修改

pages/Orderlearning/Orderlearning.vue

@@ -1,11 +1,11 @@
 <template>
 	<view class="app">
 		<view class="" style="background-color: #F4F5F7;height: 17rpx;width:100%"></view>
-<!-- 		<u-tabs :list="tablist" :is-scroll="false" :current="tabcurrent" @change="tabchange" font-size='34'
+		<!-- 		<u-tabs :list="tablist" :is-scroll="false" :current="tabcurrent" @change="tabchange" font-size='34'
 			bar-height='7' bar-width='43' inactive-color='#A09F9F' active-color='#4271B9'>
 		</u-tabs> -->
 		<view class="content" v-if="tabcurrent==0">
-		</view>	
+		</view>
 		<view class="directory" v-if="tabcurrent==1">
 			<view class="imagetext" v-if="imgtextlist.length>0">
 				<view class="topheader">

pages/Videolearning/Videolearning.vue

@@ -19,21 +19,21 @@
 				<view class="Introduce">
 					{{item.itemDirectoryIntroduce}}
 				</view>
-				<view class="play" v-if="!list.trainingOrderNo" @tap='videoplay(item)'>
+				<view class="play" v-if="!item.trainingOrderStatus" @tap='videoplay(item)'>
 					开始播放
 				</view>
-				<view class="" v-else>
+				<view class="" v-if="item.trainingOrderStatus=='PAY'">
 					<view class="play" @tap='videoplay(item)'
 						:style="item.itemDirectoryWatchStatus=='NOT_WATCHED'?'background-color: #3D7DCA;color:#fff':''"
 						v-if="item.itemDirectoryWatchStatus=='NOT_WATCHED'">
 						开始播放
 					</view>
-					<view class="play"
+					<view class="play" @tap='videoplay(item)'
 						:style="item.itemDirectoryWatchStatus=='WATCHED'?'background-color: #4271B9;color:#3D7DCA':''"
 						v-if="item.itemDirectoryWatchStatus=='WATCHED'">
 						继续播放
 					</view>
-					<view class="play"
+					<view class="play" @tap='videoplay(item)'
 						:style="item.itemDirectoryWatchStatus=='FINISHED_READING'?'background-color: #E6E6E6;color:#76777B':''"
 						v-if="item.itemDirectoryWatchStatus=='FINISHED_READING'">
 						已看完
@@ -96,9 +96,6 @@
 					this.videoitem.watchTime = 0
 				}
 				this.videoitem = item
-				this.videoitem.trainingOrderId = this.list.trainingOrderId
-				this.videoitem.trainingItemId = this.list.trainingItemId
-				this.videoitem.nurseStationPersonId = this.nurseStationPersonId
 				if (item.itemDirectoryWatchStatus == 'WATCHED') {
 					getTrainingItemWatchRecord(this.videoitem.trainingOrderId, this.videoitem.trainingItemId, this
 						.videoitem