diff --git a/src/setting.js b/src/setting.js index 2e098f1..b8f4811 100644 --- a/src/setting.js +++ b/src/setting.js @@ -11,7 +11,7 @@ if (isDev) { jumpPath = 'http://192.168.31.125:8087/' // 本地调试-需要启动本地判分点系统 host = 'http://121.37.12.51/' // host = 'https://huorantech.cn/' - // host = 'http://192.168.31.217:9000/'// 榕 + host = 'http://192.168.31.217:9000/'// 榕 // host = 'http://192.168.31.51:9000/'// 赓 } else if (isPro) { jumpPath = 'https://www.huorantech.cn/judgmentPoint/' diff --git a/src/utils/api.js b/src/utils/api.js index 263102f..53248fb 100644 --- a/src/utils/api.js +++ b/src/utils/api.js @@ -472,6 +472,7 @@ export default { goodsOffTheShelf: `nakadai/mall/goodsOffTheShelf`, goodsSelection: `nakadai/mall/goodsSelection`, queryCitySettlementPrice: `nakadai/mallPrice/queryCitySettlementPrice`, + allSubjects: `nakadai/productTheme/allSubjects`, // 营销推广 delMarketing: `nakadai/nakadai/mall/marketing/promotion/batchDeletion`, diff --git a/src/views/order/AddOrder.vue b/src/views/order/AddOrder.vue index 024ca8f..2a35f35 100644 --- a/src/views/order/AddOrder.vue +++ b/src/views/order/AddOrder.vue @@ -2436,12 +2436,12 @@ export default { this.$confirm("确定要删除吗?", "提示", { type: "warning" }).then(() => { - if (this.renewDisabled && this.coursePermissions.length === 1) { - return this.$message.warning("续费至少保留一条课程权限"); - } else { - this.handleOrderRepeat(row.dataOrCourseId) - this.coursePermissions.splice(index, 1); - } + // if (this.renewDisabled && this.coursePermissions.length === 1) { + // return this.$message.warning("续费至少保留一条课程权限"); + // } else { + this.handleOrderRepeat(row.dataOrCourseId) + this.coursePermissions.splice(index, 1); + // } }); }, //删除理论课程 @@ -2449,12 +2449,12 @@ export default { this.$confirm("确定要删除吗?", "提示", { type: "warning" }).then(() => { - if (this.renewDisabled && this.theoryCourseList.length === 1) { - return this.$message.warning("续费至少保留一条课程权限"); - } else { - this.handleOrderRepeat(row.dataOrCourseId) - this.theoryCourseList.splice(index, 1); - } + // if (this.renewDisabled && this.theoryCourseList.length === 1) { + // return this.$message.warning("续费至少保留一条课程权限"); + // } else { + this.handleOrderRepeat(row.dataOrCourseId) + this.theoryCourseList.splice(index, 1); + // } }); }, @@ -2463,12 +2463,12 @@ export default { this.$confirm("确定要删除吗?", "提示", { type: "warning" }).then(() => { - if (this.renewDisabled && this.dataPlatformPermissions.length === 1) { - return this.$message.warning("续费至少保留一条产品信息"); - } else { - this.handleOrderRepeat(row.dataOrCourseId) - this.dataPlatformPermissions.splice(index, 1); - } + // if (this.renewDisabled && this.dataPlatformPermissions.length === 1) { + // return this.$message.warning("续费至少保留一条产品信息"); + // } else { + this.handleOrderRepeat(row.dataOrCourseId) + this.dataPlatformPermissions.splice(index, 1); + // } }); }, @@ -2477,12 +2477,12 @@ export default { this.$confirm("确定要删除吗?", "提示", { type: "warning" }).then(() => { - if (this.renewDisabled && this.valuePermissions.length === 1) { - return this.$message.warning("续费至少保留一条产品信息"); - } else { - this.handleOrderRepeat(row.dataOrCourseId) - this.valuePermissions.splice(index, 1); - } + // if (this.renewDisabled && this.valuePermissions.length === 1) { + // return this.$message.warning("续费至少保留一条产品信息"); + // } else { + this.handleOrderRepeat(row.dataOrCourseId) + this.valuePermissions.splice(index, 1); + // } }); }, @@ -2631,12 +2631,12 @@ export default { this.$confirm("确定要删除吗?", "提示", { type: "warning" }).then(() => { - if (this.renewDisabled && this.practicalCourses.length === 1) { - return this.$message.warning("续费至少保留一条产品信息"); - } else { - this.handleOrderRepeat(row.dataOrCourseId) - this.practicalCourses.splice(index, 1); - } + // if (this.renewDisabled && this.practicalCourses.length === 1) { + // return this.$message.warning("续费至少保留一条产品信息"); + // } else { + this.handleOrderRepeat(row.dataOrCourseId) + this.practicalCourses.splice(index, 1); + // } }); }, diff --git a/src/views/shop/addProduct/index.vue b/src/views/shop/addProduct/index.vue index 222285f..1b47c22 100644 --- a/src/views/shop/addProduct/index.vue +++ b/src/views/shop/addProduct/index.vue @@ -224,6 +224,20 @@ + + +

只能上传jpg/png文件

-

课程封面图将按1:1显示,最佳分辨率80*80

+

课程封面图最佳分辨率484*278

@@ -259,9 +273,14 @@ :headers="headers" :show-file-list="false" name="file"> -
+
上传界面图
+
+

只能上传jpg/png文件

+

界面图最佳分辨率484*278

+
@@ -297,7 +316,7 @@

只能上传jpg/png文件

-

课程封面图将按1:1显示,最佳分辨率80*80

+

小程序图标将按1:1显示,最佳分辨率57*57

@@ -736,6 +755,7 @@ export default { productIntroduction: '', productName: '', state: 1, + themeId: '' }, mallNonAssociatedLinks: [ { @@ -793,6 +813,7 @@ export default { ProfessionalList: [], //专业 classificationList: [], provinces: [], + themes: [], entryTypes: [ { id: 0, @@ -810,7 +831,8 @@ export default { pass: false, updateTime: 0, nameRepeat: false, - appletList: [] + appletList: [], + isPython: false }; }, watch: { @@ -901,6 +923,7 @@ export default { this.getClass() this.getSupplier() this.getSubject() + this.getTheme() }, // 关联产品单选回调 @@ -991,6 +1014,7 @@ export default { const active = this.productActive this.selectedProduct = false this.isData = false + this.isPython = false // 实训、理论需要查询课程详情,把课程信息带过来 if (!active || active == 1) { this.$post(`${this.api.curriculumDetail}?cid=${id}`).then(({ data }) => { @@ -1012,6 +1036,9 @@ export default { mall.appletIcon = data.miniProgramPictureAddress mall.productIntroduction = data.briefIntroduction mall.marketUnitPrice = data.marketPrice + // 判断是否是python系统 + const systemIds = data.systemIds.split(',') + this.isPython = systemIds.filter(e => e != 12 && e != 13).length this.calcAllSettlement() }).catch(err => { }) } else { @@ -1040,7 +1067,12 @@ export default { this.productCategoryList = res.classificationList }).catch(err => { }) }, - + // 获取主题 + getTheme () { + this.$post(this.api.allSubjects).then(({ data }) => { + this.themes = data + }).catch(err => { }) + }, // 获取供应厂商 getSupplier () { @@ -1530,18 +1562,17 @@ $avatar-width: 104px; display: block; } } +} +/deep/.el-upload__tip { + margin-top: 0; - .el-upload__tip { - margin-top: 0; - - p { - font-size: 14px; - color: rgba(0, 0, 0, 0.45); - line-height: 1; + p { + font-size: 14px; + color: rgba(0, 0, 0, 0.45); + line-height: 1; - &:first-child { - margin-bottom: 5px; - } + &:first-child { + margin-bottom: 5px; } } } @@ -1701,4 +1732,31 @@ $avatar-width: 104px; } } } +.styles { + display: inline-flex; + flex-wrap: wrap; + li { + width: 170px; + margin-right: 20px; + text-align: center; + cursor: pointer; + } + img { + width: 170px; + height: 112px; + } + /deep/.el-radio { + .el-radio__label { + display: none; + } + .el-radio__inner { + width: 18px; + height: 18px; + &::after { + width: 6px; + height: 6px; + } + } + } +} \ No newline at end of file diff --git a/src/views/shop/list/market/index.vue b/src/views/shop/list/market/index.vue index 0db71c3..0779dfe 100644 --- a/src/views/shop/list/market/index.vue +++ b/src/views/shop/list/market/index.vue @@ -148,7 +148,7 @@ export default { }, cropperModel: false, isUpload: false, - fixedNumber: [3.6, 1], + fixedNumber: [5.4, 1], file: '' }; },