LinWuTai 1 день назад
Родитель
Сommit
32d9c4cec4

+ 3 - 2
components/creditCard.vue

@@ -13,14 +13,14 @@
 				请登录后查看
 			</view>
 		</view>
-		<view class="desc-box" v-if="isLogin && !data.creditNo" @click="onGuideClick()">
+		<view class="desc-box" v-if="isLogin && !data.creditNo">
 			<view class="text">
 				用户暂未办理信用信息卡<br/>点击了解办理指引&gt;
 			</view>
 		</view>
 		<view class="image-box" v-if="isLogin && data.creditNo">
 			<view class="image-item-box">
-				<image class="photo" :src="data.headUrl"></image>
+				<image class="photo" :src="data.headUrl" :key="data.headUrl"></image>
 			</view>
 			<view class="image-item-box">
 				<view class="qrcode-box">
@@ -31,6 +31,7 @@
 						:height="size === 'mini' ? 75 : 240"
 						unit="rpx"
 						:data="data.url"
+						:key="data.url"
 					 />
 				</view>
 				<view class="text">

+ 10 - 0
pages.json

@@ -471,6 +471,16 @@
 					"bounce" : "none"
 				}
 			}
+		},
+		{
+			"path" : "pages/zhiyin/zhiyin",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"titleNView": true
+				}
+			}
 		}
 	],
 	"globalStyle": {

+ 5 - 4
pages/huiFeiJiaoJiao/huiFeiJiaoJiao.vue

@@ -28,8 +28,8 @@
 					{{item.payed ? '是' : '否'}}
 				</view>
 				<view class="list-item">
-					<view class="button" :class="[item.payed ? 'primary' : 'error']" @click="onJiaoFei(item)">
-						{{item.payed ? '已缴费' : '未缴费,点击缴费'}}
+					<view class="button" :class="[item.payed ? '' : 'error']" @click="onJiaoFei(item)">
+						{{item.payed ? '正常' : '失效,点击缴费'}}
 					</view>
 				</view>
 			</view>
@@ -127,7 +127,7 @@
 				}
 				padding: 15rpx 0;
 				text-align: center;
-				font-size: $uni-font-size-3;
+				font-size: $uni-font-size-1;
 				font-weight: bold;
 				display: flex;
 				align-items: center;
@@ -135,7 +135,6 @@
 					width: calc(100% / 3);
 					text-align: center;
 					&:last-child {
-						color: $uni-text-color-inverse;
 						font-weight: normal;
 					}
 				}
@@ -143,6 +142,7 @@
 				.button {
 					width: fit-content;
 					border-radius: $uni-card-border-radius;
+					color: #303133;
 					margin: 0 auto;
 				}
 				.primary {
@@ -151,6 +151,7 @@
 				}
 				.error {
 					padding: 5rpx 15rpx;
+					color: $uni-text-color-inverse;
 					background-color: $uni-color-error;
 				}
 			}

+ 8 - 4
pages/jixujiaoyunianjian/jixujiaoyunianjian.vue

@@ -140,11 +140,14 @@
 			padding: 20rpx 15rpx;
 			margin-bottom: 30rpx;
 			
