From 5425d3658a0606c1eeb7cb576b33e1954ecebd08 Mon Sep 17 00:00:00 2001 From: linju-json Date: Thu, 16 Sep 2021 21:19:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=B1=E5=A4=9A=E8=AF=AD?= =?UTF-8?q?=E8=A8=80=E5=88=87=E6=8D=A2=E5=8A=9F=E8=83=BD=E5=BC=95=E8=B5=B7?= =?UTF-8?q?=E7=9A=84=E9=9A=90=E7=A7=81=E6=94=BF=E7=AD=96=E5=8D=8F=E8=AE=AE?= =?UTF-8?q?=E6=A0=87=E9=A2=98=E9=93=BE=E6=8E=A5=E8=A2=AB=E9=87=8D=E5=86=99?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 24 ++---------------------- changelog.md | 2 ++ lang/en.js | 3 ++- lang/zh-Hans.js | 3 ++- package.json | 2 +- uni-starter.config.js | 9 +++++---- 6 files changed, 14 insertions(+), 29 deletions(-) diff --git a/App.vue b/App.vue index 70062a15..28bef618 100644 --- a/App.vue +++ b/App.vue @@ -55,28 +55,8 @@ }) //更新 uni-starter.config //agreements - let agreements = [{ - "title": "用户服务协议", //协议名称 - "url": "请填写用户服务协议链接" //对应的网络链接 - }, - { - "title": "隐私政策", - "url": "请填写隐私政策链接" - } - ] - if(getApp().globalData.$i18n.locale == 'en'){ - agreements = [{ - "title": "User service agreement", //协议名称 - "url": "请填写用户服务协议链接" //对应的网络链接 - }, - { - "title": "Privacy policy", - "url": "请填写隐私政策链接" - } - ] - } - // console.log(getApp().globalData.config) - getApp().globalData.config.about.agreements = agreements + let agreementsTitle = this.$t('agreementsTitle').split(',') + let agreements = getApp().globalData.config.about.agreements agreements[0].title = agreementsTitle[0] agreements[1].title = agreementsTitle[1] getApp().globalData.config.about.agreements = agreements } setTimeout(()=>{ initLanguageAfter() diff --git a/changelog.md b/changelog.md index f69f9391..e7726a38 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,5 @@ +## 1.1.9（2021-09-16） +修复由多语言切换功能引起的隐私政策协议标题链接被重写的问题 ## 1.1.8（2021-09-15） 更新数据表guestbook的schema中更新权限的配置 ## 1.1.7（2021-09-14） diff --git a/lang/en.js b/lang/en.js index 2dbfbf08..11c57b9b 100644 --- a/lang/en.js +++ b/lang/en.js @@ -1,5 +1,6 @@ export default { - tabbar:'List,Grid,Mine', + tabbar:'List,Grid,Mine', + agreementsTitle:'User service agreement,Privacy policy', common: { wechatFriends: "friends", wechatBbs: "bbs", diff --git a/lang/zh-Hans.js b/lang/zh-Hans.js index 90bdd76c..77c2733b 100644 --- a/lang/zh-Hans.js +++ b/lang/zh-Hans.js @@ -1,5 +1,6 @@ export default { - tabbar:'列表,宫格,我的', + tabbar:'列表,宫格,我的', + agreementsTitle:'用户服务协议,隐私政策', common:{ wechatFriends: "微信好友", wechatBbs: "微信朋友圈", diff --git a/package.json b/package.json index c405238a..f6a9ffdd 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "id": "uni-starter", "displayName": "uni-starter", - "version": "1.1.8", + "version": "1.1.9", "description": "云端一体应用快速开发基本项目模版", "keywords": [ "login", diff --git a/uni-starter.config.js b/uni-starter.config.js index 4aee92f3..6e4567b0 100644 --- a/uni-starter.config.js +++ b/uni-starter.config.js @@ -29,7 +29,7 @@ export default { * 注意：黑名单与白名单模式二选一 */ // "needLogin" : [ - // {pattern:/^\/pages\/list.*/}", //支持正则表达式 + // {pattern:/^\/pages\/list.*/}, //支持正则表达式 // "/uni_modules/uni-news-favorite/pages/uni-news-favorite/list", // "/uni_modules/uni-feedback/pages/uni-feedback/add" // ], @@ -41,7 +41,8 @@ export default { "/pages/grid/grid", "/pages/ucenter/ucenter", "/pages/ucenter/guestbook/guestbook", - "/pages/ucenter/guestbook/guestbook" + "/pages/ucenter/about/about", + "/pages/ucenter/settings/settings" ], /* login:配置登陆类型与优先级 @@ -62,11 +63,11 @@ export default { "slogan": "云端一体应用快速开发模版", //政策协议 "agreements": [{ - "title": "用户服务协议", //协议名称 + // "title": "为了多语言国际化请在 lang/en.js 和 lang/zh-Hans.js中配置", "url": "请填写用户服务协议链接" //对应的网络链接 }, { - "title": "隐私政策", + // "title": "为了多语言国际化请在 lang/en.js 和 lang/zh-Hans.js中配置", "url": "请填写隐私政策链接" } ], -- GitLab