Commit 9799254f by 吕明尚

优惠卷赠送功能

parent 694155ba
...@@ -321,7 +321,7 @@ ...@@ -321,7 +321,7 @@
<script> <script>
import { listConsumer, getConsumer, delConsumer, addConsumer, updateConsumer } from "@/api/system/consumer"; import { listConsumer, getConsumer, delConsumer, addConsumer, updateConsumer } from "@/api/system/consumer";
import {listCoupon} from "../../../api/system/coupon"; import {listDuration} from "../../../api/system/coupon";
import {give} from "../../../api/system/consumerCoupon"; import {give} from "../../../api/system/consumerCoupon";
export default { export default {
...@@ -402,7 +402,7 @@ export default { ...@@ -402,7 +402,7 @@ export default {
}); });
}, },
getCouponList() { getCouponList() {
listCoupon(this.couponQueryParams).then(response => { listDuration(this.couponQueryParams).then(response => {
this.couponList = response.rows; this.couponList = response.rows;
this.couponTotal = response.total; this.couponTotal = response.total;
}); });
......
...@@ -237,7 +237,7 @@ ...@@ -237,7 +237,7 @@
<!-- <span>{{ parseTime(scope.row.deleteTime, '{y}-{m}-{d}') }}</span>--> <!-- <span>{{ parseTime(scope.row.deleteTime, '{y}-{m}-{d}') }}</span>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<!-- <el-table-column label="备注" align="center" prop="remark"/>--> <el-table-column label="说明" align="center" prop="remark"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- <el-button--> <!-- <el-button-->
......
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="数量" align="center" prop="number"/> <el-table-column label="数量" align="center" prop="number"/>
<el-table-column label="备注" align="center" prop="remark"/> <el-table-column label="说明" align="center" prop="remark"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -188,7 +188,7 @@ ...@@ -188,7 +188,7 @@
<el-input v-model="form.name" placeholder="请输入优惠券名称"/> <el-input v-model="form.name" placeholder="请输入优惠券名称"/>
</el-form-item> </el-form-item>
<el-form-item label="优惠券类型" prop="couponType"> <el-form-item label="优惠券类型" prop="couponType">
<el-select v-model="form.couponType" placeholder="请选择优惠券类型"> <el-select v-model="form.couponType" placeholder="请选择优惠券类型" disabled>
<el-option <el-option
v-for="dict in dict.type.duration_coupon_type" v-for="dict in dict.type.duration_coupon_type"
:key="dict.value" :key="dict.value"
...@@ -201,7 +201,7 @@ ...@@ -201,7 +201,7 @@
<el-input-number v-model="form.duration" :min="0" :max="24" placeholder="请输入时长"/> <el-input-number v-model="form.duration" :min="0" :max="24" placeholder="请输入时长"/>
</el-form-item> </el-form-item>
<el-form-item label="平台类型" prop="platformType"> <el-form-item label="平台类型" prop="platformType">
<el-select v-model="form.platformType" placeholder="请选择平台类型" clearable> <el-select v-model="form.platformType" placeholder="请选择平台类型" clearable disabled>
<el-option <el-option
:key="1" :key="1"
label="自营" label="自营"
...@@ -253,7 +253,7 @@ ...@@ -253,7 +253,7 @@
<el-input-number v-model="form.number" :min="0" :max="9999" label="优惠卷数量"/> <el-input-number v-model="form.number" :min="0" :max="9999" label="优惠卷数量"/>
<!-- <el-input v-model="form.number" type="textarea" placeholder="请输入数量" />--> <!-- <el-input v-model="form.number" type="textarea" placeholder="请输入数量" />-->
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remark"> <el-form-item label="说明" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/> <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
</el-form-item> </el-form-item>
...@@ -413,6 +413,8 @@ export default { ...@@ -413,6 +413,8 @@ export default {
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.reset(); this.reset();
this.form.platformType = 1;
this.form.couponType = 4;
this.open = true; this.open = true;
this.title = "添加优惠券"; this.title = "添加优惠券";
}, },
......
...@@ -134,8 +134,8 @@ ...@@ -134,8 +134,8 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="数量" align="center" prop="number"/> <!-- <el-table-column label="数量" align="center" prop="number"/>-->
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="说明" align="center" prop="remark"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -172,7 +172,7 @@ ...@@ -172,7 +172,7 @@
<el-input v-model="form.name" placeholder="请输入优惠券名称" /> <el-input v-model="form.name" placeholder="请输入优惠券名称" />
</el-form-item> </el-form-item>
<el-form-item label="优惠券类型" prop="couponType"> <el-form-item label="优惠券类型" prop="couponType">
<el-select v-model="form.couponType" placeholder="请选择优惠券类型"> <el-select v-model="form.couponType" placeholder="请选择优惠券类型" disabled>
<el-option <el-option
v-for="dict in dict.type.cash_coupon_type" v-for="dict in dict.type.cash_coupon_type"
:key="dict.value" :key="dict.value"
...@@ -185,7 +185,8 @@ ...@@ -185,7 +185,8 @@
<!-- <el-input-number v-model="form.duration" :min="0" :max="24" placeholder="请输入时长"/>--> <!-- <el-input-number v-model="form.duration" :min="0" :max="24" placeholder="请输入时长"/>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="平台类型" prop="platformType"> <el-form-item label="平台类型" prop="platformType">
<el-select v-model="form.platformType" placeholder="请选择平台类型" clearable> <!--输入框 显示美团 值为2-->
<el-select v-model="form.platformType" placeholder="请选择平台类型" clearable disabled>
<el-option <el-option
key="2" key="2"
label="美团" label="美团"
...@@ -217,11 +218,11 @@ ...@@ -217,11 +218,11 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="数量" prop="number"> <!-- <el-form-item label="数量" prop="number">-->
<el-input-number v-model="form.number" :min="0" :max="9999" label="优惠卷数量"/> <!-- <el-input-number v-model="form.number" :min="0" :max="9999" label="优惠卷数量"/>-->
<!-- <el-input v-model="form.number" type="textarea" placeholder="请输入数量" />--> <!-- &lt;!&ndash; <el-input v-model="form.number" type="textarea" placeholder="请输入数量" />&ndash;&gt;-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="备注" prop="remark"> <el-form-item label="说明" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" /> <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item> </el-form-item>
...@@ -385,6 +386,9 @@ export default { ...@@ -385,6 +386,9 @@ export default {
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.reset(); this.reset();
this.form.platformType = "2"
this.form.couponType = 2
this.open = true; this.open = true;
this.title = "添加优惠券"; this.title = "添加优惠券";
}, },
...@@ -394,6 +398,7 @@ export default { ...@@ -394,6 +398,7 @@ export default {
const id = row.id || this.ids const id = row.id || this.ids
getCoupon(id).then(response => { getCoupon(id).then(response => {
this.form = response.data; this.form = response.data;
this.form.platformType = "2";
if (response.data.orderType) { if (response.data.orderType) {
this.form.orderType = response.data.orderType.toString(); this.form.orderType = response.data.orderType.toString();
} }
...@@ -415,6 +420,9 @@ export default { ...@@ -415,6 +420,9 @@ export default {
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
if (this.form.id != null) { if (this.form.id != null) {
if (this.form.platformType === "美团") {
this.form.platformType = 2
}
updateCoupon(this.form).then(response => { updateCoupon(this.form).then(response => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.open = false; this.open = false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment