|
@@ -404,7 +404,7 @@
|
|
|
|
|
|
let req = {
|
|
let req = {
|
|
levelId: data.levelId,
|
|
levelId: data.levelId,
|
|
- zhangId: data.youkeZhangId
|
|
|
|
|
|
+ zhangId: data.zhangId
|
|
}
|
|
}
|
|
getCommonZhangInfo(req).then(res => {
|
|
getCommonZhangInfo(req).then(res => {
|
|
translateData(res.data)
|
|
translateData(res.data)
|
|
@@ -492,13 +492,13 @@
|
|
|
|
|
|
function goDanciList(data, index) {
|
|
function goDanciList(data, index) {
|
|
if (!cacheManager.get('auth')) {
|
|
if (!cacheManager.get('auth')) {
|
|
- let youkeData = {
|
|
|
|
- subjectId:subjectId.value,
|
|
|
|
- typeId:typeId.value,
|
|
|
|
- levelId:levelId.value,
|
|
|
|
- tipFlag:tipFlag.value,
|
|
|
|
- youkeZhangId:youkeZhangId.value,
|
|
|
|
- jieId:data.jieId
|
|
|
|
|
|
+ let youkeData = {
|
|
|
|
+ subjectId: subjectId.value,
|
|
|
|
+ typeId: typeId.value,
|
|
|
|
+ levelId: levelId.value,
|
|
|
|
+ tipFlag: tipFlag.value,
|
|
|
|
+ youkeZhangId: youkeZhangId.value,
|
|
|
|
+ jieId: data.jieId
|
|
}
|
|
}
|
|
uni.redirectTo({
|
|
uni.redirectTo({
|
|
url: '/pages/wordList/wordList?youkePageData=' + JSON.stringify(youkeData)
|
|
url: '/pages/wordList/wordList?youkePageData=' + JSON.stringify(youkeData)
|
|
@@ -571,33 +571,52 @@
|
|
}
|
|
}
|
|
|
|
|
|
function listClick(data, data2, index) {
|
|
function listClick(data, data2, index) {
|
|
- console.log('data', data); // 节内容
|
|
|
|
- console.log('data2', data2); //章内容
|
|
|
|
- if (!cacheManager.get('auth') && data.firstFlag != 1) {
|
|
|
|
- youkeDialogRef.value.handleShow();
|
|
|
|
- return;
|
|
|
|
- }
|
|
|
|
- const authCode = getUserIdentity();
|
|
|
|
- console.log('authCode', authCode);
|
|
|
|
- if (!(authCode == 'VIP' || data.firstFlag == 1)) {
|
|
|
|
- // debugger
|
|
|
|
- goPayDialogRef.value.handleShow();
|
|
|
|
- return false
|
|
|
|
- }
|
|
|
|
|
|
+ //console.log('data', data); // 节内容
|
|
|
|
+ // console.log('data2', data2); //章内容
|
|
|
|
+ chooseMethodListClick(data,data2,index)
|
|
|
|
|
|
- if (data.type == 2) {
|
|
|
|
- // 最后一项
|
|
|
|
- goKaoshi(data, index)
|
|
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ function chooseMethodListClick(data,data2,index) {
|
|
|
|
+
|
|
|
|
+ console.log('data', data); // 节内容
|
|
|
|
+ console.log('data2', data2); //章内容
|
|
|
|
+ const authCode = getUserIdentity();
|
|
|
|
+ if (currentProduct.value == 2 && typeId.value == 1) {
|
|
|
|
+ const isFirst = data.jieName ==data2.jieList[0].jieName
|
|
|
|
+ if(!cacheManager.get('auth') &&!isFirst){
|
|
|
|
+ youkeDialogRef.value.handleShow();
|
|
|
|
+ return false;
|
|
|
|
+ }
|
|
|
|
+ console.log('authCode', authCode);
|
|
|
|
+ if (!(authCode == 'VIP' || isFirst)) {
|
|
|
|
+ goPayDialogRef.value.handleShow();
|
|
|
|
+ return false
|
|
|
|
+ }
|
|
|
|
+ debugger
|
|
|
|
+ goDanciList(data, index)
|
|
} else {
|
|
} else {
|
|
- if (currentProduct.value == 2 && typeId.value == 1) {
|
|
|
|
- goDanciList(data, index)
|
|
|
|
|
|
+ if (!cacheManager.get('auth') && data.firstFlag != 1) {
|
|
|
|
+ youkeDialogRef.value.handleShow();
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ console.log('authCode', authCode);
|
|
|
|
+ if (!(authCode == 'VIP' || data.firstFlag == 1)) {
|
|
|
|
+ // debugger
|
|
|
|
+ goPayDialogRef.value.handleShow();
|
|
|
|
+ return false
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if (data.type == 2) {
|
|
|
|
+ // 最后一项
|
|
|
|
+ goKaoshi(data, index)
|
|
} else {
|
|
} else {
|
|
goLookShipin(data, index)
|
|
goLookShipin(data, index)
|
|
}
|
|
}
|
|
-
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+
|
|
function handleCheckCatalogue(item) {
|
|
function handleCheckCatalogue(item) {
|
|
catalogueRef.value.showPopup(item);
|
|
catalogueRef.value.showPopup(item);
|
|
}
|
|
}
|