新增继续教育页面

api/report.js

@@ -118,4 +118,18 @@ export function payReport(data){
 		data: data,
 		'method': 'post'
 	})
+}
+
+/**
+ * 学分列表
+ */
+export function list() {
+	return request({
+		url: '/course/creditList',
+		headers: {
+			isToken: true
+		},
+		data: null,
+		'method': 'get'
+	})
 }

pages.json

@@ -256,7 +256,7 @@
 		{
 			"path": "pages/huiFeiJiaoJiao/huiFeiJiaoJiao",
 			"style": {
-				"navigationBarTitleText": "会费缴交",
+				"navigationBarTitleText": "个人会费缴交",
 				"navigationBarBackgroundColor": "#8dccff",
 				"app-plus": {
 					"titleNView": true
@@ -430,6 +430,26 @@
 					"titleNView": true
 				}
 			}
+		},
+		{
+			"path" : "pages/huifeijiaojiaoRukou/huifeijiaojiaoRukou",
+			"style": {
+				"navigationBarTitleText": "会费缴交",
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"titleNView": true
+				}
+			}
+		},
+		{
+			"path" : "pages/jixujiaoyunianjian/jixujiaoyunianjian",
+			"style": {
+				"navigationBarTitleText": "继续教育年检",
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"titleNView": true
+				}
+			}
 		}
 	],
 	"globalStyle": {

pages/chat/chat.vue

@@ -49,7 +49,7 @@
 
 <script setup>
 	import { ref, computed } from 'vue'
-	import { onLoad, onReachBottom, onPullDownRefresh } from '@dcloudio/uni-app'
+	import { onLoad, onShow, onReachBottom, onPullDownRefresh } from '@dcloudio/uni-app'
 	import { query, count } from '@/api/chat.js'
 	import { useTabbarStore } from '@/store/tabbarStore.js'
 
@@ -169,7 +169,7 @@
 			}
 		})
 	})
