ZxcZxc123 2 年之前
父节点
当前提交
22768e3de6
共有 3 个文件被更改,包括 8 次插入2 次删除
  1. 2 2
      app/admin/view/login/index.php
  2. 1 0
      app/api/controller/user/UserBillController.php
  3. 5 0
      app/models/user/UserBill.php

+ 2 - 2
app/admin/view/login/index.php

@@ -17,11 +17,11 @@
     </script>
 </head>
 <body class="gray-bg login-bg">
-<canvas id="canvas" width="900" height="300" style="position: fixed;top: -50px;width: 60%;left: 20%"></canvas>
+<!--<canvas id="canvas" width="900" height="300" style="position: fixed;top: -50px;width: 60%;left: 20%"></canvas>-->
 <div class="middle-box text-center loginscreen  animated fadeInDown">
     <div class="login-group">
         <h3 class="login-logo">
-            <img src="{__ADMIN_PATH}images/logo.png">
+            <!--<img src="{__ADMIN_PATH}images/logo.png">-->
         </h3>
         <form role="form" action="{:url('verify')}" method="post" id="form" onsubmit="return false">
             <div class="form-group">

+ 1 - 0
app/api/controller/user/UserBillController.php

@@ -115,6 +115,7 @@ class UserBillController
      */
     public function spread_commission(Request $request, $type)
     {
+
         list($page, $limit) = UtilService::getMore([
             ['page', 0],
             ['limit', 0],

+ 5 - 0
app/models/user/UserBill.php

@@ -167,13 +167,18 @@ class UserBill extends BaseModel
                 $model = $model->where('type', 'brokerage,extract')->where('pm', 0);
                 break;
         }
+        var_dump('2.3');
         if ($page) $model = $model->page((int)$page, (int)$limit);
         $list = ($list = $model->select()) ? $list->toArray() : [];
         $data = [];
+        var_dump('2.3.1');
+        var_dump($model);
         foreach ($list as $item) {
+            var_dump('2.4');
             $value['time'] = $item['time'];
             $value['list'] = self::where('id', 'in', $item['ids'])->field('FROM_UNIXTIME(add_time,"%Y-%m-%d %H:%i") as add_time,title,number,pm,status')->order('add_time DESC')->select();
             array_push($data, $value);
+            var_dump('2.5');
         }
         return $data;
     }