From cb210916ebf8c3798717d4a462821a83cdda1bed Mon Sep 17 00:00:00 2001 From: Yer <17633066053@163.com> Date: Tue, 26 Sep 2023 15:02:17 +0800 Subject: [PATCH 1/7] =?UTF-8?q?style:=20=E8=B0=83=E6=95=B4=E6=8A=95?= =?UTF-8?q?=E8=AF=89=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../after-order/afterSaleOrderDetail.vue | 50 +++++-------------- .../after-order/orderComplaintDetail.vue | 20 +++----- .../after-order/orderComplaintDetail.vue | 21 +++----- .../after-order/reurnGoodsOrderDetail.vue | 25 ++++------ 4 files changed, 36 insertions(+), 80 deletions(-) diff --git a/manager/src/views/order/after-order/afterSaleOrderDetail.vue b/manager/src/views/order/after-order/afterSaleOrderDetail.vue index 912326a6..a3299fc7 100644 --- a/manager/src/views/order/after-order/afterSaleOrderDetail.vue +++ b/manager/src/views/order/after-order/afterSaleOrderDetail.vue @@ -5,6 +5,19 @@

退货申请

+
+
退货商品
+
+
+ +
+ {{ afterSaleInfo.goodsName }} +
+ + {{ afterSaleInfo.num }}(数量) + +
+
退货状态
{{ afterSaleInfo.serviceName }}
@@ -155,43 +168,6 @@
-
-

相关商品交易信息

-
-
- -
-
-
- {{ - afterSaleInfo.goodsName - }} - -
- -
- - -
-
- 数量：x{{ afterSaleInfo.num }} -
-
-
-

订单相关信息

diff --git a/manager/src/views/order/after-order/orderComplaintDetail.vue b/manager/src/views/order/after-order/orderComplaintDetail.vue index dc868ce7..84281dfa 100644 --- a/manager/src/views/order/after-order/orderComplaintDetail.vue +++ b/manager/src/views/order/after-order/orderComplaintDetail.vue @@ -8,6 +8,13 @@
投诉商品
{{complaintInfo.goodsName}}
+
+
+ +
+ {{ complaintInfo.goodsName }}
+ {{ complaintInfo.num }}(数量) +
投诉状态
@@ -144,19 +151,6 @@
-
-

相关商品交易信息

-
-
- -
-
- {{complaintInfo.goodsName}}
- ￥{{complaintInfo.goodsPrice}} * {{complaintInfo.num}}(数量) -
-
- -

订单相关信息

diff --git a/seller/src/views/order/after-order/orderComplaintDetail.vue b/seller/src/views/order/after-order/orderComplaintDetail.vue index 86ba8e39..fd30317b 100644 --- a/seller/src/views/order/after-order/orderComplaintDetail.vue +++ b/seller/src/views/order/after-order/orderComplaintDetail.vue @@ -7,7 +7,13 @@

投诉信息

投诉商品
-
{{ complaintInfo.goodsName }}
+
+
+ +
+ {{ complaintInfo.goodsName }}
+ ￥{{ complaintInfo.goodsPrice | unitPrice }} * {{ complaintInfo.num }}(数量) +
投诉状态
@@ -160,19 +166,6 @@
-
-

相关商品交易信息

-
-
- -
-
- {{ complaintInfo.goodsName }}
- ￥{{ complaintInfo.goodsPrice | unitPrice }} * {{ complaintInfo.num }}(数量) -
-
- -

订单相关信息

diff --git a/seller/src/views/order/after-order/reurnGoodsOrderDetail.vue b/seller/src/views/order/after-order/reurnGoodsOrderDetail.vue index 4a34fa73..bcaf7cde 100644 --- a/seller/src/views/order/after-order/reurnGoodsOrderDetail.vue +++ b/seller/src/views/order/after-order/reurnGoodsOrderDetail.vue @@ -8,8 +8,15 @@

售后申请

-
售后状态
-
{{filterStatus(afterSaleInfo.serviceStatus)}}
+
售后商品
+
+
+ +
+ {{ afterSaleInfo.goodsName }}
+ {{ afterSaleInfo.num }}(数量) +
+
@@ -155,20 +162,6 @@
-
-

相关商品交易信息

-
-
- -
-
- {{ afterSaleInfo.goodsName }}
- {{ afterSaleInfo.num }}(数量)
- -
-
- -

订单相关信息

