Skip to content

M
marketing
Commit 94fb7d71 by zhangmeng
Options

add:修改了卡券适用渠道的问题

parent 003ba943
Showing with 10 additions and 7 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.f61937149cff0e4d1a8617107f5f1958.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/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.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/store.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/member-group.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/confirm-people.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.08.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.02.js></script><script type=text/javascript src=/marketing/static/js/manifest.0a85049e489e85ac5f0a.js></script><script type=text/javascript src=/marketing/static/js/vendor.b95f77e8a57f632ca3ef.js></script><script type=text/javascript src=/marketing/static/js/app.adec24bd73b5594d327e.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.f61937149cff0e4d1a8617107f5f1958.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/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.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/store.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/member-group.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/confirm-people.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.08.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.02.js></script><script type=text/javascript src=/marketing/static/js/manifest.0a85049e489e85ac5f0a.js></script><script type=text/javascript src=/marketing/static/js/vendor.b95f77e8a57f632ca3ef.js></script><script type=text/javascript src=/marketing/static/js/app.0a24644100cca6d91363.js></script></body></html>
\ No newline at end of file
src/views/card/form.js
......@@ -164,14 +164,19 @@ export default {
}
if (res.errorCode === 0) {
// 拉取卡券适用渠道的列表
this.cardApplyChannelOptions = res.result.systemCoupChannelList;
if (this.isAdd) {
this.cardApplyChannelOptions = res.result.systemCoupChannelList;
} else {
this.cardApplyChannelOptions = res.result.allChannelList;
}
//处理有效期下拉选项
const dicMap = res.result.dicMap;
this.startDayOptions = Object.keys(dicMap).map(key => ({ label: dicMap[key].dictName == '0' ? '当天' : '第' + dicMap[key].dictName + '天', value: parseInt(dicMap[key].dictName) }));
if (res.result.card) {
const card = res.result.card;
this.storeMode = card.storeMode === 0 ? 0 : 1;
this.form.cardApplyChannel = card.cardApplyChannel.split(',') || [];
this.form.cardApplyChannel = card.cardApplyChannel ? card.cardApplyChannel.split(',') : [];
// this.form.cardApplyChannel = _cardApplyChannel.filter(v => this.cardApplyChannelOptions.map(v => v.value).indexOf(v) > -1);
this.form.auditingStatus = card.auditingStatus || '';
this.form.coupCardId = this.isCopy ? '' : card.coupCardId;
this.form.cardType = card.cardType;
......
src/views/card/list.vue
......@@ -68,7 +68,6 @@ export default {
},
//修改库存后台异步 所以这边延迟刷新列表
delayRefresh(val) {
console.log(val);
this.currentCard.couponStock = val;
},
sortList(val) {
......
src/views/card/record-get.vue
......@@ -93,7 +93,7 @@ export default {
formateDateTimeByType,
dateTime: [Date.now() - 30 * 24 * 60 * 60 * 1000, Date.now()],
dateTime2: ['', ''],
cardStatusOptions: [{ value: '', label: '全部卡券状态' }, { value: 4, label: '待核销' }, { value: 5, label: '已核销' }, { value: 6, label: '已过期' }, { value: 7, label: '已销毁' }],
cardStatusOptions: [{ value: '', label: '全部卡券状态' }, { value: 4, label: '待核销' }, { value: 5, label: '已核销' }, { value: 6, label: '已过期' }, { value: 7, label: '已销毁' }, { value: 8, label: '已占用' }],
recordLoading: false,
recordList: [],
listParams: {
......
src/views/ecm/current-list.vue
......@@ -189,7 +189,6 @@ export default {
},
// 导出
exportCurrentSendDetails() {
alert(1);
this.dialogVisible = true;
this.excelUrl = exportCurrentSendDetails;
this.formatterTimeFunc();
......
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