wangguoyu 5 ماه پیش
والد
کامیت
e0ca1eedf8
3فایلهای تغییر یافته به همراه15 افزوده شده و 12 حذف شده
  1. 2 2
      pages/selectGradesTerms/index.vue
  2. 10 10
      pages/study/index.vue
  3. 3 0
      utils/request.js

+ 2 - 2
pages/selectGradesTerms/index.vue

@@ -88,12 +88,12 @@
 				})
 				// 数序
 				uni.redirectTo({
-					url: `/pages/study/index?flag=selectGrades`
+					url: `/pages/study/index`
 				})
 			} else {
 				// 数序
 				uni.redirectTo({
-					url: `/pages/study/index?nianji=${data.activeNianji}&cardId=${data.activeXueke}&zhangId=0&flag=selectGrades`
+					url: `/pages/study/index?nianji=${data.activeNianji}&cardId=${data.activeXueke}&zhangId=0`
 				})
 			}
 

+ 10 - 10
pages/study/index.vue

@@ -53,18 +53,17 @@
 		zhangName: '',
 		numberStr: '',
 	});
-	onLoad(() => {
+	onLoad((options) => {
 		// 获取路由参数
 
-		init()
+		init(options)
 
 	})
 
-	function init(){
+	function init(options){
 		if (cacheManager.get('auth')) {
 			//会员 取auth
 			selectZhang.value = cacheManager.get('auth');
-			
 			console.log(selectZhang.value);
 			// 已登录
 			// 选择年级进入调用此接口
@@ -72,9 +71,10 @@
 			getZhangInfo()
 			// 蛋
 			// eggDialogRef.value.eggShow();
-		} else {
+		} else {
+			console.log(options);
 			// 未登录 游客 
-			getCommonZhang()
+			getCommonZhang(options)
 	
 		}
 	}
@@ -107,11 +107,11 @@
 	}
 
 	function getCommonZhang(data) {
-    const auth = cacheManager.get('auth');
+   
 		let req = {
-			nianji: auth.nianji,
-			cardId: auth.cardId,
-			zhangId: selectZhang.value? selectZhang.value.zhangId :0,
+			nianji: data.nianji,
+			cardId: data.cardId,
+			zhangId:data.zhangId,
 		}
 		getCommonZhangInfo(req).then(res => {
 			infoData.jieList = res.data.jieList

+ 3 - 0
utils/request.js

@@ -68,6 +68,9 @@ const request = config => {
 				} else if (code === 500) {
 					toast("数据异常-500")
 					reject('500')
+				}else if (code === 400) {
+					toast("数据异常-400")
+					reject('400')
 				} else if (code !== 0) {
 					//   toast(msg)
 					reject(code)