Merge branch 'test'

# Conflicts:
#	hyhproject/admin/controller/LogSysData.php
#	hyhproject/admin/model/CashDraws.php
#	hyhproject/admin/view/log_sys_data/log_sys_data.js
#	hyhproject/admin/view/log_sys_data/log_sys_data2.js
#	hyhproject/common/model/SysSummary.php

hyhproject/admin/controller/LogSysData.php

@@ -3,6 +3,7 @@
 
 namespace wstmart\admin\controller;
 
+use think\Db;
 use wstmart\admin\model\LogSysData as M;
 
 class LogSysData extends Base
@@ -17,6 +18,10 @@ class LogSysData extends Base
         return $this->fetch("list2");
     }
 
+    public function index3()
+    {
+        return $this->fetch('list3');
+    }
     /**
      * 获取分页
      */
@@ -26,4 +31,14 @@ class LogSysData extends Base
         return WSTGrid($rs);
     }
 
+    public function uvData(){
+        $data = Db::name('user_vouchers_notice')->alias('a')
+            ->join('users b','b.userId=a.userId','left')
+            ->field('a.*,b.loginName')
+            ->paginate(input('post.limit/d'))->toArray();
+        foreach ($data['Rows'] as &$item) {
+            $item['createTime'] = date("Y-m-d H:i:s", $item['createTime']);
+        }
+        return WSTGrid($data);
+    }
 }

hyhproject/admin/model/CashDraws.php

@@ -186,8 +186,11 @@ class CashDraws extends Base{
 //    			$orders['collectionGatheringSum'] += abs($v['payable']);
 //    		}
     	}
-    	$data = Db::name('cash_draws')->whereTime('createTime',[$date,date('Y-m-d',strtotime('+1 day',strtotime($date)))])
-            ->where("cashSatus", '=', 1)->select();
+    	$data = Db::name('cash_draws')->whereIn('cashId',
+            Db::name('log_moneys')
+                ->whereTime('createTime',[$date,date('Y-m-d',strtotime('+1 day',strtotime($date)))])
+                ->where('dataSrc', '=', 3)->column('dataId')
+        )->select();
     	foreach ($data as $item){
             $m->setTable('shops');
             $shopUserId = $m->getField(['shopId'=>$item['targetId']],'userId');

hyhproject/admin/view/index.html

@@ -10,7 +10,7 @@
 <style>body,.wrapper{overflow:hidden;}</style>
 <div class="wrapper">
   <header class="main-header">
-    <a href="#" class="logo">
+    <a href="?" class="logo">
       <span class="logo-mini">商城后台</span>
       <span class="logo-lg">商城后台</span>
     </a>

hyhproject/admin/view/log_sys_data/list3.html

@@ -0,0 +1,23 @@
+{extend name="base" /}
+{block name="css"}
+<link rel="stylesheet" type="text/css" href="__ADMIN__/js/mmgrid/mmGrid.css?v={$v}" />
+{/block}
+{block name="js"}
+<script src="__ADMIN__/js/mmgrid/mmGrid.js?v={$v}" type="text/javascript"></script>
+<script src="__ADMIN__/log_sys_data/log_sys_data3.js?v={$v}" type="text/javascript"></script>
+<script>
+$(function(){initGrid();})
+</script>
+{/block}
+{block name="main"}
+<div class="wst-toolbar">
+   <div id="ztreeMenuContent" class="ztreeMenuContent">
+      <ul id="dropDownTree" class="ztree" style="margin-top:0; width:250px; height: 300px;"></ul>
+   </div>
+   <div style='clear:both'></div>
+</div>
+<div class='wst-grid'>
+<div id="mmg" class="mmg"></div>
+<div id="pg" style="text-align: right;"></div>
+</div>
+{/block}

hyhproject/admin/view/log_sys_data/log_sys_data.js

@@ -12,6 +12,7 @@ function initGrid(){
 				}
             	return "￥"+val;
 			}},
+            {title:'备注', name:'remark' },
             {title:'时间', name:'createTime' ,width:120,sortable:true},
             ];
  

hyhproject/admin/view/log_sys_data/log_sys_data2.js

@@ -12,6 +12,7 @@ function initGrid(){
                 }
                 return "￥"+val;
             }},
+        {title:'备注', name:'remark' },
         {title:'时间', name:'createTime' ,width:120,sortable:true},
     ];
  

hyhproject/admin/view/log_sys_data/log_sys_data3.js

@@ -0,0 +1,43 @@
+var mmg;
+function initGrid(){
+    var h = WST.pageHeight();
+    var cols = [
+        {title:'用户', name:'loginName' ,width:120},
+        {title:'预获产品券', name:'expectedProductNum' ,width:200,renderer: function(val,item,rowIndex){
+                if(item.moneyType!=1){
+                    val = '-'+val;
+                }
+                return "￥"+val;
+            }},
+        {title:'预获优惠券', name:'expectedCouponsNum' ,width:200,renderer: function(val,item,rowIndex){
+                if(item.moneyType!=1){
+                    val = '-'+val;
+                }
+                return "￥"+val;
+            }},
+        {title:'描述', name:'remark' ,width:240,sortable:true},
+        {title:'时间', name:'createTime' ,width:120,sortable:true},
+    ];
+ 
+    mmg = $('.mmg').mmGrid({height: h-85,indexCol: true, cols: cols,method:'POST',checkCol:false,multiSelect:true,
+        url: WST.U('admin/log_sys_data/uvData'), fullWidthRows: true, autoLoad: true,remoteSort: true,
+        plugins: [
+            $('#pg').mmPaginator({})
+        ]
+    });   
+    mmg.on('loadSuccess',function(){
+    	layui.form.render('','gridForm');
+        layui.form.on('switch(isShow)', function(data){
+            var id = $(this).attr("data");
+            if(this.checked){
+                toggleIsShow(1,id);
+            }else{
+                toggleIsShow(0,id);
+            }
+        });
+    })
+}
+
+function loadGrid(){
+	mmg.load({page:1});
+}

hyhproject/admin/view/main.html

@@ -54,11 +54,13 @@ function enterLicense(){
 			</div>
 			<div class="layui-col-md4" style="height: auto;overflow: hidden;">
 			 <div class="wst-summary-content">
-			    <div class="img"><img src="__ADMIN__/img/15.png"/></div>
+				 <a href="/admin/log_sys_data/index3.html">
+				 <div class="img"><img src="__ADMIN__/img/15.png"/></div>
 				<div class="data">
 					<p class="data-top" style="color: #f1635f;">{$object['qlg']['vouchersSummarySum']}</p>
 					<div class="data-bottom">预代付值</div>
 				</div>
+				 </a>
 			 </div>
 			</div>			
 			<div class="layui-col-md4" style="height: auto;overflow: hidden;">