Skip to content

M
marketing
Commit 8853ebad by chenxin
Options

Merge branch 'feature/营销1月迭代' into dev 

# Conflicts:
#	dist/index.html
#	dist/static/css/main.5c52b8b27322d429aa2f6d64f296b710.css
#	dist/static/css/main.a64b4629c6265900cd4d3fe487df7e10.css
#	dist/static/css/main.f2c0924643982a716fd64fba523a6251.css
#	dist/static/js/manifest.4619f24378d924122188.js
#	dist/static/js/manifest.75c5fce2ce1441c1e151.js
#	dist/static/js/manifest.cb95bf12f5ffc497c209.js
#	index.html
parents deedea25 aaa77dab
Showing with 19 additions and 24 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.5c52b8b27322d429aa2f6d64f296b710.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.45.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.19.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.27.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.252.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.66.js></script><script src=//web-1251519181.file.myqcloud.com/components/confirm-people.2.0.035.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.43.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.16.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.20.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/activity-select.1.0.2.1.js></script><script type=text/javascript src=/marketing/static/js/manifest.4619f24378d924122188.js></script><script type=text/javascript src=/marketing/static/js/vendor.fef1c3d3b3b586faaee2.js></script><script type=text/javascript src=/marketing/static/js/main.f21fa84ea2fafaf1a2cf.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.ea6e003c2e7858a578c671efaef26e1c.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.45.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.19.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.27.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.252.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.67.js></script><script src=//web-1251519181.file.myqcloud.com/components/confirm-people.2.0.035.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.43.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.16.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.20.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/activity-select.1.0.2.1.js></script><script type=text/javascript src=/marketing/static/js/manifest.e75245032ec72c10c24c.js></script><script type=text/javascript src=/marketing/static/js/vendor.fef1c3d3b3b586faaee2.js></script><script type=text/javascript src=/marketing/static/js/main.f21fa84ea2fafaf1a2cf.js></script></body></html>
\ No newline at end of file
dist/static/js/manifest.4619f24378d924122188.js → dist/static/js/manifest.e75245032ec72c10c24c.js
!function(e){var r=window.webpackJsonp;window.webpackJsonp=function(n,a,o){for(var f,i,u,d=0,s=[];d<n.length;d++)i=n[d],t[i]&&s.push(t[i][0]),t[i]=0;for(f in a)Object.prototype.hasOwnProperty.call(a,f)&&(e[f]=a[f]);for(r&&r(n,a,o);s.length;)s.shift()();if(o)for(d=0;d<o.length;d++)u=c(c.s=o[d]);return u};var n={},t={15:0};function c(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,c),t.l=!0,t.exports}c.e=function(e){var r=t[e];if(0===r)return new Promise(function(e){e()});if(r)return r[2];var n=new Promise(function(n,c){r=t[e]=[n,c]});r[2]=n;var a=document.getElementsByTagName("head")[0],o=document.createElement("script");o.type="text/javascript",o.charset="utf-8",o.async=!0,o.timeout=12e4,c.nc&&o.setAttribute("nonce",c.nc),o.src=c.p+"static/js/"+({0:"card",1:"game",2:"wechat",3:"message",4:"ewash",5:"scan",6:"ecm",7:"evaluation",8:"activity",9:"cdKey",10:"recharge",11:"msg",12:"calllog"}[e]||e)+"."+{0:"2581ee235a1bf869eb36",1:"13dab37beda20959629e",2:"5dc639c3066c5b1b26cf",3:"6413b55f63391becb1ba",4:"c8a5e5c668cdc258c3c4",5:"c5259ccf38eb5ea9a2cf",6:"04263dc5c06af7a75da3",7:"45f7d7f2d664f384f7d1",8:"5ddb72b68fcdf6943011",9:"acd1803f49e3f7121560",10:"fd4ef6af3cd790ec9e39",11:"00a6edc9657c9e4c34fa",12:"f1c9fa1ccd0d36ae0602"}[e]+".js";var f=setTimeout(i,12e4);function i(){o.onerror=o.onload=null,clearTimeout(f);var r=t[e];0!==r&&(r&&r[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return o.onerror=o.onload=i,a.appendChild(o),n},c.m=e,c.c=n,c.d=function(e,r,n){c.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:n})},c.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return c.d(r,"a",r),r},c.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},c.p="/marketing/",c.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
!function(e){var r=window.webpackJsonp;window.webpackJsonp=function(n,o,a){for(var f,i,u,d=0,s=[];d<n.length;d++)i=n[d],t[i]&&s.push(t[i][0]),t[i]=0;for(f in o)Object.prototype.hasOwnProperty.call(o,f)&&(e[f]=o[f]);for(r&&r(n,o,a);s.length;)s.shift()();if(a)for(d=0;d<a.length;d++)u=c(c.s=a[d]);return u};var n={},t={15:0};function c(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,c),t.l=!0,t.exports}c.e=function(e){var r=t[e];if(0===r)return new Promise(function(e){e()});if(r)return r[2];var n=new Promise(function(n,c){r=t[e]=[n,c]});r[2]=n;var o=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,c.nc&&a.setAttribute("nonce",c.nc),a.src=c.p+"static/js/"+({0:"card",1:"game",2:"wechat",3:"message",4:"ewash",5:"scan",6:"ecm",7:"evaluation",8:"activity",9:"cdKey",10:"recharge",11:"msg",12:"calllog"}[e]||e)+"."+{0:"2581ee235a1bf869eb36",1:"13dab37beda20959629e",2:"5dc639c3066c5b1b26cf",3:"6413b55f63391becb1ba",4:"c8a5e5c668cdc258c3c4",5:"c5259ccf38eb5ea9a2cf",6:"62446153be80861e5faf",7:"45f7d7f2d664f384f7d1",8:"5ddb72b68fcdf6943011",9:"acd1803f49e3f7121560",10:"fd4ef6af3cd790ec9e39",11:"00a6edc9657c9e4c34fa",12:"f1c9fa1ccd0d36ae0602"}[e]+".js";var f=setTimeout(i,12e4);function i(){a.onerror=a.onload=null,clearTimeout(f);var r=t[e];0!==r&&(r&&r[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=i,o.appendChild(a),n},c.m=e,c.c=n,c.d=function(e,r,n){c.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:n})},c.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return c.d(r,"a",r),r},c.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},c.p="/marketing/",c.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
index.html
......@@ -28,7 +28,7 @@
<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.27.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/store-card.2.0.252.js"></script><!-- 门店选择器 -->
<script src="//web-1251519181.file.myqcloud.com/components/store-new.2.0.66.js"></script><!-- 新版门店选择器 -->
<script src="//web-1251519181.file.myqcloud.com/components/store-new.2.0.67.js"></script><!-- 新版门店选择器 -->
<script src="//web-1251519181.file.myqcloud.com/components/confirm-people.2.0.035.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/people.2.0.43.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/export-excel.2.0.16.js"></script><!-- 数据导出 -->
......
src/views/ecm/form.js
......@@ -14,20 +14,6 @@ export default {
name: 'ecm-manage',
mixins: [xxSysp_mix],
data() {
// 校验执行日期
const checkExecDate = (rule, value, callback) => {
// 1按天执行 2按周 3按月
const { execDateType, execDate } = this.form;
if (execDateType !== 1) {
if (execDate && execDate.length) {
callback();
}
callback(new Error(rule.message));
} else {
callback();
}
};
return {
ecmPlanId: '', // 必传,
creatorId: '',
......@@ -123,8 +109,8 @@ export default {
checked: [],
rules: {
ecmPlanName: { type: 'string', required: true, message: '计划名称不能为空', trigger: 'blur' },
gradeIds: [{ type: 'array', required: true, message: '请至少选择一个卡类型', trigger: 'change' }],
execDate: { validator: checkExecDate, required: true, message: '执行日期填写不完整', trigger: 'change' }
gradeIds: [{ type: 'array', required: true, message: '请至少选择一个卡类型', trigger: 'change' }]
// execDate: { validator: checkExecDate, required: true, message: '执行日期填写不完整', trigger: 'change' }
},
isEdit: this.$route.meta.type === 'edit',
isAdd: this.$route.meta.type === 'add',
......@@ -541,6 +527,15 @@ export default {
if (this.form.effectType == 1) {
// 重复
// 校验执行频率
const { execDateType, execDate } = this.form;
if (execDateType !== 1) {
// 1按天执行 2按周 3按月
if (!(execDate && execDate.length)) {
this.$tips({ type: 'warning', message: '执行频率填写不完整' });
return;
}
}
if (!this.form.effectTime) {
this.$tips({ type: 'warning', message: '请填写执行时间' });
return;
......
src/views/ecm/form.vue
......@@ -7,7 +7,7 @@
<el-form-item label="计划名称" prop="ecmPlanName">
<dm-input class="w400" :maxlength="9" v-model="form.ecmPlanName" :disabled="!isAdd"></dm-input>
</el-form-item>
<el-form-item label="时效">
<el-form-item label="时效" class="is-required">
<el-radio v-model="form.effectType" :label="0" :disabled="!isAdd">触点</el-radio>
<el-radio v-model="form.effectType" :label="1" :disabled="!isAdd">重复</el-radio>
<el-radio v-model="form.effectType" :label="2" :disabled="!isAdd">单次</el-radio>
......@@ -34,7 +34,7 @@
</el-form-item>
<!-- 重复执行 -->
<template v-if="form.effectType == 1">
<el-form-item label="执行频率" prop="execDate">
<el-form-item label="执行频率" prop="execDate" class="is-required">
<div class="flex">
<el-select :disabled="!isAdd" style="width:220px;" class="mr20" v-model="form.execDateType" placeholder="请选择" @change="form.execDate = []">
<el-option v-for="(v, i) in execDateType" :key="i" :label="`${v.label}执行`" :value="v.value"></el-option>
......@@ -44,7 +44,7 @@
</el-select>
</div>
</el-form-item>
<el-form-item label="执行时间" class="mt10">
<el-form-item label="执行时间" class="mt10 is-required">
<el-time-select v-model="form.effectTime" :disabled="!isAdd" :picker-options="{ start: '00:00', step: '01:00', end: '23:00' }" placeholder="请设置"></el-time-select>
</el-form-item>
</template>
......
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