před 2 roky · 22fa4c7138
--- a/dist/index.html
+++ b/dist/index.html
@@ -7,4 +7,8 @@
 
				         hm.src = "https://hm.baidu.com/hm.js?8b02a318fde5831da10426656a43d03c";
			
 
				         var s = document.getElementsByTagName("script")[0];
			
 
				         s.parentNode.insertBefore(hm, s);
			
 
				-      })();</script><script src=./static/ks3jssdk/plupload.full.min.js></script><script src=./static/ks3jssdk/ks3jssdk.min.js></script><link href=./static/css/app.9b1649cb07c4587318aeaf302ca96b4e.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.0bc90638222a60e61f9f.js></script><script type=text/javascript src=./static/js/vendor.dc1ac6978ca1430d79f6.js></script><script type=text/javascript src=./static/js/app.232ddbd39778e9ba453c.js></script></body></html>
			
 
				+<<<<<<< HEAD
			
 
				+      })();</script><script src=./static/ks3jssdk/plupload.full.min.js></script><script src=./static/ks3jssdk/ks3jssdk.min.js></script><link href=./static/css/app.9b1649cb07c4587318aeaf302ca96b4e.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.0bc90638222a60e61f9f.js></script><script type=text/javascript src=./static/js/vendor.dc1ac6978ca1430d79f6.js></script><script type=text/javascript src=./static/js/app.232ddbd39778e9ba453c.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.b49ce70dadd1ea3d227c1c2d779b88e6.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.be8ff7e60390b6b18ef2.js></script><script type=text/javascript src=./static/js/vendor.dc1ac6978ca1430d79f6.js></script><script type=text/javascript src=./static/js/app.b1b9a3682818705bab18.js></script></body></html>
			
 
				+>>>>>>> main
			
