Merge pull request 'fox' (#10) from fox into master

Reviewed-on: http://175.178.51.79:3000/hly/fission-star-applet-250304/pulls/10

pages_order/auth/wxLogin.vue

@@ -93,14 +93,9 @@
 				}
 			},
 			onCancel() {
-				uni.navigateBack({
-					delta: 1,
-					fail: () => {
-						uni.reLaunch({
-							url: '/pages/index/index'
-						})
-					}
-				});
+				uni.reLaunch({
+					url: '/pages/index/index'
+				})
 			},
 		}
 	}

pages_order/sharing/article.vue

@@ -55,7 +55,7 @@
 		},
     onShow() {
       if (this.id && uni.getStorageSync('token')) {
-        this.initData()
+        this.detail.id ? this.refreshLockStatus() : this.initData()
       }
     },
     async onLoad(option) {
@@ -103,8 +103,6 @@
       }
       this.$fetch('addLogShareInfo', params)
 
-      this.refreshLockStatus()
-
       return o
     },
     methods: {

pages_order/sharing/group.vue

@@ -48,7 +48,7 @@
 		},
     onShow() {
       if (this.id && uni.getStorageSync('token')) {
-        this.fetchDetails()
+        this.detail.id ? this.refreshLockStatus() : this.fetchDetails()
       }
     },
     onLoad(option) {
@@ -88,17 +88,12 @@
         query: `id=${this.id}&state=2&shareId=${this.userInfo.id}`,
       }
 	  
-	  //调用增加分享次数的方法
-	  	  const params = {
-	  	    id:this.id,
-	  	    state:"2",
-	  	  }
-	  	  this.$fetch('addLogShareInfo', params)
-	  
-	  
-	  
-
-      this.refreshLockStatus()
+	    //调用增加分享次数的方法
+      const params = {
+        id:this.id,
+        state:"2",
+      }
+      this.$fetch('addLogShareInfo', params)
 
       return o
     },

pages_order/sharing/personal.vue

@@ -49,7 +49,7 @@
 		},
     onShow() {
       if (this.id && uni.getStorageSync('token')) {
-        this.fetchDetails()
+        this.detail.id ? this.refreshLockStatus() : this.fetchDetails()
       }
     },
     onLoad(option) {
@@ -89,14 +89,12 @@
         query: `id=${this.id}&state=0&shareId=${this.userInfo.id}`,
       }
 
-
- //调用增加分享次数的方法
-	  const params = {
-	    id:this.id,
-	    state:"0",
-	  }
-	  this.$fetch('addLogShareInfo', params)
-      this.refreshLockStatus()
+      //调用增加分享次数的方法
+      const params = {
+        id:this.id,
+        state:"0",
+      }
+      this.$fetch('addLogShareInfo', params)
 
       return o
     },

pages_order/sharing/video.vue

@@ -62,7 +62,7 @@
 		},
     onShow() {
       if (this.id && uni.getStorageSync('token')) {
-        this.initData()
+        this.detail.id ? this.refreshLockStatus() : this.initData()
       }
     },
     async onLoad(option) {
@@ -110,8 +110,6 @@
       }
       this.$fetch('addLogShareInfo', params)
 
-      this.refreshLockStatus()
-
       return o
     },
     methods: {
@@ -123,11 +121,7 @@
         }
       },
       async initData() {
-        this.fetchCheckShare().then(result => {
-          const { open } = result
-
-          this.isLocked = !open
-        })
+        this.isLocked = true
         await this.fetchDetails(this.id)
 
         this.videoContext = uni.createVideoContext('video');
@@ -139,51 +133,22 @@
           return {}
         }
       },
-      async refreshLockStatus() {
-
-        const result = await this.fetchCheckShare()
-        const { title, open } = result
-
-        console.log('--open', open)
-
-        this.$refs.popupUnlock.close();
-
-        if (open) {
-          this.isLocked = false
-          this.timeIsUp = false
+      refreshLockStatus() {
+        this.isLocked = false
+        this.timeIsUp = false
+        setTimeout(() => {
           this.videoContext.play()
-          return
-        }
-
-        title && uni.showToast({
-          title,
-          icon: 'none'
+          console.log('--play')
         })
-
       },
       async onPlay() {
         if (!this.isLocked) {
           return
         }
-        
-        const result = await this.fetchCheckShare()
-        const { open, need_num, num } = result
-
-        console.log('--open', open)
-
-        if (open) { // 转发已达标
-          this.isLocked = false
-          this.timeIsUp = false
-          this.videoContext.play()
-        } else {
-          this.videoContext.pause()
-          this.timeIsUp = true
-          uni.showToast({
-            title: `还需转发${need_num - num}次`,
-            icon: 'none',
-          })
-          this.$refs.popupUnlock.open();
-        }
+   
+        this.videoContext.pause()
+        this.timeIsUp = true
+        this.$refs.popupUnlock.open();
       },
       async onTimeupdate(e) {
         const { currentTime } = e.target