5.14号，核销调整

This reverts commit d201e82abea147a9c155eb225caa9c7f43c41754.

components/vlog/guanzhu.nvue

@@ -1042,7 +1042,6 @@ export default {
 			this.page = 1;
 			this.dataList = [];
 			this.k = 0;
-			this.userId = '';
 		},
 		async get() {
 			// 这个方法主要就是用来第一次进入视频播放时用来处理的

components/vlog/local.nvue

@@ -1048,7 +1048,6 @@ export default {
 			this.page = 1;
 			this.dataList = [];
 			this.k = 0;
-			this.userId = '';
 		},
 		async get() {
 			// 这个方法主要就是用来第一次进入视频播放时用来处理的

components/vlog/tuijian.nvue

@@ -1049,7 +1049,6 @@ export default {
 			this.page = 1;
 			this.dataList = [];
 			this.k = 0;
-			this.userId = '';
 		},
 		async get() {
 			// 这个方法主要就是用来第一次进入视频播放时用来处理的

manifest.json

@@ -3,9 +3,8 @@
 	"appid": "__UNI__6DB512D",
 	"description": "admin",
 	"versionName": "4.0.0",
-    "versionCode" : 404,
+	"versionCode": 403,
 	"transformPx": false,
-    "sassImplementationName" : "node-sass",
 	"app-plus": {
 		"android": {
 			"versionCode": 4000049, // Android 版本号
@@ -117,8 +116,7 @@
 					"weixin": {
 						"appid": "wxebcdaea31881caab",
 						"UniversalLinks": "https://wuzhongjie.com.cn/ulink/"
-                    },
+					}
-                    "apple" : {}
 				},
 				"geolocation": {
 					"amap": {

pages/me/vlog.nvue

@@ -1046,7 +1046,6 @@ export default {
 			this.page = 1;
 			this.dataList = [];
 			this.k = 0;
-			this.userId = '';
 		},
 		async get() {
 			// 这个方法主要就是用来第一次进入视频播放时用来处理的

pages/passport/login.vue

@@ -201,17 +201,9 @@ export default {
 					code: 'APPLE'
 				}
 			],
-			initurl: false,
+			initurl: false
-			channelComment: null
 		};
 	},
-	destroyed() {
-		console.log('登录面销毁');
-		// 销毁时关闭 BroadcastChannel
-		if (this.channelComment) {
-			this.channelComment.close();
-		}
-	},
 
 	onShow() {
 		//#ifdef H5
@@ -350,7 +342,6 @@ export default {
 		}
 	},
 	onLoad(options) {
-		this.channelComment = new BroadcastChannel('comment-counts');
 		if (options.init == 'index') {
 			this.initurl = true;
 		}
@@ -573,11 +564,7 @@ export default {
 					storage.setVlogToken(vlogInfo.userToken);
 					storage.setVlogUserInfo(vlogInfo);
 					storage.setRefreshVlogIndex('1');
-					// 刷新videoList
+
-					this.channelComment.postMessage({
-						type: 'comment-counts',
-						data: { lahei: true }
-					});
 					/**
 					 * 登录成功后获取个人信息
 					 */
@@ -587,7 +574,6 @@ export default {
 							/**
 							 * 个人信息存储到缓存userInfo中
 							 */
-
 							storage.setUserInfo(user.data.result);
 							storage.setHasLogin(true);
 							// loginIm

pages/tabbar/user/utils/tool.vue

@@ -183,13 +183,13 @@ export default {
           const par = res.result.split("|");
           getGoodstake(par[0], par[1], { storeid: par[2] }).then((resfn) => {
             console.log("resfn", resfn);
-            
+            let title = resfn.data.code === 200 ? "核销成功" : "核销失败";
-            if (resfn.data.success) {
+            uni.showModal({
-              uni.showToast({
+              title: "提示",
-                title: resfn.data.message,
+              content: title,
-                icon: "none",
+              showCancel: false,
+              confirmText: "确定",
             });
-            }
 
             // }
           });

pages/tabbar/vlog/index.nvue

@@ -215,14 +215,17 @@ export default {
 			// this.$refs[prop].showVd();
 			console.log('是否刷新：' + storage.getRefreshVlogIndex());
 			if (storage.getRefreshVlogIndex() === '1') {
+				try {
+					storage.setRefreshVlogIndex('0'); //初始完数据修改状态不需要刷新
+					console.log('是否刷新：' + storage.getRefreshVlogIndex());
 					// 登录后需要刷新数据
 					for (var i = 0; i < this.pageList.length; i++) {
-					if (this.$refs[i]) {
 						this.$refs[i].dataList = []; //所有数据清空
 					}
-				}
 					this.$refs[prop].get(); //只初始化当前所在位置的数据
-				storage.setRefreshVlogIndex('0'); //初始完数据修改状态不需要刷新
+				} catch (err) {
+					console.log(err + '255');
+				}
 			} else {
 				try {
 					this.$refs[prop].showVd();
@@ -238,10 +241,8 @@ export default {
 		if (storage.getRefreshVlogIndex() == '1') {
 			// 登录后需要刷新数据
 			for (var i = 0; i < this.pageList.length; i++) {
-				if (this.$refs[i]) {
 				this.$refs[i].dataList = []; //所有数据清空
 			}
-			}
 			this.$refs[prop].get(); //只初始化当前所在位置的数据
 			storage.setRefreshVlogIndex('0'); //初始完数据修改状态不需要刷新
 		} else {

uni_modules/TencentCloud-Push/utssdk/app-android/config.json

@@ -11,7 +11,9 @@
 		"com.tencent.timpush:xiaomi:8.5.6864",
 		"com.tencent.timpush:oppo:8.5.6864",
 		"com.tencent.timpush:meizu:8.5.6864",
-    "com.tencent.timpush:fcm:8.5.6864"
+		"com.tencent.timpush:fcm:8.5.6864",
+		"com.tencent.timpush:honor:8.5.6864",
+		"com.tencent.timpush:vivo:8.5.6864"
 	],
 	"project": {
 		"plugins": [