Merge branch 'liuxiangxin' into jun

app/Http/Controllers/Admin/Product.php

@@ -715,6 +715,8 @@ class Product extends Auth{
 			$data['min_quota']		= request('min_quota',0);
 			$data['quota_start']	= request('quota_start','');
 			$data['quota_end']		= request('quota_end','');
+			$data['puton_time']		= request('puton_time','');
+			$data['putoff_time']	= request('putoff_time','');
 			$data['stock']			= request('stock',0);
 			$data['status']			= 1;
 			$data['admin_uid']		= admin('uid');

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

@@ -84,11 +84,11 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 	</div>
 	<div class="form-group col-sm-2">
 		<label class="control-label">限购开始</label>
-		<input class="form-control" type="datetime-local" placeholder="限购开始时间"  name="quota_start" value="{{date('Y-m-d H:i',$oldData['quota_start'])}}" />
+		<input class="form-control" type="datetime-local" placeholder="限购开始时间"  name="quota_start" value="{{$oldData['quota_end']?date('Y-m-d H:i',$oldData['quota_start']):''}}" />
 	</div>
 	<div class="form-group col-sm-2">
 		<label class="control-label">限购结束</label>
-		<input class="form-control" type="datetime-local" placeholder="限购结束时间" name="quota_end" value="{{date('Y-m-d H:i',$oldData['quota_end'])}}" />
+		<input class="form-control" type="datetime-local" placeholder="限购结束时间" name="quota_end" value="{{$oldData['quota_end']?date('Y-m-d H:i',$oldData['quota_end']):''}}" />
 	</div>
 	<div class="form-group col-sm-2">
 		<label class="control-label">上架时间</label>

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

@@ -139,7 +139,7 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 											预上架
 										</a>
 										@else
-										<a class="delete btn btn-sm btn-success" data-url="{{url('admin/product/set_status?'.http_build_query(['id'=>$a['id'],'status'=>'1']))}}">
+										<a class="delete btn btn-sm btn-success" data-url="{{url('admin/product/set_status?'.http_build_query(['id'=>$a['id'],'status'=>'0']))}}">
 											上架
 										</a>
 										@endif
@@ -155,7 +155,7 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 											预上架
 										</a>
 										@else
-										<a class="delete btn btn-sm btn-success" data-url="{{url('admin/product/set_status?'.http_build_query(['id'=>$a['id'],'status'=>'1']))}}">
+										<a class="delete btn btn-sm btn-success" data-url="{{url('admin/product/set_status?'.http_build_query(['id'=>$a['id'],'status'=>'0']))}}">
 											上架
 										</a>
 										@endif
@@ -166,7 +166,7 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 											预上架
 										</a>
 										@else
-										<a class="delete btn btn-sm btn-success" data-url="{{url('admin/product/set_status?'.http_build_query(['id'=>$a['id'],'status'=>'1']))}}">
+										<a class="delete btn btn-sm btn-success" data-url="{{url('admin/product/set_status?'.http_build_query(['id'=>$a['id'],'status'=>'0']))}}">
 											上架
 										</a>
 										@endif