.

749e5fda · zhangzhiwei · be363522 · 749e5fda · 749e5fda · 749e5fda
--- a/dist/index.html
+++ b/dist/index.html
-<<<<<<< HEAD
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport><link rel=icon type=image/x-icon href=./static/favicon.ico><link rel=stylesheet href=//at.alicdn.com/t/font_1586872_yhll0m2jcs.css><title>E淘供货商</title><link href=/static/css/app.d2398f33169e231dcac4a36032655666.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.d1f167442ad2025af9b7.js></script><script type=text/javascript src=/static/js/vendor.02a8d01969b52bb78b9a.js></script><script type=text/javascript src=/static/js/app.9c533f42bc14bb8986f3.js></script></body></html>
-=======
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport><link rel=icon type=image/x-icon href=./static/favicon.ico><link rel=stylesheet href=//at.alicdn.com/t/font_1586872_yhll0m2jcs.css><title>E淘供货商</title><link href=/static/css/app.66d8891b9925744d2154a2809df9c6a3.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.3c031843ea9c529da38f.js></script><script type=text/javascript src=/static/js/vendor.02a8d01969b52bb78b9a.js></script><script type=text/javascript src=/static/js/app.4b2c6164a0f24d0d12d8.js></script></body></html>
->>>>>>> release-pre
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport><link rel=icon type=image/x-icon href=./static/favicon.ico><link rel=stylesheet href=//at.alicdn.com/t/font_1586872_yhll0m2jcs.css><title>E淘供货商</title><link href=/static/css/app.29a902e336f3f59783dbb76e553f738a.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.6e7874cbf02c6e8d7cd9.js></script><script type=text/javascript src=/static/js/vendor.02a8d01969b52bb78b9a.js></script><script type=text/javascript src=/static/js/app.4fa13b62c094d39066dd.js></script></body></html>
\ No newline at end of file
--- a/dist/static/DIN-Medium.otf
+++ b/dist/static/DIN-Medium.otf
--- a/dist/static/css/app.29a902e336f3f59783dbb76e553f738a.css
+++ b/dist/static/css/app.29a902e336f3f59783dbb76e553f738a.css
--- a/dist/static/favicon.ico
+++ b/dist/static/favicon.ico
--- a/dist/static/fonts/element-icons.535877f.woff
+++ b/dist/static/fonts/element-icons.535877f.woff
--- a/dist/static/fonts/element-icons.732389d.ttf
+++ b/dist/static/fonts/element-icons.732389d.ttf
--- a/dist/static/img/coupon-1.da2997f.png
+++ b/dist/static/img/coupon-1.da2997f.png
--- a/dist/static/img/coupon-2.4c10af0.png
+++ b/dist/static/img/coupon-2.4c10af0.png
--- a/dist/static/img/demo_codeimg.8f3edba.jpg
+++ b/dist/static/img/demo_codeimg.8f3edba.jpg
--- a/dist/static/img/help0.01d51dc.png
+++ b/dist/static/img/help0.01d51dc.png
--- a/dist/static/img/index/er.png
+++ b/dist/static/img/index/er.png
--- a/dist/static/img/index/goods0.png
+++ b/dist/static/img/index/goods0.png
--- a/dist/static/img/index/goods1.png
+++ b/dist/static/img/index/goods1.png
--- a/dist/static/img/index/goods2.png
+++ b/dist/static/img/index/goods2.png
--- a/dist/static/img/index/goods3.png
+++ b/dist/static/img/index/goods3.png
--- a/dist/static/img/index/goods4.png
+++ b/dist/static/img/index/goods4.png
--- a/dist/static/img/index/help.png
+++ b/dist/static/img/index/help.png
--- a/dist/static/img/index/noact.png
+++ b/dist/static/img/index/noact.png
--- a/dist/static/img/index/order0.png
+++ b/dist/static/img/index/order0.png
--- a/dist/static/img/index/order1.png
+++ b/dist/static/img/index/order1.png
--- a/dist/static/img/index/order2.png
+++ b/dist/static/img/index/order2.png
--- a/dist/static/img/index/order3.png
+++ b/dist/static/img/index/order3.png
--- a/dist/static/img/index/order4.png
+++ b/dist/static/img/index/order4.png
--- a/dist/static/img/index/order5.png
+++ b/dist/static/img/index/order5.png
--- a/dist/static/img/index/order6.png
+++ b/dist/static/img/index/order6.png
--- a/dist/static/img/index/smile_face.png
+++ b/dist/static/img/index/smile_face.png
--- a/dist/static/img/index/vip.png
+++ b/dist/static/img/index/vip.png
--- a/dist/static/img/login-bg.0db77e2.png
+++ b/dist/static/img/login-bg.0db77e2.png
--- a/dist/static/img/mainicon.3c924e2.png
+++ b/dist/static/img/mainicon.3c924e2.png
--- a/dist/static/img/noact.a7b4a9a.png
+++ b/dist/static/img/noact.a7b4a9a.png
--- a/dist/static/img/step.4de44a1.png
+++ b/dist/static/img/step.4de44a1.png
--- a/dist/static/img/top.125321d.png
+++ b/dist/static/img/top.125321d.png
--- a/dist/static/js/0.1708e1f4e7b561ec8140.js
+++ b/dist/static/js/0.1708e1f4e7b561ec8140.js
--- a/dist/static/js/3.ca2708494961454b4374.js
+++ b/dist/static/js/3.ca2708494961454b4374.js
--- a/dist/static/js/4.c569c81ffe41d4800bf8.js
+++ b/dist/static/js/4.c569c81ffe41d4800bf8.js
+webpackJsonp([4],{OHjh:function(n,c){}});
\ No newline at end of file
--- a/dist/static/js/5.cb7f3344fd930f577a5c.js
+++ b/dist/static/js/5.cb7f3344fd930f577a5c.js
--- a/dist/static/js/app.4fa13b62c094d39066dd.js
+++ b/dist/static/js/app.4fa13b62c094d39066dd.js
--- a/dist/static/js/manifest.6e7874cbf02c6e8d7cd9.js
+++ b/dist/static/js/manifest.6e7874cbf02c6e8d7cd9.js
+!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,a){for(var i,u,f,s=0,l=[];s<r.length;s++)u=r[s],t[u]&&l.push(t[u][0]),t[u]=0;for(i in c)Object.prototype.hasOwnProperty.call(c,i)&&(e[i]=c[i]);for(n&&n(r,c,a);l.length;)l.shift()();if(a)for(s=0;s<a.length;s++)f=o(o.s=a[s]);return f};var r={},t={6:0};function o(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,o),t.l=!0,t.exports}o.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,o){n=t[e]=[r,o]});n[2]=r;var c=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,o.nc&&a.setAttribute("nonce",o.nc),a.src=o.p+"static/js/"+e+"."+{0:"1708e1f4e7b561ec8140",3:"ca2708494961454b4374",4:"c569c81ffe41d4800bf8",5:"cb7f3344fd930f577a5c"}[e]+".js";var i=setTimeout(u,12e4);function u(){a.onerror=a.onload=null,clearTimeout(i);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=u,c.appendChild(a),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="/",o.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/dist/static/js/vendor.02a8d01969b52bb78b9a.js
+++ b/dist/static/js/vendor.02a8d01969b52bb78b9a.js