Skip to content

M
marketing
Commit 871a1e09 by chenxin
Options

fix: cdkey 优化

parent e3054630
Showing with 20 additions and 15 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/fonts/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link rel=stylesheet href=//web-1251519181.file.myqcloud.com/components/element.2.12.0.css><link href=/marketing/static/css/main.43d7c145af0f9cc362c8fe369b70cc24.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/components/element.2.12.0.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.36.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.12.js></script><script src=//web-1251519181.file.myqcloud.com/components/store.2.0.01.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.2.22.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/confirm-people.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.42.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/input.2.0.20.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/selector.1.2.1115.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script type=text/javascript src=/marketing/static/js/manifest.0dc6262d112e31d654b9.js></script><script type=text/javascript src=/marketing/static/js/vendor.b30a466c3b2d11195801.js></script><script type=text/javascript src=/marketing/static/js/main.639926e246003bf2a575.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/fonts/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link rel=stylesheet href=//web-1251519181.file.myqcloud.com/components/element.2.12.0.css><link href=/marketing/static/css/main.f81931e4f9bacdb7adbd37032a697e58.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/components/element.2.12.0.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.36.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.12.js></script><script src=//web-1251519181.file.myqcloud.com/components/store.2.0.01.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.2.22.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/confirm-people.2.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.42.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/input.2.0.20.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/selector.1.2.1115.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script type=text/javascript src=/marketing/static/js/manifest.a3278bc7a93fe39c77b1.js></script><script type=text/javascript src=/marketing/static/js/vendor.b30a466c3b2d11195801.js></script><script type=text/javascript src=/marketing/static/js/main.639926e246003bf2a575.js></script></body></html>
\ No newline at end of file
dist/static/js/manifest.0dc6262d112e31d654b9.js → dist/static/js/manifest.a3278bc7a93fe39c77b1.js
!function(e){var r=window.webpackJsonp;window.webpackJsonp=function(t,c,a){for(var f,i,u,d=0,s=[];d<t.length;d++)i=t[d],n[i]&&s.push(n[i][0]),n[i]=0;for(f in c)Object.prototype.hasOwnProperty.call(c,f)&&(e[f]=c[f]);for(r&&r(t,c,a);s.length;)s.shift()();if(a)for(d=0;d<a.length;d++)u=o(o.s=a[d]);return u};var t={},n={14:0};function o(r){if(t[r])return t[r].exports;var n=t[r]={i:r,l:!1,exports:{}};return e[r].call(n.exports,n,n.exports,o),n.l=!0,n.exports}o.e=function(e){var r=n[e];if(0===r)return new Promise(function(e){e()});if(r)return r[2];var t=new Promise(function(t,o){r=n[e]=[t,o]});r[2]=t;var c=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,o.nc&&a.setAttribute("nonce",o.nc),a.src=o.p+"static/js/"+({0:"card",1:"game",2:"wechat",3:"message",4:"ewash",5:"ecm",6:"evaluation",7:"activity",8:"cdKey",9:"recharge",10:"msg",11:"calllog"}[e]||e)+"."+{0:"f085cf8b307772907c51",1:"37c311477e2d45952ca2",2:"0927e95d3fe5b6f648da",3:"2d2ca8276e939c42e37e",4:"0f8f5a7e1a28450e55c7",5:"a2fc801fe903d3e1d38b",6:"a69c5c6513644d0f2537",7:"c9e4106934931698098b",8:"9d1a3cff1cd7a70fde34",9:"e8e771469c2137096ce5",10:"08d7348811ff689c70ac",11:"07f9326e2a68fd201646"}[e]+".js";var f=setTimeout(i,12e4);function i(){a.onerror=a.onload=null,clearTimeout(f);var r=n[e];0!==r&&(r&&r[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return a.onerror=a.onload=i,c.appendChild(a),t},o.m=e,o.c=t,o.d=function(e,r,t){o.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:t})},o.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(r,"a",r),r},o.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},o.p="/marketing/",o.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
!function(e){var r=window.webpackJsonp;window.webpackJsonp=function(t,c,a){for(var f,i,u,s=0,l=[];s<t.length;s++)i=t[s],n[i]&&l.push(n[i][0]),n[i]=0;for(f in c)Object.prototype.hasOwnProperty.call(c,f)&&(e[f]=c[f]);for(r&&r(t,c,a);l.length;)l.shift()();if(a)for(s=0;s<a.length;s++)u=o(o.s=a[s]);return u};var t={},n={14:0};function o(r){if(t[r])return t[r].exports;var n=t[r]={i:r,l:!1,exports:{}};return e[r].call(n.exports,n,n.exports,o),n.l=!0,n.exports}o.e=function(e){var r=n[e];if(0===r)return new Promise(function(e){e()});if(r)return r[2];var t=new Promise(function(t,o){r=n[e]=[t,o]});r[2]=t;var c=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,o.nc&&a.setAttribute("nonce",o.nc),a.src=o.p+"static/js/"+({0:"card",1:"game",2:"wechat",3:"message",4:"ewash",5:"ecm",6:"evaluation",7:"activity",8:"cdKey",9:"recharge",10:"msg",11:"calllog"}[e]||e)+"."+{0:"f085cf8b307772907c51",1:"37c311477e2d45952ca2",2:"0927e95d3fe5b6f648da",3:"2d2ca8276e939c42e37e",4:"0f8f5a7e1a28450e55c7",5:"a2fc801fe903d3e1d38b",6:"a69c5c6513644d0f2537",7:"c9e4106934931698098b",8:"ec90a74f74ea29279a66",9:"e8e771469c2137096ce5",10:"08d7348811ff689c70ac",11:"07f9326e2a68fd201646"}[e]+".js";var f=setTimeout(i,12e4);function i(){a.onerror=a.onload=null,clearTimeout(f);var r=n[e];0!==r&&(r&&r[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return a.onerror=a.onload=i,c.appendChild(a),t},o.m=e,o.c=t,o.d=function(e,r,t){o.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:t})},o.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(r,"a",r),r},o.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},o.p="/marketing/",o.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/views/cdkey/form.vue
......@@ -139,6 +139,7 @@ export default {
cdkeyContentRelated: '', // 1是cardId
cdkeyContentDescribe: '', // 1是cardName
cdkeyMode: 1,
cdkeyCount: undefined,
cdkeyType: 1,
cdkeyValue: '',
cdkeyEffectTime: '',
......@@ -251,14 +252,17 @@ export default {
// 手工导入
formData.append('file', this.importRes.file);
}
if (this.isEdit) {
formData.append('cdkeyPlanId', this.cdkeyPlanId);
}
Object.keys(params).forEach(key => {
formData.append(key, params[key]);
});
// console.log(formData);
// return;
if (this.isEdit) {
formData.append('cdkeyPlanId', this.cdkeyPlanId);
// 编辑不要cdkeyMode cdkeyType cdkeyValue cdkeyCount
formData.delete('cdkeyMode');
formData.delete('cdkeyType');
formData.delete('cdkeyValue');
formData.delete('cdkeyCount');
}
axios
.post(cdkeyPlanSave, formData)
.then(res => {
......@@ -305,7 +309,7 @@ export default {
this.ruleForm.cdkeyContentRelated = '';
this.ruleForm.cdkeyContentDescribe = '';
this.ruleForm.cdkeyContentType = '';
this.$refs.ruleForm.validateField('cdkeyContentDescribe');
this.$refs.ruleForm.validateField('cdkeyContentRelated');
},
//选择卡券后置
selectCard(val) {
......@@ -313,7 +317,7 @@ export default {
this.ruleForm.cdkeyContentType = 1;
this.ruleForm.cdkeyContentRelated = val.coupCardId;
this.ruleForm.cdkeyContentDescribe = val.cardName;
this.$refs.ruleForm.validateField('cdkeyContentDescribe');
this.$refs.ruleForm.validateField('cdkeyContentRelated');
}
this.showCardDialog = false;
},
......
src/views/cdkey/list.vue
......@@ -17,9 +17,9 @@
</div>
<el-table tooltipEffect="light" :data="tableList" style="width: 100%">
<el-table-column min-width="150" align="left" prop="cdkeyName" label="兑换码名称" fixed="left" :show-overflow-tooltip="true"></el-table-column>
<el-table-column :show-overflow-tooltip="true" min-width="150" align="left" prop="createTime" label="有效期">
<el-table-column :show-overflow-tooltip="true" min-width="170" align="left" prop="createTime" label="有效期">
<template slot-scope="scope">
<div>{{ formatDateTimeByType(scope.row.cdkeyEffectTime, 'yyyy-MM-dd HH:mm:ss') }}~</div>
<div>{{ formatDateTimeByType(scope.row.cdkeyEffectTime, 'yyyy-MM-dd HH:mm:ss') }} ~</div>
<div>{{ formatDateTimeByType(scope.row.cdkeyLimitTime, 'yyyy-MM-dd HH:mm:ss') }}</div>
</template>
</el-table-column>
......@@ -42,7 +42,7 @@
<!-- 兑换码计划状态（1：未生效，2：生效中，3：已过期，4：已失效） -->
<div v-if="scope.row.cdkeyPlanStatus == 1"><span class="dm-status--warning"></span>未生效</div>
<div v-if="scope.row.cdkeyPlanStatus == 2"><span class="dm-status--primary--flash"></span>生效中</div>
<div v-if="scope.row.cdkeyPlanStatus == 3">已过期<span class="dm-status--info"></span></div>
<div v-if="scope.row.cdkeyPlanStatus == 3"><span class="dm-status--info"></span>已过期</div>
<div v-if="scope.row.cdkeyPlanStatus == 4"><span class="dm-status--info"></span>已失效</div>
</template>
</el-table-column>
......@@ -83,7 +83,8 @@ export default {
mixins: [tableMethods],
data() {
return {
status: [{ value: 1, label: '未生效' }, { value: 2, label: '生效中' }, { value: 4, label: '已失效' }], // eslint-disable-line
// （1：未生效，2：生效中，3：已过期，4：已失效）
status: [{ value: 1, label: '未生效' }, { value: 2, label: '生效中' }, { value: 3, label: '已过期' }, { value: 4, label: '已失效' }], // eslint-disable-line
loading: false,
tableList: [],
listParams: {
......
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