From 30734242cb96c1c4d85dc0f5d10e5dfd12745cc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Tue, 25 Apr 2023 17:12:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/Orderlearning/index.js            | 5 ++---
 pages/Orderlearning/Orderlearning.vue | 9 +++++----
 pages/Orderlist/Orderlist.vue         | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/api/Orderlearning/index.js b/api/Orderlearning/index.js
index dc97d0e..54a9ab5 100644
--- a/api/Orderlearning/index.js
+++ b/api/Orderlearning/index.js
@@ -1,9 +1,8 @@
 import request from "../request.js"
 
-export function selectTrainingOrderItemList(trainingParentId, nurseStationPersonId) {
+export function selectTrainingOrderItemList(trainingParentId, nurseStationPersonId, trainingOrderNo) {
 	return request({
-		url: `/nurseApplet/personLearn/selectTrainingOrderItemList?trainingParentId=${trainingParentId}&nurseStationPersonId=${nurseStationPersonId}`,
+		url: `/nurseApplet/personLearn/selectTrainingOrderItemList?trainingParentId=${trainingParentId}&nurseStationPersonId=${nurseStationPersonId}&trainingOrderNo=${trainingOrderNo}`,
 		method: 'GET'
 	})
 }
-
diff --git a/pages/Orderlearning/Orderlearning.vue b/pages/Orderlearning/Orderlearning.vue
index 91b5db4..d4ccb15 100644
--- a/pages/Orderlearning/Orderlearning.vue
+++ b/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>
+		</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">
@@ -72,6 +72,7 @@
 			const that = this
 			this.baseurl = baseurl
 			this.trainingParentId = options.trainingParentId
+			this.trainingOrderNo = options.trainingOrderNo
 			const value = uni.getStorageSync('nursePersonId');
 			if (value) {
 				that.nurseStationPersonId = value
@@ -92,7 +93,7 @@
 				})
 			},
 			info() {
-				selectTrainingOrderItemList(this.trainingParentId, this.nurseStationPersonId).then(
+				selectTrainingOrderItemList(this.trainingParentId, this.nurseStationPersonId, this.trainingOrderNo).then(
 					res => {
 						res.data.forEach(e => {
 							if (e.trainingItemType == 'VIDEO_LEARNING') {
diff --git a/pages/Orderlist/Orderlist.vue b/pages/Orderlist/Orderlist.vue
index f2a1119..1a8809a 100644
--- a/pages/Orderlist/Orderlist.vue
+++ b/pages/Orderlist/Orderlist.vue
@@ -71,7 +71,7 @@
 					})
 				} else if (item.trainingOrderStatus == 'PAY') {
 					uni.navigateTo({
-						url: `/pages/Orderlearning/Orderlearning?trainingParentId=${item.trainingItemId}`
+						url: `/pages/Orderlearning/Orderlearning?trainingParentId=${item.trainingItemId}&trainingOrderNo=${item.trainingOrderNo}`
 					})
 				}
 			},