From af094e55b01a01b5197695fc01772bf0720a0466 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A6=86=E9=92=B1=E8=90=BD=E5=B0=BD=E6=A7=BF=E8=8A=B1?=
 =?UTF-8?q?=E7=A8=80?= <2675540038@qq.com>
Date: Thu, 7 Aug 2025 17:53:23 +0800
Subject: [PATCH] tj

---
 .gitignore                                    |    3 +-
 common/js/utils.js                            |    3 +
 .../kz-page-index-color-1.vue                 | 1592 +++++++++--------
 pages.json                                    |   16 +-
 pages/index/news-detail.vue                   |  310 ++--
 pages/train/detail.vue                        |  136 ++
 pages/train/index.vue                         |  484 ++---
 pages/train/train.vue                         |    4 +
 pagesSubject/sign_up.vue                      |  953 ++++++++++
 static/img/4.png                              |  Bin 5288 -> 5533 bytes
 static/img/5.png                              |  Bin 0 -> 7468 bytes
 tuniao-ui/components/tn-radio/tn-radio.vue    |    3 +-
 12 files changed, 2404 insertions(+), 1100 deletions(-)
 create mode 100644 pages/train/detail.vue
 create mode 100644 pagesSubject/sign_up.vue
 create mode 100644 static/img/5.png

