abu/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui

Browse Source
This commit is contained in:
Chopper711 2023-11-30 18:50:01 +08:00
commit 904046f02c
10 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build.sh
View File

@ -1,7 +1,6 @@
#代码目录
code_path=$PWD
git checkout master
git pull
cd ${code_path}/manager

2
buyer/src/pages/home/orderCenter/AfterSale.vue
View File

@ -9,7 +9,7 @@
class="width_300"
search
enter-button
v-model="params.sn"
v-model="params.keywords"
@on-search="getList"
placeholder="请输入订单号搜索"
/>

6
manager/src/views/goods/goods-manage/category.vue
View File

@ -114,14 +114,14 @@
<InputNumber v-model="formAdd.sortOrder"></InputNumber>
</FormItem>
<FormItem label="佣金比例(%)" prop="commissionRate" style="width: 345px">
<InputNumber v-model="formAdd.commissionRate"></InputNumber>
<InputNumber :max="100" :min="0" v-model="formAdd.commissionRate"></InputNumber>
</FormItem>
<FormItem label="是否启用" prop="deleteFlag">
<i-switch
size="large"
v-model="formAdd.deleteFlag"
:true-value="0"
:false-value="1"
:true-value="false"
:false-value="true"
>
<span slot="open">启用</span>
<span slot="close">禁用</span>

4
manager/src/views/statistics/member.vue
View File

@ -64,12 +64,12 @@ export default {
value: "YESTERDAY",
},
{
title: "最近7天",
title: "过去7天",
selected: true,
value: "LAST_SEVEN",
},
{
title: "最近30天",
title: "过去30天",
selected: false,
value: "LAST_THIRTY",
},

4
manager/src/views/statistics/order.vue
View File

@ -454,12 +454,12 @@ export default {
value: "YESTERDAY",
},
{
title: "最近7天",
title: "过去7天",
selected: true,
value: "LAST_SEVEN",
},
{
title: "最近30天",
title: "过去30天",
selected: false,
value: "LAST_THIRTY",
},

4
manager/src/views/statistics/traffic.vue
View File

@ -76,12 +76,12 @@ export default {
value: "YESTERDAY",
},
{
title: "最近7天",
title: "过去7天",
selected: true,
value: "LAST_SEVEN",
},
{
title: "最近30天",
title: "过去30天",
selected: false,
value: "LAST_THIRTY",
},

13
seller/src/views/goods/goods-seller/goodsOperationSec.vue
View File

@ -156,12 +156,12 @@
<div v-for="(item, $index) in skuInfo" :key="$index" class="sku-item-content">
<Card :bordered="true" class="ivu-card-body">
<Button slot="extra" type="primary" @click="handleCloseSkuItem($index, item)">
删除规格
删除规格项
</Button>
<div>
<FormItem class="sku-item-content-val flex" label="规格名">
<FormItem class="sku-item-content-val flex" label="规格项名">
<AutoComplete v-model="item.name" :data="skuData" :filter-method="filterMethod"
:maxlength="30" placeholder="请输入规格名称" style="width: 150px"
:maxlength="30" placeholder="请输入规格项名称" style="width: 150px"
@on-focus="changeSkuItem(item.name)" @on-change="
editSkuItem(item.name, $index, item)
">
@ -1568,6 +1568,13 @@ export default {
this.submitLoading = false;
return;
}
if (this.goodsUnitList && !this.goodsUnitList.find(i => i === this.baseInfoForm.goodsUnit)) {
submit.goodsUnit = ""
this.$Message.error("商品单位不存在");
this.submitLoading = false;
return;
}
let skuInfoNames = this.skuInfo.map((n) => n.name);
submit.skuList = [];
this.skuTableData.map((sku) => {

2
seller/src/views/promotion/pintuan/pintuan-goods.vue
View File

@ -277,6 +277,7 @@ export default {
delGoods(index) {
// 删除商品
this.goodsData.splice(index, 1);
this.selectCount = 0;
},
delAll() {
// 批量删除商品
@ -295,6 +296,7 @@ export default {
this.goodsData = this.goodsData.filter((item) => {
return !ids.includes(item.skuId);
});
this.selectCount = 0;
},
});
},

4
seller/src/views/statistics/order.vue
View File

@ -377,12 +377,12 @@ export default {
value: "YESTERDAY",
},
{
title: "最近7天",
title: "过去7天",
selected: true,
value: "LAST_SEVEN",
},
{
title: "最近30天",
title: "过去30天",
selected: false,
value: "LAST_THIRTY",
},

4
seller/src/views/statistics/traffic.vue
View File

@ -74,12 +74,12 @@ export default {
value: "YESTERDAY",
},
{
title: "最近7天",
title: "过去7天",
selected: true,
value: "LAST_SEVEN",
},
{
title: "最近30天",
title: "过去30天",
selected: false,
value: "LAST_THIRTY",
},