Skip to content

M
marketing
Commit c2adb732 by liuchenxi
Options

Merge branch 'dev' of http://git.gicdev.com/marketing-web/marketing into dev 

# Conflicts:
#	dist/index.html
#	dist/static/css/main.061298db2746af3c9fe6ad00c161a961.css
#	dist/static/css/main.86142a969cd94ab713cae5552a871075.css
#	dist/static/css/main.f00bdad33d5810d87d52368e191524b0.css
#	dist/static/js/manifest.ee5ebfdfe6df80b1dc49.js
#	dist/static/js/recharge.0bad81fb05e6ba408a3c.js
#	dist/static/js/recharge.5be69adb4af76e86a62a.js
#	dist/static/js/recharge.b642a36a23597d982be8.js
parents 768264e8 dd3ef016
Showing with 11 additions and 2 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=//at.alicdn.com/t/font_2996579_93aeeozj35q.css><link href=/marketing/static/css/main.f00bdad33d5810d87d52368e191524b0.css rel=stylesheet></head><body><div id=app></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>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=//at.alicdn.com/t/font_2996579_93aeeozj35q.css><link href=/marketing/static/css/main.86142a969cd94ab713cae5552a871075.css rel=stylesheet></head><body><div id=app></div><script>(function() {
>>>>>>> dd3ef016741fb39b80e357e6a5a06ca3d253a396
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.ee5ebfdfe6df80b1dc49.js></script><script type=text/javascript src=/marketing/static/js/vendor.60b9dda16393a2ab9e6a.js></script><script type=text/javascript src=/marketing/static/js/main.1473bfe0ab79093c8eb2.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.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.ee5ebfdfe6df80b1dc49.js></script><script type=text/javascript src=/marketing/static/js/vendor.60b9dda16393a2ab9e6a.js></script><script type=text/javascript src=/marketing/static/js/main.1473bfe0ab79093c8eb2.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.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.5c1e5de0f40581696755.js></script><script type=text/javascript src=/marketing/static/js/vendor.60b9dda16393a2ab9e6a.js></script><script type=text/javascript src=/marketing/static/js/main.15495ef189081e6a39e8.js></script></body></html>
>>>>>>> dd3ef016741fb39b80e357e6a5a06ca3d253a396
dist/static/css/main.86142a969cd94ab713cae5552a871075.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.5c1e5de0f40581696755.js 0 → 100644
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,o,c){for(var f,i,d,u=0,s=[];u<r.length;u++)i=r[u],a[i]&&s.push(a[i][0]),a[i]=0;for(f in o)Object.prototype.hasOwnProperty.call(o,f)&&(e[f]=o[f]);for(n&&n(r,o,c);s.length;)s.shift()();if(c)for(u=0;u<c.length;u++)d=t(t.s=c[u]);return d};var r={},a={17:0};function t(n){if(r[n])return r[n].exports;var a=r[n]={i:n,l:!1,exports:{}};return e[n].call(a.exports,a,a.exports,t),a.l=!0,a.exports}t.e=function(e){var n=a[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,t){n=a[e]=[r,t]});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,t.nc&&c.setAttribute("nonce",t.nc),c.src=t.p+"static/js/"+({0:"card",1:"game",2:"wechat",3:"ecm",4:"message",5:"ewash",6:"scan",7:"evaluation",8:"recharge",9:"activity",10:"signIn",11:"cdKey",12:"popup",13:"msg",14:"calllog"}[e]||e)+"."+{0:"deba7672c390b4bd4f0e",1:"71f958adebe94dc74204",2:"e1ed6e6ab557862719ef",3:"1246a9884bd9536e98bc",4:"527fc3df55cbef6956ea",5:"040daa00ad74daa6dc50",6:"a8b29371ef4839f4ef58",7:"59f8a7ef78bc0d73daf2",8:"5be69adb4af76e86a62a",9:"c81a068528a0d55d1a15",10:"b42bb545eb553e28af5c",11:"aeb00fcde81507fa4885",12:"091dd7723081a823098f",13:"e058d550c4872f50f70e",14:"04499b9ab4f58848b2a4"}[e]+".js";var f=setTimeout(i,12e4);function i(){c.onerror=c.onload=null,clearTimeout(f);var n=a[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),a[e]=void 0)}return c.onerror=c.onload=i,o.appendChild(c),r},t.m=e,t.c=r,t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},t.p="/marketing/",t.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
dist/static/js/recharge.5be69adb4af76e86a62a.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
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