Skip to content

I
integral-mall
Commit 4e589897 by damodmg
Options

提交后台增加的cardType字段

parent 3b046264
Showing with 21 additions and 5 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=/integral-mall/static/css/app.b872e63d75aaecb49d4311495648175a.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/integral-mall/static/js/manifest.003beacb9c9ae622c7f2.js></script><script type=text/javascript src=/integral-mall/static/js/vendor.b2d5add275329279664d.js></script><script type=text/javascript src=/integral-mall/static/js/app.99964bf2a2583ea9de7c.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=/integral-mall/static/css/app.b872e63d75aaecb49d4311495648175a.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/integral-mall/static/js/manifest.003beacb9c9ae622c7f2.js></script><script type=text/javascript src=/integral-mall/static/js/vendor.b2d5add275329279664d.js></script><script type=text/javascript src=/integral-mall/static/js/app.7213b19d1d57df67a4c4.js></script></body></html>
\ No newline at end of file
dist/static/js/app.7213b19d1d57df67a4c4.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.99964bf2a2583ea9de7c.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/mall/coupon/info.js
......@@ -10,6 +10,8 @@ export default {
form: {
integralMallProId: '',
proReferId: '',
cardType:0,
cardName:'',
proName: '', // String 商品名字，优惠券就是所选券的名字。 (必填)
integralCost: 0, // Number 100 积分费用 (必填)
cashCost: 0, // Number 现金费用，两位小数
......@@ -93,6 +95,10 @@ 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.cardType = result.cardType
console.log('333333',this.form.cardType)
// result.showStore = 2;
this.sendChildData = {
......@@ -142,7 +148,9 @@ export default {
},
// 获取卡券组件回调的对象
getCardActiveObjFun(val) {
console.log(val)
if (val.hasOwnProperty('cardType')) {
this.form.cardType = val.cardType
}
if (val.coupCardId && this.isAdd) {
this.form.virtualStock = val.couponStock || 0;
this.form.proReferId = val.coupCardId || '';
......@@ -178,7 +186,7 @@ export default {
this.$tips({ type: 'warning', message: '请选择优惠券' });
return;
}
console.log(4444444,this.form.cardType)
console.log(this.timeRangeList)
let params = {
integralMallProId: this.form.integralMallProId || '',
......@@ -200,7 +208,10 @@ export default {
virtualStock: this.form.virtualStock || 0, //库存
cardType :this.form.cardType
}
console.log(22222,params)
// 判断 兑换日期
if (params.exchangeDateType === 2) {
......
src/views/mall/gift/info.js
......@@ -33,7 +33,7 @@ export default {
proShowStatus: 1,
changeType: 2, // Number 兑换方式1:微信兑换 2:快递发货 3:在线发货
releaseType: 1,
cardType:0,
exchangeFixDate: ['', ''], // exchangeFixDateBegin // exchangeFixDateEnd,
exchangeDateDayArr: [],
exchangeDateWeekArr: [],
......@@ -179,6 +179,7 @@ export default {
this.form.limitTimeBegin = result.limitTimeBegin || '';
this.form.weChatVirtualStock = this.form.virtualStock = result.virtualStock || 0;
this.form.detailDescription=result.detailDescription//图文详情的数据
this.form.cardType = result.cardType
// result.showStore = 2;
this.sendChildData = {
......@@ -231,6 +232,9 @@ export default {
},
// 获取卡券组件回调的对象
getCardActiveObjFun(val) {
if (val.hasOwnProperty('cardType')) {
this.form.cardType = val.cardType
}
if (this.isAdd) {
this.form.weChatVirtualStock = val.couponStock || 0;
this.form.proReferId = val.coupCardId || '';
......@@ -313,6 +317,7 @@ export default {
storeIds: '', // 选中的门店信息，多个逗号拼接
virtualStock: this.form.changeType === 1 ? this.form.weChatVirtualStock : this.form.virtualStock, //库存
detailDescription:this.form.detailDescription,//图文详情
cardType :this.form.cardType
}
......
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