rabin 5 years ago
parent
commit
e562385b54
34 changed files with 29 additions and 31 deletions
  1. 12 2
      assets/lib/layui - 副本/admin/lib/admin.js
  2. 0 1
      assets/lib/layui/css/layui.css
  3. 1 1
      assets/lib/layui/css/layui.mobile.css
  4. 1 1
      assets/lib/layui/css/modules/code.css
  5. 1 1
      assets/lib/layui/css/modules/laydate/default/laydate.css
  6. 1 1
      assets/lib/layui/css/modules/layer/default/layer.css
  7. BIN
      assets/lib/layui/font/iconfont.eot
  8. 0 0
      assets/lib/layui/font/iconfont.svg
  9. BIN
      assets/lib/layui/font/iconfont.ttf
  10. BIN
      assets/lib/layui/font/iconfont.woff
  11. BIN
      assets/lib/layui/font/iconfont.woff2
  12. 0 1
      assets/lib/layui/lay/modules/carousel.js
  13. 1 1
      assets/lib/layui/lay/modules/code.js
  14. 1 1
      assets/lib/layui/lay/modules/colorpicker.js
  15. 1 1
      assets/lib/layui/lay/modules/element.js
  16. 2 2
      assets/lib/layui/lay/modules/flow.js
  17. 0 1
      assets/lib/layui/lay/modules/form.js
  18. 1 1
      assets/lib/layui/lay/modules/jquery.js
  19. 1 1
      assets/lib/layui/lay/modules/laydate.js
  20. 1 1
      assets/lib/layui/lay/modules/layedit.js
  21. 1 1
      assets/lib/layui/lay/modules/layer.js
  22. 1 1
      assets/lib/layui/lay/modules/laypage.js
  23. 1 1
      assets/lib/layui/lay/modules/laytpl.js
  24. 0 1
      assets/lib/layui/lay/modules/mobile.js
  25. 1 1
      assets/lib/layui/lay/modules/rate.js
  26. 0 1
      assets/lib/layui/lay/modules/slider.js
  27. 0 1
      assets/lib/layui/lay/modules/table.js
  28. 0 1
      assets/lib/layui/lay/modules/transfer.js
  29. 0 1
      assets/lib/layui/lay/modules/tree.js
  30. 0 1
      assets/lib/layui/lay/modules/upload.js
  31. 0 1
      assets/lib/layui/lay/modules/util.js
  32. 0 1
      assets/lib/layui/layui.all.js
  33. 0 1
      assets/lib/layui/layui.js
  34. 1 1
      assets/lib/manage/main.js

+ 12 - 2
assets/lib/layui - 副本/admin/lib/admin.js

