调整数据类型

api/learnPlan.js

@@ -34,3 +34,15 @@ export function userZhangInfo(data = {}) {
     timeout: 20000
   })
 }
+
+export function getCommonZhangInfo(data = {}) {
+  return request({
+    'url': '/common/zhang/firstInfo',
+    headers: {
+      isToken: true
+    },
+    method: 'post',
+    data,
+    timeout: 20000
+  })
+}

pages/study/index.vue

@@ -37,7 +37,8 @@
 	import {
 		userZhangFirstInfo,
 		userZhangInfo,
-		userLocate
+		userLocate,
+		getCommonZhangInfo
 	} from "@/api/learnPlan.js"
 	import {
 		reactive,
@@ -57,6 +58,7 @@
 		useTabBarHistory
 	} from '@/utils/emitEvents.js';
 	import eggDialog from './eggDialog.vue'
+	
 	const eggDialogRef = ref(null);
 
 	const catalogueRef = ref(null);
@@ -95,17 +97,50 @@
 		console.log(options)
 		// 获取路由参数
 		routeParams.value = options;
-		// 选择年级进入调用此接口
-		if (options.flag == 'selectGrades') {
-			getZhangFirst()
+		
+		if (JSON.parse(getAuth())) {
+			// 已登录
+			// 选择年级进入调用此接口
+			if (options.flag == 'selectGrades') {
+				getZhangFirst()
+			} else {
+				getZhangInfo()
+			}
+			// 设置全局变量
+				
+			// 蛋
+			// eggDialogRef.value.eggShow();
+			
 		} else {
-			getZhangInfo()
+			// 未登录
+			getCommonZhang();
 		}
-		// 设置全局变量
-	
-		// 蛋
-		// eggDialogRef.value.eggShow();
 	})
+	function getCommonZhang(data) {
+		let req = data ? {
+			nianji: selectZhang.value.nianji,
+			xueqi: selectZhang.value.xueqi,
+			zhangId: selectZhang.value.zhangId,
+		} : {
+			nianji: routeParams.value.nianji,
+			xueqi: routeParams.value.xueqi,
+			zhangId: routeParams.value.zhangId,
+		};
+		getCommonZhangInfo(req).then(res => {
+			infoData.jieList = res.data.jieList
+			infoData.haveFlag = res.data.haveFlag
+			infoData.nianji = res.data.nianji
+			infoData.number = res.data.number
+			infoData.numberStr = res.data.numberStr
+			infoData.xueqi = res.data.xueqi
+			infoData.zhangId = res.data.zhangId
+			infoData.zhangName = res.data.zhangName
+			gradeTerm.value = translateData(res.data);
+			useTabBarHistory().setTabBarStorage({nianji:res.data.nianji,zhangId:res.data.zhangId,xueqi:res.data.xueqi})
+		})
+	}
+	
+	
 	function recordZhangJie() {
 		let req = {
 			nianji: routeParams.value.nianji,
@@ -281,6 +316,15 @@
 	
 
 	function listClick(data,index) {
+		
+		if (!JSON.parse(getAuth())) {
+			uni.redirectTo({
+				url: '/pages/login/index'
+			})
+			return;
+		}
+		
+		
 		if(index ==infoData.jieList.length-1){
 			// 最后一项
 			goKaoshi(data)