From 85d0f092c04d10ece18dcaabd1abe75a48d768ef Mon Sep 17 00:00:00 2001 From: gyq <875626088@qq.com> Date: Sat, 24 May 2025 18:16:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=A6=81=E7=94=A8=E5=BC=B9?= =?UTF-8?q?=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .hbuilderx/launch.json | 2 +- commons/config.js | 4 +- components/disable-mask/disable-mask.vue | 69 ++ http/http.js | 6 +- manifest.json | 310 +++--- pages/chasingDrama/index.vue | 10 +- pages/index/index.vue | 697 +++++++------ pages/me/index.vue | 657 ++++++------- pages/task/index.vue | 1141 +++++++++++----------- pages/video/index.nvue | 203 ++-- 10 files changed, 1615 insertions(+), 1484 deletions(-) create mode 100644 components/disable-mask/disable-mask.vue diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json index 576f2b0..a814c8a 100644 --- a/.hbuilderx/launch.json +++ b/.hbuilderx/launch.json @@ -2,7 +2,7 @@ "version" : "1.0", "configurations" : [ { - "playground" : "custom", + "playground" : "standard", "type" : "uni-app:app-android" }, { diff --git a/commons/config.js b/commons/config.js index f7a8188..3c8b8df 100644 --- a/commons/config.js +++ b/commons/config.js @@ -1,5 +1,5 @@ //打包时修改env的值即可 -const env = 'production' //test , production,local +const env = 'test' //test,production,local export const encryptKey = '1234567890123456' // http数据加解密的key @@ -7,7 +7,7 @@ export const apiUrl = '/czg/' export const h5Config = { production: 'https://web.hnsiyao.cn', test: 'https://web-api.hnsiyao.cn', - local: 'http://192.168.1.41:8100' + local: 'http://192.168.1.21:8100' } export const AppConfig = { diff --git a/components/disable-mask/disable-mask.vue b/components/disable-mask/disable-mask.vue new file mode 100644 index 0000000..be2f414 --- /dev/null +++ b/components/disable-mask/disable-mask.vue @@ -0,0 +1,69 @@ + + + + + diff --git a/http/http.js b/http/http.js index 2e88a74..ba692cd 100644 --- a/http/http.js +++ b/http/http.js @@ -61,6 +61,7 @@ function commonsProcess(showLoading, httpReqCallback, isreturm) { if (isreturm) { return Promise.resolve(bodyData); } + if (statusCode == 500) { isShowErrorToast = true; return Promise.reject(bodyData); // 跳转到catch函数 @@ -82,6 +83,9 @@ function commonsProcess(showLoading, httpReqCallback, isreturm) { isShowErrorToast = true; return Promise.reject(bodyData); // 跳转到catch函数 } + if (bodyData.code == 702) { + return Promise.reject(bodyData); // 跳转到catch函数 + } if (bodyData.code == 500) { // 提示信息 isShowErrorToast = true; @@ -100,7 +104,7 @@ function commonsProcess(showLoading, httpReqCallback, isreturm) { //未绑定微信 if (bodyData.code == 407) { - return Promise.resolve(result); + return Promise.resolve(result); } diff --git a/manifest.json b/manifest.json index 4fe5f47..5f8a918 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" - } - } -} + "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 diff --git a/pages/chasingDrama/index.vue b/pages/chasingDrama/index.vue index e7cddd7..701b2ea 100644 --- a/pages/chasingDrama/index.vue +++ b/pages/chasingDrama/index.vue @@ -52,14 +52,17 @@ + \ No newline at end of file + + .gongao { + position: absolute; + bottom: 85rpx; + left: 70rpx; + border-radius: 12rpx 12rpx 12rpx 12rpx; + width: 611rpx; + height: 60rpx; + background-color: rgba(255, 255, 255, 0.65); + display: flex; + align-items: center; + padding: 12rpx; + box-sizing: border-box; + + .gongaoicon { + color: #ffffff; + width: 98rpx; + height: 40rpx; + line-height: 40rpx; + text-align: center; + font-size: 20rpx; + background-image: url('../../static/index/gonggaobg.png'); + background-size: 98rpx 50rpx; + } + + .swiperstyle { + height: 78rpx; + width: 80%; + } + } +} + +.navTop-active { + color: #cb5d68; +} + +.navTop { + display: flex; + align-items: center; + justify-content: space-between; + padding: 0 20rpx; + + > view { + background-color: #f0f0f0; + margin-left: 20rpx; + padding: 6rpx 20rpx; + } +} + diff --git a/pages/me/index.vue b/pages/me/index.vue index 6ded404..74a5e3d 100644 --- a/pages/me/index.vue +++ b/pages/me/index.vue @@ -9,17 +9,13 @@ - - - + + + - - - + + {{ userInfo.phone || '请登录' }} @@ -33,7 +29,7 @@ 我的追剧 {{ likeData.collectCount }} - + 我的红包 {{ amount || 0 }} @@ -48,7 +44,6 @@
金币明细
-
@@ -58,8 +53,12 @@
- + {{ item.title }} 看到{{ item.courseDetailsName }} @@ -105,7 +104,7 @@ 绑定微信 - + 隐私政策 @@ -114,362 +113,354 @@ + \ No newline at end of file +} + +.card-wrap { + background: #fff; + border-radius: 16upx; + overflow: hidden; + margin-bottom: 28upx; + + .gold-wrap { + background: #f2b5b5; + display: flex; + justify-content: space-between; + padding: 20upx 28upx; + position: relative; + + // &::after { + // $size: 40upx; + // content: ''; + // width: $size; + // height: $size; + // border-radius: 8upx; + // transform: rotate(45deg); + // position: absolute; + // left: 50%; + // margin-left: $size * 0.5 * -1; + // bottom: $size * 0.3 * -1; + // background: inherit; + // } + .left { + display: flex; + align-items: center; + + .icon { + $size: 52upx; + width: $size; + height: $size; + margin-right: 20upx; + } + + .num { + color: #fff; + font-size: 32upx; + } + } + + .btn { + color: #977641; + background: linear-gradient(90deg, #fee7bc 0%, #fdcc89 100%); + width: 144upx; + height: 56upx; + border-radius: 56upx; + display: flex; + align-items: center; + justify-content: center; + font-size: 24upx; + } + } + + .title-wrap { + padding: 28upx; + + .a { + display: flex; + align-items: center; + justify-content: space-between; + + .t { + font-size: 28upx; + } + } + } + + .history-list { + padding: 0 28upx 28upx; + display: grid; + grid-template-columns: repeat(3, 1fr); + grid-template-rows: 1fr; + grid-column-gap: 28upx; + grid-row-gap: 28upx; + + .item { + .cover { + width: 100%; + height: 280upx; + border-radius: 20upx; + } + + .name { + font-size: 28upx; + width: 160upx; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + + .t { + color: #999; + font-size: 24upx; + } + } + } + + .menu-list { + display: flex; + flex-wrap: wrap; + padding: 28upx 0 0; + + .item { + flex: 0 0 25%; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + margin-bottom: 32upx; + + .icon { + $size: 56upx; + width: $size; + height: $size; + } + + .name { + font-size: 24upx; + margin-top: 8upx; + color: #333; + } + } + } +} + diff --git a/pages/task/index.vue b/pages/task/index.vue index 92fe011..cccc823 100644 --- a/pages/task/index.vue +++ b/pages/task/index.vue @@ -9,650 +9,655 @@
- + - 已连续签到 {{ datas.signDays }} + + 已连续签到 + {{ datas.signDays }} + 天 + - - + + {{ item.status == 1 ? '已签到' : '待签到' }} {{ item.signDay.substr(5, 8) }} - + - - - - - {{ - item.title - }} + + + + + {{ item.title }} {{ item.rewardDetail }} - {{ item.detail }} + {{ item.detail }} - - - {{ item.type == 1 ? item.buttonTitle : item.number ? `${item.discNumber}/${item.number}` : ( item.discNumber <= 0 ? item.buttonTitle : `剩余${item.discNumber}次`) }} + + + {{ + item.type == 1 + ? item.buttonTitle + : item.number + ? `${item.discNumber}/${item.number}` + : item.discNumber <= 0 + ? item.buttonTitle + : `剩余${item.discNumber}次` + }} - {{ item.type == 1 ? item.buttonTitle : item.number ? `${item.discNumber}/${item.number}` : ( item.discNumber <= 0 ? item.buttonTitle : `剩余${item.discNumber}次`) }} + {{ + item.type == 1 + ? item.buttonTitle + : item.number + ? `${item.discNumber}/${item.number}` + : item.discNumber <= 0 + ? item.buttonTitle + : `剩余${item.discNumber}次` + }} - - {{ item.buttonUnderContent}} + + {{ item.buttonUnderContent }} - + - - + + \ No newline at end of file + + .cell:last-child { + border-bottom: none; + } +} + diff --git a/pages/video/index.nvue b/pages/video/index.nvue index f3c8144..d2516a1 100644 --- a/pages/video/index.nvue +++ b/pages/video/index.nvue @@ -1,93 +1,148 @@ - \ No newline at end of file +} +