il y a 2 ans · 48b39b8b6a
--- a/dist/index.html
+++ b/dist/index.html
@@ -7,12 +7,4 @@
 
				         hm.src = "https://hm.baidu.com/hm.js?8b02a318fde5831da10426656a43d03c";
			
 
				         var s = document.getElementsByTagName("script")[0];
			
 
				         s.parentNode.insertBefore(hm, s);
			
 
				-<<<<<<< HEAD
			
 
				-<<<<<<< HEAD
			
 
				-      })();</script><script src=./static/ks3jssdk/plupload.full.min.js></script><script src=./static/ks3jssdk/ks3jssdk.min.js></script><link href=./static/css/app.b85b416bc7f544153aafd02450367a48.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.9fc44ecdbc4c55f25c13.js></script><script type=text/javascript src=./static/js/vendor.07015f4555c6e302e551.js></script><script type=text/javascript src=./static/js/app.3d4fadb44c56736e941c.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.efea4e9363d0635dddad2863ddbb39ae.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.c84d9d4e3ac69a503d4e.js></script><script type=text/javascript src=./static/js/vendor.07015f4555c6e302e551.js></script><script type=text/javascript src=./static/js/app.bff9700db634556c8b21.js></script></body></html>
			
 
				->>>>>>> main
			
 
				-=======
			
 
				-      })();</script><script src=./static/ks3jssdk/plupload.full.min.js></script><script src=./static/ks3jssdk/ks3jssdk.min.js></script><link href=./static/css/app.35654069b577c558efb50ee6d9993f47.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.61a3c47ca08b78d7e091.js></script><script type=text/javascript src=./static/js/vendor.3a8d2e3245c66a69b2a4.js></script><script type=text/javascript src=./static/js/app.bff9700db634556c8b21.js></script></body></html>
			
 
				->>>>>>> online
			
 
				+      })();</script><script src=./static/ks3jssdk/plupload.full.min.js></script><script src=./static/ks3jssdk/ks3jssdk.min.js></script><link href=./static/css/app.621244b2b7d13be60e98efa1349b5bcd.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.a2ae2fed697e6500786d.js></script><script type=text/javascript src=./static/js/vendor.3a8d2e3245c66a69b2a4.js></script><script type=text/javascript src=./static/js/app.2abf74cae83a2c484a60.js></script></body></html>
			
