浏览代码

订单冗余核销人,并按照核销人搜索

lizhen_gitee 5 月之前
父节点
当前提交
cea134bda5
共有 2 个文件被更改,包括 5 次插入1 次删除
  1. 3 1
      application/admin/controller/unishop/Order.php
  2. 2 0
      public/assets/js/backend/unishop/order.js

+ 3 - 1
application/admin/controller/unishop/Order.php

@@ -75,7 +75,7 @@ class Order extends Backend
                 ->where($where)
                 ->order($sort, $order)
                 ->limit($offset, $limit)
-                ->field('order.*,user.username,intro.username as intro_username,hexiao.username as hexiao_username')
+                ->field('order.*,user.username,intro.username as intro_username,intro.mobile as intro_mobile,hexiao.username as hexiao_username,hexiao.mobile as hexiao_mobile')
                 ->select();
 
             $list = collection($list)->toArray();
@@ -86,9 +86,11 @@ class Order extends Backend
 
                 $item['intro'] = [];
                 $item['intro']['username'] = $item['intro_username'] ? $item['intro_username'] : '';
+                $item['intro']['mobile']   = $item['intro_mobile']   ? $item['intro_mobile'] : '';
 
                 $item['hexiao'] = [];
                 $item['hexiao']['username'] = $item['hexiao_username'] ? $item['hexiao_username'] : '';
+                $item['hexiao']['mobile']   = $item['hexiao_mobile']   ? $item['hexiao_mobile'] : '';
 
                 $item['have_paid_status'] = $item['have_paid'];
                 $item['have_delivered_status'] = $item['have_delivered'];

+ 2 - 0
public/assets/js/backend/unishop/order.js

@@ -101,7 +101,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'user_id', title: __('User_id')},
                         {field: 'user.username', title: __('User name')},
                         {field: 'intro.username', title: '推广人'},
+                        {field: 'intro.mobile', title: '推广人手机'},
                         {field: 'hexiao.username', title: '核销人'},
+                        {field: 'hexiao.mobile', title: '核销人手机'},
                         {field: 'out_trade_no', title: __('Out_trade_no')},
                         {field: 'order_price', title: __('Order_price'), operate:'BETWEEN'},
                         {field: 'discount_price', title: __('Discount_price'), operate:'BETWEEN'},