Merge branch 'dev_helixiaogushi_weixin_240717' of...

Merge branch 'dev_helixiaogushi_weixin_240717' of http://gitlab.mints-id.com/android/uniapp_vedio into dev_helixiaogushi_weixin_240717

vedio/manifest.json

 {
     "name" : "reader",
-    "appid" : "__UNI__F7F50FF",
+    "appid" : "__UNI__1EF86FE",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : 1000,

vedio/pages/home.vue

@@ -90,18 +90,28 @@
 			}
 		},
 		onShow() {
-			// try {
-			// 	// 在子组件重写show()代替onShow()
-			// 	if (this.currentPage == 0) {
-			// 		this.$refs.index.show();
-			// 	} else if (this.currentPage == 1) {
-			// 		this.$refs.recommend.show();
-			// 	} else if (this.currentPage == 2) {
-			// 		this.$refs.user.show();
-			// 	}
-			// } catch (e) {
+			try {
+				// 在子组件重写show()代替onShow()
+				if (this.currentPage == 0) {
+					this.$refs.index.show();
+				} else if (this.currentPage == 1) {
+					this.$refs.recommend.show();
+				} else if (this.currentPage == 2) {
+					this.$refs.user.show();
+				}
+			} catch (e) {
 
-			// }
+			}
+
+			let that = this
+			uni.$on('refreshPreviousPage', (data) => {
+				if (data.vipFlag == '1') {
+					// 开通vip刷新状态
+					if (that.currentPage == 2) {
+						that.$refs.user.show();
+					}
+				}
+			});
 		},
 		mounted() {
 			// 渲染完成 初始化首页数据
@@ -114,15 +124,7 @@
 				})
 			}
 
-			uni.$on('refreshPreviousPage', (data) => {
 
-				if (data.vipFlag == '1') {
-					// 开通vip刷新状态
-					if (that.currentPage == 2) {
-						that.$refs.user.show();
-					}
-				}
-			});
 		},
 		methods: {
 			tabChange(index) {

vedio/pagesA/vipPay/vipPay.vue

@@ -192,16 +192,7 @@
 					path: 'pages/index/index',
 					extraData: wxData.params,
 					success(res) {
-						message.notify('支付成功')
-
-						setTimeout(() => {
-							uni.$emit('refreshPreviousPage', {
-								vipFlag: '1'
-							});
-							uni.navigateBack({
-								delta: 1,
-							});
-						}, 1000);
+						uni.navigateBack()
 					},
 					fail(res) {
 						// 未成功跳转到签约小程序 
@@ -221,11 +212,11 @@
 					paySign: wxParams.paySign,
 					success(res) {
 						message.notify('支付成功')
+						uni.$emit('refreshPreviousPage', {
+							vipFlag: '1'
+						});
 
 						setTimeout(() => {
-							uni.$emit('refreshPreviousPage', {
-								vipFlag: '1'
-							});
 							uni.navigateBack({
 								delta: 1,
 							});