From 5330c1af408abbd1e1198bc11593187cc4b3cdf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com> Date: Mon, 24 Apr 2023 18:14:09 +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 --- src/api/system/trainingOrder.js | 16 +++ src/views/system/trainingItem/index.vue | 102 ++++++++++------ src/views/system/trainingOrder/index.vue | 146 +++++++++++++++++------ 3 files changed, 192 insertions(+), 72 deletions(-) diff --git a/src/api/system/trainingOrder.js b/src/api/system/trainingOrder.js index d20d09e..af5809b 100644 --- a/src/api/system/trainingOrder.js +++ b/src/api/system/trainingOrder.js @@ -16,6 +16,22 @@ export function getTrainingOrder(id) { method: 'get' }) } +// 确定按钮 +export function xylWeChatRefundNotify(data) { + return request({ + url: '/nurseApp/weChatPayment/weChatRefundOrderApply', + method: 'post', + data: data + }) +} +// 退款 +export function refundInformation(id) { + return request({ + url: `/system/trainingOrder/refundInformation` + `?id=${id}`, + method: 'get', + }) +} + // 新增学习培训订单主 export function addTrainingOrder(data) { diff --git a/src/views/system/trainingItem/index.vue b/src/views/system/trainingItem/index.vue index e4b53cd..35cee5c 100644 --- a/src/views/system/trainingItem/index.vue +++ b/src/views/system/trainingItem/index.vue @@ -274,28 +274,30 @@ align="center" > - + - + @@ -603,7 +605,6 @@ v-if=" form.trainingItemType == 'LIVE_COURSES' || form.trainingItemType == 'OFFLINE_TRAINING' - " > 0) { + updatePicture(obj).then((res) => {}); + } + // if (this.imgsurl.pictureUrlList.length > 0) { + updatePicture(this.imgsurl).then((res) => {}); + // } + this.imgsurl = { pictureUrlList: [] }; + this.open = false; this.reset(); }, @@ -1124,12 +1136,12 @@ export default { itemDirectorySort: null, }, ], - trainingParentId:null, + trainingParentId: null, id: null, trainingCategoryName: "请选择培训分类", trainingCategoryId: null, trainingItemTitle: "", - trainingParentName:"", + trainingParentName: "", trainingItemCode: null, trainingItemPrice: null, trainingItemCoverUrl: null, @@ -1202,6 +1214,8 @@ export default { response.data.trainingItemDirectoryList.push(obj); } this.form = response.data; + this.imgone = this.form.trainingItemCoverUrl; + this.imgtwo = this.form.trainingItemPosterUrl; this.open = true; this.title = "修改学习培训项目信息"; this.isEditFlag = true; @@ -1217,11 +1231,25 @@ export default { } else { this.form.trainingItemStartTimeStr = "00:00:00"; } - if (this.form.trainingItemType == "GRAPHIC_LEARNING"||this.form.trainingItemType == "LEARNING_ITEM_GROUP") { + if ( + this.form.trainingItemType == "GRAPHIC_LEARNING" || + this.form.trainingItemType == "LEARNING_ITEM_GROUP" + ) { this.form.trainingItemDirectoryList = []; } if (this.form.trainingItemId != null) { updateTrainingItem(this.form).then((response) => { + var obj = { pictureUrlList: [] }; + if (this.imgone != this.form.trainingItemCoverUrl) { + obj.pictureUrlList.push(this.imgone); + } + if (this.imgtwo != this.form.trainingItemPosterUrl) { + obj.pictureUrlList.push(this.imgtwo); + } + this.imgsurl = { pictureUrlList: [] }; + if (obj.pictureUrlList.length > 0) { + updatePicture(obj).then((res) => {}); + } this.$modal.msgSuccess("修改成功"); this.open = false; this.getList(); diff --git a/src/views/system/trainingOrder/index.vue b/src/views/system/trainingOrder/index.vue index 69bb258..a953c7f 100644 --- a/src/views/system/trainingOrder/index.vue +++ b/src/views/system/trainingOrder/index.vue @@ -160,46 +160,22 @@ v-if="scope.row.trainingOrderStatus == 'PAY'" >已付款 - 待派单 - 待接单 - 未完成 - 待评价 - 服务完成 退款中 - 退款成功 + 已取消 + 已退款 + + + + + + + + + + + + + + + + + + @@ -336,9 +377,11 @@ - +