diff --git a/components/vlog/guanzhu.nvue b/components/vlog/guanzhu.nvue index 4a60afd6..98217932 100644 --- a/components/vlog/guanzhu.nvue +++ b/components/vlog/guanzhu.nvue @@ -1042,7 +1042,6 @@ 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 16f54029..f0a26cfd 100644 --- a/components/vlog/local.nvue +++ b/components/vlog/local.nvue @@ -1048,7 +1048,6 @@ export default { this.page = 1; this.dataList = []; this.k = 0; - this.userId = ''; }, async get() { // 这个方法主要就是用来第一次进入视频播放时用来处理的 @@ -1381,4 +1380,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 b29b873c..a1fc00b4 100644 --- a/components/vlog/tuijian.nvue +++ b/components/vlog/tuijian.nvue @@ -1049,7 +1049,6 @@ export default { this.page = 1; this.dataList = []; this.k = 0; - this.userId = ''; }, async get() { // 这个方法主要就是用来第一次进入视频播放时用来处理的 @@ -1362,4 +1361,4 @@ export default { /* background-color: #000000; */ background-color: #00ffff; } - \ No newline at end of file + diff --git a/manifest.json b/manifest.json index 5d175035..c2f64be0 100644 --- a/manifest.json +++ b/manifest.json @@ -1,245 +1,243 @@ -{ - "name" : "无终街", - "appid" : "__UNI__6DB512D", - "description" : "admin", - "versionName" : "4.0.0", - "versionCode" : 404, - "transformPx" : false, - "sassImplementationName" : "node-sass", - "app-plus" : { - "android" : { - "versionCode" : 4000049, // Android 版本号 - "versionName" : "4.0.0" // 用户看到的版本号 - }, - "compatible" : { - "ignoreVersion" : true //true表示忽略版本检查提示框,HBuilderX1.9.0及以上版本支持 - }, - "nvueStyleCompiler" : "uni-app", - "compilerVersion" : 3, - /* 5+App特有相关 */ - "usingComponents" : true, - "splashscreen" : { - "alwaysShowBeforeRender" : true, - "waiting" : true, - "autoclose" : true, - "delay" : 0 - }, - "screenOrientation" : [ "portrait-primary" ], - "modules" : { - "Payment" : {}, - "Share" : {}, - "Geolocation" : {}, - "Maps" : {}, - "Camera" : {}, - "Barcode" : {}, - "VideoPlayer" : {}, - "Push" : {}, - "OAuth" : {} - }, - "error" : { - /* 404错误页面*/ - "url" : "hybrid/html/error.html" - }, - /* 模块配置 */ - "distribute" : { - /* 应用发布信息 */ - "android" : { - /* android打包配置 */ - "permissions" : [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ], - "abiFilters" : [ "arm64-v8a" ], - "schemes" : "wuzhongjie", - "minSdkVersion" : 30, - "targetSdkVersion" : 34 - }, - "ios" : { - "idfa" : false, - "privacyDescription" : { - "NSPhotoLibraryUsageDescription" : "需要用与评论上传,头像上传功能", - "NSPhotoLibraryAddUsageDescription" : "保存商品图片到本地", - "NSCameraUsageDescription" : "需要用与扫描二维码和商品评论图片拍摄", - "NSLocationAlwaysAndWhenInUseUsageDescription" : "可根据位置向您介绍附近的视频信息,提升浏览体验,或帮助你在发布的信息中展示位置,不授权不影响app正常使用", - "NSMicrophoneUsageDescription" : "用户上传视频时需使用音频信息" - }, - "capabilities" : { - "entitlements" : { - "com.apple.developer.associated-domains" : [ "applinks:wuzhongjie.com.cn" ] - } - }, - "urltypes" : "wuzhongjie", - "dSYMs" : false - }, - /* ios打包配置 */ - "sdkConfigs" : { - "payment" : { - "weixin" : { - "__platform__" : [ "ios", "android" ], - "appid" : "wxebcdaea31881caab", - "UniversalLinks" : "https://wuzhongjie.com.cn/ulink/" - }, - "alipay" : { - "__platform__" : [ "ios", "android" ] - } - }, - "ad" : {}, - "share" : { - "weixin" : { - "appid" : "wxebcdaea31881caab", - "UniversalLinks" : "https://wuzhongjie.com.cn/ulink/" - } - }, - "oauth" : { - "weixin" : { - "appid" : "wxebcdaea31881caab", - "UniversalLinks" : "https://wuzhongjie.com.cn/ulink/" - }, - "apple" : {} - }, - "geolocation" : { - "amap" : { - "__platform__" : [ "ios", "android" ], - "appkey_ios" : "f463d3350efe63f8be5d9a62f24d0aab", - "appkey_android" : "fb3f1ccb34616c70f068aa950f3e27df" - }, - "system" : { - "__platform__" : [ "ios", "android" ] - } - }, - "maps" : { - "amap" : { - "appkey_ios" : "f463d3350efe63f8be5d9a62f24d0aab", - "appkey_android" : "fb3f1ccb34616c70f068aa950f3e27df" - } - }, - "push" : {} - }, - "icons" : { - "android" : { - "hdpi" : "unpackage/res/icons/72x72.png", - "xhdpi" : "unpackage/res/icons/96x96.png", - "xxhdpi" : "unpackage/res/icons/144x144.png", - "xxxhdpi" : "unpackage/res/icons/192x192.png" - }, - "ios" : { - "appstore" : "unpackage/res/icons/1024x1024.png", - "ipad" : { - "app" : "unpackage/res/icons/76x76.png", - "app@2x" : "unpackage/res/icons/152x152.png", - "notification" : "unpackage/res/icons/20x20.png", - "notification@2x" : "unpackage/res/icons/40x40.png", - "proapp@2x" : "unpackage/res/icons/167x167.png", - "settings" : "unpackage/res/icons/29x29.png", - "settings@2x" : "unpackage/res/icons/58x58.png", - "spotlight" : "unpackage/res/icons/40x40.png", - "spotlight@2x" : "unpackage/res/icons/80x80.png" - }, - "iphone" : { - "app@2x" : "unpackage/res/icons/120x120.png", - "app@3x" : "unpackage/res/icons/180x180.png", - "notification@2x" : "unpackage/res/icons/40x40.png", - "notification@3x" : "unpackage/res/icons/60x60.png", - "settings@2x" : "unpackage/res/icons/58x58.png", - "settings@3x" : "unpackage/res/icons/87x87.png", - "spotlight@2x" : "unpackage/res/icons/80x80.png", - "spotlight@3x" : "unpackage/res/icons/120x120.png" - } - } - }, - "splashscreen" : { - "iosStyle" : "common", - "ios" : { - "storyboard" : "CustomStoryboard.zip" - }, - "androidStyle" : "default", - "android" : { - "hdpi" : "CustomStartPage/start-page.9.png", - "xhdpi" : "CustomStartPage/start-page.9.png", - "xxhdpi" : "CustomStartPage/start-page.9.png" - }, - "useOriginalMsgbox" : true - } - }, - "nativePlugins" : {} - }, - "permission" : { - "scope.userLocation" : { - "desc" : "你的位置信息将用于高德地图的效果展示" - } - }, - /* SDK配置 */ - "quickapp" : {}, - /* 快应用特有相关 */ - "mp-weixin" : { - /* 小程序特有相关 */ - "usingComponents" : true, - "appid" : "wx6f10f29075dc1b0b", - "optimization" : { - "subPackages" : true - }, - "setting" : { - "urlCheck" : false, - "minified" : true, - "postcss" : false, - "es6" : true - }, - "permission" : { - "scope.userLocation" : { - "desc" : "位置信息将用于高德地图的效果展示" - } - }, - "plugins" : { - "myPlugin" : { - "version" : "1.1.0", - "provider" : "wx738958e0f4c894f9" - }, - "live-player-plugin" : { - "version" : "1.3.0", - "provider" : "wx2b03c6e691cd7370" - } - } - }, - "h5" : { - "devServer" : { - "disableHostCheck" : true - }, - "router" : { - "mode" : "history", - "base" : "" - }, - "sdkConfigs" : { - "maps" : {} - }, - "optimization" : { - "treeShaking" : { - "enable" : true - } - }, - "title" : "lilishop", - "template" : "" - } -} +{ + "name": "无终街", + "appid": "__UNI__6DB512D", + "description": "admin", + "versionName": "4.0.0", + "versionCode": 403, + "transformPx": false, + "app-plus": { + "android": { + "versionCode": 4000049, // Android 版本号 + "versionName": "4.0.0" // 用户看到的版本号 + }, + "compatible": { + "ignoreVersion": true //true表示忽略版本检查提示框,HBuilderX1.9.0及以上版本支持 + }, + "nvueStyleCompiler": "uni-app", + "compilerVersion": 3, + /* 5+App特有相关 */ + "usingComponents": true, + "splashscreen": { + "alwaysShowBeforeRender": true, + "waiting": true, + "autoclose": true, + "delay": 0 + }, + "screenOrientation": ["portrait-primary"], + "modules": { + "Payment": {}, + "Share": {}, + "Geolocation": {}, + "Maps": {}, + "Camera": {}, + "Barcode": {}, + "VideoPlayer": {}, + "Push": {}, + "OAuth": {} + }, + "error": { + /* 404错误页面*/ + "url": "hybrid/html/error.html" + }, + /* 模块配置 */ + "distribute": { + /* 应用发布信息 */ + "android": { + /* android打包配置 */ + "permissions": [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ], + "abiFilters": ["arm64-v8a"], + "schemes": "wuzhongjie", + "minSdkVersion": 30, + "targetSdkVersion": 34 + }, + "ios": { + "idfa": false, + "privacyDescription": { + "NSPhotoLibraryUsageDescription": "需要用与评论上传,头像上传功能", + "NSPhotoLibraryAddUsageDescription": "保存商品图片到本地", + "NSCameraUsageDescription": "需要用与扫描二维码和商品评论图片拍摄", + "NSLocationAlwaysAndWhenInUseUsageDescription": "可根据位置向您介绍附近的视频信息,提升浏览体验,或帮助你在发布的信息中展示位置,不授权不影响app正常使用", + "NSMicrophoneUsageDescription": "用户上传视频时需使用音频信息" + }, + "capabilities": { + "entitlements": { + "com.apple.developer.associated-domains": ["applinks:wuzhongjie.com.cn"] + } + }, + "urltypes": "wuzhongjie", + "dSYMs": false + }, + /* ios打包配置 */ + "sdkConfigs": { + "payment": { + "weixin": { + "__platform__": ["ios", "android"], + "appid": "wxebcdaea31881caab", + "UniversalLinks": "https://wuzhongjie.com.cn/ulink/" + }, + "alipay": { + "__platform__": ["ios", "android"] + } + }, + "ad": {}, + "share": { + "weixin": { + "appid": "wxebcdaea31881caab", + "UniversalLinks": "https://wuzhongjie.com.cn/ulink/" + } + }, + "oauth": { + "weixin": { + "appid": "wxebcdaea31881caab", + "UniversalLinks": "https://wuzhongjie.com.cn/ulink/" + } + }, + "geolocation": { + "amap": { + "__platform__": ["ios", "android"], + "appkey_ios": "f463d3350efe63f8be5d9a62f24d0aab", + "appkey_android": "fb3f1ccb34616c70f068aa950f3e27df" + }, + "system": { + "__platform__": ["ios", "android"] + } + }, + "maps": { + "amap": { + "appkey_ios": "f463d3350efe63f8be5d9a62f24d0aab", + "appkey_android": "fb3f1ccb34616c70f068aa950f3e27df" + } + }, + "push": {} + }, + "icons": { + "android": { + "hdpi": "unpackage/res/icons/72x72.png", + "xhdpi": "unpackage/res/icons/96x96.png", + "xxhdpi": "unpackage/res/icons/144x144.png", + "xxxhdpi": "unpackage/res/icons/192x192.png" + }, + "ios": { + "appstore": "unpackage/res/icons/1024x1024.png", + "ipad": { + "app": "unpackage/res/icons/76x76.png", + "app@2x": "unpackage/res/icons/152x152.png", + "notification": "unpackage/res/icons/20x20.png", + "notification@2x": "unpackage/res/icons/40x40.png", + "proapp@2x": "unpackage/res/icons/167x167.png", + "settings": "unpackage/res/icons/29x29.png", + "settings@2x": "unpackage/res/icons/58x58.png", + "spotlight": "unpackage/res/icons/40x40.png", + "spotlight@2x": "unpackage/res/icons/80x80.png" + }, + "iphone": { + "app@2x": "unpackage/res/icons/120x120.png", + "app@3x": "unpackage/res/icons/180x180.png", + "notification@2x": "unpackage/res/icons/40x40.png", + "notification@3x": "unpackage/res/icons/60x60.png", + "settings@2x": "unpackage/res/icons/58x58.png", + "settings@3x": "unpackage/res/icons/87x87.png", + "spotlight@2x": "unpackage/res/icons/80x80.png", + "spotlight@3x": "unpackage/res/icons/120x120.png" + } + } + }, + "splashscreen": { + "iosStyle": "common", + "ios": { + "storyboard": "CustomStoryboard.zip" + }, + "androidStyle": "default", + "android": { + "hdpi": "CustomStartPage/start-page.9.png", + "xhdpi": "CustomStartPage/start-page.9.png", + "xxhdpi": "CustomStartPage/start-page.9.png" + }, + "useOriginalMsgbox": true + } + }, + "nativePlugins": {} + }, + "permission": { + "scope.userLocation": { + "desc": "你的位置信息将用于高德地图的效果展示" + } + }, + /* SDK配置 */ + "quickapp": {}, + /* 快应用特有相关 */ + "mp-weixin": { + /* 小程序特有相关 */ + "usingComponents": true, + "appid": "wx6f10f29075dc1b0b", + "optimization": { + "subPackages": true + }, + "setting": { + "urlCheck": false, + "minified": true, + "postcss": false, + "es6": true + }, + "permission": { + "scope.userLocation": { + "desc": "位置信息将用于高德地图的效果展示" + } + }, + "plugins": { + "myPlugin": { + "version": "1.1.0", + "provider": "wx738958e0f4c894f9" + }, + "live-player-plugin": { + "version": "1.3.0", + "provider": "wx2b03c6e691cd7370" + } + } + }, + "h5": { + "devServer": { + "disableHostCheck": true + }, + "router": { + "mode": "history", + "base": "" + }, + "sdkConfigs": { + "maps": {} + }, + "optimization": { + "treeShaking": { + "enable": true + } + }, + "title": "lilishop", + "template": "" + } +} \ No newline at end of file diff --git a/pages/me/vlog.nvue b/pages/me/vlog.nvue index d15d31c4..03d583a4 100644 --- a/pages/me/vlog.nvue +++ b/pages/me/vlog.nvue @@ -1046,7 +1046,6 @@ 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 fb0089c4..cba7f68a 100644 --- a/pages/passport/login.vue +++ b/pages/passport/login.vue @@ -201,17 +201,9 @@ export default { code: 'APPLE' } ], - initurl: false, - channelComment: null + initurl: false }; }, - 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 diff --git a/pages/tabbar/vlog/index.nvue b/pages/tabbar/vlog/index.nvue index 493e5643..7bd628ea 100644 --- a/pages/tabbar/vlog/index.nvue +++ b/pages/tabbar/vlog/index.nvue @@ -215,14 +215,17 @@ export default { // this.$refs[prop].showVd(); console.log('是否刷新:' + storage.getRefreshVlogIndex()); if (storage.getRefreshVlogIndex() === '1') { - // 登录后需要刷新数据 - for (var i = 0; i < this.pageList.length; i++) { - if (this.$refs[i]) { + try { + storage.setRefreshVlogIndex('0'); //初始完数据修改状态不需要刷新 + console.log('是否刷新:' + storage.getRefreshVlogIndex()); + // 登录后需要刷新数据 + for (var i = 0; i < this.pageList.length; 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(); @@ -238,9 +241,7 @@ 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[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 a2340f55..ff8cfffd 100644 --- a/uni_modules/TencentCloud-Push/utssdk/app-android/config.json +++ b/uni_modules/TencentCloud-Push/utssdk/app-android/config.json @@ -1,27 +1,29 @@ -{ - "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" - ] - } +{ + "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" + ] + } } \ No newline at end of file