Merge branch 'feature/销售线索4' of http://git.gicdev.com/office/haoban-3 into dev

src/views/apps/customerApp/index.vue

@@ -140,6 +140,8 @@ export default {
               tabName: '会员标签设置',
               icon: ''
             };
+          } else if (this.$route.path === '/memberTagSet') {
+            this.$router.replace('memberShowSet');
           }
           this.$nextTick(() => {
             this.tabListData = [].concat(list);

src/views/enterpriseData/enterpriseUseData.vue

@@ -310,15 +310,15 @@ export default {
     }
   },
   watch: {
-    activeBrand: function(newData, oldData) {
-      const that = this;
-      if (newData) {
-        // that.getLoginData();
-        // that.getTendData();
-        // that.getAreaLoginData();
-      }
-      that.activeBrand = newData;
-    }
+    // activeBrand: function(newData, oldData) {
+    //   const that = this;
+    //   if (newData) {
+    //     // that.getLoginData();
+    //     // that.getTendData();
+    //     // that.getAreaLoginData();
+    //   }
+    //   that.activeBrand = newData;
+    // }
   },
   mounted() {
     const that = this;