From 8238c6fc74df95d4b74a54f87b7f8e07b67277ee Mon Sep 17 00:00:00 2001 From: linju <8432241+linjuDcloud@user.noreply.gitee.com> Date: Sat, 10 Apr 2021 02:15:29 +0800 Subject: [PATCH] 123 --- manifest.json | 235 +++++++++--------- pages.json | 42 ++-- .../cloudfunctions/common/uni-id/config.json | 6 +- .../login-short-code/login-short-code.vue | 2 +- .../uni-login-page/pages/index/phone-code.vue | 2 +- .../pages/index/pwd-retrieve.vue | 2 +- .../check-version/check-version.param.json | 2 +- .../utils/check-update.js | 1 - 8 files changed, 148 insertions(+), 144 deletions(-) diff --git a/manifest.json b/manifest.json index 04fb53a..8c7db57 100644 --- a/manifest.json +++ b/manifest.json @@ -1,116 +1,121 @@ -{ - "name": "base-app", - "appid": "__UNI__BC54A00", - "description": "", - "versionName": "1.0.0", - "versionCode": "100", - "transformPx": false, - "app-plus": { - "usingComponents": true, - "nvueCompiler": "uni-app", - "compilerVersion": 3, - "screenOrientation":["portrait-primary"], // 竖屏锁定 - "safearea": { //安全区域配置，仅iOS平台生效 - "background": "#FFFFFF", //安全区域外的背景颜色，默认值为"#FFFFFF" - "bottom": { // 底部安全区域配置 - "offset": "auto" // 底部安全区域偏移，"none"表示不空出安全区域，"auto"自动计算空出安全区域，默认值为"none" - } - }, - "splashscreen": { - "alwaysShowBeforeRender": true, - "waiting": true, - "autoclose": true, - "delay": 0 - }, - "modules": { - "Share": {}, - "Fingerprint": {}, - "OAuth": {} - }, - "distribute": { - "android": { - "permissions": [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - /* ios打包配置 */ - "ios": { - "capabilities": { - "plists": { - "DCloudConfig": { - "miniServer": true - } - }, - "entitlements": { - "com.apple.developer.associated-domains": [ - "applinks:uniapp.dcloud.io", - "applinks:static-7827e38b-7f40-4421-bca7-58331dcddc00.bspapp.com" - ] - } - }, - "privacyDescription": { - "NSLocalNetworkUsageDescription": "展示游戏页面" - } - }, - "sdkConfigs": { - "oauth": { - "apple": {}, - "weixin": { - "appid": "wx0411fa6a39d61297", - "appsecret": "", - "UniversalLinks": "https://static-7827e38b-7f40-4421-bca7-58331dcddc00.bspapp.com/uni-universallinks/__UNI__BC54A00" - }, - "univerify": {} - }, - "share": { - "weixin": { - "appid": "wx0411fa6a39d61297", - "UniversalLinks": "https://static-7827e38b-7f40-4421-bca7-58331dcddc00.bspapp.com/uni-universallinks/__UNI__BC54A00", - "_spaceID": "7827e38b-7f40-4421-bca7-58331dcddc00" - } - }, - "payment": { - "weixin": { - "UniversalLinks": "https://static-7827e38b-7f40-4421-bca7-58331dcddc00.bspapp.com/uni-universallinks/__UNI__BC54A00" - } - }, - "ad": {} - } - } - }, - "quickapp": {}, - "mp-weixin": { - "appid": "", - "setting": { - "urlCheck": false - }, - "usingComponents": true - }, - "mp-alipay": { - "usingComponents": true - }, - "mp-baidu": { - "usingComponents": true - }, - "mp-toutiao": { - "usingComponents": true - }, - "uniStatistics": { - "enable": false - } +{ + "name" : "base-app", + "appid" : "__UNI__BC54A00", + "description" : "", + "versionName" : "1.0.0", + "versionCode" : "100", + "transformPx" : false, + "app-plus" : { + "usingComponents" : true, + "nvueCompiler" : "uni-app", + "compilerVersion" : 3, + "compatible" : { + "ignoreVersion" : true + }, + "screenOrientation" : [ "portrait-primary" ], // 竖屏锁定 + "safearea" : { + //安全区域配置，仅iOS平台生效 + "background" : "#FFFFFF", //安全区域外的背景颜色，默认值为"#FFFFFF" + "bottom" : { + // 底部安全区域配置 + "offset" : "auto" // 底部安全区域偏移，"none"表示不空出安全区域，"auto"自动计算空出安全区域，默认值为"none" + } + }, + "splashscreen" : { + "alwaysShowBeforeRender" : true, + "waiting" : true, + "autoclose" : true, + "delay" : 0 + }, + "modules" : { + "Share" : {}, + "Fingerprint" : {}, + "OAuth" : {} + }, + "distribute" : { + "android" : { + "permissions" : [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ] + }, + /* ios打包配置 */ + "ios" : { + "capabilities" : { + "plists" : { + "DCloudConfig" : { + "miniServer" : true + } + }, + "entitlements" : { + "com.apple.developer.associated-domains" : [ + "applinks:uniapp.dcloud.io", + "applinks:static-7827e38b-7f40-4421-bca7-58331dcddc00.bspapp.com" + ] + } + }, + "privacyDescription" : { + "NSLocalNetworkUsageDescription" : "展示游戏页面" + } + }, + "sdkConfigs" : { + "oauth" : { + "apple" : {}, + "weixin" : { + "appid" : "wx0411fa6a39d61297", + "appsecret" : "", + "UniversalLinks" : "https://static-7827e38b-7f40-4421-bca7-58331dcddc00.bspapp.com/uni-universallinks/__UNI__BC54A00" + }, + "univerify" : {} + }, + "share" : { + "weixin" : { + "appid" : "wx0411fa6a39d61297", + "UniversalLinks" : "https://static-7827e38b-7f40-4421-bca7-58331dcddc00.bspapp.com/uni-universallinks/__UNI__BC54A00", + "_spaceID" : "7827e38b-7f40-4421-bca7-58331dcddc00" + } + }, + "payment" : { + "weixin" : { + "UniversalLinks" : "https://static-7827e38b-7f40-4421-bca7-58331dcddc00.bspapp.com/uni-universallinks/__UNI__BC54A00" + } + }, + "ad" : {} + } + } + }, + "quickapp" : {}, + "mp-weixin" : { + "appid" : "", + "setting" : { + "urlCheck" : false + }, + "usingComponents" : true + }, + "mp-alipay" : { + "usingComponents" : true + }, + "mp-baidu" : { + "usingComponents" : true + }, + "mp-toutiao" : { + "usingComponents" : true + }, + "uniStatistics" : { + "enable" : false + } } diff --git a/pages.json b/pages.json index bddae4b..9a1a056 100644 --- a/pages.json +++ b/pages.json @@ -187,27 +187,27 @@ "navigationBarBackgroundColor": "#FFFFFF", "backgroundColor": "#F8F8F8" }, - "condition": { - "list": [{ - "path": "uni_modules/uni-login-page/pages/index/index", - "style": { - "navigationBarTitleText": "", - "app-plus": { - "animationType": "none", - "popGesture": "none", - "titleNView": { - "buttons": [{ - "text": "帮助", - "type": "none", - "fontSize": "16px", - "width": "60px" - }] - } - } - } - }], - "current": 0 - }, + // "condition": { + // "list": [{ + // "path": "uni_modules/uni-login-page/pages/index/index", + // "style": { + // "navigationBarTitleText": "", + // "app-plus": { + // "animationType": "none", + // "popGesture": "none", + // "titleNView": { + // "buttons": [{ + // "text": "帮助", + // "type": "none", + // "fontSize": "16px", + // "width": "60px" + // }] + // } + // } + // } + // }], + // "current": 0 + // }, "tabBar": { "color": "#7A7E83", "selectedColor": "#007AFF", diff --git a/uni_modules/uni-id/uniCloud/cloudfunctions/common/uni-id/config.json b/uni_modules/uni-id/uniCloud/cloudfunctions/common/uni-id/config.json index ef6a18d..3763b1c 100644 --- a/uni_modules/uni-id/uniCloud/cloudfunctions/common/uni-id/config.json +++ b/uni_modules/uni-id/uniCloud/cloudfunctions/common/uni-id/config.json @@ -44,9 +44,9 @@ "smsSecret": "d6c424b702d73baa3b6e1a1452469213" }, "univerify":{ - "appid": "__UNI__GameCat", - "apiKey":"c5f80ebad34aaf0ae22958d866287521", - "apiSecret":"f921890ca9c248273eadaf9b4137cf5c" + "appid": "__UNI__BC54A00", + "apiKey":"d1e36bcd497b3795434d900dcfdd44dc", + "apiSecret":"2feb378ff1114362b20ac179b572293e" } } } diff --git a/uni_modules/uni-login-page/components/login-short-code/login-short-code.vue b/uni_modules/uni-login-page/components/login-short-code/login-short-code.vue index d022c08..b345f4f 100644 --- a/uni_modules/uni-login-page/components/login-short-code/login-short-code.vue +++ b/uni_modules/uni-login-page/components/login-short-code/login-short-code.vue @@ -27,7 +27,7 @@ */ count: { type: [String, Number], - default: 3 + default: 60 } }, data() { diff --git a/uni_modules/uni-login-page/pages/index/phone-code.vue b/uni_modules/uni-login-page/pages/index/phone-code.vue index 9985cf5..cf05513 100644 --- a/uni_modules/uni-login-page/pages/index/phone-code.vue +++ b/uni_modules/uni-login-page/pages/index/phone-code.vue @@ -92,7 +92,7 @@ success: (e) => { console.log(e); uni.showToast({ - title: JSON.stringify(e.result), + title: "短信验证码发送成功", icon: 'none' }); diff --git a/uni_modules/uni-login-page/pages/index/pwd-retrieve.vue b/uni_modules/uni-login-page/pages/index/pwd-retrieve.vue index 868e5af..d268bd2 100644 --- a/uni_modules/uni-login-page/pages/index/pwd-retrieve.vue +++ b/uni_modules/uni-login-page/pages/index/pwd-retrieve.vue @@ -125,7 +125,7 @@ import mixin from '../../common/loginPage.mixin.js'; success: (e) => { console.log(e); uni.showToast({ - title: JSON.stringify(e.result), + title: "短信验证码发送成功", icon: 'none' }); // uni.showModal({ diff --git a/uni_modules/uni-upgrade-center-app/uniCloud/cloudfunctions/check-version/check-version.param.json b/uni_modules/uni-upgrade-center-app/uniCloud/cloudfunctions/check-version/check-version.param.json index c53f322..5dde9b0 100644 --- a/uni_modules/uni-upgrade-center-app/uniCloud/cloudfunctions/check-version/check-version.param.json +++ b/uni_modules/uni-upgrade-center-app/uniCloud/cloudfunctions/check-version/check-version.param.json @@ -3,7 +3,7 @@ // 配置教程参考：https://uniapp.dcloud.net.cn/uniCloud/quickstart?id=runparam { - "appid": "__YOUR_APPID__", + "appid": "uni.UNIBC54A00", "appVersion": "2.2.0", "wgtVersion": "2.2.2" } diff --git a/uni_modules/uni-upgrade-center-app/utils/check-update.js b/uni_modules/uni-upgrade-center-app/utils/check-update.js index 32e7d5c..1152067 100644 --- a/uni_modules/uni-upgrade-center-app/utils/check-update.js +++ b/uni_modules/uni-upgrade-center-app/utils/check-update.js @@ -4,7 +4,6 @@ const PACKAGE_INFO_KEY = '__package_info__' export default function() { // #ifdef APP-PLUS - return '先关了' plus.runtime.getProperty(plus.runtime.appid, function(widgetInfo) { uniCloud.callFunction({ -- GitLab