Merge remote-tracking branch 'origin/master'

components/creditCard.vue

@@ -13,7 +13,7 @@
 				请登录后查看
 			</view>
 		</view>
-		<view class="desc-box" v-if="isLogin && !data.creditNo">
+		<view class="desc-box" v-if="isLogin && !data.creditNo" @click="onGuideClick">
 			<view class="text">
 				用户暂未办理信用信息卡<br/>点击了解办理指引&gt;
 			</view>
@@ -226,6 +226,17 @@
 				font-size: calc($uni-title-font-size-1);
 			}
 		}
+		.desc-box {
+			height: 60%;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			text-align: center;
+			.text {
+				font-size: $uni-title-font-size-1;
+				font-weight: bold;
+			}
+		}
 		.image-box {
 			height: 40%;
 			padding: 0 20rpx;

pages/chat/chat.vue

@@ -257,7 +257,7 @@
 						}
 						.text {
 							height: calc(30% - 5rpx);
-							font-size: $uni-font-size-2;
+							font-size: $uni-title-font-size-2;
 							color: $uni-text-color-grey;
 							@include text-overflow();
 						}

pages/personalCenter/personalCenter.vue

@@ -57,7 +57,7 @@
 		</view>
 		<u-popup v-model="showCreditCard" mode="center">
 			<view class="certificate-preview-box">
-				<CreditCard :isLogin="isLogin" :size="`normal ${creditCard.isAgtNTAsst ? 'green' : creditCard.isAgtNT ? 'red' : 'blue'}`" :data="creditCard"></CreditCard>
+				<CreditCard :isLogin="isLogin" :size="`normal ${creditCard.isAgtNTAsst ? 'green' : creditCard.isAgtNT ? 'red' : 'blue'}`" :data="creditCard" @guide="onCreditZhiYin"></CreditCard>
 			</view>
 		</u-popup>
 		<view class="menu-box">
@@ -263,15 +263,21 @@
 	function onShowCreditCard() {
 		showCreditCard.value = false
 		if (isLogin.value) {
-			if (creditCard.value.creditNo) {
-				showCreditCard.value = true
-			} else {
-				uni.navigateTo({
-					url: '/pages/zhiyin/zhiyin?title=信息信用卡指引'
-				})
-			}
+			showCreditCard.value = true
+			// if (creditCard.value.creditNo) {
+			// 	showCreditCard.value = true
+			// } else {
+			// 	uni.navigateTo({
+			// 		url: '/pages/zhiyin/zhiyin?title=信息信用卡指引'
+			// 	})
+			// }
 		}
 	}
+	function onCreditZhiYin() {
+		uni.navigateTo({
+			url: '/pages/zhiyin/zhiyin?title=信息信用卡指引'
+		})
+	}
 	// 中介认证点击
 	function onZhongJieRenZhengClick(valid) {
 		if (!isLogin.value) {