修改分类

.env

@@ -1,5 +0,0 @@
-
-[JWT]
-TTL=3600
-REFRESH_TTL=20160
-SECRET=b43e6276644ed60e65c50d1b324ba10b

.env.dev

@@ -1,32 +0,0 @@
-APP_DEBUG = true
-
-DB_TYPE = mysql
-DB_HOST = localhost
-DB_NAME = orico-official-website
-DB_USER = orico-ow
-DB_PASS = 14Xi17NIK8V2qAXE8oMataHEsaR8lE
-DB_PORT = 3306
-DB_CHARSET = utf8mb4
-DB_PREFIX = ow_
-
-DEFAULT_LANG = zh-cn
-
-# 前端代理服务器ip（影响使用代理访问情况下的客户端ip获取）
-PROXY_SERVER_IP[] = 120.79.27.160
-
-[JWT]
-TTL=3600
-REFRESH_TTL=20160
-SECRET=b43e6276644ed60e65c50d1b324ba10b
-
-# 后台不需要登录的接口
-[ADMIN_AUTH]
-WHITE_LIST[] = v1/user/login
-WHITE_LIST[] = v1/user/captcha
-
-# 不需记录日志的接口
-[ADMIN_API]
-IGNORE_LOGGING_LIST[] = v1/OperateLog/index
-MAX_IMAGE_SIZE = 5mb # 图片上传最大限制
-MAX_VIDEO_SIZE = 150mb # 视频上传最大限制
-MAX_ATTACHMENT_SIZE = 100mb # 附件上传最大限制

.env.local

@@ -1,37 +0,0 @@
-APP_DEBUG = true
-
-DB_TYPE = mysql
-DB_HOST = 127.0.0.1
-DB_NAME = orico-official-website
-DB_USER = orico-official-website
-DB_PASS = 14Xi17NIK8V2qAXE8oMataHEsaR8lE
-DB_PORT = 3306
-DB_CHARSET = utf8mb4
-DB_PREFIX = ow_
-
-DEFAULT_LANG = zh-cn
-
-# 前端代理服务器ip（影响使用代理访问情况下的客户端ip获取）
-PROXY_SERVER_IP[] = 120.79.27.160
-
-[JWT]
-TTL=3600
-REFRESH_TTL=20160
-SECRET=b43e6276644ed60e65c50d1b324ba10b
-
-# 后台不需要登录的接口
-[ADMIN_AUTH]
-WHITE_LIST[] = v1/user/login
-WHITE_LIST[] = v1/user/captcha
-
-# 不需记录日志的接口
-[ADMIN_API]
-IGNORE_LOGGING_LIST[] = v1/OperateLog/index
-MAX_IMAGE_SIZE = 5mb; # 图片上传最大限制
-MAX_VIDEO_SIZE = 150mb; # 视频上传最大限制
-MAX_ATTACHMENT_SIZE = 100mb; # 附件上传最大限制
-
-# 开放API
-[OPENAPI]
-RESOURCE_IMAGES_DOMAIN = http://local.orico.com; # 图片资源服务器地址
-RESOURCE_VIDEOS_DOMAIN = http://local.orico.com; # 视频资源服务器地址

.example.env

@@ -1,11 +1,96 @@
 APP_DEBUG = true
 
 DB_TYPE = mysql
-DB_HOST = 127.0.0.1
+DB_HOST = localhost
-DB_NAME = test
+DB_NAME = orico-official-website
-DB_USER = username
+DB_USER = orico-ow
-DB_PASS = password
+DB_PASS = 14Xi17NIK8V2qAXE8oMataHEsaR8lE
 DB_PORT = 3306
-DB_CHARSET = utf8
+DB_CHARSET = utf8mb4
+DB_PREFIX = ow_
+DB_VERSION = 8
 
 DEFAULT_LANG = zh-cn
+
+# 前端代理服务器ip（影响使用代理访问情况下的客户端ip获取）
+PROXY_SERVER_IP[] = 120.79.27.160
+
+# redis 配置
+REDIS_HOST = 127.0.0.1
+REDIS_PORT = 6379
+REDIS_PASSWORD = ''
+REDIS_PREFIX = ow:
+
+[JWT]
+TTL=3600
+REFRESH_TTL=20160
+SECRET=b43e6276644ed60e65c50d1b324ba10b
+
+# 七牛云存储配置
+[QINIU_CLOUD]
+BUCKET = orico-official-website
+BASE_URL = //ow.static.f2b211.com
+ACCESS_KEY = dOsTum4a5qvhPTBbZRPX0pIOU7PZWRX7htKjztms
+SECRET_KEY = KFxsGbnErkALFfeGdMa8QWTdodJbamMX0iznLe-q
+
+# 后台不需要登录的接口
+[ADMIN_AUTH]
+WHITE_LIST[] = v1/user/login
+WHITE_LIST[] = v1/user/captcha
+WHITE_LIST[] = receive_sync/category
+WHITE_LIST[] = receive_sync/product
+
+# 不需记录日志的接口
+[ADMIN_API]
+IGNORE_LOGGING_LIST[] = v1/OperateLog/index
+MAX_IMAGE_SIZE = 5mb; # 图片上传最大限制
+MAX_VIDEO_SIZE = 150mb; # 视频上传最大限制
+MAX_ATTACHMENT_SIZE = 100mb; # 附件上传最大限制
+
+# 开放API
+[OPENAPI]
+ACCESS_TOKEN_LIFETIME = 3600; # 访问令牌有效期
+REFRESH_TOKEN_LIFETIME = 1209600; # 刷新令牌有效期
+RESOURCE_IMAGES_DOMAIN = http://local.orico.com; # 图片资源服务器地址
+RESOURCE_VIDEOS_DOMAIN = http://local.orico.com; # 视频资源服务器地址
+
+# 七牛云存储配置
+[QINUI]
+BUCKET = orico
+BASE_URL = http://local.orico.com
+ACCESS_KEY = 1234567890
+SECRET_KEY = 1234567890
+
+# 前台视图模板规则配置
+[INDEX_VIEW_TPL]
+# 视图目录
+# query 规则：URL参数 mtpl=1 表示移动端访问
+# 例如：http://xxxx.com?mtpl=1
+# domain 规则：根据特定域名，判断是否移动端访问
+# 例如：http://mobile.orico.cn
+RULE = query
+# query 规则参数名
+RULE_QUERY_NAME = mtpl
+# query 规则参数值
+RULE_QUERY_VALUE = 1
+# domain 规则协议
+RULE_DOMAIN_SCHEME[] = http
+RULE_DOMAIN_SCHEME[] = https
+# domain 规则域名
+RULE_DOMAIN_HOST = mobile.orico.cn
+
+# 前台语言检测配置
+[INDEX_LANG_DETECT]
+# 是否启用域名检测方式来检测语言
+DOMAIN_DETECT = true
+# 域名规则
+# 格式：域名=语言
+# 例如：mobile.orico.cn=zh-cn
+DOMAIN_RULE[] = orico.cn=zh-cn
+DOMAIN_RULE[] = orico.com.cn=zh-cn
+DOMAIN_RULE[] = www.orico.cn=zh-cn
+DOMAIN_RULE[] = www.orico.com.cn=zh-cn
+DOMAIN_RULE[] = ow.f2b211.com=zh-cn
+DOMAIN_RULE[] = orico.cc=en-us
+DOMAIN_RULE[] = www.orico.cc=en-us
+DOMAIN_RULE[] = ow.us.f2b211.com=en-us

.gitignore

@@ -3,7 +3,13 @@ composer.phar
 composer.lock
 .DS_Store
 Thumbs.db
+.env
+.env.dev
+.env.local
+.env.prod
 
+public/dist
+public/opendoc
 /.idea
 /.vscode
 /vendor

app/admin/controller/ReceiveProductSync.php

@@ -0,0 +1,219 @@
+<?php
+declare (strict_types = 1);
+
+namespace app\admin\controller;
+
+use app\admin\model\v1\LanguageModel;
+use app\admin\model\v1\ProductCategoryModel;
+use app\admin\model\v1\ProductModel;
+use app\admin\model\v1\ProductTcoCategoryModel;
+use think\facade\Db;
+
+class Operate_Of_ReceiveSync
+{
+    const Add     = 'add';
+    const Update  = 'update';
+    const Enable  = 'enable';
+    const Disable = 'disable';
+}
+
+/**
+ * 接收产品相关同步数据
+ */
+class ReceiveProductSync
+{
+    // 接收产品目录分类同步数据
+    public function category()
+    {
+        $data = request()->post();
+        if (empty($data)) return error('请确认同步数据');
+
+        $validate = validate([
+            'name|分类名称'        => 'require',
+            'erp_code|分类ERP编码' => 'require',
+        ]);
+        if (!$validate->check($data)) {
+            return error((string)$validate->getError());
+        }
+
+        // 获取对应语言ID
+        $lang_id = LanguageModel::where('code', $data['lang'])->value('id');
+        if (empty($lang_id)) {
+            return error('语言不存在');
+        }
+
+        Db::startTrans();
+        try {
+            $tco_category_data = [
+                'language_id'  => $lang_id,
+                'name'         => $data['name'],
+                'tco_id'       => $data['tco_id'],
+                'tco_pid'      => $data['tco_pid'],
+                'tco_path'     => $data['tco_path'],
+                'erp_id'       => $data['erp_id'],
+                'erp_pid'      => $data['erp_pid'],
+                'erp_code'     => $data['erp_code'],
+                'erp_path'     => $data['erp_path'],
+                'disabled'     => Operate_Of_ReceiveSync::Disable == $data['operate'] ? 1 : 0,
+                'sync_time'    => strtotime($data['created_at'])
+            ];
+            $tco_category = ProductTcoCategoryModel::language($lang_id)->erpCode($tco_category_data['erp_code'])->find();
+            if (empty($tco_category)) {
+                $tco_category = ProductTcoCategoryModel::create($tco_category_data);
+                if ($tco_category->isEmpty()) {
+                    throw new \Exception('产品目录分类创建失败');
+                }
+
+                $category_data = [
+                    'language_id'          => $lang_id,
+                    'unique_id'            => uniqid('PRO_CATE_'),
+                    'pid'                  => 0,
+                    'path'                 => '',
+                    'name'                 => $tco_category_data['name'],
+                    'icon'                 => '',
+                    'desc'                 => '',
+                    'related_tco_category' => $tco_category['id'],
+                    'sort'                 => 0,
+                    'level'                => 1,
+                    'is_show'              => 1,
+                ];
+                $tco_parent = ProductTcoCategoryModel::language($lang_id)->tcoId($tco_category['tco_pid'])->find();
+                if (!empty($tco_parent)) {
+                    $parent = ProductCategoryModel::language($lang_id)->tcoId($tco_parent['id'])->find();
+                    if ($parent->isEmpty()) {
+                        throw new \Exception('产品分类父级不存在');
+                    }
+                    $category_data['pid']   = $parent['id'];
+                    $category_data['path']  = $parent['path'] . $parent['pid'];
+                    $category_data['level'] = $parent['level'] + 1;
+                }
+                $category = ProductCategoryModel::create($category_data);
+                if ($category->isEmpty()) {
+                    throw new \Exception('产品分类创建失败');
+                }
+            }
+            else if ($tco_category['sync_time'] < $tco_category_data['sync_time']) {
+                $success = $tco_category->save($tco_category_data);
+                if (!$success) {
+                    throw new \Exception('产品目录分类更新失败');
+                }
+
+                $category   = ProductCategoryModel::language($lang_id)->tcoId($tco_category['id'])->find();
+                if (!empty($category)) {
+                    $tco_parent = ProductTcoCategoryModel::language($lang_id)->tcoId($tco_category['tco_pid'])->find();
+                    if (!empty($tco_parent)) {
+                        $parent = ProductCategoryModel::language($lang_id)->tcoId($tco_parent['id'])->find();
+                        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('产品分类更新失败');
+                    }
+                }
+            }
+
+            Db::commit();
+        } catch (\Throwable $th) {
+            Db::rollback();
+            return error(sprintf('%s %s:%d', $th->getMessage(), $th->getFile(), $th->getLine()));
+        }
+
+        return success('同步成功');
+    }
+
+    // 接收产品同步数据
+    public function product()
+    {
+        $data = request()->post();
+        if (empty($data)) {
+            return error('请确认同步数据');
+        }
+
+        $validate = validate([
+            'spu'               => 'require',
+            'name'              => 'require',
+            'category_erp_code' => 'require',
+            'lang'              => 'require',
+            'created_at'        => 'require',
+        ]);
+        if (!$validate->check($data)) {
+            return error((string)$validate->getError());
+        }
+
+        // 获取对应语言ID
+        $lang_id = LanguageModel::where('code', $data['lang'])->value('id');
+        if (empty($lang_id)) {
+            return error('语言不存在');
+        }
+
+        // 如果 spu_before_modification 存在则根据 spu_before_modification 更新型号
+        $product = null;
+        if (!empty($data['spu_before_modification'])) {
+            $product = ProductModel::language($lang_id)->spu($data['spu_before_modification'])->find();
+        }
+        if (
+            (empty($data['spu_before_modification']) && !empty($data['spu']))
+            // 避免 spu_before_modification 更新型号时，人为删除了旧型号导致的新增，从而出现重复型号问题，而进行再次验证
+            || (!empty($data['spu_before_modification']) && empty($product))
+        ) {
+            $product = ProductModel::language($lang_id)->spu($data['spu'])->find();
+        }
+
+        try {
+            $product_tco_category = ProductTcoCategoryModel::language($lang_id)->erpCode($data['category_erp_code'])->find();
+            if (empty($product_tco_category)) {
+                throw new \Exception('官网未找到产品目录同步分类');
+            }
+
+            $product_category = ProductCategoryModel::language($lang_id)->tcoId($product_tco_category['id'])->find();
+            if (empty($product_category)) {
+                throw new \Exception('官网未找到产品目录同步分类关联的分类');
+            }
+
+            if (empty($product)) {
+                $product = ProductModel::create([
+                    'language_id'  => $lang_id,
+                    'category_id'  => $product_category['id'],
+                    'spu'          => $data['spu'],
+                    'name'         => $data['name'],
+                    'short_name'   => '',
+                    'cover_image'  => '',
+                    'desc'         => '',
+                    'video_img'    => '',
+                    'video_url'    => '',
+                    'is_sale'      => 1,
+                    'is_new'       => 0,
+                    'is_hot'       => 0,
+                    'is_show'      => 0,
+                    'sort'         => 0,
+                    'detail'       => '',
+                    'status'       => Operate_Of_ReceiveSync::Disable == $data['operate'] ? -1 : 1,
+                    'seo_title'    => '',
+                    'seo_keywords' => '',
+                    'seo_desc'     => '',
+                    'updated_at'   => $data['created_at'],
+                ]);
+                if ($product->isEmpty()) {
+                    throw new \Exception('产品创建失败');
+                }
+            }
+            else if (strtotime($product['updated_at']) < strtotime($data['created_at'])) {
+                $product->spu         = $data['spu'];
+                $product->name        = $data['name'];
+                $product->category_id = $product_category['id'];
+                $product->status      = Operate_Of_ReceiveSync::Disable == $data['operate'] ? -1 : 1;
+                if (!$product->save()) {
+                    throw new \Exception('产品更新失败');
+                }
+            }
+        } catch (\Throwable $th) {
+            return error(sprintf('%s %s:%d', $th->getMessage(), $th->getFile(), $th->getLine()));
+        }
+
+        return success('同步成功');
+    }
+}

app/admin/controller/v1/Article.php

@@ -228,7 +228,7 @@ class Article
     private function getExportArticleData()
     {
         $server = request()->server();
-        $image_host = $server['REQUEST_SCHEME'] . "://" . $server['SERVER_NAME'] . config('filesystem.disks.public.url') . '/';
+        $image_host = $server['REQUEST_SCHEME'] . "://" . $server['SERVER_NAME'] . '/';
         $param = request()->param(['title', 'category_id', 'release_time']);
         $data = ArticleModel::field([
                 '*',
@@ -253,7 +253,7 @@ class Article
             ])
             ->bindAttr('category', ['category_name' => 'name'])
             ->each(function ($item) use($image_host) {
-                $item->image = !empty($item->image) ? $image_host . $item->image : '';
+                $item->image = !empty($item->image) ? url_join($image_host, $item->image) : '';
                 return $item;
             });
 

app/admin/controller/v1/Banner.php

@@ -34,12 +34,12 @@ class Banner
         $datas = [];
         if (!$banners->isEmpty()) {
             $temp = [];
-            $map  = ['pc' => 'PC端', 'mobile' => '移动端'];
+            $map  = ['pc' => ['id' => -1, 'name' => 'PC端'], 'mobile' => ['id' => -2, 'name' => '移动端']];
             foreach ($banners as $banner) {
                 if (!isset($temp[$banner->at_platform])) {
                     $temp[$banner->at_platform] = [
-                        'id'       => 0,
+                        'id'       => $map[$banner->at_platform]['id'] ?? 0,
-                        'name'     => $map[$banner->at_platform] ?? '未知平台',
+                        'name'     => $map[$banner->at_platform]['name'] ?? '未知平台',
                         'children' => []
                     ];
                 }

app/admin/controller/v1/BannerItem.php

@@ -105,6 +105,7 @@ class BannerItem
             'desc_txt_color',
             'type',
             'image',
+            'extra_image',
             'video',
             'link_to' => 'custom',
             'link',
@@ -159,6 +160,7 @@ class BannerItem
             'desc_txt_color',
             'type',
             'image',
+            'extra_image',
             'video',
             'link_to',
             'link',
@@ -242,6 +244,7 @@ class BannerItem
             'desc_txt_color'  => '描述字体颜色',
             'type'            => '前台显示类型',
             'image'           => '图片地址',
+            'extra_image'     => '额外图片地址',
             'video'           => '视频地址',
             'link_to'         => '链接类型',
             'link'            => '链接地址',
@@ -259,11 +262,9 @@ class BannerItem
     // 获取导出数据
     private function getBannerExportData()
     {
-        $param = request()->param([
+        $server = request()->server();
-            'title',
+        $image_host = $server['REQUEST_SCHEME'] . "://" . $server['SERVER_NAME'] . '/';
-            'banner_id',
+        $param = request()->param(['title', 'banner_id', 'created_at']);
-            'created_at'
-        ]);
         return SysBannerItemModel::alias('item')
             ->field([
                 'item.id',
@@ -274,6 +275,7 @@ class BannerItem
                 'item.desc_txt_color',
                 'item.type',
                 'item.image',
+                'item.extra_image',
                 'item.video',
                 'item.link_to',
                 'item.link',
@@ -307,7 +309,13 @@ class BannerItem
                 }
             })
             ->order(['item.sort' => 'asc', 'item.id' => 'desc'])
-            ->select();
+            ->select()
+            ->each(function($item) use($image_host) {
+                $item->image       = !empty($item->image) ? url_join($image_host, $item->image) : '';
+                $item->extra_image = !empty($item->extra_image) ? url_join($image_host, $item->extra_image) : '';
+                $item->video       = !empty($item->video) ? url_join($image_host, $item->video) : '';
+                return $item;
+            });
     }
 
     // 删除

app/admin/controller/v1/Product.php

@@ -57,7 +57,7 @@ class Product
             ])
             ->categoryNullable($param['category_id']??null)
             ->isShowNullable(isset($param['is_show']) ? (bool)$param['is_show'] : null)