--- a/dist/static/css/app.9b1649cb07c4587318aeaf302ca96b4e.css
+++ b/dist/static/css/app.9b1649cb07c4587318aeaf302ca96b4e.css
--- a/dist/static/css/app.9b1649cb07c4587318aeaf302ca96b4e.css.map
+++ b/dist/static/css/app.9b1649cb07c4587318aeaf302ca96b4e.css.map
--- a/dist/static/css/app.b49ce70dadd1ea3d227c1c2d779b88e6.css
+++ b/dist/static/css/app.b49ce70dadd1ea3d227c1c2d779b88e6.css
--- a/dist/static/css/app.b49ce70dadd1ea3d227c1c2d779b88e6.css.map
+++ b/dist/static/css/app.b49ce70dadd1ea3d227c1c2d779b88e6.css.map
--- a/dist/static/js/0.685fdd696e85b5fc0761.js
+++ b/dist/static/js/0.685fdd696e85b5fc0761.js
--- a/dist/static/js/0.685fdd696e85b5fc0761.js.map
+++ b/dist/static/js/0.685fdd696e85b5fc0761.js.map
--- a/dist/static/js/1.b64ecf6c043f311b4abb.js
+++ b/dist/static/js/1.b64ecf6c043f311b4abb.js
--- a/dist/static/js/1.b64ecf6c043f311b4abb.js.map
+++ b/dist/static/js/1.b64ecf6c043f311b4abb.js.map
--- a/dist/static/js/1.dc12505dfd3618dc403c.js
+++ b/dist/static/js/1.dc12505dfd3618dc403c.js
--- a/dist/static/js/1.dc12505dfd3618dc403c.js.map
+++ b/dist/static/js/1.dc12505dfd3618dc403c.js.map
--- a/dist/static/js/10.5f1ca14be77e519033df.js
+++ b/dist/static/js/10.5f1ca14be77e519033df.js
--- a/dist/static/js/10.5f1ca14be77e519033df.js.map
+++ b/dist/static/js/10.5f1ca14be77e519033df.js.map
--- a/dist/static/js/10.95811e13a2d3b3a0e181.js
+++ b/dist/static/js/10.95811e13a2d3b3a0e181.js
--- a/dist/static/js/10.95811e13a2d3b3a0e181.js.map
+++ b/dist/static/js/10.95811e13a2d3b3a0e181.js.map
--- a/dist/static/js/11.bb6bb5f5ffba2f0ec9e6.js
+++ b/dist/static/js/11.bb6bb5f5ffba2f0ec9e6.js
--- a/dist/static/js/11.bb6bb5f5ffba2f0ec9e6.js.map
+++ b/dist/static/js/11.bb6bb5f5ffba2f0ec9e6.js.map
--- a/dist/static/js/11.d22a0472bd98c9a895b9.js
+++ b/dist/static/js/11.d22a0472bd98c9a895b9.js
--- a/dist/static/js/11.d22a0472bd98c9a895b9.js.map
+++ b/dist/static/js/11.d22a0472bd98c9a895b9.js.map
--- a/dist/static/js/12.3c4fa576b83781e170b9.js
+++ b/dist/static/js/12.3c4fa576b83781e170b9.js
--- a/dist/static/js/12.3c4fa576b83781e170b9.js.map
+++ b/dist/static/js/12.3c4fa576b83781e170b9.js.map
--- a/dist/static/js/12.b6798400b1f6d8ae9c65.js
+++ b/dist/static/js/12.b6798400b1f6d8ae9c65.js
--- a/dist/static/js/12.b6798400b1f6d8ae9c65.js.map
+++ b/dist/static/js/12.b6798400b1f6d8ae9c65.js.map
--- a/dist/static/js/13.4bc56cb83ae37cccb1a7.js
+++ b/dist/static/js/13.4bc56cb83ae37cccb1a7.js
--- a/dist/static/js/13.4bc56cb83ae37cccb1a7.js.map
+++ b/dist/static/js/13.4bc56cb83ae37cccb1a7.js.map
--- a/dist/static/js/14.683ec24f95ac3b2b5358.js
+++ b/dist/static/js/14.683ec24f95ac3b2b5358.js
--- a/dist/static/js/14.683ec24f95ac3b2b5358.js.map
+++ b/dist/static/js/14.683ec24f95ac3b2b5358.js.map
--- a/dist/static/js/15.23829e9c328099c91b06.js
+++ b/dist/static/js/15.23829e9c328099c91b06.js
--- a/dist/static/js/15.23829e9c328099c91b06.js.map
+++ b/dist/static/js/15.23829e9c328099c91b06.js.map
--- a/dist/static/js/15.d43b7d2563d5e627b470.js
+++ b/dist/static/js/15.d43b7d2563d5e627b470.js
--- a/dist/static/js/15.d43b7d2563d5e627b470.js.map
+++ b/dist/static/js/15.d43b7d2563d5e627b470.js.map
--- a/dist/static/js/16.487455b8eebaac3c8354.js
+++ b/dist/static/js/16.487455b8eebaac3c8354.js
--- a/dist/static/js/16.487455b8eebaac3c8354.js.map
+++ b/dist/static/js/16.487455b8eebaac3c8354.js.map
--- a/dist/static/js/16.85ad65ca9d9905c79994.js
+++ b/dist/static/js/16.85ad65ca9d9905c79994.js
--- a/dist/static/js/16.85ad65ca9d9905c79994.js.map
+++ b/dist/static/js/16.85ad65ca9d9905c79994.js.map
--- a/dist/static/js/17.83d3d4e01f0cfc3d56a1.js
+++ b/dist/static/js/17.83d3d4e01f0cfc3d56a1.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("XFGP")},"data-v-dc06b418",null);a.default=r.exports},"6ccA":function(t,a,e){t.exports=e.p+"static/img/gif_404.6b8ae1d.gif"},XFGP:function(t,a){}});
			
 
				-//# sourceMappingURL=17.621c647421c6135917af.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("bubF")},"data-v-36ebfeda",null);a.default=r.exports},"6ccA":function(t,a,e){t.exports=e.p+"static/img/gif_404.6b8ae1d.gif"},bubF:function(t,a){}});
			
 
				+//# sourceMappingURL=17.83d3d4e01f0cfc3d56a1.js.map
			
