Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -89,6 +89,14 @@ class InquiryForm extends Base
         $model = self::where('sign', $sign)->first();
         $model = self::where('sign', $sign)->first();
         if(!$model){
         if(!$model){
             $model = new self();
             $model = new self();
+
+            //移动端询盘表单
+            if($sign == md5(json_encode(["__amp_source_origin", "message", "name", "phone"]))){
+                $model->title = '移动端询盘';
+                unset($data['__amp_source_origin']);
+                $field = array_keys($data);
+            }
+
             $model->sign = $sign;
             $model->sign = $sign;
             $model->field = $field;
             $model->field = $field;
 
 
@@ -103,11 +111,6 @@ class InquiryForm extends Base
                 !$has_file && $model->is_default = 1;
                 !$has_file && $model->is_default = 1;
             }
             }
 
 
-            //移动端询盘表单
-            if($sign == md5(json_encode(["__amp_source_origin", "message", "name", "phone"]))){
-                $model->title = '移动端询盘';
-            }
-
             $model->save();
             $model->save();
         }
         }
         return $model->id;
         return $model->id;

@@ -55,6 +55,10 @@ class InquiryFormData extends Base
         if(!empty($sign_data['globalso-date'])){
         if(!empty($sign_data['globalso-date'])){
             unset($sign_data['globalso-date']);
             unset($sign_data['globalso-date']);
         }
         }
+        if(!empty($sign_data['__amp_source_origin'])){
+            unset($sign_data['__amp_source_origin']);
+            unset($data['__amp_source_origin']);
+        }
         $sign = md5(json_encode($sign_data));
         $sign = md5(json_encode($sign_data));
         //5分钟内是否有重复数据
         //5分钟内是否有重复数据
         $is_exist = self::where('sign', $sign)->where('created_at', '>', date('Y-m-d H:i:s', strtotime('-5 minute')))->first();
         $is_exist = self::where('sign', $sign)->where('created_at', '>', date('Y-m-d H:i:s', strtotime('-5 minute')))->first();
@@ -62,6 +66,7 @@ class InquiryFormData extends Base
             return 0;
             return 0;
         }
         }
 
 
+
         $model = new self();
         $model = new self();
         $model->form_id = $form_id;
         $model->form_id = $form_id;
         $model->domain = $domain;
         $model->domain = $domain;