Skip to content

M
marketing
Commit b6cfc363 by caoyanzhi
Options

Merge branch 'bugfix/弹窗推广列表' into dev 

# Conflicts:
#	dist/index.html
#	dist/static/css/main.381cb6bca45f1ec9cf708b5100dee1e7.css
#	dist/static/css/main.7c417c0eae1ff92f0366d998858d49ae.css
#	dist/static/css/main.d3a9130a1cedcfdf1a9a02e4f37ca2c5.css
#	dist/static/js/16.0da77f92b8d1ab2e6dff.js
#	dist/static/js/16.3b17d743d502b83d338f.js
#	dist/static/js/16.5f3597b937b6ff3af1a7.js
#	dist/static/js/17.6b3ebc28621b084bd224.js
#	dist/static/js/18.759a98067ceda319dbac.js
#	dist/static/js/19.ffdbfa6a1416f79f5183.js
#	dist/static/js/main.6e48362b5cb668d37572.js
parents 9944db7d dd2cf7f2
Showing with 12 additions and 3 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></title><link rel=stylesheet type=text/css href=static/css/common.css><link rel=stylesheet href=//at.alicdn.com/t/font_688955_2dxzdzrb3a7.css><script src=//at.alicdn.com/t/font_688955_2dxzdzrb3a7.js></script><link rel=stylesheet href=//at.alicdn.com/t/c/font_3229694_yzk6z4765g.css><script src=//at.alicdn.com/t/font_3229694_yzk6z4765g.js></script><link rel=stylesheet href=//at.alicdn.com/t/c/font_3380872_b9qubgdi1ic.css><link rel=stylesheet href=//at.alicdn.com/t/c/font_3229694_yzk6z4765g.css><script src=//at.alicdn.com/t/c/font_3229694_yzk6z4765g.js></script><link src=//at.alicdn.com/t/font_2859043_udehp133w1.css><script src=//at.alicdn.com/t/font_2859043_udehp133w1.js></script><link rel=stylesheet href=//at.alicdn.com/t/font_2996579_dv9vctk5vdt.css><script src=//at.alicdn.com/t/font_2996579_dv9vctk5vdt.js></script><link rel=stylesheet href=//at.alicdn.com/t/c/font_3380872_hsi60jw7bi7.css><script src=//at.alicdn.com/t/c/font_3380872_hsi60jw7bi7.js></script><link href=/marketing/static/css/main.381cb6bca45f1ec9cf708b5100dee1e7.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/css/common.css><link rel=stylesheet href=//at.alicdn.com/t/font_688955_2dxzdzrb3a7.css><script src=//at.alicdn.com/t/font_688955_2dxzdzrb3a7.js></script><link rel=stylesheet href=//at.alicdn.com/t/c/font_3380872_b9qubgdi1ic.css><link src=//at.alicdn.com/t/font_2859043_udehp133w1.css><script src=//at.alicdn.com/t/font_2859043_udehp133w1.js></script><link rel=stylesheet href=//at.alicdn.com/t/font_2996579_dv9vctk5vdt.css><script src=//at.alicdn.com/t/font_2996579_dv9vctk5vdt.js></script><link rel=stylesheet href=//at.alicdn.com/t/c/font_3380872_hsi60jw7bi7.css><script src=//at.alicdn.com/t/c/font_3380872_hsi60jw7bi7.js></script><link href=/marketing/static/css/main.d3a9130a1cedcfdf1a9a02e4f37ca2c5.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() {
>>>>>>> bugfix/弹窗推广列表
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 ? 'www.gicdev.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.10.js></script><script type=text/javascript src=/marketing/static/js/manifest.69a3b9981a9167e1eb5c.js></script><script type=text/javascript src=/marketing/static/js/vendor.24a60bdab11def7b4f96.js></script><script type=text/javascript src=/marketing/static/js/main.e2d557656f10c681160f.js></script></body></html>
\ No newline at end of file
<<<<<<< HEAD
})();</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.10.js></script><script type=text/javascript src=/marketing/static/js/manifest.69a3b9981a9167e1eb5c.js></script><script type=text/javascript src=/marketing/static/js/vendor.24a60bdab11def7b4f96.js></script><script type=text/javascript src=/marketing/static/js/main.e2d557656f10c681160f.js></script></body></html>
=======
})();</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.10.js></script><script type=text/javascript src=/marketing/static/js/manifest.ac784e816acfe6207416.js></script><script type=text/javascript src=/marketing/static/js/vendor.e0ebad0c4fec1c8f90bf.js></script><script type=text/javascript src=/marketing/static/js/main.6e48362b5cb668d37572.js></script></body></html>
>>>>>>> bugfix/弹窗推广列表
dist/static/css/main.381cb6bca45f1ec9cf708b5100dee1e7.css
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/main.d3a9130a1cedcfdf1a9a02e4f37ca2c5.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/16.0da77f92b8d1ab2e6dff.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/16.5f3597b937b6ff3af1a7.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.ac784e816acfe6207416.js 0 → 100644
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(n,c,o){for(var f,d,i,b=0,u=[];b<n.length;b++)d=n[b],r[d]&&u.push(r[d][0]),r[d]=0;for(f in c)Object.prototype.hasOwnProperty.call(c,f)&&(e[f]=c[f]);for(a&&a(n,c,o);u.length;)u.shift()();if(o)for(b=0;b<o.length;b++)i=t(t.s=o[b]);return i};var n={},r={25:0};function t(a){if(n[a])return n[a].exports;var r=n[a]={i:a,l:!1,exports:{}};return e[a].call(r.exports,r,r.exports,t),r.l=!0,r.exports}t.e=function(e){var a=r[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var n=new Promise(function(n,t){a=r[e]=[n,t]});a[2]=n;var c=document.getElementsByTagName("head")[0],o=document.createElement("script");o.type="text/javascript",o.charset="utf-8",o.async=!0,o.timeout=12e4,t.nc&&o.setAttribute("nonce",t.nc),o.src=t.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",15:"calllog"}[e]||e)+"."+{0:"1bfc28cdfdbd925237d8",1:"4bae1568fe34f4ea4acc",2:"78a893a3285592901952",3:"09c6c06cb3314d6adea6",4:"a11ede89dfa4f6dd621b",5:"1ff85c307f9e68524f34",6:"cc6d123e6bb64892a5b5",7:"fed72fe4c42bb8d8d839",8:"442031faa4ebb0041149",9:"84b91fefa20d9462504c",10:"0756ab734cd7ddc9e1b3",11:"f0c61288632fe8432bef",12:"396650af933c0c4e4ae2",13:"200e6bfe2fb2f86c8231",14:"3fce568e31fac1e807d2",15:"7e607494d8968aef74ab",16:"0da77f92b8d1ab2e6dff",17:"6b3ebc28621b084bd224",18:"759a98067ceda319dbac",19:"ffdbfa6a1416f79f5183",20:"586426db4db60db953da",21:"3b70c426e7cb5384d238",22:"6cd16237471f80ad3676"}[e]+".js";var f=setTimeout(d,12e4);function d(){o.onerror=o.onload=null,clearTimeout(f);var a=r[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),r[e]=void 0)}return o.onerror=o.onload=d,c.appendChild(o),n},t.m=e,t.c=n,t.d=function(e,a,n){t.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:n})},t.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(a,"a",a),a},t.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},t.p="/marketing/",t.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/views/popup/list.vue
......@@ -22,7 +22,7 @@
<el-table-column align="left" label="状态"></el-table-column>
<el-table-column align="left" label="操作" width="170"></el-table-column>
</el-table>
<div class="group-table" v-for="(group, i) in tableList" :key="i">
<div class="group-table" v-for="group in tableList" :key="group.id">
<div class="group-title">
<p class="title">
计划名称：{{ group.name }}<i>{{ formatDateTimeByType(group.beginTime, 'yyyy-MM-dd') + '至' + formatDateTimeByType(group.endTime, 'yyyy-MM-dd') }}</i>
......
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