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

src/components/activity/spellGroup/index.vue

@@ -77,7 +77,9 @@
           :class="{ lastchild: swiperNum == index + 1 }"
           @click="onclickProduct(goodsList[index])"
         >
-          <goodsItem :datas="datas" :items="item" :style="{'margin-left':datas.componentData.proGap*2+'px'}"></goodsItem>
+          <div :style="{'margin-left':datas.componentData.proGap*2+'px'}">
+            <goodsItem :datas="datas" :items="item"></goodsItem>
+          </div>
         </div>
       </div>
       <!-- 瀑布流 -->

static/nativeComponents/TimeLimitedDiscount/activityListItem/index.wxml

@@ -8,7 +8,7 @@
 		{{datas.singleItemActivityName}}
 	</view>
 	<view class="cover">
-		<image src="{{datas.singleItemActivityCoverImage}}"></image>
+		<image mode="center" src="{{datas.singleItemActivityCoverImage}}"></image>
 	</view>
 	<view class="countDown flex" wx:if="{{countDownShow}}">
 		<van-count-down

static/nativeComponents/TimeLimitedDiscount/index.js

@@ -232,7 +232,7 @@ const componentOptions = {
                 new Date(item.endTime.replace(/-/g, "/")).getTime() -
                 new Date().getTime();
               item.singleItemActivityCoverImage = DFSImg(
-                item.singleItemActivityCoverImage
+                item.singleItemActivityCoverImage,400,400
               );
               item.isStart =
                 new Date(item.startTime.replace(/-/g, "/")).getTime() >
@@ -245,6 +245,7 @@ const componentOptions = {
             if (hideNum == actList.length) {
               this.setData({ hideAll: true });
             }
+            this.setData({ isLoading: false });
           }
         }
       });

static/nativeComponents/TimeLimitedDiscount/index.json

@@ -2,6 +2,7 @@
   "component": true,
   "usingComponents": {
     "activity-list-item":"./activityListItem/index",
-    "van-count-down": "/static/vant/count-down/index"
+    "van-count-down": "/static/vant/count-down/index",
+    "skeleton-block": "../module/SkeletonBlock/index"
   }
 }

static/nativeComponents/TimeLimitedDiscount/index.wxml

@@ -119,12 +119,21 @@
 	</view>
 	<!-- 活动列表 -->
 	<activity-list-item
-	 wx:if="{{datas.componentData.dimension == 1}}"
+	 wx:if="{{datas.componentData.dimension == 1 && !isLoading}}"
 	 wx:for="{{datas.componentData.actList}}"
 	 wx:key="index"
 	 datas="{{item}}"
 	 num="{{index}}"
 	 countDownShow="{{datas.componentData['countDownShow']}}"
 	></activity-list-item>
+	<view wx:if="{{isLoading}}">
+		<skeleton-block
+		 loading="{{isLoading}}"
+		 type="{{'row'}}"
+		 height="60"
+		 row="1"
+		 col="1"
+		></skeleton-block>
+	</view>
 </view>