1 year ago · 9879e6b186
--- a/dist/index.html
+++ b/dist/index.html
@@ -7,8 +7,4 @@
 
				         hm.src = "https://hm.baidu.com/hm.js?8b02a318fde5831da10426656a43d03c";
			
 
				         var s = document.getElementsByTagName("script")[0];
			
 
				         s.parentNode.insertBefore(hm, s);
			
 
				-<<<<<<< HEAD
			
 
				-      })();</script><script src=./static/ks3jssdk/plupload.full.min.js></script><script src=./static/ks3jssdk/ks3jssdk.min.js></script><link href=./static/css/app.9d2d2210a791a712e6d37f92d9014c77.css rel=stylesheet></head><body><script src=https://unpkg.com/tinymce@4.7.5/tinymce.min.js></script><div id=app></div><script type=text/javascript src=./static/js/manifest.252d6537df6e41fd4154.js></script><script type=text/javascript src=./static/js/vendor.3a8d2e3245c66a69b2a4.js></script><script type=text/javascript src=./static/js/app.529d7471a25ddb1ca654.js></script></body></html>
			
 
				-=======
			
 
				-      })();</script><script src=./static/ks3jssdk/plupload.full.min.js></script><script src=./static/ks3jssdk/ks3jssdk.min.js></script><link href=./static/css/app.238ed995561a314ca817abc2cd4cea69.css rel=stylesheet></head><body><script src=https://unpkg.com/tinymce@4.7.5/tinymce.min.js></script><div id=app></div><script type=text/javascript src=./static/js/manifest.1f85ac9193a39cfcec4b.js></script><script type=text/javascript src=./static/js/vendor.3a8d2e3245c66a69b2a4.js></script><script type=text/javascript src=./static/js/app.744d452477ac7dfb33cd.js></script></body></html>
			
 
				->>>>>>> iteration-oss-upload
			
 
				+      })();</script><script src=./static/ks3jssdk/plupload.full.min.js></script><script src=./static/ks3jssdk/ks3jssdk.min.js></script><link href=./static/css/app.f596670ec4d5d0aa74064c0dcd5d5045.css rel=stylesheet></head><body><script src=https://unpkg.com/tinymce@4.7.5/tinymce.min.js></script><div id=app></div><script type=text/javascript src=./static/js/manifest.686f3c845a41da926ad2.js></script><script type=text/javascript src=./static/js/vendor.3a8d2e3245c66a69b2a4.js></script><script type=text/javascript src=./static/js/app.292d8e53f3695eb38388.js></script></body></html>
			
