From 10e8e82fe483268a698b4a0d1aeee91643bfc7d8 Mon Sep 17 00:00:00 2001 From: chc <1501738723@qq.com> Date: Wed, 18 Sep 2024 15:25:04 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=8F=91=E8=B4=A7=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buyer/src/pages/home/enumeration.js | 4 ++++ manager/src/views/order/order/orderList.vue | 5 +++++ seller/src/views/order/order/orderList.vue | 7 ++++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/buyer/src/pages/home/enumeration.js b/buyer/src/pages/home/enumeration.js index 60caf556..f6191807 100644 --- a/buyer/src/pages/home/enumeration.js +++ b/buyer/src/pages/home/enumeration.js @@ -17,6 +17,10 @@ export const orderStatusList = [ name: '待发货', status: 'UNDELIVERED' }, + { + name: '部分发货', + status: 'PARTS_DELIVERED' + }, { name: '已发货', status: 'DELIVERED' diff --git a/manager/src/views/order/order/orderList.vue b/manager/src/views/order/order/orderList.vue index 0b8c503b..52ab75c4 100644 --- a/manager/src/views/order/order/orderList.vue +++ b/manager/src/views/order/order/orderList.vue @@ -267,6 +267,10 @@ export default { return h("div", [ h("tag", { props: { color: "geekblue" } }, "待自提"), ]); + } else if (params.row.orderStatus == "PARTS_DELIVERED") { + return h("div", [ + h("tag", { props: { color: "cyan" } }, "部分发货"), + ]); } else if (params.row.orderStatus == "DELIVERED") { return h("div", [ h("tag", { props: { color: "cyan" } }, "已发货"), @@ -320,6 +324,7 @@ export default { {title: '未付款', value: 'UNPAID'}, {title: '已付款', value: 'PAID'}, {title: '待发货', value: 'UNDELIVERED'}, + {title: '部分发货', value: 'PARTS_DELIVERED'}, {title: '已发货', value: 'DELIVERED'}, {title: '待核验', value: 'TAKE'}, {title: '待自提', value: 'STAY_PICKED_UP'}, diff --git a/seller/src/views/order/order/orderList.vue b/seller/src/views/order/order/orderList.vue index 146ef7a7..29547ca8 100644 --- a/seller/src/views/order/order/orderList.vue +++ b/seller/src/views/order/order/orderList.vue @@ -36,6 +36,7 @@ + @@ -233,10 +234,14 @@ export default { return h("div", [ h("tag", { props: { color: "geekblue" } }, "待发货"), ]); - }else if (params.row.orderStatus == "STAY_PICKED_UP") { + } else if (params.row.orderStatus == "STAY_PICKED_UP") { return h("div", [ h("tag", { props: { color: "geekblue" } }, "待自提"), ]); + } else if (params.row.orderStatus == "PARTS_DELIVERED") { + return h("div", [ + h("tag", { props: { color: "cyan" } }, "部分发货"), + ]); } else if (params.row.orderStatus == "DELIVERED") { return h("div", [ h("tag", { props: { color: "cyan" } }, "已发货"), From 6f309496203b9a84fa2593ba3a20365363b6475e Mon Sep 17 00:00:00 2001 From: misworga831 Date: Mon, 23 Sep 2024 21:18:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=A5=BC?= =?UTF-8?q?=E5=B1=82=E8=A3=85=E4=BF=AE=E4=BF=83=E9=94=80=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E7=A7=BB=E9=99=A4=E4=BC=98=E6=83=A0=E5=88=B8.pc=E7=AB=AF?= =?UTF-8?q?=E6=A5=BC=E5=B1=82=E8=A3=85=E4=BF=AE=E5=BF=AB=E6=8D=B7=E5=AF=BC?= =?UTF-8?q?=E8=88=AA=E5=A4=96=E9=83=A8=E9=93=BE=E6=8E=A5=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E5=A1=AB=E5=86=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lili-dialog/template/marketing.vue | 20 +++++++------- .../src/views/page-decoration/modelForm.vue | 27 ++++++++++--------- 2 files changed, 25 insertions(+), 22 deletions(-) diff --git a/manager/src/components/lili-dialog/template/marketing.vue b/manager/src/components/lili-dialog/template/marketing.vue index 4585087d..be39d636 100644 --- a/manager/src/components/lili-dialog/template/marketing.vue +++ b/manager/src/components/lili-dialog/template/marketing.vue @@ -339,15 +339,15 @@ export default { this.sortGoods("SECKILL"); }, }; - case "COUPON": - return { - title: "优惠券", - methodsed: () => { - this.showPromotionList = []; - this.activeColumns = this.pintuanColumns; - this.sortGoods("COUPON"); - }, - }; + // case "COUPON": + // return { + // title: "优惠券", + // methodsed: () => { + // this.showPromotionList = []; + // this.activeColumns = this.pintuanColumns; + // this.sortGoods("COUPON"); + // }, + // }; case "POINTS_GOODS": return { title: "积分商品", @@ -383,6 +383,8 @@ export default { getPromotion(res) { if (res.result) { this.promotionList = res.result; + // 去除优惠券 + delete this.promotionList.COUPON; Object.keys(res.result)[0] && this.typeOption(Object.keys(res.result)[0]).methodsed(); } diff --git a/manager/src/views/page-decoration/modelForm.vue b/manager/src/views/page-decoration/modelForm.vue index 713852ce..e832a094 100644 --- a/manager/src/views/page-decoration/modelForm.vue +++ b/manager/src/views/page-decoration/modelForm.vue @@ -134,7 +134,7 @@ @@ -201,15 +201,16 @@ export default { bgColor: "#de000d", size: "1200*80", }, + currentIndex: 0, navList: { // 分类nav数据 type: "navBar", list: [ - { name: "秒杀", url: "" }, - { name: "闪购", url: "" }, - { name: "优惠券", url: "" }, - { name: "拍卖", url: "" }, - { name: "服装城", url: "" }, + { name: "秒杀", url: "", title: "" }, + { name: "闪购", url: "", title: "" }, + { name: "优惠券", url: "", title: "" }, + { name: "拍卖", url: "", title: "" }, + { name: "服装城", url: "", title: "" }, ], }, }; @@ -228,21 +229,19 @@ export default { // 调起选择链接弹窗 if (item) this.selectedNav = item; this.$refs.liliDialog.open("link"); - console.log(item); + this.currentIndex = index; }, // 已选链接 selectedLink(val) { - if (this.showModalNav) { this.selectedNav.url = this.$options.filters.formatLinkType(val); - this.selectedNav.type = - val.___type === "other" && val.url === "" ? "link" : "other"; + this.selectedNav.type = val.___type === "other" && val.url === "" ? "link" : "other"; } else { this.topAdvert.url = this.$options.filters.formatLinkType(val); - this.topAdvert.type = - val.___type === "other" && val.url === "" ? "link" : "other"; + this.topAdvert.type = val.___type === "other" && val.url === "" ? "link" : "other"; } + this.navList.list[this.currentIndex].title = val.title; }, handleDelNav(index) { // 删除导航 @@ -250,7 +249,9 @@ export default { }, handleAddNav() { // 添加导航 - this.navList.list.push({ name: "", url: "" }); + this.navList.list.push({ name: "", url: "", title: "" });this.$nextTick(() => { + this.selectedNav.title = val.title; + }); }, // 拖动结束回调 handleMoveEnd({ newIndex, oldIndex }) {