合并master后

This commit is contained in:
@fawn-nine
2024-09-09 17:08:56 +08:00
parent 5232171255
commit 13c656d9b5
8 changed files with 38 additions and 27 deletions

View File

@@ -101,7 +101,7 @@
</view>
<view class="containerBg2">
<!-- 目录 -->
<view :class="['coursePart','flexbox', userMsg.vip != 0 ? 'vipBgColor':'']"
<view :class="['coursePart','flexbox', (userMsg.vip == 1 || userMsg.vip == 2) ? 'vipBgColor':'']"
v-if="librayList.length > 1">
<view :class="['item','flexbox',curId == item.id? 'active': '' ]"
v-for="(item, index) in librayList" :key="index" @click="clicklib(item,index)">
@@ -111,11 +111,11 @@
</view>
<!-- end -->
<template v-if="librayList[curIndex]">
<view :class="['endBox',userMsg.vip != 0 ? 'vipBgColor':'']"
<view :class="['endBox',(userMsg.vip == 1 || userMsg.vip == 2) ? 'vipBgColor':'']"
v-if="librayList[curIndex].isBuy == 1 || userMsg.vip != 0">
<!-- 已经可以观看的情况 -->
<view class="box">
<view class="flexbox" v-if="userMsg.vip != 0">
<view class="flexbox" v-if="userMsg.vip == 1 || userMsg.vip == 2">
<!-- vip到期时间 -->
<text>VIP畅学权益有效期截止到{{userMsg.userVip.endTime}} </text>
<!-- <uni-tag type="warning" text="去学习"></uni-tag> -->
@@ -152,9 +152,9 @@
</template>
<view class="shiting_content">
<view :class="['chapter_content',userMsg.vip != 0 ? 'vipchapter_content' : '']"
<view :class="['chapter_content', (userMsg.vip == 1 || userMsg.vip == 2) ? 'vipchapter_content' : '']"
v-if="chapterList.length > 0">
<view class="vipSee" v-if="userMsg && userMsg.vip != 0">
<view class="vipSee" v-if="userMsg && (userMsg.vip == 1 || userMsg.vip == 2)">
<text>VIP畅学权益生效中</text>
</view>
<view @click="gotoDetail(item, index)" class="item" v-for="(item, index) in chapterList"
@@ -733,7 +733,7 @@
_myurl = '/pages/course/chapterDetailAndorid'
// }
if (this.librayList[this.curIndex].isBuy == 1 || v.isAudition == 1 ||
this.vip.type != "0") {
this.vip.type != "1" || this.vip.type != "2") {
let noRecored = false
v.isAudition == 1 && this.userMsg.vip == 0 && this.librayList[this.curIndex].isBuy == 0 ?
noRecored = true : ''