Skip to content

I
integral-mall
Commit f0363dec by damodmg
Options

更新功能

parent 5841645c
Showing with 22 additions and 21 deletions
dist/index.html
......@@ -2,4 +2,4 @@
gio('init','8be12240a3749eab', {});
//custom page code begin here
//custom page code end here
gio('send');</script><link href=./static/css/app.aa4551687ed7173f3d427e019e6ca57f.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.35.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.12.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/card.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.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.18.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.9072594f61a88f768c70.js></script><script type=text/javascript src=./static/js/app.55cdee07adf736786679.js></script></body></html>
\ No newline at end of file
gio('send');</script><link href=./static/css/app.c1571c326209698ffb1235b801fb33e0.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.35.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.12.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/card.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.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.18.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.9072594f61a88f768c70.js></script><script type=text/javascript src=./static/js/app.22354a364b02b3cee048.js></script></body></html>
\ No newline at end of file
dist/static/js/app.22354a364b02b3cee048.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.55cdee07adf736786679.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/goods/gift/info.vue
......@@ -1103,8 +1103,6 @@ export default {
return false;
}
/*eslint-disable*/
console.log(file);
console.log(file.type);
if (file.type !== 'image/jpeg' && file.type !== 'image/png' && file.type !== 'image/jpg' && file.type !== 'image/gif') {
this.$message.error('请上传jpg，png，gif格式的图片');
return false;
......@@ -1434,8 +1432,6 @@ export default {
giftImageFiledCodes.push(item.imageCode);
}
}
return false
//校验规格明细
if (this.giftProStandardJson) {
for (let item of this.giftProStandardJson) {
......@@ -1578,6 +1574,7 @@ export default {
memberGrade: this.giftForm.memberGrade.join(','), //适用会员
showStore: this.sendChildData.storeType, // 显示门店 0所有 1部分分类 2部分门店
storeIds: '', //展现门店id
storeWidgetId:'',
limitTimes: this.giftForm.limitTimesStatus ? this.giftForm.limitTimes : '-1', //限兑
exchangeDateType: this.giftForm.exchangeDateType, //兑换日期
exchangeFixDateBegin: this.giftForm.exchangeDateType === 2 ? this.getTime(this.giftForm.exchangeFixDate[0]) : '', //固定日期
......@@ -1606,21 +1603,25 @@ export default {
// responseParams: this.responseParams.length ? this.responseParams : null
};
// 门店分类
if (this.sendChildData.storeType === 1) {
if (this.sendChildData.storeGroupIds) {
params.storeGroupIds = this.sendChildData.storeGroupIds || '';
} else {
this.$message.error('门店分类不能为空');
return;
}
} else if (this.sendChildData.storeType === 2) {
if (this.sendChildData.storeIds.length) {
params.storeIds = this.sendChildData.storeIds.map(v => v.storeId).join(',');
} else {
params.storeIds = '';
this.$message.error('部分门店不能为空');
return;
if(this.useNewStoreWidget===0) {
if (this.sendChildData.storeType === 1) {
if (this.sendChildData.storeGroupIds) {
params.storeGroupIds = this.sendChildData.storeGroupIds || '';
} else {
this.$message.error('门店分类不能为空');
return;
}
} else if (this.sendChildData.storeType === 2) {
if (this.sendChildData.storeIds.length) {
params.storeIds = this.sendChildData.storeIds.map(v => v.storeId).join(',');
} else {
params.storeIds = '';
this.$message.error('部分门店不能为空');
return;
}
}
}else if(this.useNewStoreWidget===0){
params.storeWidgetId = this.uuid
}
// 部分时段时间转换
let timeLink = [];
......
src/views/setting/deliverSet.vue
......@@ -120,7 +120,7 @@ export default {
// 导出
dialogVisible: false,
excelUrl: '/api-integral-mall/pick-up-points-excel',
params: { search: '', dataType: 2 },
params: { search: '', dataType: 2, params: 'integral-mall' },
projectName: 'integral-mall'
};
},
......
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