From e62e96b4b36b49bbee3328d9a581f0b9d4cb649b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= <icho.yang@scai-global.com>
Date: Wed, 17 Sep 2025 09:29:08 +0800
Subject: [PATCH 01/10] =?UTF-8?q?fix=EF=BC=9A=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                           | 4 ++--
 src/pages/course/components/chartFive.vue  | 2 +-
 src/pages/course/components/chartFour.vue  | 2 +-
 src/pages/course/components/chartThree.vue | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.env.development b/.env.development
index d09195dc..467a5637 100644
--- a/.env.development
+++ b/.env.development
@@ -26,7 +26,7 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
 # dev
 # VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001'
 # sit
-#VITE_APP_BASE_H5_API_Url = 'http://25.18.122.91:9786'
+VITE_APP_BASE_H5_API_Url = 'http://25.18.122.92:9786'
 
 # UAT
 # VITE_APP_BASE_H5_API_Url = 'http://25.18.122.78:9786'
@@ -44,7 +44,7 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
 # 于嘉文
 # VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.16.143:9604'
 # 孙宇
-# VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.16.139:9604'
+VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.16.139:9604'
 # 付丙鑫
 # VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.145:9602'
 
diff --git a/src/pages/course/components/chartFive.vue b/src/pages/course/components/chartFive.vue
index 327b21e0..b43d42ed 100644
--- a/src/pages/course/components/chartFive.vue
+++ b/src/pages/course/components/chartFive.vue
@@ -18,7 +18,7 @@
 			<image class="total-score-icon" src="@/static/images/course/score.png"  alt=""></image>
 		</view>
 		<view  v-for="(item,index) in dataList" :class="['score-item', 'score-item'+(index+1)]">
-			<view class="score-item-name">{{ item.gradeDimens || item.gradeDimensName }}</view>
+			<view class="score-item-name">{{ item.gradeDimensName || item.gradeDimens }}</view>
 			<view class="score-item-score">{{ item.anlyGrade }}</view>
 		</view>
 	</view>
diff --git a/src/pages/course/components/chartFour.vue b/src/pages/course/components/chartFour.vue
index 17d70295..3b2130db 100644
--- a/src/pages/course/components/chartFour.vue
+++ b/src/pages/course/components/chartFour.vue
@@ -17,7 +17,7 @@
 			<image class="total-score-icon" src="@/static/images/course/score.png"  alt=""></image>
 		</view>
 		<view  v-for="item,index in props.dataList" :class="['score-item', 'score-item'+(index+1)]">
-			<view class="score-item-name">{{ item.gradeDimensName }}</view>
+			<view class="score-item-name">{{ item.gradeDimensName || item.gradeDimens }}</view>
 			<view class="score-item-score">{{ item.anlyGrade }}</view>
 		</view>
 	</view>
diff --git a/src/pages/course/components/chartThree.vue b/src/pages/course/components/chartThree.vue
index 44e0160a..d96b33ac 100644
--- a/src/pages/course/components/chartThree.vue
+++ b/src/pages/course/components/chartThree.vue
@@ -20,7 +20,7 @@
 			<image class="total-score-icon" src="@/static/images/course/score.png"  alt="" ></image>
 		</view>
 		<view  v-for="item,index in props.dataList" :class="['score-item', 'score-item'+(index+1)]">
-			<view class="score-item-name">{{ item.gradeDimensName }}</view>
+			<view class="score-item-name">{{ item.gradeDimensName || item.gradeDimens }}</view>
 			<view class="score-item-score">{{ item.anlyGrade }}</view>
 		</view>
 	</view>

From 6411ea98ff93c8323accd115f538224eb136d5e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=94=B0=E5=B2=A9?= <tybb88x@gmail.com>
Date: Wed, 17 Sep 2025 09:42:05 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E6=94=B9=E8=BF=9B=E4=B8=8B=E6=8B=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |   8 +-
 src/pages/courseDetail/index.vue              |   1 +
 .../components/examRecordList.vue             |  87 +++----
 .../components/practiceRecordList.vue         |  87 +++----
 .../components/studyRecordItem.vue            |   1 +
 .../components/studyRecordList.vue            |  88 +++----
 src/pages/courseRecord/index.vue              | 122 ++++------
 .../components/examRecordItem.vue             |  11 +-
 .../components/examRecordList.vue             |  68 ------
 src/pages/examinationRecord/index.vue         |  73 +++---
 .../favorites/components/favoritesCourse.vue  | 158 +++++--------
 .../favorites/components/favoritesTask.vue    | 217 ++++++++----------
 src/pages/favorites/index.vue                 | 144 +++++-------
 src/pages/index/dialog.vue                    |   1 +
 .../learningTasks/components/content.vue      |   4 -
 src/pages/learningTasks/index.vue             |  25 +-
 .../preview/components/previewCourse.vue      | 103 +++------
 src/pages/preview/index.vue                   | 126 +++++-----
 18 files changed, 493 insertions(+), 831 deletions(-)
 delete mode 100644 src/pages/examinationRecord/components/examRecordList.vue

diff --git a/.env.development b/.env.development
index d09195dc..5b24174e 100644
--- a/.env.development
+++ b/.env.development
@@ -1,17 +1,17 @@
 # 开发环境
 ENV = 'development'
 # 'development'
-
+VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
 # UAT
 # VITE_APP_BASE_API_Url = 'http://25.18.122.78:9786'
 
 # DEV
-VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
 
 # app入口
-#VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002'
+
+
 #VITE_APP_BASE_API_Url = 'http://25.16.122.65:7001'
-#VITE_APP_BASE_API_Url = 'http://25.16.122.91:9786'
+# VITE_APP_BASE_API_Url = 'http://25.16.122.92:9786'
 #VITE_APP_BASE_API_Url = 'http://25.18.122.66:9786'
 
 # h5专用地址x2
