dever 3 年之前
父節點
當前提交
98a627c9ac
共有 2 個文件被更改,包括 11 次插入2 次删除
  1. 1 1
      assets/layadmin/html/inc/head.html
  2. 10 1
      src/Database.php

+ 1 - 1
assets/layadmin/html/inc/head.html

@@ -8,7 +8,7 @@
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
 <link rel="stylesheet" type="text/css" href="../script/lib/layui/css/layui.css" />
-<link rel="stylesheet" href="../script/lib/layui/admin/style/admin.css?v3" media="all">
+<link rel="stylesheet" href="../script/lib/layui/admin/style/admin.css?v5" media="all">
 
 <!-- plugin -->
 <link rel="stylesheet" type="text/css" href="../script/lib/color/colpick.css">

+ 10 - 1
src/Database.php

@@ -2424,7 +2424,16 @@ class Database
                         }
                         $result .= '<a href="javascript:;" onclick="load(\'' . Dever::url($pj) . '\', \'' . $content . '\', \'' . $title . '\')"><button type="button" class="btn btn-info btn-rounded waves-effect waves-light m-b-5 '.$class.'">' . $vj[0] . '</button></a>&nbsp;&nbsp;';
                     } elseif (strpos($kj, 'new') !== false) {
-                        $result .= '<a href="' . $this->url($kj, $data['id'], $pj) . '" target="_blank" class="oper_' . $kj . '"><button type="button" class="btn btn-info btn-rounded waves-effect waves-light m-b-5 '.$class.'">' . $h . $vjn . '</button></a>&nbsp;&nbsp;';
+                        if (!isset($vj[1])) {
+                            $vj[1] = '';
+                        }
+                        if (strstr($vj[1], 'http')) {
+                            $url = $vj[1] . '&id=' . $data['id'];
+                        } else {
+                            $url = $this->url($kj, $data['id']);
+                        }
+
+                        $result .= '<a href="' . $url . '" target="_blank" class="oper_' . $kj . '"><button type="button" class="btn btn-info btn-rounded waves-effect waves-light m-b-5 '.$class.'">' . $h . $vjn . '</button></a>&nbsp;&nbsp;';
                     } elseif (isset($vj[1]) && strpos($vj[1], 'modal|') !== false) {
                         $t = explode('|', $vj[1]);
                         $result .= '<a href="#dever_modal" data-toggle="modal"  class="btn btn-info btn-rounded waves-effect waves-light m-b-5 '.$class.'" onclick=' . $t[1] . ' msg-send="' . $this->value($t[2], $data) . '">' . $vj[0] . '</a>&nbsp;&nbsp;';