合并master后
This commit is contained in:
@@ -167,11 +167,11 @@
|
||||
<text class="hidden1">{{ item.title }}</text>
|
||||
<!-- {{item.isAudition}}-{{librayList[curIndex].isBuy}}-{{userMsg.vip}} -->
|
||||
<uni-tag
|
||||
v-if="item.isAudition == 1 && librayList[curIndex].isBuy == 0 && userMsg.vip == 0"
|
||||
v-if="item.isAudition == 1 && librayList[curIndex].isBuy == 0 && (userMsg.vip != 1 && userMsg.vip != 2)"
|
||||
style="margin-left: 10rpx" :inverted="true" text="试听" size="mini"
|
||||
type="success" />
|
||||
<template
|
||||
v-if="librayList[curIndex] && librayList[curIndex].isBuy == 1 || userMsg.vip != 0">
|
||||
v-if="librayList[curIndex] && librayList[curIndex].isBuy == 1 || (userMsg.vip == 1 || userMsg.vip == 2)">
|
||||
<uni-tag v-if="item.isLearned == 0" style="margin-left: 10rpx;"
|
||||
:inverted="true" text="未学" size="mini" type="primary" />
|
||||
<uni-tag v-if="item.isLearned == 1" style="margin-left: 10rpx;"
|
||||
@@ -192,13 +192,16 @@
|
||||
<view v-else>暂无章节内容</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class=" completionBg">
|
||||
<uni-section class="mb-10" style="padding: 0 20rpx" title="学习进度" type="line"
|
||||
v-if="librayList.length > 0 && librayList[curIndex].completion > 0">
|
||||
<view class=" completionBg" style="padding: 0 20rpx;">
|
||||
<view class="" style="margin: 16rpx;">
|
||||
<text style="font-size: 28rpx; color:#666">学习进度</text>
|
||||
</view>
|
||||
<!-- <uni-section class="mb-10" style="padding: 0 20rpx" title="" type="line"
|
||||
v-if="librayList.length > 0 && librayList[curIndex].completion > 0"> -->
|
||||
<view class="progress-box">
|
||||
<progress :percent="librayList[curIndex].completion" show-info stroke-width="3" />
|
||||
</view>
|
||||
</uni-section>
|
||||
<!-- </uni-section> -->
|
||||
</view>
|
||||
<view class="linkPro" v-if="tjProList.length > 0">
|
||||
<uni-section style="padding: 0 20rpx" class="mb-10 graybg" title="相关书籍" type="line">
|
||||
@@ -225,14 +228,22 @@
|
||||
</view>
|
||||
</view>
|
||||
<view style="background: rgba(255, 255, 255, 0.85) !important">
|
||||
<uni-section style="padding: 0 20rpx" class="mb-10 graybg" title="留言板" type="line">
|
||||
<!-- <uni-section style="padding: 0 20rpx" class="mb-10 graybg" title="留言板" type="line">
|
||||
<template v-slot:right>
|
||||
<view class="flexbox" style="align-items: center" @click="addSay()">
|
||||
<u-icon name="edit-pen" color="#2979ff" size="28"></u-icon>
|
||||
<text>发布留言</text>
|
||||
</view>
|
||||
</template>
|
||||
</uni-section>
|
||||
</uni-section> -->
|
||||
<view class="flex_box flex_between" style="margin: 16rpx; padding: 40rpx 0;">
|
||||
<text style="font-size: 28rpx; color:#666">留言板</text>
|
||||
<view class="flexbox" style="align-items: center" @click="addSay()">
|
||||
<!-- <u-icon name="edit-pen" color="#2979ff" size="28"></u-icon> -->
|
||||
<!-- <uni-icons type="chatboxes" color="#2979ff" size="28"></uni-icons> -->
|
||||
<text style="color:#2979ff; font-size: 30rpx; font-weight: bold;" >发布留言</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="liuyanBox">
|
||||
<view class="" v-if="sayList.length > 0">
|
||||
<commentsList :sayList="sayList" @support="support" @showSayModule="showSayModule">
|
||||
@@ -271,8 +282,8 @@
|
||||
</view>
|
||||
<!-- </view> -->
|
||||
<!-- 评论弹出 -->
|
||||
<u-popup key="2" :show="sayVisible" :round="10" @close="sayclose">
|
||||
<view class="contentBox" style="padding: 20rpx">
|
||||
<u-popup key="2" v-if="sayVisible" :show="sayVisible" :round="10" @close="sayclose">
|
||||
<view class="contentBox" style="padding: 20rpx; background-color: #fff; border-top: 1px solid #999;">
|
||||
<view class="" v-if="fatherSay.id != undefined">
|
||||
<view class="" style="font-size: 26rpx; margin-bottom: 20rpx">
|
||||
<text>回复@:{{ fatherSay.user.name }} 的留言</text>
|
||||
@@ -342,7 +353,8 @@
|
||||
</emotion>
|
||||
</view>
|
||||
<view class="sbmitBox">
|
||||
<button @click="submitSay" type="default">发 布</button>
|
||||
<button class="submit" @click="submitSay" type="default">发 布</button>
|
||||
<button style="background-color: #fff !important; color: ; " @click="sayclose" type="default">取 消</button>
|
||||
</view>
|
||||
</view>
|
||||
</u-popup>
|
||||
@@ -1612,7 +1624,7 @@
|
||||
}
|
||||
|
||||
.sbmitBox {
|
||||
button {
|
||||
button.submit {
|
||||
margin-top: 20rpx;
|
||||
margin-bottom: 20rpx;
|
||||
@include theme("btn_bg");
|
||||
|
||||
Reference in New Issue
Block a user