-            ->order(['sort' => 'asc', 'id' => 'desc'])
+            ->order(['sort' => 'asc', 'created_at' => 'desc', 'id' => 'desc'])
             ->paginate([
                 'list_rows' => $param['size'],
                 'page'      => $param['page'],
@@ -171,7 +171,7 @@ class Product
         // 更新产品参数
         if ($put['params'] != "") {
             ProductParamsModel::productId($id)->delete();
-            if (preg_match_all('/(\S+):(.[^\s]+)/', $put['params'], $match_result)) {
+            if (preg_match_all('/(.+):(.+)/', $put['params'], $match_result)) {
                 $params = [];
                 for ($i = 0; $i < count($match_result[0]); $i++) {
                     $params[] = [
@@ -346,7 +346,7 @@ class Product
     private function getExportProductData()
     {
         $server = request()->server();
-        $image_host = $server['REQUEST_SCHEME'] . "://" . $server['SERVER_NAME'] . config('filesystem.disks.public.url') . '/';
+        $image_host = $server['REQUEST_SCHEME'] . "://" . $server['SERVER_NAME'] . '/';
         $param = request()->param([
             'name',
             'spu',
@@ -360,10 +360,10 @@ class Product
                 'spu',
                 'name',
                 'short_name',
-                'CONCAT("' . $image_host . '", `cover_image`)' => 'cover_image',
+                'cover_image',
                 'desc',
-                'CONCAT("' . $image_host . '", `video_img`)' => 'video_img',
+                'video_img',
-                'CONCAT("' . $image_host . '", `video_url`)' => 'video_url',
+                'video_url',
                 'CASE WHEN is_new = 1 THEN "是" ELSE "否" END' => 'is_new',
                 'CASE WHEN is_hot = 1 THEN "是" ELSE "否" END' => 'is_hot',
                 'CASE WHEN is_sale = 1 THEN "是" ELSE "否" END' => 'is_sale',
@@ -390,7 +390,18 @@ class Product
             ->order(['id' => 'asc'])
             ->select()
             ->bindAttr('category', ['category_name' => 'name'])
-            ->hidden(['category_id', 'category']);
+            ->hidden(['category_id', 'category'])
+            ->each(function($item) use($image_host) {
+                if (!empty($item["cover_image"])) {
+                    $item["cover_image"] = url_join($image_host, $item["cover_image"]);
+                }
+                if (!empty($item["video_img"])) {
+                    $item["video_img"] = url_join($image_host, $item["video_img"]);
+                }
+                if (!empty($item["video_url"])) {
+                    $item["video_url"] = url_join($image_host, $item["video_url"]);
+                }
+            });
 
         if (!$products->isEmpty()) {
             // 产品参数

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/admin/controller/v1/Upload.php

@@ -9,6 +9,7 @@ use app\admin\model\v1\SysAttachmentUploadRecordModel;
 use Intervention\Image\ImageManager;
 use Intervention\Image\Typography\FontFactory;
 use think\facade\Filesystem;
+use filesystem\Qiniu;
 
 /**
  * 文件上传控制器
@@ -31,7 +32,7 @@ class Upload
             $max_size = strtobytes(env('ADMIN_API.MAX_IMAGE_SIZE', '1mb'));
             $validate = validate([
                 'module' => 'require|max:64',
-                'image'  => "fileSize:$max_size|fileExt:jpg,jpeg,png,gif"
+                'image'  => "fileSize:$max_size|fileExt:jpg,jpeg,png,gif,webp"
             ]);
             if (!$validate->check(['module' => $param['module'], 'image' => $file])) {
                 return error($validate->getError());
@@ -45,17 +46,39 @@ class Upload
             // 获取图片上传配置
             list(
                 'filename_keep'  => $filename_keep,
-                'filemd5_unique' => $filemd5_unique
+                'filemd5_unique' => $filemd5_unique,
+                'filetype_to'    => $filetype_to,
             ) = $this->getUploadOptions('upload_image');
+
+            // 获取文件大小
+            $file_size = $file->getSize();
+            // 获取文件mime类型
+            $mime_type = $file->getOriginalMime();
+
             // 是否需要根据文件MD5值检查文件是否已存在
             $image_model = $filemd5_unique ? SysImageUploadRecordModel::md5($filemd5)->find() : null;
             if (is_null($image_model)) {
                 // 检查是否需要保留原文件名生成器
                 $name_rule = fn() => $filename_keep ? $this->filenameGenerator($file) : null;
-                $filename  = Filesystem::disk('image')->putFile($param['module'], $file, $name_rule());
+
                 // 处理图片
-                $image_manager = ImageManager::imagick();
+                $image_manager = ImageManager::gd();
+                if ($filetype_to == 'original') {
+                    $filename = Filesystem::disk('image')->putFile($param['module'], $file, $name_rule());
                     $image    = $image_manager->read('.' . $storage . '/' . $filename);
+                }
+                else if ($filetype_to == 'webp') {
+                    $image = $image_manager->read($file->getRealPath());
+                    // 转换为webp格式
+                    $webp     = $image->toWebp(75);
+                    $root     = config('filesystem.disks.image.root');
+                    $filename = $param['module'] . '/' . ($name_rule() ? $name_rule()() : date('Ymd') . '/' . md5((string)time() . random_str(8))) . '.webp';
+                    $webp->save($this->checkPath($root . '/' . $filename));
+                    // 获取webp文件大小
+                    $file_size = $webp->size();
+                    // 获取webp文件mime类型
+                    $mime_type = $webp->mimetype();
+                }
 
                 // 水印
                 list(
@@ -131,10 +154,10 @@ class Upload
                 $image_model              = new SysImageUploadRecordModel();
                 $image_model->language_id = request()->lang_id;
                 $image_model->module      = $param['module'];
-                $image_model->image_path  = $filename;
+                $image_model->image_path  = $storage . '/' . $filename;
-                $image_model->image_thumb = $thumb_filename;
+                $image_model->image_thumb = $storage . '/' . $thumb_filename;
-                $image_model->file_size   = $file->getSize();
+                $image_model->file_size   = $file_size;
-                $image_model->file_type   = $file->getOriginalMime();
+                $image_model->file_type   = $mime_type;
                 $image_model->file_md5    = $filemd5;
                 $image_model->file_sha1   = $filesha1;
                 if (!$image_model->save()) {
@@ -143,8 +166,8 @@ class Upload
             }
 
             return success('操作成功', [
-                'path'       => $storage . '/' . $image_model->image_path,
+                'path'       => $image_model->image_path,
-                'thumb_path' => $storage . '/' . $image_model->image_thumb,
+                'thumb_path' => $image_model->image_thumb,
                 'filemd5'    => $image_model->file_md5,
                 'filesha1'   => $image_model->file_sha1
             ]);
@@ -154,6 +177,30 @@ class Upload
 
         return error('上传失败');
     }
+    /**
+     * 检查路径
+     * 
+     * @param string $path
+     * @return string
+     */
+    private function checkPath($path): string
+    {
+        $ok       = true;
+        $filename = basename($path);
+        $dirname  = dirname($path);
+        if (!is_dir($dirname)) {
+            $ok = @mkdir($dirname, 0755, true);
+        }
+        else if (!is_writable($dirname)) {
+            $ok = @chmod($dirname,0755);
+        }
+
+        if ($ok) {
+            return $dirname . '/' . $filename;
+        }
+
+        throw new \Exception("上传目标目录不可用");
+    }
     /**
      * 文件名生成回调
      *
@@ -175,10 +222,12 @@ class Upload
         $config_model = new \app\admin\controller\v1\SiteConfig;
         $config       = $config_model->getByGroupUniqueLabel('upload');
         $options      = data_get($config, $module, []);
-        throw_if(empty($options), '上传配置错误');
+        
         return [
             'filename_keep'  => (int)data_get($options, 'filename_keep.value', 0)  == 1,
             'filemd5_unique' => (int)data_get($options, 'filemd5_unique.value', 0) == 1,
+            'filetype_to'    => data_get($options, 'filetype_to.value', 'original'),
+            'save_to'        => data_get($options, 'save_to.value', 'local'),
         ];
     }
     /**
@@ -220,7 +269,7 @@ class Upload
         ];
     }
     /**
-     * 计算文体水印偏移量
+     * 计算文本水印偏移量
      *
      * @param string $position
      * @param integer $offset_x
@@ -298,20 +347,35 @@ class Upload
             // 获取视频上传配置
             list(
                 'filename_keep'  => $filename_keep,
-                'filemd5_unique' => $filemd5_unique
+                'filemd5_unique' => $filemd5_unique,
+                'save_to'        => $save_to,
             ) = $this->getUploadOptions('upload_video');
             // 是否需要根据文件MD5值检查文件是否已存在
             $video = $filemd5_unique ? SysVideoUploadRecordModel::md5($filemd5)->find() : null;
             if (is_null($video)) {
+                // 保存位置配置 key
+                $disk = 'video';
                 // 检查是否需要保留原文件名
                 $name_rule = fn() => $filename_keep ? $this->filenameGenerator($file) : null;
-                $filename  = Filesystem::disk('video')->putFile($param['module'], $file, $name_rule());
+
+                // 保存到七牛云
+                if ($save_to == 'qiniu_cloud') {
+                    $disk      = 'video_qiniu';
+                    $storage   = config('filesystem.disks.video_qiniu.path_prefix');
+                }
+                $filename  = Filesystem::disk($disk)->putFile($param['module'], $file, $name_rule());
+
+                // 组装视频路径
+                $video_path = $storage . '/' . $filename;
+                if ($save_to == 'qiniu_cloud') {
+                    $video_path = Filesystem::disk($disk)->url($filename);
+                }
 
                 // 保存视频
                 $video              = new SysVideoUploadRecordModel();
                 $video->language_id = request()->lang_id;
                 $video->module      = $param['module'];
-                $video->video_path  = $filename;
+                $video->video_path  = $video_path;
                 $video->file_size   = $file->getSize();
                 $video->file_type   = $file->getOriginalMime();
                 $video->file_md5    = $filemd5;
@@ -322,7 +386,7 @@ class Upload
             }
 
             return success('上传成功', [
-                'path'      => $storage . '/' . $video->video_path,
+                'path'      => $video->video_path,
                 'file_md5'  => $video->file_md5,
                 'file_sha1' => $video->file_sha1
             ]);
@@ -346,31 +410,48 @@ class Upload
         try {
             $max_size = strtobytes(env('ADMIN_API.MAX_ATTACHMENT_SIZE', '100mb'));
             $validate = validate([
-                'attachment'  => "fileSize:$max_size|fileExt:biz,bz,bz2,gz,tgz,zip,rar,7z,doc,docx,xls,xlsx,csv,ppt,pptx,pdf,txt,jpg,jpeg,png,ttf"
+                'attachment'  => "fileSize:$max_size|fileExt:biz,bz,bz2,gz,tgz,zip,rar,7z,doc,docx,xls,xlsx,csv,ppt,pptx,pdf,txt,jpg,jpeg,png,webp,ttf"
             ]);
             if (!$validate->check(['attachment' => $file])) {
                 return error($validate->getError());
             }
 
+            $storage = config('filesystem.disks.public.url');
+
             $filemd5  = $file->md5();
             $filesha1 = $file->sha1();
 
             // 获取附件上传配置
             list(
                 'filename_keep'  => $filename_keep,
-                'filemd5_unique' => $filemd5_unique
+                'filemd5_unique' => $filemd5_unique,
+                'save_to'        => $save_to
             ) = $this->getUploadOptions('upload_attachment');
             // 是否需要根据文件MD5值检查文件是否已存在
             $attachment = $filemd5_unique ? SysAttachmentUploadRecordModel::md5($filemd5)->find() : null;
             if (is_null($attachment)) {
+                // 保存位置配置 key
+                $disk = 'public';
                 // 检查是否需要保留原文件名
                 $name_rule = fn() => $filename_keep ? $this->filenameGenerator($file) : null;
-                $filename  = Filesystem::disk('public')->putFile('attachments', $file, $name_rule());
 
-                // 保存视频
+                // 保存到七牛云
+                if ($save_to == 'qiniu_cloud') {
+                    $disk      = 'public_qiniu';
+                    $storage   = config('filesystem.disks.public_qiniu.path_prefix');
+                }
+                $filename  = Filesystem::disk($disk)->putFile('attachments', $file, $name_rule());
+
+                // 组装附件路径
+                $attachment_path = $storage . '/' . $filename;
+                if ($save_to == 'qiniu_cloud') {
+                    $attachment_path = Filesystem::disk($disk)->url($filename);
+                }
+
+                // 保存附件
                 $attachment                  = new SysAttachmentUploadRecordModel();
                 $attachment->language_id     = request()->lang_id;
-                $attachment->attachment_path = $filename;
+                $attachment->attachment_path = $attachment_path;
                 $attachment->file_size       = $file->getSize();
                 $attachment->file_type       = $file->getOriginalMime();
                 $attachment->file_md5        = $filemd5;
@@ -380,9 +461,8 @@ class Upload
                 }
             }
 
-            $storage = config('filesystem.disks.public.url');
             return success('上传成功', [
-                'path'      => $storage . '/' . $attachment->attachment_path,
+                'path'      => $attachment->attachment_path,
                 'file_md5'  => $attachment->file_md5,
                 'file_sha1' => $attachment->file_sha1
             ]);

app/admin/controller/v1/Video.php

@@ -209,9 +209,6 @@ class Video
         ]);
 
         $domain     = request()->domain();
-        $image_path = Config::get('filesystem.disks.image.url');
-        $video_path = Config::get('filesystem.disks.video.url');
-
         return  VideoModel::withoutField([
                 'language_id',
                 'updated_at',
@@ -230,13 +227,9 @@ class Video
             ->select()
             ->bindAttr('category', ['category_name' => 'name'])
             ->hidden(['category_id', 'category'])
-            ->each(function ($item) use($domain, $image_path, $video_path) {
+            ->each(function ($item) use($domain) {
-                if (!empty($item->image)) {
+                $item->image     = !empty($item->image) ? url_join($domain, $item->image) : '';
-                    $item->image = $domain . $image_path . '/' . $item->image;
+                $item->video     = !empty($item->video) ? url_join($domain, $item->video) : '';
-                }
-                if (!empty($item->video)) {
-                    $item->video = $domain . $video_path . '/' . $item->video;
-                }
                 $item->recommend = $item->recommend == 1 ? '是' : '否';
                 $item->status    = $item->status    == 1 ? '启用' : '禁用';
                 return $item;

app/admin/model/v1/ProductCategoryModel.php

@@ -29,6 +29,12 @@ class ProductCategoryModel extends ProductCategoryBaseModel
         $query->where('language_id', '=', $value);
     }
 
+    // 所属产品目录分类id查询
+    public function scopeTcoId($query, $value)
+    {
+        $query->where('related_tco_category', '=', $value);
+    }
+
     /**
      * 根据是否显示查询
      * @param $query

app/admin/model/v1/ProductModel.php

@@ -80,6 +80,12 @@ class ProductModel extends ProductBaseModel
         $query->where('category_id', '=', $value);
     }
 
+    // 规格型号查询
+    public function scopeSpu($query, $spu)
+    {
+        $query->where('spu', '=', $spu);
+    }
+
     // 启用状态查询
     public function scopeEnabled($query)
     {

app/admin/model/v1/ProductTcoCategoryModel.php

@@ -23,6 +23,18 @@ class ProductTcoCategoryModel extends ProductTcoCategoryBaseModel
         $query->where('language_id', '=', $value);
     }
 
+    // 根据 tco_id 查询
+    public function scopeTcoId($query, $value)
+    {
+        $query->where('tco_id', '=', $value);
+    }
+
+    // 根据ERP Code查询
+    public function scopeErpCode($query, $value)
+    {
+        $query->where('erp_code', '=', $value);
+    }
+
     // 按分类名称搜索
     public function searchNameAttr($query, $value, $data)
     {

app/admin/route/v1.php

@@ -616,6 +616,12 @@ Route::group('v1', function () {
     });
 })->prefix('v1.');
 
+// 接收产品目录同步数据
+Route::group('receive_sync', function () {
+    Route::post('category', 'ReceiveProductSync/category');
+    Route::post('product', 'ReceiveProductSync/product');
+});
+
 Route::miss(function() {
     return '404 Not Found!';
 });

app/admin/validate/v1/ArticleCategoryValidate.php

@@ -64,7 +64,10 @@ class ArticleCategoryValidate extends Validate
         if ($value == 0) {
             return true;
         }
+
+        $children   = [];
         $table_name = (new ArticleCategoryModel)->getTable();
+        if (env('DB_VERSION', '5') == '8') {
             $children = Db::query(
                 preg_replace(
                     '/\s+/u', 
@@ -77,6 +80,20 @@ class ArticleCategoryValidate extends Validate
                     SELECT id FROM article_tree_by WHERE id <> {$data['id']};"
                 )
             );
+        } else {
+            $children = \think\facade\Db::query("
+                SELECT t2.id
+                    FROM ( 
+                        SELECT 
+                            @r AS _id, (SELECT @r := GROUP_CONCAT(id) FROM $table_name WHERE FIND_IN_SET(pid, _id)) AS parent_id
+                        FROM 
+                            (SELECT @r := {$data['id']}) vars, $table_name h 
+                        WHERE @r <> 0) t1 
+                    JOIN $table_name t2 
+                    ON FIND_IN_SET(t2.pid, t1._id)
+                ORDER BY t2.id;
+            ");
+        }
         if (!empty($children) && in_array($data['pid'], array_column($children, 'id'))) {
             return false;
         }

app/admin/validate/v1/ArticleValidate.php

@@ -23,9 +23,9 @@ class ArticleValidate extends Validate
         'sort'         => 'integer',
         'recommend'    => 'require|in:0,1',
         'release_time' => 'dateFormat:Y-m-d H:i:s',
-        'seo_title'    => 'max:255',
+        'seo_title'    => 'max:512',
-        'seo_keywords' => 'max:255',
+        'seo_keywords' => 'max:512',
-        'seo_desc'     => 'max:255'
+        'seo_desc'     => 'max:1024'
     ];
 
     /**
@@ -48,8 +48,8 @@ class ArticleValidate extends Validate
         'recommend.require'       => '推荐状态不能为空',
         'recommend.in'            => '推荐状态的值必须是0或1',
         'release_time.dateFormat' => '发布时间格式不正确',
-        'seo_title.max'           => 'SEO标题长度不能超过255个字符',
+        'seo_title.max'           => 'SEO标题长度不能超过512个字符',
-        'seo_keywords.max'        => 'SEO关键字长度不能超过255个字符',
+        'seo_keywords.max'        => 'SEO关键字长度不能超过512个字符',
-        'seo_desc.max'            => 'SEO描述长度不能超过255个字符'
+        'seo_desc.max'            => 'SEO描述长度不能超过1024个字符'
     ];
 }

app/admin/validate/v1/AttachmentCategoryValidate.php

@@ -49,7 +49,10 @@ class AttachmentCategoryValidate extends Validate
         if ($value == 0) {
             return true;
         }
+
+        $children   = [];
         $table_name = (new AttachmentCategoryModel)->getTable();
+        if (env('DB_VERSION', '5') == '8') {
             $children = Db::query(
                 preg_replace(
                     '/\s+/u', 
@@ -62,6 +65,20 @@ class AttachmentCategoryValidate extends Validate
                     SELECT id FROM attachment_tree_by WHERE id <> {$data['id']};"
                 )
             );
+        } else {
+            $children = \think\facade\Db::query("
+                SELECT t2.id
+                    FROM ( 
+                        SELECT 
+                            @r AS _id, (SELECT @r := GROUP_CONCAT(id) FROM $table_name WHERE FIND_IN_SET(pid, _id)) AS parent_id
+                        FROM 
+                            (SELECT @r := {$data['id']}) vars, $table_name h 
+                        WHERE @r <> 0) t1 
+                    JOIN $table_name t2 
+                    ON FIND_IN_SET(t2.pid, t1._id)
+                ORDER BY t2.id;
+            ");
+        }
         if (!empty($children) && in_array($data['pid'], array_column($children, 'id'))) {
             return false;
         }

app/admin/validate/v1/NavigationItemValidate.php

@@ -61,7 +61,10 @@ class NavigationItemValidate extends Validate
         if ($value == 0) {
             return true;
         }
+
+        $children   = [];
         $table_name = (new SysNavigationItemModel)->getTable();
+        if (env('DB_VERSION', '5') == '8') {
             $children = Db::query(
                 preg_replace(
                     '/\s+/u', 
@@ -74,6 +77,20 @@ class NavigationItemValidate extends Validate
                     SELECT id FROM tree_by WHERE id <> {$data['id']};"
                 )
             );
+        } else {
+            $children = \think\facade\Db::query("
+                SELECT t2.id
+                    FROM ( 
+                        SELECT 
+                            @r AS _id, (SELECT @r := GROUP_CONCAT(id) FROM $table_name WHERE FIND_IN_SET(pid, _id)) AS parent_id
+                        FROM 
+                            (SELECT @r := {$data['id']}) vars, $table_name h 
+                        WHERE @r <> 0) t1 
+                    JOIN $table_name t2 
+                    ON FIND_IN_SET(t2.pid, t1._id)
+                ORDER BY t2.id;
+            ");
+        }
         if (!empty($children) && in_array($data['pid'], array_column($children, 'id'))) {
             return false;
         }

app/admin/validate/v1/SysBannerItemValidate.php

@@ -15,16 +15,17 @@ class SysBannerItemValidate extends Validate
      */
     protected $rule = [
         'id'              => 'require|integer',
-        'banner_id'       => 'require|integer',
+        'banner_id'       => 'require|integer|gt:0',
         'title'           => 'require|max:256',
         'title_txt_color' => 'max:7',
         'desc'            => 'max:1024',
         'desc_txt_color'  => 'max:7',
         'type'            => 'in:image,video',
         'image'           => 'max:255',
+        'extra_image'     => 'max:255',
         'video'           => 'max:255',
         'link_to'         => 'requireIf:type,image|max:64|in:article,article_category,product,product_category,system_page,custom',
-        'link'            => 'max:255',
+        'link'            => 'max:510',
         'sort'            => 'integer',
         'status'          => 'in:-1,1'
     ];
@@ -40,6 +41,7 @@ class SysBannerItemValidate extends Validate
         'id.integer'          => 'ID必须是整数',
         'banner_id.require'   => '横幅项分类不能为空',
         'banner_id.integer'   => '横幅项分类必须是整数',
+        'banner_id.gt'        => '该横幅分类不可选',
         'title.require'       => '名称不能为空',
         'title.max'           => '名称最多不能超过256个字符',
         'title_txt_color.max' => '名称字体颜色最多不能超过7个字符',
@@ -47,11 +49,12 @@ class SysBannerItemValidate extends Validate
         'desc_txt_color.max'  => '描述字体颜色最多不能超过7个字符',
         'type.in'             => '显示类型必须是image或video',
         'image.max'           => '图片地址最多不能超过255个字符',
+        'extra_image.max'     => '额外图片地址最多不能超过255个字符',
         'video.max'           => '视频地址最多不能超过255个字符',
         'link_to.requireIf'   => '链接类型不能为空',
         'link_to.max'         => '链接类型最多不能超过64个字符',
         'link_to.in'          => '链接类型必须是article,article_category,product,product_category,system_page,custom中之一',
-        'link.max'            => '链接最多不能超过255个字符',
+        'link.max'            => '链接最多不能超过512个字符',
         'sort.integer'        => '排序值必须是整数',
         'status.in'           => '状态必须是-1或1'
     ];

app/admin/validate/v1/SysMenuValidate.php

@@ -74,7 +74,10 @@ class SysMenuValidate extends Validate
         if ($value == 0) {
             return true;
         }
+
+        $children   = [];
         $table_name = (new SysMenuModel)->getTable();
+        if (env('DB_VERSION', '5') == '8') {
             $children = Db::query(
                 preg_replace(
                     '/\s+/u', 
@@ -87,6 +90,20 @@ class SysMenuValidate extends Validate
                     SELECT id FROM menu_tree_by WHERE id <> {$data['id']};"
                 )
             );
+        } else {
+            $children = \think\facade\Db::query("
+                SELECT t2.id
+                    FROM ( 
+                        SELECT 
+                            @r AS _id, (SELECT @r := GROUP_CONCAT(id) FROM $table_name WHERE FIND_IN_SET(pid, _id)) AS parent_id
+                        FROM 
+                            (SELECT @r := {$data['id']}) vars, $table_name h 
+                        WHERE @r <> 0) t1 
+                    JOIN $table_name t2 
+                    ON FIND_IN_SET(t2.pid, t1._id)
+                ORDER BY t2.id;
+            ");
+        }
         if (!empty($children) && in_array($data['pid'], array_column($children, 'id'))) {
             return false;
         }

app/admin/validate/v1/VideoValidate.php

@@ -17,8 +17,8 @@ class VideoValidate extends Validate
         'id'           => 'require|integer',
         'language_id'  => 'require|integer',
         'category_id'  => 'require|integer',
-        'name'         => 'require|max:64',
+        'name'         => 'require|max:128',
-        'desc'         => 'max:255',
+        'desc'         => 'max:512',
         'image'        => 'max:125',
         'video'        => 'max:125',
         'link'         => 'url|max:125',
@@ -43,8 +43,8 @@ class VideoValidate extends Validate
         'category_id.require' => '分类不能为空',
         'category_id.integer' => '分类参数类型错误',
         'name.require'        => '名称不能为空',
-        'name.max'            => '名称不能超过64个字符',
+        'name.max'            => '名称不能超过128个字符',
-        'desc.max'            => '描述不能超过255个字符',
+        'desc.max'            => '描述不能超过512个字符',
         'image.max'           => '图片不能超过125个字符',
         'video.max'           => '视频不能超过125个字符',
         'link.url'            => '链接格式错误',

app/command/DataMigration.php

@@ -61,6 +61,9 @@ class DataMigration extends Command
 
             // 迁移文章
             // $this->migrateArticle([
+            //     16 => 7,
+            //     31 => 9,
+            //     32 => 8,
             //     68 => 10,
             //     69 => 11,
             //     70 => 12,
@@ -290,14 +293,15 @@ class DataMigration extends Command
         $old_db = Db::connect('old');
 
         $success_map = [];
-        $success_arr = include_once(runtime_path() . 'product_success.php');
+        $success_arr = []; // include_once(runtime_path() . 'product_success.php');
         foreach ($success_arr as $so) {
             $success_map['p_' . $so['cod_product_id']] = $so;
         }
 
+        $arr = include_once(runtime_path() . 'product_ids.php');
         $products = $old_db->name('product')
             ->where('country_code', 'in', ['ZH', 'US'])
-            ->where('id', '>', 15789)
+            ->where('id', 'in', array_unique(array_column($arr, 'cod_product_id')))
             ->order(['id' => 'asc'])
             ->cursor();
 
@@ -374,7 +378,16 @@ class DataMigration extends Command
                     'deleted_at'   => $v['stat'] == -1 ? date('Y-m-d H:i:s') : null,
                 ];
                 // 保存产品数据
+                $prod = Db::name('product')
+                    ->where('language_id', '=', $item['language_id'])
+                    ->where('spu', '=', $item['spu'])
+                    ->find();
+                if (!empty($prod)) {
+                    $id = $prod['id'];
+                    Db::name('product')->where('id', '=', $prod['id'])->update($item);
+                } else {
                     $id = Db::name('product')->insertGetId($item);
+                }
 
                 // 保存产品参数数据
                 if (!empty($v['product_view'])) {
@@ -387,7 +400,21 @@ class DataMigration extends Command
                             'value'      => $p['desc_desc']
                         ];
                     }
+                    $old_params = Db::name('product_params')
+                        ->where('product_id', '=', $id)
+                        ->select();
+                    if ($old_params->isEmpty()) {
                         Db::name('product_params')->insertAll($prarms);
+                    } else {
+                        foreach ($old_params as $op) {
+                            Db::name('product_params')
+                                ->where('product_id', '=', $id)
+                                ->where('name', '=', $op['name'])
+                                ->update([
+                                    'value' => $op['value']
+                                ]);
+                        }
+                    }
                 }
 
                 // 保存sku数据
@@ -444,7 +471,7 @@ class DataMigration extends Command
                                 if ($k != 'sort') {
                                     $attr_value = $at;
                                     if (in_array($k, ['颜色', 'Color'])) {
-                                        if ($k == 'Color') $k = '颜色';
+                                        // if ($k == 'Color') $k = '颜色';
                                         $attr_value = '/static/common/images/colors/' . $at . '.png';
                                     }
                                     $images[$pkey]['color'] = $at;
@@ -468,7 +495,7 @@ class DataMigration extends Command
                             }
                         }
                         $attr_arr = [
-                            'attr_id'    => $attrs_map[$v['country_code']]['颜色'],
+                            'attr_id'    => $attrs_map[$v['country_code']][$v['country_code'] == 'ZH' ? '颜色' : 'Color'],
                             'attr_value' => $attr_value,
                         ];
                         if (
@@ -514,7 +541,7 @@ class DataMigration extends Command
                     $skus[] = [
                         'main_image' => $ti['image_url'],
                         'attrs' => [[
-                            'attr_id'    => $attrs_map[$v['country_code']]['颜色'],
+                            'attr_id'    => $attrs_map[$v['country_code']][$v['country_code'] == 'ZH' ? '颜色' : 'Color'],
                             'attr_value' => $ti['image_color'],
                         ]],
                         'pkey'      => $tpkey
@@ -575,6 +602,7 @@ class DataMigration extends Command
                 }
 
                 foreach ($skus as $sku) {
+                    Db::name('product_sku')->where('product_id', '=', $sku['product_id'])->delete();
                     $sku_id = Db::name('product_sku')->insertGetId([
                         'product_id'  => $sku['product_id'],
                         'sku'         => $sku['sku']??'',
@@ -584,6 +612,7 @@ class DataMigration extends Command
                     if (!empty($sku['attrs'])) {
                         foreach ($sku['attrs'] as $attr) {
                             if (!empty($sku_id)) {
+                                Db::name('product_sku_attr')->where('sku_id', '=', $sku_id)->delete();
                                 Db::name('product_sku_attr')->insert([
                                     'sku_id'     => $sku_id,
                                     'attr_id'    => $attr['attr_id'],
@@ -601,7 +630,7 @@ class DataMigration extends Command
                     sprintf('["ow_product_id" => %d, "cod_product_id" => %d]'.PHP_EOL, $id, $v['id']),
                     FILE_APPEND
                 );
-                $this->println(sprintf('迁移产品ID：%s => %s 【耗时：%s】', $v['id'], 0, round(microtime(true) - $start, 2) . 's'));
+                $this->println(sprintf('迁移产品ID：%s => %s 【耗时：%s】', $v['id'], $id, round(microtime(true) - $start, 2) . 's'));
             } catch (\Throwable $th) {
                 Db::rollback();
                 file_put_contents(
@@ -694,9 +723,12 @@ class DataMigration extends Command
             throw new \Exception('请确认分类ID');
         }
 
+        // 1634
         $article = Db::connect('old')
             ->name('article')
+            ->where('country_code', 'in', ['ZH', 'US'])
             ->where('cid', 'in', array_keys($category_map))
+            ->where('id', '=', 351)
             ->order(['id' => 'asc'])
             ->cursor();
 
@@ -745,7 +777,16 @@ class DataMigration extends Command
                 'release_time' => date('Y-m-d H:i:s', $v['createtime']),
                 'deleted_at'   => $v['stat'] == -1 ? date('Y-m-d H:i:s') : null
             ];
+            $ret = Db::name('article')
+                ->where('language_id', '=', $item['language_id'])
+                ->where('title', '=', $item['title'])
+                ->find();
+            if (empty($ret)) {
                 $id = Db::name('article')->insertGetId($item);
+            } else {
+                $id = $ret['id'];
+                Db::name('article')->where('id', '=', $ret['id'])->update($item);
+            }
 
             $this->println(sprintf('迁移文章ID：%s => %s', $v['id'], $id));
         }
@@ -779,7 +820,15 @@ class DataMigration extends Command
                 'recommend'   => $val['is_home'],
                 'sort'        => $val['sort'] == 9999 ? 0 : $val['sort']
             ];
+            $ret = Db::name('faq')
+                ->where('language_id', '=', $item['language_id'])
+                ->where('question', '=', $item['question'])
+                ->find();
+            if (empty($ret)) {
                 Db::name('faq')->insert($item);
+            } else {
+                Db::name('faq')->where('id', '=', $ret['id'])->update($item);
+            }
         }
     }
 
@@ -881,7 +930,8 @@ class DataMigration extends Command
     {
         $videos = Db::connect('old')
             ->name('video')
-            ->where('id', '>', 844)
+            // ->where('id', '>', 844)
+            ->where('cid', 'in', array_keys($category_map))
             ->where('country_code', 'in', ['ZH', 'US'])
             ->order(['id' => 'asc'])
             ->cursor();
@@ -921,7 +971,16 @@ class DataMigration extends Command
                 'seo_desc'         => $val['seo_description'],
                 'deleted_at'       => $val['stat'] == -1 ? date('Y-m-d H:i:s') : null
             ];
+            $ret = Db::name('video')
+                ->where('language_id', '=', $item['language_id'])
+                ->where('name', '=', $item['name'])
+                ->find();
+            if (empty($ret)) {
                 Db::name('video')->insert($item);
+            } else {
+                Db::name('video')->where('id', '=', $ret['id'])->update($item);
+            }
+            
             $this->println('迁移视频ID：' . $val['id']);
         }
     }
@@ -929,7 +988,7 @@ class DataMigration extends Command
 
 class UploadMannager
 {
-    const   UPLOAD_BASE_API    = 'http://dev.ow.f2b211.com';
+    const   UPLOAD_BASE_API    = 'http://ow.f2b211.com';
     const   DOWNLOAD_BASE_API  = 'http://www.orico.com.cn';
     const   DOWNLOAD_TEMP_PATH = '/var/www/html/orico-official-website/public/migrate_temp_images';
     private $username          = 'admin';
@@ -942,7 +1001,7 @@ class UploadMannager
     {
         // 登录获取token
         $this->token = $this->getAuthorization();
-        $this->maps = include_once(runtime_path() . 'fiber_product_image_mapping.php');
+        $this->maps = []; // include_once(runtime_path() . 'fiber_product_image_mapping.php');
     }
 
     // 下载图片
@@ -1062,6 +1121,7 @@ class UploadMannager
             print($http_code . PHP_EOL);
         }
 
+        file_put_contents(runtime_path() . 'upload.txt', $response . PHP_EOL, FILE_APPEND);
         $ret = json_decode($response, true);
         if (empty($ret)) {
             throw new \Exception($response);

app/command/OpenApiMgr/AddClient.php

@@ -0,0 +1,42 @@
+<?php
+declare (strict_types = 1);
+
+namespace app\command\OpenApiMgr;
+
+use oauth\OAuthStorage;
+use think\console\Command;
+use think\console\Input;
+use think\console\input\Argument;
+use think\console\input\Option;
+use think\console\Output;
+
+class AddClient extends Command
+{
+    protected function configure()
+    {
+        // 指令配置
+        $this->setName('OpenApiMgr:AddClient')
+            ->addArgument('salt', Argument::OPTIONAL, "开放API的client_secret密钥的盐值")
+            ->setDescription('开放API的client管理');
+    }
+
+    protected function execute(Input $input, Output $output)
+    {
+        $salt = $input->getArgument('salt');
+        $salt = empty($salt) ? null : trim($salt);
+
+        // 指令输出
+        $oauth = new OAuthStorage($salt);
+
+        $client_id = random_str(13, 'all', 0);
+        $client_secret = random_str(32, 'all', 0);
+        
+        $ok = $oauth->addClient($client_id, $client_secret, null);
+        if (!$ok) { 
+            $output->writeln("添加失败");
+            return;
+        }
+
+        $output->writeln("添加成功:\nClientID: {$client_id}\nClientSecret: {$client_secret}\n");
+    }
+}

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;
                 }
@@ -145,3 +145,90 @@ if (!function_exists('thumb')) {
         return mb_substr($url, 0, $idx, 'utf-8') . '_thumb' . mb_substr($url, $idx, $len - $idx, 'utf-8');
     }
 }
+
+if (!function_exists('get_filesystem_url')) {
+    /**
+     * 获取文件系统的访问 URL
+     * @param string $url 文件地址
+     * @param string $disk 磁盘配置 key
+     * @return 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;
+        }
+        if (empty($disk)) {
+            return '';
+        }
+        return \think\facade\Filesystem::disk($disk)->url($url);
+    }
+}
+
+if (!function_exists('url_filesystem_detect')) {
+    /**
+     * 检测文件地址并根据情况转换为文件系统地址
+     * @param string $url 文件地址
+     * @return string
+     */
+    function url_filesystem_detect(string|null $url): string
+    {
+        if  (is_null($url)) {
+            return '';
+        }
+
+        $idx = strrpos($url, '.');
+        if ($idx === false) {
+            return $url;
+        }
+
+        $disks = [
+            'public_qiniu' => '_' . base64_encode('public_qiniu'),
+            'video_qiniu'  => '_' . base64_encode('video_qiniu')
+        ];
+        foreach ($disks as $disk => $marker) {
+            if (str_ends_with(mb_substr($url, 0, $idx), $marker)) {
+                return get_filesystem_url($url, $disk);
+            }
+        }
+
+        return $url;
+    }
+}
+
+if (!function_exists('url_join')) {
+    /**
+     * 合并URL
+     * @param string $url 基础URL
+     * @param string $path 路径
+     * @param bool $remove_slash 是否移除首尾的斜杠
+     * @return string
+     */
+    function url_join(string $url, string $path, bool $remove_slash = true): string
+    {
+        if (empty($url)) {
+            return $path;
+        }
+        if (empty($path)) {
+            return $url;
+        }
+        if (\think\helper\Str::startsWith($path, ['http://', 'https://', '//'])) {
+            return $path;
+        }
+        
+        if ($remove_slash) {
+            if (str_ends_with($url, '/') && str_starts_with($path, '/')) {
+                return $url . substr($path, 1);
+            }
+            if (!str_ends_with($url, '/') && !str_starts_with($path, '/')) {
+                return $url . '/' . $path;
+            }
+        }
+
+        return $url . $path;
+    }
+}

app/common/model/SysBannerItemBaseModel.php

@@ -25,6 +25,7 @@ class SysBannerItemBaseModel extends BaseModel
         'desc_txt_color'  => 'string',
         'type'            => 'string',
         'image'           => 'string',
+        'extra_image'     => 'string',
         'video'           => 'string',
         'link_to'         => 'string',
         'link'            => 'string',

app/common/model/SysRoleAuthorityBaseModel.php

@@ -18,6 +18,6 @@ class SysRoleAuthorityBaseModel extends Model
     protected $schema = [
         'role_id' => 'int',
         'menu_id' => 'int',
-        'permission' => 'int',
+        'permission' => 'string',
     ];
 }

app/index/common.php

@@ -178,3 +178,66 @@ if (!function_exists('date_format_i18n')) {
         return date($fmt, $timestamp);
     }
 }
+
+if (!function_exists('get_platform')) {
+    /**
+     * 获取平台
+     * @return string
+     */
+    function get_platform(): string
+    {
+        $detect   = new \Detection\MobileDetect();
+        $platform = 'pc';
+
+        if ($detect->isMobile() || $detect->isTablet()) {
+            $platform = 'mobile';
+        } else {
+            // 在非移动端环境，根据配置规则判断是否要显示移动端
+            $view_cfg = $view_cfg = [
+                'rule'  => env('INDEX_VIEW_TPL.RULE', 'query'),
+                'query' => [
+                    'name'  => env('INDEX_VIEW_TPL.RULE_QUERY_NAME', 'mtpl'),
+                    'value' => env('INDEX_VIEW_TPL.RULE_QUERY_VALUE', '1'),
+                ],
+                'domain' => [
+                    'scheme' => env('INDEX_VIEW_TPL.RULE_DOMAIN_SCHEME', ['http']),
+                    'host'   => env('INDEX_VIEW_TPL.RULE_DOMAIN_HOST'),
+                ],
+            ];
+            if ($view_cfg['rule'] == 'query') {
+                $name  = $view_cfg['query']['name'];
+                $value = $view_cfg['query']['value'];
+                if (request()->get($name) == $value) {
+                    $platform = 'mobile';
+                }
+            } elseif ($view_cfg['rule'] == 'domain') {
+                $scheme = $view_cfg['domain']['scheme'];
+                $host   = $view_cfg['domain']['host'];
+                if (in_array(request()->scheme(), $scheme) && $host == request()->host()) {
+                    $platform = 'mobile';
+                }
+            }
+        }
+
+        return $platform;
+    }
+}
+
+if (!function_exists('highlight_keywords')) {
+    /**
+     * 高亮关键词
+     * @param string $text // 要处理的文本
+     * @param string $keyword // 关键词
+     * @param string|callable $repalce // 替换函数或字符串
+     * @return string
+     */
+    function highlight_keywords(string $text, string $keyword, string|callable $replace): string
+    {
+        return preg_replace_callback('/' . preg_quote($keyword, '/') . '+/i', function($match) use($text, $replace) {
+            if (empty($match)) return $text;
+            if (is_string($replace)) return '<strong>' . $match[0] . '</strong>';
+            if (is_callable($replace)) return $replace($match[0]);
+            return $match[0];
+        }, $text);
+    }
+}

app/index/config/lang.php

@@ -19,7 +19,7 @@ return [
     // 扩展语言包
     'extend_list'     => [
         'en-us' => [
-            app()->getAppPath() . '/lang/en-us/' . (request()->isMobile() ? 'mobile' : 'pc') . '.php',
+            app()->getAppPath() . '/lang/en-us/' . get_platform() . '.php',
             app()->getAppPath() . '/lang/en-us/validate.php',
         ],
     ],

app/index/config/view.php

@@ -3,13 +3,7 @@
 // | 模板设置
 // +----------------------------------------------------------------------
 
-use Detection\MobileDetect;
+$view_device_name = get_platform();
-
-$detect           = new MobileDetect();
-$view_device_name = 'pc';
-if ($detect->isMobile() || $detect->isTablet() || request()->get('mtpl') == 1) {
-    $view_device_name = 'mobile';
-}
 
 return [
     // 模板引擎类型使用Think

app/index/controller/Article.php

@@ -170,9 +170,9 @@ class Article extends Common
         ]);
         $ret = ArticleLeaveMessageModel::create($data);
         if ($ret->isEmpty()) {
-            return error(lang('留言提交失败'));
+            return error(lang('信息提交失败！'));
         }
 
-        return success(lang('留言提交成功'));
+        return success(lang('信息已成功提交！'));
     }
 }

app/index/controller/Attachment.php

@@ -21,7 +21,7 @@ class Attachment extends Common
     {
         $param = request()->param([
             'id',
-            'keyword',
+            'keyword' => '',
             'page/d'  => 1,
             'size/d'  => 12,
         ]);
@@ -48,9 +48,9 @@ class Attachment extends Common
                 'support_platform',
                 'attach',
             ])
-            ->withSearch(['name'], ['name' => $param['keyword']??null])
+            ->withSearch(['name'], ['name' => !empty($param['keyword']) ? trim($param['keyword']) : null])
             ->language($this->lang_id)
-            ->category($param['id']??null)
+            ->category(!empty($param['id']) ? $param['id'] : $categorys[0]['id']??null)
             ->order(['sort' => 'asc', 'id' => 'desc'])
             ->paginate([
                 'list_rows' => $param['size'],
@@ -59,6 +59,16 @@ class Attachment extends Common
                     'id' => $param['id']??null
                 ]
             ]);
+        if (!$attachements->isEmpty()) {
+            $attachements->each(function($item) {
+                if (is_array($item->attach)) {
+                    $item->attach = array_map(function($v) {
+                        $v['file_path'] = url_filesystem_detect($v['file_path']);
+                        return $v;
+                    }, $item->attach);
+                }
+            });
+        }
         View::assign('attachements', $attachements);
         View::assign('page', $attachements->render());
 
@@ -109,9 +119,9 @@ class Attachment extends Common
                 'video',
                 'link'
             ])
