From e1f17a2b7946f3d5205a20ffe901466d63e56217 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= <icho.yang@scai-global.com>
Date: Mon, 24 Nov 2025 15:33:00 +0800
Subject: [PATCH] fix: bug

---
 src/pages/sparring/index.vue  | 68 +++++++++++++++++++----------------
 src/pages/sparring/result.vue | 15 ++++----
 2 files changed, 45 insertions(+), 38 deletions(-)

diff --git a/src/pages/sparring/index.vue b/src/pages/sparring/index.vue
index 0136702b..dc7627c1 100644
--- a/src/pages/sparring/index.vue
+++ b/src/pages/sparring/index.vue
@@ -9,17 +9,16 @@
 				AI陪练
 			</view>
 			<view class="input-view" @click="toSearchPage">
-				<uv-input shape="circle" placeholderStyle="color:#999999;font-size:28rpx;" placeholder="请输入"
-					suffixIcon="search" :customStyle="customStyle" :suffixIconStyle="suffixIconStyle" :readonly="true">
+				<uv-input shape="circle" placeholderStyle="color:#999999;font-size:28rpx;" placeholder="请输入" suffixIcon="search"
+					:customStyle="customStyle" :suffixIconStyle="suffixIconStyle" :readonly="true">
 				</uv-input>
 			</view>
 			<view class="tabs-view">
-				<uv-tabs :list="tabList" @click="changeTab" :current="currentTab" :scrollable="true"
-					class="font_pf my_tabs" :inactive-style="{ color: '#333333', fontSize: '30rpx', fontWeight: '500' }"
+				<uv-tabs :list="tabList" @click="changeTab" :current="currentTab" :scrollable="true" class="font_pf my_tabs"
+					:inactive-style="{ color: '#333333', fontSize: '30rpx', fontWeight: '500' }"
 					:activeStyle="{ color: '#333333', fontSize: '30rpx', fontWeight: '600' }"></uv-tabs>
 				<uv-tabs :list="tabSecList" @click="changeTabSec" :current="currentTabSec" :scrollable="true"
-					 class="font_pf my_tabs2"
-					:inactive-style="{ color: '#333333', fontSize: '24rpx', fontWeight: '500' }"
+					class="font_pf my_tabs2" :inactive-style="{ color: '#333333', fontSize: '24rpx', fontWeight: '500' }"
 					:activeStyle="{ color: '#0066FF', fontSize: '24rpx', fontWeight: '500' }" :lineColor="`#06f`"></uv-tabs>
 				<!-- :lineColor="`url(${LineBg}) 2% 2%`" -->
 			</view>
@@ -66,8 +65,7 @@
 				</uv-scroll-list>
 				<view class="sparring-list">
 					<view class="sparring-list-body">
-						<scroll-view :class="['right-sparring-list']" :scroll-y="true"
-							@scrolltolower="getMoreList()">
+						<scroll-view :class="['right-sparring-list']" :scroll-y="true" @scrolltolower="getMoreList()">
 							<!-- <view class="all-item"> -->
 							<view class="left-items">
 								<view class="sparring-item-box" v-for="item in leftsparringList">
@@ -342,14 +340,14 @@
 		common.navigateTo('/pages/search/search?from=sparring')
 	}
 	// 跳转 课程详情
-	const toSparringDetail = item => { 
+	const toSparringDetail = item => {
 		if (item.traId) {
 			checkTraPartnerInfoById({
 				traId: item.traId
-			}).then(res=>{
-				if(res.body.inRange){
+			}).then(res => {
+				if (res.body.inRange) {
 					common.navigateTo('/pages/sparring/detail?traId=' + item.traId)
-				}else{
+				} else {
 					common.show('提示', res.body.message, false)
 				}
 			})
@@ -358,7 +356,9 @@
 	const reSeting = ref(false)
 	onMounted(() => {
 		reSeting.value = true
-		setTimeout(()=>{reSeting.value = false})
+		setTimeout(() => {
+			reSeting.value = false
+		})
 		currentTab.value = 0
 		currentTabSec.value = 0
 		queryTraPartnerCatelogList().then(res => {
@@ -368,40 +368,46 @@
 			tagsTree.value = res.body || []
 		})
 		changeTab({
-			name: '全部'
+			name: '全部',
+			value: ''
 		})
 		uni.$on('refresh_sparring_list', () => {
 			changeTab({
-				name: activeTab.value || '全部'
+				name: activeTab.value || '全部',
+				value: activeCourseType.value || ''
 			})
 		})
 	})
 	onUnmounted(() => {
 		uni.$off('refresh_sparring_list')
 	})
-	// onActivated(() => {
-	// 	currentTab.value = 2
-	// 	currentTabSec.value = 0
-	// 	// 重新获取标签信息
-	// 	getTraTagListApi().then(res => {
-	// 		tagsTree.value = res.body || []
-	// 	})
-	// 	changeTab({
-	// 		name: activeTab.value || '全部'
-	// 	})
-	// })
-	onShow(() => {
-		reSeting.value = true
-		setTimeout(()=>{reSeting.value = false})
-		currentTab.value =  0
+	onActivated(() => {
+		currentTab.value = 0
 		currentTabSec.value = 0
+		// 重新获取标签信息
+		getTraTagListApi().then(res => {
+			tagsTree.value = res.body || []
+		})
 		changeTab({
 			name: activeTab.value || '全部'
 		})
+	})
+	onShow(() => {
+		reSeting.value = true
+		setTimeout(() => {
+			reSeting.value = false
+		})
+		currentTab.value = 0
+		currentTabSec.value = 0
+		changeTab({
+			name: activeTab.value || '全部',
+			value: activeCourseType.value || ''
+		})
 		socketStore.closeSocket()
 		uni.$on('refresh_sparring_list', () => {
 			changeTab({
-				name: activeTab.value || '全部'
+				name: activeTab.value || '全部',
+				value: activeCourseType.value || ''
 			})
 		})
 	})
diff --git a/src/pages/sparring/result.vue b/src/pages/sparring/result.vue
index 1e0f184e..20bec14a 100644
--- a/src/pages/sparring/result.vue
+++ b/src/pages/sparring/result.vue
@@ -173,7 +173,6 @@
 	}
 	const filterType = ref('')
 	const changeTab = (info) => {
-		console.log(info)
 		filterType.value = info.value
 	}
 	const evalDimens = ref([])
@@ -185,6 +184,7 @@
 	const positiveList = ref([]) // 劣质话术
 	const isLoading = ref(false)
 	const getData = () => {
+		isLoading.value = true
 		partnerChatReport({
 			traId: traId.value,
 			execId: execId.value,
@@ -192,11 +192,7 @@
 			// traId: 'PARTNERINFO02501812207220251103160409000007402',
 			// execId: 'db2f275b-c04a-4572-83dd-74a95ff49d67'
 		}).then(res => {
-			if (res.body.code === 200) {
-				setTimeout(getData, 2000)
-				isLoading.value = true
-			} else {
-				isLoading.value = false
+			if (res.body.reportFlag){
 				traInfo.value = res.body.traPartnerInfo || {}
 				roleInfo.value = res.body.traPartnerCharacterInfoVo || {}
 				traTm.value = res.body.traTm || '0'
@@ -240,10 +236,15 @@
 						return t
 					}
 				})
+				isLoading.value = false
 				setTimeout(() => {
 					showLoading.value = false
 				}, 800)
-			}
+			} else {
+				setTimeout(getData, 2000)
+			} 
+		}).catch(()=>{
+			isLoading.value = false
 		})
 	}
 	const setTextColor = (str) => {