From c381dfc3e90431a729e70f9d92121424c1d44138 Mon Sep 17 00:00:00 2001 From: yangsanTT <812952667@qq.com> Date: Mon, 10 May 2021 21:53:23 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 2 +- pages/goods/HM-search/HM-search.vue | 2 +- pages/login/login.vue | 7 ++++--- pages/login/resetpasswd.vue | 8 ++++---- pages/tabBar/category/category.vue | 2 +- pages/tabBar/home/home.vue | 2 +- static/css/login.scss | 3 ++- uni.scss | 4 ++++ 8 files changed, 18 insertions(+), 12 deletions(-) diff --git a/pages.json b/pages.json index 6e91877..a11f79f 100644 --- a/pages.json +++ b/pages.json @@ -329,7 +329,7 @@ "navigationBarTextStyle": "white" } } - ], + ], "globalStyle": { "navigationBarTextStyle": "black", diff --git a/pages/goods/HM-search/HM-search.vue b/pages/goods/HM-search/HM-search.vue index 2caf104..3271a6c 100644 --- a/pages/goods/HM-search/HM-search.vue +++ b/pages/goods/HM-search/HM-search.vue @@ -135,7 +135,7 @@ //加载默认搜索关键字 loadDefaultKeyword() { //定义默认搜索关键字,可以自己实现ajax请求数据再赋值,用户未输入时,以水印方式显示在输入框,直接不输入内容搜索会搜索默认关键字 - this.defaultKeyword = "默认关键字"; + this.defaultKeyword = "搜索卡券"; }, //加载历史搜索,自动读取本地Storage loadOldKeyword() { diff --git a/pages/login/login.vue b/pages/login/login.vue index 8b01e08..590dafd 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -17,10 +17,11 @@ placeholder-style="color: rgba(255,255,255,0.8);" /> 登 录 - + - - + 重置密码 + + diff --git a/pages/login/resetpasswd.vue b/pages/login/resetpasswd.vue index 32f0c60..e53fcbe 100644 --- a/pages/login/resetpasswd.vue +++ b/pages/login/resetpasswd.vue @@ -7,14 +7,14 @@ - {{getCodeText}} - + + - + - + 重置密码 diff --git a/pages/tabBar/category/category.vue b/pages/tabBar/category/category.vue index 3d33b79..0078e18 100644 --- a/pages/tabBar/category/category.vue +++ b/pages/tabBar/category/category.vue @@ -7,7 +7,7 @@ {{city}} - + diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue index c495d5e..1a69816 100644 --- a/pages/tabBar/home/home.vue +++ b/pages/tabBar/home/home.vue @@ -13,7 +13,7 @@ - + diff --git a/static/css/login.scss b/static/css/login.scss index c89a178..8a7496a 100644 --- a/static/css/login.scss +++ b/static/css/login.scss @@ -46,7 +46,8 @@ page { .btn { color: #f06c7a; - width: 100%; + width: 100%; + margin-top: 50rpx; height: 90rpx; display: flex; justify-content: center; diff --git a/uni.scss b/uni.scss index 382e7d5..a3067e3 100644 --- a/uni.scss +++ b/uni.scss @@ -150,6 +150,10 @@ $uni-font-size-paragraph:30upx; .marglerig{ margin-right: 5px; } +.marRight20{ + margin-right: 20px; +} + .verc { vertical-align: middle;