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

@@ -5,6 +5,7 @@ namespace App\Console\Commands\Update;
 use App\Helper\Arr;
 use App\Helper\Arr;
 use App\Http\Logic\Bside\News\NewsLogic;
 use App\Http\Logic\Bside\News\NewsLogic;
 use App\Http\Logic\Bside\Product\CategoryLogic;
 use App\Http\Logic\Bside\Product\CategoryLogic;
+use App\Jobs\SyncImageFileJob;
 use App\Models\Blog\Blog;
 use App\Models\Blog\Blog;
 use App\Models\Collect\CollectSource;
 use App\Models\Collect\CollectSource;
 use App\Models\Collect\CollectTask;
 use App\Models\Collect\CollectTask;
@@ -1062,6 +1063,9 @@ class ProjectUpdate extends Command
                         'updated_at' => date('Y-m-d H:i:s'),
                         'updated_at' => date('Y-m-d H:i:s'),
                     ]);
                     ]);
 
 
+                    //同步到177
+                    $new_url_name = basename($new_url);
+                    SyncImageFileJob::dispatch(['path' => str_replace('/' . $new_url_name, '', $new_url), 'name' => $new_url_name, 'location' => 0]);
                     return getImageUrl($new_url);
                     return getImageUrl($new_url);
                 } else {
                 } else {
                     return $url_complete;
                     return $url_complete;

@@ -25,7 +25,7 @@ class InquiryController extends BaseController
 {
 {
 
 
     public function form_list(){
     public function form_list(){
-        $list = InquiryForm::where('is_default', 0)->get();
+        $list = InquiryForm::where('is_default', 0)->orderBy('title', 'desc')->get();
         $data = $list->toArray();
         $data = $list->toArray();
         foreach ($data as &$item){
         foreach ($data as &$item){
             $field_text = [];
             $field_text = [];

@@ -103,6 +103,11 @@ 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;