From 9b14cd633e7826f08997b853dcf9852d7e78db6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Mon, 25 Apr 2022 09:18:31 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E7=83=AD=E8=AF=8D=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/api/index.js                      |  11 +-
 manager/src/store/modules/app.js              |   1 +
 .../views/page/article-manage/hotWords.vue    | 185 +++++-------------
 .../template/historyHotWords.vue              |   0
 .../article-manage/template/setupHotWords.vue | 135 +++++++++++++
 .../template/statisticsHotWords.vue           | 130 ++++++++++++
 .../article-manage/template/todayHotWords.vue | 162 +++++++++++++++
 7 files changed, 488 insertions(+), 136 deletions(-)
 create mode 100644 manager/src/views/page/article-manage/template/historyHotWords.vue
 create mode 100644 manager/src/views/page/article-manage/template/setupHotWords.vue
 create mode 100644 manager/src/views/page/article-manage/template/statisticsHotWords.vue
 create mode 100644 manager/src/views/page/article-manage/template/todayHotWords.vue

diff --git a/manager/src/api/index.js b/manager/src/api/index.js
index 599600f4..776f3f74 100644
--- a/manager/src/api/index.js
+++ b/manager/src/api/index.js
@@ -439,11 +439,18 @@ export const setHotWords = (params) => {
 };
 
 // 删除热搜词
-export const deleteHotWords = (words) => {
-  return deleteRequest(`/hotwords/hotwords/${words}`);
+export const deleteHotWords = (params) => {
+  return deleteRequest(`/hotwords/hotwords`,params);
 };
 
 // 获取热搜词
 export const getHotWords = () => {
   return getRequest(`/hotwords/hotwords`);
 };
+
+// 获取热词统计
+export const getHotWordsStatistics = (params) => {
+  return getRequest(`/hotwords/hotwords/statistics`,params);
+};
+
+
diff --git a/manager/src/store/modules/app.js b/manager/src/store/modules/app.js
index 71fc509c..03f81e98 100644
--- a/manager/src/store/modules/app.js
+++ b/manager/src/store/modules/app.js
@@ -21,6 +21,7 @@ const app = {
       path: '',
       name: 'home_index'
     }],
+    hotWords:[], //今日热词数据
     // 面包屑数组 左侧菜单
     menuList: [],
     tagsList: [...otherRouter.children], //这块是面包屑的内容不能删除
diff --git a/manager/src/views/page/article-manage/hotWords.vue b/manager/src/views/page/article-manage/hotWords.vue
index 69f750ba..2753774b 100644
--- a/manager/src/views/page/article-manage/hotWords.vue
+++ b/manager/src/views/page/article-manage/hotWords.vue
@@ -1,154 +1,71 @@
 <template>
   <div class="search">
     <Card>
-      <Row class="operation">
-        <Button @click="add()" type="primary">设置今日热词</Button>
-      </Row>
-      <Row>
-        <p>
-          <Alert type="success">
-            这里展示今日系统中搜索前一百的搜索热词，分数为热词在排序系统中的分数，分数越高，可以在用户获取热词时进行优先展示（首页商品搜索栏下方推荐位）（分数可以填写负数，会降低推荐度）
-          </Alert>
-        </p>
-      </Row>
-
-      <div class="card-list">
-        <Card v-for="words in data" class="card-item" :key="words" onclick="">
-          <p>
-            <a href="#" slot="extra" @click.prevent="add(words)">{{ words }}</a>
-          </p>
-          <p slot="extra">
-            <a @click="deleteWords(words)">
-              <Icon type="md-close" />
-            </a>
-          </p>
-        </Card>
-      </div>
-    </Card>
-    <Modal :title="modalTitle" v-model="modalVisible" :mask-closable="false" :width="500">
-      <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
-        <FormItem label="热词" prop="keywords">
-          <Input v-model="form.keywords" clearable style="width: 100%" />
-        </FormItem>
-        <FormItem label="分数" prop="point">
-          <Input v-model="form.point" clearable style="width: 100%" />
-        </FormItem>
-      </Form>
-      <div slot="footer">
-        <Button type="text" @click="modalVisible = false">取消</Button>
-        <Button type="primary" :loading="submitLoading" @click="handleSubmit"
-          >提交</Button
+      <Tabs @on-click="handleClickTab">
+        <TabPane
+          v-for="(item, index) in templatesWay"
+          :key="index"
+          :name="item.template"
+          :label="item.label"
         >
-      </div>
-    </Modal>
+          <components v-if="item.template == currentTemplate" :is="currentTemplate"></components>
+        </TabPane>
+      </Tabs>
+    </Card>
   </div>
 </template>
 
 <script>
