Commit 718bf212 by 萱草

update: 更改

parent d1e18f30
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet type=text/css href=./static/css/iconfont.css><link rel=stylesheet type=text/css href=./static/css/common.css><link rel="shortcut icon" type=image/x-icon href=./static/img/favicon.ico><title>积分商城</title><link href=./static/css/app.56a6f39c8d337143110cd4f4aa99302e.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.45.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.15.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.41.js></script><script src=//web-1251519181.file.myqcloud.com/components/activity-select.1.0.2.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.71.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.19.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.15.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.26.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.30.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/member-group.2.2.28.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.175ccdf2bfbfc0694b7c.js></script><script type=text/javascript src=./static/js/app.e1a3f0f3632d1b03fd9c.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=stylesheet type=text/css href=./static/css/iconfont.css><link rel=stylesheet type=text/css href=./static/css/common.css><link rel="shortcut icon" type=image/x-icon href=./static/img/favicon.ico><title>积分商城</title><link href=./static/css/app.cc514eccbaaea45aadc90b92b9c66066.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.45.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.15.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.41.js></script><script src=//web-1251519181.file.myqcloud.com/components/activity-select.1.0.2.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.71.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.19.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.15.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.26.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.30.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/member-group.2.2.28.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.175ccdf2bfbfc0694b7c.js></script><script type=text/javascript src=./static/js/app.d4d8b07d847885231972.js></script></body></html>
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -269,6 +269,7 @@ export default {
},
projectName: 'integral-mall',
defaltSelected: [], // 默认穿梭窗已选入数据
memberLabelId: [],
height: 543, // 穿梭窗高度, 默认是543
// projectName: 'mall', // 默认是memberTag
headerList: ['isRealTime', 'latestUpdateTime', 'updateType', 'effectiveStatus', 'effectiveDate'], // 表头配置,默认全部,分组名称默认显示不可配置
......@@ -422,7 +423,7 @@ export default {
}
});
}
console.log(this.selectList);
// console.log(this.selectList);
this.loading = false;
} else {
this.$message.error(res.data.message);
......@@ -467,7 +468,7 @@ export default {
}
});
this.selectList = copy(this.selectListCopy);
console.log(this.selectList);
// console.log(this.selectList);
}
},
getRowKeys(row) {
......@@ -480,8 +481,6 @@ export default {
},
// 删除选择的数据
deleteSelectList(item, index) {
console.log(item);
console.log(index);
this.selectList.forEach((it, index) => {
if (it.integralMallProId === item.integralMallProId) {
this.selectList.splice(index, 1);
......@@ -498,7 +497,7 @@ export default {
},
// 开启和关闭修改实物礼品多规格sku
updateSkuStock(item) {
console.log(item);
// console.log(item);
this.skuStockDialog = true;
this.skuStockData = item;
},
......@@ -512,7 +511,6 @@ export default {
} else {
this.flashSaleForm.ignoreLimitFlag = 0;
}
console.log(this.flashSaleForm.ignoreLimitFlag);
},
// 秒杀活动名称字数限制
goodsLimit(value) {
......@@ -542,7 +540,6 @@ export default {
findFilter(value) {
// var that = this;
this.searchParams = value;
console.log(this.searchParams);
},
// 取消
cancelFilter() {
......@@ -633,11 +630,9 @@ export default {
// 保存
submitForm(flashSaleForm) {
if (this.selectList.length) {
console.log(this.selectList);
if (!this.isEdit) {
this.activityProList = [];
this.selectList.forEach((item, index) => {
// console.log(111);
this.activityProList.push({
activityExchangeLimit: item.activityExchangeLimit,
activityIntegral: item.activityIntegral,
......@@ -647,13 +642,8 @@ export default {
giftProId: item.integralMallProId,
activityProSkuList: []
});
// console.log(222);
if (item.children && item.children.length) {
// console.log(item.activityProSkuList);
console.log(this.activityProList[index].activityProSkuList);
item.children.forEach(it => {
// console.log(333);
// console.log(item.activityProSkuList);
this.activityProList[index].activityProSkuList.push({
activityExchangeLimit: it.activityExchangeLimit,
activityIntegral: it.activityIntegral,
......@@ -663,14 +653,12 @@ export default {
giftProId: item.integralMallProId,
giftProSkuId: it.integralMallProId
});
console.log(44);
});
}
});
} else {
this.activityProList = [];
this.selectList.forEach((item, index) => {
// console.log(111);
this.activityProList.push({
activityExchangeLimit: item.activityExchangeLimit,
activityIntegral: item.activityIntegral,
......@@ -681,13 +669,8 @@ export default {
activityProSkuList: [],
activityProId: item.activityProId
});
// console.log(222);
if (item.children && item.children.length) {
// console.log(item.activityProSkuList);
console.log(this.activityProList[index].activityProSkuList);
item.children.forEach(it => {
// console.log(333);
// console.log(item.activityProSkuList);
this.activityProList[index].activityProSkuList.push({
activityExchangeLimit: it.activityExchangeLimit,
activityIntegral: it.activityIntegral,
......@@ -698,12 +681,10 @@ export default {
giftProSkuId: it.integralMallProId,
activityProId: it.activityProId
});
console.log(44);
});
}
});
}
console.log(this.activityProList);
} else {
this.$message.error('请选择参加活动的商品');
return false;
......@@ -718,13 +699,11 @@ export default {
return false;
}
if (this.flashSaleForm.memberSearchType === 3) {
console.log(this.toggleTag, !this.getSaveData);
if (this.toggleTag && !this.getSaveData) {
this.$message.error('请选中人群筛选器的数据');
return false;
}
}
let memberLabelId;
// if (this.flashSaleForm.memberLabelType === 1) {
// memberLabelId = '';
// this.searchParams = '';
......@@ -742,11 +721,11 @@ export default {
// memberLabelId = '';
// }
if (this.flashSaleForm.memberLabelType === 2) {
memberLabelId = [];
let memberLabelIds = [];
for (let item of this.defaltSelected) {
memberLabelId.push(item.memberTagGroupId);
memberLabelIds.push(item.memberTagGroupId);
}
memberLabelId = memberLabelId.join(',');
this.memberLabelId = memberLabelIds.join(',');
}
if (!this.flashSaleForm.beginTime && !this.flashSaleForm.endTime) {
this.$message.error('请选择活动时间');
......@@ -767,6 +746,7 @@ export default {
memberSearchParams: this.flashSaleForm.memberSearchType === 1 ? '' : this.flashSaleForm.memberSearchType === 2 ? this.memberLabelId : this.flashSaleForm.memberSearchType === 3 ? this.searchParams : '', // 人群筛选器或会员分组数据
activityProList: this.activityProList
};
console.log(params);
if (!this.isEdit) {
let data = JSON.stringify(params);
let params2 = {
......
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