--- a/dist/static/js/17.83d3d4e01f0cfc3d56a1.js.map
+++ b/dist/static/js/17.83d3d4e01f0cfc3d56a1.js.map
--- a/dist/static/js/18.ad956a9294670e1b7af3.js
+++ b/dist/static/js/18.ad956a9294670e1b7af3.js
--- a/dist/static/js/18.ad956a9294670e1b7af3.js.map
+++ b/dist/static/js/18.ad956a9294670e1b7af3.js.map
--- a/dist/static/js/18.d68c1d7bcd6b561fdd92.js
+++ b/dist/static/js/18.d68c1d7bcd6b561fdd92.js
--- a/dist/static/js/19.1e45d25d09fe5e2e4bea.js
+++ b/dist/static/js/19.1e45d25d09fe5e2e4bea.js
--- a/dist/static/js/19.1e45d25d09fe5e2e4bea.js.map
+++ b/dist/static/js/19.1e45d25d09fe5e2e4bea.js.map
--- a/dist/static/js/19.f8c96f2c4c6252c26c4e.js
+++ b/dist/static/js/19.f8c96f2c4c6252c26c4e.js
--- a/dist/static/js/19.f8c96f2c4c6252c26c4e.js.map
+++ b/dist/static/js/19.f8c96f2c4c6252c26c4e.js.map
--- a/dist/static/js/2.13d4d04b2f62531203fc.js
+++ b/dist/static/js/2.13d4d04b2f62531203fc.js
--- a/dist/static/js/2.13d4d04b2f62531203fc.js.map
+++ b/dist/static/js/2.13d4d04b2f62531203fc.js.map
--- a/dist/static/js/2.438571f3060ee145300a.js
+++ b/dist/static/js/2.438571f3060ee145300a.js
--- a/dist/static/js/20.d6c9d7060456e027436d.js
+++ b/dist/static/js/20.d6c9d7060456e027436d.js
--- a/dist/static/js/20.d6c9d7060456e027436d.js.map
+++ b/dist/static/js/20.d6c9d7060456e027436d.js.map
--- a/dist/static/js/21.0efb7f43e62de1fdbeaa.js.map
+++ b/dist/static/js/21.0efb7f43e62de1fdbeaa.js.map
--- a/dist/static/js/21.4a1f0f6d7f79c4a7b792.js
+++ b/dist/static/js/21.4a1f0f6d7f79c4a7b792.js
--- a/dist/static/js/21.4a1f0f6d7f79c4a7b792.js.map
+++ b/dist/static/js/21.4a1f0f6d7f79c4a7b792.js.map
--- a/dist/static/js/22.a15b4fa0291891c054e6.js.map
+++ b/dist/static/js/22.a15b4fa0291891c054e6.js.map
--- a/dist/static/js/22.ed2310125b1bde791cd6.js
+++ b/dist/static/js/22.ed2310125b1bde791cd6.js
--- a/dist/static/js/22.ed2310125b1bde791cd6.js.map
+++ b/dist/static/js/22.ed2310125b1bde791cd6.js.map
--- a/dist/static/js/23.40a0a83201fb6bf3dd34.js.map
+++ b/dist/static/js/23.40a0a83201fb6bf3dd34.js.map
--- a/dist/static/js/23.8a7c6bf276e71a26786a.js
+++ b/dist/static/js/23.8a7c6bf276e71a26786a.js
--- a/dist/static/js/23.8a7c6bf276e71a26786a.js.map
+++ b/dist/static/js/23.8a7c6bf276e71a26786a.js.map
--- a/dist/static/js/24.b817eedabcabb6b0bbda.js
+++ b/dist/static/js/24.b817eedabcabb6b0bbda.js
--- a/dist/static/js/24.b817eedabcabb6b0bbda.js.map
+++ b/dist/static/js/24.b817eedabcabb6b0bbda.js.map
--- a/dist/static/js/24.fdfe2d97a3a02995a784.js.map
+++ b/dist/static/js/24.fdfe2d97a3a02995a784.js.map
--- a/dist/static/js/25.388587260efbf9beb635.js
+++ b/dist/static/js/25.388587260efbf9beb635.js
--- a/dist/static/js/25.388587260efbf9beb635.js.map
+++ b/dist/static/js/25.388587260efbf9beb635.js.map
--- a/dist/static/js/26.02cf1bfb554b30e54576.js
+++ b/dist/static/js/26.02cf1bfb554b30e54576.js
--- a/dist/static/js/26.02cf1bfb554b30e54576.js.map
+++ b/dist/static/js/26.02cf1bfb554b30e54576.js.map
--- a/dist/static/js/26.6a43c3d4d2724182807b.js
+++ b/dist/static/js/26.6a43c3d4d2724182807b.js
--- a/dist/static/js/26.6a43c3d4d2724182807b.js.map
+++ b/dist/static/js/26.6a43c3d4d2724182807b.js.map
--- a/dist/static/js/27.36f624b9f9a74287d329.js
+++ b/dist/static/js/27.36f624b9f9a74287d329.js
--- a/dist/static/js/27.b23f447466ff6cf2ffed.js
+++ b/dist/static/js/27.b23f447466ff6cf2ffed.js
--- a/dist/static/js/27.b23f447466ff6cf2ffed.js.map
+++ b/dist/static/js/27.b23f447466ff6cf2ffed.js.map
--- a/dist/static/js/28.bbdb88721e4f991d58c5.js
+++ b/dist/static/js/28.bbdb88721e4f991d58c5.js
--- a/dist/static/js/28.bbdb88721e4f991d58c5.js.map
+++ b/dist/static/js/28.bbdb88721e4f991d58c5.js.map
--- a/dist/static/js/28.e82ccf1ce0167db07846.js
+++ b/dist/static/js/28.e82ccf1ce0167db07846.js
--- a/dist/static/js/29.765d88e5a30114bccb3e.js.map
+++ b/dist/static/js/29.765d88e5a30114bccb3e.js.map
--- a/dist/static/js/29.e69b6a55d50efcc15cae.js
+++ b/dist/static/js/29.e69b6a55d50efcc15cae.js
--- a/dist/static/js/29.e69b6a55d50efcc15cae.js.map
+++ b/dist/static/js/29.e69b6a55d50efcc15cae.js.map
--- a/dist/static/js/3.57ca91c506e332bf6d26.js
+++ b/dist/static/js/3.57ca91c506e332bf6d26.js
--- a/dist/static/js/3.57ca91c506e332bf6d26.js.map
+++ b/dist/static/js/3.57ca91c506e332bf6d26.js.map
--- a/dist/static/js/3.8167a4144a0f13c31fe6.js
+++ b/dist/static/js/3.8167a4144a0f13c31fe6.js
--- a/dist/static/js/3.8167a4144a0f13c31fe6.js.map
+++ b/dist/static/js/3.8167a4144a0f13c31fe6.js.map
--- a/dist/static/js/30.ad3dbd3402dfed5af3c7.js
+++ b/dist/static/js/30.ad3dbd3402dfed5af3c7.js
--- a/dist/static/js/30.ad3dbd3402dfed5af3c7.js.map
+++ b/dist/static/js/30.ad3dbd3402dfed5af3c7.js.map
--- a/dist/static/js/30.dee30979b651086bc827.js
+++ b/dist/static/js/30.dee30979b651086bc827.js
--- a/dist/static/js/30.dee30979b651086bc827.js.map
+++ b/dist/static/js/30.dee30979b651086bc827.js.map
--- a/dist/static/js/31.a7fdd83c35908c039d66.js
+++ b/dist/static/js/31.a7fdd83c35908c039d66.js
--- a/dist/static/js/31.a7fdd83c35908c039d66.js.map
+++ b/dist/static/js/31.a7fdd83c35908c039d66.js.map
--- a/dist/static/js/31.cec44c31f3619acccce9.js
+++ b/dist/static/js/31.cec44c31f3619acccce9.js
@@ -1,2 +0,0 @@
 
				-webpackJsonp([31],{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("m88z")},null,null);t.default=c.exports},m88z:function(e,t){}});
			
 
				-//# sourceMappingURL=31.cec44c31f3619acccce9.js.map
			