-import { getHotWords, setHotWords, deleteHotWords } from "@/api/index";
-
-import { regular } from "@/utils";
+import todayHotWords from "./template/todayHotWords";
+import historyHotWords from "./template/historyHotWords";
+import setupHotWords from "./template/setupHotWords";
+import statisticsHotWords from "./template/statisticsHotWords";
 export default {
   name: "hotWords",
-  components: {},
+  components: {
+    todayHotWords,
+    historyHotWords,
+    setupHotWords,
+    statisticsHotWords
+  },
   data() {
     return {
-      submitLoading: false,
-      modalTitle: "",
-      loading: true, // 表单加载状态
-      modalVisible: false, //弹出框
-      form: {
-        keywords: "",
-        point: 0,
-      },
-      data: [], // 表单数据
-
-      // 表单验证规则
-      formValidate: {
-        keywords: [regular.REQUIRED, regular.VARCHAR20],
-        point: [regular.REQUIRED, regular.NUMBER],
+      // 模版集合key value
+      templatesWay: [
+        {
+          template: "todayHotWords",
+          label: "今日热次",
+        },
+        {
+          template: "historyHotWords",
+          label: "历史热词",
+        },
+        {
+          template: "statisticsHotWords",
+          label: "热词统计",
+        },
+        {
+          template: "setupHotWords",
+          label: "设置热词",
+        },
+      ],
+      // 引入模板
+      templates: {
+        todayHotWords,
+        historyHotWords,
+        setupHotWords,
+        statisticsHotWords
       },
+      // 当前模版
+      currentTemplate: "todayHotWords",
     };
   },
   methods: {
-    init() {
-      this.getDataList();
-    },
-    getDataList() {
-      this.loading = true;
-      getHotWords().then((res) => {
-        this.loading = false;
-        if (res.success) {
-          this.data = res.result;
-        }
-      });
-      this.loading = false;
-    },
-    handleSubmit() {
-      this.$refs.form.validate((valid) => {
-        if (valid) {
-          this.submitLoading = true;
-          setHotWords(this.form).then((res) => {
-            this.submitLoading = false;
-            if (res.success) {
-              this.$Message.success("操作成功");
-              this.getDataList();
-              this.modalVisible = false;
-            }
-          });
-        }
-      });
-    },
-    //设置热词优先
-    add(words) {
-      this.modalType = 0;
-      this.modalTitle = "设置热词";
-      if (words) {
-        this.form.keywords = words;
-      } else {
-        this.form.keywords = "";
-      }
-      this.form.point = 1;
-      this.modalVisible = true;
-    },
-    deleteWords(words) {
-      this.$Modal.confirm({
-        title: "是否确定删除热词",
-        content: "<p>您确定要删除此热词吗？</p>",
-        okText: "确实",
-        cancelText: "取消",
-        onOk: () => {
-          deleteHotWords(words).then((res) => {
-            if (res.success) {
-              this.$Message.success("删除成功");
-              this.getDataList();
-            }
-          });
-        },
-      });
+    handleClickTab(val) {
+      this.currentTemplate = val;
     },
   },
-  mounted() {
-    this.init();
-  },
+
 };
 </script>
-<style lang="scss" scoped>
-.card-list {
-  display: flex;
-  flex-wrap: wrap;
-  align-items: center;
-}
-
-.card-item {
-  min-width: 100px;
-  margin: 20px;
-}
-</style>
-<style>
-.ivu-card-extra{
-  right: 3px;
-  top:15px;
-  z-index: 99;
-}
-</style>
\ No newline at end of file
+<style lang="scss" scoped></style>
diff --git a/manager/src/views/page/article-manage/template/historyHotWords.vue b/manager/src/views/page/article-manage/template/historyHotWords.vue
new file mode 100644
index 00000000..e69de29b
diff --git a/manager/src/views/page/article-manage/template/setupHotWords.vue b/manager/src/views/page/article-manage/template/setupHotWords.vue
new file mode 100644
index 00000000..27f4af38
--- /dev/null
+++ b/manager/src/views/page/article-manage/template/setupHotWords.vue
@@ -0,0 +1,135 @@
+<template>
+  <div class="layout">
+    <Form
+      ref="formValidate"
+      :label-width="150"
+      label-position="right"
+      :model="formValidate"
+      :rules="ruleValidate"
+    >
+      <FormItem label="热词默认配置" prop="hotWordsSettingItems">
+        <div
+          class="item-label"
+          v-for="(item, index) in formValidate.hotWordsSettingItems"
+          :key="index"
+        >
+          <div>
+            <div class="item-keyword">
+              <div>热词：</div>
+              <Input type="text" v-model="item.keywords"> </Input>
+            </div>
+            <div class="item-score">
+              <div>分数：</div>
+              <InputNumber :max="5" :min="0" v-model="item.score"></InputNumber>
+            </div>
+          </div>
+          <div>
+            <Button type="primary" @click="formValidate.hotWordsSettingItems.splice(index,1)">删除</Button>
+          </div>
+        </div>
+        <Button @click="addSetItem">添加配置</Button>
+      </FormItem>
+      <FormItem label="每日保存数量" prop="saveNum">
+        <InputNumber :min="0" v-model="formValidate.saveNum" />
+      </FormItem>
+
+      <div class="label-btns">
+        <Button type="primary" @click="submit('formValidate')">保存</Button>
+      </div>
+    </Form>
+  </div>
+</template>
+<script>
+import { setSetting, getSetting } from "@/api/index";
+
+export default {
+  data() {
+    return {
+      ruleValidate: {}, // 验证规则
+      formValidate: {
+        // 表单数据
+        saveNum: 1, // 每日保存数量
+        hotWordsSettingItems: [
+          {
+            keywords: "",
+            score: 1,
+          },
+        ], // 热词默认配置
+      },
+    };
+  },
+
+  created() {
+    this.init();
+  },
+  methods: {
+    // 添加热词默认配置
+    addSetItem(val) {
+      if (this.formValidate.hotWordsSettingItems.length >= 5) {
+        this.$Message.error("最多5个热词项");
+      } else {
+        this.formValidate.hotWordsSettingItems.push({
+          keywords: "",
+          score: 1,
+        });
+      }
+    },
+
+    submit(name) {
+      this.$refs["formValidate"].validate(async (valid) => {
+        if (valid) {
+          this.setupSetting();
+        } else {
+          that.$Message.error("请正确填写内容!");
+          return flag;
+        }
+      });
+    },
+    // 保存设置
+    setupSetting() {
+      setSetting("HOT_WORDS", this.formValidate).then((res) => {
+        if (res.success) {
+          this.$Message.success("保存成功!");
+        } else {
+          this.$Message.error("保存失败!");
+        }
+        this.init();
+      });
+    },
+    // 实例化数据
+    async init() {
+      const res = await getSetting("HOT_WORDS");
+      if (res.success) {
+        this.formValidate = res.result;
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.item-label {
+  border-bottom: 1px solid #ededed;
+  margin-bottom: 10px;
+  display: flex;
+  align-items: center;
+  width:500px;
+  justify-content:space-between;
+}
+/deep/ .ivu-input {
+  width: 100px !important;
+}
+.ivu-input-wrapper {
+  width: 300px;
+  margin-right: 10px;
+}
+.item-keyword,
+.item-score {
+  display: flex;
+  align-items: center;
+  margin-bottom: 10px;
+  > div {
+    margin-right: 20px;
+  }
+}
+</style>
diff --git a/manager/src/views/page/article-manage/template/statisticsHotWords.vue b/manager/src/views/page/article-manage/template/statisticsHotWords.vue
new file mode 100644
index 00000000..dd8afb5e
--- /dev/null
+++ b/manager/src/views/page/article-manage/template/statisticsHotWords.vue
@@ -0,0 +1,130 @@
+<template>
+  <div>
+    <div class="affix-time">
+      <Affix :offset-top="100">
+        <div class="flex affix-box">
+          <affixTime :closeShop="true" @selected="clickBreadcrumb" />
+          <Input
+            placeholder="关键词"
+            style="width: 100px; margin-left: 10px"
+            v-model="params.keyWords"
+          ></Input>
+          <Button style="margin-left: 10px" @click="init">搜索</Button>
+        </div>
+      </Affix>
+    </div>
+    <div v-if="!hotWords.length">请输入关键词进行查询</div>
+    <div v-else id="container"></div>
+  </div>
+</template>
+
+<script>
+import { Chart } from "@antv/g2";
+import { getHotWordsStatistics } from "@/api/index";
+import affixTime from "@/views/lili-components/affix-time";
+
+export default {
+  components: {
+    affixTime,
+  },
+  data() {
+    return {
+      params: {
+        // 请求参数
+        searchType: "LAST_SEVEN",
+        year: "",
+        month: "",
+        keywords: "",
+      },
+    };
+  },
+  computed: {
+    hotWords() {
+      this.params.keyWords = this.$store.state.app.hotWords
+        ? this.$store.state.app.hotWords[0]
+        : "";
+      return this.$store.state.app.hotWords
+        ? this.$store.state.app.hotWords[0]
+        : "";
+    },
+  },
+  methods: {
+    clickBreadcrumb(val) {
+      console.log(val)
+      this.params = {...this.params,...val}
+    },
+    // 初始化图表
+    async init() {
+      const res = await getHotWordsStatistics(this.params);
+      if (res.success) {
+      }
+    },
+    handleClickSearch() {},
+  },
+  mounted() {
+    this.init();
+    const data = [
+      { type: "未知", value: 654, percent: 0.02 },
+      { type: "17 岁以下", value: 654, percent: 0.02 },
+      { type: "18-24 岁", value: 4400, percent: 0.2 },
+      { type: "25-29 岁", value: 5300, percent: 0.24 },
+      { type: "30-39 岁", value: 6200, percent: 0.28 },
+      { type: "40-49 岁", value: 3300, percent: 0.14 },
+      { type: "50 岁以上", value: 1500, percent: 0.06 },
+    ];
+
+    const chart = new Chart({
+      container: "container",
+      autoFit: true,
+      height: 500,
+      padding: [50, 20, 50, 20],
+    });
+    chart.data(data);
+    chart.scale("value", {
+      alias: "销售额(万)",
+    });
+
+    chart.axis("type", {
+      tickLine: {
+        alignTick: false,
+      },
+    });
+    chart.axis("value", false);
+
+    chart.tooltip({
+      showMarkers: false,
+    });
+    chart.interval().position("type*value");
+    chart.interaction("element-active");
+
+    // 添加文本标注
+    data.forEach((item) => {
+      chart
+        .annotation()
+        .text({
+          position: [item.type, item.value],
+          content: item.value,
+          style: {
+            textAlign: "center",
+          },
+          offsetY: -30,
+        })
+        .text({
+          position: [item.type, item.value],
+          content: (item.percent * 100).toFixed(0) + "%",
+          style: {
+            textAlign: "center",
+          },
+          offsetY: -12,
+        });
+    });
+    chart.render();
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.affix-time {
+  padding-left: 15px;
+}
+</style>
diff --git a/manager/src/views/page/article-manage/template/todayHotWords.vue b/manager/src/views/page/article-manage/template/todayHotWords.vue
new file mode 100644
index 00000000..1f8802ab
--- /dev/null
+++ b/manager/src/views/page/article-manage/template/todayHotWords.vue
@@ -0,0 +1,162 @@
+<template>
+  <div>
+    <Row class="operation">
+      <Button @click="add()" type="primary">设置今日热词</Button>
+    </Row>
+    <Row>
+      <p>
+        <Alert type="success">
+          这里展示今日系统中搜索前一百的搜索热词，分数为热词在排序系统中的分数，分数越高，可以在用户获取热词时进行优先展示（首页商品搜索栏下方推荐位）（分数可以填写负数，会降低推荐度）
+        </Alert>
+      </p>
+    </Row>
+
+    <div class="card-list">
+      <Card v-for="words in data" class="card-item" :key="words" onclick="">
+        <p>
+          <a href="#" slot="extra" @click.prevent="add(words)">{{ words }}</a>
+        </p>
+        <p slot="extra">
+          <a @click="deleteWords(words)">
+            <Icon type="md-close" />
+          </a>
+        </p>
+      </Card>
+    </div>
+    <Modal
+      :title="modalTitle"
+      v-model="modalVisible"
+      :mask-closable="false"
+      :width="500"
+    >
+      <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
+        <FormItem label="热词" prop="keywords">
+          <Input v-model="form.keywords" clearable style="width: 100%" />
+        </FormItem>
+        <FormItem label="分数" prop="point">
+          <InputNumber  v-model="form.point" clearable style="width: 100%" />
+        </FormItem>
+      </Form>
+      <div slot="footer">
+        <Button type="text" @click="modalVisible = false">取消</Button>
+        <Button type="primary" :loading="submitLoading" @click="handleSubmit"
+          >提交</Button
+        >
+      </div>
+    </Modal>
+  </div>
+</template>
+
+<script>
+import { getHotWords, setHotWords, deleteHotWords } from "@/api/index";
+
+import { regular } from "@/utils";
+export default {
+  name: "hotWords",
+  components: {},
+  data() {
+    return {
+      submitLoading: false,
+      modalTitle: "",
+      loading: true, // 表单加载状态
+      modalVisible: false, //弹出框
+      form: {
+        keywords: "",
+        point: 0,
+      },
+      data: [], // 表单数据
+
+      // 表单验证规则
+      formValidate: {
+        keywords: [regular.REQUIRED, regular.VARCHAR20],
+        point: [regular.REQUIRED, regular.NUMBER],
+      },
+    };
+  },
+  methods: {
+    init() {
+      this.getDataList();
+    },
+    handleClickTab(val) {
+      console.log(val);
+    },
+    getDataList() {
+      this.loading = true;
+      getHotWords().then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.data = res.result;
+          this.$store.state.app.hotWords = this.data
+
+        }
+      });
+      this.loading = false;
+    },
+    handleSubmit() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.submitLoading = true;
+          setHotWords(this.form).then((res) => {
+            this.submitLoading = false;
+            if (res.success) {
+              this.$Message.success("操作成功");
+              this.getDataList();
+              this.modalVisible = false;
+            }
+          });
+        }
+      });
+    },
+    //设置热词优先
+    add(words) {
+      this.modalType = 0;
+      this.modalTitle = "设置热词";
+      if (words) {
+        this.form.keywords = words;
+      } else {
+        this.form.keywords = "";
+      }
+      this.form.point = 1;
+      this.modalVisible = true;
+    },
+    deleteWords(words) {
+      this.$Modal.confirm({
+        title: "是否确定删除热词",
+        content: "<p>您确定要删除此热词吗？</p>",
+        okText: "确实",
+        cancelText: "取消",
+        onOk: () => {
+          deleteHotWords({words}).then((res) => {
+            if (res.success) {
+              this.$Message.success("删除成功");
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+  },
+  mounted() {
+    this.init();
+  },
+};
+</script>
+<style lang="scss" scoped>
+.card-list {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+}
+
+.card-item {
+  min-width: 100px;
+  margin: 20px;
+}
+</style>
+<style>
+.ivu-card-extra {
+  right: 3px;
+  top: 15px;
+  z-index: 99;
+}
+</style>

From 8d9a64d84b69deb924bb0c6dabab5a6979d3044f Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Mon, 25 Apr 2022 18:08:29 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E7=83=AD=E8=AF=8D=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../page/article-manage/HOTWORDS_HISTORY.vue  | 157 ++++++++++++++++++
 .../page/article-manage/HOTWORDS_TODAY.vue    | 157 ++++++++++++++++++
 .../page/article-manage/HOTWORD_SETTING.vue   | 145 ++++++++++++++++
 3 files changed, 459 insertions(+)
 create mode 100644 manager/src/views/page/article-manage/HOTWORDS_HISTORY.vue
 create mode 100644 manager/src/views/page/article-manage/HOTWORDS_TODAY.vue
 create mode 100644 manager/src/views/page/article-manage/HOTWORD_SETTING.vue

diff --git a/manager/src/views/page/article-manage/HOTWORDS_HISTORY.vue b/manager/src/views/page/article-manage/HOTWORDS_HISTORY.vue
new file mode 100644
index 00000000..c9fd2aaf
--- /dev/null
+++ b/manager/src/views/page/article-manage/HOTWORDS_HISTORY.vue
@@ -0,0 +1,157 @@
+<template>
+  <div class="search">
+    <Card>
+      <Row class="operation">
+        <Button @click="add()" type="primary">设置今日热词</Button>
+      </Row>
+      <Row>
+        <p>
+          <Alert type="success">
+            这里展示今日系统中搜索前一百的搜索热词，分数为热词在排序系统中的分数，分数越高，可以在用户获取热词时进行优先展示（首页商品搜索栏下方推荐位）（分数可以填写负数，会降低推荐度）
+          </Alert>
+        </p>
+      </Row>
+
+      <div class="card-list">
+        <Card v-for="words in data" class="card-item" :key="words" onclick="">
+          <p>
+            <a href="#" slot="extra" @click.prevent="add(words)">{{ words }}</a>
+          </p>
+          <p slot="extra">
+            <a @click="deleteWords(words)">
+              <Icon type="md-close"/>
+            </a>
+          </p>
+        </Card>
+      </div>
+    </Card>
+    <Modal :title="modalTitle" v-model="modalVisible" :mask-closable="false" :width="500">
+      <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
+        <FormItem label="热词" prop="keywords">
+          <Input v-model="form.keywords" clearable style="width: 100%"/>
+        </FormItem>
+        <FormItem label="分数" prop="point">
+          <Input v-model="form.point" clearable style="width: 100%"/>
+        </FormItem>
+      </Form>
+      <div slot="footer">
+        <Button type="text" @click="modalVisible = false">取消</Button>
+        <Button type="primary" :loading="submitLoading" @click="handleSubmit"
+        >提交
+        </Button
+        >
+      </div>
+    </Modal>
+  </div>
+</template>
+
+<script>
+import {getHotWords, setHotWords, deleteHotWords} from "@/api/index";
+
+import {regular} from "@/utils";
+
+export default {
+  name: "hotWords",
+  components: {},
+  data() {
+    return {
+      submitLoading: false,
+      modalTitle: "",
+      loading: true, // 表单加载状态
+      modalVisible: false, //弹出框
+      form: {
+        keywords: "",
+        point: 0,
+      },
+      data: [], // 表单数据
+
+      // 表单验证规则
+      formValidate: {
+        keywords: [regular.REQUIRED, regular.VARCHAR20],
+        point: [regular.REQUIRED, regular.NUMBER],
+      },
+    };
+  },
+  methods: {
+    init() {
+      this.getDataList();
+    },
+    getDataList() {
+      this.loading = true;
+      getHotWords().then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.data = res.result;
+        }
+      });
+      this.loading = false;
+    },
+    handleSubmit() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.submitLoading = true;
+          setHotWords(this.form).then((res) => {
+            this.submitLoading = false;
+            if (res.success) {
+              this.$Message.success("操作成功");
+              this.getDataList();
+              this.modalVisible = false;
+            }
+          });
+        }
+      });
+    },
+    //设置热词优先
+    add(words) {
+      this.modalType = 0;
+      this.modalTitle = "设置热词";
+      if (words) {
+        this.form.keywords = words;
+      } else {
+        this.form.keywords = "";
+      }
+      this.form.point = 1;
+      this.modalVisible = true;
+    },
+    deleteWords(words) {
+      this.$Modal.confirm({
+        title: "是否确定删除热词",
+        content: "<p>您确定要删除此热词吗？</p>",
+        okText: "确实",
+        cancelText: "取消",
+        onOk: () => {
+          let params = {words: words}
+          deleteHotWords(params).then((res) => {
+            if (res.success) {
+              this.$Message.success("删除成功");
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+  },
+  mounted() {
+    this.init();
+  },
+};
+</script>
+<style lang="scss" scoped>
+.card-list {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+}
+
+.card-item {
+  min-width: 100px;
+  margin: 20px;
+}
+</style>
+<style>
+.ivu-card-extra {
+  right: 3px;
+  top: 15px;
+  z-index: 99;
+}
+</style>
diff --git a/manager/src/views/page/article-manage/HOTWORDS_TODAY.vue b/manager/src/views/page/article-manage/HOTWORDS_TODAY.vue
new file mode 100644
index 00000000..c9fd2aaf
--- /dev/null
+++ b/manager/src/views/page/article-manage/HOTWORDS_TODAY.vue
@@ -0,0 +1,157 @@
+<template>
+  <div class="search">
+    <Card>
+      <Row class="operation">
+        <Button @click="add()" type="primary">设置今日热词</Button>
+      </Row>
+      <Row>
+        <p>
+          <Alert type="success">
+            这里展示今日系统中搜索前一百的搜索热词，分数为热词在排序系统中的分数，分数越高，可以在用户获取热词时进行优先展示（首页商品搜索栏下方推荐位）（分数可以填写负数，会降低推荐度）
+          </Alert>
+        </p>
+      </Row>
+
+      <div class="card-list">
+        <Card v-for="words in data" class="card-item" :key="words" onclick="">
+          <p>
+            <a href="#" slot="extra" @click.prevent="add(words)">{{ words }}</a>
+          </p>
+          <p slot="extra">
+            <a @click="deleteWords(words)">
+              <Icon type="md-close"/>
+            </a>
+          </p>
+        </Card>
+      </div>
+    </Card>
+    <Modal :title="modalTitle" v-model="modalVisible" :mask-closable="false" :width="500">
+      <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
+        <FormItem label="热词" prop="keywords">
+          <Input v-model="form.keywords" clearable style="width: 100%"/>
+        </FormItem>
+        <FormItem label="分数" prop="point">
+          <Input v-model="form.point" clearable style="width: 100%"/>
+        </FormItem>
+      </Form>
+      <div slot="footer">
+        <Button type="text" @click="modalVisible = false">取消</Button>
+        <Button type="primary" :loading="submitLoading" @click="handleSubmit"
+        >提交
+        </Button
+        >
+      </div>
+    </Modal>
+  </div>
+</template>
+
+<script>
+import {getHotWords, setHotWords, deleteHotWords} from "@/api/index";
+
+import {regular} from "@/utils";
+
+export default {
+  name: "hotWords",
+  components: {},
+  data() {
+    return {
+      submitLoading: false,
+      modalTitle: "",
+      loading: true, // 表单加载状态
+      modalVisible: false, //弹出框
+      form: {
+        keywords: "",
+        point: 0,
+      },
+      data: [], // 表单数据
+
+      // 表单验证规则
+      formValidate: {
+        keywords: [regular.REQUIRED, regular.VARCHAR20],
+        point: [regular.REQUIRED, regular.NUMBER],
+      },
+    };
+  },
+  methods: {
+    init() {
+      this.getDataList();
+    },
+    getDataList() {
+      this.loading = true;
+      getHotWords().then((res) => {
+        this.loading = false;
+        if (res.success) {
+          this.data = res.result;
+        }
+      });
+      this.loading = false;
+    },
+    handleSubmit() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.submitLoading = true;
+          setHotWords(this.form).then((res) => {
+            this.submitLoading = false;
+            if (res.success) {
+              this.$Message.success("操作成功");
+              this.getDataList();
+              this.modalVisible = false;
+            }
+          });
+        }
+      });
+    },
+    //设置热词优先
+    add(words) {
+      this.modalType = 0;
+      this.modalTitle = "设置热词";
+      if (words) {
+        this.form.keywords = words;
+      } else {
+        this.form.keywords = "";
+      }
+      this.form.point = 1;
+      this.modalVisible = true;
+    },
+    deleteWords(words) {
+      this.$Modal.confirm({
+        title: "是否确定删除热词",
+        content: "<p>您确定要删除此热词吗？</p>",
+        okText: "确实",
+        cancelText: "取消",
+        onOk: () => {
+          let params = {words: words}
+          deleteHotWords(params).then((res) => {
+            if (res.success) {
+              this.$Message.success("删除成功");
+              this.getDataList();
+            }
+          });
+        },
+      });
+    },
+  },
+  mounted() {
+    this.init();
+  },
+};
+</script>
+<style lang="scss" scoped>
+.card-list {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+}
+
+.card-item {
+  min-width: 100px;
+  margin: 20px;
+}
+</style>
+<style>
+.ivu-card-extra {
+  right: 3px;
+  top: 15px;
+  z-index: 99;
+}
+</style>
diff --git a/manager/src/views/page/article-manage/HOTWORD_SETTING.vue b/manager/src/views/page/article-manage/HOTWORD_SETTING.vue
new file mode 100644
index 00000000..b58ff304
--- /dev/null
+++ b/manager/src/views/page/article-manage/HOTWORD_SETTING.vue
@@ -0,0 +1,145 @@
+<template>
+  <div class="layout">
+    <Form ref="formValidate" :label-width="150" label-position="right" :model="formValidate" :rules="ruleValidate">
+
+      <FormItem class="label-item" v-for="(point,index) in  formValidate.pointSettingItems" :key="index"
+                :label="'签到设置'+(index+1)">
+        <div class="label-item">
+
+          <InputNumber :min="1" v-model="point.day"></InputNumber>
+
+          <InputNumber :min="0" v-model="point.point"></InputNumber>
+
+          <Button ghost type="error" @click="delSign(point,index)">删除</Button>
+          <span class="ml_10">签到<span class="theme_color">{{ point.day }}</span>天，赠送<span
+            class="theme_color">{{ point.point }}</span>积分</span>
+        </div>
+
+      </FormItem>
+      <FormItem label="操作：">
+        <Button @click="addSign">新增签到</Button>
+      </FormItem>
+      <div class="label-btns">
+        <Button type="primary" @click="submit('formValidate')">保存</Button>
+      </div>
+    </Form>
+  </div>
+</template>
+
+<script>
+import {setSetting} from "@/api/index";
+
+export default {
+  data() {
+    return {
+      formValidate: {}, // 表单数据
+    };
+  },
+  props: ["res", "type"],
+  created() {
+    this.init();
+  },
+  methods: {
+    // 保存
+    submit(name) {
+      let that = this;
+      this.setupSetting();
+    },
+    // 保存设置
+    setupSetting() {
+      setSetting(this.type, this.formValidate).then((res) => {
+        if (res.success) {
+          this.$Message.success("保存成功!");
+        } else {
+          this.$Message.error("保存失败!");
+        }
+      });
+    },
+    delSign(item, index) {
+      this.formValidate.pointSettingItems.splice(index, 1);
+    },
+    addSign() {
+      if (this.formValidate.pointSettingItems.length >= 5) {
+        this.$Message.error({
+          content: "最多设置5项签到设置",
+        });
+        return false;
+      }
+      this.formValidate.pointSettingItems.push({
+        point: "0",
+        day: this.formValidate.pointSettingItems.length,
+      });
+    },
+    // 实例化数据
+    init() {
+      this.res = JSON.parse(this.res);
+      Object.keys(this.res).map((item) => {
+        if (item == "pointSettingItems") {
+          return false;
+        }
+        this.res[item] += "";
+      });
+
+      this.$set(this, "formValidate", {...this.res});
+
+      Object.keys(this.formValidate).forEach((item) => {
+        this.ruleValidate[item] = [
+          {
+            required: true,
+            message: "请填写必填项",
+            trigger: "blur",
+          },
+          {
+            validator: (rule, value, callback) => {
+              if (value < 0) {
+                callback(new Error("不能输入负数！"));
+              } else {
+                callback();
+              }
+            },
+            trigger: "change",
+          },
+        ];
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "./style.scss";
+
+.label-item {
+  display: flex;
+
+  > .ivu-input-number {
+    width: 100px;
+    margin-right: 5px;
+  }
+
+  > .ivu-input-number:nth-last-of-type(1) {
+    width: 150px;
+    margin-right: 5px;
+  }
+
+  > .ivu-input {
+    width: 100px;
+    margin: 0 10px;
+  }
+}
+
+/deep/ .ivu-input {
+  width: 70px !important;
+}
+
+.ivu-input-wrapper {
+  width: 70px;
+  margin-right: 10px;
+}
+
+.label-btns {
+  /deep/ .ivu-btn {
+    margin-right: 10px;
+  }
+}
+</style>

From 9e34b4416546e0cc4b60a9bef40a8bb78fdfea92 Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Mon, 25 Apr 2022 18:09:49 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E7=83=AD=E8=AF=8D=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/public/config.js                      |   8 +-
 manager/src/api/index.js                      |   5 +
 .../src/views/page/article-manage/style.scss  |  22 +++
 .../src/views/page/article-manage/template.js |   8 ++
 .../template/historyHotWords.vue              | 108 ++++++++++++++
 .../article-manage/template/setupHotWords.vue |   2 +-
 .../template/statisticsHotWords.vue           | 132 +++++++-----------
 7 files changed, 198 insertions(+), 87 deletions(-)
 create mode 100644 manager/src/views/page/article-manage/style.scss
 create mode 100644 manager/src/views/page/article-manage/template.js

diff --git a/manager/public/config.js b/manager/public/config.js
index ada826fc..048f3158 100644
--- a/manager/public/config.js
+++ b/manager/public/config.js
@@ -3,10 +3,10 @@ var BASE = {
      * @description api请求基础路径
      */
     API_DEV: {
-      common: "https://common-api.pickmall.cn",
-      buyer: "https://buyer-api.pickmall.cn",
-      seller: "https://store-api.pickmall.cn",
-      manager: "https://admin-api.pickmall.cn"
+      seller:  "http://127.0.0.1:8889",
+      manager: "http://127.0.0.1:8887",
+      buyer:   "http://127.0.0.1:8888",
+      common:  "http://127.0.0.1:8890",
     },
     API_PROD: {
       common: "https://common-api.pickmall.cn",
diff --git a/manager/src/api/index.js b/manager/src/api/index.js
index 776f3f74..709bec3a 100644
--- a/manager/src/api/index.js
+++ b/manager/src/api/index.js
@@ -453,4 +453,9 @@ export const getHotWordsStatistics = (params) => {
   return getRequest(`/hotwords/hotwords/statistics`,params);
 };
 
+// 获取历史热词
+export const getHotWordsHistory = (params) => {
+  return getRequest(`/hotwords/hotwords/history`,params);
+};
+
 
diff --git a/manager/src/views/page/article-manage/style.scss b/manager/src/views/page/article-manage/style.scss
new file mode 100644
index 00000000..9994b8af
--- /dev/null
+++ b/manager/src/views/page/article-manage/style.scss
@@ -0,0 +1,22 @@
+/deep/ .ivu-input{
+  width: 200px !important;
+}
+
+.label-btns{
+  margin-left: 150px;
+}
+
+.ivu-form-item{
+  padding: 10px 0;
+}
+
+
+.ivu-input-wrapper {
+  width: 150px;
+  margin-right: 10px;
+}
+
+/deep/ .ivu-form-item-content {
+  margin-left: 0 !important;
+  display: flex;
+}
diff --git a/manager/src/views/page/article-manage/template.js b/manager/src/views/page/article-manage/template.js
new file mode 100644
index 00000000..9b1b1084
--- /dev/null
+++ b/manager/src/views/page/article-manage/template.js
@@ -0,0 +1,8 @@
+import HOTWORD_SETTING from "./HOTWORD_SETTING";
+import HOTWORDS_HISTORY from "./HOTWORDS_HISTORY";
+import HOTWORDS_TODAY from "./HOTWORDS_TODAY";
+export default {
+  HOTWORD_SETTING,
+  HOTWORDS_TODAY,
+  HOTWORDS_HISTORY
+};
diff --git a/manager/src/views/page/article-manage/template/historyHotWords.vue b/manager/src/views/page/article-manage/template/historyHotWords.vue
index e69de29b..09377c32 100644
--- a/manager/src/views/page/article-manage/template/historyHotWords.vue
+++ b/manager/src/views/page/article-manage/template/historyHotWords.vue
@@ -0,0 +1,108 @@
+<template>
+  <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>
+
+      </Col>
+    </Row>
+    <Row>
+      <p>
+        <Alert type="success">
+          这里展示历史某一天的热词数据统计，可根据需求配置每日持久化多少条数据。
+        </Alert>
+      </p>
+    </Row>
+
+
+    <div id="container"></div>
+  </div>
+</template>
+
+<script>
+import {Chart} from "@antv/g2";
+import {getHotWordsHistory} from "@/api/index";
+import affixTime from "@/views/lili-components/affix-time";
+import {Message} from "view-design";
+
+export default {
+  components: {
+    affixTime,
+  },
+  data() {
+    return {
+      params: {
+        date:this.$options.filters.unixToDate(new Date().getTime() / 1000,'yyyy-MM-dd')
+      },
+      hotWordsChart: "", //图表
+      hotWordsData: [] //数据
+    };
+  },
+  computed: {},
+  methods: {
+    clickBreadcrumb(val) {
+      this.params = {...this.params, ...val}
+    },
+    // 初始化图表
+    async search(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.render();
+        if (!this.hotWordsData) {
+          Message.error("暂无数据");
+        }
+      }
+    },
+    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();
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.affix-time {
+  padding-left: 15px;
+}
+
+.box {
+  min-height: 400px;
+}
+</style>
+
diff --git a/manager/src/views/page/article-manage/template/setupHotWords.vue b/manager/src/views/page/article-manage/template/setupHotWords.vue
index 27f4af38..5bf45610 100644
--- a/manager/src/views/page/article-manage/template/setupHotWords.vue
+++ b/manager/src/views/page/article-manage/template/setupHotWords.vue
@@ -29,7 +29,7 @@
         </div>
         <Button @click="addSetItem">添加配置</Button>
       </FormItem>
-      <FormItem label="每日保存数量" prop="saveNum">
+      <FormItem label="每日持久化热词数量" prop="saveNum">
         <InputNumber :min="0" v-model="formValidate.saveNum" />
       </FormItem>
 
diff --git a/manager/src/views/page/article-manage/template/statisticsHotWords.vue b/manager/src/views/page/article-manage/template/statisticsHotWords.vue
index dd8afb5e..b78431a5 100644
--- a/manager/src/views/page/article-manage/template/statisticsHotWords.vue
+++ b/manager/src/views/page/article-manage/template/statisticsHotWords.vue
@@ -3,24 +3,25 @@
     <div class="affix-time">
       <Affix :offset-top="100">
         <div class="flex affix-box">
-          <affixTime :closeShop="true" @selected="clickBreadcrumb" />
-          <Input
-            placeholder="关键词"
-            style="width: 100px; margin-left: 10px"
-            v-model="params.keyWords"
-          ></Input>
-          <Button style="margin-left: 10px" @click="init">搜索</Button>
+          <affixTime :closeShop="true" @selected="clickBreadcrumb"/>
+
+          <InputNumber
+            placeholder="展示前N"
+            :max="200"
+            :min="10"
+            v-model="params.top"
+          ></InputNumber>
+          <Button style="margin-left: 10px" @click="search">搜索</Button>
         </div>
       </Affix>
     </div>
-    <div v-if="!hotWords.length">请输入关键词进行查询</div>
-    <div v-else id="container"></div>
+    <div id="container"></div>
   </div>
 </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 "@/views/lili-components/affix-time";
 
 export default {
@@ -34,91 +35,58 @@ export default {
         searchType: "LAST_SEVEN",
         year: "",
         month: "",
-        keywords: "",
+        top: 50
       },
+      hotWordsChart:"", //图表
+      hotWordsData:[] //数据
     };
   },
-  computed: {
-    hotWords() {
-      this.params.keyWords = this.$store.state.app.hotWords
-        ? this.$store.state.app.hotWords[0]
-        : "";
-      return this.$store.state.app.hotWords
-        ? this.$store.state.app.hotWords[0]
-        : "";
-    },
-  },
+  computed: {},
   methods: {
     clickBreadcrumb(val) {
-      console.log(val)
-      this.params = {...this.params,...val}
+      this.params = {...this.params, ...val}
     },
     // 初始化图表
-    async init() {
+    async search() {
       const res = await getHotWordsStatistics(this.params);
       if (res.success) {
+        this.hotWordsData=res.result;
+        this.hotWordsChart.data(this.hotWordsData)
+        this.hotWordsChart.render();
       }
     },
-    handleClickSearch() {},
+    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();
-    const data = [
-      { type: "未知", value: 654, percent: 0.02 },
-      { type: "17 岁以下", value: 654, percent: 0.02 },
-      { type: "18-24 岁", value: 4400, percent: 0.2 },
-      { type: "25-29 岁", value: 5300, percent: 0.24 },
-      { type: "30-39 岁", value: 6200, percent: 0.28 },
-      { type: "40-49 岁", value: 3300, percent: 0.14 },
-      { type: "50 岁以上", value: 1500, percent: 0.06 },
-    ];
-
-    const chart = new Chart({
-      container: "container",
-      autoFit: true,
-      height: 500,
-      padding: [50, 20, 50, 20],
-    });
-    chart.data(data);
-    chart.scale("value", {
-      alias: "销售额(万)",
-    });
-
-    chart.axis("type", {
-      tickLine: {
-        alignTick: false,
-      },
-    });
-    chart.axis("value", false);
-
-    chart.tooltip({
-      showMarkers: false,
-    });
-    chart.interval().position("type*value");
-    chart.interaction("element-active");
-
-    // 添加文本标注
-    data.forEach((item) => {
-      chart
-        .annotation()
-        .text({
-          position: [item.type, item.value],
-          content: item.value,
-          style: {
-            textAlign: "center",
-          },
-          offsetY: -30,
-        })
-        .text({
-          position: [item.type, item.value],
-          content: (item.percent * 100).toFixed(0) + "%",
-          style: {
-            textAlign: "center",
-          },
-          offsetY: -12,
-        });
-    });
-    chart.render();
   },
 };
 </script>

From 5bd66b9ec612d82a44a22c6cbc4d65c77ce0ab23 Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Mon, 25 Apr 2022 18:16:06 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E6=8E=A5=E5=8F=A3api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/public/config.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/manager/public/config.js b/manager/public/config.js
index 048f3158..ada826fc 100644
--- a/manager/public/config.js
+++ b/manager/public/config.js
@@ -3,10 +3,10 @@ var BASE = {
      * @description api请求基础路径
      */
     API_DEV: {
-      seller:  "http://127.0.0.1:8889",
-      manager: "http://127.0.0.1:8887",
-      buyer:   "http://127.0.0.1:8888",
-      common:  "http://127.0.0.1:8890",
+      common: "https://common-api.pickmall.cn",
+      buyer: "https://buyer-api.pickmall.cn",
+      seller: "https://store-api.pickmall.cn",
+      manager: "https://admin-api.pickmall.cn"
     },
     API_PROD: {
       common: "https://common-api.pickmall.cn",