components/vlog/guanzhu.nvue

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

components/vlog/local.nvue

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

components/vlog/tuijian.nvue

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

manifest.json

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

pages/me/vlog.nvue

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

pages/passport/login.vue

@@ -201,9 +201,17 @@ export default {
 					code: 'APPLE'
 				}
 			],
-			initurl: false
+			initurl: false,
+			channelComment: null
 		};
 	},
+	destroyed() {
+		console.log('登录面销毁');
+		// 销毁时关闭 BroadcastChannel
+		if (this.channelComment) {
+			this.channelComment.close();
+		}
+	},
 
 	onShow() {
 		//#ifdef H5
@@ -342,6 +350,7 @@ export default {
 		}
 	},
 	onLoad(options) {
+		this.channelComment = new BroadcastChannel('comment-counts');
 		if (options.init == 'index') {
 			this.initurl = true;
 		}
@@ -564,7 +573,11 @@ export default {
 					storage.setVlogToken(vlogInfo.userToken);
 					storage.setVlogUserInfo(vlogInfo);
 					storage.setRefreshVlogIndex('1');
-
+					// 刷新videoList
+					this.channelComment.postMessage({
+						type: 'comment-counts',
+						data: { lahei: true }
+					});
 					/**
 					 * 登录成功后获取个人信息
 					 */
@@ -574,6 +587,7 @@ 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 ? "核销成功" : "核销失败";
-            uni.showModal({
-              title: "提示",
-              content: title,
-              showCancel: false,
-              confirmText: "确定",
+            
+            if (resfn.data.success) {
+              uni.showToast({
+                title: resfn.data.message,
+                icon: "none",
               });
+            }
 
             // }
           });

pages/tabbar/vlog/index.nvue

@@ -215,17 +215,14 @@ 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(); //只初始化当前所在位置的数据
-				} catch (err) {
-					console.log(err + '255');
 				}
+				this.$refs[prop].get(); //只初始化当前所在位置的数据
+				storage.setRefreshVlogIndex('0'); //初始完数据修改状态不需要刷新
 			} else {
 				try {
 					this.$refs[prop].showVd();
@@ -241,8 +238,10 @@ 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,9 +11,7 @@
     "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:honor:8.5.6864",
-		"com.tencent.timpush:vivo:8.5.6864"
+    "com.tencent.timpush:fcm:8.5.6864"
   ],
   "project": {
     "plugins": [