bug修改

This commit is contained in:
mabo
2021-07-07 15:34:38 +08:00
parent fc393ecd64
commit 1246810c01
19 changed files with 144 additions and 151 deletions

View File

@@ -79,13 +79,11 @@ export default {
{
title: "活动名称",
key: "promotionName",
minWidth: 100,
fixed: "left",
},
{
title: "优惠券名称",
key: "couponName",
minWidth: 100,
tooltip: true,
},
{
@@ -107,18 +105,16 @@ export default {
{
title: "领取数量/总数量",
key: "publishNum",
width: 130,
render: (h, params) => {
return h(
"div",
params.row.receivedNum + "/" + params.row.publishNum
params.row.receivedNum + "/" + (params.row.publishNum === 0 ? '无限制' : params.row.publishNum)
);
},
},
{
title: "优惠券类型",
key: "couponType",
width: 120,
render: (h, params) => {
let text = "未知";
if (params.row.couponType === "DISCOUNT") {
@@ -195,8 +191,7 @@ export default {
text
),
]);
},
minWidth: 70,
}
},
{
title: "操作",

View File

@@ -180,11 +180,11 @@ export default {
],
publishNum: [
{ required: true, message: "请输入发放数量" },
{ pattern: regular.integer, message: "请输入正整数" },
{ pattern: regular.Integer, message: "请输入正整数" },
],
couponLimitNum: [
{ required: true, message: "请输入领取限制" },
{ pattern: regular.integer, message: "请输入正整数" },
{ pattern: regular.Integer, message: "请输入正整数" },
],
description: [{ required: true, message: "请输入范围描述" }],
},

View File

@@ -277,6 +277,7 @@ export default {
// 将数据回调到liveform里面
if (result.success) {
console.log(result);
let data = result.result;
for (let key in data) {
this.liveForm[key] = data[key];
@@ -494,11 +495,12 @@ export default {
this.$refs["liveForm"].validate((valid) => {
if (valid) {
// 需判断当前是否是添加商品
if (this.$route.query.id && this.liveData.length != 0) {
if (this.$route.query.id) {
this.spinShow = true;
this.liveForm.commodityList = JSON.stringify(
this.liveForm.commodityList
);
delete this.liveForm.updateTime
// 将当前直播间修改
editLive(this.liveForm).then((res) => {
if (res.success) {