pc

application/admin/controller/Goods.php

@@ -12,6 +12,7 @@ use app\common\model\GoodsService;
 use app\common\model\GoodsSku;
 use app\common\model\Refund;
 use think\Db;
+use think\db\Query;
 use Yansongda\Supports\Arr;
 
 /**
@@ -66,7 +67,9 @@ class Goods extends Backend
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
 
             $list = $this->model
-                    ->with(['category'])
+                    ->with(['category','sku'=>function(Query $query){
+                        $query->where('num_stock',0);
+                    }])
                     ->where($where)
                     ->order($sort, $order)
                     ->paginate($limit);

application/admin/controller/seller/User.php

@@ -6,6 +6,7 @@ use app\admin\model\Admin;
 use app\admin\model\AdminMoneyLog;
 use app\admin\model\AuthGroup;
 use app\admin\model\AuthGroupAccess;
+use app\admin\model\Orders;
 use app\common\controller\Backend;
 use fast\Random;
 use fast\Tree;
@@ -307,6 +308,8 @@ class User extends Backend
     public function detail($ids){
         $admin=$this->model->findOrFail($ids);
         $this->assign('user',$admin);
+        $userYeji=Orders::payed()->where('admin_id',$admin['id'])->sum('amount_pay');
+        $this->assign('userYeji',$userYeji);
         if($this->request->isAjax()){
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
             $list = \app\admin\model\User::where($where)

application/admin/view/seller/user/detail.html

@@ -6,6 +6,7 @@
     <tr><td>登录时间</td><td>{$user.logintime|date='Y-m-d H:i:s',###}</td></tr>
     <tr><td>状态</td><td>{:$user.status=='normal'?'正常':'禁用'}</td></tr>
     <tr><td>销售提成</td><td>{$user.money}</td></tr>
+    <tr><td>销售业绩</td><td>{$userYeji}</td></tr>
 </table>
 <div class="panel panel-default panel-intro">
     <div class="panel-body">
@@ -24,7 +25,6 @@
                     </table>
                 </div>
             </div>
-
         </div>
     </div>
 </div>

public/assets/js/backend/auth/group.js

@@ -52,6 +52,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'jstree'], function (
                             }
                         },
                         {field: 'status', title: __('Status'), formatter: Table.api.formatter.status},
+                        {field: 'createtime', title: __('创建时间'), formatter: Table.api.formatter.datetime,addClass:'datetimerange'},
+                        {field: 'updatetime', title: __('更新时间'), formatter: Table.api.formatter.datetime,addClass:'datetimerange'},
                         {
                             field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: function (value, row, index) {
                                 if (Config.admin.group_ids.indexOf(parseInt(row.id)) > -1) {

public/assets/js/backend/goods.js

@@ -41,6 +41,13 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'is_kill', title: __('Is_kill'),formatter:Table.api.formatter.label,searchList:{0:'否',1:'是'}},
                         {field: 'is_level_discount', title: __('参与会员折扣'),formatter:Table.api.formatter.label,searchList:{0:'否',1:'是'}},
                         {field: 'status', title: __('状态'),formatter:Table.api.formatter.label,searchList:goodsStatus},
+                        {field: 'sku', title: __('库存预警'),operate: false,formatter(sku){
+                            let a=[]
+                                sku.forEach(item=>{
+                                    a.push(`<div class="bg-gray" style="margin-top: 5px;">${item.name}库存不足</div>`)
+                                })
+                                return a.join('')
+                            }},
                         {field: 'num_sell', title: __('Num_sell')},
                         {field: 'create_time', title: __('Create_time'),formatter: Table.api.formatter.datetime,addClass:'datetimerange'},
                         //{field: 'update_time', title: __('Update_time'),formatter: Table.api.formatter.datetime,addClass:'datetimerange'},