diff --git a/App.vue b/App.vue index 3f2967949bb4603204e26c677ae27792b2230883..1f641bbcef262341bb791e859b62dfa5d67db4c2 100644 --- a/App.vue +++ b/App.vue @@ -76,7 +76,7 @@ } ] } - console.log(getApp().globalData.config) + // console.log(getApp().globalData.config) getApp().globalData.config.about.agreements = agreements } setTimeout(()=>{ diff --git a/changelog.md b/changelog.md index 8ad0d5792d711772e199b7201458c778c73ce883..fa9faaedbe1b2cd4be452b948060e591eca251c2 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,5 @@ +## 1.1.3(2021-08-31) +修复在微信小程序端默认语言为英文的问题 ## 1.1.2(2021-08-30) 修复在微信小程序下切换语言报`locale`不存在的问题 ## 1.1.1(2021-08-30) diff --git a/common/appInit.js b/common/appInit.js index 3d9a669f86b393c79f84833bdbc3877116f3ddd4..8f94ba79fbc49e524d13dffb28c1f0a51d56f080 100644 --- a/common/appInit.js +++ b/common/appInit.js @@ -290,7 +290,7 @@ export default async function() { }); break; default: - console.log('code的值是:' + e.result.code, '可以在这里插入,自动处理响应体'); + console.log('code的值是:' + e.result.code, '可以在上面添加case,自动处理响应体'); break; } diff --git a/lang/i18n.js b/lang/i18n.js index 07a208d59cccbdbbe5fa305a735f92bf39d60433..5a3e2211cc8aa5b986994dde3ec5207f58fce73e 100644 --- a/lang/i18n.js +++ b/lang/i18n.js @@ -17,20 +17,13 @@ if (!currentLang) { }else{ uni.getSystemInfo({ success: function (res) { - uni.getSystemInfo({ - success: function (res) { - console.log('获取设备信息:',res); - let language = 'zh-Hans' - if(res.language != 'zh-Hans'){ - language = 'en' - } - uni.setStorageSync('CURRENT_LANG', language) - currentLang = language - }, - fail: (err) => { - console.error(err) - } - }) + console.log('获取设备信息:',res); + let language = 'zh-Hans' + if(res.language == 'en'){ + language = 'en' + } + uni.setStorageSync('CURRENT_LANG', language) + currentLang = language }, fail: (err) => { console.error(err) diff --git a/package.json b/package.json index f1fbca53a71422e0aa56461dbffc696f2a75dbfd..7b08e075b3538dfd309430687a8750b06937b3ca 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "id": "uni-starter", "displayName": "uni-starter", - "version": "1.1.2", + "version": "1.1.3", "description": "云端一体应用快速开发基本项目模版", "keywords": [ "login", diff --git a/pages/list/list.nvue b/pages/list/list.nvue index 36c70dc8b64e4f52ce81f88a225d0960c4372741..53ae47b2e28d9d2f938c9ed6e80243c0b9f8238f 100644 --- a/pages/list/list.nvue +++ b/pages/list/list.nvue @@ -88,15 +88,6 @@ this.listHight = 'auto' // #endif cdbRef = this.$refs.udb - - // #ifdef VUE3 - console.log('vue3') - // #endif - - // #ifdef VUE2 - console.log('vue2') - // #endif - }, async onShow() { this.keyword = getApp().globalData.searchText @@ -106,11 +97,11 @@ // uni.showLoading({ // title:"获取定位中" // }); + //默认h5端不获取定位 // #ifndef H5 let location = await gps.getLocation({geocode:true}) console.log(location); // #endif - // if(location){ // uni.showToast({ // title: JSON.stringify(location), diff --git a/uniCloud-aliyun/cloudfunctions/redis-test/index.js b/uniCloud-aliyun/cloudfunctions/redis-test/index.js deleted file mode 100644 index 2e13b9c35dd0eadef14365db1906c166ae4e6eca..0000000000000000000000000000000000000000 --- a/uniCloud-aliyun/cloudfunctions/redis-test/index.js +++ /dev/null @@ -1,11 +0,0 @@ -// 简单的使用示例 -'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 deleted file mode 100644 index fd00300ec5ba8468394bef587b86a80df533743f..0000000000000000000000000000000000000000 --- a/uniCloud-aliyun/cloudfunctions/redis-test/package.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name": "redis-test", - "version": "1.0.0", - "description": "", - "main": "index.js", - "extensions": { - "uni-cloud-redis": {} - }, - "author": "" -}