From 9df8a753d46dc02e576a72d88046d963308630d9 Mon Sep 17 00:00:00 2001
From: mabo <mailmabo@126.com>
Date: Mon, 17 May 2021 10:34:54 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer/src/vuex/store.js                              |  2 +-
 seller/src/libs/routerJson.js                        |  2 +-
 seller/src/router/router.js                          | 12 ++++++------
 .../promotion/fullCut/{full-cut.vue => fullCut.vue}  |  3 ++-
 4 files changed, 10 insertions(+), 9 deletions(-)
 rename seller/src/views/promotion/fullCut/{full-cut.vue => fullCut.vue} (99%)

diff --git a/buyer/src/vuex/store.js b/buyer/src/vuex/store.js
index 105eded6..61a5b9f0 100644
--- a/buyer/src/vuex/store.js
+++ b/buyer/src/vuex/store.js
@@ -11,7 +11,7 @@ export default new Vuex.Store({
   state: {
     category: [], // 全部分类
     navList: [],
-    cartNum: storage.getItem('cartNum') || 0
+    cartNum: storage.getItem('userInfo') ? storage.getItem('cartNum') : 0
   },
   getters,
   actions,
diff --git a/seller/src/libs/routerJson.js b/seller/src/libs/routerJson.js
index 41937a01..29ec21bc 100644
--- a/seller/src/libs/routerJson.js
+++ b/seller/src/libs/routerJson.js
@@ -405,7 +405,7 @@ export const result = [
             type: 0,
             title: "满额活动",
             path: "full-cut",
-            component: "promotion/fullCut/full-cut",
+            component: "promotion/fullCut/fullCut",
             icon: "md-person",
             isMenu: true,
             url: "",
diff --git a/seller/src/router/router.js b/seller/src/router/router.js
index eaf49412..133081b5 100644
--- a/seller/src/router/router.js
+++ b/seller/src/router/router.js
@@ -115,12 +115,12 @@ export const otherRouter = {
       component: () =>
         import("@/views/order/after-order/reurnGoodsOrderDetail.vue")
     },
-    {
-      path: "full-cut-detail",
-      title: "添加满额活动",
-      name: "full-cut-detail",
-      component: () => import("@/views/promotion/fullCut/newFullCut.vue")
-    },
+    // {
+    //   path: "full-cut-detail",
+    //   title: "添加满额活动",
+    //   name: "full-cut-detail",
+    //   component: () => import("@/views/promotion/fullCut/newFullCut.vue")
+    // },
     {
       path: "order-detail",
       title: "订单详情",
diff --git a/seller/src/views/promotion/fullCut/full-cut.vue b/seller/src/views/promotion/fullCut/fullCut.vue
similarity index 99%
rename from seller/src/views/promotion/fullCut/full-cut.vue
rename to seller/src/views/promotion/fullCut/fullCut.vue
index 8f3d1cac..3a18d8f7 100644
--- a/seller/src/views/promotion/fullCut/full-cut.vue
+++ b/seller/src/views/promotion/fullCut/fullCut.vue
@@ -111,6 +111,7 @@
 <script>
 import { getFullDiscountList, delFullDiscount } from "@/api/promotion.js";
 export default {
+  name: 'full-cut',
   data() {
     return {
       loading: false, // 表单加载状态
@@ -256,7 +257,7 @@ export default {
       });
     },
   },
-  activated() {
+  activated () {
     this.init();
   }
 };