Compare commits

..

No commits in common. "1e149f7e41ba7abd1726da39802c96102e4ae439" and "aca3767a2434484772534ab57f586ce6d5281014" have entirely different histories.

2 changed files with 3 additions and 48 deletions

View File

@ -22,8 +22,8 @@ async function getCouponList(page) {
return Vue.axios.get('/can/coupon?page=' + (page - 1) + "&size=20");
}
async function generateCoupon(couponName, couponType, can, validity, isMultipleUse, couponNumberCount) {
const request = {couponName, couponType, can, validity: validity + ' 23:59:59', isMultipleUse, couponNumberCount};
async function generateCoupon(couponName, can, validity, isMultipleUse, couponNumberCount) {
const request = {couponName, can, validity: validity + ' 23:59:59', isMultipleUse, couponNumberCount};
return Vue.axios.post('/can/coupon', request);
}

View File

@ -14,7 +14,7 @@
<v-col>
<v-btn
block
color="#3bb9f1"
color="#9970ff"
dark
depressed
@click="showWriteDialog"
@ -42,10 +42,6 @@
<span @click="getCouponNumberList(item)">{{ item.couponName }}</span>
</template>
<template v-slot:item.couponType="{ item }">
{{ item.couponType }}
</template>
<template v-slot:item.can="{ item }">
{{ item.can.toLocaleString('en-US') }}
</template>
@ -136,38 +132,6 @@
label="발행수량"
/>
</v-card-text>
<v-card-text>
<v-row align="center">
<v-col cols="4">
쿠폰종류
</v-col>
<v-col
cols="8"
class="datepicker-wrapper"
>
<v-row>
<v-col>
<input
id="can_coupon"
v-model="coupon_type"
type="radio"
value="CAN"
>
<label for="can_coupon"> 쿠폰</label>
</v-col>
<v-col>
<input
id="point_coupon"
v-model="coupon_type"
type="radio"
value="POINT"
>
<label for="point_coupon"> 포인트 쿠폰</label>
</v-col>
</v-row>
</v-col>
</v-row>
</v-card-text>
<v-card-text>
<v-row align="center">
<v-col cols="4">
@ -409,7 +373,6 @@ export default {
is_active: null,
is_multiple_use: false,
coupon_number_count: null,
coupon_type: 'CAN',
page: 1,
total_page: 0,
@ -451,12 +414,6 @@ export default {
sortable: false,
value: 'couponName',
},
{
text: '쿠폰종류',
align: 'center',
sortable: false,
value: 'couponType',
},
{
text: '쿠폰금액',
align: 'center',
@ -585,7 +542,6 @@ export default {
this.is_active = null
this.is_multiple_use = false
this.coupon_number_count = null
this.coupon_type = 'CAN'
},
showModifyDialog(value) {
@ -672,7 +628,6 @@ export default {
try {
const res = await api.generateCoupon(
this.coupon_name,
this.coupon_type,
this.can,
this.validity,
this.is_multiple_use,