Merge branch 'master' into stage-4

# Conflicts:
#	pages2/wd/class.vue

pages2/class/detail.vue

@@ -906,6 +906,7 @@ export default {
 			let self = this;
 			this.$api.reMenuList({ courseId: this.courseId, rebuild: 1, gradeId: this.gradeId }).then(res => {
 				if (res.data.code == 200) {
+					console.log(9999)
 					for (let i = 0; i < res.data.rows.length; i++) {
 						let item = res.data.rows[i];
 						item.down = true;

pages2/wd/class.vue

@@ -2,8 +2,8 @@
 	<view style="padding: 30rpx;">
 		<view class="class" v-for="(item, index) in goodsList" :key="index">
 			
-				<view class="class_item">
-					<navigator  hover-class="none" :url="`/pages2/wd/course?id=${item.goodsId}&gid=${item.gradeId}`">
+				<view class="class_item" @click.stop="studyIn(item.goodsId,item.gradeId,item)">
+					<!-- <navigator  hover-class="none" :url="`/pages2/wd/course?id=${item.goodsId}&gid=${item.gradeId}`"> -->
 						<image :src="$method.splitImgHost(item.coverUrl, true)" class="class_img"></image>
 						<view class="class_text">
 							<view class="class_title">{{ item.goodsName }}</view>
@@ -23,7 +23,7 @@
 								<text class="content">{{ $method.timestampToTime(item.validityStartTime) }} - {{ $method.timestampToTime(item.validityEndTime) }}</text>
 							</view>
 						</view>
-					</navigator>
+					<!-- </navigator> -->
 					<view class="class-warm">
 						<u-icon class="class-warm__icon" size="30" color="#FF3B30" name="error-circle-fill"></u-icon>
 						<view class="class-warm__text">

pages3/polyv/detail.vue

@@ -62,8 +62,31 @@
 					<view v-if="item.type == 3"><courseSection :courseId="courseId" :goodsId="goodsId" :gradeId="gradeId" :isBuy="true" :menuItem="item" :levelId="'0-0-' + item.menuId"></courseSection></view>
 				</view>
 			</view>
-			<!--笔记 -->
+			<!--讲义 -->
 			<view v-show="current == 1">
+				<view class="lecture-box">
+					<view class="title">
+						这是后台配置的讲义标题过长省略这是后台配置的讲义标题过长省略
+					</view>
+					<view class="btn" @click="openDocument">
+						<u-icon name="download" color="#007AFF" size="40"></u-icon>
+					</view>
+				</view>
+				<view class="lecture-content">
+					<rich-text :nodes="'讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容讲义内容'"></rich-text>
+				</view>
+				
+				<view class="inputBottom">
+					<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="textarea" :custom-style="inputStyle" v-model="noteValue" />
+					</view>
+					<view style="color: #007AFF;font-size: 30rpx;font-weight: bold;width: 15%;text-align: center;" @click="postNote">提交</view>
+				</view>
+				
+			</view>
+			<!--笔记 -->
+			<view v-show="current == 2">
 				<view v-if="noteList.length == 0" style="text-align: center;">暂无笔记</view>
 				<view class="inputBottom">
 					<view style="width: 10%;"><image src="/static/icon/note3.png" style="width: 39rpx;height: 39rpx;margin:0 29rpx;"></image></view>
@@ -94,7 +117,7 @@
 				</view>
 			</view>
 			<!--答疑 -->
-			<view v-show="current == 2">
+			<view v-show="current == 3">
 				<view class="inputBottom">
 					<view class="flex_auto">
 						<u-input height="60" fixed="true" :placeholder="placeholder" type="textarea" :custom-style="inputStyle" v-model="ctxValue" />
@@ -123,7 +146,7 @@
 				<view v-if="answerList.length == 0" style="text-align: center;">暂无记录</view>
 			</view>
 			<!--目录 -->
-			<view v-show="current == 3" >
+			<view v-show="current == 4" >
 				<view class="menuBox" v-for="(item, index) in reMenuList" :key="index">
 					<!--模块 -->
 					<view v-if="item.type == 1"><courseModule :courseId="courseId" :goodsId="goodsId" :gradeId="gradeId" :isRebuild="true" :isBuy="true" :menuItem="item" :levelId="item.menuId"></courseModule></view>
@@ -1143,12 +1166,16 @@ export default {
 							{
 								name: '目录'
 							},
+							{
+								name: '讲义'
+							},
 							{
 								name: '笔记'
 							},
 							{
 								name: '答疑'
-							},{name:'重修目录'}
+							},
+							{name:'重修目录'}
 						];
 						this.current = 0;
 					} else {
@@ -1157,6 +1184,9 @@ export default {
 							{
 								name: '目录'
 							},
+							{
+								name: '讲义'
+							},
 							{
 								name: '笔记'
 							},
@@ -1234,6 +1264,42 @@ export default {
 	border-radius: 16rpx;
 	font-size: 24rpx;
 }
+.lecture-box {
+	display: flex;
+	align-items: center;
+	height: 80rpx;
+	background: #FFFFFF;
+	border-radius: 16rpx 16rpx 16rpx 16rpx;
+	
+	.title {
+		padding:10rpx;
+		flex:1;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+		color:#333;
+		font-weight: bold;
+		font-size: 32rpx;
+	}
+	
+	.btn {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width:80rpx;
+		height:80rpx;
+		background: #FFFFFF;
+		box-shadow: -4rpx 0rpx 4rpx 0rpx rgba(0,0,0,0.1);
+		border-radius: 16rpx 16rpx 16rpx 16rpx;
+	}
+}
+
+.lecture-content {
+	background:#fff;
+	margin-top:10rpx;
+	padding:10rpx;
+	border-radius:16rpx;
+}
 .photoBox {
 	background-color: #FFFFFF;
 	border-radius: 32px 32px 0px 0px;