--- a/dist/static/css/app.35654069b577c558efb50ee6d9993f47.css
+++ b/dist/static/css/app.35654069b577c558efb50ee6d9993f47.css
--- a/dist/static/css/app.35654069b577c558efb50ee6d9993f47.css.map
+++ b/dist/static/css/app.35654069b577c558efb50ee6d9993f47.css.map
--- a/dist/static/css/app.b85b416bc7f544153aafd02450367a48.css
+++ b/dist/static/css/app.b85b416bc7f544153aafd02450367a48.css
--- a/dist/static/css/app.b85b416bc7f544153aafd02450367a48.css.map
+++ b/dist/static/css/app.b85b416bc7f544153aafd02450367a48.css.map
--- a/dist/static/css/app.efea4e9363d0635dddad2863ddbb39ae.css
+++ b/dist/static/css/app.efea4e9363d0635dddad2863ddbb39ae.css
--- a/dist/static/js/0.41c17bbb1ccf8551c1ea.js
+++ b/dist/static/js/0.41c17bbb1ccf8551c1ea.js
--- a/dist/static/js/0.41c17bbb1ccf8551c1ea.js.map
+++ b/dist/static/js/0.41c17bbb1ccf8551c1ea.js.map
--- a/dist/static/js/0.a2f7bb837bd99f74b7d6.js
+++ b/dist/static/js/0.a2f7bb837bd99f74b7d6.js
--- a/dist/static/js/0.a2f7bb837bd99f74b7d6.js.map
+++ b/dist/static/js/0.a2f7bb837bd99f74b7d6.js.map
--- a/dist/static/js/1.750fa040bdf06283a979.js.map
+++ b/dist/static/js/1.750fa040bdf06283a979.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/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/2.277f7eafcf529fc2b562.js
+++ b/dist/static/js/2.277f7eafcf529fc2b562.js
--- a/dist/static/js/2.277f7eafcf529fc2b562.js.map
+++ b/dist/static/js/2.277f7eafcf529fc2b562.js.map
--- a/dist/static/js/26.f1f6bbe9f7c5d902396d.js
+++ b/dist/static/js/26.f1f6bbe9f7c5d902396d.js
--- a/dist/static/js/26.f1f6bbe9f7c5d902396d.js.map
+++ b/dist/static/js/26.f1f6bbe9f7c5d902396d.js.map
--- a/dist/static/js/27.8baadd442470e2af3e1b.js
+++ b/dist/static/js/27.8baadd442470e2af3e1b.js
--- a/dist/static/js/27.8baadd442470e2af3e1b.js.map
+++ b/dist/static/js/27.8baadd442470e2af3e1b.js.map
--- a/dist/static/js/28.947265f6d8a543156e65.js
+++ b/dist/static/js/28.947265f6d8a543156e65.js
@@ -1,2 +0,0 @@
 
				-webpackJsonp([28],{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=28.947265f6d8a543156e65.js.map
			
--- a/dist/static/js/28.947265f6d8a543156e65.js.map
+++ b/dist/static/js/28.947265f6d8a543156e65.js.map
--- a/dist/static/js/29.e252971e8fad0aaf49a4.js
+++ b/dist/static/js/29.e252971e8fad0aaf49a4.js
--- a/dist/static/js/29.e252971e8fad0aaf49a4.js.map
+++ b/dist/static/js/29.e252971e8fad0aaf49a4.js.map
--- a/dist/static/js/3.41a52caa50648aa3f035.js
+++ b/dist/static/js/3.41a52caa50648aa3f035.js
--- a/dist/static/js/3.41a52caa50648aa3f035.js.map
+++ b/dist/static/js/3.41a52caa50648aa3f035.js.map
--- a/dist/static/js/30.e22a3a005a1af8e17bc9.js
+++ b/dist/static/js/30.e22a3a005a1af8e17bc9.js
--- a/dist/static/js/30.e22a3a005a1af8e17bc9.js.map
+++ b/dist/static/js/30.e22a3a005a1af8e17bc9.js.map
--- a/dist/static/js/31.c5d010afdd09c51064d1.js
+++ b/dist/static/js/31.c5d010afdd09c51064d1.js
--- a/dist/static/js/31.c5d010afdd09c51064d1.js.map
+++ b/dist/static/js/31.c5d010afdd09c51064d1.js.map
--- a/dist/static/js/32.935b6ed6478b69beee44.js
+++ b/dist/static/js/32.935b6ed6478b69beee44.js
--- a/dist/static/js/32.935b6ed6478b69beee44.js.map
+++ b/dist/static/js/32.935b6ed6478b69beee44.js.map
--- a/dist/static/js/33.94214edc573528e02f88.js
+++ b/dist/static/js/33.94214edc573528e02f88.js
--- a/dist/static/js/33.94214edc573528e02f88.js.map
+++ b/dist/static/js/33.94214edc573528e02f88.js.map
--- a/dist/static/js/34.32039390dce14c2a329f.js
+++ b/dist/static/js/34.32039390dce14c2a329f.js
--- a/dist/static/js/34.32039390dce14c2a329f.js.map
+++ b/dist/static/js/34.32039390dce14c2a329f.js.map
--- a/dist/static/js/35.fae5dcf381e6613f131c.js
+++ b/dist/static/js/35.fae5dcf381e6613f131c.js
@@ -1,2 +0,0 @@
 
				-webpackJsonp([35],{jHNE:function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var r={name:"updateProduct",components:{ProductDetail:n("CmKi").a}},o={render:function(){var t=this.$createElement;return(this._self._c||t)("product-detail",{attrs:{"is-edit":!0}})},staticRenderFns:[]};var u=n("VU/8")(r,o,!1,function(t){n("oLCt")},null,null);e.default=u.exports},oLCt:function(t,e){}});
			
 
				-//# sourceMappingURL=35.fae5dcf381e6613f131c.js.map
			
--- a/dist/static/js/35.fae5dcf381e6613f131c.js.map
+++ b/dist/static/js/35.fae5dcf381e6613f131c.js.map
--- a/dist/static/js/36.e5c6525d6edcfb92e45d.js
+++ b/dist/static/js/36.e5c6525d6edcfb92e45d.js
--- a/dist/static/js/36.e5c6525d6edcfb92e45d.js.map
+++ b/dist/static/js/36.e5c6525d6edcfb92e45d.js.map
--- a/dist/static/js/37.3dd2426eded77656901f.js
+++ b/dist/static/js/37.3dd2426eded77656901f.js
--- a/dist/static/js/37.3dd2426eded77656901f.js.map
+++ b/dist/static/js/37.3dd2426eded77656901f.js.map
--- a/dist/static/js/38.be83db5c8c3b4f377ef5.js
+++ b/dist/static/js/38.be83db5c8c3b4f377ef5.js
@@ -1,2 +0,0 @@
 
				-webpackJsonp([38],{l84a:function(e,t){},lfyr:function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n("c/Tr"),a=n.n(r),i=n("lHA8"),l=n.n(i),s=n("bUp0"),c=n("STSY"),o={name:"allocMenu",data:function(){return{menuTreeList:[],defaultProps:{children:"children",label:"title"},roleId:null}},created:function(){this.roleId=this.$route.query.roleId,this.treeList(),this.getRoleMenu(this.roleId)},methods:{treeList:function(){var e=this;Object(s.d)().then(function(t){e.menuTreeList=t.data})},getRoleMenu:function(e){var t=this;Object(c.g)(e).then(function(e){var n=e.data,r=[];if(null!=n&&n.length>0)for(var a=0;a<n.length;a++){var i=n[a];0!==i.parentId&&r.push(i.id)}t.$refs.tree.setCheckedKeys(r)})},handleSave:function(){var e=this,t=this.$refs.tree.getCheckedNodes(),n=new l.a;if(null!=t&&t.length>0)for(var r=0;r<t.length;r++){var i=t[r];n.add(i.id),0!==i.parentId&&n.add(i.parentId)}this.$confirm("是否分配菜单？","提示",{confirmButtonText:"确定",cancelButtonText:"取消",type:"warning"}).then(function(){var t={menuIds:a()(n).join(","),roleId:e.roleId};Object(c.a)(t).then(function(t){e.$message({message:"分配成功",type:"success",duration:1e3}),e.$router.back()})})},handleClear:function(){this.$refs.tree.setCheckedKeys([])}}},d={render:function(){var e=this,t=e.$createElement,n=e._self._c||t;return n("el-card",{staticClass:"form-container",attrs:{shadow:"never"}},[n("el-tree",{ref:"tree",attrs:{data:e.menuTreeList,"show-checkbox":"","default-expand-all":"","node-key":"id","highlight-current":"",props:e.defaultProps}}),e._v(" "),n("div",{staticStyle:{"margin-top":"20px"},attrs:{align:"center"}},[n("el-button",{attrs:{type:"primary"},on:{click:function(t){e.handleSave()}}},[e._v("保存")]),e._v(" "),n("el-button",{on:{click:function(t){e.handleClear()}}},[e._v("清空")])],1)],1)},staticRenderFns:[]};var u=n("VU/8")(o,d,!1,function(e){n("l84a")},"data-v-69c4c24c",null);t.default=u.exports}});
			
 
				-//# sourceMappingURL=38.be83db5c8c3b4f377ef5.js.map
			
