diff --git a/hyhproject/admin/controller/LogSysData.php b/hyhproject/admin/controller/LogSysData.php index a3875cd..b25794b 100644 --- a/hyhproject/admin/controller/LogSysData.php +++ b/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 @@ -26,4 +27,11 @@ 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(); + return WSTGrid($data); + } } \ No newline at end of file diff --git a/hyhproject/admin/view/log_sys_data/list3.html b/hyhproject/admin/view/log_sys_data/list3.html new file mode 100644 index 0000000..f6a324f --- /dev/null +++ b/hyhproject/admin/view/log_sys_data/list3.html @@ -0,0 +1,23 @@ +{extend name="base" /} +{block name="css"} + +{/block} +{block name="js"} + + + +{/block} +{block name="main"} +
+
+ +
+
+
+
+
+
+
+{/block} \ No newline at end of file diff --git a/hyhproject/admin/view/log_sys_data/log_sys_data3.js b/hyhproject/admin/view/log_sys_data/log_sys_data3.js new file mode 100644 index 0000000..8059551 --- /dev/null +++ b/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}); +} diff --git a/hyhproject/admin/view/main.html b/hyhproject/admin/view/main.html index a1891ce..bae2b9e 100755 --- a/hyhproject/admin/view/main.html +++ b/hyhproject/admin/view/main.html @@ -54,11 +54,13 @@ function enterLicense(){
-
+ +

{$object['qlg']['vouchersSummarySum']}

预代付值
+