-	onLoad(() => {
+	onShow(() => {
 		onSearch()
 		count().then(res => {
 			if (res && res.message === 'success') {

pages/geRenHuiFeiJiaoJiao/geRenHuiFeiJiaoJiao.vue

@@ -67,7 +67,7 @@
 	import { onLoad } from '@dcloudio/uni-app'
 	import { useAuthStore } from '@/store/authStore'
 	import { personPayment } from '@/api/cost.js'
-	import { msgError, msgSuccess } from '../../utils/common'
+	import { msgError, msgSuccess } from '@/utils/common'
 	const authStore = useAuthStore()
 	
 	const openid = ref('')

pages/huiFeiJiaoJiao/huiFeiJiaoJiao.vue

@@ -7,20 +7,14 @@
 			<view class="info-item">
 				任职机构：{{user.corpName ?? '无'}}
 			</view>
-			<view class="info-item">
-				业务水平认证证书编号：{{user.corpRegNo ?? '无'}}
-			</view>
 		</view>
 		<view class="list-box">
 			<view class="list-item-box">
 				<view class="list-item">
-					学习年度
-				</view>
-				<view class="list-item">
-					会员网络教育<br/>完成学分情况
+					年份
 				</view>
 				<view class="list-item">
-					年检情况
+					是否缴费
 				</view>
 				<view class="list-item">
 					会籍情况
@@ -31,37 +25,39 @@
 					{{item.year}}
 				</view>
 				<view class="list-item">
-					{{item.credit}}
+					{{item.payed ? '是' : '否'}}
 				</view>
-				<view class="list-item" v-html="item.annIns"></view>
 				<view class="list-item">
 					<view class="button" :class="[item.payed ? 'primary' : 'error']" @click="onJiaoFei(item)">
-						{{item.isPay ? '已缴费' : '未缴，点击缴费'}}
+						{{item.payed ? '已缴费' : '未缴费，点击缴费'}}
 					</view>
 				</view>
 			</view>
 		</view>
 		<view class="desc-box">
 			<view class="title">
-				会员网络教育年检规则：
+				会员会费缴交规则：
 			</view>
 			<view class="text">
-				持证人员每年需完成24个分学分，年检时间为每年1月1日至4月30日。
+				根据《广州市房地产中介协会章程》第五十六条，会费标准如下：
 			</view>
-			<view class="text">
-				持证人员会籍有效（注：已缴交当年个人会费）时，系统方可记录学分。
+			<view class="li">
+				副会长单位：50000元/年；
 			</view>
-			<view class="text">
-				持证人员在年检期内完成年检的，方可享受学分减免。
+			<view class="li">
+				理事单位：10000元/年；
 			</view>
-		</view>
-		<view class="buttom-block"></view>
-		<view class="bottom-box">
-			<view class="button" @click="onDaiJiaoGeRenHuiFei()">
-				代缴个人会费
+			<view class="li">
+				普通会员单位：1000元/年；
 			</view>
-			<view class="button" @click="onDaiJiaoDanWeiHuiFei()">
-				代缴单位会费
+			<view class="li">
+				个人会员：200元/年。
+			</view>
+			<view class="text">
+				单位会员会籍为每年1月1日至12月31日；
+			</view>
+			<view class="text">
+				个人会员会籍为每年5月1日至次年4月30日。
 			</view>
 		</view>
 	</view>
@@ -84,14 +80,6 @@
 	})
 	
 	const listData = ref([
-		{
-			annIns: "学分未达标不能申请年检",
-			credit: "0/24",
-			dueDiscount: true,
-			duePrice: 100,
-			payed: false,
-			year: 2025
-		},
 	])
 	function onJiaoFei(val) {
 		if (val.payed) {
@@ -101,16 +89,6 @@
 			url: `/pages/geRenHuiFeiJiaoJiao/geRenHuiFeiJiaoJiao?year=${val.year}&duePrice=${val.duePrice}`
 		})
 	}
-	function onDaiJiaoGeRenHuiFei() {
-		uni.navigateTo({
-			url: '/pages/daiJiaoGeRenHuiFei/daiJiaoGeRenHuiFei'
-		})
-	}
-	function onDaiJiaoDanWeiHuiFei() {
-		uni.navigateTo({
-			url: '/pages/daiJiaoDanWeiHuiFei/daiJiaoDanWeiHuiFei'
-		})
-	}
 	
 	onLoad(() => {
 		user.value = authStore.userInfo
@@ -158,7 +136,7 @@
 					font-size: $uni-font-size-1;
 					font-weight: bold;
 					.list-item {
-						width: 25%;
+						width: calc(100% / 3);
 						text-align: center;
 						&:last-child {
 							color: #303133;
@@ -173,7 +151,7 @@
 				display: flex;
 				align-items: center;
 				.list-item {
-					width: 25%;
+					width: calc(100% / 3);
 					text-align: center;
 					&:last-child {
 						color: $uni-text-color-inverse;
@@ -208,40 +186,17 @@
 				display: flex;
 				align-items: center;
 				font-size: $uni-font-size-2;
+			}
+			.li {
+				display: flex;
+				align-items: center;
+				font-size: $uni-font-size-2;
 				&:before {
 					content: '•';
-					font-size: 50rpx;
+					font-size: 30rpx;
 					margin-right: 8rpx;
 				}
 			}
 		}
-		
-		
-		.buttom-block {
-			height: 100rpx;
-		}
-		.bottom-box {
-			text-align: center;
-			font-size: $uni-title-font-size-2;
-			background-color: $uni-bg-color-grey;
-			position: fixed;
-			bottom: 0;
-			width: 100%;
-			display: flex;
-			.button {
-				width: 50%;
-				height: 100rpx;
-				line-height: 100rpx;
-				color: $uni-color-primary;
-				letter-spacing: 2rpx;
-				border: 1rpx solid #E9E9E9;
-				&:active {
-					background-color: $uni-bg-color-hover;
-				}
-				&:last-child {
-					color: $uni-color-error;
-				}
-			}
-		}
 	}
 </style>

pages/huifeijiaojiaoRukou/huifeijiaojiaoRukou.vue

@@ -0,0 +1,93 @@
+<template>
+	<view class="container">
+		<view class="menus-box">
+			<view class="menus-item-box" @click="toPage('个人会费缴交')">
+				<view class="text-box">
+					个人会费缴交
+				</view>
+			</view>
+			<view class="menus-item-box" @click="toPage('代缴个人会费')">
+				<view class="text-box">
+					代缴个人会费
+				</view>
+			</view>
+			<view class="menus-item-box" @click="toPage('代缴单位会费')">
+				<view class="text-box">
+					代缴单位会费
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+	function toPage(name) {
+		switch (name) {
+			case '个人会费缴交': 
+				uni.navigateTo({
+					url: '/pages/huiFeiJiaoJiao/huiFeiJiaoJiao'
+				});
+				break;
+			case '代缴个人会费':
+				uni.navigateTo({
+					url: '/pages/daiJiaoGeRenHuiFei/daiJiaoGeRenHuiFei'
+				})
+				break;
+			case '代缴单位会费':
+				uni.navigateTo({
+					url: '/pages/daiJiaoDanWeiHuiFei/daiJiaoDanWeiHuiFei'
+				})
+				break;
+		}
+	}
+</script>
+
+<style lang="scss">
+.container {
+	height: 100vh;
+	width: 100vw;
+	background-color: $uni-text-color-inverse;
+	.menus-box {
+		padding: 20rpx;
+	
+		.menus-item-box {
+			width: 100%;
+			padding: 35rpx 50rpx;
+			margin-bottom: 35rpx;
+			display: flex;
+			gap: 30rpx;
+			align-items: center;
+			justify-content: center;
+			background-color: #006AF4;
+			border-radius: $uni-card-border-radius;
+	
+			&:active {
+				background-color: #005AF4;
+			}
+	
+			.icon-box {
+				width: 40%;
+				text-align: center;
+				width: 100rpx;
+				height: 100rpx;
+				line-height: 100rpx;
+				text-align: center;
+				border-radius: 50%;
+				border: 3rpx solid $uni-text-color-inverse;
+				background-color: #004DC9;
+	
+				.iconfont {
+					font-size: 60rpx;
+					color: $uni-text-color-inverse;
+				}
+			}
+	
+			.text-box {
+				font-size: 50rpx;
+				font-weight: bold;
+				color: $uni-text-color-inverse;
+			}
+		}
+	}
+}
+</style>

pages/order/order.vue

@@ -63,7 +63,7 @@
 						<view class="text" v-if="item.status === '1'">
 							实付款:&nbsp;￥{{item.buyPrice}}元
 						</view>
-						<view class="button" v-if="item.status === '0'">
+						<view class="button error" v-if="item.status === '0'" @click.stop="onPay(item)">
 							待支付
 						</view>
 						<view class="button" v-if="item.status === '2'">
@@ -87,6 +87,7 @@
 	import { ref } from 'vue'
 	import { onLoad, onReachBottom, onPullDownRefresh } from '@dcloudio/uni-app'
 	import { query } from '@/api/order.js'
+	import { msgError, msgSuccess } from '@/utils/common'
 	
 	const searchInputStyle = {
 		backgroundColor: '#E5E5E5'
@@ -137,6 +138,26 @@
 			// 培训课程
 		}
 	}
+	function onPay(order) {
+		wx.requestPayment({
+		  timeStamp: order.prepay.timeStamp,
+		  nonceStr: order.prepay.nonceStr,
+		  package: order.prepay.package,
+		  signType: order.prepay.signType,
+		  paySign: order.prepay.paySign,
+		  success (res) {
+				msgSuccess('支付成功')
+				onSearch()
+			},
+		  fail (res) {
+				// console.log('支付失败', res)
+				const errMsg = res.errMsg
+				if (errMsg.indexOf('fail cancel')) {
+					msgError('已取消支付')
+				}
+			}
+		})
+	}
 	
 	function onSearchConfirm() {
 		searchForm.value.pageNumber = 1
@@ -176,6 +197,7 @@
 	}
 	onPullDownRefresh((e) => {
 		searchForm.value.pageNumber = 1
+		searchForm.value.type = searchType[searchForm.value.type].value
 		loadMoreStatus.value = 'more'
 		query(searchForm.value).then(res => {
 			if (res && res.message === 'success') {
@@ -308,6 +330,9 @@
 							padding: 6rpx 25rpx;
 							border-radius: $uni-card-border-radius;
 						}
+						.error {
+							background-color: $uni-color-error;
+						}
 					}
 				}
 			}

pages/personalCenter/personalCenter.vue

@@ -72,7 +72,7 @@
 					<view class="iconfont icon-chevron-right"></view>
 				</view>
 			</view>
-			<view class="menu-item-box" @click="onHuiFeiJiaoJiao()">
+			<view class="menu-item-box" @click="onJiXuJiaoYuNianJian()">
 				<view class="icon-box">
 					<view class="iconfont icon-qianbi"></view>
 				</view>
@@ -341,7 +341,17 @@
 			return
 		}
 		uni.navigateTo({
-			url: '/pages/huiFeiJiaoJiao/huiFeiJiaoJiao'
+			url: '/pages/huifeijiaojiaoRukou/huifeijiaojiaoRukou'
+		})
+	}
+	// 点击-继续教育年检
+	function onJiXuJiaoYuNianJian() {
+		if (!isLogin.value) {
+			showMsg()
+			return
+		}
+		uni.navigateTo({
+			url: '/pages/jixujiaoyunianjian/jixujiaoyunianjian'
 		})
 	}
 	// 点击-我的订单