修改登录流程

src/app.wpy

@@ -32,12 +32,6 @@ wepy.app({
       }
     });
     wx.setStorageSync('onNetworkStatusChange', true);
-    if (!wx.getStorageSync('openId')) {
-      const { code } = await wepy.wx.login();
-      const userInfo = await login(code);
-      wx.setStorageSync('openId', userInfo.openid);
-      wx.setStorageSync('isRegister', userInfo.register);
-    }
     // wx.checkSession({
     //   success () {
     //     console.log('已登录');

src/common/api.js

@@ -21,7 +21,7 @@ module.exports = {
     return http.post('/api/prize/feed', qs.stringify(params));
   },
   addGold(params) {
-    return http.post('/api/user/book', params);
+    return http.post('/api/user/book', qs.stringify(params));
   },
   signIn(params) {
     return http.post('/api/user/signin', params, { 'content-type': 'application/json' });

src/common/wxRequest.js

@@ -42,6 +42,7 @@ const request = async (url, options) => {
       throw new Error(res.data.msg || '服务器异常,请稍后重试');
     }
     Notify({ message: '服务器异常,请稍后重试', background: '#FF5D15', safeAreaInsetTop });
+    throw new Error(res.data.msg || '服务器异常,请稍后重试');
   });
 };
 

src/components/custom/openAnimation.wpy

@@ -23,7 +23,7 @@
             </div>
             <div class="success-content" v-if="isWin">
               <div class="des">恭喜您中奖!</div>
-              <image class="image" :src="joinRecord.prize.photoUrl"></image>
+              <image class="image" :src="joinRecord.prize.photoUrl" mode="aspectFill"></image>
               <div class="name">{{joinRecord.prize.name}}</div>
             </div>
             <div class="dialog-footer">
@@ -57,6 +57,7 @@
     },
     computed: {
       isWin() {
+        if (!this.joinRecord.id) return false;
         return +this.joinRecord.status.value === 3;
       }
     },
@@ -299,6 +300,7 @@
               overflow: hidden;
               text-overflow: ellipsis;
               font-size: 24rpx;
