合并分支 'master-server' 到 'master'

Master server



查看合并请求 !905

@@ -50,7 +50,7 @@ class MinorLanguagesController extends BaseController
      */
      */
     public function getLanguages(){
     public function getLanguages(){
         $webLanguageModel = new WebLanguage();
         $webLanguageModel = new WebLanguage();
-        $lists = $webLanguageModel->list($this->map,'id',['short','chinese']);
+        $lists = $webLanguageModel->list($this->map);
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }
 }
 }

@@ -105,8 +105,10 @@ class DetailController extends BaseController
     public function saveDetail(DetailLogic $logic){
     public function saveDetail(DetailLogic $logic){
         $this->request->validate([
         $this->request->validate([
             'product_id'=>'required',
             'product_id'=>'required',
+            'data'=>'required',
         ],[
         ],[
             'product_id.required' => '产品id不能为空',
             'product_id.required' => '产品id不能为空',
+            'data.required' => 'data不能为空',
         ]);
         ]);
         $data = $logic->saveDetail();
         $data = $logic->saveDetail();
         $this->response('success',Code::SUCCESS,$data);
         $this->response('success',Code::SUCCESS,$data);

@@ -51,7 +51,7 @@ class DetailLogic extends BaseLogic
      * @time   :2024/11/13 9:30
      * @time   :2024/11/13 9:30
      */
      */
     public function saveDetail(){
     public function saveDetail(){
-        if(!empty($data)){
+        if(!empty($this->param['data'])){
             try {
             try {
                 foreach ($this->param['data'] as $data){
                 foreach ($this->param['data'] as $data){
                     foreach ($data as $v){
                     foreach ($data as $v){
@@ -61,8 +61,8 @@ class DetailLogic extends BaseLogic
                             'product_id'=>$this->param['product_id'],
                             'product_id'=>$this->param['product_id'],
                             'text_type'=>$v['text_type'],
                             'text_type'=>$v['text_type'],
                             'title'=>$v['title'] ?? '',
                             'title'=>$v['title'] ?? '',
-                            'content'=>json_encode($v['content'] ?? []),
-                            'css'=>json_encode($v['css'] ?? []),
+                            'content'=>json_encode($v['content'] ?? [],JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES),
+                            'css'=>json_encode($v['css'] ?? [],JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES),
                         ];
                         ];
                         if(isset($v['id']) && !empty($v['id'])){
                         if(isset($v['id']) && !empty($v['id'])){
                             $this->edit($save_data,['id'=>$v['id']]);
                             $this->edit($save_data,['id'=>$v['id']]);