diff --git a/.gitignore b/.gitignore
index b02c4d0..366402f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /unpackage
-/.hbuilderx
\ No newline at end of file
+/.hbuilderx
+.history
\ No newline at end of file
diff --git a/common/js/utils.js b/common/js/utils.js
index cbf2744..2c7d858 100644
--- a/common/js/utils.js
+++ b/common/js/utils.js
@@ -5,6 +5,9 @@ const api_prefix = api_host + '/addons/exam/'
 
 //工具类
 module.exports = {
+	apiUrlReturn(){
+		return api_host;
+	},
 	isShowTip(apiUrl) {
 		let filterList = ['/agency/getAuditVersion']
 		if (filterList.indexOf(apiUrl) != -1) {
diff --git a/components/kz-page-index-color-1/kz-page-index-color-1.vue b/components/kz-page-index-color-1/kz-page-index-color-1.vue
index d20add8..b4acb5c 100644
--- a/components/kz-page-index-color-1/kz-page-index-color-1.vue
+++ b/components/kz-page-index-color-1/kz-page-index-color-1.vue
@@ -41,7 +41,8 @@
 				<!-- 功能列表 start -->
 				<view class="about-shadow tn-padding-top-sm tn-padding-bottom-sm">
 					<view style="display: flex;justify-content: center;align-items: center;gap: 12px;">
-						<view v-if="classes_show == 1" class="tn-padding-sm tn-margin-xs" @click="goPage('/pagesSubject/video/index')">
+						<view v-if="classes_show == 1" class="tn-padding-sm tn-margin-xs"
+							@click="goPage('/pagesSubject/video/index')">
 							<view class="tn-flex tn-flex-direction-column tn-flex-row-center tn-flex-col-center">
 								<view
 									class="icon15__item--image tn-flex tn-flex-row-center tn-flex-col-center tn-shadow-blur tn-color-white">
@@ -53,18 +54,30 @@
 								</view>
 							</view>
 						</view>
-						<view v-if="classes_show == 1" class="tn-padding-sm tn-margin-xs" @click="goPage('/pages/index/news-list')">
+						<view class="tn-padding-sm tn-margin-xs" @click="goPage('/pages/index/news-detail?id=1')">
 							<view class="tn-flex tn-flex-direction-column tn-flex-row-center tn-flex-col-center">
 								<view
 									class="icon15__item--image tn-flex tn-flex-row-center tn-flex-col-center tn-shadow-blur tn-color-white">
-									<image src="/static/img/1.png" style="width: 100%;height: 100%"></image>
+									<image src="/static/img/5.png" style="width: 100%;height: 100%"></image>
 								</view>
-						
+
 								<view class="tn-text-center">
 									<text class="tn-text-ellipsis" style="font-size: 28rpx">关于我们</text>
 								</view>
 							</view>
 						</view>
+						<view class="tn-padding-sm tn-margin-xs" @click="goPage('/pagesSubject/sign_up')">
+							<view class="tn-flex tn-flex-direction-column tn-flex-row-center tn-flex-col-center">
+								<view
+									class="icon15__item--image tn-flex tn-flex-row-center tn-flex-col-center tn-shadow-blur tn-color-white">
+									<image src="/static/img/4.png" style="width: 100%;height: 100%"></image>
+								</view>
+
+								<view class="tn-text-center">
+									<text class="tn-text-ellipsis" style="font-size: 28rpx">预约报名</text>
+								</view>
+							</view>
+						</view>
 						<!-- <view class="tn-padding-sm tn-margin-xs" @click="goPage('/pages/train/index?page=train')">
 							<view class="tn-flex tn-flex-direction-column tn-flex-row-center tn-flex-col-center">
 								<view
@@ -89,24 +102,39 @@
 								</view>
 							</view>
 						</view>
-						<view class="tn-padding-sm tn-margin-xs" @click="goPage('/pages/collect/index')">
-							<view class="tn-flex tn-flex-direction-column tn-flex-row-center tn-flex-col-center">
-								<view
-									class="icon15__item--image tn-flex tn-flex-row-center tn-flex-col-center tn-shadow-blur tn-color-white">
-									<image src="/static/img/4.png" style="width: 100%;height: 100%"></image>
-								</view>
-
-								<view class="tn-text-center">
-									<text class="tn-text-ellipsis" style="font-size: 28rpx">题目收藏</text>
-								</view>
-							</view>
-						</view>
+						
 					</view>
 				</view>
 				<!-- 功能列表 end -->
+				<!-- 题库列表 -->
+				<view class="tn-padding-top-xs tn-padding-bottom-sm">
+					<view class="tn-flex tn-flex-row-between tn-margin-sm">
+						<view class="justify-content-item tn-text-bold tn-text-xl">
+							<text class="tn-icon-title"></text>
+							<text class="">题库中心</text>
+						</view>
+					</view>
 
+					<view class="tn-margin-top-sm">
+						<view class="tn-flex tn-flex-wrap tn-margin-sm">
+							<block v-for="(item, index) in cateList" :key="index">
+								<view style="width: 50%">
+									<view class="question-bank-card tn-margin-xs" @click="checkPay(item.value)">
+										<view class="question-bank-image-wrapper">
+											<image class="question-bank-image" :src="imgUrl + item.image"
+												mode="aspectFill"></image>
+										</view>
+										<view class="question-bank-title">
+											{{ item.text }}
+										</view>
+									</view>
+								</view>
+							</block>
+						</view>
+					</view>
+				</view>
 				<!-- 试卷列表 -->
-				<view class="about-shadow tn-margin-top tn-padding-top-xs tn-padding-bottom-sm"
+				<!-- <view class="about-shadow tn-margin-top tn-padding-top-xs tn-padding-bottom-sm"
 					v-if="papers.length > 0">
 					<view class="tn-flex tn-flex-row-between tn-margin-sm">
 						<view class="justify-content-item tn-text-bold tn-text-xl">
@@ -123,7 +151,6 @@
 						<view class="skill-sequence-panel-content-wrapper-vertical">
 							<view class="kite-classify-cell-vertical shadow" v-for="(item, index) in papers"
 								:key="index">
-								<!-- <view :class="'nav-li bg-index' + (index + 1)"> -->
 								<view :class="'nav-li bg-index3'">
 									<view class="nav-name">{{ item.title }}</view>
 								</view>
@@ -147,7 +174,7 @@
 							</view>
 						</view>
 					</view>
-				</view>
+				</view> -->
 
 				<!-- 考场列表 -->
 				<!-- <view class="about-shadow tn-margin-top-xl tn-padding-top-xs tn-padding-bottom-sm"
@@ -236,377 +263,403 @@
 				</view> -->
 			</view>
 		</view>
+		<login ref="login" v-on:succ="ajax"></login>
 	</view>
 </template>
 
 <script>
-	import template_page_mixin from "@/libs/mixin/template_page_mixin.js";
-	// import NavIndexButton from '@/libs/components/nav-index-button.vue'
-
-	export default {
-		name: "kz-page-index-list1",
-		mixins: [template_page_mixin],
-		components: {
-			// NavIndexButton
+import template_page_mixin from "@/libs/mixin/template_page_mixin.js";
+// import NavIndexButton from '@/libs/components/nav-index-button.vue'
+import cateApi from "@/common/api/cate.js"
+export default {
+	name: "kz-page-index-list1",
+	mixins: [template_page_mixin],
+	components: {
+		// NavIndexButton
+	},
+	props: {
+		// 关注提示
+		focusOnTip: {
+			type: String,
+			default: "点击「添加小程序」，下次访问更便捷",
 		},
-		props: {
-			// 关注提示
-			focusOnTip: {
-				type: String,
-				default: "点击「添加小程序」，下次访问更便捷",
-			},
-			// banner图集合
-			banners: {
-				type: Array,
-				default: () => [],
-			},
-			// 轮播图集合
-			slides: {
-				type: Array,
-				default: () => [],
-			},
-			// 公告集合
-			notices: {
-				type: Array,
-				default: () => [],
-			},
-			// 公告集合
-			headlines: {
-				type: Array,
-				default: () => [],
-			},
-			// 试卷集合
-			papers: {
-				type: Array,
-				default: () => [],
-			},
-			// 考场集合
-			rooms: {
-				type: Array,
-				default: () => [],
-			},
-			// 学习动态集合
-			news: {
-				type: Array,
-				default: () => [],
-			},
-			// 功能集合
-			modules: {
-				type: Array,
-				default: () => [],
-			},
-			// 科目ID
-			subjectId: {
-				type: Number,
-				default: 0,
-			},
-			// 科目名称
-			subjectName: {
-				type: String,
-				default: "",
-			},
-			// 标题
-			title: {
-				type: String,
-				default: "",
-			},
-			classes_show: {
-				type: String,
-				default: "",
-			}
+		// banner图集合
+		banners: {
+			type: Array,
+			default: () => [],
 		},
-		watch: {
-			/**
-			 * 监听banners
-			 * @param list
-			 */
-			banners(list) {
-				console.log("watch banners", list);
-				// let banners = []
-				// for (var image of list) {
-				// 	banners.push({
-				// 		image: image
-				// 	})
-				// }
-				// this.banner = banners
-				this.banner = list;
-				console.log("watch banner", this.banner, this.slides);
+		// 轮播图集合
+		slides: {
+			type: Array,
+			default: () => [],
+		},
+		// 公告集合
+		notices: {
+			type: Array,
+			default: () => [],
+		},
+		// 公告集合
+		headlines: {
+			type: Array,
+			default: () => [],
+		},
+		// 试卷集合
+		papers: {
+			type: Array,
+			default: () => [],
+		},
+		// 考场集合
+		rooms: {
+			type: Array,
+			default: () => [],
+		},
+		// 学习动态集合
+		news: {
+			type: Array,
+			default: () => [],
+		},
+		// 功能集合
+		modules: {
+			type: Array,
+			default: () => [],
+		},
+		// 科目ID
+		subjectId: {
+			type: Number,
+			default: 0,
+		},
+		// 科目名称
+		subjectName: {
+			type: String,
+			default: "",
+		},
+		// 标题
+		title: {
+			type: String,
+			default: "",
+		},
+		classes_show: {
+			type: String,
+			default: "",
+		}
+	},
+	watch: {
+		/**
+		 * 监听banners
+		 * @param list
+		 */
+		banners(list) {
+			console.log("watch banners", list);
+			// let banners = []
+			// for (var image of list) {
+			// 	banners.push({
+			// 		image: image
+			// 	})
+			// }
+			// this.banner = banners
+			this.banner = list;
+			console.log("watch banner", this.banner, this.slides);
+		},
+		/**
+		 * 监听papers
+		 * @param list
+		 */
+		papers(list) {
+			this.bgColorList = this.utils.shuffle(this.bgColorList);
+			// 随机颜色
+			console.log("watch bgColorList", this.bgColorList);
+		},
+		/**
+		 * 监听rooms
+		 * @param list
+		 */
+		rooms(list) { },
+		/**
+		 * 监听modules
+		 * @param list
+		 */
+		// modules(list) {
+		// 	console.log('listen1 modules', list, this.moduleList)
+		// 	if (list && list.length > 0) {
+		// 		this.moduleList = list
+		// 	}
+		// },
+	},
+	mounted() {
+		console.log(this.modules);
+		let diyIndexButton = uni.getStorageSync("diyIndexButton");
+		if (diyIndexButton) {
+			this.moduleList = diyIndexButton;
+		}
+		this.getCate();
+		console.log("mounted diyIndexButton", diyIndexButton, this.moduleList);
+	},
+	data() {
+		return {
+			// 图片域名
+			imgUrl: this.imgUrl,
+			// banner图集
+			banner: [],
+			// 图鸟颜色列表
+			// tuniaoColorList: this.$t.color.getTuniaoColorList(),
+			bgColorList: this.utils.shuffle([1, 2, 3, 4, 5, 6]),
+			moduleList: [{
+				name: "课程中心",
+				type: "image",
+				image: "/static/img/1.png",
+				color: "tn-bg-green",
+				icon: "",
+				path: "/pagesSubject/video/index",
 			},
-			/**
-			 * 监听papers
-			 * @param list
-			 */
-			papers(list) {
-				this.bgColorList = this.utils.shuffle(this.bgColorList);
-				// 随机颜色
-				console.log("watch bgColorList", this.bgColorList);
-			},
-			/**
-			 * 监听rooms
-			 * @param list
-			 */
-			rooms(list) {},
-			/**
-			 * 监听modules
-			 * @param list
-			 */
-			// modules(list) {
-			// 	console.log('listen1 modules', list, this.moduleList)
-			// 	if (list && list.length > 0) {
-			// 		this.moduleList = list
-			// 	}
+			// {
+			// 	name: "背题模式",
+			// 	type: "icon",
+			// 	image: "",
+			// 	color: "tn-bg-green",
+			// 	icon: "tn-icon-eye",
+			// 	path: "/pages/train/index?page=look",
 			// },
+			{
+				name: "平台题库",
+				type: "image",
+				image: "/static/img/2.png",
+				color: "tn-bg-blue",
+				icon: "tn-icon-edit-write",
+				path: "/pages/train/index?page=train",
+			},
+			// {
+			// 	name: "模拟考试",
+			// 	type: "icon",
+			// 	image: "",
+			// 	color: "tn-bg-orange",
+			// 	icon: "tn-icon-edit-form",
+			// 	path: "/pages/paper/index",
+			// },
+			{
+				name: "错题本",
+				type: "image",
+				image: "/static/img/3.png",
+				color: "tn-bg-red",
+				icon: "tn-icon-close-circle",
+				path: "/pages/wrong/index",
+			},
+			// {
+			// 	name: "考场报名",
+			// 	type: "icon",
+			// 	image: "",
+			// 	color: "tn-bg-cyan",
+			// 	icon: "tn-icon-empty-data",
+			// 	path: "/pages/room/index",
+			// },
+			// {
+			// 	name: "题目搜索",
+			// 	type: "icon",
+			// 	image: "",
+			// 	color: "tn-bg-indigo",
+			// 	icon: "tn-icon-search-list",
+			// 	path: "/pages/search/index",
+			// },
+			{
+				name: "题目收藏",
+				type: "image",
+				image: "/static/img/4.png",
+				color: "tn-bg-purple",
+				icon: "tn-icon-like-lack",
+				path: "/pages/collect/index",
+			},
+				// {
+				// 	title: '报名记录',
+				// 	color: 'orange',
+				// 	icon: 'tn-icon-empty-coupon',
+				// 	path: '/pages/room/signup-index'
+				// },
+			],
+			cateList: [],
+		};
+	},
+	methods: {
+		// 获取题库
+		getCate() {
+			this.http('cate/getThree', {
+				kind: 'QUESTION',
+				page: this.page,
+				subject_id: this.subjectId
+			}).then(res => {
+				this.cateList = res.data
+			})
 		},
-		mounted() {
-			console.log(this.modules);
-			let diyIndexButton = uni.getStorageSync("diyIndexButton");
-			if (diyIndexButton) {
-				this.moduleList = diyIndexButton;
+		// 跳转页面
+		goPage(page) {
+			this.utils.goto(page);
+		},
+		// 点击公告，跳转公告详情
+		clickNotice(id) {
+			this.utils.goto("notice-detail?id=" + id);
+		},
+		// 点击轮播图
+		clickSwiper(index) {
+			const slide = this.banners[index];
+			console.log("clickSwiper", index, slide);
+			if (
+				slide &&
+				slide.front_info &&
+				slide.front_info != undefined &&
+				slide.front_info.full_url
+			) {
+				this.utils.goto(slide.front_info.full_url);
 			}
-			console.log("mounted diyIndexButton", diyIndexButton, this.moduleList);
 		},
-		data() {
-			return {
-				// 图片域名
-				imgUrl: this.imgUrl,
-				// banner图集
-				banner: [],
-				// 图鸟颜色列表
-				// tuniaoColorList: this.$t.color.getTuniaoColorList(),
-				bgColorList: this.utils.shuffle([1, 2, 3, 4, 5, 6]),
-				moduleList: [{
-						name: "课程中心",
-						type: "image",
-						image: "/static/img/1.png",
-						color: "tn-bg-green",
-						icon: "",
-						path: "/pagesSubject/video/index",
-					},
-					// {
-					// 	name: "背题模式",
-					// 	type: "icon",
-					// 	image: "",
-					// 	color: "tn-bg-green",
-					// 	icon: "tn-icon-eye",
-					// 	path: "/pages/train/index?page=look",
-					// },
-					{
-						name: "平台题库",
-						type: "image",
-						image: "/static/img/2.png",
-						color: "tn-bg-blue",
-						icon: "tn-icon-edit-write",
-						path: "/pages/train/index?page=train",
-					},
-					// {
-					// 	name: "模拟考试",
-					// 	type: "icon",
-					// 	image: "",
-					// 	color: "tn-bg-orange",
-					// 	icon: "tn-icon-edit-form",
-					// 	path: "/pages/paper/index",
-					// },
-					{
-						name: "错题本",
-						type: "image",
-						image: "/static/img/3.png",
-						color: "tn-bg-red",
-						icon: "tn-icon-close-circle",
-						path: "/pages/wrong/index",
-					},
-					// {
-					// 	name: "考场报名",
-					// 	type: "icon",
-					// 	image: "",
-					// 	color: "tn-bg-cyan",
-					// 	icon: "tn-icon-empty-data",
-					// 	path: "/pages/room/index",
-					// },
-					// {
-					// 	name: "题目搜索",
-					// 	type: "icon",
-					// 	image: "",
-					// 	color: "tn-bg-indigo",
-					// 	icon: "tn-icon-search-list",
-					// 	path: "/pages/search/index",
-					// },
-					{
-						name: "题目收藏",
-						type: "image",
-						image: "/static/img/4.png",
-						color: "tn-bg-purple",
-						icon: "tn-icon-like-lack",
-						path: "/pages/collect/index",
-					},
-					// {
-					// 	title: '报名记录',
-					// 	color: 'orange',
-					// 	icon: 'tn-icon-empty-coupon',
-					// 	path: '/pages/room/signup-index'
-					// },
-				],
-			};
+		ajax() {
+			if (uni.getStorageSync("token")) {
+				userApi.getUserInfo(this).then((res) => {
+					if (res.code == 1) {
+						this.user = { ...res.data };
+						uni.setStorageSync("user", this.user);
+					}
+				});
+			}
 		},
-		methods: {
-			// 跳转页面
-			goPage(page) {
-				this.utils.goto(page);
-			},
-			// 点击公告，跳转公告详情
-			clickNotice(id) {
-				this.utils.goto("notice-detail?id=" + id);
-			},
-			// 点击轮播图
-			clickSwiper(index) {
-				const slide = this.banners[index];
-				console.log("clickSwiper", index, slide);
-				if (
-					slide &&
-					slide.front_info &&
-					slide.front_info != undefined &&
-					slide.front_info.full_url
-				) {
-					this.utils.goto(slide.front_info.full_url);
+		// 检测题库是否已开通
+		checkPay(cateId) {
+			
+			// if (!this.cateId) {
+			// 	this.utils.toast('请先选择练习的题库')
+			// 	return
+			// }
+
+			// 检测题库是否已开通
+			cateApi.checkPay(this, cateId).then(res => {
+				console.log('checkPay res', res)
+
+				if (res.code != 1) {
+					// this.utils.toast(res.msg)
+					// if (res.data.need_open_member) {
+					// 	this.utils.goto('/pages/user/member-center')
+					// }
+					uni.showModal({
+						title: '提示',
+						content: res.msg,
+						confirmText: '联系客服',
+						success: (res) => {
+							if (res.confirm) {
+								//this.utils.goto('/pages/user/member-center?from_train=1')
+								uni.makePhoneCall({
+									phoneNumber: '18903795988' //仅为示例
+								});
+							} else if (res.cancel) {
+								this.utils.goback()
+							}
+						}
+					});
+					return
 				}
-			},
+				if (res.data.status == 1) {
+					uni.navigateTo({
+						url: '/pages/train/detail?id=' + cateId
+					});
+				}
+				// 无须支付
+				// if (res.data.status == 1) {
+				// 	this.goTrain()
+				// 	return
+				// } else if (res.data.status == 2) {
+				// 	this.catePrice = parseFloat(res.data.price)
+				// 	this.confirmCateContent = res.data.msg
+				// 	this.showCateConfirm = true
+				// }
+			})
 		},
-	};
+	},
+};
 </script>
 
 <style lang="scss" scoped>
-	.page-index-list {
-		background-color: #ffffff;
+.page-index-list {
+	background-color: #ffffff;
+}
+
+/* 自定义导航栏内容 start */
+.custom-nav {
+	height: 100%;
+
+	&__back {
+		margin: auto 5rpx;
+		font-size: 40rpx;
+		margin-right: 10rpx;
+		margin-left: 30rpx;
+		flex-basis: 5%;
 	}
 
-	/* 自定义导航栏内容 start */
-	.custom-nav {
+	&__search {
+		flex-basis: 60%;
+		width: 100%;
 		height: 100%;
 
-		&__back {
-			margin: auto 5rpx;
-			font-size: 40rpx;
-			margin-right: 10rpx;
-			margin-left: 30rpx;
-			flex-basis: 5%;
-		}
-
-		&__search {
-			flex-basis: 60%;
+		&__box {
 			width: 100%;
-			height: 100%;
-
-			&__box {
-				width: 100%;
-				height: 70%;
-				padding: 10rpx 0;
-				margin: 0 30rpx;
-				border-radius: 60rpx 60rpx 0 60rpx;
-				font-size: 24rpx;
-			}
-
-			&__icon {
-				padding-right: 10rpx;
-				margin-left: 20rpx;
-				font-size: 30rpx;
-			}
-
-			&__text {
-				color: #aaaaaa;
-			}
-		}
-	}
-
-	/*logo start */
-	.logo-image {
-		width: 65rpx;
-		height: 65rpx;
-		position: relative;
-	}
-
-	.logo-pic {
-		background-size: cover;
-		background-repeat: no-repeat;
-		// background-attachment:fixed;
-		background-position: top;
-		border-radius: 50%;
-	}
-
-	/* 自定义导航栏内容 end */
-
-	/* 内容布局 start*/
-	.course-shadow {
-		box-shadow: 0rpx 0rpx 80rpx 0rpx rgba(0, 0, 0, 0.07);
-	}
-
-	.course-radius {
-		border-radius: 15rpx;
-	}
-
-	/* 图标容器15 start */
-	.icon15 {
-		&__item {
-			width: 30%;
-			background-color: #ffffff;
-			border-radius: 10rpx;
-			padding: 30rpx;
-			margin: 20rpx 10rpx;
-			transform: scale(1);
-			transition: transform 0.3s linear;
-			transform-origin: center center;
-
-			&--icon {
-				width: 100rpx;
-				height: 100rpx;
-				font-size: 60rpx;
-				border-radius: 50%;
-				margin-bottom: 18rpx;
-				position: relative;
-				z-index: 1;
-
-				&::after {
-					content: " ";
-					position: absolute;
-					z-index: -1;
-					width: 100%;
-					height: 100%;
-					left: 0;
-					bottom: 0;
-					border-radius: inherit;
-					opacity: 1;
-					transform: scale(1, 1);
-					background-size: 100% 100%;
-				}
-			}
-
-			&--image {
-				width: 72rpx;
-				height: 72rpx;
-				margin-bottom: 18rpx;
-				position: relative;
-				background-position: center;
-				background-size: 100% 100%;
-
-				&::after {
-					width: 100%;
-					height: 100%;
-				}
-			}
-		}
-	}
-
-	/* 业务展示 start */
-	.tn-info {
-		&__container {
-			margin-top: 10rpx;
-			margin-bottom: 50rpx;
+			height: 70%;
+			padding: 10rpx 0;
+			margin: 0 30rpx;
+			border-radius: 60rpx 60rpx 0 60rpx;
+			font-size: 24rpx;
 		}
 
-		&__item {
-			width: 48%;
-			margin: 15rpx 0rpx;
-			padding: 40rpx 30rpx;
-			border-radius: 15rpx;
+		&__icon {
+			padding-right: 10rpx;
+			margin-left: 20rpx;
+			font-size: 30rpx;
+		}
 
+		&__text {
+			color: #aaaaaa;
+		}
+	}
+}
+
+/*logo start */
+.logo-image {
+	width: 65rpx;
+	height: 65rpx;
+	position: relative;
+}
+
+.logo-pic {
+	background-size: cover;
+	background-repeat: no-repeat;
+	// background-attachment:fixed;
+	background-position: top;
+	border-radius: 50%;
+}
+
+/* 自定义导航栏内容 end */
+
+/* 内容布局 start*/
+.course-shadow {
+	box-shadow: 0rpx 0rpx 80rpx 0rpx rgba(0, 0, 0, 0.07);
+}
+
+.course-radius {
+	border-radius: 15rpx;
+}
+
+/* 图标容器15 start */
+.icon15 {
+	&__item {
+		width: 30%;
+		background-color: #ffffff;
+		border-radius: 10rpx;
+		padding: 30rpx;
+		margin: 20rpx 10rpx;
+		transform: scale(1);
+		transition: transform 0.3s linear;
+		transform-origin: center center;
+
+		&--icon {
+			width: 100rpx;
+			height: 100rpx;
+			font-size: 60rpx;
+			border-radius: 50%;
+			margin-bottom: 18rpx;
 			position: relative;
 			z-index: 1;
 
@@ -622,406 +675,481 @@
 				opacity: 1;
 				transform: scale(1, 1);
 				background-size: 100% 100%;
-				background-image: url(https://tnuiimage.tnkjapp.com/cool_bg_image/3.png);
-			}
-
-			&__left {
-				&--icon {
-					width: 80rpx;
-					height: 80rpx;
-					border-radius: 30%;
-					font-size: 50rpx;
-					margin-right: 20rpx;
-					position: relative;
-					z-index: 1;
-
-					&::after {
-						content: " ";
-						position: absolute;
-						z-index: -1;
-						width: 100%;
-						height: 100%;
-						left: 0;
-						bottom: 0;
-						border-radius: inherit;
-						opacity: 1;
-						transform: scale(1, 1);
-						background-size: 100% 100%;
-						background-image: url(https://tnuiimage.tnkjapp.com/cool_bg_image/icon_bg5.png);
-					}
-				}
-
-				&__content {
-					font-size: 30rpx;
-
-					&--data {
-						margin-top: 5rpx;
-						font-weight: bold;
-					}
-				}
-			}
-
-			&__right {
-				&--icon {
-					position: absolute;
-					right: 0upx;
-					top: 50upx;
-					font-size: 100upx;
-					width: 108upx;
-					height: 108upx;
-					text-align: center;
-					line-height: 60upx;
-					opacity: 0.15;
-				}
-			}
-		}
-	}
-
-	/* 业务展示 end */
-
-	/* 文章内容 start*/
-	.tn-blogger-content {
-		&__wrap {
-			box-shadow: 0rpx 0rpx 80rpx 0rpx rgba(0, 0, 0, 0.07);
-			border-radius: 20rpx;
-			margin: 15rpx;
-		}
-
-		&__info {
-			&__btn {
-				margin-right: -12rpx;
-				opacity: 0.5;
 			}
 		}
 
-		&__label {
-			&__item {
-				line-height: 45rpx;
-				padding: 0 20rpx;
-				margin: 5rpx 18rpx 0 0;
+		&--image {
+			width: 72rpx;
+			height: 72rpx;
+			margin-bottom: 18rpx;
+			position: relative;
+			background-position: center;
+			background-size: 100% 100%;
 
-				&--prefix {
-					color: #82b2ff;
-					padding-right: 10rpx;
-				}
-			}
-
-			&__desc {
-				line-height: 35rpx;
-			}
-		}
-
-		&__main-image {
-			border-radius: 16rpx 16rpx 0 0;
-
-			&--1 {
-				max-width: 690rpx;
-				min-width: 690rpx;
-				max-height: 400rpx;
-				min-height: 400rpx;
-			}
-
-			&--2 {
-				max-width: 260rpx;
-				max-height: 260rpx;
-			}
-
-			&--3 {
-				height: 212rpx;
+			&::after {
 				width: 100%;
+				height: 100%;
 			}
 		}
+	}
+}
 
-		&__count-icon {
-			font-size: 30rpx;
-			padding-right: 5rpx;
-		}
+/* 业务展示 start */
+.tn-info {
+	&__container {
+		margin-top: 10rpx;
+		margin-bottom: 50rpx;
 	}
 
-	.image-music {
-		padding: 100rpx 0rpx;
-		font-size: 16rpx;
-		font-weight: 300;
-		position: relative;
-	}
-
-	.image-pic {
-		background-size: cover;
-		background-repeat: no-repeat;
-		// background-attachment:fixed;
-		background-position: top;
-		border-radius: 20rpx 20rpx 0 0;
-	}
-
-	/* 文章内容 end*/
-
-	/* 底部tabbar start*/
-	.footerfixed {
-		position: fixed;
-		width: 100%;
-		bottom: 0;
-		z-index: 999;
-		background-color: #ffffff;
-		box-shadow: 0rpx 0rpx 30rpx 0rpx rgba(0, 0, 0, 0.07);
-	}
-
-	.tabbar {
-		display: flex;
-		align-items: center;
-		min-height: 110rpx;
-		justify-content: space-between;
-		padding: 0;
-		height: calc(110rpx + env(safe-area-inset-bottom) / 2);
-		padding-bottom: calc(env(safe-area-inset-bottom) / 2);
-	}
-
-	.tabbar .action {
-		font-size: 22rpx;
-		position: relative;
-		flex: 1;
-		text-align: center;
-		padding: 0;
-		display: block;
-		height: auto;
-		line-height: 1;
-		margin: 0;
-		overflow: initial;
-	}
-
-	.tabbar .action .bar-icon {
-		width: 100rpx;
-		position: relative;
-		display: block;
-		height: auto;
-		margin: 0 auto 10rpx;
-		text-align: center;
-		font-size: 42rpx;
-	}
-
-	.tabbar .action .bar-icon image {
-		width: 50rpx;
-		height: 50rpx;
-		display: inline-block;
-	}
-
-	/*scroll-view外层*/
-	.skill-sequence-panel-content-wrapper {
-		position: relative;
-		white-space: nowrap;
-		padding: 10rpx 0 10rpx 10rpx;
-		// background-color: #f2f5f9;
-	}
-
-	/*左右渐变遮罩*/
-	.hide-content-box {
-		position: absolute;
-		top: 0;
-		height: 100%;
-		width: 10px;
-		z-index: 2;
-	}
-
-	.hide-content-box-left {
-		left: 0;
-		background-image: linear-gradient(to left,
-				rgba(255, 255, 255, 0),
-				#f3f3f3 60%);
-	}
-
-	.hide-content-box-right {
-		right: 0;
-		background-image: linear-gradient(to right,
-				rgba(255, 255, 255, 0),
-				#f3f3f3 60%);
-	}
-
-	.kite-classify-scroll {
-		width: 100%;
-		height: 380rpx;
-		overflow: hidden;
-		white-space: nowrap;
-		padding-top: 15rpx;
-	}
-
-	.kite-classify-cell {
-		display: inline-block;
-		width: 266rpx;
-		height: 350rpx;
-		margin-right: 20rpx;
-		background-color: #ffffff;
-		border-radius: 20rpx;
-		overflow: hidden;
-		box-shadow: 2px 2px 3px rgba(26, 26, 26, 0.2);
-	}
-
-	/* 垂直布局样式 */
-	.skill-sequence-panel-content-wrapper-vertical {
-		position: relative;
-		padding: 10rpx 20rpx;
-	}
-
-	.kite-classify-cell-vertical {
-		display: block;
-		width: 100%;
-		height: 280rpx;
-		margin-bottom: 40rpx;
-		background-color: #ffffff;
-		border-radius: 20rpx;
-		overflow: hidden;
-		box-shadow: 2px 2px 3px rgba(26, 26, 26, 0.2);
-	}
-
-	.nav-li {
+	&__item {
+		width: 48%;
+		margin: 15rpx 0rpx;
 		padding: 40rpx 30rpx;
-		width: 100%;
-		background-image: url(https://s1.ax1x.com/2020/06/27/NyU04x.png);
-		background-size: cover;
-		background-position: center;
+		border-radius: 15rpx;
+
 		position: relative;
 		z-index: 1;
-		margin: 0 !important;
+
+		&::after {
+			content: " ";
+			position: absolute;
+			z-index: -1;
+			width: 100%;
+			height: 100%;
+			left: 0;
+			bottom: 0;
+			border-radius: inherit;
+			opacity: 1;
+			transform: scale(1, 1);
+			background-size: 100% 100%;
+			background-image: url(https://tnuiimage.tnkjapp.com/cool_bg_image/3.png);
+		}
+
+		&__left {
+			&--icon {
+				width: 80rpx;
+				height: 80rpx;
+				border-radius: 30%;
+				font-size: 50rpx;
+				margin-right: 20rpx;
+				position: relative;
+				z-index: 1;
+
+				&::after {
+					content: " ";
+					position: absolute;
+					z-index: -1;
+					width: 100%;
+					height: 100%;
+					left: 0;
+					bottom: 0;
+					border-radius: inherit;
+					opacity: 1;
+					transform: scale(1, 1);
+					background-size: 100% 100%;
+					background-image: url(https://tnuiimage.tnkjapp.com/cool_bg_image/icon_bg5.png);
+				}
+			}
+
+			&__content {
+				font-size: 30rpx;
+
+				&--data {
+					margin-top: 5rpx;
+					font-weight: bold;
+				}
+			}
+		}
+
+		&__right {
+			&--icon {
+				position: absolute;
+				right: 0upx;
+				top: 50upx;
+				font-size: 100upx;
+				width: 108upx;
+				height: 108upx;
+				text-align: center;
+				line-height: 60upx;
+				opacity: 0.15;
+			}
+		}
+	}
+}
+
+/* 业务展示 end */
+
+/* 文章内容 start*/
+.tn-blogger-content {
+	&__wrap {
+		box-shadow: 0rpx 0rpx 80rpx 0rpx rgba(0, 0, 0, 0.07);
+		border-radius: 20rpx;
+		margin: 15rpx;
 	}
 
-	.nav-name {
+	&__info {
+		&__btn {
+			margin-right: -12rpx;
+			opacity: 0.5;
+		}
+	}
+
+	&__label {
+		&__item {
+			line-height: 45rpx;
+			padding: 0 20rpx;
+			margin: 5rpx 18rpx 0 0;
+
+			&--prefix {
+				color: #82b2ff;
+				padding-right: 10rpx;
+			}
+		}
+
+		&__desc {
+			line-height: 35rpx;
+		}
+	}
+
+	&__main-image {
+		border-radius: 16rpx 16rpx 0 0;
+
+		&--1 {
+			max-width: 690rpx;
+			min-width: 690rpx;
+			max-height: 400rpx;
+			min-height: 400rpx;
+		}
+
+		&--2 {
+			max-width: 260rpx;
+			max-height: 260rpx;
+		}
+
+		&--3 {
+			height: 212rpx;
+			width: 100%;
+		}
+	}
+
+	&__count-icon {
 		font-size: 30rpx;
-		text-transform: Capitalize;
-		margin-top: 20upx;
-		position: relative;
-		text-overflow: ellipsis;
-		overflow: hidden;
+		padding-right: 5rpx;
 	}
+}
 
-	.nav-name::before {
-		content: "";
-		position: absolute;
-		display: block;
-		width: 40rpx;
-		height: 6rpx;
-		background: #fff;
-		bottom: 0;
-		right: 0;
-		opacity: 0.5;
-	}
+.image-music {
+	padding: 100rpx 0rpx;
+	font-size: 16rpx;
+	font-weight: 300;
+	position: relative;
+}
 
-	.nav-name::after {
-		content: "";
-		position: absolute;
-		display: block;
-		width: 100rpx;
-		height: 1px;
-		background: #fff;
-		bottom: 0;
-		right: 40rpx;
-		opacity: 0.3;
-	}
+.image-pic {
+	background-size: cover;
+	background-repeat: no-repeat;
+	// background-attachment:fixed;
+	background-position: top;
+	border-radius: 20rpx 20rpx 0 0;
+}
 
-	.nav-content {
-		width: 100%;
-		padding: 15rpx;
-		display: inline-block;
-		overflow-wrap: break-word;
-		white-space: normal;
-	}
+/* 文章内容 end*/
 
-	.nav-btn {
-		width: 200rpx;
-		height: 60rpx;
-		margin-right: 30rpx;
-		text-align: center;
-		line-height: 60rpx;
-		border-radius: 10rpx;
-	}
+/* 底部tabbar start*/
+.footerfixed {
+	position: fixed;
+	width: 100%;
+	bottom: 0;
+	z-index: 999;
+	background-color: #ffffff;
+	box-shadow: 0rpx 0rpx 30rpx 0rpx rgba(0, 0, 0, 0.07);
+}
 
-	.bg-index1 {
-		background-color: #19cf8a;
-		color: #fff;
-	}
+.tabbar {
+	display: flex;
+	align-items: center;
+	min-height: 110rpx;
+	justify-content: space-between;
+	padding: 0;
+	height: calc(110rpx + env(safe-area-inset-bottom) / 2);
+	padding-bottom: calc(env(safe-area-inset-bottom) / 2);
+}
 
-	.bg-index2 {
-		background-color: #954ff6;
-		color: #fff;
-	}
+.tabbar .action {
+	font-size: 22rpx;
+	position: relative;
+	flex: 1;
+	text-align: center;
+	padding: 0;
+	display: block;
+	height: auto;
+	line-height: 1;
+	margin: 0;
+	overflow: initial;
+}
 
-	.bg-index3 {
-		font-size: 30rpx;
-		background-color: #5177ee;
-		color: #fff;
-	}
+.tabbar .action .bar-icon {
+	width: 100rpx;
+	position: relative;
+	display: block;
+	height: auto;
+	margin: 0 auto 10rpx;
+	text-align: center;
+	font-size: 42rpx;
+}
 
-	.bg-index4 {
-		background-color: #f49a02;
-		color: #fff;
-	}
+.tabbar .action .bar-icon image {
+	width: 50rpx;
+	height: 50rpx;
+	display: inline-block;
+}
 
-	.bg-index5 {
-		background-color: #ff4f94;
-		color: #fff;
-	}
+/*scroll-view外层*/
+.skill-sequence-panel-content-wrapper {
+	position: relative;
+	white-space: nowrap;
+	padding: 10rpx 0 10rpx 10rpx;
+	// background-color: #f2f5f9;
+}
 
-	.bg-index6 {
-		background-color: #7fd02b;
-		color: #fff;
-	}
+/*左右渐变遮罩*/
+.hide-content-box {
+	position: absolute;
+	top: 0;
+	height: 100%;
+	width: 10px;
+	z-index: 2;
+}
 
-	/* 页面阴影 start*/
-	.wallpaper-shadow {
-		border-radius: 15rpx;
-		box-shadow: 0rpx 0rpx 50rpx 0rpx rgba(0, 0, 0, 0.07);
-	}
+.hide-content-box-left {
+	left: 0;
+	background-image: linear-gradient(to left,
+			rgba(255, 255, 255, 0),
+			#f3f3f3 60%);
+}
 
-	/* 用户头像 start */
-	.logo-image {
-		width: 100rpx;
-		height: 100rpx;
-		position: relative;
-	}
+.hide-content-box-right {
+	right: 0;
+	background-image: linear-gradient(to right,
+			rgba(255, 255, 255, 0),
+			#f3f3f3 60%);
+}
 
-	.logo-pic {
-		background-size: cover;
-		background-repeat: no-repeat;
-		// background-attachment:fixed;
-		background-position: top;
-		border: 1rpx solid rgba(255, 255, 255, 0.05);
-		box-shadow: 0rpx 0rpx 80rpx 0rpx rgba(0, 0, 0, 0.05);
-		border-radius: 50%;
-		overflow: hidden;
-		// background-color: #FFFFFF;
-	}
+.kite-classify-scroll {
+	width: 100%;
+	height: 380rpx;
+	overflow: hidden;
+	white-space: nowrap;
+	padding-top: 15rpx;
+}
 
-	/*公告*/
-	.tui-rolling-news {
-		width: calc(100% - 40rpx);
-		padding: 12rpx 20rpx;
-		box-sizing: border-box;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		flex-wrap: nowrap;
-		background: #fff;
-		border-radius: 10rpx;
-		margin: 0 20rpx 30rpx;
-	}
+.kite-classify-cell {
+	display: inline-block;
+	width: 266rpx;
+	height: 350rpx;
+	margin-right: 20rpx;
+	background-color: #ffffff;
+	border-radius: 20rpx;
+	overflow: hidden;
+	box-shadow: 2px 2px 3px rgba(26, 26, 26, 0.2);
+}
 
-	.tui-swiper {
-		font-size: 28rpx;
-		height: 50rpx;
-		flex: 1;
-		overflow: hidden;
-		white-space: nowrap;
-		text-overflow: ellipsis;
-	}
+/* 垂直布局样式 */
+.skill-sequence-panel-content-wrapper-vertical {
+	position: relative;
+	padding: 10rpx 20rpx;
+}
 
-	.tui-swiper-item {
-		display: flex;
-		align-items: center;
-	}
+.kite-classify-cell-vertical {
+	display: block;
+	width: 100%;
+	height: 280rpx;
+	margin-bottom: 40rpx;
+	background-color: #ffffff;
+	border-radius: 20rpx;
+	overflow: hidden;
+	box-shadow: 2px 2px 3px rgba(26, 26, 26, 0.2);
+}
 
-	.tui-news-item {
-		line-height: 24rpx;
-		white-space: nowrap;
-		overflow: hidden;
-		text-overflow: ellipsis;
-	}
+.nav-li {
+	padding: 40rpx 30rpx;
+	width: 100%;
+	background-image: url(https://s1.ax1x.com/2020/06/27/NyU04x.png);
+	background-size: cover;
+	background-position: center;
+	position: relative;
+	z-index: 1;
+	margin: 0 !important;
+}
 
-	/*公告*/
+.nav-name {
+	font-size: 30rpx;
+	text-transform: Capitalize;
+	margin-top: 20upx;
+	position: relative;
+	text-overflow: ellipsis;
+	overflow: hidden;
+}
+
+.nav-name::before {
+	content: "";
+	position: absolute;
+	display: block;
+	width: 40rpx;
+	height: 6rpx;
+	background: #fff;
+	bottom: 0;
+	right: 0;
+	opacity: 0.5;
+}
+
+.nav-name::after {
+	content: "";
+	position: absolute;
+	display: block;
+	width: 100rpx;
+	height: 1px;
+	background: #fff;
+	bottom: 0;
+	right: 40rpx;
+	opacity: 0.3;
+}
+
+.nav-content {
+	width: 100%;
+	padding: 15rpx;
+	display: inline-block;
+	overflow-wrap: break-word;
+	white-space: normal;
+}
+
+.nav-btn {
+	width: 200rpx;
+	height: 60rpx;
+	margin-right: 30rpx;
+	text-align: center;
+	line-height: 60rpx;
+	border-radius: 10rpx;
+}
+
+.bg-index1 {
+	background-color: #19cf8a;
+	color: #fff;
+}
+
+.bg-index2 {
+	background-color: #954ff6;
+	color: #fff;
+}
+
+.bg-index3 {
+	font-size: 30rpx;
+	background-color: #5177ee;
+	color: #fff;
+}
+
+.bg-index4 {
+	background-color: #f49a02;
+	color: #fff;
+}
+
+.bg-index5 {
+	background-color: #ff4f94;
+	color: #fff;
+}
+
+.bg-index6 {
+	background-color: #7fd02b;
+	color: #fff;
+}
+
+/* 页面阴影 start*/
+.wallpaper-shadow {
+	border-radius: 15rpx;
+	box-shadow: 0rpx 0rpx 50rpx 0rpx rgba(0, 0, 0, 0.07);
+}
+
+/* 用户头像 start */
+.logo-image {
+	width: 100rpx;
+	height: 100rpx;
+	position: relative;
+}
+
+.logo-pic {
+	background-size: cover;
+	background-repeat: no-repeat;
+	// background-attachment:fixed;
+	background-position: top;
+	border: 1rpx solid rgba(255, 255, 255, 0.05);
+	box-shadow: 0rpx 0rpx 80rpx 0rpx rgba(0, 0, 0, 0.05);
+	border-radius: 50%;
+	overflow: hidden;
+	// background-color: #FFFFFF;
+}
+
+/*公告*/
+.tui-rolling-news {
+	width: calc(100% - 40rpx);
+	padding: 12rpx 20rpx;
+	box-sizing: border-box;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	flex-wrap: nowrap;
+	background: #fff;
+	border-radius: 10rpx;
+	margin: 0 20rpx 30rpx;
+}
+
+.tui-swiper {
+	font-size: 28rpx;
+	height: 50rpx;
+	flex: 1;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
+
+.tui-swiper-item {
+	display: flex;
+	align-items: center;
+}
+
+.tui-news-item {
+	line-height: 24rpx;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
+/*公告*/
+
+/* 题库卡片样式 start */
+.question-bank-card {
+	background-color: #ffffff;
+	border-radius: 15rpx;
+}
+
+.question-bank-image-wrapper {
+	width: 100%;
+	height: 200rpx;
+	overflow: hidden;
+	border-radius: 15rpx;
+}
+
+.question-bank-image {
+	width: 100%;
+	height: 100%;
+	object-fit: cover;
+}
+
+.question-bank-title {
+	padding: 15rpx;
+	font-size: 32rpx;
+	color: #333333;
+	display: flex;
+}
+
+/* 题库卡片样式 end */
 </style>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 658e36c..44561a8 100644
--- a/pages.json
+++ b/pages.json
@@ -95,7 +95,7 @@
 		}, {
 			"path": "pages/train/index",
 			"style": {
-				"navigationBarTitleText": "题目选择",
+				"navigationBarTitleText": "平台题库",
 				"enablePullDownRefresh": false
 			}
 
@@ -106,6 +106,13 @@
 				"enablePullDownRefresh": false
 			}
 
+		}, {
+			"path": "pages/train/detail",
+			"style": {
+				"navigationBarTitleText": "题目选择",
+				"enablePullDownRefresh": false
+			}
+
 		}, {
 			"path": "pages/webview/webview",
 			"style": {
@@ -142,7 +149,7 @@
 		}, {
 			"path": "pages/index/news-detail",
 			"style": {
-				"navigationBarTitleText": "详情",
+				"navigationBarTitleText": "关于我们",
 				"enablePullDownRefresh": false
 			}
 		}, {
@@ -219,6 +226,11 @@
 						"navigationBarTitleText": "科目",
 						"enablePullDownRefresh": true
 					}
+				},{
+					"path": "sign_up",
+					"style": {
+						"navigationBarTitleText": "预约报名"
+					}
 				},
 				{
 					"path": "video/index",
diff --git a/pages/index/news-detail.vue b/pages/index/news-detail.vue
index 5c5478c..57070cc 100644
--- a/pages/index/news-detail.vue
+++ b/pages/index/news-detail.vue
@@ -14,18 +14,17 @@
 						我们的位置
 					</view>
 					<view class="mapContainer">
-						<map
-							:latitude="mapData.latitude"
-							:longitude="mapData.longitude"
-							:markers="mapData.markers"
-							:scale="mapData.scale"
-							:show-location="true"
-							@markertap="handleMarkerTap"
-							@callouttap="handleCalloutTap"
-							class="map"
-						></map>
+						<map :latitude="mapData.latitude" :longitude="mapData.longitude" :markers="mapData.markers"
+							:scale="mapData.scale" :show-location="true" @markertap="handleMarkerTap"
+							@callouttap="handleCalloutTap" class="map"></map>
 					</view>
 				</view>
+				<view style="padding-bottom: 30rpx;margin-top: 50rpx;">
+					<tn-button fontColor="#ffffff" type="primary" width="100%" height="88rpx" @click="openBm"
+						:loading="submitting" backgroundColor="#1A73E8">
+						预约报名
+					</tn-button>
+				</view>
 			</view>
 
 			<!-- <view class="cu-bar justify-left bg-white margin-top-sm">
@@ -48,6 +47,7 @@
           <text class="text-df" style="margin-top: 2rpx;">{{newsData.commentNum}}</text>
         </view>
       </view> -->
+
 		</view>
 
 		<!-- <view class="cu-bar bg-white tabbar border shop bottomBox">
@@ -68,164 +68,170 @@
 </template>
 
 <script>
-	import newsApi from "@/common/api/news.js"
+import newsApi from "@/common/api/news.js"
 
-	export default {
-		data() {
-			return {
-				newsData: [],
-				requestStatus: false, // 事件防抖
-				tagStyle: {
-					table: 'border: 1px solid gray;border-collapse:collapse',
-					th: 'border: 1px solid gray;',
-					td: 'border: 1px solid gray;'
-				},
-				// 地图数据
-				mapData: {
-					latitude: 34.621881, // 纬度
-					longitude: 112.436631, // 经度
-					scale: 17, // 地图缩放级别
-					markers: [{
-						id: 1,
-						latitude: 34.621881,
-						longitude: 112.436631,
-						title: '名扬体育学院',
-						width:15,
-						height:20,
-						callout: {
-							content: '名扬体育学院',
-							color: '#000000',
-							fontSize: 14,
-							borderRadius: 8,
-							bgColor: '#ffffff',
-							padding: 8,
-							display: 'ALWAYS'
-						}
-					}]
+export default {
+	data() {
+		return {
+			newsData: [],
+			requestStatus: false, // 事件防抖
+			tagStyle: {
+				table: 'border: 1px solid gray;border-collapse:collapse',
+				th: 'border: 1px solid gray;',
+				td: 'border: 1px solid gray;'
+			},
+			// 地图数据
+			mapData: {
+				latitude: 34.621881, // 纬度
+				longitude: 112.436631, // 经度
+				scale: 17, // 地图缩放级别
+				markers: [{
+					id: 1,
+					latitude: 34.621881,
+					longitude: 112.436631,
+					title: '名扬体育学院',
+					width: 15,
+					height: 20,
+					callout: {
+						content: '名扬体育学院',
+						color: '#000000',
+						fontSize: 14,
+						borderRadius: 8,
+						bgColor: '#ffffff',
+						padding: 8,
+						display: 'ALWAYS'
+					}
+				}]
+			}
+		}
+	},
+	onLoad(option) {
+		console.log(option)
+		this.getData(option.id);
+	},
+	methods: {
+		// 获取数据
+		getData(id) {
+			console.log(id);
+
+			newsApi.getNewsDetail(this, {
+				id: id
+			}).then(res => {
+				s
+				if (res && res.data) {
+					this.newsData = res.data
 				}
+			})
+		},
+		// 打开导航
+		openNavigation() {
+			uni.openLocation({
+				latitude: this.mapData.latitude,
+				longitude: this.mapData.longitude,
+				name: '名扬体育学院',
+				address: '名扬体育学院',
+				scale: 18,
+				success: () => {
+					console.log('成功打开地图导航');
+				},
+				fail: (err) => {
+					console.error('打开地图导航失败', err);
+					uni.showToast({
+						title: '打开地图失败',
+						icon: 'none'
+					});
+				}
+			});
+		},
+		// 处理地图标记点击事件
+		handleMarkerTap(e) {
+			console.log('标记点被点击', e);
+			this.openNavigation();
+		},
+		// 处理callout点击事件
+		handleCalloutTap(e) {
+			console.log('callout被点击', e);
+			this.openNavigation();
+		},
+		handleBack() {
+			this.utils.goto('news-list')
+		},
+		handleGo() {
+			if (this.newsData && this.newsData.front_info) {
+				this.utils.goto(this.newsData.front_info.full_url)
 			}
 		},
-		onLoad(option) {
-			console.log(option)
-			this.getData(option.id);
+		openBm() {
+			uni.navigateTo({
+				url: '/pagesSubject/sign_up'
+			})
 		},
-		methods: {
-			// 获取数据
-			getData(id) {
-				console.log(id);
-
-				newsApi.getNewsDetail(this, {
-					id: id
-				}).then(res => {
-					if (res && res.data) {
-						this.newsData = res.data
-					}
-				})
-			},
-			// 打开导航
-			openNavigation() {
-				uni.openLocation({
-					latitude: this.mapData.latitude,
-					longitude: this.mapData.longitude,
-					name: '名扬体育学院',
-					address: '名扬体育学院',
-					scale: 18,
-					success: () => {
-						console.log('成功打开地图导航');
-					},
-					fail: (err) => {
-						console.error('打开地图导航失败', err);
-						uni.showToast({
-							title: '打开地图失败',
-							icon: 'none'
-						});
-					}
-				});
-			},
-			// 处理地图标记点击事件
-			handleMarkerTap(e) {
-				console.log('标记点被点击', e);
-				this.openNavigation();
-			},
-			// 处理callout点击事件
-			handleCalloutTap(e) {
-				console.log('callout被点击', e);
-				this.openNavigation();
-			},
-			handleBack() {
-				this.utils.goto('news-list')
-			},
-			handleGo() {
-				if (this.newsData && this.newsData.front_info) {
-					this.utils.goto(this.newsData.front_info.full_url)
-				}
-			},
-			previewImage(index) {
-				// 预览功能需要数组格式，具体查看uniapp文档：previewImage
-				const seeImgList = this.newsData.images
-				uni.previewImage({
-					current: index, //预览图片的下标
-					urls: seeImgList //预览图片的地址，必须要数组形式，如果不是数组形式就转换成数组形式就可以
-				})
-			},
-
+		previewImage(index) {
+			// 预览功能需要数组格式，具体查看uniapp文档：previewImage
+			const seeImgList = this.newsData.images
+			uni.previewImage({
+				current: index, //预览图片的下标
+				urls: seeImgList //预览图片的地址，必须要数组形式，如果不是数组形式就转换成数组形式就可以
+			})
 		},
-	}
+
+	},
+}
 </script>
 
 <style lang="scss" scoped>
-	button::after {
-		border: none;
-		background: transparent;
-	}
+button::after {
+	border: none;
+	background: transparent;
+}
 
-	uni-button {
-		background: transparent;
-	}
+uni-button {
+	background: transparent;
+}
 
-	.container {
-		background-color: #f2f2f2;
-	}
+.container {
+	background-color: #f2f2f2;
+}
 
-	.solid {
-		border-radius: 50rpx;
-		text-indent: 12rpx;
-	}
+.solid {
+	border-radius: 50rpx;
+	text-indent: 12rpx;
+}
 
-	image {
-		width: 750rpx;
-	}
+image {
+	width: 750rpx;
+}
 
-	.bottomBox {
-		width: 750rpx;
-		position: fixed;
-		left: 0;
-		bottom: 0rpx;
-	}
+.bottomBox {
+	width: 750rpx;
+	position: fixed;
+	left: 0;
+	bottom: 0rpx;
+}
 
-	/* 地图相关样式 */
-	.mapSection {
-		background-color: #FFFFFF;
-		margin-top: 20rpx;
-		border-radius: 16rpx;
-	}
+/* 地图相关样式 */
+.mapSection {
+	background-color: #FFFFFF;
+	margin-top: 20rpx;
+	border-radius: 16rpx;
+}
 
-	.mapTitle {
-		display: flex;
-		align-items: center;
-		margin-bottom: 20rpx;
-	}
+.mapTitle {
+	display: flex;
+	align-items: center;
+	margin-bottom: 20rpx;
+}
 
-	.mapContainer {
-		width: 100%;
-		height: 400rpx;
-		border-radius: 12rpx;
-		overflow: hidden;
-		box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.1);
-	}
+.mapContainer {
+	width: 100%;
+	height: 400rpx;
+	border-radius: 12rpx;
+	overflow: hidden;
+	box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.1);
+}
 
-	.map {
-		width: 100%;
-		height: 100%;
-	}
+.map {
+	width: 100%;
+	height: 100%;
+}
 </style>
\ No newline at end of file
diff --git a/pages/train/detail.vue b/pages/train/detail.vue
new file mode 100644
index 0000000..51b390a
--- /dev/null
+++ b/pages/train/detail.vue
@@ -0,0 +1,136 @@
+<template>
+	<view style="padding: 30rpx; background-color: #FAFAFA; min-height: 100vh;">
+		<view style="display: flex;align-items: center;">
+			<view @click="show = true"
+				style="display: flex;align-items: center; border: 2rpx solid #1A73E8; border-radius: 32rpx; padding: 8rpx 24rpx; color: #1A73E8; background: #fff; font-weight: 500; box-shadow: 0 2rpx 8rpx rgba(26,115,232,0.08); cursor: pointer; transition: background 0.2s;">
+				<view style="margin-right: 8rpx;">更多题库</view>
+				<view>
+					<text class="tn-icon-down-triangle"
+						style="font-size: 24rpx; color: #1A73E8; position: relative;"></text>
+				</view>
+			</view>
+			<view style="display: inline-block; position: relative;padding-left: 30rpx;font-size: 32rpx;font-weight: bold;">
+				<text>{{ info.text }}</text>
+			</view>
+		</view>
+		<view style="padding: 20rpx 0px;margin-top: 30rpx;">
+			<view v-for="item in info.children" style="margin-bottom: 40rpx;">
+				<view @click="goTrain(item.value, item.text, item.type)"
+					style="display: flex;justify-content: space-between;align-items: center; background: #fff; border-radius: 16rpx; box-shadow: 0 4rpx 16rpx rgba(26,115,232,0.06); padding: 30rpx;">
+					<view style="display: flex;align-items: center;">
+						<view
+							style="height: 40rpx;width: 40rpx;background-color: #1A73E8;border-radius: 50%; display: flex; align-items: center; justify-content: center; color: #fff; font-size: 24rpx; font-weight: bold;">
+							题
+						</view>
+						<view style="padding-left: 32rpx;">
+							<view style="font-size: 32rpx; font-weight: bold; color: #222;">{{ item.text }}</view>
+							<view style="color: #999999;font-size: 24rpx;padding-top: 8rpx;">题目数量：{{ item.count }}道
+							</view>
+						</view>
+					</view>
+					<!-- 1会员 2不是会员 -->
+					<view v-if="item.type == 2"
+						style="background: #1A73E8; color: #fff; border-radius: 24rpx; padding: 4rpx 28rpx; font-size: 26rpx; font-weight: 500; letter-spacing: 2rpx;">
+						免费</view>
+					<view v-else
+						style="background: #f39c12; color: #fff; border-radius: 24rpx; padding: 4rpx 28rpx; font-size: 26rpx; font-weight: 500; letter-spacing: 2rpx;">
+						会员</view>
+				</view>
+			</view>
+		</view>
+		<tn-popup v-model="show" mode="left" width="550rpx"
+			:style="'border-radius:32rpx 0 0 32rpx; box-shadow: 0 8rpx 32rpx rgba(26,115,232,0.12); overflow: hidden;'">
+			<view style="padding: 30rpx;">
+				<view v-for="item in cateList" @click="getTree(item)"
+					style="margin-bottom: 40rpx;padding:25rpx 20rpx;text-align: center;background-color: #F3F5F7;border-radius: 60rpx; font-size: 28rpx; color: #1A73E8;">
+					{{ item.text }}</view>
+			</view>
+		</tn-popup>
+	</view>
+</template>
+
+<script>
+import newsApi from "@/common/api/news.js"
+export default {
+	data() {
+		return {
+			show: false,
+			id: 0,
+			cateList: [],
+			info: {},
+			vip: 0,
+		}
+	},
+	onLoad(op) {
+		console.log(op);
+		this.id = op.id;
+		this.getCate();
+		this.getIsUser();
+	},
+	methods: {
+		getTree(item) {
+			this.info = item;
+			this.show = false;
+		},
+		getIsUser() {
+			newsApi.ifUserMember(this, {}).then(res => {
+				//0 不是会员  
+				console.log(res);
+				this.vip = res.code;
+			})
+		},
+		getCate() {
+			this.http('cate/getThree', {
+				kind: 'QUESTION',
+			}).then(res => {
+				this.cateList = res.data;
+				this.info = res.data.find(item => item.value == this.id);
+			})
+		},
+		goTrain(id, name, type) {
+			if (type == 1 && this.vip == 0) {
+				uni.showModal({
+					title: '提示',
+					content: '该题库仅限会员可用，请联系客服开通会员！',
+					confirmText: '联系客服',
+					success: (res) => {
+						if (res.confirm) {
+							uni.makePhoneCall({
+								phoneNumber: '18903795988' //仅为示例
+							});
+						}
+					}
+				});
+				return;
+			}
+			this.utils.goto('train?cateId=' + id + '&cateName=' + name + '&mode=normal')
+		}
+	}
+}
+</script>
+
+<style>
+page {
+	background-color: #FAFAFA;
+}
+
+/* 统一字体和颜色 */
+body,
+view,
+text {
+	font-family: 'PingFang SC', 'Microsoft YaHei', Arial, sans-serif;
+	color: #222;
+}
+
+/* 主题色变量可用于后续扩展 */
+:root {
+	--theme-color: #1A73E8;
+}
+
+/* 适当增加全局间距 */
+view {
+	box-sizing: border-box;
+}
+
+/* 注释：如需进一步美化可在此扩展 */
+</style>
diff --git a/pages/train/index.vue b/pages/train/index.vue
index 83601ae..c7a6002 100644
--- a/pages/train/index.vue
+++ b/pages/train/index.vue
@@ -3,8 +3,8 @@
 		<!-- <view class="card-view">
 			<image :src="bannerImage" mode="aspectFill" style="width: 100%; height: 200rpx;"></image>
 		</view> -->
-		<view style="height:99vh">
-			<view class="card-view" style="height: 85%;">
+		<view>
+			<view>
 				<!-- <tui-divider width="80%" gradual>选择要练习的题目类型</tui-divider>
 				<view class="margin">
 					<tn-radio-group activeColor="#1A73E8" v-model="mode">
@@ -19,14 +19,35 @@
 					<view v-if="mode == 'memory'">* 按顺序出题，记忆当前做题题标，下次进入直接跳至题标</view>
 					<view v-if="mode == 'random'">* 随机出题，不记忆当前做题题标</view>
 				</view> -->
-			
-				<tui-cascade-selection height="75vh" :itemList="cateList" @complete="complete" text="请选择题库"
+
+				<!-- <tui-cascade-selection height="75vh" :itemList="cateList" @complete="complete" text="请选择题库"
 					:defaultItemList="defaultCateList"></tui-cascade-selection>
 			</view>
 			
 			<view style="width:90%; margin: 10rpx auto;" class="padding-bottom-xl">
 				<tui-button shape="circle" shadow bold preventClick :disabled="questionCount == 0"
 					@click="checkPay">{{btnText}}</tui-button>
+			</view> -->
+
+				<view class="tn-margin-top-sm">
+					<view class="tn-flex tn-flex-wrap tn-margin-sm">
+						<block v-for="(item, index) in cateList" :key="index">
+							<view style="width: 50%">
+								<view class="question-bank-card tn-margin-xs"
+									@click="checkPay(item.value)">
+									<view class="question-bank-image-wrapper">
+										<image class="question-bank-image" :src="imgUrl + item.image" mode="aspectFill">
+										</image>
+									</view>
+									<view class="question-bank-title">
+										{{ item.text }}
+									</view>
+								</view>
+							</view>
+						</block>
+					</view>
+				</view>
+
 			</view>
 		</view>
 
@@ -42,130 +63,58 @@
 </template>
 
 <script>
-	import cateApi from "@/common/api/cate.js"
-	export default {
-		data() {
-			return {
-				page: '',
-				cateList: [],
-				cateId: 0,
-				cateName: '',
-				questionCount: 0,
-				btnText: '开始练习',
-				mode: 'normal',
-				defaultCateList: [],
+import cateApi from "@/common/api/cate.js"
+export default {
+	data() {
+		return {
+			// 图片域名
+			imgUrl: this.imgUrl,
+			page: '',
+			cateList: [],
+			cateId: 0,
+			cateName: '',
+			questionCount: 0,
+			btnText: '开始练习',
+			mode: 'normal',
+			defaultCateList: [],
 
-				// 题库支付弹窗相关
-				catePrice: 0.00,
-				showCateConfirm: false,
-				confirmCateContent: '',
-				
-				subjectId: 0,
-				
-				bannerImage: '',
+			// 题库支付弹窗相关
+			catePrice: 0.00,
+			showCateConfirm: false,
+			confirmCateContent: '',
+
+			subjectId: 0,
+
+			bannerImage: '',
+		}
+	},
+	onLoad(e) {
+		this.page = e?.page
+		this.getPageCache()
+		this.subjectId = this.utils.getSubjectId()
+		this.getCate()
+	},
+	methods: {
+		// 获取缓存
+		getPageCache() {
+			let cdn_url = this.utils.getData('cdn_url')
+			cdn_url = cdn_url ? cdn_url : ''
+
+			let pageCache = this.utils.getData('page')
+			console.log('pageCache', pageCache)
+			if (pageCache && pageCache.cate_banner_image) {
+				this.bannerImage = cdn_url + pageCache.cate_banner_image
+				console.log('this.bannerImage', this.bannerImage)
 			}
 		},
-		onLoad(e) {
-			this.page = e?.page
-			this.getPageCache()
-			this.subjectId = this.utils.getSubjectId()
-			this.getCate()
-		},
-		methods: {
-			// 获取缓存
-			getPageCache() {
-				let cdn_url = this.utils.getData('cdn_url')
-				cdn_url = cdn_url ? cdn_url : ''
-				
-				let pageCache = this.utils.getData('page')
-				console.log('pageCache', pageCache)
-				if (pageCache && pageCache.cate_banner_image) {
-					this.bannerImage = cdn_url + pageCache.cate_banner_image
-					console.log('this.bannerImage', this.bannerImage)
-				}
-			},
-			// 获取题库
-			getCate() {
-				this.http('cate/getThree', {
-					kind: 'QUESTION',
-					page: this.page,
-					subject_id: this.subjectId
-				}).then(res => {
-					this.cateList = res.data
-
-					// 模拟题库点击事件
-					if (this.cateId) {
-						this.complete({
-							value: this.cateId,
-							result: [{
-								text: this.cateName
-							}]
-						})
-					} else {
-						let defaultCate = this.utils.getData('default_cate-QUESTION')
-						console.log('defaultCate', defaultCate)
-						if (defaultCate) {
-							let lastCate = [...defaultCate.result].pop()
-							console.log('lastCate', lastCate)
-							
-							let hasCate = false
-							for (let j = 0; j < this.cateList.length; j++) {
-								let cate = this.cateList[j]
-								if (hasCate || cate.value == lastCate.value) {
-									hasCate = true
-									break
-								}
-								
-								if (cate.children && cate.children.length > 0) {
-									for (let k = 0; k < cate.children.length; k++) {
-										let child_cate = cate.children[k]
-										if (child_cate.value == lastCate.value) {
-											hasCate = true
-											break
-										}
-									}
-								}
-							}
-
-							if (hasCate) {
-								let defaultCateList = []
-								for (let i = 0; i < defaultCate.result.length; i++) {
-									defaultCateList.push(defaultCate.result[i].text)
-								}
-								this.defaultCateList = defaultCateList
-								
-								this.cateId = lastCate.value
-								this.cateName = lastCate.text
-								
-								this.complete({
-									value: this.cateId,
-									result: [{
-										text: this.cateName
-									}]
-								})
-							}
-						}
-
-						// let user = this.utils.getData('user')
-						// if (user?.info && user.info?.default_cate_ids) {
-						// 	this.defaultCateList = [...user.info.default_cate_names]
-
-						// 	this.cateId = [...user.info.default_cate_ids].pop()
-						// 	this.cateName = [...user.info.default_cate_names].pop()
-
-						// 	this.complete({
-						// 		value: this.cateId,
-						// 		result: [
-						// 			{
-						// 				text: this.cateName
-						// 			}
-						// 		]
-						// 	})
-						// }
-					}
-
-					// this.defaultCateList = ["消防","灭火救援常识",]
-				})
+		// 获取题库
+		getCate() {
+			this.http('cate/getThree', {
+				kind: 'QUESTION',
+				page: this.page,
+				subject_id: this.subjectId
+			}).then(res => {
+				this.cateList = res.data
 
 				// 模拟题库点击事件
 				if (this.cateId) {
@@ -175,105 +124,216 @@
 							text: this.cateName
 						}]
 					})
-				}
-			},
-			// 选择题库
-			complete(e) {
-				console.log(e);
-				console.log('您选择的数据为：', e);
+				} else {
+					let defaultCate = this.utils.getData('default_cate-QUESTION')
+					console.log('defaultCate', defaultCate)
+					if (defaultCate) {
+						let lastCate = [...defaultCate.result].pop()
+						console.log('lastCate', lastCate)
 
-				this.cateId = e.value
-				this.cateName = e.result[e.result.length - 1].text
+						let hasCate = false
+						for (let j = 0; j < this.cateList.length; j++) {
+							let cate = this.cateList[j]
+							if (hasCate || cate.value == lastCate.value) {
+								hasCate = true
+								break
+							}
 
-				let params = {
-					cate_id: this.cateId,
-					just_get_count: 1,
-				}
-
-				this.$refs.login.afterMethod = () => {
-					this.complete(e)
-				}
-				console.log('afterMethod', this.$refs.login.afterMethod)
-				this.http('question/train', params).then(res => {
-					if (res.code == 1) {
-						this.questionCount = res.data.total
-						if (this.questionCount) {
-							this.btnText = '开始练习'
-						} else {
-							this.btnText = '当前分类无试题'
-						}
-					} else {
-						this.utils.toast(res.msg)
-					}
-				})
-
-			},
-			// 检测题库是否已开通
-			checkPay() {
-				if (!this.cateId) {
-					this.utils.toast('请先选择练习的题库')
-					return
-				}
-
-				// 检测题库是否已开通
-				cateApi.checkPay(this, this.cateId).then(res => {
-					console.log('checkPay res', res)
-
-					if (res.code != 1) {
-						// this.utils.toast(res.msg)
-						// if (res.data.need_open_member) {
-						// 	this.utils.goto('/pages/user/member-center')
-						// }
-						uni.showModal({
-							title: '提示',
-							content: res.msg,
-							confirmText: '联系客服',
-							success: (res) => {
-								if (res.confirm) {
-									//this.utils.goto('/pages/user/member-center?from_train=1')
-									uni.makePhoneCall({
-										phoneNumber: '18903795988' //仅为示例
-									});
-								} else if (res.cancel) {
-									this.utils.goback()
+							if (cate.children && cate.children.length > 0) {
+								for (let k = 0; k < cate.children.length; k++) {
+									let child_cate = cate.children[k]
+									if (child_cate.value == lastCate.value) {
+										hasCate = true
+										break
+									}
 								}
 							}
-						});
-						return
+						}
+
+						if (hasCate) {
+							let defaultCateList = []
+							for (let i = 0; i < defaultCate.result.length; i++) {
+								defaultCateList.push(defaultCate.result[i].text)
+							}
+							this.defaultCateList = defaultCateList
+
+							this.cateId = lastCate.value
+							this.cateName = lastCate.text
+
+							this.complete({
+								value: this.cateId,
+								result: [{
+									text: this.cateName
+								}]
+							})
+						}
 					}
 
-					// 无须支付
-					if (res.data.status == 1) {
-						this.goTrain()
-						return
-					} else if (res.data.status == 2) {
-						this.catePrice = parseFloat(res.data.price)
-						this.confirmCateContent = res.data.msg
-						this.showCateConfirm = true
-					}
+					// let user = this.utils.getData('user')
+					// if (user?.info && user.info?.default_cate_ids) {
+					// 	this.defaultCateList = [...user.info.default_cate_names]
+
+					// 	this.cateId = [...user.info.default_cate_ids].pop()
+					// 	this.cateName = [...user.info.default_cate_names].pop()
+
+					// 	this.complete({
+					// 		value: this.cateId,
+					// 		result: [
+					// 			{
+					// 				text: this.cateName
+					// 			}
+					// 		]
+					// 	})
+					// }
+				}
+
+				// this.defaultCateList = ["消防","灭火救援常识",]
+			})
+
+			// 模拟题库点击事件
+			if (this.cateId) {
+				this.complete({
+					value: this.cateId,
+					result: [{
+						text: this.cateName
+					}]
 				})
-			},
-			// 开始练习
-			goTrain() {
-				this.showCateConfirm = false
-				this.showResult = false
-				this.confirmCateContent = ''
-				this.payResultContent = ''
-
-				this.page = this.page == 'train' ? 'train' : 'look'
-				this.utils.goto(this.page + '?cateId=' + this.cateId + '&cateName=' + this.cateName + '&mode=' + this.mode)
-			},
-			closeDialog() {
-				console.log('get emit closeDialog')
-				this.showCateConfirm = false
 			}
+		},
+		// 选择题库
+		complete(e) {
+			console.log(e);
+			console.log('您选择的数据为：', e);
+
+			this.cateId = e.value
+			this.cateName = e.result[e.result.length - 1].text
+
+			let params = {
+				cate_id: this.cateId,
+				just_get_count: 1,
+			}
+
+			this.$refs.login.afterMethod = () => {
+				this.complete(e)
+			}
+			console.log('afterMethod', this.$refs.login.afterMethod)
+			this.http('question/train', params).then(res => {
+				if (res.code == 1) {
+					this.questionCount = res.data.total
+					if (this.questionCount) {
+						this.btnText = '开始练习' 
+					} else {
+						this.btnText = '当前分类无试题'
+					}
+				} else {
+					this.utils.toast(res.msg)
+				}
+			})
+
+		},
+		// 检测题库是否已开通
+		checkPay(cateId) {
+			// if (!this.cateId) {
+			// 	this.utils.toast('请先选择练习的题库')
+			// 	return
+			// }
+
+			// 检测题库是否已开通
+			cateApi.checkPay(this, cateId).then(res => {
+				console.log('checkPay res', res)
+
+				if (res.code != 1) {
+					// this.utils.toast(res.msg)
+					// if (res.data.need_open_member) {
+					// 	this.utils.goto('/pages/user/member-center')
+					// }
+					uni.showModal({
+						title: '提示',
+						content: res.msg,
+						confirmText: '联系客服',
+						success: (res) => {
+							if (res.confirm) {
+								//this.utils.goto('/pages/user/member-center?from_train=1')
+								uni.makePhoneCall({
+									phoneNumber: '18903795988' //仅为示例
+								});
+							} else if (res.cancel) {
+								this.utils.goback()
+							}
+						}
+					});
+					return
+				}
+				if (res.data.status == 1) {
+					this.utils.goto('/pages/train/detail?id=' + cateId);
+					return
+				} 
+				// 无须支付
+				// if (res.data.status == 1) {
+				// 	this.goTrain()
+				// 	return
+				// } else if (res.data.status == 2) {
+				// 	this.catePrice = parseFloat(res.data.price)
+				// 	this.confirmCateContent = res.data.msg
+				// 	this.showCateConfirm = true
+				// }
+			})
+		},
+		// 开始练习
+		goTrain() {
+			this.showCateConfirm = false
+			this.showResult = false
+			this.confirmCateContent = ''
+			this.payResultContent = ''
+
+			this.page = this.page == 'train' ? 'train' : 'look'
+			this.utils.goto(this.page + '?cateId=' + this.cateId + '&cateName=' + this.cateName + '&mode=' + this.mode)
+		},
+		closeDialog() {
+			console.log('get emit closeDialog')
+			this.showCateConfirm = false
 		}
 	}
+}
 </script>
 
 <style>
-	.tn-radio__label {
-		color: #333 !important;
-		font-size: 15px !important;
+page {
+		background-color: #fff;
 	}
+
+.tn-radio__label {
+	color: #333 !important;
+	font-size: 15px !important;
+}
+/* 题库卡片样式 start */
+.question-bank-card {
+		background-color: #ffffff;
+		border-radius: 15rpx;
+	}
+
+	.question-bank-card:active {
+		transform: scale(0.98);
+	}
+
+	.question-bank-image-wrapper {
+		width: 100%;
+		height: 200rpx;
+		overflow: hidden;
+		border-radius: 15rpx;
+	}
+
+	.question-bank-image {
+		width: 100%;
+		height: 100%;
+		object-fit: cover;
+	}
+
+	.question-bank-title {
+		padding: 15rpx;
+		font-size: 32rpx;
+		color: #333333;
+		display: flex;
+	}
+	/* 题库卡片样式 end */
 </style>
\ No newline at end of file
diff --git a/pages/train/train.vue b/pages/train/train.vue
index 1696cb4..867613d 100644
--- a/pages/train/train.vue
+++ b/pages/train/train.vue
@@ -6,6 +6,7 @@
 
     <!-- toast提示 -->
     <tui-toast ref="toast"></tui-toast>
+    <login ref="login" v-on:succ="ajax"></login>
   </view>
 </template>
 
@@ -30,6 +31,9 @@ export default {
     this.getQuestion()
   },
   methods: {
+    ajax(){
+      this.getQuestion()
+    },
     // 获取试题（包括延迟获取）
     getQuestion (page = 1, callback = null) {
       console.log('getQuestion', page, this.currentPage, this.lastPage)
diff --git a/pagesSubject/sign_up.vue b/pagesSubject/sign_up.vue
new file mode 100644
index 0000000..5711f7f
--- /dev/null
+++ b/pagesSubject/sign_up.vue
@@ -0,0 +1,953 @@
+<template>
+	<view class="container">
+		<view class="form-container">
+			<tn-form ref="form" :model="form" :errorType="errorType" :labelPosition="labelPosition"
+				:labelWidth="labelWidth" :labelAlign="labelAlign" :borderBottom="false">
+				<!-- 姓名 -->
+				<tn-form-item label="姓名" prop="name" class="form-item-vertical" required>
+					<tn-input v-model="form.name" type="text" placeholder="请输入姓名" :border="false"
+						:placeholderStyle="placeholderStyle" />
+				</tn-form-item>
+
+				<!-- 性别 -->
+				<tn-form-item label="性别" prop="sex" class="form-item-vertical" required>
+					<tn-radio-group activeColor="#1A73E8" :size="43" v-model="form.sex" direction="row">
+						<tn-radio name="男" style="margin-right: 40rpx;">男</tn-radio>
+						<tn-radio name="女">女</tn-radio>
+					</tn-radio-group>
+				</tn-form-item>
+
+				<!-- 身份证号 -->
+				<tn-form-item label="身份证号" prop="code" class="form-item-vertical" required>
+					<tn-input v-model="form.code" type="text" placeholder="请输入身份证号" :border="false"
+						:placeholderStyle="placeholderStyle" maxlength="18" />
+				</tn-form-item>
+
+				<!-- 出生日期 -->
+				<tn-form-item label="出生日期" prop="userymd" class="form-item-vertical" required @click="showDatePicker">
+					<view class="date-picker-wrapper" @click="showDatePicker">
+						<tn-input @click="showDatePicker" v-model="form.userymd" type="text" placeholder="请选择出生日期"
+							:border="false" :placeholderStyle="placeholderStyle" :disabled="true" />
+						<view class="picker-icon">
+							<text class="tn-icon-calendar"></text>
+						</view>
+					</view>
+				</tn-form-item>
+				<!-- 联系电话 -->
+				<tn-form-item label="手机号码" prop="phone" class="form-item-vertical" required>
+					<tn-input v-model="form.phone" type="number" placeholder="请输入手机号码" :border="false"
+						:placeholderStyle="placeholderStyle" maxlength="11" @blur="validatePhone" />
+				</tn-form-item>
+
+				<!-- 上传蓝底电子版照片 -->
+				<tn-form-item label="蓝底电子版照片" prop="oneimage" class="form-item-vertical" required>
+					<view class="upload-new-wrapper">
+						<view class="upload-status">
+							<view class="upload-status-text">
+								<text v-if="form.imageFile">文件选择成功，</text>
+								<text v-if="form.imageFile" class="preview-link" @click="previewImage">点击预览</text>
+								<text v-if="!form.imageFile">请选择图片文件</text>
+							</view>
+							<text style="color: #E5E5E5;">|</text>
+							<view class="upload-btn" @click="chooseImage">
+								<text class="upload-btn-text">{{ form.imageFile ? '重新选择' : '选择文件' }}</text>
+							</view>
+						</view>
+					</view>
+				</tn-form-item>
+
+				<!-- 报考科目 -->
+				<tn-form-item label="报考科目" prop="kemu" class="form-item-vertical" required>
+					<view class="subject-tags">
+						<view v-for="subject in subjectOptions" :key="subject.value" class="subject-tag"
+							:class="{ 'subject-tag--selected': form.kemu.includes(subject.value) }"
+							@click="toggleSubject(subject.value)">
+							<text>{{ subject.label }}</text>
+							<view v-if="form.kemu.includes(subject.value)" class="subject-tag__check">
+								<text class="tn-icon-success"></text>
+							</view>
+						</view>
+					</view>
+				</tn-form-item>
+
+				<!-- 报考级别 -->
+				<tn-form-item label="报考级别" prop="jibie" class="form-item-vertical" required>
+					<tn-radio-group activeColor="#1A73E8" :size="43" v-model="form.jibie" direction="row">
+						<tn-radio v-for="level in levelOptions" :key="level.value" :name="level.value"
+							style="margin-right: 40rpx;">
+							{{ level.label }}
+						</tn-radio>
+					</tn-radio-group>
+				</tn-form-item>
+
+				<!-- 报考类型 -->
+				<tn-form-item label="报考类型" prop="type" class="form-item-vertical" required>
+					<view class="exam-type-tags">
+						<view v-for="type in examTypeOptions" :key="type.value" class="exam-type-tag"
+							:class="{ 'exam-type-tag--selected': form.type.includes(type.value) }"
+							@click="toggleExamType(type.value)">
+							<text>{{ type.label }}</text>
+							<view v-if="form.type.includes(type.value)" class="exam-type-tag__check">
+								<text class="tn-icon-success"></text>
+							</view>
+						</view>
+					</view>
+				</tn-form-item>
+
+				<!-- 毕业学校 -->
+				<tn-form-item label="毕业学校" prop="by_school" class="form-item-vertical" required>
+					<tn-input v-model="form.by_school" type="text" placeholder="请输入毕业学校" :border="false"
+						:placeholderStyle="placeholderStyle" />
+				</tn-form-item>
+
+				<!-- 毕业专业 -->
+				<tn-form-item label="毕业专业" prop="by_zy" class="form-item-vertical" required>
+					<tn-input v-model="form.by_zy" type="text" placeholder="请输入毕业专业" :border="false"
+						:placeholderStyle="placeholderStyle" />
+				</tn-form-item>
+
+				<!-- 最高学历 -->
+				<tn-form-item label="最高学历" prop="zgxl" class="form-item-vertical" required>
+					<tn-radio-group activeColor="#1A73E8" :size="43" v-model="form.zgxl" direction="row">
+						<tn-radio v-for="edu in educationOptions" :key="edu.value" :name="edu.value">{{ edu.label
+						}}</tn-radio>
+					</tn-radio-group>
+				</tn-form-item>
+
+				<!-- 工作单位 -->
+				<tn-form-item label="工作单位" prop="danwei" class="form-item-vertical" required>
+					<tn-input v-model="form.danwei" type="text" placeholder="请输入工作单位" :border="false"
+						:placeholderStyle="placeholderStyle" />
+				</tn-form-item>
+
+				<!-- 累计从事本职业时间 -->
+				<tn-form-item label="累计从事本职业时间" prop="leijishijian" class="form-item-vertical" required>
+					<tn-input v-model="form.leijishijian" type="text" placeholder="请输入累计从事本职业时间" :border="false"
+						:placeholderStyle="placeholderStyle" />
+				</tn-form-item>
+
+				<!-- 培训基地 -->
+				<tn-form-item label="培训基地" prop="pxjd" class="form-item-vertical" required>
+					<tn-input v-model="form.pxjd" type="text" placeholder="请输入培训基地" :border="false"
+						:placeholderStyle="placeholderStyle" />
+				</tn-form-item>
+			</tn-form>
+
+			<!-- 提交按钮 -->
+			<view class="submit-section">
+
+				<tn-button fontColor="#ffffff" type="primary" width="100%" height="88rpx" @click="submitForm"
+					:loading="submitting" backgroundColor="#1A73E8">
+					马上提交
+				</tn-button>
+			</view>
+			<!-- 用户协议同意 -->
+			<view class="agreement-section">
+				<view>
+					<tn-checkbox-group activeColor="#1A73E8" :size="43" v-model="agreementChecked">
+						<tn-checkbox name="agree" class="agreement-checkbox"></tn-checkbox>
+					</tn-checkbox-group>
+				</view>
+				<view class="agreement-content">
+					<text class="agreement-text">我已阅读并同意</text>
+					<text class="agreement-link" @click="openUserAgreement">《用户服务协议》</text>
+					<text class="agreement-text">和</text>
+					<text class="agreement-link" @click="openPrivacyPolicy">《隐私政策》</text>
+				</view>
+			</view>
+
+		</view>
+
+		<!-- 日期选择器 -->
+		<tn-picker v-model="datePickerShow" mode="time" :params="dateParams" @confirm="onDateConfirm"
+			@cancel="datePickerShow = false"></tn-picker>
+			<login ref="login" v-on:succ="ajax()"></login>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			TimeShow: false,
+			// 表单数据
+			form: {
+				name: '',           // 姓名
+				sex: '',            // 性别
+				code: '',           // 身份证号
+				userymd: '',        // 出生日期
+				phone: '',          // 联系电话
+				oneimage: '',       // 电子照片URL（用于显示）
+				imageFile: null,    // 电子照片文件（用于提交）
+				kemu: [],           // 报考科目
+				jibie: '',          // 报考级别
+				type: [],           // 报考类型
+				by_school: '',      // 毕业学校
+				by_zy: '',          // 毕业专业
+				zgxl: '',           // 最高学历
+				danwei: '',         // 工作单位
+				leijishijian: '',   // 累计从事本职业时间
+				pxjd: ''            // 培训基地
+			},
+
+			// 表单配置
+			errorType: ['toast'],
+			labelPosition: 'top',
+			labelWidth: 120,
+			labelAlign: 'left',
+			placeholderStyle: 'color: #999; font-size: 28rpx;',
+			// 日期选择器
+			datePickerShow: false,
+			dateParams: {
+				year: true,
+				month: true,
+				day: true,
+				hour: false,
+				minute: false,
+				second: false
+			},
+
+			// 提交状态
+			submitting: false,
+
+			// 用户协议同意状态
+			agreementChecked: [],
+
+			// 选项数据
+			subjectOptions: [
+				{ label: '游泳救生员', value: '游泳救生员' },
+				{ label: '游泳社会体育指导员', value: '游泳社会体育指导员' },
+				{ label: '健身教练', value: '健身教练' },
+				{ label: '水质管理员', value: '水质管理员' },
+				{ label: '潜水', value: '潜水' },
+				{ label: '滑雪', value: '滑雪' },
+				{ label: '少儿体适能', value: '少儿体适能' }
+			],
+
+			levelOptions: [
+				{ label: '初级（五级）', value: '初级（五级）' },
+				{ label: '中级（四级）', value: '中级（四级）' },
+				{ label: '高级（三级）', value: '高级（三级）' }
+			],
+
+			examTypeOptions: [
+				{ label: '正常', value: '正常' },
+				{ label: '补考理论', value: '补考理论' },
+				{ label: '补考实操', value: '补考实操' },
+				{ label: '补考双项', value: '补考双项' }
+			],
+
+			educationOptions: [
+				{ label: '博士', value: '博士' },
+				{ label: '硕士', value: '硕士' },
+				{ label: '大学', value: '大学' },
+				{ label: '大专', value: '大专' },
+				{ label: '高中、高职、中专', value: '高中、高职、中专' },
+				{ label: '初中', value: '初中' },
+				{ label: '小学', value: '小学' }
+			]
+		}
+	},
+	onLoad(){
+		//console.log(this.utils.apiUrlReturn());
+	},
+	methods: {
+		// 显示日期选择器
+		showDatePicker() {
+			this.datePickerShow = true
+		},
+
+		// 日期选择确认
+		onDateConfirm(e) {
+			this.form.userymd = e.year + '/' + e.month + '/' + e.day;
+			this.datePickerShow = false
+		},
+
+		// 选择图片
+		chooseImage() {
+			console.log(123);
+			uni.chooseImage({
+				count: 1,
+				sizeType: ['compressed'],
+				sourceType: ['album', 'camera'],
+				success: (res) => {
+					const tempFilePath = res.tempFilePaths[0]
+					// 保存文件路径用于后续提交
+					this.form.imageFile = tempFilePath
+					// 设置显示用的URL
+					this.form.oneimage = tempFilePath
+
+					uni.showToast({
+						title: '图片选择成功',
+						icon: 'success'
+					})
+				},
+				fail: (res) => {
+					console.log(res);
+					uni.showToast({
+						title: '选择图片失败',
+						icon: 'none'
+					})
+				}
+			})
+		},
+
+		// 预览图片
+		previewImage() {
+			if (this.form.oneimage) {
+				uni.previewImage({
+					urls: [this.form.oneimage],
+					current: this.form.oneimage
+				})
+			}
+		},
+
+
+
+		// 提交表单
+		submitForm() {
+			// 检查是否同意用户协议
+			if (!this.agreementChecked.includes('agree')) {
+				uni.showToast({
+					title: '请先同意用户服务协议和隐私政策',
+					icon: 'none'
+				})
+				return
+			}
+
+			// 验证表单字段
+			if (!this.validateForm()) {
+				return
+			}
+
+			this.submitting = true
+
+			// 准备提交数据
+			const formData = {
+				name: this.form.name,
+				sex: this.form.sex,
+				code: this.form.code,
+				userymd: this.form.userymd,
+				phone: this.form.phone,
+				kemu: this.form.kemu.join(','), // 数组转字符串
+				jibie: this.form.jibie,
+				type: this.form.type.join(','), // 数组转字符串
+				by_school: this.form.by_school,
+				by_zy: this.form.by_zy,
+				zgxl: this.form.zgxl,
+				danwei: this.form.danwei,
+				leijishijian: this.form.leijishijian,
+				pxjd: this.form.pxjd
+			}
+
+			// 使用uni.uploadFile提交表单和文件
+			uni.uploadFile({
+				url: this.utils.apiUrlReturn() + '/addons/exam/gzinfo/add', // 替换为您的提交接口
+				filePath: this.form.imageFile,
+				name: 'oneimage', // 文件字段名
+				formData: formData, // 其他表单数据
+				header: {
+					'token': uni.getStorageSync('token')
+				},
+				success: (res) => {
+					this.submitting = false;
+					console.log(res);
+					const data = JSON.parse(res.data)
+					if(data.code===401){
+						uni.showToast({
+							title: '请登录后提交！',
+							icon: 'none'
+						})
+						this.$refs.login.modal = true;
+						return;
+					}
+					if (res.statusCode === 200 && data.code === 1) {
+						uni.showToast({
+							title: '提交成功',
+							icon: 'success'
+						})
+						// 提交成功后清空表单
+						this.resetForm()
+					} else {
+						uni.showToast({
+							title: data.message || '提交失败',
+							icon: 'none'
+						})
+					}
+				},
+				fail: (error) => {
+					this.submitting = false
+					uni.showToast({
+						title: '提交失败',
+						icon: 'none'
+					})
+					console.error('提交错误:', error)
+				}
+			})
+		},
+
+		//判断表单字段
+		validateForm() {
+				// 判断姓名
+				if (!this.form.name || this.form.name.trim() === '') {
+					uni.showToast({
+						title: '请输入姓名',
+						icon: 'none'
+					})
+					return false
+				}
+
+				// 判断性别
+				if (!this.form.sex || this.form.sex === '') {
+					uni.showToast({
+						title: '请选择性别',
+						icon: 'none'
+					})
+					return false
+				}
+
+				// 判断身份证号
+				if (!this.form.code || this.form.code.trim() === '') {
+					uni.showToast({
+						title: '请输入身份证号',
+						icon: 'none'
+					})
+					return false
+				}
+
+				// 验证身份证号格式
+				const idCardReg = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/
+				if (!idCardReg.test(this.form.code)) {
+					uni.showToast({
+						title: '身份证号格式不正确',
+						icon: 'none'
+					})
+					return false
+				}
+
+				// 判断出生日期
+				if (!this.form.userymd || this.form.userymd === '') {
+					uni.showToast({
+						title: '请选择出生日期',
+						icon: 'none'
+					})
+					return false
+				}
+
+				// 判断联系电话
+				if (!this.form.phone || this.form.phone.trim() === '') {
+					uni.showToast({
+						title: '请输入联系电话',
+						icon: 'none'
+					})
+					return false
+				}
+
+				// 验证手机号格式
+				const phone = this.form.phone.trim()
+
+				// 检查是否为11位数字
+				if (!/^\d{11}$/.test(phone)) {
+					uni.showToast({
+						title: '手机号必须为11位数字',
+						icon: 'none'
+					})
+					return false
+				}
+
+				// 检查是否以1开头
+				if (!phone.startsWith('1')) {
+					uni.showToast({
+						title: '手机号必须以1开头',
+						icon: 'none'
+					})
+					return false
+				}
+
+				// 检查第二位数字是否为3-9
+				const secondDigit = phone.charAt(1)
+				if (!/[3-9]/.test(secondDigit)) {
+					uni.showToast({
+						title: '手机号第二位必须为3-9',
+						icon: 'none'
+					})
+					return false
+				}
+
+				// 详细的运营商号段验证
+				const phoneReg = /^1(3[0-9]|4[01456879]|5[0-35-9]|6[2567]|7[0-8]|8[0-9]|9[0-35-9])\d{8}$/
+				if (!phoneReg.test(phone)) {
+					uni.showToast({
+						title: '请输入正确的手机号码',
+						icon: 'none'
+					})
+					return false
+				}
+
+				// 判断电子照片
+				if (!this.form.imageFile) {
+					uni.showToast({
+						title: '请选择蓝底电子版照片',
+						icon: 'none'
+					})
+					return false
+				}
+
+				// 判断报考科目
+				if (!this.form.kemu || this.form.kemu.length === 0) {
+					uni.showToast({
+						title: '请选择报考科目',
+						icon: 'none'
+					})
+					return false
+				}
+
+				// 判断报考级别
+				if (!this.form.jibie || this.form.jibie === '') {
+					uni.showToast({
+						title: '请选择报考级别',
+						icon: 'none'
+					})
+					return false
+				}
+
+				// 判断报考类型
+				if (!this.form.type || this.form.type.length === 0) {
+					uni.showToast({
+						title: '请选择报考类型',
+						icon: 'none'
+					})
+					return false
+				}
+
+				// 判断毕业学校
+				if (!this.form.by_school || this.form.by_school.trim() === '') {
+					uni.showToast({
+						title: '请输入毕业学校',
+						icon: 'none'
+					})
+					return false
+				}
+
+				// 判断毕业专业
+				if (!this.form.by_zy || this.form.by_zy.trim() === '') {
+					uni.showToast({
+						title: '请输入毕业专业',
+						icon: 'none'
+					})
+					return false
+				}
+
+				// 判断最高学历
+				if (!this.form.zgxl || this.form.zgxl === '') {
+					uni.showToast({
+						title: '请选择最高学历',
+						icon: 'none'
+					})
+					return false
+				}
+
+				// 判断工作单位
+				if (!this.form.danwei || this.form.danwei.trim() === '') {
+					uni.showToast({
+						title: '请输入工作单位',
+						icon: 'none'
+					})
+					return false
+				}
+
+				// 判断累计从事本职业时间
+				if (!this.form.leijishijian || this.form.leijishijian.trim() === '') {
+					uni.showToast({
+						title: '请输入累计从事本职业时间',
+						icon: 'none'
+					})
+					return false
+				}
+
+				// 判断培训基地
+				if (!this.form.pxjd || this.form.pxjd.trim() === '') {
+					uni.showToast({
+						title: '请输入培训基地',
+						icon: 'none'
+					})
+					return false
+				}
+
+				// 所有验证通过
+				return true
+		},
+
+		// 打开用户服务协议
+		openUserAgreement() {
+			// 这里可以跳转到用户服务协议页面
+			uni.showToast({
+				title: '打开用户服务协议',
+				icon: 'none'
+			})
+		},
+
+		// 打开隐私政策
+		openPrivacyPolicy() {
+			// 这里可以跳转到隐私政策页面
+			uni.showToast({
+				title: '打开隐私政策',
+				icon: 'none'
+			})
+		},
+
+		// 切换科目选择
+		toggleSubject(value) {
+			const index = this.form.kemu.indexOf(value)
+			if (index > -1) {
+				// 如果已选中，则取消选择
+				this.form.kemu.splice(index, 1)
+			} else {
+				// 如果未选中，则添加选择
+				this.form.kemu.push(value)
+			}
+		},
+
+		// 切换报考类型选择
+		toggleExamType(value) {
+			const index = this.form.type.indexOf(value)
+			if (index > -1) {
+				// 如果已选中，则取消选择
+				this.form.type.splice(index, 1)
+			} else {
+				// 如果未选中，则添加选择
+				this.form.type.push(value)
+			}
+		},
+
+		// 实时验证手机号
+		validatePhone() {
+			const phone = this.form.phone.trim()
+
+			// 如果为空，不显示错误（在提交时再验证）
+			if (!phone) {
+				return
+			}
+
+			// 长度检查
+			if (phone.length !== 11) {
+				uni.showToast({
+					title: '手机号必须为11位',
+					icon: 'none',
+					duration: 1500
+				})
+				return
+			}
+
+			// 格式检查
+			const phoneReg = /^1(3[0-9]|4[01456879]|5[0-35-9]|6[2567]|7[0-8]|8[0-9]|9[0-35-9])\d{8}$/
+			if (!phoneReg.test(phone)) {
+				uni.showToast({
+					title: '请输入正确的手机号码',
+					icon: 'none',
+					duration: 1500
+				})
+			}
+		},
+
+		// 重置表单
+		resetForm() {
+			// 清空表单数据
+			this.form = {
+				name: '',           // 姓名
+				sex: '',            // 性别
+				code: '',           // 身份证号
+				userymd: '',        // 出生日期
+				phone: '',          // 联系电话
+				oneimage: '',       // 电子照片URL（用于显示）
+				imageFile: null,    // 电子照片文件（用于提交）
+				kemu: [],           // 报考科目
+				jibie: '',          // 报考级别
+				type: [],           // 报考类型
+				by_school: '',      // 毕业学校
+				by_zy: '',          // 毕业专业
+				zgxl: '',           // 最高学历
+				danwei: '',         // 工作单位
+				leijishijian: '',   // 累计从事本职业时间
+				pxjd: ''            // 培训基地
+			}
+
+			// 清空用户协议选择
+			this.agreementChecked = []
+
+			// 清空日期选择器状态
+			this.datePickerShow = false
+
+			uni.showToast({
+				title: '表单已重置',
+				icon: 'success',
+				duration: 1500
+			})
+		}
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+.container {
+	min-height: 100vh;
+	background-color: #f8f8f8;
+	padding: 20rpx;
+}
+
+.form-container {
+	background-color: #ffffff;
+	border-radius: 20rpx;
+	padding: 0rpx 40rpx;
+	padding-bottom: 50rpx;
+}
+
+// 垂直布局的表单项
+.form-item-vertical {
+	/deep/ .tn-form-item__body {
+		flex-direction: column;
+		align-items: flex-start;
+	}
+
+	/deep/ .tn-form-item__label {
+		margin-bottom: 20rpx;
+		font-weight: bold;
+		color: #333;
+		position: relative;
+	}
+
+	// 将必填*号放在文字左侧
+	/deep/ .tn-form-item--left__content--required {
+		position: absolute;
+		left: -20rpx;
+		top: 50%;
+		transform: translateY(-50%);
+		color: #ff0000 !important;
+		order: -1;
+	}
+
+	/deep/ .tn-form-item--left__content {
+		position: relative;
+	}
+
+	/deep/ .tn-form-item__content {
+		width: 100%;
+	}
+
+	// 去掉下划线
+	/deep/ .tn-form-item {
+		border-bottom: none !important;
+	}
+
+	/deep/ .tn-form-item::after {
+		display: none !important;
+	}
+
+	// 确保所有输入框宽度为100%
+	/deep/ .tn-input {
+		width: 640rpx;
+		background-color: #F7F7F7 !important;
+		border: none !important;
+		padding: 20rpx;
+		height: 100rpx;
+	}
+
+	/deep/ .tn-input__input {
+		width: 100%;
+		background-color: #F7F7F7 !important;
+		border: none !important;
+		padding: 20rpx;
+		height: 100rpx;
+	}
+
+	/deep/ .tn-input__wrap {
+		background-color: #F7F7F7 !important;
+		border: none !important;
+	}
+}
+
+// 日期选择器样式
+.date-picker-wrapper {
+	position: relative;
+	width: 640rpx;
+
+	/deep/ .tn-input {
+		width: 640rpx;
+		background-color: #F7F7F7 !important;
+		border: none !important;
+	}
+
+	/deep/ .tn-input__input {
+		width: 100%;
+		background-color: #F7F7F7 !important;
+		border: none !important;
+	}
+
+	/deep/ .tn-input__wrap {
+		background-color: #F7F7F7 !important;
+		border: none !important;
+	}
+
+	.picker-icon {
+		position: absolute;
+		right: 20rpx;
+		top: 50%;
+		transform: translateY(-50%);
+		color: #999;
+		font-size: 32rpx;
+	}
+}
+
+// 新的图片上传样式
+.upload-new-wrapper {
+	width: 640rpx;
+
+	.upload-status {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 20rpx 10rpx 20rpx 30rpx;
+		background-color: #F7F7F7;
+		border-radius: 0rpx;
+		height: 100rpx;
+		box-sizing: border-box;
+
+		.upload-status-text {
+			color: #666;
+			font-size: 28rpx;
+			flex: 1;
+			display: flex;
+			align-items: center;
+
+			.preview-link {
+				color: #1A73E8;
+				text-decoration: underline;
+				cursor: pointer;
+			}
+		}
+
+		.upload-btn {
+			padding: 8rpx 20rpx;
+
+			.upload-btn-text {
+				color: #333;
+				font-size: 24rpx;
+			}
+		}
+	}
+
+	.preview-section {
+		margin-top: 20rpx;
+
+		.preview-thumb {
+			width: 120rpx;
+			height: 120rpx;
+			border-radius: 8rpx;
+			border: 1rpx solid #eee;
+		}
+	}
+}
+
+// 科目标签样式
+.subject-tags {
+	display: flex;
+	flex-direction: column;
+	gap: 20rpx;
+
+	.subject-tag {
+		position: relative;
+		width: 640rpx;
+		padding: 10rpx 40rpx;
+		border-radius: 0rpx;
+		background-color: #f8f8f8;
+		color: #666;
+		font-size: 28rpx;
+		transition: all 0.3s ease;
+		text-align: left;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+
+		&--selected {
+			border-color: #1A73E8;
+			background-color: #e8f0fe;
+			color: #1A73E8;
+		}
+
+		&__check {
+			width: 40rpx;
+			height: 40rpx;
+			background-color: #1A73E8;
+			border-radius: 50%;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			color: #fff;
+			font-size: 24rpx;
+			flex-shrink: 0;
+		}
+	}
+}
+
+// 报考类型标签样式（与科目标签样式一致）
+.exam-type-tags {
+	display: flex;
+	flex-direction: column;
+	gap: 20rpx;
+
+	.exam-type-tag {
+		position: relative;
+		width: 640rpx;
+		padding: 10rpx 40rpx;
+		background-color: #f8f8f8;
+		color: #666;
+		font-size: 28rpx;
+		transition: all 0.3s ease;
+		text-align: left;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+
+		&--selected {
+			background-color: #e8f0fe;
+			color: #1A73E8;
+		}
+
+		&__check {
+			width: 40rpx;
+			height: 40rpx;
+			background-color: #1A73E8;
+			border-radius: 50%;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			color: #fff;
+			font-size: 24rpx;
+			flex-shrink: 0;
+		}
+	}
+}
+
+// 用户协议区域
+.agreement-section {
+	margin-top: 30rpx;
+	display: flex;
+	align-items: center;
+}
+
+.agreement-text {
+	color: #666;
+	font-size: 26rpx;
+}
+
+.agreement-link {
+	color: #1A73E8;
+	font-size: 26rpx;
+}
+
+// 提交按钮区域
+.submit-section {
+	margin-top: 30rpx;
+	padding: 0 20rpx;
+}
+</style>
diff --git a/static/img/4.png b/static/img/4.png
index 1832e8f28eadc128df35243920b62c68bc8c154d..2aff0f5a26a8f04932e8fa3b56c21993f2c3ca56 100644
GIT binary patch
delta 5527
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
ZzZj`;!VrJZZwUYZ002ovPDHLkV1ie)o5%nF

delta 5280
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

diff --git a/static/img/5.png b/static/img/5.png
new file mode 100644
index 0000000000000000000000000000000000000000..219fa7c6a0711644b42c483e10f2fda9ce75f4b9
GIT binary patch
literal 7468
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

literal 0
HcmV?d00001

diff --git a/tuniao-ui/components/tn-radio/tn-radio.vue b/tuniao-ui/components/tn-radio/tn-radio.vue
index 0be0b5a..2b55df8 100644
--- a/tuniao-ui/components/tn-radio/tn-radio.vue
+++ b/tuniao-ui/components/tn-radio/tn-radio.vue
@@ -201,6 +201,7 @@
     overflow: hidden;
     user-select: none;
     line-height: 1.8;
+    padding-bottom: 20rpx;
     
     &__icon-wrap {
       color: $tn-font-color;
@@ -216,7 +217,7 @@
       text-align: center;
       transition-property: color, border-color, background-color;
       font-size: 20rpx;
-      border: 1rpx solid $tn-font-sub-color;
+      border: 1px solid $tn-font-sub-color;
       transition-duration: 0.2s;
       
       /* #ifdef MP-TOUTIAO */