From f9d09365ea7298475037d761caecc31c3f94c157 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E8=89=AFking?= <2244255345@qq.com>
Date: Thu, 17 Feb 2022 10:43:46 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/components/header/hoverSearch.vue   |  5 ++++
 .../src/views/lili-components/affix-time.vue  |  4 +--
 manager/src/views/order/order/orderDetail.vue |  7 ++---
 .../page/article-manage/ArticleCategory.vue   | 27 ++++++++++---------
 .../views/page/article-manage/hotWords.vue    |  7 +++++
 .../src/views/sys/menu-manage/menuManage.vue  |  2 +-
 seller/src/views/shop/shopAddress.vue         |  2 +-
 seller/src/views/shop/shopSetting.vue         |  2 +-
 8 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/buyer/src/components/header/hoverSearch.vue b/buyer/src/components/header/hoverSearch.vue
index 6acc49b6..64fce084 100644
--- a/buyer/src/components/header/hoverSearch.vue
+++ b/buyer/src/components/header/hoverSearch.vue
@@ -16,6 +16,7 @@
       />
       <i class="cart-badge">{{ cartNum < 100 ? cartNum : "99" }}</i>
     </div>
+    <hr class="hr"/>
   </div>
 </template>
 <script>
@@ -59,6 +60,10 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.hr{
+  height:1px;
+  background:$theme_color;
+}
 .content {
   width: 1200px;
   height: 40px;
diff --git a/manager/src/views/lili-components/affix-time.vue b/manager/src/views/lili-components/affix-time.vue
index a6dfbc08..d06ad9cb 100644
--- a/manager/src/views/lili-components/affix-time.vue
+++ b/manager/src/views/lili-components/affix-time.vue
@@ -4,9 +4,9 @@
       <span @click="clickBreadcrumb(item,index)" :class="{'active':item.selected}" v-for="(item,index) in dateList"
         :key="index"> {{item.title}}</span>
       <div class="date-picker">
-        <Select @on-change="changeSelect(selectedWay)" v-model="month" placeholder="年月查询"
+        <Select @on-change="changeSelect(selectedWay)" v-model="month" placeholder="年月查询" clearable
           style="width:200px;margin-left:10px;">
-          <Option v-for="(item,index) in dates" :value="item.year+'-'+item.month" :key="index">
+          <Option v-for="(item,index) in dates" :value="item.year+'-'+item.month" :key="index" clearable>
             {{ item.year+'年'+item.month+'月' }}</Option>
         </Select>
       </div>
diff --git a/manager/src/views/order/order/orderDetail.vue b/manager/src/views/order/order/orderDetail.vue
index 6972e3ad..998cb3bb 100644
--- a/manager/src/views/order/order/orderDetail.vue
+++ b/manager/src/views/order/order/orderDetail.vue
@@ -598,10 +598,10 @@ export default {
         },
         {
           title: "小计",
-          key: "flowPrice",
+          key: "subTotal",
           minWidth: 100,
           render: (h, params) => {
-            return h("div", this.$options.filters.unitPrice(params.row.flowPrice, "￥"));
+            return h("div", this.$options.filters.unitPrice(params.row.subTotal, "￥"));
           },
         },
       ],
@@ -674,7 +674,8 @@ export default {
     },
     modifyPrice() {
       //默认要修改的金额为订单总金额
-      this.modifyPriceForm.price = this.orderInfo.order.flowPrice;
+      this.modifyPriceForm.price = this.orderInfo.order.subTotal;
+      console.log(this.modifyPriceForm.price)
       this.modal = true;
     },
     //修改订单金额提交
diff --git a/manager/src/views/page/article-manage/ArticleCategory.vue b/manager/src/views/page/article-manage/ArticleCategory.vue
index c8eacdfe..0b5f9f6a 100644
--- a/manager/src/views/page/article-manage/ArticleCategory.vue
+++ b/manager/src/views/page/article-manage/ArticleCategory.vue
@@ -2,7 +2,9 @@
   <div>
     <Card>
       <div class="operation mb_10">
