|
@@ -260,6 +260,19 @@
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ function findZhangindex(data) {
|
|
|
+ console.log('data', data);
|
|
|
+ for (let zhangIndex = 0; zhangIndex < data.zhangList.length; zhangIndex++) {
|
|
|
+ const zhang = data.zhangList[zhangIndex];
|
|
|
+ for (let jieIndex = 0; jieIndex < zhang.jieList.length; jieIndex++) {
|
|
|
+ if (zhang.jieList[jieIndex].studyFlag == 0) {
|
|
|
+ return zhangIndex; // 返回所在zhang的索引
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return -1; // 如果没有找到
|
|
|
+ }
|
|
|
+
|
|
|
function getZhangInfo(data) {
|
|
|
let req = {
|
|
|
levelId: localAuth.value.levelId
|
|
@@ -269,17 +282,18 @@
|
|
|
let zhang = cacheManager.get('zhangInfo').zhangList.findIndex(zhang => zhang.zhangId == localAuth
|
|
|
.value.zhangId);
|
|
|
console.log('zhang', zhang);
|
|
|
+
|
|
|
if (zhang != -1) {
|
|
|
cacheManager.updateObject('auth', {
|
|
|
currentZhang: zhang
|
|
|
})
|
|
|
} else {
|
|
|
+ const zhangIndex = findZhangindex(cacheManager.get('zhangInfo'))
|
|
|
+ console.log(zhangIndex);
|
|
|
cacheManager.updateObject('auth', {
|
|
|
- currentZhang: 0
|
|
|
+ currentZhang: zhangIndex
|
|
|
})
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
nextTick(() => {
|
|
|
translateData(res.data)
|
|
|
zhangList.value = res.data.zhangList
|
|
@@ -290,10 +304,10 @@
|
|
|
|
|
|
}).catch((err) => {
|
|
|
toast('数据异常,请重新登录!')
|
|
|
- cacheManager.clearAll();
|
|
|
- uni.reLaunch({
|
|
|
- url: '/pages/login/index'
|
|
|
- });
|
|
|
+ // cacheManager.clearAll();
|
|
|
+ // uni.reLaunch({
|
|
|
+ // url: '/pages/login/index'
|
|
|
+ // });
|
|
|
})
|
|
|
}
|
|
|
|