Merge branch 'feature/activity' into 'master'

活动信息不用跑马灯

See merge request !27

src/pages/index.wpy

@@ -189,8 +189,15 @@
     </view>
     <view class="content">
       <view class="leftcont">
-        <swiper class="list-wrapper" vertical="true" circular="true" display-multiple-items="2" autoplay="true" interval="1500">
-          <swiper-item  wx:for="{{adlist}}" wx:key="index" catch:touchmove>
+        <swiper 
+          class="list-wrapper"
+          vertical="{{true}}" 
+          circular="{{false}}" 
+          display-multiple-items="{{activityDisplayItems}}" 
+          bindchange="onActivityChange" 
+          autoplay="{{autoplayActivity}}" 
+          interval="1500">
+          <swiper-item  wx:for="{{activityList}}" wx:key="index" catch:touchmove>
             <view class="imgwrap">
               <image class="img" src="{{item.avatarUrl}}"></image>
               <view class="text">{{item.content}}</view>
@@ -256,7 +263,11 @@
 
     data: {
       list: [], // 商品list
-      adlist: [],
+
+      // 活动信息
+      activityList: [],
+      activityDisplayItems: 2,
+  
       current: 5, // 商品列表初次展示第几个
 //      userInfo: {},
       swiperItem: 2,
@@ -280,7 +291,9 @@
       showShareModal: false,
       showAwardsModal: false,
       awardsInfo: {},
-      isReceive: false
+      isReceive: false,
+
+      autoplayActivity: false
     },
 
     computed: {
@@ -572,6 +585,18 @@
           await register(params);
           wx.setStorageSync('isRegister', true);
         }
+      },
+      async showActivity() {
+        // 1期方案先一次取50
+        const list = await getActivityFeed({ count: 50 });
+        this.activityList = list;
+        this.autoplayActivity = true;
+      },
+      onActivityChange(e) {
+        const lastIndex = this.activityList.length - this.activityDisplayItems;
+        if (e.$wx.detail.current === lastIndex) {
+          this.autoplayActivity = false;
+        }
       }
     },
     async onLoad (options) {
@@ -603,8 +628,9 @@
       }
       await this.getMainInfo();
       this.videoList = await getPrizeList();
-      this.adlist = await getActivityFeed({ count: 50 });
+      this.showActivity();
     }
+  
   });
 </script>
 <config>