commit

app/admin/controller/finance/UserExtract.php

@@ -25,12 +25,14 @@ class UserExtract extends AuthController
 {
     public function index()
     {
+        $admin = $this->adminInfo;
         $where = Util::getMore([
             ['status', ''],
             ['nickname', ''],
             ['extract_type', ''],
             ['nireid', ''],
             ['date', ''],
+            ['is_examine', '']
         ], $this->request);
         $limitTimeList = [
             'today' => implode(' - ', [date('Y/m/d'), date('Y/m/d', strtotime('+1 day'))]),
@@ -47,6 +49,7 @@ class UserExtract extends AuthController
                 date('Y') . '/01/01', date('Y/m/d', strtotime(date('Y') . '/01/01 + 1year -1 day'))
             ])
         ];
+        $this->assign('roles', $admin['roles']);
         $this->assign('where', $where);
         $this->assign('limitTimeList', $limitTimeList);
         $this->assign(UserExtractModel::extractStatistics());
@@ -54,6 +57,112 @@ class UserExtract extends AuthController
         return $this->fetch();
     }
 
+    public function shichang_index()
+    {
+        $admin = $this->adminInfo;
+        $where = Util::getMore([
+            ['status', ''],
+            ['nickname', ''],
+            ['extract_type', ''],
+            ['nireid', ''],
+            ['date', ''],
+            ['is_examine', '']
+        ], $this->request);
+        $limitTimeList = [
+            'today' => implode(' - ', [date('Y/m/d'), date('Y/m/d', strtotime('+1 day'))]),
+            'week' => implode(' - ', [
+                date('Y/m/d', (time() - ((date('w') == 0 ? 7 : date('w')) - 1) * 24 * 3600)),
+                date('Y-m-d', (time() + (7 - (date('w') == 0 ? 7 : date('w'))) * 24 * 3600))
+            ]),
+            'month' => implode(' - ', [date('Y/m') . '/01', date('Y/m') . '/' . date('t')]),
+            'quarter' => implode(' - ', [
+                date('Y') . '/' . (ceil((date('n')) / 3) * 3 - 3 + 1) . '/01',
+                date('Y') . '/' . (ceil((date('n')) / 3) * 3) . '/' . date('t', mktime(0, 0, 0, (ceil((date('n')) / 3) * 3), 1, date('Y')))
+            ]),
+            'year' => implode(' - ', [
+                date('Y') . '/01/01', date('Y/m/d', strtotime(date('Y') . '/01/01 + 1year -1 day'))
+            ])
+        ];
+        $this->assign('roles', $admin['roles']);
+        $this->assign('where', $where);
+        $this->assign('limitTimeList', $limitTimeList);
+        $this->assign(UserExtractModel::extractStatistics());
+        $this->assign(UserExtractModel::systemPage($where));
+        return $this->fetch();
+    }
+
+    public function caiwu_index()
+    {
+        $admin = $this->adminInfo;
+        $where = Util::getMore([
+            ['status', ''],
+            ['nickname', ''],
+            ['extract_type', ''],
+            ['nireid', ''],
+            ['date', ''],
+            ['is_examine', '']
+        ], $this->request);
+        $limitTimeList = [
+            'today' => implode(' - ', [date('Y/m/d'), date('Y/m/d', strtotime('+1 day'))]),
+            'week' => implode(' - ', [
+                date('Y/m/d', (time() - ((date('w') == 0 ? 7 : date('w')) - 1) * 24 * 3600)),
+                date('Y-m-d', (time() + (7 - (date('w') == 0 ? 7 : date('w'))) * 24 * 3600))
+            ]),
+            'month' => implode(' - ', [date('Y/m') . '/01', date('Y/m') . '/' . date('t')]),
+            'quarter' => implode(' - ', [
+                date('Y') . '/' . (ceil((date('n')) / 3) * 3 - 3 + 1) . '/01',
+                date('Y') . '/' . (ceil((date('n')) / 3) * 3) . '/' . date('t', mktime(0, 0, 0, (ceil((date('n')) / 3) * 3), 1, date('Y')))
+            ]),
+            'year' => implode(' - ', [
+                date('Y') . '/01/01', date('Y/m/d', strtotime(date('Y') . '/01/01 + 1year -1 day'))
+            ])
+        ];
+        $this->assign('roles', $admin['roles']);
+        $this->assign('where', $where);
+        $this->assign('limitTimeList', $limitTimeList);
+        $this->assign(UserExtractModel::extractStatistics());
+        $this->assign(UserExtractModel::systemPage($where));
+        return $this->fetch();
+    }
+
+    public function jishu_index()
+    {
+        $admin = $this->adminInfo;
+        $where = Util::getMore([
+            ['status', ''],
+            ['nickname', ''],
+            ['extract_type', ''],
+            ['nireid', ''],
+            ['date', ''],
+            ['is_examine', '']
+        ], $this->request);
+        $limitTimeList = [
+            'today' => implode(' - ', [date('Y/m/d'), date('Y/m/d', strtotime('+1 day'))]),
+            'week' => implode(' - ', [
+                date('Y/m/d', (time() - ((date('w') == 0 ? 7 : date('w')) - 1) * 24 * 3600)),
+                date('Y-m-d', (time() + (7 - (date('w') == 0 ? 7 : date('w'))) * 24 * 3600))
+            ]),
+            'month' => implode(' - ', [date('Y/m') . '/01', date('Y/m') . '/' . date('t')]),
+            'quarter' => implode(' - ', [
+                date('Y') . '/' . (ceil((date('n')) / 3) * 3 - 3 + 1) . '/01',
+                date('Y') . '/' . (ceil((date('n')) / 3) * 3) . '/' . date('t', mktime(0, 0, 0, (ceil((date('n')) / 3) * 3), 1, date('Y')))
+            ]),
+            'year' => implode(' - ', [
+                date('Y') . '/01/01', date('Y/m/d', strtotime(date('Y') . '/01/01 + 1year -1 day'))
+            ])
+        ];
+        $this->assign('roles', $admin['roles']);
+        $this->assign('where', $where);
+        $this->assign('limitTimeList', $limitTimeList);
+        $this->assign(UserExtractModel::extractStatistics());
+        $this->assign(UserExtractModel::systemPage($where));
+        return $this->fetch();
+    }
+
+
+
+
+
     public function excel()
     {
         $data = Util::getMore([
@@ -79,6 +188,7 @@ class UserExtract extends AuthController
             ->leftJoin('user b', 'b.uid = a.uid');
         if ($data['date']){
             list($startTime, $endTime) = explode(' - ', $data['date']);
+            $endTime = (int)bcadd(strtotime($endTime), 86400, 0);
             $model = $model->whereBetweenTime('a.add_time', $startTime, $endTime);
         }
         $list = $model->select();
@@ -235,4 +345,40 @@ class UserExtract extends AuthController
             return JsonService::fail('操作失败!');
         }
     }
+
+
+    public function examine($id)
+    {
+        if (!UserExtractModel::be(['id' => $id, 'status' => 0]))
+            return JsonService::fail('操作记录不存在或状态错误!');
+        UserExtractModel::beginTrans();
+        $extract = UserExtractModel::get($id);
+        if (!$extract) return JsonService::fail('操作记录不存!');
+        $admin = $this->adminInfo;
+        if ($admin['roles'] == 5){
+            if ($extract->is_examine > 0) return JsonService::fail('该记录已审核');
+            $extract['is_examine'] = 1;
+            $extract['reviewed'] = $admin['real_name'];
+        }elseif ($admin['roles'] == 6){
+            if ($extract->is_examine > 1) return JsonService::fail('该记录已审核');
+            $extract['is_examine'] = 2;
+            $extract['reviewed'] = $extract['reviewed'].','.$admin['real_name'];
+        }elseif ($admin['roles'] == 3){
+            if ($extract->examine_status > 0) return JsonService::fail('该记录已审核');
+            $extract['examine_status'] = 1;
+            $extract['reviewed'] = $extract['reviewed'].','.$admin['real_name'];
+        }else{
+            return JsonService::fail('身份不对!');
+        }
+        $res = $extract->save();
+        if ($res) {
+            UserExtractModel::commitTrans();
+            return JsonService::successful('操作成功!');
+        } else {
+            UserExtractModel::rollbackTrans();
+            return JsonService::fail('操作失败!');
+        }
+
+
+    }
 }

app/admin/controller/order/StoreOrder.php

@@ -52,9 +52,62 @@ class StoreOrder extends AuthController
             'orderCount' => StoreOrderModel::orderCount(),
             'payTypeCount' => StoreOrderModel::payTypeCount(),
         ]);
+        $this->assign('role', $this->adminInfo['roles']);
         return $this->fetch();
     }
 