-            ->withSearch(['name'], ['name' => $param['keyword']??null])
+            ->withSearch(['name'], ['name' => !empty($param['keyword']) ? trim($param['keyword']) : null])
             ->language($this->lang_id)
-            ->category($param['id']??$video_categorys[0]['id']??null)
+            ->category(!empty($param['id']) ? $param['id'] : $video_categorys[0]['id']??null)
             ->order(['sort' => 'asc', 'id' => 'desc'])
             ->paginate([
                 'list_rows' => $param['size'],
@@ -122,6 +132,9 @@ class Attachment extends Common
             ]);
         
         if (!$videos->isEmpty()) {
+            $videos->each(function($item) {
+                $item->video = url_filesystem_detect($item->video);
+            });
             $videos->setCollection($videos->getCollection()->chunk(2));
         }
         View::assign('videos', $videos);

app/index/controller/Common.php

@@ -106,6 +106,7 @@ abstract class Common extends BaseController
                 'language_id'  =>  $language,
                 'status'       => 1
             ])
+            ->where('status', '=', 1)
             ->order(['sort' => 'asc', 'id' => 'asc'])
             ->select();
         if ($nav->isEmpty()) {

app/index/controller/ContactUs.php

@@ -45,14 +45,7 @@ class ContactUs extends Common
                 $banner_map[$v->unique_label] = $v;
             }
             $focus_image = data_get($banner_map, 'BANNER_6805e3d32dcc2')?->items->first()?->toArray();
