From 32b304bc153977e32571d0437e87811b367be30a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=B3=89=E5=BE=B7?= <liquande@jlbank.com>
Date: Wed, 25 Jun 2025 13:58:37 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development            |   4 +-
 src/pages.json              |   9 +
 src/pages/me/index.vue      | 590 ++++++++++++++++++------------------
 src/pages/setting/index.vue | 144 +++++++++
 src/pagesOther.json         |   9 +
 5 files changed, 451 insertions(+), 305 deletions(-)
 create mode 100644 src/pages/setting/index.vue

diff --git a/.env.development b/.env.development
index 9e88b879..eeaca914 100644
--- a/.env.development
+++ b/.env.development
@@ -9,8 +9,8 @@ ENV = 'development'
 # VITE_APP_BASE_API_Url = 'http://25.64.16.133:9786' 
 
 
-VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
+# VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
 
 app入口
-# VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001'
+ VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001'
 
diff --git a/src/pages.json b/src/pages.json
index 9cd6dcfe..d85cf603 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -27,6 +27,15 @@
                 }
             }
         },
+        {
+            "path": "pages/setting/index",
+            "style": {
+                "navigationBarTitleText": "设置",
+                "app-plus": {
+                    "titleNView": false
+                }
+            }
+        },
         {
             "path": "pages/study/index",
             "style": {
diff --git a/src/pages/me/index.vue b/src/pages/me/index.vue
index e34556a1..1b4e75f2 100644
--- a/src/pages/me/index.vue
+++ b/src/pages/me/index.vue
@@ -14,19 +14,14 @@
 					<view class="personal_information_data">
 						<view class="name_sex_div">
 							<view class="name">
-								{{user_info.userName}}
+								{{ user_info.userName }}
 							</view>
 							<view class="sex">
-								<image v-if="user_info.gender === 'F'" class="img_100"
-									src="/static/images/me/wuman.png">
-								</image>
-								<image v-if="user_info.gender === 'M'" class="img_100" src="/static/images/me/man.png">
-								</image>
+								<image v-if="user_info.gender === 'F'" class="img_100" src="/static/images/me/wuman.png"></image>
+								<image v-if="user_info.gender === 'M'" class="img_100" src="/static/images/me/man.png"></image>
 							</view>
 						</view>
-						<view class="work_number_div">
-							工号：{{user_info.userId}}
-						</view>
+						<view class="work_number_div">工号：{{ user_info.userId }}</view>
 						<view class="fl1"></view>
 					</view>
 				</view>
@@ -35,22 +30,31 @@
 					<view class="item">
 						<view class="top">累计学习时长</view>
 						<view class="bottom">
-							<uv-count-to :startVal="statistics_data['startAccmPoint']" :endVal="statistics_data['accmPoint']"
-								:useEasing="true" :decimals="1" ref="accmPointRef"></uv-count-to>h
+							<uv-count-to
+								:startVal="statistics_data['startAccmPoint']"
+								:endVal="statistics_data['accmPoint']"
+								:useEasing="true"
+								:decimals="1"
+								ref="accmPointRef"
+							></uv-count-to>
+							h
 						</view>
 					</view>
 					<view class="item">
 						<view class="top">累计完成任务</view>
 						<view class="bottom">
-							<uv-count-to :startVal="statistics_data['startAccmTaskCnt']"
-								:endVal="statistics_data['accmTaskCnt']" :useEasing="true" ref="accmTaskCntRef"></uv-count-to>
+							<uv-count-to
+								:startVal="statistics_data['startAccmTaskCnt']"
+								:endVal="statistics_data['accmTaskCnt']"
+								:useEasing="true"
+								ref="accmTaskCntRef"
+							></uv-count-to>
 						</view>
 					</view>
 					<view class="item">
 						<view class="top">累计获得积分</view>
 						<view class="bottom">
-							<uv-count-to :startVal="statistics_data['startStdtTmLen']" :endVal="statistics_data['stdtTmLen']"
-								:useEasing="true" ref="stdtTmLenRef"></uv-count-to>
+							<uv-count-to :startVal="statistics_data['startStdtTmLen']" :endVal="statistics_data['stdtTmLen']" :useEasing="true" ref="stdtTmLenRef"></uv-count-to>
 						</view>
 					</view>
 				</view>
@@ -79,18 +83,17 @@
 		</view>
 		<view class="cell_div">
 			<uv-cell-group :border="false">
-				<uv-cell title='消息通知' :isLink="true"></uv-cell>
-				<uv-cell title='排行榜' :isLink="true"></uv-cell>
-				<uv-cell title='问答记录' :isLink="true"></uv-cell>
-				<uv-cell title='竞赛记录' :isLink="true" :clickable="false" :border="false"></uv-cell>
+				<uv-cell title="消息通知" :isLink="true"></uv-cell>
+				<uv-cell title="排行榜" :isLink="true"></uv-cell>
+				<uv-cell title="问答记录" :isLink="true"></uv-cell>
+				<uv-cell title="竞赛记录" :isLink="true" :clickable="false" :border="false"></uv-cell>
 			</uv-cell-group>
 		</view>
 		<view class="cell_div">
 			<uv-cell-group :border="false">
-				<uv-cell title='设置' :isLink="true"></uv-cell>
-				<uv-cell title='客服' :isLink="true"></uv-cell>
-				<uv-cell title='退出登录' :isLink="true" :clickable="false" :border="false"
-					@click="click_loginout()"></uv-cell>
+				<uv-cell title="设置" :isLink="true" @click="common.navigateTo('/pages/setting/index')"></uv-cell>
+				<uv-cell title="客服" :isLink="true"></uv-cell>
+				<uv-cell title="退出登录" :isLink="true" :clickable="false" :border="false" @click="click_loginout()"></uv-cell>
 			</uv-cell-group>
 		</view>
 		<tabbar-shadow></tabbar-shadow>
@@ -98,310 +101,291 @@
 </template>
 
 <script setup>
-	import {
-		ref,
-		computed,
-		reactive
-	} from 'vue';
-	import {
-		onShow
-	} from '@dcloudio/uni-app'
-	import common from '@/common/common'
-	import {
-		getUserInfo
-	} from '@/common/common'
-	import {
-		onPullDownRefresh
-	} from '@dcloudio/uni-app'
-	import {
-		loginOut
-	} from '@/api/login.js'
-	import {
-		queryTraStdyStatisticsSelf
-	} from '@/api/user.js'
-	const accmTaskCntRef = ref(null)
-	const accmPointRef = ref(null)
-	const stdtTmLenRef = ref(null)
-	const statistics_data = reactive({
-		'stdtTmLen': 0, // 累计学习时长
-		'accmTaskCnt': 0, // 累计完成任务
-		'accmPoint': 0, // 累计获得积分
-		'startStdtTmLen': 0, // 起始累计学习时长
-		'startAccmTaskCnt': 0, // 起始累计完成任务
-		'startAccmPoint': 0, // 起始累计获得积分
-		'request_time': 0, // 上次请求时间
-		"init": function() { // 初始化统计数据
-			const me_statistics_data = common.getValue('me_statistics_data') // 获取缓存
-			if (me_statistics_data) {
-				this.stdtTmLen = me_statistics_data.stdtTmLen;
-				this.accmTaskCnt = me_statistics_data.accmTaskCnt;
-				this.accmPoint = me_statistics_data.accmPoint;
-			}
-		},
-		"get_statistics_data": async function() {
-			try {
-				const time_now = Date.now();
-				if (time_now - this.request_time > 300 ) {
-					this.request_time = time_now;
-					// 获取最新数据
-					const res = await queryTraStdyStatisticsSelf();
-					common.setValue('me_statistics_data', res.body)
-					const accmPoint = res.body.accmPoint
-					const accmTaskCnt = res.body.accmTaskCnt
-					const stdtTmLen = res.body.stdtTmLen
-					if (accmPoint != this.accmPoint) { // 不相等就执行
-						this.startAccmPoint = this.accmPoint
-						this.accmPoint = accmPoint
-						accmPointRef.value.start()
-					}
-					if (accmTaskCnt != this.accmTaskCnt) { // 不相等就执行
-						this.startAccmTaskCnt = this.accmTaskCnt
-						this.accmTaskCnt = accmTaskCnt
-						accmTaskCntRef.value.start()
-					}
-					if (stdtTmLen != this.stdtTmLen) { // 不相等就执行
-						this.startStdtTmLen = this.stdtTmLen
-						this.stdtTmLen = stdtTmLen
-						stdtTmLenRef.value.start()
-					}
-					console.log('统计数据已更新');
-				} else {
-					console.log('时间没到无需更新');
-				}
-			} catch (error) {
-				console.error('获取统计数据失败:', error);
-			}
+import { ref, computed, reactive } from 'vue';
+import { onShow } from '@dcloudio/uni-app';
+import common from '@/common/common';
+import { getUserInfo } from '@/common/common';
+import { onPullDownRefresh } from '@dcloudio/uni-app';
+import { loginOut } from '@/api/login.js';
+import { queryTraStdyStatisticsSelf } from '@/api/user.js';
+const accmTaskCntRef = ref(null);
+const accmPointRef = ref(null);
+const stdtTmLenRef = ref(null);
+const statistics_data = reactive({
+	stdtTmLen: 0, // 累计学习时长
+	accmTaskCnt: 0, // 累计完成任务
+	accmPoint: 0, // 累计获得积分
+	startStdtTmLen: 0, // 起始累计学习时长
+	startAccmTaskCnt: 0, // 起始累计完成任务
+	startAccmPoint: 0, // 起始累计获得积分
+	request_time: 0, // 上次请求时间
+	init: function () {
+		// 初始化统计数据
+		const me_statistics_data = common.getValue('me_statistics_data'); // 获取缓存
+		if (me_statistics_data) {
+			this.stdtTmLen = me_statistics_data.stdtTmLen;
+			this.accmTaskCnt = me_statistics_data.accmTaskCnt;
+			this.accmPoint = me_statistics_data.accmPoint;
 		}
-	});
-
-	const user_info = reactive({
-		userName: '',
-		userId: ''
-	});
-
-
-
-	onShow(() => {
-		const user_info_cache = getUserInfo()
-		Object.assign(user_info, user_info_cache)
-		statistics_data['get_statistics_data']() // 获取统计数据
-	})
-
-	const click_loginout = () => {
-		common.show('确定退出登录？').then(async (res) => {
-			console.log(res);
-			if (!res) return;
-			try {
-				common.loading('正在退出登录')
-				await loginOut()
-			} catch (e) {
-
+	},
+	get_statistics_data: async function () {
+		try {
+			const time_now = Date.now();
+			if (time_now - this.request_time > 300) {
+				this.request_time = time_now;
+				// 获取最新数据
+				const res = await queryTraStdyStatisticsSelf();
+				common.setValue('me_statistics_data', res.body);
+				const accmPoint = res.body.accmPoint;
+				const accmTaskCnt = res.body.accmTaskCnt;
+				const stdtTmLen = res.body.stdtTmLen;
+				if (accmPoint != this.accmPoint) {
+					// 不相等就执行
+					this.startAccmPoint = this.accmPoint;
+					this.accmPoint = accmPoint;
+					accmPointRef.value.start();
+				}
+				if (accmTaskCnt != this.accmTaskCnt) {
+					// 不相等就执行
+					this.startAccmTaskCnt = this.accmTaskCnt;
+					this.accmTaskCnt = accmTaskCnt;
+					accmTaskCntRef.value.start();
+				}
+				if (stdtTmLen != this.stdtTmLen) {
+					// 不相等就执行
+					this.startStdtTmLen = this.stdtTmLen;
+					this.stdtTmLen = stdtTmLen;
+					stdtTmLenRef.value.start();
+				}
+				console.log('统计数据已更新');
+			} else {
+				console.log('时间没到无需更新');
 			}
-			common.hideLoading()
-			// 主动退出登录后，再次登录应该进首页
-			common.reLaunch('/pages/login/login')
-		})
+		} catch (error) {
+			console.error('获取统计数据失败:', error);
+		}
 	}
+});
 
-	onPullDownRefresh(() => {
-		console.log('下拉刷新');
-		uni.stopPullDownRefresh();
-	})
+const user_info = reactive({
+	userName: '',
+	userId: ''
+});
+
+onShow(() => {
+	const user_info_cache = getUserInfo();
+	Object.assign(user_info, user_info_cache);
+	statistics_data['get_statistics_data'](); // 获取统计数据
+});
+
+const click_loginout = () => {
+	common.show('确定退出登录？').then(async (res) => {
+		console.log(res);
+		if (!res) return;
+		try {
+			common.loading('正在退出登录');
+			await loginOut();
+		} catch (e) {}
+		common.hideLoading();
+		// 主动退出登录后，再次登录应该进首页
+		common.reLaunch('/pages/login/login');
+	});
+};
+
+onPullDownRefresh(() => {
+	console.log('下拉刷新');
+	uni.stopPullDownRefresh();
+});
 </script>
 
 <style scoped lang="scss">
-	$bg-margin-left: 50rpx;
-
-	// 下方单元格
-	.cell_div {
-		margin: 30rpx $bg-margin-left 0 $bg-margin-left;
-		background: #FFFFFF;
-		border-radius: 15rpx;
-		z-index: 101;
-		overflow: hidden;
-
-		// 为了让线缩进来24单位
-		:deep(.uv-line) {
-			width: calc(100% - 48rpx) !important;
-			margin: 0 24rpx !important;
-		}
-
-		:deep(.uv-cell__body) {
-			padding: 12px 15px;
-		}
+$bg-margin-left: 50rpx;
 
+// 下方单元格
+.cell_div {
+	margin: 30rpx $bg-margin-left 0 $bg-margin-left;
+	background: #ffffff;
+	border-radius: 15rpx;
+	z-index: 101;
+	overflow: hidden;
 
+	// 为了让线缩进来24单位
+	:deep(.uv-line) {
+		width: calc(100% - 48rpx) !important;
+		margin: 0 24rpx !important;
 	}
 
-	// 快捷导航栏
-	.navigation_div {
-		margin: 30rpx $bg-margin-left 0 $bg-margin-left;
-		padding: 24rpx 0 20rpx 0;
-		background-color: #FFFFFF;
-		border-radius: 23rpx;
+	:deep(.uv-cell__body) {
+		padding: 12px 15px;
+	}
+}
+
+// 快捷导航栏
+.navigation_div {
+	margin: 30rpx $bg-margin-left 0 $bg-margin-left;
+	padding: 24rpx 0 20rpx 0;
+	background-color: #ffffff;
+	border-radius: 23rpx;
+	display: flex;
+	flex-direction: column;
+	justify-content: space-around;
+	z-index: 101;
+
+	.group {
+		display: flex;
+		justify-content: space-around;
+	}
+
+	.item {
 		display: flex;
 		flex-direction: column;
-		justify-content: space-around;
-		z-index: 101;
+		justify-content: center;
+		align-items: center;
 
-		.group {
+		// background-color: red;
+		.icon {
+			width: 88rpx;
+			height: 86rpx;
+		}
+
+		.title {
+			margin-top: 10rpx;
+			font-family: PingFangSC, PingFang SC;
+			font-weight: 400;
+			font-size: 25rpx;
+			color: #323e57;
+			line-height: 35rpx;
+			text-align: left;
+			font-style: normal;
+		}
+	}
+}
+
+.bg_div {
+	display: flex;
+	flex-direction: column;
+	position: relative;
+	padding: 0 $bg-margin-left;
+	z-index: 50;
+
+	.bg_img {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		z-index: -1;
+		height: 858rpx;
+	}
+
+	// 个人信息
+	.user_data_div {
+		margin-top: 158rpx;
+		background: linear-gradient(180deg, rgba(241, 245, 255, 0.5) 0%, #f6f9fe 50%, #ffffff 100%);
+		border-radius: 14rpx;
+		border: 2rpx solid #ffffff;
+		box-shadow: #f6f8ff 0 0 2rpx;
+
+		.personal_information {
+			padding: 20rpx 18rpx 0 26rpx;
+			display: flex;
+
+			// 个人头像框框
+			.profile {
+				border-radius: 100%;
+				border: 2px solid #ffffff;
+				width: 108rpx;
+				height: 108rpx;
+				overflow: hidden;
+			}
+
+			// 头像右边的信息
+			.personal_information_data {
+				flex: 1;
+				display: flex;
+				flex-direction: column;
+				margin-left: 26rpx;
+				overflow: hidden;
+
+				// 上边的姓名性别盒子
+				.name_sex_div {
+					display: flex;
+					margin-top: 6rpx;
+					.name {
+						font-family: PingFangSC;
+						font-weight: 600;
+						font-size: 28rpx;
+						color: #000000;
+						line-height: 40rpx;
+					}
+
+					.sex {
+						margin-left: 10rpx;
+						width: 30rpx;
+						height: 30rpx;
+					}
+				}
+
+				.work_number_div {
+					font-family: PingFangSC;
+					font-weight: 400;
+					font-size: 25rpx;
+					color: #666666;
+					line-height: 38rpx;
+					text-align: left;
+					font-style: normal;
+					white-space: nowrap;
+					text-overflow: ellipsis;
+				}
+			}
+		}
+
+		.study_information {
 			display: flex;
 			justify-content: space-around;
-		}
+			z-index: 20;
+			margin: 30rpx 50rpx;
 
-		.item {
-			display: flex;
-			flex-direction: column;
-			justify-content: center;
-			align-items: center;
-
-			// background-color: red;
-			.icon {
-				width: 88rpx;
-				height: 86rpx;
-			}
-
-			.title {
-				margin-top: 10rpx;
-				font-family: PingFangSC, PingFang SC;
-				font-weight: 400;
-				font-size: 25rpx;
-				color: #323E57;
-				line-height: 35rpx;
-				text-align: left;
-				font-style: normal;
-			}
-		}
-	}
-
-	.bg_div {
-		display: flex;
-		flex-direction: column;
-		position: relative;
-		padding: 0 $bg-margin-left;
-		z-index: 50;
-
-		.bg_img {
-			position: absolute;
-			top: 0;
-			left: 0;
-			width: 100%;
-			z-index: -1;
-			height: 858rpx;
-		}
-
-		// 个人信息
-		.user_data_div {
-			margin-top: 158rpx;
-			background: linear-gradient(180deg, rgba(241, 245, 255, .5) 0%, #F6F9FE 50%, #FFFFFF 100%);
-			border-radius: 14rpx;
-			border: 2rpx solid #ffffff;
-			box-shadow: #F6F8FF 0 0 2rpx;
-
-			.personal_information {
-				padding: 20rpx 18rpx 0 26rpx;
+			.item {
+				flex: 1;
 				display: flex;
-				
-				// 个人头像框框
-				.profile {
-					border-radius: 100%;
-					border: 2px solid #ffffff;
-					width: 108rpx;
-					height: 108rpx;
-					overflow: hidden;
+				flex-direction: column;
+				justify-content: center;
+
+				.top {
+					font-family: PingFangSC, PingFang SC;
+					font-weight: 400;
+					font-size: 25rpx;
+					color: #666666;
+					line-height: 35rpx;
+					text-align: center;
+					font-style: normal;
 				}
 
-				// 头像右边的信息
-				.personal_information_data {
-					flex: 1;
-					display: flex;
-					flex-direction: column;
-					margin-left: 26rpx;
-					overflow: hidden;
+				.bottom {
+					margin-top: 5%;
+					font-weight: bold;
+					font-size: 50rpx;
+					color: #000000;
+					line-height: 58rpx;
+					text-align: left;
+					font-style: normal;
+					text-align: center;
 
-					// 上边的姓名性别盒子
-					.name_sex_div {
-						display: flex;
-						margin-top: 6rpx;
-						.name {
-							font-family: PingFangSC;
-							font-weight: 600;
-							font-size: 28rpx;
-							color: #000000;
-							line-height: 40rpx;
-						}
-
-						.sex {
-							margin-left: 10rpx;
-							width: 30rpx;
-							height: 30rpx;
-						}
-					}
-
-					.work_number_div {
-						font-family: PingFangSC;
-						font-weight: 400;
-						font-size: 25rpx;
-						color: #666666;
-						line-height: 38rpx;
-						text-align: left;
-						font-style: normal;
-						white-space: nowrap;
-						text-overflow: ellipsis;
-						
+					// 数字滚动组件
+					:deep(.uv-count-num) {
+						font-weight: bold !important;
+						font-size: 50rpx !important;
+						color: #000000 !important;
 					}
 				}
 			}
-
-			.study_information {
-
-				display: flex;
-				justify-content: space-around;
-				z-index: 20;
-				margin: 30rpx 50rpx;
-
-				.item {
-					flex: 1;
-					display: flex;
-					flex-direction: column;
-					justify-content: center;
-
-					.top {
-						font-family: PingFangSC, PingFang SC;
-						font-weight: 400;
-						font-size: 25rpx;
-						color: #666666;
-						line-height: 35rpx;
-						text-align: center;
-						font-style: normal;
-					}
-
-					.bottom {
-						margin-top: 5%;
-						font-weight: bold;
-						font-size: 50rpx;
-						color: #000000;
-						line-height: 58rpx;
-						text-align: left;
-						font-style: normal;
-						text-align: center;
-
-						// 数字滚动组件
-						:deep(.uv-count-num) {
-							font-weight: bold !important;
-							font-size: 50rpx !important;
-							color: #000000 !important;
-						}
-					}
-				}
-			}
-
 		}
 	}
+}
 
-	.main_div {
-		display: flex;
-		flex-direction: column;
-		background-color: #F6F8FF;
-	}
-</style>
\ No newline at end of file
+.main_div {
+	display: flex;
+	flex-direction: column;
+	background-color: #f6f8ff;
+}
+</style>
diff --git a/src/pages/setting/index.vue b/src/pages/setting/index.vue
new file mode 100644
index 00000000..6146c3d8
--- /dev/null
+++ b/src/pages/setting/index.vue
@@ -0,0 +1,144 @@
+<template>
+	<view class="max_page detail-main">
+		<nav-bar :is_seat="false"></nav-bar>
+		<view class="fixed_search_div">
+			<view class="back_div" @click="common.navigateBack()">
+				<view class="back-icon"></view>
+			</view>
+			<view class="title font_pf">设置</view>
+		</view>
+		<view class="detail-body">
+			<uv-cell-group>
+				<uv-cell title="头像"></uv-cell>
+				<uv-cell title="名字"></uv-cell>
+			</uv-cell-group>
+		</view>
+		<view class="btn-box font_pf">
+			<uv-button type="primary" @click="submit">提交评价</uv-button>
+		</view>
+	</view>
+</template>
+
+<script setup>
+import { reactive, ref } from 'vue';
+import { onLoad } from '@dcloudio/uni-app';
+import { publishCrsEvaluation } from '@/api/courseDetail.js';
+import common from '@/common/common';
+
+const formData = reactive({
+	crsNum: null,
+	imgIdList: [], // 发表图片ID列表，文件ID集
+	bbsGrade: 10, // 综合评分(最高10分)
+	bbsTag: 'SUG', // 评价标签 （SUG 建议 ASK 提问 ）
+	bbsContent: '' // 评价内容
+});
+const submit = () => {
+	if (formData.bbsContent === '') {
+		if (formData.bbsTag == 'SUG') {
+			return common.msg('请输入你的建议');
+		} else {
+			return common.msg('请输入你的问题');
+		}
+	}
+	publishCrsEvaluation(formData).then((res) => {
+		common.msg('发表成功');
+		setTimeout(() => common.navigateBack(), 500);
+	});
+};
+onLoad((params) => {
+	formData.crsNum = params.crsNum;
+});
+</script>
+
+<style lang="scss" scoped>
+.detail-main {
+	background-color: #fff;
+}
+
+.detail-body {
+	box-sizing: border-box;
+	min-height: calc(100vh - (var(--status-bar-height)+50rpx));
+	padding: 29rpx 37rpx;
+	width: 100%;
+	display: flex;
+	flex-direction: column;
+	padding-top: 0rpx;
+}
+
+.title {
+	color: #000000;
+	font-size: 34rpx;
+	height: 34rpx;
+	font-weight: 600;
+	// margin-bottom: 30rpx;
+	line-height: 34rpx;
+}
+
+.body-content {
+	flex: 1;
+	background-color: #ffffff;
+	border-radius: 15rpx;
+	padding: 36rpx;
+	padding-top: 0rpx;
+}
+
+.btn-box {
+	position: fixed;
+	bottom: 0;
+	// height: 187rpx;
+	width: 100%;
+	display: flex;
+	padding-bottom: 30rpx;
+	justify-content: space-evenly;
+
+	:deep(.uv-button) {
+		border-radius: 14rpx;
+		width: 616rpx;
+		height: 80rpx;
+	}
+}
+
+.c-666 {
+	color: #666666;
+}
+
+.c-000 {
+	font-weight: 600;
+	color: #000;
+}
+
+.fixed_search_div {
+	padding: calc(10rpx + var(--status-bar-height)) 15rpx 24rpx 30rpx;
+	display: flex;
+	align-items: center;
+	background-color: #f6f7f8;
+	.back_div {
+		margin-right: 10rpx;
+		.back-icon {
+			position: relative;
+			width: 40rpx;
+			height: 40rpx;
+			cursor: pointer;
+			display: flex;
+			align-items: center;
+		}
+
+		.back-icon::before,
+		.back-icon::after {
+			content: '';
+			position: absolute;
+			transition: all 0.3s ease;
+		}
+
+		.back-icon::after {
+			top: 25%;
+			left: 25%;
+			width: 40%;
+			height: 40%;
+			border-top: 4rpx solid #2b2c2e;
+			border-left: 4rpx solid #2b2c2e;
+			transform: rotate(-45deg);
+		}
+	}
+}
+</style>
diff --git a/src/pagesOther.json b/src/pagesOther.json
index 04435044..bda555b2 100644
--- a/src/pagesOther.json
+++ b/src/pagesOther.json
@@ -26,6 +26,15 @@
 				"titleNView": false
 			}
 		}
+	},
+	{
+		"path": "pages/setting/index",
+		"style": {
+			"navigationBarTitleText": "设置",
+			"app-plus": {
+				"titleNView": false
+			}
+		}
 	}
 	],
 	"tabBar": {

From d7007f607b05806f34a3615ec753ced4f3c0029c Mon Sep 17 00:00:00 2001
From: yanghang <icho.yang@scai-global.com>
Date: Wed, 25 Jun 2025 20:57:24 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/course/components/talkingItem.vue |  24 +++--
 src/pages/course/study.vue                  | 100 ++++++++++++--------
 src/static/images/course/play-blue.png      | Bin 0 -> 1287 bytes
 src/static/images/course/stop-blue.png      | Bin 0 -> 1155 bytes
 4 files changed, 80 insertions(+), 44 deletions(-)
 create mode 100644 src/static/images/course/play-blue.png
 create mode 100644 src/static/images/course/stop-blue.png

diff --git a/src/pages/course/components/talkingItem.vue b/src/pages/course/components/talkingItem.vue
index 09fcbc06..0767cd92 100644
--- a/src/pages/course/components/talkingItem.vue
+++ b/src/pages/course/components/talkingItem.vue
@@ -10,13 +10,13 @@
 			</view>
 		</view>
 		<view class="talking-info">
-			<view class="talking-gif"></view>
+			<view class="talking-gif is-play"></view>
 			<view class="talking-cont">
 				<view class="talking-text">
 					阿列克山大是快乐的你艾德卡省的mask安东拉森扣篮大赛了快递那里是啊克里斯蒂娜老师的阿萨是看，
 				</view>
-				<ImagePreview class="cont-img-box" :imgId="''"></ImagePreview>
-				<VideoPreview class="cont-img-box" :imgId="''"></VideoPreview>
+				<!-- <ImagePreview class="cont-img-box" :imgId="''"></ImagePreview>
+				<VideoPreview class="cont-img-box" :imgId="''"></VideoPreview> -->
 			</view>
 			<view class="talking-cont">
 				<view class="talking-text">
@@ -61,8 +61,8 @@
 					<image class="icon" src="@/static/images/course/replay.png" style="width: 100%;height: 100%;"></image>
 				</view> -->
 				<view class="play-btn">
-					<image class="icon" v-if="false" src="@/static/images/course/play.png" style="width: 100%;height: 100%;"></image>
-					<image class="icon" src="@/static/images/course/pause.png" style="width: 100%;height: 100%;"></image>
+					<image class="icon" v-if="false" src="@/static/images/course/play-blue.png" style="width: 100%;height: 100%;"></image>
+					<image class="icon" src="@/static/images/course/stop-blue.png" style="width: 100%;height: 100%;"></image>
 				</view>
 			</view>
 		</view>
@@ -119,8 +119,13 @@
 			.talking-gif{
 				width: 140rpx;
 				height: 38rpx;
-				background-color: #999;
+				background: url(@/static/images/course/voice-gray.png) no-repeat;
+				background-size: 100%;
 				margin-bottom: 16rpx;
+				&.is-play{
+					background: url(@/static/images/course/voice-gif.gif) no-repeat;
+					background-size: 100%;
+				}
 			}
 			.talking-cont{
 				.talking-text{
@@ -268,8 +273,13 @@
 			.talking-gif{
 				width: 140rpx;
 				height: 38rpx;
-				background-color: #999;
+				background: url(@/static/images/course/voice-gray.png) no-repeat;
+				background-size: 100%;
 				margin-bottom: 16rpx;
+				&.is-play{
+					background: url(@/static/images/course/voice-gif.gif) no-repeat;
+					background-size: 100%;
+				}
 			}
 			.talking-cont{
 				.talking-text{
diff --git a/src/pages/course/study.vue b/src/pages/course/study.vue
index 576cb08a..eff1bbc6 100644
--- a/src/pages/course/study.vue
+++ b/src/pages/course/study.vue
@@ -16,7 +16,7 @@
 						</view>
 						<view class="right-cont">
 							<view class="right-name">{{item.teacherName}}</view>
-							<view class="right-desc">描述：{{item.teacheDesc || '--'}}</view>
+							<view class="right-desc">描述：{{item.voiceDesc || '--'}}</view>
 							<view class="audio-box">
 								<view class="talking-gif"></view>
 								<view class="play-btn">
@@ -117,7 +117,7 @@ const getData = async () => {
 	// 	videoUrlShow.value = res.tempFilePath
 	// })
 };
-let WS = {}
+var WS = null
 const nextStep = () => {
 	if(choiceTeacher.value){
 		initWS(1)
@@ -129,47 +129,67 @@ const nextStep = () => {
 		});
 	}
 }
-const initWS = async (step) => {
+const reconnectTimer = null // 重连timer
+const isManualClose = false // 是否手动关闭
+
+const initWS = ($step) => {
 	WS = uni.connectSocket({
 		url: get_base_url() + '/trastudy/trasoket/open?summary=' + getToken(),
-		header:{
-			'summary': getToken(),
-			'content-type': 'application/json;charset=UTF-8'
-		},
-		success:function(res){
-			WS.onMessage = (event) => {
-				console.log(event)
-			}
-			let _params = step === 1 ?{
+		complete: function(cv){
+			console.log(cv)
+		}
+	})
+	WS.onMessage = (event) => {
+		console.log(event,111)
+	}
+	WS.onSocketMessage = (event) => {
+		console.log(event,222)
+	}
+	WS.onOpen = () =>{
+		console.log('建立链接')
+	}
+	WS.onError = (event) => {
+		console.log('error',event)
+	}
+	// WS.onclose = () => {
+	// 	// 重连
+	// 	// initWS()
+	// }
+	setTimeout(()=>{
+		console.log(WS , WS.readyState)
+		if( WS && WS.readyState === 1){
+			let _params = $step === 1 ?{
 				"commond" : 'open',
 				"body" : {
 					crsId: crsId.value,
 					teacherNo: choiceTeacher.value
 				}
-			}:{
-				
-			}
-			WS.send(_params)
-		},
-		fail:function(err){
-			console.log(err)
-		},
-		complete:function(res){
-			console.log(res)
+			}:{}
+			sendMessage(_params)
+			step.value = 2
 		}
-	})
-	WS.onOpen = () =>{
-		console.log('建立链接')
-		step.value = 2
-	}
-	// WS.onerror = (event) => {
-	// 	console.log(event)
-	// }
-	// WS.onclose = () => {
-	// 	// 重连
-	// 	// initWS()
-	// }
+	},100)
 }
+const reconnect = ()=> {
+	if(reconnectTimer || isManualClose) return
+	reconnectTimer = setTimeout(()=>{
+		initWS(2)
+	},3000)
+}
+const sendMessage = (data) => {
+	WS.send({
+		data: JSON.stringify(data)
+	})
+}
+const closeWebSocket = () => {
+	isManualClose = true
+	if(WS){
+		WS.close()
+		WS = null
+	}
+}
+
+
 onLoad((params) => {
 	crsId.value = params.crsId||'';
 	crsNum.value = params.crsNum||'';
@@ -208,10 +228,10 @@ onShow(()=>{
 	getData();
 })
 onHide(()=>{
-	WS.close?.()
+	closeWebSocket()
 })
 onUnmounted(()=>{
-	WS.close?.()
+	closeWebSocket()
 })
 const playRecord = () => {
 	audioObj.src = audioPath.value
@@ -393,9 +413,15 @@ const handleMove = (obj) => {
 							.talking-gif{
 								width: 140rpx;
 								height: 40rpx;
-								background-color: #ccc;
+								// background-color: #ccc;
+								background: url(@/static/images/course/voice-gray.png) no-repeat;
+								background-size: 100%;
 								box-sizing: border-box;
 								float: left;
+								&.is-play{
+									background: url(@/static/images/course/voice-gif.gif) no-repeat;
+									background-size: 100%;
+								}
 							}
 							.talking-time{
 								float: right;
diff --git a/src/static/images/course/play-blue.png b/src/static/images/course/play-blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b7072d9f2120c5ba5067307ff768bec96124a4f
GIT binary patch
literal 1287
zcmV+i1^D`jP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000EMNkl<ZcmdRy
zOKenC7{~wj3>}P8Z~+z@G{zJ`jmEe@4Tb~=rU6M@xYF97(Xx;Q8WDok)X+54#z&$o
ztR|XTV~la70@{!&aVMz@HAD$9Ky64sY!l?scINQ^pLvye_1-)0$@%7<`R@1lefOSo
z?wM;4@Y6GD7d$^?H*6oa`?h~(zv~*dC)l5)%u=jRk?o}OWeoc4Q%uDUhy&jRbPd_t
zyFRz?OpIe9VsM0sy5V872eh%jgc70nZL(eBd_8QYQ@3I&wsI&Jb-voX1#J7o-pniY
zfoE{Svv|q#u*_HF5Jrmaaxj;2D))S0iWa~jvT0!xj`K>r$Usp_wOUj;m0JwOk`^q0
zj=Sl2n6jKwtESwClPq}|@)kgcx8PwvCGYvXkt(J1I8Vvqn2`I)0i@w>g73;Tt+B?#
zF2|OIaa{p4*u?XFlzMG_Nyao^x&SxhJq+>cr*&zodg*vD<QsCVNPJA<07RS6%f2QJ
z4|Uy^Cs`e&D?kqpE?X}+O#^(1Rm?(l1t5Z*;7y=3N{c3$Vch;Bj*dnlPjix4>}LE7
z*69(RKG7f@F^k=B6Sck+<_)WXx1R)_S_9lz&CLd(#cp8nAp4=)+B<=p76R*50zF%S
zHFty#72J{R#saH?duBXLVi|CX#Ww)Ytp#>&1a4_|s)~MD4|f@krKRQ0vYJnm*S7#$
z?gJK>a!1d^<8r!8;TL68<?A&?fUWlfDr8kl`Qm0pTBHJ)Dob6)pDl|MLu%V2Kr`n`
z8AB@+=dlhI77kN9%*n1v{%Biylj#olj99vvR;!MOfL9&^TJ<lw^pL1(0V&=#{;PhC
zf90Qe0Ek9X+Hl936d+U$-u8QeHy#J>xmB8QQnLb5xJ$VP?%-aar8%VucC2{;!o4yB
zT$xobxYWFWKPG^_L%`JK;PCROSpfq6_-Ek#QQ-VVp@fsF7ZB&>>!-iC@%siib}Ah7
zTrU+6o2#f~fBZjS;0NG~Ux3RT_hrZxQvoI1Kz|5VIYGZ3ON{lu&-?T7X?0QC>2p4f
zLz(^d5Af!<z{qhx!zWab0!|!_=M3Klb3_)fC_z1W2^c&I9QYBq@P7$`inxm1@I?`C
zZV{`1r*xG^{{(t?)yK{RbPj6nVa&wh;6fJEGh;t9X9+lc0qFl8`0^MZOy!xRnM8Sd
zVmB*p!%=GydLA759XLtvuL!-LFXK=Bn<rBRRALsp=~?g1a!)!OHpj0VCR!SgaM)=0
zgpCu}&tO>W#yQ6D9)M{|qqJ!xn0f7qJlN@-=92UgyA9FADrUhZ?f`q!Gw9~wET!Jt
z*(9suOc(I!v)&{uIw^5?rXIg6;^gaetVzCf0s8&nGu{Y~dnxtW_9hwAeAg8qEe-lv
z<$(I3r4o)71CA{#c1{60Ps3MP#2!lRhf`wM>~Tzj%aXhW$c7I6JhoG6IkA<yJ;_3p
z+*YsvnbL9O>J0AYvUPyJtNEOmR!-#>19KN_MGKIZX8d4>x5LJ<l5d0G)gxT`N{C{+
z9L%Mh$~|A6c?(Dd(1T;}Y47FM6=>xqY9sZ%oFfOB^d$RJlo-WtlkJrAwKzzpUd2>w
x<xno_e6?!;00960o#C`#00006Nkl<Z0|5I=kUA`f%RvAD002ovPDHLkV1jWaX^{W`

literal 0
HcmV?d00001

diff --git a/src/static/images/course/stop-blue.png b/src/static/images/course/stop-blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..43d88e924ec26465573a66f9e86f8e80e3ce9386
GIT binary patch
literal 1155
zcmV-}1bq96P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000CyNkl<ZcmeEK
zOK4PA82-+Qj<glDP{9VZwAhxCO{x1*TZG`MbXjd^p^bel+JZIMECf^W0qVkMTqrTR
z6gNshL~*aU34$;1K@=2>-~-3Z9KY|}nLA_d&CHp^WbQzQ^WSske|-P<pL5T>hilQ`
zZ__z9=jQ?U^}0c~dEHTWs(a8~<9L)ZMsa~6-%%e+49090rm!2NgWv+X2i&smV{Yfj
zU5vC@oMob37_2tHa*h{J+9;t-z6*S;!D<He3RBq1p<L7jwYmlTc-SrEOzkli*Nns8
z#$Ztp@+6#u?Q<}faw>N{n3@If7FjiKF0OE<{vc3}GE*(5oXRZ@wUSO)00TELaEP*)
z(yXT3LnSV$98wElz;+mHrKH+Zk)}&&xKGK&b3*c$AV|jzB)&fB+GLHvde3bfjn@jG
z!z$XhP_o*#lsLxx;sX4RHyGgT$GX@nD+2>degmE>qMwaAAU79%9Bb3C%XC{@;_6BI
z0`%hGW9t{MX@QHlinFNt0?>xPz(t_6O3Rfv!}{|_5o=q8dCZfX#ogY$gD>?8j}0v{
z5NC0>JVdQ*5zYyk;%?#aMZ(f53Uap&_;fOSJ3D}_-vI~KM6&OD;6EOWm)AI}$|fKA
zmg9sWtjTb22A^2oOYb!ryy64k+s}c8Z&e~KpKVLu1%CSqcsu3X`VMun$w$8BNMQ(T
z#j>&{yl2WqdW_Bw4~aZG-jDjUtB8J-G9@2UCtF&KbRF%wHZ1d1KwG0>^XAl!$felR
zbk!*JFsps5#@xqM|5|aV6$s>=O}E(sn!PTwD=@nPQ=Ea>TWE?CIOTAyK%r5T7h|;}
z@+tN-T{TKQ%xd4NaX|$<sZs<Dhwn}7_B0RNe3-OLCtK1IX@*ClzQOAg9j6~O7=(+r
zfRmSj(dU)OBG2V_9s&E$1J77Q#S)FAlTAMIjkFPlurA&%Yr=b`d|>%C_-c4a#dByF
z=s5xWdMuLPj|2ao2Cmnb4%y@*-*TKVgjGQfABnr=hoVd2AsO>DxMT}OoXZ%kU^?P%
zmn_8v=TKwegYjn6QJlryZdz%^U@<tO+22Gmau#>%u?pA?Am!OXZ8lpT5ogXl3HEoH
z+k7M);;<!}xQesLMk~Nk{v~?Z-KS)|-7j(VJmUh6{A5Pq&_yYFOBOE<Me^(NTuc1o
z0`&jj59SQ}jg+jmjU|pTzt;+omJZuk<qnM}Ez=R`u)}j3hn*-ub~^scB6=vzzn!An
zrpI#<xp9(OfP5IRjeRGjnHyWVJ4;+hCD|q{K&}it^Wr5w<6~<t|Ig%mBCnjvEe^~*
zVXIkyqO{}t*P1_F5g+qw@GiZ=rJoKFw$H&_%BkG-^3*M$44@ZB{~Gg8`x3PC5cLi9
zecU6bne+z7k0}L8Xp`?_AM3zFIQoPsY~@g{P@q=;00960;G(VC00006Nkl<Z0{~7u
Vema+E)m{Jq002ovPDHLkV1nX@Fhc+U

literal 0
HcmV?d00001