Merge branch 'develop' into lms

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Bside\Template;
 use App\Enums\Common\Code;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Bside\BTemplate\BTemplateModuleLogic;
+use App\Models\Template\BModuleProject;
 
 /**
  * @remark :左侧模块管理
@@ -25,8 +26,13 @@ class BTemplateModuleController extends BaseController
         if(!isset($this->map['test_model'])){
             $this->map['test_model'] = 0;
         }
+        $data = [];
         $list = $BTemplateModuleLogic->ModuleList($this->map,$this->order);
-        $this->response('success',Code::SUCCESS,$list);
+        $data['list'] = $list;
+        $moduleProjectModel = new BModuleProject();
+        $module_list = $moduleProjectModel->list(['project_id'=>$this->user['project_id']]);
+        $data['module_list'] = $module_list;
+        $this->response('success',Code::SUCCESS,$data);
     }
 
     /**

@@ -366,7 +366,8 @@ class ProductLogic extends  BaseLogic
         $info = $this->model->read(['id'=>$this->param['id']]);
         $param = $this->setProductParams($info);
         $save_id = $this->model->insertGetId($param);
-        $route = RouteMap::setRoute($param['route'], RouteMap::SOURCE_PRODUCT, $save_id, $this->user['project_id']);
+        $route = preg_replace('/-product.*/', '', $param['route']);
+        $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT, $save_id, $this->user['project_id']);
         $this->model->edit(['route'=>$route],['id'=>$save_id]);
         //同步可视化装修数据
         $this->copyTemplate($this->param['id'],$info['project_id'],$save_id);