From 803eae5c7d3631516c3d15648c1199a1718ec0cc Mon Sep 17 00:00:00 2001
From: Chopper711 <liushuai711@gmail.com>
Date: Thu, 23 Mar 2023 16:44:28 +0800
Subject: [PATCH 01/10] =?UTF-8?q?style:=E6=8C=89=E9=92=AE=E7=A9=BA?=
 =?UTF-8?q?=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/pages/shopEntry/ShopEntry.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/buyer/src/pages/shopEntry/ShopEntry.vue b/buyer/src/pages/shopEntry/ShopEntry.vue
index cff8618d..a55cc7ed 100644
--- a/buyer/src/pages/shopEntry/ShopEntry.vue
+++ b/buyer/src/pages/shopEntry/ShopEntry.vue
@@ -22,6 +22,7 @@
         <span v-if="storeDisable == 'REFUSED'">审核未通过,请修改资质信息，如有疑问请联系管理员</span>
       </div>
       <Button v-if="currentIndex === 3" @click="$router.push('/')">返回</Button>
+      &nbsp;
       <Button type="primary" @click='currentIndex = 0'
         v-if="storeDisable === 'REFUSED' && currentIndex === 3">重新申请</Button>
     </div>
@@ -162,7 +163,7 @@ export default {
   padding: 10px 20px;
 
   h1 {
-    
+
     margin-top: 20px;
   }
 }

From ab56bdfcada093fd56e0822aac60be3e8a573e4f Mon Sep 17 00:00:00 2001
From: chc <1501738723@qq.com>
Date: Mon, 27 Mar 2023 19:45:53 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E8=A7=84=E6=A0=BC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/views/goods/goods-manage/spec.vue | 100 +++++-------------
 1 file changed, 24 insertions(+), 76 deletions(-)

diff --git a/manager/src/views/goods/goods-manage/spec.vue b/manager/src/views/goods/goods-manage/spec.vue
index 9e5b588a..9ec82c2d 100644
--- a/manager/src/views/goods/goods-manage/spec.vue
+++ b/manager/src/views/goods/goods-manage/spec.vue
@@ -1,98 +1,44 @@
 <template>
   <div class="search">
     <Card>
-      <Form
-        @keydown.enter.native="handleSearch"
-        ref="searchForm"
-        :model="searchForm"
-        inline
-        :label-width="70"
-        class="search-form"
-      >
+      <Form @keydown.enter.native="handleSearch" ref="searchForm" :model="searchForm" inline :label-width="70"
+        class="search-form">
         <Form-item label="规格名称" prop="specName">
-          <Input
-            type="text"
-            v-model="searchForm.specName"
-            placeholder="请输入规格名称"
-            clearable
-            style="width: 200px"
-          />
+          <Input type="text" v-model="searchForm.specName" placeholder="请输入规格名称" clearable style="width: 200px" />
         </Form-item>
-        <Button @click="handleSearch" type="primary" class="search-btn"
-          >搜索</Button
-        >
+        <Button @click="handleSearch" type="primary" class="search-btn">搜索</Button>
       </Form>
       <Row class="operation padding-row">
         <Button @click="add" type="primary">添加</Button>
         <Button @click="delAll">批量删除</Button>
       </Row>
-      <Table
-        :loading="loading"
-        border
-        :columns="columns"
-        :data="data"
-        ref="table"
-        sortable="custom"
-        @on-sort-change="changeSort"
-        @on-selection-change="changeSelect"
-      >
+      <Table :loading="loading" border :columns="columns" :data="data" ref="table" sortable="custom"
+        @on-sort-change="changeSort" @on-selection-change="changeSelect">
       </Table>
       <Row type="flex" justify="end" class="mt_10">
-        <Page
-          :current="searchForm.pageNumber"
-          :total="total"
-          :page-size="searchForm.pageSize"
-          @on-change="changePage"
-          @on-page-size-change="changePageSize"
-          :page-size-opts="[10, 20, 50]"
-          size="small"
-          show-total
-          show-elevator
-          show-sizer
-        ></Page>
+        <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage"
+          @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" size="small" show-total show-elevator
+          show-sizer></Page>
       </Row>
     </Card>
-    <Modal
-      :title="modalTitle"
-      v-model="modalVisible"
-      :mask-closable="false"
-      :width="500"
-    >
+    <Modal :title="modalTitle" v-model="modalVisible" :mask-closable="false" :width="500">
       <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
         <FormItem label="规格名称" prop="specName">
-          <Input
-            v-model="form.specName"
-            maxlength="30"
-            clearable
-            style="width: 100%"
-          />
+          <Input v-model="form.specName" maxlength="30" clearable style="width: 100%" />
         </FormItem>
+        {{ form }}
         <FormItem label="规格值" prop="specValue">
-          <Select
-            v-model="form.specValue"
-            placeholder="输入后回车添加"
-            multiple
-            filterable
-            allow-create
-            :popper-append-to-body="false"
-            popper-class="spec-values-popper"
-            style="width: 100%; text-align: left; margin-right: 10px"
-          >
-            <Option
-              v-for="item in specValue"
-              :value="item"
-              :label="item"
-              :key="item"
-            >
+          <Select v-model="form.specValue" placeholder="输入后回车添加" multiple filterable allow-create
+            :popper-append-to-body="false" popper-class="spec-values-popper"
+            style="width: 100%; text-align: left; margin-right: 10px">
+            <Option v-for="item in specValue" :value="item" :label="item" :key="item">
             </Option>
           </Select>
         </FormItem>
       </Form>
       <div slot="footer">
         <Button type="text" @click="modalVisible = false">取消</Button>
-        <Button type="primary" :loading="submitLoading" @click="saveSpec"
-          >提交</Button
-        >
+        <Button type="primary" :loading="submitLoading" @click="saveSpec">提交</Button>
       </div>
     </Modal>
   </div>
@@ -310,6 +256,7 @@ export default {
     },
     //弹出编辑框
     edit(v) {
+      console.log(v);
       this.modalType = 1;
       this.modalTitle = "编辑";
       // 转换null为""
@@ -319,18 +266,19 @@ export default {
         }
       }
       let localVal = v.specValue;
-
+      console.log(localVal.split(","))
       this.form.specName = v.specName;
       this.form.id = v.id;
-      this.form.specValue = v.specValue;
-
+      this.$nextTick(() => {
+        this.$set(this.form, 'specValue', localVal.split(","))
+      })
+      
       if (localVal && localVal.indexOf("," > 0)) {
-        this.form.specValue = localVal.split(",");
         this.specValue = this.form.specValue;
-        this.$set(this, "specValue", this.form.specValue);
       } else {
         this.specValue = [];
       }
+      console.log("form.specValue", this.form);
       this.modalVisible = true;
     },
     // 删除规格

From d2540733dce8871ecb11d18cb87740e3a2067012 Mon Sep 17 00:00:00 2001
From: chc <1501738723@qq.com>
Date: Tue, 28 Mar 2023 17:00:19 +0800
Subject: [PATCH 03/10] =?UTF-8?q?fix:=20=E7=94=B5=E5=AD=90=E9=9D=A2?=
 =?UTF-8?q?=E5=8D=95=E5=8F=82=E6=95=B0=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 seller/src/views/shop/ship/logistics.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/seller/src/views/shop/ship/logistics.vue b/seller/src/views/shop/ship/logistics.vue
index a3e0889e..b6c208e3 100644
--- a/seller/src/views/shop/ship/logistics.vue
+++ b/seller/src/views/shop/ship/logistics.vue
@@ -40,21 +40,21 @@
               class="faceSheetInput"
             ></Input>
           </FormItem>
-          <FormItem label="customerPwd" prop="monthCode">
+          <FormItem label="monthCode" prop="monthCode">
             <Input
               v-model="faceSheetForm.monthCode"
               type="text"
               class="faceSheetInput"
             ></Input
             ></FormItem>
-          <FormItem label="customerPwd" prop="sendSite">
+          <FormItem label="sendSite" prop="sendSite">
             <Input
               v-model="faceSheetForm.sendSite"
               type="text"
               class="faceSheetInput"
             ></Input
             ></FormItem>
-          <FormItem label="customerPwd" prop="sendStaff">
+          <FormItem label="sendStaff" prop="sendStaff">
             <Input
               v-model="faceSheetForm.sendStaff"
               type="text"