--- a/dist/static/css/app.9d2d2210a791a712e6d37f92d9014c77.css
+++ b/dist/static/css/app.9d2d2210a791a712e6d37f92d9014c77.css
--- a/dist/static/css/app.9d2d2210a791a712e6d37f92d9014c77.css.map
+++ b/dist/static/css/app.9d2d2210a791a712e6d37f92d9014c77.css.map
--- a/dist/static/css/app.f596670ec4d5d0aa74064c0dcd5d5045.css
+++ b/dist/static/css/app.f596670ec4d5d0aa74064c0dcd5d5045.css
--- a/dist/static/css/app.f596670ec4d5d0aa74064c0dcd5d5045.css.map
+++ b/dist/static/css/app.f596670ec4d5d0aa74064c0dcd5d5045.css.map
--- a/dist/static/js/0.22575540957b5e13d1a2.js
+++ b/dist/static/js/0.22575540957b5e13d1a2.js
--- a/dist/static/js/0.22575540957b5e13d1a2.js.map
+++ b/dist/static/js/0.22575540957b5e13d1a2.js.map
--- a/dist/static/js/0.3a2211b19c3ef303deb9.js
+++ b/dist/static/js/0.3a2211b19c3ef303deb9.js
--- a/dist/static/js/0.3a2211b19c3ef303deb9.js.map
+++ b/dist/static/js/0.3a2211b19c3ef303deb9.js.map
--- a/dist/static/js/0.e23f1a4fe70bd8ff0f2f.js
+++ b/dist/static/js/0.e23f1a4fe70bd8ff0f2f.js
--- a/dist/static/js/0.e23f1a4fe70bd8ff0f2f.js.map
+++ b/dist/static/js/0.e23f1a4fe70bd8ff0f2f.js.map
--- a/dist/static/js/1.41ff458f410c3a84f4b1.js.map
+++ b/dist/static/js/1.41ff458f410c3a84f4b1.js.map
--- a/dist/static/js/1.772c0b5ac23bee074e5c.js
+++ b/dist/static/js/1.772c0b5ac23bee074e5c.js
--- a/dist/static/js/1.772c0b5ac23bee074e5c.js.map
+++ b/dist/static/js/1.772c0b5ac23bee074e5c.js.map
--- a/dist/static/js/10.1285880c5d5f256dd54b.js
+++ b/dist/static/js/10.1285880c5d5f256dd54b.js
--- a/dist/static/js/10.1285880c5d5f256dd54b.js.map
+++ b/dist/static/js/10.1285880c5d5f256dd54b.js.map
--- a/dist/static/js/10.27332077c16c3aaa0dd6.js
+++ b/dist/static/js/10.27332077c16c3aaa0dd6.js
--- a/dist/static/js/10.27332077c16c3aaa0dd6.js.map
+++ b/dist/static/js/10.27332077c16c3aaa0dd6.js.map
--- a/dist/static/js/10.b53e4d307ef9bd37ac19.js.map
+++ b/dist/static/js/10.b53e4d307ef9bd37ac19.js.map
--- a/dist/static/js/11.3963f612248c2310fdb7.js
+++ b/dist/static/js/11.3963f612248c2310fdb7.js
--- a/dist/static/js/11.3963f612248c2310fdb7.js.map
+++ b/dist/static/js/11.3963f612248c2310fdb7.js.map
--- a/dist/static/js/11.600184dc75c383b4e54d.js
+++ b/dist/static/js/11.600184dc75c383b4e54d.js
--- a/dist/static/js/11.600184dc75c383b4e54d.js.map
+++ b/dist/static/js/11.600184dc75c383b4e54d.js.map
--- a/dist/static/js/11.d21339cb2e7be6a743ca.js
+++ b/dist/static/js/11.d21339cb2e7be6a743ca.js
--- a/dist/static/js/11.d21339cb2e7be6a743ca.js.map
+++ b/dist/static/js/11.d21339cb2e7be6a743ca.js.map
--- a/dist/static/js/12.3965388e70ad3bce3d7e.js
+++ b/dist/static/js/12.3965388e70ad3bce3d7e.js
--- a/dist/static/js/12.3965388e70ad3bce3d7e.js.map
+++ b/dist/static/js/12.3965388e70ad3bce3d7e.js.map
--- a/dist/static/js/12.8f385410994d9e5a2b72.js
+++ b/dist/static/js/12.8f385410994d9e5a2b72.js
--- a/dist/static/js/12.8f385410994d9e5a2b72.js.map
+++ b/dist/static/js/12.8f385410994d9e5a2b72.js.map
--- a/dist/static/js/12.e899c6f783bde5792a55.js
+++ b/dist/static/js/12.e899c6f783bde5792a55.js
--- a/dist/static/js/12.e899c6f783bde5792a55.js.map
+++ b/dist/static/js/12.e899c6f783bde5792a55.js.map
--- a/dist/static/js/13.351f20474e9b3c8ff7e3.js
+++ b/dist/static/js/13.351f20474e9b3c8ff7e3.js
--- a/dist/static/js/13.351f20474e9b3c8ff7e3.js.map
+++ b/dist/static/js/13.351f20474e9b3c8ff7e3.js.map
--- a/dist/static/js/13.8f77f8ee344e545ae71c.js
+++ b/dist/static/js/13.8f77f8ee344e545ae71c.js
--- a/dist/static/js/13.8f77f8ee344e545ae71c.js.map
+++ b/dist/static/js/13.8f77f8ee344e545ae71c.js.map
--- a/dist/static/js/13.ace212faa3bf4922cb3f.js
+++ b/dist/static/js/13.ace212faa3bf4922cb3f.js
--- a/dist/static/js/13.ace212faa3bf4922cb3f.js.map
+++ b/dist/static/js/13.ace212faa3bf4922cb3f.js.map
--- a/dist/static/js/14.0303845d062e775561bd.js
+++ b/dist/static/js/14.0303845d062e775561bd.js
--- a/dist/static/js/14.0303845d062e775561bd.js.map
+++ b/dist/static/js/14.0303845d062e775561bd.js.map
--- a/dist/static/js/14.15dc65250bedd435a021.js.map
+++ b/dist/static/js/14.15dc65250bedd435a021.js.map
--- a/dist/static/js/14.95648340f6b8f3862329.js
+++ b/dist/static/js/14.95648340f6b8f3862329.js
--- a/dist/static/js/14.95648340f6b8f3862329.js.map
+++ b/dist/static/js/14.95648340f6b8f3862329.js.map
--- a/dist/static/js/15.211ac8b0ab5b5b7677a9.js
+++ b/dist/static/js/15.211ac8b0ab5b5b7677a9.js
--- a/dist/static/js/15.211ac8b0ab5b5b7677a9.js.map
+++ b/dist/static/js/15.211ac8b0ab5b5b7677a9.js.map
--- a/dist/static/js/15.33fccc699c5f645be03a.js
+++ b/dist/static/js/15.33fccc699c5f645be03a.js
--- a/dist/static/js/15.33fccc699c5f645be03a.js.map
+++ b/dist/static/js/15.33fccc699c5f645be03a.js.map
--- a/dist/static/js/16.8a40d7c10ae8c85d0b7b.js
+++ b/dist/static/js/16.8a40d7c10ae8c85d0b7b.js
--- a/dist/static/js/16.8a40d7c10ae8c85d0b7b.js.map
+++ b/dist/static/js/16.8a40d7c10ae8c85d0b7b.js.map
--- a/dist/static/js/16.baf9485f1d65365f4ae1.js
+++ b/dist/static/js/16.baf9485f1d65365f4ae1.js
--- a/dist/static/js/16.baf9485f1d65365f4ae1.js.map
+++ b/dist/static/js/16.baf9485f1d65365f4ae1.js.map
--- a/dist/static/js/17.ca79b0cc45f17c25e615.js
+++ b/dist/static/js/17.ca79b0cc45f17c25e615.js
@@ -1,2 +1,2 @@
 
				-webpackJsonp([17],{"+H76":function(t,a,e){"use strict";Object.defineProperty(a,"__esModule",{value:!0});var n=e("6ccA"),i=e.n(n),s={name:"wrongPage",data:function(){return{img_404:i.a}},methods:{handleGoMain:function(){this.$router.push({path:"/"})}}},c={render:function(){var t=this,a=t.$createElement,e=t._self._c||a;return e("div",[e("div",{staticClass:"app-container"},[e("el-col",{attrs:{span:12}},[e("img",{staticClass:"img-style",attrs:{src:t.img_404,alt:"404"}})]),t._v(" "),e("el-col",{attrs:{span:12}},[e("div",{staticStyle:{"margin-left":"100px","margin-top":"60px"}},[e("h1",{staticClass:"color-main"},[t._v("OOPS!")]),t._v(" "),e("h2",{staticStyle:{color:"#606266"}},[t._v("很抱歉，页面它不小心迷路了！")]),t._v(" "),e("div",{staticStyle:{color:"#909399","font-size":"14px"}},[t._v("请检查您输入的网址是否正确，请点击以下按钮返回主页或者发送错误报告")]),t._v(" "),e("el-button",{staticStyle:{"margin-top":"20px"},attrs:{type:"primary",round:""},on:{click:t.handleGoMain}},[t._v("返回首页")])],1)])],1)])},staticRenderFns:[]};var r=e("VU/8")(s,c,!1,function(t){e("tTM0")},"data-v-dc06b418",null);a.default=r.exports},"6ccA":function(t,a,e){t.exports=e.p+"static/img/gif_404.6b8ae1d.gif"},tTM0:function(t,a){}});
			
 
				-//# sourceMappingURL=17.79a514e4392df8d8f875.js.map
			
 
				+webpackJsonp([17],{"+H76":function(t,a,e){"use strict";Object.defineProperty(a,"__esModule",{value:!0});var n=e("6ccA"),i=e.n(n),s={name:"wrongPage",data:function(){return{img_404:i.a}},methods:{handleGoMain:function(){this.$router.push({path:"/"})}}},c={render:function(){var t=this,a=t.$createElement,e=t._self._c||a;return e("div",[e("div",{staticClass:"app-container"},[e("el-col",{attrs:{span:12}},[e("img",{staticClass:"img-style",attrs:{src:t.img_404,alt:"404"}})]),t._v(" "),e("el-col",{attrs:{span:12}},[e("div",{staticStyle:{"margin-left":"100px","margin-top":"60px"}},[e("h1",{staticClass:"color-main"},[t._v("OOPS!")]),t._v(" "),e("h2",{staticStyle:{color:"#606266"}},[t._v("很抱歉，页面它不小心迷路了！")]),t._v(" "),e("div",{staticStyle:{color:"#909399","font-size":"14px"}},[t._v("请检查您输入的网址是否正确，请点击以下按钮返回主页或者发送错误报告")]),t._v(" "),e("el-button",{staticStyle:{"margin-top":"20px"},attrs:{type:"primary",round:""},on:{click:t.handleGoMain}},[t._v("返回首页")])],1)])],1)])},staticRenderFns:[]};var r=e("VU/8")(s,c,!1,function(t){e("7AMC")},"data-v-36ebfeda",null);a.default=r.exports},"6ccA":function(t,a,e){t.exports=e.p+"static/img/gif_404.6b8ae1d.gif"},"7AMC":function(t,a){}});
			
 
				+//# sourceMappingURL=17.ca79b0cc45f17c25e615.js.map
			
