diff --git a/pages/index/center.vue b/pages/index/center.vue
index a987155..c0c334a 100644
--- a/pages/index/center.vue
+++ b/pages/index/center.vue
@@ -22,7 +22,7 @@
-
+
普通会员
@@ -39,7 +39,7 @@
代理商权益
- 将于{{userInfo.endTime}}到期
+ 将于{{userInfo.endTime || '-'}}到期
diff --git a/pages_order/sharing/group.vue b/pages_order/sharing/group.vue
index a86132a..b66ca87 100644
--- a/pages_order/sharing/group.vue
+++ b/pages_order/sharing/group.vue
@@ -5,7 +5,7 @@
{{ detail.headTitle || '' }}
- {{ `群人数:${detail.memberNum || 0}` }}
+ {{ `(${detail.memberNum || 0})` }}
diff --git a/pages_order/sharing/personal.vue b/pages_order/sharing/personal.vue
index 52a30e9..da0f8fd 100644
--- a/pages_order/sharing/personal.vue
+++ b/pages_order/sharing/personal.vue
@@ -9,9 +9,10 @@
-
+
+ 长按识别二维码,了解更多内容!
-
+
@@ -175,7 +176,7 @@
margin-top: 30rpx;
}
-.btn, .qr {
+.btn, .qr-popup {
position: absolute;
}
@@ -195,9 +196,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;
}
\ No newline at end of file
diff --git a/pages_order/sharing/video.vue b/pages_order/sharing/video.vue
index cb0f56e..bbfc68a 100644
--- a/pages_order/sharing/video.vue
+++ b/pages_order/sharing/video.vue
@@ -12,6 +12,7 @@
:show-fullscreen-btn="false"
:show-center-play-btn="true"
@timeupdate="onTimeupdate"
+ @ended="onTimeEnd"
>
{{ detail.author || '' }}
@@ -22,8 +23,9 @@
-
+
+
@@ -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) {
@@ -115,6 +116,11 @@
}
},
async initData() {
+ this.fetchCheckShare().then(result => {
+ const { open } = result
+
+ this.isLocked = !open
+ })
await this.fetchDetails(this.id)
this.videoContext = uni.createVideoContext('video');
@@ -137,7 +143,8 @@
if (open) {
this.isLocked = false
- this.$refs.popupQrCode.open()
+ this.timeIsUp = false
+ this.videoContext.play()
return
}
@@ -149,7 +156,6 @@
},
async onPlay() {
if (!this.isLocked) {
- this.$refs.popupQrCode.open()
return
}
@@ -160,8 +166,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',
@@ -172,13 +181,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()
+ },
},
}