Skip to content

M
marketing
Commit 72c1b30c by caoyanzhi
Options

Merge branch 'master' into feature/3月迭代

parents e4145551 5d0e843a
Showing with 8 additions and 9 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></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=//at.alicdn.com/t/font_2996579_93aeeozj35q.css><link href=/marketing/static/css/main.d89dea084120421e7b30d68bd033b244.css rel=stylesheet></head><body><div id=app><div class=el-loading-spinner style="width: 98%;"><svg viewBox="25 25 50 50" class=circular><circle cx=50 cy=50 r=20 fill=none class=path></circle></svg></div></div><script>(function() {
<!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></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=//at.alicdn.com/t/font_2996579_93aeeozj35q.css><link href=/marketing/static/css/main.6126458f60b44590b59d24015eaceb3a.css rel=stylesheet></head><body><div id=app><div class=el-loading-spinner style="width: 98%;"><svg viewBox="25 25 50 50" class=circular><circle cx=50 cy=50 r=20 fill=none class=path></circle></svg></div></div><script>(function() {
var src = '/component/static/import-component.js?timestrap=' + new Date().getTime();
var host = window.location.host;
host = host.indexOf('localhost') > -1 || host.indexOf('192.168') > -1 ? 'gicdev.demogic.com' : host;
document.write('<script src="//' + host + src + '"><\/script>');
})();</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.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/upload-file.1.0.6.js></script><script src=//web-1251519181.file.myqcloud.com/components/steps.1.0.1.js></script><script type=text/javascript src=/marketing/static/js/manifest.8e9ebdd7fd0b64c67849.js></script><script type=text/javascript src=/marketing/static/js/vendor.f023e8a9a0c1cdaacdae.js></script><script type=text/javascript src=/marketing/static/js/main.43d4b2b8838c019bc1bd.js></script></body></html>
\ No newline at end of file
})();</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.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/upload-file.1.0.6.js></script><script src=//web-1251519181.file.myqcloud.com/components/steps.1.0.1.js></script><script type=text/javascript src=/marketing/static/js/manifest.8d9e940cc0b174a0d002.js></script><script type=text/javascript src=/marketing/static/js/vendor.f023e8a9a0c1cdaacdae.js></script><script type=text/javascript src=/marketing/static/js/main.43d4b2b8838c019bc1bd.js></script></body></html>
\ No newline at end of file
dist/static/js/manifest.8e9ebdd7fd0b64c67849.js → dist/static/js/manifest.8d9e940cc0b174a0d002.js
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,o,c){for(var f,i,u,s=0,d=[];s<r.length;s++)i=r[s],t[i]&&d.push(t[i][0]),t[i]=0;for(f in o)Object.prototype.hasOwnProperty.call(o,f)&&(e[f]=o[f]);for(n&&n(r,o,c);d.length;)d.shift()();if(c)for(s=0;s<c.length;s++)u=a(a.s=c[s]);return u};var r={},t={17:0};function a(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,a),t.l=!0,t.exports}a.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,a){n=t[e]=[r,a]});n[2]=r;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:"ecm",4:"message",5:"ewash",6:"scan",7:"recharge",8:"activity",9:"signIn",10:"evaluation",11:"cdKey",12:"popup",13:"msg",14:"calllog"}[e]||e)+"."+{0:"6b8a2aa321095e8bf967",1:"f696a75d18f63ba382a1",2:"87577d5631db74a5c53f",3:"46e7a962fa533a2b5a74",4:"5191a87f6bf08777e93b",5:"fcf26357353a16e34874",6:"16de762ea519e8b1b79c",7:"57fab6f6b65984488b8b",8:"027b144d7e02f568cfcb",9:"b9215ca5f80c0f14e4e1",10:"24dee8cce61b88177e37",11:"04ea2e4b129980c10d62",12:"7a732ff9a02812ec59a5",13:"36276a6899f058e9d8e6",14:"0d5636d0cec7eadf7549"}[e]+".js";var f=setTimeout(i,12e4);function i(){c.onerror=c.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=i,o.appendChild(c),r},a.m=e,a.c=r,a.d=function(e,n,r){a.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},a.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(n,"a",n),n},a.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},a.p="/marketing/",a.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,o,c){for(var f,i,u,s=0,d=[];s<r.length;s++)i=r[s],t[i]&&d.push(t[i][0]),t[i]=0;for(f in o)Object.prototype.hasOwnProperty.call(o,f)&&(e[f]=o[f]);for(n&&n(r,o,c);d.length;)d.shift()();if(c)for(s=0;s<c.length;s++)u=a(a.s=c[s]);return u};var r={},t={17:0};function a(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,a),t.l=!0,t.exports}a.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,a){n=t[e]=[r,a]});n[2]=r;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:"ecm",4:"message",5:"ewash",6:"scan",7:"recharge",8:"activity",9:"signIn",10:"evaluation",11:"cdKey",12:"popup",13:"msg",14:"calllog"}[e]||e)+"."+{0:"6b8a2aa321095e8bf967",1:"f696a75d18f63ba382a1",2:"87577d5631db74a5c53f",3:"cfbcad1d5f4bce1b1137",4:"5191a87f6bf08777e93b",5:"fcf26357353a16e34874",6:"16de762ea519e8b1b79c",7:"57fab6f6b65984488b8b",8:"e01c89910d020bc0ae7e",9:"b9215ca5f80c0f14e4e1",10:"24dee8cce61b88177e37",11:"04ea2e4b129980c10d62",12:"7a732ff9a02812ec59a5",13:"36276a6899f058e9d8e6",14:"0d5636d0cec7eadf7549"}[e]+".js";var f=setTimeout(i,12e4);function i(){c.onerror=c.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=i,o.appendChild(c),r},a.m=e,a.c=r,a.d=function(e,n,r){a.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},a.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(n,"a",n),n},a.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},a.p="/marketing/",a.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/views/activity/data-view.vue
......@@ -3,7 +3,7 @@
<template v-if="!loading">
<p class="title">
{{ info.name || '--' }}<span>活动时间：{{ info.beginDate || '--' }} 至 {{ info.endDate || '--' }}</span>
<span style="color:#909399;" class="ml10">* 次日0点后更新当天营销数据统计</span>
<span style="color:#909399;" class="ml10">* 次日10点后更新当天营销数据统计</span>
</p>
<template v-if="!isHistory">
<div class="bk f1 big" :class="fade">
......@@ -156,7 +156,6 @@ export default {
if (new Date(result.endDate) < new Date()) {
// 历史数据
this.isHistory = true;
this.$store.commit('mutations_breadcrumb', [{ name: '数据对话厅', path: '/activity/list' }, { name: '历史数据概览', path: '' }]); // eslint-disable-line
}
activityViewData({ marketingActivityId: this.marketingActivityId })
.then(res => {
......
src/views/ecm/form.vue
......@@ -390,8 +390,8 @@
<el-button size="small" @click="cancelFilter">取 消</el-button>
</div>
</div>
<div :class="!isAdd ? 'el-view-mask' : ''" v-if="form.memberType === 1">
<vue-gic-member-group v-bind="storeParams" :real-time-type="getRealTimeType" :defaltSelected="defaltSelected" :height="500" :projectName="projectName" :headerList="headerList" @handleDataTransferred="handleDataTransferred" @handleDataLeft="handleDataLeft"></vue-gic-member-group>
<div v-if="form.memberType === 1">
<vue-gic-member-group v-bind="storeParams" :readonly="!isAdd" :real-time-type="getRealTimeType" :defaltSelected="defaltSelected" :height="500" :projectName="projectName" :headerList="headerList" @handleDataTransferred="handleDataTransferred" @handleDataLeft="handleDataLeft"></vue-gic-member-group>
</div>
</section>
<!-- 营销事件组件 -->
......
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