|
@@ -79,17 +79,17 @@ class Order extends Controller
|
|
|
$query->like('order_no,truck_name,truck_phone,truck_province|truck_area|truck_address#address,truck_send_no,truck_send_name');
|
|
|
$query->equal('status,payment_type,payment_status')->dateBetween('create_at,payment_datetime,cancel_datetime,truck_datetime,truck_send_datetime');
|
|
|
|
|
|
-// // 发货信息搜索
|
|
|
-// $db = ShopOrderSend::mQuery()->like('address_name#truck_address_name,address_phone#truck_address_phone,address_province|address_city|address_area|address_content#truck_address_content')->db();
|
|
|
-// if ($db->getOptions('where')) $query->whereRaw("order_no in {$db->field('order_no')->buildSql()}");
|
|
|
-//
|
|
|
-// // 用户搜索查询
|
|
|
-// $db = DataUser::mQuery()->like('phone|nickname#user_keys')->db();
|
|
|
-// if ($db->getOptions('where')) $query->whereRaw("uuid in {$db->field('id')->buildSql()}");
|
|
|
-//
|
|
|
-// // 代理搜索查询
|
|
|
-// $db = DataUser::mQuery()->like('phone|nickname#from_keys')->db();
|
|
|
-// if ($db->getOptions('where')) $query->whereRaw("puid1 in {$db->field('id')->buildSql()}");
|
|
|
+ // 发货信息搜索
|
|
|
+ $db = ShopOrderSend::mQuery()->like('address_name#truck_address_name,address_phone#truck_address_phone,address_province|address_city|address_area|address_content#truck_address_content')->db();
|
|
|
+ if ($db->getOptions('where')) $query->whereRaw("order_no in {$db->field('order_no')->buildSql()}");
|
|
|
+
|
|
|
+ // 用户搜索查询
|
|
|
+ $db = DataUser::mQuery()->like('phone|nickname#user_keys')->db();
|
|
|
+ if ($db->getOptions('where')) $query->whereRaw("uuid in {$db->field('id')->buildSql()}");
|
|
|
+
|
|
|
+ // 代理搜索查询
|
|
|
+ $db = DataUser::mQuery()->like('phone|nickname#from_keys')->db();
|
|
|
+ if ($db->getOptions('where')) $query->whereRaw("puid1 in {$db->field('id')->buildSql()}");
|
|
|
|
|
|
// 列表选项卡
|
|
|
if (is_numeric($this->type = trim(input('type', 'ta'), 't'))) {
|