合并master后

This commit is contained in:
@fawn-nine
2024-09-09 14:16:48 +08:00
10 changed files with 3106 additions and 3129 deletions

View File

@@ -3,7 +3,10 @@
<!-- 公共组件-每个页面必须引入 -->
<public-module></public-module>
<!-- <z-nav-bar :title="pageTitle ? pageTitle : '课程详情'"> -->
<z-nav-bar title="课程介绍">
<z-nav-bar title="课程介绍">
<!-- <view class="curseSet" slot="right" @click="newOnShare">
<uni-icons type="redo" size="26"></uni-icons><text style="font-size: 26rpx;"></text> 分享课程
</view> -->
</z-nav-bar>
<view class="contentBox commonPageContentBox">
@@ -49,11 +52,11 @@
position: relative;
display: flex;
align-items: center;
" @click="isHideCourseInfo = !isHideCourseInfo">
">
<view :class="`${isHideCourseInfo ? 'hidden2' : ''}`"
style="width: calc(100% - 50rpx); font-size: 30rpx;" v-html="course.content">
</view>
<text
<text @click="isHideCourseInfo = !isHideCourseInfo"
style="
position: absolute;
bottom: 0;
@@ -69,7 +72,7 @@
</view>
</view>
</view>
<!-- 小班入口 -->
<!-- 小班入口 -->
<view class="classEntrance" v-if="linkClassList.length > 0">
<view class="flex_box" style="justify-content: space-between;">
<view class="flex_box classTitleBox">
@@ -475,7 +478,25 @@
fatherIndex: null,
supportFlag: false,
selectGoodsData: {},
buyOptions: [],
buyOptions: [
// {
// icon: 'chat',
// text: '客服'
// },
// {
// icon: 'shop',
// text: '店铺',
// // info: 2,
// infoBackgroundColor: '#007aff',
// infoColor: "#f5f5f5"
// },
// {
// icon: 'cart',
// text: '购物车',
// info: 2
// }
],
customButtonGroup1: [{
with: 200,
text: "立即购买",
@@ -501,14 +522,14 @@
// this.pageTitle = e.title
console.log(e, "传入分类id");
this.getUserInfo();
this.courseId = e.id;
this.courseId = e.id;
// this.getCateList(this.courseId)
// await this.getData(e.id);
this.getSayList();
this.getOS()
},
onPageScroll(e) {
this.scrollTop = e.scrollTop;
if (this.scrollTop > 500) {
@@ -529,7 +550,7 @@
// #ifdef APP-PLUS
plus.screen.unlockOrientation();
plus.screen.lockOrientation("portrait-primary");
// #endif
// #endif
this.getLinkClassList()
},
onUnload() {
@@ -594,6 +615,31 @@
})
})
},
getClassList(){
$http.request({
url: '/common/class/getClassByUser',
method: "POST",
data: {
"courseId": this.courseId
},
header: { //默认 无 说明:请求头
'Content-Type': 'application/json'
},
})
.then(res => {
this.classInfo = {}
console.log('获取班级列表',res.result);
if(res.code == 0 && res.result != null){
if(res.result.id){
this.classInfo = res.result
}
}
console.log('获取班级列表++++++',this.classList);
}).catch(e => {
console.log('获取班级列表失败',e);
this.classInfo = {}
});
},
// 获得操作系统
getOS() {
let oprateOs = "";
@@ -692,7 +738,7 @@
v.isAudition == 1 && this.userMsg.vip == 0 && this.librayList[this.curIndex].isBuy == 0 ?
noRecored = true : ''
uni.navigateTo({
url: `${_myurl}?courseId=${this.course.id}&navTitle=${this.pageTitle}&title=${v.title}&id=${v.id}&conditions=${v.conditions}&noRecored=${noRecored}`,
url: `${_myurl}?navTitle=${this.pageTitle}&title=${v.title}&id=${v.id}&conditions=${v.conditions}&noRecored=${noRecored}`,
});
} else {
this.$commonJS.showToast("请先购买课程");
@@ -745,8 +791,7 @@
if (res.code == 0) {
this.getCourseDescriptionData();
// this.$commonJS.showToast("");
}
}
this.$forceUpdate();
});
} else {
@@ -1013,31 +1058,6 @@
console.log("提交报错", e);
});
},
getClassList(){
$http.request({
url: '/common/class/getClassByUser',
method: "POST",
data: {
"courseId": this.courseId
},
header: { //默认 无 说明:请求头
'Content-Type': 'application/json'
},
})
.then(res => {
this.classInfo = {}
console.log('获取班级列表',res.result);
if(res.code == 0){
if(res.result.id){
this.classInfo = res.result
}
}
console.log('获取班级列表++++++',this.classList);
}).catch(e => {
console.log('获取班级列表失败',e);
this.classInfo = {}
});
},
// 查询课程的评论
getSayList() {
this.status = 1;
@@ -1215,9 +1235,7 @@
this.courseList = [];
// console.log("at line 1167:", "调用了几次");
var that = this;
uni.showLoading({
title:'正在加载'
})
await $http
.request({
url: "sociology/course/getCourseDetail",
@@ -1303,10 +1321,8 @@
// console.log("list at line 1233:", list);
}
}
uni.hideLoading()
})
.catch((e) => {
uni.hideLoading()
console.log(e, "获取目录数据报错");
});
},
@@ -1434,16 +1450,16 @@
});
},
goClassLIst(url, id,title){
uni.navigateTo({
url: `${url}?courseId=${id}&courseTitle=${title}`,
});
},
uni.navigateTo({
url: `${url}?courseId=${id}&courseTitle=${title}`,
});
},
},
};
</script>
<style lang="scss" scoped>
@import "@/style/mixin.scss";
.classEntrance{background-color: #d0ecc1; padding:20rpx;
.classEntrance{background-color: #d0ecc1; padding:20rpx;
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
.flex_box{align-items: center;}
}
@@ -1477,7 +1493,7 @@
}
img {
max-width: 260rpx;
width: 20px;
}
.u-upload__button {
@@ -1514,12 +1530,14 @@
.contentBox {
width: calc(100% - 60rpx);
// img{width: 100rpx !important;
// height: 100rpx !important;}
}
// .img{ width: 60rpx;
// height: 60rpx;
// image{width:60rpx; height: 60rpx; border-radius: 100%;}
// }
.img{ width: 60rpx;
height: 60rpx;
image{width:60rpx; height: 60rpx; border-radius: 100%;}
}
}
.chooseImgType {
@@ -2147,8 +2165,9 @@
color: #333;
// background-color: #f0f0f0;
// margin-bottom: 10rpx;
}
::v-deep .prof img{ width: 100px; height: 100px;}
.catalogueTitle {
justify-content: space-between;
overflow: hidden;