Merge branch 'master' into 2941-optimization

@@ -337,6 +337,11 @@ Page(Object.assign({
           if (res.data.defaultUrl) {
             defaultImage = res.data.defaultUrl;
           }
+          
+          this.setData({
+            defaultImage
+          });
+          wx.hideLoading();
 
           let productDesc = [];
 
@@ -395,7 +400,6 @@ Page(Object.assign({
             assistLimit: res.data.helpLimit ? res.data.helpLimit : 0,
             queueType: res.data.queueType ? res.data.queueType : QUEUE_TYPE.READY,
             activityId: res.data.activityId ? res.data.activityId : '',
-            defaultImage,
             productDesc,
             snapData,
             productSourceType

@@ -23,22 +23,32 @@
     <view class="detail-btn" bindtap="buyNow">查看商品详情</view>
 </view>
 <view class="line"></view>
-<image class="banner-image" bindtap="goList" src="../../../static/images/banner.png"></image>
+<image class="banner-image" lazy-load bindtap="goList" src="../../../static/images/banner.png"></image>
 <view class="detail-container">
     <view class="goodsInfo">
         <view wx:for="{{productDesc}}">
-            <block wx:if="{{item.type === 4}}">
-                <image class="intro-image" src="{{item.imageUrl}}" wx:if="{{item.imageUrl}}" mode="widthFix"></image>
+            <block wx:if="{{item.type === 2}}">
+                <!--<video class="desc-video" src="{{item.imageUrl}}"></video>-->
             </block>
             <block wx:else>
-                <image class="intro-image" src="{{item.imageUrl}}" wx:if="{{item.imageUrl}}" mode="widthFix"></image>
-                <view class="desc">{{item.intro}}</view>
+                <block wx:if="{{item.type === 4}}">
+                    <image lazy-load class="intro-image" src="{{item.imageUrl}}?imageslim" 
+                           wx:if="{{item.imageUrl}}" 
+                           mode="widthFix"></image>
+                </block>
+                <block wx:if="{{item.type === 1}}">
+                    <image lazy-load class="intro-image" src="{{item.imageUrl}}?imageslim" 
+                           wx:if="{{item.imageUrl}}" mode="widthFix"></image>
+                </block>
+                <block wx:if="{{item.type === 3}}">
+                    <view class="desc">{{item.intro}}</view>
+                </block>
             </block>
         </view>
     </view>
 </view>
 
-<image class="bottom-image" bindtap="goYohobuy" src="../../../static/images/bottom.png"></image>
+<image class="bottom-image" lazy-load bindtap="goYohobuy" src="../../../static/images/bottom.png"></image>
 
 <view wx:if="{{showAssistList}}" style="height:70rpx;"></view>
 <view style="height:100rpx;"></view>