Merge branch '2024鹅状元' of https://gogs.mtavip.com/wangguoyu/uniProject into 2024鹅状元

components/catalogue/catalogue.vue

@@ -5,8 +5,8 @@
 			<uni-icons @click="handleClose" class="catalogue-close-btn"></uni-icons>
 			<!-- 目录区域 -->
 			<uni-collapse v-model="activeCollapse" class="ezy-catalogue-collapse" accordion>
-				<uni-collapse-item title-border="none" :border="false" :name="index" v-for="(item,index) in list" 
-				class="collapse-item-box" :class="{ 'collapse-active': activeCollapse === index}">
+				<uni-collapse-item title-border="none" :border="false" :name="index+''" v-for="(item,index) in list" 
+				class="collapse-item-box" :class="{ 'collapse-active': activeCollapse === index+''}">
 					<template v-slot:title>
 							<view @click.stop="handleSelectZhang(item,index)" class="collapse-title">
 								<view class="collapse-num-box">{{index+1}}</view>

components/custom-tabbar/custom-tabbar.vue

@@ -12,10 +12,10 @@ export default {
   data() {
     return {
       tabList: [
-        {iconPath: 'static/images/tabbar/unselect/plan-sj.png',path:`/pages/study/index?zhangId=${this.$state.zhangId}&nianji=${this.$state.nianji}&xueqi=${this.$state.xueqi}` },
+        {iconPath: 'static/images/tabbar/unselect/plan-sj.png',path:`/pages/study/index` },
         {iconPath: 'static/images/tabbar/unselect/develop-sj.png',path:'/pages/study/index' },
         {iconPath: 'static/images/tabbar/unselect/partner-sj.png',path:'/pages/study/index' },
-        {iconPath: 'static/images/tabbar/unselect/my-sj.png',path:`/pages/my/index?zhangId=${this.$state.zhangId}&nianji=${this.$state.nianji}&xueqi=${this.$state.xueqi}` },
+        {iconPath: 'static/images/tabbar/unselect/my-sj.png',path:`/pages/my/index` },
         // 更多 Tab 项...
       ]
     };

pages/study/index.vue

@@ -97,21 +97,12 @@
 			getZhangFirst()
 		} else {
 			getZhangInfo()
-		}
-
+		}
 		// 设置全局变量
-		setGlobalData(options)
+	
 		// 蛋
 		// eggDialogRef.value.eggShow();
 	})
-
-	function setGlobalData(data){
-		console.log(data);
-		const { appContext } = getCurrentInstance();
-		appContext.config.globalProperties.$state.xueqi = data.xueqi
-		appContext.config.globalProperties.$state.nianji = data.nianji
-		appContext.config.globalProperties.$state.zhangId = data.zhangId
-	}
 	function recordZhangJie() {
 		let req = {
 			nianji: routeParams.value.nianji,

utils/emitEvents.js

@@ -1,3 +1,5 @@
+import { reactive } from "vue";
+
 export const FROM_PAGES_UNITTEST = "from.pages.unitTest"; // 从 单元测试 返回 岛 的路由参数
 export const FROM_PAGES_SELECTGRADE = "from.pages.selectGrade"; // 从年级学期选择 跳转 岛 的路由参数
 
@@ -40,4 +42,39 @@ export function useStudyRouteParams() {
 		getStudyStorage,
 		removeStudyStorage
 	}
+}
+
+
+const PAGE_TABBAR_KEY = "TAB_BAR";
+const History_Obj = reactive({
+	study: null,
+	logout: null
+})
+export function useTabBarHistory () {
+	function setTabBarStorage(data) {
+		uni.setStorageSync(PAGE_TABBAR_KEY,JSON.stringify(data));
+	}
+	
+	function getTabBarStorage(page) {
+		const data = uni.getStorageSync(PAGE_TABBAR_KEY);
+		return data ? JSON.parse(data)[page] : data;
+	}
+	
+	function removeTabBarStorage() {
+		uni.removeStorageSync(PAGE_TABBAR_KEY)
+	}
+	
+	function setTabBarStorageCustom(page,callback) {
+		const data = getTabBarStorage(page)
+		function done(data) {
+			setTabBarStorage(data)
+		}
+		if (data) {
+			callback(data,done);
+		}
+	}
+	
+	return {
+		setTabBarStorage,getTabBarStorage,removeTabBarStorage
+	}
 }