zhuce
/
lilishop-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

master
mabo 2021-06-30 15:51:14 +08:00
parent 950b8a097c
commit c9e58f3586
12 changed files with 73 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
buyer/src/assets/images/decorate.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 46 KiB

2
buyer/src/components/goodsDetail/ShowGoods.vue
View File

@ -111,7 +111,7 @@
<span class="inventory"> 库存{{skuDetail.quantity}}</span>
</div>
</div>
<div class="item-select" v-if="skuDetail.goodsType !== 'VIRTUAL_GOODS'">
<div class="item-select" v-if="skuDetail.goodsType !== 'VIRTUAL_GOODS' || skuDetail.weight === 0">
<div class="item-select-title">
<p>重量</p>
</div>

2
buyer/src/components/indexDecorate/modelList/firstPageAdvert.vue
View File

@ -31,7 +31,7 @@ export default {
return {
options: this.data.options // 装修数据
};
},
}
};
</script>
<style lang="scss" scoped>

2
buyer/src/pages/user/Home.vue
View File

@ -15,7 +15,7 @@
>
<div class="user-icon">
<div class="user-img">
<img :src="userInfo.face" v-if="userInfo.face" alt />
<img :src="userInfo.face" style="width:100%;height:100%;" v-if="userInfo.face" alt />
<Avatar icon="ios-person" class="mb_10" v-else size="96" />
</div>
<p>{{userInfo.nickName}}</p>

16
manager/src/config/index.js
View File

