Merge branch 'master' into release-20170915

pages/mobile/center/index.vue

@@ -439,7 +439,7 @@
     watch: {
       '$route.query': {
         handler: function (val, old) {
-//          this.switchSeek('wait')
+          this.switchSeek('wait')
           if (val.type === 'saler' && !this.shopuuid.uuid) {
             this.$store.dispatch('loadStoreStatus', { op: 'check' })
           }

pages/mobile/user/index.vue

@@ -264,7 +264,7 @@
           <i class="el-icon-close" @click="isShowTypeAlert = false"></i>
         </div>
         <div class="content-title-label clearfix" >
-          <div v-for="(item, index) in ContentTitleArray" @click="chooseTitle(index)">
+          <div v-for="(item, index) in ContentTitleArray" @click="chooseTitle(index)" v-if="item !== ''">
             <a :class="{active: index === titleActive}">{{item}}</a>
           </div>
         </div>
@@ -312,7 +312,7 @@
         AddBtnShow: true,
         labelText: '',
         scopeLabel: [],
-        ContentTitleArray: [], // 行业数组
+        ContentTitleArray: ['', '', ''], // 行业数组
         isSearchSearchingMore: false,
         collectResult: '',
         timeoutCount: 0,
@@ -408,6 +408,7 @@
         if (listIndex === 'firstList') {
           this.TypeListActive.firstListActive = index
           this.ContentTitleArray[0] = key
+          // alert(this.ContentTitleArray)
           this.TypeList.secondsList = []
           this.titleActive = 0
           if (this.TypeObj[key] instanceof Array) {
@@ -449,8 +450,8 @@
             this.enterpriseInfo.enIndustry = key
             this.isShowTypeAlert = false
             this.TypeListShow = {
-              firstListShow: true,
-              secondsListShow: false,
+              firstListShow: false,
+              secondsListShow: true,
               threetListShow: false
             }
           }
@@ -461,9 +462,9 @@
           this.enterpriseInfo.enIndustry = key
           this.isShowTypeAlert = false
           this.TypeListShow = {
-            firstListShow: true,
+            firstListShow: false,
             secondsListShow: false,
-            threetListShow: false
+            threetListShow: true
           }
         }
       },