|
|
@@ -46,11 +46,12 @@
|
|
|
<u-col span="10">
|
|
|
<view class="video_t1">{{ detail.courseName }}</view>
|
|
|
</u-col>
|
|
|
- <u-col span="2" v-if="false">
|
|
|
- <view class="video_t1_t" @click="openJY">
|
|
|
- <image src="/static/icon/jy_icon.png" style="width: 40rpx;height: 40rpx;"></image>
|
|
|
- 讲义
|
|
|
- </view>
|
|
|
+ <u-col span="2" >
|
|
|
+ <div class="notice_wrap" v-if="noticeShow">
|
|
|
+ <view class="video_t1_t" @click="studyNotice">
|
|
|
+ 学员须知
|
|
|
+ </view>
|
|
|
+ </div>
|
|
|
</u-col>
|
|
|
</u-row>
|
|
|
</view>
|
|
|
@@ -102,7 +103,7 @@
|
|
|
<!--笔记 -->
|
|
|
<view v-show="current == 2">
|
|
|
<view v-if="noteList.length == 0" style="text-align: center;">暂无笔记</view>
|
|
|
- <view class="inputBottom">
|
|
|
+ <view class="inputBottom" v-if="!(isPlayRebuild > 0)">
|
|
|
<view style="width: 10%;"><image src="/static/icon/note3.png" style="width: 39rpx;height: 39rpx;margin:0 29rpx;"></image></view>
|
|
|
<view style="width: 73%;height: 100%;padding: 10rpx 0;">
|
|
|
<u-input class="input" height="60" fixed="true" placeholder="您可以在这里输入笔记内容" type="input" :custom-style="inputStyle" v-model="noteValue" />
|
|
|
@@ -215,6 +216,17 @@
|
|
|
</view>
|
|
|
|
|
|
</u-mask>
|
|
|
+
|
|
|
+ <u-popup v-model="noticeShow" class="notice_modal" mode="center" border-radius="14" width="500rpx" height="600rpx">
|
|
|
+ <div class="content">
|
|
|
+
|
|
|
+ <scroll-view scroll-y="true" style="height: 100%;">
|
|
|
+ <text>
|
|
|
+ {{goodsData.buyNote}}</text>
|
|
|
+ </scroll-view>
|
|
|
+ </div>
|
|
|
+
|
|
|
+ </u-popup>
|
|
|
</view>
|
|
|
|
|
|
</template>
|
|
|
@@ -234,6 +246,7 @@ export default {
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
+ noticeShow:false,
|
|
|
navShow:true,
|
|
|
enableAutoRotation:true,
|
|
|
seekTime:'',
|
|
|
@@ -308,8 +321,10 @@ export default {
|
|
|
photoHistoryList:[], //已拍照历史的下标点
|
|
|
sectionItem:null,
|
|
|
businessData:{},
|
|
|
+ showNotes:true,
|
|
|
menuIndex:[],
|
|
|
uploadLock:false, //上传图片
|
|
|
+ isPlayRebuild:false, //是否正在播放重修视频
|
|
|
isRebuild:false, //视频是否从重修目录点击
|
|
|
};
|
|
|
},
|
|
|
@@ -463,6 +478,7 @@ export default {
|
|
|
if (this.timer) {
|
|
|
clearInterval(this.timer);
|
|
|
}
|
|
|
+ websocket.sendMsg('delAction')
|
|
|
},
|
|
|
mounted() {
|
|
|
uni.$on('changeSection', oldSectionId => {
|
|
|
@@ -481,6 +497,7 @@ export default {
|
|
|
});
|
|
|
uni.$on('getSection', item => {
|
|
|
//清除直播
|
|
|
+ this.isPlayRebuild = item.rebuild
|
|
|
this.photoConfig = false
|
|
|
this.photoIndex = 0
|
|
|
this.sectionItem = item;
|
|
|
@@ -980,8 +997,8 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
- openJY(){
|
|
|
- this.$u.toast('此功能正在开发中');
|
|
|
+ studyNotice(){
|
|
|
+ this.noticeShow = true;
|
|
|
},
|
|
|
//播放笔记视频
|
|
|
async playNoteVideo(item) {
|
|
|
@@ -1603,6 +1620,7 @@ export default {
|
|
|
}
|
|
|
self.reMenuList = res.data.rows;
|
|
|
if(self.reMenuList.length>0){
|
|
|
+ this.showNotes = false;
|
|
|
self.list = [
|
|
|
|
|
|
{
|
|
|
@@ -2271,14 +2289,23 @@ page {
|
|
|
text-overflow: ellipsis;
|
|
|
white-space: nowrap;
|
|
|
}
|
|
|
-.video_t1_t {
|
|
|
+
|
|
|
+.notice_wrap {
|
|
|
+ height:80rpx;
|
|
|
display: flex;
|
|
|
- flex-direction: column;
|
|
|
- height: 80rpx;
|
|
|
- color: #333333;
|
|
|
- text-align: center;
|
|
|
align-items: center;
|
|
|
- border-left: solid 1px #d6d6db;
|
|
|
+ justify-content: flex-end;
|
|
|
+
|
|
|
+ .video_t1_t {
|
|
|
+ width:100%;
|
|
|
+ height:40rpx;
|
|
|
+ line-height: 40rpx;
|
|
|
+ text-align: center;
|
|
|
+ background:rgba(245,154,35,1);
|
|
|
+ color:#333;
|
|
|
+ border-radius:10rpx;
|
|
|
+ font-size: 24rpx;
|
|
|
+ }
|
|
|
}
|
|
|
.video_play {
|
|
|
position: absolute;
|
|
|
@@ -2338,4 +2365,12 @@ page {
|
|
|
.rotoct {
|
|
|
transform: rotate(90deg);
|
|
|
}
|
|
|
+
|
|
|
+.notice_modal {
|
|
|
+ .content {
|
|
|
+ width:100%;
|
|
|
+ height:100%;
|
|
|
+ padding:20rpx;
|
|
|
+ }
|
|
|
+}
|
|
|
</style>
|
chenxiong