Merge branch 'master' of ssh://8.134.10.79:222/Leadfyy.co/hainan

app/AdminSupplier/Controllers/ProductController.php

@@ -253,7 +253,7 @@ class ProductController extends AdminController
 					return $form->response()->error('对不起，你没有此类产品的发布、编辑权限');
 				}
 			} else if ($form->isEditing()) { //type不允许编辑
-				$form->deleteInput('type');
+				$form->type = $form->model()->type;
 			}
 
 			//不允许编辑的字段，忽略字段不起作用？
@@ -283,12 +283,24 @@ class ProductController extends AdminController
 				return $form->response()->error('请输入产品规格');
 			}
 
+			$form->hidden(['stock', 'original_price', 'price', 'logitude', 'latitude', 'address']);
+
 			//处理库存、市场价、销售价
-			$form->hidden(['stock', 'original_price', 'price']);
 			$form->stock = array_sum(array_column($spec, 'stock'));
 			$form->original_price = min(array_column($spec, 'original_price'));
 			$form->price = min(array_column($spec, 'price'));
 
+			//经度，纬度，地址
+			if ($form->type == 0) { //旅游线路用出发地保存
+				$form->logitude = $form->extends['field_0_departure_place_longitude'] ?? 0;
+				$form->latitude = $form->extends['field_0_departure_place_latitude'] ?? 0;
+				$form->address = $form->extends['field_0_departure_place'] ?? '';
+			} else {
+				$form->logitude = $form->extends['field_'.$form->type.'_longitude'] ?? 0;
+				$form->latitude = $form->extends['field_'.$form->type.'_latitude'] ?? 0;
+				$form->address = $form->extends['field_'.$form->type.'_address'] ?? '';
+			}
+
 			//特殊字段处理
 			if ($form->isCreating()) {
 				$form->hidden(['status', 'supplier_id']); //表单没有的字段，必须加上这句才能重置值