feat: update slug fix

(cherry picked from commit 44587916d267867f2ae87d465dafeeb648722694)

app/Distributor/Controllers/DistProductCategoryController.php

@@ -107,8 +107,9 @@ class DistProductCategoryController extends AdminDistController
 
                 $id = $form->getKey();
 
+
                 //slug配置是否重复
-                $form->flug=CommonHelper::slug_fix($form->flug);
+                $form->slug=CommonHelper::slug_fix($form->slug);
                 if ($form->slug != '') {
                     if (DistProductCategory::isRepeatedSlug($id, $form->slug)) {
                         //slug重复

app/Distributor/Controllers/DistProductController.php

@@ -222,7 +222,7 @@ class DistProductController extends AdminDistController
                 $form->dist_id =getDistributorId();//保存时直接写死dist_id
                 $id = $form->getKey();
                 //slug配置是否重复
-                $form->flug=CommonHelper::slug_fix($form->flug);
+                $form->slug=CommonHelper::slug_fix($form->slug);
                 if ($form->slug != '') {
 
                     if (DistProduct::isRepeatedSlug($id, $form->slug)) {

app/Distributor/Controllers/DistVideoCategoryController.php

@@ -88,9 +88,15 @@ class DistVideoCategoryController extends AdminDistController
             $form->saving(function (Form $form) {
                 $form->dist_id =getDistributorId();//保存时直接写死dist_id
                 $id = $form->getKey();
+
+
                 //slug配置是否重复
-                $form->flug=CommonHelper::slug_fix($form->flug);
+                $form->slug=CommonHelper::slug_fix($form->slug);
+
                 if ($form->slug != '') {
+                    //把slug中的空格替换成-，多个空格在一起只用一个-，大写字母转换成小写
+                    $form->slug = preg_replace('/\s+/', '-', $form->slug);
+                    $form->slug = strtolower($form->slug);
                     if (DistVideoCategory::isRepeatedSlug($id, $form->slug)) {
                         //slug重复
                         return $form->response()->error(admin_trans_label('url_repeated'));

app/Distributor/Controllers/DistVideoController.php

@@ -171,8 +171,7 @@ class DistVideoController extends AdminDistController
                 $form->dist_id =getDistributorId();//保存时直接写死dist_id
 
                 $id = $form->getKey();
-                //slug配置是否重复
-                $form->flug=CommonHelper::slug_fix($form->flug);
+                $form->slug=CommonHelper::slug_fix($form->slug);
                 if ($form->slug != '') {
                     if (DistVideo::isRepeatedSlug($id, $form->slug)) {
                         //slug重复

app/Distributor/Controllers/SitePagesController.php

@@ -195,7 +195,7 @@ class SitePagesController extends AdminDistController
                 $form->page_type = $location;
                 $id = $form->getKey();
                 //slug配置是否重复
-                $form->flug=CommonHelper::slug_fix($form->flug);
+                $form->slug=CommonHelper::slug_fix($form->slug);
                 if ($form->slug != '') {
 
                     if (SitePages::isRepeatedSlug($id, $form->slug)) {

app/Distributor/Controllers/SitePagesTagController.php

@@ -92,6 +92,9 @@ class SitePagesTagController extends AdminDistController
                 $form->dist_id = getDistributorId();
                 //slug配置是否重复
                 $id = $form->getKey();
+
+                $form->slug=CommonHelper::slug_fix($form->slug);
+
                 if ($form->slug != '') {
                     if (SitePagesTag::isRepeatedSlug($id, $form->slug)) {
                         //slug重复

app/Libraries/CommonHelper.php

@@ -264,13 +264,11 @@ JS
     }
 
 
-    // slug fix
-    function slug_fix($slug)
+    public  static function slug_fix($slug)
     {
-        $slug = trim($slug);
-        if($slug == '') {
+        if ($slug == '') {
             return '';
-        }else {
+        } else {
             $slug = preg_replace('/\s+/', '-', $slug);
             $slug = strtolower($slug);
             return $slug;