Merge branch 'develop' into 'sit'

Develop

See merge request K17_AITS/tra-app!8

src/components/course-item/course-item.vue

@@ -8,7 +8,7 @@
 			<view class="item-title">{{itemInfo.crsName}}</view>
 			<uv-scroll-list class="item-tags" :indicator="false">
 				<view class="item-tag-view">
-					<view class="item-tag" v-for="item in itemInfo.tagCataList">{{item.tagName}}</view>
+					<view class="item-tag" v-for="item in tagsShowList">{{item.tagName}}</view>
 				</view>
 			</uv-scroll-list>
 			<view class="item-publish">发布：{{itemInfo.issuTm}}</view>
@@ -26,13 +26,17 @@
 		},
 		props:{
 			itemInfo:{
-				type:Object,
+				type: Object,
 				default:()=>({
-					crsName: '银行核心业务全流程实践哒哒哒哒',
-					tagsList:[{tagName:'公斤业务'},{tagName:'初级'}],
-					publicTime:"2025-01-03",
-					learnedNum:'2222222'
+					crsName: '',
+					tagCataList:[],
+					publicTime:"",
+					learnedNum:''
 				})
+			},
+			activeTag:{
+				default: '',
+				type: String
 			}
 		},
 		data() {
@@ -40,6 +44,21 @@
 				
 			};
 		},
+		watch:{
+			activeTag:{
+				handler(){},
+				deep: true,
+				immediate: true
+			}
+		},
+		computed:{
+			tagsShowList(){
+				if(!this.activeTag) return this.itemInfo.tagCataList
+				let _arr = this.itemInfo.tagCataList.filter(t=> t.tagId === this.activeTag)
+				let _arr1 = this.itemInfo.tagCataList.filter(t=> t.tagId !== this.activeTag)
+				return _arr.concat(_arr1)
+			}
+		},
 		methods:{
 			clickItem(){
 				this.$emit('clickItem', this.itemInfo)

src/pages/course/components/talkingItem.vue

@@ -73,11 +73,12 @@
 						重新答
 					<image class="icon icon-iamge" src="@/static/images/course/restart.png" ></image>
 				</view>
-				<view class="replay-study-btn"
+				<view class="replay-study-btn next-learn-btn"
 					v-if="showNextBtn && [5].indexOf(type) >= 0 && isLast"
 					@click.stop="goOnRestartPrgh"
 				>
-					<image class="icon icon-iamge" src="@/static/images/course/restudy.png" ></image>
+					重新学
+					<image class="icon icon-iamge" src="@/static/images/course/refresh-white.png" ></image>
 				</view>
 				<view class="next-btn" @click.stop="goOnGetQues" v-if="showNextBtn && [3, 6].indexOf(type) >= 0 && isLast">继续 
 					<image class="icon icon-iamge" src="@/static/images/course/goon.png" ></image></view>
@@ -228,6 +229,7 @@ const audioCacheObj = computed(() => storageStore.audioObj)
 			type: Object
 		},
 	})
+	
 	const { type, dataInfo, activeVoiceId, isPlaying, isLast, lastQuestionInfo} = toRefs(props)
 	const emit = defineEmits(['changePlay', 'nextQuestion', 'withdraw', 'finishQuestion'])
 	// 声音播放初始化
@@ -547,6 +549,9 @@ const audioCacheObj = computed(() => storageStore.audioObj)
 					margin-top: 16rpx;
 					margin-right: 16rpx;
 					position: relative;
+					&.replay-study-btn{
+						float: right;
+					}
 					&.restart{
 						background-color: #eaf2ff;
 						color: #06f;
@@ -581,18 +586,6 @@ const audioCacheObj = computed(() => storageStore.audioObj)
 						margin-top: -12rpx;
 					}
 				}
-				.replay-study-btn{
-					width: 162rpx;
-					height: 62rpx;
-					border-radius: 8rpx;
-					float: right;
-					margin-top: 16rpx;
-					.icon-iamge{
-						width: 100%;
-						height: 100%;
-						margin:0;
-					}
-				}
 				.next-btn{
 					float: right;
 					padding: 0 60rpx 0 20rpx;

src/pages/course/index.vue

@@ -48,7 +48,7 @@
 						:type="activeTag === ''?'primary':'info'"
 						@click="chooseTag({value:''})"
 					></uv-tags>
-					<uv-tags :text="item.label+item.required" 
+					<uv-tags :text="item.label" 
 						v-for="item in tagsList" 
 						:key="item.value" 
 						shape="circle" 
@@ -93,7 +93,7 @@
 								<view class="left-color"></view>
 								{{item.label}}
 							</view>
-							<CourseItem v-for="itemC in item.courseList" :key="itemC.crsNum" :itemInfo="itemC" @clickItem="toCourseDetail(itemC)"/>
+							<CourseItem v-for="itemC in item.courseList" :key="itemC.crsNum" :itemInfo="itemC" :activeTag="activeTag" @clickItem="toCourseDetail(itemC)"/>
 							<view 
 								class="type-list"
 								v-for="itemT in item.children"
@@ -103,7 +103,7 @@
 									<view class="left-color"></view>
 										{{itemT.label}}
 								</view>
-								<CourseItem v-for="itemTC in itemT.courseList" :key="itemTC.crsNum" :itemInfo="itemTC" @clickItem="toCourseDetail(itemTC)"/>
+								<CourseItem v-for="itemTC in itemT.courseList" :key="itemTC.crsNum" :activeTag="activeTag" :itemInfo="itemTC" @clickItem="toCourseDetail(itemTC)"/>
 							</view>
 						</view>
 					</view>

src/store/socket.js

@@ -14,7 +14,7 @@ export const useSocketStore = defineStore('socketStore',{
 		}
 	},
 	actions:{
-		creatSocket(){
+		creatSocket(url = '/trastudy/trasoket/open?summary='){
 			if(this.SocketObj && this.SocketObj?.close && !this.SocketObj?.isClose) {
 				return
 			}
@@ -22,7 +22,7 @@ export const useSocketStore = defineStore('socketStore',{
 				this.SocketObj.isClose = false
 			}
 			let _baseUrl = get_base_url().split('http').join('ws')
-			this.SocketObj = new SocketClass(_baseUrl + '/trastudy/trasoket/open?summary=' + getToken());
+			this.SocketObj = new SocketClass(_baseUrl + url + getToken());
 		},
 		closeSocket() {
 			if(!(this.SocketObj && this.SocketObj?.close)) return