Merge branch 'B2C' of http://gitlab.oytour.com/zk123/jz_travel into B2C

components/tabbar/index.vue

 <template>
-  <view class="tabbarMain" :style="{paddingBottom: `${bottomSafeHeight}px`}" v-if="navs.length">
+	  <view class="tabbarMain" :style="{paddingBottom: `${bottomSafeHeight}px`}" v-if="navs.length && isExsits">
 		<view class="tabBtnMina">
 		  <view 
 			class="itmMain" 
@@ -27,7 +27,8 @@ export default {
       active: 0,
       navs: [],
       bottomSafeHeight: 0,
-	  currentPath:''
+	  currentPath:'',
+	  isExsits:true
     };
   },
   mounted() {
@@ -48,12 +49,12 @@ export default {
         .map(key => `${key}=${query[key]}`)
         .join('&')
 		this.currentPath = `/${currentPage.route}${queryString ? '?' + queryString : ''}`
-      
       this.navs.forEach((item, index) => {
         if (this.currentPath === item.url) {
           this.active = index
         }
       })
+	  this.isExsits = this.navs.findIndex(x=>x.url == this.currentPath)!=-1
     },
     goUrl(url) {
       if (this.currentPath !== url) {

pages/index/index.vue

@@ -295,6 +295,9 @@
 					},
 					(res) => {
 						this.myPageData = res.data;
+						if(this.pageId==0){
+							uni.setStorageSync('navs',this.myPageData.navbar.navs)
+						}
 						uni.setStorageSync("basedata", res.data);
 						if (res.data && res.data.mall && res.data.mall.setting) {
 							this.setting = res.data.mall.setting;