Accept Merge Request #183: (feature/zy -> develop)

Merge Request: feature: kpi

Created By: @zhuyu
Accepted By: @zhuyu
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/183

application/admin/controller/Dashboard.php

@@ -162,20 +162,16 @@ class Dashboard extends Backend
 
             //total 派单数
             //money 利润
-            $money = $data['money'] ?? 0;
-            $mymoney = $money * 3 / 100;
 
             $assignData = [
                 'total' => $data['total'] ?? 0,
                 'finish' => $data['finish'] ?? 0,
                 'money' => $data['money'] ?? 0,
-                'rate' => $money,
-                'my_money' => $mymoney,
             ];
 
             $admin = Admin::get($this->auth->id);
 
-            $this->view->assign('adminname', $admin['username']);
+            $this->view->assign('adminname', $admin['nickname']);
             $this->view->assign('data', $assignData);
 
             return $this->view->fetch('kpi_presale');

application/admin/view/dashboard/kpi_presale.html

@@ -12,8 +12,6 @@
                 <th>姓名</th>
                 <th>录单数</th>
                 <th>录单业绩</th>
-                <th>提成比例（固定3%）</th>
-                <th>提成</th>
             </tr>
             </thead>
             <tbody>
@@ -21,8 +19,6 @@
                 <td>{$adminname|htmlentities}</td>
                 <td>{$data['total']|htmlentities}</td>
                 <td>{$data['money']|htmlentities}</td>
-                <td>3%</td>
-                <td>{$data['my_money']|htmlentities}</td>
             </tr>
             </tbody>
         </table>