From b7a2a5af6d9570ac84c2acc9ac53918de4a4d947 Mon Sep 17 00:00:00 2001
From: misworga831 <paulgao0831@gmail.com>
Date: Mon, 18 Sep 2023 16:04:25 +0800
Subject: [PATCH 1/9] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=AB=AF=E5=95=86=E5=93=81=E5=88=86=E7=B1=BB=EF=BC=8C=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=97=B6=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E9=97=AE=E9=A2=98=E5=8F=8A=E4=BD=A3=E9=87=91=E6=AF=94?=
 =?UTF-8?q?=E4=BE=8B=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/views/goods/goods-manage/category.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 @@
             <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>

From c6cf90fb4e2b48cfd74872356a00d23c5e33977f Mon Sep 17 00:00:00 2001
From: misworga831 <paulgao0831@gmail.com>
Date: Mon, 18 Sep 2023 16:59:23 +0800
Subject: [PATCH 2/9] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=96=87=E6=9C=AC=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/components/affix-time.vue           | 6 +++---
 manager/src/views/statistics/member.vue         | 4 ++--
 manager/src/views/statistics/order.vue          | 4 ++--
 manager/src/views/statistics/traffic.vue        | 4 ++--
 seller/src/views/lili-components/affix-time.vue | 8 ++++----
 seller/src/views/statistics/order.vue           | 4 ++--
 seller/src/views/statistics/traffic.vue         | 4 ++--
 7 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/manager/src/components/affix-time.vue b/manager/src/components/affix-time.vue
index d06ad9cb..e4072503 100644
--- a/manager/src/components/affix-time.vue
+++ b/manager/src/components/affix-time.vue
@@ -31,7 +31,7 @@ export default {
 
       selectedWay: {
         // 可选时间项
-        title: "最近7天",
+        title: "过去7天",
         selected: true,
         searchType: "LAST_SEVEN",
       },
@@ -56,12 +56,12 @@ export default {
           searchType: "YESTERDAY",
         },
         {
-          title: "最近7天",
+          title: "过去7天",
           selected: true,
           searchType: "LAST_SEVEN",
         },
         {
-          title: "最近30天",
+          title: "过去30天",
           selected: false,
           searchType: "LAST_THIRTY",
         },
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..24183d6f 100644
--- a/manager/src/views/statistics/order.vue
+++ b/manager/src/views/statistics/order.vue
@@ -452,12 +452,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/traffic.vue b/manager/src/views/statistics/traffic.vue
index 841e06a3..4d133beb 100644
--- a/manager/src/views/statistics/traffic.vue
+++ b/manager/src/views/statistics/traffic.vue
@@ -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",
         },
diff --git a/seller/src/views/lili-components/affix-time.vue b/seller/src/views/lili-components/affix-time.vue
index 54461bb9..fb48aa3f 100644
--- a/seller/src/views/lili-components/affix-time.vue
+++ b/seller/src/views/lili-components/affix-time.vue
@@ -20,13 +20,13 @@ export default {
       month: "", // 所选月份
 
       defuaultWay: {
-        title: "最近7天",
+        title: "过去7天",
         selected: true,
         searchType: "LAST_SEVEN",
       },
 
       selectedWay: {
-        title: "最近7天",
+        title: "过去7天",
         selected: true,
         searchType: "LAST_SEVEN",
       },
@@ -51,12 +51,12 @@ export default {
           searchType: "YESTERDAY",
         },
         {
-          title: "最近7天",
+          title: "过去7天",
           selected: true,
           searchType: "LAST_SEVEN",
         },
         {
-          title: "最近30天",
+          title: "过去30天",
           selected: false,
           searchType: "LAST_THIRTY",
         },
diff --git a/seller/src/views/statistics/order.vue b/seller/src/views/statistics/order.vue
index 37250ac0..0f634524 100644
--- a/seller/src/views/statistics/order.vue
+++ b/seller/src/views/statistics/order.vue
@@ -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",
         },
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",
         },

From 2aae5a4bff832fafef1ac0da298cd6da72df5cb5 Mon Sep 17 00:00:00 2001
From: misworga831 <paulgao0831@gmail.com>
Date: Sat, 30 Sep 2023 17:48:35 +0800
Subject: [PATCH 3/9] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=8B=BC=E5=9B=A2?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4=EF=BC=8C=E6=89=80=E9=80=89?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E4=B8=8D=E6=AD=A3=E7=A1=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 seller/src/views/promotion/pintuan/pintuan-goods.vue | 2 ++
 1 file changed, 2 insertions(+)

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;
         },
       });
     },