--- a/dist/static/js/31.cec44c31f3619acccce9.js.map
+++ b/dist/static/js/31.cec44c31f3619acccce9.js.map
--- a/dist/static/js/32.145a9c1511e35bc22071.js
+++ b/dist/static/js/32.145a9c1511e35bc22071.js
--- a/dist/static/js/32.145a9c1511e35bc22071.js.map
+++ b/dist/static/js/32.145a9c1511e35bc22071.js.map
--- a/dist/static/js/32.8e45314b725c3033163a.js
+++ b/dist/static/js/32.8e45314b725c3033163a.js
--- a/dist/static/js/32.8e45314b725c3033163a.js.map
+++ b/dist/static/js/32.8e45314b725c3033163a.js.map
--- a/dist/static/js/33.4d756e25227f36454b07.js.map
+++ b/dist/static/js/33.4d756e25227f36454b07.js.map
--- a/dist/static/js/33.6209c23e6a74ac0698ac.js
+++ b/dist/static/js/33.6209c23e6a74ac0698ac.js
@@ -0,0 +1,2 @@
 
				+webpackJsonp([33],{"GiQ+":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}},i={render:function(){var e=this.$createElement;return(this._self._c||e)("product-detail",{attrs:{"is-edit":!0}})},staticRenderFns:[]};var a=n("VU/8")(r,i,!1,function(e){n("GiQ+")},null,null);t.default=a.exports}});
			
 
				+//# sourceMappingURL=33.6209c23e6a74ac0698ac.js.map
			