-            $info_datas  = data_get($banner_map, 'BANNER_6806090c1838f')?->items->each(function($item) {
+            $info_datas  = data_get($banner_map, 'BANNER_6806090c1838f')?->items->toArray();
-                if (Str::contains($item->title, '<br/>')) {
-                    $title             = explode('<br/>', $item->title);
-                    $item->title       = $title[0];
-                    $item->title_short = $title[1];
-                }
-                return $item;
-            })->toArray();
         }
         View::assign('focus_image', $focus_image);
         View::assign('info_datas', $info_datas);

app/index/controller/Product.php

@@ -104,7 +104,7 @@ class Product extends Common
                     ->onSale(true)
                     ->onShelves(true)
                     ->append(['p' => $list[0]['id']])
-                    ->order(['sort' => 'asc', 'id' => 'desc'])
+                    ->order(['sort' => 'asc', 'created_at' => 'desc', 'id' => 'desc'])
                     ->limit(5)
                     ->buildSql();
                 $query = \think\facade\Db::table("($sql) as a");
@@ -126,7 +126,7 @@ class Product extends Common
                         ->enabled(true)
                         ->onSale(true)
                         ->onShelves(true)
-                        ->order(['sort' => 'asc', 'id' => 'desc'])
+                        ->order(['sort' => 'asc', 'created_at' => 'desc', 'id' => 'desc'])
                         ->limit(5);
                     });
                 }
@@ -192,7 +192,7 @@ class Product extends Common
                 ->enabled(true)
                 ->onSale(true)
                 ->onShelves(true)