From b2c286f0f53024c5ab1ce980aa2eca0fddd68319 Mon Sep 17 00:00:00 2001
From: Yer <17633066053@163.com>
Date: Mon, 9 Oct 2023 13:27:13 +0800
Subject: [PATCH 4/9] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D=E5=9C=A8?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=9B=BE=E4=B8=AD=E5=8F=AF=E8=83=BD=E5=87=BA?=
 =?UTF-8?q?=E7=8E=B0=E7=9A=84Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/components/affix-time.vue         | 73 +++++++++++++------
 .../src/views/lili-components/affix-time.vue  | 72 +++++++++++++-----
 2 files changed, 101 insertions(+), 44 deletions(-)

diff --git a/manager/src/components/affix-time.vue b/manager/src/components/affix-time.vue
index 7bc48c0f..54a2fc87 100644
--- a/manager/src/components/affix-time.vue
+++ b/manager/src/components/affix-time.vue
@@ -1,20 +1,20 @@
 <template>
   <div>
     <div class="breadcrumb">
-      <span @click="clickBreadcrumb(item,index)" :class="{'active':item.selected}" v-for="(item,index) in dateList"
-        :key="index"> {{item.title}}</span>
+      <span @click="clickBreadcrumb(item, index)" :class="{ 'active': item.selected }" v-for="(item, index) in dateList"
+        :key="index"> {{ item.title }}</span>
       <div class="date-picker">
-        <Select @on-change="changeSelect(selectedWay)" v-model="month" placeholder="年月查询" clearable
+        <Select @on-change="changeSelect($event, selectedWay)" :value="month" placeholder="年月查询" clearable
           style="width:200px;margin-left:10px;">
-          <Option v-for="(item,index) in dates" :value="item.year+'-'+item.month" :key="index" clearable>
-            {{ item.year+'年'+item.month+'月' }}</Option>
+          <Option v-for="(item, i) in dates" :value="item.year + '-' + item.month" :key="i" clearable>
+            {{ item.year + '年' + item.month + '月' }}</Option>
         </Select>
       </div>
       <div class="shop-list" v-if="!closeShop">
         <Select clearable @on-change="changeshop(selectedWay)" v-model="storeId" placeholder="店铺查询"
           style="width:200px;margin-left:10px;">
           <Scroll :on-reach-bottom="handleReachBottom">
-            <Option v-for="(item,index) in shopsData" :value="item.id" :key="index">{{ item.storeName }}</Option>
+            <Option v-for="(item, index) in shopsData" :value="item.id" :key="index">{{ item.storeName }}</Option>
           </Scroll>
         </Select>
       </div>
