From 49b65c20fca60494828302dfa51db3596db0b143 Mon Sep 17 00:00:00 2001 From: yujialong <479214531@qq.com> Date: Wed, 18 May 2022 10:28:34 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=AE=A2=E6=88=B7=E7=AD=89?= =?UTF-8?q?=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/api.js | 16 +++++----- src/views/course/AddCurriculum.vue | 49 +++++++++++++++++++++++++++--- src/views/customer/AddCustomer.vue | 14 +++++---- src/views/order/AddOrder.vue | 49 ++++++++++++++++++------------ 4 files changed, 90 insertions(+), 38 deletions(-) diff --git a/src/utils/api.js b/src/utils/api.js index 8edaba2..33f1314 100644 --- a/src/utils/api.js +++ b/src/utils/api.js @@ -2,7 +2,7 @@ import Setting from "@/setting"; const host = Setting.apiBaseURL const uploadURL = Setting.uploadURL -const host1 = 'http://192.168.31.151:9000/' +const host1 = 'http://192.168.31.137:9000/' export default { @@ -144,14 +144,14 @@ export default { courseProfessionalClass: `nakadai/nakadai/subject/courseProfessionalClass`, //课程专业类 courseProfessional: `nakadai/nakadai/subject/courseProfessional`, //课程专业 //课程管理 - curriculumList: `nakadai/nakadai/curriculum/curriculumList`, //课程列表 - createCurriculum: `nakadai/nakadai/curriculum/createCurriculum`, //创建课程 - curriculumDetail: `nakadai/nakadai/curriculum/curriculumDetail`, //课程详情 - modifyCourse: `nakadai/nakadai/curriculum/modifyCourse`, //编辑课程 - delCourse: `nakadai/nakadai/curriculum/delCourse`, //单个、批量删除课程 - isShelves: `nakadai/nakadai/curriculum/isShelves`, //上下架课程 + curriculumList: `${host1}nakadai/nakadai/curriculum/curriculumList`, //课程列表 + createCurriculum: `${host1}nakadai/nakadai/curriculum/createCurriculum`, //创建课程 + curriculumDetail: `${host1}nakadai/nakadai/curriculum/curriculumDetail`, //课程详情 + modifyCourse: `${host1}nakadai/nakadai/curriculum/modifyCourse`, //编辑课程 + delCourse: `${host1}nakadai/nakadai/curriculum/delCourse`, //单个、批量删除课程 + isShelves: `${host1}nakadai/nakadai/curriculum/isShelves`, //上下架课程 getInternalProjectBySystemId: `occupationlab/projectManage/getInternalProjectBySystemId`, //根据系统id、项目权限获取系统内置项目 - checkConfig: `nakadai/nakadai/curriculum/checkConfig`, + checkConfig: `${host1}nakadai/nakadai/curriculum/checkConfig`, // 课程章节管理 addChapter: `nakadai/curriculum/chapter/addChapter`, //添加章节 editChapter: `nakadai/curriculum/chapter/editChapter`, //修改章节 diff --git a/src/views/course/AddCurriculum.vue b/src/views/course/AddCurriculum.vue index f67f998..8281093 100644 --- a/src/views/course/AddCurriculum.vue +++ b/src/views/course/AddCurriculum.vue @@ -23,7 +23,7 @@
- + @@ -46,11 +46,27 @@ - - - + + + + + +
+ 结算单价 + + + +
+
+ 比例分成 + 商务经理占比 + + 产品厂商占比 + +
+ @@ -75,6 +91,9 @@ + + + @@ -284,7 +303,12 @@ export default { briefIntroduction: "", teachingObjectives: "", systemIdByAssessment: [], - systemIdByPractice: [] + systemIdByPractice: [], + supplier: '', + businessProportion: '', + manufacturerProportion: '', + settlementPrice: '', + settlementMethod: '0' }, rules: { curriculumName: [ @@ -802,4 +826,19 @@ $avatar-width: 104px; align-items: center; padding: 10px 120px; } +.settlement { + display: flex; + align-items: center; + margin-bottom: 10px; + .label { + margin-right: 10px; + white-space: nowrap; + color: #606266; + font-size: 14px; + } + .el-input { + width: 150px; + margin-right: 30px; + } +} \ No newline at end of file diff --git a/src/views/customer/AddCustomer.vue b/src/views/customer/AddCustomer.vue index 233f97f..b52bdcc 100644 --- a/src/views/customer/AddCustomer.vue +++ b/src/views/customer/AddCustomer.vue @@ -499,7 +499,7 @@ export default { // 获取已订阅产品 getProduct() { this.$get(this.api.getProductsSubscribedByCustomers, { - customeId: 19 + customeId: this.customerId }).then(({ data }) => { const { productTypeList } = this data.map(e => { @@ -547,15 +547,17 @@ export default { } } } - e.remain = this.getRemain(e.startTime, e.endTime) // 获取剩余期限 - e.startTime = e.startTime.replace(' 00:00:00', '') - e.endTime = e.endTime.replace(' 00:00:00', '') + const date = new Date() + date.setHours(0) + date.setMinutes(0) + date.setSeconds(0) + e.remain = this.getRemain(date.getTime(), e.endTime) // 获取剩余期限 e.startAndEndTime = e.startTime + ' ~ ' + e.endTime // 如果还有未生效的订单，页面上要显示出来 if (e.notActiveList.length) { e.other = '' e.notActiveList.map(j => { - e.other += `
${j.startTime.replace(' 00:00:00', '')} ~ ${j.endTime.replace(' 00:00:00', '')}` + e.other += `
${j.startTime} ~ ${j.endTime}` }) } e.productTypeName = productTypeList.find(n => n.id === e.productType).name @@ -570,7 +572,7 @@ export default { }, // 获取剩余日期 getRemain(startTime, endTime) { - return (new Date(endTime).getTime() - new Date(startTime).getTime()) / 86400000 + return parseInt(((new Date(endTime).getTime() - new Date(startTime).getTime()) / 86400000)) + 1 }, // 已订阅产品筛选 filterForm2() { diff --git a/src/views/order/AddOrder.vue b/src/views/order/AddOrder.vue index 6d2f0bc..74ec586 100644 --- a/src/views/order/AddOrder.vue +++ b/src/views/order/AddOrder.vue @@ -178,13 +178,10 @@
- + @@ -203,9 +200,9 @@ - - -