Skip to content

M
marketing
Commit 49f94d14 by chenxin
Options

fix: ecm 折扣商品

parent 125ed581
Showing with 88 additions and 26 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.64bc7a43d300efd4c3a067987a0e0414.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.10.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.e2bc004e694d665832d6.js></script><script type=text/javascript src=/marketing/static/js/vendor.b30a466c3b2d11195801.js></script><script type=text/javascript src=/marketing/static/js/main.db12f4df4be5f397a871.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.693357edad9c74533f477af19705d735.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.10.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.3bcd54cc91d44fbc52eb.js></script><script type=text/javascript src=/marketing/static/js/vendor.b30a466c3b2d11195801.js></script><script type=text/javascript src=/marketing/static/js/main.db12f4df4be5f397a871.js></script></body></html>
\ No newline at end of file
dist/static/js/cdKey.406e2abc87dab166597d.js 0 → 100644
webpackJsonp([8],{"0SQO":function(t,e,a){"use strict";e.a={methods:{refresh:function(){this.listParams.currentPage=1,this.getTableList()},handleSizeChange:function(t){this.listParams.pageSize=t,this.getTableList()},handleCurrentChange:function(t){this.listParams.currentPage=t,this.getTableList()}}}},"6ncD":function(t,e,a){"use strict";var n={name:"time-count",data:function(){return{isStart:!1,globalTimer:null,countString:"0秒",day:0,hour:0,minute:0,second:0,millisecond:0,countVal:this.defaultVal,pauseTime:0,nowDate:Date.now()}},watch:{countString:{deep:!0,handler:function(t,e){this.needSendSunc&&this.passToParent(t)}},needSendSunc:{deep:!0,handler:function(t){t&&this.passToParent(this.countString)}}},props:{sendSync:{type:Boolean,default:!1},autoStart:{type:Boolean,default:!1},defaultVal:{type:Number,default:0}},mounted:function(){this.autoStart&&this.startCountFn()},computed:{needSendSunc:function(){return this.sendSync}},created:function(){this.$on("startCount",function(){this.startCountFn()}),this.$on("stopCount",function(){this.stopCountFn()})},methods:{counterFn:function(t){var e=this,a=(new Date).getTime(),n=0;this.pauseTime<=0?n=t-a:(this.pauseTime=this.pauseTime+10,n=t-this.pauseTime),n<=0&&(this.stopCountFn(),this.$nextTick(function(t){e.countString=""}));var s=n%864e5,i=s%36e5,r=i%6e4;this.day=Math.floor(n/864e5),this.hour=Math.floor(s/36e5),this.minute=Math.floor(i/6e4),this.second=Math.round(r/1e3),this.day>0?this.countString=this.day+"天 "+this.hour+"小时 "+this.minute+"分 "+this.second+"秒":this.hour>0?this.countString=this.hour+"小时 "+this.minute+"分 "+this.second+"秒":this.minute>0?this.countString=this.minute+"分 "+this.second+"秒":this.countString=this.second+"秒"},startCountFn:function(){var t=this;if(!this.isStart){this.countVal=this.countVal?this.countVal:(new Date).getTime();var e=setInterval(function(e){t.counterFn(t.countVal)},1e3);this.globalTimer=e,this.isStart=!0}},stopCountFn:function(){this.isStart&&(window.clearInterval(this.globalTimer),this.globalTimer=null,this.isStart=!1,this.pauseTime=(new Date).getTime())},passToParent:function(t){this.$emit("getDataFromChild",t)}},beforeDestroy:function(){this.stopCountFn()}},s={render:function(){var t=this.$createElement,e=this._self._c||t;return e("div",[e("span",{attrs:{sendSync:this.sendSync,autoStart:this.autoStart,defaultVal:this.defaultVal}},[this._v(this._s(this.countString))])])},staticRenderFns:[]},i=a("VU/8")(n,s,!1,null,null,null);e.a=i.exports},BPmr:function(t,e,a){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var n={render:function(){var t=this.$createElement,e=this._self._c||t;return e("div",[e("router-view")],1)},staticRenderFns:[]},s=a("VU/8")({name:"cdkey",created:function(){var t=this;this.$store.commit("aside_handler",!1),this.$nextTick(function(e){t.$store.commit("aside_handler",!0)})}},n,!1,null,null,null);e.default=s.exports},UsD7:function(t,e,a){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var n=a("Xxa5"),s=a.n(n),i=a("exGp"),r=a.n(i),l=a("6Hqf"),o="api-marketing/",u=(a("2uFj").a.api,a("0xDb")),c=a("6ncD"),d=a("0SQO"),h={name:"sms-record",components:{timeCounts:c.a},mixins:[d.a],data:function(){return{sendStatusOptions:[{value:"",label:"所有状态",type:""},{value:0,label:"定时执行",type:"warning"},{value:1,label:"执行完毕",type:"success"},{value:2,label:"执行失败",type:"danger"},{value:3,label:"无可用模板",type:"danger"},{value:5,label:"执行中",type:"primary--flash"},{value:-1,label:"已失效",type:"danger"}],recordLoading:!1,tableList:[],listParams:{sendStatus:"",sendBeginTime:"",sendEndTime:"",search:"",currentPage:1,pageSize:20,showSelfFlag:""},dateTime:["",""],total:0}},created:function(){this.$store.commit("mutations_breadcrumb",[{name:"营销管理",path:""},{name:"兑换码",path:""},{name:"兑换码列表",path:""}]),this.getTableList()},methods:{formatDateTimeByType:u.f,getTableList:function(){var t=this;return r()(s.a.mark(function e(){var a;return s.a.wrap(function(e){for(;;)switch(e.prev=e.next){case 0:return e.abrupt("return");case 6:0===(a=e.sent).errorCode&&a.result?(t.tableList=a.result.result||[],t.total=a.result.totalCount):(t.tableList=[],t.total=0),t.recordLoading=!1,e.next=14;break;case 11:e.prev=11,e.t0=e.catch(1),t.recordLoading=!1;case 14:case"end":return e.stop()}},e,t,[[1,11]])}))()},invalidData:function(t){var e,a=this;(e={smsId:t.smsId},Object(l.b)(o+"expire-marketing-activity",e)).then(function(t){a.$tips({type:"success",message:"禁用成功!"}),a.getTableList()}).catch(function(t){a.$tips({type:"error",message:"禁用失败!"})})},filterStatus:function(t){var e={label:"执行错误",type:"warning"};return this.sendStatusOptions.forEach(function(a){t===a.value&&(e=a)}),e}}},m={render:function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("section",{directives:[{name:"loading",rawName:"v-loading",value:t.recordLoading,expression:"recordLoading"}],staticClass:"dm-wrap"},[a("div",{staticClass:"clearfix pb22"},[a("el-input",{staticClass:"w280",attrs:{placeholder:"请输入兑换码名称/姓名/手机号",clearable:""},on:{change:t.refresh},model:{value:t.listParams.search,callback:function(e){t.$set(t.listParams,"search",e)},expression:"listParams.search"}},[a("i",{staticClass:"el-input__icon el-icon-search",attrs:{slot:"prefix"},slot:"prefix"})]),t._v(" "),a("el-date-picker",{staticClass:"w300",attrs:{type:"daterange","range-separator":"至","start-placeholder":"兑换开始日期","end-placeholder":"兑换结束日期"},on:{change:t.refresh},model:{value:t.dateTime,callback:function(e){t.dateTime=e},expression:"dateTime"}}),t._v(" "),a("el-select",{staticClass:"dm-select",attrs:{placeholder:"兑换码类型"},on:{change:t.refresh},model:{value:t.listParams.sendStatus,callback:function(e){t.$set(t.listParams,"sendStatus",e)},expression:"listParams.sendStatus"}},t._l(t.sendStatusOptions,function(t){return a("el-option",{key:t.value,attrs:{label:t.label,value:t.value}})}),1),t._v(" "),a("el-select",{staticClass:"dm-select",attrs:{placeholder:"兑换码状态"},on:{change:t.refresh},model:{value:t.listParams.sendStatus,callback:function(e){t.$set(t.listParams,"sendStatus",e)},expression:"listParams.sendStatus"}},t._l(t.sendStatusOptions,function(t){return a("el-option",{key:t.value,attrs:{label:t.label,value:t.value}})}),1),t._v(" "),a("div",{staticClass:"fr"},[a("el-button",{attrs:{type:"primary"}},[t._v("兑换链接")]),t._v(" "),a("el-button",{attrs:{type:"primary"},on:{click:function(e){return t.$router.push("/cdKey/add")}}},[t._v("新建兑换码")])],1)],1),t._v(" "),a("el-table",{staticStyle:{width:"100%"},attrs:{tooltipEffect:"light",data:t.tableList,"row-key":"sendTime"}},[a("el-table-column",{attrs:{"min-width":"140",align:"left",prop:"receiveTime",label:"兑换码名称",fixed:"left","show-overflow-tooltip":!0}}),t._v(" "),a("el-table-column",{attrs:{"show-overflow-tooltip":!0,"min-width":"120",align:"left",prop:"createTime",label:"有效期"},scopedSlots:t._u([{key:"default",fn:function(e){return[a("div",[t._v(t._s(t.formatDateTimeByType(e.row.createTime,"yyyy-MM-dd-HH-mm"))+"-")]),t._v(" "),a("div",[t._v(t._s(t.formatDateTimeByType(e.row.createTime,"yyyy-MM-dd-HH-mm")))])]}}])}),t._v(" "),a("el-table-column",{attrs:{"show-overflow-tooltip":!0,"min-width":"120",align:"left",label:"兑换码类型"},scopedSlots:t._u([{key:"default",fn:function(e){return[t._v("\n "+t._s(1==e.row.type?"专属码":"兑换码")+"\n ")]}}])}),t._v(" "),a("el-table-column",{attrs:{"min-width":"120",align:"left",prop:"orderNumber",label:"兑换码数量"}}),t._v(" "),a("el-table-column",{attrs:{"show-overflow-tooltip":!0,"min-width":"140",align:"left",prop:"orderNumber",label:"兑换内容"}}),t._v(" "),a("el-table-column",{attrs:{"show-overflow-tooltip":!0,"min-width":"120",align:"left",prop:"createTime",label:"兑换码状态"},scopedSlots:t._u([{key:"default",fn:function(e){return[a("div",{staticClass:"dm-status--info"},[t._v("????")])]}}])}),t._v(" "),a("el-table-column",{attrs:{label:"操作",align:"left",width:"160px",fixed:"right"},scopedSlots:t._u([{key:"default",fn:function(e){return[a("el-button",{attrs:{type:"text"},on:{click:function(a){return t.$router.push("/cdKey/edit/"+e.row.smsId)}}},[t._v("编辑")]),t._v(" "),a("el-button",{attrs:{type:"text"},on:{click:function(a){return t.$router.push("/cdKey/info/"+e.row.smsId)}}},[t._v("详情")]),t._v(" "),a("dm-delete",{attrs:{tips:"是否禁用该条数据?"},on:{confirm:function(a){return t.invalidData(e.row)}}},[a("el-button",{attrs:{type:"text"}},[t._v("禁用")])],1),t._v(" "),a("dm-delete",{attrs:{tips:"是否删除该条数据?"},on:{confirm:function(a){return t.invalidData(e.row)}}},[a("el-button",{attrs:{type:"text"}},[t._v("删除")])],1)]}}])})],1),t._v(" "),a("dm-pagination",{directives:[{name:"show",rawName:"v-show",value:t.tableList.length,expression:"tableList.length"}],staticClass:"dm-pagination",attrs:{background:"","current-page":t.listParams.currentPage,"page-sizes":[20,40,60,80],"page-size":t.listParams.pageSize,layout:"total, sizes, prev, pager, next",total:t.total},on:{"size-change":t.handleSizeChange,"current-change":t.handleCurrentChange}})],1)},staticRenderFns:[]},p=a("VU/8")(h,m,!1,null,null,null);e.default=p.exports},oqbS:function(t,e,a){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var n={render:function(){var t=this.$createElement;return(this._self._c||t)("div",{directives:[{name:"loading",rawName:"v-loading",value:this.loading,expression:"loading"}],staticClass:"dm-wrap"})},staticRenderFns:[]},s=a("VU/8")({name:"cdkey-form",data:function(){return{loading:!1}}},n,!1,null,null,null);e.default=s.exports},wFKx:function(t,e,a){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var n={render:function(){var t=this.$createElement;return(this._self._c||t)("div",[this._v("????")])},staticRenderFns:[]},s=a("VU/8")(null,n,!1,null,null,null);e.default=s.exports}});
\ No newline at end of file
dist/static/js/manifest.3bcd54cc91d44fbc52eb.js 0 → 100644
!function(e){var r=window.webpackJsonp;window.webpackJsonp=function(t,c,a){for(var i,u,f,s=0,d=[];s<t.length;s++)u=t[s],n[u]&&d.push(n[u][0]),n[u]=0;for(i in c)Object.prototype.hasOwnProperty.call(c,i)&&(e[i]=c[i]);for(r&&r(t,c,a);d.length;)d.shift()();if(a)for(s=0;s<a.length;s++)f=o(o.s=a[s]);return f};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:"cd9b870f0143660d16bb",1:"82cd3927c4b3b635db4b",2:"2a8e523c0449ab3e20e1",3:"3729e6e1b77305892d6e",4:"0f8f5a7e1a28450e55c7",5:"be1031b0bad70e075894",6:"a69c5c6513644d0f2537",7:"c9e4106934931698098b",8:"406e2abc87dab166597d",9:"e8e771469c2137096ce5",10:"08d7348811ff689c70ac",11:"07f9326e2a68fd201646"}[e]+".js";var i=setTimeout(u,12e4);function u(){a.onerror=a.onload=null,clearTimeout(i);var r=n[e];0!==r&&(r&&r[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return a.onerror=a.onload=u,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
dist/static/js/manifest.e2bc004e694d665832d6.js deleted 100644 → 0
!function(e){var r=window.webpackJsonp;window.webpackJsonp=function(t,a,c){for(var i,f,u,s=0,l=[];s<t.length;s++)f=t[s],n[f]&&l.push(n[f][0]),n[f]=0;for(i in a)Object.prototype.hasOwnProperty.call(a,i)&&(e[i]=a[i]);for(r&&r(t,a,c);l.length;)l.shift()();if(c)for(s=0;s<c.length;s++)u=o(o.s=c[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 a=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,o.nc&&c.setAttribute("nonce",o.nc),c.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:"648b57f28475f99aec1f",1:"82cd3927c4b3b635db4b",2:"2a8e523c0449ab3e20e1",3:"3729e6e1b77305892d6e",4:"0f8f5a7e1a28450e55c7",5:"18d7873206009149c251",6:"a69c5c6513644d0f2537",7:"c9e4106934931698098b",8:"710a3a5af8140aa099aa",9:"e8e771469c2137096ce5",10:"08d7348811ff689c70ac",11:"07f9326e2a68fd201646"}[e]+".js";var i=setTimeout(f,12e4);function f(){c.onerror=c.onload=null,clearTimeout(i);var r=n[e];0!==r&&(r&&r[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return c.onerror=c.onload=f,a.appendChild(c),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/service/api/cdKeyApi.js 0 → 100644
import { requests } from './index';
const PREFIX = 'api-marketing/';
import config from '@/config';
export const url = config.api + PREFIX;
// 兑换计划分页接口
export const cdkeyPlanRecord = params => requests(PREFIX + 'cdkey-plan-record', params);
// 兑换码-- 删除
export const delActivity = params => requests(PREFIX + 'del-marketing-activity', params);
// 兑换码-- 删除
export const stopActivity = params => requests(PREFIX + 'expire-marketing-activity', params);
// 兑换码 - 获取详情
export const getActivityInfo = params => requests(PREFIX + 'get-marketing-activity-detail', params);
// 兑换码-- 新建/修改 [保存]计划信息
export const saveActivity = params => requests(PREFIX + 'save-edit-marketing-activity', params);
// 兑换码-- 查看数据概览
export const activityViewData = params => requests(PREFIX + 'marketing-activity-statistics', params);
src/views/card/form.js
......@@ -130,7 +130,7 @@ export default {
// cardValidity: false, // 卡券有效期是否禁用
nowWmShopData: {}, // 存储wm店铺数据
giveEnable: false, // 支持转赠
discount_limit: { type: 1, count: undefined, flag: false } // 折扣商品
discount_limit: { type: 1, count: undefined, flag: false } // 适用商品折扣
};
},
watch: {
......
src/views/cdkey/form.vue
<template>
<div class="dm-wrap" v-loading="loading">
</div>
<div class="dm-wrap" v-loading="loading"></div>
</template>
<script>
......@@ -10,7 +8,7 @@ export default {
data() {
return {
loading: false
}
};
}
}
</script>
\ No newline at end of file
};
</script>
src/views/cdkey/list.vue
......@@ -51,7 +51,7 @@
</section>
</template>
<script>
import { LoadMessageList, invalidsmsRecord } from '@/service/api/messageApi.js';
import { cdkeyPlanRecord, stopActivity } from '@/service/api/cdKeyApi.js';
import { formatDateTimeByType } from '@/utils/index.js';
import timeCounts from '@/components/timeCount/index.vue';
import tableMethods from '@/mixins/tableMethods.js';
......@@ -86,6 +86,7 @@ export default {
methods: {
formatDateTimeByType,
async getTableList() {
return;
try {
this.recordLoading = true;
if (this.dateTime) {
......@@ -94,7 +95,7 @@ export default {
} else {
this.listParams.sendBeginTime = this.listParams.sendEndTime = '';
}
let res = await LoadMessageList(this.listParams);
let res = await cdkeyPlanRecord(this.listParams);
if (res.errorCode === 0 && res.result) {
this.tableList = res.result.result || [];
this.total = res.result.totalCount;
......@@ -108,7 +109,7 @@ export default {
}
},
invalidData(row) {
invalidsmsRecord({ smsId: row.smsId })
stopActivity({ smsId: row.smsId })
.then(res => {
this.$tips({ type: 'success', message: '禁用成功!' });
this.getTableList();
......
src/views/ecm/form.js
......@@ -125,7 +125,8 @@ export default {
cost: false, // 消费金额
count: false, // 消费件数
good: false // 消费商品
}
},
discount_limit: { type: 1, count: undefined, flag: false } // 适用商品折扣
};
},
components: {
......@@ -305,6 +306,14 @@ export default {
}
}
// 处理适用商品折扣
if (consumTrigger.discount_limit) {
const discount_limit = JSON.parse(consumTrigger.discount_limit);
this.discount_limit.flag = true;
this.discount_limit.type = discount_limit.type;
this.discount_limit.count = discount_limit.count;
}
// 消费金额&消费件数
this.consumeChecked.cost = consumTrigger['lowest_cost'] || consumTrigger['max_cost'] ? true : false;
this.consumeChecked.count = consumTrigger['lowest_cost_count'] || consumTrigger['max_cost_count'] ? true : false;
......@@ -503,6 +512,11 @@ export default {
this.$tips({ type: 'warning', message: '消费件数为正整数' });
return;
}
// 验证适用商品折扣 discount_limit
if (this.discount_limit.flag && isNaN(this.discount_limit.count)) {
this.$tips({ type: 'warning', message: '适用商品折扣额度未填写' });
return;
}
}
let params = {
......@@ -563,13 +577,15 @@ export default {
filterAbbrInfo: this.xxSysp.filterAbbrInfo
});
}
// 处理适用商品折扣 未勾选不传这个对象
if (this.discount_limit.flag) {
const discount_limit = { ...this.discount_limit };
delete discount_limit.flag;
consumeObj.discount_limit = JSON.stringify(discount_limit);
}
params = Object.assign(params, consumeObj); // 合并消费触发数据
}
if (this.form.effectType) {
params[this.checked[0]] = this.form[this.checked[0]] || 0;
}
params.marketingActivityId = this.form.marketingActivityId || ''; // 否 String 营销场景
// 如果适用人群-人群筛选器可编辑：需要调用await this.$refs.threshold.triggerPeopleSet(); 强制触发回显，否则数据保存有错误
// await this.triggerPeopleSet();
......
src/views/ecm/form.vue
......@@ -61,10 +61,10 @@
<i class="dm-title__label--icon iconfont icon-xinxixianshi"></i>
<span class="gray fz13">仅适用于线下单笔消费；仅限对当天线下的单笔购买消费订单进行触发；重导订单、非购买订单均不触发。</span>
</h3>
<p class="fz14 gray mb20 ml25">同时满足以下条件即可触发</p>
<p class="fz14 gray mb20 ml10">同时满足以下条件即可触发</p>
<el-form-item>
<div class="no_label_form_label">
<el-checkbox class="el-form-item__label" :disabled="!isAdd" v-model="consumeChecked.store" @change="initStoreCardLeft">消费门店</el-checkbox>
<el-checkbox class="el-form-item__label align-left" :disabled="!isAdd" v-model="consumeChecked.store" @change="initStoreCardLeft">消费门店</el-checkbox>
<div>
<span class="fz14 gray" v-show="!consumeChecked.store">所有消费门店</span>
<vue-gic-store-card v-bind="storeParams" :readonly="!isAdd" v-show="consumeChecked.store" ref="storeCard" :uuid.sync="form.order_store"></vue-gic-store-card>
......@@ -73,7 +73,7 @@
</el-form-item>
<el-form-item v-if="xxSysp.goodsEnable">
<div class="no_label_form_label">
<el-checkbox class="el-form-item__label" :disabled="!isAdd" v-model="consumeChecked.good">消费商品</el-checkbox>
<el-checkbox class="el-form-item__label align-left" :disabled="!isAdd" v-model="consumeChecked.good">消费商品</el-checkbox>
<div>
<span class="fz14 gray" v-show="!consumeChecked.good">所有消费商品</span>
<div class="sysp__content clearfix" v-show="consumeChecked.good">
......@@ -86,13 +86,33 @@
<el-button type="primary" @click="handleXxSyspClick" class="fl mt5" size="mini">{{ !isAdd ? '查看' : '编辑' }}</el-button>
<el-button v-show="xxSysp.filterAbbrInfo.length && isAdd" @click="handleXxSyspReset" class="fl mt5" size="mini">清空</el-button>
</div>
<div v-show="consumeChecked.good" style="margin-left:-68px;" class="fz12 gray">勾选消费商品后，消费金额、消费件数仅指适用消费商品的金额和件数。</div>
<div v-show="consumeChecked.good" class="fz12 gray">勾选消费商品后，消费金额、消费件数仅指适用消费商品的金额和件数。</div>
</div>
</div>
</el-form-item>
<el-form-item>
<div class="no_label_form_label">
<el-checkbox class="el-form-item__label" :disabled="!isAdd" v-model="consumeChecked.cost">消费金额</el-checkbox>
<el-checkbox class="el-form-item__label align-left" v-model="discount_limit.flag" :disabled="!isAdd">适用商品折扣</el-checkbox>
<!-- 1: 大于等于 2:大于 3: 等于 4: 小于 5: 小于等于 -->
<div>
<div v-if="discount_limit.flag" class="inline-block">
<el-select :disabled="!isAdd" v-model="discount_limit.type" class="w150">
<el-option label="大于等于" :value="1"></el-option>
<el-option label="大于" :value="2"></el-option>
<el-option label="等于" :value="3"></el-option>
<el-option label="小于" :value="4"></el-option>
<el-option label="小于等于" :value="5"></el-option>
</el-select>
<el-input-number controls-position="right" :disabled="!isAdd" v-model="discount_limit.count" :precision="2" :min="0" :max="10" class="w150"></el-input-number>&nbsp;&nbsp;折
</div>
<span class="fz14 gray" v-else>不限制消费商品折扣</span>
<div v-if="discount_limit.flag" class="fz12 gray">* 商品折扣=订单实付/订单总金额</div>
</div>
</div>
</el-form-item>
<el-form-item>
<div class="no_label_form_label">
<el-checkbox class="el-form-item__label align-left" :disabled="!isAdd" v-model="consumeChecked.cost">消费金额</el-checkbox>
<div>
<span class="fz14 gray" v-show="!consumeChecked.cost">任意消费金额</span>
<div v-show="consumeChecked.cost">
......@@ -107,7 +127,7 @@
</el-form-item>
<el-form-item>
<div class="no_label_form_label">
<el-checkbox class="el-form-item__label" :disabled="!isAdd" v-model="consumeChecked.count">消费件数</el-checkbox>
<el-checkbox class="el-form-item__label align-left" :disabled="!isAdd" v-model="consumeChecked.count">消费件数</el-checkbox>
<div>
<span class="fz14 gray" v-show="!consumeChecked.count">任意消费件数</span>
<div v-show="consumeChecked.count">
......@@ -408,4 +428,7 @@ export default ecmForm;
/deep/ .act-select {
width: 400px !important;
}
.el-form-item__label.align-left {
text-align: left;
}
</style>
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