2.6提交

pages/education/education.vue

@@ -107,18 +107,18 @@
 	// 方法
 	// 方法
 	const goToCourse = (courseType) => {
-		console.log('进入课程:', courseType);
+		
 		
 		// 根据课程类型进行不同的处理
 		switch(courseType) {
 			case 'course':
-				navTo({
-					url: '/pages_course/course/course'
+				uni.sendNativeEvent('goCourse',{
+					msg: 'course'
 				})
 				break;
 			case 'video':
 			  navTo({
-					url: '/pages_app/video/video'
+					url: '/pages_app/video/video?from=education'
 				})
 				break;
 			case 'ppt':

pages/live/live.vue

@@ -3,6 +3,7 @@
     <view class="status_bar"></view>
     <uni-nav-bar
     title="肝胆会议"
+    :left-icon="from?'left':''"
     @clickLeft="goBack"
     color="#8B2316"
     :border="false"
@@ -66,6 +67,7 @@
     <scroll-view
       ref="scrollView"
       class="scroll-content"
+      :class="{'active':from}"
       scroll-y="true"
       refresher-enabled="true"
       :refresher-triggered="isRefreshing"
@@ -245,7 +247,7 @@
     </view>
 
     <!-- 底部导航栏 -->
-    <CustomTabbar></CustomTabbar>
+    <CustomTabbar v-if="!from"></CustomTabbar>
     <topTip ref="topTipRef" title="相机权限使用说明" content="“肝胆相照”想使用您的相机和访问您的媒体，用于帮助您进行后续的扫码活动"></topTip>
   </view>
 </template>
@@ -288,6 +290,7 @@ const pageSize = ref(10);
 const scrollTop = ref(0);
 const permissionListener=ref(null);
 const topTipRef=ref(null);
+const from=ref('');
 const goToMeetHistroy = () => {
   navTo({
     url: "/pages_app/meetHistroy/meetHistroy",
@@ -297,7 +300,10 @@ const goToMeetHistroy = () => {
 onUnload (() => {
   permissionListener.value?.stop();
 });
- onLoad(()=>{	
+ onLoad((options)=>{	
+  if(options.from){
+    from.value=options.from;
+  }
 	// #ifdef APP-PLUS
    permissionListener.value=uni.createRequestPermissionListener();
    console.log('放在onLoad执行');
@@ -384,9 +390,15 @@ const goDetail = (item) => {
   uni.navigateTo({
     url: `/pages_app/webview/webview?url=${encoded}&sharetitle=${item.title}&bg=1&type=live_yugao&imgPath=${imgPath}&share=1&title=会议详情`,
   });
+};
+const goBack = () => {
+  if(from.value){
+    uni.navigateBack();
+  }
 };
  onBackPress(() => {
-  try{
+  if(!from.value){
+    try{
 			uni.sendNativeEvent('goTabbarPage', {
 			msg: 'home'
 		},ret => {
@@ -397,6 +409,7 @@ const goDetail = (item) => {
 		}
     plus.runtime.quit()
     return true;
+  }
 })
 const sendWebsocketMsg = (code) => {
   let userInfo = uni.getStorageSync("userInfo");
@@ -1068,6 +1081,9 @@ $shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
   right: 0;
   bottom:120rpx; // 底部导航栏高度
   width: 100%;
+  &.active{
+    bottom:10rpx;
+  }
 }
 
 // 筛选标签栏

pages/patientClass/patientClass.vue

@@ -130,9 +130,14 @@
 	import api from "@/api/api.js"
 	import docUrl from '@/utils/docUrl.js';
 	import navTo from '@/utils/navTo.js';
+	import {onBackPress} from '@dcloudio/uni-app';
 	import navBar from "@/components/navBar/navBar.vue"
 	import formatNumber from '@/utils/formatNumber.js';
 	const type=ref(1)
+	onBackPress(() => {
+		plus.runtime.quit();
+		return true;
+	});
 	
 	// 分页相关状态
 	const currentPage = ref(1);
@@ -289,8 +294,8 @@
 	
 	// 跳转到搜索页面
 	const goToSearch = () => {
-		uni.navigateTo({
-			url: '/pages_app/search/search'
+		uni.sendNativeEvent('goHomeSearch',{
+			msg: 'patientClass'
 		});
 	};
 	
@@ -357,16 +362,16 @@
 		// 检查是否有选中的标签
 		const hasSelected = filterTags.value.some(tag => tag.selected);
 		isFilterActive.value = hasSelected;
-		
+		let words='';
 		// 执行筛选逻辑
 		if (hasSelected) {
 			const selectedTags = filterTags.value.filter(tag => tag.selected).map(tag => tag.NAME);
 			console.log('选中的标签:', selectedTags);
-			keywords.value = selectedTags.join(',');
+			words = selectedTags.join(',');
 		} else {
-			keywords.value = '';
+			words = '';
 		}
-		
+		keywords.value = words;
 		// 重置分页状态
 		currentPage.value = 1;
 		hasMore.value = true;
@@ -665,16 +670,15 @@ $padding-small: 20rpx;
 		.filter-tags {
 			display: flex;
 			flex-wrap: wrap;
-			gap: 20rpx;
 			margin-bottom: 60rpx;
 			max-height: 65vh;
 			overflow-y: auto;
-			
 			.tag-item {
 				background-color: #f8f8f8;
 				color: $gray-dark;
 				padding: 8rpx 0rpx;
-				width:150rpx;
+				width:152rpx;
+				margin:8rpx;
 				text-align:center;
 				border-radius: 30rpx;
 				font-size: 26rpx;