Commit 15e55906 authored by 张伯涛's avatar 张伯涛

bug修改

parent 9ebf7f7e
......@@ -2,7 +2,7 @@
<div class="classes-box">
<img v-if="item.isExpired == 1" class="guoqiPathClass" :src="guoqiPath" alt="">
<!-- 当前课程是必修&&从免费课变成了收费课 || 会员到期(expireTime单位使用开课结束时间,endTrialTime个人开课结束时间)-->
<img v-if="(item.isObligatory === '0' && item.priceTrend == 1) ||( (item.expireTime === null && item.endTrialTime === null) && item.isExpired !== '1')" class="guoqiPathClass" :src="paidPath" alt="">
<img v-if="(item.isObligatory === '0' && item.priceTrend == 1) ||( (item.expireTime === null && item.endTrialTime === null) && item.isExpired === '1')" class="guoqiPathClass" :src="paidPath" alt="">
<template v-if="type == 1">
<div class="left-image img-out">
<!-- 过期-->
......
......@@ -27,12 +27,12 @@
<div v-if="token">
<!-- 不是免费课并且没有买 tryout === '1' 试用-->
<div v-if="courseDetails.lessonIsPay === 0 && courseDetails.lessonPrice > 0 && courseDetails.tryout !== '1'">
<el-button
class="studyBtn"
round
@click="handleToTrialListening"
>试听
</el-button>
<!-- <el-button-->
<!-- class="studyBtn"-->
<!-- round-->
<!-- @click="handleToTrialListening"-->
<!-- >试听-->
<!-- </el-button>-->
</div>
<div v-else>
<!-- isPay === '0'免费课,lessonIsPay === '1'&& isPay === '1' 付费课&&已付费 并且sStudy === 0 || isStudy === null 没有学习过-->
......@@ -1334,7 +1334,7 @@ export default {
.card-top {
display: flex;
padding: 0 25px;
//padding: 0 25px;
.avatar {
.img {
......@@ -1364,7 +1364,7 @@ export default {
}
.position {
width: 195px;
width: 260px;
height: 21px;
line-height: 21px;
font-size: 14px;
......
......@@ -893,7 +893,7 @@ export default {
.course-card {
cursor: pointer;
height: 256px;
height: 317px;
background: #ffffff;
border-radius: 6px;
box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.15);
......@@ -947,19 +947,19 @@ export default {
padding: 24px 20px 16px;
.title {
height: 23px;
height: 89px;
font-size: 20px;
font-family: Source Han Sans CN, Source Han Sans CN-700;
font-weight: 700;
color: #000000;
line-height: 23px;
margin-bottom: 16px;
text-overflow: ellipsis;
display: -webkit-box; /* 适用于 WebKit 浏览器,如 Chrome 和 Safari */
-webkit-line-clamp: 1; /* 限制显示的行数,此处设置为 1 行 */
-webkit-box-orient: vertical; /* 使内容按垂直方向排列 */
overflow: hidden; /* 隐藏超出部分 */
word-break: break-all; /* 强制在任意字符处换行 */
//text-overflow: ellipsis;
//display: -webkit-box; /* 适用于 WebKit 浏览器,如 Chrome 和 Safari */
//-webkit-line-clamp: 1; /* 限制显示的行数,此处设置为 1 行 */
//-webkit-box-orient: vertical; /* 使内容按垂直方向排列 */
//overflow: hidden; /* 隐藏超出部分 */
//word-break: break-all; /* 强制在任意字符处换行 */
}
.title:hover,
......
......@@ -38,7 +38,7 @@
placeholder="请输入课程关键词"
@keyup.native.enter="handleQuery"
>
<i slot="suffix" class="el-icon-search el-input__icon" /></el-input>
<i slot="suffix" style="cursor: pointer" class="el-icon-search el-input__icon" @click="handleQuery" /></el-input>
</div>
</div>
......@@ -53,7 +53,7 @@
/>
<div v-if="unPublishTableData.length > 0">
<!-- 分隔线 -->
<div class="purchasedSeparation"></div>
<div class="purchasedSeparation" />
<!-- 未发布标题 -->
<div class="purchaseContainer">
<spam class="purchaseTitle">未发布课程</spam>
......
......@@ -93,12 +93,11 @@
<div v-if="classDataList.length>0">
<classesItem
v-for="(i, key) in classDataList"
:item="i"
:key="key"
:item="i"
type="2"
refresh="getList()"
>
</classesItem>
/>
</div>
<div v-else class="containerNo">
<el-image :src="require('@/assets/image/zanwushujuP.png')" />
......@@ -255,6 +254,11 @@ export default {
},
handleChange() {
this.queryParams.lessonIsPay = this.selectedValues.join(',')
if (this.selectedValues.includes('1')) {
this.queryParams.isPay = '0'
} else {
this.queryParams.isPay = ''
}
this.getList()
},
getPersonalStatistics() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment