diff --git a/components/vlog/guanzhu.nvue b/components/vlog/guanzhu.nvue index 98217932..4a60afd6 100644 --- a/components/vlog/guanzhu.nvue +++ b/components/vlog/guanzhu.nvue @@ -1042,6 +1042,7 @@ export default { this.page = 1; this.dataList = []; this.k = 0; + this.userId = ''; }, async get() { // 这个方法主要就是用来第一次进入视频播放时用来处理的 diff --git a/components/vlog/local.nvue b/components/vlog/local.nvue index f0a26cfd..16f54029 100644 --- a/components/vlog/local.nvue +++ b/components/vlog/local.nvue @@ -1048,6 +1048,7 @@ export default { this.page = 1; this.dataList = []; this.k = 0; + this.userId = ''; }, async get() { // 这个方法主要就是用来第一次进入视频播放时用来处理的 @@ -1380,4 +1381,4 @@ export default { /* background-color: #000000; */ background-color: #00ffff; } - \ No newline at end of file + diff --git a/components/vlog/tuijian.nvue b/components/vlog/tuijian.nvue index a1fc00b4..b29b873c 100644 --- a/components/vlog/tuijian.nvue +++ b/components/vlog/tuijian.nvue @@ -1049,6 +1049,7 @@ export default { this.page = 1; this.dataList = []; this.k = 0; + this.userId = ''; }, async get() { // 这个方法主要就是用来第一次进入视频播放时用来处理的 @@ -1361,4 +1362,4 @@ export default { /* background-color: #000000; */ background-color: #00ffff; } - + \ No newline at end of file diff --git a/manifest.json b/manifest.json index f2325f05..f3eb0712 100644 --- a/manifest.json +++ b/manifest.json @@ -8,7 +8,7 @@ "sassImplementationName": "node-sass", "app-plus": { "android": { - "versionCode": 404, // Android 版本号 + "versionCode": 405, // Android 版本号 "versionName": "4.0.0" // 用户看到的版本号 }, "compatible": { diff --git a/pages/me/vlog.nvue b/pages/me/vlog.nvue index 03d583a4..d15d31c4 100644 --- a/pages/me/vlog.nvue +++ b/pages/me/vlog.nvue @@ -1046,6 +1046,7 @@ export default { this.page = 1; this.dataList = []; this.k = 0; + this.userId = ''; }, async get() { // 这个方法主要就是用来第一次进入视频播放时用来处理的 diff --git a/pages/passport/login.vue b/pages/passport/login.vue index cba7f68a..fb0089c4 100644 --- a/pages/passport/login.vue +++ b/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 diff --git a/pages/tabbar/vlog/index.nvue b/pages/tabbar/vlog/index.nvue index 7bd628ea..493e5643 100644 --- a/pages/tabbar/vlog/index.nvue +++ b/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++) { + // 登录后需要刷新数据 + 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,7 +238,9 @@ export default { if (storage.getRefreshVlogIndex() == '1') { // 登录后需要刷新数据 for (var i = 0; i < this.pageList.length; i++) { - this.$refs[i].dataList = []; //所有数据清空 + if (this.$refs[i]) { + this.$refs[i].dataList = []; //所有数据清空 + } } this.$refs[prop].get(); //只初始化当前所在位置的数据 storage.setRefreshVlogIndex('0'); //初始完数据修改状态不需要刷新 diff --git a/uni_modules/TencentCloud-Push/utssdk/app-android/config.json b/uni_modules/TencentCloud-Push/utssdk/app-android/config.json index ff8cfffd..a2340f55 100644 --- a/uni_modules/TencentCloud-Push/utssdk/app-android/config.json +++ b/uni_modules/TencentCloud-Push/utssdk/app-android/config.json @@ -1,29 +1,27 @@ -{ - "minSdkVersion": "21", - "dependencies": [ - "com.google.android.material:material:1.3.0", - "com.google.code.gson:gson:2.9.1", - "commons-codec:commons-codec:1.15", - "com.github.bumptech.glide:glide:4.12.0", - "com.tencent.timpush:timpush:8.5.6864", - "com.tencent.liteav.tuikit:tuicore:8.5.6864", - "com.tencent.timpush:huawei:8.5.6864", - "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" - ], - "project": { - "plugins": [ - "com.huawei.agconnect", - "com.hihonor.mcs.asplugin" - ], - "dependencies": [ - "com.huawei.agconnect:agcp:1.9.1.301", - "com.google.gms:google-services:4.3.15", - "com.hihonor.mcs:asplugin:2.0.1.300" - ] - } +{ + "minSdkVersion": "21", + "dependencies": [ + "com.google.android.material:material:1.3.0", + "com.google.code.gson:gson:2.9.1", + "commons-codec:commons-codec:1.15", + "com.github.bumptech.glide:glide:4.12.0", + "com.tencent.timpush:timpush:8.5.6864", + "com.tencent.liteav.tuikit:tuicore:8.5.6864", + "com.tencent.timpush:huawei:8.5.6864", + "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" + ], + "project": { + "plugins": [ + "com.huawei.agconnect", + "com.hihonor.mcs.asplugin" + ], + "dependencies": [ + "com.huawei.agconnect:agcp:1.9.1.301", + "com.google.gms:google-services:4.3.15", + "com.hihonor.mcs:asplugin:2.0.1.300" + ] + } } \ No newline at end of file