huoran
/
FE_middlePlatform_server
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 14 Wiki Activity

python主题

Browse Source
dev_review
yujialong 1 year ago
parent f0e037809e
commit b4765b92fb
5 changed files with 106 additions and 47 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/setting.js
  2. 1
      src/utils/api.js
  3. 40
      src/views/order/AddOrder.vue
  4. 74
      src/views/shop/addProduct/index.vue
  5. 2
      src/views/shop/list/market/index.vue

2
src/setting.js
Unescape View File

@ -11,7 +11,7 @@ if (isDev) {
jumpPath = 'http://192.168.31.125:8087/' // 本地调试-需要启动本地判分点系统 jumpPath = 'http://192.168.31.125:8087/' // 本地调试-需要启动本地判分点系统
host = 'http://121.37.12.51/' host = 'http://121.37.12.51/'
// host = 'https://huorantech.cn/' // 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/'// 赓 // host = 'http://192.168.31.51:9000/'// 赓
} else if (isPro) { } else if (isPro) {
jumpPath = 'https://www.huorantech.cn/judgmentPoint/' jumpPath = 'https://www.huorantech.cn/judgmentPoint/'

1
src/utils/api.js
Unescape View File

@ -472,6 +472,7 @@ export default {
goodsOffTheShelf: `nakadai/mall/goodsOffTheShelf`, goodsOffTheShelf: `nakadai/mall/goodsOffTheShelf`,
goodsSelection: `nakadai/mall/goodsSelection`, goodsSelection: `nakadai/mall/goodsSelection`,
queryCitySettlementPrice: `nakadai/mallPrice/queryCitySettlementPrice`, queryCitySettlementPrice: `nakadai/mallPrice/queryCitySettlementPrice`,
allSubjects: `nakadai/productTheme/allSubjects`,
// 营销推广 // 营销推广
delMarketing: `nakadai/nakadai/mall/marketing/promotion/batchDeletion`, delMarketing: `nakadai/nakadai/mall/marketing/promotion/batchDeletion`,

40
src/views/order/AddOrder.vue
Unescape View File

@ -2436,12 +2436,12 @@ export default {
this.$confirm("确定要删除吗？", "提示", { this.$confirm("确定要删除吗？", "提示", {
type: "warning" type: "warning"
}).then(() => { }).then(() => {
if (this.renewDisabled && this.coursePermissions.length === 1) { // if (this.renewDisabled && this.coursePermissions.length === 1) {
return this.$message.warning("续费至少保留一条课程权限"); // return this.$message.warning("续费至少保留一条课程权限");
} else { // } else {
this.handleOrderRepeat(row.dataOrCourseId) this.handleOrderRepeat(row.dataOrCourseId)
this.coursePermissions.splice(index, 1); this.coursePermissions.splice(index, 1);
} // }
}); });
}, },
//删除理论课程 //删除理论课程
@ -2449,12 +2449,12 @@ export default {
this.$confirm("确定要删除吗？", "提示", { this.$confirm("确定要删除吗？", "提示", {
type: "warning" type: "warning"
}).then(() => { }).then(() => {
if (this.renewDisabled && this.theoryCourseList.length === 1) { // if (this.renewDisabled && this.theoryCourseList.length === 1) {
return this.$message.warning("续费至少保留一条课程权限"); // return this.$message.warning("续费至少保留一条课程权限");
} else { // } else {
this.handleOrderRepeat(row.dataOrCourseId) this.handleOrderRepeat(row.dataOrCourseId)
this.theoryCourseList.splice(index, 1); this.theoryCourseList.splice(index, 1);
} // }
}); });
}, },
@ -2463,12 +2463,12 @@ export default {
this.$confirm("确定要删除吗？", "提示", { this.$confirm("确定要删除吗？", "提示", {
type: "warning" type: "warning"
}).then(() => { }).then(() => {
if (this.renewDisabled && this.dataPlatformPermissions.length === 1) { // if (this.renewDisabled && this.dataPlatformPermissions.length === 1) {
return this.$message.warning("续费至少保留一条产品信息"); // return this.$message.warning("续费至少保留一条产品信息");
} else { // } else {
this.handleOrderRepeat(row.dataOrCourseId) this.handleOrderRepeat(row.dataOrCourseId)
this.dataPlatformPermissions.splice(index, 1); this.dataPlatformPermissions.splice(index, 1);
} // }
}); });
}, },
@ -2477,12 +2477,12 @@ export default {
this.$confirm("确定要删除吗？", "提示", { this.$confirm("确定要删除吗？", "提示", {
type: "warning" type: "warning"
}).then(() => { }).then(() => {
if (this.renewDisabled && this.valuePermissions.length === 1) { // if (this.renewDisabled && this.valuePermissions.length === 1) {
return this.$message.warning("续费至少保留一条产品信息"); // return this.$message.warning("续费至少保留一条产品信息");
} else { // } else {
this.handleOrderRepeat(row.dataOrCourseId) this.handleOrderRepeat(row.dataOrCourseId)
this.valuePermissions.splice(index, 1); this.valuePermissions.splice(index, 1);
} // }
}); });
}, },
@ -2631,12 +2631,12 @@ export default {
this.$confirm("确定要删除吗？", "提示", { this.$confirm("确定要删除吗？", "提示", {
type: "warning" type: "warning"
}).then(() => { }).then(() => {
if (this.renewDisabled && this.practicalCourses.length === 1) { // if (this.renewDisabled && this.practicalCourses.length === 1) {
return this.$message.warning("续费至少保留一条产品信息"); // return this.$message.warning("续费至少保留一条产品信息");
} else { // } else {
this.handleOrderRepeat(row.dataOrCourseId) this.handleOrderRepeat(row.dataOrCourseId)
this.practicalCourses.splice(index, 1); this.practicalCourses.splice(index, 1);
} // }
}); });
}, },

