Skip to content

Commit 9d0e77b

Browse files
committed
【功能修复】商城:指定发卷、新人卷,支持无限发放的兜底
1 parent 8d11659 commit 9d0e77b

File tree

3 files changed

+22
-2
lines changed

3 files changed

+22
-2
lines changed

src/views/mall/promotion/coupon/formatter.ts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,19 @@ export const validityTypeFormat = (row: CouponTemplateVO) => {
3333
return '未知【' + row.validityType + '】'
3434
}
3535

36+
// 格式化【totalCount】
37+
export const totalCountFormat = (row: CouponTemplateVO) => {
38+
if (row.totalCount === -1) {
39+
return '不限制'
40+
}
41+
return row.totalCount
42+
}
43+
3644
// 格式化【剩余数量】
3745
export const remainedCountFormat = (row: CouponTemplateVO) => {
46+
if (row.totalCount === -1) {
47+
return '不限制'
48+
}
3849
return row.totalCount - row.takeCount
3950
}
4051

src/views/mall/promotion/coupon/template/CouponTemplateForm.vue

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@
115115
<el-radio-group v-model="formData.takeType">
116116
<el-radio :key="1" :value="1">直接领取</el-radio>
117117
<el-radio :key="2" :value="2">指定发放</el-radio>
118+
<el-radio :key="2" :value="3">新人卷</el-radio>
118119
</el-radio-group>
119120
</el-form-item>
120121
<el-form-item v-if="formData.takeType === 1" label="发放数量" prop="totalCount">
@@ -309,7 +310,9 @@ const submitForm = async () => {
309310
validEndTime:
310311
formData.value.validTimes && formData.value.validTimes.length === 2
311312
? formData.value.validTimes[1]
312-
: undefined
313+
: undefined,
314+
totalCount: formData.value.takeType === 1 ? formData.value.totalCount : -1,
315+
takeLimitCount: formData.value.takeType === 1 ? formData.value.takeLimitCount : -1
313316
} as unknown as CouponTemplateApi.CouponTemplateVO
314317
315318
// 设置商品范围

src/views/mall/promotion/coupon/template/index.vue

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,12 @@
109109
prop="validityType"
110110
width="185"
111111
/>
112-
<el-table-column align="center" label="发放数量" prop="totalCount" />
112+
<el-table-column
113+
:formatter="totalCountFormat"
114+
align="center"
115+
label="发放数量"
116+
prop="totalCount"
117+
/>
113118
<el-table-column
114119
:formatter="remainedCountFormat"
115120
align="center"
@@ -189,6 +194,7 @@ import {
189194
discountFormat,
190195
remainedCountFormat,
191196
takeLimitCountFormat,
197+
totalCountFormat,
192198
validityTypeFormat
193199
} from '@/views/mall/promotion/coupon/formatter'
194200

0 commit comments

Comments
 (0)