diff --git a/system/api_root.php b/system/api_root.php index b3adff5..7b5ec67 100644 --- a/system/api_root.php +++ b/system/api_root.php @@ -25,13 +25,15 @@ function other_upsys(){ if(!preg_match('/^v.+-(\d{8})$/i',SysVer,$matches)){ msg(-1,"获取程序版本异常"); } + if (!is_dir('./data/temp')) mkdir('./data/temp',0755,true) or msg(-1,'下载失败,创建临时[/data/temp]目录失败'); //检查指定文件夹是否可写 - $paths = ["./","./data","./static","./system","./templates"]; + $paths = ["./","./data","./data/temp","./static","./system","./templates"]; foreach($paths as $path){ if(!is_writable($path)){ msg(-1,"文件夹不可写 >> $path"); } } + $_SESSION['upsys']['sysver'] = intval($matches[1]); usleep(1000*300); //延迟300毫秒 msg(1,'success'); diff --git a/system/public.php b/system/public.php index 5df079f..fb582e7 100644 --- a/system/public.php +++ b/system/public.php @@ -230,8 +230,8 @@ function echo_category($property = false){ function echo_pwds(){ $where["uid"] = UID; $where['ORDER']['pid'] = 'ASC'; - foreach (select_db('user_pwd_group',['pid','name'],$where) as $data) { - echo ""; + foreach (select_db('user_pwd_group',['pid','name','password'],$where) as $data) { + echo ""; } } //检查链接 diff --git a/system/version.txt b/system/version.txt index 41c9dfb..e72a17d 100644 --- a/system/version.txt +++ b/system/version.txt @@ -1 +1 @@ -v2.0.08-20230406 \ No newline at end of file +v2.0.09-20230410 \ No newline at end of file diff --git a/templates/admin/css/public.css b/templates/admin/css/public.css index 137ed78..6a1c36f 100644 --- a/templates/admin/css/public.css +++ b/templates/admin/css/public.css @@ -10,23 +10,6 @@ body { width: 190px; } -/*手机端适配*/ -@media screen and (max-width: 768px) { - .layui-form-mid { - margin-left: 10px; - } - .layui-form-item .layui-input-inline { - margin-right: 0px; - width: calc(100% - 110px); - } -} -@media screen and (max-width: 450px){ - .layui-form-item .layui-input-inline+.layui-form-mid { - margin-left: 10px; - } -} - - .layuimini-container { border: 1px solid #f2f2f2; border-radius: 5px; @@ -91,4 +74,40 @@ body { .layui-table-tool-temp{ padding-right: 0px; +} + + +/*手机端适配*/ +@media screen and (max-width: 768px) { + .layui-form-mid { + margin-left: 10px; + } + .layui-form-item .layui-input-inline { + margin-right: 0px; + width: calc(100% - 110px); + } + /*手机端表单调整230410*/ + .layui-form-label{ + width: 60px; + padding: 9px 9px; + } + .layui-input-block{ + margin-left: 85px; + } + /*隐藏描述*/ + .layui-form-mid{ + display:none + } + /*边距*/ + .layuimini-main { + margin: 10px 5px 10px 0px; + } + .layui-form-item{ + margin-bottom: 8px; + } +} +@media screen and (max-width: 450px){ + .layui-form-item .layui-input-inline+.layui-form-mid { + margin-left: 10px; + } } \ No newline at end of file diff --git a/templates/admin/js/category.js b/templates/admin/js/category.js index cfa3cf2..2e9490c 100644 --- a/templates/admin/js/category.js +++ b/templates/admin/js/category.js @@ -80,20 +80,6 @@ $("#fid").append(""); } } - //加载加密分组数据 - $.post(get_api('read_pwd_group_list'),{'page':'1','limit':'9999'},function(data,status){ - if(data.code == 1){ - pwds = []; - $("#pwd_id").empty(); - $("#pwd_id").append(""); - for(var i =0;i"+data.data[i].name+" | 密码 [" + data.data[i].password +"]"); - } - } - }); - - layui.form.render("select");//重新渲染下拉框 limit = false; //取消修改限制 layer.closeAll('loading'); //关闭加载层 } diff --git a/templates/admin/js/link_list.js b/templates/admin/js/link_list.js index 75a6386..070363c 100644 --- a/templates/admin/js/link_list.js +++ b/templates/admin/js/link_list.js @@ -248,18 +248,6 @@ layui.use(['form','table','dropdown','miniTab'], function () { return true; } }) - }else if(event === 'generate'){ //生成大量链接 - if($('#fid').val() == 0 ){ - layer.msg("请选择一个分类",{icon:3}); - return; - } - var fid = $('#fid').val(); - for (i = 0; i < 1000; i++) { - $.post(get_api('write_link','add'),{title:'百度翻译'+i,fid:fid,url:'https://fanyi.baidu.com/#zh/en/'+i+'_'+randomString(5)},function(data,status){ - - }); - } - } }); diff --git a/templates/admin/page/add_link_tpl.php b/templates/admin/page/add_link_tpl.php index 660428e..cabf202 100644 --- a/templates/admin/page/add_link_tpl.php +++ b/templates/admin/page/add_link_tpl.php @@ -28,6 +28,7 @@
diff --git a/templates/admin/page/category_list.php b/templates/admin/page/category_list.php index 8b63247..721cbcd 100644 --- a/templates/admin/page/category_list.php +++ b/templates/admin/page/category_list.php @@ -72,6 +72,7 @@
diff --git a/templates/admin/page/home.php b/templates/admin/page/home.php index ae3c0ff..6214403 100644 --- a/templates/admin/page/home.php +++ b/templates/admin/page/home.php @@ -1,8 +1,6 @@ 'notice']); @@ -261,11 +259,11 @@ require 'header.php'; 专属地址 - 我的主页 + 我的主页   - TwoNav - 登录 + TwoNav - 登录   -  建议收藏 +  建议收藏 diff --git a/templates/admin/page/link_add.php b/templates/admin/page/link_add.php index 2e0dc00..55517da 100644 --- a/templates/admin/page/link_add.php +++ b/templates/admin/page/link_add.php @@ -13,7 +13,7 @@ .badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:11px;font-weight:700;color:#fff;line-height:1;vertical-align:middle;white-space:nowrap;text-align:center;background-color:#777;border-radius:10px}
-
+
diff --git a/templates/admin/page/link_list.php b/templates/admin/page/link_list.php index e1b1f9c..b4bc0a5 100644 --- a/templates/admin/page/link_list.php +++ b/templates/admin/page/link_list.php @@ -67,7 +67,6 @@ -
diff --git a/templates/admin/page/root/reg_control.php b/templates/admin/page/root/reg_control.php index 08434b0..5c6d878 100644 --- a/templates/admin/page/root/reg_control.php +++ b/templates/admin/page/root/reg_control.php @@ -71,7 +71,7 @@ $user_groups = select_db('user_group',['id','code','name'],'');