【Fix】订单增加省市县查询

app/Http/Controllers/Admin/Orders.php

@@ -40,6 +40,9 @@ class Orders extends Auth{
 		$phone					= request('phone','');
 		$customCode				= request('custom_code','');
 		$productName			= request('product_name','');
+		$province				= request('contact_province','');
+		$city					= request('contact_city','');
+		$area					= request('contact_area','');
 		$status					= request('status',0);
 		$startTime				= request('start_time','');
 		$endTime				= request('end_time','');
@@ -55,6 +58,9 @@ class Orders extends Auth{
 		if( $productId )		$map[] = ['orders_product.product_id','=',$productId];
 		if( $productName )		$map[] = ['orders_product.product_name','=',$productName];
 		if( $phone )			$map[] = ['orders_addr.contact_phone','=',$phone];
+		if( $province )			$map[] = ['orders_addr.contact_province','LIKE','%'.$province.'%'];
+		if( $city )				$map[] = ['orders_addr.contact_city','LIKE','%'.$city.'%'];
+		if( $area )				$map[] = ['orders_addr.contact_area','LIKE','%'.$area.'%'];
 		if( $startTime )		$map[] = ['orders_product.insert_time','>=',strtotime($startTime)];
 		if( $endTime )			$map[] = ['orders_product.insert_time','<=',strtotime($endTime)];
 		if( $status )			$map[] = ['orders_product.status','=',$status];
@@ -255,6 +261,10 @@ class Orders extends Auth{
 		$productCode			= request('product_code','');
 		$customCode				= request('custom_code','');
 		$productName			= request('product_name','');
+		$phone					= request('phone','');
+		$province				= request('contact_province','');
+		$city					= request('contact_city','');
+		$area					= request('contact_area','');
 		$status					= request('status',0);
 		$startTime				= request('start_time','');
 		$endTime				= request('end_time','');
@@ -269,6 +279,10 @@ class Orders extends Auth{
 		if( $uid )				$map[] = ['custom.uid','=',$uid];
 		if( $productId )		$map[] = ['orders_product.product_id','=',$productId];
 		if( $productName )		$map[] = ['orders_product.product_name','=',$productName];
+		if( $phone )			$map[] = ['orders_addr.contact_phone','=',$phone];
+		if( $province )			$map[] = ['orders_addr.contact_province','LIKE','%'.$province.'%'];
+		if( $city )				$map[] = ['orders_addr.contact_city','LIKE','%'.$city.'%'];
+		if( $area )				$map[] = ['orders_addr.contact_area','LIKE','%'.$area.'%'];
 		if( $startTime )		$map[] = ['orders_product.insert_time','>=',strtotime($startTime)];
 		if( $endTime )			$map[] = ['orders_product.insert_time','<=',strtotime($endTime)];
 		if( $status )			$map[] = ['orders_product.status','=',$status];

resources/views/admin/coupon/index.blade.php

@@ -20,8 +20,8 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 			<option value="" >优惠券状态</option>
 			<option value="0" @if (request('status') === '0' ) selected="selected" @endif >正常</option>
 			<option value="2" @if (request('status') === '2' ) selected="selected" @endif >暂停</option>
-			<option value="2" @if (request('status') === '3' ) selected="selected" @endif >过期</option>
-			<option value="2" @if (request('status') === '4' ) selected="selected" @endif >作废</option>
+			<option value="3" @if (request('status') === '3' ) selected="selected" @endif >过期</option>
+			<option value="4" @if (request('status') === '4' ) selected="selected" @endif >作废</option>
 		</select>
 	</div>
 	<div class="form-group col col-md-1" style="margin-right: 2px;">

resources/views/admin/custom_coupon/index.blade.php

@@ -21,8 +21,8 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 			<option value="0" @if (request('status') === '0' ) selected="selected" @endif >正常</option>
 			<option value="1" @if (request('status') === '1' ) selected="selected" @endif >已用</option>
 			<option value="2" @if (request('status') === '2' ) selected="selected" @endif >暂停</option>
-			<option value="2" @if (request('status') === '3' ) selected="selected" @endif >过期</option>
-			<option value="2" @if (request('status') === '4' ) selected="selected" @endif >作废</option>
+			<option value="3" @if (request('status') === '3' ) selected="selected" @endif >过期</option>
+			<option value="4" @if (request('status') === '4' ) selected="selected" @endif >作废</option>
 		</select>
 	</div>
 	<div class="form-group col col-md-1" style="margin-right: 2px;">

resources/views/admin/orders/index.blade.php

@@ -25,6 +25,15 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 	<div class="form-group col col-lg-2 col-md-2 col-sm-2 col-xs-12" style="margin-right: 2px;">
 		<input type="text" class="form-control" name="product_name" value="{{request('product_name','')}}" placeholder="请输入产品名称查询" />
 	</div>
+	<div class="form-group col col-lg-2 col-md-2 col-sm-2 col-xs-12" style="margin-right: 2px;">
+		<input type="text" class="form-control" name="contact_province" value="{{request('contact_province','')}}" placeholder="请输入省份查询" />
+	</div>
+	<div class="form-group col col-lg-2 col-md-2 col-sm-2 col-xs-12" style="margin-right: 2px;">
+		<input type="text" class="form-control" name="contact_city" value="{{request('contact_city','')}}" placeholder="请输入城市查询" />
+	</div>
+	<div class="form-group col col-lg-2 col-md-2 col-sm-2 col-xs-12" style="margin-right: 2px;">
+		<input type="text" class="form-control" name="contact_area" value="{{request('contact_area','')}}" placeholder="请输入区县查询" />
+	</div>
 	<div class="form-group col col-lg-2 col-md-2 col-sm-2 col-xs-12" style="margin-right: 2px;">
 		<select name="status" class="form-control">
 			<option value="" >订单状态</option>