diff --git a/src/pages/courseDetail/index.vue b/src/pages/courseDetail/index.vue
index 1a20ef05..2de16cca 100644
--- a/src/pages/courseDetail/index.vue
+++ b/src/pages/courseDetail/index.vue
@@ -286,6 +286,7 @@
 			if (pages.length >= 2) {
 				const prevPage = pages[pages.length - 2];
 				if (prevPage.route === 'pages/favorites/index') {
+					
 					uni.$emit('refresh_favorites_list', {
 						type: 'course',
 						state: !!form.value.collectId, // 最终是收藏了还是取消了
diff --git a/src/pages/courseRecord/components/examRecordList.vue b/src/pages/courseRecord/components/examRecordList.vue
index 5d4a33ec..ffbc474e 100644
--- a/src/pages/courseRecord/components/examRecordList.vue
+++ b/src/pages/courseRecord/components/examRecordList.vue
@@ -1,68 +1,41 @@
 <template>
-	<view class="scroll_div">
-		<scroll-view scroll-y="true" class="scroll-Y" @scrolltolower="scrolltolower" :show-scrollbar="false">
-			<itemVue :item="item" v-for="(item, index) in data_list"></itemVue>
-			<list-no-data v-if="total === 0 && status == 'nomore'">暂无记录</list-no-data>
-			<uv-load-more v-if="total !== 0" :status="status" loadmore-text="轻轻上拉加载" :height="30"></uv-load-more>
-		</scroll-view>
-	</view>
+	<z-paging
+		ref="pagingRef"
+		v-model="data_list"
+		@query="queryList"
+		class="scroll_div"
+		:auto="false"
+		empty-view-text="暂无记录"
+	>
+		<view class="scroll-Y">
+			<itemVue :item="item" v-for="item in data_list"></itemVue>
+		</view>
+	</z-paging>
 </template>
-<script setup>
+<script setup lang="ts">
 	import itemVue from './examRecordItem.vue';
-	import { ref, reactive } from 'vue';
+	import { ref, reactive, onMounted, watch } from 'vue';
 	import { queryCrsExamRecordPaging } from '@/api/courseRecord.js';
-	const status = ref('loading'); // loadmore - 加载前，loading - 加载中，nomore - 没有数据
-	const limit = 20;
-	const total = ref(-1);
-	const page = ref(0);
-	const data_list = reactive([]);
-
-	const getData = (from = '') => {
-		if (from === 'first') {
-			if (total.value !== -1) {
-				return;
-			}
-			status.value = 'loading';
-			total.value = -1;
-			page.value = 1;
-			data_list.length = 0;
-		} else {
-			if (status.value !== 'loadmore' && status.value !== '') return;
-			status.value = 'loading';
-			page.value++;
-		}
-		queryCrsExamRecordPaging({
-			page: page.value,
-			limit: limit
-		})
-			.then((res) => {
-				total.value = res.total;
-				data_list.push(...res.body);
-			})
-			.finally(() => {
-				if (data_list.length >= total.value) {
-					status.value = 'nomore';
-				} else {
-					status.value = 'loadmore';
-				}
-			});
-	};
-
-	const scrolltolower = () => {
-		getData();
-	};
-
-	defineExpose({
-		getData
+	import useZpaging from '@/composables/useZpaging';
+	const { pagingRef, queryList, data_list, reload, total } = useZpaging({
+		fetchFunction: queryCrsExamRecordPaging
+	});
+	const props = defineProps<{
+		tabIndex: number;
+		currentIndex: number;
+	}>();
+	onMounted(() => {
+		watch(
+			() => props.currentIndex,
+			(v) => v === props.tabIndex && total.value === -1 && reload(),
+			{ immediate: true }
+		);
 	});
 </script>
 
 <style scoped lang="scss">
-	.scroll_div {
-		background-color: #f1f5fa;
-	}
-
 	.scroll-Y {
-		height: calc(100vh - var(--status-bar-height) - 88rpx - 88rpx - 30rpx);
+		background-color: #f1f5fa;
+		height: 100%;
 	}
 </style>
diff --git a/src/pages/courseRecord/components/practiceRecordList.vue b/src/pages/courseRecord/components/practiceRecordList.vue
index dc5ea6c9..cab11185 100644
--- a/src/pages/courseRecord/components/practiceRecordList.vue
+++ b/src/pages/courseRecord/components/practiceRecordList.vue
@@ -1,68 +1,41 @@
 <template>
-	<view class="scroll_div">
-		<scroll-view scroll-y="true" class="scroll-Y" @scrolltolower="scrolltolower" :show-scrollbar="false">
-			<itemVue :item="item" v-for="(item, index) in data_list"></itemVue>
-			<list-no-data v-if="total === 0 && status == 'nomore'">暂无记录</list-no-data>
-			<uv-load-more v-if="total !== 0" :status="status" loadmore-text="轻轻上拉加载" :height="30"></uv-load-more>
-		</scroll-view>
-	</view>
+	<z-paging
+		ref="pagingRef"
+		v-model="data_list"
+		@query="queryList"
+		class="scroll_div"
+		:auto="false"
+		empty-view-text="暂无记录"
+	>
+		<view class="scroll-Y">
+			<itemVue :item="item" v-for="item in data_list"></itemVue>
+		</view>
+	</z-paging>
 </template>
-<script setup>
+<script setup lang="ts">
 	import itemVue from './practiceRecordItem.vue';
-	import { ref, reactive } from 'vue';
+	import { ref, reactive, onMounted, watch } from 'vue';
+	import useZpaging from '@/composables/useZpaging';
 	import { queryPracticeRecordPaging } from '@/api/courseRecord.js';
-	const status = ref('loading'); // loadmore - 加载前，loading - 加载中，nomore - 没有数据
-	const limit = 20;
-	const total = ref(-1);
-	const page = ref(0);
-	const data_list = reactive([]);
-
-	const getData = (from = '') => {
-		if (from === 'first') {
-			if (total.value !== -1) {
-				return;
-			}
-			status.value = 'loading';
-			total.value = -1;
-			page.value = 1;
-			data_list.length = 0;
-		} else {
-			if (status.value !== 'loadmore' && status.value !== '') return;
-			status.value = 'loading';
-			page.value++;
-		}
-		queryPracticeRecordPaging({
-			page: page.value,
-			limit: limit
-		})
-			.then((res) => {
-				total.value = res.total;
-				data_list.push(...res.body);
-			})
-			.finally(() => {
-				if (data_list.length >= total.value) {
-					status.value = 'nomore';
-				} else {
-					status.value = 'loadmore';
-				}
-			});
-	};
-
-	const scrolltolower = () => {
-		getData();
-	};
-
-	defineExpose({
-		getData
+	const { pagingRef, queryList, data_list, reload, total } = useZpaging({
+		fetchFunction: queryPracticeRecordPaging
+	});
+	const props = defineProps<{
+		tabIndex: number;
+		currentIndex: number;
+	}>();
+	onMounted(() => {
+		watch(
+			() => props.currentIndex,
+			(v) => v === props.tabIndex && total.value === -1 && reload(),
+			{ immediate: true }
+		);
 	});
 </script>
 
 <style scoped lang="scss">
-	.scroll_div {
-		background-color: #f1f5fa;
-	}
-
 	.scroll-Y {
-		height: calc(100vh - var(--status-bar-height) - 88rpx - 88rpx - 30rpx);
+		background-color: #f1f5fa;
+		height: 100%;
 	}
 </style>
diff --git a/src/pages/courseRecord/components/studyRecordItem.vue b/src/pages/courseRecord/components/studyRecordItem.vue
index 491aef22..7b017933 100644
--- a/src/pages/courseRecord/components/studyRecordItem.vue
+++ b/src/pages/courseRecord/components/studyRecordItem.vue
@@ -58,6 +58,7 @@
 </template>
 
 <script setup>
+	console.log('学习组件');
 	import { computed } from 'vue';
 	import common from '@/common/common';
 	import { queryStdyBatchByCrsId } from '@/api/courseRecord.js';
diff --git a/src/pages/courseRecord/components/studyRecordList.vue b/src/pages/courseRecord/components/studyRecordList.vue
index ae9c78e8..b9b70398 100644
--- a/src/pages/courseRecord/components/studyRecordList.vue
+++ b/src/pages/courseRecord/components/studyRecordList.vue
@@ -1,70 +1,42 @@
 <template>
-	<view class="scroll_div">
-		<scroll-view scroll-y="true" class="scroll-Y" @scrolltolower="scrolltolower" :show-scrollbar="false">
-			<itemVue :item="item"  v-for="(item, index) in data_list" ></itemVue>
-			<list-no-data v-if="total === 0 && status == 'nomore'">暂无记录</list-no-data>
-			<uv-load-more v-if="total !== 0" :status="status" loadmore-text="轻轻上拉加载" :height="30"></uv-load-more>
-		</scroll-view>
-	</view>
+	<z-paging
+		ref="pagingRef"
+		v-model="data_list"
+		@query="queryList"
+		class="scroll_div"
+		:auto="false"
+		empty-view-text="暂无记录"
+	>
+		<view class="scroll-Y">
+			<itemVue :item="item" v-for="item in data_list"></itemVue>
+		</view>
+	</z-paging>
 </template>
-<script setup>
+<script setup lang="ts">
 	import itemVue from './studyRecordItem.vue';
-	import { ref, reactive} from 'vue';
+	import { ref, reactive, onMounted, watch } from 'vue';
 	import { queryStdyRecordPaging } from '@/api/courseRecord.js';
-	const status = ref('loading'); // loadmore - 加载前，loading - 加载中，nomore - 没有数据
-	const limit = 20;
-	const total = ref(-1);
-	const page = ref(0);
-	const data_list = reactive([]);
-	
-	const getData = (from = '') => {
-		if (from === 'first') {
-			if (total.value !== -1) {
-				return;
-			}
-			status.value = 'loading';
-			total.value = -1;
-			page.value = 1;
-			data_list.length = 0;
-		} else {
-			if (status.value !== 'loadmore' && status.value !== '') return;
-			status.value = 'loading';
-			page.value++;
-		}
-		
-		queryStdyRecordPaging({
-			page: page.value,
-			limit: limit
-		})
-			.then((res) => {
-				total.value = res.total;
-				data_list.push(...res.body);
-			})
-			.finally(() => {
-				if (data_list.length >= total.value) {
-					status.value = 'nomore';
-				} else {
-					status.value = 'loadmore';
-				}
-			});
-		
-	};
-
-	const scrolltolower = () => {
-		getData();
-	};
-
-	defineExpose({
-		getData
+	import useZpaging from '@/composables/useZpaging';
+	const { pagingRef, queryList, data_list, reload, total } = useZpaging({
+		fetchFunction: queryStdyRecordPaging
+	});
+	const props = defineProps<{
+		tabIndex: number;
+		currentIndex: number;
+	}>();
+	onMounted(() => {
+		watch(
+			() => props.currentIndex,
+			(v) => v === props.tabIndex && total.value === -1 && reload(),
+			{ immediate: true }
+		);
 	});
 </script>
 
 <style scoped lang="scss">
-	.scroll_div {
+	.scroll-Y {
 		background-color: #f1f5fa;
+		height: 100%;
 	}
 	
-	.scroll-Y {
-		height: calc(100vh - var(--status-bar-height) - 88rpx - 88rpx - 30rpx);
-	}
 </style>
diff --git a/src/pages/courseRecord/index.vue b/src/pages/courseRecord/index.vue
index 7463f6e4..4c990064 100644
--- a/src/pages/courseRecord/index.vue
+++ b/src/pages/courseRecord/index.vue
@@ -1,54 +1,63 @@
 <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>
+	<z-paging-swiper>
+		<template #top>
+			<view class="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">
+					<view class="body-tab">
+						<uv-tabs
+							class="font_pf my_tabs"
+							:current="tabAct"
+							:list="tabList"
+							@change="tabChange"
+							:scrollable="false"
+							line-color="#0066FF"
+							:inactive-style="{ color: '#333333', fontSize: '30rpx', fontWeight: '600' }"
+							:activeStyle="{ color: '#0066FF', fontSize: '30rpx', fontWeight: '600' }"
+							:lineColor="`url(${LineBg}) 10% 10%`"
+						></uv-tabs>
+					</view>
+				</view>
 			</view>
-			<view class="title font_pf">课程记录</view>
-		</view>
-	
-		<view class="detail-body">
-			<view class="body-tab">
-				<uv-tabs
-					class="font_pf my_tabs"
-					:current="tabAct"
-					:list="tabList"
-					@change="tabChange"
-					:scrollable="false"
-					line-color="#0066FF"
-					:inactive-style="{ color: '#333333', fontSize: '30rpx', fontWeight: '600' }"
-					:activeStyle="{ color: '#0066FF', fontSize: '30rpx', fontWeight: '600' }"
-					:lineColor="`url(${LineBg}) 10% 10%`"
-				></uv-tabs>
-			</view>
-			<view class="uni-margin-wrap no-overflow">
-				<swiper class="swiper" :current="tabAct" :indicator-dots="false" @change="swiperChange">
-					<swiper-item>
-						<studyRecordList :ref="(el) => (listItemRefs[0] = el)"></studyRecordList>
-					</swiper-item>
-					<swiper-item>
-						<practiceRecordList :ref="(el) => (listItemRefs[1] = el)"></practiceRecordList>
-					</swiper-item>
-					<swiper-item>
-						<examRecordList :ref="(el) => (listItemRefs[2] = el)"></examRecordList>
-					</swiper-item>
-				</swiper>
-			</view>
-		</view>
-	</view>
+		</template>
+		<swiper class="swiper" :current="tabAct" :indicator-dots="false" @change="swiperChange">
+			<swiper-item class="swiper-item">
+				<studyRecordList
+					:ref="(el) => (listItemRefs[0] = el)"
+					:tabIndex="0"
+					:currentIndex="tabAct"
+				></studyRecordList>
+			</swiper-item>
+			<swiper-item class="swiper-item">
+				<practiceRecordList
+					:ref="(el) => (listItemRefs[1] = el)"
+					:tabIndex="1"
+					:currentIndex="tabAct"
+				></practiceRecordList>
+			</swiper-item>
+			<swiper-item class="swiper-item">
+				<examRecordList :ref="(el) => (listItemRefs[2] = el)" :tabIndex="2" :currentIndex="tabAct"></examRecordList>
+			</swiper-item>
+		</swiper>
+	</z-paging-swiper>
 </template>
 
 <script setup>
 	import { LineBg } from '@/enum.js';
-
 	import studyRecordList from './components/studyRecordList.vue';
 	import practiceRecordList from './components/practiceRecordList.vue';
 	import examRecordList from './components/examRecordList.vue';
 	import { ref, onMounted, watch } from 'vue';
 	import common from '@/common/common.js';
-	const listItemRefs = ref([]);
-	const tabAct = ref(0);
+	import useIndexList from '@/composables/useIndexList.js';
+	const { tabAct, listItemRefs, tabChange, swiperChange } = useIndexList();
+
 	const tabList = ref([
 		{
 			name: '学习记录'
@@ -60,30 +69,10 @@
 			name: '考试记录'
 		}
 	]);
-
-	const tabChange = (item) => {
-		tabAct.value = item.index;
-	};
-	const swiperChange = (item) => {
-		tabAct.value = item.detail.current;
-	};
-	onMounted(() => {
-		watch(
-			tabAct,
-			(newValue) => {
-				typeof listItemRefs.value[newValue]?.getData === 'function' &&
-					listItemRefs.value[newValue]?.getData('first');
-			},
-			{
-				immediate: true
-			}
-		);
-	});
 </script>
 
 <style lang="scss" scoped>
 	$bg-margin-left: 50rpx;
-
 	.my_tabs {
 		// 解决这个圆角的图片，开穿透
 		:deep(.uv-tabs__wrapper__nav__line) {
@@ -95,21 +84,12 @@
 	}
 
 	.swiper {
-		/*
-		状态栏 var(--status-bar-height)
-		标题高度88rpx
-		tab切换栏高度88rpx
-		下方滑动区域上下边距各10共20rpx
-		**/
-
-		height: calc(100vh - var(--status-bar-height) - 88rpx - 88rpx - 30rpx);
+		height: 100%;
 	}
-
 	.swiper-item {
 		display: block;
 		height: 100%;
-		line-height: 300rpx;
-		text-align: center;
+		background-color: #f1f5fa;
 	}
 
 	.detail-body {
diff --git a/src/pages/examinationRecord/components/examRecordItem.vue b/src/pages/examinationRecord/components/examRecordItem.vue
index 50c47283..2184f37d 100644
--- a/src/pages/examinationRecord/components/examRecordItem.vue
+++ b/src/pages/examinationRecord/components/examRecordItem.vue
@@ -1,16 +1,13 @@
 <template>
 	<view class="item">
 		<view class="details_div">
-			<!-- <view class="img_div"> -->
-				<!-- <image-preview class="img" :src="item.ossAddr" mode="scaleToFill"></image-preview> -->
-			<!-- </view> -->
 			<view class="right_div">
 				<view class="title ellipsis-text">
 					{{ item.examName }}
 				</view>
 				<view class="prompt_div">
 					<view class="prompt_div_left">
-						<view class="top">{{ item.flagQuery === 'Y'?item.highestGrade:'--' || 0 }}</view>
+						<view class="top">{{ item.flagQuery === 'Y' ? item.highestGrade : '--' || 0 }}</view>
 						<view class="bottom">历史最高分</view>
 					</view>
 					<view class="prompt_div_line"></view>
@@ -19,7 +16,7 @@
 							{{ item.examCnt || 0 }}
 							<uv-icon
 								class="click_text_icon"
-								:class="{click_text_icon_action:show_list_state}"
+								:class="{ click_text_icon_action: show_list_state }"
 								name="arrow-right"
 								color="#0066FF"
 								size="12"
@@ -40,7 +37,7 @@
 					</view>
 					<view class="list_small_item">
 						<image src="@/static/images/courseRecord/duration.png" class="icon_img"></image>
-						<view class="prompt">考试得分：{{ item_list.flagQuery === 'Y'?item_list.examGrade:'--' }}</view>
+						<view class="prompt">考试得分：{{ item_list.flagQuery === 'Y' ? item_list.examGrade : '--' }}</view>
 					</view>
 				</view>
 				<view class="fl1"></view>
@@ -225,7 +222,7 @@
 								/* 添加过渡动画，包含延迟效果 */
 								transition: transform 0.2s ease;
 							}
-							.click_text_icon_action{
+							.click_text_icon_action {
 								transform: rotate(90deg);
 							}
 						}
diff --git a/src/pages/examinationRecord/components/examRecordList.vue b/src/pages/examinationRecord/components/examRecordList.vue
deleted file mode 100644
index 0f9ffedc..00000000
--- a/src/pages/examinationRecord/components/examRecordList.vue
+++ /dev/null
@@ -1,68 +0,0 @@
-<template>
-	<view class="scroll_div">
-		<scroll-view scroll-y="true" class="scroll-Y" @scrolltolower="scrolltolower" :show-scrollbar="false">
-			<itemVue :item="item" v-for="(item, index) in data_list"></itemVue>
-			<list-no-data v-if="total === 0 && status == 'nomore'">暂无记录</list-no-data>
-			<uv-load-more v-if="total !== 0" :status="status" loadmore-text="轻轻上拉加载" :height="30"></uv-load-more>
-		</scroll-view>
-	</view>
-</template>
-<script setup>
-	import itemVue from './examRecordItem.vue';
-	import { ref, reactive } from 'vue';
-	import { queryExamRecordPaging } from '@/api/courseRecord.js';
-	const status = ref('loading'); // loadmore - 加载前，loading - 加载中，nomore - 没有数据
-	const limit = 20;
-	const total = ref(-1);
-	const page = ref(0);
-	const data_list = reactive([]);
-
-	const getData = (from = '') => {
-		if (from === 'first') {
-			if (total.value !== -1) {
-				return;
-			}
-			status.value = 'loading';
-			total.value = -1;
-			page.value = 1;
-			data_list.length = 0;
-		} else {
-			if (status.value !== 'loadmore' && status.value !== '') return;
-			status.value = 'loading';
-			page.value++;
-		}
-		queryExamRecordPaging({
-			page: page.value,
-			limit: limit
-		})
-			.then((res) => {
-				total.value = res.total;
-				data_list.push(...res.body);
-			})
-			.finally(() => {
-				if (data_list.length >= total.value) {
-					status.value = 'nomore';
-				} else {
-					status.value = 'loadmore';
-				}
-			});
-	};
-
-	const scrolltolower = () => {
-		getData();
-	};
-
-	defineExpose({
-		getData
-	});
-</script>
-
-<style scoped lang="scss">
-	.scroll_div {
-		background-color: #f1f5fa;
-	}
-
-	.scroll-Y {
-		height: calc(100vh - var(--status-bar-height) - 88rpx - 88rpx - 30rpx);
-	}
-</style>
diff --git a/src/pages/examinationRecord/index.vue b/src/pages/examinationRecord/index.vue
index 8e0fd61f..9bbab722 100644
--- a/src/pages/examinationRecord/index.vue
+++ b/src/pages/examinationRecord/index.vue
@@ -1,59 +1,34 @@
 <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>
+	<z-paging ref="pagingRef" v-model="data_list" @query="queryList" class="scroll_div" empty-view-text="暂无记录">
+		<template #top>
+			<view class="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>
-			<view class="title font_pf">考试记录</view>
+		</template>
+		<view class="scroll-Y">
+			<itemVue :item="item" v-for="item in data_list"></itemVue>
 		</view>
-		<view class="detail-body">
-			<examRecordList ref="listItemRef"></examRecordList>
-		</view>
-	</view>
+	</z-paging>
 </template>
 
 <script setup>
-	import examRecordList from './components/examRecordList.vue';
-	import { ref, onMounted } from 'vue';
+	import itemVue from './components/examRecordItem.vue';
+	import { queryExamRecordPaging } from '@/api/courseRecord.js';
+	import useZpaging from '@/composables/useZpaging.js';
 	import common from '@/common/common.js';
-	const listItemRef = ref(null);
-	onMounted(() => {
-		listItemRef.value?.getData('first');
+	const { pagingRef, queryList, data_list, reload, search, total, clear } = useZpaging({
+		fetchFunction: queryExamRecordPaging
 	});
 </script>
 
 <style lang="scss" scoped>
 	$bg-margin-left: 50rpx;
-
-	.my_tabs {
-		// 解决这个圆角的图片，开穿透
-		:deep(.uv-tabs__wrapper__nav__line) {
-			height: 26rpx !important;
-			left: 60rpx;
-			background-size: 28rpx !important;
-			background-repeat: no-repeat !important;
-		}
-	}
-
-	.swiper {
-		/*
-		状态栏 var(--status-bar-height)
-		标题高度88rpx
-		tab切换栏高度88rpx
-		下方滑动区域上下边距各10共20rpx
-		**/
-
-		height: calc(100vh - var(--status-bar-height) - 88rpx - 88rpx - 30rpx);
-	}
-
-	.swiper-item {
-		display: block;
-		height: 100%;
-		line-height: 300rpx;
-		text-align: center;
-	}
-
 	.detail-body {
 		background: #ffffff;
 		border-radius: 15rpx;
@@ -131,4 +106,14 @@
 			}
 		}
 	}
+	.scroll-Y {
+		background-color: #f1f5fa;
+		border-radius: 16rpx;
+		// padding: 17rpx 12rpx 0 22rpx;
+		// margin: 17rpx 20rpx;
+	}
+	.scroll_div {
+		background-color: #f1f5fa;
+		// padding: 22rpx;
+	}
 </style>
diff --git a/src/pages/favorites/components/favoritesCourse.vue b/src/pages/favorites/components/favoritesCourse.vue
index 56a99ce1..15384c26 100644
--- a/src/pages/favorites/components/favoritesCourse.vue
+++ b/src/pages/favorites/components/favoritesCourse.vue
@@ -1,52 +1,55 @@
 <template>
-	<view class="scroll_div">
-		<scroll-view scroll-y="true" class="scroll-Y" @scrolltolower="scrolltolower" :show-scrollbar="false">
-			<uv-swipe-action :autoClose="true">
-				<uv-swipe-action-item
-					class="item-swipe-action"
-					:options="options"
-					:threshold="40"
-					:index="index"
-					:name="index"
-					v-for="(item, index) in data_list"
-					@click="swipeActionClick"
-				>
-					<view class="item" @touchmove.stop @click="click_item(item)">
-						<view class="img_div">
-							<image-preview class="img" :src="item?.ossAddr" mode="scaleToFill"></image-preview>
-							<view class="subscript">{{ item.evalGrade ?? 0 }}分</view>
+	<z-paging
+		ref="pagingRef"
+		v-model="data_list"
+		@query="queryList"
+		:auto="false"
+		empty-view-text="暂无数据"
+		paging-class="pagingClass"
+	>
+		<uv-swipe-action :autoClose="true">
+			<uv-swipe-action-item
+				class="item-swipe-action"
+				:options="options"
+				:threshold="40"
+				:index="index"
+				:name="index"
+				v-for="(item, index) in data_list"
+				@click="swipeActionClick"
+			>
+				<view class="item" @touchmove.stop @click="click_item(item)">
+					<view class="img_div">
+						<image-preview class="img" :src="item?.ossAddr" mode="scaleToFill"></image-preview>
+						<view class="subscript">{{ item.evalGrade ?? 0 }}分</view>
+					</view>
+					<view class="right_div">
+						<view class="title ellipsis-text">
+							{{ item.crsName }}
 						</view>
-						<view class="right_div">
-							<view class="title ellipsis-text">
-								{{ item.crsName }}
-							</view>
-							<view class="tag_div">
-								<view class="tag" v-for="tagItem in item?.tagCataList ?? []">
-									{{ tagItem?.tagName }}
-								</view>
-							</view>
-							<view class="time_and_num">
-								<view class="mr-10">发布：{{ item.issuTm?.substr(0, 10) }}</view>
-								<view>已学：{{ item.accmStdyCnt }}次</view>
+						<view class="tag_div">
+							<view class="tag" v-for="tagItem in item?.tagCataList ?? []">
+								{{ tagItem?.tagName }}
 							</view>
 						</view>
+						<view class="time_and_num">
+							<view class="mr-10">发布：{{ item.issuTm?.substr(0, 10) }}</view>
+							<view>已学：{{ item.accmStdyCnt }}次</view>
+						</view>
 					</view>
-				</uv-swipe-action-item>
-			</uv-swipe-action>
-			<list-no-data v-if="total === 0 && status == 'nomore'">暂无数据</list-no-data>
-			<uv-load-more v-if="total !== 0" :status="status" loadmore-text="轻轻上拉加载" :height="30"></uv-load-more>
-		</scroll-view>
-	</view>
+				</view>
+			</uv-swipe-action-item>
+		</uv-swipe-action>
+	</z-paging>
 </template>
 <script setup>
-	const status = ref('loading'); // loadmore - 加载前，loading - 加载中，nomore - 没有数据
-	const limit = 20;
-	const total = ref(-1);
-	const page = ref(0);
-	const data_list = reactive([]);
-	import { ref, reactive} from 'vue';
+	import { ref, reactive, onMounted, watch } from 'vue';
 	import { queryTraPersonalCollectionCrsPaging, deleteTraPersonalCollectionById } from '@/api/favorites.js';
 	import common from '@/common/common';
+	import useZpaging from '@/composables/useZpaging';
+	const { pagingRef, queryList, data_list, reload, total } = useZpaging({
+		fetchFunction: queryTraPersonalCollectionCrsPaging
+	});
+
 	const options = [
 		{
 			text: '删除',
@@ -55,39 +58,7 @@
 			}
 		}
 	];
-	const getData = (from = '') => {
-		console.log('status.value', status.value);
-		if (from === 'first') {
-			if (total.value !== -1) {
-				return;
-			}
-			status.value = 'loading';
-			total.value = -1;
-			page.value = 1;
-			data_list.length = 0;
-		} else {
-			if (status.value !== 'loadmore' && status.value !== '') return;
-			status.value = 'loading';
-			page.value++;
-		}
 
-		queryTraPersonalCollectionCrsPaging({
-			page: page.value,
-			limit: limit
-		})
-			.then((res) => {
-				total.value = res.total;
-				data_list.push(...res.body);
-			})
-			.finally(() => {
-				if (data_list.length >= total.value) {
-					status.value = 'nomore';
-				} else {
-					status.value = 'loadmore';
-				}
-				console.log('status.value', status.value);
-			});
-	};
 	// 进入课程详情页
 	const click_item = (item) => {
 		common.navigateTo(`/pages/courseDetail/index?crsId=${item.crsId}&collectId=${item.collectId}`);
@@ -108,52 +79,41 @@
 				});
 		});
 	};
-	const scrolltolower = () => {
-		getData();
-	};
-	const refreshData = () => {
-		total.value = -1;
-		getData('first');
-	};
 
-	const updateData = (item) => {
-		console.log('收藏的updateData');
-		
-	};
-	
+
+
 	defineExpose({
-		getData,
-		updateData,
-		refreshData
+	
+	});
+
+	const props = defineProps(['tabIndex', 'currentIndex']);
+	onMounted(() => {
+		watch(
+			() => props.currentIndex,
+			(v) => v === props.tabIndex && total.value === -1 && reload(),
+			{ immediate: true }
+		);
 	});
 </script>
 
 <style scoped lang="scss">
-	.scroll_div {
-		background-color: #f1f5fa;
-		padding: 22rpx;
-	}
-
-	.scroll-Y {
-		height: calc(100vh - var(--status-bar-height) - 54rpx - 88rpx - 20rpx - 44rpx);
+	.pagingClass {
+		width: calc(100% - 44rpx);
+		margin: 22rpx auto;
 		background-color: #fff;
 		border-radius: 16rpx;
 	}
-
 	.item-swipe-action {
 		margin: 32rpx 22rpx;
 		overflow: hidden;
-
 		:deep(.uv-swipe-action-item__right__button__wrapper) {
 			border-radius: 20rpx !important;
 		}
 	}
 
-	.scroll-Y .item {
+	.item {
 		height: 170rpx;
 		display: flex;
-		// background-color: red;
-
 		.img_div {
 			position: relative;
 			width: 224rpx;
diff --git a/src/pages/favorites/components/favoritesTask.vue b/src/pages/favorites/components/favoritesTask.vue
index f689e461..7491eece 100644
--- a/src/pages/favorites/components/favoritesTask.vue
+++ b/src/pages/favorites/components/favoritesTask.vue
@@ -1,66 +1,73 @@
 <template>
-	<view class="scroll_div">
-		<scroll-view scroll-y="true" class="scroll-Y" @scrolltolower="scrolltolower" :show-scrollbar="false">
-			<uv-swipe-action :autoClose="true">
-				<uv-swipe-action-item
-					class="item-swipe-action"
-					:options="options"
-					:threshold="40"
-					:index="index"
-					:name="index"
-					v-for="(item, index) in data_list"
-					@click="swipeActionClick"
-				>
-					<view class="item" :class="getStatusClass(item.isFinish)" @touchmove.stop @click="click_item(item)">
-						<view class="img_div">
-							<image-preview class="img" :src="item?.ossAddr" mode="scaleToFill"></image-preview>
-							<view class="subscript" v-if="item.isFinish === '02'">已完成</view>
-							<view class="subscript" v-else>未完成</view>
+	<z-paging
+		ref="pagingRef"
+		v-model="data_list"
+		@query="queryList"
+		:auto="false"
+		empty-view-text="暂无数据"
+		paging-class="pagingClass"
+	>
+		<uv-swipe-action :autoClose="true">
+			<uv-swipe-action-item
+				class="item-swipe-action"
+				:options="options"
+				:threshold="40"
+				:index="index"
+				:name="index"
+				v-for="(item, index) in data_list"
+				@click="swipeActionClick"
+			>
+				<view class="item" :class="getStatusClass(item.isFinish)" @touchmove.stop @click="click_item(item)">
+					<view class="img_div">
+						<image-preview class="img" :src="item?.ossAddr" mode="scaleToFill"></image-preview>
+						<view class="subscript" v-if="item.isFinish === '02'">已完成</view>
+						<view class="subscript" v-else>未完成</view>
+					</view>
+					<view class="right_div">
+						<view class="title ellipsis-text">
+							{{ item.taskName }}
 						</view>
-						<view class="right_div">
-							<view class="title ellipsis-text">
-								{{ item.taskName }}
+						<view class="time_div">
+							起止时间：
+							<text class="blod_color">
+								{{ item.startTm?.substr(0, 10) }}至{{ item.endTm?.substr(0, 10) }}
+							</text>
+						</view>
+						<view class="people_progress_div">
+							<view class="mr-10">
+								完成人数：
+								<text class="blod_color">{{ item.taskFinishSums ?? 0 }}/{{ item.taskSums ?? 0 }}</text>
 							</view>
-							<view class="time_div">
-								起止时间：
+							<view>
+								进度：
 								<text class="blod_color">
-									{{ item.startTm?.substr(0, 10) }}至{{ item.endTm?.substr(0, 10) }}
+									{{ item.finishCrs ?? item.learnedNumber ?? 0 }}/{{
+										item.sumCrs ?? item.taskNumber ?? 0
+									}}门课程
 								</text>
 							</view>
-							<view class="people_progress_div">
-								<view class="mr-10">
-									完成人数：
-									<text class="blod_color">{{ item.taskFinishSums ?? 0 }}/{{ item.taskSums ?? 0 }}</text>
-								</view>
-								<view>
-									进度：
-									<text class="blod_color">{{ item.finishCrs ?? item.learnedNumber ?? 0 }}/{{ item.sumCrs ?? item.taskNumber ?? 0 }}门课程</text>
-								</view>
-								<!-- <view>
+							<!-- <view>
 									我的进度：
 									<text class="blod_color">{{ item.myProcess ?? 0 }}%</text>
 								</view> -->
-							</view>
 						</view>
 					</view>
-				</uv-swipe-action-item>
-			</uv-swipe-action>
-			<list-no-data v-if="total === 0 && status == 'nomore'">暂无数据</list-no-data>
-			<uv-load-more v-if="total !== 0" :status="status" loadmore-text="轻轻上拉加载" :height="30"></uv-load-more>
-		</scroll-view>
-	</view>
+				</view>
+			</uv-swipe-action-item>
+		</uv-swipe-action>
+	</z-paging>
 </template>
 <script setup>
-	import { ref, reactive} from 'vue';
-	import { queryTraPersonalCollectionTaskPaging,deleteTraPersonalCollectionById } from '@/api/favorites.js';
+	import { ref, reactive, onMounted, watch } from 'vue';
+	import { queryTraPersonalCollectionTaskPaging, deleteTraPersonalCollectionById } from '@/api/favorites.js';
 	import { setPageCache } from '@/common/common';
 	import common from '@/common/common';
 
-	const status = ref('loading'); // loadmore - 加载前，loading - 加载中，nomore - 没有数据
-	const limit = 20;
-	const total = ref(-1);
-	const page = ref(0);
-	const data_list = reactive([]);
+	import useZpaging from '@/composables/useZpaging';
+	const { pagingRef, queryList, data_list, reload, total } = useZpaging({
+		fetchFunction: queryTraPersonalCollectionTaskPaging
+	});
+
 	const options = [
 		{
 			text: '删除',
@@ -69,39 +76,7 @@
 			}
 		}
 	];
-	const getData = (from = '') => {
-		if (from === 'first') {
-			if (total.value !== -1) {
-				return;
-			}
-			status.value = 'loading';
-			total.value = -1;
-			page.value = 1;
-			data_list.length = 0;
-		} else {
-			if (status.value !== 'loadmore' && status.value !== '') return;
-			status.value = 'loading';
-			page.value++;
-		}
-		setTimeout(() => {
-			queryTraPersonalCollectionTaskPaging({
-				page: page.value,
-				limit: limit
-			})
-				.then((res) => {
-					total.value = res.total;
-					data_list.push(...res.body);
-				})
-				.finally(() => {
-					if (data_list.length >= total.value) {
-						status.value = 'nomore';
-					} else {
-						status.value = 'loadmore';
-					}
-				});
-		}, 200);
-	};
-	
+
 	const swipeActionClick = (click_item) => {
 		const index = click_item['name'];
 		const item = data_list[index];
@@ -118,13 +93,13 @@
 				});
 		});
 	};
-	
+
 	// 跳转到详情
 	const click_item = (item) => {
-		if(item.limitTyp === '02') {
-			if(item.isTimeOut === '01') {
+		if (item.limitTyp === '02') {
+			if (item.isTimeOut === '01') {
 				return common.msg('任务未开始');
-			} else if(item.isTimeOut === '02') {
+			} else if (item.isTimeOut === '02') {
 				return common.msg('任务已结束');
 			}
 		}
@@ -132,52 +107,51 @@
 		common.navigateTo(`/pages/learningTasks/details?collectId=${item.collectionId}`);
 	};
 	const getStatusClass = (isFinish) => {
-		// 01进行中、02已完成、03已超时
-		// if (isFinish === '00') return 'in_progress';
-		// if (isFinish === '01') return 'completed';
-		// return 'expired';
 		if (isFinish === '02') return 'completed';
 		return 'expired';
 	};
-	const scrolltolower = (item) => {
-		getData();
-	};
-	const refreshData = (params) => {
-		total.value = -1;
-		getData('first');
-		console.log('子组件refreshData');
-	};
-	
-	const updateData = (item) => {
-		console.log('收藏的updateData', item);
-		console.log('收藏的updatedata_list', data_list);
-		const index = data_list.findIndex((res) => res.taskId === item.taskId);
-		console.log('updateData', index, item);
-		if (index !== -1) {
-			data_list[index] = item;
-		}
-	};
-	
+
+	const props = defineProps(['tabIndex', 'currentIndex']);
+	onMounted(() => {
+		watch(
+			() => props.currentIndex,
+			(v) => v === props.tabIndex && total.value === -1 && reload(),
+			{ immediate: true }
+		);
+	});
+	// const updateData = (item) => {
+	// 	console.log('收藏的updateData', item);
+	// 	console.log('收藏的updatedata_list', data_list);
+	// 	const index = data_list.findIndex((res) => res.taskId === item.taskId);
+	// 	console.log('updateData', index, item);
+	// 	if (index !== -1) {
+	// 		data_list[index] = item;
+	// 	}
+	// };
+
 	defineExpose({
-		getData,
-		refreshData,
-		updateData
+		// getData,
+		// refreshData,
+		// updateData
 	});
 </script>
 
 <style scoped lang="scss">
-	.scroll_div {
-		background-color: #f1f5fa;
-		padding: 22rpx;
-	}
-
-	.scroll-Y {
-		height: calc(100vh - var(--status-bar-height) - 54rpx - 88rpx - 20rpx - 44rpx);
+	.pagingClass {
+		width: calc(100% - 44rpx);
+		margin: 22rpx auto;
 		background-color: #fff;
 		border-radius: 16rpx;
 	}
 
-	.scroll-Y .item.in_progress {
+	.item-swipe-action {
+		overflow: hidden;
+		:deep(.uv-swipe-action-item__right__button__wrapper) {
+			border-radius: 20rpx !important;
+		}
+	}
+
+	.item.in_progress {
 		// 进行中
 		.subscript {
 			color: #0066ff;
@@ -189,7 +163,7 @@
 		}
 	}
 
-	.scroll-Y .item.completed {
+	.item.completed {
 		// 已完成
 		.subscript {
 			color: #ffffff;
@@ -201,7 +175,7 @@
 		}
 	}
 
-	.scroll-Y .item.expired {
+	.item.expired {
 		// 已超时
 		.subscript {
 			color: #ffffff;
@@ -221,9 +195,8 @@
 		}
 	}
 
-	.scroll-Y .item {
+	.item {
 		height: 170rpx;
-		// margin: 32rpx 22rpx;
 		display: flex;
 
 		.img_div {
diff --git a/src/pages/favorites/index.vue b/src/pages/favorites/index.vue
index 647d0a70..581362aa 100644
--- a/src/pages/favorites/index.vue
+++ b/src/pages/favorites/index.vue
@@ -1,57 +1,57 @@
 <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>
+	<z-paging-swiper>
+		<template #top>
+			<view class="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">
+					<view class="body-tab">
+						<uv-tabs
+							class="font_pf my_tabs"
+							:current="tabAct"
+							:list="tabList"
+							@change="tabChange"
+							:scrollable="false"
+							line-color="#0066FF"
+							:inactive-style="{ color: '#333333', fontSize: '30rpx', fontWeight: '600' }"
+							:activeStyle="{ color: '#0066FF', fontSize: '30rpx', fontWeight: '600' }"
+							:lineColor="`url(${LineBg}) 10% 10%`"
+						></uv-tabs>
+					</view>
+				</view>
 			</view>
-			<view class="title font_pf">我的收藏</view>
-		</view>
-		<view class="detail-body">
-			<view class="body-tab">
-				<uv-tabs
-					class="font_pf my_tabs"
-					:current="tabAct"
-					:list="tabList"
-					@change="tabChange"
-					:scrollable="false"
-					line-color="#0066FF"
-					:inactive-style="{ color: '#333333', fontSize: '30rpx', fontWeight: '600' }"
-					:activeStyle="{ color: '#0066FF', fontSize: '30rpx', fontWeight: '600' }"
-					:lineColor="`url(${LineBg}) 10% 10%`"
-				></uv-tabs>
-			</view>
-			<view class="uni-margin-wrap no-overflow">
-				<swiper
-					class="swiper"
-					:current="tabAct"
-					:indicator-dots="false"
-					:disable-touch="true"
-					@change="swiperChange"
-				>
-					<swiper-item>
-						<FavoritesCourse ref="courseRef"></FavoritesCourse>
-					</swiper-item>
-					<swiper-item>
-						<FavoritesTask ref="taskRef"></FavoritesTask>
-					</swiper-item>
-				</swiper>
-			</view>
-		</view>
-	</view>
+		</template>
+		<swiper class="swiper" :current="tabAct" :indicator-dots="false" :disable-touch="true" @change="swiperChange">
+			<swiper-item>
+				<FavoritesCourse
+					:ref="(el) => (listItemRefs[0] = el)"
+					:tabIndex="0"
+					:currentIndex="tabAct"
+				></FavoritesCourse>
+			</swiper-item>
+			<swiper-item>
+				<FavoritesTask :ref="(el) => (listItemRefs[1] = el)" :tabIndex="1" :currentIndex="tabAct"></FavoritesTask>
+			</swiper-item>
+		</swiper>
+	</z-paging-swiper>
 </template>
 
 <script setup>
+	// 我的收藏
 	import FavoritesTask from './components/favoritesTask.vue';
 	import FavoritesCourse from './components/favoritesCourse.vue';
-	// 我的收藏
 	import { ref, onMounted, watch } from 'vue';
 	import { onLoad, onUnload } from '@dcloudio/uni-app';
 	import { LineBg } from '@/enum.js';
 	import common from '@/common/common';
-	const courseRef = ref(null);
-	const taskRef = ref(null);
-	const tabAct = ref(0);
+	import useIndexList from '@/composables/useIndexList.js';
+	const { tabAct, listItemRefs, tabChange, swiperChange, search } = useIndexList();
+	
 	const tabList = ref([
 		{
 			name: '课程收藏'
@@ -61,49 +61,28 @@
 		}
 	]);
 
-	const tabChange = (item) => {
-		tabAct.value = item.index;
-	};
-	const swiperChange = (item) => {
-		tabAct.value = item.detail.current;
-	};
-	onMounted(() => {
-		watch(
-			tabAct,
-			(newValue, oldValue) => {
-				if (newValue === 0) {
-					courseRef.value?.getData('first');
-				} else if (newValue === 1) {
-					taskRef.value?.getData('first');
-				}
-			},
-			{
-				immediate: true
-			}
-		); // 这里的immediate会在onMounted之后执行
-	});
 	onLoad(() => {
 		// 里面取消收藏后重新刷新列表
-		uni.$on('refresh_favorites_list', (params) => {
-			if (params.type === 'course') {
-				courseRef.value?.refreshData(params);
-			} else if (params.type === 'task') {
-				taskRef.value?.refreshData(params);
-			}
-		});
-		// 完成任务后更新列表单条信息
-		uni.$on('refresh_favorites_data', (res) => {
-			console.log('列表监听里面学习完成后更新任务历程', res);
-			if (tabAct.value === 0) {
-				courseRef.value?.updateData(res);
-			} else if (tabAct.value === 1) {
-				taskRef.value?.updateData(res);
-			}
-		});
+		// uni.$on('refresh_favorites_list', (params) => {
+		// 	if (params.type === 'course') {
+		// 		courseRef.value?.refreshData(params);
+		// 	} else if (params.type === 'task') {
+		// 		taskRef.value?.refreshData(params);
+		// 	}
+		// });
+		// // 完成任务后更新列表单条信息
+		// uni.$on('refresh_favorites_data', (res) => {
+		// 	console.log('列表监听里面学习完成后更新任务历程', res);
+		// 	if (tabAct.value === 0) {
+		// 		courseRef.value?.updateData(res);
+		// 	} else if (tabAct.value === 1) {
+		// 		taskRef.value?.updateData(res);
+		// 	}
+		// });
 	});
 	onUnload(() => {
-		uni.$off('refresh_favorites_data');
-		uni.$off('refresh_favorites_list');
+		// uni.$off('refresh_favorites_data');
+		// uni.$off('refresh_favorites_list');
 	});
 </script>
 
@@ -122,6 +101,7 @@
 
 	.swiper {
 		height: calc(100vh - var(--status-bar-height) - 54rpx - 88rpx - 20rpx - 10rpx);
+		background-color: #f1f5fa;
 	}
 
 	.swiper-item {
diff --git a/src/pages/index/dialog.vue b/src/pages/index/dialog.vue
index e5b8c304..3f8d4303 100644
--- a/src/pages/index/dialog.vue
+++ b/src/pages/index/dialog.vue
@@ -480,6 +480,7 @@
 					let fileUrl = base_url + '/traask/traFilePreview/' + info.docId;
 					uni.downloadFile({
 						url: fileUrl,
+						
 						success: function (res) {
 							var filePath = res.tempFilePath;
 							uni.openDocument({
diff --git a/src/pages/learningTasks/components/content.vue b/src/pages/learningTasks/components/content.vue
index f4461df3..b92706ae 100644
--- a/src/pages/learningTasks/components/content.vue
+++ b/src/pages/learningTasks/components/content.vue
@@ -1,4 +1,3 @@
-<!-- 在这个文件对每个tab对应的列表进行渲染 -->
 <template>
 	<z-paging
 		ref="pagingRef"
@@ -46,10 +45,7 @@
 			}
 		}
 	});
-	console.log('aaa', props.state);
 	const updateData = (item) => {
-		console.log('未完成专属逻辑，如果未完成列表出现了已完成状态，就重新加载未完成列表', props.tabIndex, item.isFinish);
-		// 未完成专属逻辑，如果未完成列表出现了已完成状态，就重新加载未完成列表
 		if(props.tabIndex !== 0 && item.isFinish === '02') {
 			reload()
 		} else{
diff --git a/src/pages/learningTasks/index.vue b/src/pages/learningTasks/index.vue
index a2f5173d..fb80c344 100644
--- a/src/pages/learningTasks/index.vue
+++ b/src/pages/learningTasks/index.vue
@@ -1,4 +1,3 @@
-<!-- 滑动切换选项卡演示(标准写法) -->
 <template>
 	<z-paging-swiper>
 		<template #top>
@@ -68,23 +67,9 @@
 			listItemRefs.value[1]?.updateData(res);
 			listItemRefs.value[2]?.updateData(res);
 		});
-		
-		// 完成任务后更新列表单条信息
-		// uni.$on('refresh_tasks_data', (res) => {
-		// 	listItemRefs.value[0]?.updateData(res);
-		// 	listItemRefs.value[1]?.clear();
-		// 	listItemRefs.value[2]?.clear();
-		// 	listItemRefs.value[tabAct.value]?.getData('first');
-		// 	if (tabAct.value === 0) {
-		// 		courseRef.value?.updateData(res);
-		// 	} else if (tabAct.value === 1) {
-		// 		taskRef.value?.updateData(res);
-		// 	}
-		// });
 	});
 	onUnload(() => {
 		uni.$off('update_tasks_item');
-		// uni.$off('refresh_tasks_data');
 	});
 </script>
 
@@ -100,7 +85,7 @@
 			background-repeat: no-repeat !important;
 		}
 	}
-
+	
 	.swiper {
 		height: 100%;
 	}
@@ -191,13 +176,5 @@
 	.scroll_div {
 		background-color: #f1f5fa;
 		padding: 22rpx;
-
-		// height: calc(100vh - var(--status-bar-height) - 88rpx - 80rpx - 88rpx - 20rpx - 30rpx);
-		.scroll_item_div {
-			background-color: #fff;
-			border-radius: 16rpx;
-			padding: 0 12rpx 0 22rpx;
-			box-sizing: border-box;
-		}
 	}
 </style>
diff --git a/src/pages/preview/components/previewCourse.vue b/src/pages/preview/components/previewCourse.vue
index 01e42a85..c63c15d9 100644
--- a/src/pages/preview/components/previewCourse.vue
+++ b/src/pages/preview/components/previewCourse.vue
@@ -1,87 +1,56 @@
 <template>
-	<view class="scroll_div">
-		<scroll-view scroll-y="true" class="scroll-Y" @scrolltolower="scrolltolower" :show-scrollbar="false">
-			<view class="item" v-for="item in data_list" @click="goto_course_detail(item)">
-				<view class="img_div">
-					<image-preview class="img" :imgId="item.imgId" mode="scaleToFill"></image-preview>
-				</view>
-				<view class="right_div">
-					<view class="title ellipsis-text">{{ item.crsName }}</view>
-					<view class="tag_div">
-						<view class="tag" v-for="tag in item.tagCataList">{{ tag.tagName }}</view>
-					</view>
-					<view class="time_and_num"></view>
-				</view>
+	<z-paging
+		ref="pagingRef"
+		v-model="data_list"
+		@query="queryList"
+		:auto="false"
+		empty-view-text="暂无数据"
+		paging-class="pagingClass"
+	>
+		<view class="item" v-for="item in data_list" @click="goto_course_detail(item)">
+			<view class="img_div">
+				<image-preview class="img" :imgId="item.imgId" mode="scaleToFill"></image-preview>
 			</view>
-			<list-no-data v-if="total === 0 && status == 'nomore'">暂无数据</list-no-data>
-			<uv-load-more v-if="total !== 0" :status="status" loadmore-text="轻轻上拉加载" :height="30"></uv-load-more>
-		</scroll-view>
-	</view>
+			<view class="right_div">
+				<view class="title ellipsis-text">{{ item.crsName }}</view>
+				<view class="tag_div">
+					<view class="tag" v-for="tag in item.tagCataList">{{ tag.tagName }}</view>
+				</view>
+				<view class="time_and_num"></view>
+			</view>
+		</view>
+	</z-paging>
 </template>
 <script setup>
-	const status = ref('loading'); // loadmore - 加载前，loading - 加载中，nomore - 没有数据
-	const limit = 20;
-	const total = ref(-1);
-	const page = ref(0);
 	import common from '@/common/common';
-	const data_list = reactive([]);
-	import { ref, reactive, onMounted, nextTick } from 'vue';
+	import { ref, reactive, onMounted, nextTick, watch } from 'vue';
 	import { queryTraStdyInfoPreviewPaging } from '@/api/preview.js';
-	const getData = (from = '') => {
-		if (from == 'first') {
-			if (total.value !== -1) {
-				return;
-			}
-			status.value = 'loading';
-			total.value = -1;
-			page.value = 1;
-			data_list.length = 0;
-		} else {
-			if (status.value !== 'loadmore' && status.value !== '') return;
-			status.value = 'loading';
-			page.value++;
-		}
-		queryTraStdyInfoPreviewPaging({
-			page: page.value,
-			limit: limit
-		})
-			.then((res) => {
-				total.value = res.total;
-				data_list.push(...res.body);
-			})
-			.finally(() => {
-				if (data_list.length >= total.value) {
-					status.value = 'nomore';
-				} else {
-					status.value = 'loadmore';
-				}
-			});
-	};
-	const scrolltolower = (item) => {
-		getData();
-	};
+	import useZpaging from '@/composables/useZpaging';
+	const { pagingRef, queryList, data_list, reload, total } = useZpaging({
+		fetchFunction: queryTraStdyInfoPreviewPaging
+	});
+	const props = defineProps(['tabIndex', 'currentIndex']);
 	const goto_course_detail = (item) => {
 		common.navigateTo('/pages/courseDetail/index?isPreview=preview&crsId=' + item.crsId);
 	};
-
-	defineExpose({
-		getData
+	onMounted(() => {
+		watch(
+			() => props.currentIndex,
+			(v) => v === props.tabIndex && total.value === -1 && reload(),
+			{ immediate: true }
+		);
 	});
 </script>
 
 <style scoped lang="scss">
-	.scroll_div {
-		background-color: #f1f5fa;
-		padding: 22rpx;
-	}
-
-	.scroll-Y {
-		height: calc(100vh - var(--status-bar-height) - 54rpx - 88rpx - 20rpx - 44rpx);
+	.pagingClass {
+		width: calc(100% - 44rpx);
+		margin: 22rpx auto;
 		background-color: #fff;
 		border-radius: 16rpx;
 	}
 
-	.scroll-Y .item {
+	.item {
 		height: 170rpx;
 		margin: 32rpx 22rpx;
 		display: flex;
diff --git a/src/pages/preview/index.vue b/src/pages/preview/index.vue
index ed6af128..82bb3a3f 100644
--- a/src/pages/preview/index.vue
+++ b/src/pages/preview/index.vue
@@ -1,80 +1,68 @@
 <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>
+	<z-paging-swiper>
+		<template #top>
+			<view class="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">
+					<view class="body-tab">
+						<uv-tabs
+							class="font_pf my_tabs"
+							:current="tabAct"
+							:list="tabList"
+							@change="tabChange"
+							:scrollable="false"
+							line-color="#0066FF"
+							:inactive-style="{ color: '#333333', fontSize: '30rpx', fontWeight: '600' }"
+							:activeStyle="{ color: '#0066FF', fontSize: '30rpx', fontWeight: '600' }"
+							:lineColor="`url(${LineBg}) 10% 10%`"
+						></uv-tabs>
+					</view>
+				</view>
 			</view>
-			<view class="title font_pf">我的预览</view>
-		</view>
-		<view class="detail-body">
-			<view class="body-tab">
-				<uv-tabs class="font_pf my_tabs" :current="tabAct" :list="tabList" @change="tabChange"
-					:scrollable="false" line-color="#0066FF"
-					:inactive-style="{ color: '#333333', fontSize: '30rpx', fontWeight:'600'}"
-					:activeStyle="{color:'#0066FF',fontSize:'30rpx', fontWeight:'600'}"
-					:lineColor="`url(${LineBg}) 10% 10%`"></uv-tabs>
-			</view>
-			<view class="uni-margin-wrap">
-				<swiper class="swiper" :current="tabAct" :indicator-dots="false" @change="swiperChange">
-					<swiper-item>
-						<PreviewCourse ref="courseRef"></PreviewCourse>
-					</swiper-item>
-					<swiper-item>
-						<PreviewAiSparring ref="aiSparringRef"></PreviewAiSparring>
-					</swiper-item>
-				</swiper>
-			</view>
-		</view>
-	</view>
+		</template>
+		<swiper class="swiper" :current="tabAct" :indicator-dots="false" @change="swiperChange">
+			<swiper-item>
+				<PreviewCourse :ref="(el) => (listItemRefs[0] = el)" :tabIndex="0" :currentIndex="tabAct"></PreviewCourse>
+			</swiper-item>
+			<swiper-item>
+				<PreviewAiSparring :ref="(el) => (listItemRefs[1] = el)" :tabIndex="1" :currentIndex="tabAct"></PreviewAiSparring>
+			</swiper-item>
+		</swiper>
+	</z-paging-swiper>
 </template>
 
 <script setup>
 	// 我的预览
-	import PreviewAiSparring from './components/previewAiSparring.vue'
-	import PreviewCourse from './components/previewCourse.vue'
-	import {
-		ref,
-		onMounted,
-		watch
-	} from 'vue';
+	import PreviewAiSparring from './components/previewAiSparring.vue';
+	import PreviewCourse from './components/previewCourse.vue';
+	import { ref, onMounted, watch } from 'vue';
 	import common from '@/common/common';
-	import {
-		LineBg
-	} from '@/enum.js'
-	const courseRef = ref(null);
-	const aiSparringRef = ref(null);
-	const tabAct = ref(0);
-	const tabList = ref([{
-		name: '预览课程'
-	}, {
-		name: '预览AI陪练'
-	}]);
-
-	const tabChange = (item) => {
-		tabAct.value = item.index;
-	};
-	const swiperChange = (item) => {
-		tabAct.value = item.detail.current;
-	};
-	onMounted(() => {
-		watch(tabAct, (newValue, oldValue) => {
-			if (newValue === 0) {
-				courseRef.value?.getData('first')
-			} else if (newValue === 1) {
-
-			}
-		}, {
-			immediate: true
-		})
-	})
+	import { LineBg } from '@/enum.js';
+	import useIndexList from '@/composables/useIndexList.js';
+	const { tabAct, listItemRefs, tabChange, swiperChange, search } = useIndexList();
+	
+	
+	const tabList = ref([
+		{
+			name: '预览课程'
+		},
+		{
+			name: '预览AI陪练'
+		}
+	]);
+	
 </script>
 
 <style lang="scss" scoped>
 	$bg-margin-left: 50rpx;
 
 	.my_tabs {
-
 		// 解决这个圆角的图片，开穿透
 		:deep(.uv-tabs__wrapper__nav__line) {
 			height: 26rpx !important;
@@ -86,6 +74,9 @@
 
 	.swiper {
 		height: calc(100vh - var(--status-bar-height) - 54rpx - 88rpx - 20rpx - 10rpx);
+		// background-color: red;
+		// height: 100%;
+		background-color: #f1f5fa;
 	}
 
 	.swiper-item {
@@ -107,7 +98,7 @@
 	}
 
 	.detail-main {
-		background-color: #F6F8FF;
+		background-color: #f6f8ff;
 		overflow: hidden;
 	}
 
@@ -120,7 +111,8 @@
 		line-height: 34rpx;
 	}
 
-	.swiper {}
+	.swiper {
+	}
 
 	.fixed_search_div {
 		padding: calc(20rpx + var(--status-bar-height)) 15rpx 24rpx 30rpx;
@@ -163,4 +155,4 @@
 			}
 		}
 	}
-</style>
\ No newline at end of file
+</style>

From 1257d726b7dd579408f825237e44c295cc484ee5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= <icho.yang@scai-global.com>
Date: Wed, 17 Sep 2025 09:42:44 +0800
Subject: [PATCH 03/10] fix: bug

---
 .env.development           | 2 +-
 src/api/request.js         | 4 ++--
 src/pages/course/study.vue | 5 ++++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.env.development b/.env.development
index 467a5637..15881e23 100644
--- a/.env.development
+++ b/.env.development
@@ -44,7 +44,7 @@ VITE_APP_BASE_H5_API_Url = 'http://25.18.122.92:9786'
 # 于嘉文
 # VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.16.143:9604'
 # 孙宇
-VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.16.139:9604'
+# VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.16.139:9604'
 # 付丙鑫
 # VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.145:9602'
 
diff --git a/src/api/request.js b/src/api/request.js
index be358012..cda6bc54 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -21,7 +21,7 @@ export const get_base_url = (url = '') => {
 		// #endif
 	} else { // 其他环境，包括生产环境，sit环境，uat环境
 		return ENV.VITE_APP_BASE_API_Url
-		
+
 	}
 }
 
@@ -46,7 +46,7 @@ export const goto_login_fun = (from = 'http') => {
 	if (page_route === 'pages/login/login') return;
 	common.hideLoading()
 	common.show('未登录', '现在去登录', false).then(() => {
-		common.navigateTo('/pages/login/login')
+		// common.navigateTo('/pages/login/login')
 		if (from === 'socket' && page_route !== '') {
 			common.redirectTo('/pages/login/login?path=' + page_route)
 		} else {
diff --git a/src/pages/course/study.vue b/src/pages/course/study.vue
index 8411859e..29dbb772 100644
--- a/src/pages/course/study.vue
+++ b/src/pages/course/study.vue
@@ -671,7 +671,7 @@ const initsocketTask = () => {
       }
     } else {
       // if(['0005', 'QQ0005'].includes(res.rtnCode)) {
-      //   goto_login_fun();
+      //   goto_login_fun('socket');
       // }
     }
   })
@@ -722,6 +722,7 @@ const changeAppHeightBottom = height => {
   // #endif
 }
 onHide(() => {
+  console.log('onHide')
   //#ifdef APP-PLUS
   uni.offKeyboardHeightChange(setHeight)
   // #endif
@@ -733,6 +734,7 @@ onHide(() => {
   // }).finally(() => {})
 })
 onShow(() => {
+  console.log('onShow')
   //#ifdef APP-PLUS
   uni.onKeyboardHeightChange(setHeight)
   // #endif
@@ -742,6 +744,7 @@ onShow(() => {
 })
 const watchFlag = ref(1)
 onUnload(() => {
+  console.log('onUnload')
   socketStore.closeSocket()
   changePlayItemId('')
   console.log(typeof teacherVoiceObj);

From dbf2af05551180039b1641df3f653b0ae1af14ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= <icho.yang@scai-global.com>
Date: Wed, 17 Sep 2025 10:44:18 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E6=B5=8B=E8=AF=95pdf?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development            |  4 ++--
 src/pages/index/dialog.vue  |  3 ++-
 src/pages/index/preview.vue | 12 +++++++++---
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/.env.development b/.env.development
index 15881e23..b5caf08c 100644
--- a/.env.development
+++ b/.env.development
@@ -24,9 +24,9 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
 
 
 # dev
-# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001'
+VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001'
 # sit
-VITE_APP_BASE_H5_API_Url = 'http://25.18.122.92:9786'
+# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.92:9786'
 
 # UAT
 # VITE_APP_BASE_H5_API_Url = 'http://25.18.122.78:9786'
diff --git a/src/pages/index/dialog.vue b/src/pages/index/dialog.vue
index e5b8c304..e02a5e80 100644
--- a/src/pages/index/dialog.vue
+++ b/src/pages/index/dialog.vue
@@ -473,7 +473,8 @@
 				});
 				break;
 			case 'preview':
-				if (getPhoneEnvBool('AND')) {
+				// if (getPhoneEnvBool('AND')) {
+				if (false) {
 					common.navigateTo('/pages/index/preview?fileId=' + info.docId);
 				} else {
 					const base_url = get_base_url('/traask/traFilePreview/');
diff --git a/src/pages/index/preview.vue b/src/pages/index/preview.vue
index 478f4b3f..19afb5bd 100644
--- a/src/pages/index/preview.vue
+++ b/src/pages/index/preview.vue
@@ -37,9 +37,15 @@ export default {
     this.fileId = params.fileId || ''
   },
   onShow() {
-    this.openPdfFn({
-      fileId: this.fileId
-    })
+		if (getPhoneEnvBool('AND')) {
+			this.openPdfFn({
+				fileId: this.fileId
+			})
+		}else{
+			const base_url = get_base_url('/traask/traFilePreview/');
+			let fileUrl = base_url + '/traask/traFilePreview/' + info.docId;
+			this.showUrl = fileUrl
+		}
   },
   onReady() {
     //#ifdef APP-PLUS

From f0756f3d8a2b4cfd4249236715c15bc2e6841bf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=94=B0=E5=B2=A9?= <tybb88x@gmail.com>
Date: Wed, 17 Sep 2025 11:00:54 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=91=E7=9A=84?=
 =?UTF-8?q?=E6=94=B6=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |  8 ++---
 src/pages/courseDetail/index.vue              | 12 +++----
 .../favorites/components/favoritesCourse.vue  | 10 +++---
 .../favorites/components/favoritesTask.vue    | 33 ++++++++----------
 src/pages/favorites/index.vue                 | 34 ++++++++-----------
 src/pages/learningTasks/details.vue           | 11 ++----
 src/pages/login/login.vue                     |  4 +--
 7 files changed, 48 insertions(+), 64 deletions(-)

diff --git a/.env.development b/.env.development
index 87a63ae8..a8eb1205 100644
--- a/.env.development
+++ b/.env.development
@@ -1,7 +1,7 @@
 # 开发环境
 ENV = 'development'
 # 'development'
-VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
+VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002'
 # UAT
 # VITE_APP_BASE_API_Url = 'http://25.18.122.78:9786'
 
@@ -10,9 +10,9 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
 # app入口
 
 
-#VITE_APP_BASE_API_Url = 'http://25.16.122.65:7001'
+# VITE_APP_BASE_API_Url = 'http://25.16.122.65:7001'
 # VITE_APP_BASE_API_Url = 'http://25.16.122.92:9786'
-#VITE_APP_BASE_API_Url = 'http://25.18.122.66:9786'
+# VITE_APP_BASE_API_Url = 'http://25.18.122.66:9786'
 
 # h5专用地址x2
 
@@ -26,7 +26,7 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
 # dev
 # VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001'
 # sit
-VITE_APP_BASE_H5_API_Url = 'http://25.18.122.92:9786'
+# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.92:9786'
 
 # UAT
 # VITE_APP_BASE_H5_API_Url = 'http://25.18.122.78:9786'
diff --git a/src/pages/courseDetail/index.vue b/src/pages/courseDetail/index.vue
index 2de16cca..43020f56 100644
--- a/src/pages/courseDetail/index.vue
+++ b/src/pages/courseDetail/index.vue
@@ -272,7 +272,7 @@
 	});
 	onLoad((params) => {
 		crsId.value = params.crsId;
-		collectId.value = params.collectId || '';
+		collectId.value = params.collectId || null;
 		isPreview.value = params.isPreview || '';
 	});
 	onShow(() => {
@@ -286,13 +286,11 @@
 			if (pages.length >= 2) {
 				const prevPage = pages[pages.length - 2];
 				if (prevPage.route === 'pages/favorites/index') {
+					// if (prevPage.$vm && typeof prevPage.$vm.$?.exposed?.reload === 'function') {
+					// 	prevPage.$vm.$?.exposed?.reload('course', form.value);
+					// }
+					uni.$emit('update_course_item', form.value);
 					
-					uni.$emit('refresh_favorites_list', {
-						type: 'course',
-						state: !!form.value.collectId, // 最终是收藏了还是取消了
-						old: collectId.value, // 进入时候的收藏id
-						new: form.value.collectId // 新的收藏id
-					});
 				}
 			}
 		}
diff --git a/src/pages/favorites/components/favoritesCourse.vue b/src/pages/favorites/components/favoritesCourse.vue
index 15384c26..8a240617 100644
--- a/src/pages/favorites/components/favoritesCourse.vue
+++ b/src/pages/favorites/components/favoritesCourse.vue
@@ -17,7 +17,7 @@
 				v-for="(item, index) in data_list"
 				@click="swipeActionClick"
 			>
-				<view class="item" @touchmove.stop @click="click_item(item)">
+				<view class="item" @click="click_item(item)">
 					<view class="img_div">
 						<image-preview class="img" :src="item?.ossAddr" mode="scaleToFill"></image-preview>
 						<view class="subscript">{{ item.evalGrade ?? 0 }}分</view>
@@ -80,10 +80,12 @@
 		});
 	};
 
-
-
+	const reloadPage = () => {
+		total.value == -1;
+		reload(true);
+	};
 	defineExpose({
-	
+		reloadPage
 	});
 
 	const props = defineProps(['tabIndex', 'currentIndex']);
diff --git a/src/pages/favorites/components/favoritesTask.vue b/src/pages/favorites/components/favoritesTask.vue
index 7491eece..af906472 100644
--- a/src/pages/favorites/components/favoritesTask.vue
+++ b/src/pages/favorites/components/favoritesTask.vue
@@ -17,7 +17,7 @@
 				v-for="(item, index) in data_list"
 				@click="swipeActionClick"
 			>
-				<view class="item" :class="getStatusClass(item.isFinish)" @touchmove.stop @click="click_item(item)">
+				<view class="item" :class="getStatusClass(item.isFinish)" @click="click_item(item)">
 					<view class="img_div">
 						<image-preview class="img" :src="item?.ossAddr" mode="scaleToFill"></image-preview>
 						<view class="subscript" v-if="item.isFinish === '02'">已完成</view>
@@ -46,10 +46,6 @@
 									}}门课程
 								</text>
 							</view>
-							<!-- <view>
-									我的进度：
-									<text class="blod_color">{{ item.myProcess ?? 0 }}%</text>
-								</view> -->
 						</view>
 					</view>
 				</view>
@@ -104,7 +100,7 @@
 			}
 		}
 		setPageCache('learning_tasks_details', item);
-		common.navigateTo(`/pages/learningTasks/details?collectId=${item.collectionId}`);
+		common.navigateTo(`/pages/learningTasks/details?collectId=${item.collectionId}&taskId=${item.taskId}`);
 	};
 	const getStatusClass = (isFinish) => {
 		if (isFinish === '02') return 'completed';
@@ -119,20 +115,21 @@
 			{ immediate: true }
 		);
 	});
-	// const updateData = (item) => {
-	// 	console.log('收藏的updateData', item);
-	// 	console.log('收藏的updatedata_list', data_list);
-	// 	const index = data_list.findIndex((res) => res.taskId === item.taskId);
-	// 	console.log('updateData', index, item);
-	// 	if (index !== -1) {
-	// 		data_list[index] = item;
-	// 	}
-	// };
+
+	const updateData = (item) => {
+		// 这里是收藏记录，如果是取消收藏，那就得重新刷新列表
+		if (item.collectionId === null) {
+			reload();
+		} else {
+			const index = data_list.value.findIndex((res) => res.taskId === item.taskId);
+			if (index !== -1) {
+				data_list.value[index] = item;
+			}
+		}
+	};
 
 	defineExpose({
-		// getData,
-		// refreshData,
-		// updateData
+		updateData
 	});
 </script>
 
diff --git a/src/pages/favorites/index.vue b/src/pages/favorites/index.vue
index 581362aa..ea3e0403 100644
--- a/src/pages/favorites/index.vue
+++ b/src/pages/favorites/index.vue
@@ -51,7 +51,7 @@
 	import common from '@/common/common';
 	import useIndexList from '@/composables/useIndexList.js';
 	const { tabAct, listItemRefs, tabChange, swiperChange, search } = useIndexList();
-	
+
 	const tabList = ref([
 		{
 			name: '课程收藏'
@@ -62,28 +62,22 @@
 	]);
 
 	onLoad(() => {
-		// 里面取消收藏后重新刷新列表
-		// uni.$on('refresh_favorites_list', (params) => {
-		// 	if (params.type === 'course') {
-		// 		courseRef.value?.refreshData(params);
-		// 	} else if (params.type === 'task') {
-		// 		taskRef.value?.refreshData(params);
-		// 	}
-		// });
-		// // 完成任务后更新列表单条信息
-		// uni.$on('refresh_favorites_data', (res) => {
-		// 	console.log('列表监听里面学习完成后更新任务历程', res);
-		// 	if (tabAct.value === 0) {
-		// 		courseRef.value?.updateData(res);
-		// 	} else if (tabAct.value === 1) {
-		// 		taskRef.value?.updateData(res);
-		// 	}
-		// });
+		uni.$on('update_tasks_item', (item) => {
+			setTimeout(() => {
+				listItemRefs.value[1]?.updateData(item);
+			}, 100);
+		});
+		uni.$on('update_course_item', (item) => {
+			setTimeout(() => {
+				listItemRefs.value[0]?.reloadPage();
+			}, 100);
+		});
 	});
 	onUnload(() => {
-		// uni.$off('refresh_favorites_data');
-		// uni.$off('refresh_favorites_list');
+		uni.$off('update_tasks_item');
+		uni.$off('update_course_item');
 	});
+	
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/pages/learningTasks/details.vue b/src/pages/learningTasks/details.vue
index 25881ab4..b1498e92 100644
--- a/src/pages/learningTasks/details.vue
+++ b/src/pages/learningTasks/details.vue
@@ -307,16 +307,11 @@
 				const prevPage = pages[pages.length - 2];
 				if (prevPage.route === 'pages/favorites/index') {
 					// 收藏页跳入
-					uni.$emit('refresh_favorites_list', {
-						type: 'task',
-						state: !!detailData.collectionId, // 最终是收藏了还是取消了
-						old: collectId.value, // 进入时候的收藏id
-						new: detailData.collectionId // 新的收藏id
-					});
+					uni.$emit('update_tasks_item', detailData);
 				} else if (prevPage.route === 'pages/learningTasks/index') {
 					// 学习任务页跳入，更新外部列表否则下次列表数据还是老的
-					console.log('学习任务页跳入，更新外部列表否则下次列表数据还是老的');
-					uni.$emit('update_tasks_item', detailData);
+					console.log('学习任务页跳入，更新外部列表否则下次列表数据还是老的(作废)');
+					// uni.$emit('update_tasks_item', detailData);
 				}
 			}
 		}
diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue
index 4005122d..892abb5a 100644
--- a/src/pages/login/login.vue
+++ b/src/pages/login/login.vue
@@ -183,9 +183,7 @@
 		}
 	};
 
-	onLoad(() => {
-		
-	});
+	onLoad(() => {});
 	onMounted(() => {
 		let loginAccountData = common.getValue('loginAccountData');
 		if (loginAccountData) {

From f87e674513d1342b0fd8cee7c0202ac30a58cc06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=94=B0=E5=B2=A9?= <tybb88x@gmail.com>
Date: Wed, 17 Sep 2025 14:22:05 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=80=83=E8=AF=95?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E4=B8=8B=E6=8B=89=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../favorites/components/favoritesTask.vue    |   8 +-
 src/pages/index/dialog.vue                    |   2 +-
 src/pages/index/preview.vue                   |   9 +-
 .../learningTasks/components/content-item.vue |   2 -
 src/pages/testingHall/components/content.vue  | 230 ++++++++++--------
 src/pages/testingHall/index.vue               | 169 +++++++------
 6 files changed, 229 insertions(+), 191 deletions(-)

diff --git a/src/pages/favorites/components/favoritesTask.vue b/src/pages/favorites/components/favoritesTask.vue
index af906472..a8f98688 100644
--- a/src/pages/favorites/components/favoritesTask.vue
+++ b/src/pages/favorites/components/favoritesTask.vue
@@ -75,14 +75,14 @@
 
 	const swipeActionClick = (click_item) => {
 		const index = click_item['name'];
-		const item = data_list[index];
+		const item = data_list.value[index];
+		console.log('item', item);
 		common.show('提示', '确认删除吗？').then((res) => {
 			if (!res) return;
 			common.loading();
 			deleteTraPersonalCollectionById({ collectId: item.collectionId })
 				.then(() => {
-					data_list.splice(index, 1); // 从列表移除
-					total.value -= 1; // 更新下总数
+					reload(true);
 				})
 				.finally(() => {
 					common.hideLoading();
@@ -115,7 +115,7 @@
 			{ immediate: true }
 		);
 	});
-
+	
 	const updateData = (item) => {
 		// 这里是收藏记录，如果是取消收藏，那就得重新刷新列表
 		if (item.collectionId === null) {
diff --git a/src/pages/index/dialog.vue b/src/pages/index/dialog.vue
index d76a55a1..87c11120 100644
--- a/src/pages/index/dialog.vue
+++ b/src/pages/index/dialog.vue
@@ -474,7 +474,7 @@
 				break;
 			case 'preview':
 				// if (getPhoneEnvBool('AND')) {
-				if (false) {
+				if (true) {
 					common.navigateTo('/pages/index/preview?fileId=' + info.docId);
 				} else {
 					const base_url = get_base_url('/traask/traFilePreview/');
diff --git a/src/pages/index/preview.vue b/src/pages/index/preview.vue
index 19afb5bd..7b514e90 100644
--- a/src/pages/index/preview.vue
+++ b/src/pages/index/preview.vue
@@ -19,6 +19,7 @@
 <script>
 import { getToken } from '@/common/common.js'
 import common from '@/common/common'
+import {getPhoneEnvBool} from '@/common/common'
 import { downloadFile } from '@/api/common.js'
 import { get_base_url } from '@/api/request.js'
 var wv
@@ -37,14 +38,16 @@ export default {
     this.fileId = params.fileId || ''
   },
   onShow() {
+			console.log(getPhoneEnvBool('AND'),111)
 		if (getPhoneEnvBool('AND')) {
 			this.openPdfFn({
 				fileId: this.fileId
 			})
 		}else{
 			const base_url = get_base_url('/traask/traFilePreview/');
-			let fileUrl = base_url + '/traask/traFilePreview/' + info.docId;
-			this.showUrl = fileUrl
+			let fileUrl = base_url + '/traask/traFilePreview/' + this.fileId;
+			this.showUrl = 'https://aitstest.jlbank.com.cn:7002/traask/traFilePreview/d0c9e8cf-c862-44e7-bfa8-514a54d4baf2'//fileUrl
+			console.log(this.showUrl,111)
 		}
   },
   onReady() {
@@ -52,6 +55,7 @@ export default {
     var currentWebview = this.$scope.$getAppWebview()
     setTimeout(() => {
       wv = currentWebview.children()[0]
+	  if(!wv) return
       wv.setStyle({
         top: 80
       })
@@ -62,6 +66,7 @@ export default {
   methods: {
     setHeight(res){
 			//#ifdef APP-PLUS
+	  if(!wv) return
     	wv.setStyle({
     		top: res.height + 20
     	})
diff --git a/src/pages/learningTasks/components/content-item.vue b/src/pages/learningTasks/components/content-item.vue
index 8bdd1774..a4ff8811 100644
--- a/src/pages/learningTasks/components/content-item.vue
+++ b/src/pages/learningTasks/components/content-item.vue
@@ -97,8 +97,6 @@
 		}
 	}
 	.item {
-		// background-color: red;
-		// height: 170rpx;
 		padding-top: 16rpx;
 		padding-bottom: 16rpx;
 		display: flex;
diff --git a/src/pages/testingHall/components/content.vue b/src/pages/testingHall/components/content.vue
index 9eb0435c..8442f279 100644
--- a/src/pages/testingHall/components/content.vue
+++ b/src/pages/testingHall/components/content.vue
@@ -1,5 +1,19 @@
 <template>
-	<scroll-view
+	<z-paging
+		ref="pagingRef"
+		v-model="data_list"
+		@query="queryList"
+		:fixed="false"
+		class="scroll_div"
+		:auto="false"
+		empty-view-text="暂无考试任务"
+	>
+		<view class="scroll-Y">
+			<!-- 如果当前页已经加载过数据或者当前切换到的tab是当前页，才展示当前页数据（懒加载） -->
+			<itemVue :item="item" v-for="(item, index) in data_list"></itemVue>
+		</view>
+	</z-paging>
+	<!-- <scroll-view
 		ref="scrollRef"
 		scroll-y="true"
 		class="scroll-Y"
@@ -7,106 +21,124 @@
 		:show-scrollbar="false"
 		@scrolltolower="scrolltolower"
 	>
-		<!-- 主体 -->
 		<view class="content">
 			<itemVue :item="item" v-for="item in data_list"></itemVue>
 			<list-no-data v-if="total === 0 && status == 'nomore'">暂无考试任务</list-no-data>
 			<uv-load-more v-if="total !== 0" :status="status" loadmore-text="轻轻上拉加载" :height="30"></uv-load-more>
 		</view>
-	</scroll-view>
+	</scroll-view> -->
 </template>
 
 <script setup>
-	import { ref, reactive} from 'vue';
+	import { ref, reactive, computed, onMounted, watch } from 'vue';
 	import { queryTraExamPapersPage } from '@/api/testingHall.js';
 	import itemVue from './content-item.vue';
-	const status = ref('loadmore'); // loadmore - 加载前，loading - 加载中，nomore - 没有数据
-	const limit = 20;
-	const total = ref(-1);
-	const page = ref(0);
-	const data_list = reactive([]);
-	const scrollRef = ref(null);
+
+	import useZpaging from '@/composables/useZpaging.js';
+
+	const examStat = computed(() => ['', 'Y', 'N'][props.currentIndex]);
+	const fetchFunction = (params) => queryTraExamPapersPage({ examStat: examStat.value, ...params });
+	const { pagingRef, queryList, data_list, reload, search, total, clear } = useZpaging({
+		fetchFunction,
+		searchKey: 'papersName'
+	});
+
 	const props = defineProps({
-		index: {
+		tabIndex: {
+			type: Number,
+			default: 0
+		},
+		currentIndex: {
 			type: Number,
 			default: 0
 		}
 	});
 
-	const getData = (from = '', _searchText = '') => {
-		if (from === 'first') {
-			if (total.value !== -1) return;
-			status.value = 'loading';
-			total.value = -1;
-			page.value = 1;
-			data_list.length = 0;
-		} else {
-			if (status.value !== 'loadmore' && status.value !== '') return;
-			status.value = 'loading';
-			page.value++;
-		}
-
-		setTimeout(() => {
-			let params = {
-				papersName: _searchText || searchText.value,
-				page: page.value,
-				limit: limit
-			};
-			if (props.index === 1) {
-				params.examStat = 'Y';
-			} else if (props.index === 2) {
-				params.examStat = 'N';
-			}
-			queryTraExamPapersPage(params)
-				.then((res) => {
-					total.value = res.total;
-					data_list.push(...res.body);
-					console.log('total.value', total.value);
-				})
-				.catch((res) => {
-					console.log('resres', res);
-				})
-				.finally(() => {
-					if (data_list.length >= total.value) {
-						status.value = 'nomore';
-					} else {
-						status.value = 'loadmore';
-					}
-					
-				});
-		}, 200);
-	};
-	const scrolltolower = () => {
-		getData();
-	};
-	const searchText = ref('');
-	const search = (value, state) => {
-		console.log('value', value, state);
-		total.value = -1;
-		searchText.value = value;
-		if (state) {
-			getData('first', value);
-		} else {
-			total.value = -1;
-			page.value = 1;
-			data_list.length = 0;
-		}
-	};
-	const clear = (state) => {
-		total.value = -1;
-		page.value = 1;
-		data_list.length = 0;
-	};
-	const updateData = (item) => {
-	// 	const index = data_list.findIndex((res) => res.taskId === item.taskId);
-	
-	// 	console.log('updateData', index, item);
-	// 	if (index !== -1) {
-	// 		data_list[index] = item;
+	// const getData = (from = '', _searchText = '') => {
+	// 	if (from === 'first') {
+	// 		if (total.value !== -1) return;
+	// 		status.value = 'loading';
+	// 		total.value = -1;
+	// 		page.value = 1;
+	// 		data_list.length = 0;
+	// 	} else {
+	// 		if (status.value !== 'loadmore' && status.value !== '') return;
+	// 		status.value = 'loading';
+	// 		page.value++;
 	// 	}
+
+	// 	setTimeout(() => {
+	// 		let params = {
+	// 			papersName: _searchText || searchText.value,
+	// 			page: page.value,
+	// 			limit: limit
+	// 		};
+	// 		if (props.currentIndex === 1) {
+	// 			params.examStat = 'Y';
+	// 		} else if (props.currentIndex === 2) {
+	// 			params.examStat = 'N';
+	// 		}
+	// 		queryTraExamPapersPage(params)
+	// 			.then((res) => {
+	// 				total.value = res.total;
+	// 				data_list.push(...res.body);
+	// 				console.log('total.value', total.value);
+	// 			})
+	// 			.catch((res) => {
+	// 				console.log('resres', res);
+	// 			})
+	// 			.finally(() => {
+	// 				if (data_list.length >= total.value) {
+	// 					status.value = 'nomore';
+	// 				} else {
+	// 					status.value = 'loadmore';
+	// 				}
+	// 			});
+	// 	}, 200);
+	// };
+	// const scrolltolower = () => {
+	// 	getData();
+	// };
+	// const searchText = ref('');
+	// const search = (value, state) => {
+	// 	console.log('value', value, state);
+	// 	total.value = -1;
+	// 	searchText.value = value;
+	// 	if (state) {
+	// 		getData('first', value);
+	// 	} else {
+	// 		total.value = -1;
+	// 		page.value = 1;
+	// 		data_list.length = 0;
+	// 	}
+	// };
+	// const clear = (state) => {
+	// 	total.value = -1;
+	// 	page.value = 1;
+	// 	data_list.length = 0;
+	// };
+	const updateData = (item) => {
+		// 	const index = data_list.findIndex((res) => res.taskId === item.taskId);
+		// 	console.log('updateData', index, item);
+		// 	if (index !== -1) {
+		// 		data_list[index] = item;
+		// 	}
 	};
+	onMounted(() => {
+		watch(
+			() => props.currentIndex,
+			(newVal) => {
+				if (newVal === props.tabIndex && total.value === -1) {
+					reload();
+				}
+			},
+			{
+				immediate: true
+			}
+		);
+	});
 	defineExpose({
-		getData,
+		// getData,
 		search,
 		updateData,
 		clear
@@ -114,20 +146,26 @@
 </script>
 
 <style scoped lang="scss">
-	.scroll-Y {
-		height: calc(100vh - var(--status-bar-height) - 70rpx - 78rpx - 40rpx - 88rpx);
-		position: relative;
-		overflow: hidden;
-		background-color: #f1f5fa;
+	// .scroll-Y {
+	// 	height: calc(100vh - var(--status-bar-height) - 70rpx - 78rpx - 40rpx - 88rpx);
+	// 	position: relative;
+	// 	overflow: hidden;
+	// 	background-color: #f1f5fa;
 
-		.content {
-			width: 100%;
-			height: 100%;
-			border-radius: 20rpx 20rpx 0 0;
-			position: relative;
-			padding-top: 22rpx;
-			padding: 0 22rpx;
-			box-sizing: border-box;
-		}
+	// 	.content {
+	// 		width: 100%;
+	// 		height: 100%;
+	// 		border-radius: 20rpx 20rpx 0 0;
+	// 		position: relative;
+	// 		padding-top: 22rpx;
+	// 		padding: 0 22rpx;
+	// 		box-sizing: border-box;
+	// 	}
+	// }
+
+	.scroll-Y {
+		background-color: #f1f5fa;
+		border-radius: 16rpx;
+		padding: 1rpx 12rpx 0 22rpx;
 	}
 </style>
diff --git a/src/pages/testingHall/index.vue b/src/pages/testingHall/index.vue
index d49403a1..b01e6989 100644
--- a/src/pages/testingHall/index.vue
+++ b/src/pages/testingHall/index.vue
@@ -1,106 +1,106 @@
 <template>
-	<view class="main_div max_page">
-		<view class="body-title">
-			<view class="back_div" @click="common.navigateBack()">
-				<view class="back-icon"></view>
+	<z-paging-swiper>
+		<template #top>
+			<view class="main_div">
+				<view class="body-title">
+					<view class="back_div" @click="common.navigateBack()">
+						<view class="back-icon"></view>
+					</view>
+					<view>考试中心</view>
+				</view>
+				<view class="input-view">
+					<search-input placeholder="请输入考试名" @search="search"></search-input>
+				</view>
+				<view class="body-tab">
+					<uv-tabs
+						class="font_pf my_tabs"
+						:current="tabAct"
+						:list="tabList"
+						@change="tabChange"
+						:scrollable="false"
+						line-color="#0066FF"
+						:inactive-style="{ color: '#333333', fontSize: '30rpx', fontWeight: '600' }"
+						:activeStyle="{ color: '#0066FF', fontSize: '30rpx', fontWeight: '600' }"
+						:lineColor="`url(${LineBg}) 10% 10%`"
+					></uv-tabs>
+				</view>
 			</view>
-			<view>考试中心</view>
-		</view>
-		<view class="input-view">
-			<search-input placeholder="请输入考试名" @search="search"></search-input>
-			<!-- <view class="search_div" @click="search"></view> -->
-		</view>
-		<view class="body-tab">
-			<uv-tabs class="font_pf my_tabs" :current="tabAct" :list="tabList" @change="tabChange" :scrollable="false"
-				line-color="#0066FF" :inactive-style="{ color: '#333333', fontSize: '30rpx', fontWeight:'600'}"
-				:activeStyle="{color:'#0066FF',fontSize:'30rpx', fontWeight:'600'}"
-				:lineColor="`url(${LineBg}) 10% 10%`"></uv-tabs>
-		</view>
-		
+		</template>
 		<swiper class="swiper" :current="tabAct" :indicator-dots="false" @change="swiperChange">
 			<swiper-item>
-				<Content :ref="el => contentRefs[0] = el" :index="tabAct"
-					@gotoDetails="gotoDetails"></Content>
+				<Content :ref="(el) => (listItemRefs[0] = el)" :tabIndex="0" :currentIndex="tabAct" @gotoDetails="gotoDetails"></Content>
 			</swiper-item>
 			<swiper-item>
-				<Content :ref="el => contentRefs[1] = el" :index="tabAct"
-					@gotoDetails="gotoDetails"></Content>
+				<Content :ref="(el) => (listItemRefs[1] = el)" :tabIndex="1" :currentIndex="tabAct" @gotoDetails="gotoDetails"></Content>
 			</swiper-item>
 			<swiper-item>
-				<Content :ref="el => contentRefs[2] = el" :index="tabAct"
-					@gotoDetails="gotoDetails"></Content>
+				<Content :ref="(el) => (listItemRefs[2] = el)" :tabIndex="2" :currentIndex="tabAct" @gotoDetails="gotoDetails"></Content>
 			</swiper-item>
 		</swiper>
-	</view>
+	</z-paging-swiper>
 </template>
 
 <script setup>
 	// 考试中心
-	import Content from './components/content.vue'
-	import {
-		ref,
-		reactive,
-		watch,
-		onMounted
-	} from 'vue'
-	import {
-		onLoad,
-		onUnload
-	} from '@dcloudio/uni-app'
-	import {
-		setPageCache
-	} from '@/common/common';
+	
+	
+	import Content from './components/content.vue';
+	import { ref, reactive, watch, onMounted } from 'vue';
+	import { onLoad, onUnload } from '@dcloudio/uni-app';
+	import { setPageCache } from '@/common/common';
 	import common from '@/common/common';
-	
-	import {
-		LineBg
-	} from '@/enum.js'
-	const tabAct = ref(0);
 
-	const tabList = ref([{
-		name: '全 部'
-	}, {
-		name: '已完成'
-	}, {
-		name: '未完成'
-	}]);
+	import { LineBg } from '@/enum.js';
+	import useIndexList from '@/composables/useIndexList.js';
+	const { tabAct, listItemRefs, tabChange, swiperChange, search } = useIndexList();
+	
+
+
+	const tabList = ref([
+		{
+			name: '全 部'
+		},
+		{
+			name: '已完成'
+		},
+		{
+			name: '未完成'
+		}
+	]);
+
+
+	const triggered = ref(false);
+
+
+	// const search = (value) => {
+		// contentRefs.value[0]?.search(value, tabAct.value === 0);
+		// contentRefs.value[1]?.search(value, tabAct.value === 1);
+		// contentRefs.value[2]?.search(value, tabAct.value === 2);
+	// };
 
-	const contentRefs = ref([])
-	const triggered = ref(false)
-	const tabChange = (item) => {
-		tabAct.value = item.index;
-	};
-	const swiperChange = (item) => {
-		tabAct.value = item.detail.current;
-	};
-	
-	const search = (value) => {
-		contentRefs.value[0]?.search(value, tabAct.value === 0);
-		contentRefs.value[1]?.search(value, tabAct.value === 1);
-		contentRefs.value[2]?.search(value, tabAct.value === 2);
-	};
-	
 	const gotoDetails = (item) => {
-		setPageCache('testing_hall_details', item)
+		setPageCache('testing_hall_details', item);
 		common.navigateTo('/pages/testingHall/details');
-	}
-	onMounted(() => {
-		triggered.value = true
-		watch(tabAct, (newValue, oldValue) => {
-			typeof contentRefs.value[newValue]?.getData === 'function' && contentRefs.value[newValue]
-				?.getData('first')
-		}, {
-			immediate: true
-		}) // 这里的immediate会在onMounted之后执行
-	})
-	
-	
+	};
+	// onMounted(() => {
+	// 	triggered.value = true;
+	// 	watch(
+	// 		tabAct,
+	// 		(newValue, oldValue) => {
+	// 			typeof contentRefs.value[newValue]?.getData === 'function' && contentRefs.value[newValue]?.getData('first');
+	// 		},
+	// 		{
+	// 			immediate: true
+	// 		}
+	// 	); // 这里的immediate会在onMounted之后执行
+	// });
+
 	onLoad(() => {
 		uni.$on('refresh_testing_hall_data', (res) => {
-		// 	console.log('exam_completed');
-		// 	contentRefs.value[0]?.updateData(res);
-		// 	contentRefs.value[1]?.updateData(res);
-		// 	contentRefs.value[2]?.updateData(res);
+			// 	console.log('exam_completed');
+			// 	contentRefs.value[0]?.updateData(res);
+			// 	contentRefs.value[1]?.updateData(res);
+			// 	contentRefs.value[2]?.updateData(res);
 		});
 	});
 	onUnload(() => {
@@ -114,7 +114,6 @@
 		width: 100%;
 	}
 
-
 	.body-tab {
 		height: 88rpx;
 		// background-color: red;
@@ -122,7 +121,6 @@
 	}
 
 	.my_tabs {
-
 		// 解决这个圆角的图片，开穿透
 		:deep(.uv-tabs__wrapper__nav__line) {
 			height: 30rpx !important;
@@ -130,7 +128,6 @@
 			background-size: 24rpx !important;
 			background-repeat: no-repeat !important;
 		}
-
 	}
 
 	.main_div {
@@ -214,4 +211,4 @@
 			// background-color: red;
 		}
 	}
-</style>
\ No newline at end of file
+</style>

From fe7e4b6a1ee9a46023ed4e2edad20c142ed1b581 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= <icho.yang@scai-global.com>
Date: Wed, 17 Sep 2025 14:25:31 +0800
Subject: [PATCH 07/10] =?UTF-8?q?fix=EF=BC=9B=20=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E9=A2=84=E8=A7=88=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/index/dialog.vue | 1994 ++++++++++++++++++------------------
 1 file changed, 988 insertions(+), 1006 deletions(-)

diff --git a/src/pages/index/dialog.vue b/src/pages/index/dialog.vue
index 87c11120..f8bd4c06 100644
--- a/src/pages/index/dialog.vue
+++ b/src/pages/index/dialog.vue
@@ -1,1060 +1,1042 @@
 <template>
-	<view class="index-dialog-page">
-		<!-- <MarkdownPreview/> -->
-		<view class="top-bg"></view>
-		<view class="bot-bg"></view>
-		<scroll-view
-			class="index-dialog-body"
-			:scroll-y="true"
-			upper-threshold="0"
-			refresher-enabled="true"
-			refresher-default-style="none"
-			@refresherrefresh="scrolltolower"
-		>
-			<view class="body-title">
-				<!-- <uv-icon class="arrow-icon" name="arrow-left" @click="common.navigateBack()"/> -->
-				AI问答
-				<view class="seek-setting">
-					<image
-						src="@/static/images/dialog/new-dialog.png"
-						alt=""
-						class="image-icon-new"
-						@click="createNewDialog"
-					></image>
-					<image
-						src="@/static/images/dialog/history.png"
-						alt=""
-						class="image-icon"
-						@click="showMenuList = !showMenuList"
-					></image>
-					<view :class="['more-list', showMenuList ? 'show' : '']">
-						<view class="more-item" @click.stop="showHistory">历史</view>
-						<view class="more-item" @click.stop="toMessage">消息</view>
-						<view class="more-item" @click.stop="toMePage">我的</view>
-					</view>
-				</view>
-			</view>
+  <view class="index-dialog-page">
+    <!-- <MarkdownPreview/> -->
+    <view class="top-bg"></view>
+    <view class="bot-bg"></view>
+    <scroll-view class="index-dialog-body" :scroll-y="true" upper-threshold="0" refresher-enabled="true" refresher-default-style="none" @refresherrefresh="scrolltolower">
+      <view class="body-title">
+        <!-- <uv-icon class="arrow-icon" name="arrow-left" @click="common.navigateBack()"/> -->
+        AI问答
+        <view class="seek-setting">
+          <image src="@/static/images/dialog/new-dialog.png" alt="" class="image-icon-new" @click="createNewDialog"></image>
+          <image src="@/static/images/dialog/history.png" alt="" class="image-icon" @click="showMenuList = !showMenuList"></image>
+          <view :class="['more-list', showMenuList ? 'show' : '']">
+            <view class="more-item" @click.stop="showHistory">历史</view>
+            <view class="more-item" @click.stop="toMessage">消息</view>
+            <view class="more-item" @click.stop="toMePage">我的</view>
+          </view>
+        </view>
+      </view>
 
-			<view class="ai-info">
-				<!-- <image src="@/static/images/dialog/pet-3.png" alt="" class="image-pet-bg"></image> -->
-				<image src="@/static/images/dialog/pet-bg-base.png" alt="" class="image-pet-bg"></image>
-				<image :src="userInfo?.mascotInfo?.imgAddr || ''" alt="" class="image-pet" mode="widthFix"></image>
-				<view class="ai-info-bg-box">
-					<view class="hello-text">{{ userInfo ? 'Hi，我是' + userInfo?.mascotInfo?.mascotName : 'Hi' }}</view>
-					<view class="info-text">工作学习，我都能帮你！</view>
-					<view class="info-btn">试试他的能力</view>
-				</view>
-			</view>
-			<view class="questions-view">
-				<scroll-view :scroll-x="true" :show-scrollbar="false">
-					<view class="question-row">
-						<view
-							class="question-item"
-							v-for="item in Math.ceil(questionList.length / 2)"
-							@click="sendText(questionList[item - 1].hotContent)"
-						>
-							{{ questionList[item - 1].hotContent }}
-						</view>
-					</view>
-					<view class="question-row">
-						<view
-							class="question-item"
-							v-for="item in questionList.length - Math.ceil(questionList.length / 2)"
-							@click="sendText(questionList[item + Math.ceil(questionList.length / 2) - 1].hotContent)"
-						>
-							{{ questionList[item + Math.ceil(questionList.length / 2) - 1].hotContent }}
-						</view>
-					</view>
-				</scroll-view>
-			</view>
-			<view class="talking-list">
-				<scroll-view
-					class="talking-scroll-list"
-					:scroll-y="true"
-					:scroll-top="scrollTop"
-					:show-scrollbar="false"
-					:scroll-with-animation="false"
-				>
-					<TalkingItem
-						v-for="(item, index) in talkingList"
-						:talkingType="item.type"
-						:talkingInfo="item"
-						:isLast="index + 1 === talkingList.length"
-						:isAnswering="!answerIsOver"
-						:activeVoiceId="activeVoiceTalkingItemId"
-						@handleEvents="talkItemEvents"
-					></TalkingItem>
-				</scroll-view>
-			</view>
-			<view class="router-list">
-				<scroll-view class="" :scroll-x="true" :show-scrollbar="false">
-					<view class="btns-item" @click="routerTo('AI学')">
-						<image src="@/static/images/dialog/icons/study.png" alt="" class="image-icon"></image>
-						{{ 'AI学' }}
-					</view>
-					<view class="btns-item" @click="routerTo('AI练')">
-						<image src="@/static/images/dialog/icons/test.png" alt="" class="image-icon"></image>
-						{{ 'AI练' }}
-					</view>
-					<view class="btns-item" @click="routerTo('AI考')">
-						<image src="@/static/images/dialog/icons/exam.png" alt="" class="image-icon"></image>
-						{{ 'AI考' }}
-					</view>
-					<view class="btns-item" @click="routerTo('去PK')">
-						<image src="@/static/images/dialog/icons/PK.png" alt="" class="image-icon"></image>
-						{{ '去PK' }}
-					</view>
-					<view class="btns-item" @click="routerTo('任务')">
-						<image src="@/static/images/dialog/icons/task.png" alt="" class="image-icon"></image>
-						{{ '任务' }}
-					</view>
-					<view class="btns-item" @click="routerTo('错题')">
-						<image src="@/static/images/dialog/icons/wrong.png" alt="" class="image-icon"></image>
-						{{ '错题' }}
-					</view>
-					<view class="btns-item" @click="routerTo('分析')">
-						<image src="@/static/images/dialog/icons/static.png" alt="" class="image-icon"></image>
-						{{ '分析' }}
-					</view>
-				</scroll-view>
-			</view>
-			<TouchBtn
-				class="talk-btns"
-				@uploadVoice="uploadRecordNow"
-				@submitAnswer="submitAnswerNow"
-				@startRecord="startRecordCallback"
-				:loadingText="sendLoadingText"
-				:isLoading="!answerIsOver"
-				:adjustPosition="true"
-				:isDisabled="isHistory"
-			/>
-			<History ref="historyRef" @showDetail="showHistoryDetail"></History>
-			<PreviewVue ref="previewRef" />
-		</scroll-view>
-	</view>
-	<!-- 反馈组件 -->
-	<Feedback ref="feedbackRef" @feedbackAnswer="feedbackAnswer"></Feedback>
-	<!-- <file-preview ref="previewFileRef" :file-id="'603058d8-88e0-43d2-8242-3132b85bc91c'" v-model="showPreview" /> -->
+      <view class="ai-info">
+        <!-- <image src="@/static/images/dialog/pet-3.png" alt="" class="image-pet-bg"></image> -->
+        <image src="@/static/images/dialog/pet-bg-base.png" alt="" class="image-pet-bg"></image>
+        <image :src="userInfo?.mascotInfo?.imgAddr || ''" alt="" class="image-pet" mode="widthFix"></image>
+        <view class="ai-info-bg-box">
+          <view class="hello-text">{{ userInfo ? 'Hi，我是' + userInfo?.mascotInfo?.mascotName : 'Hi' }}</view>
+          <view class="info-text">工作学习，我都能帮你！</view>
+          <view class="info-btn">试试他的能力</view>
+        </view>
+      </view>
+      <view class="questions-view">
+        <scroll-view :scroll-x="true" :show-scrollbar="false">
+          <view class="question-row">
+            <view class="question-item" v-for="item in Math.ceil(questionList.length / 2)" @click="sendText(questionList[item - 1].hotContent)">
+              {{ questionList[item - 1].hotContent }}
+            </view>
+          </view>
+          <view class="question-row">
+            <view class="question-item" v-for="item in questionList.length - Math.ceil(questionList.length / 2)" @click="sendText(questionList[item + Math.ceil(questionList.length / 2) - 1].hotContent)">
+              {{ questionList[item + Math.ceil(questionList.length / 2) - 1].hotContent }}
+            </view>
+          </view>
+        </scroll-view>
+      </view>
+      <view class="talking-list">
+        <scroll-view class="talking-scroll-list" :scroll-y="true" :scroll-top="scrollTop" :show-scrollbar="false" :scroll-with-animation="false">
+          <TalkingItem v-for="(item, index) in talkingList" :talkingType="item.type" :talkingInfo="item" :isLast="index + 1 === talkingList.length" :isAnswering="!answerIsOver" :activeVoiceId="activeVoiceTalkingItemId" @handleEvents="talkItemEvents"></TalkingItem>
+        </scroll-view>
+      </view>
+      <view class="router-list">
+        <scroll-view class="" :scroll-x="true" :show-scrollbar="false">
+          <view class="btns-item" @click="routerTo('AI学')">
+            <image src="@/static/images/dialog/icons/study.png" alt="" class="image-icon"></image>
+            {{ 'AI学' }}
+          </view>
+          <view class="btns-item" @click="routerTo('AI练')">
+            <image src="@/static/images/dialog/icons/test.png" alt="" class="image-icon"></image>
+            {{ 'AI练' }}
+          </view>
+          <view class="btns-item" @click="routerTo('AI考')">
+            <image src="@/static/images/dialog/icons/exam.png" alt="" class="image-icon"></image>
+            {{ 'AI考' }}
+          </view>
+          <view class="btns-item" @click="routerTo('去PK')">
+            <image src="@/static/images/dialog/icons/PK.png" alt="" class="image-icon"></image>
+            {{ '去PK' }}
+          </view>
+          <view class="btns-item" @click="routerTo('任务')">
+            <image src="@/static/images/dialog/icons/task.png" alt="" class="image-icon"></image>
+            {{ '任务' }}
+          </view>
+          <view class="btns-item" @click="routerTo('错题')">
+            <image src="@/static/images/dialog/icons/wrong.png" alt="" class="image-icon"></image>
+            {{ '错题' }}
+          </view>
+          <view class="btns-item" @click="routerTo('分析')">
+            <image src="@/static/images/dialog/icons/static.png" alt="" class="image-icon"></image>
+            {{ '分析' }}
+          </view>
+        </scroll-view>
+      </view>
+      <TouchBtn class="talk-btns" @uploadVoice="uploadRecordNow" @submitAnswer="submitAnswerNow" @startRecord="startRecordCallback" :loadingText="sendLoadingText" :isLoading="!answerIsOver" :adjustPosition="true" :isDisabled="isHistory" />
+      <History ref="historyRef" @showDetail="showHistoryDetail"></History>
+      <PreviewVue ref="previewRef" />
+    </scroll-view>
+  </view>
+  <!-- 反馈组件 -->
+  <Feedback ref="feedbackRef" @feedbackAnswer="feedbackAnswer"></Feedback>
+  <!-- <file-preview ref="previewFileRef" :file-id="'603058d8-88e0-43d2-8242-3132b85bc91c'" v-model="showPreview" /> -->
 </template>
 
 <script setup>
-	import { ref, unref, onMounted, watch, nextTick, computed, onActivated } from 'vue';
-	import common from '@/common/common';
-	import { setupKeyboardHeightListener } from '@/common/common';
-	import TouchBtn from '@/pages/course/components/touchBtn.vue';
-	import TalkingItem from './components/talking-item.vue';
-	import PreviewVue from './components/preview.vue';
-	import { useSocketStore } from '@/store/socket.js';
-	import { useStorageStore } from '@/store/storage.js';
-	import { storeToRefs } from 'pinia';
-	import { onLoad, onShow, onUnload, onHide, onBackPress } from '@dcloudio/uni-app';
-	import { get_base_url, goto_login_fun } from '@/api/request';
-	import { getUserInfo, getPhoneEnvBool } from '@/common/common';
-	import { commonUploadVoiceFile } from '@/api/common.js';
-	import {
-		queryHotQuestionApi,
-		insertTraAskFeedback,
-		queryAskHisByBatchIdPaging,
-		updateLikeStat,
-		updateDownvoteStat
-	} from '@/api/dialog.js';
-	import Feedback from './components/feedback.vue';
-	import History from './components/history.vue';
+import { ref, unref, onMounted, watch, nextTick, computed, onActivated } from 'vue'
+import common from '@/common/common'
+import { setupKeyboardHeightListener } from '@/common/common'
+import TouchBtn from '@/pages/course/components/touchBtn.vue'
+import TalkingItem from './components/talking-item.vue'
+import PreviewVue from './components/preview.vue'
+import { useSocketStore } from '@/store/socket.js'
+import { useStorageStore } from '@/store/storage.js'
+import { storeToRefs } from 'pinia'
+import { onLoad, onShow, onUnload, onHide, onBackPress } from '@dcloudio/uni-app'
+import { get_base_url, goto_login_fun } from '@/api/request'
+import { getUserInfo, getPhoneEnvBool } from '@/common/common'
+import { commonUploadVoiceFile } from '@/api/common.js'
+import { queryHotQuestionApi, insertTraAskFeedback, queryAskHisByBatchIdPaging, updateLikeStat, updateDownvoteStat } from '@/api/dialog.js'
+import Feedback from './components/feedback.vue'
+import History from './components/history.vue'
 
-	const { statusBarHeight } = uni.getWindowInfo();
+const { statusBarHeight } = uni.getWindowInfo()
 
-	const pageTopPadding = computed(() => statusBarHeight + 'px');
+const pageTopPadding = computed(() => statusBarHeight + 'px')
 
-	const socketStore = useSocketStore();
-	const { SocketObj } = storeToRefs(socketStore);
+const socketStore = useSocketStore()
+const { SocketObj } = storeToRefs(socketStore)
 
-	const feedbackRef = ref();
-	const userInfo = ref(getUserInfo());
-	const questionList = ref([
-		// '对公小程序开户流程？',
-		// '厅堂服务经理2025年管理办法？',
-		// '厅堂服务经理2025年考核表单？',
-		// '吉林银行重要空白凭证调微业务操作规程？',
-		// '协助有权机关查询冻结扣划业务操作规程？',
-		// '柜面个人账户操作规程？',
-		// '久悬未取款账户如何办理销户？',
-		// '境外来华人员个人账户业务开户如何办理？',
-		// '营业机构日间管理风险防控要点有哪些？',
-		// '现金管理平台柜面业务操作？'
-	]);
-	const scrollBoxRef = ref();
-	const scrollTop = ref(99999);
-	const scrollToBottomNow = (time = 100) => {
-		nextTick(() => {
-			setTimeout(() => {
-				scrollTop.value += 100;
-				scrollTop.value += 100;
-			}, time);
-		});
-	};
-	const isHistory = ref(false);
-	const activeVoiceTalkingItemId = ref('');
-	// ws 初始化逻辑
-	const reconnectTimer = null; // 重连timer
-	const isManualClose = ref(false); // 是否手动关闭
-	const reqBatch = ref('');
-	const seqNo = ref('');
-	const mascotId = computed(() => {
-		return unref(userInfo)?.mascotInfo?.mascotId || 'Tst00001';
-	});
-	const answerText = ref('');
-	const answerFileList = ref('');
-	const answerIsOver = ref(true);
-	const talkingList = ref([]);
+const feedbackRef = ref()
+const userInfo = ref(getUserInfo())
+const questionList = ref([
+  // '对公小程序开户流程？',
+  // '厅堂服务经理2025年管理办法？',
+  // '厅堂服务经理2025年考核表单？',
+  // '吉林银行重要空白凭证调微业务操作规程？',
+  // '协助有权机关查询冻结扣划业务操作规程？',
+  // '柜面个人账户操作规程？',
+  // '久悬未取款账户如何办理销户？',
+  // '境外来华人员个人账户业务开户如何办理？',
+  // '营业机构日间管理风险防控要点有哪些？',
+  // '现金管理平台柜面业务操作？'
+])
+const scrollBoxRef = ref()
+const scrollTop = ref(99999)
+const scrollToBottomNow = (time = 100) => {
+  nextTick(() => {
+    setTimeout(() => {
+      scrollTop.value += 100
+      scrollTop.value += 100
+    }, time)
+  })
+}
+const isHistory = ref(false)
+const activeVoiceTalkingItemId = ref('')
+// ws 初始化逻辑
+const reconnectTimer = null // 重连timer
+const isManualClose = ref(false) // 是否手动关闭
+const reqBatch = ref('')
+const seqNo = ref('')
+const mascotId = computed(() => {
+  return unref(userInfo)?.mascotInfo?.mascotId || 'Tst00001'
+})
+const answerText = ref('')
+const answerFileList = ref('')
+const answerIsOver = ref(true)
+const talkingList = ref([])
 
-	const createNewDialog = () => {
-		if (talkingList.value.length === 0) {
-			common.msg('已经是最新对话');
-		}
-		common.redirectTo(`/pages/index/dialog`);
-	};
-	const showModelComfirm = ref(false);
-	const reconcatNum = ref(1);
-	const initsocketTask = () => {
-		isHistory.value = false;
-		socketStore.creatSocket('/traask/asksocket/open?summary=');
-		// unref(SocketObj).on('open', (res)=>{
-		// 	if(!answerIsOver.value){
-		// 		sendMessage({
-		// 			"commond" : 'ASK-RE-START',
-		// 			"body" : {
-		// 				reqBatch: reqBatch.value,
-		// 				seqNo: seqNo.value,
-		// 				answerContent: answerText.value
-		// 			}
-		// 		})
-		// 	}
-		// })
-		unref(SocketObj).on('error', () => {
-			if (watchFlag.value === 1 || showModelComfirm.value) return;
-			if (reconcatNum.value === 5) {
-				common.msg('系统网络异常，请稍后再试！');
-				return;
-			}
-			showModelComfirm.value = true;
-			common
-				.show('提示信息', '网络环境不稳定，请重试！', false, '', '确认')
-				.then((res) => {
-					reconcatNum.value += 1;
-					common.redirectTo(`/pages/index/dialog`);
-				})
-				.finally(() => {
-					showModelComfirm.value = false;
-				});
-		});
-		unref(SocketObj).on('message', (res) => {
-			const { rtnCode, body, commond } = JSON.parse(res.data);
-			let _id = new Date().getTime() + 'id';
-			if (rtnCode === '0000') {
-				if (commond === 'ASK-OPEN') {
-					if (!answerIsOver.value) {
-						// 问题没完成， 重新尝试回答
-						sendMessage({
-							commond: 'ASK-RE-START',
-							body: {
-								reqBatch: reqBatch.value,
-								seqNo: seqNo.value,
-								answerContent: answerText.value
-							}
-						});
-					} else {
-						// 新连接
-						sendMessage({
-							commond: 'ASK-START',
-							body: {
-								mascotId: mascotId.value,
-								deviceImei: ''
-							}
-						});
-					}
-					return;
-				}
-				if (commond === 'ASK-START') {
-					// console.log('开启对话！')
-					reqBatch.value = body.reqBatch;
-					return;
-				}
-				if (commond === 'ASK') {
-					console.log('发送问题成功！');
-					if (talkingList.value.length > 0 && talkingList.value[talkingList.value.length - 1].isLoading) {
-						talkingList.value.pop();
-					}
-					seqNo.value = body.seqNo;
-					touchBtnCallBack.value && touchBtnCallBack.value();
-					touchBtnCallBack.value = null;
-					talkingList.value.push({
-						type: 'question',
-						talkingText: body.intrctContent,
-						isLoading: false,
-						id: _id,
-						...body,
-						talkingVoice: askData.value.talkingVoice
-					});
-					talkingList.value.push({
-						type: 'answer',
-						isLoading: true,
-						id: _id + 'loading'
-					});
-					scrollToBottomNow();
-					return;
-				}
-				if (commond === 'ASK-STOP') {
-					console.log('停止回答标记!');
-					stopAnswerCallBack.value && stopAnswerCallBack.value(askData.value);
-					setTimeout(() => {
-						stopAnswerCallBack.value = null;
-						answerIsOver.value = true;
-					}, 10);
-					return;
-				}
-				if (commond === 'ASK-ANSWER') {
-					if (body.event === 'start') {
-						console.log('开始回答！');
-						answerIsOver.value = false;
-						answerText.value = '';
-						talkingList.value.pop();
-						talkingList.value.push({
-							type: 'answer',
-							talkingText: answerText.value,
-							isLoading: false,
-							id: _id,
-							...body,
-							askData: {
-								...askData.value
-							},
-							talkingFiles: [],
-							talkingCrsList: []
-						});
-					} else if (body.event === 'token') {
-						answerIsOver.value = false;
-						answerText.value += body.data;
-					} else if (body.event === 'end') {
-						console.log('完成回答！');
-						answerIsOver.value = true;
-					} else if (body.event === 'sourceDocuments') {
-						console.log('回答返回文件列表！');
-						console.log('body: ', body);
-						if (talkingList.value.length === 0) return;
-						let _data = body.data;
-						talkingList.value[talkingList.value.length - 1].talkingFiles = _data.knowledgeList || [];
-						talkingList.value[talkingList.value.length - 1].talkingCrsList = _data.crsList || [];
-					}
-					return;
-				}
-				if (commond === 'ASK-RE-ANSWER') {
-					// console.log('开始继续回答！')
-					if (body.event === 'start') {
-						answerIsOver.value = false;
-						answerText.value = '';
-					} else if (body.event === 'token') {
-						answerIsOver.value = false;
-						answerText.value = body.data;
-					} else if (body.event === 'end') {
-						answerIsOver.value = true;
-					}
-					return;
-				}
+const createNewDialog = () => {
+  if (talkingList.value.length === 0) {
+    common.msg('已经是最新对话')
+  }
+  common.redirectTo(`/pages/index/dialog`)
+}
+const showModelComfirm = ref(false)
+const reconcatNum = ref(1)
+const initsocketTask = () => {
+  isHistory.value = false
+  socketStore.creatSocket('/traask/asksocket/open?summary=')
+  // unref(SocketObj).on('open', (res)=>{
+  // 	if(!answerIsOver.value){
+  // 		sendMessage({
+  // 			"commond" : 'ASK-RE-START',
+  // 			"body" : {
+  // 				reqBatch: reqBatch.value,
+  // 				seqNo: seqNo.value,
+  // 				answerContent: answerText.value
+  // 			}
+  // 		})
+  // 	}
+  // })
+  unref(SocketObj).on('error', () => {
+    if (watchFlag.value === 1 || showModelComfirm.value) return
+    if (reconcatNum.value === 5) {
+      common.msg('系统网络异常，请稍后再试！')
+      return
+    }
+    showModelComfirm.value = true
+    common
+      .show('提示信息', '网络环境不稳定，请重试！', false, '', '确认')
+      .then(res => {
+        reconcatNum.value += 1
+        common.redirectTo(`/pages/index/dialog`)
+      })
+      .finally(() => {
+        showModelComfirm.value = false
+      })
+  })
+  unref(SocketObj).on('message', res => {
+    const { rtnCode, body, commond } = JSON.parse(res.data)
+    let _id = new Date().getTime() + 'id'
+    if (rtnCode === '0000') {
+      if (commond === 'ASK-OPEN') {
+        if (!answerIsOver.value) {
+          // 问题没完成， 重新尝试回答
+          sendMessage({
+            commond: 'ASK-RE-START',
+            body: {
+              reqBatch: reqBatch.value,
+              seqNo: seqNo.value,
+              answerContent: answerText.value
+            }
+          })
+        } else {
+          // 新连接
+          sendMessage({
+            commond: 'ASK-START',
+            body: {
+              mascotId: mascotId.value,
+              deviceImei: ''
+            }
+          })
+        }
+        return
+      }
+      if (commond === 'ASK-START') {
+        // console.log('开启对话！')
+        reqBatch.value = body.reqBatch
+        return
+      }
+      if (commond === 'ASK') {
+        console.log('发送问题成功！')
+        if (talkingList.value.length > 0 && talkingList.value[talkingList.value.length - 1].isLoading) {
+          talkingList.value.pop()
+        }
+        seqNo.value = body.seqNo
+        touchBtnCallBack.value && touchBtnCallBack.value()
+        touchBtnCallBack.value = null
+        talkingList.value.push({
+          type: 'question',
+          talkingText: body.intrctContent,
+          isLoading: false,
+          id: _id,
+          ...body,
+          talkingVoice: askData.value.talkingVoice
+        })
+        talkingList.value.push({
+          type: 'answer',
+          isLoading: true,
+          id: _id + 'loading'
+        })
+        scrollToBottomNow()
+        return
+      }
+      if (commond === 'ASK-STOP') {
+        console.log('停止回答标记!')
+        stopAnswerCallBack.value && stopAnswerCallBack.value(askData.value)
+        setTimeout(() => {
+          stopAnswerCallBack.value = null
+          answerIsOver.value = true
+        }, 10)
+        return
+      }
+      if (commond === 'ASK-ANSWER') {
+        if (body.event === 'start') {
+          console.log('开始回答！')
+          answerIsOver.value = false
+          answerText.value = ''
+          talkingList.value.pop()
+          talkingList.value.push({
+            type: 'answer',
+            talkingText: answerText.value,
+            isLoading: false,
+            id: _id,
+            ...body,
+            askData: {
+              ...askData.value
+            },
+            talkingFiles: [],
+            talkingCrsList: []
+          })
+        } else if (body.event === 'token') {
+          answerIsOver.value = false
+          answerText.value += body.data
+        } else if (body.event === 'end') {
+          console.log('完成回答！')
+          answerIsOver.value = true
+        } else if (body.event === 'sourceDocuments') {
+          console.log('回答返回文件列表！')
+          console.log('body: ', body)
+          if (talkingList.value.length === 0) return
+          let _data = body.data
+          talkingList.value[talkingList.value.length - 1].talkingFiles = _data.knowledgeList || []
+          talkingList.value[talkingList.value.length - 1].talkingCrsList = _data.crsList || []
+        }
+        return
+      }
+      if (commond === 'ASK-RE-ANSWER') {
+        // console.log('开始继续回答！')
+        if (body.event === 'start') {
+          answerIsOver.value = false
+          answerText.value = ''
+        } else if (body.event === 'token') {
+          answerIsOver.value = false
+          answerText.value = body.data
+        } else if (body.event === 'end') {
+          answerIsOver.value = true
+        }
+        return
+      }
 
-				if (commond === 'ASK-ERR') {
-					console.log('提问失败，系统异常！');
-					return;
-				}
-			} else {
-				if (['0005', 'QQ0005'].includes(res.rtnCode)) {
-					goto_login_fun();
-				}
-			}
-		});
-		watchFlag.value += 1;
-	};
-	const sendLoadingText = ref('问题回答中，请在问题回答结束后重试！');
-	const reconnect = () => {
-		if (reconnectTimer || isManualClose.value) return;
-		reconnectTimer = setTimeout(() => {
-			initsocketTask();
-		}, 3000);
-	};
-	const sendMessage = (data) => {
-		unref(SocketObj).send(data);
-	};
-	watch(
-		() => answerText.value,
-		(val) => {
-			if (val) {
-				changeText(val);
-				scrollToBottomNow();
-			}
-		}
-	);
+      if (commond === 'ASK-ERR') {
+        console.log('提问失败，系统异常！')
+        return
+      }
+    } else {
+      if (['0005', 'QQ0005'].includes(res.rtnCode)) {
+        goto_login_fun()
+      }
+    }
+  })
+  watchFlag.value += 1
+}
+const sendLoadingText = ref('问题回答中，请在问题回答结束后重试！')
+const reconnect = () => {
+  if (reconnectTimer || isManualClose.value) return
+  reconnectTimer = setTimeout(() => {
+    initsocketTask()
+  }, 3000)
+}
+const sendMessage = data => {
+  unref(SocketObj).send(data)
+}
+watch(
+  () => answerText.value,
+  val => {
+    if (val) {
+      changeText(val)
+      scrollToBottomNow()
+    }
+  }
+)
 
-	const changeText = () => {
-		if (talkingList.value.length === 0) return;
-		talkingList.value[talkingList.value.length - 1].talkingText = answerText.value;
-	};
+const changeText = () => {
+  if (talkingList.value.length === 0) return
+  talkingList.value[talkingList.value.length - 1].talkingText = answerText.value
+}
 
-	const stopAnswerCallBack = ref(null);
-	const talkItemEvents = ({ type, data, id, info = {} }) => {
-		switch (type) {
-			case 'reAnswer':
-				console.log('重新提问回答');
-				// 停止获取
-				sendMessage({
-					commond: 'ASK-STOP',
-					body: {
-						reqBatch: reqBatch.value,
-						seqNo: seqNo.value
-					}
-				});
-				sendMessage({
-					commond: 'ASK',
-					body: data.askData
-				});
-				// // 设置停止回调
-				// stopAnswerCallBack.value = ($data) => {
-				// 	sendMessage({
-				// 		"commond": 'ASK',
-				// 		"body": $data
-				// 	})
-				// }
-				break;
-			case 'stop':
-				console.log('停止获取数据');
-				stopAnswerCallBack.value = null;
-				// ASK-STOP
-				sendMessage({
-					commond: 'ASK-STOP',
-					body: {
-						reqBatch: reqBatch.value,
-						seqNo: seqNo.value
-					}
-				});
-				break;
-			case 'changePlay':
-				activeVoiceTalkingItemId.value = id;
-				break;
-			case 'feedback':
-				let _feedstatus = data.downvoteStat === 'Y' ? 'N' : 'Y';
-				let _feedid = data.seqNo || data.askId;
-				if (_feedstatus === 'N') {
-					updateDownvoteStat({
-						askId: _feedid,
-						stat: _feedstatus
-					}).then((res) => {
-						talkingList.value.forEach((t) => {
-							if (t.seqNo === _feedid || t.askId === _feedid) {
-								t.downvoteStat = 'N';
-							}
-						});
-					});
-				} else {
-					feedbackRef.value.open(data);
-				}
-				break;
-			case 'great':
-				let _status = data.likeStat === 'Y' ? 'N' : 'Y';
-				let _id = data.seqNo || data.askId;
-				updateLikeStat({
-					askId: _id,
-					stat: _status
-				}).then((res) => {
-					talkingList.value.forEach((t) => {
-						if (t.seqNo === _id || t.askId === _id) {
-							t.likeStat = _status;
-							if (_status === 'Y') {
-								t.downvoteStat = 'N';
-							}
+const stopAnswerCallBack = ref(null)
+const talkItemEvents = ({ type, data, id, info = {} }) => {
+  switch (type) {
+    case 'reAnswer':
+      console.log('重新提问回答')
+      // 停止获取
+      sendMessage({
+        commond: 'ASK-STOP',
+        body: {
+          reqBatch: reqBatch.value,
+          seqNo: seqNo.value
+        }
+      })
+      sendMessage({
+        commond: 'ASK',
+        body: data.askData
+      })
+      // // 设置停止回调
+      // stopAnswerCallBack.value = ($data) => {
+      // 	sendMessage({
+      // 		"commond": 'ASK',
+      // 		"body": $data
+      // 	})
+      // }
+      break
+    case 'stop':
+      console.log('停止获取数据')
+      stopAnswerCallBack.value = null
+      // ASK-STOP
+      sendMessage({
+        commond: 'ASK-STOP',
+        body: {
+          reqBatch: reqBatch.value,
+          seqNo: seqNo.value
+        }
+      })
+      break
+    case 'changePlay':
+      activeVoiceTalkingItemId.value = id
+      break
+    case 'feedback':
+      let _feedstatus = data.downvoteStat === 'Y' ? 'N' : 'Y'
+      let _feedid = data.seqNo || data.askId
+      if (_feedstatus === 'N') {
+        updateDownvoteStat({
+          askId: _feedid,
+          stat: _feedstatus
+        }).then(res => {
+          talkingList.value.forEach(t => {
+            if (t.seqNo === _feedid || t.askId === _feedid) {
+              t.downvoteStat = 'N'
+            }
+          })
+        })
+      } else {
+        feedbackRef.value.open(data)
+      }
+      break
+    case 'great':
+      let _status = data.likeStat === 'Y' ? 'N' : 'Y'
+      let _id = data.seqNo || data.askId
+      updateLikeStat({
+        askId: _id,
+        stat: _status
+      }).then(res => {
+        talkingList.value.forEach(t => {
+          if (t.seqNo === _id || t.askId === _id) {
+            t.likeStat = _status
+            if (_status === 'Y') {
+              t.downvoteStat = 'N'
+            }
+          }
+        })
+      })
+      break
+    case 'preview':
+      if (getPhoneEnvBool('AND')) {
+        common.navigateTo('/pages/index/preview?fileId=' + info.docId)
+      } else {
+        const base_url = get_base_url('/traask/traFilePreview/')
+        let fileUrl = base_url + '/traask/traFilePreview/' + info.docId
+				const localFilePath = '_doc/pdf_view/' + info.docName + '.pdf'
+				downloadAndSaveAvatar(fileUrl, localFilePath).then(res=>{
+					uni.openDocument({
+						filePath: res,
+						showMenu: true,
+						success: function () {
+							console.log('打开文档成功')
 						}
-					});
-				});
-				break;
-			case 'preview':
-				// if (getPhoneEnvBool('AND')) {
-				if (true) {
-					common.navigateTo('/pages/index/preview?fileId=' + info.docId);
-				} else {
-					const base_url = get_base_url('/traask/traFilePreview/');
-					let fileUrl = base_url + '/traask/traFilePreview/' + info.docId;
-					uni.downloadFile({
-						url: fileUrl,
+					})
+				})
+      //   uni.downloadFile({
+      //     url: fileUrl,
+      //     success: function (res) {
 						
-						success: function (res) {
-							var filePath = res.tempFilePath;
-							uni.openDocument({
-								filePath: filePath,
-								showMenu: true,
-								success: function (res) {
-									console.log('打开文档成功');
-								}
-							});
-						}
-					});
-				}
+      //       uni.saveFile({
+      //         tempFilePath: res.tempFilePath,
+      //         success: function (resS) {
+      //           var filePath = resS.savedFilePath
+      //           uni.openDocument({
+      //             filePath: filePath,
+      //             showMenu: true,
+      //             success: function () {
+      //               console.log('打开文档成功')
+      //             }
+      //           })
+      //         }
+      //       })
+      //     }
+      //   })
+      }
+      break
+    case 'toCourse':
+      console.log(type, data, id)
+      break
+    default:
+      break
+  }
+}
+	const downloadAndSaveAvatar = async (fileUrl, localFilePath) => {
+	  try {
+	    return new Promise((resolve, reject) => {
+	      console.log('开始下载:', fileUrl)
+	      const dtask = plus.downloader.createDownload(fileUrl, {
+	        filename: localFilePath
+	      }, (d, status) => {
+	        if (status === 200) {
+	          console.log("保存路径：", d.filename)
+	          resolve(d.filename)
+	        } else {
+	          console.error("文件下载失败：", status)
+	          reject(new Error(`下载失败，状态码: ${status}`))
+	        }
+	      })
+	      
+	      dtask.start()
+	    })
+	  } catch (error) {
+	    console.error('创建目录失败:', error)
+	    throw error
+	  }
+	}
+const feedbackAnswer = params => {
+  talkingList.value.forEach(t => {
+    if (t.seqNo === params.askId) {
+      t.downvoteStat = 'Y'
+      t.likeStat = 'N'
+    }
+  })
+}
+const historyRef = ref(null)
+const showMenuList = ref(false)
+const showHistory = () => {
+  showMenuList.value = false
+  historyRef.value.open()
+}
+const toMessage = () => {
+  showMenuList.value = false
+  common.navigateTo('/pages/messageNotification/index')
+}
+const toMePage = () => {
+  showMenuList.value = false
+  common.switchTab('/pages/me/index')
+}
 
-				break;
-			case 'toCourse':
-				console.log(type, data, id);
-				break;
-			default:
-				break;
-		}
-	};
-	const feedbackAnswer = (params) => {
-		talkingList.value.forEach((t) => {
-			if (t.seqNo === params.askId) {
-				t.downvoteStat = 'Y';
-				t.likeStat = 'N';
-			}
-		});
-	};
-	const historyRef = ref(null);
-	const showMenuList = ref(false);
-	const showHistory = () => {
-		showMenuList.value = false;
-		historyRef.value.open();
-	};
-	const toMessage = () => {
-		showMenuList.value = false;
-		common.navigateTo('/pages/messageNotification/index');
-	};
-	const toMePage = () => {
-		showMenuList.value = false;
-		common.switchTab('/pages/me/index');
-	};
+const showHistoryDetail = item => {
+  isHistory.value = true
+  queryAskHisByBatchIdPaging({
+    batchId: item.reqBatch,
+    page: 1,
+    limit: 100
+  }).then(res => {
+    console.log(res)
 
-	const showHistoryDetail = (item) => {
-		isHistory.value = true;
-		queryAskHisByBatchIdPaging({
-			batchId: item.reqBatch,
-			page: 1,
-			limit: 100
-		}).then((res) => {
-			console.log(res);
+    talkingList.value = (res.body || []).map((t, index) => {
+      // let _obj = JSON.parse( t.respContent)
+      // console.log(_obj,0)
+      // if(t.chatRole === 'TCH'){
+      // console.log(JSON.parse(_obj),1)
+      // }
+      let _text
+      let _talkingCrsList
+      let _talkingFiles
+      if (t.chatRole === 'TCH') {
+        _text = t.respContentVo?.messageBuileder || ''
+        _talkingCrsList = t.respContentVo?.resultMap?.crsList || []
+        _talkingFiles = t.respContentVo?.resultMap?.knowledgeList || []
+      } else {
+        _text = t.respContent
+      }
+      return {
+        type: t.chatRole === 'TCH' ? 'answer' : 'question',
+        talkingText: _text,
+        isLoading: false,
+        askId: t.askId,
+        seqNo: t.askId,
+        id: t.askId + index,
+        talkingVoice: '',
+        reqBatch: item.reqBatch,
+        intrctWay: '01', //01-文本；02-语音；03-图片
+        intrctContent: _text,
+        bucketKey: '',
+        downvoteStat: t.downvoteStat,
+        likeStat: t.likeStat,
+        talkingCrsList: _talkingCrsList,
+        talkingFiles: _talkingFiles,
+        isHistory: true
+      }
+    })
+    historyRef.value.close()
+  })
+}
+const routerTo = type => {
+  switch (type) {
+    case 'AI学':
+      common.switchTab('/pages/course/index')
+      break
+    case 'AI考':
+      common.navigateTo('/pages/testingHall/index')
+      break
+    case '任务':
+      common.navigateTo('/pages/learningTasks/index')
+      break
+    case '错题':
+      common.navigateTo('/pages/wrongQuestionRecord/index')
+      break
+    default:
+      common.msg('页面建设中，敬请期待！')
+      break
+  }
+}
 
-			talkingList.value = (res.body || []).map((t, index) => {
-				// let _obj = JSON.parse( t.respContent)
-				// console.log(_obj,0)
-				// if(t.chatRole === 'TCH'){
-				// console.log(JSON.parse(_obj),1)
-				// }
-				let _text;
-				let _talkingCrsList;
-				let _talkingFiles;
-				if (t.chatRole === 'TCH') {
-					_text = t.respContentVo?.messageBuileder || '';
-					_talkingCrsList = t.respContentVo?.resultMap?.crsList || [];
-					_talkingFiles = t.respContentVo?.resultMap?.knowledgeList || [];
-				} else {
-					_text = t.respContent;
-				}
-				return {
-					type: t.chatRole === 'TCH' ? 'answer' : 'question',
-					talkingText: _text,
-					isLoading: false,
-					askId: t.askId,
-					seqNo: t.askId,
-					id: t.askId + index,
-					talkingVoice: '',
-					reqBatch: item.reqBatch,
-					intrctWay: '01', //01-文本；02-语音；03-图片
-					intrctContent: _text,
-					bucketKey: '',
-					downvoteStat: t.downvoteStat,
-					likeStat: t.likeStat,
-					talkingCrsList: _talkingCrsList,
-					talkingFiles: _talkingFiles,
-					isHistory: true
-				};
-			});
-			historyRef.value.close();
-		});
-	};
-	const routerTo = (type) => {
-		switch (type) {
-			case 'AI学':
-				common.switchTab('/pages/course/index');
-				break;
-			case 'AI考':
-				common.navigateTo('/pages/testingHall/index');
-				break;
-			case '任务':
-				common.navigateTo('/pages/learningTasks/index');
-				break;
-			case '错题':
-				common.navigateTo('/pages/wrongQuestionRecord/index');
-				break;
-			default:
-				common.msg('页面建设中，敬请期待！');
-				break;
-		}
-	};
+const touchBtnCallBack = ref(null)
+const askData = ref({})
+const sendText = item => {
+  submitAnswerNow(item)
+}
+// 发送语音
+const uploadRecordNow = voicePath => {
+  // /traask/traAskchat/voiceTrans
+  //#ifndef APP-PLUS
+  // h5 假数据
+  // #endif
+  //#ifdef APP-PLUS
+  talkingList.value.push({
+    type: 'question',
+    talkingText: '',
+    isLoading: true
+  })
+  scrollToBottomNow()
+  commonUploadVoiceFile(voicePath, '/traask/traAskchat/voiceTrans', {})
+    .then(res => {
+      let _res = JSON.parse(res.data)
+      if (_res.rtnCode === '0000') {
+        if (!!(_res.body.transContent || '').trim()) {
+          askData.value = {
+            reqBatch: reqBatch.value,
+            intrctWay: '02', //01-文本；02-语音；03-图片
+            intrctContent: _res.body.transContent,
+            bucketKey: _res.body.fileId,
+            ossFileAddr: _res.body.ossFileAddr,
+            talkingVoice: voicePath
+          }
+          sendMessage({
+            commond: 'ASK',
+            body: askData.value
+          })
+        } else {
+          talkingList.value.pop()
+          uni.showToast({
+            title: '未识别到文字',
+            icon: 'none',
+            duration: 1000
+          })
+        }
+      } else {
+      }
+    })
+    .catch(err => {
+      talkingList.value.pop()
+      uni.showToast({
+        title: '系统异常，请联系管理员',
+        icon: 'none',
+        duration: 1000
+      })
+    })
+  // #endif
+}
+// 发送文本
+const submitAnswerNow = (val, cb = null) => {
+  if (!answerIsOver.value) {
+    // 问题回答中
+    return
+  }
+  touchBtnCallBack.value = cb
+  askData.value = {
+    reqBatch: reqBatch.value,
+    intrctWay: '01', //01-文本；02-语音；03-图片
+    intrctContent: val,
+    bucketKey: ''
+  }
+  sendMessage({
+    commond: 'ASK',
+    body: askData.value
+  })
+}
+const startRecordCallback = () => {
+  // 开始录音回调
+}
+const watchFlag = ref(1)
 
-	const touchBtnCallBack = ref(null);
-	const askData = ref({});
-	const sendText = (item) => {
-		submitAnswerNow(item);
-	};
-	// 发送语音
-	const uploadRecordNow = (voicePath) => {
-		// /traask/traAskchat/voiceTrans
-		//#ifndef APP-PLUS
-		// h5 假数据
-		// #endif
-		//#ifdef APP-PLUS
-		talkingList.value.push({
-			type: 'question',
-			talkingText: '',
-			isLoading: true
-		});
-		scrollToBottomNow();
-		commonUploadVoiceFile(voicePath, '/traask/traAskchat/voiceTrans', {})
-			.then((res) => {
-				let _res = JSON.parse(res.data);
-				if (_res.rtnCode === '0000') {
-					if (!!(_res.body.transContent || '').trim()) {
-						askData.value = {
-							reqBatch: reqBatch.value,
-							intrctWay: '02', //01-文本；02-语音；03-图片
-							intrctContent: _res.body.transContent,
-							bucketKey: _res.body.fileId,
-							ossFileAddr: _res.body.ossFileAddr,
-							talkingVoice: voicePath
-						};
-						sendMessage({
-							commond: 'ASK',
-							body: askData.value
-						});
-					} else {
-						talkingList.value.pop();
-						uni.showToast({
-							title: '未识别到文字',
-							icon: 'none',
-							duration: 1000
-						});
-					}
-				} else {
-				}
-			})
-			.catch((err) => {
-				talkingList.value.pop();
-				uni.showToast({
-					title: '系统异常，请联系管理员',
-					icon: 'none',
-					duration: 1000
-				});
-			});
-		// #endif
-	};
-	// 发送文本
-	const submitAnswerNow = (val, cb = null) => {
-		if (!answerIsOver.value) {
-			// 问题回答中
-			return;
-		}
-		touchBtnCallBack.value = cb;
-		askData.value = {
-			reqBatch: reqBatch.value,
-			intrctWay: '01', //01-文本；02-语音；03-图片
-			intrctContent: val,
-			bucketKey: ''
-		};
-		sendMessage({
-			commond: 'ASK',
-			body: askData.value
-		});
-	};
-	const startRecordCallback = () => {
-		// 开始录音回调
-	};
-	const watchFlag = ref(1);
+const scrolltolower = () => {
+  console.log('scrolltolower')
+  const pages = getCurrentPages()
+  const pageCount = pages?.length || 0
+  // 处理页面数量不足的情况，此为调试时候异常情况
+  if (pageCount <= 1) {
+    common.switchTab('/pages/index/index')
+    return
+  }
+  const prevPage = pages[pageCount - 2] // 获取上一页实例并验证
+  // 根据上一页路由决定跳转方式
+  if (prevPage.route === 'pages/login/login') {
+    // 登录页特殊处理，如果刚好等于2说明书刚启动，里面只有登录页和当前页，这样直接返回老首页
+    pageCount === 2 ? common.switchTab('/pages/index/index') : common.navigateBack(2)
+  } else {
+    // 普通页面返回上一页
+    common.navigateBack()
+  }
+}
 
-	const scrolltolower = () => {
-		console.log('scrolltolower');
-		const pages = getCurrentPages();
-		const pageCount = pages?.length || 0;
-		// 处理页面数量不足的情况，此为调试时候异常情况
-		if (pageCount <= 1) {
-			common.switchTab('/pages/index/index');
-			return;
-		}
-		const prevPage = pages[pageCount - 2]; // 获取上一页实例并验证
-		// 根据上一页路由决定跳转方式
-		if (prevPage.route === 'pages/login/login') {
-			// 登录页特殊处理，如果刚好等于2说明书刚启动，里面只有登录页和当前页，这样直接返回老首页
-			pageCount === 2 ? common.switchTab('/pages/index/index') : common.navigateBack(2);
-		} else {
-			// 普通页面返回上一页
-			common.navigateBack();
-		}
-	};
+onBackPress(options => {
+  const from = options.from
+  if (from === 'backbutton') {
+    // 判断上一级是否是登录，是登录就返回两层跳过登录页
+    const pages = getCurrentPages()
+    if (pages && pages.length > 1) {
+      const page = pages[pages.length - 2]
+      if (page.route === 'pages/login/login') {
+        if (pages.length == 2) {
+          common.switchTab('/pages/index/index')
+        } else {
+          common.navigateBack(2)
+        }
+        return true
+      }
+    }
+  }
+  return false
+})
 
-	onBackPress((options) => {
-		const from = options.from;
-		if (from === 'backbutton') {
-			// 判断上一级是否是登录，是登录就返回两层跳过登录页
-			const pages = getCurrentPages();
-			if (pages && pages.length > 1) {
-				const page = pages[pages.length - 2];
-				if (page.route === 'pages/login/login') {
-					if (pages.length == 2) {
-						common.switchTab('/pages/index/index');
-					} else {
-						common.navigateBack(2);
-					}
-					return true;
-				}
-			}
-		}
-		return false;
-	});
+const getQuestionList = () => {
+  queryHotQuestionApi().then(res => {
+    console.log(res)
+    questionList.value = res.body
+      .map(t => {
+        return {
+          ...t,
+          hotContent: t.refineContent
+        }
+      })
+      .filter(t => t.refineContent)
+  })
+}
+const loadData = async () => {
+  userInfo.value = getUserInfo()
+  getQuestionList()
+  initsocketTask()
+}
+onLoad(() => {
+  changeAppHeightBottom()
+  if (!common.isLogin()) {
+    common.navigateTo('/pages/login/login')
+    return
+  }
+  // 判断下如果没有设置吉祥物就跳转到吉祥物页面
+  if (userInfo.value?.mascotInfo.mascotId === null) {
+    //说明这人在上次选吉祥物的时候退出了，没有选到吉祥物
+    common.redirectTo('/pages/mascot/mascot_select_list')
+    return
+  }
+  loadData()
+})
+const previewRef = ref()
+const previewFileRef = ref()
+const showPreview = ref(false)
+onMounted(() => {
+  // previewFileRef.value.open({
+  // 	fileId: '0006e7f7-a332-4c81-9802-ac4e2d971c71'
+  // })
+})
 
-	const getQuestionList = () => {
-		queryHotQuestionApi().then((res) => {
-			console.log(res);
-			questionList.value = res.body
-				.map((t) => {
-					return {
-						...t,
-						hotContent: t.refineContent
-					};
-				})
-				.filter((t) => t.refineContent);
-		});
-	};
-	const loadData = async () => {
-		userInfo.value = getUserInfo();
-		getQuestionList();
-		initsocketTask();
-	};
-	onLoad(() => {
-		changeAppHeightBottom();
-		if (!common.isLogin()) {
-			common.navigateTo('/pages/login/login');
-			return;
-		}
-		// 判断下如果没有设置吉祥物就跳转到吉祥物页面
-		if (userInfo.value?.mascotInfo.mascotId === null) {
-			//说明这人在上次选吉祥物的时候退出了，没有选到吉祥物
-			common.redirectTo('/pages/mascot/mascot_select_list');
-			return;
-		}
-		loadData();
-	});
-	const previewRef = ref();
-	const previewFileRef = ref();
-	const showPreview = ref(false);
-	onMounted(() => {
-		// previewFileRef.value.open({
-		// 	fileId: '0006e7f7-a332-4c81-9802-ac4e2d971c71'
-		// })
-	});
+const refreshData = () => {
+  loadData()
+}
 
-	const refreshData = () => {
-		loadData();
-	};
-
-	const keyboardHeight = ref('0px');
-	const setHeight = (res) => {
-		keyboardHeight.value = (res.height || 0) + 'px';
-	};
-	const keyBoardIsHide = computed(() => {
-		return parseInt(keyboardHeight.value) == 0;
-	});
-	const bottomHeight = ref('0px');
-	const totalBotHeight = computed(() => {
-		return keyBoardIsHide.value ? 0 + 'px' : parseInt(keyboardHeight.value) - parseInt(bottomHeight.value) + 'px';
-	});
-	const changeAppHeightBottom = (height) => {
-		//#ifdef APP-PLUS
-		// 获取系统信息
-		const systemInfo = uni.getSystemInfoSync();
-		// 计算安全区域底部高度
-		bottomHeight.value = systemInfo.screenHeight - systemInfo.safeArea.bottom + 'px';
-		// #endif
-	};
-	//#ifdef APP-PLUS
-	onHide(() => {
-		uni.offKeyboardHeightChange(setHeight);
-	});
-	onShow(() => {
-		uni.onKeyboardHeightChange(setHeight);
-	});
-	// #endif
-	onUnload(() => {
-		watchFlag.value = 1;
-		socketStore?.closeSocket();
-		// setupKeyboardHeightListener(changeAppHeightBottom)
-	});
-	defineExpose({
-		refreshData
-	});
+const keyboardHeight = ref('0px')
+const setHeight = res => {
+  keyboardHeight.value = (res.height || 0) + 'px'
+}
+const keyBoardIsHide = computed(() => {
+  return parseInt(keyboardHeight.value) == 0
+})
+const bottomHeight = ref('0px')
+const totalBotHeight = computed(() => {
+  return keyBoardIsHide.value ? 0 + 'px' : parseInt(keyboardHeight.value) - parseInt(bottomHeight.value) + 'px'
+})
+const changeAppHeightBottom = height => {
+  //#ifdef APP-PLUS
+  // 获取系统信息
+  const systemInfo = uni.getSystemInfoSync()
+  // 计算安全区域底部高度
+  bottomHeight.value = systemInfo.screenHeight - systemInfo.safeArea.bottom + 'px'
+  // #endif
+}
+//#ifdef APP-PLUS
+onHide(() => {
+  uni.offKeyboardHeightChange(setHeight)
+})
+onShow(() => {
+  uni.onKeyboardHeightChange(setHeight)
+})
+// #endif
+onUnload(() => {
+  watchFlag.value = 1
+  socketStore?.closeSocket()
+  // setupKeyboardHeightListener(changeAppHeightBottom)
+})
+defineExpose({
+  refreshData
+})
 </script>
 
 <style scoped lang="scss">
-	.index-dialog-page {
-		position: relative;
-		display: flex;
-		flex-direction: column;
-		height: 100vh;
-		overflow: hidden;
-	}
+.index-dialog-page {
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  height: 100vh;
+  overflow: hidden;
+}
 
-	.top-bg {
-		background: linear-gradient(0deg, rgba(234, 246, 255, 0) 0%, #e6eafd 100%);
-		height: 480rpx;
-		width: 100%;
-	}
+.top-bg {
+  background: linear-gradient(0deg, rgba(234, 246, 255, 0) 0%, #e6eafd 100%);
+  height: 480rpx;
+  width: 100%;
+}
 
-	.bot-bg {
-		// background-color: #F6F8FF;
-		background: linear-gradient(136deg, rgba(234, 246, 255, 0) 0%, #fff 100%);
-		width: 100%;
-		flex: 1;
-	}
+.bot-bg {
+  // background-color: #F6F8FF;
+  background: linear-gradient(136deg, rgba(234, 246, 255, 0) 0%, #fff 100%);
+  width: 100%;
+  flex: 1;
+}
 
-	.index-dialog-body {
-		position: absolute;
-		overflow: hidden;
-		height: calc(100% - v-bind(totalBotHeight));
-		width: 100%;
-		padding: 0;
-		bottom: 0;
-		left: 0;
-		box-sizing: border-box;
-		padding-top: v-bind(pageTopPadding);
-		// padding-bottom: v-bind(bottomHeight);
-		// display: flex;
-		// flex-direction: column;
+.index-dialog-body {
+  position: absolute;
+  overflow: hidden;
+  height: calc(100% - v-bind(totalBotHeight));
+  width: 100%;
+  padding: 0;
+  bottom: 0;
+  left: 0;
+  box-sizing: border-box;
+  padding-top: v-bind(pageTopPadding);
+  // padding-bottom: v-bind(bottomHeight);
+  // display: flex;
+  // flex-direction: column;
 
-		.body-title {
-			height: 90rpx;
-			text-align: center;
-			font-size: 33rpx;
-			padding-top: 20rpx;
+  .body-title {
+    height: 90rpx;
+    text-align: center;
+    font-size: 33rpx;
+    padding-top: 20rpx;
 
-			line-height: 46rpx;
-			box-sizing: border-box;
-			font-weight: 500;
-			color: #000;
-			position: relative;
+    line-height: 46rpx;
+    box-sizing: border-box;
+    font-weight: 500;
+    color: #000;
+    position: relative;
 
-			// margin-bottom: 23rpx;
-			.arrow-icon {
-				position: absolute;
-				left: 36rpx;
-				top: 30rpx;
-				color: #000;
-			}
-		}
+    // margin-bottom: 23rpx;
+    .arrow-icon {
+      position: absolute;
+      left: 36rpx;
+      top: 30rpx;
+      color: #000;
+    }
+  }
 
-		.seek-setting {
-			position: absolute;
-			z-index: 13;
-			right: 45rpx;
-			top: 8rpx;
-			font-size: 26rpx;
-			width: 140rpx;
-			height: 52rpx;
-			padding: 10rpx 0;
-			// overflow: hidden;
-			line-height: 32rpx;
-			text-align: right;
-			padding-right: 48rpx;
-			.more-list {
-				position: absolute;
-				top: 100%;
-				right: 0;
-				width: 100rpx;
-				text-align: center;
-				background-color: #fff;
-				border-radius: 12rpx;
-				padding: 16rpx 0;
-				display: none;
-				z-index: 21;
-				&.show {
-					display: block;
-				}
-				.more-item {
-					line-height: 60rpx;
-					font-size: 29rpx;
-					color: #333;
-					position: relative;
-					z-index: 22;
-				}
-			}
-			.image-icon {
-				width: 30rpx;
-				height: 32rpx;
-				position: absolute;
-				right: 0;
-				top: 10rpx;
-			}
+  .seek-setting {
+    position: absolute;
+    z-index: 13;
+    right: 45rpx;
+    top: 8rpx;
+    font-size: 26rpx;
+    width: 140rpx;
+    height: 52rpx;
+    padding: 10rpx 0;
+    // overflow: hidden;
+    line-height: 32rpx;
+    text-align: right;
+    padding-right: 48rpx;
+    .more-list {
+      position: absolute;
+      top: 100%;
+      right: 0;
+      width: 100rpx;
+      text-align: center;
+      background-color: #fff;
+      border-radius: 12rpx;
+      padding: 16rpx 0;
+      display: none;
+      z-index: 21;
+      &.show {
+        display: block;
+      }
+      .more-item {
+        line-height: 60rpx;
+        font-size: 29rpx;
+        color: #333;
+        position: relative;
+        z-index: 22;
+      }
+    }
+    .image-icon {
+      width: 30rpx;
+      height: 32rpx;
+      position: absolute;
+      right: 0;
+      top: 10rpx;
+    }
 
-			.image-icon-new {
-				right: 50rpx;
-				width: 30rpx;
-				height: 32rpx;
-				position: absolute;
-				top: 10rpx;
-			}
-		}
+    .image-icon-new {
+      right: 50rpx;
+      width: 30rpx;
+      height: 32rpx;
+      position: absolute;
+      top: 10rpx;
+    }
+  }
 
-		.ai-info {
-			padding: 0 24rpx;
-			height: 250rpx;
-			overflow: hidden;
-			padding-top: 72rpx;
-			margin-bottom: 24rpx;
-			position: relative;
-			box-sizing: border-box;
+  .ai-info {
+    padding: 0 24rpx;
+    height: 250rpx;
+    overflow: hidden;
+    padding-top: 72rpx;
+    margin-bottom: 24rpx;
+    position: relative;
+    box-sizing: border-box;
 
-			.image-pet {
-				width: 230rpx;
-				// height: 235rpx;
-				position: absolute;
-				right: 24rpx;
-				top: -20rpx;
-				z-index: 2;
-			}
+    .image-pet {
+      width: 230rpx;
+      // height: 235rpx;
+      position: absolute;
+      right: 24rpx;
+      top: -20rpx;
+      z-index: 2;
+    }
 
-			.image-pet-bg {
-				position: absolute;
-				padding: 0 24rpx;
-				box-sizing: border-box;
-				width: 100%;
-				height: 230rpx;
-				left: 0;
-				bottom: 0;
-				z-index: 2;
-			}
+    .image-pet-bg {
+      position: absolute;
+      padding: 0 24rpx;
+      box-sizing: border-box;
+      width: 100%;
+      height: 230rpx;
+      left: 0;
+      bottom: 0;
+      z-index: 2;
+    }
 
-			.ai-info-bg-box {
-				position: absolute;
-				z-index: 3;
-				left: 0;
-				top: 68rpx;
-				width: 100%;
-				// background-color: #ccc;
-				padding: 0 64rpx;
-				height: 178rpx;
+    .ai-info-bg-box {
+      position: absolute;
+      z-index: 3;
+      left: 0;
+      top: 68rpx;
+      width: 100%;
+      // background-color: #ccc;
+      padding: 0 64rpx;
+      height: 178rpx;
 
-				.hello-text {
-					height: 54rpx;
-					line-height: 44rpx;
-					font-size: 28rpx;
-					color: #666;
-				}
+      .hello-text {
+        height: 54rpx;
+        line-height: 44rpx;
+        font-size: 28rpx;
+        color: #666;
+      }
 
-				.info-text {
-					height: 44rpx;
-					line-height: 44rpx;
-					font-size: 32rpx;
-					color: #000;
-					font-weight: 600;
-				}
+      .info-text {
+        height: 44rpx;
+        line-height: 44rpx;
+        font-size: 32rpx;
+        color: #000;
+        font-weight: 600;
+      }
 
-				.info-btn {
-					width: 220rpx;
-					font-size: 29rpx;
-					height: 54rpx;
-					color: #fff;
-					background: linear-gradient(104deg, #5547f3 0%, #4e86f4 100%);
-					line-height: 54rpx;
-					text-align: center;
-					border-radius: 15rpx 15rpx 0 0;
-					position: absolute;
-					left: 68rpx;
-					bottom: 0;
-				}
-			}
-		}
+      .info-btn {
+        width: 220rpx;
+        font-size: 29rpx;
+        height: 54rpx;
+        color: #fff;
+        background: linear-gradient(104deg, #5547f3 0%, #4e86f4 100%);
+        line-height: 54rpx;
+        text-align: center;
+        border-radius: 15rpx 15rpx 0 0;
+        position: absolute;
+        left: 68rpx;
+        bottom: 0;
+      }
+    }
+  }
 
-		.questions-view {
-			padding-left: 24rpx;
-			padding-right: 24rpx;
-			height: 184rpx;
-			box-sizing: border-box;
+  .questions-view {
+    padding-left: 24rpx;
+    padding-right: 24rpx;
+    height: 184rpx;
+    box-sizing: border-box;
 
-			.question-row {
-				white-space: nowrap;
-				margin-bottom: 16rpx;
-			}
+    .question-row {
+      white-space: nowrap;
+      margin-bottom: 16rpx;
+    }
 
-			.question-item {
-				white-space: nowrap;
-				height: 66rpx;
-				line-height: 66rpx;
-				background-color: #fff;
-				border: 2rpx solid #e0dede;
-				padding: 0 16rpx;
-				border-radius: 11rpx;
-				margin-right: 16rpx;
-				display: inline-block;
-				font-size: 26rpx;
+    .question-item {
+      white-space: nowrap;
+      height: 66rpx;
+      line-height: 66rpx;
+      background-color: #fff;
+      border: 2rpx solid #e0dede;
+      padding: 0 16rpx;
+      border-radius: 11rpx;
+      margin-right: 16rpx;
+      display: inline-block;
+      font-size: 26rpx;
 
-				&:last-child {
-					margin-right: 0;
-				}
-			}
-		}
+      &:last-child {
+        margin-right: 0;
+      }
+    }
+  }
 
-		.router-list {
-			height: 84rpx;
-			padding: 20rpx 30rpx 0;
-			background-color: #fff;
-			border-radius: 15rpx 15rpx 0 0;
-			white-space: nowrap;
-			box-sizing: border-box;
+  .router-list {
+    height: 84rpx;
+    padding: 20rpx 30rpx 0;
+    background-color: #fff;
+    border-radius: 15rpx 15rpx 0 0;
+    white-space: nowrap;
+    box-sizing: border-box;
 
-			.btns-item {
-				display: inline-block;
-				box-sizing: border-box;
-				height: 62rpx;
-				border: 2rpx solid #e0dede;
-				border-radius: 15rpx;
-				margin-right: 16rpx;
-				padding: 0 20rpx 0 64rpx;
-				line-height: 58rpx;
-				font-size: 29rpx;
-				position: relative;
+    .btns-item {
+      display: inline-block;
+      box-sizing: border-box;
+      height: 62rpx;
+      border: 2rpx solid #e0dede;
+      border-radius: 15rpx;
+      margin-right: 16rpx;
+      padding: 0 20rpx 0 64rpx;
+      line-height: 58rpx;
+      font-size: 29rpx;
+      position: relative;
 
-				.image-icon {
-					position: absolute;
-					width: 31rpx;
-					height: 31rpx;
-					top: 50%;
-					transform: translateY(-50%);
-					left: 24rpx;
-				}
+      .image-icon {
+        position: absolute;
+        width: 31rpx;
+        height: 31rpx;
+        top: 50%;
+        transform: translateY(-50%);
+        left: 24rpx;
+      }
 
-				&:last-child {
-					margin-right: 0;
-				}
-			}
-		}
+      &:last-child {
+        margin-right: 0;
+      }
+    }
+  }
 
-		.talking-list {
-			height: calc(100% - 772rpx);
-			padding: 12rpx 24rpx;
-			box-sizing: border-box;
+  .talking-list {
+    height: calc(100% - 772rpx);
+    padding: 12rpx 24rpx;
+    box-sizing: border-box;
 
-			.talking-scroll-list {
-				height: 100%;
-			}
-		}
-	}
+    .talking-scroll-list {
+      height: 100%;
+    }
+  }
+}
 
-	// .talking-list {
-	// 	height: calc(100% - 832rpx);
-	// 	padding: 12rpx 24rpx;
-	// 	box-sizing: border-box;
+// .talking-list {
+// 	height: calc(100% - 832rpx);
+// 	padding: 12rpx 24rpx;
+// 	box-sizing: border-box;
 
-	// 	.talking-scroll-list {
-	// 		height: 100%;
-	// 	}
-	// }
+// 	.talking-scroll-list {
+// 		height: 100%;
+// 	}
+// }
 </style>

From cbeab8a1f4b32acd4ddf0ec5b288ff070d573faa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= <icho.yang@scai-global.com>
Date: Wed, 17 Sep 2025 14:42:19 +0800
Subject: [PATCH 08/10] =?UTF-8?q?fix=EF=BC=9A=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/index/dialog.vue | 127 ++++++++++++++++++++++---------------
 1 file changed, 75 insertions(+), 52 deletions(-)

diff --git a/src/pages/index/dialog.vue b/src/pages/index/dialog.vue
index f8bd4c06..47fe4136 100644
--- a/src/pages/index/dialog.vue
+++ b/src/pages/index/dialog.vue
@@ -424,35 +424,35 @@ const talkItemEvents = ({ type, data, id, info = {} }) => {
       } else {
         const base_url = get_base_url('/traask/traFilePreview/')
         let fileUrl = base_url + '/traask/traFilePreview/' + info.docId
-				const localFilePath = '_doc/pdf_view/' + info.docName + '.pdf'
-				downloadAndSaveAvatar(fileUrl, localFilePath).then(res=>{
-					uni.openDocument({
-						filePath: res,
-						showMenu: true,
-						success: function () {
-							console.log('打开文档成功')
-						}
-					})
-				})
-      //   uni.downloadFile({
-      //     url: fileUrl,
-      //     success: function (res) {
-						
-      //       uni.saveFile({
-      //         tempFilePath: res.tempFilePath,
-      //         success: function (resS) {
-      //           var filePath = resS.savedFilePath
-      //           uni.openDocument({
-      //             filePath: filePath,
-      //             showMenu: true,
-      //             success: function () {
-      //               console.log('打开文档成功')
-      //             }
-      //           })
-      //         }
-      //       })
-      //     }
-      //   })
+        const localFilePath = '_doc/pdf_view/' + info.docName + '.pdf'
+        downloadAndSaveAvatar(fileUrl, localFilePath).then(res => {
+          uni.openDocument({
+            filePath: res,
+            showMenu: true,
+            success: function () {
+              console.log('打开文档成功')
+            }
+          })
+        })
+        //   uni.downloadFile({
+        //     url: fileUrl,
+        //     success: function (res) {
+
+        //       uni.saveFile({
+        //         tempFilePath: res.tempFilePath,
+        //         success: function (resS) {
+        //           var filePath = resS.savedFilePath
+        //           uni.openDocument({
+        //             filePath: filePath,
+        //             showMenu: true,
+        //             success: function () {
+        //               console.log('打开文档成功')
+        //             }
+        //           })
+        //         }
+        //       })
+        //     }
+        //   })
       }
       break
     case 'toCourse':
@@ -462,29 +462,39 @@ const talkItemEvents = ({ type, data, id, info = {} }) => {
       break
   }
 }
-	const downloadAndSaveAvatar = async (fileUrl, localFilePath) => {
-	  try {
-	    return new Promise((resolve, reject) => {
-	      console.log('开始下载:', fileUrl)
-	      const dtask = plus.downloader.createDownload(fileUrl, {
-	        filename: localFilePath
-	      }, (d, status) => {
-	        if (status === 200) {
-	          console.log("保存路径：", d.filename)
-	          resolve(d.filename)
-	        } else {
-	          console.error("文件下载失败：", status)
-	          reject(new Error(`下载失败，状态码: ${status}`))
-	        }
-	      })
-	      
-	      dtask.start()
-	    })
-	  } catch (error) {
-	    console.error('创建目录失败:', error)
-	    throw error
-	  }
-	}
+const downloadAndSaveAvatar = async (fileUrl, localFilePath) => {
+  try {
+    //#ifdef APP-PLUS
+    return new Promise((resolve, reject) => {
+      console.log('开始下载:', fileUrl)
+      const dtask = plus.downloader.createDownload(
+        fileUrl,
+        {
+          filename: localFilePath
+        },
+        (d, status) => {
+          if (status === 200) {
+            console.log('保存路径：', d.filename)
+            resolve(d.filename)
+          } else {
+            console.error('文件下载失败：', status)
+            reject(new Error(`下载失败，状态码: ${status}`))
+          }
+        }
+      )
+      dtask.start()
+    })
+    // #endif
+    //#ifdef H5
+    return new Promise((resolve, reject) => {
+      resolve()
+    })
+    // #endif
+  } catch (error) {
+    console.error('创建目录失败:', error)
+    throw error
+  }
+}
 const feedbackAnswer = params => {
   talkingList.value.forEach(t => {
     if (t.seqNo === params.askId) {
@@ -758,6 +768,18 @@ const changeAppHeightBottom = height => {
   bottomHeight.value = systemInfo.screenHeight - systemInfo.safeArea.bottom + 'px'
   // #endif
 }
+
+const deleteFolder = () => {
+  //#ifdef APP-PLUS
+  plus.io.resolveLocalFileSystemURL('_doc/pdf_view', function (entry) {
+    console.log('entry', entry)
+    entry.removeRecursively(function (res) {
+      console.log('删除成功')
+    })
+  })
+  // #endif
+}
+
 //#ifdef APP-PLUS
 onHide(() => {
   uni.offKeyboardHeightChange(setHeight)
@@ -768,6 +790,7 @@ onShow(() => {
 // #endif
 onUnload(() => {
   watchFlag.value = 1
+  deleteFolder()
   socketStore?.closeSocket()
   // setupKeyboardHeightListener(changeAppHeightBottom)
 })

From 376e54f4dd6d1d2819d1f86e7ea1360b34a29190 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=94=B0=E5=B2=A9?= <tybb88x@gmail.com>
Date: Wed, 17 Sep 2025 15:48:58 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=80=83=E8=AF=95?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E4=B8=8B=E6=8B=89=E5=88=B7=E6=96=B0=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |   2 +-
 src/api/examination.js                        |  10 +
 .../components/examRecordItem.vue             |   2 +-
 .../components/practiceRecordItem.vue         |   2 +-
 .../components/studyRecordItem.vue            |   2 +-
 src/pages/courseRecord/useItemList.js         |   3 +-
 src/pages/learningTasks/details.vue           |   3 +-
 .../testingHall/components/content-item.vue   |   1 +
 src/pages/testingHall/components/content.vue  |  88 +----
 src/pages/testingHall/details.vue             | 304 ++++++++++--------
 src/pages/testingHall/index.vue               |  58 +---
 11 files changed, 218 insertions(+), 257 deletions(-)

diff --git a/.env.development b/.env.development
index a48f4b38..db90fd74 100644
--- a/.env.development
+++ b/.env.development
@@ -24,7 +24,7 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002'
 
 
 # dev
-VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001'
+# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7002'
 # sit
 # VITE_APP_BASE_H5_API_Url = 'http://25.18.122.92:9786'
 
diff --git a/src/api/examination.js b/src/api/examination.js
index 1f4ee2d3..3cfb371b 100644
--- a/src/api/examination.js
+++ b/src/api/examination.js
@@ -31,6 +31,16 @@ export const queryPaperExamScore = (data) => {
 		data
 	});
 };
+// 根据试卷id查询详情
+export const queryTraExamPapersByPapersId = (data) => {
+	return request({
+		url: base_url + '/traExamPapers/queryTraExamPapersByPapersId',
+		method: 'post',
+		toastErrors: true,
+		data
+	});
+};
+
 
 // ↑↑↑↑↑↑↑↑↑考试中心考试↑↑↑↑↑↑↑
 
diff --git a/src/pages/courseRecord/components/examRecordItem.vue b/src/pages/courseRecord/components/examRecordItem.vue
index 9ccd6920..461dafb2 100644
--- a/src/pages/courseRecord/components/examRecordItem.vue
+++ b/src/pages/courseRecord/components/examRecordItem.vue
@@ -14,7 +14,7 @@
 						<view class="bottom">历史最高分</view>
 					</view>
 					<view class="prompt_div_line"></view>
-					<view class="prompt_div_right" @click="show_list_click">
+					<view class="prompt_div_right" @click="show_list_click(item.examCnt)">
 						<view class="click_text">
 							{{ item.examCnt || 0 }}
 							<uv-icon
diff --git a/src/pages/courseRecord/components/practiceRecordItem.vue b/src/pages/courseRecord/components/practiceRecordItem.vue
index cea6b05e..dc1eb66f 100644
--- a/src/pages/courseRecord/components/practiceRecordItem.vue
+++ b/src/pages/courseRecord/components/practiceRecordItem.vue
@@ -14,7 +14,7 @@
 						<view class="bottom">答题正确率</view>
 					</view>
 					<view class="prompt_div_line"></view>
-					<view class="prompt_div_right" @click="show_list_click">
+					<view class="prompt_div_right" @click="show_list_click(item.exrCnt)">
 						<view class="click_text">
 							{{ item.exrCnt || '0' }}
 							<uv-icon
diff --git a/src/pages/courseRecord/components/studyRecordItem.vue b/src/pages/courseRecord/components/studyRecordItem.vue
index 7b017933..b83c8f9a 100644
--- a/src/pages/courseRecord/components/studyRecordItem.vue
+++ b/src/pages/courseRecord/components/studyRecordItem.vue
@@ -14,7 +14,7 @@
 						<view class="bottom">学习时长</view>
 					</view>
 					<view class="prompt_div_line"></view>
-					<view class="prompt_div_right" @click="show_list_click">
+					<view class="prompt_div_right" @click="show_list_click(item.stdyCnt)">
 						<view class="click_text">
 							{{ item.stdyCnt || 0 }}
 							<uv-icon
diff --git a/src/pages/courseRecord/useItemList.js b/src/pages/courseRecord/useItemList.js
index 900f98d3..f0a6843e 100644
--- a/src/pages/courseRecord/useItemList.js
+++ b/src/pages/courseRecord/useItemList.js
@@ -55,7 +55,8 @@ export function useItemList(fetchFunction, item) {
 		}
 	});
 	// 点击获取详情
-	const show_list_click = () => {
+	const show_list_click = (num = -1) => {
+		if (num === 0) return;
 		show_list_state.value = !show_list_state.value;
 		if (show_list_state.value) {
 			nextTick(() => {
diff --git a/src/pages/learningTasks/details.vue b/src/pages/learningTasks/details.vue
index b1498e92..67096ef6 100644
--- a/src/pages/learningTasks/details.vue
+++ b/src/pages/learningTasks/details.vue
@@ -150,7 +150,6 @@
 	import { queryAllTraTaskCrsInfo, queryTraTaskInfoByTaskId } from '@/api/learningTasks.js';
 	import { passTheExamIcon, completeTheExercisesIcon, lockIcon } from '@/common/imgSvg';
 	import { insertTraPersonalCollectionTask, deleteTraPersonalCollectionById } from '@/api/favorites.js';
-	import useZpaging from '@/composables/useZpaging.js';
 	import common from '@/common/common';
 	import { getPageCache } from '@/common/common';
 
@@ -528,7 +527,7 @@
 		background-position: top;
 		background-color: #fff;
 	}
-
+	
 	.detail_div {
 		height: 250rpx;
 		z-index: 2;
diff --git a/src/pages/testingHall/components/content-item.vue b/src/pages/testingHall/components/content-item.vue
index 4bee10da..5032cf80 100644
--- a/src/pages/testingHall/components/content-item.vue
+++ b/src/pages/testingHall/components/content-item.vue
@@ -32,6 +32,7 @@
 		setPageCache('testing_hall_details', item)
 		common.navigateTo('/pages/testingHall/details');
 	}
+	
 </script>
 
 <style scoped lang="scss">
diff --git a/src/pages/testingHall/components/content.vue b/src/pages/testingHall/components/content.vue
index 8442f279..6ef991be 100644
--- a/src/pages/testingHall/components/content.vue
+++ b/src/pages/testingHall/components/content.vue
@@ -36,13 +36,13 @@
 
 	import useZpaging from '@/composables/useZpaging.js';
 
-	const examStat = computed(() => ['', 'Y', 'N'][props.currentIndex]);
+	const examStat = computed(() => ['', 'Y', 'N'][props.tabIndex]);
 	const fetchFunction = (params) => queryTraExamPapersPage({ examStat: examStat.value, ...params });
 	const { pagingRef, queryList, data_list, reload, search, total, clear } = useZpaging({
 		fetchFunction,
 		searchKey: 'papersName'
 	});
-
+	
 	const props = defineProps({
 		tabIndex: {
 			type: Number,
@@ -53,76 +53,18 @@
 			default: 0
 		}
 	});
-
-	// const getData = (from = '', _searchText = '') => {
-	// 	if (from === 'first') {
-	// 		if (total.value !== -1) return;
-	// 		status.value = 'loading';
-	// 		total.value = -1;
-	// 		page.value = 1;
-	// 		data_list.length = 0;
-	// 	} else {
-	// 		if (status.value !== 'loadmore' && status.value !== '') return;
-	// 		status.value = 'loading';
-	// 		page.value++;
-	// 	}
-
-	// 	setTimeout(() => {
-	// 		let params = {
-	// 			papersName: _searchText || searchText.value,
-	// 			page: page.value,
-	// 			limit: limit
-	// 		};
-	// 		if (props.currentIndex === 1) {
-	// 			params.examStat = 'Y';
-	// 		} else if (props.currentIndex === 2) {
-	// 			params.examStat = 'N';
-	// 		}
-	// 		queryTraExamPapersPage(params)
-	// 			.then((res) => {
-	// 				total.value = res.total;
-	// 				data_list.push(...res.body);
-	// 				console.log('total.value', total.value);
-	// 			})
-	// 			.catch((res) => {
-	// 				console.log('resres', res);
-	// 			})
-	// 			.finally(() => {
-	// 				if (data_list.length >= total.value) {
-	// 					status.value = 'nomore';
-	// 				} else {
-	// 					status.value = 'loadmore';
-	// 				}
-	// 			});
-	// 	}, 200);
-	// };
-	// const scrolltolower = () => {
-	// 	getData();
-	// };
-	// const searchText = ref('');
-	// const search = (value, state) => {
-	// 	console.log('value', value, state);
-	// 	total.value = -1;
-	// 	searchText.value = value;
-	// 	if (state) {
-	// 		getData('first', value);
-	// 	} else {
-	// 		total.value = -1;
-	// 		page.value = 1;
-	// 		data_list.length = 0;
-	// 	}
-	// };
-	// const clear = (state) => {
-	// 	total.value = -1;
-	// 	page.value = 1;
-	// 	data_list.length = 0;
-	// };
+	
 	const updateData = (item) => {
-		// 	const index = data_list.findIndex((res) => res.taskId === item.taskId);
-		// 	console.log('updateData', index, item);
-		// 	if (index !== -1) {
-		// 		data_list[index] = item;
-		// 	}
+		if(props.tabIndex !== 0 && item.examStatText === 'Y') {
+			reload()
+		} else{
+			const index = data_list.value.findIndex((res) => res.taskId === item.taskId);
+			if (index !== -1) {
+				Object.assign(data_list.value[index], {
+					...item
+				});
+			}
+		}
 	};
 	onMounted(() => {
 		watch(
@@ -164,8 +106,8 @@
 	// }
 
 	.scroll-Y {
-		background-color: #f1f5fa;
+		
 		border-radius: 16rpx;
-		padding: 1rpx 12rpx 0 22rpx;
+		padding: 1rpx 22rpx 0 22rpx;
 	}
 </style>
diff --git a/src/pages/testingHall/details.vue b/src/pages/testingHall/details.vue
index f4959bf2..bceabeb0 100644
--- a/src/pages/testingHall/details.vue
+++ b/src/pages/testingHall/details.vue
@@ -1,145 +1,142 @@
 <template>
-	<view class="main_div max_page">
-		<view class="my-nav-bar"></view>
-		<view class="body-title">
-			<view class="back_div" @click="common.navigateBack()">
-				<view class="back-icon"></view>
-			</view>
-			<view>考试详情</view>
-		</view>
-		<view class="detail_div" :class="detailData.examStatText == 'Y' ? 'completed' : 'incomplete'">
-			<view class="subscript" v-if="detailData.examStatText === 'N'">未完成</view>
-			<view class="subscript" v-if="detailData.examStatText === 'Y'">已完成</view>
-			<view class="title_div">
-				<view class="title ellipsis-text">{{ detailData.papersName }}</view>
-			</view>
-			<view class="time">
-				<text class="color_3">起止时间：</text>
-				<text class="color_class">{{ detailData.examStartTm }}至{{ detailData.examEndTm }}</text>
-			</view>
-			<view class="num_div">
-				<text class="color_3">完成人数：</text>
-				<text class="color_2">{{ detailData.execPersionNumer }}/{{ detailData.planPersionNumber }}</text>
-			</view>
-		</view>
-		<view class="paper_div">
-			<view class="paper">
-				<!-- 试卷信息 -->
-				<view class="paper_title_div">
-					<image src="@/static/images/testingHall/testing.png" class="img"></image>
-					<view class="title">试卷信息</view>
+	<z-paging ref="pagingRef" @query="query" :loading-more-enabled="false" :refresher-only="true" :aoto="false">
+		<template #top>
+			<view class="body-title">
+				<view class="back_div" @click="common.navigateBack()">
+					<view class="back-icon"></view>
 				</view>
-				<view class="title-note">
-					考试时长：
-					<text class="bold">{{ detailData.limitTm / 60 }}</text>
-					分钟
+				<view>考试详情</view>
+			</view>
+		</template>
+		<view class="main_div max_page">
+			<view class="detail_div" :class="detailData.examStatText == 'Y' ? 'completed' : 'incomplete'">
+				<view class="subscript" v-if="detailData.examStatText === 'N'">未完成</view>
+				<view class="subscript" v-if="detailData.examStatText === 'Y'">已完成</view>
+				<view class="title_div">
+					<view class="title ellipsis-text">{{ detailData.papersName }}</view>
 				</view>
-				<view class="title-table">
-					<view class="title-table-item">
-						<view class="top">
-							<text class="text_2">{{ detailData.totalGrade }}</text>
-							<text class="text_1">分</text>
-						</view>
-						<view class="bottom text_1">试卷总分</view>
+				<view class="time">
+					<text class="color_3">起止时间：</text>
+					<text class="color_class">{{ detailData.examStartTm }}至{{ detailData.examEndTm }}</text>
+				</view>
+				<view class="num_div">
+					<text class="color_3">完成人数：</text>
+					<text class="color_2">{{ detailData.execPersionNumer }}/{{ detailData.planPersionNumber }}</text>
+				</view>
+			</view>
+			<view class="paper_div">
+				<view class="paper">
+					<!-- 试卷信息 -->
+					<view class="paper_title_div">
+						<image src="@/static/images/testingHall/testing.png" class="img"></image>
+						<view class="title">试卷信息</view>
 					</view>
-					<view class="title-table-item">
-						<view class="top">
-							<text class="text_2">{{ detailData.passGrade }}</text>
-							<text class="text_1">分</text>
+					<view class="title-note">
+						考试时长：
+						<text class="bold">{{ detailData.limitTm / 60 }}</text>
+						分钟
+					</view>
+					<view class="title-table">
+						<view class="title-table-item">
+							<view class="top">
+								<text class="text_2">{{ detailData.totalGrade }}</text>
+								<text class="text_1">分</text>
+							</view>
+							<view class="bottom text_1">试卷总分</view>
 						</view>
+						<view class="title-table-item">
+							<view class="top">
+								<text class="text_2">{{ detailData.passGrade }}</text>
+								<text class="text_1">分</text>
+							</view>
 
-						<view class="bottom text_1">通过分数</view>
-					</view>
-					<view class="title-table-item">
-						<view class="top text_2">
-							{{ detailData.limitTypText }}
+							<view class="bottom text_1">通过分数</view>
 						</view>
-						<view class="bottom text_1">通过次数</view>
-					</view>
-					<view class="title-table-item">
-						<view class="top text_2">
-							{{ detailData.papersTypText || '随机' }}
+						<view class="title-table-item">
+							<view class="top text_2">
+								{{ detailData.limitTypText }}
+							</view>
+							<view class="bottom text_1">通过次数</view>
 						</view>
-						<view class="bottom text_1">试卷类型</view>
-					</view>
-				</view>
-
-				<view class="table">
-					<view class="table_th">
-						<view class="table_td">题型</view>
-						<view class="fl1"></view>
-						<view class="table_td">数量</view>
-						<view class="table_td">分值</view>
-					</view>
-					<view
-						class="table_tr"
-						v-for="(t, t_index) in detailData.papersPlateVos"
-						:class="{ table_tr_dark: t_index % 2 }"
-					>
-						<view class="table_td">
-							{{ t.plateName }}
-						</view>
-						<view class="fl1"></view>
-						<view class="table_td">
-							{{ t.qnsNumber }}
-						</view>
-						<view class="table_td">
-							{{ t.tgtGrade }}
+						<view class="title-table-item">
+							<view class="top text_2">
+								{{ detailData.papersTypText || '随机' }}
+							</view>
+							<view class="bottom text_1">试卷类型</view>
 						</view>
 					</view>
 
-					<view class="table_tr">
-						<view class="table_td">总计</view>
-						<view class="fl1"></view>
-						<view class="table_td">
-							{{ allNumber }}
+					<view class="table">
+						<view class="table_th">
+							<view class="table_td">题型</view>
+							<view class="fl1"></view>
+							<view class="table_td">数量</view>
+							<view class="table_td">分值</view>
 						</view>
-						<view class="table_td">
-							{{ allGrade }}
+						<view
+							class="table_tr"
+							v-for="(t, t_index) in detailData.papersPlateVos"
+							:class="{ table_tr_dark: t_index % 2 }"
+						>
+							<view class="table_td">
+								{{ t.plateName }}
+							</view>
+							<view class="fl1"></view>
+							<view class="table_td">
+								{{ t.qnsNumber }}
+							</view>
+							<view class="table_td">
+								{{ t.tgtGrade }}
+							</view>
+						</view>
+
+						<view class="table_tr">
+							<view class="table_td">总计</view>
+							<view class="fl1"></view>
+							<view class="table_td">
+								{{ allNumber }}
+							</view>
+							<view class="table_td">
+								{{ allGrade }}
+							</view>
 						</view>
 					</view>
 				</view>
 			</view>
 		</view>
-		<view class="fixed_button_div" @click="goto_examination()">
-			<uv-button
-				type="primary"
-				class="send_evaluate"
-				:custom-style="customStyle"
-				:throttleTime="300"
-				:hairline="false"
-				:disabled="isTimeInvalid"
-			>
-				开始考试
-			</uv-button>
-		</view>
-	</view>
+		<template #bottom>
+			<view class="fixed_button_div" @click="goto_examination()">
+				<uv-button
+					type="primary"
+					class="send_evaluate"
+					:custom-style="customStyle"
+					:throttleTime="300"
+					:hairline="false"
+					:disabled="isTimeInvalid"
+				>
+					开始考试
+				</uv-button>
+			</view>
+		</template>
+	</z-paging>
 </template>
 
 <script setup>
-	import {
-		onLoad,
-		onUnload
-	} from '@dcloudio/uni-app'
-	import { reactive, computed } from 'vue';
-	import { startTraExamPapersInfo } from '@/api/examination.js';
+	import { onLoad, onUnload } from '@dcloudio/uni-app';
+	import { reactive, computed, ref } from 'vue';
+	import { startTraExamPapersInfo, queryTraExamPapersByPapersId } from '@/api/examination.js';
 	import common from '@/common/common';
 	import { setPageCache, getPageCache } from '@/common/common';
+	import useZpaging from '@/composables/useZpaging.js';
+	const pagingRef = ref(null);
+
 	const detailData = reactive({
 		papersId: '',
 		papersName: '',
 		examStartTm: '',
 		examEndTm: '',
 		execPersionNumer: '',
-		planPersionNumber: '',
-		judgeNumber: 0,
-		singleNumber: 0,
-		multiNumber: 0,
-		essayNumber: 0,
-		judgeGrade: 0,
-		singleGrade: 0,
-		multiGrade: 0,
-		essayGrade: 0
+		planPersionNumber: ''
 	});
 	const customStyle = {
 		backgroundColor: '#0066FF',
@@ -171,7 +168,38 @@
 		// 未开始或已结束都返回true（不符合时间要求）
 		return current < start || current > end;
 	});
+	const query = () => {
+		setTimeout(() => {
+			queryTraExamPapersByPapersId({ papersId: detailData.papersId }).then((res) => {
+				console.log('水水水水', res.body);
 
+				const compareKeys = [
+					'examId',
+					'papersName',
+					'examStartTm',
+					'examEndTm',
+					'execPersionNumer',
+					'planPersionNumber',
+					'totalGrade',
+					'execPersionNumer',
+					'examStatText'
+				];
+				const detailsData = res.body;
+				// // 检查是否需要更新
+				const needUpdate = compareKeys.some((key) => {
+					return detailData[key] !== detailsData[key];
+				});
+				console.log('检查是否需要更新', needUpdate);
+				if (needUpdate) {
+					Object.assign(detailData, {
+						...detailsData
+					});
+					uni.$emit('update_testing_hall_item', detailsData);
+				}
+				pagingRef.value.endRefresh();
+			});
+		}, 200);
+	};
 	const goto_examination = async () => {
 		if (detailData.limitTyp === 'SG' && detailData.examStatText === 'Y') return common.msg('考试已完成');
 		const startTime = new Date(detailData.examStartTm);
@@ -204,24 +232,23 @@
 		Object.assign(detailData, {
 			...testing_hall_details
 		});
-		uni.$on('exam_completed', (res) => { // 考试完成，考试中心这里任务要完成
-			
-			console.log('refresh_testing_hall_data');
-			// contentRefs.value[0]?.updateData(res);
-			
+		uni.$on('get_result_completed', (res) => {
+			// 考试完成，考试中心这里任务要完成
+			setTimeout(() => {
+				pagingRef.value.reload();
+			}, 100);
 		});
 	});
-	
+
 	onUnload(() => {
-		uni.$off('exam_completed');
+		uni.$off('get_result_completed');
 	});
 </script>
 
 <style scoped lang="scss">
 	.fixed_button_div {
-		position: fixed;
-		bottom: 30rpx;
 		width: calc(100vw - 60rpx);
+		margin: 0 auto 30rpx auto;
 	}
 
 	.title-table {
@@ -369,21 +396,38 @@
 		background-color: #337fff;
 	}
 	.body-title {
-		background-color: #337fff;
+		// background-color: #337fff;
+		// width: 100%;
+		// position: relative;
+		// text-align: center;
+		// height: 120rpx;
+		// line-height: 100rpx;
+		// font-family: PingFangSC;
+		// font-weight: 500;
+		// font-size: 38rpx;
+		// color: #ffffff;
+		// font-style: normal;
+		// padding-top: var(--status-bar-height);
+	}
+
+	.body-title {
 		width: 100%;
 		position: relative;
 		text-align: center;
-		height: 120rpx;
-		line-height: 100rpx;
+		height: 180rpx;
+		padding-top: var(--status-bar-height);
+		margin-bottom: -10rpx;
+		line-height: calc(180rpx - var(--status-bar-height) - 10rpx);
 		font-family: PingFangSC;
 		font-weight: 500;
-		font-size: 38rpx;
+		font-size: 32rpx;
 		color: #ffffff;
 		font-style: normal;
+		background-color: #337fff;
 	}
 
 	.detail_div {
-		margin-top: -20rpx;
+		height: 250rpx;
 		z-index: 2;
 		width: 100%;
 		padding: 48rpx 40rpx 20rpx 40rpx;
@@ -481,11 +525,9 @@
 	.back_div {
 		position: absolute;
 		left: 26rpx;
-		height: 100%;
-		top: -10rpx;
+		bottom: 20rpx;
 		display: flex;
 		align-items: center;
-
 		.back-icon {
 			position: relative;
 			width: 50rpx;
diff --git a/src/pages/testingHall/index.vue b/src/pages/testingHall/index.vue
index b01e6989..3917c15d 100644
--- a/src/pages/testingHall/index.vue
+++ b/src/pages/testingHall/index.vue
@@ -28,13 +28,13 @@
 		</template>
 		<swiper class="swiper" :current="tabAct" :indicator-dots="false" @change="swiperChange">
 			<swiper-item>
-				<Content :ref="(el) => (listItemRefs[0] = el)" :tabIndex="0" :currentIndex="tabAct" @gotoDetails="gotoDetails"></Content>
+				<Content :ref="(el) => (listItemRefs[0] = el)" :tabIndex="0" :currentIndex="tabAct"></Content>
 			</swiper-item>
 			<swiper-item>
-				<Content :ref="(el) => (listItemRefs[1] = el)" :tabIndex="1" :currentIndex="tabAct" @gotoDetails="gotoDetails"></Content>
+				<Content :ref="(el) => (listItemRefs[1] = el)" :tabIndex="1" :currentIndex="tabAct"></Content>
 			</swiper-item>
 			<swiper-item>
-				<Content :ref="(el) => (listItemRefs[2] = el)" :tabIndex="2" :currentIndex="tabAct" @gotoDetails="gotoDetails"></Content>
+				<Content :ref="(el) => (listItemRefs[2] = el)" :tabIndex="2" :currentIndex="tabAct"></Content>
 			</swiper-item>
 		</swiper>
 	</z-paging-swiper>
@@ -42,19 +42,13 @@
 
 <script setup>
 	// 考试中心
-	
-	
 	import Content from './components/content.vue';
 	import { ref, reactive, watch, onMounted } from 'vue';
 	import { onLoad, onUnload } from '@dcloudio/uni-app';
-	import { setPageCache } from '@/common/common';
-	import common from '@/common/common';
-
 	import { LineBg } from '@/enum.js';
+	import common from '@/common/common';
 	import useIndexList from '@/composables/useIndexList.js';
 	const { tabAct, listItemRefs, tabChange, swiperChange, search } = useIndexList();
-	
-
 
 	const tabList = ref([
 		{
@@ -68,55 +62,27 @@
 		}
 	]);
 
-
-	const triggered = ref(false);
-
-
-	// const search = (value) => {
-		// contentRefs.value[0]?.search(value, tabAct.value === 0);
-		// contentRefs.value[1]?.search(value, tabAct.value === 1);
-		// contentRefs.value[2]?.search(value, tabAct.value === 2);
-	// };
-
-	const gotoDetails = (item) => {
-		setPageCache('testing_hall_details', item);
-		common.navigateTo('/pages/testingHall/details');
-	};
-	// onMounted(() => {
-	// 	triggered.value = true;
-	// 	watch(
-	// 		tabAct,
-	// 		(newValue, oldValue) => {
-	// 			typeof contentRefs.value[newValue]?.getData === 'function' && contentRefs.value[newValue]?.getData('first');
-	// 		},
-	// 		{
-	// 			immediate: true
-	// 		}
-	// 	); // 这里的immediate会在onMounted之后执行
-	// });
-
 	onLoad(() => {
-		uni.$on('refresh_testing_hall_data', (res) => {
-			// 	console.log('exam_completed');
-			// 	contentRefs.value[0]?.updateData(res);
-			// 	contentRefs.value[1]?.updateData(res);
-			// 	contentRefs.value[2]?.updateData(res);
+		uni.$on('update_testing_hall_item', (res) => {
+			listItemRefs.value[0]?.updateData(res);
+			listItemRefs.value[1]?.updateData(res);
+			listItemRefs.value[2]?.updateData(res);
 		});
 	});
 	onUnload(() => {
-		uni.$off('refresh_testing_hall_data');
+		uni.$off('update_testing_hall_item');
 	});
 </script>
 
 <style scoped lang="scss">
 	.swiper {
-		height: calc(100vh - var(--status-bar-height) - 70rpx - 78rpx - 40rpx - 88rpx);
+		height: 100%;
 		width: 100%;
+		background-color: #f1f5fa;
 	}
 
 	.body-tab {
 		height: 88rpx;
-		// background-color: red;
 		width: 100%;
 	}
 
@@ -147,7 +113,7 @@
 		color: #000;
 		position: relative;
 		text-align: center;
-
+		
 		.delete_div {
 			position: absolute;
 			right: 20rpx;

From 0c7c1c2969a08b87a5528e72cbf9c212a666808a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=94=B0=E5=B2=A9?= <tybb88x@gmail.com>
Date: Wed, 17 Sep 2025 15:50:06 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A8=E5=B1=80?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E4=B8=BA20=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.js b/src/main.js
index f462c585..5874ef87 100644
--- a/src/main.js
+++ b/src/main.js
@@ -5,7 +5,7 @@ import CommonLoading from './components/loading.vue'
 
 uni.$zp = {
 	config: {
-		'default-page-size': 15,
+		'default-page-size': 20,
 		'show-loading-more-when-reload': true, // 列表刷新时自动显示加载更多view，且为加载中状态
 		'show-scrollbar': false, // 控制是否出现滚动条
 		'refresher-refreshing-scrollable': false, // 自定义下拉刷新刷新中状态是否允许列表滚动