1.提交代码 修改问题

pages.json

@@ -329,7 +329,7 @@
 				"navigationBarTextStyle": "white"
 			}
 		}
-	],
+    ],
 
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

pages/goods/HM-search/HM-search.vue

@@ -135,7 +135,7 @@
 			//加载默认搜索关键字
 			loadDefaultKeyword() {
 				//定义默认搜索关键字，可以自己实现ajax请求数据再赋值,用户未输入时，以水印方式显示在输入框，直接不输入内容搜索会搜索默认关键字
-				this.defaultKeyword = "默认关键字";
+				this.defaultKeyword = "搜索卡券";
 			},
 			//加载历史搜索,自动读取本地Storage
 			loadOldKeyword() {

pages/login/login.vue

@@ -17,10 +17,11 @@
 					placeholder-style="color: rgba(255,255,255,0.8);" />
 			</view>
 			<view class="btn mart50" @tap="doLogin">登 录</view>
-			<!-- <view class="res"> -->
+			<view class="res flright mart20">
 			<!-- <view @tap="toPage('register')">用户注册</view> -->
-			<!-- <view @tap="toPage('resetpasswd')">忘记密码</view> -->
+			<view @tap="toPage('resetpasswd')">重置密码</view>
-			<!-- </view> -->
+			</view>
+			<!-- <view class="mart30 flright marRight20 font15  fcorfff">重置密码</view> -->
 		</view>
 		<!-- 第三方登录 -->
 		<!-- <view class="oauth" v-if="isShowOauth"> -->

pages/login/resetpasswd.vue

@@ -7,14 +7,14 @@
 		</view>
 		<view class="form re">
 			<view class="username">
-				<view class="get-code" :style="{'color':getCodeBtnColor}" @click.stop="getCode()">{{getCodeText}}</view>
+				<!-- <view class="get-code" :style="{'color':getCodeBtnColor}" @click.stop="getCode()">{{getCodeText}}</view> -->
-				<input placeholder="请输入手机号" v-model="phoneNumber" placeholder-style="color: rgba(255,255,255,0.8);"/>
+				<input placeholder="请输入旧密码" v-model="phoneNumber" placeholder-style="color: rgba(255,255,255,0.8);"/>
 			</view>
 			<view class="code">
-				<input placeholder="请输入验证码" v-model="code" placeholder-style="color: rgba(255,255,255,0.8);"/>
+				<input placeholder="请输入新密码" v-model="code" placeholder-style="color: rgba(255,255,255,0.8);"/>
 			</view>
 			<view class="password">
-				<input placeholder="请输入密码" v-model="passwd" password=true placeholder-style="color: rgba(255,255,255,0.8);"/>
+				<input placeholder="确认新密码" v-model="passwd" password=true placeholder-style="color: rgba(255,255,255,0.8);"/>
 			</view>
 			<view class="btn" @tap="doReset">重置密码</view>
 

pages/tabBar/category/category.vue

@@ -7,7 +7,7 @@
 				<view class="icon location"></view>{{city}}
 			</view>
 			<view class="input-box">
-				<input placeholder="默认关键字" placeholder-style="color:#c0c0c0;" @tap="toSearch()" />
+				<input placeholder="搜索卡券" placeholder-style="color:#c0c0c0;" @tap="toSearch()" />
 				<view class="icon search"></view>
 			</view>
 			<!-- <view class="icon-btn"> -->

pages/tabBar/home/home.vue

@@ -13,7 +13,7 @@
 			</view>
 			<!-- 搜索框 -->
 			<view class="input-box">
-				<input placeholder="默认关键字" placeholder-style="color:#c0c0c0;" @tap="toSearch()" />
+				<input placeholder="搜索卡券" placeholder-style="color:#c0c0c0;" @tap="toSearch()" />
 				<view class="icon search"></view>
 			</view>
 			<!-- 右侧图标按钮 -->

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;

uni.scss

@@ -150,6 +150,10 @@ $uni-font-size-paragraph:30upx;
 .marglerig{
 	margin-right: 5px;
 }
+.marRight20{
+	margin-right: 20px;
+}
+
 
 .verc {
   vertical-align: middle;