Skip to content

M
marketing
Commit a5460ebd by zhangmeng
Options

积分商城 bug

parent 009d1f1d
Showing with 41 additions and 25 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/marketing/static/css/app.839d8ec914e09f595f9b1b82f34c427d.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/marketing/static/js/manifest.0a85049e489e85ac5f0a.js></script><script type=text/javascript src=/marketing/static/js/vendor.ccb4bd422cd76a080cba.js></script><script type=text/javascript src=/marketing/static/js/app.21767517c893702bbb3c.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/marketing/static/css/app.839d8ec914e09f595f9b1b82f34c427d.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/marketing/static/js/manifest.0a85049e489e85ac5f0a.js></script><script type=text/javascript src=/marketing/static/js/vendor.ccb4bd422cd76a080cba.js></script><script type=text/javascript src=/marketing/static/js/app.b45a645e3ccc85b0643f.js></script></body></html>
\ No newline at end of file
src/views/mall/coupon/info.js
......@@ -77,6 +77,7 @@ export default {
this.form.integralMallProId = result.integralMallProId || '';
this.form.proReferId = result.proReferId || '';
this.form.proName = result.proName || '';
this.form.virtualStock = result.virtualStock || 0;
this.form.integralCost = result.integralCost || 0;
this.form.cashCost = result.cashCost || 0;
this.form.memberGradeArr = result.memberGrade?result.memberGrade.split(','):[];
......@@ -90,10 +91,6 @@ export default {
this.form.exchangeDateDayArr = result.exchangeDateDay ? result.exchangeDateDay.split(',') : [];
this.form.exchangeDateWeekArr = result.exchangeDateWeek ? result.exchangeDateWeek.split(',').filter(v => v) : [];
this.form.limitTimeBegin = result.limitTimeBegin || '';
this.form.virtualStock = result.virtualStock || 0;
// result.showStore = 2;
this.sendChildData.storeType = result.showStore || 0;
......@@ -142,10 +139,11 @@ export default {
// 获取卡券组件回调的对象
getCardActiveObjFun(val) {
console.log(val)
this.form.virtualStock = val.couponStock || 0;
this.form.proReferId = val.coupCardId || '';
this.form.proName = val.cardName || '';
if (val.coupCardId) {
this.form.virtualStock = val.couponStock || 0;
this.form.proReferId = val.coupCardId || '';
this.form.proName = val.cardName || '';
}
},
addTimeRange() {
let length = this.timeRangeList.length;
......@@ -185,8 +183,13 @@ export default {
// 判断 兑换日期
if (params.exchangeDateType === 2) {
params.exchangeFixDateBegin = formateDateTimeByType(this.exchangeFixDate[0],'yyyy-MM-dd-HH-mm-ss');
params.exchangeFixDateEnd = formateDateTimeByType(this.exchangeFixDate[1],'yyyy-MM-dd-HH-mm-ss');
if (this.form.exchangeFixDate) {
params.exchangeFixDateBegin = formateDateTimeByType(this.form.exchangeFixDate[0],'yyyy-MM-dd-HH-mm-ss');
params.exchangeFixDateEnd = formateDateTimeByType(this.form.exchangeFixDate[1],'yyyy-MM-dd-HH-mm-ss');
} else {
this.$tips({type:'warning',message:'兑换固定日期不能为空'});
return;
}
} else if (params.exchangeDateType === 3) {
params.exchangeDateDay = this.form.exchangeDateDayArr.length > 0 ? this.form.exchangeDateDayArr.join(','):'';
} else if (params.exchangeDateType === 4) {
......@@ -205,21 +208,24 @@ export default {
}
})
if (flag) {
this.$tips({message:'兑换时段不能为空'});
this.$tips({message:'部分时段未填写完整'});
return;
}
params.timeZones = list.length?list.join('#'):'';
// 如果数组为1的话也要传 #分割
if (list.length === 1) {
params.timeZones = list[0] +'#';
} else {
params.timeZones = list.length?list.join('#'):'';
}
}
// 判断发送时间
if (params.releaseType === 2) {
this.limitTimeBegin = this.form.exchangeDateWeekArr.length > 0 ? this.form.exchangeDateWeekArr.join(','):'';
params.limitTimeBegin = formateDateTimeByType(this.form.limitTimeBegin,'yyyy-MM-dd-HH-mm-ss');
}
// 门店分组 todo
// 门店分组
if (this.sendChildData.storeType === 1) {
if (this.sendChildData.storeGroupIds) {
params.storeGroupIds = this.sendChildData.storeGroupIds || '';
......
src/views/mall/gift/info.js
......@@ -233,13 +233,18 @@ export default {
storeIds:'', // 选中的门店信息，多个逗号拼接
giftImageUrls:this.form.giftImg.imgUrl, // 礼品图片
giftImageFiledCodes:this.form.giftImg.code, // 礼品图片编码
virtualStock:this.form.changeType ===1 ? this.form.weChatVirtualStock : this.form.virtualStock, //库存
virtualStock:this.form.changeType === 1 ? this.form.weChatVirtualStock : this.form.virtualStock, //库存
}
// 判断 兑换日期
if (params.exchangeDateType === 2) {
params.exchangeFixDateBegin = formateDateTimeByType(this.exchangeFixDate[0],'yyyy-MM-dd-HH-mm-ss');
params.exchangeFixDateEnd = formateDateTimeByType(this.exchangeFixDate[1],'yyyy-MM-dd-HH-mm-ss');
if (this.form.exchangeFixDate) {
params.exchangeFixDateBegin = formateDateTimeByType(this.form.exchangeFixDate[0],'yyyy-MM-dd-HH-mm-ss');
params.exchangeFixDateEnd = formateDateTimeByType(this.form.exchangeFixDate[1],'yyyy-MM-dd-HH-mm-ss');
} else {
this.$tips({type:'warning',message:'兑换固定日期不能为空'});
return;
}
} else if (params.exchangeDateType === 3) {
params.exchangeDateDay = this.form.exchangeDateDayArr.length > 0 ? this.form.exchangeDateDayArr.join(','):'';
} else if (params.exchangeDateType === 4) {
......@@ -258,10 +263,15 @@ export default {
}
})
if (flag) {
this.$tips({message:'兑换时段不能为空'});
this.$tips({message:'部分时段未填写完整'});
return;
}
params.timeZones = list.length?list.join('#'):'';
// 如果数组为1的话也要传 #分割
if (list.length === 1) {
params.timeZones = list[0] +'#';
} else {
params.timeZones = list.length?list.join('#'):'';
}
}
......@@ -269,10 +279,10 @@ export default {
// 判断发送时间
if (params.releaseType === 2) {
this.limitTimeBegin = this.form.exchangeDateWeekArr.length > 0 ? this.form.exchangeDateWeekArr.join(','):'';
params.limitTimeBegin = formateDateTimeByType(this.form.limitTimeBegin,'yyyy-MM-dd-HH-mm-ss');
}
// 门店分组 todo
// 门店分组
if (this.sendChildData.storeType === 1) {
if (this.sendChildData.storeGroupIds) {
params.storeGroupIds = this.sendChildData.storeGroupIds || '';
......
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