From 8c286610bac1a7026e1f0e962f549f7fba5d7bbf Mon Sep 17 00:00:00 2001
From: chc <1501738723@qq.com>
Date: Wed, 29 Mar 2023 10:06:59 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E5=BE=85=E8=87=AA=E6=8F=90=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/views/order/order/orderList.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/manager/src/views/order/order/orderList.vue b/manager/src/views/order/order/orderList.vue
index 38caab90..eb3c3595 100644
--- a/manager/src/views/order/order/orderList.vue
+++ b/manager/src/views/order/order/orderList.vue
@@ -67,6 +67,7 @@
             <Option value="COMPLETED">已完成</Option>
             <Option value="TAKE">待核验</Option>
             <Option value="CANCELLED">已取消</Option>
+            <Option value="STAY_PICKED_UP">待自提</Option>
           </Select>
         </Form-item>
         <Button
@@ -266,6 +267,10 @@ export default {
               return h("div", [
                 h("tag", { props: { color: "geekblue" } }, "待发货"),
               ]);
+            } else if (params.row.orderStatus == "STAY_PICKED_UP") {
+              return h("div", [
+                h("tag", { props: { color: "geekblue" } }, "待自提"),
+              ]);
             } else if (params.row.orderStatus == "DELIVERED") {
               return h("div", [
                 h("tag", { props: { color: "cyan" } }, "已发货"),

From aa196918bf75cd660d3cfc0f613cc27625e03abd Mon Sep 17 00:00:00 2001
From: Chopper711 <1814994716@qq.com>
Date: Fri, 31 Mar 2023 07:23:51 +0000
Subject: [PATCH 05/10] update README.md.

Signed-off-by: Chopper711 <1814994716@qq.com>
---
 README.md | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 62fda1fb..a94031b2 100644
--- a/README.md
+++ b/README.md
@@ -9,11 +9,12 @@
 ##### 交流 qq 1群 961316482（已满）
 ##### 交流 qq 2群 875294241（已满）
 ##### 交流 qq 3群 263785057（已满）
-##### 交流 qq 4群 674617534
+##### 交流 qq 4群 674617534 (已满)
+##### 交流 qq 5群 594675235 
 
 ##### 体验 公众号/小程序/APP 体验，扫描二维码
 
-![image-20210511171611793](https://pickmall.cn/assets/imgs/h5-qrcode.png)
+![image-20210511171611793](https://static.pickmall.cn/images/h5-qrcode.png)
 
 [![star](https://gitee.com/beijing_hongye_huicheng/lilishop/badge/star.svg?theme=dark)](https://gitee.com/beijing_hongye_huicheng/lilishop/stargazers)
 &nbsp;&nbsp;![github](https://img.shields.io/github/stars/hongyehuicheng/lilishop.svg?style=social&logo=#181717)
@@ -55,7 +56,7 @@ PS：手机验证码为 ‘111111’
 
 **商城 小程序/公众号/APP**：扫描二维码
 
-![image-20210511171611793](https://pickmall.cn/assets/imgs/h5-qrcode.png)
+![image-20210511171611793](https://static.pickmall.cn/images/h5-qrcode.png)
 
 ### 快速本地部署
 
@@ -74,24 +75,24 @@ PS：手机验证码为 ‘111111’
 
 #### 平台管理端功能
 
-![平台管理端功能](https://pickmall.cn/assets/imgs/other/managerList1.jpg)
+![平台管理端功能](https://static.pickmall.cn/images/other/managerList1.jpg)
 
 
 
 #### 卖家功能
 
-![商家端功能](https://pickmall.cn/assets/imgs/other/storeList.jpg)
+![商家端功能](https://static.pickmall.cn/images/other/storeList.jpg)
 
 
 ### 商城前端功能展示
 
 #### 商城移动端
 
-<img src="https://pickmall.cn/assets/imgs/other/app.gif" alt="移动端功能展示" style="zoom:50%;" />
+<img src="https://static.pickmall.cn/images/other/app.gif" alt="移动端功能展示" style="zoom:50%;" />
 
 #### 平台管理端
 
-![管理端功能展示](https://pickmall.cn/assets/imgs/other/manager.gif)
+![管理端功能展示](https://static.pickmall.cn/images/other/manager.gif)
 
 
 ### 技术选型
@@ -164,4 +165,12 @@ PS：手机验证码为 ‘111111’
 ##### 交流 qq 1群 961316482（已满）
 ##### 交流 qq 2群 875294241（已满）
 ##### 交流 qq 3群 263785057（已满）
-##### 交流 qq 4群 674617534
+##### 交流 qq 4群 674617534（已满）
+##### 交流 qq 5群 594675235 
+
+### 附录
+有人有自己的学习视频、学习记录文档、希望宣传关联开源项目等均可以私聊仓库所有者。
+
+类似：
+
+清晨敲代码同学的分析: https://blog.csdn.net/vaevaevae233/category_12103567.html
\ No newline at end of file

From 2f6e50cc1c0a951610667c58d19aec79ce6e7add Mon Sep 17 00:00:00 2001
From: misworga831 <paulgao0831@gmail.com>
Date: Fri, 31 Mar 2023 17:14:22 +0800
Subject: [PATCH 06/10] =?UTF-8?q?fix:=20=E9=80=82=E9=85=8D=E6=96=B0?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=95=86=E5=93=81=E8=BF=94=E5=9B=9E=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/pages/GoodsList.vue | 28 +++++++++------------
 buyer/src/pages/Merchant.vue  | 47 +++++++++++++++++------------------
 2 files changed, 35 insertions(+), 40 deletions(-)

diff --git a/buyer/src/pages/GoodsList.vue b/buyer/src/pages/GoodsList.vue
index 0d454c22..15e1cc15 100644
--- a/buyer/src/pages/GoodsList.vue
+++ b/buyer/src/pages/GoodsList.vue
@@ -49,35 +49,35 @@
               class="goods-show-info"
               v-for="(item, index) in goodsList"
               :key="index"
-              @click="goGoodsDetail(item.id, item.content.goodsId)"
+              @click="goGoodsDetail(item.id, item.goodsId)"
             >
               <div class="goods-show-img">
-                <img width="220" height="220" :src="item.content.thumbnail" />
+                <img width="220" height="220" :src="item.thumbnail" />
               </div>
               <div class="goods-show-price">
                 <span>
                   <span class="seckill-price text-danger">{{
-                    item.content.price | unitPrice("￥")
+                    item.price | unitPrice("￥")
                   }}</span>
                 </span>
               </div>
               <div class="goods-show-detail">
                 <Tag
-                  v-if="item.content.salesModel === 'WHOLESALE'"
+                  v-if="item.salesModel === 'WHOLESALE'"
                   class="goods-show-tag"
                   color="purple"
                 >
                   批发
                 </Tag>
-                <span>{{ item.content.goodsName }}</span>
+                <span>{{ item.goodsName }}</span>
               </div>
               <div class="goods-show-num">
-                已有<span>{{ item.content.commentNum || 0 }}</span
+                已有<span>{{ item.commentNum || 0 }}</span
                 >人评价
               </div>
               <div class="goods-show-seller">
                 <span class="text-bottom" style="color: #e4393c">{{
-                  item.content.storeName
+                  item.storeName
                 }}</span>
               </div>
 
@@ -85,21 +85,21 @@
                 <Tag
                   class="goods-show-tag"
                   color="red"
-                  v-if="item.content.selfOperated"
+                  v-if="item.selfOperated"
                 >
                   自营
                 </Tag>
                 <Tag
                   class="goods-show-tag"
                   color="blue"
-                  v-if="item.content.goodsType == 'VIRTUAL_GOODS'"
+                  v-if="item.goodsType === 'VIRTUAL_GOODS'"
                 >
                   虚拟
                 </Tag>
                 <Tag
                   class="goods-show-tag"
                   color="blue"
-                  v-else-if="item.content.goodsType == 'PHYSICAL_GOODS'"
+                  v-else-if="item.goodsType === 'PHYSICAL_GOODS'"
                 >
                   实物
                 </Tag>
@@ -146,7 +146,6 @@ export default {
       ],
       goodsList: [], // 商品列表
       loading: false, // 加载状态
-      goodsListType: "",
       total: 0, // 列表总数
       params: {
         // 请求参数
@@ -230,11 +229,8 @@ export default {
         .then((res) => {
           this.loading = false;
           if (res.success) {
-            this.goodsList = res.result.content;
-            this.total = res.result.totalElements;
-            for (var i = 0; i < this.goodsList.length; i++) {
-              this.goodsListType = this.goodsList[i];
-            }
+            this.goodsList = res.result;
+            this.total = res.result.total;
           }
         })
         .catch(() => {
diff --git a/buyer/src/pages/Merchant.vue b/buyer/src/pages/Merchant.vue
index 773d8ac8..621f3ad5 100644
--- a/buyer/src/pages/Merchant.vue
+++ b/buyer/src/pages/Merchant.vue
@@ -7,14 +7,14 @@
     <div class="shop-logo">
       <div>
         <p>{{ storeMsg.storeName || 'xx店铺' }}</p>
-        <p class="ellipsis" :alt="storeMsg.storeDesc" v-html="storeMsg.storeDesc"></p>
+        <p :alt="storeMsg.storeDesc" class="ellipsis" v-html="storeMsg.storeDesc"></p>
       </div>
       <div>
-        <span class="hover-pointer" @click="collect"><Icon type="ios-heart"
-                                                           :color="storeCollected ? '#ed3f14' : '#fff'"/>{{
+        <span class="hover-pointer" @click="collect"><Icon :color="storeCollected ? '#ed3f14' : '#fff'"
+                                                           type="ios-heart"/>{{
             storeCollected ? '已收藏店铺' : '收藏店铺'
           }}</span>
-        <span style="width:80px" class="hover-pointer ml_10" @click="IMService(storeMsg.storeId)"><Icon
+        <span class="hover-pointer ml_10" style="width:80px" @click="IMService(storeMsg.storeId)"><Icon
           custom="icomoon icon-customer-service"/>联系客服</span>
       </div>
     </div>
@@ -26,7 +26,7 @@
         >
           首页
         </li>
-        <li class="cate-item" v-for="(cate, index) in cateList" :key="index">
+        <li v-for="(cate, index) in cateList" :key="index" class="cate-item">
           <Dropdown v-if="cate.children.length">
             <div @click.self="searchByCate(cate)">
               {{ cate.labelName }}
@@ -34,10 +34,10 @@
             </div>
             <DropdownMenu slot="list">
               <DropdownItem
-                @click.native="searchByCate(sec)"
-                :name="sec.id"
                 v-for="sec in cate.children"
                 :key="sec.id"
+                :name="sec.id"
+                @click.native="searchByCate(sec)"
               >{{ sec.labelName }}
               </DropdownItem
               >
@@ -63,38 +63,38 @@
 
         <empty v-if="goodsList.length === 0"/>
         <div
-          v-else
-          class="goods-show-info"
           v-for="(item, index) in goodsList"
+          v-else
           :key="index"
-          @click="goGoodsDetail(item.content.id, item.content.goodsId)"
+          class="goods-show-info"
+          @click="goGoodsDetail(item.id, item.goodsId)"
         >
           <div class="goods-show-img">
-            <img width="220" height="220" :src="item.content.thumbnail"/>
+            <img :src="item.thumbnail" height="220" width="220" alt=""/>
           </div>
           <div class="goods-show-price">
             <span>
               <span class="seckill-price text-danger">{{
-                  item.content.price | unitPrice("￥")
+                  item.price | unitPrice("￥")
                 }}</span>
             </span>
           </div>
           <div class="goods-show-detail">
-            <span>{{ item.content.goodsName }}</span>
+            <span>{{ item.goodsName }}</span>
           </div>
           <div class="goods-show-num">
-            已有<span>{{ item.content.commentNum || 0 }}</span
+            已有<span>{{ item.commentNum || 0 }}</span
           >人评价
           </div>
         </div>
       </div>
       <div class="goods-page">
         <Page
+          :page-size="params.pageSize"
+          :total="total"
           show-sizer
           @on-change="changePageNum"
           @on-page-size-change="changePageSize"
-          :total="total"
-          :page-size="params.pageSize"
         ></Page>
       </div>
 
@@ -107,15 +107,14 @@
 
 <script>
 
-import {getDetailById, getCateById} from "@/api/shopentry";
-import {cancelStoreCollect, collectStore, isStoreCollection} from "@/api/member";
+import {getCateById, getDetailById} from "@/api/shopentry";
+import {cancelStoreCollect, collectStore} from "@/api/member";
 import {goodsList} from "@/api/goods";
 import Search from "@/components/Search";
 import ModelForm from "@/components/indexDecorate/ModelForm";
 import HoverSearch from "@/components/header/hoverSearch";
 import storage from "@/plugins/storage";
 import {getFloorStoreData} from "@/api/index.js";
-import {seckillByDay} from "@/api/promotion";
 import imTalk from '@/components/mixes/talkIm'
 
 export default {
@@ -165,8 +164,8 @@ export default {
             let dataJson = JSON.parse(res.result.pageData);
             // 秒杀活动不是装修的数据，需要调用接口判断是否有秒杀商品
             // 轮播图根据不同轮播，样式不同
-            for (let i = 0; i < dataJson.list.length; i++) {
-              let type = dataJson.list[i].type;
+            for (const element of dataJson.list) {
+              let type = element.type;
               if (type === "carousel2") {
                 this.carouselLarge = true;
               } else if (type === "carousel1") {
@@ -255,8 +254,8 @@ export default {
       goodsList(this.params)
         .then((res) => {
           if (res.success) {
-            this.goodsList = res.result.content;
-            this.total = res.result.totalElements;
+            this.goodsList = res.result;
+            this.total = res.result.total;
           }
         })
         .catch(() => {
@@ -313,7 +312,7 @@ export default {
 };
 </script>
 
-<style scoped lang="scss">
+<style lang="scss" scoped>
 @import "../assets/styles/goodsList.scss";
 
 .merchant {

From 16b0d457fc9e81bf4a14da0dca476ac091145681 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E5=BE=88=E5=B7=AE=E5=95=A6?=
 <17633066053@163.com>
Date: Fri, 31 Mar 2023 18:16:33 +0800
Subject: [PATCH 07/10] =?UTF-8?q?style:=20:sparkles:=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81=E6=B3=A8=E9=87=8A=20?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=96=B0=E5=A2=9E=E9=83=A8=E5=88=86=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 im/src/config/config.js                       | 28 +++++++++++--
 im/src/main.js                                | 20 ++++++++-
 .../setting-manage/setting/BASE_SETTING.vue   | 12 +++++-
 .../setting-manage/setting/GOODS_SETTING.vue  |  1 +
 .../sys/setting-manage/setting/IM_SETTING.vue |  2 +
 .../sys/setting-manage/setting/style.scss     |  5 +++
 seller/src/views/shop/bill/billDetail.vue     | 41 +++++++++++--------
 seller/src/views/shop/shopSetting.vue         | 14 ++++++-
 8 files changed, 96 insertions(+), 27 deletions(-)

diff --git a/im/src/config/config.js b/im/src/config/config.js
index 7cc7377c..d5396129 100644
--- a/im/src/config/config.js
+++ b/im/src/config/config.js
@@ -1,10 +1,30 @@
+
+/**
+ * 读取公共配置API路径。
+ * 工程会读取根目录下的 env 。
+ * 根目录下的.env文件是用来定义环境变量的。
+ * 它可以包含各种键值对，每个键代表一个环境变量。
+ * 这些环境变量可以在应用程序的整个生命周期内使用，例如在代码中访问、配置webpack或在构建部署过程中使用不同的值。
+ * env中的 ODE_ENV指定当前的环境。
+ * 可以分别创建.env.development、.env.production等文件。
+ * 默认.env 文件中的变量作为开发环境的环境变量。
+ * env文件修改的话需要重新编译项目。
+ */
 export default {
+   // 网站名称
   WEBSITE_NAME: process.env.VUE_APP_WEBSITE_NAME || "LiLi IM",
-  BASE_API_URL: process.env.VUE_APP_API_BASE_URL || "",
-  BASE_WS_URL: process.env.VUE_APP_WEB_SOCKET_URL || "",
-  BASE_COMMON: process.env.VUE_APP_COMMON || "",
-  BASE_BUYER: process.env.VUE_APP_BUYER || "",
+  // 默认请求IM的API 
+  BASE_API_URL: process.env.VUE_APP_API_BASE_URL || "", 
+  // 默认请求的WS
+  BASE_WS_URL: process.env.VUE_APP_WEB_SOCKET_URL || "", 
+  // 默认请求公有接口相关 API
+  BASE_COMMON: process.env.VUE_APP_COMMON || "", 
+  // 默认请求用户相关API
+  BASE_BUYER: process.env.VUE_APP_BUYER || "", 
+  // 默认请求卖家相关的API
   BASE_SELLER: process.env.VUE_APP_SELLER || "",
+  // 点击商品跳转到的地址
   PC_URL: process.env.VUE_APP_PC_URL || "https://pc-b2b2c.pickmall.cn",
+  // 订单跳转商家订单页面
   PC_STORE: process.env.VUE_APP_PC_STORE || 'https://store-b2b2c.pickmall.cn',
 };
diff --git a/im/src/main.js b/im/src/main.js
index 321eab3a..2fdf7f6c 100644
--- a/im/src/main.js
+++ b/im/src/main.js
@@ -1,20 +1,33 @@
 import 'core-js/stable'
 import 'regenerator-runtime/runtime'
 
+// 引入 Vue 和应用程序组件
 import Vue from 'vue'
 import App from '@/App'
+
+// 引入 store 和 router
 import store from '@/store'
 import router from '@/router'
+
+// 引入自定义的 mixin
 import MainMixin from './mixins/main-mixin'
+
+// 引入全局组件
 import face from '@/components/face'
 import faceNull from '@/components/face-null'
+
+// 引入配置文件和其他核心模块
 import config from "@/config/config";
 import './core/lazy-use'
 import './core/global-component'
 import './core/filter'
 import './core/directives'
+
+// 引入权限控制和图标库
 import '@/permission'
 import '@/icons'
+
+// 引入自定义过滤器，并注册为全局过滤器
 import * as filters from "./plugins/filters";
 Object.keys(filters).forEach((key) => {
   Vue.filter(key, filters[key]);
@@ -23,11 +36,16 @@ Object.keys(filters).forEach((key) => {
 // 引入自定义全局css
 import '@/assets/css/global.less'
 
+// 关闭生产提示
 Vue.config.productionTip = false
-Vue.mixin(MainMixin)  // 引入mixins
+
+// 注册全局 mixin
+Vue.mixin(MainMixin) 
 Vue.component('face', face)
 Vue.component('face-null', faceNull)
 
+
+// 添加自定义原型方法
 Vue.prototype.linkToGoods = function (goodsId, skuId) {  // 跳转买家端商品
   if (localStorage.getItem('storeFlag') == 'false') {
     window.open(`${config.PC_URL}goodsDetail?skuId=${skuId}&goodsId=${goodsId}`, '_blank')
diff --git a/manager/src/views/sys/setting-manage/setting/BASE_SETTING.vue b/manager/src/views/sys/setting-manage/setting/BASE_SETTING.vue
index f0675d31..f36647e9 100644
--- a/manager/src/views/sys/setting-manage/setting/BASE_SETTING.vue
+++ b/manager/src/views/sys/setting-manage/setting/BASE_SETTING.vue
@@ -3,7 +3,8 @@
     <Form ref="formValidate" :label-width="150" label-position="right" :model="formValidate" :rules="ruleValidate">
 
       <FormItem label="站点名称" prop="siteName">
-        <Input v-model="formValidate.siteName" />
+        <Input style="width:200px;" v-model="formValidate.siteName" />
+        <span class="desc">配置买家端站点名称</span>
       </FormItem>
       <FormItem label="icp" prop="icp">
 
@@ -16,6 +17,7 @@
           <img v-if="formValidate.domainLogo" class="img" :src="formValidate.domainLogo" />
           <img v-else class="img" src="../../../../assets/emptyImg.png" alt="">
           <Button @click="onClickImg('domainLogo')">选择图片</Button>
+           <span class="desc">后台管理左上角logo展示 	17∶6</span>
         </div>
       </FormItem>
       <FormItem label="后台Icon" prop="domainIcon">
@@ -24,6 +26,7 @@
           <img v-if="formValidate.domainIcon" class="img" :src="formValidate.domainIcon" />
           <img v-else class="img" src="../../../../assets/emptyImg.png" alt="">
           <Button @click="onClickImg('domainIcon')">选择图片</Button>
+            <span class="desc">后台管理网站icon展示 	1∶1</span>
         </div>
       </FormItem>
       <FormItem label="买家端Logo" prop="buyerSideLogo">
@@ -31,6 +34,7 @@
           <img v-if="formValidate.buyerSideLogo" class="img" :src="formValidate.buyerSideLogo" />
           <img v-else class="img" src="../../../../assets/emptyImg.png" alt="">
           <Button @click="onClickImg('buyerSideLogo')">选择图片</Button>
+           <span class="desc">买家端logo展示 	17∶6</span>
         </div>
       </FormItem>
       <FormItem label="买家端Icon" prop="buyerSideIcon">
@@ -38,6 +42,7 @@
           <img v-if="formValidate.buyerSideIcon" class="img" :src="formValidate.buyerSideIcon" />
           <img v-else class="img" src="../../../../assets/emptyImg.png" alt="">
           <Button @click="onClickImg('buyerSideIcon')">选择图片</Button>
+            <span class="desc">买家端网站icon展示 	1∶1</span>
         </div>
       </FormItem>
       <FormItem label="商家端Logo" prop="storeSideLogo">
@@ -45,6 +50,7 @@
           <img v-if="formValidate.storeSideLogo" class="img" :src="formValidate.storeSideLogo" />
           <img v-else class="img" src="../../../../assets/emptyImg.png" alt="">
           <Button @click="onClickImg('storeSideLogo')">选择图片</Button>
+          <span class="desc">商家端logo展示 	17∶6</span>
         </div>
       </FormItem>
       <FormItem label="商家端Icon" prop="storeSideIcon">
@@ -52,11 +58,13 @@
           <img v-if="formValidate.storeSideIcon" class="img" :src="formValidate.storeSideIcon" />
           <img v-else class="img" src="../../../../assets/emptyImg.png" alt="">
           <Button @click="onClickImg('storeSideIcon')">选择图片</Button>
+           <span class="desc">商家端icon展示 	1∶1</span>
         </div>
       </FormItem>
 
       <FormItem label="站点地址" prop="staticPageAddress">
-        <Input v-model="formValidate.staticPageAddress" />
+        <Input  style="width:200px;" v-model="formValidate.staticPageAddress" />
+
       </FormItem>
       <FormItem label="wap站点地址" prop="staticPageWapAddress">
         <Input v-model="formValidate.staticPageWapAddress" />
diff --git a/manager/src/views/sys/setting-manage/setting/GOODS_SETTING.vue b/manager/src/views/sys/setting-manage/setting/GOODS_SETTING.vue
index 86f3e9ba..4e780525 100644
--- a/manager/src/views/sys/setting-manage/setting/GOODS_SETTING.vue
+++ b/manager/src/views/sys/setting-manage/setting/GOODS_SETTING.vue
@@ -7,6 +7,7 @@
           <Radio label="false">关闭</Radio>
 
         </RadioGroup>
+         <span class="desc">商品审核关闭后，商家添加商品则无需审核直接上架</span>
       </FormItem>
       <div class="label-item">
         <FormItem class="label-item" label="缩略图宽" prop="abbreviationPictureWidth">
diff --git a/manager/src/views/sys/setting-manage/setting/IM_SETTING.vue b/manager/src/views/sys/setting-manage/setting/IM_SETTING.vue
index 36a47c8a..3d4c374d 100644
--- a/manager/src/views/sys/setting-manage/setting/IM_SETTING.vue
+++ b/manager/src/views/sys/setting-manage/setting/IM_SETTING.vue
@@ -3,7 +3,9 @@
     <Form ref="formValidate" :label-width="150" label-position="right" :model="formValidate" :rules="ruleValidate">
       <FormItem label="云IM地址" prop="httpUrl">
         <Input v-model="formValidate.httpUrl"/>
+        <span class="desc">配置买家端联系客服以及商家端登录客服跳转的路径</span>
       </FormItem>
+
       <div class="label-btns">
         <Button type="primary" @click="submit('formValidate')">保存</Button>
       </div>
diff --git a/manager/src/views/sys/setting-manage/setting/style.scss b/manager/src/views/sys/setting-manage/setting/style.scss
index 9994b8af..7c442b2b 100644
--- a/manager/src/views/sys/setting-manage/setting/style.scss
+++ b/manager/src/views/sys/setting-manage/setting/style.scss
@@ -10,6 +10,11 @@
   padding: 10px 0;
 }
 
+.desc{
+  margin-left: 10px;
+  color: #999;
+  font-size: 12px;
+}
 
 .ivu-input-wrapper {
   width: 150px;
diff --git a/seller/src/views/shop/bill/billDetail.vue b/seller/src/views/shop/bill/billDetail.vue
index c16d6024..63e424b8 100644
--- a/seller/src/views/shop/bill/billDetail.vue
+++ b/seller/src/views/shop/bill/billDetail.vue
@@ -33,39 +33,37 @@
       <div>
         <h3 class="ml_10">结算详细</h3>
         <div class="bill-detail-price">
+          <div class="flex bill-item">
             <span>
               <p>退单金额</p>
               <p class="theme_color">-{{bill.refundPrice || 0 | unitPrice('￥')}}</p>
             </span>
-
             <span>
               <p>平台收取佣金</p>
               <p class="theme_color">-{{bill.commissionPrice || 0 | unitPrice('￥')}}</p>
             </span>
-        		  <span>
-        		    <p>退单产生退还佣金金额</p>
-        		    <p class="increase-color">+{{bill.refundCommissionPrice || 0  | unitPrice('￥')}}</p>
-        		  </span>
-
             <span>
               <p>分销返现支出</p>
               <p class="theme_color">-{{bill.distributionCommission || 0  | unitPrice('￥')}}</p>
             </span>
-        		  <span>
-        		    <p>退单分销返现返还</p>
-        		    <p class="increase-color">+{{bill.distributionRefundCommission || 0  | unitPrice('￥')}}</p>
-        		  </span>
-
             <span>
               <p>退单平台优惠券补贴返还</p>
               <p class="theme_color">-{{bill.siteCouponRefundCommission || 0  | unitPrice('￥')}}</p>
             </span>
-
+             </div>
+            <div class="flex bill-item">
             <span>
               <p>平台优惠券补贴</p>
               <p class="increase-color">+{{bill.siteCouponCommission || 0  | unitPrice('￥')}}</p>
             </span>
-
+              <span>
+        		    <p>退单产生退还佣金金额</p>
+        		    <p class="increase-color">+{{bill.refundCommissionPrice || 0  | unitPrice('￥')}}</p>
+        		  </span>
+        		  <span>
+        		    <p>退单分销返现返还</p>
+        		    <p class="increase-color">+{{bill.distributionRefundCommission || 0  | unitPrice('￥')}}</p>
+        		  </span>
             <span>
               <p>积分结算金额</p>
               <p class="increase-color">+{{bill.pointSettlementPrice || 0  | unitPrice('￥')}}</p>
@@ -74,6 +72,7 @@
               <p>砍价商品结算金额</p>
               <p class="increase-color">+{{bill.kanjiaSettlementPrice || 0  | unitPrice('￥')}}</p>
             </span>
+            </div>
           </div>
         </div>
     </Card>
@@ -263,7 +262,7 @@ export default {
 		        this.$options.filters.unitPrice(params.row.siteCouponCommission, "￥")
 		      );
 		    }
-		
+
 		  },
 		},
         {
@@ -669,11 +668,10 @@ table {
   }
 }
 .bill-detail-price {
-  display: flex;
-  align-items: center;
-  flex-wrap: wrap;
+  width: 1200px;
+  margin: 10px 0;
   padding: 10px;
-  > span {
+  /deep/ span {
     font-size: 14px;
     text-align: center;
     width: 200px;
@@ -685,5 +683,12 @@ table {
   .increase-color {
     color: green;
   }
+  div{
+
+  margin: 20px 0;
+  }
+}
+.bill-item{
+  justify-content: flex-start;
 }
 </style>
diff --git a/seller/src/views/shop/shopSetting.vue b/seller/src/views/shop/shopSetting.vue
index 1cbad7b6..85aa5d25 100644
--- a/seller/src/views/shop/shopSetting.vue
+++ b/seller/src/views/shop/shopSetting.vue
@@ -49,9 +49,11 @@
             </FormItem>
             <FormItem label="店铺楼层" prop="content" class="wangEditor">
               <i-switch v-model="form.pageShow" @on-change="pageShow"></i-switch>
+               <span class="desc">店铺楼层装修是否开启，开启后移动端PC端将会自动展示装修的内容</span>
             </FormItem>
             <FormItem label="开启自提" prop="content" class="wangEditor">
               <i-switch v-model="form.selfPickFlag" @on-change="changeSelfPickFlag"></i-switch>
+               <span class="desc">店铺是否开启自提功能</span>
             </FormItem>
             <Form-item>
               <Button
@@ -216,6 +218,7 @@
                 style="width: 20%"
               />
             </FormItem>
+
             <Form-item>
               <Button
                 @click="stockWarningHandleSubmit"
@@ -227,7 +230,8 @@
             </Form-item>
           </Form>
         </TabPane>
-        <TabPane label="客服设置" name="UDESK">
+        <!-- Udesk 坐席功能 后续维护 -->
+        <!-- <TabPane label="客服设置" name="UDESK">
           <Form
             ref="udeskForm"
             :model="udeskForm"
@@ -252,7 +256,7 @@
               </Button>
             </Form-item>
           </Form>
-        </TabPane>
+        </TabPane> -->
       </Tabs>
     </Card>
 
@@ -597,3 +601,9 @@ export default {
   },
 };
 </script>
+<style scoped lang="scss">
+.desc{
+  margin-left: 10px;
+  color: #999;
+}
+</style>

From 170244cc9cb1a1e12c483637c66fd8c470e4ba6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E5=BE=88=E5=B7=AE=E5=95=A6?=
 <17633066053@163.com>
Date: Mon, 3 Apr 2023 14:22:07 +0800
Subject: [PATCH 08/10] =?UTF-8?q?style:=20:sparkles:=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E9=A1=B5=E9=9D=A2=E4=B8=AD=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E7=BB=86=E8=8A=82=EF=BC=8C=E5=88=86=E9=94=80=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E4=B8=AD=E6=96=B0=E5=A2=9E=E7=8A=B6=E6=80=81=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=EF=BC=8C=E7=BB=9F=E8=AE=A1=E6=A8=A1=E5=9D=97=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=EF=BC=8C=E7=83=AD=E8=AF=8D=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=20=E5=8E=86=E5=8F=B2=E7=83=AD=E8=AF=8D=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=98=A8=E5=A4=A9=E7=83=AD=E8=AF=8D=EF=BC=8C?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E4=BC=98=E5=8C=96=E7=83=AD=E8=AF=8D=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/distribution/distributionCash.vue   |   2 +-
 .../views/distribution/distributionOrder.vue  |   2 +
 manager/src/views/home/home.vue               |   3 +
 .../message-manage/weChatMessageManager.vue   |  13 +-
 .../template/historyHotWords.vue              |  65 ++++++----
 .../template/statisticsHotWords.vue           | 112 +++++++++++-------
 manager/src/views/privacy-content/index.vue   |   1 +
 manager/src/views/statistics/member.vue       |   1 +
 manager/src/views/statistics/order.vue        |   1 +
 manager/src/views/statistics/traffic.vue      |   1 +
 .../src/views/sys/log-manage/logManage.vue    |  25 ++--
 .../authLogin/WECHAT_CONNECT.vue              |   2 +-
 .../setting/WITHDRAWAL_SETTING.vue            |   2 +-
 seller/src/views/statistics/order.vue         |   1 +
 seller/src/views/statistics/traffic.vue       |   1 +
 15 files changed, 149 insertions(+), 83 deletions(-)

diff --git a/manager/src/views/distribution/distributionCash.vue b/manager/src/views/distribution/distributionCash.vue
index 89645b85..7e130b5f 100644
--- a/manager/src/views/distribution/distributionCash.vue
+++ b/manager/src/views/distribution/distributionCash.vue
@@ -139,7 +139,7 @@ export default {
                     "Button",
                     {
                       props: {
-                        type: "success",
+                        type: "primary",
                         size: "small",
                       },
                       style: {
diff --git a/manager/src/views/distribution/distributionOrder.vue b/manager/src/views/distribution/distributionOrder.vue
index 7e6fe9ab..2f0c8852 100644
--- a/manager/src/views/distribution/distributionOrder.vue
+++ b/manager/src/views/distribution/distributionOrder.vue
@@ -212,6 +212,7 @@
       filterStatus (status) { // 过滤订单状态
         const arr = [
           {status: 'WAIT_BILL', title: '待结算'},
+          {status: 'NO_COMPLETED', title: '未完成'},
           {status: 'WAIT_CASH', title: '待提现'},
           {status: 'COMPLETE_CASH', title: '提现完成'},
           {status: 'CANCEL', title: '订单取消'},
@@ -229,6 +230,7 @@
           {status: 'WAIT_CASH', color: 'orange'},
           {status: 'COMPLETE_CASH', color: 'green'},
           {status: 'CANCEL', color: 'red'},
+          {status: 'NO_COMPLETED', color: 'red'},
           {status: 'REFUND', color: 'magenta'},
         ]
         for (let i=0;i<arr.length;i++) {
diff --git a/manager/src/views/home/home.vue b/manager/src/views/home/home.vue
index e9ea5f83..cda01897 100644
--- a/manager/src/views/home/home.vue
+++ b/manager/src/views/home/home.vue
@@ -337,6 +337,7 @@ export default {
 
     // 实例化订单图表
     async initOrderChartList(name) {
+      this.orderChart ? this.orderChart.clear() : ''
       const res = await API_Goods.getOrderChart(this.orderParams);
       if (res.success) {
         this.chartList = res.result;
@@ -446,6 +447,7 @@ export default {
 
     // 浏览量
     async getPvChart() {
+      this.pvChart ? this.pvChart.clear() : ''
       API_Member.getStatisticsList(this.params).then((res) => {
         if (res.result) {
           this.data = res.result;
@@ -464,6 +466,7 @@ export default {
     },
     // 实例化会员流量图表
     async initHistoryMemberChartList() {
+      this.historyMemberChart ? this.historyMemberChart.clear() : ''
       const res = await API_Member.historyMemberChartList();
       if (res.success) {
         this.chartList = res.result;
diff --git a/manager/src/views/member/message-manage/weChatMessageManager.vue b/manager/src/views/member/message-manage/weChatMessageManager.vue
index 1bc0d3f7..d68ada8d 100644
--- a/manager/src/views/member/message-manage/weChatMessageManager.vue
+++ b/manager/src/views/member/message-manage/weChatMessageManager.vue
@@ -28,18 +28,16 @@
 
       </div>
       <div slot="footer" style="text-align: right">
-        <Button v-if="tab === 'WECHAT'" type="success" size="large" @click="wechatFormDataEdit">保存</Button>
+        <Button v-if="tab === 'WECHAT'"  type="primary"  @click="wechatFormDataEdit">保存</Button>
 
-        <Button v-else type="success" size="large" @click="wechatMPFormDataEdit">保存</Button>
+        <Button v-else  type="primary" @click="wechatMPFormDataEdit">保存</Button>
       </div>
     </Modal>
 
-
+  <Card>
     <Tabs @on-click="tabPaneChange" v-model="tab">
       <TabPane label="微信消息" name="WECHAT">
         <div class="search">
-          <Card>
-
             <Row class="operation mt_10">
               <Button @click="weChatSync" type="primary">同步微信消息</Button>
             </Row>
@@ -61,14 +59,11 @@
                 size="small"
               ></Page>
             </Row>
-          </Card>
         </div>
       </TabPane>
 
       <TabPane label="微信小程序订阅消息" name="WECHATMP">
         <div class="search">
-          <Card>
-
             <Row class="operation mt_10">
               <Button @click="weChatSync('mp')" type="primary">同步微信小程序订阅消息</Button>
             </Row>
@@ -91,10 +86,10 @@
                 size="small"
               ></Page>
             </Row>
-          </Card>
         </div>
       </TabPane>
     </Tabs>
+     </Card>
   </div>
 
 
diff --git a/manager/src/views/page/article-manage/template/historyHotWords.vue b/manager/src/views/page/article-manage/template/historyHotWords.vue
index 5b095484..77d0b4d6 100644
--- a/manager/src/views/page/article-manage/template/historyHotWords.vue
+++ b/manager/src/views/page/article-manage/template/historyHotWords.vue
@@ -2,10 +2,15 @@
   <div class="box">
     <Row class="operation">
       <Col span="12">
-
-        <DatePicker @on-change="search" show-week-numbers type="date" placement="bottom-end" placeholder="选择查看日期"
-                    style="width: 200px"></DatePicker>
-
+        <DatePicker
+          :options="options"
+          @on-change="search"
+          type="date"
+          placement="bottom-end"
+          placeholder="选择查看日期"
+          style="width: 200px"
+          v-model="yestDate"
+        ></DatePicker>
       </Col>
     </Row>
     <Row>
@@ -16,16 +21,15 @@
       </p>
     </Row>
 
-
     <div id="container"></div>
   </div>
 </template>
 
 <script>
-import {Chart} from "@antv/g2";
-import {getHotWordsHistory} from "@/api/index";
+import { Chart } from "@antv/g2";
+import { getHotWordsHistory } from "@/api/index";
 import affixTime from "@/components/affix-time";
-import {Message} from "view-design";
+import { Message } from "view-design";
 
 export default {
   components: {
@@ -33,37 +37,54 @@ export default {
   },
   data() {
     return {
+      yestDate:new Date(new Date().getTime() - 24 * 60 * 60 * 1000).toString(),
+      yestDate:this.$options.filters.unixToDate(
+          (new Date().getTime() / 1000) - (24 * 60 * 60),
+          "yyyy年MM月dd日"
+        ),
       params: {
-        date:this.$options.filters.unixToDate(new Date().getTime() / 1000,'yyyy-MM-dd')
+        date: this.$options.filters.unixToDate(
+          (new Date().getTime() / 1000) - (24 * 60 * 60),
+          "yyyy-MM-dd"
+        ),
       },
       hotWordsChart: "", //图表
-      hotWordsData: [] //数据
+      hotWordsData: [], //数据
+      options: {
+        disabledDate: (date) => {
+          if (this.endMonth) {
+            let endDate = this.getDate(this.endMonth);
+            return (date && date > endDate) || date > new Date();
+          } else {
+            return date && date > new Date();
+          }
+        },
+      },
     };
   },
   computed: {},
+
   methods: {
     clickBreadcrumb(val) {
-      this.params = {...this.params, ...val}
+      this.params = { ...this.params, ...val };
     },
     // 初始化图表
     async search(val) {
-
-      val ? this.params.date = val : ''
+      console.log(val)
+      val ? (this.params.date = val) : "";
       const res = await getHotWordsHistory(this.params);
       if (res.success) {
         this.hotWordsData = res.result;
-        this.hotWordsChart.data(this.hotWordsData)
+        this.hotWordsChart.data(this.hotWordsData);
         this.hotWordsChart.render();
         if (!this.hotWordsData) {
           Message.error("暂无数据");
         }
       }
     },
-    handleClickSearch() {
-
-    },
+    handleClickSearch() {},
     init() {
-      let chart = this.hotWordsChart
+      let chart = this.hotWordsChart;
       chart = new Chart({
         container: "container",
         autoFit: true,
@@ -84,11 +105,11 @@ export default {
       chart.tooltip({
         showMarkers: false,
       });
-      chart.interval().position("keywords*score");
+      chart.interval().position("keywords*score").color("#f59b99");
       chart.interaction("element-active");
       this.hotWordsChart = chart;
       this.search();
-    }
+    },
   },
   mounted() {
     this.init();
@@ -99,10 +120,12 @@ export default {
 <style lang="scss" scoped>
 .affix-time {
   padding-left: 15px;
+
 }
 
+
 .box {
   min-height: 400px;
+  margin-left: 50px;
 }
 </style>
-
diff --git a/manager/src/views/page/article-manage/template/statisticsHotWords.vue b/manager/src/views/page/article-manage/template/statisticsHotWords.vue
index cc9fe130..d1e55ce7 100644
--- a/manager/src/views/page/article-manage/template/statisticsHotWords.vue
+++ b/manager/src/views/page/article-manage/template/statisticsHotWords.vue
@@ -3,7 +3,7 @@
     <div class="affix-time">
       <Affix :offset-top="100">
         <div class="flex affix-box">
-          <affixTime :closeShop="true" @selected="clickBreadcrumb"/>
+          <affixTime :closeShop="true" @selected="clickBreadcrumb" />
 
           <InputNumber
             placeholder="展示前N"
@@ -22,8 +22,8 @@
 </template>
 
 <script>
-import {Chart} from "@antv/g2";
-import {getHotWordsStatistics} from "@/api/index";
+import { Chart } from "@antv/g2";
+import { getHotWordsStatistics } from "@/api/index";
 import affixTime from "@/components/affix-time";
 
 export default {
@@ -37,9 +37,9 @@ export default {
         searchType: "LAST_SEVEN",
         year: "",
         month: "",
-        top: 50
+        top: 50,
       },
-      columns:[
+      columns: [
         {
           title: "热词名称",
           key: "keywords",
@@ -49,53 +49,86 @@ export default {
           key: "score",
         },
       ],
-      hotWordsChart:"", //图表
-      hotWordsData:[] //数据
+      hotWordsChart: "", //图表
+      hotWordsData: [], //数据
+      orderChart: "",
     };
   },
   computed: {},
+  watch: {
+    params: {
+      handler(val) {
+        this.search();
+      },
+      deep: true,
+      immediate: true,
+    },
+    year(val) {
+      this.params.year = new Date(val).getFullYear();
+    },
+  },
   methods: {
     clickBreadcrumb(val) {
-      this.params = {...this.params, ...val}
+      this.params = { ...this.params, ...val };
     },
     // 初始化图表
     async search() {
       const res = await getHotWordsStatistics(this.params);
       if (res.success) {
-        this.hotWordsData=res.result;
-        this.hotWordsChart.data(this.hotWordsData)
+        this.hotWordsData = res.result;
+        if (!this.hotWordsChart) {
+          this.hotWordsChart = new Chart({
+            container: "container",
+            autoFit: true,
+            height: 500,
+            padding: [50, 20, 50, 20],
+          });
+        }
+
+        this.init();
+      }
+    },
+    handleClickSearch() {},
+    init() {
+      if (this.hotWordsChart) {
+        this.hotWordsChart.data(this.hotWordsData);
+        this.hotWordsChart.scale("score", {
+          alias: "搜索次数",
+        });
+
+        this.hotWordsChart.axis("keywords", {
+          tickLine: {
+            alignTick: false,
+          },
+        });
+        this.hotWordsChart.axis("score", false);
+
+        this.hotWordsChart.tooltip({
+          showMarkers: false,
+        });
+        this.hotWordsChart
+          .interval()
+          .position("keywords*score")
+          .color("#f59b99");
+        this.hotWordsChart.interaction("element-active");
+
+        // 添加文本标注
+        // this.hotWordsData.forEach((item) => {
+        //   this.hotWordsChart
+        //     .annotation()
+        //     .text({
+        //       position: [item.keywords, item.score],
+        //       content: item.score,
+        //       style: {
+        //         textAlign: "center",
+        //       },
+        //       offsetY: -30,
+        //     })
+        // });
+
         this.hotWordsChart.render();
       }
     },
-    handleClickSearch() {
-    },
-    init(){
-      let chart = this.hotWordsChart
-      chart = new Chart({
-        container: "container",
-        autoFit: true,
-        height: 500,
-        padding: [50, 20, 50, 20],
-      });
-      chart.scale("score", {
-        alias: "搜索次数",
-      });
-
-      chart.axis("keywords", {
-        tickLine: {
-          alignTick: false,
-        },
-      });
-      chart.axis("score", false);
-
-      chart.tooltip({
-        showMarkers: false,
-      });
-      chart.interval().position("keywords*score");
-      chart.interaction("element-active");
-      this.hotWordsChart=chart;
-      this.search();
-    }
   },
   mounted() {
     this.init();
@@ -107,5 +140,4 @@ export default {
 .affix-time {
   padding-left: 15px;
 }
-
 </style>
diff --git a/manager/src/views/privacy-content/index.vue b/manager/src/views/privacy-content/index.vue
index 0627bf4f..a3256228 100644
--- a/manager/src/views/privacy-content/index.vue
+++ b/manager/src/views/privacy-content/index.vue
@@ -3,6 +3,7 @@
     <Row>
       <Col span="24">
       <Card class="article-detail">
+        <Alert>隐私协议在移动端中 设置->关于我们->对应的文章展示</Alert>
         <Table :loading="loading" border :columns="columns" :data="data" ref="table">
         </Table>
       </Card>
diff --git a/manager/src/views/statistics/member.vue b/manager/src/views/statistics/member.vue
index de5204eb..0312eb22 100644
--- a/manager/src/views/statistics/member.vue
+++ b/manager/src/views/statistics/member.vue
@@ -180,6 +180,7 @@ export default {
     },
     // 初始化数据
     init() {
+      this.orderChart ? this.orderChart.clear() : ''
       API_Member.getMemberStatistics(this.params).then((res) => {
         if (res.result) {
           res.result.forEach((item) => {
diff --git a/manager/src/views/statistics/order.vue b/manager/src/views/statistics/order.vue
index 9d91f9c3..bfdd0fa6 100644
--- a/manager/src/views/statistics/order.vue
+++ b/manager/src/views/statistics/order.vue
@@ -586,6 +586,7 @@ export default {
     },
     // 实例化订单图表
     async initOrderChartList(name) {
+      this.orderChart ? this.orderChart.clear() : ''
       const res = await API_Goods.getOrderChart(this.orderParams);
       if (res.success) {
         this.chartList = res.result;
diff --git a/manager/src/views/statistics/traffic.vue b/manager/src/views/statistics/traffic.vue
index f3b78a32..841e06a3 100644
--- a/manager/src/views/statistics/traffic.vue
+++ b/manager/src/views/statistics/traffic.vue
@@ -185,6 +185,7 @@ export default {
     },
     // 初始化数据
     init() {
+      this.orderChart ? this.orderChart.clear() : ''
       API_Member.getStatisticsList(this.params).then((res) => {
         if (res.result) {
           this.data = res.result;
diff --git a/manager/src/views/sys/log-manage/logManage.vue b/manager/src/views/sys/log-manage/logManage.vue
index 83af4906..d91ba053 100644
--- a/manager/src/views/sys/log-manage/logManage.vue
+++ b/manager/src/views/sys/log-manage/logManage.vue
@@ -47,16 +47,16 @@
           openTip ? "关闭提示" : "开启提示"
         }}</Button>
       </Row>
-      <Row v-show="openTip">
-        <Alert show-icon>
-          <span>展示详细内容</span>
-          <Icon type="ios-bulb-outline" slot="icon"></Icon>
-          <i-switch size="large" v-model="showDev">
-            <span slot="open">开发</span>
-            <span slot="close">普通</span>
-          </i-switch>
-        </Alert>
-      </Row>
+      <div v-show="openTip">
+          <Alert show-icon>
+            <span>展示详细内容</span>
+            <Icon type="ios-bulb-outline" slot="icon"></Icon>
+            <i-switch class="switch" size="large" v-model="showDev">
+              <span slot="open">开发</span>
+              <span slot="close">普通</span>
+            </i-switch>
+          </Alert>
+      </div>
 
       <Table
         v-if="showDev"
@@ -323,3 +323,8 @@ export default {
   },
 };
 </script>
+<style lang="scss" scoped>
+.switch{
+  margin-left: 20px;
+}
+</style>
diff --git a/manager/src/views/sys/setting-manage/authLogin/WECHAT_CONNECT.vue b/manager/src/views/sys/setting-manage/authLogin/WECHAT_CONNECT.vue
index cb57be19..d03e3d82 100644
--- a/manager/src/views/sys/setting-manage/authLogin/WECHAT_CONNECT.vue
+++ b/manager/src/views/sys/setting-manage/authLogin/WECHAT_CONNECT.vue
@@ -49,7 +49,7 @@
 <script>
 import { setSetting } from "@/api/index";
 import { handleSubmit } from "../setting/validate";
-import { getPaymentSupportForm } from "@/api/setting";
+
 export default {
   data() {
     return {
diff --git a/manager/src/views/sys/setting-manage/setting/WITHDRAWAL_SETTING.vue b/manager/src/views/sys/setting-manage/setting/WITHDRAWAL_SETTING.vue
index 21596fd6..29ff0841 100644
--- a/manager/src/views/sys/setting-manage/setting/WITHDRAWAL_SETTING.vue
+++ b/manager/src/views/sys/setting-manage/setting/WITHDRAWAL_SETTING.vue
@@ -9,7 +9,7 @@
       </FormItem>
 
       <FormItem  label="最低提现金额" prop="minPrice">
-        <Input class="label-appkey" v-model="formValidate.minPrice" />
+        ￥<Input class="label-appkey" v-model="formValidate.minPrice" />
       </FormItem>
 
       <FormItem label="提现方式" prop="type">
diff --git a/seller/src/views/statistics/order.vue b/seller/src/views/statistics/order.vue
index 8d9bb3de..d9e00b70 100644
--- a/seller/src/views/statistics/order.vue
+++ b/seller/src/views/statistics/order.vue
@@ -523,6 +523,7 @@ export default {
     },
     // 实例化订单图表
     async initOrderChartList(name) {
+      this.orderChart ? this.orderChart.clear() : ''
       const res = await API_Goods.getOrderChart(this.orderParams);
       if (res.success) {
         this.chartList = res.result;
diff --git a/seller/src/views/statistics/traffic.vue b/seller/src/views/statistics/traffic.vue
index 348e1315..41bdad36 100644
--- a/seller/src/views/statistics/traffic.vue
+++ b/seller/src/views/statistics/traffic.vue
@@ -190,6 +190,7 @@ export default {
     },
     // 初始化
     init() {
+      this.orderChart ? this.orderChart.clear() : ''
       API_Member.getStatisticsList(this.params).then((res) => {
         if (res.result) {
           this.data = res.result;

From 1abc7a5a5245b2fffdd37422a719d2520849a8f0 Mon Sep 17 00:00:00 2001
From: misworga831 <paulgao0831@gmail.com>
Date: Tue, 4 Apr 2023 15:14:41 +0800
Subject: [PATCH 09/10] =?UTF-8?q?fix:=20=E9=80=82=E9=85=8D=E6=96=B0?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=95=86=E5=93=81=E8=BF=94=E5=9B=9E=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/buyer/src/pages/GoodsList.vue b/buyer/src/pages/GoodsList.vue
index 15e1cc15..68a5cc1b 100644
--- a/buyer/src/pages/GoodsList.vue
+++ b/buyer/src/pages/GoodsList.vue
@@ -229,7 +229,7 @@ export default {
         .then((res) => {
           this.loading = false;
           if (res.success) {
-            this.goodsList = res.result;
+            this.goodsList = res.result.records;
             this.total = res.result.total;
           }
         })

From ebc79da0fccfcb86ae5d3e06dda42925d90aba27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E5=BE=88=E5=B7=AE=E5=95=A6?=
 <17633066053@163.com>
Date: Wed, 12 Apr 2023 11:06:25 +0800
Subject: [PATCH 10/10] =?UTF-8?q?feat:=20:sparkles:=20=E5=AF=B9=E5=8E=9F?=
 =?UTF-8?q?=E6=9C=89=E5=A1=AB=E5=86=99=E9=87=91=E9=A2=9D=E7=9A=84input?=
 =?UTF-8?q?=E6=A1=86=E8=BF=9B=E8=A1=8C=E6=94=B9=E8=BF=9B=EF=BC=8C=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E9=83=A8=E5=88=86=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/lili/upload-pic-input.vue  |  6 +++---
 manager/src/views/member/list/index.vue       |  1 +
 .../after-order/afterSaleOrderDetail.vue      |  2 +-
 .../points-goods/points-goods-add.vue         | 19 ++++++++++++++-----
 .../points-goods/points-goods-edit.vue        |  5 +++--
 .../after-order/reurnGoodsOrderDetail.vue     |  2 +-
 6 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/manager/src/components/lili/upload-pic-input.vue b/manager/src/components/lili/upload-pic-input.vue
index 6ad5bddf..e5039617 100644
--- a/manager/src/components/lili/upload-pic-input.vue
+++ b/manager/src/components/lili/upload-pic-input.vue
@@ -14,12 +14,12 @@
           <Poptip slot="append" transfer trigger="hover" title="图片预览" placement="right">
             <Icon type="md-eye" class="see-icon" />
             <div slot="content">
-              <img :src="currentValue" alt="该资源不存在" style="width: 100%;margin: 0 auto;display: block;" />
+              <img :src="currentValue" alt="该资源不存在" style="max-width: 300px;margin: 0 auto;display: block;" />
               <a @click="viewImage=true" style="margin-top:5px;text-align:right;display:block">查看大图</a>
             </div>
           </Poptip>
       </Input>
-      
+
       <Upload
         :action="uploadFileUrl"
         :headers="accessToken"
@@ -40,7 +40,7 @@
     </div>
 
     <Modal title="图片预览" v-model="viewImage" :styles="{top: '30px'}" draggable>
-      <img :src="currentValue" alt="该资源不存在" style="width: 100%;margin: 0 auto;display: block;" />
+      <img :src="currentValue" alt="该资源不存在" style="max-width: 300px;margin: 0 auto;display: block;" />
       <div slot="footer">
         <Button @click="viewImage=false">关闭</Button>
       </div>
diff --git a/manager/src/views/member/list/index.vue b/manager/src/views/member/list/index.vue
index 0f0ad381..04890d8c 100644
--- a/manager/src/views/member/list/index.vue
+++ b/manager/src/views/member/list/index.vue
@@ -325,6 +325,7 @@ export default {
   methods: {
     // 回调给父级
     callback(val, index) {
+      this.selectMember.forEach(item=>{item.___selected = false})
       this.$set(val, "___selected", !val.___selected);
       console.log(val.___selected);
       console.log(this.selectMember);
diff --git a/manager/src/views/order/after-order/afterSaleOrderDetail.vue b/manager/src/views/order/after-order/afterSaleOrderDetail.vue
index a4a5edda..122bfd22 100644
--- a/manager/src/views/order/after-order/afterSaleOrderDetail.vue
+++ b/manager/src/views/order/after-order/afterSaleOrderDetail.vue
@@ -84,7 +84,7 @@
             <dl>
               <dt>实际退款金额</dt>
               <dd>
-                <Input v-model="params.actualRefundPrice" style="width: 260px" />
+                <InputNumber :min="0" v-model="params.actualRefundPrice" style="width: 260px" />
               </dd>
             </dl>
             <dl>
diff --git a/manager/src/views/promotions/points-goods/points-goods-add.vue b/manager/src/views/promotions/points-goods/points-goods-add.vue
index 9d4380ab..6434484e 100644
--- a/manager/src/views/promotions/points-goods/points-goods-add.vue
+++ b/manager/src/views/promotions/points-goods/points-goods-add.vue
@@ -28,7 +28,8 @@
                 </template>
 
                 <template slot-scope="{ index }" slot="settlementPrice">
-                  <Input
+                  <InputNumber
+                    :min="0"
                     type="number"
                     v-model="promotionGoodsList[index].settlementPrice"
                   />
@@ -54,10 +55,18 @@
                   </Select>
                 </template>
                 <template slot-scope="{ index }" slot="activeStock">
-                  <Input type="number" v-model="promotionGoodsList[index].activeStock" />
+                  <InputNumber
+                    :min="0"
+                    type="number"
+                    v-model="promotionGoodsList[index].activeStock"
+                  />
                 </template>
                 <template slot-scope="{ index }" slot="points">
-                  <Input type="number" v-model="promotionGoodsList[index].points" />
+                  <InputNumber
+                    :min="0"
+                    type="number"
+                    v-model="promotionGoodsList[index].points"
+                  />
                 </template>
               </Table>
             </FormItem>
@@ -370,8 +379,8 @@ export default {
           settlementPrice: e.settlementPrice || 0,
           pointsGoodsCategoryId: e.pointsGoodsCategoryId || 0,
           pointsGoodsCategoryName: e.pointsGoodsCategoryName || "",
-          activeStock: e.activeStock || 0,
-          points: e.points || 0,
+          activeStock: e.activeStock || 1,
+          points: e.points || 1,
           skuId: e.id,
           goodsId: e.goodsId,
           originalPrice: e.price || 0,
diff --git a/manager/src/views/promotions/points-goods/points-goods-edit.vue b/manager/src/views/promotions/points-goods/points-goods-edit.vue
index b8fd1c7c..6604fc0e 100644
--- a/manager/src/views/promotions/points-goods/points-goods-edit.vue
+++ b/manager/src/views/promotions/points-goods/points-goods-edit.vue
@@ -96,7 +96,7 @@ export default {
       pointsGoodsCategoryId:'',
       pointsGoodsCategoryName:'',
       form: {
-        
+
         /** 活动名称 */
         promotionName: "",
         /** 报名截止时间 */
@@ -109,7 +109,7 @@ export default {
         seckillRule: "",
         goodsSku: {},
         promotionStatus: "NEW",
-       
+
       },
       categoryList: [], // 分类列表
       id: this.$route.query.id, // 活动id
@@ -118,6 +118,7 @@ export default {
         settlementPrice: [{ required: true, message: "请填写结算价格" }],
         pointsGoodsCategoryId: [{ required: true, message: "请选择积分商品分类" }],
         points: [{ required: true, message: "请填写兑换积分" }],
+        activeStock: [{ required: true, message: "请填写库存" }],
       },
       options: {
         disabledDate(date) {
diff --git a/seller/src/views/order/after-order/reurnGoodsOrderDetail.vue b/seller/src/views/order/after-order/reurnGoodsOrderDetail.vue
index df8db5bb..cbf57bbc 100644
--- a/seller/src/views/order/after-order/reurnGoodsOrderDetail.vue
+++ b/seller/src/views/order/after-order/reurnGoodsOrderDetail.vue
@@ -94,7 +94,7 @@
               <dl v-if="params.serviceStatus == 'PASS'">
                 <dt>实际退款金额</dt>
                 <dd>
-                  <Input v-model="params.actualRefundPrice" style="width:260px" />
+                  <InputNumber :min="0" v-model="params.actualRefundPrice" style="width:260px" />
                 </dd>
               </dl>
               <dl>