Skip to content

M
marketing
Commit 03b7c8e5 by chenxin
Options

fix:修复bug ecm卡券投放 编辑时会员分组初始化；ecm投放记录 url name变为query；e袋洗修改bread；

parent 13e99e2c
Showing with 25 additions and 29 deletions
dist/index.html
...@@ -2,4 +2,4 @@ ...@@ -2,4 +2,4 @@
gio('init','8be12240a3749eab', {}); gio('init','8be12240a3749eab', {});
//custom page code begin here //custom page code begin here
//custom page code end here //custom page code end here
gio('send');</script><link href=/marketing/static/css/main.563bb16b8b3706ac63a01fd32b5b3ad1.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=https://unpkg.com/element-ui/lib/index.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.31.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.02.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.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.09.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.31.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/input.2.0.00.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.1.91.js></script><script type=text/javascript src=/marketing/static/js/manifest.31e4281aa8cc069a23de.js></script><script type=text/javascript src=/marketing/static/js/vendor.4cb744d5df3ad4bdbad7.js></script><script type=text/javascript src=/marketing/static/js/main.4302aa674177ad5a8881.js></script></body></html> gio('send');</script><link href=/marketing/static/css/main.dc2f219e63d19e3c2825db893c75559e.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=https://unpkg.com/element-ui/lib/index.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.31.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.02.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.0.01.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.09.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.31.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/input.2.0.00.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.1.91.js></script><script type=text/javascript src=/marketing/static/js/manifest.a2f5242e14e2d4b3ee02.js></script><script type=text/javascript src=/marketing/static/js/vendor.4cb744d5df3ad4bdbad7.js></script><script type=text/javascript src=/marketing/static/js/main.b3eb0bce64fbab2035a9.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dist/static/js/manifest.31e4281aa8cc069a23de.js deleted 100644 → 0
!function(e){var r=window.webpackJsonp;window.webpackJsonp=function(n,o,a){for(var i,u,d,f=0,s=[];f<n.length;f++)u=n[f],t[u]&&s.push(t[u][0]),t[u]=0;for(i in o)Object.prototype.hasOwnProperty.call(o,i)&&(e[i]=o[i]);for(r&&r(n,o,a);s.length;)s.shift()();if(a)for(f=0;f<a.length;f++)d=c(c.s=a[f]);return d};var n={},t={12: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:"game",1:"card",2:"wechat",3:"ewash",4:"evaluation",5:"message",6:"ecm",7:"recharge",8:"msg",9:"calllog"}[e]||e)+"."+{0:"939ef154a34f1a744ce0",1:"ed20d27aeaa55df29c5d",2:"74cec9b4e7b2d7c30c85",3:"d1d7acc6579e8edd261d",4:"a639d4b91d56334ec9ea",5:"8b5a84b02f4c6a9c3090",6:"082b04e2e2d5c4e505cc",7:"6235075e2c47716c5050",8:"5d9bccc98221e443f872",9:"101d05cb830d169de2d6"}[e]+".js";var i=setTimeout(u,12e4);function u(){a.onerror=a.onload=null,clearTimeout(i);var r=t[e];0!==r&&(r&&r[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=u,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
dist/static/js/manifest.a2f5242e14e2d4b3ee02.js 0 → 100644
!function(e){var r=window.webpackJsonp;window.webpackJsonp=function(n,c,a){for(var i,u,f,d=0,s=[];d<n.length;d++)u=n[d],t[u]&&s.push(t[u][0]),t[u]=0;for(i in c)Object.prototype.hasOwnProperty.call(c,i)&&(e[i]=c[i]);for(r&&r(n,c,a);s.length;)s.shift()();if(a)for(d=0;d<a.length;d++)f=o(o.s=a[d]);return f};var n={},t={12:0};function o(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,o),t.l=!0,t.exports}o.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,o){r=t[e]=[n,o]});r[2]=n;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:"game",1:"card",2:"wechat",3:"ewash",4:"evaluation",5:"message",6:"ecm",7:"recharge",8:"msg",9:"calllog"}[e]||e)+"."+{0:"939ef154a34f1a744ce0",1:"3e1481af8e558d5d77b9",2:"74cec9b4e7b2d7c30c85",3:"ac92094893ef171ce33f",4:"a639d4b91d56334ec9ea",5:"8b5a84b02f4c6a9c3090",6:"31d8299ebecd59279d15",7:"6235075e2c47716c5050",8:"5d9bccc98221e443f872",9:"101d05cb830d169de2d6"}[e]+".js";var i=setTimeout(u,12e4);function u(){a.onerror=a.onload=null,clearTimeout(i);var r=t[e];0!==r&&(r&&r[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=u,c.appendChild(a),n},o.m=e,o.c=n,o.d=function(e,r,n){o.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:n})},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/router/modules/ecm.js
//智能营销 //智能营销
// import ecm from '../../views/ecm';
// import ecmList from '../../views/ecm/list';
// import ecmForm from '../../views/ecm/form.vue';
// import batchList from '../../views/ecm/batch-list';
// import currentList from '../../views/ecm/current-list';
export default { export default {
path: 'ecm', path: 'ecm',
name: '智能营销管理', name: '智能营销管理',
...@@ -38,7 +32,7 @@ export default { ...@@ -38,7 +32,7 @@ export default {
} }
}, },
{ {
path: 'batchlist/:id/:name', path: 'batchlist/:id',
name: '批次记录', name: '批次记录',
component: () => import(/* webpackChunkName: "ecm" */ '../../views/ecm/batch-list.vue'), component: () => import(/* webpackChunkName: "ecm" */ '../../views/ecm/batch-list.vue'),
meta: { meta: {
...@@ -46,7 +40,7 @@ export default { ...@@ -46,7 +40,7 @@ export default {
} }
}, },
{ {
path: 'currentlist/:id/:name', path: 'currentlist/:id',
name: '实时发送记录', name: '实时发送记录',
component: () => import(/* webpackChunkName: "ecm" */ '../../views/ecm/current-list.vue'), component: () => import(/* webpackChunkName: "ecm" */ '../../views/ecm/current-list.vue'),
meta: { meta: {
......
src/router/modules/ewash.js
...@@ -22,7 +22,7 @@ export default { ...@@ -22,7 +22,7 @@ export default {
}, },
{ {
path: 'edit/:id', path: 'edit/:id',
name: '卡券编辑', name: '编辑卡券',
component: () => import(/* webpackChunkName: "ewash" */ '../../views/ewash/form.vue'), component: () => import(/* webpackChunkName: "ewash" */ '../../views/ewash/form.vue'),
meta: { meta: {
type: 'edit', type: 'edit',
......
src/views/card/group-send.vue
<!--
* @Description: In User Settings Edit
* @Author: your name
* @Date: 2019-06-04 11:42:09
* @LastEditTime: 2019-08-20 10:15:52
* @LastEditors: Please set LastEditors
-->
<template> <template>
<el-form :model="form" ref="form" :rules="rules" label-width="100px" v-loading="loading"> <el-form :model="form" ref="form" :rules="rules" label-width="100px" v-loading="loading">
<div class="dm-form__wrap"> <div class="dm-form__wrap">
...@@ -237,7 +230,6 @@ export default { ...@@ -237,7 +230,6 @@ export default {
}, },
isEditTemplate() { isEditTemplate() {
//是否可以编辑 1.新增 2.编辑，选择时间发送，发送时间大于当前时间 //是否可以编辑 1.新增 2.编辑，选择时间发送，发送时间大于当前时间
console.log(111);
return this.isAdd || (this.isEdit && this.form.putOnType === 1 && this.form.putOnTime > Date.now()); return this.isAdd || (this.isEdit && this.form.putOnType === 1 && this.form.putOnTime > Date.now());
} }
}, },
...@@ -311,6 +303,12 @@ export default { ...@@ -311,6 +303,12 @@ export default {
} else if (this.form.memberType === 1) { } else if (this.form.memberType === 1) {
this.memberList = res.result.memberList; this.memberList = res.result.memberList;
} else if (this.form.memberType === 2) { } else if (this.form.memberType === 2) {
const memberTagGroupIds = res.result.tagGroupList.map(v => {
return v.memberTagGroupId;
});
if (memberTagGroupIds) {
this.form.memberGroupIds = memberTagGroupIds.join(); // 赋值会员分组id
}
this.defaltSelected = res.result.tagGroupList || []; this.defaltSelected = res.result.tagGroupList || [];
} }
...@@ -505,6 +503,8 @@ export default { ...@@ -505,6 +503,8 @@ export default {
memberIds: this.form.openIds, memberIds: this.form.openIds,
cardId: this.form.cardId cardId: this.form.cardId
}; };
// console.log(this.form.memberGroupIds);
let res = await checkPutonMemberIds(params); let res = await checkPutonMemberIds(params);
if (res.errorCode === 0) { if (res.errorCode === 0) {
let sumPerson = res.result.totalSendCount; let sumPerson = res.result.totalSendCount;
......
src/views/ecm/batch-list.vue
...@@ -101,7 +101,7 @@ export default { ...@@ -101,7 +101,7 @@ export default {
}, },
created() { created() {
this.ecmBatchSendInfos(); this.ecmBatchSendInfos();
this.$store.commit('mutations_breadcrumb', [{ name: '营销管理', path: '' }, { name: '智能营销', path: '/ecm' }, { name: this.$route.params.name + ' - 批次记录', path: '' }]); this.$store.commit('mutations_breadcrumb', [{ name: '营销管理', path: '' }, { name: '智能营销', path: '/ecm' }, { name: this.$route.query.name + ' - 批次记录', path: '' }]);
this.$store.commit( this.$store.commit(
'mutations_layoutTips', 'mutations_layoutTips',
`<div class="layout--tips"> `<div class="layout--tips">
...@@ -149,7 +149,7 @@ export default { ...@@ -149,7 +149,7 @@ export default {
toDialog(row) { toDialog(row) {
this.dialogShow = true; this.dialogShow = true;
this.dialogId = row.ecmPlanQuartzLogId; this.dialogId = row.ecmPlanQuartzLogId;
this.dialogEcmPlanName = this.$route.params.name; this.dialogEcmPlanName = this.$route.query.name;
this.dialogExecTime = formatDateTimeByType(row.execTime, 'yyyy-MM-dd-HH-mm-ss'); this.dialogExecTime = formatDateTimeByType(row.execTime, 'yyyy-MM-dd-HH-mm-ss');
console.log(this.dialogId); console.log(this.dialogId);
} }
......
src/views/ecm/current-list.vue
...@@ -143,7 +143,7 @@ export default { ...@@ -143,7 +143,7 @@ export default {
}, },
created() { created() {
this.ecmCurrentSendInfos(); this.ecmCurrentSendInfos();
this.$store.commit('mutations_breadcrumb', [{ name: '营销管理', path: '' }, { name: '智能营销', path: '/ecm' }, { name: this.$route.params.name + ' - 实时发送记录', path: '' }]); this.$store.commit('mutations_breadcrumb', [{ name: '营销管理', path: '' }, { name: '智能营销', path: '/ecm' }, { name: this.$route.query.name + ' - 实时发送记录', path: '' }]);
this.$store.commit('mutations_layoutTips', `<div class="layout--tips"><i class="el-icon-info"></i>历史数据限制：2018年11月15日之前的历史营销计划，没有详细数据</div>`); this.$store.commit('mutations_layoutTips', `<div class="layout--tips"><i class="el-icon-info"></i>历史数据限制：2018年11月15日之前的历史营销计划，没有详细数据</div>`);
setTimeout(_ => { setTimeout(_ => {
this.$store.commit('mutations_layoutTips', ''); this.$store.commit('mutations_layoutTips', '');
...@@ -220,7 +220,7 @@ export default { ...@@ -220,7 +220,7 @@ export default {
memberInfo: this.listParams.memberInfo, memberInfo: this.listParams.memberInfo,
success: this.listParams.success, success: this.listParams.success,
ecmPlanId: this.listParams.ecmPlanId, ecmPlanId: this.listParams.ecmPlanId,
ecmPlanName: this.$route.params.name, ecmPlanName: this.$route.query.name,
beginTime: this.listParams.beginTime, beginTime: this.listParams.beginTime,
endTime: this.listParams.endTime, endTime: this.listParams.endTime,
ecmMarketingTypeRelationIds: this.listParams.ecmMarketingTypeRelationIds, ecmMarketingTypeRelationIds: this.listParams.ecmMarketingTypeRelationIds,
......
src/views/ecm/list.vue
...@@ -139,7 +139,7 @@ export default { ...@@ -139,7 +139,7 @@ export default {
}, },
// 记录 // 记录
toRecord(row) { toRecord(row) {
this.$router.push(`/ecm/${row.effectType ? 'batchlist' : 'currentlist'}/${row.ecmPlanId}/${row.ecmPlanName}`); this.$router.push({ path: `/ecm/${row.effectType ? 'batchlist' : 'currentlist'}/${row.ecmPlanId}`, query: { name: row.ecmPlanName } });
}, },
// 删除 // 删除
async delData(row) { async delData(row) {
......
src/views/ewash/form.js
...@@ -931,6 +931,6 @@ export default { ...@@ -931,6 +931,6 @@ export default {
} }
}, },
created() { created() {
this.$store.commit('mutations_breadcrumb', [{ name: 'e袋洗服务', path: '' }, { name: '卡券列表', path: '/ewash/add' }, { name: `${this.isAdd ? '新增' : '编辑'}卡券`, path: '' }]); this.$store.commit('mutations_breadcrumb', [{ name: 'e袋洗服务', path: '' }, { name: '服务列表', path: '/ewash/list' }, { name: `${this.isAdd ? '新增' : '编辑'}卡券`, path: '' }]);
} }
}; };
src/views/ewash/statements-detail.vue
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<span class="primary-font-color">卡券核销码：</span><span class="regular-font-color">{{ info.couponNo || '--' }}</span> <span class="primary-font-color">卡券核销码：</span><span class="regular-font-color">{{ info.couponNo || '--' }}</span>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<span class="primary-font-color">预约时间：</span><span class="regular-font-color">{{ info.preTime || '--' }}</span> <span class="primary-font-color">预约时间：</span><span class="regular-font-color">{{ formatDateTimeByType(info.preTime) || '--' }}</span>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<span class="primary-font-color">会员手机号：</span><span class="regular-font-color">{{ info.memberPhone }}</span> <span class="primary-font-color">会员手机号：</span><span class="regular-font-color">{{ info.memberPhone }}</span>
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<p class="text-right mt10"> <p class="text-right mt10">
服务总价 预估金额
<span class="fz16 ml5">¥ {{ this.orderTableAmount | amount }}</span> <span class="fz16 ml5">¥ {{ this.orderTableAmount | amount }}</span>
</p> </p>
<p class="text-right mt10"> <p class="text-right mt10">
...@@ -118,6 +118,7 @@ ...@@ -118,6 +118,7 @@
<script> <script>
import { edxOrderDetail } from '@/service/api/ewashApi'; import { edxOrderDetail } from '@/service/api/ewashApi';
import { formatDateTimeByType } from '@/utils/index';
/* eslint-disable */ /* eslint-disable */
const status1 = [ const status1 = [
{ content: '删除', status: 0 } { content: '删除', status: 0 }
...@@ -164,6 +165,7 @@ export default { ...@@ -164,6 +165,7 @@ export default {
} }
}, },
methods: { methods: {
formatDateTimeByType,
handleDetail() { handleDetail() {
this.loading = true; this.loading = true;
edxOrderDetail({ orderId: this.id }).then(res => { edxOrderDetail({ orderId: this.id }).then(res => {
......
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