4 tháng trước cách đây · 2fe452a121
--- 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.78ab572f16103017ff083d5bb5045f31.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.5fa0dc7dfe4b45233896.js></script><script type=text/javascript src=./static/js/vendor.e1f19ba9387f34e746e9.js></script><script type=text/javascript src=./static/js/app.5f9cbea6ffaa1dd62f7e.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.0864106bf42e9f805f412e27850ee0e4.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.da1a814f2373921b6c3d.js></script><script type=text/javascript src=./static/js/vendor.e1f19ba9387f34e746e9.js></script><script type=text/javascript src=./static/js/app.5f9cbea6ffaa1dd62f7e.js></script></body></html>
			
 
				->>>>>>> iteration-20241016
			
 
				+      })();</script><script src=./static/ks3jssdk/plupload.full.min.js></script><script src=./static/ks3jssdk/ks3jssdk.min.js></script><link href=./static/css/app.e0eaff5681545968b630721183394628.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.28e97b1f34102a33fd59.js></script><script type=text/javascript src=./static/js/vendor.e1f19ba9387f34e746e9.js></script><script type=text/javascript src=./static/js/app.f5e4d7c41d1fbf582e09.js></script></body></html>
			
--- a/dist/static/css/app.0864106bf42e9f805f412e27850ee0e4.css
+++ b/dist/static/css/app.0864106bf42e9f805f412e27850ee0e4.css
--- a/dist/static/css/app.0864106bf42e9f805f412e27850ee0e4.css.map
+++ b/dist/static/css/app.0864106bf42e9f805f412e27850ee0e4.css.map
--- a/dist/static/css/app.78ab572f16103017ff083d5bb5045f31.css
+++ b/dist/static/css/app.78ab572f16103017ff083d5bb5045f31.css
--- a/dist/static/css/app.78ab572f16103017ff083d5bb5045f31.css.map
+++ b/dist/static/css/app.78ab572f16103017ff083d5bb5045f31.css.map
--- a/dist/static/css/app.e0eaff5681545968b630721183394628.css
+++ b/dist/static/css/app.e0eaff5681545968b630721183394628.css
--- a/dist/static/css/app.e0eaff5681545968b630721183394628.css.map
+++ b/dist/static/css/app.e0eaff5681545968b630721183394628.css.map
--- a/dist/static/js/0.a37cf60fe4ad1a511f9c.js
+++ b/dist/static/js/0.a37cf60fe4ad1a511f9c.js
--- a/dist/static/js/0.b6580a5687cb14ea8a33.js
+++ b/dist/static/js/0.b6580a5687cb14ea8a33.js
--- a/dist/static/js/1.839070f6762ad0be83ff.js.map
+++ b/dist/static/js/1.839070f6762ad0be83ff.js.map
--- a/dist/static/js/1.df9ce37774a63d561c03.js
+++ b/dist/static/js/1.df9ce37774a63d561c03.js
--- a/dist/static/js/1.df9ce37774a63d561c03.js.map
+++ b/dist/static/js/1.df9ce37774a63d561c03.js.map
--- a/dist/static/js/10.5f1ca14be77e519033df.js.map
+++ b/dist/static/js/10.5f1ca14be77e519033df.js.map
--- a/dist/static/js/10.87f39cfc3850a1dce478.js
+++ b/dist/static/js/10.87f39cfc3850a1dce478.js
--- a/dist/static/js/10.87f39cfc3850a1dce478.js.map
+++ b/dist/static/js/10.87f39cfc3850a1dce478.js.map
--- a/dist/static/js/11.6e59c886413ee6e056dc.js
+++ b/dist/static/js/11.6e59c886413ee6e056dc.js
--- a/dist/static/js/11.6e59c886413ee6e056dc.js.map
+++ b/dist/static/js/11.6e59c886413ee6e056dc.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.63f328f368505abfb339.js
+++ b/dist/static/js/12.63f328f368505abfb339.js
--- a/dist/static/js/12.63f328f368505abfb339.js.map
+++ b/dist/static/js/12.63f328f368505abfb339.js.map
--- a/dist/static/js/12.65aa282d046d4ff52a15.js.map
+++ b/dist/static/js/12.65aa282d046d4ff52a15.js.map
--- a/dist/static/js/13.33d27092e17456616be7.js.map
+++ b/dist/static/js/13.33d27092e17456616be7.js.map
--- a/dist/static/js/13.ca1f30d32a79268047db.js
+++ b/dist/static/js/13.ca1f30d32a79268047db.js
--- a/dist/static/js/13.ca1f30d32a79268047db.js.map
+++ b/dist/static/js/13.ca1f30d32a79268047db.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/14.eff5884bf311a5611908.js
+++ b/dist/static/js/14.eff5884bf311a5611908.js
--- a/dist/static/js/14.eff5884bf311a5611908.js.map
+++ b/dist/static/js/14.eff5884bf311a5611908.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.aa6afa84bed9ae5d9114.js
+++ b/dist/static/js/15.aa6afa84bed9ae5d9114.js
--- a/dist/static/js/15.aa6afa84bed9ae5d9114.js.map
+++ b/dist/static/js/15.aa6afa84bed9ae5d9114.js.map
--- a/dist/static/js/16.1f56a5902979e8d6fad3.js
+++ b/dist/static/js/16.1f56a5902979e8d6fad3.js
--- a/dist/static/js/16.1f56a5902979e8d6fad3.js.map
+++ b/dist/static/js/16.1f56a5902979e8d6fad3.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.13b1350f0f1c055d085e.js
+++ b/dist/static/js/17.13b1350f0f1c055d085e.js
--- a/dist/static/js/17.13b1350f0f1c055d085e.js.map
+++ b/dist/static/js/17.13b1350f0f1c055d085e.js.map
--- a/dist/static/js/17.e9e8af1100534438adc3.js
+++ b/dist/static/js/17.e9e8af1100534438adc3.js
--- a/dist/static/js/17.e9e8af1100534438adc3.js.map
+++ b/dist/static/js/17.e9e8af1100534438adc3.js.map
--- a/dist/static/js/18.8fad5ca62f2fa59be8dd.js
+++ b/dist/static/js/18.8fad5ca62f2fa59be8dd.js
@@ -1,2 +0,0 @@
 
				-webpackJsonp([18],{"+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=18.8fad5ca62f2fa59be8dd.js.map
			
--- a/dist/static/js/18.8fad5ca62f2fa59be8dd.js.map
+++ b/dist/static/js/18.8fad5ca62f2fa59be8dd.js.map
--- a/dist/static/js/18.fe6a1895f2c1a548ba34.js
+++ b/dist/static/js/18.fe6a1895f2c1a548ba34.js
--- a/dist/static/js/18.fe6a1895f2c1a548ba34.js.map
+++ b/dist/static/js/18.fe6a1895f2c1a548ba34.js.map
--- a/dist/static/js/19.a2193be84ab576d1a500.js
+++ b/dist/static/js/19.a2193be84ab576d1a500.js
@@ -0,0 +1,2 @@
 
				+webpackJsonp([19],{"+H76":function(t,a,n){"use strict";Object.defineProperty(a,"__esModule",{value:!0});var i=n("6ccA"),e=n.n(i),s={name:"wrongPage",data:function(){return{img_404:e.a}},methods:{handleGoMain:function(){this.$router.push({path:"/"})}}},c={render:function(){var t=this,a=t.$createElement,n=t._self._c||a;return n("div",[n("div",{staticClass:"app-container"},[n("el-col",{attrs:{span:12}},[n("img",{staticClass:"img-style",attrs:{src:t.img_404,alt:"404"}})]),t._v(" "),n("el-col",{attrs:{span:12}},[n("div",{staticStyle:{"margin-left":"100px","margin-top":"60px"}},[n("h1",{staticClass:"color-main"},[t._v("OOPS!")]),t._v(" "),n("h2",{staticStyle:{color:"#606266"}},[t._v("很抱歉，页面它不小心迷路了！")]),t._v(" "),n("div",{staticStyle:{color:"#909399","font-size":"14px"}},[t._v("请检查您输入的网址是否正确，请点击以下按钮返回主页或者发送错误报告")]),t._v(" "),n("el-button",{staticStyle:{"margin-top":"20px"},attrs:{type:"primary",round:""},on:{click:t.handleGoMain}},[t._v("返回首页")])],1)])],1)])},staticRenderFns:[]};var r=n("VU/8")(s,c,!1,function(t){n("iln/")},"data-v-27b8085b",null);a.default=r.exports},"6ccA":function(t,a,n){t.exports=n.p+"static/img/gif_404.6b8ae1d.gif"},"iln/":function(t,a){}});
			
 
				+//# sourceMappingURL=19.a2193be84ab576d1a500.js.map
			
--- a/dist/static/js/19.a2193be84ab576d1a500.js.map
+++ b/dist/static/js/19.a2193be84ab576d1a500.js.map
--- a/dist/static/js/19.c2732f6a301709238954.js
+++ b/dist/static/js/19.c2732f6a301709238954.js
--- a/dist/static/js/19.c2732f6a301709238954.js.map
+++ b/dist/static/js/19.c2732f6a301709238954.js.map
--- a/dist/static/js/2.37904f40b9f34a485826.js
+++ b/dist/static/js/2.37904f40b9f34a485826.js
--- a/dist/static/js/2.37904f40b9f34a485826.js.map
+++ b/dist/static/js/2.37904f40b9f34a485826.js.map
--- a/dist/static/js/2.3c0845fc49c31813f747.js
+++ b/dist/static/js/2.3c0845fc49c31813f747.js
--- a/dist/static/js/2.3c0845fc49c31813f747.js.map
+++ b/dist/static/js/2.3c0845fc49c31813f747.js.map
--- a/dist/static/js/20.6e736481436ec0301f00.js
+++ b/dist/static/js/20.6e736481436ec0301f00.js
--- a/dist/static/js/20.6e736481436ec0301f00.js.map
+++ b/dist/static/js/20.6e736481436ec0301f00.js.map
--- a/dist/static/js/20.cfeaac4e46586555d0ca.js
+++ b/dist/static/js/20.cfeaac4e46586555d0ca.js
--- a/dist/static/js/20.cfeaac4e46586555d0ca.js.map
+++ b/dist/static/js/20.cfeaac4e46586555d0ca.js.map
--- a/dist/static/js/21.90a04a3cd7d8d31d723e.js.map
+++ b/dist/static/js/21.90a04a3cd7d8d31d723e.js.map
--- a/dist/static/js/21.c15b25fb0b2f992c954b.js
+++ b/dist/static/js/21.c15b25fb0b2f992c954b.js
--- a/dist/static/js/21.c15b25fb0b2f992c954b.js.map
+++ b/dist/static/js/21.c15b25fb0b2f992c954b.js.map
--- a/dist/static/js/22.727a676d8bb7f0265c50.js
+++ b/dist/static/js/22.727a676d8bb7f0265c50.js
--- a/dist/static/js/22.727a676d8bb7f0265c50.js.map
+++ b/dist/static/js/22.727a676d8bb7f0265c50.js.map
--- a/dist/static/js/22.e0692b5e57317f512108.js
+++ b/dist/static/js/22.e0692b5e57317f512108.js
--- a/dist/static/js/22.e0692b5e57317f512108.js.map
+++ b/dist/static/js/22.e0692b5e57317f512108.js.map
--- a/dist/static/js/23.79cc6386e6f34f5d4a16.js.map
+++ b/dist/static/js/23.79cc6386e6f34f5d4a16.js.map
--- a/dist/static/js/23.ccbd70c3727702978066.js
+++ b/dist/static/js/23.ccbd70c3727702978066.js
--- a/dist/static/js/23.ccbd70c3727702978066.js.map
+++ b/dist/static/js/23.ccbd70c3727702978066.js.map
--- a/dist/static/js/24.0c4dbbba2c70c9a5dd13.js
+++ b/dist/static/js/24.0c4dbbba2c70c9a5dd13.js
--- a/dist/static/js/24.0c4dbbba2c70c9a5dd13.js.map
+++ b/dist/static/js/24.0c4dbbba2c70c9a5dd13.js.map
--- a/dist/static/js/24.9b35a98229b9df9c6f92.js.map
+++ b/dist/static/js/24.9b35a98229b9df9c6f92.js.map
--- a/dist/static/js/25.4dd3a26d02cc0409c830.js
+++ b/dist/static/js/25.4dd3a26d02cc0409c830.js
--- a/dist/static/js/25.4dd3a26d02cc0409c830.js.map
+++ b/dist/static/js/25.4dd3a26d02cc0409c830.js.map
--- a/dist/static/js/25.4e93f61dd1982c9aa161.js.map
+++ b/dist/static/js/25.4e93f61dd1982c9aa161.js.map
--- a/dist/static/js/26.8cb6c755bdfa7e000f85.js
+++ b/dist/static/js/26.8cb6c755bdfa7e000f85.js
--- a/dist/static/js/26.8cb6c755bdfa7e000f85.js.map
+++ b/dist/static/js/26.8cb6c755bdfa7e000f85.js.map
--- a/dist/static/js/27.60246654576eed7d53f0.js
+++ b/dist/static/js/27.60246654576eed7d53f0.js
--- a/dist/static/js/27.60246654576eed7d53f0.js.map
+++ b/dist/static/js/27.60246654576eed7d53f0.js.map
--- a/dist/static/js/27.ea8abdedcb2d4bdd911d.js.map
+++ b/dist/static/js/27.ea8abdedcb2d4bdd911d.js.map
--- a/dist/static/js/28.5de47c93826cb4068717.js
+++ b/dist/static/js/28.5de47c93826cb4068717.js
--- a/dist/static/js/28.5de47c93826cb4068717.js.map
+++ b/dist/static/js/28.5de47c93826cb4068717.js.map
--- a/dist/static/js/28.61d9105db59a7801449b.js
+++ b/dist/static/js/28.61d9105db59a7801449b.js
--- a/dist/static/js/28.61d9105db59a7801449b.js.map
+++ b/dist/static/js/28.61d9105db59a7801449b.js.map
--- a/dist/static/js/29.7645b4880e124be4fc3f.js.map
+++ b/dist/static/js/29.7645b4880e124be4fc3f.js.map
--- a/dist/static/js/29.ad17ede98859911edd29.js
+++ b/dist/static/js/29.ad17ede98859911edd29.js
--- a/dist/static/js/29.ad17ede98859911edd29.js.map
+++ b/dist/static/js/29.ad17ede98859911edd29.js.map
--- a/dist/static/js/3.803bac563f49200fd977.js
+++ b/dist/static/js/3.803bac563f49200fd977.js
--- a/dist/static/js/3.803bac563f49200fd977.js.map
+++ b/dist/static/js/3.803bac563f49200fd977.js.map
--- a/dist/static/js/3.af91a9bd3e0f1276ce1e.js
+++ b/dist/static/js/3.af91a9bd3e0f1276ce1e.js
--- a/dist/static/js/3.af91a9bd3e0f1276ce1e.js.map
+++ b/dist/static/js/3.af91a9bd3e0f1276ce1e.js.map
--- a/dist/static/js/30.3f328c69e7c94e0ebb9e.js.map
+++ b/dist/static/js/30.3f328c69e7c94e0ebb9e.js.map
--- a/dist/static/js/30.8cfaed86350832fba20d.js
+++ b/dist/static/js/30.8cfaed86350832fba20d.js
@@ -0,0 +1,2 @@
 
				+webpackJsonp([30],{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=30.8cfaed86350832fba20d.js.map
			
--- a/dist/static/js/30.8cfaed86350832fba20d.js.map
+++ b/dist/static/js/30.8cfaed86350832fba20d.js.map
--- a/dist/static/js/31.77262c26660915c20c81.js
+++ b/dist/static/js/31.77262c26660915c20c81.js
--- a/dist/static/js/31.77262c26660915c20c81.js.map
+++ b/dist/static/js/31.77262c26660915c20c81.js.map
--- a/dist/static/js/31.7f2ab4b89f4534b3c9c2.js.map
+++ b/dist/static/js/31.7f2ab4b89f4534b3c9c2.js.map
--- a/dist/static/js/32.4fad6cc0629674e654dd.js
+++ b/dist/static/js/32.4fad6cc0629674e654dd.js
--- a/dist/static/js/32.4fad6cc0629674e654dd.js.map
+++ b/dist/static/js/32.4fad6cc0629674e654dd.js.map
--- a/dist/static/js/32.e8a1d195c130a9e01e14.js
+++ b/dist/static/js/32.e8a1d195c130a9e01e14.js
--- a/dist/static/js/32.e8a1d195c130a9e01e14.js.map
+++ b/dist/static/js/32.e8a1d195c130a9e01e14.js.map
--- a/dist/static/js/33.1c10f62b1cfbee734952.js
+++ b/dist/static/js/33.1c10f62b1cfbee734952.js