From 5a3c0c415b08bdf50cf2d1dfdc713c59929f3ba5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=99=E5=90=8C=E5=AD=A6?= <2495967527@qq.com> Date: Wed, 5 Mar 2025 10:22:18 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datacenter/product-analysis/index.vue | 126 +++++++++++++++++- 1 file changed, 125 insertions(+), 1 deletion(-) diff --git a/src/views/modules/datacenter/product-analysis/index.vue b/src/views/modules/datacenter/product-analysis/index.vue index 6b2c20e..a50c401 100644 --- a/src/views/modules/datacenter/product-analysis/index.vue +++ b/src/views/modules/datacenter/product-analysis/index.vue @@ -108,7 +108,6 @@
+ +
销售量TOP
+ + + + + + + + +
销售额TOP
+ + + + + + + + + + + + +
回复率TOP
+ + + + + + + + +
From 25502106ec56a5fb6777e14761cdce113eb8186c Mon Sep 17 00:00:00 2001 From: yukai <602570645@qq.com> Date: Sat, 8 Mar 2025 14:18:21 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=AD=A3=E5=BC=8F=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/config/index-prod.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/config/index-prod.js b/public/config/index-prod.js index 6096255..37b1be0 100644 --- a/public/config/index-prod.js +++ b/public/config/index-prod.js @@ -13,7 +13,7 @@ window.SITE_CONFIG = {}; // 在线api接口请求地址 - window.SITE_CONFIG["baseUrl"] = "https://admin-test.damajishi.cn/"; + window.SITE_CONFIG["baseUrl"] = "https://admin.damajishi.cn/"; // cdn地址 = 域名 + 版本号 window.SITE_CONFIG["domain"] = "./"; // 域名 From c5b73ec1ee6f39483446083a1382214c27bd08b8 Mon Sep 17 00:00:00 2001 From: yukai <602570645@qq.com> Date: Sat, 8 Mar 2025 14:46:08 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=9D=83=E9=99=90?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=B8=8D=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operation-management/role/popup/add-or-update.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/modules/operation-management/role/popup/add-or-update.vue b/src/views/modules/operation-management/role/popup/add-or-update.vue index 82a095b..e770ae8 100644 --- a/src/views/modules/operation-management/role/popup/add-or-update.vue +++ b/src/views/modules/operation-management/role/popup/add-or-update.vue @@ -109,9 +109,9 @@ export default { label: "权限字段", prop: "col", type: "Input", - required: true, + required: false, rules: { - required: true, + required: false, message: "请输入权限字段", trigger: "blur", }, @@ -208,4 +208,4 @@ export default { }; \ No newline at end of file + From 482e743ea1b7427d6cf32232c46bbca8920bce89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=99=E5=90=8C=E5=AD=A6?= <2495967527@qq.com> Date: Tue, 18 Mar 2025 14:54:19 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=95=86=E5=93=81=E9=A2=84=E5=94=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operation-management/commodity/index.vue | 9 +++++ .../commodity/popup/add-or-update.vue | 34 +++++++++++++++++-- 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/src/views/modules/operation-management/commodity/index.vue b/src/views/modules/operation-management/commodity/index.vue index b29dbce..226847a 100644 --- a/src/views/modules/operation-management/commodity/index.vue +++ b/src/views/modules/operation-management/commodity/index.vue @@ -345,6 +345,15 @@ export default { align: "center", field: "stockNum", }, + { + title: "是否为预售商品", + align: "center", + field: "isAdvanceSell", + type: "jsx", + render: ({ row }) => { + return {row.isAdvanceSell == 1 ? "是" : "否"}; + }, + }, { title: "状态", // fixed: "right", diff --git a/src/views/modules/operation-management/commodity/popup/add-or-update.vue b/src/views/modules/operation-management/commodity/popup/add-or-update.vue index 95d200b..daffc77 100644 --- a/src/views/modules/operation-management/commodity/popup/add-or-update.vue +++ b/src/views/modules/operation-management/commodity/popup/add-or-update.vue @@ -3,7 +3,7 @@ { + return ( + + {[ + { label: "是", value: "1" }, + { label: "否", value: "0" }, + ].map((item) => { + return ( + + ); + })} + + ); + }, + }, ]; break; case "销售信息": From effc36a756331e93372e4b7870d721f8273b580e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=99=E5=90=8C=E5=AD=A6?= <2495967527@qq.com> Date: Thu, 20 Mar 2025 10:00:57 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=BF=90=E8=B4=B9=E6=A8=A1=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logistics-template/index.vue | 35 ++++++++++++++----- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/src/views/modules/logistics-fare/logistics-template/index.vue b/src/views/modules/logistics-fare/logistics-template/index.vue index e9844d5..44bd972 100644 --- a/src/views/modules/logistics-fare/logistics-template/index.vue +++ b/src/views/modules/logistics-fare/logistics-template/index.vue @@ -67,10 +67,20 @@ export default { }; }, created() { - this.searchForm = { - name: "", - linkId: this.marketId ? this.marketId : this.shopId, - }; + if ( + JSON.parse(sessionStorage.getItem("userInfo")).role === "ROLE_MERCHANT" + ) { + this.searchForm = { + name: "", + linkId: this.shopId, + }; + } else { + this.searchForm = { + name: "", + linkId: this.marketId ? this.marketId : this.shopId, + }; + } + this.$nextTick(() => { this.$refs.oTable.reload(); }); @@ -95,10 +105,19 @@ export default { }); }, Reset() { - this.searchForm = { - name: "", - linkId: this.marketId ? this.marketId : this.shopId, - }; + if ( + JSON.parse(sessionStorage.getItem("userInfo")).role === "ROLE_MERCHANT" + ) { + this.searchForm = { + name: "", + linkId: this.shopId, + }; + } else { + this.searchForm = { + name: "", + linkId: this.marketId ? this.marketId : this.shopId, + }; + } this.$refs.oTable.reload(); }, addFareTemplate() {