From ee6a95c99d5d601cf0653ef59d9fefadc7904b39 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Thu, 21 Mar 2024 14:36:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/Authorize.vue                |  4 +-
 pages/goods_details/index.vue           |  3 +-
 pages/store/detail/index.vue            |  2 +-
 pages/users/login/login_copy.vue        |  6 +--
 pages/users/retrievePassword/index.vue  | 52 ++++++++++++-------------
 pages/users/user_modify_phone/index.vue |  2 +-
 pages/users/user_modify_pwd/index.vue   |  2 +-
 7 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/components/Authorize.vue b/components/Authorize.vue
index a76b013..261596f 100644
--- a/components/Authorize.vue
+++ b/components/Authorize.vue
@@ -277,7 +277,7 @@
 		position: fixed;
 		top: 500rpx;
 		left: 125rpx;
-		z-index: 1000;
+		z-index: 10000;
 		border-radius: 8px;
 		overflow: hidden;
 	}
@@ -372,6 +372,6 @@
 		left: 0;
 		bottom: 0;
 		background-color: rgba(0, 0, 0, 0.65);
-		z-index: 99;
+		z-index: 9999;
 	}
 </style>
\ No newline at end of file
diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue
index 0a425df..52edcd1 100644
--- a/pages/goods_details/index.vue
+++ b/pages/goods_details/index.vue
@@ -4,7 +4,8 @@
 			<view class="head-wrapper" id="home" :style="{ top: homeTop + 'rpx' }">
 				<view class="head-menu">
 					<view class='iconfont icon-fanhui2' @click="returns"></view>
-					<view class="iconfont icon-gengduo5" @click="showNav"></view>
+					<view class="iconfont icon-shouye4" @click="goHome"></view>
+					<!-- <view class="iconfont icon-gengduo5" @click="showNav"></view> -->
 				</view>
 			</view>
 			<!-- 导航小图标 -->
diff --git a/pages/store/detail/index.vue b/pages/store/detail/index.vue
index 6def5f5..fcfbc79 100644
--- a/pages/store/detail/index.vue
+++ b/pages/store/detail/index.vue
@@ -47,7 +47,7 @@
 			<view class="section info">
 				<view class="item very">
 					<view class="name">店铺简介</view>
-					<view class="value">{{ store.mer_info }}</view>
+					<view class="value" v-if="store.mer_info">{{ store.mer_info.mer_info }}</view>
 				</view>
 				<view class="item very">
 					<view class="name">店铺地址</view>
diff --git a/pages/users/login/login_copy.vue b/pages/users/login/login_copy.vue
index bce871f..0ee61ff 100644
--- a/pages/users/login/login_copy.vue
+++ b/pages/users/login/login_copy.vue
@@ -34,7 +34,7 @@
 							<div class="item">
 								<div class="acea-row row-middle">
 									<image src="/static/images/phone_1.png"></image>
-									<input type="text" placeholder="输入账号" placeholder-class="placeholder"
+									<input type="number" placeholder="输入账号" placeholder-class="placeholder"
 										v-model="account" required />
 								</div>
 							</div>
@@ -59,7 +59,7 @@
 						<div class="item">
 							<div class="acea-row row-middle">
 								<image src="/static/images/phone_1.png"></image>
-								<input type="text" placeholder="输入手机号码" placeholder-class="placeholder"
+								<input type="number" placeholder="输入手机号码" placeholder-class="placeholder"
 									v-model="account" />
 							</div>
 						</div>
@@ -105,7 +105,7 @@
 						<div class="item">
 							<div class="acea-row row-middle">
 								<image src="/static/images/phone_1.png"></image>
-								<input type="text" placeholder="输入手机号码" placeholder-class="placeholder"
+								<input type="number" placeholder="输入手机号码" placeholder-class="placeholder"
 									v-model="account" />
 							</div>
 						</div>
diff --git a/pages/users/retrievePassword/index.vue b/pages/users/retrievePassword/index.vue
index f27da1a..f0d94c4 100644
--- a/pages/users/retrievePassword/index.vue
+++ b/pages/users/retrievePassword/index.vue
@@ -1,40 +1,40 @@
 <template>
-	<div class="register absolute" :style="viewColor">
-		<!-- <div class="shading">
-			<div class="pictrue acea-row row-center-wrapper">
+	<view class="register absolute" :style="viewColor">
+		<!-- <view class="shading">
+			<view class="pictrue acea-row row-center-wrapper">
 				<image :src="login_logo" v-if="login_logo" />