-			.year,.fen {
+			.year {
 				width: 20%;
 			}
+			.fen {
+				width: 18%;
+			}
 			.btn {
-				width: 40%;
+				width: 44%;
 			}
 			.list-item-box {
 				&:first-child {
@@ -161,14 +164,13 @@
 				}
 				padding: 15rpx 0;
 				text-align: center;
-				font-size: $uni-font-size-3;
+				font-size: $uni-font-size-1;
 				font-weight: bold;
 				display: flex;
 				align-items: center;
 				.list-item {
 					text-align: center;
 					&:last-child {
-						color: $uni-text-color-inverse;
 						font-weight: normal;
 					}
 				}
@@ -176,6 +178,7 @@
 				.button {
 					width: fit-content;
 					border-radius: $uni-card-border-radius;
+					color: #303133;
 					margin: 0 auto;
 				}
 				.primary {
@@ -184,6 +187,7 @@
 				}
 				.error {
 					padding: 5rpx 15rpx;
+					color: $uni-text-color-inverse;
 					background-color: $uni-color-error;
 				}
 			}

+ 21 - 25
pages/personalCenter/personalCenter.vue

@@ -47,7 +47,7 @@
 			</view>
 			<view class="list-box">
 				<view class="list-item-box" @click="onShowCreditCard">
-					<CreditCard :isLogin="isLogin" :data="creditCard" @guide="onCreditCardGuideClick()"></CreditCard>
+					<CreditCard :isLogin="isLogin" :data="creditCard"></CreditCard>
 				</view>
 				<view class="list-item-box" :class="[isLogin ? (zhongjie.zsbh ? 'zhongjie-back' : 'zhongjie-back-zhiyin') : 'zhongjie-back-login']" @click="onZhongJieRenZhengClick(zhongjie.zsbh)">
 				</view>
@@ -74,7 +74,7 @@
 			</view>
 			<view class="menu-item-box" @click="onJiXuJiaoYuNianJian()">
 				<view class="icon-box">
-					<view class="iconfont icon-qianbi"></view>
+					<view class="iconfont icon-nianjianmingxi"></view>
 				</view>
 				<view class="content-box">
 					继续教育年检
@@ -251,46 +251,40 @@
 	const showCreditCard = ref(false)
 	// 信用信息卡
 	const creditCard = ref({
-		creditNo: 'GZ2028000001',
-		name: '彭于晏',
-		date: '2018年6月22日',
-		publisher: '广州市住房和城乡建设委员会',
-		headUrl: 'https://ok.166.net/reunionpub/1_20210628_17a5105e667995566.jpeg',
-		url: 'http://www.gzrea.org.cn:8543/icon/wxmp/zhengshu/qrCode.png',
+		creditNo: '',
+		name: '',
+		date: '',
+		publisher: '',
+		headUrl: '',
+		url: '',
 		isAgtNT: false,
 		isAgtNTAsst: false
 	})
 	function onShowCreditCard() {
 		showCreditCard.value = false
 		if (isLogin.value) {
-			showCreditCard.value = true
+			if (creditCard.value.creditNo) {
+				showCreditCard.value = true
+			} else {
+				uni.navigateTo({
+					url: '/pages/zhiyin/zhiyin?title=信息信用卡指引'
+				})
+			}
 		}
 	}
-	// 信息信用卡-点击指引
-	function onCreditCardGuideClick() {
-		// {
-		// 	"id": 26314850,
-		// 	"title": "广州市房地产中介服务人员 —— 信用信息卡办理指引",
-		// 	"date": "2018-10-22"
-		// },
-		console.log('点击-信息信用卡指引');
-	}
 	// 中介认证点击
 	function onZhongJieRenZhengClick(valid) {
 		if (!isLogin.value) {
 			return
 		}
 		if (valid) {
-			// {
-			// 		"id": 33842433,
-			// 		"title": "广州市房地产中介从业人员信用信息卡办理指引",
-			// 		"date": "2018-10-26"
-			// },
 			uni.navigateTo({
 				url: '/pages/certificateDetail/certificateDetail?type=zhongjie&title=广州市房地产中介从业人员水平认证证书'
 			})
 		} else {
-			console.log('跳转中介认证报名指引');
+			uni.navigateTo({
+				url: '/pages/zhiyin/zhiyin?title=中介认证报名指引'
+			})
 		}
 	}
 	// 按揭认证点击
@@ -303,7 +297,9 @@
 				url: '/pages/certificateDetail/certificateDetail?type=anjie&title=广州市房地产按揭从业人员水平认证证书'
 			})
 		} else {
-			console.log('跳转按揭认证报名指引');
+			uni.navigateTo({
+				url: '/pages/zhiyin/zhiyin?title=按揭认证报名指引'
+			})
 		}
 	}
 	const zhongjie = ref({

+ 83 - 0
pages/zhiyin/zhiyin.vue

@@ -0,0 +1,83 @@
+<template>
+	<view class="container">
+		<view class="content">
+			<u-parse :html="data.content" :selectable="true" :show-with-animation="true" style="width: 100%;"></u-parse>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	import { ref } from 'vue'
+	import { onLoad } from '@dcloudio/uni-app'
+	// import { query } from '@/api/contactUs.js'
+	
+	const pageTitle = ref('')
+	const data = ref({
+		content: '指引页面,待确认'
+	})
+	
+	onLoad((load) => {
+		pageTitle.value = load.title
+		uni.setNavigationBarTitle({
+			title: pageTitle.value
+		})
+		// query().then(res => {
+		// 	if (res && res.message === 'success') {
+		// 		data.value = res.data
+		// 	}
+		// })
+	})
+</script>
+
+<style lang="scss" scoped>
+.container {
+	padding: 20px;
+	background-color: #ffffff;
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
+	/* height: 100vh; */
+	/* 让页面高度撑满 */
+	
+	margin-bottom: env(safe-area-inset-bottom, 0);
+	
+	.title {
+		font-size: 24px;
+		font-weight: bold;
+		color: #333;
+		text-align: center;
+		/* 标题居中 */
+		margin-bottom: 15px;
+	}
+	
+	.content {
+		flex: 1;
+		/* 占据剩余空间 */
+		display: flex;
+		flex-direction: column;
+		align-items: flex-start;
+		/* 内容左对齐 */
+	}
+	
+	.body {
+		font-size: 16px;
+		color: #555;
+		text-align: left;
+		/* 内容左对齐 */
+	}
+	
+	.body img {
+		width: 50%;
+		height: auto;
+	}
+	
+	.date {
+		font-size: 14px;
+		color: #999;
+		text-align: right;
+		/* 时间右对齐 */
+		margin-top: 10px;
+		/* 与内容分离 */
+	}
+}
+</style>

+ 7 - 3
static/fonts/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 4808041 */
-  src: url('iconfont.woff2?t=1747813809195') format('woff2'),
-       url('iconfont.woff?t=1747813809195') format('woff'),
-       url('iconfont.ttf?t=1747813809195') format('truetype');
+  src: url('iconfont.woff2?t=1747985648773') format('woff2'),
+       url('iconfont.woff?t=1747985648773') format('woff'),
+       url('iconfont.ttf?t=1747985648773') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-nianjianmingxi:before {
+  content: "\e643";
+}
+
 .icon-yingfengdongtai:before {
   content: "\e622";
 }

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
static/fonts/iconfont.js


+ 7 - 0
static/fonts/iconfont.json

@@ -6,6 +6,13 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "32621192",
+      "name": "年检",
+      "font_class": "nianjianmingxi",
+      "unicode": "e643",
+      "unicode_decimal": 58947
+    },
+    {
       "icon_id": "1037697",
       "name": "盈峰动态",
       "font_class": "yingfengdongtai",

BIN
static/fonts/iconfont.ttf


BIN
static/fonts/iconfont.woff


BIN
static/fonts/iconfont.woff2


Некоторые файлы не были показаны из-за большого количества измененных файлов