-        <Button @click="addParent" type="primary" icon="md-add">添加一级分类</Button>
+        <Button @click="addParent" type="primary" icon="md-add"
+          >添加一级分类</Button
+        >
       </div>
       <tree-table
         ref="treeTable"
@@ -116,17 +118,12 @@ export default {
         parentId: "",
         sort: 1,
         level: 0,
-        articleCategoryName:""
+        articleCategoryName: "",
       },
       // 表单验证规则
       formValidate: {
-        articleCategoryName:[
-          regular.REQUIRED
-        ],
-        sort:[
-          regular.REQUIRED,
-          regular.INTEGER
-        ]
+        articleCategoryName: [regular.REQUIRED],
+        sort: [regular.REQUIRED,regular.INTEGER],
       },
       columns: [
         {
@@ -149,7 +146,7 @@ export default {
           template: "action",
         },
       ],
-      tableData: []  // 表格数据
+      tableData: [], // 表格数据
     };
   },
   methods: {
@@ -205,7 +202,13 @@ export default {
               if (res.success) {
                 this.$Message.success("添加成功");
 
-                this.formAdd = {};
+                this.formAdd = {
+                  // 添加或编辑表单对象初始化数据
+                  parentId: "",
+                  sort: 1,
+                  level: 0,
+                  articleCategoryName: "",
+                };
               } else {
                 // this.$Message.error(res.message);
               }
@@ -248,7 +251,7 @@ export default {
       });
     },
     // 获取分类数据
-    getAllList() {
+    getAllList(newval) {
       this.loading = true;
       getArticleCategory().then((res) => {
         this.loading = false;
diff --git a/manager/src/views/page/article-manage/hotWords.vue b/manager/src/views/page/article-manage/hotWords.vue
index b9931a2c..69f750ba 100644
--- a/manager/src/views/page/article-manage/hotWords.vue
+++ b/manager/src/views/page/article-manage/hotWords.vue
@@ -145,3 +145,10 @@ export default {
   margin: 20px;
 }
 </style>
+<style>
+.ivu-card-extra{
+  right: 3px;
+  top:15px;
+  z-index: 99;
+}
+</style>
\ No newline at end of file
diff --git a/manager/src/views/sys/menu-manage/menuManage.vue b/manager/src/views/sys/menu-manage/menuManage.vue
index a0829b1f..d2f7721d 100644
--- a/manager/src/views/sys/menu-manage/menuManage.vue
+++ b/manager/src/views/sys/menu-manage/menuManage.vue
@@ -571,6 +571,6 @@ export default {
   color: #999;
 }
 .menu-input {
-  width: 500px;
+  width: 162px;
 }
 </style>
diff --git a/seller/src/views/shop/shopAddress.vue b/seller/src/views/shop/shopAddress.vue
index 198693e2..75e34801 100644
--- a/seller/src/views/shop/shopAddress.vue
+++ b/seller/src/views/shop/shopAddress.vue
@@ -110,7 +110,7 @@
           mobile: [
             {
               required: true,
-              message: "请输入地址纬度",
+              message: "请输入联系电话号",
               trigger: "blur",
             },
             { validator: validateMobile,
diff --git a/seller/src/views/shop/shopSetting.vue b/seller/src/views/shop/shopSetting.vue
index 2243601d..6c388e61 100644
--- a/seller/src/views/shop/shopSetting.vue
+++ b/seller/src/views/shop/shopSetting.vue
@@ -224,7 +224,7 @@ export default {
       },
       stockWarningFormValidate: {
         stockWarning: [
-          { required: true, message: "请输入库存预警数", trigger: "blur" },
+          { required: true, type:'number', message: "请输入库存预警数", trigger: "blur" },
         ],
       },
       udeskFormValidate: {