+              text-align: center;
             }
           }
           .dialog-footer {

src/components/custom/sharedPopup.wpy

@@ -61,7 +61,6 @@
     methods: {
       getGold: function() {
         this.$emit('getSharedGold', {
-          openid: wx.getStorageSync('openId'),
           itemIdList: this.ids.join(','),
           quantity: this.goldNum
         });

src/components/custom/sign.wpy

@@ -85,6 +85,10 @@
         type: String,
         default: ''
       },
+      isReceive: {
+        type: Boolean,
+        default: false
+      }
     },
     computed: {
       goldUrl() {
@@ -107,15 +111,12 @@
       }
     },
     watch: {
+      isReceive(newVal, oldVal) {
+        this.addGold = true;
+      },
       des(newVal, oldVal) {
         if (this.type === 'gold') {
-          if (this.addCount <= 1) {
-            this.addCount ++;
-            return;
-          }
-          this.addGold = true;
           this.addGoldNum = newVal - oldVal;
-          this.addCount ++;
         }
       },
       gold(v) {

src/components/custom/videolist.wpy

@@ -3,11 +3,16 @@
     width:100%;
     height:100%;
   }
-  .video_item{
+  .video-item{
     height:100%;
     width:100%;
     position: absolute;
     z-index: 1;
+    display: flex;
+    align-items: center;
+  }
+  .video-wrapper {
+    width: 100%;
   }
   .rightcont {
     font-size: 24rpx;
@@ -63,7 +68,7 @@
       bindchange="cancelPause"
     >
       <!-- curQueue 循环会导致video重新插入，objectFit 不可变更 -->
-      <swiper-item wx:for="{{curQueue}}" wx:key="index">
+      <swiper-item class="video-item" wx:for="{{curQueue}}" wx:key="index">
         <view class="video-wrapper">
           <!-- <video
             id="video_{{index}}"
@@ -91,8 +96,9 @@
               <view class="orange" style="{{item.progressStyle}}"></view>
             </view>
           </view>
-          <!-- <video-loading v-if="item.time === 0"/> -->
+          <!-- <van-image lazy-load custom-class="images" :src="item.photoUrl" mode="contain" /> -->
           <image class="images" :src="item.photoUrl" mode="widthFix"></image>
+          <!-- <video-loading v-if="item.time === 0"/> -->
         </view>
       </swiper-item>
     </swiper>
@@ -305,6 +311,7 @@
         }
       },
       async playCurrent(current) {
+        if (!this.curQueue || this.curQueue.length <= 1) return;
         await this.getProgress(this.curQueue[current].id);
         const { batchId, photoUrl, name, probability, progress } = this.curQueue[current];
         this.$emit('getAwardsInfo', {
@@ -348,7 +355,8 @@
 {
     usingComponents: {
       'video-pause': '~@/components/custom/videoPause',
-      'video-loading': '~@/components/custom/loading'
+      'video-loading': '~@/components/custom/loading',
+      "van-image": "~@/components/vant/image/index"
     }
 }
 </config>

src/pages/index.wpy

 <style lang="less">
   page{
     height: 100%;
+    background-color: #000;
   }
   .video-wrapper{
     width: 100%;
@@ -35,7 +36,7 @@
   .leftcont {
     width: 44%;
     float: left;
-    font-size: 12px;
+    font-size: 24rpx;
     margin-left: 30rpx;
   }
   .list-wrapper {
@@ -48,7 +49,11 @@
     vertical-align: middle;
   }
   .leftcont .text {
-    margin-left: 5px;
+    max-width: 200rpx;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    margin-left: 10rpx;
     vertical-align: middle;
     border-radius: 20rpx;
     display: inline-block;
@@ -177,7 +182,7 @@
       <image src="{{userInfo.avatarUrl || '/static/images/user@2x.png'}}" mode="cover" class="userimage"></image>
     </view>
     <view>
-      <video-gold type="gold" :des="mainInfo && mainInfo.account && mainInfo.account.quantity || 0" :gold="sign"></video-gold>
+      <video-gold type="gold" :des="mainInfo && mainInfo.account && mainInfo.account.quantity || 0" :gold="sign" :isReceive="isReceive"></video-gold>
       <video-sign type="sign" des="签到" :sign="sign" @sign-in="signIn"></video-sign>
       <video-lottery type="lottery" des="抽奖" @tap="getAwards"></video-lottery>
       <video-share type="share" des="分享"></video-share>
@@ -223,7 +228,7 @@
         </swiper-item>
       </swiper>
     </view> -->
-    <view class="authmodal" v-if="authmodal">
+    <view class="authmodal" v-show="authmodal">
       <view class="wrap">
         <view class="text">来到lukii，再平凡的人，<br>也有幸运的权利！</view>
         <button open-type="getUserInfo" bindgetuserinfo="getUserInfo">授权并进入</button>
@@ -242,7 +247,7 @@
   import { mapState, mapActions } from '@wepy/x';
   import wepy from '@wepy/core';
   import Notify from '../components/vant/notify/notify';
-  import { register, getUserInfo, addGold, getPrizeList, signIn, getActivityFeed } from '../common/api.js';
+  import { login, register, getUserInfo, addGold, getPrizeList, signIn, getActivityFeed } from '../common/api.js';
   wepy.page({
     store,
     hooks: {
@@ -274,7 +279,8 @@
       mainInfo: null,
       showShareModal: false,
       showAwardsModal: false,
-      awardsInfo: {}
+      awardsInfo: {},
+      isReceive: false
     },
 
     computed: {
@@ -465,7 +471,7 @@
               if (rs) {
                 that.sign = true;
 
-                setTimeout(() => {
+                setTimeout(async () => {
                   const innerAudioContext = wx.createInnerAudioContext();
                   innerAudioContext.autoplay = true;
                   innerAudioContext.src = '/static/audio/supermarie.mp3';
@@ -476,8 +482,9 @@
                     console.log(res.errMsg);
                     console.log(res.errCode);
                   });
-                  that.mainInfo.account.quantity += 1;
-                  signIn();
+                  const { coins } = await signIn();
+                  if (coins === 0) return;
+                  that.mainInfo.account.quantity = coins;
                 }, 1500);
               } else {
                 Notify({ message: '签到必须同意推送授权!', background: '#FF5D15', safeAreaInsetTop: true });
@@ -512,9 +519,13 @@
       },
       getAwards: function() {
         const { batchId, photoUrl, quantity, name, chance, progress } = this.awardsInfo;
-        if (!batchId) return;
+        if (!batchId || !this.mainInfo || !this.mainInfo.account) {
+          Notify({ message: '服务器异常,请稍后重试', background: '#FF5D15', safeAreaInsetTop: true});
+          return;
+        }
         if (this.mainInfo && this.mainInfo.account && this.mainInfo.account.quantity === 0) {
           Notify({ message: '您的克币数为0, 无法参与抽奖', background: '#FF5D15', safeAreaInsetTop: true});
+          return;
         }
         wx.navigateTo({
           url: `/pages/raffle?batchId=${batchId}&progress=${progress}&chance=${chance}&photoUrl=${photoUrl}&quantity=${quantity}&name=${name}`
@@ -530,6 +541,7 @@
         this.showShareModal = false;
         await addGold(v);
         this.mainInfo.account.quantity += v.quantity;
+        this.isReceive = true;
         setTimeout(() => {
           if (this.mainInfo.joinRecord && this.mainInfo.joinRecord.id) {
             this.showAwardsModal = true;
@@ -539,7 +551,7 @@
       getMainInfo: async function() {
         this.mainInfo = await getUserInfo(wx.getStorageSync('openId'));
         this.sign = this.mainInfo.signin;
-        wx.setStorageSync('hasPhone', this.mainInfo.phone || false);
+        wx.setStorageSync('hasPhone', this.mainInfo.phone);
         if (this.mainInfo.inviteRecord && this.mainInfo.inviteRecord.length) {
           this.showShareModal = true;
         } else if (this.mainInfo.joinRecord && this.mainInfo.joinRecord.id) {
@@ -560,6 +572,16 @@
     async onLoad (options) {
       if (options.openid) {
         this.inviter = options.openid;
+        Notify({ message: this.inviter, background: '#FF5D15', safeAreaInsetTop: true });
+      }
+
+      wx.setStorageSync('openId', false);
+
+      if (!wx.getStorageSync('openId')) {
+        const { code } = await wepy.wx.login();
+        const userInfo = await login(code);
+        wx.setStorageSync('openId', userInfo.openid);
+        wx.setStorageSync('isRegister', userInfo.register);
       }
 
       let self = this;
@@ -578,8 +600,8 @@
 
       await this.getMainInfo();
       this.videoList = await getPrizeList();
-      // 如果已经存在store里就不用再获取用户信息了
       this.adlist = await getActivityFeed({ count: 50 });
+      // 如果已经存在store里就不用再获取用户信息了
       if (!this.userInfo) {
         const setting = await wepy.wx.getSetting();
         if (setting.authSetting['scope.userInfo']) {