Merge remote-tracking branch 'origin/2025北京诚祥-家政版' into 2025北京诚祥-家政版

common/styles/global/pages.scss

@@ -6,17 +6,19 @@
 		width:100%;height: 1283rpx;@include ezy-no-repeat-cover(top);
 		position: absolute;top:0;
 	}
-	.bjcx-head-box{width: 100%;text-align: center;margin-bottom: 100rpx;
-	margin-top: calc(180rpx + var(--status-bar-height));display: inline-block;}
+	.bjcx-head-box{width: 100%;text-align: center;
+	margin-top: calc(200rpx + var(--status-bar-height));display: inline-block;}
 	.bjcx-logo-box{
 		width:200rpx;height: 200rpx;background-image: url("@/static/images/login/login-logo.png");@include ezy-no-repeat-cover;
 	}
 	.bjcx-logo-title{font-size: 34rpx;color: #000;margin-top: 16rpx;}
 	.agreement-checkbox-box{
-		display: flex;font-size: 28rpx;color: #666;margin: 32rpx 56rpx 64px;line-height: 1.5;
+		display: flex;font-size: 28rpx;color: #666;margin: 72rpx 56rpx 16rpx;line-height: 1.5;text-align: justify;
 		.agreement-text-box{flex-direction: row;display: flex;align-items: center;}
 		.agreement-text {color: #3fd2a1;display: contents;}
 	}
+	.wechat-auth-box{margin-top: 200rpx;}
+	.login-input-body{margin-top: 100rpx;}
 	.login-input-box{
 		display: flex;align-items: center;border-bottom: 1rpx solid #eee;margin:32rpx 56rpx;
 		padding: 24rpx 0;
@@ -30,6 +32,8 @@
 		.login-eye + .close-btn{margin-left: 24rpx;}
 	}
 	.login-btn{margin:48rpx 56rpx;}
+	.wechat-auth-btn{margin: 48rpx 56rpx 0;border-radius: 50rpx;}
+	.qtdl-btn{font-size: 30rpx;color: #3fd2a1;text-align: center;padding: 32rpx 0;}
 }
 
 /*** 首页 ***/
@@ -486,7 +490,7 @@
 	
 	// list
 	.my-list-box{
-		margin: 0 20rpx;background-color: #fff;border-radius: 8rpx;padding: 0 36rpx;
+		margin: 0 20rpx 20rpx;background-color: #fff;border-radius: 8rpx;padding: 0 36rpx;
 		.list-row{border-bottom: 2rpx solid #eee;color: #333;box-sizing: border-box;padding: 36rpx 0;
 		display: flex;align-items: center;position: relative;}
 		.select-picker-box{flex: 1;display: flex;flex-flow: column;}

pages.json

@@ -23,9 +23,8 @@
 		},
 		 {
 		 	"path" : "pages/Login/test",
-		 	"style" :
-		 	{
-		 		"navigationBarTitleText" : ""
+		 	"style": {
+		 		"navigationStyle": "custom"
 		 	}
 		 }
 	],

pages/Login/clientIndex.vue

@@ -7,23 +7,21 @@
 			</view>
 			<!-- 合同分享下 -->
 			<view v-if="fromAppShare" class="wechat-auth-box">
-				<view class="auth-tips">欢迎使用小程序</view>
-				<button class="wechat-auth-btn" open-type="getPhoneNumber" @getphonenumber="onWechatAuth">
-					微信一键登录
-				</button>
+				<!-- <view class="auth-tips">欢迎使用小程序</view> -->
 				<view class="agreement-checkbox-box">
 					<checkbox-group @change="handleChange">
 						<checkbox class="agreement-checkbox-input" color="#3fd2a1" value="agree" :checked="isAgreed"
 							style="transform:scale(0.7)" />
 					</checkbox-group>
-					<view class="agreement-text-box">
+					<view class="agreement-text-box mt-big">
 						在使用当前小程序服务之前，请仔细阅读<view class="agreement-text" @click="agreeBtn('yhxy')">《诚祥学用户协议》</view>和<view
 							@click="agreeBtn('ystk')" class="agreement-text">《诚祥学隐私政策》</view>，如您同意，请勾选后开始使用
 					</view>
 				</view>
-				<button @click="handleChangeFangshi">
-					切换微信一键登录
+				<button class="phone-green-btn wechat-auth-btn" type="default" open-type="getPhoneNumber" @getphonenumber="onWechatAuth">
+					微信一键登录
 				</button>
+				<view class="qtdl-btn"><text @click="handleChangeFangshi">其他登录</text></view>
 			</view>
 		</view>
 	</view>
@@ -206,31 +204,3 @@
 		});
 	}
 </script>
-
-<style scoped>
-	/* 新增样式 */
-	.wechat-auth-box {
-		text-align: center;
-		padding: 40rpx 0;
-	}
-
-	.auth-tips {
-		font-size: 32rpx;
-		color: #333;
-		margin-bottom: 60rpx;
-	}
-
-	.wechat-auth-btn {
-		background-color: #07C160;
-		color: white;
-		border-radius: 50rpx;
-		margin-bottom: 30rpx;
-	}
-
-	.switch-login {
-		color: #007AFF;
-		font-size: 28rpx;
-	}
-
-	/* 你原有的所有样式都保持不变 */
-</style>

