Merge branch 'develop' of http://25.13.9.101:9000/K17_AITS/tra-app into develop

src/pages/course/index.vue

@@ -45,6 +45,7 @@
 						<view class="btn-sub" @click="() => {showFilterList = false;activeTag = activeTagPop}">筛选</view>
 					</view>
 				</view>
+				<view :class="['model-filter-list',showFilterList?'show':'']"  @click="showFilterList = false"></view>
 				<uv-scroll-list class="tags-view" :indicator="false">
 					<uv-tags text="全部" 
 						shape="circle" 
@@ -132,7 +133,7 @@ import {
 	queryCrsInfoByPopularApi,
 	queryCrsInfoByRecmdApi
 } from "@/api/course.js"
-import { onMounted, onActivated, ref, computed } from 'vue'
+import { onMounted, onActivated, ref, computed, onUnmounted } from 'vue'
 import { onShow } from "@dcloudio/uni-app"
 	const customStyle = {
 		backgroundColor: "#ffffff",
@@ -337,6 +338,13 @@ import { onShow } from "@dcloudio/uni-app"
 			tagsTree.value = res.body||[]
 		})
 		changeTab({name:'全部'})
+		
+		uni.$on('refresh_course_list', () => {
+			changeTab({name:activeTab.value || '全部'})
+		});
+	})
+	onUnmounted(() => {
+		uni.$off('refresh_course_list');
 	})
   onActivated(() => {
 		// 重新获取标签信息
@@ -345,9 +353,9 @@ import { onShow } from "@dcloudio/uni-app"
 		})
 		changeTab({name:activeTab.value || '全部'})
 	});
-	onShow(()=>{
-		changeTab({name:activeTab.value || '全部'})
-	})
+	// onShow(()=>{
+	// 	changeTab({name:activeTab.value || '全部'})
+	// })
 </script>
 
 
@@ -426,7 +434,7 @@ import { onShow } from "@dcloudio/uni-app"
 					height: 588rpx;
 					padding-bottom: 80rpx;
 					overflow-y: hidden;
-					z-index: 2;
+					z-index: 10;
 					background-color: #f9f9f9;
 					box-shadow: 0rpx 12rpx 20rpx rgba(160,160,160,.25);
 					border-radius: 0 0 0rpx 0rpx;
@@ -504,7 +512,17 @@ import { onShow } from "@dcloudio/uni-app"
 						}
 					}
 				}
-				.filter-list{
+				.model-filter-list{
+					position: fixed;
+					width: 100vw;
+					height: 100vh;
+					overflow: hidden;
+					top: 0;
+					left: 0;
+					z-index: 1;
+				}
+				.filter-list,
+				.model-filter-list{
 					display: none;
 					&.show{
 						display: block;

src/pages/course/study.vue

@@ -347,6 +347,7 @@ const showOrder = ref(0)
 const isLastPgrph = ref(false)
 const backRouter = () => {
   // common.redirectTo(`/pages/courseDetail/index?crsId=${crsId.value}&crsNum=${crsNum.value}&from=study`)
+	uni.$emit('refresh_course_list');
   common.navigateBack()
 }
 
@@ -395,6 +396,7 @@ const getGraphInfoUnStudy = (flag = 0) => {
           })
           .finally(() => {})
       }
+			uni.$emit('refresh_course_list');
       return
     }
     lastTalkingInfo.value = {