From 2c66eaae2b33e81c1f16a9b1d35c591893384196 Mon Sep 17 00:00:00 2001 From: Yer <17633066053@163.com> Date: Tue, 26 Sep 2023 15:53:13 +0800 Subject: [PATCH 2/7] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D=E5=B7=B2?= =?UTF-8?q?=E7=9F=A5=E7=BB=9F=E8=AE=A1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manager/src/components/affix-time.vue | 11 +++++++---- seller/src/views/lili-components/affix-time.vue | 8 ++++++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/manager/src/components/affix-time.vue b/manager/src/components/affix-time.vue index d06ad9cb..7bc48c0f 100644 --- a/manager/src/components/affix-time.vue +++ b/manager/src/components/affix-time.vue @@ -138,6 +138,9 @@ export default { this.$emit("selected", this.selectedWay); } else { + const current = this.dateList.find(item=>{return item.selected}) + this.selectedWay = current + this.$emit("selected", this.selectedWay); } }, // 变更时间 @@ -148,14 +151,16 @@ export default { item.selected = true; item.storeId = this.storeId; this.month = ""; - + const dateList = this.dateList + let currentDate if (item.searchType == "") { if ( dateList.some((date) => { + currentDate = date return date.title == item.title; }) ) { - item.searchType = date.searchType; + item.searchType = currentDate.searchType; } else { item.searchType = "LAST_SEVEN"; } @@ -183,8 +188,6 @@ export default { color: $theme_color; position: relative; } -.date-picker { -} .active:before { content: ""; position: absolute; diff --git a/seller/src/views/lili-components/affix-time.vue b/seller/src/views/lili-components/affix-time.vue index 54461bb9..98a75806 100644 --- a/seller/src/views/lili-components/affix-time.vue +++ b/seller/src/views/lili-components/affix-time.vue @@ -101,6 +101,9 @@ export default { this.$emit("selected", this.selectedWay); } else { + const current = this.dateList.find(item=>{return item.selected}) + this.selectedWay = current + this.$emit("selected", this.selectedWay); } }, // 点击时间筛选 @@ -111,14 +114,15 @@ export default { item.selected = true; item.storeId = this.storeId; this.month = ""; - + const dateList = this.dateList + let currentDate if (item.searchType == "") { if ( dateList.some((date) => { return date.title == item.title; }) ) { - item.searchType = date.searchType; + item.searchType = currentDate.searchType; } else { item.searchType = "LAST_SEVEN"; } From 46143beb83d744edf02760beb87c025f6bb2a99b Mon Sep 17 00:00:00 2001 From: "pikachu1995@126.com" Date: Tue, 26 Sep 2023 18:48:55 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=87=E4=BB=B6-?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manager/src/api/index.js | 20 + .../src/views/sys/oss-manage/ossManage.vue | 860 ++++++++++++------ 2 files changed, 620 insertions(+), 260 deletions(-) diff --git a/manager/src/api/index.js b/manager/src/api/index.js index 247d9fe6..f87e4f8f 100644 --- a/manager/src/api/index.js +++ b/manager/src/api/index.js @@ -490,4 +490,24 @@ export const getHotWordsHistory = (params) => { return getRequest(`/hotwords/hotwords/history`,params); }; +// 获取文件目录列表 +export const getFileDirectory = () => { + return getRequest(commonUrl+`/common/resource/fileDirectory`); +}; +// 添加文件目录 +export const addFileDirectory = (params) => { + return postRequestWithNoForm(commonUrl+`/common/resource/fileDirectory`,params); +}; + + +// 修改文件目录 +export const updateFileDirectory = (params) => { + return putRequestWithNoForm(commonUrl+`/common/resource/fileDirectory`,params); +}; + + +// 删除文件目录 +export const delFileDirectory = (id) => { + return deleteRequest(commonUrl+`/common/resource/fileDirectory/${id}`); +}; diff --git a/manager/src/views/sys/oss-manage/ossManage.vue b/manager/src/views/sys/oss-manage/ossManage.vue index b255e4c5..3db93fc9 100644 --- a/manager/src/views/sys/oss-manage/ossManage.vue +++ b/manager/src/views/sys/oss-manage/ossManage.vue @@ -1,203 +1,233 @@ From c88c1865e7a84d3f9a69217fe242856c08a54635 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CYer=E2=80=9D?= <17633066053@163.com> Date: Sat, 30 Sep 2023 16:18:27 +0800 Subject: [PATCH 4/7] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E6=94=B9=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E5=9B=BE=E5=B7=B2=E5=8F=91=E7=8E=B0=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manager/src/components/affix-time.vue | 78 +++++++--- .../src/views/lili-components/affix-time.vue | 140 +++++++++++++----- 2 files changed, 157 insertions(+), 61 deletions(-) diff --git a/manager/src/components/affix-time.vue b/manager/src/components/affix-time.vue index 7bc48c0f..bc9162a7 100644 --- a/manager/src/components/affix-time.vue +++ b/manager/src/components/affix-time.vue @@ -1,20 +1,20 @@