From fcf6bcb995f855de1bef379042cf6140f7cfc215 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com> Date: Mon, 24 Apr 2023 15:53:03 +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/Learningtraining/index.js | 9 + api/Orderlist/index.js | 4 +- api/Videolearning/index.js | 12 +- pages.json | 29 +-- pages/Learningtraining/Learningtraining.vue | 106 +++++++++- pages/Orderdetails/Orderdetails.vue | 202 ++++++++++++++++++++ pages/Orderlist/Orderlist.vue | 156 ++++++++++++++- pages/Videolearning/Videolearning.vue | 55 +----- 8 files changed, 487 insertions(+), 86 deletions(-) create mode 100644 pages/Orderdetails/Orderdetails.vue diff --git a/api/Learningtraining/index.js b/api/Learningtraining/index.js index e9bab3d..b730a03 100644 --- a/api/Learningtraining/index.js +++ b/api/Learningtraining/index.js @@ -7,3 +7,12 @@ export function selectTrainingCategory(pageNum, pageSize, nurseStationPersonId) method: 'GET' }) } + +//生成订单 +export function trainingItemOrder(data) { + return request({ + url: `/nurseApplet/personLearn/trainingItemOrder`, + method: 'POST', + data, + }) +} diff --git a/api/Orderlist/index.js b/api/Orderlist/index.js index 6b91e60..115930d 100644 --- a/api/Orderlist/index.js +++ b/api/Orderlist/index.js @@ -1,9 +1,9 @@ import request from "../request.js" //订单列表 -export function selectTrainingOrderItemList(pageNum, pageSize, trainingItemType, nurseStationPersonId) { +export function selectTrainingOrderItemList(pageNum, pageSize, nurseStationPersonId) { return request({ - url: `/nurseApplet/personLearn/selectTrainingOrderItemList?pageNum=${pageNum}&pageSize=${pageSize}&trainingItemType=${trainingItemType}&nurseStationPersonId=${nurseStationPersonId}`, + url: `/nurseApplet/personLearn/selectTrainingOrderItemList?pageNum=${pageNum}&pageSize=${pageSize}&trainingItemType=${''}&nurseStationPersonId=${nurseStationPersonId}`, method: 'GET' }) } diff --git a/api/Videolearning/index.js b/api/Videolearning/index.js index c2b0204..719f13b 100644 --- a/api/Videolearning/index.js +++ b/api/Videolearning/index.js @@ -1,18 +1,10 @@ import request from "../request.js" -export function personTrainingItem(pageNum, pageSize, trainingItemId, nurseStationPersonId) { +export function personTrainingItem(pageNum, pageSize, trainingParentId, nurseStationPersonId) { return request({ - url: `/nurseApplet/personLearn/personTrainingItem?pageNum=${pageNum}&pageSize=${pageSize}&trainingItemId=${trainingItemId}&nurseStationPersonId=${nurseStationPersonId}`, + url: `/nurseApplet/personLearn/personTrainingItem?pageNum=${pageNum}&pageSize=${pageSize}&trainingParentId=${trainingParentId}&nurseStationPersonId=${nurseStationPersonId}`, method: 'GET' }) } -//生成订单 -export function trainingItemOrder(data) { - return request({ - url: `/nurseApplet/personLearn/trainingItemOrder`, - method: 'POST', - data, - }) -} diff --git a/pages.json b/pages.json index c983d68..fa4a073 100644 --- a/pages.json +++ b/pages.json @@ -9,20 +9,20 @@ "navigationBarTitleText": "", "navigationStyle": "custom" } - },{ + }, { "path": "pages/Videolearning/Videolearning", "style": { "navigationBarTitleText": "视频学习", "onReachBottomDistance": 50, //距离底部多远时触发 单位为px "enablePullDownRefresh": true //设置参数为true } - },{ + }, { "path": "pages/MyLearning/MyLearning", "style": { "navigationBarTitleText": "我的学习", "enablePullDownRefresh": false } - }, { + }, { "path": "pages/Graphiclearning/Graphiclearning", "style": { "navigationBarTitleText": "图文学习", @@ -128,17 +128,20 @@ "navigationBarTitleText": "视频学习", "enablePullDownRefresh": false } + }, { + "path": "pages/Orderlist/Orderlist", + "style": { + "navigationBarTitleText": "我的学习", + "enablePullDownRefresh": false + } + }, { + "path": "pages/Orderdetails/Orderdetails", + "style": { + "navigationBarTitleText": "订单详情", + "enablePullDownRefresh": false + } } - ,{ - "path" : "pages/Orderlist/Orderlist", - "style" : - { - "navigationBarTitleText": "订单列表", - "enablePullDownRefresh": false - } - - } - ], + ], "globalStyle": { "navigationBarTextStyle": "white", "navigationBarTitleText": "", diff --git a/pages/Learningtraining/Learningtraining.vue b/pages/Learningtraining/Learningtraining.vue index 276f667..04e4efe 100644 --- a/pages/Learningtraining/Learningtraining.vue +++ b/pages/Learningtraining/Learningtraining.vue @@ -31,11 +31,24 @@ --> + + 请选择支付方式 + + + + 微信支付 + + + + 确认支付¥{{buylist.trainingItemPrice}} + + + + diff --git a/pages/Orderlist/Orderlist.vue b/pages/Orderlist/Orderlist.vue index 1660992..2e31f35 100644 --- a/pages/Orderlist/Orderlist.vue +++ b/pages/Orderlist/Orderlist.vue @@ -1,23 +1,54 @@ diff --git a/pages/Videolearning/Videolearning.vue b/pages/Videolearning/Videolearning.vue index 55cdb46..f292bda 100644 --- a/pages/Videolearning/Videolearning.vue +++ b/pages/Videolearning/Videolearning.vue @@ -20,18 +20,6 @@ --> - @@ -39,27 +27,24 @@