From 38b429e52b411349fb32869e5c73263d8b73eeca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= <icho.yang@scai-global.com>
Date: Thu, 30 Oct 2025 17:31:24 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=99=AA=E7=BB=83=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development.yh                           |   1 +
 src/api/sparring.js                           |  28 ++++
 .../sparring/components/sparring-item.vue     |  40 +++++
 src/pages/sparring/index.vue                  | 155 ++++++------------
 src/static/images/sparring/phone-icon.png     | Bin 0 -> 603 bytes
 src/static/images/sparring/talk-icon.png      | Bin 0 -> 666 bytes
 src/static/images/sparring/video-icon.png     | Bin 0 -> 535 bytes
 7 files changed, 115 insertions(+), 109 deletions(-)
 create mode 100644 src/api/sparring.js
 create mode 100644 src/static/images/sparring/phone-icon.png
 create mode 100644 src/static/images/sparring/talk-icon.png
 create mode 100644 src/static/images/sparring/video-icon.png

diff --git a/.env.development.yh b/.env.development.yh
index e343a979..6dabe4cb 100644
--- a/.env.development.yh
+++ b/.env.development.yh
@@ -5,6 +5,7 @@ ENV = 'development.yh'
 VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001'
 
 # VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.32.154:9604'
+# VITE_APP_BASE_H5_API_Url_TRAPRACTICE = 'http://25.64.32.154:9603'
 
 
 
diff --git a/src/api/sparring.js b/src/api/sparring.js
new file mode 100644
index 00000000..f683549b
--- /dev/null
+++ b/src/api/sparring.js
@@ -0,0 +1,28 @@
+import request from '@/api/request'
+
+const course_base_url = '/trapractice'
+
+// 获取课程分类树接口
+export const getCourseTypeListApi = (data) => {
+	return request({
+		url: course_base_url + '/traPartnerCatelog/queryTraPartnerCatelog',
+		method: 'post',
+		data
+	});
+};
+// 获取标签分类树 接口
+export const getTraTagListApi = (data) => {
+	return request({
+		url: course_base_url + '/traPartnerTag/queryTraTagCatalogInfoList',
+		method: 'post',
+		data
+	});
+};
+//  全部模块
+export const queryCrsInfoByCatalogApi = (data) => {
+	return request({
+		url: course_course_base_url + '/traPartnerInfo/queryTraPartnerInfoPaging',
+		method: 'post',
+		data
+	});
+};
\ No newline at end of file
diff --git a/src/pages/sparring/components/sparring-item.vue b/src/pages/sparring/components/sparring-item.vue
index 83eeb47d..6474ba18 100644
--- a/src/pages/sparring/components/sparring-item.vue
+++ b/src/pages/sparring/components/sparring-item.vue
@@ -1,6 +1,24 @@
 <template>
 	<view class="sparring-info" @click="clickItem">
 		<view class="cont-box">
+			<view class="item-type">
+						<image
+							class="type-icon"
+							src="@/static/images/sparring/video-icon.png"
+							v-if="Number(itemInfo.accmStdyCnt)%3 === 0"
+						></image>
+						<image
+							class="type-icon"
+							src="@/static/images/sparring/phone-icon.png"
+							v-if="Number(itemInfo.accmStdyCnt)%3 === 1"
+						></image>
+						<image
+							class="type-icon"
+							src="@/static/images/sparring/talk-icon.png"
+							v-if="Number(itemInfo.accmStdyCnt)%3 === 2"
+						></image>
+				{{'视频对话'}}
+			</view>
 			<ImagePreview class="img-box" :imgId="itemInfo.imgId" :isCache="true" width="225" height="170" mode="scaleToFill">
 			</ImagePreview>
 			<view class="item-title">{{itemInfo.crsName}}</view>
@@ -91,6 +109,28 @@
 				overflow: hidden;
 				background-color: #fff;
 				border: 2rpx solid #f1f1f1;
