一些修改
This commit is contained in:
@@ -41,7 +41,7 @@
|
|||||||
</view>
|
</view>
|
||||||
<view class="list_item_price" v-if="item.courseCatalogueEntityList.length>1">
|
<view class="list_item_price" v-if="item.courseCatalogueEntityList.length>1">
|
||||||
<text v-for="(v,i) in item.courseCatalogueEntityList" :key="i">
|
<text v-for="(v,i) in item.courseCatalogueEntityList" :key="i">
|
||||||
{{(v.title).substring(0, 1)}}<text v-if="i !== item.courseCatalogueEntityList.length - 1">/</text>
|
{{formatContent(v.title)}}<text v-if="i !== item.courseCatalogueEntityList.length - 1">/</text>
|
||||||
</text>
|
</text>
|
||||||
<text v-if="item.courseCatalogueEntityList[0].halfFee==0" style="padding-left: 20rpx;">免费</text>
|
<text v-if="item.courseCatalogueEntityList[0].halfFee==0" style="padding-left: 20rpx;">免费</text>
|
||||||
<text v-else style="margin-left: 20rpx;">¥{{item.courseCatalogueEntityList[0].halfFee}}/{{item.courseCatalogueEntityList[0].fee}}</text>
|
<text v-else style="margin-left: 20rpx;">¥{{item.courseCatalogueEntityList[0].halfFee}}/{{item.courseCatalogueEntityList[0].fee}}</text>
|
||||||
@@ -148,6 +148,19 @@ export default {
|
|||||||
this.countryText = text;
|
this.countryText = text;
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
//判断显示‘上/中/下’
|
||||||
|
formatContent(content) {
|
||||||
|
const keywords = ["上部", "中部", "下部"];
|
||||||
|
let result = [];
|
||||||
|
|
||||||
|
// 判断是否包含关键字
|
||||||
|
keywords.forEach((keyword) => {
|
||||||
|
if (content.includes(keyword)) {
|
||||||
|
result.push(keyword.substring(0, 1));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
return result.join(" / ");
|
||||||
|
},
|
||||||
//获取数据
|
//获取数据
|
||||||
getData(id){
|
getData(id){
|
||||||
uni.showLoading({
|
uni.showLoading({
|
||||||
|
|||||||
@@ -440,16 +440,22 @@
|
|||||||
},
|
},
|
||||||
//课程详情
|
//课程详情
|
||||||
async gotoDetail(v, index) {
|
async gotoDetail(v, index) {
|
||||||
if (
|
if(this.userVip){
|
||||||
this.cateList[this.currentCateIndex].isBuy == 1 ||
|
|
||||||
v.isAudition == 1 || this.cateList[this.currentCateIndex].type==0 ||
|
|
||||||
this.userVip!=null
|
|
||||||
) {
|
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
url: `/pages/curriculum/order/detail?navTitle=${this.options.navTitle}&title=${v.title}&id=${v.id}&conditions=${v.conditions}&detailOid=${v.detailOid}&curriculumImgUrl=${this.curriculumData.image}`,
|
url: `/pages/curriculum/order/detail?navTitle=${this.options.navTitle}&title=${v.title}&id=${v.id}&conditions=${v.conditions}&detailOid=${v.detailOid}&curriculumImgUrl=${this.curriculumData.image}`,
|
||||||
});
|
});
|
||||||
} else {
|
}else{
|
||||||
this.$commonJS.showToast("请先购买课程");
|
if(v.isAudition == 1||this.cateList[this.currentCateIndex].isBuy == 1){
|
||||||
|
uni.navigateTo({
|
||||||
|
url: `/pages/curriculum/order/detail?navTitle=${this.options.navTitle}&title=${v.title}&id=${v.id}&conditions=${v.conditions}&detailOid=${v.detailOid}&curriculumImgUrl=${this.curriculumData.image}`,
|
||||||
|
});
|
||||||
|
}else{
|
||||||
|
if(this.cateList[this.currentCateIndex].type != 0){
|
||||||
|
this.$commonJS.showToast("请先购买课程");
|
||||||
|
}else{
|
||||||
|
this.$commonJS.showToast("请先领取课程");
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
//获取章节
|
//获取章节
|
||||||
@@ -1320,6 +1326,7 @@
|
|||||||
}
|
}
|
||||||
.hidden2{
|
.hidden2{
|
||||||
line-height: 20px;
|
line-height: 20px;
|
||||||
max-height: 60px;
|
max-height: 40px;
|
||||||
|
height: auto;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
@@ -366,12 +366,13 @@ export default {
|
|||||||
color: #333;
|
color: #333;
|
||||||
|
|
||||||
.curriculum_box{
|
.curriculum_box{
|
||||||
|
margin-top: 5rpx;
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: space-around;
|
justify-content: space-around;
|
||||||
margin-top: 25rpx;
|
|
||||||
|
|
||||||
.curriculum_item_box{
|
.curriculum_item_box{
|
||||||
|
padding: 20rpx;
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
position: relative;
|
position: relative;
|
||||||
@@ -400,7 +401,6 @@ export default {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.cate_box {
|
.cate_box {
|
||||||
margin-top: 20rpx;
|
|
||||||
background: #7dc1f0;
|
background: #7dc1f0;
|
||||||
box-shadow: 0rpx 0rpx 6rpx 0rpx #f9f6ea;
|
box-shadow: 0rpx 0rpx 6rpx 0rpx #f9f6ea;
|
||||||
border-radius: 10rpx;
|
border-radius: 10rpx;
|
||||||
|
|||||||
@@ -1036,6 +1036,8 @@
|
|||||||
height: 50rpx;
|
height: 50rpx;
|
||||||
}
|
}
|
||||||
.hidden2{
|
.hidden2{
|
||||||
max-height: 60px;
|
line-height: 20px;
|
||||||
|
max-height: 40px;
|
||||||
|
height: auto;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
4
unpackage/dist/build/app-plus/app-service.js
vendored
4
unpackage/dist/build/app-plus/app-service.js
vendored
File diff suppressed because one or more lines are too long
4
unpackage/dist/build/app-plus/app-view.js
vendored
4
unpackage/dist/build/app-plus/app-view.js
vendored
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user