+    /**
+     * @return mixed
+     */
+    public function caigou_index()
+    {
+        $this->assign([
+            'year' => get_month(),
+            'real_name' => $this->request->get('real_name', ''),
+            'status' => $this->request->param('status', ''),
+            'orderCount' => StoreOrderModel::orderCount(),
+            'payTypeCount' => StoreOrderModel::payTypeCount(),
+        ]);
+        $this->assign('role', $this->adminInfo['roles']);
+        return $this->fetch();
+    }
+
+    /**
+     * @return mixed
+     */
+    public function  jishu_index()
+    {
+        $this->assign([
+            'year' => get_month(),
+            'real_name' => $this->request->get('real_name', ''),
+            'status' => $this->request->param('status', ''),
+            'orderCount' => StoreOrderModel::orderCount(),
+            'payTypeCount' => StoreOrderModel::payTypeCount(),
+        ]);
+        $this->assign('role', $this->adminInfo['roles']);
+        return $this->fetch();
+    }
+
+    /**
+     * @return mixed
+     */
+    public function  caiwu_index()
+    {
+        $this->assign([
+            'year' => get_month(),
+            'real_name' => $this->request->get('real_name', ''),
+            'status' => $this->request->param('status', ''),
+            'orderCount' => StoreOrderModel::orderCount(),
+            'payTypeCount' => StoreOrderModel::payTypeCount(),
+        ]);
+        $this->assign('role', $this->adminInfo['roles']);
+        return $this->fetch();
+    }
+
+
+
+
+
     /**
      * 获取头部订单金额等信息
      * return json
@@ -89,7 +142,10 @@ class StoreOrder extends AuthController
             ['order', ''],
             ['page', 1],
             ['limit', 20],
-            ['excel', 0]
+            ['excel', 0],
+            ['examine_status', 0],
+            ['paid', 0],
+            ['is_examine', 0],
         ]);
         return Json::successlayui(StoreOrderModel::OrderList($where));
     }
@@ -891,4 +947,57 @@ class StoreOrder extends AuthController
         }
     }
 
+    public function tg($id)
+    {
+        $order = \app\admin\model\order\StoreOrder::where('id', $id)->find();
+        if ($order['examine_status'] <> 0) return Json::fail('订单审核状态不对');
+        $admin = $this->getActiveAdminInfo();
+        $roles = explode(',', $admin['roles']);
+        if (in_array( 7,$roles)){
+            if ($order->is_examine > 0) return JsonService::fail('该记录已审核');
+            $order['is_examine'] = 1;
+            $order['reviewed'] = $admin['real_name'];
+        }elseif (in_array(6 ,$roles)){
+            if ($order->is_examine > 1) return JsonService::fail('该记录已审核');
+            $order['is_examine'] = 2;
+            $order['reviewed'] = $order['reviewed'].','.$admin['real_name'];
+        }elseif (in_array(3, $roles)){
+            if ($order->examine_status > 0) return JsonService::fail('该记录已审核');
+            $order['examine_status'] = 1;
+            $order['reviewed'] = $order['reviewed'].','.$admin['real_name'];
+        }else{
+            return JsonService::fail('身份不对!');
+        }
+        $res = $order->save();
+        if ($res) {
+            return JsonService::successful('操作成功!');
+        } else {
+            return JsonService::fail('操作失败!');
+        }
+    }
+
+    public function jj($id)
+    {
+        $order = \app\admin\model\order\StoreOrder::where('id', $id)->find();
+        if ($order['examine_status'] <> 0) return Json::fail('订单审核状态不对');
+        $admin = $this->getActiveAdminInfo();
+        $roles = explode(',', $admin['roles']);
+        if (!in_array( 3,$roles) && !in_array( 6,$roles) && !in_array( 7,$roles)){
+            return JsonService::fail('身份不对!');
+        }
+        $order['examine_status'] = -1;
+        if (!empty($order['reviewed'])){
+            $order['reviewed'] = $order['reviewed'].',不通过人'.$admin['real_name'];
+        }else{
+            $order['reviewed'] = '不通过人'.$admin['real_name'];
+        }
+
+        $res = $order->save();
+        if ($res) {
+            return JsonService::successful('操作成功!');
+        } else {
+            return JsonService::fail('操作失败!');
+        }
+    }
+
 }

app/admin/controller/user/Examine.php

@@ -0,0 +1,106 @@
+<?php
+/**
+ *
+ * @author: xaboy<365615158@qq.com>
+ * @day: 2017/11/11
+ */
+
+namespace app\admin\controller\user;
+
+use app\admin\controller\AuthController;
+use crmeb\repositories\UserRepository;
+use crmeb\traits\CurdControllerTrait;
+use think\facade\Route as Url;
+use crmeb\basic\BaseModel;
+use app\models\user\UserLevel as Level;
+use app\admin\model\order\StoreOrder;
+use app\admin\model\wechat\WechatMessage;
+use app\admin\model\store\{StoreVisit, StoreCouponUser};
+use app\admin\model\system\{SystemUserLevel, SystemUserTask};
+use crmeb\services\{FormBuilder as Form, UtilService as Util, JsonService as Json};
+use app\admin\model\user\{User as UserModel, UserBill as UserBillAdmin, UserBill, UserLevel, UserGroup, UserTaskFinish};
+
+/**
+ * 用户管理控制器
+ * Class User
+ * @package app\admin\controller\user
+ */
+class Examine extends AuthController
+{
+
+    /**
+     * 显示资源列表
+     *
+     * @return \think\Response
+     */
+    public function index()
+    {
+        $this->assign('role', $this->adminInfo['roles']);
+        return $this->fetch();
+    }
+
+
+    public function list()
+    {
+        $where = Util::getMore([
+            ['status', ''],
+            ['page', 1],
+            ['limit', 20],
+            ['name', '']
+        ]);
+
+        return Json::successlayui(\app\admin\model\user\Examine::list($where));
+    }
+
+    /**
+     * 用户增加审核
+     * @param $id
+     * @return void
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    public function tg($id)
+    {
+        $examine = \app\admin\model\user\Examine::where('id', $id)->find();
+        if (!$examine) return Json::fail('记录不存在');
+        if ($examine['status'] != 0) return Json::fail('记录状态不正确');
+        $user = \app\admin\model\user\User::where('uid', $examine['uid'])->find();
+        if (!$user) return Json::fail('增加用户不存在');
+        $examine['examine_id'] = $this->adminId;
+        $examine['status'] = 1;
+        if ($examine['pm'] == 1){
+            if ($examine['type'] == 1){
+                $edit = bcadd($user['now_money'], $examine['price'], 2);
+                $res1 = \app\admin\model\user\User::where('uid', $examine['uid'])->inc('now_money', $examine['price'])->update();
+                $res2 = UserBillAdmin::income('系统增加余额', $user['uid'], 'now_money', 'system_add', $examine['price'], $this->adminId, $edit, '系统增加了' . floatval($examine['price']) . '余额');
+            }elseif ($examine['type'] == 2){
+                $edit = bcadd($user['integral'], $examine['price'], 2);
+                $res1 = \app\admin\model\user\User::where('uid', $examine['uid'])->inc('integral', $examine['price'])->update();
+                $res2 = UserBillAdmin::income('系统增加积分', $user['uid'], 'integral', 'system_add', $examine['price'], $this->adminId, $edit, '系统增加了' . floatval($examine['price']) . '积分');
+            }elseif ($examine['type'] == 3){
+                $edit = bcadd($user['consumption'], $examine['price'], 2);
+                $res1 = \app\admin\model\user\User::where('uid', $examine['uid'])->inc('consumption', $examine['price'])->update();
+                $res2 = UserBillAdmin::income('系统增加积分', $user['uid'], 'consumption', 'system_add_consumption', $examine['price'], $this->adminId, $edit, '系统增加了' . floatval($examine['price']) . '消费券');
+            }
+        }elseif ($examine['pm'] == 0){
+            if ($examine['type'] == 1){
+                $edit = bcsub($user['now_money'], $examine['price'], 2);
+                $res1 = \app\admin\model\user\User::where('uid', $examine['uid'])->dec('now_money', $examine['price'])->update();
+                $res2 = UserBillAdmin::expend('系统减少消费券', $user['uid'], 'now_money', 'system_sub', $examine['price'], $this->adminId, $edit, '系统扣除了' . floatval($examine['price']) . '余额');
+            }elseif ($examine['type'] == 2){
+                $edit = bcsub($user['integral'], $examine['price'], 2);
+                $res1 = \app\admin\model\user\User::where('uid', $examine['uid'])->dec('integral', $examine['price'])->update();
+                $res2 = UserBillAdmin::expend('系统减少消费券', $user['uid'], 'integral', 'system_sub', $examine['price'], $this->adminId, $edit, '系统扣除了' . floatval($examine['price']) . '积分');
+            }elseif ($examine['type'] == 3){
+                $edit = bcsub($user['consumption'], $examine['price'], 2);
+                $res1 = \app\admin\model\user\User::where('uid', $examine['uid'])->dec('consumption', $examine['price'])->update();
+                $res2 = UserBillAdmin::expend('系统减少消费券', $user['uid'], 'consumption', 'system_sub_consumption', $examine['price'], $this->adminId, $edit, '系统扣除了' . floatval($examine['price']) . '消费券');
+            }
+        }
+        $res = $res1 && $res2 && $examine->save();
+        BaseModel::checkTrans($res);
+        if ($res) return Json::successful('提交成功!');
+        else return Json::fail('提交失败');
+    }
+}

app/admin/controller/user/User.php

@@ -146,80 +146,122 @@ class User extends AuthController
         $edit = array();
         if ($data['money_status'] && $data['money']) {//余额增加或者减少
             if ($data['money_status'] == 1) {//增加
-                $edit['now_money'] = bcadd($user['now_money'], $data['money'], 2);
-                $res1 = UserBillAdmin::income('系统增加余额', $user['uid'], 'now_money', 'system_add', $data['money'], $this->adminId, $edit['now_money'], '系统增加了' . floatval($data['money']) . '余额');
-                try {
-                    UserRepository::adminAddMoney($user, $data['money']);
-                } catch (\Exception $e) {
-                    BaseModel::rollbackTrans();
-                    return Json::fail($e->getMessage());
-                }
+                $res = \app\admin\model\user\Examine::create([
+                        'uid' => $uid,
+                        'admin_id' => $this->adminId,
+                        'price' => $data['money'],
+                        'type' => 1,
+                        'pm' => 1
+                    ]);
+//                $edit['now_money'] = bcadd($user['now_money'], $data['money'], 2);
+//                $res1 = UserBillAdmin::income('系统增加余额', $user['uid'], 'now_money', 'system_add', $data['money'], $this->adminId, $edit['now_money'], '系统增加了' . floatval($data['money']) . '余额');
+//                try {
+//                    UserRepository::adminAddMoney($user, $data['money']);
+//                } catch (\Exception $e) {
+//                    BaseModel::rollbackTrans();
+//                    return Json::fail($e->getMessage());
+//                }
             } else if ($data['money_status'] == 2) {//减少
-                $edit['now_money'] = bcsub($user['now_money'], $data['money'], 2);
-                $res1 = UserBillAdmin::expend('系统减少余额', $user['uid'], 'now_money', 'system_sub', $data['money'], $this->adminId, $edit['now_money'], '系统扣除了' . floatval($data['money']) . '余额');
-                try {
-                    UserRepository::adminSubMoney($user, $data['money']);
-                } catch (\Exception $e) {
-                    BaseModel::rollbackTrans();
-                    return Json::fail($e->getMessage());
-                }
+                $res = \app\admin\model\user\Examine::create([
+                    'uid' => $uid,
+                    'admin_id' => $this->adminId,
+                    'price' => $data['money'],
+                    'type' => 1,
+                    'pm' => 0
+                ]);
+//                $edit['now_money'] = bcsub($user['now_money'], $data['money'], 2);
+//                $res1 = UserBillAdmin::expend('系统减少余额', $user['uid'], 'now_money', 'system_sub', $data['money'], $this->adminId, $edit['now_money'], '系统扣除了' . floatval($data['money']) . '余额');
+//                try {
+//                    UserRepository::adminSubMoney($user, $data['money']);
+//                } catch (\Exception $e) {
+//                    BaseModel::rollbackTrans();
+//                    return Json::fail($e->getMessage());
+//                }
             }
         } else {
             $res1 = true;
         }
         if ($data['integration_status'] && $data['integration']) {//积分增加或者减少
             if ($data['integration_status'] == 1) {//增加
-                $edit['integral'] = bcadd($user['integral'], $data['integration'], 2);
-                $res2 = UserBillAdmin::income('系统增加积分', $user['uid'], 'integral', 'system_add', $data['integration'], $this->adminId, $edit['integral'], '系统增加了' . floatval($data['integration']) . '积分');
-                try {
-                    UserRepository::adminAddIntegral($user, $data['integration']);
-                } catch (\Exception $e) {
-                    BaseModel::rollbackTrans();
-                    return Json::fail($e->getMessage());
-                }
+                $res = \app\admin\model\user\Examine::create([
+                    'uid' => $uid,
+                    'admin_id' => $this->adminId,
+                    'price' => $data['integration'],
+                    'type' => 2,
+                    'pm' => 1
+                ]);
+//                $edit['integral'] = bcadd($user['integral'], $data['integration'], 2);
+//                $res2 = UserBillAdmin::income('系统增加积分', $user['uid'], 'integral', 'system_add', $data['integration'], $this->adminId, $edit['integral'], '系统增加了' . floatval($data['integration']) . '积分');
+//                try {
+//                    UserRepository::adminAddIntegral($user, $data['integration']);
+//                } catch (\Exception $e) {
+//                    BaseModel::rollbackTrans();
+//                    return Json::fail($e->getMessage());
+//                }
             } else if ($data['integration_status'] == 2) {//减少
-                $edit['integral'] = bcsub($user['integral'], $data['integration'], 2);
-                $res2 = UserBillAdmin::expend('系统减少积分', $user['uid'], 'integral', 'system_sub', $data['integration'], $this->adminId, $edit['integral'], '系统扣除了' . floatval($data['integration']) . '积分');
-                try {
-                    UserRepository::adminSubIntegral($user, $data['integration']);
-                } catch (\Exception $e) {
-                    BaseModel::rollbackTrans();
-                    return Json::fail($e->getMessage());
-                }
+                $res = \app\admin\model\user\Examine::create([
+                    'uid' => $uid,
+                    'admin_id' => $this->adminId,
+                    'price' => $data['integration'],
+                    'type' => 2,
+                    'pm' => 0
+                ]);
+//                $edit['integral'] = bcsub($user['integral'], $data['integration'], 2);
+//                $res2 = UserBillAdmin::expend('系统减少积分', $user['uid'], 'integral', 'system_sub', $data['integration'], $this->adminId, $edit['integral'], '系统扣除了' . floatval($data['integration']) . '积分');
+//                try {
+//                    UserRepository::adminSubIntegral($user, $data['integration']);
+//                } catch (\Exception $e) {
+//                    BaseModel::rollbackTrans();
+//                    return Json::fail($e->getMessage());
+//                }
             }
         } else {
             $res2 = true;
         }
         if ($data['consumption_status'] && $data['consumption']) {//积分增加或者减少
             if ($data['consumption_status'] == 1) {//增加
-                $edit['consumption'] = bcadd($user['consumption'], $data['consumption'], 2);
-                $res2 = UserBillAdmin::income('系统增加消费券', $user['uid'], 'consumption', 'system_add_consumption', $data['consumption'], $this->adminId, $edit['consumption'], '系统增加了' . floatval($data['consumption']) . '消费券');
-                try {
-                    UserRepository::adminAddIntegral($user, $data['integration']);
-                } catch (\Exception $e) {
-                    BaseModel::rollbackTrans();
-                    return Json::fail($e->getMessage());
-                }
+                $res = \app\admin\model\user\Examine::create([
+                    'uid' => $uid,
+                    'admin_id' => $this->adminId,
+                    'price' => $data['consumption'],
+                    'type' => 3,
+                    'pm' => 1
+                ]);
+//                $edit['consumption'] = bcadd($user['consumption'], $data['consumption'], 2);
+//                $res2 = UserBillAdmin::income('系统增加消费券', $user['uid'], 'consumption', 'system_add_consumption', $data['consumption'], $this->adminId, $edit['consumption'], '系统增加了' . floatval($data['consumption']) . '消费券');
+//                try {
+//                    UserRepository::adminAddIntegral($user, $data['integration']);
+//                } catch (\Exception $e) {
+//                    BaseModel::rollbackTrans();
+//                    return Json::fail($e->getMessage());
+//                }
             } else if ($data['consumption_status'] == 2) {//减少
-                $edit['consumption'] = bcsub($user['consumption'], $data['consumption'], 2);
-                $res2 = UserBillAdmin::expend('系统减少消费券', $user['uid'], 'consumption', 'system_sub_consumption', $data['consumption'], $this->adminId, $edit['consumption'], '系统扣除了' . floatval($data['consumption']) . '消费券');
-                try {
-                    UserRepository::adminSubIntegral($user, $data['integration']);
-                } catch (\Exception $e) {
-                    BaseModel::rollbackTrans();
-                    return Json::fail($e->getMessage());
-                }
+                $res = \app\admin\model\user\Examine::create([
+                    'uid' => $uid,
+                    'admin_id' => $this->adminId,
+                    'price' => $data['consumption'],
+                    'type' => 3,
+                    'pm' => 0
+                ]);
+//                $edit['consumption'] = bcsub($user['consumption'], $data['consumption'], 2);
+//                $res2 = UserBillAdmin::expend('系统减少消费券', $user['uid'], 'consumption', 'system_sub_consumption', $data['consumption'], $this->adminId, $edit['consumption'], '系统扣除了' . floatval($data['consumption']) . '消费券');
+//                try {
+//                    UserRepository::adminSubIntegral($user, $data['integration']);
+//                } catch (\Exception $e) {
+//                    BaseModel::rollbackTrans();
+//                    return Json::fail($e->getMessage());
+//                }
             }
         } else {
-            $res2 = true;
+            $res2 = false;
         }
-        if ($edit) $res3 = UserModel::edit($edit, $uid);
-        else $res3 = true;
-        if ($res1 && $res2 && $res3) $res = true;
-        else $res = false;
-        BaseModel::checkTrans($res);
-        if ($res) return Json::successful('修改成功!');
-        else return Json::fail('修改失败');
+//        if ($edit) $res3 = UserModel::edit($edit, $uid);
+//        else $res3 = true;
+//        if ($res1 && $res2 && $res3) $res = true;
+//        else $res = false;
+//        BaseModel::checkTrans($res);
+        if ($res) return Json::successful('提交成功!');
+        else return Json::fail('提交失败');
     }
 
     /*

app/admin/model/order/StoreOrder.php

@@ -215,6 +215,18 @@ HTML;
             } else if ($item['paid'] == 1 && $item['refund_status'] == 2) {
                 $item['_status'] = 7;
             }
+            $reviewed = explode(',', $item['reviewed']);
+            $item['reviewed_name'] = '采购部审核:'.$reviewed[0].'<br/>';
+            if (isset($reviewed[1])){
+                $item['reviewed_name'] .= '技术部审核:'.$reviewed[1].'<br/>';
+            }else{
+                $item['reviewed_name'] .= '技术部审核:<br/>';
+            }
+            if (isset($reviewed[2])){
+                $item['reviewed_name'] .= '会计审核:'.$reviewed[2].'<br/>';
+            }else{
+                $item['reviewed_name'] .= '会计审核:<br/>';
+            }
         }
         if (isset($where['excel']) && $where['excel'] == 1) {
             self::SaveExcel($data);
@@ -483,6 +495,21 @@ HTML;
         if (isset($where['status']) && $where['status'] != '') {
             $model = self::statusByWhere($where['status'], $model, $aler);
         }
+        if (isset($where['paid'])){
+            if ($where['paid']) $model = $model->where('paid', 1);
+        }
+        if (isset($where['is_examine'])){
+            if ($where['is_examine'] >= 0)$model = $model->where('is_examine', '>=', $where['is_examine']);
+        }
+        if (isset($where['examine_status'])){
+            if ($where['examine_status'] == 1){
+                $model = $model->where('examine_status', 0);
+            }elseif ($where['examine_status'] == 2){
+                $model = $model->where('examine_status', 1);
+            }elseif ($where['examine_status'] == -1){
+                $model = $model->where('examine_status', -1);
+            }
+        }
         if (isset($where['is_del']) && $where['is_del'] != '' && $where['is_del'] != -1) $model = $model->where($aler . 'is_del', $where['is_del']);
         if (isset($where['combination_id'])) {
             if ($where['combination_id'] == '普通订单') {

app/admin/model/user/Examine.php

@@ -0,0 +1,51 @@
+<?php
+namespace app\admin\model\user;
+
+use crmeb\traits\ModelTrait;
+use crmeb\basic\BaseModel;
+use think\facade\Db;
+
+/**
+ * 用户消费新增金额明细 model
+ * Class User
+ * @package app\admin\model\user
+ */
+class Examine extends BaseModel
+{
+    /**
+     * 数据表主键
+     * @var string
+     */
+    protected $pk = 'id';
+
+    /**
+     * 模型名称
+     * @var string
+     */
+    protected $name = 'examine';
+    protected $autoWriteTimestamp = true;
+    use ModelTrait;
+
+    public static function list($where)
+    {
+        $model = self::field('a.*,u.phone,b.real_name,c.real_name as cw_name')
+            ->alias('a')
+            ->leftJoin('system_admin b', 'a.admin_id = b.id')
+            ->leftJoin('system_admin c', 'a.examine_id = c.id')
+            ->leftJoin('user u', 'a.uid = u.uid')
+            ->order('a.id DESC');
+
+        if ($where['name'])$model->where('name' , 'like', '%'.$where['name'],'%');
+        if ($where['status'])$model->where('status' , '=', $where['status']);
+        $data['count'] = $model->count();
+        if ($where['page'] && $where['limit']){
+            $model->page($where['page'], $where['limit']);
+        }else{
+            $model->page(20, 1);
+        }
+        $list = $model->select()->toArray();
+        $data['data'] = $list;
+        return $data;
+
+    }
+}

app/admin/model/user/UserExtract.php

@@ -74,6 +74,7 @@ class UserExtract extends BaseModel
         if ($where['status'] != '') $model = $model->where('a.status', $where['status']);
         if ($where['extract_type'] != '') $model = $model->where('a.extract_type', $where['extract_type']);
         if ($where['nireid'] != '') $model = $model->where('a.real_name|a.id|b.nickname|a.bank_code|a.alipay_code', 'like', "%$where[nireid]%");
+        if ($where['is_examine'] >= 0) $model = $model->where('is_examine', '>=',$where['is_examine']);
         $model = $model->alias('a');
         $model = $model->field('a.*,b.nickname');
         $model = $model->join('user b', 'b.uid=a.uid', 'LEFT');

app/admin/view/finance/finance/bill.php

@@ -143,6 +143,7 @@
             {field: 'uid', title: '会员ID', sort: true,event:'uid',align:"center",width:"10%"},
             {field: 'nickname', title: '昵称' ,align:"center",width:"16%"},
             {field: 'number', title: '金额',sort:true,templet:'#number',align:"center",width:"10%"},
+            {field: 'balance', title: '剩余',sort:true,templet:'#balance',align:"center",width:"10%"},
             {field: 'title', title: '类型',align:"center",width:"10%"},
             {field: 'mark', title: '备注',align:"center"},
             {field: 'add_time', title: '创建时间',align:"center",width:"16%"},

app/admin/view/finance/user_extract/caiwu_index.php

@@ -0,0 +1,327 @@
+{extend name="public/container"}
+{block name="head_top"}
+<link rel="stylesheet" href="{__PLUG_PATH}daterangepicker/daterangepicker.css">
+<script src="{__PLUG_PATH}moment.js"></script>
+<script src="{__PLUG_PATH}daterangepicker/daterangepicker.js"></script>
+{/block}
+{block name="content"}
+<div class="row">
+    <div class="col-sm-12">
+        <div class="ibox">
+            <div class="ibox-content">
+                <div class="row">
+                    <div class="m-b m-l">
+                        <form action="" class="form-inline" id="dataFrom">
+                            <div class="search-item" data-name="date">
+                                <span>选择时间：</span>
+                                <button type="button" class="btn btn-outline btn-link" data-value="">全部</button>
+                                <button type="button" class="btn btn-outline btn-link" data-value="{$limitTimeList.today}">今天</button>
+                                <button type="button" class="btn btn-outline btn-link" data-value="{$limitTimeList.week}">本周</button>
+                                <button type="button" class="btn btn-outline btn-link" data-value="{$limitTimeList.month}">本月</button>
+                                <button type="button" class="btn btn-outline btn-link" data-value="{$limitTimeList.quarter}">本季度</button>
+                                <button type="button" class="btn btn-outline btn-link" data-value="{$limitTimeList.year}">本年</button>
+                                <div class="datepicker" style="display: inline-block;">
+                                    <button type="button" class="btn btn-outline btn-link" data-value="{$where.date?:'no'}">自定义时间</button>
+                                </div>
+                                <input class="search-item-value" type="hidden" name="date" value="{$where.date}" />
+                            </div>
+                            <select name="status" aria-controls="editable" class="form-control input-sm">
+                                <option value="">提现状态</option>
+                                <option value="-1" {eq name="where.status" value="-1"}selected="selected"{/eq}>未通过</option>
+                                <option value="0" {eq name="where.status" value="0"}selected="selected"{/eq}>未提现</option>
+                                <option value="1" {eq name="where.status" value="1"}selected="selected"{/eq}>已通过</option>
+                            </select>
+                            <select name="extract_type"  class="form-control input-sm">
+                                <option value="">提现方式</option>
+                                <option value="alipay" {eq name="where.extract_type" value="alipay" }selected="selected"{/eq}>支付宝</option>
+                                <option value="bank" {eq name="where.extract_type" value="bank"}selected="selected"{/eq}>银行卡</option>
+                                <option value="weixin" {eq name="where.extract_type" value="weixin"}selected="selected"{/eq}>微信</option>
+                            </select>
+                            <div class="input-group">
+                                  <span class="input-group-btn">
+                                      <input type="text" name="nireid" value="{$where.nireid}" placeholder="微信昵称/姓名/支付宝账号/银行卡号" class="input-sm form-control" size="38"/>
+                                      <button type="submit" class="btn btn-sm btn-primary"> 搜索</button>
+                                  </span>
+                            </div>
+                            <button type="button" id="excel" class="btn btn-sm btn-primary"> 导出</button>
+                        </form>
+                    </div>
+<!--                    <div class="col-sm-3 ui-sortable">-->
+<!--                        <div class="ibox float-e-margins">-->
+<!--                            <div class="ibox-title">-->
+<!--                                <span class="label label-success pull-right">￥</span>-->
+<!--                                <h5>已提现金额</h5>-->
+<!--                            </div>-->
+<!--                            <div class="ibox-content">-->
+<!--                                <h1 class="no-margins">{$data.priced}</h1>-->
+<!--                            </div>-->
+<!--                        </div>-->
+<!--                    </div>-->
+<!--                    <div class="col-sm-3 ui-sortable">-->
+<!--                        <div class="ibox float-e-margins">-->
+<!--                            <div class="ibox-title">-->
+<!--                                <span class="label label-danger pull-right">急</span>-->
+<!--                                <h5>待提现金额</h5>-->
+<!--                            </div>-->
+<!--                            <div class="ibox-content">-->
+<!--                                <h1 class="no-margins">{$data.price}</h1>-->
+<!--                            </div>-->
+<!--                        </div>-->
+<!--                    </div>-->
+<!--                    <div class="col-sm-3 ui-sortable">-->
+<!--                        <div class="ibox float-e-margins">-->
+<!--                            <div class="ibox-title">-->
+<!--                                <span class="label label-success pull-right">待</span>-->
+<!--                                <h5>佣金总金额</h5>-->
+<!--                            </div>-->
+<!--                            <div class="ibox-content">-->
+<!--                                <h1 class="no-margins">{$data.brokerage_count}</h1>-->
+<!--                            </div>-->
+<!--                        </div>-->
+<!--                    </div>-->
+<!--                    <div class="col-sm-3 ui-sortable">-->
+<!--                        <div class="ibox float-e-margins">-->
+<!--                            <div class="ibox-title">-->
+<!--                                <span class="label label-success pull-right">待</span>-->
+<!--                                <h5>未提现金额</h5>-->
+<!--                            </div>-->
+<!--                            <div class="ibox-content">-->
+<!--                                <h1 class="no-margins">{$data.brokerage_not}</h1>-->
+<!--                            </div>-->
+<!--                        </div>-->
+<!--                    </div>-->
+<!--                </div>-->
+                <div class="table-responsive">
+                    <table class="table table-striped  table-bordered">
+                        <thead>
+                        <tr>
+                            <th class="text-center">编号</th>
+                            <th class="text-center">用户信息</th>
+                            <th class="text-center">提现金额</th>
+                            <th class="text-center">提现方式</th>
+                            <th class="text-center">添加时间</th>
+                            <th class="text-center">备注</th>
+                            <th class="text-center">审核状态</th>
+                            <th class="text-center">审核进度</th>
+                            <th class="text-center">审核人</th>
+                            <th class="text-center">操作</th>
+                        </tr>
+                        </thead>
+                        <tbody class="">
+                        {volist name="list" id="vo"}
+                        <tr>
+                            <td class="text-center">
+                                {$vo.id}
+                            </td>
+                            <td class="text-center">
+                                用户昵称: {$vo.nickname}/用户id:{$vo.uid}
+                            </td>
+                            <td class="text-center" style="color: #00aa00;">
+                                {$vo.extract_price}
+                            </td>
+                            <td class="text-left">
+                                {if condition="$vo['extract_type'] eq 'bank'"}
+                                姓名：{$vo.real_name}<br>
+                                银行卡号：{$vo.bank_code}
+                                <br/>
+                                银行开户地址:{$vo.bank_address}
+                                所属支行名称:{$vo.bank_belonging}
+                                {elseif condition="$vo['extract_type'] eq 'weixin'"/}
+                                昵称：{$vo.nickname}<br>
+                                微信号：{$vo.wechat}
+                                {else/}
+                                姓名：{$vo.real_name}<br>
+                                支付宝号：{$vo.alipay_code}
+                                {/if}
+                            </td>
+                            <td class="text-center">
+                                {$vo.add_time|date='Y-m-d H:i:s'}
+                            </td>
+                            <td class="text-center">
+                                {$vo.mark}
+                            </td>
+                            <td class="text-center">
+                                {if condition="$vo['status'] eq 1"}
+                                提现通过<br/>
+                                {elseif condition="$vo['status'] eq -1"/}
+                                提现未通过<br/>
+                                未通过原因：{$vo.fail_msg}
+                                <br>
+                                未通过时间：{$vo.fail_time|date='Y-m-d H:i:s'}
+                                {else/}
+                                未提现<br/>
+                                {if condition="$vo['examine_status'] eq 0 && $vo['examine_status'] eq 2"}
+                                <button data-url="{:url('fail',['id'=>$vo['id']])}" class="j-fail btn btn-danger btn-xs" type="button"><i class="fa fa-close"></i> 无效</button>
+                                {/if}
+                                {if condition="$vo['examine_status'] eq 1"}
+                                <button data-url="{:url('succ',['id'=>$vo['id']])}" class="j-success btn btn-primary btn-xs" type="button"><i class="fa fa-check"></i> 通过</button>
+                                {/if}
+                                {/if}
+                            </td>
+                            <td class="text-center">
+                                {if condition="$vo['examine_status'] eq 0"}
+                                {if condition="$vo['is_examine'] eq 0"}
+                                市场部审核<br/>
+                                {elseif condition="$vo['is_examine'] eq 1"/}
+                                技术部审核<br/>
+                                {else/}
+                                会计审核<br/>
+                                {/if}
+                                {else/}
+                                已审核通过<br/>
+                                {/if}
+
+                            </td>
+                            <td class="text-center">
+                                {$vo.reviewed}
+                            </td>
+                            <td class="text-center">
+                                {if condition="$vo['is_examine'] eq 2"}
+                                <button data-url="{:url('examine',['id'=>$vo['id']])}" class="j-success btn btn-primary btn-xs" type="button"><i class="fa fa-check"></i> 审核通过</button>
+                                {/if}
+                                <!--                                <button class="btn btn-info btn-xs" type="button"  onclick="$eb.createModalFrame('编辑','{:Url('edit',array('id'=>$vo['id']))}')"><i class="fa fa-edit"></i> 编辑</button>-->
+                            </td>
+                        </tr>
+                        {/volist}
+                        </tbody>
+                    </table>
+                </div>
+                {include file="public/inner_page"}
+            </div>
+        </div>
+    </div>
+</div>
+{/block}
+{block name="script"}
+<script>
+    $(function init() {
+        $('.search-item>.btn').on('click', function () {
+            var that = $(this), value = that.data('value'), p = that.parent(), name = p.data('name'), form = p.parents();
+            form.find('input[name="' + name + '"]').val(value);
+            $('input[name=export]').val(0);
+            form.submit();
+        });
+        $('.tag-item>.btn').on('click', function () {
+            var that = $(this), value = that.data('value'), p = that.parent(), name = p.data('name'), form = p.parents(),list = $('input[name="' + name + '"]').val().split(',');
+            var bool = 0;
+            $.each(list,function (index,item) {
+                if(item == value){
+                    bool = 1
+                    list.splice(index,1);
+                }
+            })
+            if(!bool) list.push(''+value+'');
+            form.find('input[name="' + name + '"]').val(list.join(','));
+            $('input[name=export]').val(0);
+            form.submit();
+        });
+        $('.search-item>li').on('click', function () {
+            var that = $(this), value = that.data('value'), p = that.parent(), name = p.data('name'), form = $('#form');
+            form.find('input[name="' + name + '"]').val(value);
+            $('input[name=export]').val(0);
+            form.submit();
+        });
+        $('.search-item>li').each(function () {
+            var that = $(this), value = that.data('value'), p = that.parent(), name = p.data('name');
+            if($where[name]) $('.'+name).css('color','#1ab394');
+        });
+        $('.search-item-value').each(function () {
+            var that = $(this), name = that.attr('name'), value = that.val(), dom = $('.search-item[data-name="' + name + '"] .btn[data-value="' + value + '"]');
+            dom.eq(0).removeClass('btn-outline btn-link').addClass('btn-primary btn-sm')
+                .siblings().addClass('btn-outline btn-link').removeClass('btn-primary btn-sm')
+        });
+    })
+    $('.j-fail').on('click',function(){
+        var url = $(this).data('url');
+        $eb.$alert('textarea',{
+            title:'请输入未通过原因',
+            value:'输入信息不完整或有误!',
+        },function(value){
+            $eb.axios.post(url,{message:value}).then(function(res){
+                if(res.data.code == 200) {
+                    $eb.$swal('success', res.data.msg);
+                    setTimeout(function () {
+                        window.location.reload();
+                    },1000);
+                }else
+                    $eb.$swal('error',res.data.msg||'操作失败!');
+            });
+        });
+    });
+
+    $('#excel').on('click',function(){
+
+        var data = $('#dataFrom').serializeArray();
+        var url = '{:url('excel')}?date='+data[0].value+'&status='+data[1].value+'&extract_type='+data[2].value+'&nireid='+data[3].value;
+        window.location.replace(url);
+    });
+    $('.j-success').on('click',function(){
+        var url = $(this).data('url');
+        $eb.$swal('delete',function(){
+            $eb.axios.post(url).then(function(res){
+                if(res.data.code == 200) {
+                    setTimeout(function () {
+                        window.location.reload();
+                    },1000);
+                    $eb.$swal('success', res.data.msg);
+                }else
+                    $eb.$swal('error',res.data.msg||'操作失败!');
+            });
+        },{
+            title:'确定审核通过?',
+            text:'通过后无法撤销，请谨慎操作！',
+            confirm:'审核通过'
+        });
+    });
+    $('.btn-warning').on('click',function(){
+        window.t = $(this);
+        var _this = $(this),url =_this.data('url');
+        $eb.$swal('delete',function(){
+            $eb.axios.get(url).then(function(res){
+                if(res.status == 200 && res.data.code == 200) {
+                    $eb.$swal('success',res.data.msg);
+                    _this.parents('tr').remove();
+                }else
+                    return Promise.reject(res.data.msg || '删除失败')
+            }).catch(function(err){
+                $eb.$swal('error',err);
+            });
+        })
+    });
+    $(".open_image").on('click',function (e) {
+        var image = $(this).data('image');
+        $eb.openImage(image);
+    })
+    var dateInput = $('.datepicker');
+    dateInput.daterangepicker({
+        autoUpdateInput: false,
+        "opens": "center",
+        "drops": "down",
+        "ranges": {
+            '今天': [moment(), moment().add(1, 'days')],
+            '昨天': [moment().subtract(1, 'days'), moment()],
+            '上周': [moment().subtract(6, 'days'), moment()],
+            '前30天': [moment().subtract(29, 'days'), moment()],
+            '本月': [moment().startOf('month'), moment().endOf('month')],
+            '上月': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')]
+        },
+        "locale" : {
+            applyLabel : '确定',
+            cancelLabel : '取消',
+            fromLabel : '起始时间',
+            toLabel : '结束时间',
+            format : 'YYYY/MM/DD',
+            customRangeLabel : '自定义',
+            daysOfWeek : [ '日', '一', '二', '三', '四', '五', '六' ],
+            monthNames : [ '一月', '二月', '三月', '四月', '五月', '六月',
+                '七月', '八月', '九月', '十月', '十一月', '十二月' ],
+            firstDay : 1
+        }
+    });
+    dateInput.on('apply.daterangepicker', function(ev, picker) {
+        $("input[name=date]").val(picker.startDate.format('YYYY/MM/DD') + ' - ' + picker.endDate.format('YYYY/MM/DD'));
+        $('form').submit();
+    });
+</script>
+{/block}
+

app/admin/view/finance/user_extract/index.php

@@ -102,6 +102,8 @@
                                 <th class="text-center">添加时间</th>
                                 <th class="text-center">备注</th>
                                 <th class="text-center">审核状态</th>
+                                <th class="text-center">审核进度</th>
+                                <th class="text-center">审核人</th>
                                 <th class="text-center">操作</th>
                             </tr>
                         </thead>
@@ -148,11 +150,35 @@
                                 未通过时间：{$vo.fail_time|date='Y-m-d H:i:s'}
                                 {else/}
                                 未提现<br/>
-                                <button data-url="{:url('fail',['id'=>$vo['id']])}" class="j-fail btn btn-danger btn-xs" type="button"><i class="fa fa-close"></i> 无效</button>
-                                <button data-url="{:url('succ',['id'=>$vo['id']])}" class="j-success btn btn-primary btn-xs" type="button"><i class="fa fa-check"></i> 通过</button>
+                                    {if condition="$vo['examine_status'] eq 0"}
+                                    <button data-url="{:url('fail',['id'=>$vo['id']])}" class="j-fail btn btn-danger btn-xs" type="button"><i class="fa fa-close"></i> 无效</button>
+                                    {/if}
+                                    {if condition="$vo['examine_status'] eq 1"}
+                                    <button data-url="{:url('succ',['id'=>$vo['id']])}" class="j-success btn btn-primary btn-xs" type="button"><i class="fa fa-check"></i> 通过</button>
+                                    {/if}
                                 {/if}
                             </td>
                             <td class="text-center">
+                                {if condition="$vo['examine_status'] eq 0"}
+                                    {if condition="$vo['is_examine'] eq 0"}
+                                    市场部审核<br/>
+                                    {elseif condition="$vo['is_examine'] eq 1"/}
+                                    技术部审核<br/>
+                                    {else/}
+                                    会计审核<br/>
+                                    {/if}
+                                {else/}
+                                    已审核通过<br/>
+                                {/if}
+
+                            </td>
+                            <td class="text-center">
+                                {$vo.reviewed}
+                            </td>
+                            <td class="text-center">
+                                {if condition="$roles eq 3 or $roles eq 5 or $roles eq 6"}
+                                <button data-url="{:url('examine',['id'=>$vo['id']])}" class="j-success btn btn-primary btn-xs" type="button"><i class="fa fa-check"></i> 审核通过</button>
+                                {/if}
                                 <button class="btn btn-info btn-xs" type="button"  onclick="$eb.createModalFrame('编辑','{:Url('edit',array('id'=>$vo['id']))}')"><i class="fa fa-edit"></i> 编辑</button>
                             </td>
                         </tr>

app/admin/view/finance/user_extract/jishu_index.php

@@ -0,0 +1,327 @@
+{extend name="public/container"}
+{block name="head_top"}
+<link rel="stylesheet" href="{__PLUG_PATH}daterangepicker/daterangepicker.css">
+<script src="{__PLUG_PATH}moment.js"></script>
+<script src="{__PLUG_PATH}daterangepicker/daterangepicker.js"></script>
+{/block}
+{block name="content"}
+<div class="row">
+    <div class="col-sm-12">
+        <div class="ibox">
+            <div class="ibox-content">
+                <div class="row">
+                    <div class="m-b m-l">
+                        <form action="" class="form-inline" id="dataFrom">
+                            <div class="search-item" data-name="date">
+                                <span>选择时间：</span>
+                                <button type="button" class="btn btn-outline btn-link" data-value="">全部</button>
+                                <button type="button" class="btn btn-outline btn-link" data-value="{$limitTimeList.today}">今天</button>
+                                <button type="button" class="btn btn-outline btn-link" data-value="{$limitTimeList.week}">本周</button>
+                                <button type="button" class="btn btn-outline btn-link" data-value="{$limitTimeList.month}">本月</button>
+                                <button type="button" class="btn btn-outline btn-link" data-value="{$limitTimeList.quarter}">本季度</button>
+                                <button type="button" class="btn btn-outline btn-link" data-value="{$limitTimeList.year}">本年</button>
+                                <div class="datepicker" style="display: inline-block;">
+                                    <button type="button" class="btn btn-outline btn-link" data-value="{$where.date?:'no'}">自定义时间</button>
+                                </div>
+                                <input class="search-item-value" type="hidden" name="date" value="{$where.date}" />
+                            </div>
+                            <select name="status" aria-controls="editable" class="form-control input-sm">
+                                <option value="">提现状态</option>
+                                <option value="-1" {eq name="where.status" value="-1"}selected="selected"{/eq}>未通过</option>
+                                <option value="0" {eq name="where.status" value="0"}selected="selected"{/eq}>未提现</option>
+                                <option value="1" {eq name="where.status" value="1"}selected="selected"{/eq}>已通过</option>
+                            </select>
+                            <select name="extract_type"  class="form-control input-sm">
+                                <option value="">提现方式</option>
+                                <option value="alipay" {eq name="where.extract_type" value="alipay" }selected="selected"{/eq}>支付宝</option>
+                                <option value="bank" {eq name="where.extract_type" value="bank"}selected="selected"{/eq}>银行卡</option>
+                                <option value="weixin" {eq name="where.extract_type" value="weixin"}selected="selected"{/eq}>微信</option>
+                            </select>
+                            <div class="input-group">
+                                  <span class="input-group-btn">
+                                      <input type="text" name="nireid" value="{$where.nireid}" placeholder="微信昵称/姓名/支付宝账号/银行卡号" class="input-sm form-control" size="38"/>
+                                      <button type="submit" class="btn btn-sm btn-primary"> 搜索</button>
+                                  </span>
+                            </div>
+                            <button type="button" id="excel" class="btn btn-sm btn-primary"> 导出</button>
+                        </form>
+                    </div>
+<!--                    <div class="col-sm-3 ui-sortable">-->
+<!--                        <div class="ibox float-e-margins">-->
+<!--                            <div class="ibox-title">-->
+<!--                                <span class="label label-success pull-right">￥</span>-->
+<!--                                <h5>已提现金额</h5>-->
+<!--                            </div>-->
+<!--                            <div class="ibox-content">-->
+<!--                                <h1 class="no-margins">{$data.priced}</h1>-->
+<!--                            </div>-->
+<!--                        </div>-->
+<!--                    </div>-->
+<!--                    <div class="col-sm-3 ui-sortable">-->
+<!--                        <div class="ibox float-e-margins">-->
+<!--                            <div class="ibox-title">-->
+<!--                                <span class="label label-danger pull-right">急</span>-->
+<!--                                <h5>待提现金额</h5>-->
+<!--                            </div>-->
+<!--                            <div class="ibox-content">-->
+<!--                                <h1 class="no-margins">{$data.price}</h1>-->
+<!--                            </div>-->
+<!--                        </div>-->
+<!--                    </div>-->
+<!--                    <div class="col-sm-3 ui-sortable">-->
+<!--                        <div class="ibox float-e-margins">-->
+<!--                            <div class="ibox-title">-->
+<!--                                <span class="label label-success pull-right">待</span>-->
+<!--                                <h5>佣金总金额</h5>-->
+<!--                            </div>-->
+<!--                            <div class="ibox-content">-->
+<!--                                <h1 class="no-margins">{$data.brokerage_count}</h1>-->
+<!--                            </div>-->
+<!--                        </div>-->
+<!--                    </div>-->
+<!--                    <div class="col-sm-3 ui-sortable">-->
+<!--                        <div class="ibox float-e-margins">-->
+<!--                            <div class="ibox-title">-->
+<!--                                <span class="label label-success pull-right">待</span>-->
+<!--                                <h5>未提现金额</h5>-->
+<!--                            </div>-->
+<!--                            <div class="ibox-content">-->
+<!--                                <h1 class="no-margins">{$data.brokerage_not}</h1>-->
+<!--                            </div>-->
+<!--                        </div>-->
+<!--                    </div>-->
+                </div>
+                <div class="table-responsive">
+                    <table class="table table-striped  table-bordered">
+                        <thead>
+                        <tr>
+                            <th class="text-center">编号</th>
+                            <th class="text-center">用户信息</th>
+                            <th class="text-center">提现金额</th>
+                            <th class="text-center">提现方式</th>
+                            <th class="text-center">添加时间</th>
+                            <th class="text-center">备注</th>
+                            <th class="text-center">审核状态</th>
+                            <th class="text-center">审核进度</th>
+                            <th class="text-center">审核人</th>
+                            <th class="text-center">操作</th>
+                        </tr>
+                        </thead>
+                        <tbody class="">
+                        {volist name="list" id="vo"}
+                        <tr>
+                            <td class="text-center">
+                                {$vo.id}
+                            </td>
+                            <td class="text-center">
+                                用户昵称: {$vo.nickname}/用户id:{$vo.uid}
+                            </td>
+                            <td class="text-center" style="color: #00aa00;">
+                                {$vo.extract_price}
+                            </td>
+                            <td class="text-left">
+                                {if condition="$vo['extract_type'] eq 'bank'"}
+                                姓名：{$vo.real_name}<br>
+                                银行卡号：{$vo.bank_code}
+                                <br/>
+                                银行开户地址:{$vo.bank_address}
+                                所属支行名称:{$vo.bank_belonging}
+                                {elseif condition="$vo['extract_type'] eq 'weixin'"/}
+                                昵称：{$vo.nickname}<br>
+                                微信号：{$vo.wechat}
+                                {else/}
+                                姓名：{$vo.real_name}<br>
+                                支付宝号：{$vo.alipay_code}
+                                {/if}
+                            </td>
+                            <td class="text-center">
+                                {$vo.add_time|date='Y-m-d H:i:s'}
+                            </td>
+                            <td class="text-center">
+                                {$vo.mark}
+                            </td>
+                            <td class="text-center">
+                                {if condition="$vo['status'] eq 1"}
+                                提现通过<br/>
+                                {elseif condition="$vo['status'] eq -1"/}
+                                提现未通过<br/>
+                                未通过原因：{$vo.fail_msg}
+                                <br>
+                                未通过时间：{$vo.fail_time|date='Y-m-d H:i:s'}
+                                {else/}
+                                未提现<br/>
+                                {if condition="$vo['examine_status'] eq 0 && $vo['examine_status'] eq 1"}
+                                <button data-url="{:url('fail',['id'=>$vo['id']])}" class="j-fail btn btn-danger btn-xs" type="button"><i class="fa fa-close"></i> 无效</button>
+                                {/if}
+                                {if condition="$vo['examine_status'] eq 1"}
+                                <!--                                    <button data-url="{:url('succ',['id'=>$vo['id']])}" class="j-success btn btn-primary btn-xs" type="button"><i class="fa fa-check"></i> 通过</button>-->
+                                {/if}
+                                {/if}
+                            </td>
+                            <td class="text-center">
+                                {if condition="$vo['examine_status'] eq 0"}
+                                {if condition="$vo['is_examine'] eq 0"}
+                                市场部审核<br/>
+                                {elseif condition="$vo['is_examine'] eq 1"/}
+                                技术部审核<br/>
+                                {else/}
+                                会计审核<br/>
+                                {/if}
+                                {else/}
+                                已审核通过<br/>
+                                {/if}
+
+                            </td>
+                            <td class="text-center">
+                                {$vo.reviewed}
+                            </td>
+                            <td class="text-center">
+                                {if condition="$vo['is_examine'] eq 1"}
+                                <button data-url="{:url('examine',['id'=>$vo['id']])}" class="j-success btn btn-primary btn-xs" type="button"><i class="fa fa-check"></i> 审核通过</button>
+                                {/if}
+                                <!--                                <button class="btn btn-info btn-xs" type="button"  onclick="$eb.createModalFrame('编辑','{:Url('edit',array('id'=>$vo['id']))}')"><i class="fa fa-edit"></i> 编辑</button>-->
+                            </td>
+                        </tr>
+                        {/volist}
+                        </tbody>
+                    </table>
+                </div>
+                {include file="public/inner_page"}
+            </div>
+        </div>
+    </div>
+</div>
+{/block}
+{block name="script"}
+<script>
+    $(function init() {
+        $('.search-item>.btn').on('click', function () {
+            var that = $(this), value = that.data('value'), p = that.parent(), name = p.data('name'), form = p.parents();
+            form.find('input[name="' + name + '"]').val(value);
+            $('input[name=export]').val(0);
+            form.submit();
+        });
+        $('.tag-item>.btn').on('click', function () {
+            var that = $(this), value = that.data('value'), p = that.parent(), name = p.data('name'), form = p.parents(),list = $('input[name="' + name + '"]').val().split(',');
+            var bool = 0;
+            $.each(list,function (index,item) {
+                if(item == value){
+                    bool = 1
+                    list.splice(index,1);
+                }
+            })
+            if(!bool) list.push(''+value+'');
+            form.find('input[name="' + name + '"]').val(list.join(','));
+            $('input[name=export]').val(0);
+            form.submit();
+        });
+        $('.search-item>li').on('click', function () {
+            var that = $(this), value = that.data('value'), p = that.parent(), name = p.data('name'), form = $('#form');
+            form.find('input[name="' + name + '"]').val(value);
+            $('input[name=export]').val(0);
+            form.submit();
+        });
+        $('.search-item>li').each(function () {
+            var that = $(this), value = that.data('value'), p = that.parent(), name = p.data('name');
+            if($where[name]) $('.'+name).css('color','#1ab394');
+        });
+        $('.search-item-value').each(function () {
+            var that = $(this), name = that.attr('name'), value = that.val(), dom = $('.search-item[data-name="' + name + '"] .btn[data-value="' + value + '"]');
+            dom.eq(0).removeClass('btn-outline btn-link').addClass('btn-primary btn-sm')
+                .siblings().addClass('btn-outline btn-link').removeClass('btn-primary btn-sm')
+        });
+    })
+    $('.j-fail').on('click',function(){
+        var url = $(this).data('url');
+        $eb.$alert('textarea',{
+            title:'请输入未通过原因',
+            value:'输入信息不完整或有误!',
+        },function(value){
+            $eb.axios.post(url,{message:value}).then(function(res){
+                if(res.data.code == 200) {
+                    $eb.$swal('success', res.data.msg);
+                    setTimeout(function () {
+                        window.location.reload();
+                    },1000);
+                }else
+                    $eb.$swal('error',res.data.msg||'操作失败!');
+            });
+        });
+    });
+
+    $('#excel').on('click',function(){
+
+        var data = $('#dataFrom').serializeArray();
+        var url = '{:url('excel')}?date='+data[0].value+'&status='+data[1].value+'&extract_type='+data[2].value+'&nireid='+data[3].value;
+        window.location.replace(url);
+    });
+    $('.j-success').on('click',function(){
+        var url = $(this).data('url');
+        $eb.$swal('delete',function(){
+            $eb.axios.post(url).then(function(res){
+                if(res.data.code == 200) {
+                    setTimeout(function () {
+                        window.location.reload();
+                    },1000);
+                    $eb.$swal('success', res.data.msg);
+                }else
+                    $eb.$swal('error',res.data.msg||'操作失败!');
+            });
+        },{
+            title:'确定审核通过?',
+            text:'通过后无法撤销，请谨慎操作！',
+            confirm:'审核通过'
+        });
+    });
+    $('.btn-warning').on('click',function(){
+        window.t = $(this);
+        var _this = $(this),url =_this.data('url');
+        $eb.$swal('delete',function(){
+            $eb.axios.get(url).then(function(res){
+                if(res.status == 200 && res.data.code == 200) {
+                    $eb.$swal('success',res.data.msg);
+                    _this.parents('tr').remove();
+                }else
+                    return Promise.reject(res.data.msg || '删除失败')
+            }).catch(function(err){
+                $eb.$swal('error',err);
+            });
+        })
+    });
+    $(".open_image").on('click',function (e) {
+        var image = $(this).data('image');
+        $eb.openImage(image);
+    })
+    var dateInput = $('.datepicker');
+    dateInput.daterangepicker({
+        autoUpdateInput: false,
+        "opens": "center",
+        "drops": "down",
+        "ranges": {
+            '今天': [moment(), moment().add(1, 'days')],
+            '昨天': [moment().subtract(1, 'days'), moment()],
+            '上周': [moment().subtract(6, 'days'), moment()],
+            '前30天': [moment().subtract(29, 'days'), moment()],
+            '本月': [moment().startOf('month'), moment().endOf('month')],
+            '上月': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')]
+        },
+        "locale" : {
+            applyLabel : '确定',
+            cancelLabel : '取消',
+            fromLabel : '起始时间',
+            toLabel : '结束时间',
+            format : 'YYYY/MM/DD',
+            customRangeLabel : '自定义',
+            daysOfWeek : [ '日', '一', '二', '三', '四', '五', '六' ],
+            monthNames : [ '一月', '二月', '三月', '四月', '五月', '六月',
+                '七月', '八月', '九月', '十月', '十一月', '十二月' ],
+            firstDay : 1
+        }
+    });
+    dateInput.on('apply.daterangepicker', function(ev, picker) {
+        $("input[name=date]").val(picker.startDate.format('YYYY/MM/DD') + ' - ' + picker.endDate.format('YYYY/MM/DD'));
+        $('form').submit();
+    });
+</script>
+{/block}
+

app/admin/view/finance/user_extract/shichang_index.php

@@ -0,0 +1,327 @@
+{extend name="public/container"}
+{block name="head_top"}
+<link rel="stylesheet" href="{__PLUG_PATH}daterangepicker/daterangepicker.css">
+<script src="{__PLUG_PATH}moment.js"></script>
+<script src="{__PLUG_PATH}daterangepicker/daterangepicker.js"></script>
+{/block}
+{block name="content"}
+<div class="row">
+    <div class="col-sm-12">
+        <div class="ibox">
+            <div class="ibox-content">
+                <div class="row">
+                    <div class="m-b m-l">
+                        <form action="" class="form-inline" id="dataFrom">
+                            <div class="search-item" data-name="date">
+                                <span>选择时间：</span>
+                                <button type="button" class="btn btn-outline btn-link" data-value="">全部</button>
+                                <button type="button" class="btn btn-outline btn-link" data-value="{$limitTimeList.today}">今天</button>
+                                <button type="button" class="btn btn-outline btn-link" data-value="{$limitTimeList.week}">本周</button>
+                                <button type="button" class="btn btn-outline btn-link" data-value="{$limitTimeList.month}">本月</button>
+                                <button type="button" class="btn btn-outline btn-link" data-value="{$limitTimeList.quarter}">本季度</button>
+                                <button type="button" class="btn btn-outline btn-link" data-value="{$limitTimeList.year}">本年</button>
+                                <div class="datepicker" style="display: inline-block;">
+                                    <button type="button" class="btn btn-outline btn-link" data-value="{$where.date?:'no'}">自定义时间</button>
+                                </div>
+                                <input class="search-item-value" type="hidden" name="date" value="{$where.date}" />
+                            </div>
+                            <select name="status" aria-controls="editable" class="form-control input-sm">
+                                <option value="">提现状态</option>
+                                <option value="-1" {eq name="where.status" value="-1"}selected="selected"{/eq}>未通过</option>
+                                <option value="0" {eq name="where.status" value="0"}selected="selected"{/eq}>未提现</option>
+                                <option value="1" {eq name="where.status" value="1"}selected="selected"{/eq}>已通过</option>
+                            </select>
+                            <select name="extract_type"  class="form-control input-sm">
+                                <option value="">提现方式</option>
+                                <option value="alipay" {eq name="where.extract_type" value="alipay" }selected="selected"{/eq}>支付宝</option>
+                                <option value="bank" {eq name="where.extract_type" value="bank"}selected="selected"{/eq}>银行卡</option>
+                                <option value="weixin" {eq name="where.extract_type" value="weixin"}selected="selected"{/eq}>微信</option>
+                            </select>
+                            <div class="input-group">
+                                  <span class="input-group-btn">
+                                      <input type="text" name="nireid" value="{$where.nireid}" placeholder="微信昵称/姓名/支付宝账号/银行卡号" class="input-sm form-control" size="38"/>
+                                      <button type="submit" class="btn btn-sm btn-primary"> 搜索</button>
+                                  </span>
+                            </div>
+                            <button type="button" id="excel" class="btn btn-sm btn-primary"> 导出</button>
+                        </form>
+                    </div>
+<!--                    <div class="col-sm-3 ui-sortable">-->
+<!--                        <div class="ibox float-e-margins">-->
+<!--                            <div class="ibox-title">-->
+<!--                                <span class="label label-success pull-right">￥</span>-->
+<!--                                <h5>已提现金额</h5>-->
+<!--                            </div>-->
+<!--                            <div class="ibox-content">-->
+<!--                                <h1 class="no-margins">{$data.priced}</h1>-->
+<!--                            </div>-->
+<!--                        </div>-->
+<!--                    </div>-->
+<!--                    <div class="col-sm-3 ui-sortable">-->
+<!--                        <div class="ibox float-e-margins">-->
+<!--                            <div class="ibox-title">-->
+<!--                                <span class="label label-danger pull-right">急</span>-->
+<!--                                <h5>待提现金额</h5>-->
+<!--                            </div>-->
+<!--                            <div class="ibox-content">-->
+<!--                                <h1 class="no-margins">{$data.price}</h1>-->
+<!--                            </div>-->
+<!--                        </div>-->
+<!--                    </div>-->
+<!--                    <div class="col-sm-3 ui-sortable">-->
+<!--                        <div class="ibox float-e-margins">-->
+<!--                            <div class="ibox-title">-->
+<!--                                <span class="label label-success pull-right">待</span>-->
+<!--                                <h5>佣金总金额</h5>-->
+<!--                            </div>-->
+<!--                            <div class="ibox-content">-->
+<!--                                <h1 class="no-margins">{$data.brokerage_count}</h1>-->
+<!--                            </div>-->
+<!--                        </div>-->
+<!--                    </div>-->
+<!--                    <div class="col-sm-3 ui-sortable">-->
+<!--                        <div class="ibox float-e-margins">-->
+<!--                            <div class="ibox-title">-->
+<!--                                <span class="label label-success pull-right">待</span>-->
+<!--                                <h5>未提现金额</h5>-->
+<!--                            </div>-->
+<!--                            <div class="ibox-content">-->
+<!--                                <h1 class="no-margins">{$data.brokerage_not}</h1>-->
+<!--                            </div>-->
+<!--                        </div>-->
+<!--                    </div>-->
+                </div>
+                <div class="table-responsive">
+                    <table class="table table-striped  table-bordered">
+                        <thead>
+                            <tr>
+                                <th class="text-center">编号</th>
+                                <th class="text-center">用户信息</th>
+                                <th class="text-center">提现金额</th>
+                                <th class="text-center">提现方式</th>
+                                <th class="text-center">添加时间</th>
+                                <th class="text-center">备注</th>
+                                <th class="text-center">审核状态</th>
+                                <th class="text-center">审核进度</th>
+                                <th class="text-center">审核人</th>
+                                <th class="text-center">操作</th>
+                            </tr>
+                        </thead>
+                        <tbody class="">
+                        {volist name="list" id="vo"}
+                        <tr>
+                            <td class="text-center">
+                                {$vo.id}
+                            </td>
+                            <td class="text-center">
+                               用户昵称: {$vo.nickname}/用户id:{$vo.uid}
+                            </td>
+                            <td class="text-center" style="color: #00aa00;">
+                                {$vo.extract_price}
+                            </td>
+                            <td class="text-left">
+                                {if condition="$vo['extract_type'] eq 'bank'"}
+                                姓名：{$vo.real_name}<br>
+                                 银行卡号：{$vo.bank_code}
+                                <br/>
+                                 银行开户地址:{$vo.bank_address}
+                                 所属支行名称:{$vo.bank_belonging}
+                                {elseif condition="$vo['extract_type'] eq 'weixin'"/}
+                                昵称：{$vo.nickname}<br>
+                                微信号：{$vo.wechat}
+                                {else/}
+                                姓名：{$vo.real_name}<br>
+                                  支付宝号：{$vo.alipay_code}
+                                {/if}
+                            </td>
+                            <td class="text-center">
+                                {$vo.add_time|date='Y-m-d H:i:s'}
+                            </td>
+                            <td class="text-center">
+                                {$vo.mark}
+                            </td>
+                            <td class="text-center">
+                                {if condition="$vo['status'] eq 1"}
+                                提现通过<br/>
+                                {elseif condition="$vo['status'] eq -1"/}
+                                提现未通过<br/>
+                                未通过原因：{$vo.fail_msg}
+                                <br>
+                                未通过时间：{$vo.fail_time|date='Y-m-d H:i:s'}
+                                {else/}
+                                未提现<br/>
+                                {if condition="$vo['examine_status'] eq 0 && $vo['examine_status'] eq 0"}
+                                    <button data-url="{:url('fail',['id'=>$vo['id']])}" class="j-fail btn btn-danger btn-xs" type="button"><i class="fa fa-close"></i> 无效</button>
+                                    {/if}
+                                    {if condition="$vo['examine_status'] eq 1"}
+<!--                                    <button data-url="{:url('succ',['id'=>$vo['id']])}" class="j-success btn btn-primary btn-xs" type="button"><i class="fa fa-check"></i> 通过</button>-->
+                                    {/if}
+                                {/if}
+                            </td>
+                            <td class="text-center">
+                                {if condition="$vo['examine_status'] eq 0"}
+                                    {if condition="$vo['is_examine'] eq 0"}
+                                    市场部审核<br/>
+                                    {elseif condition="$vo['is_examine'] eq 1"/}
+                                    技术部审核<br/>
+                                    {else/}
+                                    会计审核<br/>
+                                    {/if}
+                                {else/}
+                                    已审核通过<br/>
+                                {/if}
+
+                            </td>
+                            <td class="text-center">
+                                {$vo.reviewed}
+                            </td>
+                            <td class="text-center">
+                                {if condition="$vo['is_examine'] eq 0"}
+                                <button data-url="{:url('examine',['id'=>$vo['id']])}" class="j-success btn btn-primary btn-xs" type="button"><i class="fa fa-check"></i> 审核通过</button>
+                                {/if}
+<!--                                <button class="btn btn-info btn-xs" type="button"  onclick="$eb.createModalFrame('编辑','{:Url('edit',array('id'=>$vo['id']))}')"><i class="fa fa-edit"></i> 编辑</button>-->
+                            </td>
+                        </tr>
+                        {/volist}
+                        </tbody>
+                    </table>
+                </div>
+                {include file="public/inner_page"}
+            </div>
+        </div>
+    </div>
+</div>
+{/block}
+{block name="script"}
+<script>
+    $(function init() {
+        $('.search-item>.btn').on('click', function () {
+            var that = $(this), value = that.data('value'), p = that.parent(), name = p.data('name'), form = p.parents();
+            form.find('input[name="' + name + '"]').val(value);
+            $('input[name=export]').val(0);
+            form.submit();
+        });
+        $('.tag-item>.btn').on('click', function () {
+            var that = $(this), value = that.data('value'), p = that.parent(), name = p.data('name'), form = p.parents(),list = $('input[name="' + name + '"]').val().split(',');
+            var bool = 0;
+            $.each(list,function (index,item) {
+                if(item == value){
+                    bool = 1
+                    list.splice(index,1);
+                }
+            })
+            if(!bool) list.push(''+value+'');
+            form.find('input[name="' + name + '"]').val(list.join(','));
+            $('input[name=export]').val(0);
+            form.submit();
+        });
+        $('.search-item>li').on('click', function () {
+            var that = $(this), value = that.data('value'), p = that.parent(), name = p.data('name'), form = $('#form');
+            form.find('input[name="' + name + '"]').val(value);
+            $('input[name=export]').val(0);
+            form.submit();
+        });
+        $('.search-item>li').each(function () {
+            var that = $(this), value = that.data('value'), p = that.parent(), name = p.data('name');
+            if($where[name]) $('.'+name).css('color','#1ab394');
+        });
+        $('.search-item-value').each(function () {
+            var that = $(this), name = that.attr('name'), value = that.val(), dom = $('.search-item[data-name="' + name + '"] .btn[data-value="' + value + '"]');
+            dom.eq(0).removeClass('btn-outline btn-link').addClass('btn-primary btn-sm')
+                .siblings().addClass('btn-outline btn-link').removeClass('btn-primary btn-sm')
+        });
+    })
+    $('.j-fail').on('click',function(){
+        var url = $(this).data('url');
+        $eb.$alert('textarea',{
+            title:'请输入未通过原因',
+            value:'输入信息不完整或有误!',
+        },function(value){
+            $eb.axios.post(url,{message:value}).then(function(res){
+                if(res.data.code == 200) {
+                    $eb.$swal('success', res.data.msg);
+                    setTimeout(function () {
+                        window.location.reload();
+                    },1000);
+                }else
+                    $eb.$swal('error',res.data.msg||'操作失败!');
+            });
+        });
+    });
+
+    $('#excel').on('click',function(){
+
+        var data = $('#dataFrom').serializeArray();
+        var url = '{:url('excel')}?date='+data[0].value+'&status='+data[1].value+'&extract_type='+data[2].value+'&nireid='+data[3].value;
+        window.location.replace(url);
+    });
+    $('.j-success').on('click',function(){
+        var url = $(this).data('url');
+        $eb.$swal('delete',function(){
+            $eb.axios.post(url).then(function(res){
+                if(res.data.code == 200) {
+                    setTimeout(function () {
+                        window.location.reload();
+                    },1000);
+                    $eb.$swal('success', res.data.msg);
+                }else
+                    $eb.$swal('error',res.data.msg||'操作失败!');
+            });
+        },{
+            title:'确定审核通过?',
+            text:'通过后无法撤销，请谨慎操作！',
+            confirm:'审核通过'
+        });
+    });
+    $('.btn-warning').on('click',function(){
+        window.t = $(this);
+        var _this = $(this),url =_this.data('url');
+        $eb.$swal('delete',function(){
+            $eb.axios.get(url).then(function(res){
+                if(res.status == 200 && res.data.code == 200) {
+                    $eb.$swal('success',res.data.msg);
+                    _this.parents('tr').remove();
+                }else
+                    return Promise.reject(res.data.msg || '删除失败')
+            }).catch(function(err){
+                $eb.$swal('error',err);
+            });
+        })
+    });
+    $(".open_image").on('click',function (e) {
+        var image = $(this).data('image');
+        $eb.openImage(image);
+    })
+    var dateInput = $('.datepicker');
+    dateInput.daterangepicker({
+        autoUpdateInput: false,
+        "opens": "center",
+        "drops": "down",
+        "ranges": {
+            '今天': [moment(), moment().add(1, 'days')],
+            '昨天': [moment().subtract(1, 'days'), moment()],
+            '上周': [moment().subtract(6, 'days'), moment()],
+            '前30天': [moment().subtract(29, 'days'), moment()],
+            '本月': [moment().startOf('month'), moment().endOf('month')],
+            '上月': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')]
+        },
+        "locale" : {
+            applyLabel : '确定',
+            cancelLabel : '取消',
+            fromLabel : '起始时间',
+            toLabel : '结束时间',
+            format : 'YYYY/MM/DD',
+            customRangeLabel : '自定义',
+            daysOfWeek : [ '日', '一', '二', '三', '四', '五', '六' ],
+            monthNames : [ '一月', '二月', '三月', '四月', '五月', '六月',
+                '七月', '八月', '九月', '十月', '十一月', '十二月' ],
+            firstDay : 1
+        }
+    });
+    dateInput.on('apply.daterangepicker', function(ev, picker) {
+        $("input[name=date]").val(picker.startDate.format('YYYY/MM/DD') + ' - ' + picker.endDate.format('YYYY/MM/DD'));
+        $('form').submit();
+    });
+</script>
+{/block}
+

app/admin/view/order/store_order/caigou_index.php

@@ -0,0 +1,604 @@
+{extend name="public/container"}
+{block name="head_top"}
+
+{/block}
+{block name="content"}
+<style>
+    .btn-outline{
+        border:none;
+    }
+    .btn-outline:hover{
+        background-color: #0e9aef;
+        color: #fff;
+    }
+    .layui-form-item .layui-btn {
+        margin-top: 5px;
+        margin-right: 10px;
+    }
+    .layui-btn-primary{
+        margin-right: 10px;
+        margin-left: 0!important;
+    }
+    label{
+        margin-bottom: 0!important;
+        margin-top: 4px;
+    }
+</style>
+<div class="layui-fluid">
+    <div class="layui-row layui-col-space15" id="app">
+        <!--搜索条件-->
+        <div class="layui-col-md12">
+            <div class="layui-card">
+                <div class="layui-card-header">搜索条件</div>
+                <div class="layui-card-body">
+                    <div class="layui-carousel layadmin-carousel layadmin-shortcut" lay-anim="" lay-indicator="inside"
+                         lay-arrow="none" style="background:none">
+                        <div class="layui-card-body">
+                            <div class="layui-row layui-col-space10 layui-form-item">
+<!--                                <div class="layui-col-lg12">-->
+<!--                                    <label class="layui-form-label">订单状态:</label>-->
+<!--                                    <div class="layui-input-block" v-cloak="">-->
+<!--                                        <button class="layui-btn layui-btn-sm"-->
+<!--                                                :class="{'layui-btn-primary':where.status!==item.value}"-->
+<!--                                                @click="where.status = item.value" type="button"-->
+<!--                                                v-for="item in orderStatus">{{item.name}}-->
+<!--                                            <span v-if="item.count!=undefined"-->
+<!--                                                  :class="item.class!=undefined ? 'layui-badge': 'layui-badge layui-bg-gray' ">{{item.count}}</span>-->
+<!--                                        </button>-->
+<!--                                    </div>-->
+<!--                                </div>-->
+<!--                                <div class="layui-col-lg12">-->
+<!--                                    <label class="layui-form-label">订单类型:</label>-->
+<!--                                    <div class="layui-input-block" v-cloak="">-->
+<!--                                        <button class="layui-btn layui-btn-sm"-->
+<!--                                                :class="{'layui-btn-primary':where.type!=item.value}"-->
+<!--                                                @click="where.type = item.value" type="button"-->
+<!--                                                v-for="item in orderType">{{item.name}}-->
+<!--                                            <span v-if="item.count!=undefined" class="layui-badge layui-bg-gray">{{item.count}}</span>-->
+<!--                                        </button>-->
+<!--                                    </div>-->
+<!--                                </div>-->
+<!--                                <div class="layui-col-lg12">-->
+<!--                                    <label class="layui-form-label">支付方式:</label>-->
+<!--                                    <div class="layui-input-block" v-cloak="">-->
+<!--                                        <button class="layui-btn layui-btn-sm"-->
+<!--                                                :class="{'layui-btn-primary':where.pay_type!=item.value}"-->
+<!--                                                @click="where.pay_type = item.value" type="button"-->
+<!--                                                v-for="item in payType">{{item.name}}-->
+<!--                                            <span v-if="item.count!=undefined" class="layui-badge layui-bg-gray">{{item.count}}</span>-->
+<!--                                        </button>-->
+<!--                                    </div>-->
+<!--                                </div>-->
+                                <div class="layui-col-lg12">
+                                    <label class="layui-form-label">审核状态:</label>
+                                    <div class="layui-input-block" v-cloak="">
+                                        <button class="layui-btn layui-btn-sm"
+                                                :class="{'layui-btn-primary':where.examine_status!=item.value}"
+                                                @click="where.examine_status = item.value" type="button"
+                                                v-for="item in examine_status">{{item.name}}
+                                        </button>
+                                    </div>
+                                </div>
+                                <div class="layui-col-lg12">
+                                    <label class="layui-form-label">创建时间:</label>
+                                    <div class="layui-input-block" data-type="data" v-cloak="">
+                                        <button class="layui-btn layui-btn-sm" type="button" v-for="item in dataList"
+                                                @click="setData(item)"
+                                                :class="{'layui-btn-primary':where.data!=item.value}">{{item.name}}
+                                        </button>
+                                        <button class="layui-btn layui-btn-sm" type="button" ref="time"
+                                                @click="setData({value:'zd',is_zd:true})"
+                                                :class="{'layui-btn-primary':where.data!='zd'}">自定义
+                                        </button>
+                                        <button type="button" class="layui-btn layui-btn-sm layui-btn-primary"
+                                                v-show="showtime==true" ref="date_time">{$year.0} - {$year.1}
+                                        </button>
+                                    </div>
+                                </div>
+                                <div class="layui-col-lg12">
+                                    <label class="layui-form-label">订单号:</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" name="real_name" style="width: 50%" v-model="where.real_name"
+                                               placeholder="请输入姓名、电话、订单编号" class="layui-input">
+                                    </div>
+                                </div>
+                                <div class="layui-col-lg12">
+                                    <div class="layui-input-block">
+                                        <button @click="search" type="button"
+                                                class="layui-btn layui-btn-sm layui-btn-normal">
+                                            <i class="layui-icon layui-icon-search"></i>搜索
+                                        </button>
+                                        <button @click="excel" type="button"
+                                                class="layui-btn layui-btn-warm layui-btn-sm export" type="button">
+                                            <i class="fa fa-floppy-o" style="margin-right: 3px;"></i>导出
+                                        </button>
+                                        <button @click="refresh" type="reset"
+                                                class="layui-btn layui-btn-primary layui-btn-sm">
+                                            <i class="layui-icon layui-icon-refresh"></i>刷新
+                                        </button>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <!--end-->
+        <!-- 中间详细信息-->
+<!--        <div :class="item.col!=undefined ? 'layui-col-sm'+item.col+' '+'layui-col-md'+item.col:'layui-col-sm6 layui-col-md3'"-->
+<!--             v-for="item in badge" v-cloak="" v-if="item.count > 0">-->
+<!--            <div class="layui-card">-->
+<!--                <div class="layui-card-header">-->
+<!--                    {{item.name}}-->
+<!--                    <span class="layui-badge layuiadmin-badge" :class="item.background_color">{{item.field}}</span>-->
+<!--                </div>-->
+<!--                <div class="layui-card-body">-->
+<!--                    <p class="layuiadmin-big-font">{{item.count}}</p>-->
+<!--                    <p v-show="item.content!=undefined">-->
+<!--                        {{item.content}}-->
+<!--                        <span class="layuiadmin-span-color">{{item.sum}}<i :class="item.class"></i></span>-->
+<!--                    </p>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--        </div>-->
+        <!--enb-->
+    </div>
+    <!--列表-->
+    <div class="layui-row layui-col-space15">
+        <div class="layui-col-md12">
+            <div class="layui-card">
+                <div class="layui-card-header">订单列表</div>
+                <div class="layui-card-body">
+                    <div class="layui-btn-container" id="container-action">
+                        <button class="layui-btn layui-btn-sm" data-type="del_order">批量删除订单</button>
+                        <button class="layui-btn layui-btn-sm layui-btn-warm" data-type="write_order">订单核销</button>
+                    </div>
+                    <table class="layui-hide" id="List" lay-filter="List"></table>
+                    <!--订单-->
+                    <script type="text/html" id="order_id">
+                        {{d.order_id}}<br/>
+                        <span style="color: {{d.color}};">{{d.pink_name}}</span><br/>　
+                        {{#  if(d.is_del == 1){ }}<span style="color: {{d.color}};">用户已删除</span>{{# } }}　
+                    </script>
+                    <!--用户信息-->
+                    <script type="text/html" id="userinfo">
+                        {{d.nickname==null ? '暂无信息':d.nickname}}/{{d.uid}}
+                    </script>
+                    <!--分销员信息-->
+                    <script type="text/html" id="spread_uid">
+                        {{# if(d.spread_uid != 0){ }}
+                        <button class="btn-xs btn-outline" type="button"
+                                onclick="$eb.createModalFrame('推荐人信息','{:Url('order_spread_user')}?uid={{d.spread_uid}}',{w:600,h:400})">
+                            {{d.spread_nickname}}
+                        </button>
+                        {{# }else{ }}无{{# } }}
+                    </script>
+                    <!--支付状态-->
+                    <script type="text/html" id="paid">
+                        {{#  if(d.pay_type==1){ }}
+                        <p>{{d.pay_type_name}}</p>
+                        {{#  }else{ }}
+                        {{# if(d.pay_type_info!=undefined){ }}
+                        <p><span>线下支付</span></p>
+                        {{# }else{ }}
+                        <p>{{d.pay_type_name}}</p>
+                        {{# } }}
+                        {{# }; }}
+                    </script>
+                    <!--订单状态-->
+                    <script type="text/html" id="status">
+                        {{d.status_name}}
+                    </script>
+                    <!--商品信息-->
+                    <script type="text/html" id="info">
+                        {{#  layui.each(d._info, function(index, item){ }}
+                        {{#  if(item.cart_info.productInfo.attrInfo!=undefined){ }}
+                        <div>
+                            <span>
+                                <img style="width: 30px;height: 30px;margin:0;cursor: pointer;"
+                                     src="{{item.cart_info.productInfo.attrInfo.image}}">
+                            </span>
+                            <span>{{item.cart_info.productInfo.store_name}}&nbsp;{{item.cart_info.productInfo.attrInfo.suk}}</span>
+                            <span> | ￥{{item.cart_info.truePrice}}×{{item.cart_info.cart_num}}</span>
+                        </div>
+                        {{#  }else{ }}
+                        <div>
+                            <span><img style="width: 30px;height: 30px;margin:0;cursor: pointer;"
+                                       src="{{item.cart_info.productInfo.image}}"></span>
+                            <span>{{item.cart_info.productInfo.store_name}}</span><span> | ￥{{item.cart_info.truePrice}}×{{item.cart_info.cart_num}}</span>
+                        </div>
+                        {{# } }}
+                        {{#  }); }}
+                    </script>
+
+                    <script type="text/html" id="act">
+                        {{# if(d.is_examine == 0){ }}
+                        <button type="button" class="layui-btn layui-btn-xs" onclick="dropdown(this)">操作 <span
+                                    class="caret"></span></button>
+                        <ul class="layui-nav-child layui-anim layui-anim-upbit">
+                            <li>
+                                <a href="javascript:void(0);" lay-event=tg>
+                                    <i class="fa fa-history"></i> 审核通过
+                                </a>
+                            </li>
+                            <li>
+                                <a href="javascript:void(0);" lay-event=jj>
+                                    <i class="fa fa-history"></i> 不通过
+                                </a>
+                            </li>
+                        </ul>
+                        {{# } }}
+                    </script>
+                    <script type="text/html" id="is_examine">
+                        {{#  if(d.examine_status == 0){ }}
+                            {{#  if(d.is_examine == 0){ }}
+                            采购部审核
+                            {{# } }}
+                            {{#  if(d.is_examine == 1){ }}
+                            技术部审核
+                            {{# } }}
+                            {{#  if(d.is_examine == 2){ }}
+                            会计审核
+                            {{# } }}
+                        {{# } }}
+                        {{#  if(d.examine_status == 1){ }}
+                        审核通过
+                        {{# } }}
+                        {{#  if(d.examine_status < 0){ }}
+                        审核不通过
+                        {{# } }}
+                    </script>
+                    <script type="text/html" id="examine_status">
+                        {{#  if(d.examine_status == 0){ }}
+                        审核中
+                        {{# } }}
+                        {{#  if(d.examine_status == 1){ }}
+                        审核通过
+                        {{# } }}
+                        {{#  if(d.examine_status == -1){ }}
+                        审核不通过
+                        {{# } }}
+                    </script>
+                    <script type="text/html" id="reviewed">
+                        {{d.reviewed_name}}
+                    </script>
+
+                </div>
+            </div>
+        </div>
+    </div>
+    <!--end-->
+</div>
+<script src="{__ADMIN_PATH}js/layuiList.js"></script>
+{/block}
+{block name="script"}
+<script>
+    layList.tableList('List', "{:Url('order_list',['real_name'=>$real_name,'paid' => 1, 'is_examine' => 0])}", function () {
+        return [
+            {type: 'checkbox'},
+            {field: 'order_id', title: '订单号', sort: true, event: 'order_id', width: '10%', templet: '#order_id'},
+            {field: 'nickname', title: '用户信息', templet: '#userinfo', width: '10%', align: 'center'},
+            {field: 'spread_uid', title: '推荐人信息', templet: '#spread_uid', align: 'center'},
+            {field: 'info', title: '商品信息', templet: "#info",width: '8%', height: 'full-20'},
+            {field: 'pay_price', title: '实际支付', width: '8%', align: 'center'},
+            {field: 'paid', title: '支付状态', templet: '#paid', width: '8%', align: 'center'},
+            {field: 'status', title: '订单状态', templet: '#status', width: '8%', align: 'center'},
+            {field: 'reviewed', title: '审核人', templet: '#reviewed',width: '8%', align: 'center'},
+            {field: 'is_examine', title: '审核流程', templet: '#is_examine', align: 'center'},
+            {field: 'examine_status', title: '审核状态', templet: '#examine_status', align: 'center'},
+            {field: 'add_time', title: '下单时间', width: '10%', sort: true, align: 'center'},
+            {field: 'right', title: '操作', align: 'center', toolbar: '#act', width: '10%'},
+        ];
+    });
+    layList.tool(function (event, data, obj) {
+        switch (event) {
+            case 'order_paid':
+                var url = layList.U({c: 'order.store_order', a: 'offline', p: {id: data.id}});
+                $eb.$swal('delete', function () {
+                    $eb.axios.get(url).then(function (res) {
+                        if (res.status == 200 && res.data.code == 200) {
+                            $eb.$swal('success', res.data.msg);
+                        } else
+                            return Promise.reject(res.data.msg || '修改失败')
+                    }).catch(function (err) {
+                        $eb.$swal('error', err);
+                    });
+                }, {'title': '您确定要修改支付状态吗？', 'text': '修改后将无法恢复,请谨慎操作！', 'confirm': '是的，我要修改'})
+                break;
+            case 'verify':
+                var url = layList.U({c: 'order.store_order', a: 'verify', p: {id: data.id}});
+                $eb.$swal('delete', function () {
+                    $eb.axios.get(url).then(function (res) {
+                        if (res.status == 200 && res.data.code == 200) {
+                            $eb.$swal('success', res.data.msg);
+                        } else
+                            return Promise.reject(res.data.msg || '核销失败')
+                    }).catch(function (err) {
+                        $eb.$swal('error', err);
+                    });
+                }, {'title': '您确定核销该订单吗？', 'text': '修改后将无法恢复,请谨慎操作！', 'confirm': '是的，我要核销'})
+                break;
+            case 'marke':
+                var url = layList.U({c: 'order.store_order', a: 'remark'}),
+                    id = data.id,
+                    make = data.remark;
+                $eb.$alert('textarea', {title: '请修改内容', value: make}, function (result) {
+                    if (result) {
+                        $.ajax({
+                            url: url,
+                            data: 'remark=' + result + '&id=' + id,
+                            type: 'post',
+                            dataType: 'json',
+                            success: function (res) {
+                                if (res.code == 200) {
+                                    $eb.$swal('success', res.msg);
+                                } else
+                                    $eb.$swal('error', res.msg);
+                            }
+                        })
+                    } else {
+                        $eb.$swal('error', '请输入要备注的内容');
+                    }
+                });
+                break;
+            case 'danger':
+                var url = layList.U({c: 'order.store_order', a: 'take_delivery', p: {id: data.id}});
+                $eb.$swal('delete', function () {
+                    $eb.axios.get(url).then(function (res) {
+                        if (res.status == 200 && res.data.code == 200) {
+                            $eb.$swal('success', res.data.msg);
+                        } else
+                            return Promise.reject(res.data.msg || '收货失败')
+                    }).catch(function (err) {
+                        $eb.$swal('error', err);
+                    });
+                }, {'title': '您确定要修改收货状态吗？', 'text': '修改后将无法恢复,请谨慎操作！', 'confirm': '是的，我要修改'})
+                break;
+            case 'order_info':
+                $eb.createModalFrame(data.nickname + '订单详情', layList.U({a: 'order_info', q: {oid: data.id}}));
+                break;
+            case 'order_print':
+                var url = layList.U({c: 'order.store_order', a: 'order_print', p: {id: data.id}});
+                $eb.$swal('delete', function () {
+                    $eb.axios.get(url).then(function (res) {
+                        if (res.status == 200 && res.data.code == 200) {
+                            $eb.$swal('success', res.data.msg);
+                        } else
+                            return Promise.reject(res.data.msg || '核销失败')
+                    }).catch(function (err) {
+                        $eb.$swal('error', err);
+                    });
+                }, {'title': '确认打印订单？', 'text': '是否确认打印！', 'confirm': '确定'})
+                break;
+            case 'tg':
+                var url = layList.U({c: 'order.store_order', a: 'tg', p: {id: data.id}});
+                $eb.$swal('delete', function () {
+                    $eb.axios.get(url).then(function (res) {
+                        if (res.status == 200 && res.data.code == 200) {
+                            $eb.$swal('success', res.data.msg);
+                            obj.del();
+                            location.reload();
+                        } else
+                            return Promise.reject(res.data.msg || '失败')
+                    }).catch(function (err) {
+                        $eb.$swal('error', err);
+                    });
+                }, {'title': '确认通过吗？', 'text': '是否确认通过！', 'confirm': '确定'})
+                break;
+            case 'jj':
+                var url = layList.U({c: 'order.store_order', a: 'jj', p: {id: data.id}});
+                $eb.$swal('delete', function () {
+                    $eb.axios.get(url).then(function (res) {
+                        if (res.status == 200 && res.data.code == 200) {
+                            $eb.$swal('success', res.data.msg);
+                            location.reload();
+                        } else
+                            return Promise.reject(res.data.msg || '失败')
+                    }).catch(function (err) {
+                        $eb.$swal('error', err);
+                    });
+                }, {'title': '确认不通过吗？', 'text': '是否确认！', 'confirm': '确定'})
+                break;
+        }
+    })
+    var action = {
+        del_order: function () {
+            var ids = layList.getCheckData().getIds('id');
+            if (ids.length) {
+                var url = layList.U({c: 'order.store_order', a: 'del_order'});
+                $eb.$swal('delete', function () {
+                    $eb.axios.post(url, {ids: ids}).then(function (res) {
+                        if (res.status == 200 && res.data.code == 200) {
+                            $eb.$swal('success', res.data.msg);
+                        } else
+                            return Promise.reject(res.data.msg || '删除失败')
+                    }).catch(function (err) {
+                        $eb.$swal('error', err);
+                    });
+                }, {'title': '您确定要修删除订单吗？', 'text': '删除后将无法恢复,请谨慎操作！', 'confirm': '是的，我要删除'})
+            } else {
+                layList.msg('请选择要删除的订单');
+            }
+        },
+        write_order: function () {
+            return $eb.createModalFrame('订单核销', layList.U({a: 'write_order'}), {w: 500, h: 400});
+        },
+    };
+    $('#container-action').find('button').each(function () {
+        $(this).on('click', function () {
+            var act = $(this).data('type');
+            action[act] && action[act]();
+        });
+    })
+    //下拉框
+    $(document).click(function (e) {
+        $('.layui-nav-child').hide();
+    })
+
+    function dropdown(that) {
+        var oEvent = arguments.callee.caller.arguments[0] || event;
+        oEvent.stopPropagation();
+        var offset = $(that).offset();
+        var top = offset.top - $(window).scrollTop();
+        var index = $(that).parents('tr').data('index');
+        $('.layui-nav-child').each(function (key) {
+            if (key != index) {
+                $(this).hide();
+            }
+        })
+        if ($(document).height() < top + $(that).next('ul').height()) {
+            $(that).next('ul').css({
+                'padding': 10,
+                'top': -($(that).parents('td').height() / 2 + $(that).height() + $(that).next('ul').height() / 2),
+                'min-width': 'inherit',
+                'position': 'absolute'
+            }).toggle();
+        } else {
+            $(that).next('ul').css({
+                'padding': 10,
+                'top': $(that).parents('td').height() / 2 + $(that).height(),
+                'min-width': 'inherit',
+                'position': 'absolute'
+            }).toggle();
+        }
+    }
+
+    var real_name = '<?=$real_name?>';
+    var orderCount =<?=json_encode($orderCount)?>, payTypeCount =<?=json_encode($payTypeCount)?>,
+        status =<?=$status ? $status : "''"?>;
+    require(['vue'], function (Vue) {
+        new Vue({
+            el: "#app",
+            data: {
+                badge: [],
+                payType: [
+                    {name: '全部', value: ''},
+                    {name: '微信支付', value: 1, count: payTypeCount.weixin},
+                    {name: '余额支付', value: 2, count: payTypeCount.yue},
+                    {name: '线下支付', value: 3, count: payTypeCount.offline},
+                    {name: '支付宝', value: 4, count: payTypeCount.zfb},
+                ],
+                orderType: [
+                    {name: '全部', value: ''},
+                    {name: '普通订单', value: 1, count: orderCount.general},
+                    {name: '拼团订单', value: 2, count: orderCount.pink},
+                    {name: '秒杀订单', value: 3, count: orderCount.seckill},
+                    {name: '砍价订单', value: 4, count: orderCount.bargain},
+                ],
+                orderStatus: [
+                    {name: '全部', value: ''},
+                    {name: '已卖出', value: 9, count: orderCount.ys},
+                    {name: '未发货', value: 1, count: orderCount.wf, class: true},
+                    {name: '待核销', value: 5, count: orderCount.write_off, class: true},
+                    {name: '未支付', value: 0, count: orderCount.wz},
+                    {name: '待收货', value: 2, count: orderCount.ds},
+                    {name: '待评价', value: 3, count: orderCount.dp},
+                    {name: '交易完成', value: 4, count: orderCount.jy},
+                    {name: '退款中', value: -1, count: orderCount.tk, class: true},
+                    {name: '已退款', value: -2, count: orderCount.yt},
+                    {name: '已删除', value: -4, count: orderCount.del},
+                ],
+                examine_status: [
+                    {name: '全部', value: ''},
+                    {name: '通过', value: 2},
+                    {name: '待审核', value: 1},
+                    {name: '未通过', value: -1},
+                ],
+                dataList: [
+                    {name: '全部', value: ''},
+                    {name: '今天', value: 'today'},
+                    {name: '昨天', value: 'yesterday'},
+                    {name: '最近7天', value: 'lately7'},
+                    {name: '最近30天', value: 'lately30'},
+                    {name: '本月', value: 'month'},
+                    {name: '本年', value: 'year'},
+                ],
+                where: {
+                    data: '',
+                    status: status,
+                    type: '',
+                    pay_type: '',
+                    examine_status:'',
+                    real_name: real_name || '',
+                    excel: 0,
+                },
+                showtime: false,
+            },
+            watch: {
+                'where.status': function () {
+                    this.where.excel = 0;
+                    this.getBadge();
+                    layList.reload(this.where, true);
+                },
+                'where.data': function () {
+                    this.where.excel = 0;
+                    this.getBadge();
+                    layList.reload(this.where, true);
+                },
+                'where.type': function () {
+                    this.where.excel = 0;
+                    this.getBadge();
+                    layList.reload(this.where, true);
+                },
+                'where.pay_type': function () {
+                    this.where.excel = 0;
+                    this.getBadge();
+                    layList.reload(this.where, true);
+                },
+                'where.examine_status': function () {
+                    this.where.excel = 0;
+                    this.getBadge();
+                    layList.reload(this.where, true);
+                }
+            },
+            methods: {
+                setData: function (item) {
+                    var that = this;
+                    if (item.is_zd == true) {
+                        that.showtime = true;
+                        this.where.data = this.$refs.date_time.innerText;
+                    } else {
+                        this.showtime = false;
+                        this.where.data = item.value;
+                    }
+                },
+                getBadge: function () {
+                    var that = this;
+                    layList.basePost(layList.Url({c: 'order.store_order', a: 'getBadge'}), this.where, function (rem) {
+                        that.badge = rem.data;
+                    });
+                },
+                search: function () {
+                    this.where.excel = 0;
+                    this.getBadge();
+                    layList.reload(this.where, true);
+                },
+                refresh: function () {
+                    layList.reload();
+                    this.getBadge();
+                },
+                excel: function () {
+                    this.where.excel = 1;
+                    location.href = layList.U({c: 'order.store_order', a: 'order_list', q: this.where});
+                    this.where.excel = 0;
+                }
+            },
+            mounted: function () {
+                var that = this;
+                that.getBadge();
+                window.formReload = this.search;
+                layList.laydate.render({
+                    elem: this.$refs.date_time,
+                    trigger: 'click',
+                    eventElem: this.$refs.time,
+                    range: true,
+                    change: function (value) {
+                        that.where.data = value;
+                    }
+                });
+            }
+        })
+    });
+</script>
+{/block}

app/admin/view/order/store_order/caiwu_index.php

@@ -0,0 +1,604 @@
+{extend name="public/container"}
+{block name="head_top"}
+
+{/block}
+{block name="content"}
+<style>
+    .btn-outline{
+        border:none;
+    }
+    .btn-outline:hover{
+        background-color: #0e9aef;
+        color: #fff;
+    }
+    .layui-form-item .layui-btn {
+        margin-top: 5px;
+        margin-right: 10px;
+    }
+    .layui-btn-primary{
+        margin-right: 10px;
+        margin-left: 0!important;
+    }
+    label{
+        margin-bottom: 0!important;
+        margin-top: 4px;
+    }
+</style>
+<div class="layui-fluid">
+    <div class="layui-row layui-col-space15" id="app">
+        <!--搜索条件-->
+        <div class="layui-col-md12">
+            <div class="layui-card">
+                <div class="layui-card-header">搜索条件</div>
+                <div class="layui-card-body">
+                    <div class="layui-carousel layadmin-carousel layadmin-shortcut" lay-anim="" lay-indicator="inside"
+                         lay-arrow="none" style="background:none">
+                        <div class="layui-card-body">
+                            <div class="layui-row layui-col-space10 layui-form-item">
+                                <!--                                <div class="layui-col-lg12">-->
+                                <!--                                    <label class="layui-form-label">订单状态:</label>-->
+                                <!--                                    <div class="layui-input-block" v-cloak="">-->
+                                <!--                                        <button class="layui-btn layui-btn-sm"-->
+                                <!--                                                :class="{'layui-btn-primary':where.status!==item.value}"-->
+                                <!--                                                @click="where.status = item.value" type="button"-->
+                                <!--                                                v-for="item in orderStatus">{{item.name}}-->
+                                <!--                                            <span v-if="item.count!=undefined"-->
+                                <!--                                                  :class="item.class!=undefined ? 'layui-badge': 'layui-badge layui-bg-gray' ">{{item.count}}</span>-->
+                                <!--                                        </button>-->
+                                <!--                                    </div>-->
+                                <!--                                </div>-->
+                                <!--                                <div class="layui-col-lg12">-->
+                                <!--                                    <label class="layui-form-label">订单类型:</label>-->
+                                <!--                                    <div class="layui-input-block" v-cloak="">-->
+                                <!--                                        <button class="layui-btn layui-btn-sm"-->
+                                <!--                                                :class="{'layui-btn-primary':where.type!=item.value}"-->
+                                <!--                                                @click="where.type = item.value" type="button"-->
+                                <!--                                                v-for="item in orderType">{{item.name}}-->
+                                <!--                                            <span v-if="item.count!=undefined" class="layui-badge layui-bg-gray">{{item.count}}</span>-->
+                                <!--                                        </button>-->
+                                <!--                                    </div>-->
+                                <!--                                </div>-->
+                                <!--                                <div class="layui-col-lg12">-->
+                                <!--                                    <label class="layui-form-label">支付方式:</label>-->
+                                <!--                                    <div class="layui-input-block" v-cloak="">-->
+                                <!--                                        <button class="layui-btn layui-btn-sm"-->
+                                <!--                                                :class="{'layui-btn-primary':where.pay_type!=item.value}"-->
+                                <!--                                                @click="where.pay_type = item.value" type="button"-->
+                                <!--                                                v-for="item in payType">{{item.name}}-->
+                                <!--                                            <span v-if="item.count!=undefined" class="layui-badge layui-bg-gray">{{item.count}}</span>-->
+                                <!--                                        </button>-->
+                                <!--                                    </div>-->
+                                <!--                                </div>-->
+                                <div class="layui-col-lg12">
+                                    <label class="layui-form-label">审核状态:</label>
+                                    <div class="layui-input-block" v-cloak="">
+                                        <button class="layui-btn layui-btn-sm"
+                                                :class="{'layui-btn-primary':where.examine_status!=item.value}"
+                                                @click="where.examine_status = item.value" type="button"
+                                                v-for="item in examine_status">{{item.name}}
+                                        </button>
+                                    </div>
+                                </div>
+                                <div class="layui-col-lg12">
+                                    <label class="layui-form-label">创建时间:</label>
+                                    <div class="layui-input-block" data-type="data" v-cloak="">
+                                        <button class="layui-btn layui-btn-sm" type="button" v-for="item in dataList"
+                                                @click="setData(item)"
+                                                :class="{'layui-btn-primary':where.data!=item.value}">{{item.name}}
+                                        </button>
+                                        <button class="layui-btn layui-btn-sm" type="button" ref="time"
+                                                @click="setData({value:'zd',is_zd:true})"
+                                                :class="{'layui-btn-primary':where.data!='zd'}">自定义
+                                        </button>
+                                        <button type="button" class="layui-btn layui-btn-sm layui-btn-primary"
+                                                v-show="showtime==true" ref="date_time">{$year.0} - {$year.1}
+                                        </button>
+                                    </div>
+                                </div>
+                                <div class="layui-col-lg12">
+                                    <label class="layui-form-label">订单号:</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" name="real_name" style="width: 50%" v-model="where.real_name"
+                                               placeholder="请输入姓名、电话、订单编号" class="layui-input">
+                                    </div>
+                                </div>
+                                <div class="layui-col-lg12">
+                                    <div class="layui-input-block">
+                                        <button @click="search" type="button"
+                                                class="layui-btn layui-btn-sm layui-btn-normal">
+                                            <i class="layui-icon layui-icon-search"></i>搜索
+                                        </button>
+                                        <button @click="excel" type="button"
+                                                class="layui-btn layui-btn-warm layui-btn-sm export" type="button">
+                                            <i class="fa fa-floppy-o" style="margin-right: 3px;"></i>导出
+                                        </button>
+                                        <button @click="refresh" type="reset"
+                                                class="layui-btn layui-btn-primary layui-btn-sm">
+                                            <i class="layui-icon layui-icon-refresh"></i>刷新
+                                        </button>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <!--end-->
+        <!-- 中间详细信息-->
+<!--        <div :class="item.col!=undefined ? 'layui-col-sm'+item.col+' '+'layui-col-md'+item.col:'layui-col-sm6 layui-col-md3'"-->
+<!--             v-for="item in badge" v-cloak="" v-if="item.count > 0">-->
+<!--            <div class="layui-card">-->
+<!--                <div class="layui-card-header">-->
+<!--                    {{item.name}}-->
+<!--                    <span class="layui-badge layuiadmin-badge" :class="item.background_color">{{item.field}}</span>-->
+<!--                </div>-->
+<!--                <div class="layui-card-body">-->
+<!--                    <p class="layuiadmin-big-font">{{item.count}}</p>-->
+<!--                    <p v-show="item.content!=undefined">-->
+<!--                        {{item.content}}-->
+<!--                        <span class="layuiadmin-span-color">{{item.sum}}<i :class="item.class"></i></span>-->
+<!--                    </p>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--        </div>-->
+        <!--enb-->
+    </div>
+    <!--列表-->
+    <div class="layui-row layui-col-space15">
+        <div class="layui-col-md12">
+            <div class="layui-card">
+                <div class="layui-card-header">订单列表</div>
+                <div class="layui-card-body">
+                    <div class="layui-btn-container" id="container-action">
+                        <button class="layui-btn layui-btn-sm" data-type="del_order">批量删除订单</button>
+                        <button class="layui-btn layui-btn-sm layui-btn-warm" data-type="write_order">订单核销</button>
+                    </div>
+                    <table class="layui-hide" id="List" lay-filter="List"></table>
+                    <!--订单-->
+                    <script type="text/html" id="order_id">
+                        {{d.order_id}}<br/>
+                        <span style="color: {{d.color}};">{{d.pink_name}}</span><br/>　
+                        {{#  if(d.is_del == 1){ }}<span style="color: {{d.color}};">用户已删除</span>{{# } }}　
+                    </script>
+                    <!--用户信息-->
+                    <script type="text/html" id="userinfo">
+                        {{d.nickname==null ? '暂无信息':d.nickname}}/{{d.uid}}
+                    </script>
+                    <!--分销员信息-->
+                    <script type="text/html" id="spread_uid">
+                        {{# if(d.spread_uid != 0){ }}
+                        <button class="btn-xs btn-outline" type="button"
+                                onclick="$eb.createModalFrame('推荐人信息','{:Url('order_spread_user')}?uid={{d.spread_uid}}',{w:600,h:400})">
+                            {{d.spread_nickname}}
+                        </button>
+                        {{# }else{ }}无{{# } }}
+                    </script>
+                    <!--支付状态-->
+                    <script type="text/html" id="paid">
+                        {{#  if(d.pay_type==1){ }}
+                        <p>{{d.pay_type_name}}</p>
+                        {{#  }else{ }}
+                        {{# if(d.pay_type_info!=undefined){ }}
+                        <p><span>线下支付</span></p>
+                        {{# }else{ }}
+                        <p>{{d.pay_type_name}}</p>
+                        {{# } }}
+                        {{# }; }}
+                    </script>
+                    <!--订单状态-->
+                    <script type="text/html" id="status">
+                        {{d.status_name}}
+                    </script>
+                    <!--商品信息-->
+                    <script type="text/html" id="info">
+                        {{#  layui.each(d._info, function(index, item){ }}
+                        {{#  if(item.cart_info.productInfo.attrInfo!=undefined){ }}
+                        <div>
+                            <span>
+                                <img style="width: 30px;height: 30px;margin:0;cursor: pointer;"
+                                     src="{{item.cart_info.productInfo.attrInfo.image}}">
+                            </span>
+                            <span>{{item.cart_info.productInfo.store_name}}&nbsp;{{item.cart_info.productInfo.attrInfo.suk}}</span>
+                            <span> | ￥{{item.cart_info.truePrice}}×{{item.cart_info.cart_num}}</span>
+                        </div>
+                        {{#  }else{ }}
+                        <div>
+                            <span><img style="width: 30px;height: 30px;margin:0;cursor: pointer;"
+                                       src="{{item.cart_info.productInfo.image}}"></span>
+                            <span>{{item.cart_info.productInfo.store_name}}</span><span> | ￥{{item.cart_info.truePrice}}×{{item.cart_info.cart_num}}</span>
+                        </div>
+                        {{# } }}
+                        {{#  }); }}
+                    </script>
+
+                    <script type="text/html" id="act">
+                        {{# if(d.examine_status == 0){ }}
+                        <button type="button" class="layui-btn layui-btn-xs" onclick="dropdown(this)">操作 <span
+                                    class="caret"></span></button>
+                        <ul class="layui-nav-child layui-anim layui-anim-upbit">
+                            <li>
+                                <a href="javascript:void(0);" lay-event=tg>
+                                    <i class="fa fa-history"></i> 审核通过
+                                </a>
+                            </li>
+                            <li>
+                                <a href="javascript:void(0);" lay-event=jj>
+                                    <i class="fa fa-history"></i> 不通过
+                                </a>
+                            </li>
+                        </ul>
+                        {{# } }}
+                    </script>
+                    <script type="text/html" id="is_examine">
+                        {{#  if(d.examine_status == 0){ }}
+                        {{#  if(d.is_examine == 0){ }}
+                        采购部审核
+                        {{# } }}
+                        {{#  if(d.is_examine == 1){ }}
+                        技术部审核
+                        {{# } }}
+                        {{#  if(d.is_examine == 2){ }}
+                        会计审核
+                        {{# } }}
+                        {{# } }}
+                        {{#  if(d.examine_status == 1){ }}
+                        审核通过
+                        {{# } }}
+                        {{#  if(d.examine_status < 0){ }}
+                        审核不通过
+                        {{# } }}
+                    </script>
+                    <script type="text/html" id="examine_status">
+                        {{#  if(d.examine_status == 0){ }}
+                        审核中
+                        {{# } }}
+                        {{#  if(d.examine_status == 1){ }}
+                        审核通过
+                        {{# } }}
+                        {{#  if(d.examine_status == -1){ }}
+                        审核不通过
+                        {{# } }}
+                    </script>
+                    <script type="text/html" id="reviewed">
+                        {{d.reviewed_name}}
+                    </script>
+
+                </div>
+            </div>
+        </div>
+    </div>
+    <!--end-->
+</div>
+<script src="{__ADMIN_PATH}js/layuiList.js"></script>
+{/block}
+{block name="script"}
+<script>
+    layList.tableList('List', "{:Url('order_list',['real_name'=>$real_name,'paid' => 1, 'is_examine' => 2])}", function () {
+        return [
+            {type: 'checkbox'},
+            {field: 'order_id', title: '订单号', sort: true, event: 'order_id', width: '10%', templet: '#order_id'},
+            {field: 'nickname', title: '用户信息', templet: '#userinfo', width: '10%', align: 'center'},
+            {field: 'spread_uid', title: '推荐人信息', templet: '#spread_uid', align: 'center'},
+            {field: 'info', title: '商品信息', templet: "#info",width: '8%', height: 'full-20'},
+            {field: 'pay_price', title: '实际支付', width: '8%', align: 'center'},
+            {field: 'paid', title: '支付状态', templet: '#paid', width: '8%', align: 'center'},
+            {field: 'status', title: '订单状态', templet: '#status', width: '8%', align: 'center'},
+            {field: 'reviewed', title: '审核人', templet: '#reviewed',width: '8%', align: 'center'},
+            {field: 'is_examine', title: '审核流程', templet: '#is_examine', align: 'center'},
+            {field: 'examine_status', title: '审核状态', templet: '#examine_status', align: 'center'},
+            {field: 'add_time', title: '下单时间', width: '10%', sort: true, align: 'center'},
+            {field: 'right', title: '操作', align: 'center', toolbar: '#act', width: '10%'},
+        ];
+    });
+    layList.tool(function (event, data, obj) {
+        switch (event) {
+            case 'order_paid':
+                var url = layList.U({c: 'order.store_order', a: 'offline', p: {id: data.id}});
+                $eb.$swal('delete', function () {
+                    $eb.axios.get(url).then(function (res) {
+                        if (res.status == 200 && res.data.code == 200) {
+                            $eb.$swal('success', res.data.msg);
+                        } else
+                            return Promise.reject(res.data.msg || '修改失败')
+                    }).catch(function (err) {
+                        $eb.$swal('error', err);
+                    });
+                }, {'title': '您确定要修改支付状态吗？', 'text': '修改后将无法恢复,请谨慎操作！', 'confirm': '是的，我要修改'})
+                break;
+            case 'verify':
+                var url = layList.U({c: 'order.store_order', a: 'verify', p: {id: data.id}});
+                $eb.$swal('delete', function () {
+                    $eb.axios.get(url).then(function (res) {
+                        if (res.status == 200 && res.data.code == 200) {
+                            $eb.$swal('success', res.data.msg);
+                        } else
+                            return Promise.reject(res.data.msg || '核销失败')
+                    }).catch(function (err) {
+                        $eb.$swal('error', err);
+                    });
+                }, {'title': '您确定核销该订单吗？', 'text': '修改后将无法恢复,请谨慎操作！', 'confirm': '是的，我要核销'})
+                break;
+            case 'marke':
+                var url = layList.U({c: 'order.store_order', a: 'remark'}),
+                    id = data.id,
+                    make = data.remark;
+                $eb.$alert('textarea', {title: '请修改内容', value: make}, function (result) {
+                    if (result) {
+                        $.ajax({
+                            url: url,
+                            data: 'remark=' + result + '&id=' + id,
+                            type: 'post',
+                            dataType: 'json',
+                            success: function (res) {
+                                if (res.code == 200) {
+                                    $eb.$swal('success', res.msg);
+                                } else
+                                    $eb.$swal('error', res.msg);
+                            }
+                        })
+                    } else {
+                        $eb.$swal('error', '请输入要备注的内容');
+                    }
+                });
+                break;
+            case 'danger':
+                var url = layList.U({c: 'order.store_order', a: 'take_delivery', p: {id: data.id}});
+                $eb.$swal('delete', function () {
+                    $eb.axios.get(url).then(function (res) {
+                        if (res.status == 200 && res.data.code == 200) {
+                            $eb.$swal('success', res.data.msg);
+                        } else
+                            return Promise.reject(res.data.msg || '收货失败')
+                    }).catch(function (err) {
+                        $eb.$swal('error', err);
+                    });
+                }, {'title': '您确定要修改收货状态吗？', 'text': '修改后将无法恢复,请谨慎操作！', 'confirm': '是的，我要修改'})
+                break;
+            case 'order_info':
+                $eb.createModalFrame(data.nickname + '订单详情', layList.U({a: 'order_info', q: {oid: data.id}}));
+                break;
+            case 'order_print':
+                var url = layList.U({c: 'order.store_order', a: 'order_print', p: {id: data.id}});
+                $eb.$swal('delete', function () {
+                    $eb.axios.get(url).then(function (res) {
+                        if (res.status == 200 && res.data.code == 200) {
+                            $eb.$swal('success', res.data.msg);
+                        } else
+                            return Promise.reject(res.data.msg || '核销失败')
+                    }).catch(function (err) {
+                        $eb.$swal('error', err);
+                    });
+                }, {'title': '确认打印订单？', 'text': '是否确认打印！', 'confirm': '确定'})
+                break;
+            case 'tg':
+                var url = layList.U({c: 'order.store_order', a: 'tg', p: {id: data.id}});
+                $eb.$swal('delete', function () {
+                    $eb.axios.get(url).then(function (res) {
+                        if (res.status == 200 && res.data.code == 200) {
+                            $eb.$swal('success', res.data.msg);
+                            obj.del();
+                            location.reload();
+                        } else
+                            return Promise.reject(res.data.msg || '失败')
+                    }).catch(function (err) {
+                        $eb.$swal('error', err);
+                    });
+                }, {'title': '确认通过吗？', 'text': '是否确认通过！', 'confirm': '确定'})
+                break;
+            case 'jj':
+                var url = layList.U({c: 'order.store_order', a: 'jj', p: {id: data.id}});
+                $eb.$swal('delete', function () {
+                    $eb.axios.get(url).then(function (res) {
+                        if (res.status == 200 && res.data.code == 200) {
+                            $eb.$swal('success', res.data.msg);
+                            location.reload();
+                        } else
+                            return Promise.reject(res.data.msg || '失败')
+                    }).catch(function (err) {
+                        $eb.$swal('error', err);
+                    });
+                }, {'title': '确认不通过吗？', 'text': '是否确认！', 'confirm': '确定'})
+                break;
+        }
+    })
+    var action = {
+        del_order: function () {
+            var ids = layList.getCheckData().getIds('id');
+            if (ids.length) {
+                var url = layList.U({c: 'order.store_order', a: 'del_order'});
+                $eb.$swal('delete', function () {
+                    $eb.axios.post(url, {ids: ids}).then(function (res) {
+                        if (res.status == 200 && res.data.code == 200) {
+                            $eb.$swal('success', res.data.msg);
+                        } else
+                            return Promise.reject(res.data.msg || '删除失败')
+                    }).catch(function (err) {
+                        $eb.$swal('error', err);
+                    });
+                }, {'title': '您确定要修删除订单吗？', 'text': '删除后将无法恢复,请谨慎操作！', 'confirm': '是的，我要删除'})
+            } else {
+                layList.msg('请选择要删除的订单');
+            }
+        },
+        write_order: function () {
+            return $eb.createModalFrame('订单核销', layList.U({a: 'write_order'}), {w: 500, h: 400});
+        },
+    };
+    $('#container-action').find('button').each(function () {
+        $(this).on('click', function () {
+            var act = $(this).data('type');
+            action[act] && action[act]();
+        });
+    })
+    //下拉框
+    $(document).click(function (e) {
+        $('.layui-nav-child').hide();
+    })
+
+    function dropdown(that) {
+        var oEvent = arguments.callee.caller.arguments[0] || event;
+        oEvent.stopPropagation();
+        var offset = $(that).offset();
+        var top = offset.top - $(window).scrollTop();
+        var index = $(that).parents('tr').data('index');
+        $('.layui-nav-child').each(function (key) {
+            if (key != index) {
+                $(this).hide();
+            }
+        })
+        if ($(document).height() < top + $(that).next('ul').height()) {
+            $(that).next('ul').css({
+                'padding': 10,
+                'top': -($(that).parents('td').height() / 2 + $(that).height() + $(that).next('ul').height() / 2),
+                'min-width': 'inherit',
+                'position': 'absolute'
+            }).toggle();
+        } else {
+            $(that).next('ul').css({
+                'padding': 10,
+                'top': $(that).parents('td').height() / 2 + $(that).height(),
+                'min-width': 'inherit',
+                'position': 'absolute'
+            }).toggle();
+        }
+    }
+
+    var real_name = '<?=$real_name?>';
+    var orderCount =<?=json_encode($orderCount)?>, payTypeCount =<?=json_encode($payTypeCount)?>,
+        status =<?=$status ? $status : "''"?>;
+    require(['vue'], function (Vue) {
+        new Vue({
+            el: "#app",
+            data: {
+                badge: [],
+                payType: [
+                    {name: '全部', value: ''},
+                    {name: '微信支付', value: 1, count: payTypeCount.weixin},
+                    {name: '余额支付', value: 2, count: payTypeCount.yue},
+                    {name: '线下支付', value: 3, count: payTypeCount.offline},
+                    {name: '支付宝', value: 4, count: payTypeCount.zfb},
+                ],
+                orderType: [
+                    {name: '全部', value: ''},
+                    {name: '普通订单', value: 1, count: orderCount.general},
+                    {name: '拼团订单', value: 2, count: orderCount.pink},
+                    {name: '秒杀订单', value: 3, count: orderCount.seckill},
+                    {name: '砍价订单', value: 4, count: orderCount.bargain},
+                ],
+                orderStatus: [
+                    {name: '全部', value: ''},
+                    {name: '已卖出', value: 9, count: orderCount.ys},
+                    {name: '未发货', value: 1, count: orderCount.wf, class: true},
+                    {name: '待核销', value: 5, count: orderCount.write_off, class: true},
+                    {name: '未支付', value: 0, count: orderCount.wz},
+                    {name: '待收货', value: 2, count: orderCount.ds},
+                    {name: '待评价', value: 3, count: orderCount.dp},
+                    {name: '交易完成', value: 4, count: orderCount.jy},
+                    {name: '退款中', value: -1, count: orderCount.tk, class: true},
+                    {name: '已退款', value: -2, count: orderCount.yt},
+                    {name: '已删除', value: -4, count: orderCount.del},
+                ],
+                examine_status: [
+                    {name: '全部', value: ''},
+                    {name: '通过', value: 2},
+                    {name: '待审核', value: 1},
+                    {name: '未通过', value: -1},
+                ],
+                dataList: [
+                    {name: '全部', value: ''},
+                    {name: '今天', value: 'today'},
+                    {name: '昨天', value: 'yesterday'},
+                    {name: '最近7天', value: 'lately7'},
+                    {name: '最近30天', value: 'lately30'},
+                    {name: '本月', value: 'month'},
+                    {name: '本年', value: 'year'},
+                ],
+                where: {
+                    data: '',
+                    status: status,
+                    type: '',
+                    pay_type: '',
+                    examine_status:'',
+                    real_name: real_name || '',
+                    excel: 0,
+                },
+                showtime: false,
+            },
+            watch: {
+                'where.status': function () {
+                    this.where.excel = 0;
+                    this.getBadge();
+                    layList.reload(this.where, true);
+                },
+                'where.data': function () {
+                    this.where.excel = 0;
+                    this.getBadge();
+                    layList.reload(this.where, true);
+                },
+                'where.type': function () {
+                    this.where.excel = 0;
+                    this.getBadge();
+                    layList.reload(this.where, true);
+                },
+                'where.pay_type': function () {
+                    this.where.excel = 0;
+                    this.getBadge();
+                    layList.reload(this.where, true);
+                },
+                'where.examine_status': function () {
+                    this.where.excel = 0;
+                    this.getBadge();
+                    layList.reload(this.where, true);
+                }
+            },
+            methods: {
+                setData: function (item) {
+                    var that = this;
+                    if (item.is_zd == true) {
+                        that.showtime = true;
+                        this.where.data = this.$refs.date_time.innerText;
+                    } else {
+                        this.showtime = false;
+                        this.where.data = item.value;
+                    }
+                },
+                getBadge: function () {
+                    var that = this;
+                    layList.basePost(layList.Url({c: 'order.store_order', a: 'getBadge'}), this.where, function (rem) {
+                        that.badge = rem.data;
+                    });
+                },
+                search: function () {
+                    this.where.excel = 0;
+                    this.getBadge();
+                    layList.reload(this.where, true);
+                },
+                refresh: function () {
+                    layList.reload();
+                    this.getBadge();
+                },
+                excel: function () {
+                    this.where.excel = 1;
+                    location.href = layList.U({c: 'order.store_order', a: 'order_list', q: this.where});
+                    this.where.excel = 0;
+                }
+            },
+            mounted: function () {
+                var that = this;
+                that.getBadge();
+                window.formReload = this.search;
+                layList.laydate.render({
+                    elem: this.$refs.date_time,
+                    trigger: 'click',
+                    eventElem: this.$refs.time,
+                    range: true,
+                    change: function (value) {
+                        that.where.data = value;
+                    }
+                });
+            }
+        })
+    });
+</script>
+{/block}

app/admin/view/order/store_order/index.php

@@ -69,6 +69,16 @@
                                         </button>
                                     </div>
                                 </div>
+                                <div class="layui-col-lg12">
+                                    <label class="layui-form-label">审核状态:</label>
+                                    <div class="layui-input-block" v-cloak="">
+                                        <button class="layui-btn layui-btn-sm"
+                                                :class="{'layui-btn-primary':where.examine_status!=item.value}"
+                                                @click="where.examine_status = item.value" type="button"
+                                                v-for="item in examine_status">{{item.name}}
+                                        </button>
+                                    </div>
+                                </div>
                                 <div class="layui-col-lg12">
                                     <label class="layui-form-label">创建时间:</label>
                                     <div class="layui-input-block" data-type="data" v-cloak="">
@@ -283,7 +293,7 @@
                             </li>
                         </ul>
                         {{#  }else if(d._status==2){ }}
-                        {{# if(d.shipping_type==1){ }}
+                        {{# if(d.shipping_type==1 && d.examine_status == 1){ }}
                         <button class="btn btn-primary btn-xs" type="button"
                                 onclick="$eb.createModalFrame('发送货','{:Url('order_goods')}?id={{d.id}}',{w:400,h:250})">
                             <i class="fa fa-cart-plus"></i> 发送货
@@ -524,6 +534,40 @@
                         </ul>
                         {{#  }; }}
                     </script>
+                    <script type="text/html" id="is_examine">
+                        {{#  if(d.examine_status == 0){ }}
+                            {{#  if(d.is_examine == 0){ }}
+                            采购部审核
+                            {{# } }}
+                            {{#  if(d.is_examine == 1){ }}
+                            技术部审核
+                            {{# } }}
+                            {{#  if(d.is_examine == 2){ }}
+                            会计审核
+                            {{# } }}
+                        {{# } }}
+                        {{#  if(d.examine_status == 1){ }}
+                        审核通过
+                        {{# } }}
+                        {{#  if(d.examine_status < 0){ }}
+                        审核不通过
+                        {{# } }}
+                    </script>
+                    <script type="text/html" id="examine_status">
+                        {{#  if(d.examine_status == 0){ }}
+                        审核中
+                        {{# } }}
+                        {{#  if(d.examine_status == 1){ }}
+                        审核通过
+                        {{# } }}
+                        {{#  if(d.examine_status == -1){ }}
+                        审核不通过
+                        {{# } }}
+                    </script>
+                    <script type="text/html" id="reviewed">
+                        {{d.reviewed_name}}
+                    </script>
+
                 </div>
             </div>
         </div>
@@ -537,13 +581,16 @@
     layList.tableList('List', "{:Url('order_list',['real_name'=>$real_name])}", function () {
         return [
             {type: 'checkbox'},
-            {field: 'order_id', title: '订单号', sort: true, event: 'order_id', width: '14%', templet: '#order_id'},
+            {field: 'order_id', title: '订单号', sort: true, event: 'order_id', width: '10%', templet: '#order_id'},
             {field: 'nickname', title: '用户信息', templet: '#userinfo', width: '10%', align: 'center'},
-            {field: 'spread_uid', title: '推荐人信息', templet: '#spread_uid', width: '10%', align: 'center'},
-            {field: 'info', title: '商品信息', templet: "#info", height: 'full-20'},
+            {field: 'spread_uid', title: '推荐人信息', templet: '#spread_uid', align: 'center'},
+            {field: 'info', title: '商品信息', templet: "#info",width: '8%', height: 'full-20'},
             {field: 'pay_price', title: '实际支付', width: '8%', align: 'center'},
             {field: 'paid', title: '支付状态', templet: '#paid', width: '8%', align: 'center'},
             {field: 'status', title: '订单状态', templet: '#status', width: '8%', align: 'center'},
+            {field: 'reviewed', title: '审核人', templet: '#reviewed',width: '8%', align: 'center'},
+            {field: 'is_examine', title: '审核流程', templet: '#is_examine', align: 'center'},
+            {field: 'examine_status', title: '审核状态', templet: '#examine_status', align: 'center'},
             {field: 'add_time', title: '下单时间', width: '10%', sort: true, align: 'center'},
             {field: 'right', title: '操作', align: 'center', toolbar: '#act', width: '10%'},
         ];
@@ -628,6 +675,35 @@
                     });
                 }, {'title': '确认打印订单？', 'text': '是否确认打印！', 'confirm': '确定'})
                 break;
+            case 'tg':
+                var url = layList.U({c: 'order.store_order', a: 'tg', p: {id: data.id}});
+                $eb.$swal('delete', function () {
+                    $eb.axios.get(url).then(function (res) {
+                        if (res.status == 200 && res.data.code == 200) {
+                            $eb.$swal('success', res.data.msg);
+                            obj.del();
+                            location.reload();
+                        } else
+                            return Promise.reject(res.data.msg || '失败')
+                    }).catch(function (err) {
+                        $eb.$swal('error', err);
+                    });
+                }, {'title': '确认通过吗？', 'text': '是否确认通过！', 'confirm': '确定'})
+                break;
+            case 'jj':
+                var url = layList.U({c: 'order.store_order', a: 'jj', p: {id: data.id}});
+                $eb.$swal('delete', function () {
+                    $eb.axios.get(url).then(function (res) {
+                        if (res.status == 200 && res.data.code == 200) {
+                            $eb.$swal('success', res.data.msg);
+                            location.reload();
+                        } else
+                            return Promise.reject(res.data.msg || '失败')
+                    }).catch(function (err) {
+                        $eb.$swal('error', err);
+                    });
+                }, {'title': '确认不通过吗？', 'text': '是否确认！', 'confirm': '确定'})
+                break;
         }
     })
     var action = {
@@ -727,6 +803,12 @@
                     {name: '已退款', value: -2, count: orderCount.yt},
                     {name: '已删除', value: -4, count: orderCount.del},
                 ],
+                examine_status: [
+                    {name: '全部', value: ''},
+                    {name: '通过', value: 2},
+                    {name: '待审核', value: 1},
+                    {name: '未通过', value: -1},
+                ],
                 dataList: [
                     {name: '全部', value: ''},
                     {name: '今天', value: 'today'},
@@ -741,6 +823,7 @@
                     status: status,
                     type: '',
                     pay_type: '',
+                    examine_status:'',
                     real_name: real_name || '',
                     excel: 0,
                 },
@@ -766,6 +849,11 @@
                     this.where.excel = 0;
                     this.getBadge();
                     layList.reload(this.where, true);
+                },
+                'where.examine_status': function () {
+                    this.where.excel = 0;
+                    this.getBadge();
+                    layList.reload(this.where, true);
                 }
             },
             methods: {

app/admin/view/order/store_order/jishu_index.php

@@ -0,0 +1,604 @@
+{extend name="public/container"}
+{block name="head_top"}
+
+{/block}
+{block name="content"}
+<style>
+    .btn-outline{
+        border:none;
+    }
+    .btn-outline:hover{
+        background-color: #0e9aef;
+        color: #fff;
+    }
+    .layui-form-item .layui-btn {
+        margin-top: 5px;
+        margin-right: 10px;
+    }
+    .layui-btn-primary{
+        margin-right: 10px;
+        margin-left: 0!important;
+    }
+    label{
+        margin-bottom: 0!important;
+        margin-top: 4px;
+    }
+</style>
+<div class="layui-fluid">
+    <div class="layui-row layui-col-space15" id="app">
+        <!--搜索条件-->
+        <div class="layui-col-md12">
+            <div class="layui-card">
+                <div class="layui-card-header">搜索条件</div>
+                <div class="layui-card-body">
+                    <div class="layui-carousel layadmin-carousel layadmin-shortcut" lay-anim="" lay-indicator="inside"
+                         lay-arrow="none" style="background:none">
+                        <div class="layui-card-body">
+                            <div class="layui-row layui-col-space10 layui-form-item">
+                                <!--                                <div class="layui-col-lg12">-->
+                                <!--                                    <label class="layui-form-label">订单状态:</label>-->
+                                <!--                                    <div class="layui-input-block" v-cloak="">-->
+                                <!--                                        <button class="layui-btn layui-btn-sm"-->
+                                <!--                                                :class="{'layui-btn-primary':where.status!==item.value}"-->
+                                <!--                                                @click="where.status = item.value" type="button"-->
+                                <!--                                                v-for="item in orderStatus">{{item.name}}-->
+                                <!--                                            <span v-if="item.count!=undefined"-->
+                                <!--                                                  :class="item.class!=undefined ? 'layui-badge': 'layui-badge layui-bg-gray' ">{{item.count}}</span>-->
+                                <!--                                        </button>-->
+                                <!--                                    </div>-->
+                                <!--                                </div>-->
+                                <!--                                <div class="layui-col-lg12">-->
+                                <!--                                    <label class="layui-form-label">订单类型:</label>-->
+                                <!--                                    <div class="layui-input-block" v-cloak="">-->
+                                <!--                                        <button class="layui-btn layui-btn-sm"-->
+                                <!--                                                :class="{'layui-btn-primary':where.type!=item.value}"-->
+                                <!--                                                @click="where.type = item.value" type="button"-->
+                                <!--                                                v-for="item in orderType">{{item.name}}-->
+                                <!--                                            <span v-if="item.count!=undefined" class="layui-badge layui-bg-gray">{{item.count}}</span>-->
+                                <!--                                        </button>-->
+                                <!--                                    </div>-->
+                                <!--                                </div>-->
+                                <!--                                <div class="layui-col-lg12">-->
+                                <!--                                    <label class="layui-form-label">支付方式:</label>-->
+                                <!--                                    <div class="layui-input-block" v-cloak="">-->
+                                <!--                                        <button class="layui-btn layui-btn-sm"-->
+                                <!--                                                :class="{'layui-btn-primary':where.pay_type!=item.value}"-->
+                                <!--                                                @click="where.pay_type = item.value" type="button"-->
+                                <!--                                                v-for="item in payType">{{item.name}}-->
+                                <!--                                            <span v-if="item.count!=undefined" class="layui-badge layui-bg-gray">{{item.count}}</span>-->
+                                <!--                                        </button>-->
+                                <!--                                    </div>-->
+                                <!--                                </div>-->
+                                <div class="layui-col-lg12">
+                                    <label class="layui-form-label">审核状态:</label>
+                                    <div class="layui-input-block" v-cloak="">
+                                        <button class="layui-btn layui-btn-sm"
+                                                :class="{'layui-btn-primary':where.examine_status!=item.value}"
+                                                @click="where.examine_status = item.value" type="button"
+                                                v-for="item in examine_status">{{item.name}}
+                                        </button>
+                                    </div>
+                                </div>
+                                <div class="layui-col-lg12">
+                                    <label class="layui-form-label">创建时间:</label>
+                                    <div class="layui-input-block" data-type="data" v-cloak="">
+                                        <button class="layui-btn layui-btn-sm" type="button" v-for="item in dataList"
+                                                @click="setData(item)"
+                                                :class="{'layui-btn-primary':where.data!=item.value}">{{item.name}}
+                                        </button>
+                                        <button class="layui-btn layui-btn-sm" type="button" ref="time"
+                                                @click="setData({value:'zd',is_zd:true})"
+                                                :class="{'layui-btn-primary':where.data!='zd'}">自定义
+                                        </button>
+                                        <button type="button" class="layui-btn layui-btn-sm layui-btn-primary"
+                                                v-show="showtime==true" ref="date_time">{$year.0} - {$year.1}
+                                        </button>
+                                    </div>
+                                </div>
+                                <div class="layui-col-lg12">
+                                    <label class="layui-form-label">订单号:</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" name="real_name" style="width: 50%" v-model="where.real_name"
+                                               placeholder="请输入姓名、电话、订单编号" class="layui-input">
+                                    </div>
+                                </div>
+                                <div class="layui-col-lg12">
+                                    <div class="layui-input-block">
+                                        <button @click="search" type="button"
+                                                class="layui-btn layui-btn-sm layui-btn-normal">
+                                            <i class="layui-icon layui-icon-search"></i>搜索
+                                        </button>
+                                        <button @click="excel" type="button"
+                                                class="layui-btn layui-btn-warm layui-btn-sm export" type="button">
+                                            <i class="fa fa-floppy-o" style="margin-right: 3px;"></i>导出
+                                        </button>
+                                        <button @click="refresh" type="reset"
+                                                class="layui-btn layui-btn-primary layui-btn-sm">
+                                            <i class="layui-icon layui-icon-refresh"></i>刷新
+                                        </button>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <!--end-->
+        <!-- 中间详细信息-->
+<!--        <div :class="item.col!=undefined ? 'layui-col-sm'+item.col+' '+'layui-col-md'+item.col:'layui-col-sm6 layui-col-md3'"-->
+<!--             v-for="item in badge" v-cloak="" v-if="item.count > 0">-->
+<!--            <div class="layui-card">-->
+<!--                <div class="layui-card-header">-->
+<!--                    {{item.name}}-->
+<!--                    <span class="layui-badge layuiadmin-badge" :class="item.background_color">{{item.field}}</span>-->
+<!--                </div>-->
+<!--                <div class="layui-card-body">-->
+<!--                    <p class="layuiadmin-big-font">{{item.count}}</p>-->
+<!--                    <p v-show="item.content!=undefined">-->
+<!--                        {{item.content}}-->
+<!--                        <span class="layuiadmin-span-color">{{item.sum}}<i :class="item.class"></i></span>-->
+<!--                    </p>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--        </div>-->
+        <!--enb-->
+    </div>
+    <!--列表-->
+    <div class="layui-row layui-col-space15">
+        <div class="layui-col-md12">
+            <div class="layui-card">
+                <div class="layui-card-header">订单列表</div>
+                <div class="layui-card-body">
+                    <div class="layui-btn-container" id="container-action">
+                        <button class="layui-btn layui-btn-sm" data-type="del_order">批量删除订单</button>
+                        <button class="layui-btn layui-btn-sm layui-btn-warm" data-type="write_order">订单核销</button>
+                    </div>
+                    <table class="layui-hide" id="List" lay-filter="List"></table>
+                    <!--订单-->
+                    <script type="text/html" id="order_id">
+                        {{d.order_id}}<br/>
+                        <span style="color: {{d.color}};">{{d.pink_name}}</span><br/>　
+                        {{#  if(d.is_del == 1){ }}<span style="color: {{d.color}};">用户已删除</span>{{# } }}　
+                    </script>
+                    <!--用户信息-->
+                    <script type="text/html" id="userinfo">
+                        {{d.nickname==null ? '暂无信息':d.nickname}}/{{d.uid}}
+                    </script>
+                    <!--分销员信息-->
+                    <script type="text/html" id="spread_uid">
+                        {{# if(d.spread_uid != 0){ }}
+                        <button class="btn-xs btn-outline" type="button"
+                                onclick="$eb.createModalFrame('推荐人信息','{:Url('order_spread_user')}?uid={{d.spread_uid}}',{w:600,h:400})">
+                            {{d.spread_nickname}}
+                        </button>
+                        {{# }else{ }}无{{# } }}
+                    </script>
+                    <!--支付状态-->
+                    <script type="text/html" id="paid">
+                        {{#  if(d.pay_type==1){ }}
+                        <p>{{d.pay_type_name}}</p>
+                        {{#  }else{ }}
+                        {{# if(d.pay_type_info!=undefined){ }}
+                        <p><span>线下支付</span></p>
+                        {{# }else{ }}
+                        <p>{{d.pay_type_name}}</p>
+                        {{# } }}
+                        {{# }; }}
+                    </script>
+                    <!--订单状态-->
+                    <script type="text/html" id="status">
+                        {{d.status_name}}
+                    </script>
+                    <!--商品信息-->
+                    <script type="text/html" id="info">
+                        {{#  layui.each(d._info, function(index, item){ }}
+                        {{#  if(item.cart_info.productInfo.attrInfo!=undefined){ }}
+                        <div>
+                            <span>
+                                <img style="width: 30px;height: 30px;margin:0;cursor: pointer;"
+                                     src="{{item.cart_info.productInfo.attrInfo.image}}">
+                            </span>
+                            <span>{{item.cart_info.productInfo.store_name}}&nbsp;{{item.cart_info.productInfo.attrInfo.suk}}</span>
+                            <span> | ￥{{item.cart_info.truePrice}}×{{item.cart_info.cart_num}}</span>
+                        </div>
+                        {{#  }else{ }}
+                        <div>
+                            <span><img style="width: 30px;height: 30px;margin:0;cursor: pointer;"
+                                       src="{{item.cart_info.productInfo.image}}"></span>
+                            <span>{{item.cart_info.productInfo.store_name}}</span><span> | ￥{{item.cart_info.truePrice}}×{{item.cart_info.cart_num}}</span>
+                        </div>
+                        {{# } }}
+                        {{#  }); }}
+                    </script>
+
+                    <script type="text/html" id="act">
+                        {{# if(d.is_examine == 1){ }}
+                        <button type="button" class="layui-btn layui-btn-xs" onclick="dropdown(this)">操作 <span
+                                    class="caret"></span></button>
+                        <ul class="layui-nav-child layui-anim layui-anim-upbit">
+                            <li>
+                                <a href="javascript:void(0);" lay-event=tg>
+                                    <i class="fa fa-history"></i> 审核通过
+                                </a>
+                            </li>
+                            <li>
+                                <a href="javascript:void(0);" lay-event=jj>
+                                    <i class="fa fa-history"></i> 不通过
+                                </a>
+                            </li>
+                        </ul>
+                        {{# } }}
+                    </script>
+                    <script type="text/html" id="is_examine">
+                        {{#  if(d.examine_status == 0){ }}
+                        {{#  if(d.is_examine == 0){ }}
+                        采购部审核
+                        {{# } }}
+                        {{#  if(d.is_examine == 1){ }}
+                        技术部审核
+                        {{# } }}
+                        {{#  if(d.is_examine == 2){ }}
+                        会计审核
+                        {{# } }}
+                        {{# } }}
+                        {{#  if(d.examine_status == 1){ }}
+                        审核通过
+                        {{# } }}
+                        {{#  if(d.examine_status < 0){ }}
+                        审核不通过
+                        {{# } }}
+                    </script>
+                    <script type="text/html" id="examine_status">
+                        {{#  if(d.examine_status == 0){ }}
+                        审核中
+                        {{# } }}
+                        {{#  if(d.examine_status == 1){ }}
+                        审核通过
+                        {{# } }}
+                        {{#  if(d.examine_status == -1){ }}
+                        审核不通过
+                        {{# } }}
+                    </script>
+                    <script type="text/html" id="reviewed">
+                        {{d.reviewed_name}}
+                    </script>
+
+                </div>
+            </div>
+        </div>
+    </div>
+    <!--end-->
+</div>
+<script src="{__ADMIN_PATH}js/layuiList.js"></script>
+{/block}
+{block name="script"}
+<script>
+    layList.tableList('List', "{:Url('order_list',['real_name'=>$real_name,'paid' => 1,  'is_examine' => 1])}", function () {
+        return [
+            {type: 'checkbox'},
+            {field: 'order_id', title: '订单号', sort: true, event: 'order_id', width: '10%', templet: '#order_id'},
+            {field: 'nickname', title: '用户信息', templet: '#userinfo', width: '10%', align: 'center'},
+            {field: 'spread_uid', title: '推荐人信息', templet: '#spread_uid', align: 'center'},
+            {field: 'info', title: '商品信息', templet: "#info",width: '8%', height: 'full-20'},
+            {field: 'pay_price', title: '实际支付', width: '8%', align: 'center'},
+            {field: 'paid', title: '支付状态', templet: '#paid', width: '8%', align: 'center'},
+            {field: 'status', title: '订单状态', templet: '#status', width: '8%', align: 'center'},
+            {field: 'reviewed', title: '审核人', templet: '#reviewed',width: '8%', align: 'center'},
+            {field: 'is_examine', title: '审核流程', templet: '#is_examine', align: 'center'},
+            {field: 'examine_status', title: '审核状态', templet: '#examine_status', align: 'center'},
+            {field: 'add_time', title: '下单时间', width: '10%', sort: true, align: 'center'},
+            {field: 'right', title: '操作', align: 'center', toolbar: '#act', width: '10%'},
+        ];
+    });
+    layList.tool(function (event, data, obj) {
+        switch (event) {
+            case 'order_paid':
+                var url = layList.U({c: 'order.store_order', a: 'offline', p: {id: data.id}});
+                $eb.$swal('delete', function () {
+                    $eb.axios.get(url).then(function (res) {
+                        if (res.status == 200 && res.data.code == 200) {
+                            $eb.$swal('success', res.data.msg);
+                        } else
+                            return Promise.reject(res.data.msg || '修改失败')
+                    }).catch(function (err) {
+                        $eb.$swal('error', err);
+                    });
+                }, {'title': '您确定要修改支付状态吗？', 'text': '修改后将无法恢复,请谨慎操作！', 'confirm': '是的，我要修改'})
+                break;
+            case 'verify':
+                var url = layList.U({c: 'order.store_order', a: 'verify', p: {id: data.id}});
+                $eb.$swal('delete', function () {
+                    $eb.axios.get(url).then(function (res) {
+                        if (res.status == 200 && res.data.code == 200) {
+                            $eb.$swal('success', res.data.msg);
+                        } else
+                            return Promise.reject(res.data.msg || '核销失败')
+                    }).catch(function (err) {
+                        $eb.$swal('error', err);
+                    });
+                }, {'title': '您确定核销该订单吗？', 'text': '修改后将无法恢复,请谨慎操作！', 'confirm': '是的，我要核销'})
+                break;
+            case 'marke':
+                var url = layList.U({c: 'order.store_order', a: 'remark'}),
+                    id = data.id,
+                    make = data.remark;
+                $eb.$alert('textarea', {title: '请修改内容', value: make}, function (result) {
+                    if (result) {
+                        $.ajax({
+                            url: url,
+                            data: 'remark=' + result + '&id=' + id,
+                            type: 'post',
+                            dataType: 'json',
+                            success: function (res) {
+                                if (res.code == 200) {
+                                    $eb.$swal('success', res.msg);
+                                } else
+                                    $eb.$swal('error', res.msg);
+                            }
+                        })
+                    } else {
+                        $eb.$swal('error', '请输入要备注的内容');
+                    }
+                });
+                break;
+            case 'danger':
+                var url = layList.U({c: 'order.store_order', a: 'take_delivery', p: {id: data.id}});
+                $eb.$swal('delete', function () {
+                    $eb.axios.get(url).then(function (res) {
+                        if (res.status == 200 && res.data.code == 200) {
+                            $eb.$swal('success', res.data.msg);
+                        } else
+                            return Promise.reject(res.data.msg || '收货失败')
+                    }).catch(function (err) {
+                        $eb.$swal('error', err);
+                    });
+                }, {'title': '您确定要修改收货状态吗？', 'text': '修改后将无法恢复,请谨慎操作！', 'confirm': '是的，我要修改'})
+                break;
+            case 'order_info':
+                $eb.createModalFrame(data.nickname + '订单详情', layList.U({a: 'order_info', q: {oid: data.id}}));
+                break;
+            case 'order_print':
+                var url = layList.U({c: 'order.store_order', a: 'order_print', p: {id: data.id}});
+                $eb.$swal('delete', function () {
+                    $eb.axios.get(url).then(function (res) {
+                        if (res.status == 200 && res.data.code == 200) {
+                            $eb.$swal('success', res.data.msg);
+                        } else
+                            return Promise.reject(res.data.msg || '核销失败')
+                    }).catch(function (err) {
+                        $eb.$swal('error', err);
+                    });
+                }, {'title': '确认打印订单？', 'text': '是否确认打印！', 'confirm': '确定'})
+                break;
+            case 'tg':
+                var url = layList.U({c: 'order.store_order', a: 'tg', p: {id: data.id}});
+                $eb.$swal('delete', function () {
+                    $eb.axios.get(url).then(function (res) {
+                        if (res.status == 200 && res.data.code == 200) {
+                            $eb.$swal('success', res.data.msg);
+                            obj.del();
+                            location.reload();
+                        } else
+                            return Promise.reject(res.data.msg || '失败')
+                    }).catch(function (err) {
+                        $eb.$swal('error', err);
+                    });
+                }, {'title': '确认通过吗？', 'text': '是否确认通过！', 'confirm': '确定'})
+                break;
+            case 'jj':
+                var url = layList.U({c: 'order.store_order', a: 'jj', p: {id: data.id}});
+                $eb.$swal('delete', function () {
+                    $eb.axios.get(url).then(function (res) {
+                        if (res.status == 200 && res.data.code == 200) {
+                            $eb.$swal('success', res.data.msg);
+                            location.reload();
+                        } else
+                            return Promise.reject(res.data.msg || '失败')
+                    }).catch(function (err) {
+                        $eb.$swal('error', err);
+                    });
+                }, {'title': '确认不通过吗？', 'text': '是否确认！', 'confirm': '确定'})
+                break;
+        }
+    })
+    var action = {
+        del_order: function () {
+            var ids = layList.getCheckData().getIds('id');
+            if (ids.length) {
+                var url = layList.U({c: 'order.store_order', a: 'del_order'});
+                $eb.$swal('delete', function () {
+                    $eb.axios.post(url, {ids: ids}).then(function (res) {
+                        if (res.status == 200 && res.data.code == 200) {
+                            $eb.$swal('success', res.data.msg);
+                        } else
+                            return Promise.reject(res.data.msg || '删除失败')
+                    }).catch(function (err) {
+                        $eb.$swal('error', err);
+                    });
+                }, {'title': '您确定要修删除订单吗？', 'text': '删除后将无法恢复,请谨慎操作！', 'confirm': '是的，我要删除'})
+            } else {
+                layList.msg('请选择要删除的订单');
+            }
+        },
+        write_order: function () {
+            return $eb.createModalFrame('订单核销', layList.U({a: 'write_order'}), {w: 500, h: 400});
+        },
+    };
+    $('#container-action').find('button').each(function () {
+        $(this).on('click', function () {
+            var act = $(this).data('type');
+            action[act] && action[act]();
+        });
+    })
+    //下拉框
+    $(document).click(function (e) {
+        $('.layui-nav-child').hide();
+    })
+
+    function dropdown(that) {
+        var oEvent = arguments.callee.caller.arguments[0] || event;
+        oEvent.stopPropagation();
+        var offset = $(that).offset();
+        var top = offset.top - $(window).scrollTop();
+        var index = $(that).parents('tr').data('index');
+        $('.layui-nav-child').each(function (key) {
+            if (key != index) {
+                $(this).hide();
+            }
+        })
+        if ($(document).height() < top + $(that).next('ul').height()) {
+            $(that).next('ul').css({
+                'padding': 10,
+                'top': -($(that).parents('td').height() / 2 + $(that).height() + $(that).next('ul').height() / 2),
+                'min-width': 'inherit',
+                'position': 'absolute'
+            }).toggle();
+        } else {
+            $(that).next('ul').css({
+                'padding': 10,
+                'top': $(that).parents('td').height() / 2 + $(that).height(),
+                'min-width': 'inherit',
+                'position': 'absolute'
+            }).toggle();
+        }
+    }
+
+    var real_name = '<?=$real_name?>';
+    var orderCount =<?=json_encode($orderCount)?>, payTypeCount =<?=json_encode($payTypeCount)?>,
+        status =<?=$status ? $status : "''"?>;
+    require(['vue'], function (Vue) {
+        new Vue({
+            el: "#app",
+            data: {
+                badge: [],
+                payType: [
+                    {name: '全部', value: ''},
+                    {name: '微信支付', value: 1, count: payTypeCount.weixin},
+                    {name: '余额支付', value: 2, count: payTypeCount.yue},
+                    {name: '线下支付', value: 3, count: payTypeCount.offline},
+                    {name: '支付宝', value: 4, count: payTypeCount.zfb},
+                ],
+                orderType: [
+                    {name: '全部', value: ''},
+                    {name: '普通订单', value: 1, count: orderCount.general},
+                    {name: '拼团订单', value: 2, count: orderCount.pink},
+                    {name: '秒杀订单', value: 3, count: orderCount.seckill},
+                    {name: '砍价订单', value: 4, count: orderCount.bargain},
+                ],
+                orderStatus: [
+                    {name: '全部', value: ''},
+                    {name: '已卖出', value: 9, count: orderCount.ys},
+                    {name: '未发货', value: 1, count: orderCount.wf, class: true},
+                    {name: '待核销', value: 5, count: orderCount.write_off, class: true},
+                    {name: '未支付', value: 0, count: orderCount.wz},
+                    {name: '待收货', value: 2, count: orderCount.ds},
+                    {name: '待评价', value: 3, count: orderCount.dp},
+                    {name: '交易完成', value: 4, count: orderCount.jy},
+                    {name: '退款中', value: -1, count: orderCount.tk, class: true},
+                    {name: '已退款', value: -2, count: orderCount.yt},
+                    {name: '已删除', value: -4, count: orderCount.del},
+                ],
+                examine_status: [
+                    {name: '全部', value: ''},
+                    {name: '通过', value: 2},
+                    {name: '待审核', value: 1},
+                    {name: '未通过', value: -1},
+                ],
+                dataList: [
+                    {name: '全部', value: ''},
+                    {name: '今天', value: 'today'},
+                    {name: '昨天', value: 'yesterday'},
+                    {name: '最近7天', value: 'lately7'},
+                    {name: '最近30天', value: 'lately30'},
+                    {name: '本月', value: 'month'},
+                    {name: '本年', value: 'year'},
+                ],
+                where: {
+                    data: '',
+                    status: status,
+                    type: '',
+                    pay_type: '',
+                    examine_status:'',
+                    real_name: real_name || '',
+                    excel: 0,
+                },
+                showtime: false,
+            },
+            watch: {
+                'where.status': function () {
+                    this.where.excel = 0;
+                    this.getBadge();
+                    layList.reload(this.where, true);
+                },
+                'where.data': function () {
+                    this.where.excel = 0;
+                    this.getBadge();
+                    layList.reload(this.where, true);
+                },
+                'where.type': function () {
+                    this.where.excel = 0;
+                    this.getBadge();
+                    layList.reload(this.where, true);
+                },
+                'where.pay_type': function () {
+                    this.where.excel = 0;
+                    this.getBadge();
+                    layList.reload(this.where, true);
+                },
+                'where.examine_status': function () {
+                    this.where.excel = 0;
+                    this.getBadge();
+                    layList.reload(this.where, true);
+                }
+            },
+            methods: {
+                setData: function (item) {
+                    var that = this;
+                    if (item.is_zd == true) {
+                        that.showtime = true;
+                        this.where.data = this.$refs.date_time.innerText;
+                    } else {
+                        this.showtime = false;
+                        this.where.data = item.value;
+                    }
+                },
+                getBadge: function () {
+                    var that = this;
+                    layList.basePost(layList.Url({c: 'order.store_order', a: 'getBadge'}), this.where, function (rem) {
+                        that.badge = rem.data;
+                    });
+                },
+                search: function () {
+                    this.where.excel = 0;
+                    this.getBadge();
+                    layList.reload(this.where, true);
+                },
+                refresh: function () {
+                    layList.reload();
+                    this.getBadge();
+                },
+                excel: function () {
+                    this.where.excel = 1;
+                    location.href = layList.U({c: 'order.store_order', a: 'order_list', q: this.where});
+                    this.where.excel = 0;
+                }
+            },
+            mounted: function () {
+                var that = this;
+                that.getBadge();
+                window.formReload = this.search;
+                layList.laydate.render({
+                    elem: this.$refs.date_time,
+                    trigger: 'click',
+                    eventElem: this.$refs.time,
+                    range: true,
+                    change: function (value) {
+                        that.where.data = value;
+                    }
+                });
+            }
+        })
+    });
+</script>
+{/block}

app/admin/view/user/examine/index.php

@@ -0,0 +1,237 @@
+{extend name="public/container"}
+{block name="head_top"}
+
+{/block}
+{block name="content"}
+<style>
+    .btn-outline{
+        border:none;
+    }
+    .btn-outline:hover{
+        background-color: #0e9aef;
+        color: #fff;
+    }
+    .layui-form-item .layui-btn {
+        margin-top: 5px;
+        margin-right: 10px;
+    }
+    .layui-btn-primary{
+        margin-right: 10px;
+        margin-left: 0!important;
+    }
+    label{
+        margin-bottom: 0!important;
+        margin-top: 4px;
+    }
+</style>
+<div class="layui-fluid">
+    <div class="layui-row layui-col-space15" id="app">
+        <!--搜索条件-->
+        <div class="layui-col-md12">
+            <div class="layui-card">
+                <div class="layui-card-header">搜索条件</div>
+                <div class="layui-card-body">
+                    <div class="layui-carousel layadmin-carousel layadmin-shortcut" lay-anim="" lay-indicator="inside" lay-arrow="none" style="background:none">
+                        <form class="layui-form layui-form-pane" action="">
+                            <div class="layui-form-item">
+
+                                <div class="layui-col-lg12">
+                                    <label class="layui-form-label" style="top: -5.5px;">搜索条件</label>
+                                    <div class="layui-input-inline">
+                                        <input type="text" id="name" name="name" class="layui-input" placeholder="请输入名称">
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
+                                    <div class="layui-input-inline">
+                                        <button class="layui-btn layui-btn-sm layui-btn-normal" lay-submit="search" lay-filter="search">
+                                            <i class="layui-icon layui-icon-search"></i>搜索</button>
+                                    </div>
+                                </div>
+                            </div>
+                        </form>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <!-- 中间详细信息-->
+        <div :class="item.col!=undefined ? 'layui-col-sm'+item.col+' '+'layui-col-md'+item.col:'layui-col-sm6 layui-col-md3'"
+             v-for="item in badge" v-cloak="" v-if="item.count > 0">
+        </div>
+        <!--enb-->
+    </div>
+    <!--列表-->
+    <div class="layui-row layui-col-space15">
+        <div class="layui-col-md12">
+            <div class="layui-card">
+                <div class="layui-card-header">场次列表</div>
+                <div class="layui-card-body">
+
+                    <div class="layui-btn-container" id="container-action">
+<!--                        <a class="layui-btn layui-btn-sm" onclick="$eb.createModalFrame(this.innerText,'{:Url('create')}',{h:700,w:1100})">添加众筹</a>-->
+<!--                        <button class="layui-btn layui-btn-sm" data-type="del_auction">批量删除</button>-->
+                    </div>
+                    <table class="layui-hide" id="List" lay-filter="List"></table>
+                    <script type="text/html" id="type">
+                        {{#  if(d.type == 1){ }}
+                        <button type="button" class="layui-btn layui-btn-xs layui-btn-danger">
+                            余额
+                        </button>
+                        {{#  } else if(d.type == 2) { }}
+                        <button type="button" class="layui-btn layui-btn-xs layui-btn-danger">
+                            静态积分
+                        </button>
+                        {{#  } else if(d.type == 3) { }}
+                        <button type="button" class="layui-btn layui-btn-xs layui-btn-danger">
+                            消费券
+                        </button>
+                        {{#  } }}
+                    </script>
+                    <script type="text/html" id="pm">
+                        {{#  if(d.pm == 1){ }}
+                        <button type="button" class="layui-btn layui-btn-xs layui-btn-danger">
+                            增加
+                        </button>
+                        {{#  } else if(d.pm == 0) { }}
+                        <button type="button" class="layui-btn-disabled layui-btn-xs layui-btn-danger">
+                            减少
+                        </button>
+                        {{#  } }}
+                    </script>
+
+                    <script type="text/html" id="status">
+                        {{#  if(d.status == 0){ }}
+                        <button type="button" class="layui-btn layui-btn-xs layui-btn-danger">
+                            待审核
+                        </button>
+                        {{#  } else if(d.status == 1) { }}
+                        <button type="button" class="layui-btn layui-btn-xs layui-btn-danger">
+                            通过
+                        </button>
+                        {{#  } else if(d.status == -1) { }}
+                        <button type="button" class="layui-btn-disabled layui-btn-xs layui-btn-danger">
+                            不通过
+                        </button>
+                        {{#  } }}
+                    </script>
+                    <script type="text/html" id="act">
+                        {if ($role == 3)}
+                        <button type="button" class="layui-btn layui-btn-xs layui-btn-danger" lay-event='tg' id="">
+                            通过
+                        </button>
+                        <button type="button" class="layui-btn layui-btn-xs layui-btn-danger" lay-event='jj' id="">
+                            拒绝
+                        </button>
+                        {/if}
+                    </script>
+                </div>
+            </div>
+        </div>
+    </div>
+    <!--end-->
+</div>
+<script src="{__ADMIN_PATH}js/layuiList.js"></script>
+{/block}
+{block name="script"}
+<script>
+    layList.tableList('List', "{:Url('list')}", function () {
+        return [
+            {type: 'checkbox'},
+            {field: 'id', title: 'ID', sort: true, event: 'id', width: '5%', templet: '#id'},
+            {field: 'uid', title: '用户uid',  align: 'center'},
+            {field: 'phone', title: '用户手机号',  align: 'center'},
+            {field: 'real_name', title: '提交人', align: 'center'},
+            {field: 'cw_name', title: '审核人', align: 'center'},
+            {field: 'price', title: '金额', align: 'center'},
+            {field: 'type', title: '类型',templet: '#type', align: 'center'},
+            {field: 'pm', title: '类型',templet: '#pm', align: 'center'},
+            {field: 'status', title: '状态', templet: '#status', align: 'center'},
+            {field: 'create_time', title: '提交时间', align: 'center', width: '8%'},
+            {field: 'right', title: '操作', align: 'center', toolbar: '#act',width: '15%'},
+        ];
+    });
+
+    //查询
+    layList.search('search',function(where){
+        layList.reload(where,true);
+    });
+
+    //点击事件绑定
+    layList.tool(function (event,data,obj) {
+        switch (event) {
+            case 'delete':
+                var url=layList.U({c:'many.many',a:'delete',q:{id:data.id}});
+                var code = {title:"操作提示",text:"确定将该商品移入回收站吗？",type:'info',confirm:'是的，移入回收站'};
+                $eb.$swal('delete',function(){
+                    $eb.axios.get(url).then(function(res){
+                        if(res.status == 200 && res.data.code == 200) {
+                            $eb.$swal('success',res.data.msg);
+                            obj.del();
+                            location.reload();
+                        }else
+                            return Promise.reject(res.data.msg || '删除失败')
+                    }).catch(function(err){
+                        $eb.$swal('error',err);
+                    });
+                },code)
+                break;
+            case 'tg':
+                var url=layList.U({c:'user.examine',a:'tg',q:{id:data.id}});
+                var code = {title:"操作提示",text:"确定通过吗？",type:'info',confirm:'是的'};
+                $eb.$swal('delete',function(){
+                    $eb.axios.get(url).then(function(res){
+                        if(res.status == 200 && res.data.code == 200) {
+                            $eb.$swal('success',res.data.msg);
+                            obj.del();
+                            location.reload();
+                        }else
+                            return Promise.reject(res.data.msg || '通过失败')
+                    }).catch(function(err){
+                        $eb.$swal('error',err);
+                    });
+                },code)
+                break;
+            case 'jj':
+                var url=layList.U({c:'user.examine',a:'jj',q:{id:data.id}});
+                var code = {title:"操作提示",text:"确定拒绝吗？",type:'info',confirm:'是的'};
+                $eb.$swal('delete',function(){
+                    $eb.axios.get(url).then(function(res){
+                        if(res.status == 200 && res.data.code == 200) {
+                            $eb.$swal('success',res.data.msg);
+                            obj.del();
+                            location.reload();
+                        }else
+                            return Promise.reject(res.data.msg || '拒绝失败')
+                    }).catch(function(err){
+                        $eb.$swal('error',err);
+                    });
+                },code)
+                break;
+            case 'open_image':
+                $eb.openImage(data.image);
+                break;
+            case 'edit':
+                location.href = layList.U({a:'edit',q:{id:data.id}});
+                break;
+        }
+    })
+
+
+    //改状态
+    layList.switch('status',function (odj,value) {
+        if(odj.elem.checked==true){
+            layList.baseGet(layList.Url({c:'auction.auction',a:'set_status',p:{status:1,id:value}}),function (res) {
+                layList.msg(res.msg, function () {
+                    layList.reload();
+                });
+            });
+        }else{
+            layList.baseGet(layList.Url({c:'auction.auction',a:'set_status',p:{status:0,id:value}}),function (res) {
+                layList.msg(res.msg, function () {
+                    layList.reload();
+                });
+            });
+        }
+    });
+</script>
+{/block}

app/api/controller/PublicController.php

@@ -13,6 +13,7 @@ use app\models\system\SystemStore;
 use app\models\system\SystemStoreStaff;
 use app\models\user\User;
 use app\models\user\UserBill;
+use app\models\user\UserPay;
 use app\models\user\WechatUser;
 use app\Request;
 use crmeb\services\CacheService;
@@ -24,6 +25,7 @@ use think\db\exception\ModelNotFoundException;
 use think\facade\Cache;
 use crmeb\services\upload\Upload;
 use think\facade\Db;
+use think\facade\Validate;
 
 /**
  * 公共类
@@ -332,6 +334,131 @@ class PublicController
         return app('json')->successful($list);
     }
 
+    /**
+     * 添加收款方式
+     * @param Request $request
+     * @return void
+     */
+    public function pay(Request $request)
+    {
+        $data = UtilService::postMore([
+            ['payment'],
+            ['image'],
+            ['bank'],
+            ['name'],
+            ['type'],
+            ['phone'],
+            ['bank_name']
+        ], $request);
+        if (!$data['type'])  return app('json')->fail('数据传入错误');
+        $data['uid'] =$request->uid();
+        $model = new UserPay();
+        $pay = $model->where([['uid', '=', $request->uid()], ['type', '=', $data['type']]])->find();
+        $res = Validate::rule([
+            'phone' => 'mobile'
+        ]);
+        $res->message([
+            'phone.mobile' => '请填写正确手机格式'
+        ]);
+        if (!$res->check($data)){
+            return app('json')->fail($res->getError());
+        }
+        if (!empty($pay)){
+            if ($data['type'] == 1 ){
+                // 微信收款方式
+                if (!$data['payment'])  return app('json')->fail('微信账号不能为空');
+                if (!$data['image'])  return app('json')->fail('二维码不能为空');
+                if (!$data['name'])  return app('json')->fail('姓名不能为空');
+                $pay['payment'] = $data['payment'];
+                $pay['image'] = $data['image'];
+                $pay['name'] = $data['name'];
+                $pay['phone'] = $data['phone'];
+            }elseif ($data['type'] == 2){
+                // 支付宝收款方式
+                if (!$data['payment'])  return app('json')->fail('支付宝账号不能为空');
+                if (!$data['name'])  return app('json')->fail('姓名不能为空');
+                $pay['payment'] = $data['payment'];
+                $pay['name'] = $data['name'];
+                $pay['phone'] = $data['phone'];
+            }elseif ($data['type'] == 3){
+                // 银行卡收款方式
+                if (!preg_match('/^([1-9]{1})(\d{14}|\d{18})$/', $data['payment']))
+                    return app('json')->fail('银行卡号输入有误');
+                if (!$data['payment'])  return app('json')->fail('银行卡号不能为空');
+                if (!$data['name'])  return app('json')->fail('姓名不能为空');
+                if (!$data['bank'])  return app('json')->fail('开户行不能为空');
+                if (!$data['bank_name'])  return app('json')->fail('开户支行不能为空');
+                if (!$data['phone'])  return app('json')->fail('请填写手机号');
+                $pay['payment'] = $data['payment'];
+                $pay['bank'] = $data['bank'];
+                $pay['bank_name'] = $data['bank_name'];
+                $pay['phone'] = $data['phone'];
+                $pay['name'] = $data['name'];
+
+            }
+            $res = $pay->save();
+            if ($res) return app('json')->successful('修改成功');
+            return app('json')->fail('修改失败');
+        }else{
+            if ($data['type'] == 1 ){
+                // 微信收款方式
+                if (!$data['payment'])  return app('json')->fail('微信账号不能为空');
+                if (!$data['image'])  return app('json')->fail('二维码不能为空');
+                if (!$data['name'])  return app('json')->fail('姓名不能为空');
+                if (!$data['phone'])  return app('json')->fail('请填写手机号');
+
+            }elseif ($data['type'] == 2){
+                // 支付宝收款方式
+                if (!$data['payment'])  return app('json')->fail('支付宝账号不能为空');
+                if (!$data['name'])  return app('json')->fail('姓名不能为空');
+                if (!$data['phone'])  return app('json')->fail('请填写手机号');
+
+            }elseif ($data['type'] == 3){
+                // 银行卡收款方式
+                if (!preg_match('/^([1-9]{1})(\d{14}|\d{18})$/', $data['payment']))
+                    return app('json')->fail('银行卡号输入有误');
+                if (!$data['payment'])  return app('json')->fail('银行卡号不能为空');
+                if (!$data['name'])  return app('json')->fail('姓名不能为空');
+                if (!$data['bank'])  return app('json')->fail('开户行不能为空');
+                if (!$data['bank_name'])  return app('json')->fail('开户支行不能为空');
+                if (!$data['phone'])  return app('json')->fail('请填写手机号');
+            }
+            $res = $model->save($data);
+            if ($res) return app('json')->successful('添加成功');
+            return app('json')->fail('添加失败');
+        }
+    }
+
+    /**
+     * 收款方式详情
+     * @param Request $request
+     * @return mixed
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    public function pay_list(Request $request)
+    {
+        $model = new UserPay();
+        $list = $model->where('uid', $request->uid())->select();
+
+        $list = empty($list)? []: $list->toArray();
+        $data['wx'] = [];
+        $data['zfb'] = [];
+        $data['bank'] = [];
+        foreach ($list as $k => $v){
+            if ($v['type'] == 1){
+                $data['wx'] = $v;
+            }elseif ($v['type'] == 2){
+                $data['zfb'] = $v;
+            }elseif ($v['type'] == 3){
+                $data['bank'] = $v;
+            }
+        }
+        return app('json')->successful($data);
+    }
+
+
 
     public function times()
     {
@@ -342,13 +469,13 @@ class PublicController
         } catch (\Exception $e) {
             Db::rollback();
         }
-        try {
-            Db::startTrans();
-            User::release_today();
-            Db::commit();
-        } catch (\Exception $e) {
-            Db::rollback();
-        }
+//        try {
+//            Db::startTrans();
+//            User::release_today();
+//            Db::commit();
+//        } catch (\Exception $e) {
+//            Db::rollback();
+//        }
         User::time();
 
     }

app/api/controller/user/UserExtractController.php

@@ -70,6 +70,7 @@ class UserExtractController
             ['type'],
         ], $request);
         if (cache($request->uid())) return app('json')->fail('请勿频繁点击');
+        cache($request->uid(), 1, 3);
         if (!preg_match('/^(([1-9]\d*)|0)(\.\d{1-2})?$/', $extractInfo['money'])) return app('json')->fail('提现金额输入有误');
         $user = $request->user();
         $broken_time = intval(sys_config('extract_time'));
@@ -97,7 +98,6 @@ class UserExtractController
         if (!$extractInfo['cardnum'] == '')
             if (!preg_match('/^([1-9]{1})(\d{14}|\d{18})$/', $extractInfo['cardnum']))
                 return app('json')->fail('银行卡号输入有误');
-        cache($request->uid(), 1, 5);
         if (UserExtract::userExtract($request->user(), $extractInfo))
             return app('json')->successful('申请提现成功!');
         else

app/models/store/StoreOrder.php

@@ -341,8 +341,9 @@ class StoreOrder extends BaseModel
                 $gainIntegral = bcadd($gainIntegral, $cartInfoGainIntegral, 2);
             }
             if ($shop_number < $number) return self::setErrorInfo('环球优购专区最大购买数'.$shop_number, true);
-            if ($shop_number - $userInfo['shop_number'] < $number) return self::setErrorInfo('环球优购专区还能最大购买数'.($shop_number - $userInfo['shop_number']), true);
-
+            if($number > 0){
+                if ($shop_number - $userInfo['shop_number'] < $number) return self::setErrorInfo('环球优购专区还能最大购买数'.($shop_number - $userInfo['shop_number']), true);
+            }
             $deduction = $seckill_id || $bargain_id || $combinationId;
             if ($deduction) {
                 $couponId = 0;

app/models/user/UserPay.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace app\models\user;
+
+use app\models\store\StoreProduct;
+use crmeb\services\SystemConfigService;
+use think\facade\Db;
+use crmeb\traits\ModelTrait;
+use crmeb\basic\BaseModel;
+
+/**
+ * TODO 场馆model
+ * Class Article
+ * @package app\models\article
+ */
+class UserPay extends BaseModel
+{
+    /**
+     * 数据表主键
+     * @var string
+     */
+    protected $pk = 'id';
+
+    /**
+     * 模型名称
+     * @var string
+     */
+    protected $name = 'user_pay';
+
+    use ModelTrait;
+    protected $autoWriteTimestamp = true;
+
+
+}

route/api/route.php

@@ -169,6 +169,9 @@ Route::group(function () {
     // 观看广告释放
     Route::post('advertisement', 'user.UserController/advertisement')->name('advertisement');//观看广告释放
     Route::post('user/accounts', 'user.UserController/accounts')->name('accounts');//转账
+
+    Route::post('public/pay', 'PublicController/pay')->name('pay');// 添加收款方式
+    Route::get('public/pay_list', 'PublicController/pay_list')->name('pay_list');// 用户收款方式
 })->middleware(\app\http\middleware\AllowOriginMiddleware::class)->middleware(\app\http\middleware\AuthTokenMiddleware::class, true);
 //未授权接口
 Route::group(function () {