@@ -172,7 +172,7 @@ layui.define('view', function(exports){
     //右侧面板
     ,popupRight: function(options){
       //layer.close(admin.popup.index);
-      return admin.popup.index = layer.open($.extend({
+      return admingroup = admin.popup.index = layer.open($.extend({
         type: 1
         ,id: 'LAY_adminPopupR'
         ,anim: -1
@@ -464,7 +464,17 @@ layui.define('view', function(exports){
       admin.popupRight({
         id: 'LAY_adminPopupMore'
         ,success: function(){
-          view(this.id).render('system/more');
+          //view(this.id).render('system/more');
+          var nav = '';
+          $('.nav li').each(function(i) {
+              var self = $(this);
+              var name = self.html();
+              nav += '<div class="layui-card-header">'+name+'</div>';
+          })
+          var html = '<div class="layadmin-menu-list">';
+          html += nav;
+          html += '</div>';
+          $('#' + this.id).html(html);
         }
       });
     }

File diff suppressed because it is too large
+ 0 - 1
assets/lib/layui/css/layui.css


File diff suppressed because it is too large
+ 1 - 1
assets/lib/layui/css/layui.mobile.css


+ 1 - 1
assets/lib/layui/css/modules/code.css

@@ -1,2 +1,2 @@
-/** layui-v2.5.6 MIT License By https://www.layui.com */
+/** layui-v2.4.3 MIT License By https://www.layui.com */
  html #layuicss-skincodecss{display:none;position:absolute;width:1989px}.layui-code-h3,.layui-code-view{position:relative;font-size:12px}.layui-code-view{display:block;margin:10px 0;padding:0;border:1px solid #e2e2e2;border-left-width:6px;background-color:#F2F2F2;color:#333;font-family:Courier New}.layui-code-h3{padding:0 10px;height:32px;line-height:32px;border-bottom:1px solid #e2e2e2}.layui-code-h3 a{position:absolute;right:10px;top:0;color:#999}.layui-code-view .layui-code-ol{position:relative;overflow:auto}.layui-code-view .layui-code-ol li{position:relative;margin-left:45px;line-height:20px;padding:0 5px;border-left:1px solid #e2e2e2;list-style-type:decimal-leading-zero;*list-style-type:decimal;background-color:#fff}.layui-code-view pre{margin:0}.layui-code-notepad{border:1px solid #0C0C0C;border-left-color:#3F3F3F;background-color:#0C0C0C;color:#C2BE9E}.layui-code-notepad .layui-code-h3{border-bottom:none}.layui-code-notepad .layui-code-ol li{background-color:#3F3F3F;border-left:none}

File diff suppressed because it is too large
+ 1 - 1
assets/lib/layui/css/modules/laydate/default/laydate.css


File diff suppressed because it is too large
+ 1 - 1
assets/lib/layui/css/modules/layer/default/layer.css


BIN
assets/lib/layui/font/iconfont.eot


File diff suppressed because it is too large
+ 0 - 0
assets/lib/layui/font/iconfont.svg


BIN
assets/lib/layui/font/iconfont.ttf


BIN
assets/lib/layui/font/iconfont.woff


BIN
assets/lib/layui/font/iconfont.woff2


File diff suppressed because it is too large
+ 0 - 1
assets/lib/layui/lay/modules/carousel.js


+ 1 - 1
assets/lib/layui/lay/modules/code.js

@@ -1,2 +1,2 @@
-/** layui-v2.5.6 MIT License By https://www.layui.com */
+/** layui-v2.4.3 MIT License By https://www.layui.com */
  ;layui.define("jquery",function(e){"use strict";var a=layui.$,l="http://www.layui.com/doc/modules/code.html";e("code",function(e){var t=[];e=e||{},e.elem=a(e.elem||".layui-code"),e.about=!("about"in e)||e.about,e.elem.each(function(){t.push(this)}),layui.each(t.reverse(),function(t,i){var c=a(i),o=c.html();(c.attr("lay-encode")||e.encode)&&(o=o.replace(/&(?!#?[a-zA-Z0-9]+;)/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/'/g,"&#39;").replace(/"/g,"&quot;")),c.html('<ol class="layui-code-ol"><li>'+o.replace(/[\r\t\n]+/g,"</li><li>")+"</li></ol>"),c.find(">.layui-code-h3")[0]||c.prepend('<h3 class="layui-code-h3">'+(c.attr("lay-title")||e.title||"code")+(e.about?'<a href="'+l+'" target="_blank">layui.code</a>':"")+"</h3>");var d=c.find(">.layui-code-ol");c.addClass("layui-box layui-code-view"),(c.attr("lay-skin")||e.skin)&&c.addClass("layui-code-"+(c.attr("lay-skin")||e.skin)),(d.find("li").length/100|0)>0&&d.css("margin-left",(d.find("li").length/100|0)+"px"),(c.attr("lay-height")||e.height)&&d.css("max-height",c.attr("lay-height")||e.height)})})}).addcss("modules/code.css","skincodecss");

File diff suppressed because it is too large
+ 1 - 1
assets/lib/layui/lay/modules/colorpicker.js


File diff suppressed because it is too large
+ 1 - 1
assets/lib/layui/lay/modules/element.js


+ 2 - 2
assets/lib/layui/lay/modules/flow.js

@@ -1,2 +1,2 @@
-/** layui-v2.5.6 MIT License By https://www.layui.com */
- ;layui.define("jquery",function(e){"use strict";var l=layui.$,o=function(e){},t='<i class="layui-anim layui-anim-rotate layui-anim-loop layui-icon ">&#xe63e;</i>';o.prototype.load=function(e){var o,i,n,r,a=this,c=0;e=e||{};var f=l(e.elem);if(f[0]){var m=l(e.scrollElem||document),u=e.mb||50,s=!("isAuto"in e)||e.isAuto,v=e.end||"没有更多了",y=e.scrollElem&&e.scrollElem!==document,d="<cite>加载更多</cite>",h=l('<div class="layui-flow-more"><a href="javascript:;">'+d+"</a></div>");f.find(".layui-flow-more")[0]||f.append(h);var p=function(e,t){e=l(e),h.before(e),t=0==t||null,t?h.html(v):h.find("a").html(d),i=t,o=null,n&&n()},g=function(){o=!0,h.find("a").html(t),"function"==typeof e.done&&e.done(++c,p)};if(g(),h.find("a").on("click",function(){l(this);i||o||g()}),e.isLazyimg)var n=a.lazyimg({elem:e.elem+" img",scrollElem:e.scrollElem});return s?(m.on("scroll",function(){var e=l(this),t=e.scrollTop();r&&clearTimeout(r),!i&&f.width()&&(r=setTimeout(function(){var i=y?e.height():l(window).height(),n=y?e.prop("scrollHeight"):document.documentElement.scrollHeight;n-t-i<=u&&(o||g())},100))}),a):a}},o.prototype.lazyimg=function(e){var o,t=this,i=0;e=e||{};var n=l(e.scrollElem||document),r=e.elem||"img",a=e.scrollElem&&e.scrollElem!==document,c=function(e,l){var o=n.scrollTop(),r=o+l,c=a?function(){return e.offset().top-n.offset().top+o}():e.offset().top;if(c>=o&&c<=r&&!e.attr("src")){var m=e.attr("lay-src");layui.img(m,function(){var l=t.lazyimg.elem.eq(i);e.attr("src",m).removeAttr("lay-src"),l[0]&&f(l),i++})}},f=function(e,o){var f=a?(o||n).height():l(window).height(),m=n.scrollTop(),u=m+f;if(t.lazyimg.elem=l(r),e)c(e,f);else for(var s=0;s<t.lazyimg.elem.length;s++){var v=t.lazyimg.elem.eq(s),y=a?function(){return v.offset().top-n.offset().top+m}():v.offset().top;if(c(v,f),i=s,y>u)break}};if(f(),!o){var m;n.on("scroll",function(){var e=l(this);m&&clearTimeout(m),m=setTimeout(function(){f(null,e)},50)}),o=!0}return f},e("flow",new o)});
+/** layui-v2.4.3 MIT License By https://www.layui.com */
+ ;layui.define("jquery",function(e){"use strict";var l=layui.$,o=function(e){},t='<i class="layui-anim layui-anim-rotate layui-anim-loop layui-icon ">&#xe63e;</i>';o.prototype.load=function(e){var o,i,n,r,a=this,c=0;e=e||{};var f=l(e.elem);if(f[0]){var m=l(e.scrollElem||document),u=e.mb||50,s=!("isAuto"in e)||e.isAuto,v=e.end||"没有更多了",y=e.scrollElem&&e.scrollElem!==document,d="<cite>加载更多</cite>",h=l('<div class="layui-flow-more"><a href="javascript:;">'+d+"</a></div>");f.find(".layui-flow-more")[0]||f.append(h);var p=function(e,t){e=l(e),h.before(e),t=0==t||null,t?h.html(v):h.find("a").html(d),i=t,o=null,n&&n()},g=function(){o=!0,h.find("a").html(t),"function"==typeof e.done&&e.done(++c,p)};if(g(),h.find("a").on("click",function(){l(this);i||o||g()}),e.isLazyimg)var n=a.lazyimg({elem:e.elem+" img",scrollElem:e.scrollElem});return s?(m.on("scroll",function(){var e=l(this),t=e.scrollTop();r&&clearTimeout(r),i||(r=setTimeout(function(){var i=y?e.height():l(window).height(),n=y?e.prop("scrollHeight"):document.documentElement.scrollHeight;n-t-i<=u&&(o||g())},100))}),a):a}},o.prototype.lazyimg=function(e){var o,t=this,i=0;e=e||{};var n=l(e.scrollElem||document),r=e.elem||"img",a=e.scrollElem&&e.scrollElem!==document,c=function(e,l){var o=n.scrollTop(),r=o+l,c=a?function(){return e.offset().top-n.offset().top+o}():e.offset().top;if(c>=o&&c<=r&&!e.attr("src")){var m=e.attr("lay-src");layui.img(m,function(){var l=t.lazyimg.elem.eq(i);e.attr("src",m).removeAttr("lay-src"),l[0]&&f(l),i++})}},f=function(e,o){var f=a?(o||n).height():l(window).height(),m=n.scrollTop(),u=m+f;if(t.lazyimg.elem=l(r),e)c(e,f);else for(var s=0;s<t.lazyimg.elem.length;s++){var v=t.lazyimg.elem.eq(s),y=a?function(){return v.offset().top-n.offset().top+m}():v.offset().top;if(c(v,f),i=s,y>u)break}};if(f(),!o){var m;n.on("scroll",function(){var e=l(this);m&&clearTimeout(m),m=setTimeout(function(){f(null,e)},50)}),o=!0}return f},e("flow",new o)});

File diff suppressed because it is too large
+ 0 - 1
assets/lib/layui/lay/modules/form.js


File diff suppressed because it is too large
+ 1 - 1
assets/lib/layui/lay/modules/jquery.js


File diff suppressed because it is too large
+ 1 - 1
assets/lib/layui/lay/modules/laydate.js


File diff suppressed because it is too large
+ 1 - 1
assets/lib/layui/lay/modules/layedit.js


File diff suppressed because it is too large
+ 1 - 1
assets/lib/layui/lay/modules/layer.js


File diff suppressed because it is too large
+ 1 - 1
assets/lib/layui/lay/modules/laypage.js


+ 1 - 1
assets/lib/layui/lay/modules/laytpl.js

@@ -1,2 +1,2 @@
-/** layui-v2.5.6 MIT License By https://www.layui.com */
+/** layui-v2.4.3 MIT License By https://www.layui.com */
  ;layui.define(function(e){"use strict";var r={open:"{{",close:"}}"},c={exp:function(e){return new RegExp(e,"g")},query:function(e,c,t){var o=["#([\\s\\S])+?","([^{#}])*?"][e||0];return n((c||"")+r.open+o+r.close+(t||""))},escape:function(e){return String(e||"").replace(/&(?!#?[a-zA-Z0-9]+;)/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/'/g,"&#39;").replace(/"/g,"&quot;")},error:function(e,r){var c="Laytpl Error:";return"object"==typeof console&&console.error(c+e+"\n"+(r||"")),c+e}},n=c.exp,t=function(e){this.tpl=e};t.pt=t.prototype,window.errors=0,t.pt.parse=function(e,t){var o=this,p=e,a=n("^"+r.open+"#",""),l=n(r.close+"$","");e=e.replace(/\s+|\r|\t|\n/g," ").replace(n(r.open+"#"),r.open+"# ").replace(n(r.close+"}"),"} "+r.close).replace(/\\/g,"\\\\").replace(n(r.open+"!(.+?)!"+r.close),function(e){return e=e.replace(n("^"+r.open+"!"),"").replace(n("!"+r.close),"").replace(n(r.open+"|"+r.close),function(e){return e.replace(/(.)/g,"\\$1")})}).replace(/(?="|')/g,"\\").replace(c.query(),function(e){return e=e.replace(a,"").replace(l,""),'";'+e.replace(/\\/g,"")+';view+="'}).replace(c.query(1),function(e){var c='"+(';return e.replace(/\s/g,"")===r.open+r.close?"":(e=e.replace(n(r.open+"|"+r.close),""),/^=/.test(e)&&(e=e.replace(/^=/,""),c='"+_escape_('),c+e.replace(/\\/g,"")+')+"')}),e='"use strict";var view = "'+e+'";return view;';try{return o.cache=e=new Function("d, _escape_",e),e(t,c.escape)}catch(u){return delete o.cache,c.error(u,p)}},t.pt.render=function(e,r){var n,t=this;return e?(n=t.cache?t.cache(e,c.escape):t.parse(t.tpl,e),r?void r(n):n):c.error("no data")};var o=function(e){return"string"!=typeof e?c.error("Template not found"):new t(e)};o.config=function(e){e=e||{};for(var c in e)r[c]=e[c]},o.v="1.2.0",e("laytpl",o)});

File diff suppressed because it is too large
+ 0 - 1
assets/lib/layui/lay/modules/mobile.js


File diff suppressed because it is too large
+ 1 - 1
assets/lib/layui/lay/modules/rate.js


File diff suppressed because it is too large
+ 0 - 1
assets/lib/layui/lay/modules/slider.js


File diff suppressed because it is too large
+ 0 - 1
assets/lib/layui/lay/modules/table.js


File diff suppressed because it is too large
+ 0 - 1
assets/lib/layui/lay/modules/transfer.js


File diff suppressed because it is too large
+ 0 - 1
assets/lib/layui/lay/modules/tree.js


File diff suppressed because it is too large
+ 0 - 1
assets/lib/layui/lay/modules/upload.js


File diff suppressed because it is too large
+ 0 - 1
assets/lib/layui/lay/modules/util.js


File diff suppressed because it is too large
+ 0 - 1
assets/lib/layui/layui.all.js


File diff suppressed because it is too large
+ 0 - 1
assets/lib/layui/layui.js


+ 1 - 1
assets/lib/manage/main.js

@@ -2118,7 +2118,7 @@ function select_linkage(level, id, url, name, value, valid, w, total, search, le
 			var data = t.data.list;
 
 			if(!$(e + '_' + level).length) {
-				html = '<select lay-ignore style="display:inline;margin-top:10px;'+w+'" class="layui-inputs layui-select update_value form-control '+valid+'" id="'+id+'_'+level+'" name="'+name+'[]" onchange="select_linkage(\''+level+'\', \''+id+'\', \''+url+'\', \''+name+'\', \''+value+'\', \''+valid+'\', \''+w+'\', '+total+', \''+search+'\', \''+level_param+'\');">';
+				html = '<select lay-ignore style="display:inline;margin-top:10px;'+w+'" class="layui-input layui-select update_value form-control '+valid+'" id="'+id+'_'+level+'" name="'+name+'[]" onchange="select_linkage(\''+level+'\', \''+id+'\', \''+url+'\', \''+name+'\', \''+value+'\', \''+valid+'\', \''+w+'\', '+total+', \''+search+'\', \''+level_param+'\');">';
 			}
 
 			for (a in data) {

Some files were not shown because too many files changed in this diff