Merge branch 'dev'

app/admin/controller/ReceiveProductSync.php

@@ -99,18 +99,20 @@ class ReceiveProductSync
                 }
 
                 $category   = ProductCategoryModel::language($lang_id)->tcoId($tco_category['id'])->find();
-                $tco_parent = ProductTcoCategoryModel::language($lang_id)->tcoId($tco_category['tco_pid'])->find();
+                if (!empty($category)) {
-                if (!empty($tco_parent)) {
+                    $tco_parent = ProductTcoCategoryModel::language($lang_id)->tcoId($tco_category['tco_pid'])->find();
-                    $parent = ProductCategoryModel::language($lang_id)->tcoId($tco_parent['id'])->find();
+                    if (!empty($tco_parent)) {
-                    if ($parent->isEmpty()) {
+                        $parent = ProductCategoryModel::language($lang_id)->tcoId($tco_parent['id'])->find();
-                        throw new \Exception('产品分类父级不存在');
+                        if ($parent->isEmpty()) {
+                            throw new \Exception('产品分类父级不存在');
+                        }
+                        $category['pid']   = $parent['id'];
+                        $category['path']  = $parent['path'] . $parent['pid'];
+                        $category['level'] = $parent['level'] + 1;
+                    }
+                    if (!$category->save()) {
+                        throw new \Exception('产品分类更新失败');
                     }
-                    $category['pid']   = $parent['id'];
-                    $category['path']  = $parent['path'] . $parent['pid'];
-                    $category['level'] = $parent['level'] + 1;
-                }
-                if (!$category->save($category)) {
-                    throw new \Exception('产品分类更新失败');
                 }
             }
 

app/admin/controller/v1/ProductTcoCategory.php

@@ -16,8 +16,9 @@ class ProductTcoCategory
         $param = request()->param(['name']);
 
         $categorys = ProductTcoCategoryModel::field([
-                'tco_id'  => 'id',
+                'id',
-                'tco_pid' => 'pid',
+                'tco_id',
+                'tco_pid',
                 'name',
             ])
             ->withSearch(['name'], [
@@ -25,10 +26,10 @@ class ProductTcoCategory
             ])
             ->language(request()->lang_id)
             ->enabled()
-            ->order(['id' => 'asc'])
+            ->order(['tco_id' => 'asc'])
             ->select()
             ->toArray();
 
-        return success('获取成功', array_to_tree($categorys, 0, 'pid', false));
+        return success('获取成功', array_to_tree($categorys, 0, 'tco_pid', false, true, 'tco_id'));
     }
 }

app/common.php

@@ -80,7 +80,7 @@ if (!function_exists('array_to_tree')) {
      * @param bool $keep_pid 是否保留pid
      * @return array
      */
-    function array_to_tree(array $data, int $pid, string $with = 'pid', int|bool $level = 1, bool $keep_pid = true)
+    function array_to_tree(array $data, int $pid, string $with = 'pid', int|bool $level = 1, bool $keep_pid = true, $with_ref = 'id')
     {
         $ret = [];
         foreach ($data as $item) {
@@ -93,7 +93,7 @@ if (!function_exists('array_to_tree')) {
                 if ($keep_pid === false) {
                     unset($item[$with]);
                 }
-                $children = array_to_tree($data, $item['id'], $with, $lv, $keep_pid);
+                $children = array_to_tree($data, $item[$with_ref], $with, $lv, $keep_pid, $with_ref);
                 if ($children) {
                     $item['children'] = $children;
                 }
@@ -153,8 +153,12 @@ if (!function_exists('get_filesystem_url')) {
      * @param string $disk 磁盘配置 key
      * @return string
      */
-    function get_filesystem_url(string $url, string $disk): string
+    function get_filesystem_url(string|null $url, string $disk): string
     {
+        if (is_null($url)) {
+            return '';
+        }
+
         if (\think\helper\Str::startsWith($url, ['http://', 'https://', '//'])) {
             return $url;
         }
@@ -171,8 +175,12 @@ if (!function_exists('url_filesystem_detect')) {
      * @param string $url 文件地址
      * @return string
      */
-    function url_filesystem_detect(string $url): string
+    function url_filesystem_detect(string|null $url): string
     {
+        if  (is_null($url)) {
+            return '';
+        }
+
         $idx = strrpos($url, '.');
         if ($idx === false) {
             return $url;

app/index/view/mobile/public/footer.html

@@ -29,12 +29,13 @@
                 {/notempty}
                 <li>
                     <h3>{:lang_i18n('联系方式')}</h3>
-                    {notempty name="contact_config.website_email"}
+                    {if condition="!empty($contact_config)"}
-                    <p>{$contact_config.website_email.title}： {$contact_config.website_email.value}</p>
+                        {volist name="contact_config" id="vo"}
-                    {/notempty}
+                            {if condition="$vo.type != 'image'"}
-                    {notempty name="contact_config.website_hotline_office_hours"}
+                                <p>{$vo.value}</p>
-                    <p>{$contact_config.website_hotline_office_hours.title}： {$contact_config.website_hotline_office_hours.value}</p>
+                            {/if}
-                    {/notempty}
+                        {/volist}
+                    {/if}
                 </li>
             </ul>
         </div>

app/index/view/pc/public/footer.html

@@ -58,7 +58,7 @@
               {else/}
               <a href="javascript:void(0);" class="fline">
                 {$vo.value}
-                {/if}
+              {/if}
               </a>
             </li>
             {/volist}

public/migrate_temp_images/.gitignore

@@ -1,2 +0,0 @@
-*
-!.gitignore

public/static/index/mobile/css/style.css

@@ -1278,7 +1278,7 @@ video img {
   margin-left: 1rem;
 }
 .foot-cate li {
-  width: 50%;
+  min-width: 50%;
   display: inline-block;
   float: left;
   color: #fff;