74
src/views/shop/addProduct/index.vue
Unescape View File

@ -224,6 +224,20 @@
<el-input placeholder="请输入适用场景" <el-input placeholder="请输入适用场景"
v-model="form.mall.applicationScenario"></el-input> v-model="form.mall.applicationScenario"></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="isPython"
class="req"
label="主题UI">
<ul class="styles">
<li v-for="(item, i) in themes"
:key="i"
@click="form.mall.themeId = item.id">
<img :src="item.url"
alt="">
<el-radio v-model="form.mall.themeId"
:label="item.id"></el-radio>
</li>
</ul>
</el-form-item>
<el-form-item class="req" <el-form-item class="req"
label="封面图"> label="封面图">
<el-upload class="avatar-uploader" <el-upload class="avatar-uploader"
@ -246,7 +260,7 @@
<div slot="tip" <div slot="tip"
class="el-upload__tip"> class="el-upload__tip">
<p>只能上传jpg/png文件</p> <p>只能上传jpg/png文件</p>
<p>课程封面图将按1:1显示，最佳分辨率80*80</p> <p>课程封面图最佳分辨率484*278</p>
</div> </div>
</el-upload> </el-upload>
</el-form-item> </el-form-item>
@ -259,9 +273,14 @@
:headers="headers" :headers="headers"
:show-file-list="false" :show-file-list="false"
name="file"> name="file">
<div style="text-align: left;"> <div style="margin-bottom: 10px;text-align: left;">
<el-button>上传界面图</el-button> <el-button>上传界面图</el-button>
</div> </div>
<div slot="tip"
class="el-upload__tip">
<p>只能上传jpg/png文件</p>
<p>界面图最佳分辨率484*278</p>
</div>
</el-upload> </el-upload>
<div v-if="form.mall.interfaceDiagrams.length" <div v-if="form.mall.interfaceDiagrams.length"
class="pics"> class="pics">
@ -297,7 +316,7 @@
<div slot="tip" <div slot="tip"
class="el-upload__tip"> class="el-upload__tip">
<p>只能上传jpg/png文件</p> <p>只能上传jpg/png文件</p>
<p>课程封面图将按1:1显示，最佳分辨率80*80</p> <p>小程序图标将按1:1显示，最佳分辨率57*57</p>
</div> </div>
</el-upload> </el-upload>
</el-form-item> </el-form-item>
@ -736,6 +755,7 @@ export default {
productIntroduction: '', productIntroduction: '',
productName: '', productName: '',
state: 1, state: 1,
themeId: ''
}, },
mallNonAssociatedLinks: [ mallNonAssociatedLinks: [
{ {
@ -793,6 +813,7 @@ export default {
ProfessionalList: [], //专业 ProfessionalList: [], //专业
classificationList: [], classificationList: [],
provinces: [], provinces: [],
themes: [],
entryTypes: [ entryTypes: [
{ {
id: 0, id: 0,
@ -810,7 +831,8 @@ export default {
pass: false, pass: false,
updateTime: 0, updateTime: 0,
nameRepeat: false, nameRepeat: false,
appletList: [] appletList: [],
isPython: false
}; };
}, },
watch: { watch: {
@ -901,6 +923,7 @@ export default {
this.getClass() this.getClass()
this.getSupplier() this.getSupplier()
this.getSubject() this.getSubject()
this.getTheme()
}, },
// 关联产品单选回调 // 关联产品单选回调
@ -991,6 +1014,7 @@ export default {
const active = this.productActive const active = this.productActive
this.selectedProduct = false this.selectedProduct = false
this.isData = false this.isData = false
this.isPython = false
// 实训、理论需要查询课程详情，把课程信息带过来 // 实训、理论需要查询课程详情，把课程信息带过来
if (!active || active == 1) { if (!active || active == 1) {
this.$post(`${this.api.curriculumDetail}?cid=${id}`).then(({ data }) => { this.$post(`${this.api.curriculumDetail}?cid=${id}`).then(({ data }) => {
@ -1012,6 +1036,9 @@ export default {
mall.appletIcon = data.miniProgramPictureAddress mall.appletIcon = data.miniProgramPictureAddress
mall.productIntroduction = data.briefIntroduction mall.productIntroduction = data.briefIntroduction
mall.marketUnitPrice = data.marketPrice mall.marketUnitPrice = data.marketPrice
// 判断是否是python系统
const systemIds = data.systemIds.split(',')
this.isPython = systemIds.filter(e => e != 12 && e != 13).length
this.calcAllSettlement() this.calcAllSettlement()
}).catch(err => { }) }).catch(err => { })
} else { } else {
@ -1040,7 +1067,12 @@ export default {
this.productCategoryList = res.classificationList this.productCategoryList = res.classificationList
}).catch(err => { }) }).catch(err => { })
}, },
// 获取主题
getTheme () {
this.$post(this.api.allSubjects).then(({ data }) => {
this.themes = data
}).catch(err => { })
},
// 获取供应厂商 // 获取供应厂商
getSupplier () { getSupplier () {
@ -1530,8 +1562,8 @@ $avatar-width: 104px;
display: block; display: block;
} }
} }
}
.el-upload__tip { /deep/.el-upload__tip {
margin-top: 0; margin-top: 0;
p { p {
@ -1543,7 +1575,6 @@ $avatar-width: 104px;
margin-bottom: 5px; margin-bottom: 5px;
} }
} }
}
} }
.pics { .pics {
display: flex; display: flex;
@ -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;
}
}
}
}
</style> </style>

2
src/views/shop/list/market/index.vue
Unescape View File

@ -148,7 +148,7 @@ export default {
}, },
cropperModel: false, cropperModel: false,
isUpload: false, isUpload: false,
fixedNumber: [3.6, 1], fixedNumber: [5.4, 1],
file: '' file: ''
}; };
}, },

Write Preview
Loading…
Cancel
Save