From 8095e46c2d68d844807aa610123924a7fdd2ccb4 Mon Sep 17 00:00:00 2001
From: JerryYan <792602257@qq.com>
Date: Tue, 9 Jun 2020 20:11:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hyhproject/admin/model/LogSysData.php               | 6 +++---
 hyhproject/admin/view/log_sys_data/list.html        | 2 --
 hyhproject/admin/view/log_sys_data/list2.html       | 2 --
 hyhproject/admin/view/log_sys_data/log_sys_data.js  | 8 ++++----
 hyhproject/admin/view/log_sys_data/log_sys_data2.js | 8 ++++----
 hyhproject/admin/view/main.html                     | 4 ++--
 6 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/hyhproject/admin/model/LogSysData.php b/hyhproject/admin/model/LogSysData.php
index 860850f..14b70ab 100644
--- a/hyhproject/admin/model/LogSysData.php
+++ b/hyhproject/admin/model/LogSysData.php
@@ -8,8 +8,7 @@ use think\Db;
 
 class LogSysData extends Base
 {
-    protected $createTime = "create_time";
-    protected $dateFormat = false;
+    protected $createTime = "createTime";
     protected $updateTime = false;
     /**
      * 分页
@@ -20,13 +19,14 @@ class LogSysData extends Base
         $where = [];
         $type = input('type/d');
         $where['type'] = $type;
-        $order = 'a.id desc';
+        $order = 'logId desc';
         if($sort){
             $sort =  str_replace('.',' ',$sort);
             $order = $sort;
         }
 
         $page = $this->field(true)
+            ->where($where)
             ->order($order)
             ->paginate(input('post.limit/d'))->toArray();
 
diff --git a/hyhproject/admin/view/log_sys_data/list.html b/hyhproject/admin/view/log_sys_data/list.html
index fe6becd..8d473f6 100644
--- a/hyhproject/admin/view/log_sys_data/list.html
+++ b/hyhproject/admin/view/log_sys_data/list.html
@@ -14,8 +14,6 @@ $(function(){initGrid();})
    <div id="ztreeMenuContent" class="ztreeMenuContent">
       <ul id="dropDownTree" class="ztree" style="margin-top:0; width:250px; height: 300px;"></ul>
    </div>
-   <input type='text' id='key' placeholder='规则标题'/>
-   <button class="btn btn-primary" onclick='javascript:loadGrid()'><i class='fa fa-search'></i>查询</button>
    <div style='clear:both'></div>
 </div>
 <div class='wst-grid'>
diff --git a/hyhproject/admin/view/log_sys_data/list2.html b/hyhproject/admin/view/log_sys_data/list2.html
index ce27cbb..e0c3ae4 100644
--- a/hyhproject/admin/view/log_sys_data/list2.html
+++ b/hyhproject/admin/view/log_sys_data/list2.html
@@ -14,8 +14,6 @@ $(function(){initGrid();})
    <div id="ztreeMenuContent" class="ztreeMenuContent">
       <ul id="dropDownTree" class="ztree" style="margin-top:0; width:250px; height: 300px;"></ul>
    </div>
-   <input type='text' id='key' placeholder='规则标题'/>
-   <button class="btn btn-primary" onclick='javascript:loadGrid()'><i class='fa fa-search'></i>查询</button>
    <div style='clear:both'></div>
 </div>
 <div class='wst-grid'>
diff --git a/hyhproject/admin/view/log_sys_data/log_sys_data.js b/hyhproject/admin/view/log_sys_data/log_sys_data.js
index 0fa90dd..ca490d6 100644
--- a/hyhproject/admin/view/log_sys_data/log_sys_data.js
+++ b/hyhproject/admin/view/log_sys_data/log_sys_data.js
@@ -6,17 +6,17 @@ function initGrid(){
             	if(val == 1) return '代快付';
             	else return '代慢付'
 			}},
-            {title:'金额', name:'title' ,width:200,renderer: function(val,item,rowIndex){
+            {title:'金额', name:'num' ,width:200,renderer: function(val,item,rowIndex){
             	if(item.changeType!=1){
 					val = '-'+val;
 				}
             	return "￥"+val;
 			}},
-            {title:'创建时间', name:'create_time' ,width:120,sortable:true},
+            {title:'时间', name:'createTime' ,width:120,sortable:true},
             ];
  
-    mmg = $('.mmg').mmGrid({height: h-85,indexCol: true, cols: cols,method:'POST',checkCol:true,multiSelect:true,
-        url: WST.U('admin/logSysData/pageQuery?type=1'), fullWidthRows: true, autoLoad: true,remoteSort: true,
+    mmg = $('.mmg').mmGrid({height: h-85,indexCol: true, cols: cols,method:'POST',checkCol:false,multiSelect:true,
+        url: WST.U('admin/log_sys_data/pageQuery','type=1'), fullWidthRows: true, autoLoad: true,remoteSort: true,
         plugins: [
             $('#pg').mmPaginator({})
         ]
diff --git a/hyhproject/admin/view/log_sys_data/log_sys_data2.js b/hyhproject/admin/view/log_sys_data/log_sys_data2.js
index 34698fe..229fcf1 100644
--- a/hyhproject/admin/view/log_sys_data/log_sys_data2.js
+++ b/hyhproject/admin/view/log_sys_data/log_sys_data2.js
@@ -6,17 +6,17 @@ function initGrid(){
                 if(val == 1) return '代快付';
                 else return '代慢付'
             }},
-        {title:'金额', name:'title' ,width:200,renderer: function(val,item,rowIndex){
+        {title:'金额', name:'num' ,width:200,renderer: function(val,item,rowIndex){
                 if(item.changeType!=1){
                     val = '-'+val;
                 }
                 return "￥"+val;
             }},
-        {title:'创建时间', name:'create_time' ,width:120,sortable:true},
+        {title:'时间', name:'createTime' ,width:120,sortable:true},
     ];
  
-    mmg = $('.mmg').mmGrid({height: h-85,indexCol: true, cols: cols,method:'POST',checkCol:true,multiSelect:true,
-        url: WST.U('admin/logSysData/pageQuery?type=2'), fullWidthRows: true, autoLoad: true,remoteSort: true,
+    mmg = $('.mmg').mmGrid({height: h-85,indexCol: true, cols: cols,method:'POST',checkCol:false,multiSelect:true,
+        url: WST.U('admin/log_sys_data/pageQuery','type=2'), fullWidthRows: true, autoLoad: true,remoteSort: true,
         plugins: [
             $('#pg').mmPaginator({})
         ]
diff --git a/hyhproject/admin/view/main.html b/hyhproject/admin/view/main.html
index 4257e7e..a1891ce 100755
--- a/hyhproject/admin/view/main.html
+++ b/hyhproject/admin/view/main.html
@@ -32,7 +32,7 @@ function enterLicense(){
 			</div>
 			<div class="layui-col-md4" style="height: auto;overflow: hidden;">
 			 <div class="wst-summary-content">
-				<a href="/admin/LogSysData/index.html">
+				<a href="/admin/log_sys_data/index.html">
 				<div class="img"><img src="__ADMIN__/img/13.png"/></div>
 				<div class="data">
 					<p class="data-top" style="color: #e14e5f;">{$object['qlg']['fastPay']}</p>
@@ -43,7 +43,7 @@ function enterLicense(){
 			</div>
 			<div class="layui-col-md4" style="height: auto;overflow: hidden;">
 			<div class="wst-summary-content">
-				<a href="/admin/LogSysData/index2.html">
+				<a href="/admin/log_sys_data/index2.html">
 			    <div class="img"><img src="__ADMIN__/img/14.png"/></div>
 				<div class="data">
 					<p class="data-top" style="color: #fabd3a;;">{$object['qlg']['slowPay']}</p>