+				position: relative;
+				.item-type{
+					position: absolute;
+					top:0;
+					left: 0;
+					width: 100%;
+					height: 48rpx;
+					padding: 12rpx 0 0 60rpx;
+					background-color: rgba(0, 0, 0, .4);
+					color: #fff;
+					font-size: 24rpx;
+					line-height: 24rpx;
+					z-index: 10;
+					.type-icon{
+						position: absolute;
+						width: 32rpx;
+						height: 32rpx;
+						top:50%;
+						left: 14rpx;
+						transform: translateY(-50%);
+					}
+				}
 				.img-box {
 					width: 100%;
 					height: 180rpx;
diff --git a/src/pages/sparring/index.vue b/src/pages/sparring/index.vue
index bc524461..e0fca1c1 100644
--- a/src/pages/sparring/index.vue
+++ b/src/pages/sparring/index.vue
@@ -15,15 +15,12 @@
 			</view>
 			<view class="tabs-view">
 				<uv-tabs :list="tabList" @click="changeTab" :scrollable="false" active-style="font-weight:bold; color:#000;"
-						class="font_pf my_tabs"
-						:inactive-style="{ color: '#333333', fontSize: '30rpx', fontWeight: '500' }"
-						:activeStyle="{ color: '#333333', fontSize: '30rpx', fontWeight: '600' }"
-						></uv-tabs>
+					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="tabList" @click="changeTabSec" :scrollable="true" active-style="font-weight:bold; color:#000;"
-						class="font_pf my_tabs2"
-						:inactive-style="{ color: '#333333', fontSize: '24rpx', fontWeight: '500' }"
-						:activeStyle="{ color: '#0066FF', fontSize: '24rpx', fontWeight: '500' }"
-						:lineColor="`url(${LineBg}) 2% 2%`"></uv-tabs>
+					class="font_pf my_tabs2" :inactive-style="{ color: '#333333', fontSize: '24rpx', fontWeight: '500' }"
+					:activeStyle="{ color: '#0066FF', fontSize: '24rpx', fontWeight: '500' }"
+					:lineColor="`url(${LineBg}) 2% 2%`"></uv-tabs>
 			</view>
 			<view class="list-view">
 				<view class="filter-btn" @click="
@@ -34,11 +31,8 @@
           ">
 					<!-- 筛选 -->
 					<!-- <uv-icon class="filter-icon" name="list" /> -->
-					
-						<image
-							class="filter-icon"
-							src="@/static/images/course/filter.png"
-						></image>
+
+					<image class="filter-icon" src="@/static/images/course/filter.png"></image>
 				</view>
 				<view :class="['filter-list', showFilterList ? 'show' : '']">
 					<scroll-view :scroll-y="true" class="scroll-box-tags">
@@ -74,8 +68,7 @@
 						<scroll-view :class="['right-sparring-list', getActiveItemClass()]" :scroll-y="true"
 							@scrolltolower="getMoreList()">
 							<view class="sparring-item-box" v-for="item in sparringList">
-								<SparringItem :itemInfo="item" :activeTag="activeTag"
-									@clickItem="toCourseDetail(item)" />
+								<SparringItem :itemInfo="item" :activeTag="activeTag" @clickItem="toCourseDetail(item)" />
 							</view>
 							<view class="loading-box" v-show="loading">
 								<CommonLoading color="#06f" class="loading-val" />
@@ -91,17 +84,14 @@
 <script setup>
 	import SparringItem from './components/sparring-item.vue'
 	import common from '@/common/common'
-	import { LineBg } from '@/enum.js';
 	import {
-		getPrdLineTypeListApi,
+		LineBg
+	} from '@/enum.js';
+	import {
 		getTraTagListApi,
 		getCourseTypeListApi,
-		queryCrsInfoByCatalogApi,
-		queryCrsInfoByPrdLineApi,
-		queryCrsInfoByLastnewApi,
-		queryCrsInfoByPopularApi,
-		queryCrsInfoByRecmdApi
-	} from '@/api/course.js'
+		queryCrsInfoByCatalogApi
+	} from '@/api/sparring.js'
 	import {
 		onMounted,
 		onActivated,
@@ -243,7 +233,7 @@
 		total: 0
 	})
 	const getMoreList = flag => {
-		console.log(activeTab.value)
+		if(loading.value) return
 		if (!flag) {
 			if (pageObj.value.total <= pageObj.value.page * pageObj.value.limit) return
 			pageObj.value.page += 1
@@ -253,73 +243,19 @@
 		}
 		pageObj.value.total = 0
 		loading.value = true
-		switch (activeTab.value) {
-			case '全部':
-				queryCrsInfoByCatalogApi({
-						...pageObj.value,
-						tagId: activeTag.value.join(','),
-						catalogId: activeCourseType.value
-					})
-					.then(res => {
-						sparringListBase.value = sparringListBase.value.concat(res.body || [])
-						pageObj.value.total = res.total
-					})
-					.finally(() => {
-						loading.value = false
-					})
-				break
-			case '热门':
-				queryCrsInfoByPopularApi({
-						...pageObj.value,
-						tagId: activeTag.value.join(',')
-					})
-					.then(res => {
-						sparringListBase.value = res.body || []
-					})
-					.finally(() => {
-						loading.value = false
-					})
-				break
-			case '最新':
-				queryCrsInfoByLastnewApi({
-						...pageObj.value,
-						tagId: activeTag.value.join(',')
-					})
-					.then(res => {
-						sparringListBase.value = res.body || []
-					})
-					.finally(() => {
-						loading.value = false
-					})
-				break
-			case '推荐':
-				queryCrsInfoByRecmdApi({
-						...pageObj.value,
-						tagId: activeTag.value.join(',')
-					})
-					.then(res => {
-						sparringListBase.value = sparringListBase.value.concat(res.body || [])
-						pageObj.value.total = res.total
-					})
-					.finally(() => {
-						loading.value = false
-					})
-				break
-			case '生产线':
-				queryCrsInfoByPrdLineApi({
-						...pageObj.value,
-						tagId: activeTag.value.join(','),
-						prdLineId: activePrdlineType.value
-					})
-					.then(res => {
-						sparringListBase.value = sparringListBase.value.concat(res.body || [])
-						pageObj.value.total = res.total
-					})
-					.finally(() => {
-						loading.value = false
-					})
-				break
-		}
+		
+			queryCrsInfoByCatalogApi({
+					...pageObj.value,
+					tagId: activeTag.value.join(','),
+					catalogId: activeCourseType.value
+				})
+				.then(res => {
+					sparringListBase.value = sparringListBase.value.concat(res.body || [])
+					pageObj.value.total = res.total
+				})
+				.finally(() => {
+					loading.value = false
+				})
 	}
 	const loading = ref(false)
 	const changeTab = item => {
@@ -334,18 +270,18 @@
 		activeCourseType.value = ''
 		activePrdlineType.value = ''
 		loading.value = true
-		
-			queryCrsInfoByCatalogApi(pageObj.value)
-				.then(res => {
-					sparringListBase.value = res.body || []
-					pageObj.value.total = res.total
-				})
-				.finally(() => {
-					loading.value = false
-				})
+
+		queryCrsInfoByCatalogApi(pageObj.value)
+			.then(res => {
+				sparringListBase.value = res.body || []
+				pageObj.value.total = res.total
+			})
+			.finally(() => {
+				loading.value = false
+			})
 	}
 	const changeTabSec = () => {
-		
+
 	}
 	// 跳转搜索页
 	const toSearchPage = () => {
@@ -360,16 +296,12 @@
 		getCourseTypeListApi().then(res => {
 			sparringTypeList.value = res.body || []
 		})
-		getPrdLineTypeListApi().then(res => {
-			sparringPrdlineList.value = res.body || []
-		})
 		getTraTagListApi().then(res => {
 			tagsTree.value = res.body || []
 		})
 		changeTab({
 			name: '全部'
 		})
-
 		uni.$on('refresh_sparring_list', () => {
 			changeTab({
 				name: activeTab.value || '全部'
@@ -398,6 +330,7 @@
 
 <style lang="scss" scoped>
 	.my_tabs2 {
+
 		// 解决这个圆角的图片，开穿透
 		:deep(.uv-tabs__wrapper__nav__line) {
 			height: 30rpx !important;
@@ -405,10 +338,12 @@
 			background-size: 24rpx !important;
 			background-repeat: no-repeat !important;
 		}
-		:deep(.uv-tabs__wrapper__nav__item){
+
+		:deep(.uv-tabs__wrapper__nav__item) {
 			padding: 0 30rpx !important;
 		}
 	}
+
 	.sparring-center {
 		position: relative;
 		display: flex;
@@ -469,7 +404,7 @@
 
 			.tabs-view {
 				background: #ffffff;
-				border-radius: 23rpx 23rpx 0 0; 
+				border-radius: 23rpx 23rpx 0 0;
 				padding: 6rpx 10rpx 12rpx;
 				margin: 20rpx 15rpx 0;
 			}
@@ -713,12 +648,14 @@
 							&.no-radius {
 								border-radius: 0rpx 0 0 0;
 							}
-							.sparring-item-box{
+
+							.sparring-item-box {
 								width: 50%;
 								float: left;
+
 								// background-color: #f1f1f1;
 								// margin-bottom: 16rpx;
-								&:nth-child(2n-1){
+								&:nth-child(2n-1) {
 									// margin-right: 16rpx;
 								}
 							}
diff --git a/src/static/images/sparring/phone-icon.png b/src/static/images/sparring/phone-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..d476e1f12ef5add4375503efebec5c1b5a0b9d5d
GIT binary patch
literal 603
zcmV-h0;K(kP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80006INkl<ZcmeE|
zODIH97{?6@&xB-c;gN-fu(OcILSe_6jgUxEO14Vbk;lS9c2bg(EZC4HYBUQADGN(7
z77F8W{XWgq?VNMxap#IO)BiW$Ip3M{o&P;^=HAK7_~lpHKzaxM_6}H<l?Uxm^HV<-
z#~onNHWs~s1GuEW19`MPmC*nT)v?MpltEP8G`1MaB6=pH0jjS<0jTOAF%F(dGr$!V
zQ@s|P)bBLlCa)Qw$TPfwlkS}c+~hR_KA-P}Lg!#onB)|ACe1*k@>(RSVGe_*YBH6+
zlYtG2UW2M$&Pbt}Or>u$z*Wjtk5SkHyQ=BP{UD#{iHruMGA8zji=e8R#1T7TzekXA
zCr1O3a+AbkP}NAnkBNGsCh|p)s|^?uF%7T_ugvL!AgC%Qal%3q@O^hAmcTCg5IoS{
zgi6|uifKS*Vd9Y}&xJFhs%#ST5MZGZqC7V`iJ~0ddLYQy0MV$p24of{?uacQ=YpU~
z?wku`O<#!^S;9mW<C+pOAhR&>M3k$WCcZ;5lCP-AG$COFG8q#V%+i)(7sNy*KWEcn
z&Pd8YbTv%)X*a+y+(JCfGUv+lAy)>Z5CuPAnRW&A!6AHtU2^4eHfHQed)u{vXc0_=
zVI5k@m4f_d7$gosJ^4`(BXo78Y`|WUg+j0otFQtA`?#s?sR7dh@p5Sc|9=PKoq;a^
p0096032{_U00006Nkl<Z0|2Mhj6r*G8%O{E002ovPDHLkV1mtL2b2H+

literal 0
HcmV?d00001

diff --git a/src/static/images/sparring/talk-icon.png b/src/static/images/sparring/talk-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..4755b767864b0e75390a2da1a1734c5ce19bff44
GIT binary patch
literal 666
zcmV;L0%iS)P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80006{Nkl<ZcmeE|
zOGs5w6o$RMpa=?@NI^ja4QvoaQ9(t+1`!lQf*=Y`L`89+2u?(BAgG8F1reMm4ip@S
zpaUNR6$c_dCO!~RP@D;(AbR|MxEH(!_v<<kL0R8jd!4=3+W*~mpX0feb;W<zQ$Q3&
zci|^gLpglPbR&azfW>~Z*a{3m12n@F*TqZ5K^7!{MGEOY052eJ+J#ASvf~rB*joUN
zAJeD_5@52YOw@z7c?+Q9KX?Q#%SG%xS5j&|M8MZnk;6Y=J_o!kM8HMAyJ?Xpriu9V
z5CIS4#g_PvWiD+hM1bw^r8Nx+LIi~L_0GK!VBG=k=WOskQ1N}I_5<9HUq2rk1yFdK
zL_PEMyl0qos1Hw$sDDoG43vP;i~<sg#0gdV@C9TNBkv+2LAh`7x^s5$Ml%XXR*d04
z@@<~sd%(vg5x-61A2@|^Fq%t17nM2#wKN@Otp9{Kqv>bT`@w56{=*1$n|PyH1yDRn
zr4}w?7t}D1xDPI}Jud!&HRuJMp(?!9tOAmi1$b>~H@+Bh;XAZ}UP>gWjPWbjf(g*?
zU&$AkXKXd60Gj9!{h-S_G{PdhgHDjRYWxPY!UDX33hERyw3}0a%4w!;ea~38qz<HB
z!{&&0LBa;{`7jNi$#21XnU?@{qUizDFxFeoUwjA1R{1D}9Ol2lEMsr;7Le-50us_s
z+zzrOuC>9kf>445gf8I9zY%bm9XL*IZ^|dbFn1XNdLHQX*M%*ao}IA(PJIMA{d)MM
zcMXU#7T~*vEAI>d0RR82LA7uI000I_L_t&o0NOB*L1rK#fdBvi07*qoM6N<$g24wH
A^8f$<

literal 0
HcmV?d00001

diff --git a/src/static/images/sparring/video-icon.png b/src/static/images/sparring/video-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ebadd9386b3517e138afd12c2970bc3dd3a10c6
GIT binary patch
literal 535
zcmV+y0_gpTP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80005ZNkl<ZcmeE|
zzb^zq6vuB7ic9=XR3ZwALLz=OI*Rj05V?p-qR}7<jYg#)(NbwuLPR0gXs9VQ8X-r4
zf~?OQyOX)>-OAkVL?SES&%W6=JMVpO?CxDd?vMX61KAE_J5aF$zV8>{8lItS$s^Za
zz=X|{tqrhnhJ`0E3LVg9NjKL|Ly20$#HwO$0D8koZGglUG(u9fP+$WpMAJMRlDvZw
zD47O^R3@E6zgdRHU7TOSJb2JYu8Ej44W#kurKX_k(x{chDU3lx`ohRevc!ihr@4Hn
zW5(l9RW1yC(rFDus~o1Frd$}<^E^+Ugh9G)Ladw^2s$njn;}*%41`U4Vmk+uE)1*(
zwa<bW8(bKe<L+Oe>k(W*tXvq77tInk;uoEZ@CG&I!hkdr6FE%CYj>7}m?1=E8t|jj
zb!T)fOvsC9nMyjxSj#l<ptH#bH)aV;>~k*ng?d9WmZ)~cG_b=&8oH-Q_#`m=5he~8
zjevY3u5hk)#5AzWq`X4Q#CjwJ&sjK0@h4(L<Zqz}vLk9<8zAY!HrY;)A0zEV8}h6#
zfYrZJ8=#pI1;ofJ@x_vNRlxEPF<`kq@#UF;|Gxvj-6Y=t00960@iqtx00006Nkl<Z
Z0{|9WsX^GN!e0OY002ovPDHLkV1oS<<!t}}

literal 0
HcmV?d00001