@@ -31,7 +31,7 @@ export default {
 
       selectedWay: {
         // 可选时间项
-        title: "最近7天",
+        title: "过去7天",
         selected: true,
         searchType: "LAST_SEVEN",
       },
@@ -56,12 +56,35 @@ export default {
           searchType: "YESTERDAY",
         },
         {
-          title: "最近7天",
+          title: "过去7天",
           selected: true,
           searchType: "LAST_SEVEN",
         },
         {
-          title: "最近30天",
+          title: "过去30天",
+          selected: false,
+          searchType: "LAST_THIRTY",
+        },
+      ],
+      originDateList: [
+        // 筛选条件
+        {
+          title: "今天",
+          selected: false,
+          searchType: "TODAY",
+        },
+        {
+          title: "昨天",
+          selected: false,
+          searchType: "YESTERDAY",
+        },
+        {
+          title: "过去7天",
+          selected: true,
+          searchType: "LAST_SEVEN",
+        },
+        {
+          title: "过去30天",
           selected: false,
           searchType: "LAST_THIRTY",
         },
@@ -126,8 +149,8 @@ export default {
       this.dates = dates.reverse();
     },
     // 改变已选店铺
-    changeSelect() {
-      console.log(this.month);
+    changeSelect(e) {
+      this.month = e
       if (this.month) {
         this.dateList.forEach((res) => {
           res.selected = false;
@@ -138,34 +161,36 @@ export default {
 
         this.$emit("selected", this.selectedWay);
       } else {
-        const current = this.dateList.find(item=>{return item.selected})
+
+        const current = this.dateList.find(item => { return item.selected })
         this.selectedWay = current
+        this.clickBreadcrumb(current)
         this.$emit("selected", this.selectedWay);
+
+
       }
     },
     // 变更时间
     clickBreadcrumb(item) {
-      this.dateList.forEach((res) => {
+
+      let currentIndex;
+      this.dateList.forEach((res,index) => {
         res.selected = false;
+        if(res.title === item.title){
+          currentIndex = index
+        }
       });
       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 = currentDate.searchType;
+       let currentDate = this.originDateList[currentIndex].searchType
+        if (currentDate) {
+          item.searchType = currentDate
         } else {
           item.searchType = "LAST_SEVEN";
         }
       }
-
       this.selectedWay = item;
       this.selectedWay.year = new Date().getFullYear();
       this.selectedWay.month = "";
@@ -179,7 +204,7 @@ export default {
 .breadcrumb {
   display: flex;
   align-items: center;
-  > span {
+  >span {
     margin-right: 15px;
     cursor: pointer;
   }
diff --git a/seller/src/views/lili-components/affix-time.vue b/seller/src/views/lili-components/affix-time.vue
index 98a75806..0507f5aa 100644
--- a/seller/src/views/lili-components/affix-time.vue
+++ b/seller/src/views/lili-components/affix-time.vue
@@ -1,10 +1,13 @@
 <template>
   <div>
     <div class="breadcrumb">
-      <span @click="clickBreadcrumb(item,index)" :class="{'active':item.selected}" v-for="(item,index) in dateList" :key="index"> {{item.title}}</span>
+      <span @click="clickBreadcrumb(item, index)" :class="{ 'active': item.selected }" v-for="(item, index) in dateList"
+        :key="index"> {{ item.title }}</span>
       <div class="date-picker">
-        <Select @on-change="changeSelect(selectedWay)" v-model="month" placeholder="年月查询" style="width:200px;margin-left:10px;">
-          <Option v-for="(item,index) in dates" :value="item.year+'-'+item.month" :key="index">{{ item.year+'年'+item.month+'月' }}</Option>
+        <Select @on-change="changeSelect($event, selectedWay)" :value="month" placeholder="年月查询"
+          style="width:200px;margin-left:10px;">
+          <Option v-for="(item, index) in dates" :value="item.year + '-' + item.month" :key="index">{{
+            item.year + '年' + item.month + '月' }}</Option>
         </Select>
       </div>
 
@@ -61,10 +64,32 @@ export default {
           searchType: "LAST_THIRTY",
         },
       ],
+      originDateList: [
+        {
+          title: "今天",
+          selected: false,
+          searchType: "TODAY",
+        },
+        {
+          title: "昨天",
+          selected: false,
+          searchType: "YESTERDAY",
+        },
+        {
+          title: "最近7天",
+          selected: true,
+          searchType: "LAST_SEVEN",
+        },
+        {
+          title: "最近30天",
+          selected: false,
+          searchType: "LAST_THIRTY",
+        },
+      ],
     };
   },
   mounted() {
-   this.storeId = JSON.parse(Cookies.get("userInfoSeller")).id;
+    this.storeId = JSON.parse(Cookies.get("userInfoSeller")).id;
     this.getFiveYears();
   },
   methods: {
@@ -90,7 +115,8 @@ export default {
       this.dates = dates.reverse();
     },
     // 选择回调
-    changeSelect() {
+    changeSelect(e) {
+      this.month = e
       if (this.month) {
         this.dateList.forEach((res) => {
           res.selected = false;
@@ -101,33 +127,36 @@ export default {
 
         this.$emit("selected", this.selectedWay);
       } else {
-        const current = this.dateList.find(item=>{return item.selected})
+
+        const current = this.dateList.find(item => { return item.selected })
         this.selectedWay = current
+        this.clickBreadcrumb(current)
         this.$emit("selected", this.selectedWay);
+
+
       }
     },
     // 点击时间筛选
     clickBreadcrumb(item) {
-      this.dateList.forEach((res) => {
+
+      let currentIndex;
+      this.dateList.forEach((res, index) => {
         res.selected = false;
+        if (res.title === item.title) {
+          currentIndex = index
+        }
       });
       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 = currentDate.searchType;
+      if (item.searchType == "") {
+        let currentDate = this.originDateList[currentIndex].searchType
+        if (currentDate) {
+          item.searchType = currentDate
         } else {
           item.searchType = "LAST_SEVEN";
         }
       }
-
       this.selectedWay = item;
       this.selectedWay.year = new Date().getFullYear();
       this.selectedWay.month = "";
@@ -141,17 +170,20 @@ export default {
 .breadcrumb {
   display: flex;
   align-items: center;
-  > span {
+
+  >span {
     margin-right: 15px;
     cursor: pointer;
   }
 }
+
 .active {
   color: $theme_color;
   position: relative;
 }
-.date-picker {
-}
+
+.date-picker {}
+
 .active:before {
   content: "";
   position: absolute;

From 9d442a2aa1198e2d5e51a456fe9ee39e5fb089fe Mon Sep 17 00:00:00 2001
From: chc <1501738723@qq.com>
Date: Tue, 10 Oct 2023 11:26:50 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=88=86=E9=A1=B5=E9=97=AE=E9=A2=98=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/views/statistics/order.vue | 26 +++++++++++++++++++-------
 seller/src/views/statistics/order.vue  | 10 +++++++++-
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/manager/src/views/statistics/order.vue b/manager/src/views/statistics/order.vue
index 15555ad6..fb83d5c6 100644
--- a/manager/src/views/statistics/order.vue
+++ b/manager/src/views/statistics/order.vue
@@ -172,18 +172,20 @@
         <div>
           <Table stripe :columns="columns" :data="data"></Table>
         </div>
+        <!-- (index) => {
+              refundParams.pageNumber = index;
+            } -->
+        <!-- (size) => {
+              (refundParams.pageSize = size), (refundParams.pageNumber = 1);
+            } -->
         <Page
           v-if="showRecords"
           size="small"
           @on-change="
-            (index) => {
-              refundParams.pageNumber = index;
-            }
+            pageNumberChange
           "
           @on-page-size-change="
-            (size) => {
-              (refundParams.pageSize = size), (refundParams.pageNumber = 1);
-            }
+            pageSizeChange
           "
           class="mt_10"
           show-total
@@ -523,6 +525,14 @@ export default {
     },
   },
   methods: {
+    pageNumberChange(val){
+      this.refundParams.pageNumber = val
+      this.getOrderList();
+    },
+    pageSizeChange(val){
+      this.refundParams.pageSize = val
+      this.getOrderList();
+    },
     // 订单图
     initOrderChart() {
       // 默认已经加载 legend-filter 交互
@@ -563,11 +573,13 @@ export default {
 
     clickBreadcrumb(item, index) {
       let callback = JSON.parse(JSON.stringify(item));
-
+      console.log("callback",callback)
       this.orderParams = callback;
 
       this.overViewParams = callback;
       this.refundParams = callback;
+      this.refundParams.pageNumber = 1
+      this.refundParams.pageSize = 10
     },
 
     // 实例化订单概览
diff --git a/seller/src/views/statistics/order.vue b/seller/src/views/statistics/order.vue
index 37250ac0..118bfa83 100644
--- a/seller/src/views/statistics/order.vue
+++ b/seller/src/views/statistics/order.vue
@@ -152,7 +152,7 @@
         <div>
           <Table stripe :columns="columns" :data="data"></Table>
         </div>
-        <Page @on-change="(index)=>{refundParams.pageNumber = index}" @on-page-size-change="(size)=>{refundParams.pageSize= size}" class="mt_10" show-total show-elevator :total="total" />
+        <Page @on-change="pageNumberChange" @on-page-size-change="pageSizeChange" class="mt_10" show-total show-elevator :total="total" />
       </div>
     </Card>
 
@@ -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 交互

From 0e7008862ef8a16a3bf7bd76b7299c8168402f52 Mon Sep 17 00:00:00 2001
From: Yer <17633066053@163.com>
Date: Wed, 11 Oct 2023 16:36:36 +0800
Subject: [PATCH 6/9] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E5=BC=B9?=
 =?UTF-8?q?=E5=87=BA=E9=A1=B5=E4=BB=A5=E5=8F=8A=E5=B9=BF=E5=91=8A=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=BC=80=E5=90=AF=E5=85=B3=E9=97=AD=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/views/page-decoration/wap/advertising.vue    | 9 +++++++++
 .../src/views/page-decoration/wap/alertAdvertising.vue   | 9 +++++++++
 2 files changed, 18 insertions(+)

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 @@
                   >
                 </div>
               </div>
+
+              <div class="decorate-view">
+                <div class="decorate-view-title">当前页面状态</div>
+                <div>
+                  <Tag :type="result.pageShow === 'OPEN'  ? 'green' : 'red'">{{result.pageShow === 'OPEN' ? '开启' : '关闭'}}</Tag>
+                </div>
+              </div>
             </div>
           </div>
         </div>
@@ -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 @@
                   >
                 </div>
               </div>
+
+              <div class="decorate-view">
+                <div class="decorate-view-title">当前页面状态</div>
+                <div>
+                  <Tag :type="result.pageShow === 'OPEN'  ? 'green' : 'red'">{{result.pageShow === 'OPEN' ? '开启' : '关闭'}}</Tag>
+                </div>
+              </div>
             </div>
           </div>
         </div>
@@ -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
       });
     },
     // 图片选择器回显

From 218cee2aefcc080d1d494bff82e1922003118592 Mon Sep 17 00:00:00 2001
From: misworga831 <paulgao0831@gmail.com>
Date: Mon, 16 Oct 2023 18:16:28 +0800
Subject: [PATCH 7/9] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E5=94=AE=E5=90=8E?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/pages/home/orderCenter/AfterSale.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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="请输入订单号搜索"
         />

From 08b4a047916c5518be26b8d5f94ba4fe30be96de Mon Sep 17 00:00:00 2001
From: misworga831 <paulgao0831@gmail.com>
Date: Mon, 16 Oct 2023 18:20:29 +0800
Subject: [PATCH 8/9] resolve conflict

---
 buyer/src/config/index.js |  6 ++++-
 manager/src/api/index.js  | 52 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/buyer/src/config/index.js b/buyer/src/config/index.js
index 9b2d07f9..2886fc11 100644
--- a/buyer/src/config/index.js
+++ b/buyer/src/config/index.js
@@ -19,5 +19,9 @@ module.exports = {
   aMapSwitch:false, //是否开启高德定位
   enableCDN: true, //生产环境 是否启用cdn加载 vue等js
   port: 10000, //端口
-  inputMaxLength:'140' //全局输入框默认最大输入长度字
+  inputMaxLength:'140', //全局输入框默认最大输入长度字
+
+
+  PC_DOMAIN: "https://pc-b2b2c.pickmall.cn", // PC端域名
+  WAP_DOMAIN: "https://m-b2b2c.pickmall.cn", // WAP端域名
 };
diff --git a/manager/src/api/index.js b/manager/src/api/index.js
index 2c90493a..f87e4f8f 100644
--- a/manager/src/api/index.js
+++ b/manager/src/api/index.js
@@ -261,6 +261,38 @@ export const searchPermission = (params) => {
 /****************************** 权限结束 */
 
 
+/****************************** 店铺权限 */
+// 获取全部权限数据
+export const getStoreAllPermissionList = (params) => {
+  return getRequest("/permission/storeMenu/tree", params);
+};
+
+// 获取全部权限数据
+export const getStoreCurrentPermissionList = (params) => {
+  return getRequest("/permission/storeMenu/memberMenu", params);
+};
+
+// 添加权限
+export const addStorePermission = (params) => {
+  return postRequest("/permission/storeMenu", params);
+};
+
+// 编辑权限
+export const editStorePermission = (params) => {
+  return putRequest(`/permission/storeMenu/${params.id}`, params);
+};
+// 删除权限
+export const deleteStorePermission = (ids, params) => {
+  return deleteRequest(`/permission/storeMenu/${ids}`, params);
+};
+// 搜索权限
+export const searchStorePermission = (params) => {
+  return getRequest("/permission/storeMenu", params);
+};
+
+/****************************** 权限结束 */
+
+
 // 分页获取日志数据
 export const getLogListData = (params) => {
   return getRequest("/setting/log/getAllByPage", params);
@@ -458,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}`);
+};

From 508a00d103212400d2cb85f0913d7018771d494d Mon Sep 17 00:00:00 2001
From: misworga831 <paulgao0831@gmail.com>
Date: Wed, 18 Oct 2023 08:14:54 +0800
Subject: [PATCH 9/9] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E7=BC=96=E8=AF=91?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.sh | 1 -
 1 file changed, 1 deletion(-)

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