--- a/dist/static/js/38.be83db5c8c3b4f377ef5.js.map
+++ b/dist/static/js/38.be83db5c8c3b4f377ef5.js.map
--- a/dist/static/js/39.710f0b9ae04e6f719091.js
+++ b/dist/static/js/39.710f0b9ae04e6f719091.js
--- a/dist/static/js/39.710f0b9ae04e6f719091.js.map
+++ b/dist/static/js/39.710f0b9ae04e6f719091.js.map
--- a/dist/static/js/40.8a9ef69b544c17db8ff9.js
+++ b/dist/static/js/40.8a9ef69b544c17db8ff9.js
--- a/dist/static/js/40.8a9ef69b544c17db8ff9.js.map
+++ b/dist/static/js/40.8a9ef69b544c17db8ff9.js.map
--- a/dist/static/js/8.81d68e221cc2d940ad0f.js
+++ b/dist/static/js/8.81d68e221cc2d940ad0f.js
--- a/dist/static/js/8.81d68e221cc2d940ad0f.js.map
+++ b/dist/static/js/8.81d68e221cc2d940ad0f.js.map
--- a/dist/static/js/9.9711215e8c02442f8a9b.js
+++ b/dist/static/js/9.9711215e8c02442f8a9b.js
--- a/dist/static/js/9.9711215e8c02442f8a9b.js.map
+++ b/dist/static/js/9.9711215e8c02442f8a9b.js.map
--- a/dist/static/js/app.3d4fadb44c56736e941c.js
+++ b/dist/static/js/app.3d4fadb44c56736e941c.js
--- a/dist/static/js/app.3d4fadb44c56736e941c.js.map
+++ b/dist/static/js/app.3d4fadb44c56736e941c.js.map
--- a/dist/static/js/manifest.61a3c47ca08b78d7e091.js
+++ b/dist/static/js/manifest.61a3c47ca08b78d7e091.js
--- a/dist/static/js/manifest.61a3c47ca08b78d7e091.js.map
+++ b/dist/static/js/manifest.61a3c47ca08b78d7e091.js.map
--- a/dist/static/js/manifest.9fc44ecdbc4c55f25c13.js
+++ b/dist/static/js/manifest.9fc44ecdbc4c55f25c13.js
--- a/dist/static/js/manifest.9fc44ecdbc4c55f25c13.js.map
+++ b/dist/static/js/manifest.9fc44ecdbc4c55f25c13.js.map