pages/Login/test.vue

@@ -7,7 +7,7 @@
 			</view>
 
 			<!-- 普通登录表单 -->
-			<view>
+			<view class="login-input-body">
 				<view class="login-input-box">
 					<icon class="user-icon"></icon>
 					<input class="login-input" type="text" v-model="userName" placeholder="请输入手机号"
@@ -35,11 +35,9 @@
 					</view>
 				</view>
 
-				<button type="default" @click="handleLogin" class="phone-green-btn login-btn">登录</button>
+				<button @click="handleLogin" class="phone-green-btn wechat-auth-btn" type="default">登录</button>
 
-				<button @click="handleChangeYijiandenglu" >
-				  切换微信一键登录
-				</button>
+				<view class="qtdl-btn"><text @click="handleChangeYijiandenglu">微信一键登录</text></view>
 			</view>
 		</view>
 	</view>
@@ -232,30 +230,3 @@
 	}
 </script>
 
-<style scoped>
-	/* 新增样式 */
-	.wechat-auth-box {
-		text-align: center;
-		padding: 40rpx 0;
-	}
-
-	.auth-tips {
-		font-size: 32rpx;
-		color: #333;
-		margin-bottom: 60rpx;
-	}
-
-	.wechat-auth-btn {
-		background-color: #07C160;
-		color: white;
-		border-radius: 50rpx;
-		margin-bottom: 30rpx;
-	}
-
-	.switch-login {
-		color: #007AFF;
-		font-size: 28rpx;
-	}
-
-	/* 你原有的所有样式都保持不变 */
-</style>

pages/client/my/index.vue

@@ -94,7 +94,7 @@
 			</view> -->
 			<view class="list-row" @click="zhuxiaoLogin">
 				<icon class="list-icon"
-					:style="{ backgroundImage: 'url(' + myInfoData.imgsArr.loginOutListIcon + ')' }"></icon>
+					:style="{ backgroundImage: 'url(' + myInfoData.imgsArr.yhzxListIcon + ')' }"></icon>
 				<text>用户注销</text>
 				<icon class="jt-icon" :style="{ backgroundImage: 'url(' + myInfoData.imgsArr.jtIcon + ')' }"></icon>
 			</view>
@@ -171,6 +171,7 @@
 			scoreListIcon: '',
 			sxtcsListIcon: '',
 			sxtsmListIcon: '',
+			yhzxListIcon: '',
 			loginOutListIcon: '',
 			zhengce: '',
 			xieyi: ''
@@ -345,6 +346,7 @@
 		myInfoData.imgsArr.scoreListIcon = cacheManager.get('projectImg').my_score_icon;
 		myInfoData.imgsArr.sxtcsListIcon = cacheManager.get('projectImg').my_sxtcs_icon;
 		myInfoData.imgsArr.sxtsmListIcon = cacheManager.get('projectImg').my_sxtsm_icon;
+		myInfoData.imgsArr.yhzxListIcon = cacheManager.get('projectImg').yhzx_icon;
 		myInfoData.imgsArr.loginOutListIcon = cacheManager.get('projectImg').login_out_icon;
 		myInfoData.imgsArr.jtIcon = cacheManager.get('projectImg').nav_bar_jt_bottom;
 		myInfoData.imgsArr.zhengce = cacheManager.get('projectImg').zhengce;

pages/kehu/my/my.vue

@@ -48,7 +48,7 @@
 			</view> -->
 			<view class="list-row" @click="zhuxiaoLogin">
 				<icon class="list-icon"
-					:style="{ backgroundImage: 'url(' + myInfoData.imgsArr.loginOutListIcon + ')' }"></icon>
+					:style="{ backgroundImage: 'url(' + myInfoData.imgsArr.yhzxListIcon + ')' }"></icon>
 				<text>用户注销</text>
 				<icon class="jt-icon" :style="{ backgroundImage: 'url(' + myInfoData.imgsArr.jtIcon + ')' }"></icon>
 			</view>
@@ -114,6 +114,7 @@
 			sxtcsListIcon: '',
 			sxtsmListIcon: '',
 			loginOutListIcon: '',
+			yhzxListIcon: '',
 			zhengce: '',
 			xieyi: ''
 		},
@@ -232,6 +233,7 @@
 		myInfoData.imgsArr.sxtcsListIcon = cacheManager.get('projectImg').my_sxtcs_icon;
 		myInfoData.imgsArr.sxtsmListIcon = cacheManager.get('projectImg').my_sxtsm_icon;
 		myInfoData.imgsArr.loginOutListIcon = cacheManager.get('projectImg').login_out_icon;
+		myInfoData.imgsArr.yhzxListIcon = cacheManager.get('projectImg').yhzx_icon;
 		myInfoData.imgsArr.jtIcon = cacheManager.get('projectImg').nav_bar_jt_bottom;
 		myInfoData.imgsArr.zhengce = cacheManager.get('projectImg').zhengce;
 		myInfoData.imgsArr.xieyi = cacheManager.get('projectImg').xieyi;