热更新

This commit is contained in:
2024-06-13 10:04:13 +08:00
parent e595e034dc
commit 7eaaf64a22
1180 changed files with 70026 additions and 731709 deletions

View File

@@ -1094,7 +1094,7 @@ export default {
}
.commonDetailPage {
// background-color: #d8f8e4 !important;
}
.curriulum_box {
@@ -1133,7 +1133,7 @@ export default {
.small_class_teaching_box {
width: 100%;
margin-top: 20rpx;
background: #edfcf7;
background: #B7E0E2;
.small_class_teaching_top {
padding: 20rpx 20rpx 0 10rpx;
@@ -1144,7 +1144,7 @@ export default {
// background: #EDFCF7;
color: #8f8e8e;
// box-shadow: 0px 0px 6rpx 0px rgba(0, 82, 79, 0.4);
// box-shadow: 0px 0px 6rpx 0px #E9DCCC;
.icon1 {
width: 50rpx;
height: 50rpx;
@@ -1182,7 +1182,7 @@ export default {
background: #cef8ea;
text-align: center;
border-radius: 10rpx;
box-shadow: 0px 0px 6rpx 0px rgba(0, 82, 79, 0.4);
box-shadow: 0px 0px 6rpx 0px #E9DCCC;
}
}
@@ -1290,7 +1290,7 @@ export default {
background: #f4fffb;
border-radius: 10rpx;
box-shadow: 0px 0px 6rpx 0px rgba(0, 82, 79, 0.4);
box-shadow: 0px 0px 6rpx 0px #E9DCCC;
}
.dashang_box {

View File

@@ -18,7 +18,11 @@
@click="handleClickGetGoodsList"
:title="goBuyTitle"
:show-icon="true"
v-if="cateList.length > 0 && cateList[currentCateIndex].isBuy == 0"
v-if="
cateList.length > 0 &&
cateList[currentCateIndex].isBuy == 0 &&
vip == '0'
"
>
<template slot="rightSlot" slot-scope="slotProps">
<!-- {{ slotProps.row.bxType }} -->
@@ -37,19 +41,25 @@
<view> </view>
</template>
</u-alert>
<image
<view
v-if="curriculumData.image"
:src="curriculumData.image"
mode="widthFix"
class="headImage"
:style="`height: auto !important;${
cateList.length > 0 && cateList[currentCateIndex].isBuy == 0
cateList.length > 0 &&
cateList[currentCateIndex].isBuy == 0 &&
vip == '0'
? 'padding-top:80rpx'
: ''
}`"
@click="previewImage(curriculumData.image)"
>
</image>
<image
style="width: 100%;"
:src="curriculumData.image"
mode="widthFix"
@click="previewImage(curriculumData.image)"
>
</image>
</view>
<!-- <image
v-if="curriculumData.image"
:src="curriculumData.image"
@@ -70,14 +80,19 @@
>介绍</view
>
<common-rich-detail v-if="curriculumData.content" :detailInfo="{content:curriculumData.content?curriculumData.content:''}" style="padding: 10rpx">
<template #richHeadImg>
<!-- <image :src="curriculumData.imgUrl" mode="widthFix" class="headImage"></image> -->
<common-rich-detail
v-if="curriculumData.content"
:detailInfo="{
content: curriculumData.content ? curriculumData.content : '',
}"
style="padding: 10rpx"
>
<template #richHeadImg>
<!-- <image :src="curriculumData.imgUrl" mode="widthFix" class="headImage"></image> -->
<!-- <image :src="detailInfo.imgUrl" v-if="detailInfo.imgUrl" mode="widthFix" class="headImage"></image> -->
</template>
</common-rich-detail>
<!-- <image :src="detailInfo.imgUrl" v-if="detailInfo.imgUrl" mode="widthFix" class="headImage"></image> -->
</template>
</common-rich-detail>
</view>
<!-- <view class="buy">购买</view> -->
</view>
@@ -101,7 +116,7 @@
type="locked-filled"
color="#b0b0b0"
size="24"
v-if="slotProps.data.isBuy == 0"
v-if="slotProps.data.isBuy == 0 && vip == '0'"
style="display: inline-block; margin-left: 10rpx"
></uni-icons>
</template>
@@ -167,7 +182,7 @@
<text
class="fdButtonBox aui-text-success"
v-if="slotProps.row.isAudition == 1"
v-if="slotProps.row.isAudition == 1 && vip == '0'"
>试听</text
>
@@ -299,10 +314,50 @@
:buyOptions="buyOptions"
:customButtonGroup1="customButtonGroup1"
@selectGoods="handleClickSelectGoods"
@onHandleClickBuy="onHandleClickBuy"
@onHandleClickBuy="
$refs.commonSelectGoods.close();
protocolShow = true;
"
></common-select-goods>
<z-navigation></z-navigation>
<u-popup :show="protocolShow" mode="center" round="6">
<view class="popup_box">
<view class="title">温馨提示</view>
<view class="content">
<view class="center"
>用户您好,本软件对于一个用户名及密码仅允许一部电子设备登陆,多部设备使用同一用户名操作软件的行为属于违规操作,发现违规一次将提出警告,再次违规您的用户名将被封号,无法正常登陆,如因此对您使用带来不便,敬请谅解。<br />
课程购买之后一年内不打开,此一年内不会计算有效学习时间,一年后会自动开始计算有效学习时间。<br />
本课程一经购买,暂不支持退款,敬请谅解。<br />
<view style="color: red; font-weight: bold"> 注: </view>
<view>
1.手机、pad、电脑均为可登陆电子设备均有唯一标识码一个用户名仅允许在一个手机或一个ipad或一个电脑登陆请根据您的使用习惯自行选择。<br />
2.如若申请变更登陆设备请联系客服,<br />
客服电话:13110039505;022-24142321<br />
客服微信号:yilujiankangkefu<br />
3.如因违反上述使用规定...概不退款,本公司保留追究用户相关法律责任的权利。<br />
4.点击“同意”按钮即表示您同意遵守以上条款。
</view>
</view>
<view class="bottom">
<view class="button_box">
<u-button
size="small"
text="不同意"
@click="protocolShow = false"
></u-button>
<u-button
text="同意"
color="#3AB3AE"
size="small"
@click="onHandleClickBuy"
></u-button>
</view>
</view>
</view>
</view>
</u-popup>
</view>
</template>
@@ -320,6 +375,7 @@ export default {
data() {
return {
showGoBuy: true,
protocolShow: false,
options: {},
percentage: 0,
selectGoodsData: {},
@@ -362,6 +418,7 @@ export default {
"margin-left": "30rpx",
},
modalInfo: {},
vip: "0",
show: false,
playData: {},
@@ -424,6 +481,7 @@ export default {
},
onHide() {
this.selectGoodsData = {};
this.protocolShow = false;
this.handleClickClose();
this.$refs.commonSelectGoods.close();
// this.showSearchList = false
@@ -431,6 +489,7 @@ export default {
},
onUnload() {
this.selectGoodsData = {};
this.protocolShow = false;
this.$refs.commonSelectGoods.close();
// this.showSearchList = false
// this.searchList = []
@@ -439,6 +498,8 @@ export default {
...mapState(["userInfo"]),
},
onShow() {
this.protocolShow = false;
this.getUserInfo();
this.getCourseDescriptionData();
// 也可以通过主题形式调用,如:
// this.$refs.uNotify.primary('Primary主题')
@@ -446,6 +507,14 @@ export default {
// this.$refs.uNotify.close()
},
methods: {
getUserInfo() {
this.$http.post("common/user/getUserInfo").then((res) => {
console.log("res at line 505:", res);
if (res.result.vip) {
this.vip = res.result.vip;
}
});
},
close() {
this.show = false;
},
@@ -629,7 +698,8 @@ export default {
if (
this.cateList[this.currentCateIndex].isBuy == 1 ||
v.isAudition == 1
v.isAudition == 1 ||
this.vip != "0"
) {
uni.navigateTo({
// url: '../bookShop/commodityDetail?id=' + item.id
@@ -702,17 +772,17 @@ export default {
// }
// })
// },
// 获取用户详情
getUserInfo() {
// 用户详情
if (this.userInfo.id != undefined) {
this.$http.post("book/user/info/" + this.userInfo.id).then((res) => {
this.userMes = res.user;
this.getCateList();
console.log(this.userMes, "呼呼");
});
}
},
// // 获取用户详情
// getUserInfo() {
// // 用户详情
// if (this.userInfo.id != undefined) {
// this.$http.post("book/user/info/" + this.userInfo.id).then((res) => {
// this.userMes = res.user;
// this.getCateList();
// console.log(this.userMes, "呼呼");
// });
// }
// },
async handleselectCate(item, index) {
console.log("item at line 662:", item);
@@ -840,7 +910,7 @@ export default {
</script>
<style lang="scss" scoped>
@import '@/style/mixin.scss';
@import "@/style/mixin.scss";
.u-grid-list {
// height: 40rpx;
}
@@ -1029,7 +1099,6 @@ export default {
}
.commonDetailPage {
// background-color: #d8f8e4 !important;
}
.curriulum_box {
@@ -1068,7 +1137,7 @@ export default {
.small_class_teaching_box {
width: 100%;
margin-top: 20rpx;
background: #edfcf7;
background: #b7e0e2;
.small_class_teaching_top {
padding: 20rpx 20rpx 0 10rpx;
@@ -1079,7 +1148,7 @@ export default {
// background: #EDFCF7;
color: #8f8e8e;
// box-shadow: 0px 0px 6rpx 0px rgba(0, 82, 79, 0.4);
// box-shadow: 0px 0px 6rpx 0px #E9DCCC;
.icon1 {
width: 50rpx;
height: 50rpx;
@@ -1117,7 +1186,7 @@ export default {
background: #cef8ea;
text-align: center;
border-radius: 10rpx;
box-shadow: 0px 0px 6rpx 0px rgba(0, 82, 79, 0.4);
box-shadow: 0px 0px 6rpx 0px #e9dccc;
}
}
@@ -1268,4 +1337,62 @@ export default {
border-radius: 10rpx;
}
}
.popup_box {
padding-bottom: 20rpx;
width: 85vw;
overflow: hidden;
position: relative;
height: auto;
.title {
font-family: PangMenZhengDaoBiaoTiTiMianFeiBan;
font-weight: normal;
font-size: 46rpx;
color: $themeColor;
background-color: #f5f5f5;
// line-height: 46rpx;
padding: 20rpx;
// border-leradius: 6px;
border-top-left-radius: 6px;
border-top-right-radius: 6px;
}
.content {
font-size: 26rpx;
letter-spacing: 0.15rpx;
padding: 20rpx;
color: #3f3f3f;
.top {
margin: 30rpx 0;
}
.center {
line-height: 40rpx;
// padding:0 10rpx;
}
.bottom {
width: 100%;
margin-top: 60rpx;
font-size: 24rpx;
line-height: 26rpx;
color: #b0b0b0;
}
}
.button_box {
display: flex;
align-items: center;
justify-content: space-between;
margin-top: 20rpx;
.u-button {
margin-left: 40rpx;
}
.u-button:nth-child(1) {
margin-left: 0;
}
}
}
</style>

View File

@@ -10,7 +10,7 @@
@backClick="backClick"
:backState="3000"
></z-nav-bar>
<view class="contentBox commonPageContentBox">
<!-- <scroll-view class="scroll-view_H statusList" scroll-x="true" scroll-left="0"> -->
<!-- <view class="statusList flexbox" >
@@ -43,14 +43,10 @@
<view class="cate_item_border">
<image
:src="
cateIconList.find((e) => v.sociology.title == e.title)
.imgUrl
cateIconList.find((e) => v.sociology.id == e.id).icon
"
mode="aspectFill"
:style="
cateIconList.find((e) => v.sociology.title == e.title)
.style
"
style="width: 59rpx; height: 59rpx"
></image>
</view>
<view class="cate_item_name">{{ v.sociology.title }}</view>
@@ -140,36 +136,6 @@
</u-collapse-item>
</u-collapse>
</view>
<view :class="`dataList priceDetail`">
<!-- <image src="@/static/image/headImg/top.png" mode="aspectFit" class="headImage"></image> -->
<template>
<!-- <courseDescription :dataList="dataList" @hancleClick="goCourseDescription" label="title">
<template slot="leftSlot" slot-scope="slotProps">
<text v-html="slotProps.row.bxType"></text>
</template>
</courseDescription> -->
</template>
<!-- <template v-if="currentStatusIndex == 2 && curTwoCateIndex == 2">
<u-grid :col="3">
<u-grid-item class="scroll-view-item " v-for="(item, index) in dataList" :key="item.id"
@click="previewImage(item.url)" style="align-items: flex-start;">
<img :src="item.url" alt="" class="wmzhimg" mode="aspectFit">
</u-grid-item>
</u-grid>
</template> -->
</view>
</view>
<u-modal
@@ -331,7 +297,12 @@ export default {
{
title: "未开始",
type: 2,
oid: "8a9fb99809e4428888aad6b56a3096a6",
},
// {
// title: "未开始",
// type: 2,
// },
// {
// title: "其他",
@@ -356,6 +327,7 @@ export default {
scrollViewHeight: 0,
urlList: {
list: "sociology/course/getMyCourse",
getCateList: "sociology/home/getSociologyLabels", //消息
},
options: {},
};
@@ -367,6 +339,9 @@ export default {
// this.getUserInfo()
// this.getCateList()
},
async onShow() {
await this.getCateList();
},
onHide() {
// this.showSearchList = false
// this.searchList = []
@@ -375,6 +350,28 @@ export default {
...mapState(["userInfo"]),
},
methods: {
async getCateList() {
var that = this;
this.$http
.request({
url: this.urlList.getCateList,
method: "POST",
data: {
id: 0,
},
header: {
//默认 无 说明:请求头
"Content-Type": "application/json",
},
})
.then(async (res) => {
console.log(res, "7777777777777777777");
if (res.code == 0) {
that.cateIconList = res.labels ? res.labels : [];
}
});
},
hancleModalConfirm() {
var data = {
values: {
@@ -509,7 +506,7 @@ export default {
if (this.userInfo.id != undefined) {
this.$http.post("book/user/info/" + this.userInfo.id).then((res) => {
this.userMes = res.user;
this.getCateList();
// this.getCateList();
console.log(this.userMes, "呼呼");
});
}
@@ -728,34 +725,6 @@ export default {
// console.log(e)
// })
// },
getCateList(id) {
id ? "" : (id = 0);
this.twoCateList = [];
this.curTwoCateIndex = 0;
// 0为获取顶级分类其他为搜索下级分类目前的逻辑顶级是写死的所以可能只会涉及到搜索第二级
// $http.request({
// url: "book/prescript/prescriptCategoryList",
// method: "POST", // POST、GET、PUT、DELETE具体说明查看官方文档
// data: {
// loadAnimate: 'none', // 请求加载动画
// 'categoryId': id
// },
// header: { //默认 无 说明:请求头
// 'Content-Type': 'application/json'
// },
// }).then(res => {
// console.log(res, '脉穴分类获取成功')
// if (res.code == 0 && res.list.length > 0) {
// this.statusList = res.list
this.getTowCateList(this.statusList[0].type);
// } else {
// this.statusList = []
// }
// }).catch(e => {
// this.statusList = []
// console.log(e)
// })
},
// 放大图片
previewImage(url) {
@@ -861,7 +830,8 @@ export default {
};
</script>
<style lang="scss" scoped>@import '@/style/mixin.scss';
<style lang="scss" scoped>
@import "@/style/mixin.scss";
.u-grid-list {
// height: 40rpx;
}
@@ -1092,7 +1062,7 @@ export default {
box-sizing: border-box;
.cate_item_box {
width: 200rpx;
width: 400rpx;
height: 100%;
display: flex;
align-items: center;