diff --git a/changelog.md b/changelog.md
index 66d29ac5fa5ccb40d6745be28bb7eb4d9d842e47..79f6bbccba7126984c7ecb3f4ba8244c5c5957c0 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,5 @@
+## 1.1.1(2021-08-30)
+- 解决3.2.6以下版本hbuilderx,编译的项目报`uni.setLocale`不存在的问题
## 1.1.0(2021-08-27)
- APP端支持vue3 (hbuilderx 3.2.5+)
- 支持国际化 中英文切换
diff --git a/manifest.json b/manifest.json
index d70cfa7f98905d0be7383e5e6f28c6021ce8679b..4d879fd5fcf5992447dcc80fb0537df32123c8b2 100644
--- a/manifest.json
+++ b/manifest.json
@@ -221,4 +221,4 @@
}
//...
// 中文(简体)
-// 应用名称
\ No newline at end of file
+// 应用名称
diff --git a/package.json b/package.json
index 9039513ce6ffe058d566f5d12bcb7681b73a7007..afb911b4fe76c3bdc113a56fb924f3f65d872544 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"id": "uni-starter",
"displayName": "uni-starter",
- "version": "1.1.0",
+ "version": "1.1.1",
"description": "云端一体应用快速开发基本项目模版",
"keywords": [
"login",
@@ -81,6 +81,5 @@
}
}
},
- "dependencies": {
- }
+ "dependencies": {}
}
diff --git a/pages/ucenter/settings/settings.vue b/pages/ucenter/settings/settings.vue
index 7a6c099525076b495f3a213c4cc261842ce8c8e7..f414684b415461aee4188d1a309d9ee8821d412f 100644
--- a/pages/ucenter/settings/settings.vue
+++ b/pages/ucenter/settings/settings.vue
@@ -259,8 +259,10 @@
}
uni.setStorageSync('CURRENT_LANG', language)
getApp().$i18n.locale = language
- this.currentLanguage = res.tapIndex?'简体中文':'English'
- uni.setLocale(language)
+ this.currentLanguage = res.tapIndex?'简体中文':'English'
+ if(uni.setLocale){
+ uni.setLocale(language)
+ }
uni.reLaunch({
url: '/pages/list/list',
complete: () => {
diff --git a/uniCloud-aliyun/cloudfunctions/redis-test/index.js b/uniCloud-aliyun/cloudfunctions/redis-test/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..2e13b9c35dd0eadef14365db1906c166ae4e6eca
--- /dev/null
+++ b/uniCloud-aliyun/cloudfunctions/redis-test/index.js
@@ -0,0 +1,11 @@
+// 简单的使用示例
+'use strict';
+const redis = uniCloud.redis()
+exports.main = async (event, context) => {
+ const getResult = await redis.get('my-key')
+ const setResult = await redis.set('my-key', 'value-test')
+ return {
+ getResult,
+ setResult
+ }
+};
diff --git a/uniCloud-aliyun/cloudfunctions/redis-test/package.json b/uniCloud-aliyun/cloudfunctions/redis-test/package.json
new file mode 100644
index 0000000000000000000000000000000000000000..fd00300ec5ba8468394bef587b86a80df533743f
--- /dev/null
+++ b/uniCloud-aliyun/cloudfunctions/redis-test/package.json
@@ -0,0 +1,10 @@
+{
+ "name": "redis-test",
+ "version": "1.0.0",
+ "description": "",
+ "main": "index.js",
+ "extensions": {
+ "uni-cloud-redis": {}
+ },
+ "author": ""
+}
diff --git a/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/package.json b/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/package.json
index 300e8373299bfbe8a6d517a4d33471cd3240181b..a05fe9041d16564e60f4ce6003d4413ea4d0a306 100644
--- a/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/package.json
+++ b/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/package.json
@@ -1,9 +1,10 @@
{
- "name": "uni-config-center",
- "version": "0.0.2",
- "description": "配置中心",
- "main": "index.js",
- "keywords": [],
- "author": "DCloud",
- "license": "Apache-2.0"
-}
\ No newline at end of file
+ "name" : "uni-config-center",
+ "version" : "0.0.2",
+ "description" : "配置中心",
+ "main" : "index.js",
+ "keywords" : [],
+ "author" : "DCloud",
+ "license" : "Apache-2.0",
+ "dependencies" : null
+}
diff --git a/uni_modules_tools/copy/manifest.json b/uni_modules_tools/copy/manifest.json
index 4d879fd5fcf5992447dcc80fb0537df32123c8b2..f4b3f42e2e016e8af5c74c005b851314e1bbc0d3 100644
--- a/uni_modules_tools/copy/manifest.json
+++ b/uni_modules_tools/copy/manifest.json
@@ -1,224 +1,204 @@
{
- "name": "统一应用基本项目",
- "appid": "请点击重新获取",
- "description": "云端一体应用快速开发模版",
- "versionName": "1.0.0",
- "versionCode": "100",
- "transformPx": false,
- "app-plus": {
- "locales": {
- "en": {
+ "name" : "统一应用基本项目",
+ "appid" : "__UNI__E5373F7",
+ "description" : "云端一体应用快速开发模版",
+ "versionName" : "1.0.0",
+ "versionCode" : "100",
+ "transformPx" : false,
+ "app-plus" : {
+ "locales" : {
+ "en" : {
// 英文
- "name": "uni-starter", // 应用名称
- "android": {
- "strings": {
+ "name" : "uni-starter", // 应用名称
+ "android" : {
+ "strings" : {
//Android平台自定义字符串
- "CustomKey": "CustomValue"
- }
- },
- "ios": {
- "privacyDescription": {
+ "CustomKey" : "CustomValue"
+ }
+ },
+ "ios" : {
+ "privacyDescription" : {
//iOS平台隐私访问描述信息
- "NSPhotoLibraryUsageDescription": "access to the user’s photo library(read)"
- },
- "infoPlist": {
+ "NSPhotoLibraryUsageDescription" : "access to the user’s photo library(read)"
+ },
+ "infoPlist" : {
//iOS平台自定义InfoPlist.strings
- "CustomKey": "CustomValue"
- }
- }
- },
- "zh": {
+ "CustomKey" : "CustomValue"
+ }
+ }
+ },
+ "zh" : {
// 中文(简体)
- "name": "统一应用基本项目" // 应用名称
- }
- },
- "privacy": {
- "prompt": "template",
- "template": {
- "title": "服务协议和隐私政策",
- "message": " 请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款,包括但不限于:为了更好的向你提供服务,我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。
你可阅读《服务协议》和《隐私政策》了解详细信息。如果你同意,请点击下面按钮开始接受我们的服务。",
- "buttonAccept": "同意",
- "buttonRefuse": "暂不同意"
- }
- },
- "compatible": {
- "ignoreVersion": true
- },
- "usingComponents": true,
- "nvueStyleCompiler": "uni-app",
- "compilerVersion": 3,
- "splashscreen": {
- "alwaysShowBeforeRender": false,
- "waiting": true,
- "autoclose": true,
- "delay": 0
- },
- "modules": {
- "Fingerprint": {
- },
- "Share": {
- },
- "OAuth": {
- },
- "FaceID": {
- },
- "Push": {
- },
- "Geolocation": {
- }
- },
- "distribute": {
- "android": {
- "permissions": [
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- "",
- ""
- ],
- "abiFilters": [
- "armeabi-v7a",
- "arm64-v8a",
- "x86"
- ]
- },
- "ios": {
- "capabilities": {
- "entitlements": {
- "com.apple.developer.associated-domains": [
- "applinks:static-76ce2c5e-31c7-4d81-8fcf-ed1541ecbc6e.bspapp.com"
- ]
- }
- }
- },
- "sdkConfigs": {
- "oauth": {
- "apple": {
- },
- "weixin": {
- "appid": "",
- "appsecret": "",
- "UniversalLinks": ""
- },
- "univerify": {
- }
+ "name" : "统一应用基本项目" // 应用名称
+ }
},
- "ad": {
+ "privacy" : {
+ "prompt" : "template",
+ "template" : {
+ "title" : "服务协议和隐私政策",
+ "message" : " 请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款,包括但不限于:为了更好的向你提供服务,我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。
你可阅读《服务协议》和《隐私政策》了解详细信息。如果你同意,请点击下面按钮开始接受我们的服务。",
+ "buttonAccept" : "同意",
+ "buttonRefuse" : "暂不同意"
+ }
},
- "share": {
- "weixin": {
- "appid": "",
- "UniversalLinks": ""
- }
+ "compatible" : {
+ "ignoreVersion" : true
},
- "geolocation": {
- "baidu": {
- "__platform__": [
- "ios",
- "android"
- ],
- "appkey_ios": "请填写地图的key",
- "appkey_android": "请填写地图的key"
- }
+ "usingComponents" : true,
+ "nvueStyleCompiler" : "uni-app",
+ "compilerVersion" : 3,
+ "splashscreen" : {
+ "alwaysShowBeforeRender" : false,
+ "waiting" : true,
+ "autoclose" : true,
+ "delay" : 0
},
- "push": {
- "unipush": {
- }
+ "modules" : {
+ "Fingerprint" : {},
+ "Share" : {},
+ "OAuth" : {},
+ "FaceID" : {},
+ "Push" : {},
+ "Geolocation" : {}
},
- "payment": {
- }
- },
- "icons": {
- "android": {
- "hdpi": "",
- "xhdpi": "",
- "xxhdpi": "",
- "xxxhdpi": ""
+ "distribute" : {
+ "android" : {
+ "permissions" : [
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ ""
+ ],
+ "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
+ },
+ "ios" : {
+ "capabilities" : {
+ "entitlements" : {
+ "com.apple.developer.associated-domains" : [ "applinks:static-76ce2c5e-31c7-4d81-8fcf-ed1541ecbc6e.bspapp.com" ]
+ }
+ }
+ },
+ "sdkConfigs" : {
+ "oauth" : {
+ "apple" : {},
+ "weixin" : {
+ "appid" : "wxffdd8fa6ec4ef2a0",
+ "appsecret" : "",
+ "UniversalLinks" : ""
+ },
+ "univerify" : {}
+ },
+ "ad" : {},
+ "share" : {
+ "weixin" : {
+ "appid" : "wxffdd8fa6ec4ef2a0",
+ "UniversalLinks" : ""
+ }
+ },
+ "geolocation" : {
+ "baidu" : {
+ "__platform__" : [ "ios", "android" ],
+ "appkey_ios" : "请填写地图的key",
+ "appkey_android" : "请填写地图的key"
+ }
+ },
+ "push" : {
+ "unipush" : {}
+ },
+ "payment" : {}
+ },
+ "icons" : {
+ "android" : {
+ "hdpi" : "",
+ "xhdpi" : "",
+ "xxhdpi" : "",
+ "xxxhdpi" : ""
+ },
+ "ios" : {
+ "appstore" : "",
+ "ipad" : {
+ "app" : "",
+ "app@2x" : "",
+ "notification" : "",
+ "notification@2x" : "",
+ "proapp@2x" : "",
+ "settings" : "",
+ "settings@2x" : "",
+ "spotlight" : "",
+ "spotlight@2x" : ""
+ },
+ "iphone" : {
+ "app@2x" : "",
+ "app@3x" : "",
+ "notification@2x" : "",
+ "notification@3x" : "",
+ "settings@2x" : "",
+ "settings@3x" : "",
+ "spotlight@2x" : "",
+ "spotlight@3x" : ""
+ }
+ }
+ },
+ "splashscreen" : {
+ "iosStyle" : "common",
+ "androidStyle" : "common"
+ }
+ },
+ "nvueLaunchMode" : ""
+ },
+ "quickapp" : {},
+ "mp-weixin" : {
+ "appid" : "",
+ "setting" : {
+ "urlCheck" : false,
+ "es6" : false
},
- "ios": {
- "appstore": "",
- "ipad": {
- "app": "",
- "app@2x": "",
- "notification": "",
- "notification@2x": "",
- "proapp@2x": "",
- "settings": "",
- "settings@2x": "",
- "spotlight": "",
- "spotlight@2x": ""
- },
- "iphone": {
- "app@2x": "",
- "app@3x": "",
- "notification@2x": "",
- "notification@3x": "",
- "settings@2x": "",
- "settings@3x": "",
- "spotlight@2x": "",
- "spotlight@3x": ""
- }
+ "usingComponents" : true,
+ "betterScopedSlots" : true,
+ "permission" : {
+ "scope.userLocation" : {
+ "desc" : "演示在onShow生命周期获取地理位置"
+ }
}
- },
- "splashscreen": {
- "iosStyle": "common",
- "androidStyle": "common"
- }
},
- "nvueLaunchMode": ""
- },
- "quickapp": {
- },
- "mp-weixin": {
- "appid": "",
- "setting": {
- "urlCheck": false,
- "es6": false
+ "mp-alipay" : {
+ "usingComponents" : true
+ },
+ "mp-baidu" : {
+ "usingComponents" : true
},
- "usingComponents": true,
- "betterScopedSlots": true,
- "permission": {
- "scope.userLocation": {
- "desc": "演示在onShow生命周期获取地理位置"
- }
- }
- },
- "mp-alipay": {
- "usingComponents": true
- },
- "mp-baidu": {
- "usingComponents": true
- },
- "mp-toutiao": {
- "usingComponents": true
- },
- "uniStatistics": {
- "enable": false
- },
- "h5": {
- "template": "",
- "sdkConfigs": {
- "maps": {
- "qqmap": {
- "key": ""
+ "mp-toutiao" : {
+ "usingComponents" : true
+ },
+ "uniStatistics" : {
+ "enable" : false
+ },
+ "h5" : {
+ "template" : "",
+ "sdkConfigs" : {
+ "maps" : {
+ "qqmap" : {
+ "key" : ""
+ }
+ }
}
- }
- }
- },
- "_spaceID": "",
- "vueVersion": "2"
+ },
+ "_spaceID" : "",
+ "vueVersion" : "2"
}
//...
// 中文(简体)
// 应用名称
+
diff --git a/uni_modules_tools/copy/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/uni-id/config.json b/uni_modules_tools/copy/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/uni-id/config.json
index 17500c4c354799821de17837f0cbce79e080fa33..1d308ea6f8a860fd5629f104e78464e860fd456c 100644
--- a/uni_modules_tools/copy/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/uni-id/config.json
+++ b/uni_modules_tools/copy/uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/uni-id/config.json
@@ -1,52 +1,52 @@
-{
- "passwordSecret": "passwordSecret-demo",
- "tokenSecret": "tokenSecret-demo",
- "tokenExpiresIn": 7200,
- "tokenExpiresThreshold": 600,
- "passwordErrorLimit": 6,
- "bindTokenToDevice": false,
- "passwordErrorRetryTime": 3600,
- "autoSetInviteCode": false,
- "forceInviteCode": false,
- "app-plus": {
- "tokenExpiresIn": 2592000,
- "oauth": {
- "weixin": {
- "appid": "填写来源微信开放平台https://open.weixin.qq.com/创建的应用的appid",
- "appsecret": "填写来源微信开放平台https://open.weixin.qq.com/创建的应用的appsecret"
- },
- "apple": {
- "bundleId": "苹果开发者后台获取的bundleId"
- }
- }
- },
- "mp-weixin": {
- "oauth": {
- "weixin": {
- "appid": "微信小程序登录所用的appid、appsecret需要在对应的小程序管理控制台获取",
- "appsecret": "微信小程序后台获取的appsecret"
- }
- }
- },
- "mp-alipay": {
- "oauth": {
- "alipay": {
- "appid": "支付宝小程序登录用到的appid、privateKey请参考支付宝小程序的文档进行设置或者获取,https://opendocs.alipay.com/open/291/105971#LDsXr",
- "privateKey": "支付宝小程序登录用到的appid、privateKey请参考支付宝小程序的文档进行设置或者获取,https://opendocs.alipay.com/open/291/105971#LDsXr"
- }
- }
- },
- "service": {
- "sms": {
- "name": "应用名称,对应短信模版的name",
- "codeExpiresIn": 300,
- "smsKey": "短信密钥key,开通短信服务处可以看到",
- "smsSecret": "短信密钥secret,开通短信服务处可以看到"
- },
- "univerify": {
- "appid": "当前应用的appid,使用云函数URL化,此项必须配置",
- "apiKey": "apiKey 和 apiSecret 在开发者中心获取,开发者中心:https://dev.dcloud.net.cn/uniLogin/index?type=0,文档:https://ask.dcloud.net.cn/article/37965",
- "apiSecret": ""
- }
- }
-}
\ No newline at end of file
+{
+ "passwordSecret": "passwordSecret-demo",
+ "tokenSecret": "tokenSecret-demo",
+ "tokenExpiresIn": 7200,
+ "tokenExpiresThreshold": 600,
+ "passwordErrorLimit": 6,
+ "bindTokenToDevice": false,
+ "passwordErrorRetryTime": 3600,
+ "autoSetInviteCode": false,
+ "forceInviteCode": false,
+ "app-plus": {
+ "tokenExpiresIn": 2592000,
+ "oauth": {
+ "weixin": {
+ "appid": "wxffdd8fa6ec4ef2a0",
+ "appsecret": "6c9119430d7be0a147bcbbb73ef33acf"
+ },
+ "apple": {
+ "bundleId": "苹果开发者后台获取的bundleId"
+ }
+ }
+ },
+ "mp-weixin": {
+ "oauth": {
+ "weixin": {
+ "appid": "wx81dbb061d2258234",
+ "appsecret": "51977820eb14cd71377d4048a1b4754e"
+ }
+ }
+ },
+ "mp-alipay": {
+ "oauth": {
+ "alipay": {
+ "appid": "支付宝小程序登录用到的appid、privateKey请参考支付宝小程序的文档进行设置或者获取,https://opendocs.alipay.com/open/291/105971#LDsXr",
+ "privateKey": "支付宝小程序登录用到的appid、privateKey请参考支付宝小程序的文档进行设置或者获取,https://opendocs.alipay.com/open/291/105971#LDsXr"
+ }
+ }
+ },
+ "service": {
+ "sms": {
+ "name": "应用名称,对应短信模版的name",
+ "codeExpiresIn": 300,
+ "smsKey": "短信密钥key,开通短信服务处可以看到",
+ "smsSecret": "短信密钥secret,开通短信服务处可以看到"
+ },
+ "univerify": {
+ "appid": "当前应用的appid,使用云函数URL化,此项必须配置",
+ "apiKey": "apiKey 和 apiSecret 在开发者中心获取,开发者中心:https://dev.dcloud.net.cn/uniLogin/index?type=0,文档:https://ask.dcloud.net.cn/article/37965",
+ "apiSecret": ""
+ }
+ }
+}