--- a/dist/static/js/33.6209c23e6a74ac0698ac.js.map
+++ b/dist/static/js/33.6209c23e6a74ac0698ac.js.map
--- a/dist/static/js/34.86b7e91a7a64f5b93dc4.js
+++ b/dist/static/js/34.86b7e91a7a64f5b93dc4.js
@@ -0,0 +1,2 @@
 
				+webpackJsonp([34],{"7iEc":function(e,t){},jHNE:function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r={name:"updateProduct",components:{ProductDetail:n("CmKi").a}},c={render:function(){var e=this.$createElement;return(this._self._c||e)("product-detail",{attrs:{"is-edit":!0}})},staticRenderFns:[]};var i=n("VU/8")(r,c,!1,function(e){n("7iEc")},null,null);t.default=i.exports}});
			
 
				+//# sourceMappingURL=34.86b7e91a7a64f5b93dc4.js.map
			
--- a/dist/static/js/34.86b7e91a7a64f5b93dc4.js.map
+++ b/dist/static/js/34.86b7e91a7a64f5b93dc4.js.map
--- a/dist/static/js/34.f8d9b911c0023a5f930b.js
+++ b/dist/static/js/34.f8d9b911c0023a5f930b.js
--- a/dist/static/js/34.f8d9b911c0023a5f930b.js.map
+++ b/dist/static/js/34.f8d9b911c0023a5f930b.js.map
--- a/dist/static/js/35.869cb8b049fa8e2a34b4.js
+++ b/dist/static/js/35.869cb8b049fa8e2a34b4.js