--- a/dist/static/js/17.ca79b0cc45f17c25e615.js.map
+++ b/dist/static/js/17.ca79b0cc45f17c25e615.js.map
--- a/dist/static/js/18.4cd3591d3527d68826e2.js
+++ b/dist/static/js/18.4cd3591d3527d68826e2.js
--- a/dist/static/js/18.4cd3591d3527d68826e2.js.map
+++ b/dist/static/js/18.4cd3591d3527d68826e2.js.map
--- a/dist/static/js/18.c27fb372ee978f039f36.js
+++ b/dist/static/js/18.c27fb372ee978f039f36.js
--- a/dist/static/js/18.c27fb372ee978f039f36.js.map
+++ b/dist/static/js/18.c27fb372ee978f039f36.js.map
--- a/dist/static/js/19.8166269dc48cedffac05.js
+++ b/dist/static/js/19.8166269dc48cedffac05.js
--- a/dist/static/js/19.8166269dc48cedffac05.js.map
+++ b/dist/static/js/19.8166269dc48cedffac05.js.map
--- a/dist/static/js/19.b9f9d2c7ed4ac99ddebe.js.map
+++ b/dist/static/js/19.b9f9d2c7ed4ac99ddebe.js.map
--- a/dist/static/js/2.bca7848d5fc627e6a287.js
+++ b/dist/static/js/2.bca7848d5fc627e6a287.js
--- a/dist/static/js/2.bca7848d5fc627e6a287.js.map
+++ b/dist/static/js/2.bca7848d5fc627e6a287.js.map
--- a/dist/static/js/20.e2233ac979540300982d.js
+++ b/dist/static/js/20.e2233ac979540300982d.js
--- a/dist/static/js/20.e2233ac979540300982d.js.map
+++ b/dist/static/js/20.e2233ac979540300982d.js.map
--- a/dist/static/js/21.826ba299070610b98a04.js.map
+++ b/dist/static/js/21.826ba299070610b98a04.js.map
--- a/dist/static/js/21.e8b81fffa1f329a1e2a6.js
+++ b/dist/static/js/21.e8b81fffa1f329a1e2a6.js
--- a/dist/static/js/21.e8b81fffa1f329a1e2a6.js.map
+++ b/dist/static/js/21.e8b81fffa1f329a1e2a6.js.map
--- a/dist/static/js/22.35973257612f36365fb8.js
+++ b/dist/static/js/22.35973257612f36365fb8.js
--- a/dist/static/js/22.35973257612f36365fb8.js.map
+++ b/dist/static/js/22.35973257612f36365fb8.js.map
--- a/dist/static/js/22.ed9c31c634c903087ec8.js.map
+++ b/dist/static/js/22.ed9c31c634c903087ec8.js.map
--- a/dist/static/js/23.a607682c7c939298f04b.js
+++ b/dist/static/js/23.a607682c7c939298f04b.js
--- a/dist/static/js/23.a607682c7c939298f04b.js.map
+++ b/dist/static/js/23.a607682c7c939298f04b.js.map
--- a/dist/static/js/23.c80b27bc9a1055a725ad.js
+++ b/dist/static/js/23.c80b27bc9a1055a725ad.js
--- a/dist/static/js/23.c80b27bc9a1055a725ad.js.map
+++ b/dist/static/js/23.c80b27bc9a1055a725ad.js.map
--- a/dist/static/js/24.4e55d88b236b70401215.js
+++ b/dist/static/js/24.4e55d88b236b70401215.js
--- a/dist/static/js/24.4e55d88b236b70401215.js.map
+++ b/dist/static/js/24.4e55d88b236b70401215.js.map
--- a/dist/static/js/24.a02d03c99fb4fb7a253c.js.map
+++ b/dist/static/js/24.a02d03c99fb4fb7a253c.js.map
--- a/dist/static/js/25.591357accdf4aab4c7a6.js
+++ b/dist/static/js/25.591357accdf4aab4c7a6.js
--- a/dist/static/js/25.591357accdf4aab4c7a6.js.map
+++ b/dist/static/js/25.591357accdf4aab4c7a6.js.map
--- a/dist/static/js/25.df379391e92cfe4d5422.js
+++ b/dist/static/js/25.df379391e92cfe4d5422.js
--- a/dist/static/js/25.df379391e92cfe4d5422.js.map
+++ b/dist/static/js/25.df379391e92cfe4d5422.js.map
--- a/dist/static/js/26.5b24a3d72a56be3888f7.js
+++ b/dist/static/js/26.5b24a3d72a56be3888f7.js
--- a/dist/static/js/26.5b24a3d72a56be3888f7.js.map
+++ b/dist/static/js/26.5b24a3d72a56be3888f7.js.map
--- a/dist/static/js/26.5dfc351d2f93bf362ebe.js
+++ b/dist/static/js/26.5dfc351d2f93bf362ebe.js
--- a/dist/static/js/26.5dfc351d2f93bf362ebe.js.map
+++ b/dist/static/js/26.5dfc351d2f93bf362ebe.js.map
--- a/dist/static/js/27.30d833fb991e073fc86e.js
+++ b/dist/static/js/27.30d833fb991e073fc86e.js
--- a/dist/static/js/27.30d833fb991e073fc86e.js.map
+++ b/dist/static/js/27.30d833fb991e073fc86e.js.map
--- a/dist/static/js/27.de757d1d8dc397bf7f6e.js
+++ b/dist/static/js/27.de757d1d8dc397bf7f6e.js
--- a/dist/static/js/28.40f4b48f7cb18e9a12f1.js
+++ b/dist/static/js/28.40f4b48f7cb18e9a12f1.js
--- a/dist/static/js/28.40f4b48f7cb18e9a12f1.js.map
+++ b/dist/static/js/28.40f4b48f7cb18e9a12f1.js.map
--- a/dist/static/js/28.f69de018d7bf9eed9ee8.js.map
+++ b/dist/static/js/28.f69de018d7bf9eed9ee8.js.map
--- a/dist/static/js/29.370ad477e86f96212778.js
+++ b/dist/static/js/29.370ad477e86f96212778.js
@@ -0,0 +1,2 @@
 
				+webpackJsonp([29],{N3DD:function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r={name:"addProduct",components:{ProductDetail:n("CmKi").a}},a={render:function(){var e=this.$createElement;return(this._self._c||e)("product-detail",{attrs:{"is-edit":!0,"is-add":!0}})},staticRenderFns:[]};var i=n("VU/8")(r,a,!1,function(e){n("npeD")},null,null);t.default=i.exports},npeD:function(e,t){}});
			
 
				+//# sourceMappingURL=29.370ad477e86f96212778.js.map
			
