diff --git a/changelog.md b/changelog.md
index 9bbe3354db6b4cc3c560171ebc52774dec041f46..a2491758e0919856a389e59f70b583dc1608a7d4 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,5 @@
+## 1.1.13(2021-09-29)
+修复search页面因多语言国际化导致多白屏问题
## 1.1.12(2021-09-28)
1. 改造微信登陆逻辑,直接使用`uni.login`参数`"onlyAuthorize":true`实现
2. 修复,一键登录弹出层,已勾选“同意隐私政策协议”点击自定义登陆按钮,报“你未同意隐私政策协议”的bug
diff --git a/package.json b/package.json
index 5b8a0349a4bc6f2954fc3e91d69ba4314e104228..b8aa16dfe2abd281813dc4782d4e0d8983ba0415 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"id": "uni-starter",
"displayName": "uni-starter",
- "version": "1.1.12",
+ "version": "1.1.13",
"description": "云端一体应用快速开发基本项目模版",
"keywords": [
"login",
diff --git a/pages.json b/pages.json
index bea237031cd8f06c378378df04f05bcc832437c7..1e0e7184e24f252e585e125c327d62911c2c2849 100644
--- a/pages.json
+++ b/pages.json
@@ -24,10 +24,8 @@
}
}, {
"path": "pages/list/search/search",
- "style": {
- //#ifndef MP
- "navigationStyle": "custom"
- //#endif
+ "style": {
+ "navigationBarTitleText":"搜索"
}
}, {
"path": "pages/list/detail",
diff --git a/pages/list/search/search.nvue b/pages/list/search/search.nvue
index 78f182f4df2f35699c39348fd7f2ac9a2556b005..12ab77042bec049036e79227fbab7a68bf283d51 100644
--- a/pages/list/search/search.nvue
+++ b/pages/list/search/search.nvue
@@ -1,6 +1,5 @@
-
@@ -9,22 +8,22 @@
+ clearButton="auto" cancelButton="always" @clear="clear" @confirm="confirm" @cancel="cancel" />
-
+
@@ -37,13 +36,13 @@
-
+
正在加载...
@@ -55,16 +54,19 @@
- {{$t('search.searchHiddenTip')}}
+ 当前搜索发现已隐藏
-
+
-
+
+
+
@@ -213,8 +215,8 @@
},
LocalSearchListClear() {
uni.showModal({
- content: this.$t('search.deleteTip'),
- confirmText: this.$t('search.delete'),
+ content: "确认清空搜索历史吗",
+ confirmText: "删除",
confirmColor: 'red',
cancelColor: '#808080',
success: res => {
diff --git a/pages/ucenter/login-page/register/register.vue b/pages/ucenter/login-page/register/register.vue
index 8adfea37be30cb97a4b63cacb945e683b99d1897..15ec3ae92351d7617d796796e4a242b0d517ad31 100644
--- a/pages/ucenter/login-page/register/register.vue
+++ b/pages/ucenter/login-page/register/register.vue
@@ -5,7 +5,7 @@
-
+
@@ -98,5 +98,8 @@ import mixin from '../common/login-page.mixin.js';
}
.send-btn{
margin-top: 5px;
+ }
+ .uni-container ::v-deep .uni-forms-item__label{
+ width: 15px !important;
}
diff --git a/pages/ucenter/ucenter.vue b/pages/ucenter/ucenter.vue
index cae7fbcfa8134782821a6cd77e61ca4f96060447..6759b53f92ba404686b1e1cee1165035258b5129 100644
--- a/pages/ucenter/ucenter.vue
+++ b/pages/ucenter/ucenter.vue
@@ -149,7 +149,7 @@
,
appConfig() {
return getApp().globalData.config
- }
+ }
},
methods: {
...mapMutations({