-                ->order(['sort' => 'asc', 'id' => 'desc'])
+                ->order(['sort' => 'asc', 'created_at' => 'desc', 'id' => 'desc'])
                 ->select();
             if (!$products->isEmpty()) {
                 // 获取sku信息
@@ -231,7 +231,7 @@ class Product extends Common
                         $attr = $sku_attrs_map[$v['id']]?? [];
                         if (!empty($attr)) {
                             foreach ($attr as $at) {
-                                if ($at['attr_name'] == '颜色') {
+                                if (in_array($at['attr_name'], ['颜色', 'Color'])) {
                                     $color_map[$v['product_id']][] = $at;
                                 }
                             }
@@ -277,7 +277,7 @@ class Product extends Common
             'page/d' => 1,
             'size/d' => 10
         ]);
-        $keywords = $param['keywords'] ?? '';
+        $keywords = !empty($param['keywords']) ? trim($param['keywords']) : '';
 
         // 关键词搜索
         $products = ProductModel::field([
@@ -299,9 +299,10 @@ class Product extends Common
                 'query'     => request()->param()
             ])
             ->each(function ($item) use($keywords) {
-                $item['spu']        = str_replace($keywords, '<strong class="redpoint">'.$keywords.'</strong>', $item['spu']);
+                $replace            = fn($txt) => '<strong class="redpoint">' . $txt . '</strong>';
-                $item['name']       = str_replace($keywords, '<strong class="redpoint">'.$keywords.'</strong>', $item['name']);
+                $item['spu']        = highlight_keywords($item['spu'], $keywords, $replace);
-                $item['short_name'] = str_replace($keywords, '<strong class="redpoint">'.$keywords.'</strong>', $item['short_name']);
+                $item['name']       = highlight_keywords($item['name'], $keywords, $replace);
+                $item['short_name'] = highlight_keywords($item['short_name'], $keywords, $replace);
                 return $item;
             });
         View::assign('products', $products);
@@ -373,6 +374,8 @@ class Product extends Common
                     // 获取属性名称
                     $attrs = ProductAttrModel::bypks(array_unique(Arr::pluck($sku_attrs, 'attr_id')))->column(['attr_name'], 'id');
                     foreach ($sku_attrs as $v) {
+                        if (empty($v['attr_value'])) continue;
+                        
                         $v['attr_name'] = $attrs[$v['attr_id']]?? '';
                         // 按属性分组
                         $product_sku_attrs[$v['attr_id']]['attr_id']       = $v['attr_id'];
@@ -393,8 +396,11 @@ class Product extends Common
                 ->order(['sort' => 'asc', 'id' => 'desc'])
                 ->select()
                 ->hidden(['platform'])
-                ->bindAttr('platform', ['platform_name' => 'platform'])
+                ->bindAttr('platform', ['platform_name' => 'platform', 'platform_sort' => 'sort'])
                 ->toArray();
+            // 根据购买链接平台排序
+            $sort_by_arr = array_column($product_purchase_links, 'platform_sort');
+            array_multisort($sort_by_arr, SORT_ASC, $product_purchase_links);
 
             // 获取相关产品信息
             $related = ProductRelatedModel::with(['product' => function($query) {
@@ -457,9 +463,9 @@ class Product extends Common
             'message'      => $post['message'],
         ]);
         if ($ret->isEmpty()) {
-            return error(lang('提交成功'));
+            return error(lang('提交失败'));
         }
-        return success(lang('提交失败'));
+        return success(lang('提交成功'));
     }
 
     /**

app/index/controller/TopicNas.php

@@ -21,7 +21,7 @@ class TopicNas extends Common
         // 获取国家/语言列表
         $languages = $this->getLanguages();
         // 输出国家/语言列表
-        if (request()->isMobile()) {
+        if (get_platform() == 'mobile') {
             View::assign('header_languages', $languages);
         }
 
@@ -192,6 +192,8 @@ class TopicNas extends Common
     {
         // 获取文章分类及文章数据
         $parent = ArticleCategoryModel::uniqueLabel('CATEGORY_681182e0a4529')->language($this->lang_id)->value('id');
+        $parent_two = ArticleCategoryModel::parent($parent)->language($this->lang_id)->column('id');//二级分类id
+        array_push($parent_two,$parent);
         $article_categorys = ArticleCategoryModel::with(['article' => function($query) {
                 $query->field(['id', 'title', 'category_id'])
                     ->order(['sort' => 'asc', 'id' => 'desc'])
@@ -199,14 +201,48 @@ class TopicNas extends Common
             }])
             ->field([
                 'id',
+                'pid',
                 'name',
                 'icon'
             ])
             ->language($this->lang_id)
-            ->parent($parent)
+//            ->parent($parent)
+            ->parentChild($parent_two)
             ->isShow(true)
+            ->order(['sort' => 'asc', 'id' => 'desc'])
             ->select();
-        View::assign('article_categorys', $article_categorys);
+        //查询三级分类
+        $article_categorys_new = [];
+        $article_categorys_two = [];
+//        dump($article_categorys->toArray());exit;
+        if (!$article_categorys->isEmpty()) {
+            foreach ($article_categorys->toArray() as $kk=>$vv) {
+                if ( $parent == $vv['pid'] ) {
+                    array_push($article_categorys_new,$vv);
+                } else {
+                    $article_categorys_two[$vv['pid']][] = $vv;
+                }
+            }
+            if ( !empty($article_categorys_two) ) {
+                foreach ($article_categorys_new as &$vvv) {
+                    $articles = $vvv['article'];
+                    if ( isset($article_categorys_two[$vvv['id']]) ) {
+                        foreach ($article_categorys_two[$vvv['id']] as $v) {
+                            foreach ($v['article'] as $av) {
+                                if ( count($articles) < 3 ) {
+                                    array_push($articles,$av);
+                                }
+                            }
+                        }
+                    }
+                    $vvv['article'] = $articles;
+                }
+            }
+        }
+
+
+        View::assign('article_categorys', $article_categorys_new);
+//        View::assign('article_categorys', $article_categorys);
 
         $contacts = [];
         // 获取banner数据
@@ -245,19 +281,46 @@ class TopicNas extends Common
 
         // 获取文章分类及文章数据
         $parent = ArticleCategoryModel::uniqueLabel('CATEGORY_681182e0a4529')->language($this->lang_id)->value('id');
+        $parent_two = ArticleCategoryModel::parent($parent)->language($this->lang_id)->column('id');//二级分类id
+        array_push($parent_two,$parent);
         $article_categorys = ArticleCategoryModel::with(['article' => function ($query) {
                 $query->field(['id', 'title', 'category_id'])->order(['sort' => 'asc', 'id' => 'desc']);
             }])
             ->field([
                 'id',
+                'pid',
                 'name',
                 'icon'
             ])
             ->language($this->lang_id)
-            ->parent($parent)
+//            ->parent($parent)
+            ->parentChild($parent_two)
             ->isShow(true)
+            ->order(['sort' => 'asc', 'id' => 'desc'])
             ->select();
-        View::assign('article_categorys', $article_categorys);
+//        dump($article_categorys->toArray());exit;
+        //查询三级分类
+        $article_categorys_new = [];
+        $article_categorys_two = [];
+        if (!$article_categorys->isEmpty()) {
+            foreach ($article_categorys->toArray() as $kk=>$vv) {
+                if ( $parent == $vv['pid'] ) {
+                    $vv['child'] = '';
+                    array_push($article_categorys_new,$vv);
+                } else {
+                    $article_categorys_two[$vv['pid']][] = $vv;
+                }
+            }
+            if ( !empty($article_categorys_two) ) {
+                foreach ($article_categorys_new as &$vvv) {
+                    $vvv['child'] = isset($article_categorys_two[$vvv['id']])?$article_categorys_two[$vvv['id']]:'';
+                }
+            }
+        }
+//        dump($article_categorys_new);exit;
+//        dump($article_categorys_two);exit;
+
+        View::assign('article_categorys', $article_categorys_new);
 
         return View::fetch('help_detail');
     }
@@ -274,7 +337,9 @@ class TopicNas extends Common
             ->value('id');
             
         // 获取帮且中心分类子分类
+        $categorys  = [];
         $table_name = (new ArticleCategoryModel)->getTable();
+        if (env('DB_VERSION', '5') == '8') {
             $categorys = \think\facade\Db::query(preg_replace(
                 '/\s+/u', 
                 ' ',
@@ -285,6 +350,20 @@ class TopicNas extends Common
                 )
                 SELECT id FROM article_tree_by WHERE id <> {$parent}"
             ));
+        } else {
+            $categorys = \think\facade\Db::query("
+                SELECT t2.id
+                    FROM ( 
+                        SELECT 
+                            @r AS _id, (SELECT @r := GROUP_CONCAT(id) FROM $table_name WHERE FIND_IN_SET(pid, _id)) AS parent_id
+                        FROM 
+                            (SELECT @r := $parent) vars, $table_name h 
+                        WHERE @r <> 0) t1 
+                    JOIN $table_name t2 
+                    ON FIND_IN_SET(t2.pid, t1._id)
+                ORDER BY t2.id;
+            ");
+        }
         if (empty($categorys)) return success('success', []);
 
         // 获取文章数据
@@ -299,8 +378,18 @@ class TopicNas extends Common
             ->language($this->lang_id)
             ->where('category_id', 'IN', array_column($categorys, 'id'))
             ->select();
+        //查询上级id
+        $parent_two = ArticleCategoryModel::parentColumn(array_column($categorys, 'id'))->language($this->lang_id)->column('pid','id');//二级分类id
+        $articles_data = $articles->toArray();
+        foreach ($articles_data as &$v) {
+            $v['pid'] = 0;
+            if ( $parent_two[$v['category_id']] !== $parent ) {
+                $v['pid'] = $v['category_id'];
+                $v['category_id'] = $parent_two[$v['category_id']];
+            }
+        }
 
-        return success('success', $articles->toArray());
+        return success('success', $articles_data);
     }
     
     /**

app/index/lang/en-us/mobile.php

@@ -53,6 +53,7 @@ return [
     'product/search' => [
         '搜索' => 'Search',
         '请搜索' => 'Please search...',
+        '暂无数据' => 'No data',
     ],
     // 产品详情
     'product/detail' => [

app/index/lang/en-us/pc.php

@@ -1,6 +1,7 @@
 <?php
 
 return [
+    '首页' => 'Home',
     '产品列表' => 'Products',
     '店铺' => 'Store',
     '搜索记录' => 'Search History',
@@ -160,6 +161,7 @@ return [
     // 产品 - 产品详情页
     'product/detail' => [
         '首页' => 'Home',
+        '型号' => 'Product Model',
         '产品详情' => 'Product Description',
         '相关产品' => 'Related Products',
         '发送查询' => 'Send Inquiry',
@@ -176,6 +178,11 @@ return [
         '提交' => 'SUBMIT',
     ],
 
+    // 产品 - 搜索
+    'product/search' => [
+        '暂无数据' => 'No data',
+    ],
+
     // 产品 - 分类
     'product/category' => [
         '查看全部' => 'View All',

app/index/middleware.php

@@ -2,7 +2,8 @@
 // 这是系统自动生成的middleware定义文件
 return [
     // 启用多语言支持
-    think\middleware\LoadLangPack::class,
+    // think\middleware\LoadLangPack::class,
+    app\index\middleware\LoadLangPack::class,
     // 确认请求来源
     app\index\middleware\ConfirmRequestFrom::class,
 ];

app/index/middleware/ConfirmRequestFrom.php

@@ -15,10 +15,7 @@ class ConfirmRequestFrom
     public function handle($request, \Closure $next)
     {
         // 确认请求来源
-        $request->from = 'pc';
+        $request->from = get_platform();
-        if ($request->isMobile() || $request->get('mtpl') == 1) {
-            $request->from = 'mobile';
-        }
         
         return $next($request);
     }

app/index/middleware/LoadLangPack.php

@@ -0,0 +1,39 @@
+<?php
+declare (strict_types = 1);
+
+namespace app\index\middleware;
+
+use think\Request;
+
+class LoadLangPack extends \think\middleware\LoadLangPack
+{
+    // 重写检测语言方法
+    protected function detect(Request $request): string
+    {
+        $domain_detect = env('INDEX_LANG_DETECT.DOMAIN_DETECT', false);
+        if ($domain_detect) {
+            $lang = $this->getLangSet($request, env('INDEX_LANG_DETECT.DOMAIN_RULE', []));
+            if ($lang != '') {
+                return $lang;
+            }
+        }
+
+        return parent::detect($request);
+    }
+
+    // 根据请求及规则获取语言
+    private function getLangSet(Request $request, array $rules): string
+    {
+        $map = [];
+        foreach ($rules as $v) {
+            $val  = str_replace('，', ',', $v);
+            $item = explode(',', $v);
+            foreach ($item as $val) {
+                $it          = explode('=', $val);
+                $map[$it[0]] = $it[1];
+            }
+        }
+        
+        return $map[$request->host()] ?? '';
+    }
+}

app/index/model/ArticleCategoryModel.php

@@ -46,6 +46,27 @@ class ArticleCategoryModel extends ArticleCategoryBaseModel
         $query->where('pid', '=', $parent);
     }
 
+    // 所属上级分类范围查询
+    public function scopeParentChild($query, $parent)
+    {
+        if (is_array($parent)) {
+            $query->where('pid', 'IN', $parent);
+            return;
+        }
+        $query->where('pid', '=', $parent);
+    }
+
+    // 所属上级分类查询
+    public function scopeParentColumn($query, $parent)
+    {
+        if (is_array($parent)) {
+            $query->where('id', 'IN', $parent);
+            return;
+        }
+        $query->where('id', '=', $parent);
+    }
+
+
     // 所属子分类范围查询
     public function scopeChild($query, $id, $merge_self = false)
     {

app/index/model/ProductModel.php

@@ -79,6 +79,6 @@ class ProductModel extends ProductBaseModel
     // 关键词搜索
     public function searchKeywordsAttr($query, string $keywords)
     {
-        $query->whereRaw('BINARY spu LIKE "%' . $keywords . '%" OR BINARY name LIKE "%' . $keywords . '%" OR BINARY short_name LIKE "%' . $keywords . '%"');
+        $query->whereRaw('spu LIKE "%' . $keywords . '%" OR name LIKE "%' . $keywords . '%" OR short_name LIKE "%' . $keywords . '%"');
     }
 }

app/index/view/mobile/article/detail.html

@@ -50,7 +50,7 @@
                             {notempty name="sc.url.value"}href="{$sc.url.value}"{/notempty}>
                                 {eq name=":array_key_exists('triggered_qrcode', $sc)" value="true"}
                                 <img class="toggle_qrcode" src="{$sc.image.value}" />
-                                <div class="triggered_qrcode">
+                                <div class="triggered_qrcode wechat_code">
                                     <img src="{$sc.triggered_qrcode.value}" />
                                 </div>
                                 {else /}
@@ -86,7 +86,7 @@
                         <p class="thtitle">{:lang_i18n('你可能还喜欢')}</p>
                         <p><img src="__IMAGES__/1line.webp"></p>
                     </div>
-                    <div class="swiper-container loveswiper">
+                    <div class="swiper loveswiper">
                         <div class="swiper-wrapper">
                             {volist name="recommends" id="vo"}
                             <div class="swiper-slide">
@@ -128,18 +128,15 @@
         })
 
         $('.toggle_qrcode').click(function() {
-            $(this).siblings('.triggered_qrcode').toggle();
+            const qrcode = $(this).siblings('.triggered_qrcode');
-        })
+            qrcode.css('display', qrcode.css('display') === 'none' ? 'flex' : 'none');
+        });
     })
     //banner轮播
     var loveswiper = new Swiper('.loveswiper', {
         // 配置选项
         slidesPerView: 2,
         spaceBetween: 30,
-        loop: true,
-        autoplay: {
-            delay: 3000,
-        },
         pagination: {
             el: '.swiper-pagination',
         }

app/index/view/mobile/article/index.html

@@ -32,7 +32,7 @@
                         <form action="{:url('article/index', ['pid' => $Request.param.pid])}" method="get" autocomplete="off">
                             <input type="text" class="search" id="article-blog-in" name="keywords" value="">
                             <input type="hidden" class="search" id="article-blog-in" name="cid" value="{$Request.get.cid}">
-                            <button id="blog-btnput" class="search-button-blog" style="padding:5px 12px;">{:lang_i18n('搜索')}</button>
+                            <button id="blog-btnput" class="search-button-blog">{:lang_i18n('搜索')}</button>
                         </form>
                     </div>
                     {notempty name="articles"}

app/index/view/mobile/attachment/video.html

@@ -14,7 +14,7 @@
         <div class="tabs">
             {notempty name="video_categorys"}
             {volist name="video_categorys" id="va"}
-            <a href="{:url('attachment/index', ['id' => $va.id])}"><div class="tabit active">{$va.name}</div></a>
+            <a href="{:url('attachment/video', ['id' => $va.id])}"><div class="tabit active">{$va.name}</div></a>
             {/volist}
             {/notempty}
         </div>

app/index/view/mobile/contact_us/index.html

@@ -23,14 +23,14 @@
                         {volist name="ch" id="item"}
                         <div class="narskfit" {notempty name="item.link"}onclick="location.href='{$item.link}'"{/notempty}>
                             <img src="{$item.image}" class="narskico-img" />
-                            <span class="narskf-title">{$item.title}</span>
+                            <span class="narskf-title" {:style(['color' => $item['title_txt_color']])}>{$item.title}</span>
-                            {notempty name="item.title_short"}
-                            <span class="narskf-sm">{$item.title_short}</span>
-                            {/notempty}
                             {notempty name="item.desc"}
-                            {if condition="str_contains($item.desc, '<img')"}
+                            <span class="narskf-sm" {:style(['color' => $item['desc_txt_color']])}>{$item.desc|raw}</span>
-                            <div class="narskfactive-ewm" style="display: none;">{$item.desc|raw}</div>
+                            {/notempty}
-                            {/if}
+                            {notempty name="item.extra_image"}
+                            <div class="narskfactive-ewm" style="display: none;">
+                                <img src="{$item.extra_image}" alt="" />
+                            </div>
                             {/notempty}
                         </div>
                         {/volist}
@@ -41,8 +41,8 @@
                         <div class="narskfit narskfit2">
                             <img src="{$item.image}" class="narskico-img">
                             <div class="narskfit2-ct">
-                                <span class="narskf-title">{$item.title}</span>
+                                <span class="narskf-title" {:style(['color' => $item['title_txt_color']])}>{$item.title}</span>
-                                <span class="narskf-sm">{$item.desc|raw}</span>
+                                <span class="narskf-sm" {:style(['color' => $item['desc_txt_color']])}>{$item.desc|raw}</span>
                             </div>
                         </div>
                     </div>

app/index/view/mobile/index/index.html

@@ -101,8 +101,8 @@
                 <a href="{$sc.link}"><img src="{$sc.image}" /></a>
                 <div class="position_a text_center wow animated bounceInLeft">
                     <p class="f_weight_500 timetitle" {:style(['color'=>$sc['title_txt_color']])}>{$sc.title}</p>
-                    <p class=" margin-top-14 f_weight_100 timedesin" {:style(['color'=>$sc['desc_txt_color']])}>{$sc.desc}</p>
+                    <p class=" margin-top-14 f_weight_400 timedesin" {:style(['color'=>$sc['desc_txt_color']])}>{$sc.desc|raw}</p>
-                    <p class=" margin-top-20 f_weight_100">
+                    <p class=" margin-top-20 f_weight_400">
                         <a href="{$sc.link}" class="timeblue"> {:lang_i18n('了解更多')} <img src="__IMAGES__/more-r.png"></a>
                     </p>
                 </div>
@@ -141,8 +141,8 @@
                             <img src="{$bs.image}">
                             <div class="position_a text_center">
                                 <p class=" timetitle" {:style(['color'=>$bs['title_txt_color']])}>{$bs.title} </p>
-                                <p class=" margin-top-14 f_weight_100 timedesin" {:style(['color'=>$bs['desc_txt_color']])}>{$bs.desc}</p>
+                                <p class=" margin-top-14 f_weight_400 timedesin" {:style(['color'=>$bs['desc_txt_color']])}>{$bs.desc|raw}</p>
-                                <p class=" margin-top-20 f_weight_100">
+                                <p class=" margin-top-20 f_weight_400">
                                     <span class="  timeblue">
                                         <a href="{$bs.link}">{:lang_i18n('了解更多')}<img src="__IMAGES__/more-r.png"></a>
                                     </span>

app/index/view/mobile/product/category.html

@@ -46,7 +46,7 @@
                     {volist name="vo.products" id="pro" length="4"}
                     <li class="img-responsive">
                         <a href="{:url('product/detail', ['id' => $pro.id])}">
-                            <img src="{$pro.cover_image}">
+                            <img src="{:thumb($pro.cover_image)}">
                             <span class="title">{$pro.name}</span>
                             <span class="subtitle">{$pro.spu}</span>
                         </a>

app/index/view/mobile/product/detail.html

@@ -22,7 +22,11 @@
                 <a class="href_01">{:lang_i18n('首页')}</a>
                 {volist name="product_categorys" id="ca"}
                 <span class="icon-arrow arrow_address"></span>
+                {eq name="ca.pid" value="0"}
                 <a class="href_02" href="{:url('product/category', ['id' => $ca.id])}">{$ca.name}</a>
+                {else /}
+                <a class="href_02" href="{:url('product/subcategory', ['id' => $ca.id])}">{$ca.name}</a>
+                {/eq}
                 {/volist}
             </div>
         </div>
@@ -37,6 +41,13 @@
                         <img src="{$photo}" alt="" />
                     </div>
                     {/volist}
+                    {if condition="!empty($product.video_img) && !empty($product.video_url) && $idx == 1"}
+                    <div class="swiper-slide">
+                        <video poster="{$product.video_img}" autoplay="autoplay" muted="muted" loop="loop" id="video" controls>
+                            <source src="{$product.video_url}" type="video/mp4"/>
+                        </video>
+                    </div>
+                    {/if}
                 </div>
                 <!-- 如果需要分页器 -->
                 <div class="swiper-pagination"></div>
@@ -46,7 +57,7 @@
         {/notempty}
         <!-- 规格参数 -->
         <div class="m_Container">
-            <!--多颜色-->
+            <!-- 颜色/属性 -->
             {notempty name="product_sku_attrs"}
             <div class="slideTxtBox">
                 <div class="hd clearfix">
@@ -56,7 +67,6 @@
                         {notempty name="ps.attr_values"}
                         <ul class="hd clearfix">
                             {volist name="ps.attr_values" id="pv" key="pk"}
-                                {notempty name="pv.attr_value"}
                             {assign name="attr_value_type" value=":rgb_or_image($pv.attr_value)" /}
                             {between name="ps.attr_id" value="1,2"}
                             <li class="attr_value tip1 attr_item" data-index="{$pk}">
@@ -71,7 +81,6 @@
                                 <span>{$pv.attr_value}</span>
                                 {/eq}
                             </li>
-                                {/notempty}
                             {/volist}
                         </ul>
                         {/notempty}
@@ -112,7 +121,7 @@
             <ul class="cpa des cursor_p">
                 <li class="active" id="one">{:lang_i18n('产品描述')}</li>
                 {notempty name="product_related"}
-                <li>{:lang_i18n('关联产品')}</li>
+                <li onclick="javascript:location.href='#related'">{:lang_i18n('关联产品')}</li>
                 {/notempty}
                 <div class="clear"></div>
             </ul>
@@ -121,7 +130,7 @@
         <div class="goods_des img-responsives" id="description-tab">{$product.detail|raw}</div>
         <!-- 关联产品-->
         {notempty name="product_related"}
-        <div class="glcplist" id="related-tab" style="display: none;">
+        <div class="glcplist" id="related">
             {volist name="product_related" id="rel"}
             <div class="glcpitem">
                 <a href="{:url('product/detail', ['id'=>$rel.id])}">
@@ -226,9 +235,7 @@
             $('.tab-pane').hide();
             if (targetTab === 'description') {
               $('#description-tab').show();
-              $('#related-tab').hide();
             } else if (targetTab === 'related') {
-              $('#related-tab').show();
               $('#description-tab').hide();
             }
         });

app/index/view/mobile/product/search.html

@@ -17,7 +17,7 @@
         <div class="prlist">
             {volist name="products" id="pro"}
             <a class="pritem" href="{:url('product/detail',['id'=>$pro.id])}">
-                <img src="{$pro.cover_image}" class="primg"/>
+                <img src="{:thumb($pro.cover_image)}" class="primg"/>
                 <div class="prinfo">
                     <span class="t1">{$pro.name|raw}</span>
                     <span class="t2">{$pro.spu|raw}</span>
@@ -28,9 +28,8 @@
         <!-- 分页 -->
         <div>{$page|raw}</div>
         {else/}
-        <div style="text-align: center; padding: 10%;">暂无数据</div>
+        <div style="text-align: center; padding: 10%;">{:lang_i18n('暂无数据')}</div>
         {/notempty}
-        <div style=" text-align: center;padding: 10%;">暂无数据</div>
     </div>
 </div>
 {/block}

app/index/view/mobile/product/subcategory.html

@@ -19,6 +19,7 @@
         <div class="m_Container">
             {notempty name="categorys_data"}
             <div class="product_list">
+                {if condition="in_array('products', array_keys($categorys_data[0]))"}
                 <ul>
                     {assign name="products" value=":\think\helper\Arr::flatMap(fn($pro) => $pro['products'], $categorys_data)" /}
                     {volist name="products" id="pr"}
@@ -55,6 +56,7 @@
                     </li>
                     {/volist}
                 </ul>
+                {/if}
             </div>
             {/notempty}
         </div>

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

@@ -11,15 +11,34 @@
 		<link rel="stylesheet" type="text/css" href="__CSS__/public.css" />
 		<link rel="stylesheet" type="text/css" href="__CSS__/font.css" />
 		<link rel="stylesheet" type="text/css" href="__CSS__/style.css" />
-		<!-- <link rel="stylesheet" type="text/css" href="__CSS__/fonts.css" /> -->
         <link rel="stylesheet" type="text/css" href="__CSS__/header.css" />
 		<link rel="stylesheet" type="text/css" href="__CSS__/footer.css" />
         {block name="style"}{/block}
-		<link rel="stylesheet" href="https://unpkg.com/swiper@9/swiper-bundle.min.css">
+		<link rel="stylesheet" href="__JS__/swiper-bundle9.4.1.min.css" />
-		<script type="text/javascript" src='https://code.jquery.com/jquery-3.6.0.min.js'></script>
+		<script src="__JS__/jquery-3.6.0.min.js"></script>
-		<script type="text/javascript" src="https://unpkg.com/swiper@9.4.1/swiper-bundle.min.js"></script>
+		<script type="text/javascript" src="__JS__/swiper-bundle9.4.1.min.js"></script>
+		<!-- Matomo -->
+		<script>
+			var _paq = window._paq = window._paq || [];
+			/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+			_paq.push(['trackPageView']);
+			_paq.push(['enableLinkTracking']);
+			(function() {
+				var u="//analytics.f2b211.com/";
+				_paq.push(['setTrackerUrl', u+'matomo.php']);
+				_paq.push(['setSiteId', '2']);
+				var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+				g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+			})();
+		</script>
+		<!-- End Matomo Code -->
 	</head>
 	<body>
+		<noscript>
+			<!-- Matomo Image Tracker-->
+			<img referrerpolicy="no-referrer-when-downgrade" src="https://analytics.f2b211.com/matomo.php?idsite=2&amp;rec=1" style="border:0" alt="" />
+			<!-- End Matomo -->
+		</noscript>
         {block name="header"}
             {include file="public/header"/}
         {/block}
@@ -28,5 +47,31 @@
             {include file="public/footer"/}
         {/block}
 		{block name="script"}{/block}
+		<script>
+			$(window).ready(function () {
+				// 为所有站内链接，添加标识
+				// 使用mtpl=1参数标识解决ipad访问站点时，从pc重定向到mobile每次页面都会pc - mobile闪现问题
+				var LURL = new URL(window.location.href);
+				if (LURL.searchParams.get('mtpl') == 1) {
+					$('a').each(function () {
+						var href = $(this).attr('href');
+						if (href) {
+							var origin = LURL.origin;
+							if (href.indexOf('http') == -1) {
+								href = new URL(href, origin);
+								href.searchParams.set('mtpl', '1');
+								$(this).attr('href', href);
+							} else {
+								href = new URL(href);
+								if (href.origin == origin) {
+									href.searchParams.set('mtpl', '1');
+									$(this).attr('href', href);
+								}
+							}
+						}
+					})
+				}
+			})
+		</script>
 	</body>
 </html>

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

@@ -18,7 +18,9 @@
                     {notempty name="fn.children"}
                     {volist name="fn.children" id="fnc"}
                     <p>
-                        <a href="{$fnc.link}" target="_blank" class="inline-block link-faded break-all">{$fnc.name}</a>
+                        <a href="{$fnc.link}" {eq name="fnc.link" value="1"}target="_blank"{/eq} class="inline-block link-faded break-all">
+                            {$fnc.name}
+                        </a>
                     </p>
                     {/volist}
                     {/notempty}
@@ -27,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>
@@ -62,7 +65,7 @@
         <div class="copy-text">
             {$basic_config.website_powerby.value}
             {notempty name="$basic_config.website_icp"}
-            <a href="https://beian.miit.gov.cn/" style="color:white;">（{$basic_config.website_icp.value}）</a>
+            <a href="https://beian.miit.gov.cn/" style="color:white;">{$basic_config.website_icp.value|raw}</a>
             {/notempty}
         </div>
         {/notempty}

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

@@ -10,58 +10,6 @@
         <div class="action-r">
             <div class="right img-responsive cursor_p">
                 <span class="icon-category cursor_p top-menu-toggle"><i class="icon-menu-svg"></i></span>
-                <span class="icon-keyword cursor_p top-search-toggle"><i class="icon-search-svg"></i></span>
-                <span class="mask-up cursor_p top-country-toggle"><i class="icon-lag-svg"></i></span>
-            </div>
-        </div>
-    </div>
-    <!-- 顶部菜单-->
-    <div class="top-menu">
-        <div class="it-ct">
-            <div class="it-1"><a href="/">{:lang_i18n('首页')}</a></div>
-        </div>
-        <div class="it-ct">
-            <div class="it-1">
-                <div class="it-1-more">{:lang_i18n('产品列表')}<i class="icon-arrow"></i></div>
-                {notempty name="header_categorys"}
-                {volist name="header_categorys" id="ca"}
-                <div class="it-1-2"><a href="{:url('product/category', ['id' => $ca.id])}">{$ca.name}</a></div>
-                {/volist}
-                {/notempty}
-            </div>
-        </div>
-        {notempty name="header_navigation"}
-        {volist name="header_navigation" id="nav"}
-        <div class="it-ct">
-            <div class="it-1">
-                {empty name="nav.children"}
-                <a href="{$nav.link}">{$nav.name}</a>
-                {else/}
-                <div class="it-1-more">{$nav.name}<i class="icon-arrow"></i></div>
-                {volist name="nav.children" id="ch"}
-                <div class="it-1-2"><a href="{$ch.link}">{$ch.name}</a></div>
-                {/volist}
-                {/empty}
-            </div>
-        </div>
-        {/volist}
-        {/notempty}
-    </div>
-    <!-- 顶部搜索-->
-    <div class="top-search">
-        <div class="marsk-container">
-            <div class="popup-quick">
-                <div class="ac-close float_r "><img src="__IMAGES__/close.png"></div>
-                <div class="search-in">
-                    <form action="{:url('product/search')}" method="get">
-                        <input type="text" name="keywords" placeholder="{:lang_i18n('产品')} USB 2.0...">
-                        <button type="submit" id="search-btnput" class="search-button">{:lang_i18n('搜索')}</button>
-                    </form>
-                    <div class="title-text">
-                        <p><a href="#">{:lang_i18n('搜索历史')}</a></p>
-                        <div id="history"></div>
-                    </div>
-                </div>
             </div>
         </div>
     </div>
@@ -86,6 +34,25 @@
             </ul>
         </div>
     </div>
+    <!-- 顶部菜单-->
+    <div class="top-menu">
+        {notempty name="header_navigation"}
+        {volist name="header_navigation" id="nav"}
+        <div class="it-ct">
+            <div class="it-1">
+                {empty name="nav.children"}
+                <a href="{$nav.link}">{$nav.name}</a>
+                {else/}
+                <div class="it-1-more">{$nav.name}<i class="icon-arrow"></i></div>
+                {volist name="nav.children" id="ch"}
+                <div class="it-1-2"><a href="{$ch.link}">{$ch.name}</a></div>
+                {/volist}
+                {/empty}
+            </div>
+        </div>
+        {/volist}
+        {/notempty}
+    </div>
 </header>
 <script type="text/javascript">
     $(function() {
@@ -100,13 +67,6 @@
             $(this).siblings('.it-1-2').slideToggle(800);
             $(this).find('.icon-arrow').addClass('rotate');
         });
-        //点击搜索
-        $('.top-search-toggle').click(function() {
-            $(".marsk-container").show();
-        })
-        $('.ac-close').click(function() {
-            $(".marsk-container").hide();
-        })
         // 顶部国家选择
         $('.top-country-toggle').click(function(){
             $(".mask,.action-sheet").show();
@@ -114,7 +74,6 @@
         $('.top-country .close-icon').click(function(){
             $(".mask,.action-sheet").hide();
         })
-
         // 移动端顶部宽度设置和主体内容宽度一致
         var pageWidth = $('.oricoEGapp').outerWidth();
         // 设置.header-PC元素的宽度

app/index/view/mobile/topic_nas/cooperation.html

@@ -2,6 +2,9 @@
 {block name="style"}
 <link rel="stylesheet" href="__CSS__/topic_nas_cooperation.css">
 {/block}
+{block name="header"}
+    {include file="public/nas_header" /}
+{/block}
 {block name="main"}
 <div class="oricoEGapp">
     <div class="narshzhbMbpage">

app/index/view/mobile/topic_nas/download.html

@@ -8,16 +8,16 @@
 {block name="main"}
 <div class="oricoEGapp">
     <div class="narsDowloadPc">
-        <div class="narsDtabs">
         {egt name=":count($data)" value="2"}
+        <div class="narsDtabs">
             {notempty name="data.cyber"}
             <div class="narsDtabIt narsDtabIt_active">{:lang_i18n('CyberData赛博云空间')}</div>
             {/notempty}
             {notempty name="data.weline"}
             <div class="narsDtabIt">{:lang_i18n('Weline微链接')}</div>
             {/notempty}
-            {/egt}
         </div>
+        {/egt}
         <!-- 赛博云 -->
         {notempty name="data.cyber"}
         <div class="nDtopCtMian narssbshow" style="display: block;">

app/index/view/mobile/topic_nas/help.html

@@ -49,8 +49,9 @@
         {notempty name="contacts"}
         <h1 class="nhlpapp-title">{:lang_i18n('联系我们')}</h1>
         <div class="nhlpapp-row">
+            {assign name="first_section" value=":array_splice($contacts, 0, count($contacts) - 3)"}
             <div class="sec-1">
-                {volist name="contacts" id="co" key="idx" offset="0" length="4"}
+                {volist name="first_section" id="co"}
                 <a class="nhlplxwmit" {notempty name="co.link"}href="{$co.link}"{/notempty}>
                     <img src="{$co.image}" class="lximg">
                     <span class="t1" {:style(['color'=>$co.title_txt_color])}>{$co.title}</span>
@@ -61,7 +62,7 @@
                 {/volist}
             </div>
             <div class="sec-2">
-                {volist name="contacts" id="co" key="idx" offset="4"}
+                {volist name="contacts" id="co"}
                 <a class="nhlplxwmit nhlplxwmit-w1" {notempty name="co.link"}href="{$co.link}"{/notempty}>
                     <img src="{$co.image}" class="lximg">
                     <span class="t1" {:style(['color'=>$co.title_txt_color])}>{$co.title}<br></span>

app/index/view/mobile/topic_nas/help_detail.html

@@ -33,14 +33,17 @@
                 </div>
         </div>
         <!-- 文章内容 -->
-        <div id="rendered-content" class="nhlp-app-content">
+        <div class="ql-container">
+            <div id="rendered-content" class="nhlp-app-content ql-editor">
                 {$article.content|raw|default=''}
             </div>
+        </div>
         <!-- 搜索 -->
         <div class="nhlpapp-search">
             <div class="nhlpappshtop">
                 <div class="nhlpapp-shdiv">
-                    <input class="nhlp-ipt" id="search-input" placeholder="{:lang_i18n('请输入搜索关键字,如安装赛博云空间,影视库')}" autocomplete="off">
+                    <input class="nhlp-ipt" id="search-input" placeholder="{:lang_i18n('请输入搜索关键字,如安装赛博云空间,影视库')}"
+                        autocomplete="off">
                     <img src="__IMAGES__/ssapp.png" class="searchimg">
                 </div>
                 <span class="closetx">{:lang_i18n('取消')}</span>
@@ -54,18 +57,40 @@
             <div class="nars-hlpdt-ml">
                 {notempty name="article_categorys"}
                 <div class="nav-tree">
+
+                    
                     {volist name="article_categorys" id="ac" key="idx"}
                     <div class="categoryhelp">
                         <div class="categoryhelp-title">
                             <div>
-                                <img src="__IMAGES__/nars-jt.png" class="arrow {if condition='$ac.id == $Request.get.cid'}rotate{/if}">
+                                <img src="__IMAGES__/nars-jt.png"
+                                    class="arrow {if condition='$ac.id == $Request.get.cid'}rotate{/if}">
                             </div>
                             <span>{$ac.name}</span>
                         </div>
                         <ul class="sub-list" {if condition='$ac.id == $Request.get.cid' }style="display: block;" {/if}>
+                            {volist name="ac.child" id="ad"}
+                            <li class="two-mues">
+                                <a href="#" class="two-a">
+                                    <div><img src="__IMAGES__/nars-jt.png"
+                                              class="arrow {if condition='$ad.id == $Request.get.pid'}rotate{/if}">
+                                    </div>
+                                    <span>{$ad.name}</span>
+                                </a>
+                                <ul class="thress-mues" {if condition='$ad.id == $Request.get.pid' }style="display: block;" {/if}>
+                                    {volist name="ad.article" id="ae"}
+                                    <li>
+                                        <a href="{:url('/index/topic/nas/help_detail', ['cid' => $ac.id ,'pid' => $ad.id, 'id' => $ae.id])}"
+                                           style="margin-left:18%;padding: 0.4rem;">{$ae.title}</a>
+                                    </li>
+                                    {/volist}
+                                </ul>
+                            </li>
+                            {/volist}
                             {volist name="ac.article" id="ar"}
                             <li>
-                                <a href="{:url('/index/topic/nas/help_detail', ['cid' => $ac.id , 'id' => $ar.id])}" style="padding-top: 6px;">
+                                <a href="{:url('/index/topic/nas/help_detail', ['cid' => $ac.id , 'id' => $ar.id])}"
+                                    style="padding-top: 6px;">
                                     {$ar.title}
                                 </a>
                             </li>
@@ -73,10 +98,34 @@
                         </ul>
                     </div>
                     {/volist}
+
+
+
                 </div>
                 {/notempty}
             </div>
         </div>
+        <!-- 顶部国家选择-->
+        <div class="top-country">
+            <div class="mask"></div>
+            <div class="action-sheet">
+                <div class="menu-title">
+                    <div class="menu-name">{:lang_i18n('请择地区')}</div>
+                    <div class="close-icon">
+                        <img src="__IMAGES__/close.png">
+                    </div>
+                </div>
+                <ul>
+                    {volist name="header_languages" id="la"}
+                    <li>
+                        <a href="{$la.lang_url}" target="_blank">
+                            <img src="{$la.lang_icon}">{$la.country_en_name} - {$la.lang_en_name}
+                        </a>
+                    </li>
+                    {/volist}
+                </ul>
+            </div>
+        </div>
     </div>
 </div>
 {/block}
@@ -102,6 +151,17 @@
             $(this).next('.sub-list').slideToggle();
             $(this).find('.arrow').toggleClass('rotate');
         });
+        //分类二三级交互
+        $('.two-a').click(function(e) {
+			e.preventDefault();
+			e.stopPropagation(); // 阻止事件冒泡
+
+			// 切换当前二级菜单的箭头方向
+			$(this).find('.arrow').toggleClass('rotate');
+
+			// 切换对应的三级菜单显示/隐藏
+			$(this).siblings('.thress-mues').slideToggle();
+		});
         // 点击顶部搜索图标-点击取消关闭
         $('#ssico').click(function () {
             $('.nhlpapp-pagescate').hide();
@@ -110,6 +170,13 @@
         $('.closetx').click(function () {
             $('.nhlpapp-search').hide();
         });
+        // 顶部国家选择
+        $('.top-country-toggle').click(function () {
+            $(".mask,.action-sheet").show();
+        })
+        $('.top-country .close-icon').click(function () {
+            $(".mask,.action-sheet").hide();
+        })
         // 搜索
         var timeout = null;
         $('#search-input').on('focus input', function () {
@@ -142,6 +209,27 @@
                 })
             }, 300);
         });
+        // 英文截断处理
+        // 目标容器：富文本内容所在的元素
+        const contentContainer = $('#rendered-content');
+
+        // 遍历所有包含文本内容的标签（p、h1-h6、strong等）
+        contentContainer.find('*').each(function () {
+            const $element = $(this);
+            const htmlContent = $element.html();
+
+            // 条件1：排除内容仅为一个&nbsp;的标签（如<p>&nbsp;</p>）
+            if (htmlContent.trim() === '&nbsp;') {
+                return; // 不处理，继续下一个元素
+            }
+
+            // 条件2：检查是否包含&nbsp;且有实际文本内容
+            if (htmlContent.includes('&nbsp;')) {
+                // 将所有&nbsp;替换为普通空格（有效占位符，支持单词完整换行）
+                const newContent = htmlContent.replace(/&nbsp;/g, ' ');
+                $element.html(newContent);
+            }
+        });
     });
 </script>
 {/block}

app/index/view/mobile/topic_nas/index.html

@@ -2,6 +2,9 @@
 {block name="style"}
 <link rel="stylesheet" href="__CSS__/topic_nas_index.css">
 {/block}
+{block name="header"}
+    {include file="public/nas_header" /}
+{/block}
 {block name="main"}
 <div class="oricoEGapp">
     <!-- 首页 -->

app/index/view/pc/about_us/mileage.html

@@ -5,7 +5,7 @@
 {block name="main"}
 <div class="orico_Page_achievement">
     <div class="achievementMain">
-        <img src="__IMAGES__/Achievement.png" class="acvImg" />
+        <img src="__IMAGES__/Achievement.webp" class="acvImg" />
         <div class="achInfo">
             <div class="title">{:lang_i18n('ORICO荣耀')}</div>
             {notempty name="achievement"}

app/index/view/pc/about_us/story.html

@@ -6,7 +6,7 @@
 <div class="orico_Page_brand">
     <!--内容 -->
     <div class="brandMain">
-        <img src="__IMAGES__/OurBrand.png" class="img-responsive" />
+        <img src="__IMAGES__/OurBrand.webp" class="img-responsive" />
         {notempty name="banners"}
         <div class="our_brand_con">
             {volist name="banners" id="ba" offset="0" length="2"}

app/index/view/pc/article/detail.html

@@ -24,7 +24,9 @@
 					<p>{$detail.release_time|date_format_i18n}</p>
 				</div>
 				<!-- 文本渲染-->
-				<div class="blog_content">{$detail.content|raw}</div>
+				<div class="ql-container">
+					<div class="blog_content ql-editor">{$detail.content|raw}</div>
+				</div>
 			</div>
 			<!-- 评论只显示前面五条--->
 			{notempty name="comments"}

app/index/view/pc/article/index.html

@@ -23,6 +23,7 @@
         <div class="categorySearch">
             <form action="{:url('article/index', ['pid' => $Request.param.pid])}" method="get">
                 <i class="search_icon"></i>
+                <input type="hidden" name="cid" value="{$Request.param.cid}" />
                 <input type="text" class="search" id="article-search-in" name="keywords" value="">
             </form>
         </div>
@@ -43,6 +44,8 @@
             </div>
             <!-- 分页-->
             <div>{$articles|raw}</div>
+            {else/}
+            <div style="text-align: center; padding: 10%;">暂无数据</div>
         </div>
         {/notempty}
     </div>

app/index/view/pc/attachment/index.html

@@ -7,14 +7,14 @@
     <!-- 内容 -->
     <div class="downloadMain">
         <div class="topimg">
-            <img src="__IMAGES__/banner_01.png" />
+            <img src="__IMAGES__/banner_01.webp" />
             <div class="banner_title">{:lang_i18n('软件和驱动程序')}</div>
         </div>
         <div class="contact_c">
             <!-- 搜索 -->
             <form action="{:url('attachment/index')}" method="get">
                 <div class="search_all">
-                    <input type="hidden" name="id" value="{$Request.get.id}" />
+                    <input type="hidden" name="id" value="{$Request.get.id??$categorys[0]['id']??''}" />
                     <input type="text" name="keyword" placeholder="{:lang_i18n('搜索')}" />
                     <button class="searchbtn" type="submit"><img src="__IMAGES__/search_blue.png" /></button>
                 </div>

app/index/view/pc/attachment/video.html

@@ -7,13 +7,14 @@
     <!-- 内容 -->
     <div class="downloadMain">
         <div class="topimg">
-            <img src="__IMAGES__/banner_01.png" />
+            <img src="__IMAGES__/banner_01.webp" />
             <div class="banner_title">{:lang_i18n('软件和驱动程序')}</div>
         </div>
         <div class="contact_c">
             <!-- 搜索 -->
             <form action="{:url('attachment/video')}" method="get">
                 <div class="search_all">
+                    <input type="hidden" name="id" value="{$Request.get.id??$video_categorys[0]['id']??''}" />
                     <input type="text" name="keyword" placeholder="{:lang_i18n('搜索')}" />
                     <button class="searchbtn" type="submit"><img src="__IMAGES__/search_blue.png" /></button>
                 </div>

app/index/view/pc/contact_us/index.html

@@ -23,17 +23,13 @@
                 {volist name="items" id="item"}
                 <a class="narskfit" href="{$item.link}">
                     <img src="{$item.image}" class="narskico-img" />
-                    <span class="narskf-title">{$item.title}</span>
+                    <span class="narskf-title" {:style(['color' => $item['title_txt_color']])}>{$item.title}</span>
-                    {notempty name="item.title_short"}
-                    <span class="narskf-sm">{$item.title_short}</span>
-                    {/notempty}
                     {notempty name="item.desc"}
-                    {if condition="str_contains($item.desc, '<img')"}
+                    <span class="narskf-sm" {:style(['color' => $item['desc_txt_color']])}>{$item.desc|raw}</span>
+                    {/notempty}
+                    {notempty name="item.extra_image"}
                     <div class="narskfactive-ewm">
-                    {else/}
+                        <img src="{$item.extra_image}" alt="" />
-                    <div class="narskf-sm narskf-font-26">
-                    {/if}
-                        {$item.desc|raw}
                     </div>
                     {/notempty}
                 </a>
@@ -43,8 +39,8 @@
                 <div class="narskfit narskfit2">
                     <img src="{$item.image}" class="narskico-img" />
                     <div class="narskfit2-ct">
-                        <span class="narskf-title">{$item.title}</span>
+                        <span class="narskf-title" {:style(['color' => $item['title_txt_color']])}>{$item.title}</span>
-                        <span class="narskf-sm">{$item.desc|raw}</span>
+                        <span class="narskf-sm" {:style(['color' => $item['desc_txt_color']])}>{$item.desc|raw}</span>
                     </div>
                 </div>
                 {/volist}

app/index/view/pc/index/index.html

@@ -104,7 +104,7 @@
 			<div class="hotvideo">
 				<video poster="{$video.image}" src="{$video.video}" style="max-height:50rem;z-index:9999;width: 100%;object-fit: cover;" autoplay loop controls id="oricoVideo"></video>
 			</div>
-			<img src="{$video.image}" class="hotImg" />
+			<!-- <img src="{$video.image}" class="hotImg" /> -->
 		</div>
 		{/notempty}
 		<!-- 场景介绍 -->
@@ -112,13 +112,13 @@
 		<div class="sceneIntroduction">
 			{volist name="scenes" id="scene"}
 			<div class="sceneitem">
-				<div class="sceneInfo">
+				<a class="sceneInfo" href="{$scene.link}">
-					<p class="scenetitle" {notempty name="scene.title_txt_color" }style="color:{$scene.title_txt_color};" {/notempty}>{$scene.title}</p>
+					<!-- <p class="scenetitle" {notempty name="scene.title_txt_color" }style="color:{$scene.title_txt_color};" {/notempty}>{$scene.title}</p>
 					<p class="subtitle" {notempty name="scene.desc_txt_color" }style="color:{$scene.desc_txt_color};" {/notempty}>
 						{$scene.desc|raw}</p>
-					<a class="sceneMore" href="{$scene.link}">{:lang_i18n('了解更多')} ></a>
+					<a class="sceneMore" href="{$scene.link}">{:lang_i18n('了解更多')} ></a> -->
-				</div>
 					<div style="background-image: url('{$scene.image}');" class="sceneimg"></div>
+				</a>
 			</div>
 			{/volist}
 		</div>
@@ -129,10 +129,10 @@
 			<span class="otsbtitle">{:lang_i18n('强大功能、简单使用')}</span>
 			<div class="beforeafter ba-slider">
 				<!-- 对比前的图片 -->
-				<img src="__IMAGES__/indeximg1.jpg">
+				<img src="__IMAGES__/indeximg1.webp">
 				<div class="resize">
 					<!-- 对比后的图片 -->
-					<img src="__IMAGES__/indeximg2.jpg">
+					<img src="__IMAGES__/indeximg2.webp">
 				</div>
 				<!-- 可拖动的分隔条 -->
 				<span class="handle"></span>

app/index/view/pc/product/detail.html

@@ -22,7 +22,11 @@
             <a class="pathname" href="/">{:lang_i18n('首页')}</a>
             {volist name="product_categorys" id="ca"}
             <div class="arrow"></div>
+            {eq name="ca.pid" value="0"}
             <a class="pathname" href="{:url('product/category', ['id' => $ca.id])}">{$ca.name}</a>
+            {else /}
+            <a class="pathname" href="{:url('product/subcategory', ['id' => $ca.id])}">{$ca.name}</a>
+            {/eq}
             {/volist}
         </div>
         <!-- 产品主图切换和参数详情-->
@@ -35,33 +39,26 @@
                         <!-- 左边切换按钮 -->
                         <div class="scrollbutton smallImgUp disabled"></div>
                         <!-- 小图片预览 -->
-                        <div id="imageMenu">
+                        <div id="imageMenu_{$sku.id}" class="imageMenu">
                             <ul class="image_list">
+                                {volist name="sku.photo_album" id="photo"}
+                                <li class="onlickImg"><img src="{:thumb($photo)}" data-url="{$photo}" /></li>
+                                {/volist}
                                 {if condition="!empty($product.video_img) && !empty($product.video_url) && $idx == 1"}
                                 <!-- 产品视频 -->
-                                <li id="onlickImg"><img src="{:thumb($product.video_img)}" data-url="{$product.video_url}" /></li>
+                                <li class="onlickImg"><img src="{:thumb($product.video_img)}" data-url="{$product.video_url}" /></li>
                                 {/if}
-                                {volist name="sku.photo_album" id="photo"}
-                                <li id="onlickImg"><img src="{:thumb($photo)}" data-url="{$photo}" /></li>
-                                {/volist}
                             </ul>
                         </div>
                         <!-- 右边切换按钮 -->
                         <div class="scrollbutton smallImgDown"></div>
                     </div>
                     <!-- 产品大图 -->
-                    <div class="bigImg" id="vertical">
+                    <div class="bigImg" id="vertical" style="width: 75%;">
                         <!-- 主图 -->
-                        {if condition="!empty($product.video_img) && !empty($product.video_url) && $idx == 1"}
-                        <!-- 如果有视频情况下默认先显示视频 -->
-                        <video poster="{$product.video_img}" autoplay="autoplay" muted="muted" loop="loop" id="video" controls style="width: 510px;height: 510px; position: relative;z-index: 998;">
-                            <source src="{$product.video_url}" type="video/mp4"/>
-                        </video>
-                        {else/}
                         {notempty name="sku.photo_album[0]"}
                         <img src="{$sku.photo_album[0]}" id="midimg" />
                         {/notempty}
-                        {/if}
                     </div>
                 </div>
                 {/volist}
@@ -73,6 +70,11 @@
                     <p>{$product.short_name|default=''}</p>
                     <div class="proTfg">
                         <ul class="swt-Table">
+                            <li class="Table-Row">
+                                <div class="ms3 Table-Cell">{:lang_i18n('型号')}</div>
+                                <div class="ms2 Table-Cell"></div>
+                                <div class="ms4 Table-Cell">{$product.spu}</div>
+                            </li>
                             {volist name="product_params" id="pp"}
                             <li class="Table-Row">
                                 <div class="ms3 Table-Cell">{$pp.name}</div>
@@ -82,7 +84,7 @@
                             {/volist}
                         </ul>
                     </div>
-                    <!-- 颜色-->
+                    <!-- 颜色/属性 -->
                     {volist name="product_sku_attrs" id="ps"}
                     <div class="prcolors">
                         <div class="dt">{$ps.attr_name}</div>
@@ -114,6 +116,7 @@
                     {volist name="product_purchase_links" id="ppp" key="k"}
                     <a class="thebt bttype{$k}" href="{$ppp.link}">{$ppp.platform_name}</a>
                     {/volist}
+                    <br/>
                     {eq name=":cookie('think_lang')" value="en-us"}
                     <a class="thebt bttype3" id="open_form_modal">{:lang_i18n('发送查询')}</a>
                     {/eq}
@@ -130,10 +133,12 @@
                 {/notempty}
             </div>
             <!-- 富文本渲染-->
-            <div class="products_des" id="detail">
+            <div class="ql-container">
+                <div class="products_des ql-editor" id="detail">
                     {$product.detail|default=''|raw}
                 </div>
             </div>
+        </div>
         <!-- 关联产品 -->
         {notempty name="product_related"}
         <div class="glcpmain" id="related">
@@ -225,7 +230,7 @@
                             <textarea name="message" id="message"></textarea>
                         </div>
                     </div>
-                    <button type="button" id="send" class="submit-btn">{:lang_i18n('提交')}</button>
+                    <button type="submit" class="submit-btn">{:lang_i18n('提交')}</button>
                 </form>
             </div>
         </div>
@@ -273,21 +278,12 @@
         // 处理表单提交
         modal.find("form").submit(function(e) {
             e.preventDefault();
+            var form = $(this)
             var formData = $(this).serialize();
-            // 这里可以添加代码将formData发送到服务器
-            // 例如通过AJAX
-            console.log("提交的数据: " + formData);
-            // 提交成功后可以选择关闭模态框
-            modal.hide();
-        });
-
-        // 提交询盘
-        $('#send').click(function() {
-            var form = $(this).parents('form');
             $.ajax({
                 url: "{:url('product/inquiry')}",
                 type: 'POST',
-                data: form.serialize(),
+                data: formData,
                 success: function(r) {
                     if (r.code == 0) {
                         form[0].reset(); // 重置表单
@@ -297,6 +293,7 @@
                 },
                 error: function(e) {
                     console.error(e);
+                    modal.hide();
                 }
             })
         });
@@ -332,8 +329,6 @@
           slidesPerView: 3,
           spaceBetween: 30,
           slidesPerGroup: 3,
-          loop: true,
-          loopFillGroupWithBlank: true,
           navigation: {
             nextEl: '.swiper-button-next',
             prevEl: '.swiper-button-prev',

app/index/view/pc/product/search.html

@@ -14,6 +14,7 @@
 			</div>
 		</form>
 		<!-- 搜索结果列表-->
+		{notempty name="products"}
 		<ul class="seul">
 			{volist name="products" id="pro"}
 			<a href="{:url('product/detail', ['id' => $pro['id']])}">
@@ -32,6 +33,10 @@
 			</a>
 			{/volist}
 		</ul>
+		<div>{$page|raw}</div>
+		{else/}
+		<div style="text-align: center; padding: 10%;">{:lang_i18n('暂无数据')}</div>
+		{/notempty}
 	</div>
 </div>
 {/block}

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

@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html>
+
 <head>
 	<meta charset="utf-8" />
 	{block name="title"}<title>{$basic_config['website_seo_title']['value']}</title>{/block}
@@ -13,9 +14,29 @@
 	<link rel="stylesheet" type="text/css" href="__CSS__/orico_header.css" />
 	<link rel="stylesheet" type="text/css" href="__CSS__/orico_footer.css" />
 	{block name="style"}{/block}
-	<link rel="stylesheet" href="https://unpkg.com/swiper@9/swiper-bundle.min.css">
+	<script>
-	<script type="text/javascript" src='https://code.jquery.com/jquery-3.6.0.min.js'></script>
+		// 增强型 UC 浏览器检测
-	<script type="text/javascript" src="https://unpkg.com/swiper@9.4.1/swiper-bundle.min.js"></script>
+		function isUCBrowser() {
+			const ua = navigator.userAgent.toLowerCase();
+			return ua.includes('ubrowser');
+		}
+
+		// 直接输出对应的 HTML 标签
+		if (isUCBrowser()) {
+			document.write(`
+			<link rel="stylesheet" href="__JS__/swiper-bundle8.4.7.min.css">
+			<script type="text/javascript" src="__JS__/swiper-bundle8.4.7.min.js"><\/script>
+		`);
+		} else {
+			document.write(`
+			<link rel="stylesheet" href="__JS__/swiper-bundle9.4.1.min.css">
+			<script type="text/javascript" src="__JS__/swiper-bundle9.4.1.min.js"><\/script>
+		`);
+		}
+	</script>
+
+	<!-- 你的 jQuery 和其他脚本 -->
+	<script src="__JS__/jquery-3.6.0.min.js"></script>
 	<script type="text/javascript" src="__JS__/before-after.min.js"></script>
 	<script type="text/javascript" src="__JS__/large.js"></script>
 	<script type="text/javascript">
@@ -60,22 +81,48 @@
 				return 'unknown';
 			}
 		}
-	
-		$(window).ready(function () {
-			const deviceType = detectDeviceByResolution();
-			if (deviceType=='tablet') {
-				window.location.href = '?mtpl=1';
-			}
-		})
 		// $(window).ready(function () {
-		// 	if ($(window).width() < 1024) {
+		// 	const deviceType = detectDeviceByResolution();
+		// 	if (deviceType=='tablet') {
 		// 		window.location.href = '?mtpl=1';
 		// 	}
 		// })
+		$(window).ready(function () {
+			if ($(window).width() < 1024) {
+				var locationURL = new URL(window.location.href);
+				var mtpl = locationURL.searchParams.get("mtpl");
+				if (mtpl == null) {
+					locationURL.searchParams.set("mtpl", "1");
+					window.location.href = locationURL.href;
+				}
+			}
+		})
 	</script>
+
+	<!-- Matomo -->
+	<script>
+		var _paq = window._paq = window._paq || [];
+		/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+		_paq.push(['trackPageView']);
+		_paq.push(['enableLinkTracking']);
+		(function() {
+			var u="//analytics.f2b211.com/";
+			_paq.push(['setTrackerUrl', u+'matomo.php']);
+			_paq.push(['setSiteId', '2']);
+			var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+			g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+		})();
+	</script>
+	<!-- End Matomo Code -->
+
 </head>
 
 <body>
+	<noscript>
+		<!-- Matomo Image Tracker-->
+		<img referrerpolicy="no-referrer-when-downgrade" src="https://analytics.f2b211.com/matomo.php?idsite=2&amp;rec=1" style="border:0" alt="" />
+		<!-- End Matomo -->
+	</noscript>
 	{block name="header"}
 	{include file="public/header"/}
 	{/block}

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

@@ -27,7 +27,9 @@
           <p class="ftitle">{:lang_i18n('产品')}</p>
           <ul>
             {volist name="header_categorys" id="vo"}
+              {if condition="!empty($vo.name)"}
                 <li><a href="{:url('product/category', ['id' => $vo.id])}" class="fline">{$vo.name}</a></li>
+              {/if}
             {/volist}
           </ul>
         </div>
@@ -38,7 +40,7 @@
           {if condition="!empty($vo.children)"}
           <ul>
             {volist name="vo.children" id="vc"}
-            <li><a href="{$vc.link}" class="fline">{$vc.name}</a></li>
+            <li><a href="{$vc.link}" class="fline" target="{$vc.blank==1?'_blank':'_self'}">{$vc.name}</a></li>
             {/volist}
           </ul>
           {/if}
@@ -51,10 +53,10 @@
           <ul>
             {volist name="contact_config" id="vo"}
             <li>
-              <a href="javascript:void(0);" class="fline">
               {if condition="$vo.type == 'image'"}
               <img src="{$vo.value}" {if condition="!empty($vo.extra)" }style="{$vo.extra}" {/if} />
               {else/}
+              <a href="javascript:void(0);" class="fline">
                 {$vo.value}
               {/if}
               </a>
@@ -80,7 +82,7 @@
         <div class="ftcopyright">
           <span>{$basic_config.website_powerby.value}</span>
           {if condition="!empty($basic_config.website_icp)"}
-          <a href="https://beian.miit.gov.cn/">（{$basic_config.website_icp.value}）</a>
+          <a href="https://beian.miit.gov.cn/">{$basic_config.website_icp.value|raw}</a>
           {/if}
         </div>
         {/if}
@@ -89,19 +91,16 @@
     </div>
   </div>
 </footer>
-{eq name=":cookie('think_lang')" value="zh-cn"}
 <div class="backtop">
   <img src="__IMAGES__/ic-backtop.png" class="ictop" />
-		<span>返回顶部</span>
+  <span>{eq name=":cookie('think_lang')" value="en-us"}TOP{else /}返回顶部{/eq}</span>
 </div>
-{/eq}
 <script>
   $(document).ready(function () {
     // 获取窗口高度
     var windowHeight = $(window).height();
     // 监听滚动事件
     $(window).scroll(function () {
-        console.log($(this).scrollTop(),windowHeight)
       // 检查滚动距离是否超过一屏幕高度
       if ($(this).scrollTop() > windowHeight) {
         // 如果超过，显示返回顶部按钮

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

@@ -92,7 +92,7 @@
 			</div>
 			{eq name=":cookie('think_lang')" value="en-us"}
 			{notempty name="basic_config['navigation_store_url']['value']"}
-			<a class="storetopbt" href="{$basic_config['navigation_store_url']['value']}">
+			<a class="storetopbt" href="{$basic_config['navigation_store_url']['value']}" target="_blank">
 				<img src="__IMAGES__/shopico.png" class="storeImgico" />{:lang_i18n('店铺')}
 			</a>
 			{/notempty}
@@ -115,7 +115,7 @@
 				<div class="popmain">
 					{volist name="header_hot_products" id="vo"}
 					<div class="popitem">
-						<a href="{:url('product/detail', ['id' => $vo.id])}"><img src="{$vo.cover_image}" class="popimg" /></a>
+						<a href="{:url('product/detail', ['id' => $vo.id])}"><img src="{:thumb($vo.cover_image)}" class="popimg" /></a>
 						<div class="productName">{$vo.name}</div>
 						<div class="produc-dec">{$vo.short_name}</div>
 					</div>
@@ -155,26 +155,53 @@
 
 			return history;
 		}
+
 		// 封装一个函数用于处理鼠标悬停显示和隐藏内容
 		function handleHover($element, $content) {
-			$element.mouseenter(function () {
+			// 同时支持鼠标悬停和点击事件
+			$element
+				.mouseenter(function () {
 					$content.stop(true, true).slideDown(60);
-			}).mouseleave(function () {
+				})
+				.mouseleave(function () {
 					$content.stop(true, true).slideUp(60);
+				})
+				.click(function (e) {
+					// 阻止链接默认跳转（如果有链接的话）
+					if ($content.is(':visible')) {
+						$content.stop(true, true).slideUp(60);
+					} else {
+						$content.stop(true, true).slideDown(60);
+					}
+					// 防止点击事件冒泡到a标签
+					e.preventDefault();
+					e.stopPropagation();
 				});
 		}
-		// 处理第一个导航项
+
-		handleHover($('.navItem').eq(0), $('.navItem').eq(0).find('.navItemConten'));
+		// 处理产品列表的下拉菜单
-		// 鼠标移入navItem_cyleft里面的li标签添加类，移除其他li的类
+		var $firstNav = $('.navItem').eq(0);
+		if ($firstNav.find('.navItemConten').length) {
+			handleHover($firstNav, $firstNav.find('.navItemConten'));
+		}
+
+		// 鼠标移入左侧子菜单切换显示
 		$('.navItem_cyleft li').mouseenter(function () {
 			$(this).addClass('it_active').siblings().removeClass('it_active');
 			$('.navItem_cyright').hide();
 			$('.navItem_cyright').eq($(this).index()).show();
 		});
-		// 处理第5 - 8个导航项
+
-		for (let i = 4; i < 8; i++) {
+		// 动态处理所有带有navItemConten1的导航项
-			handleHover($('.navItem').eq(i), $('.navItem').eq(i).find('.navItemConten1'));
+		$('.navItem').each(function () {
+			var $this = $(this);
+			var $dropdown = $this.find('.navItemConten1');
+			// 只给有下拉菜单的导航项绑定事件
+			if ($dropdown.length) {
+				handleHover($this, $dropdown);
 			}
+		});
+
 		// 点击搜索
 		$('#openModalBtn').click(function () {
 			$('#scmodal').toggle();
@@ -182,8 +209,20 @@
 		$('.close-btn').click(function () {
 			$('#scmodal').hide();
 		});
+
+		// 点击空白处关闭下拉菜单
+		$(document).click(function () {
+			$('.navItemConten, .navItemConten1, #top-country').slideUp(60);
+		});
+
+		// 防止下拉菜单内部点击触发空白处关闭事件
+		$('.navItemConten, .navItemConten1, #top-country').click(function (e) {
+			e.stopPropagation();
+		});
+
 		// 搜索历史记录回显
 		history();
+
 		// 执行搜索
 		$('#serrchinput').keydown(function (event) {
 			if (event.originalEvent.keyCode == 13) {
@@ -198,9 +237,11 @@
 				window.location.href = "{:url('product/search')}" + '?keywords=' + keywords;
 			}
 		});
+
 		// 点击选择国家
-		$('#countrycheck').click(function () {
+		$('#countrycheck').click(function (e) {
 			$('#top-country').toggle();
+			e.stopPropagation();
 		});
 		$('.closecountrybt').click(function () {
 			$('#top-country').hide();

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

@@ -13,9 +13,61 @@
     <link rel="stylesheet" type="text/css" href="__CSS__/topic_nas_header.css" />
     <link rel="stylesheet" type="text/css" href="__CSS__/orico_footer.css" />
     {block name="style"}{/block}
-    <script type="text/javascript" src='https://code.jquery.com/jquery-3.6.0.min.js'></script>
+    <script src="__JS__/jquery-3.6.0.min.js"></script>
+    <script>
+		// 增强型 UC 浏览器检测
+		function isUCBrowser() {
+			const ua = navigator.userAgent.toLowerCase();
+			return ua.includes('ubrowser');
+		}
+
+		// 直接输出对应的 HTML 标签
+		if (isUCBrowser()) {
+			document.write(`
+			<link rel="stylesheet" href="__JS__/swiper-bundle8.4.7.min.css">
+			<script type="text/javascript" src="__JS__/swiper-bundle8.4.7.min.js"><\/script>
+		`);
+		} else {
+			document.write(`
+			<link rel="stylesheet" href="__JS__/swiper-bundle9.4.1.min.css">
+			<script type="text/javascript" src="__JS__/swiper-bundle9.4.1.min.js"><\/script>
+		`);
+		}
+	</script>
+    <script>
+        $(window).ready(function () {
+			if ($(window).width() < 1024) {
+				var locationURL = new URL(window.location.href);
+				var mtpl = locationURL.searchParams.get("mtpl");
+				if (mtpl == null) {
+					locationURL.searchParams.set("mtpl", "1");
+					window.location.href = locationURL.href;
+				}
+			}
+		})
+    </script>
+    <!-- Matomo -->
+    <script>
+        var _paq = window._paq = window._paq || [];
+        /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+        _paq.push(['trackPageView']);
+        _paq.push(['enableLinkTracking']);
+        (function() {
+            var u="//analytics.f2b211.com/";
+            _paq.push(['setTrackerUrl', u+'matomo.php']);
+            _paq.push(['setSiteId', '2']);
+            var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+            g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+        })();
+    </script>
+    <!-- End Matomo Code -->
 </head>
 <body>
+    <noscript>
+        <!-- Matomo Image Tracker-->
+        <img referrerpolicy="no-referrer-when-downgrade" src="https://analytics.f2b211.com/matomo.php?idsite=2&amp;rec=1" style="border:0" alt="" />
+        <!-- End Matomo -->
+    </noscript>
     {block name="header"}
         {include file="public/nas_header"/}
     {/block}

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

@@ -63,7 +63,7 @@
                 <div class="ftcopyright">
                     <span>{$basic_config.website_powerby.value}</span>
                     {if condition="!empty($basic_config.website_icp)"}
-                    <a href="https://beian.miit.gov.cn/">（{$basic_config.website_icp.value}）</a>
+                    <a href="https://beian.miit.gov.cn/">{$basic_config.website_icp.value|raw}</a>
                     {/if}
                 </div>
                 {/if}

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

@@ -1,6 +1,10 @@
 <header class="narsPage-head">
     <div class="headcenter">
+        {eq name=":cookie('think_lang')" value="zh-cn"}
+        <a href="{:url('/index/topic/nas/index')}">
+        {else/}
         <a>
+        {/eq}
             <img class="logico" style="cursor:pointer;" src="__IMAGES__/logo_nas_{:cookie('think_lang')}.png" />
         </a>
         {notempty name="header_navigation"}
@@ -17,9 +21,10 @@
 <script type="text/javascript">
     $(function() {
         $('.headnav .navitem').each(function(idx, item) {
-            $(item).removeClass('hover');
+            var _item = $(item);
-            if (compareUrls(location.href, item.href)) {
+            _item.removeClass('hover');
-                $(item).addClass('hover').siblings();
+            if (_item.attr('href') && compareUrls(location.href, _item.get(0).href)) {
+                _item.addClass('hover').siblings();
             }
         });
         

app/index/view/pc/topic_nas/help.html

@@ -8,7 +8,7 @@
     <div class="narshelpCenterPc">
         <!-- banner-搜索 -->
         <div class="pagetopbg">
-            <img src="__IMAGES__/nas_help_banner.jpg" class="hpbgimg" />
+            <img src="__IMAGES__/nas_help_banner.webp" class="hpbgimg" />
             <div class='nhlp-search'>
                 <input class="nhlp-ipt" id="search-input" placeholder="{:lang_i18n('请输入搜索关键字,如安装赛博云空间,影视库')}" autocomplete="off" />
                 <img src="__IMAGES__/nas_help_search.png" class="searchimg" />
@@ -26,13 +26,13 @@
             <h1 class="helph1">{:lang_i18n('使用教程')}</h1>
             <div class="nhlp-row">
                 {volist name="article_categorys" id="vo" key="idx"}
-                <div class="nhlpit {gt name='idx' value='6'}nhlpit-w{/gt}">
+                <div class="nhlpit">
                     <div class="nhlptl">
                         <img src="{$vo.icon}" class="bhlpicoimg" />{$vo.name}
                     </div>
                     <div class="nhlp-tx-list">
                         {volist name="vo.article" id="va" key="index"}
-                        <a class="txrow" href="{:url('/index/topic/nas/help_detail', ['cid' => $vo.id, 'id' => $va.id])}">
+                        <a class="txrow" href="{:url('/index/topic/nas/help_detail', ['pid' => $va.category_id,'cid' => $vo.id, 'id' => $va.id])}">
                             <div class="nhlp-point"></div>
                             <span class="nhlpsp">{$va.title}</span>
                             <span class="narhelpgoimg">
@@ -41,7 +41,7 @@
                         </a>
                         {/volist}
                         {if condition="count($vo.article) >= 3"}
-                        <a class="ckgdbt" href="{:url('/index/topic/nas/help_detail', ['cid' => $vo.id, 'id' => isset($vo.article[0])?$vo.article[0]['id']:0])}">
+                        <a class="ckgdbt" href="{:url('/index/topic/nas/help_detail', ['cid' => $vo.id, 'id' => isset($vo.article[0])?$vo.article[0]['id']:0,'pid' => isset($vo.article[0])?$vo.article[0]['category_id']:0])}">
                             {:lang_i18n('查看更多')} >
                         </a>
                         {/if}
@@ -57,33 +57,37 @@
             <h1 class="lxwmtitle">{:lang_i18n('联系我们')}</h1>
             <div class="nhlp-row">
               <div class="nhlp-row-content">
-                {volist name="contacts" id="co" key="idx" offset="0" length="3"}
+                {assign name="fist_section" value=":array_splice($contacts, 0, 3)" /}
-                <a class="nhlplxwmit nhlplxwmit-w1" {notempty name="co.link"}href="{$co.link}"{/notempty} {eq name="idx" value="3"}style="margin-right: 0;"{/eq}>
+                {volist name="fist_section" id="co"}
+                <a class="nhlplxwmit nhlplxwmit-w1" {notempty name="co.link"}href="{$co.link}"{/notempty}>
                     <img src="{$co.image}" class="lximg" />
-                    {if condition="!empty($co.desc) && str_contains($co.desc, '<img')"}
+                    {notempty name="co.extra_image"}
-                    <img src="{:get_path_from_img_tag($co.desc)}" class="lxewmimg" />
+                    <img src="{$co.extra_image}" class="lxewmimg" />
-                    <span class="t1" {:style(['color'=>$co.title_txt_color])}>{$co.title}</span>
+                    {/notempty}
-                    {else/}
                     <span class="t1" {:style(['color'=>$co.title_txt_color])}>{$co.title}</span>
+                    {notempty name="co.desc"}
                     <span class="t2" {:style(['color'=>$co.desc_txt_color])}>{$co.desc|raw}</span>
-                    {/if}
+                    {/notempty}
                 </a>
                 {/volist}
               </div>
+              {assign name="second_section" value=":array_chunk($contacts, 4)" /}
+              {volist name="second_section" id="chunk"}
               <div class="nhlp-row-content">
-                {volist name="contacts" id="co" key="idx" offset="3"}
+                {volist name="chunk" id="co"}
-                <a class="nhlplxwmit nhlplxwmit-w2" {notempty name="co.link"}href="{$co.link}"{/notempty} {eq name="idx%4" value="0"}style="margin-right: 0;"{/eq}>
+                <a class="nhlplxwmit nhlplxwmit-w2" {notempty name="co.link"}href="{$co.link}"{/notempty}>
                     <img src="{$co.image}" class="lximg" />
-                    {if condition="!empty($co.desc) && str_contains($co.desc, '<img')"}
+                    {notempty name="co.extra_image"}
-                    <img src="{:get_path_from_img_tag($co.desc)}" class="lxewmimg" />
+                    <img src="{$co.extra_image}" class="lxewmimg" />
-                    <span class="t1" {:style(['color'=>$co.title_txt_color])}>{$co.title}</span>
+                    {/notempty}
-                    {else/}
                     <span class="t1" {:style(['color'=>$co.title_txt_color])}>{$co.title}</span>
+                    {notempty name="co.desc"}
                     <span class="t2" {:style(['color'=>$co.desc_txt_color])}>{$co.desc|raw}</span>
-                    {/if}
+                    {/notempty}
                 </a>
                 {/volist}
               </div>
+              {/volist}
             </div>
         </div>
         {/notempty}
@@ -132,7 +136,7 @@
                     $('#dropdown').hide();
                 }
             });
-            $('.nhlplxwmit:not(:first)').hover(function () {
+            $('.nhlplxwmit').hover(function () {
                 // 当鼠标移入时，显示.lxewmimg 并隐藏.lximg
                 var lxe = $(this).find('.lxewmimg');
                 var lxi = $(this).find('.lximg');

app/index/view/pc/topic_nas/help_detail.html

@@ -32,33 +32,49 @@
             <div class="nars-hlpdt-ml">
                 {notempty name="article_categorys"}
                 <div class="nav-tree">
+
+                    <!-- start 三级菜单   -->
                     {volist name="article_categorys" id="ac"}
                     <div class="category">
+                        <!-- 一级 -->
                         <div class="category-title">
-                            <div class="arrow {if condition='$ac.id == $Request.get.cid'}rotate{/if}">
+                            <div class="arrow  {if condition='$ac.id == $Request.get.cid'}rotate{/if}"><img src="__IMAGES__/nas-jt.png" class="arrow {if condition='$ac.id == $Request.get.cid'}rotate{/if}" /></div>
-                                <img src="__IMAGES__/nas-jt.png" class="arrow {if condition='$ac.id == $Request.get.cid'}rotate{/if}" />
-                            </div>
                             <span>{$ac.name}</span>
                         </div>
+                        <!-- 二级-->
                         <ul class="sub-list"  {if condition='$ac.id == $Request.get.cid' }style="display: block;" {/if}>
-                            {volist name="ac.article" id="ar"}
+                            {volist name="ac.child" id="ad"}
-                            <li>
+                            <li class="two-mues">
-                                <a 
+                                <a href="#" class="two-a">
-                                href="{:url('/index/topic/nas/help_detail', ['cid' => $ac.id, 'id' => $ar.id])}" 
+                                    <div class="arrow {if condition='$ad.id == $Request.get.pid'}rotate{/if}"><img src="__IMAGES__/nas-jt.png" class="arrow {if condition='$ad.id == $Request.get.pid'}rotate{/if}" /></div>
-                                {eq name="ar.id" value="$Request.get.id"}class="active"{/eq}
+                                    <span>{$ad.name}</span>
-                                >
-                                    {$ar.title}
                                 </a>
+                                <ul class="thress-mues" {if condition='$ad.id == $Request.get.pid' }style="display: block;" {/if}>
+                                    {volist name="ad.article" id="ae"}
+                                    <li><a href="{:url('/index/topic/nas/help_detail', ['cid' => $ac.id,'pid' => $ad.id, 'id' => $ae.id])}" style="padding-top: 6px;padding-left: 30px;" {eq
+                                           name="ae.id" value="$Request.get.id" }class="active" {/eq}>{$ae.title}</a></li>
+                                    {/volist}
+                                </ul>
+                                <!-- 三级-->
                             </li>
                             {/volist}
+                            {volist name="ac.article" id="ar"}
+                            <li><a href="{:url('/index/topic/nas/help_detail', ['cid' => $ac.id, 'id' => $ar.id])}" style="padding-top: 6px;" {eq
+                                   name="ar.id" value="$Request.get.id" }class="active" {/eq}>{$ar.title}</a></li>
+                            {/volist}
+
                         </ul>
                     </div>
                     {/volist}
+                    <!-- end 三级菜单   -->
+
                 </div>
                 {/notempty}
             </div>
             <!--文章详情 -->
-            <div class="nars-hlpdt-mm" id="rendered-content">{$article.content|raw|default=''}</div>
+            <div class="ql-container ">
+                <div class="nars-hlpdt-mm ql-editor" id="rendered-content">{$article.content|raw|default=''}</div>
+            </div>
             <!--锚点定位 -->
             <div class="nars-hlpdt-mr">
                 <div id="title-list">
@@ -73,10 +89,22 @@
 {block name="script"}
 <script type="text/javascript">
     $(document).ready(function () {
+        // 一级菜单点击事件
         $('.category-title').click(function () {
             $(this).next('.sub-list').slideToggle();
             $(this).find('.arrow').toggleClass('rotate');
         });
+        // 二级菜单点击事件
+		$('.two-a').click(function(e) {
+			e.preventDefault();
+			e.stopPropagation(); // 阻止事件冒泡
+			
+			// 切换当前二级菜单的箭头方向
+			$(this).find('.arrow').toggleClass('rotate');
+			
+			// 切换对应的三级菜单显示/隐藏
+			$(this).siblings('.thress-mues').slideToggle();
+		});
         // 搜索
         $(document).on('click', function (e) {
             var target = $(e.target);
@@ -107,7 +135,7 @@
                             html = '<ul>'
                             $.each(r.data, function (k, v) {
                                 html +=
-                                    '<li><a href="{:url(\'/index/topic/nas/help_detail\')}?cid=' + v.category_id + '&id=' + v.id + '">' + v.title + '</a></li>'
+                                    '<li><a href="{:url(\'/index/topic/nas/help_detail\')}?cid=' + v.category_id + '&id=' + v.id + '&pid=' + v.pid + '">' + v.title + '</a></li>'
                             })
                             html += '</ul>'
                         }
@@ -119,11 +147,15 @@
         // 内容
         // 清空标题列表
         $("#title-list ul").empty();
-        // 提取 h1 标题
+        // 提取 h3 标题
         var h1Titles = $("#rendered-content").find("h3");
+        // 只有当找到h3标题且内容不为空时才进行处理
+        if (h1Titles.length > 0) {
             h1Titles.each(function (index) {
                 var title = $(this);
-            var titleText = title.text();
+                var titleText = title.text().trim(); // 使用trim()去除空白字符
+                // 只有当标题文本不为空时才添加到列表
+                if (titleText) {
                     var titleId = "title-" + index;
                     title.attr("id", titleId);
                     var listItem = $("<li>");
@@ -133,7 +165,9 @@
                     });
                     listItem.append(link);
                     $("#title-list ul").append(listItem);
+                }
             });
+        }
     });
 </script>
 {/block}

app/index/view/pc/topic_nas/index.html

@@ -113,7 +113,7 @@
 </div>
 {/block}
 {block name="script"}
-<script type="text/javascript" src="https://unpkg.com/swiper@9.4.1/swiper-bundle.min.js"></script>
+<!-- <script type="text/javascript" src="https://unpkg.com/swiper@9.4.1/swiper-bundle.min.js"></script> -->
 <script type="text/javascript">
     $(document).ready(function () {
         // banner轮播

app/openapi/common.php

@@ -18,7 +18,7 @@ if (!function_exists('image_domain_concat')) {
             return $path;
         }
 
-        return rtrim($domain, '/') . '/' . ltrim($path, '/');
+        return url_join($domain, $path);
     }
 }
 
@@ -39,7 +39,7 @@ if (!function_exists('video_domain_concat')) {
             return $path;
         }
 
-        return rtrim($domain, '/') . '/' . ltrim($path, '/');
+        return url_join($domain, $path);
     }
 }
 

app/openapi/controller/v1/Article.php

@@ -66,6 +66,8 @@ class Article
             ])
             ->withoutField([
                 'language_id',
+                'author',
+                'source',
                 'seo_title',
                 'seo_keywords',
                 'seo_desc',

app/openapi/controller/v1/ArticleCategory.php

@@ -27,6 +27,8 @@ class ArticleCategory
         $categories = ArticleCategoryModel::withoutField([
                 'language_id',
                 'unique_label',
+                'short_name',
+                'desc',
                 'created_at',
                 'updated_at',
             ])

app/openapi/controller/v1/Authorize.php

@@ -25,7 +25,10 @@ class Authorize
             $server  = request()->server();
             $request = new Request([], $post, [], [], [], $server);
             $storage = new OAuthStorage;
-            $oauth   = new OAuth2($storage);
+            $oauth   = new OAuth2($storage, [
+                'access_token_lifetime'  => intval(env('OPENAPI.ACCESS_TOKEN_LIFETIME', 3600)),
+                'refresh_token_lifetime' => intval(env('OPENAPI.REFRESH_TOKEN_LIFETIME', 1209600)),
+            ]);
             $token   = $oauth->grantAccessToken($request);
             return success('success', json_decode($token->getContent(), true));
         } catch (OAuth2ServerException $e) {

app/openapi/controller/v1/Product.php

@@ -12,6 +12,7 @@ class Product
      */
     public function list()
     {
+        
         $params = request()->get([
             'category_id',
             'language' => 'zh-cn',
@@ -34,7 +35,6 @@ class Product
                 'name',
                 'short_name',
                 'cover_image',
-                'desc',
                 'deleted_at'
             ])
             ->where(function($query) use($params) {
@@ -47,7 +47,7 @@ class Product
             ->order(['sort' => 'asc', 'id' => 'desc'])
             ->hidden(['category_id'])
             ->paginate([
-                'list_row' => $params['size'],
+                'list_rows' => $params['size'],
                 'page'      => $params['page']
             ])
             ->each(function($item) {
@@ -75,14 +75,16 @@ class Product
                 'params'   => fn($query) => $query->field(['product_id', 'name', 'value'])
                                                 ->hidden(['product_id']),
                 // 关联sku
-                'skus' => fn($query) => $query->withoutField(['created_at', 'updated_at'])
+                'skus' => fn($query) => $query->withoutField(['sort', 'created_at', 'updated_at'])
                                                 ->with([
                                                     'sku_attr' => fn($query) => $query->with('attr')->hidden(['sku_id', 'attr_id'])
                                                 ])
                                                 ->hidden(['id', 'product_id']),
                 // 关联购买链接
                 'links' => fn($query) => $query->field(['product_id', 'platform_id', 'link'])
-                                                ->with(['platform' => fn($query) => $query->field(['id', 'platform'])])
+                                                ->with([
+                                                    'platforms' => fn($query) => $query->field(['id', 'platform'])
+                                                ])
                                                 ->hidden(['product_id', 'platform_id']),
                 // 关联相关产品
                 'related' => fn($query) => $query->field(['product_id', 'related_product_id'])
@@ -98,6 +100,7 @@ class Product
             ])
             ->withoutField([
                 'language_id',
+                'desc',
                 'stock_qty',
                 'seo_title',
                 'seo_keywords',

app/openapi/controller/v1/ProductCategory.php

@@ -27,6 +27,8 @@ class ProductCategory
         $categories = ProductCategoryModel::withoutField([
                 'language_id',
                 'unique_id',
+                'icon',
+                'desc',
                 'related_tco_category',
                 'created_at',
                 'updated_at'

app/openapi/middleware/Auth.php

@@ -19,7 +19,10 @@ class Auth
     public function handle($request, \Closure $next)
     {
         try {
-            $oauth = new OAuth2(new OAuthStorage);
+            $oauth = new OAuth2(new OAuthStorage, [
+                'access_token_lifetime'  => intval(env('OPENAPI.ACCESS_TOKEN_LIFETIME', 3600)),
+                'refresh_token_lifetime' => intval(env('OPENAPI.REFRESH_TOKEN_LIFETIME', 1209600)),
+            ]);
             $token = $oauth->getBearerToken();
             $oauth->verifyAccessToken($token);
         } catch (OAuth2ServerException $e) {

app/openapi/model/OAuthClientModel.php

@@ -20,6 +20,8 @@ class OAuthClientModel extends Model
         'client_secret' => 'string',
         'redirect_uri'  => 'string',
         'enabled'       => 'int',
+        'expired_at'    => 'datetime',
+        'remark'        => 'string',
         'created_at'    => 'datetime',
         'updated_at'    => 'datetime',
         'deleted_at'    => 'datetime'

app/openapi/model/ProductPurchaseLinkModel.php

@@ -12,7 +12,7 @@ use app\common\model\ProductPurchaseLinkBaseModel;
 class ProductPurchaseLinkModel extends ProductPurchaseLinkBaseModel
 {
     // 关联购买平台
-    public function platform()
+    public function platforms()
     {
         return $this->belongsTo(ProductPurchasePlatformModel::class, 'platform_id', 'id')->bind(['platform']);
     }

app/openapi/route/v1.php

@@ -31,7 +31,11 @@ Route::group('v1', function() {
     ->middleware(\app\openapi\middleware\Auth::class);
 })
 ->middleware(\think\middleware\Throttle::class, [
+    'prefix'     => 'throttle_',
     'visit_rate' => '5/m',
+    'key'        => function($throttle, $request) {
+        return '__CONTROLLER__/__ACTION__/__IP__';
+    },
     'visit_fail_response' => function (\think\middleware\Throttle $throttle, \think\Request $request, int $wait_seconds) {
         return \think\Response::create('您的操作过于频繁, 请在 ' . $wait_seconds . ' 秒后再试。')->code(429);
     },

composer.json

@@ -21,9 +21,9 @@
     ],
     "require": {
         "php": ">=8.0.0",
-        "topthink/framework": "^8.0",
+        "topthink/framework": "8.1.2",
         "topthink/think-orm": "v3.0.34",
-        "topthink/think-filesystem": "^2.0",
+        "topthink/think-filesystem": "^3.0",
         "topthink/think-multi-app": "^1.1",
         "topthink/think-migration": "^3.1",
         "topthink/think-view": "^2.0",
@@ -34,7 +34,8 @@
         "topthink/think-cors": "^1.0",
         "phpoffice/phpspreadsheet": "^3.8",
         "friendsofsymfony/oauth2-php": "^1.3",
-        "mobiledetect/mobiledetectlib": "4.8.09"
+        "mobiledetect/mobiledetectlib": "4.8.09",
+        "qiniu/php-sdk": "^7.14"
     },
     "require-dev": {
         "symfony/var-dumper": ">=4.2",

config/cache.php

@@ -29,15 +29,15 @@ return [
             // 驱动方式
             'type'       => 'redis',
             // 服务器地址
-            'host'       => '127.0.0.1',
+            'host'       => env('REDIS_HOST', '127.0.0.1'),
             // 端口
-            'port'       => 6379,
+            'port'       => env('REDIS_PORT', 6379),
             // 密码
-            'password'   => 'orico@f2b211',
+            'password'   => env('REDIS_PASSWORD', 'orico@f2b211'),
             // 缓存有效期 0表示永久缓存
             'expire'     => 0,
             // 缓存前缀
-            'prefix'     => 'ow:',
+            'prefix'     => env('REDIS_PREFIX', 'ow:'),
         ]
     ],
 ];

config/console.php

@@ -2,9 +2,12 @@
 // +----------------------------------------------------------------------
 // | 控制台配置
 // +----------------------------------------------------------------------
+
+
 return [
     // 指令定义
     'commands' => [
         'data:migrate' => \app\command\DataMigration::class,
+        'openapi:addclient' => \app\command\OpenApiMgr\AddClient::class,
     ],
 ];

config/filesystem.php

@@ -39,6 +39,60 @@ return [
             // 可见性
             'visibility' => 'public',
         ],
+        'public_qiniu' => [
+            // 磁盘类型
+            'type'                  => \filesystem\driver\Qiniu::class,
+            // bucker 名称
+            'bucket'                => env('QINIU_CLOUD.BUCKET', 'orico-official-website'),
+            // 访问密钥
+            'access_key'            => env('QINIU_CLOUD.ACCESS_KEY', 'dOsTum4a5qvhPTBbZRPX0pIOU7PZWRX7htKjztms'),
+            // 密钥
+            'secret_key'            => env('QINIU_CLOUD.SECRET_KEY', 'KFxsGbnErkALFfeGdMa8QWTdodJbamMX0iznLe-q'),
+            // 外部URL
+            'base_url'              => env('QINIU_CLOUD.BASE_URL', '//szw73dlk3.hn-bkt.clouddn.com'),
+            // 路径
+            'path_prefix'           => '/storage',
+            // 文件名称回调，可为文件名添加特定标志，以便可以在后续识别
+            'filename_generator'    => function (\think\file\UploadedFile $file, callable $context_generator = null): callable {
+                return function() use ($file, $context_generator) {
+                    // 为文件名称添加配置名，以为后续可能根据文件名识别文件所属存储配置信息
+                    $marker   = '_' . base64_encode('public_qiniu');
+                    $filename = $context_generator ? $context_generator($file) : null;
+                    if ($filename == null) {
+                        return date('Ymd') . '/' . md5(microtime(true) . $file->getPathname()) . $marker;
+                    }
+
+                    return $filename . $marker;
+                };
+            },
+        ],
+        'video_qiniu' => [
+            // 磁盘类型
+            'type'                  => \filesystem\driver\Qiniu::class,
+            // bucker 名称
+            'bucket'                => env('QINIU_CLOUD.BUCKET', 'orico-official-website'),
+            // 访问密钥
+            'access_key'            => env('QINIU_CLOUD.ACCESS_KEY', 'dOsTum4a5qvhPTBbZRPX0pIOU7PZWRX7htKjztms'),
+            // 密钥
+            'secret_key'            => env('QINIU_CLOUD.SECRET_KEY', 'KFxsGbnErkALFfeGdMa8QWTdodJbamMX0iznLe-q'),
+            // 外部URL
+            'base_url'              => env('QINIU_CLOUD.BASE_URL', '//szw73dlk3.hn-bkt.clouddn.com'),
+            // 路径
+            'path_prefix'           => '/storage/videos',
+            // 文件名称回调，可为文件名添加特定标志，以便可以在后续识别
+            'filename_generator'    => function (\think\file\UploadedFile $file, callable $context_generator = null): callable {
+                return function() use ($file, $context_generator) {
+                    // 为文件名称添加配置名，以为后续可能根据文件名识别文件所属存储配置信息
+                    $marker   = '_' . base64_encode('video_qiniu');
+                    $filename = $context_generator ? $context_generator() : null;
+                    if ($filename == null) {
+                        return date('Ymd') . '/' . md5(microtime(true) . $file->getPathname()) . $marker;
+                    }
+
+                    return $filename . $marker;
+                };
+            },
+        ]
         // 更多的磁盘配置信息
     ],
 ];

database/migrations/20241220062635_create_article_leave_message.php

@@ -33,7 +33,7 @@ class CreateArticleLeaveMessage extends Migrator
             ->addColumn('email', 'string', ['limit' => 128, 'null' => false, 'comment' => '邮箱'])
             ->addColumn('content', 'text', ['null' => false, 'comment' => '内容'])
             ->addColumn('ip', 'string', ['limit' => 64, 'null' => false, 'comment' => 'IP'])
-            ->addColumn('user_agent', 'string', ['limit' => 255, 'null' => false, 'comment' => 'UserAgent'])
+            ->addColumn('user_agent', 'string', ['limit' => 1024, 'null' => false, 'comment' => 'UserAgent'])
             ->addColumn('is_audited', 'boolean', ['null' => false, 'default' => 0, 'comment' => '0待审核,1已审核'])
             ->addColumn('created_at', 'timestamp', ['null' => false, 'default' => 'CURRENT_TIMESTAMP', 'comment' => '创建时间'])
             ->addColumn('deleted_at', 'timestamp', ['null' => true, 'comment' => '删除时间'])

database/migrations/20241220072926_create_video.php

@@ -31,7 +31,7 @@ class CreateVideo extends Migrator
         $table = $this->table('video', ['engine' => 'MyISAM', 'comment' => '视频表']);
         $table->addColumn('language_id', 'integer', ['signed' => false , 'null' => false, 'comment' => '语言ID'])
             ->addColumn('category_id', 'integer', ['signed' => false , 'null' => false, 'comment' => '分类ID'])
-            ->addColumn('name', 'string', ['limit' => 64 , 'null' => false, 'comment' => '名称'])
+            ->addColumn('name', 'string', ['limit' => 128 , 'null' => false, 'comment' => '名称'])
             ->addColumn('desc', 'string', ['limit' => 512, 'null' => true, 'default' => null, 'comment' => '描述信息'])
             ->addColumn('image', 'string', ['limit' => 125, 'null' => true, 'default' => null, 'comment' => '封面图片'])
             ->addColumn('video', 'string', ['limit' => 125, 'null' => true, 'default' => null, 'comment' => '视频地址'])

database/migrations/20241224025811_create_leave_message.php

@@ -33,7 +33,7 @@ class CreateLeaveMessage extends Migrator
             ->addColumn('email', 'string', ['limit' => 128, 'null' => false, 'comment' => '邮箱'])
             ->addColumn('content', 'text', ['null' => false, 'comment' => '内容'])
             ->addColumn('ip', 'string', ['limit' => 64, 'null' => false, 'comment' => 'IP'])
-            ->addColumn('user_agent', 'string', ['limit' => 255, 'null' => false, 'comment' => 'UserAgent'])
+            ->addColumn('user_agent', 'string', ['limit' => 1024, 'null' => false, 'comment' => 'UserAgent'])
             ->addColumn('created_at', 'timestamp', ['null' => false, 'default' => 'CURRENT_TIMESTAMP', 'comment' => '创建时间'])
             ->create();
     }

database/migrations/20241230060309_create_sys_user_login_log.php

@@ -31,7 +31,7 @@ class CreateSysUserLoginLog extends Migrator
         $table = $this->table('sys_user_login_log', ['engine' => 'MyISAM', 'comment' => '系统用户登录日志表']);
         $table->addColumn('user_id', 'integer', ['null' => false, 'comment' => '用户ID'])
             ->addColumn('ip', 'integer', ['limit' => 11, 'signed' => false, 'null' => false, 'comment' => '登录IP'])
-            ->addColumn('user_agent', 'string', ['limit' => 255, 'null' => true, 'default' => null, 'comment' => '登录设备UA信息'])
+            ->addColumn('user_agent', 'string', ['limit' => 1024, 'null' => true, 'default' => null, 'comment' => '登录设备UA信息'])
             ->addColumn('created_at', 'timestamp', ['null' => false, 'default' => 'CURRENT_TIMESTAMP', 'comment' => '创建时间'])
             ->create();
     }

database/migrations/20241231020620_create_sys_banner_item.php

@@ -36,9 +36,10 @@ class CreateSysBannerItem extends Migrator
             ->addColumn('desc_txt_color', 'string', ['limit' => 7, 'null' => false, 'default' => '', 'comment' => '描述文本颜色'])
             ->addColumn('type', 'string', ['limit' => 16, 'null' => false, 'comment' => '类型: image为图片, video为视频'])
             ->addColumn('image', 'string', ['limit' => 255, 'null' => true, 'default' => null, 'comment' => '图片'])
+            ->addColumn('extra_image', 'string', ['limit' => 255, 'null' => true, 'default' => null, 'comment' => '额外的图片'])
             ->addColumn('video', 'string', ['limit' => 255, 'null' => true, 'default' => null, 'comment' => '视频'])
             ->addColumn('link_to', 'string', ['limit' => 64, 'null' => true, 'default' => null, 'comment' => '链接到(类型): article:文章, article_category:文章分类, product:产品, product_category:产品分类, custom:自定义链接'])
-            ->addColumn('link', 'string', ['limit' => 255, 'null' => true, 'default' => null, 'comment' => '链接'])
+            ->addColumn('link', 'string', ['limit' => 510, 'null' => true, 'default' => null, 'comment' => '链接'])
             ->addColumn('sort', 'integer', ['limit' => 11, 'null' => false, 'default' => 0, 'comment' => '排序'])
             ->addColumn('status', 'boolean', ['limit' => 1, 'null' => false, 'default' => 1, 'comment' => '-1为禁用, 1为启用'])
             ->addColumn('created_at', 'timestamp', ['null' => false, 'default' =>'CURRENT_TIMESTAMP', 'comment' => '创建时间'])