@ -17,14 +17,14 @@ export default {
* @description api请求基础路径
*/
api_dev: {
common: "https://common-api.pickmall.cn",
buyer: "https://buyer-api.pickmall.cn",
seller: "https://store-api.pickmall.cn",
manager: "https://admin-api.pickmall.cn"
// common: 'http://192.168.0.100:8890',
// buyer: 'http://192.168.0.100:8888',
// seller: 'http://192.168.0.100:8889',
// manager: 'http://192.168.0.100:8887'
// common: "https://common-api.pickmall.cn",
// buyer: "https://buyer-api.pickmall.cn",
// seller: "https://store-api.pickmall.cn",
// manager: "https://admin-api.pickmall.cn"
common: 'http://192.168.0.109:8890',
buyer: 'http://192.168.0.109:8888',
seller: 'http://192.168.0.109:8889',
manager: 'http://192.168.0.109:8887'
},
api_prod: {
common: "https://common-api.pickmall.cn",

6
manager/src/views/distribution/distribution.vue
View File

@ -100,7 +100,7 @@ export default {
},
{
title: "推广单数",
key: "orderNum",
key: "distributionOrderCount",
minWidth: 120,
width: 150,
},
@ -124,7 +124,7 @@ export default {
render: (h, params) => {
return h(
"div",
this.$options.filters.unitPrice(params.row.rebateTotal, "￥")
this.$options.filters.unitPrice(params.row.canRebate, "￥")
);
},
},
@ -136,7 +136,7 @@ export default {
render: (h, params) => {
return h(
"div",
this.$options.filters.unitPrice(params.row.rebateTotal, "￥")
this.$options.filters.unitPrice(params.row.commissionFrozen, "￥")
);
},
},

14
manager/src/views/distribution/distributionCash.vue
View File

@ -3,12 +3,12 @@
<Card>
<Row @keydown.enter.native="handleSearch" >
<Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
<Input class="search-input" v-model="searchForm.memberName">
<span slot="prepend">会员名称</span>
</Input>
<Input class="search-input" v-model="searchForm.sn">
<span slot="prepend">编号</span>
</Input>
<Form-item label="会员名称">
<Input class="search-input" v-model="searchForm.memberName"></Input>
</Form-item>
<Form-item label="编号">
<Input class="search-input" v-model="searchForm.sn"></Input>
</Form-item>
<Form-item label="状态" style="margin-left: -20px">
<Select v-model="searchForm.distributionCashStatus" style="width:150px;">
<Option v-for="item in cashStatusList" :value="item.value" :key="item.value">{{ item.label }}</Option>
@ -114,7 +114,7 @@ export default {
},
{
title: "处理时间",
key: "payTime",
key: "updateTime",
minWidth: 130
},
{

18
manager/src/views/distribution/distributionGoods.vue
View File

@ -21,16 +21,16 @@
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
<template slot="goodsName" slot-scope="{row}">
<div>
<div class="div-zoom">
<a @click="linkTo(row.goodsId,row.skuId)">{{row.goodsName}}</a>
</div>
<Poptip trigger="hover" title="扫码在手机中查看" transfer>
<div slot="content">
<vue-qr :text="wapLinkTo(row.goodsId,row.skuId)" :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
</div>
<img src="../../assets/qrcode.svg" class="hover-pointer" width="20" height="20" alt="">
</Poptip>
<div class="div-zoom">
<a @click="linkTo(row.goodsId,row.skuId)">{{row.goodsName}}</a>
</div>
<Poptip trigger="hover" title="扫码在手机中查看" transfer>
<div slot="content">
<vue-qr :text="wapLinkTo(row.goodsId,row.skuId)" :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
</div>
<img src="../../assets/qrcode.svg" class="hover-pointer" width="20" height="20" alt="">
</Poptip>
</div>
</template>
</Table>
<Row type="flex" justify="end" class="page">

65
manager/src/views/distribution/distributionOrder.vue
View File

@ -34,7 +34,25 @@
<Button @click="handleSearch" type="primary" icon="ios-search" class="search-btn">搜索</Button>
</Form>
</Row>
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom"></Table>
<Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom">
<template slot-scope="{row}" slot="goodsMsg">
<div class="goods-msg">
<img :src="row.image" width="60" height="60" alt="">
<div>
<div class="div-zoom">
<a @click="linkTo(row.goodsId,row.skuId)">{{row.goodsName}}</a>
</div>
<div style="color:#999;font-size:10px">数量：x{{row.num}}</div>
<Poptip trigger="hover" title="扫码在手机中查看" transfer>
<div slot="content">
<vue-qr :text="wapLinkTo(row.goodsId,row.skuId)" :margin="0" colorDark="#000" colorLight="#fff" :size="150"></vue-qr>
</div>
<img src="../../assets/qrcode.svg" class="hover-pointer" width="20" height="20" alt="">
</Poptip>
</div>
</div>
</template>
</Table>
<Row type="flex" justify="end" class="page">
<Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize"
@on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10,20,50]"
@ -71,53 +89,35 @@
{
title: "订单编号",
key: "orderSn",
minWidth: 120,
minWidth: 100,
tooltip: true
},
{
title: "实付金额",
key: "orderPrice",
width: 130,
sortable: false,
render: (h, params) => {
if(params.row.orderPrice == null){
return h("div", this.$options.filters.unitPrice(0, '￥'));
}else{
return h("div", this.$options.filters.unitPrice(params.row.orderPrice, '￥'));
}
}
title: '商品信息',
slot: 'goodsMsg',
minWidth: 120
},
{
title: "退款金额",
key: "returnMoney",
width: 130,
sortable: false,
render: (h, params) => {
if(params.row.orderPrice == null){
if(params.row.sellBackRebate == null){
return h("div", this.$options.filters.unitPrice(0, '￥'));
}else{
return h("div", this.$options.filters.unitPrice(params.row.returnMoney, '￥'));
return h("div", this.$options.filters.unitPrice(params.row.sellBackRebate, '￥'));
}
}
},
{
title: "商品名称",
key: "goodsName",
minWidth: 120,
tooltip: true
},
{
title: "分销商",
key: "distributionName",
minWidth: 120,
tooltip: true
},
{
title: "店铺名称",
key: "storeName",
minWidth: 120,
tooltip: true
},
{
title: "状态",
@ -141,10 +141,10 @@
width: 120,
sortable: false,
render: (h, params) => {
if(params.row.rebateGrade == null){
if(params.row.rebate == null){
return h("div", this.$options.filters.unitPrice(0, '￥'));
}else{
return h("div", this.$options.filters.unitPrice(params.row.rebateGrade, '￥'));
return h("div", this.$options.filters.unitPrice(params.row.rebate, '￥'));
}
}
@ -225,7 +225,7 @@
this.init();
},
watch: {
$route(e) {
$route(e) { // 监听路由，参数变化调取接口
this.distributionId = e.query.id ? e.query.id : undefined;
this.getDataList();
}
@ -234,5 +234,12 @@
</script>
<style lang="scss" >
@import "@/styles/table-common.scss";
.goods-msg {
display: flex;
align-items: center;
>div{
margin-left: 10px;
}
}
</style>

2
manager/src/views/lili-floor-renovation/renovation.vue
View File

@ -52,6 +52,8 @@ export default {
pageData: modelForm,
pageShow,
};
console.log(this.modelForm);
API_floor.updateHome(this.$route.query.id, data).then((res) => {
if (res.success) {
this.$Message.success("保存模板成功");

4
seller/src/config/index.js
View File

@ -22,6 +22,10 @@ export default {
buyer: 'https://buyer-api.pickmall.cn',
seller: 'https://store-api.pickmall.cn',
manager: 'https://admin-api.pickmall.cn',
// common: 'http://192.168.0.109:8890',
// buyer: 'http://192.168.0.109:8888',
// seller: 'http://192.168.0.109:8889',
// manager: 'http://192.168.0.109:8887'
},
api_prod: {

2
seller/src/views/order/order/orderDetail.vue
View File

@ -63,7 +63,7 @@
<div class="div-item" v-if="orderInfo.order.needReceipt == true">
<div class="div-item-left">发票金额：</div>
<div class="div-item-right">{{ orderInfo.receipt.receiptPrice ? orderInfo.receipt.receiptPrice : '暂无' | unitPrice('￥')}}</div>
<div class="div-item-right"><span v-if="orderInfo.receipt.receiptPrice">￥</span>{{ orderInfo.receipt.receiptPrice ? orderInfo.receipt.receiptPrice : '暂无' | unitPrice}}</div>
</div>
<div class="div-item" v-if="orderInfo.order.needReceipt == true">