公共头部组件修改

components/nav-bar.vue

@@ -10,8 +10,7 @@
 			</uni-easyinput>
 		</view>
 		<!-- 条件选择器 -->
-		<view class="filter_picker">
-			<!-- 通知类型筛选 -->
+		<view class="filter_picker" v-if="showFilterPicker">
 			<picker mode="selector" v-for="(item,index) in filterPickerData" :key="index" :range="item" :value="state.pickerIndex" @change="handleTypeChange" style="width: calc((100% - 32rpx * 2) / 3);">
 				<view class="filter_item">
 					<text class="filter_text">{{ item[state.pickerIndex] }}</text>
@@ -20,7 +19,7 @@
 			</picker>
 		</view>
 		<!-- tabs -->
-		<scroll-view class="scroll_tabs" scroll-x="true" scroll-left="0" :show-scrollbar="false">
+		<scroll-view v-if="showTabs" class="scroll_tabs" scroll-x="true" scroll-left="0" :show-scrollbar="false">
 			<view :class="['tab_item',{'selected':item.sortType==state.tabsSelected}]" v-for="item in tabList" :key="item.sortType" @click="SelectMenu(item.sortType)">
 				{{item.name}}
 			</view>
@@ -73,6 +72,14 @@
 		tabList:{//tabs
 			type:Array,
 			default:()=>[]
+		},
+		showFilterPicker:{//是否显示条件选择器
+			type:Boolean,
+			default:false
+		},
+		showTabs:{//是否显示条件选择器tabs
+			type:Boolean,
+			default:false
 		}
 	});
 	const state = reactive({

pages/login/agreement.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="page_body">
 		<!-- 导航 -->
-		<rp-nav-bar height="88" backPath="" :showHeaderborder="false" title="用户协议和隐私政策" @GoBack="GoBack"></rp-nav-bar>
+		<nav-bar height="88" backPath="" :showHeaderborder="false" title="用户协议和隐私政策" @GoBack="GoBack"></nav-bar>
 		<view class="page_module">
 			<view class="p">隐私政策</view>
 			<view class="p_m">
@@ -52,7 +52,7 @@
 </template>
 
 <script setup>
-	import rpNavBar from '@/components/nav-bar.vue';
+	import navBar from '@/components/nav-bar.vue';
 	//返回
 	const GoBack = () => {
 		uni.navigateTo({

pages/my/updatePassword.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="page_body">
 		<!-- 导航 -->
-		<rp-nav-bar height="88" :showHeaderborder="false" @GoBack="GoBack"></rp-nav-bar>
+		<nav-bar height="88" :showHeaderborder="false" @GoBack="GoBack"></nav-bar>
 		<view class="page_module">
 			<view class="page_title">修改密码</view>
 			<view class="tip">请输入两次相同的密码进行修改</view>
@@ -43,7 +43,7 @@
 
 <script setup>
 	import { reactive, ref } from 'vue';
-	import rpNavBar from '@/components/nav-bar.vue';
+	import navBar from '@/components/nav-bar.vue';
 	import uniForms from '@/uni_modules/uni-forms/components/uni-forms/uni-forms.vue';
 	import uniFormsItem from '@/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue';
 	import uniEasyinput from '@/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue';

pages/teacherStudy/courseCenter/index.vue

@@ -1,5 +1,6 @@
 <template>
-	<rp-nav-bar height="312" backPath="workspace" title="教师研修" :filterPickerData="state.filterPickerData" :tabList="state.tabList" :onlyTitle="false" rightWidth="0rpx" @GoBack="GoBack"></rp-nav-bar>
+	<!-- 头部 -->
+	<nav-bar height="312" backPath="workspace" title="教师研修" :filterPickerData="state.filterPickerData" :tabList="state.tabList" :onlyTitle="false" :showFilterPicker="true" :showTabs="true" rightWidth="0rpx" @GoBack="GoBack"></nav-bar>
 	<view class="page_content">
 		<view class="list_item">
 			<image class="item_img" mode="aspectFill" src="https://jtzx001.oss-accelerate.aliyuncs.com/huijiaoyan_test/20260609_255638/09101629_53c71c9b-3072-4fa5-9944-3598c9650666.jpg"></image>
@@ -54,7 +55,7 @@
 </template>
 
 <script setup>
-	import rpNavBar from '@/components/nav-bar.vue';
+	import navBar from '@/components/nav-bar.vue';
 	import {
 		reactive,
 		ref

pages/teacherStudy/index.vue

@@ -2,6 +2,7 @@
 	<view class="page_body">
 		<!-- 课程中心 -->
 		<course-center></course-center>
+		<!-- 底部tabbar -->
 		<page-tabbar :tabBarValue="state.tabBarValue" :tabBarList="state.tabBarList" @ChangeTabBarValue="ChangeTabBarValue"></page-tabbar>
 	</view>
 </template>