diff --git a/src/api/system/trainingOrder.js b/src/api/system/trainingOrder.js index af5809b..0954095 100644 --- a/src/api/system/trainingOrder.js +++ b/src/api/system/trainingOrder.js @@ -8,6 +8,14 @@ export function listTrainingOrder(query) { params: query }) } +// 查看视频 +export function orderItemDirectory(id) { + return request({ + url: `/system/trainingOrder/orderItemDirectory?trainingOrderDetailsId=${id}`, + method: 'get', + + }) +} // 查询学习培训订单主详细 export function getTrainingOrder(id) { @@ -50,13 +58,7 @@ export function updateTrainingOrder(data) { data: data }) } -// export function trainingOrder(id) { -// return request({ -// url: `/system/trainingOrder/` + `?id=${id}`, -// method: 'get', -// }) -// } // 删除学习培训订单主 export function delTrainingOrder(id) { return request({ diff --git a/src/components/Editor/index.vue b/src/components/Editor/index.vue index 8244881..4d7cb28 100644 --- a/src/components/Editor/index.vue +++ b/src/components/Editor/index.vue @@ -103,9 +103,7 @@ export default { }, created() { this.uploadUrl = process.env.VUE_APP_BASE_API + this.url; - console.log(this.uploadUrl); this.filetype.type = this.filetypes; - console.log(this.filetype); }, computed: { styles() { @@ -198,7 +196,8 @@ export default { "image", process.env.VUE_APP_BASE_API + res.fileName ); - this.$emit("imgs", res.fileName); + console.log(res) + this.$emit("imgs", res.imgUrl); // 调整光标到最后 quill.setSelection(length + 1); } else { diff --git a/src/views/system/trainingItem/index.vue b/src/views/system/trainingItem/index.vue index 7cbc22b..e08ce02 100644 --- a/src/views/system/trainingItem/index.vue +++ b/src/views/system/trainingItem/index.vue @@ -122,6 +122,12 @@ align="center" prop="trainingItemCode" /> + + - + e.idd != item.idd - ); + this.form.trainingItemDirectoryList = + this.form.trainingItemDirectoryList.filter( + (e) => e.idd != item.idd + ); } } else if (!item.idd && item.trainingItemDirectoryId) { if (this.form.trainingItemDirectoryList.length == 1) { this.$message.error("最后一条不可删除"); } else { - this.form.trainingItemDirectoryList = this.form.trainingItemDirectoryList.filter( - e => e.trainingItemDirectoryId != item.trainingItemDirectoryId - ); + this.form.trainingItemDirectoryList = + this.form.trainingItemDirectoryList.filter( + (e) => e.trainingItemDirectoryId != item.trainingItemDirectoryId + ); } } }, + // 章节视频 itemDirectoryUrl(item) { let items = JSON.parse(item); console.log(items); @@ -1073,7 +1069,7 @@ export default { }, imgUrl4(imgUrl) {}, imgs(item) { - console.log(item) + console.log(item); this.imgsurl.pictureUrlList.push(item); }, addresetQuerylist() { @@ -1203,7 +1199,7 @@ export default { updatePicture(obj).then((res) => {}); } if (this.imgsurl.pictureUrlList.length > 0) { - updatePicture(this.imgsurl).then((res) => {}); + updatePicture(this.imgsurl).then((res) => {}); } this.imgsurl = { pictureUrlList: [] }; diff --git a/src/views/system/trainingOrder/index.vue b/src/views/system/trainingOrder/index.vue index a953c7f..0edc292 100644 --- a/src/views/system/trainingOrder/index.vue +++ b/src/views/system/trainingOrder/index.vue @@ -24,29 +24,43 @@ @keyup.enter.native="handleQuery" /> --> - - + + + + + + + + + + - - - - - - + > + + - + + 退款中 - + 已退款 - @@ -286,6 +296,14 @@ :disabled="true" /> + + + + 确 定 - - - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -412,23 +566,61 @@ import { listTrainingOrder, getTrainingOrder, + orderItemDirectory, refundInformation, delTrainingOrder, - trainingOrder, xylWeChatRefundNotify, addTrainingOrder, updateTrainingOrder, } from "@/api/system/trainingOrder"; - +import baseurl from "@/api/baseurl.js"; export default { name: "TrainingOrder", data() { return { + baseurl: null, + trainingOrderStatusoptions: [ + { + value: "WAIT_PAY", + label: "待付款", + }, + { + value: "PAY", + label: "已付款", + }, + { + value: "WAIT_REFUND", + label: "退款中", + }, + { + value: "REFUNDED", + label: "已退款", + }, + { + value: "CANCEL", + label: "已取消", + }, + ], // 遮罩层 loading: true, innerrefund: false, + innerrefundvideo: false, query: {}, - + formlist: [], + trainingItemTypeoptions: [ + { + value: "GRAPHIC_LEARNING", + label: "图文学习", + }, + { + value: "LEARNING_ITEM_GROUP", + label: "学习培训项目组", + }, + { + value: "VIDEO_LEARNING", + label: "视频学习", + }, + ], // 选中数组 ids: [], optiondeflag: [ @@ -484,12 +676,15 @@ export default { }, // 表单参数 form: {}, + list: [], + trainingOrderDetailsList: [], // 表单校验 rules: {}, }; }, created() { this.getList(); + this.baseurl = baseurl; }, methods: { // 取消按钮 @@ -502,7 +697,6 @@ export default { refundInformation(row.id).then((response) => { this.query = response.data; this.innerrefund = true; - this.title = "退款"; }); }, //退款确定按钮 @@ -534,7 +728,17 @@ export default { this.open = false; this.reset(); }, - handlelook() {}, + // 查看视频 + handlelook(row) { + this.innerrefundvideo = true; + console.log(row); + this.formlist.trainingItemCoverUrl = row.trainingItemCoverUrl; + this.formlist.trainingItemPosterUrl = row.trainingItemPosterUrl; + orderItemDirectory(row.trainingOrderDetailsId).then((response) => { + this.list = response.rows; + }); + }, + // 表单重置 reset() { this.form = { @@ -578,12 +782,14 @@ export default { this.open = true; this.title = "添加学习培训订单主"; }, - /** 修改按钮操作 */ + /** 查看按钮操作 */ handleUpdate(row) { this.reset(); const id = row.id || this.ids; getTrainingOrder(id).then((response) => { this.form = response.data; + this.form.trainingOrderDetailsList = + response.data.trainingOrderDetailsList; this.open = true; this.title = "查看学习培训订单"; }); @@ -635,4 +841,10 @@ export default { }, }; - \ No newline at end of file + \ No newline at end of file