gx

@@ -80,18 +80,6 @@ class DetailController extends BaseController
             'data.required' => 'data不能为空',
             'data.required' => 'data不能为空',
         ]);
         ]);
 
 
-        foreach ($this->param['data'] as $k => $data){
-            $i = 1;
-            foreach ($data as $key => $v){
-                $data = [
-                    'sort'=>$i,
-                    'column_id'=>$v['column_id'],
-                    'product_id'=>$this->param['product_id'],
-                    'title'=>$v['title'],
-                    'content'=>json_encode($v['content'])
-                ];
-                $i++;
-            }
-        }
+
     }
     }
 }
 }

@@ -160,6 +160,9 @@ class FileController
         $suffix = array_pop($nameArr) ?? 'jpg';
         $suffix = array_pop($nameArr) ?? 'jpg';
         $nameStr = implode('-', $nameArr);
         $nameStr = implode('-', $nameArr);
         $enName = generateRoute(Translate::tran($nameStr, 'en'));
         $enName = generateRoute(Translate::tran($nameStr, 'en'));
+        if(substr($enName, 0, 1) === '-'){
+            $enName = md5(uniqid().$project_id.rand(1,1000));
+        }
         $fileName = $enName;
         $fileName = $enName;
         $i=1;
         $i=1;
         while($this->onlyName($enName.'.'.$suffix,$project_id)){
         while($this->onlyName($enName.'.'.$suffix,$project_id)){

@@ -229,9 +229,13 @@ class ImageController extends Controller
         $nameArr = explode('.',$name);
         $nameArr = explode('.',$name);
         $suffix = array_pop($nameArr) ?? 'jpg';
         $suffix = array_pop($nameArr) ?? 'jpg';
         $nameStr = implode('-', $nameArr);
         $nameStr = implode('-', $nameArr);
-        $enName = generateRoute(Translate::tran($nameStr, 'en'));
+        $tran_name = Translate::tran($nameStr, 'en');
+        if(is_array($tran_name)){
+            $tran_name = $tran_name[0];
+        }
+        $enName = generateRoute($tran_name);
         if(substr($enName, 0, 1) === '-'){
         if(substr($enName, 0, 1) === '-'){
-            $enName = $nameStr;
+            $enName = md5(uniqid().$project_id.rand(1,1000));;
         }
         }
         $fileName = $enName;
         $fileName = $enName;
         $i=1;
         $i=1;

@@ -42,4 +42,25 @@ class DetailLogic extends BaseLogic
         }
         }
         return $this->success(['id'=>$id]);
         return $this->success(['id'=>$id]);
     }
     }
+
+    public function saveDetail(){
+        foreach ($this->param['data'] as $k => $data){
+            $i = 1;
+            $save_data = [];
+            foreach ($data as $key => $v){
+                $save_data[] = [
+                    'sort'=>$i,
+                    'column_id'=>$v['column_id'],
+                    'product_id'=>$this->param['product_id'],
+                    'title'=>$v['title'] ?? '',
+                    'content'=>json_encode($v['content'] ?? []),
+                    'css'=>json_encode($v['css'] ?? []),
+                    'created_at'=>date('Y-m-d H:i:s'),
+                    'updated_at'=>date('Y-m-d H:i:s')
+                ];
+                $i++;
+            }
+            $this->model->insert($save_data);
+        }
+    }
 }
 }