追加用户注册/投注总额统计

app/Http/Controllers/Admin/IndexController.php

@@ -296,24 +296,59 @@ class IndexController extends Controller {
 
     //最近7天会员注册情况
     function regUser() {
+        /*
         $time2 = date('Y-m-d H:i:s', time() - 60 * 60 * 24 * 30);
         $time1 = date('Y-m-d H:i:s', time());
         $timearea = [$time2, $time1];
-        // $rech_data['money_with'] = DB::table('account_detailed')->join('account', 'account.identity', '=', 'money_details.account_identity')->select(DB::Raw('sum(money) as with'))->whereBetween('money_time', $timearea)->groupBy('account')->where('trade_type', 5)->get();
-        // $rimit = \App\Models\Account_list::where('account_status', 1)
-        //     ->select(DB::Raw('date(register_time) as name, count(identity) as value'))
-        //     ->whereBetween('register_time', $timearea)->orderBy(DB::Raw('date(register_time)'))->groupBy(DB::Raw('date(register_time)'))->get();
-        // $data = $rimit->toArray();
-        $rimit = \App\Models\Account_detailed::where('statuss', 1)
-        ->select(DB::Raw('date(register_time) as name, count(identity) as value'))
-        ->whereBetween('register_time', $timearea)->orderBy(DB::Raw('date(register_time)'))->groupBy(DB::Raw('date(register_time)'))->get();
+        $rech_data['money_with'] = DB::table('account_detailed')->join('account', 'account.identity', '=', 'money_details.account_identity')->select(DB::Raw('sum(money) as with'))->whereBetween('money_time', $timearea)->groupBy('account')->where('trade_type', 5)->get();
+        $rimit = \App\Models\Account_list::where('account_status', 1)
+            ->select(DB::Raw('date(register_time) as name, count(identity) as value'))
+            ->whereBetween('register_time', $timearea)->orderBy(DB::Raw('date(register_time)'))->groupBy(DB::Raw('date(register_time)'))->get();
         $data = $rimit->toArray();
+        */
+
+        //统计七天内注册用户数量按天进行分组
+        $start_time = date('Y-m-d', strtotime('-7 days'));
+        $end_time = date('Y-m-d',time());
+        $user = DB::table('account_detailed')->whereBetween('register_time',[$start_time,$end_time])
+        ->selectRaw('date(register_time) as name,count(identity) as value')
+        ->groupBy('register_time')->get();
+        if(!empty($user)){
+            $userData = [];
+            foreach($user as $k=>$v){
+                $userData[$k]['name'] = $v->name; 
+                $userData[$k]['value'] = $v->value; 
+            }
+        }
+        //计算日期内天数
+        $stimestamp = strtotime($start_time);
+        $etimestamp = strtotime($end_time);
+        //计算日期段内有多少天
+        $days = ($etimestamp - $stimestamp) / 86400;
+        //保存每天日期
+        $date = array();
+        for($i = 0;$i < $days;$i++){
+            $date[] = date('Y-m-d', $stimestamp + (86400 * $i));
+        }
+        //循环补全日期
+        foreach ($date as $key => $val){
+            $data[$key] = [
+            'name' => $val,
+            'value' => 0
+            ];
+            foreach ($userData as $item => $value){
+                if($val == $value['name']){
+                    $data[$key] = $value;
+                }
+            }
+        }
+
 
         foreach ($data as $k => $v) {
             $array['title'][$k] = $v['name'];
             $array['data']['num'][$k] = $v['value'];
         }
-        $array['legend'][] = '最近注册用户记录';
+        $array['legend'][] = '最近7天注册用户记录';
 
         return responseToJson($array);
     }

resources/views/admin/systemSet/editNotice.blade.php

@@ -17,14 +17,12 @@
                 <div class="layui-input-block">
                     <select name="type" id="testSelect" class="Selects" lay-filter="testSelect">
                         <option value="" selected>请选择</option>
-
-
-                        <option value="1">新闻</option>
-                        <option value="2">公告</option>
-                        <option value="3">优惠活动</option>
-                        <option value="11">新手指南</option>
-                        <option value="10">常见问题</option>
-                        <option value="20">彩金活动</option>
+                        <option value="1" @if (isset($data['type']) && $data['type']==1 )  selected  @endif>新闻</option>
+                        <option value="2" @if (isset($data['type']) && $data['type']==2 )  selected  @endif>公告</option>
+                        <option value="3" @if (isset($data['type']) && $data['type']==3 )  selected  @endif>优惠活动</option>
+                        <option value="11" @if (isset($data['type']) && $data['type']==11 )  selected  @endif>新手指南</option>
+                        <option value="10" @if (isset($data['type']) && $data['type']==10 )  selected  @endif>常见问题</option>
+                        <option value="20" @if (isset($data['type']) && $data['type']==20 )  selected  @endif>彩金活动</option>
 
                     </select>
                 </div>
@@ -45,6 +43,9 @@
             <button type="button" class="layui-btn" id="test1">
                 <i class="layui-icon">&#xe67c;</i>上传图片
             </button>
+            @if (isset($data['img']) && !empty($data['img']) )
+                <a href="{{$data['img']}}" target="_blank"><img src="{{$data['img']}}" width="50"></a>
+             @endif
             <div class="layui-input-block">
                 <input type="text" name="img" id="img" class="layui-input"
                        value="{{isset($data['img'])?$data['img']:''}}">
@@ -63,6 +64,9 @@
             <button type="button" class="layui-btn" id="test2">
                 <i class="layui-icon">&#xe67c;</i>上传图片
             </button>
+            @if (isset($data['mobileimg']) && !empty($data['mobileimg']) )
+                <a href="{{$data['mobileimg']}}" target="_blank"><img src="{{$data['mobileimg']}}" width="50"></a>
+            @endif
             <div class="layui-input-block">
                 <input type="text" name="mobileimg" id="mobileimg" class="layui-input"
                        value="{{isset($data['mobileimg'])?$data['mobileimg']:''}}">

resources/views/admin/welcome.blade.php

@@ -199,7 +199,7 @@
 
 <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
     <ul class="layui-tab-title">
-        <li class="layui-this">最近注册用户记录</li>
+        <li class="layui-this">最近7天注册用户记录</li>
         <li>最近7天财务情况</li>
         <li>今日来源分析</li>
         <li>今日注单分析</li>
@@ -453,7 +453,7 @@
         // 填入数据
         chart6.setOption({
             title: {
-                text: '最近注册用户记录'
+                text: '最近7天注册用户记录'
             },
             legend: {
                 data: data.legend
@@ -465,8 +465,36 @@
         });
     });@endif
 
-///admin/game/sevendayBetmoney
+    @if(checkRriv('/admin/game/betMoney'))$.get('/admin/game/betMoney').done(function (data) {
+        var data = data.data;
+        var legend = data.legend;
+        var arr = [];
+        for (var i = 0; i < legend.length; i++) {
+            var no = legend[i];
+            var obj = {};
+            obj.name = legend[i];
+            obj.type = 'line';
+            obj.data = data.data.num;
+            arr.push(obj);
+        }
 
+        // 填入数据
+        chart7.setOption({
+            title: {
+                text: '最近7天投注总额趋势图'
+            },
+            legend: {
+                data: data.legend
+            },
+            xAxis: {
+                data: data.title
+            },
+            series: arr
+        });
+    });@endif
+
+///admin/game/sevendayBetmoney
+/*
     @if(checkRriv('/admin/game/betMoney'))$.get('/admin/game/betMoney').done(function (data) {
         
         var data = data.data;
@@ -496,6 +524,7 @@
             series: arr
         });
     });@endif
+    */
 
 
 </script>