Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep

src/components/StoreDesign/labelBar.vue

@@ -351,7 +351,7 @@
             CheckedIcon: this.domainManager().ImageUrl + '/Static/nav-icon-index.active.png',
             DefaultColor: 'rgb(136, 136, 136)',
             CheckedColor: 'rgb(255, 69, 68)',
-            TagLink: "", //链接地址
+            TagLink: "/pages/index/index", //链接地址
             TagSort: 1, //排序
             IsActive: true
           },
@@ -364,7 +364,7 @@
             CheckedIcon: this.domainManager().ImageUrl + '/Static/nav-icon-cat.active.png',
             DefaultColor: 'rgb(136, 136, 136)',
             CheckedColor: 'rgb(255, 69, 68)',
-            TagLink: "", //链接地址
+            TagLink: "/pages/cats/cats?cat_id=", //链接地址
             TagSort: 2, //排序
             IsActive: false
           },
@@ -377,7 +377,7 @@
             CheckedIcon: this.domainManager().ImageUrl + '/Static/nav-icon-cart.active.png',
             DefaultColor: 'rgb(136, 136, 136)',
             CheckedColor: 'rgb(255, 69, 68)',
-            TagLink: "", //链接地址
+            TagLink: "/pages/cart/cart", //链接地址
             TagSort: 3, //排序
             IsActive: false
           },
@@ -390,7 +390,7 @@
             CheckedIcon: this.domainManager().ImageUrl + '/Static/nav-icon-user.active.png', //激活状态图片
             DefaultColor: 'rgb(136, 136, 136)', //默认字体颜色
             CheckedColor: 'rgb(255, 69, 68)', //激活字体颜色
-            TagLink: "", //链接地址
+            TagLink: "/pages/user-center/user-center", //链接地址
             TagSort: 4, //排序
             IsActive: false
           }
@@ -588,6 +588,7 @@
       },
       //重置
       resetInfo() {
+        var that = this;
         if (this.mallMsg.BottomTagList && this.mallMsg.BottomTagList.length > 0) {
           var tagIds = "0,";
           this.mallMsg.BottomTagList.forEach(item => {
@@ -600,15 +601,15 @@
             TagId: tagIds
           }, res => {
             if (res.data.resultCode == 1) {
-              this.Success(res.data.message);
+              that.mallMsg.BottomTagList = [];
+              that.mallMsg.TopNavBgColor = '#FFFFFF';
+              that.mallMsg.BottomTagList = JSON.parse(JSON.stringify(this.defaultTagList));
+              that.saveMsg();
             } else {
               this.Info(res.data.message);
             }
           })
         }
-        this.mallMsg.BottomTagList = [];
-        this.mallMsg.TopNavBgColor = '#FFFFFF';
-        this.mallMsg.BottomTagList = JSON.parse(JSON.stringify(this.defaultTagList));
       }
     },
     mounted() {