diff --git a/commons/config.js b/commons/config.js index 3c8b8df..627a49d 100644 --- a/commons/config.js +++ b/commons/config.js @@ -1,5 +1,5 @@ //打包时修改env的值即可 -const env = 'test' //test,production,local +const env = 'production' //test,production,local export const encryptKey = '1234567890123456' // http数据加解密的key diff --git a/components/my-video-list/my-video-list.vue b/components/my-video-list/my-video-list.vue index 6657cb7..9421f16 100644 --- a/components/my-video-list/my-video-list.vue +++ b/components/my-video-list/my-video-list.vue @@ -1,78 +1,130 @@ \ No newline at end of file +.cancel-btn, +.confirm-btn { + width: 210rpx; + height: 70rpx; + line-height: 70rpx; + text-align: center; + font-size: 32rpx; + color: #fff; + background: #ed838a; + box-shadow: inset 0rpx -6rpx 12rpx 0rpx rgba(255, 255, 255, 0.77); + border-radius: 40rpx 40rpx 40rpx 40rpx; +} + +.no-get { + color: #ff5560; + font-size: 32rpx; +} + diff --git a/http/http.js b/http/http.js index ba692cd..b258bb1 100644 --- a/http/http.js +++ b/http/http.js @@ -83,6 +83,13 @@ function commonsProcess(showLoading, httpReqCallback, isreturm) { isShowErrorToast = true; return Promise.reject(bodyData); // 跳转到catch函数 } + if (bodyData.code == 701) { + uni.clearStorageSync() + uni.reLaunch({ + url: '/pages/login/login' + }) + return Promise.reject(bodyData); // 跳转到catch函数 + } if (bodyData.code == 702) { return Promise.reject(bodyData); // 跳转到catch函数 } diff --git a/manifest.json b/manifest.json index 5f8a918..4fe5f47 100644 --- a/manifest.json +++ b/manifest.json @@ -1,156 +1,156 @@ { - "name": "斯耀短剧", - "appid": "__UNI__E0B05B1", - "description": "", - "versionName": "1.3.0", - "versionCode": 130, - "transformPx": false, - /* 5+App特有相关 */ - "app-plus": { - "app": { - "name": "斯耀短剧1", - "pkgName": "com.hnsiyao.duanju" // 安卓包名 - }, - "ios": { - "name": "顺享短剧2", - "app-category": "public.app-category.utilities", - "bundleID": "com.hnsiyao.duanju" // iOS bundle ID - }, - "usingComponents": true, - "nvueStyleCompiler": "uni-app", - "compilerVersion": 3, - "splashscreen": { - "alwaysShowBeforeRender": true, - "waiting": true, - "autoclose": true, - "delay": 0 - }, - /* 模块配置 */ - "modules": { - "Camera": {}, - "Push": {}, - "VideoPlayer": {}, - "Canvas": "nvue canvas", //使用Canvas模块 - "OAuth": {} - }, - /* 应用发布信息 */ - "distribute": { - /* android打包配置 */ - "android": { - "permissions": [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ], - "abiFilters": ["armeabi-v7a", "arm64-v8a", "x86"], - "schemes": "com.hnsiyao.duanju", - "minSdkVersion": 28, - "targetSdkVersion": 33 - }, - /* ios打包配置 */ - "ios": { - "privacyDescription": { - "NSPhotoLibraryUsageDescription": "获取您的相册读取权限,目的是为了在我的资料页面使用相册读取功能,修改上传头像", - "NSCameraUsageDescription": "获取您的摄像头权限,目的是为了在我的资料页面使用摄像头功能,修改上传头像" - }, - "urltypes": "com.hnsiyao.duanju", - "dSYMs": false - }, - /* SDK配置 */ - "sdkConfigs": { - "push": { - "unipush": {} - }, - "ad": { - "ks": {} - }, - "oauth": { - "weixin": { - "appid": "wx5001ff1af6c4781f", - "UniversalLinks": "" - } - } - }, - "abiFilters": ["armeabi-v7a", "arm64-v8a", "x86"], - "minSdkVersion": 28, - "targetSdkVersion": 33, - "schemes": "com.hnsiyao.duanju", - "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" - } - } - } - } - }, - /* 快应用特有相关 */ - "quickapp": {}, - /* 小程序特有相关 */ - "mp-weixin": { - "appid": "", - "setting": { - "urlCheck": false - }, - "usingComponents": true, - "mergeVirtualHostAttributes": true - }, - "mp-alipay": { - "usingComponents": true - }, - "mp-baidu": { - "usingComponents": true - }, - "mp-toutiao": { - "usingComponents": true, - "mergeVirtualHostAttributes": true - }, - "uniStatistics": { - "enable": false - }, - "vueVersion": "3", - "h5": { - "title": "斯耀短剧", - "template": "template.html", - "router": { - "mode": "history" - } - } -} \ No newline at end of file + "name" : "斯耀短剧", + "appid" : "__UNI__E0B05B1", + "description" : "", + "versionName" : "1.3.0", + "versionCode" : 130, + "transformPx" : false, + /* 5+App特有相关 */ + "app-plus" : { + "app" : { + "name" : "斯耀短剧1", + "pkgName" : "com.hnsiyao.duanju" // 安卓包名 + }, + "ios" : { + "name" : "顺享短剧2", + "app-category" : "public.app-category.utilities", + "bundleID" : "com.hnsiyao.duanju" // iOS bundle ID + }, + "usingComponents" : true, + "nvueStyleCompiler" : "uni-app", + "compilerVersion" : 3, + "splashscreen" : { + "alwaysShowBeforeRender" : true, + "waiting" : true, + "autoclose" : true, + "delay" : 0 + }, + /* 模块配置 */ + "modules" : { + "Camera" : {}, + "Push" : {}, + "VideoPlayer" : {}, + "Canvas" : "nvue canvas", //使用Canvas模块 + "OAuth" : {} + }, + /* 应用发布信息 */ + "distribute" : { + /* android打包配置 */ + "android" : { + "permissions" : [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ], + "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ], + "schemes" : "com.hnsiyao.duanju", + "minSdkVersion" : 28, + "targetSdkVersion" : 33 + }, + /* ios打包配置 */ + "ios" : { + "privacyDescription" : { + "NSPhotoLibraryUsageDescription" : "获取您的相册读取权限,目的是为了在我的资料页面使用相册读取功能,修改上传头像", + "NSCameraUsageDescription" : "获取您的摄像头权限,目的是为了在我的资料页面使用摄像头功能,修改上传头像" + }, + "urltypes" : "com.hnsiyao.duanju", + "dSYMs" : false + }, + /* SDK配置 */ + "sdkConfigs" : { + "push" : { + "unipush" : {} + }, + "ad" : { + "ks" : {} + }, + "oauth" : { + "weixin" : { + "appid" : "wx5001ff1af6c4781f", + "UniversalLinks" : "" + } + } + }, + "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ], + "minSdkVersion" : 28, + "targetSdkVersion" : 33, + "schemes" : "com.hnsiyao.duanju", + "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" + } + } + } + } + }, + /* 快应用特有相关 */ + "quickapp" : {}, + /* 小程序特有相关 */ + "mp-weixin" : { + "appid" : "", + "setting" : { + "urlCheck" : false + }, + "usingComponents" : true, + "mergeVirtualHostAttributes" : true + }, + "mp-alipay" : { + "usingComponents" : true + }, + "mp-baidu" : { + "usingComponents" : true + }, + "mp-toutiao" : { + "usingComponents" : true, + "mergeVirtualHostAttributes" : true + }, + "uniStatistics" : { + "enable" : false + }, + "vueVersion" : "3", + "h5" : { + "title" : "斯耀短剧", + "template" : "template.html", + "router" : { + "mode" : "history" + } + } +} diff --git a/pages/index/index.vue b/pages/index/index.vue index 0d3791d..73347a5 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -107,6 +107,7 @@ onShow(() => { // datas.setindexdata = $common.setversion // console.log(datas.setindexdata,'seaeasdas') // } + getrecomVideo(); }); const disableMaskVisable = ref(false); @@ -139,7 +140,6 @@ let datas = reactive({ onLoad(() => { versionUpdate(); getMsg(); - getrecomVideo(); }); onReady(() => { if (!uni.getStorageSync('ruleShow')) { diff --git a/pages/video/index.nvue b/pages/video/index.nvue index d2516a1..977547f 100644 --- a/pages/video/index.nvue +++ b/pages/video/index.nvue @@ -1,7 +1,16 @@