Merge branch 'nativehome_tst' of http://code.mayi888.com/chengmo/mayi-mp-shop into nativehome_tst

custom-tab-bar/index.wxml

@@ -28,7 +28,7 @@
 			</view>
 		</view>
 		<!-- 名称 -->
-		<view class="text" style="color: {{selected === index ? componentData.selectTextColor  : componentData.defaultTextColor}};font-size:{{selected === index ? componentData.selectionTextNum*2 : componentData.defaultTextNum*2}}rpx">
+		<view  wx:if="{{componentData['contentFormNum']!=3}}" class="text" style="color: {{selected === index ? componentData.selectTextColor  : componentData.defaultTextColor}};font-size:{{selected === index ? componentData.selectionTextNum*2 : componentData.defaultTextNum*2}}rpx">
 			{{item.title}}</view>
 	</view>
 </view>

src/pages/home/index.vue

@@ -51,19 +51,19 @@
           <div v-if="item.componentCode == 'pop-up' && item.componentInfo.visible == 1">
             <pop-up :datas="item"></pop-up>
           </div>
-          <div v-if="item.componentCode == 'coupon'">
+          <div v-if="item.componentCode == 'coupon' && item.componentInfo.visible == 1">
             <coupon :datas="item"></coupon>
           </div>
-          <div v-if="item.componentCode == 'integral-turntable'">
+          <div v-if="item.componentCode == 'integral-turntable' && item.componentInfo.visible == 1">
             <integralTurntable :datas="item"></integralTurntable>
           </div>
-          <div v-if="item.componentCode == 'speedy-nav'">
+          <div v-if="item.componentCode == 'speedy-nav' && item.componentInfo.visible == 1">
             <speedy-nav :datas="item"></speedy-nav>
           </div>
-          <div v-if="item.componentCode == 'video-player'">
+          <div v-if="item.componentCode == 'video-player' && item.componentInfo.visible == 1" >
             <video-player :datas="item" :indexs="index"></video-player>
           </div>
-          <div v-if="item.componentCode == 'official-account'">
+          <div v-if="item.componentCode == 'official-account' && item.componentInfo.visible == 1">
 			      <official-account></official-account>
           </div>
         </div>
@@ -197,13 +197,12 @@ export default {
     }
     // 获取页面数据
     if (this.mpApp.globalData.pageList) {
-      that.init(this.mpApp.globalData.pageList);
       
+      that.init(this.mpApp.globalData.pageList);
 
     } else {
       this.mpApp.pageCallBack = function (params) {
 
-        
         that.init(params);
       };
     }
@@ -258,6 +257,8 @@ export default {
       this.pageInfo = pageList.filter((item) => item.pageCode == 1)[0];
       this.pageData = JSON.parse(this.pageInfo.pageData);
       console.log("36", this.pageData);
+
+      wx.stopPullDownRefresh()
     },
     scrolls(el){
       this.setFooterShow(el);
@@ -297,6 +298,8 @@ export default {
     console.log('onPullDownRefresh')
     app.getShopInfo(extConfig);
     app.getThemePage(extConfig);
+
+    
   }
 };
 </script>