--- a/dist/static/js/29.370ad477e86f96212778.js.map
+++ b/dist/static/js/29.370ad477e86f96212778.js.map
--- a/dist/static/js/29.5a21bcd57ae89be76771.js
+++ b/dist/static/js/29.5a21bcd57ae89be76771.js
@@ -1,2 +0,0 @@
 
				-webpackJsonp([29],{"+56F":function(e,t){},N3DD:function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r={name:"addProduct",components:{ProductDetail:n("CmKi").a}},a={render:function(){var e=this.$createElement;return(this._self._c||e)("product-detail",{attrs:{"is-edit":!0}})},staticRenderFns:[]};var c=n("VU/8")(r,a,!1,function(e){n("+56F")},null,null);t.default=c.exports}});
			
 
				-//# sourceMappingURL=29.5a21bcd57ae89be76771.js.map
			
--- a/dist/static/js/29.5a21bcd57ae89be76771.js.map
+++ b/dist/static/js/29.5a21bcd57ae89be76771.js.map
--- a/dist/static/js/29.ff9d61dc1ab83ae2196a.js
+++ b/dist/static/js/29.ff9d61dc1ab83ae2196a.js
--- a/dist/static/js/29.ff9d61dc1ab83ae2196a.js.map
+++ b/dist/static/js/29.ff9d61dc1ab83ae2196a.js.map
--- a/dist/static/js/3.ba5131628fea150d3119.js
+++ b/dist/static/js/3.ba5131628fea150d3119.js
--- a/dist/static/js/3.ba5131628fea150d3119.js.map
+++ b/dist/static/js/3.ba5131628fea150d3119.js.map
--- a/dist/static/js/30.4e283fca4526c6695bbe.js.map
+++ b/dist/static/js/30.4e283fca4526c6695bbe.js.map
--- a/dist/static/js/30.553c07446bd0a440092d.js
+++ b/dist/static/js/30.553c07446bd0a440092d.js