Skip to content

M
marketing
Commit d4b04563 by chenxin
Options

fix: 门店分组选择，close的时候触发，将传入的store比较一下，更新为传入值；ecm 营销事件通知 至少保存一条营销事件

parent adf8abd1
Showing with 18 additions and 14 deletions
dist/index.html
<<<<<<< HEAD
<!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.d397428627f7684ee62854a34eff9cd1.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.38.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.24.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.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.0.js></script><script type=text/javascript src=/marketing/static/js/manifest.246bc4880d33ad23caf1.js></script><script type=text/javascript src=/marketing/static/js/vendor.b30a466c3b2d11195801.js></script><script type=text/javascript src=/marketing/static/js/main.da43878e175cef3d17fe.js></script></body></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.44c7b7a3c9eb3445fbfed62d7ad1a8f0.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.38.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.24.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.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.0.js></script><script type=text/javascript src=/marketing/static/js/manifest.9823edc4d42559125088.js></script><script type=text/javascript src=/marketing/static/js/vendor.ecb897a408f5e47fe4a4.js></script><script type=text/javascript src=/marketing/static/js/main.0dfd99095f76dbb50a15.js></script></body></html>
>>>>>>> fe6ccd957d53d6bb9732a6e92ca49f1d41949a53
<!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.8e052e255868d1c4ae8b2198d6478a96.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.38.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.24.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.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.0.js></script><script type=text/javascript src=/marketing/static/js/manifest.0b903421f921becf0fe6.js></script><script type=text/javascript src=/marketing/static/js/vendor.b30a466c3b2d11195801.js></script><script type=text/javascript src=/marketing/static/js/main.da43878e175cef3d17fe.js></script></body></html>
\ No newline at end of file
dist/static/css/main.d397428627f7684ee62854a34eff9cd1.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/calllog.07f9326e2a68fd201646.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/calllog.ff53d07686009178f604.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/card.abb6111c738983a815b6.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/card.d1b702d362f2def4ec48.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/ecm.fc6cde90aa629123d445.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/ewash.391130c8f773cb8775d6.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/ewash.d5ac9a5d0e8868b562f3.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/game.3ba3b9aa666d8094c2bb.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/game.a6f795143dcb35b5cb4c.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.0b903421f921becf0fe6.js 0 → 100644
!function(e){var r=window.webpackJsonp;window.webpackJsonp=function(t,a,c){for(var f,i,d,u=0,s=[];u<t.length;u++)i=t[u],n[i]&&s.push(n[i][0]),n[i]=0;for(f in a)Object.prototype.hasOwnProperty.call(a,f)&&(e[f]=a[f]);for(r&&r(t,a,c);s.length;)s.shift()();if(c)for(u=0;u<c.length;u++)d=o(o.s=c[u]);return d};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:"d1b702d362f2def4ec48",1:"a6f795143dcb35b5cb4c",2:"21a2ae8bde8fd576d6c1",3:"108440167bb83f4091b2",4:"391130c8f773cb8775d6",5:"4250880241ba99afbdbe",6:"d0ca60b9a64850af134d",7:"8cde246f205e5d60d01a",8:"1b4d07f3689020998359",9:"d0c7fdeaae259a8befad",10:"0d4820f42ef1fa47e4cc",11:"07f9326e2a68fd201646"}[e]+".js";var f=setTimeout(i,12e4);function i(){c.onerror=c.onload=null,clearTimeout(f);var r=n[e];0!==r&&(r&&r[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return c.onerror=c.onload=i,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
dist/static/js/manifest.246bc4880d33ad23caf1.js deleted 100644 → 0
!function(e){var r=window.webpackJsonp;window.webpackJsonp=function(t,o,a){for(var f,i,d,u=0,s=[];u<t.length;u++)i=t[u],n[i]&&s.push(n[i][0]),n[i]=0;for(f in o)Object.prototype.hasOwnProperty.call(o,f)&&(e[f]=o[f]);for(r&&r(t,o,a);s.length;)s.shift()();if(a)for(u=0;u<a.length;u++)d=c(c.s=a[u]);return d};var t={},n={14:0};function c(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,c),n.l=!0,n.exports}c.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,c){r=n[e]=[t,c]});r[2]=t;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:"ecm",6:"evaluation",7:"activity",8:"cdKey",9:"recharge",10:"msg",11:"calllog"}[e]||e)+"."+{0:"0ddc3d68685e848dd774",1:"a6f795143dcb35b5cb4c",2:"5b9c13d64c6bf07f3450",3:"108440167bb83f4091b2",4:"391130c8f773cb8775d6",5:"33d9345e69cc8f8a4f4c",6:"6178547f1a240cc6cd6a",7:"8cde246f205e5d60d01a",8:"1b4d07f3689020998359",9:"d0c7fdeaae259a8befad",10:"0d4820f42ef1fa47e4cc",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,o.appendChild(a),t},c.m=e,c.c=t,c.d=function(e,r,t){c.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:t})},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.9823edc4d42559125088.js deleted 100644 → 0
!function(e){var r=window.webpackJsonp;window.webpackJsonp=function(t,o,c){for(var i,u,f,d=0,s=[];d<t.length;d++)u=t[d],n[u]&&s.push(n[u][0]),n[u]=0;for(i in o)Object.prototype.hasOwnProperty.call(o,i)&&(e[i]=o[i]);for(r&&r(t,o,c);s.length;)s.shift()();if(c)for(d=0;d<c.length;d++)f=a(a.s=c[d]);return f};var t={},n={14:0};function a(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,a),n.l=!0,n.exports}a.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,a){r=n[e]=[t,a]});r[2]=t;var o=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,a.nc&&c.setAttribute("nonce",a.nc),c.src=a.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:"abb6111c738983a815b6",1:"3ba3b9aa666d8094c2bb",2:"ec14ad57867a036b5385",3:"39d6d442b8a17a044e76",4:"d5ac9a5d0e8868b562f3",5:"fc6cde90aa629123d445",6:"bb52993eeb503345732a",7:"dec9bd0e648d6f1d5e6d",8:"7ac80a9c08d038853524",9:"b882885a68a2e4a21301",10:"e4700484ff0e479a66c7",11:"ff53d07686009178f604"}[e]+".js";var i=setTimeout(u,12e4);function u(){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=u,o.appendChild(c),t},a.m=e,a.c=t,a.d=function(e,r,t){a.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:t})},a.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(r,"a",r),r},a.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},a.p="/marketing/",a.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
dist/static/js/message.108440167bb83f4091b2.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/message.39d6d442b8a17a044e76.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/msg.0d4820f42ef1fa47e4cc.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/msg.e4700484ff0e479a66c7.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/vendor.b30a466c3b2d11195801.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/vendor.ecb897a408f5e47fe4a4.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/wechat.21a2ae8bde8fd576d6c1.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/wechat.ec14ad57867a036b5385.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
index.html
......@@ -35,8 +35,6 @@
<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.13.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js"></script><!-- 分页器 -->
<% if (process.env.NODE_ENV !== 'dev' ) { %>
<script src="//web-1251519181.file.myqcloud.com/components/track.1.0.0.js"></script>
<% } %>
</body>
</html>
src/components/storeGroup/index.vue
<template>
<div style="display:inline-block;">
<el-popover class="store__popover" placement="bottom" width="200" trigger="click" v-model="popoverShow">
<el-popover class="store__popover" placement="bottom" width="200" trigger="click" v-model="popoverShow" @hide="hide">
<el-input slot="reference" suffix-icon="el-icon-arrow-down" :value="newModel.label" :placeholder="newModel.label ? '' : placeholder"></el-input>
<el-tree style="height: 260px;overflow-y: auto;" ref="tree" node-key="id" :data="treeData" :highlight-current="true" @node-click="handleNodeClick"> </el-tree>
<div class="store-btn-wrap">
......@@ -36,6 +36,10 @@ export default {
this.storeGroupList();
},
methods: {
hide() {
// 关闭弹窗时
this.newModel = { ...this.model };
},
async storeGroupList() {
let res = await storeGroupList();
const result = res.result;
......@@ -64,7 +68,6 @@ export default {
},
submit() {
this.popoverShow = false;
console.log(this.newModel);
this.$emit('commit-store', this.newModel);
},
close() {
......
src/views/card/shelf.vue
......@@ -62,7 +62,7 @@ export default {
//门店回调
storeChange(val) {
console.log(val);
this.currentData = val;
this.currentData = { ...val };
if (val.id) {
this.listParams.storeGroupId = val.id;
this.refresh();
......
src/views/ecm/form.js
......@@ -443,6 +443,10 @@ export default {
// 保存 校验
submit: _debounce(async function(formName) {
if (this.$refs.marketingEvent.list.length < 1) {
this.$tips({ type: 'warning', message: '请至少保存一条营销事件' });
return;
}
// // 这里强制获取人群筛选器的配置项
// await this.$refs.peopleFilter.confirmSet();
// 判断时间
......
src/views/evaluation/charts.vue
......@@ -84,6 +84,7 @@ export default {
},
methods: {
getStoreGroup(val) {
this.storeGroupData = { ...val };
this.evaluateOverviewEchart(1, val.storeGroupId);
this.evaluateOverviewEchart(2, val.storeGroupId);
this.evaluateOverviewEchart(3, val.storeGroupId);
......
src/views/evaluation/detail.vue
......@@ -95,6 +95,7 @@ export default {
methods: {
getStoreGroup(val) {
this.listParams.currentStoreGroupId = val.storeGroupId;
this.storeGroupData = { ...val };
this.storeEvaluateDetail();
},
close() {
......
src/views/evaluation/newest.vue
......@@ -213,6 +213,7 @@ export default {
},
getStoreGroup(val) {
this.listParams.currentStoreGroupId = val.storeGroupId || '';
this.storeGroupData = { ...val };
this.getTableList();
},
//回复
......
src/views/evaluation/scoreDetail.vue
......@@ -85,6 +85,7 @@ export default {
methods: {
getStoreGroup(val) {
this.listParams.currentStoreGroupId = val.storeGroupId || '';
this.storeGroupData = { ...val };
this.storeScoreDetail();
},
close() {
......
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