|
@@ -343,11 +343,32 @@
|
|
|
getZhangInfo()
|
|
getZhangInfo()
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
- function chooseMethodUseCache() {
|
|
|
|
|
|
|
+
|
|
|
|
|
+ function jinggao(data){
|
|
|
|
|
+ uni.showModal({
|
|
|
|
|
+ title: '提示',
|
|
|
|
|
+ content: data,
|
|
|
|
|
+ showCancel:false,
|
|
|
|
|
+ success: function (res) {
|
|
|
|
|
+ if (res.confirm) {
|
|
|
|
|
+ console.log('用户点击确定');
|
|
|
|
|
+ } else if (res.cancel) {
|
|
|
|
|
+ console.log('用户点击取消');
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ });
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ function chooseMethodUseCache() {
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
// 新的英语 (人教版 之类的 新结构)
|
|
// 新的英语 (人教版 之类的 新结构)
|
|
|
if (currentProduct.value == 2 && typeId.value == 1) {
|
|
if (currentProduct.value == 2 && typeId.value == 1) {
|
|
|
- translateData(cacheManager.get('zhangInfo'))
|
|
|
|
|
|
|
+ translateData(cacheManager.get('zhangInfo'))
|
|
|
|
|
+ if(!cacheManager.get('zhangInfo').zhangList[0]){
|
|
|
|
|
+ jinggao("cacheManager.get('zhangInfo').zhangList[0].zList")
|
|
|
|
|
+ }
|
|
|
zhangList.value = cacheManager.get('zhangInfo').zhangList[0].zList
|
|
zhangList.value = cacheManager.get('zhangInfo').zhangList[0].zList
|
|
|
zhangName.value = cacheManager.get('zhangInfo').zhangList[0].zhangName
|
|
zhangName.value = cacheManager.get('zhangInfo').zhangList[0].zhangName
|
|
|
const curZid = cacheManager.get('zhangInfo').curZid;
|
|
const curZid = cacheManager.get('zhangInfo').curZid;
|
|
@@ -357,7 +378,10 @@
|
|
|
} else {
|
|
} else {
|
|
|
// 之前 旧的岛 数学英语 和新的数学
|
|
// 之前 旧的岛 数学英语 和新的数学
|
|
|
const curZhangId = cacheManager.get('zhangInfo').curZhangId;
|
|
const curZhangId = cacheManager.get('zhangInfo').curZhangId;
|
|
|
- const resZhangList = cacheManager.get('zhangInfo').zhangList;
|
|
|
|
|
|
|
+ const resZhangList = cacheManager.get('zhangInfo').zhangList;
|
|
|
|
|
+ if(!cacheManager.get('zhangInfo').zhangList){
|
|
|
|
|
+ jinggao("resZhangList")
|
|
|
|
|
+ }
|
|
|
const index = resZhangList.findIndex(item => item.zhangId == curZhangId)
|
|
const index = resZhangList.findIndex(item => item.zhangId == curZhangId)
|
|
|
console.log('index', index);
|
|
console.log('index', index);
|
|
|
translateData(cacheManager.get('zhangInfo'))
|
|
translateData(cacheManager.get('zhangInfo'))
|