Skip to content

M
marketing
Commit 57c7174f by 陈羽
Options

Merge branch 'master' of http://git.gicdev.com/marketing-web/marketing into feature/门店签到需求 

# Conflicts:
#	dist/index.html
#	dist/static/css/main.611ef6dbce9d0672c7efe94156a40035.css
#	dist/static/css/main.6ed2e160bad883eb93b49341fe8b1b48.css
#	dist/static/css/main.799551577273f91360048ffa3bbb3d1c.css
#	dist/static/js/card.c713da56138b5476aad3.js
#	dist/static/js/cdKey.af811e90e79a76129b6d.js
#	dist/static/js/ewash.14da927c4cfa606cba4f.js
#	dist/static/js/ewash.2aea6e7dfdf4a40cb08d.js
#	dist/static/js/ewash.c8a5e5c668cdc258c3c4.js
#	dist/static/js/game.398009c91a7388812f00.js
#	dist/static/js/main.71b4c4e2af7595947b49.js
#	dist/static/js/recharge.c4dfb3d423bc3d3905eb.js
#	dist/static/js/recharge.e5cd16e4f5e1229ea313.js
#	dist/static/js/recharge.fd4ef6af3cd790ec9e39.js
#	dist/static/js/vendor.a8703cbaa9498f2b02af.js
parents dd9b41bb 7a7d603b
Showing with 4 additions and 2 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>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.6ed2e160bad883eb93b49341fe8b1b48.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.45.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.20.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.28.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.30.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.71.js></script><script src=//web-1251519181.file.myqcloud.com/components/confirm-people.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.43.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.16.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.21.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.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/activity-select.1.0.2.1.js></script><script src=//web-1251519181.file.myqcloud.com/components/radio-transfer.1.0.13.js></script><script type=text/javascript src=/marketing/static/js/manifest.4d9807674e2aa891249b.js></script><script type=text/javascript src=/marketing/static/js/vendor.a8703cbaa9498f2b02af.js></script><script type=text/javascript src=/marketing/static/js/main.71b4c4e2af7595947b49.js></script></body></html>
\ No newline at end of file
<!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.799551577273f91360048ffa3bbb3d1c.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.45.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.19.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.28.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.30.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.71.js></script><script src=//web-1251519181.file.myqcloud.com/components/confirm-people.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.43.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.16.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.21.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.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/activity-select.1.0.2.1.js></script><script type=text/javascript src=/marketing/static/js/manifest.581985d1bd4d0508813f.js></script><script type=text/javascript src=/marketing/static/js/vendor.1bebc6ed2a07e457fac4.js></script><script type=text/javascript src=/marketing/static/js/main.30912736c5d34f2fe1a4.js></script></body></html>
\ No newline at end of file
dist/static/css/main.6ed2e160bad883eb93b49341fe8b1b48.css
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/main.799551577273f91360048ffa3bbb3d1c.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/calllog.7131c6b2d97281c750f7.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.f1c9fa1ccd0d36ae0602.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.9357837e6b2af2ac4ef4.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.113d0d4b1370ebf4e264.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.14da927c4cfa606cba4f.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.2aea6e7dfdf4a40cb08d.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/game.eea2e1b17aec2d5b19cf.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.581985d1bd4d0508813f.js 0 → 100644
!function(e){var r=window.webpackJsonp;window.webpackJsonp=function(n,c,o){for(var f,i,u,d=0,s=[];d<n.length;d++)i=n[d],t[i]&&s.push(t[i][0]),t[i]=0;for(f in c)Object.prototype.hasOwnProperty.call(c,f)&&(e[f]=c[f]);for(r&&r(n,c,o);s.length;)s.shift()();if(o)for(d=0;d<o.length;d++)u=a(a.s=o[d]);return u};var n={},t={15:0};function a(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,a),t.l=!0,t.exports}a.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,a){r=t[e]=[n,a]});r[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,a.nc&&o.setAttribute("nonce",a.nc),o.src=a.p+"static/js/"+({0:"card",1:"game",2:"wechat",3:"message",4:"ewash",5:"scan",6:"ecm",7:"evaluation",8:"activity",9:"cdKey",10:"recharge",11:"msg",12:"calllog"}[e]||e)+"."+{0:"9357837e6b2af2ac4ef4",1:"eea2e1b17aec2d5b19cf",2:"39ad05eb5da3dc4c9d1a",3:"ca796a3f2a45a99bb83c",4:"14da927c4cfa606cba4f",5:"25c6246c0480e836d9a2",6:"113d0d4b1370ebf4e264",7:"f28dbb0af585171c22eb",8:"bc6eab7430e4e0e9385f",9:"af811e90e79a76129b6d",10:"c4dfb3d423bc3d3905eb",11:"179854e3f9d6f3a2b732",12:"7131c6b2d97281c750f7"}[e]+".js";var f=setTimeout(i,12e4);function i(){o.onerror=o.onload=null,clearTimeout(f);var r=t[e];0!==r&&(r&&r[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return o.onerror=o.onload=i,c.appendChild(o),n},a.m=e,a.c=n,a.d=function(e,r,n){a.o(e,r)||Object.defineProperty(e,r,{configurable:!1,enumerable:!0,get:n})},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.83c06aa714fa01a48b43.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/message.ca796a3f2a45a99bb83c.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.00a6edc9657c9e4c34fa.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.179854e3f9d6f3a2b732.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/recharge.c4dfb3d423bc3d3905eb.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/recharge.fd4ef6af3cd790ec9e39.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/scan.25c6246c0480e836d9a2.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.1bebc6ed2a07e457fac4.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.1aad863c428279c5a169.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.39ad05eb5da3dc4c9d1a.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