【Add】增加产品类型，增加省份城市联动筛选

app/Http/Controllers/Admin/Product.php

@@ -50,11 +50,13 @@ class Product extends Auth{
 		// 如果存在省份ID
 		if( $provinceId )		{
 			// 循环城市列表
-			foreach ($cityList as $group) {
+			foreach ($cityList as $key=>$group) {
 				// 如果省份ID对的上
 				if( $group['id'] == $provinceId){
 					// 获取下面的城市ID
 					$cityIds = array_merge($cityIds,array_column($group['city'],'id'));
+				}else{
+					unset($cityList[$key]);
 				}
 			}
 		}
@@ -266,6 +268,7 @@ class Product extends Auth{
 			$data['puton_time']		= request('puton_time','');
 			$data['putoff_time']	= request('putoff_time','');
 			$data['stock']			= request('stock',0);
+			$data['type_id']		= request('type_id',0);
 			$data['status']			= 1;
 			$data['admin_uid']		= admin('uid');
 			$description			= request('description','');
@@ -494,6 +497,7 @@ class Product extends Auth{
 			$data['putoff_time']	= request('putoff_time','');
 			$data['producer_id']	= request('producer_id',0);
 			$data['business_id']	= request('business_id',0);
+			$data['type_id']		= request('type_id',0);
 			$data['stock']			= request('stock',0);
 			$data['status']			= 1;
 			$description			= request('description','');
@@ -746,6 +750,7 @@ class Product extends Auth{
 			$data['puton_time']		= request('puton_time','');
 			$data['putoff_time']	= request('putoff_time','');
 			$data['stock']			= request('stock',0);
+			$data['type_id']		= request('type_id',0);
 			$data['status']			= 1;
 			$data['admin_uid']		= admin('uid');
 			$description			= request('description','');

resources/views/admin/product/copy.blade.php

@@ -106,7 +106,7 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 		<label class="control-label">商品类型</label>
 		<select name="type_id" class="form-control" id="typeId">
 			@foreach ($typeList as $value)
-				<option value="{{$value['id']}}"  >{{$value['name']}}</option>
+				<option value="{{$value['id']}}" @if( $oldData['type_id'] == $value['id'] ) selected @endif >{{$value['name']}}</option>
 			@endforeach
 		</select>
 	</div>

resources/views/admin/product/edit.blade.php

@@ -106,7 +106,7 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 		<label class="control-label">商品类型</label>
 		<select name="type_id" class="form-control" id="typeId">
 			@foreach ($typeList as $value)
-				<option value="{{$value['id']}}"  >{{$value['name']}}</option>
+				<option value="{{$value['id']}}" @if( $oldData['type_id'] == $value['id'] ) selected @endif  >{{$value['name']}}</option>
 			@endforeach
 		</select>
 	</div>

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

@@ -25,7 +25,7 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 			<option value="4" @if (request('status') === '4' ) selected="selected" @endif >已结束</option>
 		</select>
 	</div>
-	<div class="form-group col col-lg-2 col-md-2 col-sm-2 col-xs-12">
+	<div class="form-group col col-lg-2 col-md-2 col-sm-2 col-xs-12" style="margin-right: 2px;">
 		<select name="province_id" class="form-control" >
 			<option value="" >选择省份</option>
 			@foreach ($cityList as $group)
@@ -33,7 +33,7 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 			@endforeach
 		</select>
 	</div>
-	<div class="form-group col col-lg-2 col-md-2 col-sm-2 col-xs-12">
+	<div class="form-group col col-lg-2 col-md-2 col-sm-2 col-xs-12" style="margin-right: 2px;">
 		<select name="city_ids[]" class="form-control selectpicker" data-max-options="20" data-live-search="true" data-live-search-placeholder="搜索城市" data-none-results-text="未搜索到 {0}" title="选择城市" multiple>
 			@foreach ($cityList as $group)
 			<optgroup label="{{$group['name']}}">