Merge branch 'master' of http://175.178.51.79:3000/hly/fission-star-applet-250304

pages/index/center.vue

@@ -22,7 +22,7 @@
 					<!-- <view v-else class="tag" >
 						代理商:{{userInfo.endTime}} 到期
 					</view> -->
-					<view v-else class="tag" v-else>
+					<view v-else class="tag">
 						普通会员
 					</view>
 				</view>
@@ -39,7 +39,7 @@
 					<view class="activate-tips" style="padding-left: 27rpx;">
 						<view>代理商权益</view>
 						<view>
-							将于<text class="activate-highlight">{{userInfo.endTime}}</text>到期
+							将于<text class="activate-highlight">{{userInfo.endTime || '-'}}</text>到期
 						</view>
 					</view>
 					<view class="btn-activate" @click="onActivate">

pages_order/sharing/group.vue

@@ -5,7 +5,7 @@
     <view class="content">
       <image class="avatar" :src="detail.headImage"></image>
       <text class="nick-name">{{ detail.headTitle || '' }}</text>
-      <text class="desc">{{ `群人数：${detail.memberNum || 0}` }}</text>
+      <text class="desc">{{ `（${detail.memberNum || 0}）` }}</text>
 
       <template v-if="isLocked">
         <button class="btn" type="success" @click="onAdd">加入</button>

pages_order/sharing/personal.vue

@@ -9,9 +9,10 @@
       <template v-if="isLocked">
         <button class="btn" type="success" @click="onAdd">添加</button>
       </template>
-      <template v-else>
+      <view v-else class="flex flex-column qr-popup">
+        <text class="tips">长按识别二维码，了解更多内容！</text>
         <image class="qr" :src="detail.wxCodeImage" :show-menu-by-longpress="true"></image>
-      </template>
+      </view>
     </view>
 
     <popupUnlock ref="popupUnlock" src="../static/sharing/unlock-user.png"></popupUnlock>
@@ -182,7 +183,7 @@
   margin-top: 30rpx;
 }
 
-.btn, .qr {
+.btn, .qr-popup {
   position: absolute;
 }
 
@@ -202,9 +203,19 @@
   box-sizing: border-box;
 }
 
+.qr-popup {
+  width: 100vw;
+  bottom: 269rpx;
+  
+  .tips {
+    color: #1B1B1B;
+    font-size: 32rpx;
+  }
+}
+
 .qr {
+  margin-top: 40rpx;
   width: 350rpx;
   height: 350rpx;
-  bottom: 269rpx;
 }
 </style>

pages_order/sharing/video.vue

@@ -12,6 +12,7 @@
         :show-fullscreen-btn="false"
         :show-center-play-btn="true"
         @timeupdate="onTimeupdate"
+        @ended="onTimeEnd"
       ></video>
       <view class="info">
         <view class="author">{{ detail.author || '' }}</view>
@@ -22,8 +23,9 @@
 
     <uv-overlay :show="timeIsUp" @click="onPlay" zIndex="998">
       <popupUnlock ref="popupUnlock" src="../static/sharing/unlock-video.png"></popupUnlock>
-      <popupQrCode ref="popupQrCode" :src="detail.wxCodeImage"></popupQrCode>
     </uv-overlay>
+
+    <popupQrCode ref="popupQrCode" :src="detail.wxCodeImage"></popupQrCode>
   </view>
 </template>
 
@@ -52,7 +54,7 @@
         },
         timeIsUp: false,
         isLocked: true,
-        videoContext: null
+        videoContext: null,
       }
     },
 		computed: {
@@ -64,7 +66,6 @@
       }
     },
     async onLoad(option) {
-      console.log('--onLoad', option)
       const { id, state, shareId } = option
 
 			if (shareId) {
@@ -122,6 +123,11 @@
         }
       },
       async initData() {
+        this.fetchCheckShare().then(result => {
+          const { open } = result
+
+          this.isLocked = !open
+        })
         await this.fetchDetails(this.id)
 
         this.videoContext = uni.createVideoContext('video');
@@ -144,7 +150,8 @@
 
         if (open) {
           this.isLocked = false
-          this.$refs.popupQrCode.open()
+          this.timeIsUp = false
+          this.videoContext.play()
           return
         }
 
@@ -156,7 +163,6 @@
       },
       async onPlay() {
         if (!this.isLocked) {
-          this.$refs.popupQrCode.open()
           return
         }
         
@@ -167,8 +173,11 @@
 
         if (open) { // 转发已达标
           this.isLocked = false
-          this.$refs.popupQrCode.open()
+          this.timeIsUp = false
+          this.videoContext.play()
         } else {
+          this.videoContext.pause()
+          this.timeIsUp = true
           uni.showToast({
             title: `还需转发${need_num - num}次`,
             icon: 'none',
@@ -179,13 +188,15 @@
       async onTimeupdate(e) {
         const { currentTime } = e.target
 
-        // todo: check
-        if (currentTime >= this.detail.timeNum) {
+        if (currentTime >= this.detail.timeNum && this.isLocked) {
           this.videoContext.pause()
           this.timeIsUp = true
           this.onPlay()
         }
       },
+      onTimeEnd() {
+        this.$refs.popupQrCode.open()
+      },
     },
   }
 </script>