diff --git a/app/data/controller/ShopOrder.php b/app/data/controller/ShopOrder.php index fd4daba90..4dc96bcb9 100644 --- a/app/data/controller/ShopOrder.php +++ b/app/data/controller/ShopOrder.php @@ -86,7 +86,7 @@ class ShopOrder extends Controller protected function _index_page_filter(array &$data) { UserAdminService::instance()->buildByUid($data); - UserAdminService::instance()->buildByUid($data, 'puid1', 'fromer'); + UserAdminService::instance()->buildByUid($data, 'puid1', 'from'); OrderService::instance()->buildData($data); foreach ($data as &$vo) $vo['payment_name'] = PaymentService::name($vo['payment_type']); } diff --git a/app/data/service/OrderService.php b/app/data/service/OrderService.php index 08d194ec8..5d5072edd 100644 --- a/app/data/service/OrderService.php +++ b/app/data/service/OrderService.php @@ -131,7 +131,7 @@ class OrderService extends Service $query = $this->app->db->name('ShopOrderItem')->where(['status' => 1, 'deleted' => 0]); $items = $query->withoutField('id,uid,status,deleted,create_at')->whereIn('order_no', $nobs)->select()->toArray(); // 关联用户数据 - $fields = 'phone,username,nickname,headimg,status'; + $fields = 'phone,username,nickname,headimg,status,vip_code,vip_name'; UserAdminService::instance()->buildByUid($data, 'uid', 'user', $fields); if ($fromer) UserAdminService::instance()->buildByUid($data, 'puid1', 'fromer', $fields); foreach ($data as &$vo) { diff --git a/app/data/view/shop_order/index.html b/app/data/view/shop_order/index.html index c84d9f4f7..e68d8d6ed 100644 --- a/app/data/view/shop_order/index.html +++ b/app/data/view/shop_order/index.html @@ -40,16 +40,20 @@