|
@@ -875,7 +875,6 @@
|
|
});
|
|
});
|
|
},
|
|
},
|
|
async studyIn(v, i, item, index) {
|
|
async studyIn(v, i, item, index) {
|
|
- let playSource = 2;
|
|
|
|
if (item.externalLinkStatus) {
|
|
if (item.externalLinkStatus) {
|
|
this.$method.toLink(item.externalLink);
|
|
this.$method.toLink(item.externalLink);
|
|
return;
|
|
return;
|
|
@@ -888,19 +887,16 @@
|
|
|
|
|
|
// 进入视频课
|
|
// 进入视频课
|
|
this.activeItem = item;
|
|
this.activeItem = item;
|
|
|
|
+ item.viewSign = 2;
|
|
if (item.interfaceAccountId > 0) {
|
|
if (item.interfaceAccountId > 0) {
|
|
//学习账号已开通
|
|
//学习账号已开通
|
|
|
|
|
|
if (item.learnStatus > 0) {
|
|
if (item.learnStatus > 0) {
|
|
//跳转第三方h5
|
|
//跳转第三方h5
|
|
- if (playSource == 1) {
|
|
|
|
- uni.navigateTo({
|
|
|
|
- url: `/pages3/polyv/detail?goodsId=${item.goodsId}&orderGoodsId=${item.orderGoodsId}&gradeId=${item.gradeId}&isOther=1`,
|
|
|
|
- });
|
|
|
|
- } else {
|
|
|
|
|
|
+ if (item.viewSign == 2) {
|
|
// #ifdef H5
|
|
// #ifdef H5
|
|
uni.navigateTo({
|
|
uni.navigateTo({
|
|
- url: `/pages3/polyv/detail?goodsId=${item.goodsId}&orderGoodsId=${item.orderGoodsId}&gradeId=${item.gradeId}&isOther=1`,
|
|
|
|
|
|
+ url: `/pages3/polyv/detail?goodsId=${item.goodsId}&orderGoodsId=${item.orderGoodsId}&gradeId=${item.gradeId}&isOther=1&viewSign=${item.viewSign}`,
|
|
});
|
|
});
|
|
// #endif
|
|
// #endif
|
|
// #ifdef MP-WEIXIN
|
|
// #ifdef MP-WEIXIN
|
|
@@ -912,9 +908,10 @@
|
|
orderGoodsId: item.orderGoodsId,
|
|
orderGoodsId: item.orderGoodsId,
|
|
gradeId: item.gradeId,
|
|
gradeId: item.gradeId,
|
|
isOther: 1,
|
|
isOther: 1,
|
|
- skipPort: res.data.data.skipPort
|
|
|
|
|
|
+ viewSign: item.viewSign,
|
|
|
|
+ skipPort: res.data.data.skipPort,
|
|
}
|
|
}
|
|
- let webViewUrl = encodeURIComponent('http://192.168.1.213:8080' +
|
|
|
|
|
|
+ let webViewUrl = encodeURIComponent('http://192.168.1.213:8081' +
|
|
'/pages3/polyv/detail?obj=' +
|
|
'/pages3/polyv/detail?obj=' +
|
|
JSON.stringify(obj))
|
|
JSON.stringify(obj))
|
|
uni.navigateTo({
|
|
uni.navigateTo({
|
|
@@ -922,6 +919,10 @@
|
|
})
|
|
})
|
|
})
|
|
})
|
|
// #endif
|
|
// #endif
|
|
|
|
+ } else {
|
|
|
|
+ uni.navigateTo({
|
|
|
|
+ url: `/pages3/polyv/detail?goodsId=${item.goodsId}&orderGoodsId=${item.orderGoodsId}&gradeId=${item.gradeId}&isOther=1`,
|
|
|
|
+ });
|
|
}
|
|
}
|
|
return;
|
|
return;
|
|
} else {
|
|
} else {
|
|
@@ -1042,17 +1043,7 @@
|
|
}).then((res) => {
|
|
}).then((res) => {
|
|
if (res.data.code == 200) {
|
|
if (res.data.code == 200) {
|
|
if (res.data.total > 1) {
|
|
if (res.data.total > 1) {
|
|
- if (playSource == 1) {
|
|
|
|
- uni.navigateTo({
|
|
|
|
- url: `/pages3/polyv/detail?id=''&goodsId=${
|
|
|
|
- item.goodsId
|
|
|
|
- }&orderGoodsId=${item.orderGoodsId}&gradeId=${
|
|
|
|
- item.gradeId
|
|
|
|
- }&periodWaitTime=${item.periodWaitTime ? 1 : ""}&isQ=${
|
|
|
|
- item.orderYear ? 1 : ""
|
|
|
|
- }`,
|
|
|
|
- });
|
|
|
|
- } else {
|
|
|
|
|
|
+ if (item.viewSign == 2) {
|
|
// #ifdef H5
|
|
// #ifdef H5
|
|
uni.navigateTo({
|
|
uni.navigateTo({
|
|
url: `/pages3/polyv/detail?id=''&goodsId=${
|
|
url: `/pages3/polyv/detail?id=''&goodsId=${
|
|
@@ -1061,7 +1052,7 @@
|
|
item.gradeId
|
|
item.gradeId
|
|
}&periodWaitTime=${item.periodWaitTime ? 1 : ""}&isQ=${
|
|
}&periodWaitTime=${item.periodWaitTime ? 1 : ""}&isQ=${
|
|
item.orderYear ? 1 : ""
|
|
item.orderYear ? 1 : ""
|
|
- }`,
|
|
|
|
|
|
+ }&viewSign=${item.viewSign}`,
|
|
});
|
|
});
|
|
// #endif
|
|
// #endif
|
|
// #ifdef MP-WEIXIN
|
|
// #ifdef MP-WEIXIN
|
|
@@ -1075,10 +1066,11 @@
|
|
gradeId: item.gradeId,
|
|
gradeId: item.gradeId,
|
|
periodWaitTime: item.periodWaitTime ? 1 : "",
|
|
periodWaitTime: item.periodWaitTime ? 1 : "",
|
|
isQ: item.orderYear ? 1 : "",
|
|
isQ: item.orderYear ? 1 : "",
|
|
|
|
+ viewSign: item.viewSign,
|
|
skipPort: res.data.data.skipPort
|
|
skipPort: res.data.data.skipPort
|
|
}
|
|
}
|
|
let webViewUrl = encodeURIComponent(
|
|
let webViewUrl = encodeURIComponent(
|
|
- 'http://192.168.1.213:8080' +
|
|
|
|
|
|
+ 'http://192.168.1.213:8081' +
|
|
'/pages3/polyv/detail?obj=' +
|
|
'/pages3/polyv/detail?obj=' +
|
|
JSON.stringify(obj))
|
|
JSON.stringify(obj))
|
|
uni.navigateTo({
|
|
uni.navigateTo({
|
|
@@ -1086,19 +1078,19 @@
|
|
})
|
|
})
|
|
})
|
|
})
|
|
// #endif
|
|
// #endif
|
|
- }
|
|
|
|
- } else if (res.data.total == 1) {
|
|
|
|
- if (playSource == 1) {
|
|
|
|
|
|
+ } else {
|
|
uni.navigateTo({
|
|
uni.navigateTo({
|
|
- url: `/pages3/polyv/detail?id=${
|
|
|
|
- res.data.rows[0].courseId
|
|
|
|
- }&goodsId=${item.goodsId}&orderGoodsId=${
|
|
|
|
- item.orderGoodsId
|
|
|
|
- }&gradeId=${item.gradeId}&periodWaitTime=${
|
|
|
|
- item.periodWaitTime ? "" : 1
|
|
|
|
- }&isQ=${item.orderYear ? 1 : ""}`,
|
|
|
|
|
|
+ url: `/pages3/polyv/detail?id=''&goodsId=${
|
|
|
|
+ item.goodsId
|
|
|
|
+ }&orderGoodsId=${item.orderGoodsId}&gradeId=${
|
|
|
|
+ item.gradeId
|
|
|
|
+ }&periodWaitTime=${item.periodWaitTime ? 1 : ""}&isQ=${
|
|
|
|
+ item.orderYear ? 1 : ""
|
|
|
|
+ }`,
|
|
});
|
|
});
|
|
- } else {
|
|
|
|
|
|
+ }
|
|
|
|
+ } else if (res.data.total == 1) {
|
|
|
|
+ if (item.viewSign == 2) {
|
|
// #ifdef H5
|
|
// #ifdef H5
|
|
uni.navigateTo({
|
|
uni.navigateTo({
|
|
url: `/pages3/polyv/detail?id=${
|
|
url: `/pages3/polyv/detail?id=${
|
|
@@ -1107,7 +1099,7 @@
|
|
item.orderGoodsId
|
|
item.orderGoodsId
|
|
}&gradeId=${item.gradeId}&periodWaitTime=${
|
|
}&gradeId=${item.gradeId}&periodWaitTime=${
|
|
item.periodWaitTime ? "" : 1
|
|
item.periodWaitTime ? "" : 1
|
|
- }&isQ=${item.orderYear ? 1 : ""}`,
|
|
|
|
|
|
+ }&isQ=${item.orderYear ? 1 : ""}&viewSign=${item.viewSign}`,
|
|
});
|
|
});
|
|
// #endif
|
|
// #endif
|
|
// #ifdef MP-WEIXIN
|
|
// #ifdef MP-WEIXIN
|
|
@@ -1121,10 +1113,11 @@
|
|
gradeId: item.gradeId,
|
|
gradeId: item.gradeId,
|
|
periodWaitTime: item.periodWaitTime ? "" : 1,
|
|
periodWaitTime: item.periodWaitTime ? "" : 1,
|
|
isQ: item.orderYear ? 1 : "",
|
|
isQ: item.orderYear ? 1 : "",
|
|
|
|
+ viewSign: item.viewSign,
|
|
skipPort: resForDetail.data.data.skipPort
|
|
skipPort: resForDetail.data.data.skipPort
|
|
}
|
|
}
|
|
let webViewUrl = encodeURIComponent(
|
|
let webViewUrl = encodeURIComponent(
|
|
- 'http://192.168.1.213:8080' +
|
|
|
|
|
|
+ 'http://192.168.1.213:8081' +
|
|
'/pages3/polyv/detail?obj=' +
|
|
'/pages3/polyv/detail?obj=' +
|
|
JSON.stringify(obj))
|
|
JSON.stringify(obj))
|
|
uni.navigateTo({
|
|
uni.navigateTo({
|
|
@@ -1132,6 +1125,16 @@
|
|
})
|
|
})
|
|
})
|
|
})
|
|
// #endif
|
|
// #endif
|
|
|
|
+ } else {
|
|
|
|
+ uni.navigateTo({
|
|
|
|
+ url: `/pages3/polyv/detail?id=${
|
|
|
|
+ res.data.rows[0].courseId
|
|
|
|
+ }&goodsId=${item.goodsId}&orderGoodsId=${
|
|
|
|
+ item.orderGoodsId
|
|
|
|
+ }&gradeId=${item.gradeId}&periodWaitTime=${
|
|
|
|
+ item.periodWaitTime ? "" : 1
|
|
|
|
+ }&isQ=${item.orderYear ? 1 : ""}`,
|
|
|
|
+ });
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
uni.showToast({
|
|
uni.showToast({
|