diff --git a/manifest.json b/manifest.json
index ed77cd3..9e43c4d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
 	"name": "惠农生活",
 	"appid": "__UNI__3A527D1",
 	"description": "",
-	"versionName": "2.0.51",
-	"versionCode": 2051,
+	"versionName": "2.0.53",
+	"versionCode": 2053,
 	"transformPx": false,
 	/* 5+App特有相关 */
 	"app-plus": {
diff --git a/pages/gather/subnvue/concat.nvue b/pages/gather/subnvue/concat.nvue
index 85ac458..6176600 100644
--- a/pages/gather/subnvue/concat.nvue
+++ b/pages/gather/subnvue/concat.nvue
@@ -10,15 +10,10 @@
 		<view class="" class="pointe" :style="{ left:(left-10)+'px',top:(top)+'px'}">
 			<image src="/static/images/pointer.png" style="width: 254rpx;height: 254rpx;" mode=""></image>
 		</view>
-		<view class="center" :style="{left:(left+20)+'px',  top:(top+60)+'px'}">
+		<view class="center" :style="{left:(left+20)+'px',  top:(top+55)+'px'}">
 			<image src="/static/images/greenLineDown.png" style="width:35px;height: 60px;" mode=""></image>
 		</view>
-		<!-- <view class="tips" :style="{ left:left+'px',top:(top+120)+'px'}">
-			<view class="tras" :class="{act:isActive}">
-				<text class="font" style="line-height: 106rpx;">点击供销助农平台进入商户平台</text>
-			</view>
-		</view> -->
-		<view class="tips-box" :style="{ left:left+'px',top:(top+120)+'px'}">
+		<view class="tips-box" :style="{ left:left+'px',top:(top+80)+'px'}">
 			<view class="tips" style="position: absolute;padding-left: 20px;">
 				<view class="tras" :class="{act:isActive}">
 					<text style="font-size: 28rpx;line-height: 100rpx;color: white;">点击我的页面，进行商户入驻</text>
@@ -187,6 +182,7 @@
 		height: 76rpx;
 		border: 1px solid white;
 		border-radius: 38rpx;
+		background-color: rgba(255, 255, 255, 0.4);
 	}
 
 	.next-btn-text {
diff --git a/pages/index/subnvue/concat.nvue b/pages/index/subnvue/concat.nvue
index f09af6a..b1c0b62 100644
--- a/pages/index/subnvue/concat.nvue
+++ b/pages/index/subnvue/concat.nvue
@@ -193,11 +193,13 @@
 		height: 76rpx;
 		border: 1px solid white;
 		border-radius: 38rpx;
+		background-color: rgba(255, 255, 255, 0.4);
 	}
 
 	.next-btn-text {
 		line-height: 76rpx;
 		text-align: center;
+		/* background-color: #939393; */
 	}
 
 	.jump {
diff --git a/pages/index/subnvue/newUser.nvue b/pages/index/subnvue/newUser.nvue
index ee01fbc..2ac0b25 100644
--- a/pages/index/subnvue/newUser.nvue
+++ b/pages/index/subnvue/newUser.nvue
@@ -91,6 +91,7 @@
 		height: 76rpx;
 		border: 1px solid white;
 		border-radius: 38rpx;
+		background: rgba(255, 255, 255, 0.4);
 	}
 
 	.target {
diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue
index 3b24ab3..8a7befd 100644
--- a/pages/store/settled/index.vue
+++ b/pages/store/settled/index.vue
@@ -424,7 +424,7 @@
 			},
 			splitAddress(str) {
 				if (!str.includes('省')) str = "四川省" + str;
-				var reg = /.+?(省|市|自治区|自治州|县|区|镇|社区|街道|村)/g; // 省市区的正则
+				var reg = /.+?(省|市|自治区|自治州|县|区|镇|社区|街道|村|街)/g; // 省市区的正则
 				let list = str.match(reg)
 				console.log(list, 'xiugiahou1de1address')
 				this.formData.province_name = list[0]
@@ -434,7 +434,6 @@
 				this.formData.village_name = list[4]
 			},
 			confirmCate(e) {
-				console.log(e)
 				this.formData.merchant_category_name = e.value[0].category_name
 				this.formData.merchant_category_id = e.value[0].merchant_category_id
 				this.showMerchantCategoryPicker = false
diff --git a/pages/user/subnvue/index.nvue b/pages/user/subnvue/index.nvue
index 844ac8f..b006c37 100644
--- a/pages/user/subnvue/index.nvue
+++ b/pages/user/subnvue/index.nvue
@@ -97,6 +97,7 @@
 		height: 76rpx;
 		border: 1px solid white;
 		border-radius: 38rpx;
+		background: rgba(255, 255, 255, 0.4);
 	}
 
 	.target {
diff --git a/pages/users/login/login_copy.vue b/pages/users/login/login_copy.vue
index 643dd23..8108d72 100644
--- a/pages/users/login/login_copy.vue
+++ b/pages/users/login/login_copy.vue
@@ -1,13 +1,14 @@
 <template>
 	<view :style="viewColor">
 		<view class="register absolute" v-if="!auth_token">
-			<view class="login" style="background-size: 100% 100%;background-repeat: no-repeat;">
+			<!-- <view class="login" style="background-size: 100% 100%;background-repeat: no-repeat;"> -->
+			<view class="login">
 				<view class="shading">
 					<view class="pictrue acea-row row-center-wrapper" style="background-color: transparent !important;">
 						<image src="@/static/images/logo1.png" />
 					</view>
 				</view>
-				<view class="" style="margin-top: 70rpx;" v-if='formItem==2'>
+				<view class="" style="margin-top: 10rpx;" v-if='formItem==2'>
 					<view style="text-align: center;font-size: 36rpx;color: #20B128;font-weight: 700;">
 						重置密码
 					</view>
@@ -48,7 +49,8 @@
 							</view>
 							<view class="item">
 								<view class="acea-row row-middle">
-									<image @click="type1=!type1" src="/static/images/eye.png"></image>
+									<image v-if="type1" @click="type1=false" src="/static/images/eye.png"></image>
+									<image v-else @click="type1=true" src="/static/images/offeye.png"></image>
 									<input :type="type1?'password':'input'" placeholder="填写登录密码"
 										placeholder-class="placeholder" v-model="password" required />
 									<button class="code" @click="formItem=2">
@@ -123,14 +125,16 @@
 						</view>
 						<view class="item">
 							<view class="acea-row row-middle">
-								<image @click="type2=!type2" src="/static/images/eye.png"></image>
+								<image v-if="type2" @click="type2=false" src="/static/images/eye.png"></image>
+								<image v-else @click="type2=true" src="/static/images/offeye.png"></image>
 								<input :type="type2?'password':'input'" placeholder="请输入新密码"
 									placeholder-class="placeholder" v-model="password" />
 							</view>
 						</view>
 						<view class="item">
 							<view class="acea-row row-middle">
-								<image @click="type3=!type3" src="/static/images/eye.png"></image>
+								<image v-if="type3" @click="type3=false" src="/static/images/eye.png"></image>
+								<image v-else @click="type3=true" src="/static/images/offeye.png"></image>
 								<input :type="type3?'password':'input'" placeholder="请再次输入密码"
 									placeholder-class="placeholder" v-model="confirm_pwd" />
 							</view>
@@ -148,9 +152,6 @@
 						</view>
 					</view>
 					<view class="logon" @click="registerReset">完成并登录</view>
-					<!-- <view class="tip">
-						<text @click="formItem=1">立即登录</text>
-					</view> -->
 					<view class="protocol acea-row row-between-wrapper">
 						<checkbox-group class="checkgroup" @change='isAgree=!isAgree'>
 							<checkbox class="checkbox" :checked="isAgree ? true : false" />
@@ -160,6 +161,16 @@
 						</checkbox-group>
 					</view>
 				</view>
+				<view class="footer-btn" v-if="formItem==2">
+					<view class="login-type-btn" :class="{actLoginType:formItem==0}" style="margin-right: 70rpx;">
+						<text v-if='formItem == 1||formItem==2' @click="formItem = 0">微信快捷登录</text>
+						<text v-else @click="appOneClcik">本机一键登录</text>
+					</view>
+					<view class="login-type-btn" :class="{actLoginType:formItem==1}">
+						<text v-if='formItem == 0 ||formItem==2' @click="formItem = 1">更多登录方式</text>
+						<text v-else @click="appOneClcik">本机一键登录</text>
+					</view>
+				</view>
 			</view>
 			<view class="bottom"></view>
 			<view class="settlementAgreement" v-if="showAgreement">
@@ -173,7 +184,7 @@
 			</view>
 
 			<!-- #ifdef APP-PLUS -->
-			<view class="footer-btns">
+			<view class="footer-btns" v-if="formItem !=2">
 				<view class="login-type-btn" :class="{actLoginType:formItem==0}" style="margin-right: 70rpx;">
 					<text v-if='formItem == 1||formItem==2' @click="formItem = 0">微信快捷登录</text>
 					<text v-else @click="appOneClcik">本机一键登录</text>
@@ -1309,7 +1320,7 @@
 </script>
 <style lang="scss" scoped>
 	page {
-		background-color: #fff !important;
+		background-color: white !important;
 	}
 
 	/deep/uni-checkbox .uni-checkbox-input {
@@ -1713,6 +1724,25 @@
 		}
 	}
 
+	.footer-btn {
+		display: flex;
+		background-color: white;
+		width: 750rpx !important;
+		padding: 0 112rpx 50rpx 112rpx;
+		margin-top: 50rpx;
+
+		.login-type-btn {
+			padding: 12rpx 30rpx;
+			border-radius: 32rpx;
+			background-color: #F6F6F6
+		}
+
+		.actLoginType {
+			color: #20B128;
+			background-color: #E8F7E9;
+		}
+	}
+
 	.tips {
 		width: 590rpx;
 		height: 354rpx;
diff --git a/static/images/offeye.png b/static/images/offeye.png
new file mode 100644
index 0000000..c391c3d
Binary files /dev/null and b/static/images/offeye.png differ