diff --git a/build.sh b/build.sh index bd6b5059..862de4eb 100644 --- a/build.sh +++ b/build.sh @@ -1,7 +1,6 @@ #代码目录 code_path=$PWD -git checkout master git pull cd ${code_path}/manager diff --git a/buyer/src/pages/home/orderCenter/AfterSale.vue b/buyer/src/pages/home/orderCenter/AfterSale.vue index d0f89578..04f085a6 100644 --- a/buyer/src/pages/home/orderCenter/AfterSale.vue +++ b/buyer/src/pages/home/orderCenter/AfterSale.vue @@ -9,7 +9,7 @@ class="width_300" search enter-button - v-model="params.sn" + v-model="params.keywords" @on-search="getList" placeholder="请输入订单号搜索" /> diff --git a/manager/src/components/affix-time.vue b/manager/src/components/affix-time.vue index bc9162a7..a81b6d25 100644 --- a/manager/src/components/affix-time.vue +++ b/manager/src/components/affix-time.vue @@ -204,7 +204,6 @@ export default { .breadcrumb { display: flex; align-items: center; - >span { margin-right: 15px; cursor: pointer; diff --git a/manager/src/views/goods/goods-manage/category.vue b/manager/src/views/goods/goods-manage/category.vue index bbc3ee80..056f9afb 100644 --- a/manager/src/views/goods/goods-manage/category.vue +++ b/manager/src/views/goods/goods-manage/category.vue @@ -114,14 +114,14 @@ - + 启用 禁用 diff --git a/manager/src/views/page-decoration/wap/advertising.vue b/manager/src/views/page-decoration/wap/advertising.vue index d4d68906..927d180d 100644 --- a/manager/src/views/page-decoration/wap/advertising.vue +++ b/manager/src/views/page-decoration/wap/advertising.vue @@ -66,6 +66,13 @@ > + +
+
当前页面状态
+
+ {{result.pageShow === 'OPEN' ? '开启' : '关闭'}} +
+
@@ -87,6 +94,7 @@ export default { }, data() { return { + result:"", picModelFlag: false, //图片选择器 type: "full", // 是否全屏 @@ -131,6 +139,7 @@ export default { res.result.pageData ? this.$set(this, "advertising", [JSON.parse(res.result.pageData)]) : ""; + this.result = res.result }); }, // 点击链接 diff --git a/manager/src/views/page-decoration/wap/alertAdvertising.vue b/manager/src/views/page-decoration/wap/alertAdvertising.vue index c9f9b78f..a2ff1cde 100644 --- a/manager/src/views/page-decoration/wap/alertAdvertising.vue +++ b/manager/src/views/page-decoration/wap/alertAdvertising.vue @@ -66,6 +66,13 @@ > + +
+
当前页面状态
+
+ {{result.pageShow === 'OPEN' ? '开启' : '关闭'}} +
+
@@ -90,6 +97,7 @@ export default { }, data() { return { + result:"", picModelFlag: false, //图片选择器 type: "full", // 展示方式 //全屏广告 @@ -140,6 +148,7 @@ export default { res.result.pageData ? this.$set(this, "advertising", [JSON.parse(res.result.pageData)]) : ""; + this.result = res.result }); }, // 图片选择器回显 diff --git a/manager/src/views/statistics/member.vue b/manager/src/views/statistics/member.vue index 0312eb22..b1b9fce4 100644 --- a/manager/src/views/statistics/member.vue +++ b/manager/src/views/statistics/member.vue @@ -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", }, diff --git a/manager/src/views/statistics/order.vue b/manager/src/views/statistics/order.vue index 15555ad6..a65d2185 100644 --- a/manager/src/views/statistics/order.vue +++ b/manager/src/views/statistics/order.vue @@ -172,18 +172,20 @@
+ +
- + @@ -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) => { diff --git a/seller/src/views/lili-components/affix-time.vue b/seller/src/views/lili-components/affix-time.vue index bc9162a7..77fd73ae 100644 --- a/seller/src/views/lili-components/affix-time.vue +++ b/seller/src/views/lili-components/affix-time.vue @@ -4,18 +4,10 @@ {{ item.title }}
- -
-
-
diff --git a/seller/src/views/promotion/pintuan/pintuan-goods.vue b/seller/src/views/promotion/pintuan/pintuan-goods.vue index 8d53bee3..e4b3a52a 100644 --- a/seller/src/views/promotion/pintuan/pintuan-goods.vue +++ b/seller/src/views/promotion/pintuan/pintuan-goods.vue @@ -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; }, }); }, diff --git a/seller/src/views/statistics/order.vue b/seller/src/views/statistics/order.vue index 37250ac0..139093fd 100644 --- a/seller/src/views/statistics/order.vue +++ b/seller/src/views/statistics/order.vue @@ -152,7 +152,7 @@
- + @@ -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", }, @@ -459,6 +459,14 @@ export default { }, }, methods: { + pageNumberChange(val){ + this.refundParams.pageNumber = val + this.getOrderList(); + }, + pageSizeChange(val){ + this.refundParams.pageSize = val + this.getOrderList(); + }, // 订单图 initOrderChart() { // 默认已经加载 legend-filter 交互 diff --git a/seller/src/views/statistics/traffic.vue b/seller/src/views/statistics/traffic.vue index cac968cf..fc050b8d 100644 --- a/seller/src/views/statistics/traffic.vue +++ b/seller/src/views/statistics/traffic.vue @@ -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", },