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] =?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;