-			</div>
-		</div> -->
-		<div class="whiteBg" :style="{ 'background-image': `url(${domain}/static/images/logo_bgl.png)`}">
+			</view>
+		</view> -->
+		<view class="whiteBg" style="margin: 0;width: 100%;padding: 50rpx 60rpx;" :style="{ 'background-image': `url(${domain}/static/images/logo_bgl.png)`}">
 			<view class="login_title">
 				<view class="title_h">找回密码</view>
 			</view>
-			<div class="list">
-				<div class="item">
-					<input type="text" placeholder="输入手机号码" placeholder-class="placeholder" v-model="account" autocomplete="off" />
-					<input type="text" style="height: 0;opacity: 0">
-				</div>
-				<div class="item">
+			<form class="list">
+				<view class="item">
+					<input type="number" placeholder="输入手机号码" placeholder-class="placeholder" v-model="account" autocomplete="off" />
+					<!-- <input type="text" style="height: 0;opacity: 0"> -->
+				</view>
+				<view class="item">
 					<input type="password" placeholder="填写您的新密码" placeholder-class="placeholder" v-model="password" autocomplete="off" />
-				</div>
-				<div class="item">
+				</view>
+				<view class="item">
 					<input type="password" placeholder="再次输入新密码" placeholder-class="placeholder" v-model="confirm_pwd" autocomplete="off" />
-				</div>
-				<div class="item">
-					<input type="text" placeholder="填写验证码" placeholder-class="placeholder" class="codeIput" v-model="captcha" autocomplete="off" />
-					<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''" @click="handleVerify">
+				</view>
+				<view class="item" style="display: flex;justify-content: space-between;">
+					<input type="number" placeholder="填写验证码" maxlength="4" placeholder-class="placeholder" class="codeIput" v-model="captcha" autocomplete="off" />
+					<button class="code" style="color: #fff;" :disabled="disabled" :class="disabled === true ? 'on' : ''" @click="handleVerify">
 						{{ text }}
 					</button>
-				</div>
-			</div>
-			<div class="logon" @click="registerReset">确认</div>
-			<div class="tip">
+				</view>
+			</form>
+			<view class="logon" @click="registerReset">确认</view>
+			<view class="tip">
 				<text @click="back">立即登录</text>
-			</div>
-		</div>
-		<div class="bottom"></div>
+			</view>
+		</view>
+		<view class="bottom"></view>
       <Verify @success="success" :captchaType="'blockPuzzle'" :imgSize="{ width: '330px', height: '155px' }" ref="verify"></Verify>
-	</div>
+	</view>
 </template>
 
 <script>
diff --git a/pages/users/user_modify_phone/index.vue b/pages/users/user_modify_phone/index.vue
index e73e74a..9ef2d25 100644
--- a/pages/users/user_modify_phone/index.vue
+++ b/pages/users/user_modify_phone/index.vue
@@ -11,7 +11,7 @@
 							<input type='number' placeholder='新手机号' placeholder-class='placeholder' v-model="phone"></input>
 						</view>
 						<view class="item acea-row row-between-wrapper">
-							<input type='number' placeholder='验证码' placeholder-class='placeholder' class="codeIput" v-model="captcha"></input>
+							<input type='number' maxlength="4" placeholder='验证码' placeholder-class='placeholder' class="codeIput" v-model="captcha"></input>
 							<button class="code" :class="disabled === true ? 'on' : ''"  :disabled='disabled' @click="handleVerify">
 								{{ text }}
 							</button>
diff --git a/pages/users/user_modify_pwd/index.vue b/pages/users/user_modify_pwd/index.vue
index 4a29690..b74dde9 100644
--- a/pages/users/user_modify_pwd/index.vue
+++ b/pages/users/user_modify_pwd/index.vue
@@ -8,7 +8,7 @@
 							<text class="phone">{{userInfo.phone}}</text>
 						</view>
 						<view class="item acea-row row-between-wrapper codeVal">
-							<input type='number' placeholder='验证码' placeholder-class='placeholder' class="codeIput"
+							<input type='number' maxlength="4" placeholder='验证码' placeholder-class='placeholder' class="codeIput"
 								v-model="captcha"></input>
 							<button class="code" :class="disabled === true ? 'on' : ''" :disabled='disabled'
 								@click="handleVerify">