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

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>
@@ -196,13 +196,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);
       };
     }
@@ -256,6 +255,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){
       if(this.$mp.page && this.$mp.page.selectComponent(".goodsListItem")){
@@ -278,6 +279,8 @@ export default {
     console.log('onPullDownRefresh')
     app.getShopInfo(extConfig);
     app.getThemePage(extConfig);
+
+    
   }
 };
 </script>