修改

pages/Orderlearning/Orderlearning.vue

@@ -45,6 +45,7 @@
 				<u-empty text="暂无目录" mode="list" icon-size='240' font-size='32'></u-empty>
 			</view>
 		</view>
+		<u-toast ref="uToast" />
 	</view>
 </template>
 <script>
@@ -66,11 +67,13 @@
 				}],
 				trainingParentId: undefined,
 				nurseStationPersonId: undefined,
+				trainingOrderStatus: undefined,
 			};
 		},
 		onLoad(options) {
 			const that = this
 			this.baseurl = baseurl
+			this.trainingOrderStatus = options.trainingOrderStatus
 			this.trainingParentId = options.trainingParentId
 			this.trainingOrderNo = options.trainingOrderNo
 			const value = uni.getStorageSync('nursePersonId');
@@ -82,14 +85,22 @@
 		methods: {
 			//跳转图文学习
 			goImglearning(item) {
+				if (this.trainingOrderStatus == 'PAY') {
 					uni.navigateTo({
 						url: `/pages/Imglearning/Imglearning?trainingItemId=${item.trainingItemId}`
 					})
+				} else {
+					this.$refs.uToast.show({
+						title: '您未购买',
+						type: 'error',
+						duration: '1000'
+					})
+				}
 			},
 			//跳转视频学习详情
 			goVideolearningdetails(item) {
 				uni.navigateTo({
-					url: `/pages/Ordervideolearning/Ordervideolearning?trainingItemId=${item.trainingItemId}&trainingOrderNo=${item.trainingOrderNo}`
+					url: `/pages/Ordervideolearning/Ordervideolearning?trainingOrderStatus=${this.trainingOrderStatus}&trainingItemId=${item.trainingItemId}&trainingOrderNo=${item.trainingOrderNo}`
 				})
 			},
 			info() {

pages/Orderlist/Orderlist.vue

@@ -66,15 +66,15 @@
 			//我的学习
 			goOrderlearning(item) {
 				item.trainingItemContent = undefined
-				if (item.trainingOrderStatus == 'WAIT_PAY') {
+				// if (item.trainingOrderStatus == 'WAIT_PAY') {
+				// uni.navigateTo({
+				// url: `/pages/Orderdetails/Orderdetails?list=${JSON.stringify(item)}`
+				// })
+				// } else{
 				uni.navigateTo({
-						url: `/pages/Orderdetails/Orderdetails?list=${JSON.stringify(item)}`
+					url: `/pages/Orderlearning/Orderlearning?trainingOrderStatus=${item.trainingOrderStatus}&trainingParentId=${item.trainingItemId}&trainingOrderNo=${item.trainingOrderNo}`
 				})
-				} else if (item.trainingOrderStatus == 'PAY') {
+				// }
-					uni.navigateTo({
-						url: `/pages/Orderlearning/Orderlearning?trainingParentId=${item.trainingItemId}&trainingOrderNo=${item.trainingOrderNo}`
-					})
-				}
 			},
 			//列表信息
 			info() {

pages/Ordervideolearning/Ordervideolearning.vue

@@ -19,6 +19,7 @@
 				<view class="Introduce">
 					{{item.itemDirectoryIntroduce}}
 				</view>
+				<view class="" v-if="trainingOrderStatus=='PAY'">
 					<view class="play" @tap='videoplay(item)'
 						:style="item.itemDirectoryWatchStatus=='NOT_WATCHED'?'background-color: #3D7DCA;color:#fff':''"
 						v-if="item.itemDirectoryWatchStatus=='NOT_WATCHED'">
@@ -35,6 +36,10 @@
 						已看完
 					</view>
 				</view>
+				<view class="play" v-else @tap='novideoplay'>
+					开始播放
+				</view>
+			</view>
 		</view>
 		<u-popup v-model="videoshow" mode="center" closeable @close='videoshowfalse'>
 			<view>
@@ -42,6 +47,7 @@
 					:initial-time='videoitem.watchTime'></video>
 			</view>
 		</u-popup>
+		<u-toast ref="uToast" />
 	</view>
 </template>
 <script>
@@ -69,6 +75,7 @@
 				videoitem: {
 					watchTime: 0,
 				}, //视频对象
+				trainingOrderStatus: undefined
 			};
 		},
 		methods: {
@@ -86,6 +93,14 @@
 					this.videoshow = false
 				})
 			},
+			//novideoplay未购买
+			novideoplay() {
+				this.$refs.uToast.show({
+					title: '您未购买',
+					type: 'error',
+					duration: '1000'
+				})
+			},
 			//视频播放
 			videoplay(item) {
 				if (!item.watchTime) {
@@ -147,6 +162,7 @@
 		onLoad(options) {
 			const that = this
 			this.baseurl = baseurl
+			this.trainingOrderStatus = options.trainingOrderStatus
 			this.trainingItemId = options.trainingItemId
 			this.trainingOrderNo = options.trainingOrderNo
 			this.info();