code-image-backup-public/lilishop-ui
1
0
Fork 0
mirror of https://gitee.com/beijing_hongye_huicheng/lilishop-ui.git synced 2026-08-06 02:47:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/promotion-datetime-format'

Browse Source
This commit is contained in:
田香琪
2026-07-28 10:30:44 +08:00
parent 24f829033f 09b735e82a
commit 36878e6f7f
3 changed files with 89 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
seller/src/views/promotion/flash-discount/flash-discount-add.vue
View File

@@ -6,7 +6,14 @@
<el-input v-model="form.promotionName" style="width: 320px" />
</el-form-item>
<el-form-item label="活动时间" required>
<el-date-picker v-model="form.rangeTime" type="datetimerange" style="width: 360px" />
<el-date-picker
v-model="form.rangeTime"
class="flash-discount-range-picker"
type="datetimerange"
format="YYYY-MM-DD HH:mm:ss"
start-placeholder="开始时间"
end-placeholder="结束时间"
/>
</el-form-item>
<el-form-item label="限购数量">
<el-input-number v-model="form.limitNum" :min="0" /> <span class="tip">0 表示不限</span>
@@ -16,12 +23,17 @@
</el-form-item>
<el-form-item label="活动商品">
<el-button type="primary" @click="openGoods">选择商品</el-button>
<el-table v-if="form.promotionGoodsList.length" :data="form.promotionGoodsList" border class="mt_10">
<el-table-column prop="goodsName" label="商品" />
<el-table-column prop="originalPrice" label="原价" width="100" />
<el-table-column label="活动价" width="140">
<el-table
v-if="form.promotionGoodsList.length"
:data="form.promotionGoodsList"
border
class="mt_10 flash-discount-goods-table"
>
<el-table-column prop="goodsName" label="商品" width="180" show-overflow-tooltip />
<el-table-column prop="originalPrice" label="原价" width="90" align="center" />
<el-table-column label="活动价" width="150" align="center">
<template #default="{ row }">
<el-input-number v-model="row.price" :min="0.01" :precision="2" />
<el-input-number v-model="row.price" :min="0.01" :precision="2" size="small" />
</template>
</el-table-column>
</el-table>
@@ -83,9 +95,18 @@ export default {
submit() {
const payload = { ...this.form };
if (payload.rangeTime && payload.rangeTime.length === 2) {
payload.startTime = payload.rangeTime[0];
payload.endTime = payload.rangeTime[1];
const start =
payload.rangeTime[0] instanceof Date
? payload.rangeTime[0]
: new Date(payload.rangeTime[0]);
const end =
payload.rangeTime[1] instanceof Date
? payload.rangeTime[1]
: new Date(payload.rangeTime[1]);
payload.startTime = this.$filters.unixToDate(start.getTime() / 1000);
payload.endTime = this.$filters.unixToDate(end.getTime() / 1000);
}
delete payload.rangeTime;
const req = payload.id ? editFlashDiscount(payload) : saveFlashDiscount(payload);
req.then((res) => {
if (res.success) {
@@ -101,4 +122,16 @@ export default {
<style scoped>
.tip { margin-left: 8px; color: #999; }
.mt_10 { margin-top: 10px; }
:deep(.flash-discount-range-picker.el-date-editor--datetimerange) {
width: 380px;
max-width: 380px;
flex-grow: 0;
--el-date-editor-width: 380px;
}
.flash-discount-goods-table {
width: fit-content;
max-width: 100%;
}
</style>

29
seller/src/views/promotion/nth-item-discount/nth-item-discount-add.vue
View File

@@ -6,7 +6,14 @@
<el-input v-model="form.promotionName" style="width: 320px" />
</el-form-item>
<el-form-item label="活动时间" required>
<el-date-picker v-model="form.rangeTime" type="datetimerange" style="width: 360px" />
<el-date-picker
v-model="form.rangeTime"
class="nth-item-range-picker"
type="datetimerange"
format="YYYY-MM-DD HH:mm:ss"
start-placeholder="开始时间"
end-placeholder="结束时间"
/>
</el-form-item>
<el-form-item label="第N件" required>
<el-input-number v-model="form.nthNum" :min="2" />
@@ -92,9 +99,18 @@ export default {
submit() {
const payload = { ...this.form };
if (payload.rangeTime && payload.rangeTime.length === 2) {
payload.startTime = payload.rangeTime[0];
payload.endTime = payload.rangeTime[1];
const start =
payload.rangeTime[0] instanceof Date
? payload.rangeTime[0]
: new Date(payload.rangeTime[0]);
const end =
payload.rangeTime[1] instanceof Date
? payload.rangeTime[1]
: new Date(payload.rangeTime[1]);
payload.startTime = this.$filters.unixToDate(start.getTime() / 1000);
payload.endTime = this.$filters.unixToDate(end.getTime() / 1000);
}
delete payload.rangeTime;
const req = payload.id ? editNthItemDiscount(payload) : saveNthItemDiscount(payload);
req.then((res) => {
if (res.success) {
@@ -110,4 +126,11 @@ export default {
<style scoped>
.tip { margin-left: 8px; color: #999; }
.mt_10 { margin-top: 10px; }
:deep(.nth-item-range-picker.el-date-editor--datetimerange) {
width: 380px;
max-width: 380px;
flex-grow: 0;
--el-date-editor-width: 380px;
}
</style>