Merge remote-tracking branch 'origin/master' into akun

@@ -55,7 +55,7 @@ class UpdateRoute extends Command
      */
      */
     public function handle(){
     public function handle(){
         $projectModel = new Project();
         $projectModel = new Project();
-        $list = $projectModel->list(['id'=>['in',[1155]]]);
+        $list = $projectModel->list(['id'=>['in',[1659]]]);
         $data = [];
         $data = [];
         foreach ($list as $v){
         foreach ($list as $v){
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
@@ -219,18 +219,18 @@ class UpdateRoute extends Command
         if(!empty($lists)){
         if(!empty($lists)){
             foreach ($lists as $v){
             foreach ($lists as $v){
                 if(!empty($v['route'])){
                 if(!empty($v['route'])){
-                    $tag = "-product";
-                    if (!(substr($v['route'], -strlen($tag)) === $tag)) {
-                        echo date('Y-m-d H:i:s') . '拼接'.$tag . PHP_EOL;
-                        $route = $v['route'].$tag;
-                        // 如果不是以 '-product' 结尾，则拼接上 '-product'
-                        $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT, $v['id'], $v['project_id']);
-                        $productModel->edit(['route'=>$route],['id'=>$v['id']]);
-                    }else{
+//                    $tag = "-product";
+//                    if (!(substr($v['route'], -strlen($tag)) === $tag)) {
+//                        echo date('Y-m-d H:i:s') . '拼接'.$tag . PHP_EOL;
+//                        $route = $v['route'].$tag;
+//                        // 如果不是以 '-product' 结尾，则拼接上 '-product'
+//                        $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT, $v['id'], $v['project_id']);
+//                        $productModel->edit(['route'=>$route],['id'=>$v['id']]);
+//                    }else{
                         echo date('Y-m-d H:i:s') . 'id :'.$v['id'] . PHP_EOL;
                         echo date('Y-m-d H:i:s') . 'id :'.$v['id'] . PHP_EOL;
                         $route = RouteMap::setRoute($v['title'], RouteMap::SOURCE_PRODUCT, $v['id'], $v['project_id']);
                         $route = RouteMap::setRoute($v['title'], RouteMap::SOURCE_PRODUCT, $v['id'], $v['project_id']);
                         $productModel->edit(['route'=>$route],['id'=>$v['id']]);
                         $productModel->edit(['route'=>$route],['id'=>$v['id']]);
-                    }
+//                    }
                     continue;
                     continue;
                 }else{
                 }else{
                     echo date('Y-m-d H:i:s') . 'id :'.$v['id'] . PHP_EOL;
                     echo date('Y-m-d H:i:s') . 'id :'.$v['id'] . PHP_EOL;

@@ -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 = [];

+<?php
+/**
+ * @remark :
+ * @name   :Comment.php
+ * @author :lyh
+ * @method :post
+ * @time   :2024/9/9 14:53
+ */
+
+namespace App\Models\Comment;
+
+use App\Models\Base;
+
+/**
+ * @remark :評論
+ * @name   :Comment
+ * @author :lyh
+ * @method :post
+ * @time   :2024/9/9 14:54
+ */
+class Comment extends Base
+{
+    protected $table = 'gl_comment';
+    //连接数据库
+    protected $connection = 'custom_mysql';
+}

@@ -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;