improvement: 活动弹窗功能

src/components/custom/video.wpy

@@ -33,7 +33,7 @@
             <van-loading slot="loading" type="spinner" size="20" vertical/>
           </van-image>
           <view class="rightcont" v-show="item.id > 0">
-            <view class="info">奖品剩余: {{item.stock}}/{{item.totalStock}}</view>
+            <view class="info">奖品剩余: {{item.stock}}</view>
             <view class="info">中奖概率: {{item.probability}}</view>
             <view class="progress">
               <view class="text">{{item.progress}}</view>

src/pages/index.wpy

@@ -221,7 +221,7 @@
     <!--活动图片弹窗-->
     <van-popup show="{{ avtivityModal }}" bind:close="ModalClose" round closeable>
       <view class="img-wrapper">
-        <van-image use-loading-slot src="{{ mainInfo.activity }}" width="400rpx" fit="widthFix" radius="10rpx">
+        <van-image use-loading-slot src="{{ mainInfo.activity && mainInfo.activity.link_url }}" width="400rpx" fit="widthFix" radius="10rpx">
           <van-loading slot="loading" type="spinner" size="30" vertical />
         </van-image>
       </view>
@@ -407,14 +407,14 @@
         this.mainInfo = await getMainInfo();
         this.sign = this.mainInfo && this.mainInfo.signin;
         wx.setStorageSync('hasPhone', this.mainInfo.phone);
-        const show = wx.getStorageSync('hasShowActivity');
+        const activityId = wx.getStorageSync('activityId');
         if (this.mainInfo && this.mainInfo.innerActivity) {
           wx.setStorageSync('innerActivity', this.mainInfo.innerActivity);
         } else {
           wx.setStorageSync('innerActivity', '');
         }
         // 弹窗有多个，展示顺序 1、活动弹窗 2、邀请好友 3、购买获得克币 4、开奖宝箱
-        if(this.mainInfo.activity && !show) {
+        if(this.mainInfo.activity && this.mainInfo.activity.id && this.mainInfo.activity.id !== +activityId) {
           this.avtivityModal = true;
         } else if (this.mainInfo.inviteRecord && this.mainInfo.inviteRecord.length) {
           this.showModal = 1;
@@ -455,7 +455,7 @@
       ModalClose() {
         this.cornModal && (this.cornModal = false);
         if(this.avtivityModal) {
-          wx.setStorageSync('hasShowActivity', 1);
+          wx.setStorageSync('activityId', this.mainInfo.activity.id);
           this.avtivityModal = false;
           if (this.mainInfo.inviteRecord && this.mainInfo.inviteRecord.length) {
             this.showModal = 1;

src/pages/search.wpy

@@ -98,7 +98,7 @@
 </script>
 <config>
   {
-    navigationBarTitleText: 'Luckii',
+    navigationBarTitleText: '搜索',
     "usingComponents": {
       "van-field": "../components/vant/field/index",
       "van-image": "../components/vant/image/index",