|
@@ -301,8 +301,6 @@
|
|
|
const curZid = cacheManager.get('zhangInfo').curZid;
|
|
|
const index = zhangList.value.findIndex(item => item.zid == curZid)
|
|
|
current.value = index
|
|
|
- zid.value = cacheManager.get('zhangInfo').zhangList[0].zList[cacheManager.get('auth').curZid].zhangZid
|
|
|
- infoData.zhangId = cacheManager.get('zhangInfo').zhangList[0].zhangId
|
|
|
recordZhangJie()
|
|
|
} else {
|
|
|
// 之前 旧的岛 数学英语 和新的数学
|
|
@@ -313,7 +311,6 @@
|
|
|
translateData(cacheManager.get('zhangInfo'))
|
|
|
zhangList.value = cacheManager.get('zhangInfo').zhangList
|
|
|
current.value = index
|
|
|
- infoData.zhangId = cacheManager.get('zhangInfo').zhangList[current.value].zhangId
|
|
|
recordZhangJie()
|
|
|
}
|
|
|
}
|
|
@@ -345,44 +342,26 @@
|
|
|
}
|
|
|
userZhangInfo(req).then(res => {
|
|
|
cacheManager.set('zhangInfo', res.data)
|
|
|
-
|
|
|
-
|
|
|
const curZid = res.data.curZid;
|
|
|
const resZList = res.data.zhangList[0].zList;
|
|
|
const index = resZList.findIndex(item => item.zid == curZid)
|
|
|
-
|
|
|
nextTick(() => {
|
|
|
translateData(res.data)
|
|
|
zhangList.value = res.data.zhangList[0].zList
|
|
|
zhangName.value = res.data.zhangList[0].zhangName
|
|
|
current.value = index
|
|
|
- zid.value = res.data.zhangList[0].zList[index].zhangZid
|
|
|
- infoData.zhangId = res.data.zhangList[0].zhangId
|
|
|
recordZhangJie()
|
|
|
})
|
|
|
|
|
|
}).catch((err) => {
|
|
|
toast('数据异常,请重新登录!')
|
|
|
- // cacheManager.clearAll();
|
|
|
- // uni.reLaunch({
|
|
|
- // url: '/pages/login/index'
|
|
|
- // });
|
|
|
+ cacheManager.clearAll();
|
|
|
+ uni.reLaunch({
|
|
|
+ url: '/pages/login/index'
|
|
|
+ });
|
|
|
})
|
|
|
}
|
|
|
|
|
|
- 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
|
|
@@ -397,16 +376,16 @@
|
|
|
translateData(res.data)
|
|
|
zhangList.value = res.data.zhangList
|
|
|
current.value = index
|
|
|
- infoData.zhangId = res.data.zhangList[current.value].zhangId
|
|
|
+
|
|
|
recordZhangJie()
|
|
|
})
|
|
|
|
|
|
}).catch((err) => {
|
|
|
toast('数据异常,请重新登录!')
|
|
|
- // cacheManager.clearAll();
|
|
|
- // uni.reLaunch({
|
|
|
- // url: '/pages/login/index'
|
|
|
- // });
|
|
|
+ cacheManager.clearAll();
|
|
|
+ uni.reLaunch({
|
|
|
+ url: '/pages/login/index'
|
|
|
+ });
|
|
|
})
|
|
|
}
|
|
|
|
|
@@ -424,10 +403,10 @@
|
|
|
current.value = 0
|
|
|
}).catch((err) => {
|
|
|
toast('数据异常,请重新登录!')
|
|
|
- // cacheManager.clearAll();
|
|
|
- // uni.reLaunch({
|
|
|
- // url: '/pages/login/index'
|
|
|
- // });
|
|
|
+ cacheManager.clearAll();
|
|
|
+ uni.reLaunch({
|
|
|
+ url: '/pages/login/index'
|
|
|
+ });
|
|
|
})
|
|
|
}
|
|
|
|