tanxue 12 часов назад
Родитель
Сommit
d9df2a13e2
3 измененных файлов с 9 добавлено и 4 удалено
  1. 3 2
      common/styles/global/pages.scss
  2. 3 1
      pages/client/my/index.vue
  3. 3 1
      pages/kehu/my/my.vue

+ 3 - 2
common/styles/global/pages.scss

@@ -13,7 +13,7 @@
 	}
 	}
 	.bjcx-logo-title{font-size: 34rpx;color: #000;margin-top: 16rpx;}
 	.bjcx-logo-title{font-size: 34rpx;color: #000;margin-top: 16rpx;}
 	.agreement-checkbox-box{
 	.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: 32rpx 56rpx 64px;line-height: 1.5;text-align: justify;
 		.agreement-text-box{flex-direction: row;display: flex;align-items: center;}
 		.agreement-text-box{flex-direction: row;display: flex;align-items: center;}
 		.agreement-text {color: #3fd2a1;display: contents;}
 		.agreement-text {color: #3fd2a1;display: contents;}
 	}
 	}
@@ -30,6 +30,7 @@
 		.login-eye + .close-btn{margin-left: 24rpx;}
 		.login-eye + .close-btn{margin-left: 24rpx;}
 	}
 	}
 	.login-btn{margin:48rpx 56rpx;}
 	.login-btn{margin:48rpx 56rpx;}
+	.wechat-auth-btn{margin: 48rpx 56rpx;border-radius: 50rpx;}
 }
 }
 
 
 /*** 首页 ***/
 /*** 首页 ***/
@@ -486,7 +487,7 @@
 	
 	
 	// list
 	// list
 	.my-list-box{
 	.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;
 		.list-row{border-bottom: 2rpx solid #eee;color: #333;box-sizing: border-box;padding: 36rpx 0;
 		display: flex;align-items: center;position: relative;}
 		display: flex;align-items: center;position: relative;}
 		.select-picker-box{flex: 1;display: flex;flex-flow: column;}
 		.select-picker-box{flex: 1;display: flex;flex-flow: column;}

+ 3 - 1
pages/client/my/index.vue

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

+ 3 - 1
pages/kehu/my/my.vue

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