font

refactor：重构了产品详情的图片预览功能，coyp了一个页面
add：新增了large.js这个是产品详情图片预览相关的

.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,26 +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
-
-[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

.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

.gitea/workflows/dev-ci.yaml

@@ -0,0 +1,26 @@
+name: Gitea Actions Official-website
+run-name: Deploy to ${{ inputs.deploy_target }} by @${{ gitea.actor }}
+on:
+    push:
+        branches:
+            - dev
+
+jobs:
+    deploy-dev:
+        runs-on: ubuntu-latest
+        steps:
+            - name: Setup SSH
+              run: |
+                  mkdir -p ~/.ssh
+                  echo "${{ secrets.SERVER_SSH_KEY }}" > ~/.ssh/id_rsa
+                  chmod 600 ~/.ssh/id_rsa
+                  ssh-keyscan -H ${{ secrets.SERVER_HOST }} >> ~/.ssh/known_hosts
+            - name: Deploy application
+              run: |
+                  ssh ${{ secrets.SERVER_USER }}@${{ secrets.SERVER_HOST }} << 'EOF'
+                    set -e
+                    cd /www/wwwroot/dev.ow.f2b211.com
+
+                    # 拉取最新代码
+                    git pull --rebase
+                  EOF

.gitignore

@@ -3,9 +3,22 @@ composer.phar
 composer.lock
 .DS_Store
 Thumbs.db
+.env
+.env.dev
+.env.local
+.env.prod
+.htaccess
+.user.ini
+404.html
+index.html
 
+public/dist*
+public/opendoc
+public/logo.png
+public/.well-known
 /.idea
 /.vscode
+/.zed
 /vendor
 /.settings
 /.buildpath

.zed/settings.json

@@ -0,0 +1,24 @@
+// Folder-specific settings
+//
+// For a full list of overridable settings, and general information on folder-specific settings,
+// see the documentation: https://zed.dev/docs/configuring-zed#settings-files
+{
+  "languages": {
+    "PHP": {
+      "language_servers": ["intelephense","!phpactor"]
+    }
+  },
+  "lsp": {
+    "intelephense": {
+      "initialization_options": {
+        "stubs": [
+          "wordpress",
+          "laravel",
+          "symfony",
+          "codeigniter",
+          "thinkphp"
+        ]
+      }
+    }
+  }
+}

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

@@ -39,8 +39,12 @@ class Article
             ->language(request()->lang_id)
             ->where(function($query) use($param) {
                 if (isset($param['category_id'])) {
+                    if (str_contains($param['category_id'], ',') || is_array($param['category_id'])) {
+                        $query->whereIn('category_id', $param['category_id']);
+                    } else {
                         $query->where('category_id', '=', $param['category_id']);
                     }
+                }
             })
             ->withSearch(['title', 'release_time'], [
                 'title'        => $param['title']??null,
@@ -55,7 +59,8 @@ class Article
                 'category',
                 'category_id'
             ])
-            ->bindAttr('category', ['category_name' => 'name']);
+            ->bindAttr('category', ['category_name' => 'name'])
+            ->each(fn($item) => $item->image = thumb($item->image));
 
         return success('获取成功', $article);
     }
@@ -223,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([
                 '*',
@@ -248,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/ArticleTrash.php

@@ -39,7 +39,8 @@ class ArticleTrash
                 'list_rows' => $param['size']
             ])
             ->hidden(['category_id', 'category'])
-            ->bindAttr('category', ['category_name' => 'name']);
+            ->bindAttr('category', ['category_name' => 'name'])
+            ?->each(fn($item) => $item->image = thumb($item->image));
 
         return success('获取成功', $data);
     }

app/admin/controller/v1/Attachment.php

@@ -48,7 +48,8 @@ class Attachment
                 'page'      => $params['page']
             ])
             ->bindAttr('category', ['category_name'])
-            ->hidden(['category_id', 'category']);
+            ->hidden(['category_id', 'category'])
+            ?->each(fn($item) => $item->image = thumb($item->image));
 
         return success('获取成功', $attachments);
     }

app/admin/controller/v1/AttachmentTrash.php

@@ -46,7 +46,8 @@ class AttachmentTrash
                 'page'      => $params['page']
             ])
             ->bindAttr('category', ['category_name'])
-            ->hidden(['category_id', 'category']);
+            ->hidden(['category_id', 'category'])
+            ?->each(fn($item) => $item->image = thumb($item->image));
 
         return success('获取成功', $attachments);
     }

app/admin/controller/v1/Banner.php

@@ -20,7 +20,8 @@ class Banner
 
         $banners = SysBannerModel::field([
                 'id',
-                'name'
+                'name',
+                'at_platform'
             ])
             ->withSearch(['name'], [
                 'name' => $param['name'] ?? null
@@ -30,7 +31,27 @@ class Banner
             ->order(['sort' => 'asc', 'id' => 'desc'])
             ->select();
 
-        return success('获取成功', $banners);
+        $datas = [];
+        if (!$banners->isEmpty()) {
+            $temp = [];
+            $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'       => $map[$banner->at_platform]['id'] ?? 0,
+                        'name'     => $map[$banner->at_platform]['name'] ?? '未知平台',
+                        'children' => []
+                    ];
+                }
+                $temp[$banner->at_platform]['children'][] = [
+                    'id'   => $banner->id,
+                    'name' => $banner->name
+                ];
+            }
+            $datas = array_values($temp);
+        }
+
+        return success('获取成功', $datas);
     }
 
     // 分页

app/admin/controller/v1/BannerItem.php

@@ -33,14 +33,18 @@ class BannerItem
                 'item.sort',
                 'item.status',
                 'item.created_at',
-                'banner.name' => 'banner_name'
+                'bnr.name' => 'banner_name'
             ])
-            ->join('sys_banner banner', 'banner.id = item.banner_id')
+            ->join('sys_banner bnr', 'bnr.id = item.banner_id')
-            ->where('banner.language_id', '=', request()->lang_id)
+            ->where('bnr.language_id', '=', request()->lang_id)
             ->where(function($query) use($param){
                 if (!empty($param['banner_id'])) {
+                    if (is_array($param['banner_id']) || str_contains($param['banner_id'], ',')) {
+                        $query->whereIn('item.banner_id', $param['banner_id']);
+                    } else {
                         $query->where('item.banner_id', '=', $param['banner_id']);
                     }
+                }
                 if (!empty($param['title'])) {
                     $query->where('item.title', 'like', "%{$param['title']}%");
                 }
@@ -60,7 +64,8 @@ class BannerItem
             ->paginate([
                 'list_rows' => $param['size'],
                 'page'      => $param['page']
-            ]);
+            ])
+            ->each(fn($item) => $item->image = thumb($item->image));
 
         return success('获取成功', $banner_items);
     }
@@ -70,12 +75,13 @@ class BannerItem
     {
         $id = request()->param('id');
 
-        $banner_item = SysBannerItemModel::with('prod_mapping.category')
+        $banner_item = SysBannerItemModel::with('prodMapping.category')
             ->withoutField([
                 'created_at',
                 'updated_at',
                 'deleted_at'
             ])
+            ->append(['rel_prod_cate_id', 'rel_prod_cate_name']) // 绑定产品分类关联模型中字段到父模型中
             ->find($id);
         if (empty($banner_item)) {
             return error('横幅不存在');
@@ -95,10 +101,13 @@ class BannerItem
             'rel_prod_cate_id',
             'title',
             'title_txt_color',
+            'short_title',
+            'short_title_txt_color',
             'desc',
             'desc_txt_color',
             'type',
             'image',
+            'extra_image',
             'video',
             'link_to' => 'custom',
             'link',
@@ -149,10 +158,13 @@ class BannerItem
             'rel_prod_cate_id',
             'title',
             'title_txt_color',
+            'short_title',
+            'short_title_txt_color',
             'desc',
             'desc_txt_color',
             'type',
             'image',
+            'extra_image',
             'video',
             'link_to',
             'link',
@@ -181,10 +193,7 @@ class BannerItem
 
             // 更新关联的产品分类
             if (!empty($put['rel_prod_cate_id'])) {
-                $ok = SysBannerProdCateMappingModel::where('banner_item_id', '=', $id)->delete();
+                SysBannerProdCateMappingModel::where('banner_item_id', '=', $id)->delete();
-                if (!$ok) {
-                    throw new InvalidOperateException('更新横幅与产品分类关联失败');
-                }
                 $mapping = SysBannerProdCateMappingModel::create([
                     'banner_item_id'      => $id,
                     'product_category_id' => $put['rel_prod_cate_id']
@@ -235,10 +244,12 @@ class BannerItem
             'banner_name'     => '分类名称',
             'title'           => '横幅名称',
             'title_txt_color' => '横幅名称字体颜色',
+            'short_title'     => '横幅简称',
             'desc'            => '描述',
             'desc_txt_color'  => '描述字体颜色',
             'type'            => '前台显示类型',
             'image'           => '图片地址',
+            'extra_image'     => '额外图片地址',
             'video'           => '视频地址',
             'link_to'         => '链接类型',
             'link'            => '链接地址',
@@ -256,21 +267,21 @@ 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',
                 'banner.name' => 'banner_name',
                 'item.title',
                 'item.title_txt_color',
+                'item.short_title',
                 'item.desc',
                 'item.desc_txt_color',
                 'item.type',
                 'item.image',
+                'item.extra_image',
                 'item.video',
                 'item.link_to',
                 'item.link',
@@ -282,8 +293,12 @@ class BannerItem
             ->where('banner.language_id', '=', request()->lang_id)
             ->where(function($query) use($param){
                 if (!empty($param['banner_id'])) {
+                    if (is_array($param['banner_id']) || str_contains($param['banner_id'], ',')) {
+                        $query->whereIn('item.banner_id', $param['banner_id']);
+                    } else {
                         $query->where('item.banner_id', '=', $param['banner_id']);
                     }
+                }
                 if (!empty($param['title'])) {
                     $query->where('item.title', 'like', "%{$param['title']}%");
                 }
@@ -300,7 +315,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/Faq.php

@@ -38,7 +38,8 @@ class Faq
             ->paginate([
                 'list_rows' => $param['size'],
                 'page'      => $param['page'],
-            ]);
+            ])
+            ?->each(fn($item) => $item->image = thumb($item->image));
 
         return success('获取成功', $faqs);
     }

app/admin/controller/v1/OperateLog.php

@@ -4,6 +4,7 @@ declare (strict_types = 1);
 namespace app\admin\controller\v1;
 
 use app\admin\model\v1\SysOperateLog;
+use app\admin\model\v1\SysUserModel;
 
 /**
  * 操作日志控制器
@@ -21,11 +22,15 @@ class OperateLog
             'size/d'
         ]);
 
-        $logs = SysOperateLog::hasWhere('user', function($query) use($param) {
+        $logs = SysOperateLog::field([
+                'SysOperateLog.*',
+                'SysUserModel.username'
+            ])
+            ->hasWhere('user', function($query) use($param) {
                 if (!empty($param['operator'])) {
-                    $query->where('username', 'like', "{$param['operator']}");
+                    $query->where('username', 'like', "%{$param['operator']}%");
                 }
-                $query->field(['id', 'username']);
+                $query->withTrashed()->field(['id', 'username']);
             })
             ->withSearch(['title', 'created_at'], [
                 'title'      => $param['title'] ?? null,
@@ -36,7 +41,6 @@ class OperateLog
                 'list_rows' => $param['size'] ?? 10,
                 'page'      => $param['page'] ?? 1,
             ])
-            ->bindAttr('user', ['username'])
             ->hidden(['user_id', 'user']);
 
         return success('获取成功', $logs);

app/admin/controller/v1/Product.php

@@ -57,13 +57,14 @@ 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'],
             ])
             ->bindAttr('category', ['category_name' => 'name'])
-            ->hidden(['category_id', 'category']);
+            ->hidden(['category_id', 'category'])
+            ?->each(fn($item) => $item->cover_image = thumb($item->cover_image));
 
         return success('获取成功', $products);
     }
@@ -170,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[] = [
@@ -345,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',
@@ -359,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',
@@ -389,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/ProductTrash.php

@@ -55,7 +55,8 @@ class ProductTrash
                 'page'      => $param['page'],
             ])
             ->bindAttr('category', ['category_name' => 'name'])
-            ->hidden(['category_id', 'category']);
+            ->hidden(['category_id', 'category'])
+            ?->each(fn($item) => $item->cover_image = thumb($item->cover_image));
 
         return success('获取成功', $products);
     }

app/admin/controller/v1/SiteConfig.php

@@ -141,6 +141,61 @@ class SiteConfig
         return $ret;
     }
 
+    // 根据分组获取配置
+    public function getByGroupUniqueLabel($unique_label)
+    {
+        $configs = SysConfigModel::alias('c')
+            ->field([
+                'c.id',
+                'c.title',
+                'c.name',
+                'c.value',
+            ])
+            ->join(SysConfigGroupModel::getTable(). ' g', 'g.id = c.group_id')
+            ->where('g.language_id', '=', request()->lang_id)
+            ->where('g.unique_label', '=', $unique_label)
+            ->where('g.status', '=', 1)
+            ->order(['c.sort' => 'asc', 'c.id' => 'desc'])
+            ->select()
+            ->each(function ($item) {
+                // 修改字段为null的输出为空字符串
+                $keys = array_keys($item->toArray());
+                foreach ($keys as $key) {
+                    if (is_null($item[$key])) {
+                        $item[$key] = '';
+                    }
+                }
+                return $item;
+            })
+            ->toArray();
+        if (!empty($configs)) {
+            $configs_map = [];
+            foreach ($configs as $cfg) {
+                $current = &$configs_map;
+                
+                // 根据name中"."拆分为多维数组
+                $parts = explode('.', $cfg['name']);
+                foreach ($parts as $part) {
+                    if (!isset($current[$part])) {
+                        $current[$part] = [];
+                    }
+                    $current = &$current[$part];
+                }
+                $current = [
+                    'id'    => $cfg['id'],
+                    'title' => $cfg['title'],
+                    'name'  => $cfg['name'],
+                    'value' => $cfg['value']
+                ];
+            }
+            unset($current);
+
+            return $configs_map;
+        }
+
+        return [];
+    }
+
     // 更新配置
     public function update()
     {

app/admin/controller/v1/System.php

@@ -146,7 +146,11 @@ class System
                     'name'    => '产品分类',
                     'link_to' => 'product_category',
                     'data'    => array_to_tree(array_map(function($item) {
+                        if ($item['pid'] == 0) {
                             $item['url'] = (string)url('/index/product/category/'. $item['id']);
+                        } else {
+                            $item['url'] = (string)url('/index/product/subcategory/' . $item['id']);
+                        }
                         return $item;
                     }, $product_category), 0, 'pid', false, false)
                 ],
@@ -154,6 +158,11 @@ class System
                     'name'    => '产品',
                     'link_to' => 'product',
                     'data'    => array_to_tree($product_category, 0, 'pid', false, false)
+                ],
+                [
+                    'name'    => '其他内页',
+                    'link_to' => 'system_page',
+                    'data'    => self::getSystemOtherPages()
                 ]
             ];
 
@@ -219,23 +228,174 @@ class System
         return $data->toArray();
     }
 
+    // 获取系统其他内页
+    static private function getSystemOtherPages()
+    {
+        return [
+            [
+                'id'   => 1,
+                'name' => '首页',
+                'url'  => (string)url('/index/index/index')
+            ],
+            [
+                'id'   => 2,
+                'name' => '新品上市',
+                'url'  => (string)url('/index/product/newpro')
+            ],
+            [
+                'id'   => 3,
+                'name' => '附件下载',
+                'url'  => (string)url('/index/attachment/index')
+            ],
+            [
+                'id'   => 4,
+                'name' => '问答中心',
+                'url'  => (string)url('/index/faq/index')
+            ],
+            [
+                'id'   => 5,
+                'name'     => '关于我们',
+                'url'      => '',
+                'children' => [
+                    [
+                        'id'   => 51,
+                        'name' => '品牌介绍',
+                        'url'  => (string)url('/index/aboutus/introduction')
+                    ],
+                    [
+                        'id'   => 52,
+                        'name' => '品牌故事',
+                        'url'  => (string)url('/index/aboutus/story')
+                    ],
+                    [
+                        'id'   => 53,
+                        'name' => '品牌历程',
+                        'url'  => (string)url('/index/aboutus/mileage')
+                    ],
+                    [
+                        'id'   => 54,
+                        'name' => '文化介绍',
+                        'url'  => (string)url('/index/aboutus/culture')
+                    ],
+                    [
+                        'id'   => 55,
+                        'name' => '售后政策',
+                        'url'  => (string)url('/index/aboutus/policy')
+                    ]
+                ]
+            ],
+            [
+                'id'       => 6,
+                'name'     => '联系我们',
+                'url'      => '',
+                'children' => [
+                    [
+                        'id'   => 61,
+                        'name' => '联系我们',
+                        'url'  => (string)url('/index/contactus/index')
+                    ],
+                    [
+                        'id'   => 62,
+                        'name' => '留言联系我们',
+                        'url'  => (string)url('/index/contactus/message')
+                    ],
+                    [
+                        'id'   => 63,
+                        'name' => '留言成为分销商',
+                        'url'  => (string)url('/index/contactus/distributor')
+                    ],
+                    [
+                        'id'   => 64,
+                        'name' => '留言批量购买',
+                        'url'  => (string)url('/index/contactus/bulkbuy')
+                    ]
+                ]
+            ],
+            [
+                'id'       => 7,
+                'name'     => 'NAS专题',
+                'url'      => '',
+                'children' => [
+                    [
+                        'id'   => 71,
+                        'name' => '首页',
+                        'url'  => (string)url('/index/topic/nas/index')
+                    ],
+                    [
+                        'id'   => 72,
+                        'name' => '产品体验',
+                        'url'  => (string)url('/index/topic/nas/product')
+                    ],
+                    [
+                        'id'   => 73,
+                        'name' => '客户合作',
+                        'url'  => (string)url('/index/topic/nas/cooperation')
+                    ],
+                    [
+                        'id'   => 74,
+                        'name' => '帮助中心',
+                        'url'  => (string)url('/index/topic/nas/help')
+                    ],
+                    [
+                        'id'   => 75,
+                        'name' => '软件下载',
+                        'url'  => (string)url('/index/topic/nas/download')
+                    ]
+                ]
+            ],
+            [
+                'id'       => 8,
+                'name'     => '电力品线专题',
+                'url'      => '',
+                'children' => [
+                    [
+                        'id'   => 81,
+                        'name' => '首页',
+                        'url'  => (string)url('/index/topic/power_prodline/index')
+                    ],
+                ]
+            ]
+        ];
+    }
+
     // 根据系统页面url获取回显数据项
     static public function getEchoDataBySystemPageUrl($link_to, $link)
     {
-        if ('custom' == $link_to) return [];
+        if ('custom' == $link_to || empty($link)) return [];
 
         $data   = [];
+        $params = [];
         $url    = parse_url($link, PHP_URL_QUERY);
-        if (empty($url)) return [];
+        if (empty($url)) {
-        
+            $parts        = explode('/', trim($link, '/'));
+            $params['id'] = (int)str_replace('.html', '', end($parts));
+        } else {
             parse_str($url, $params);
+        }
+
         switch ($link_to) {
+            case 'article_category':
+                if (empty($params['id'])) return [];
+                $data = ArticleCategoryModel::field(['id', 'name'])->bypk($params['id'])->find();
+                break;
             case 'article':
+                if (empty($params['id'])) return [];
                 $data = ArticleModel::field(['id', 'title' => 'name'])->bypk($params['id'])->find();
                 break;
+            case 'product_category':
+                if (empty($params['id'])) return [];
+                $data = ProductCategoryModel::field(['id', 'name'])->bypk($params['id'])->find();
+                break;
             case 'product':
+                if (empty($params['id'])) return [];
                 $data = ProductModel::field(['id', 'name'])->bypk($params['id'])->find();
                 break;
+            case 'system_page':
+                $data = self::filterSystemOtherPage(self::getSystemOtherPages(), function($item) use ($params, $link) {
+                    if (empty($params['id'])) return $item['url'] == $link;
+                    return $item['id'] == $params['id'];
+                });
+                break;
             default:
                 return [];
                 break;
@@ -248,4 +408,22 @@ class System
             'link' => $link
         ];
     }
+
+    // 根据条件过滤结果
+    static private function filterSystemOtherPage(array $data, callable $callback): array
+    {
+        foreach ($data as $it) {
+            if ($callback($it)) {
+                return $it;
+            }
+            if (isset($it['children'])) {
+                $child = self::filterSystemOtherPage($it['children'], $callback);
+                if (!empty($child)) {
+                    return $child;
+                }
+            }
+        }
+
+        return [];
+    }
 }

app/admin/controller/v1/Upload.php

@@ -7,7 +7,9 @@ use app\admin\model\v1\SysImageUploadRecordModel;
 use app\admin\model\v1\SysVideoUploadRecordModel;
 use app\admin\model\v1\SysAttachmentUploadRecordModel;
 use Intervention\Image\ImageManager;
+use Intervention\Image\Typography\FontFactory;
 use think\facade\Filesystem;
+use filesystem\Qiniu;
 
 /**
  * 文件上传控制器
@@ -30,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());
@@ -41,12 +43,108 @@ class Upload
             $filemd5  = $file->md5();
             $filesha1 = $file->sha1();
 
-            $image_model = SysImageUploadRecordModel::md5($filemd5)->find();
+            // 获取图片上传配置
+            list(
+                'filename_keep'  => $filename_keep,
+                '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)) {
-                $filename = Filesystem::disk('image')->putFile($param['module'], $file);
+                // 检查是否需要保留原文件名生成器
-                // 生成缩略图
+                $name_rule = fn() => $filename_keep ? $this->filenameGenerator($file) : null;
-                $image_manager = new ImageManager(new \Intervention\Image\Drivers\Imagick\Driver());
+
+                // 处理图片
+                $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(
+                    'enabled'       => $enabled,
+                    'type'          => $type,
+                    'text_options'  => $text_options,
+                    'image_options' => $image_options
+                ) = $this->getWatermarkOptions();
+                if ($enabled) {
+                    // 图片水印
+                    if ($type == 'IMAGE' && $image_options['image'] != '') {
+                        // 读取水印图片
+                        $watermark_image = $image_manager->read(public_path() . $image_options['image']);
+                        // 缩放水印图片
+                        $watermark_image->scale($image_options['width'], $image_options['height']);
+                        // 绘制水印图片
+                        $image->place(
+                            $watermark_image, 
+                            $image_options['position'], 
+                            $image_options['offset_x'], 
+                            $image_options['offset_y'], 
+                            $image_options['opacity']
+                        );
+                    }
+                    // 文字水印
+                    else if ($type == 'TEXT' && $text_options['txt'] != '') {
+                        // 原图宽度
+                        $origin_width  = $image->width();
+                        // 原图高度
+                        $origin_height = $image->height();
+
+                        $font_factory = new FontFactory(function(FontFactory $font) use($text_options) {
+                            // 设置字体
+                            $font->filename(public_path() . $text_options['font']);
+                            // 设置字体大小
+                            $font->size($text_options['size']);
+                            // 设置字体颜色及透明度
+                            $opacity = $text_options['opacity'] > 0 ? dechex((int)ceil(255 * ($text_options['opacity'] / 100))) : '00';
+                            $font->color($text_options['color'] . $opacity);
+                            $font->align('left');
+                            $font->valign('top');
+                        });
+                        // 文字尺寸
+                        $font_rect = $image->driver()->fontProcessor()->boxSize($text_options['txt'], $font_factory());
+                        // 计算偏移量
+                        list($offset_x, $offset_y) = $this->scaleTxtOffsetXYByPosition(
+                            $text_options['position'],
+                            $text_options['offset_x'],
+                            $text_options['offset_y'],
+                            $origin_width,
+                            $origin_height,
+                            $font_rect->width(),
+                            $font_rect->height()
+                        );
+                        // 绘制文字
+                        $image->text(
+                            $text_options['txt'], 
+                            $offset_x, 
+                            $offset_y, 
+                            $font_factory()
+                        );
+                    }
+                    $image->save('.'. $storage. '/'. $filename);
+                }
+
+                // 缩略图
                 $image->scale(200, 200);
                 $idx = strrpos($filename, '.');
                 $thumb_filename = mb_substr($filename, 0, $idx) . '_thumb.' . mb_substr($filename, $idx + 1);
@@ -56,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()) {
@@ -68,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
             ]);
@@ -79,6 +177,143 @@ 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("上传目标目录不可用");
+    }
+    /**
+     * 文件名生成回调
+     *
+     * @param \think\file\UploadedFile $file
+     * @return callable
+     */
+    private function filenameGenerator(\think\file\UploadedFile $file): callable
+    {
+        return fn() => date('Ymd') . '/' . pathinfo($file->getOriginalName(), PATHINFO_FILENAME);
+    }
+    /**
+     * 获取上传配置
+     *
+     * @param string $module
+     * @return array
+     */
+    private function getUploadOptions($module)
+    {
+        $config_model = new \app\admin\controller\v1\SiteConfig;
+        $config       = $config_model->getByGroupUniqueLabel('upload');
+        $options      = data_get($config, $module, []);
+        
+        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'),
+        ];
+    }
+    /**
+     * 获取水印配置
+     *
+     * @return array
+     */
+    private function getWatermarkOptions(): array
+    {
+        $config_model     = new \app\admin\controller\v1\SiteConfig;
+        $watermark_config = $config_model->getByGroupUniqueLabel('watermark');
+
+        $opacity = data_get($watermark_config, 'watermark_opacity.value', 100);
+        if ($opacity == '') {
+            $opacity = 100;
+        }
+        return [
+            'enabled'      => data_get($watermark_config, 'watermark_enabled.value', 0) == 1,
+            'type'         => data_get($watermark_config, 'watermark_type.value', ''),
+            'text_options' => [
+                'txt'      => data_get($watermark_config, 'watermark_text_value.value', ''),
+                'font'     => data_get($watermark_config, 'watermark_text_font.value', ''),
+                'size'     => (float)data_get($watermark_config, 'watermark_text_size.value', 12)?:12,
+                'color'    => data_get($watermark_config, 'watermark_text_color.value', '#000000')?:'#000000',
+                'position' => data_get($watermark_config, 'watermark_position.value', 'top-left')?:'top-left',
+                'offset_x' => (int)data_get($watermark_config, 'watermark_offset_x.value', 0),
+                'offset_y' => (int)data_get($watermark_config, 'watermark_offset_y.value', 0),
+                'opacity'  => (int)$opacity,
+            ],
+            'image_options' => [
+                'image'    => data_get($watermark_config, 'watermark_image_value.value', ''),
+                'width'    => (int)data_get($watermark_config, 'watermark_image_width.value')?:null,
+                'height'   => (int)data_get($watermark_config, 'watermark_image_height.value')?:null,
+                'position' => data_get($watermark_config, 'watermark_position.value', 'top-left')?:'top-left',
+                'offset_x' => (int)data_get($watermark_config, 'watermark_offset_x.value', 0),
+                'offset_y' => (int)data_get($watermark_config, 'watermark_offset_y.value', 0),
+                'opacity'  => (int)$opacity,
+            ]
+        ];
+    }
+    /**
+     * 计算文本水印偏移量
+     *
+     * @param string $position
+     * @param integer $offset_x
+     * @param integer $offset_y
+     * @param integer $image_width
+     * @param integer $image_height
+     * @param integer $txt_width
+     * @param integer $txt_height
+     * @return array
+     */
+    private function scaleTxtOffsetXYByPosition(string $position, int $offset_x, int $offset_y, int $image_width, int $image_height, int $txt_width, int $txt_height)
+    {
+        switch ($position) {
+            case 'top-left':
+                // top-left:左上角
+                return [$offset_x, $offset_y];
+            case 'top-right':
+                // top-right:右上角
+                return [(int)($image_width-$txt_width-$offset_x), $offset_y];
+            case 'top':
+                // top:上 - 水平居中
+                return [(int)(($image_width-$txt_width+$offset_x)/2), $offset_y];
+            case 'left':
+                // left:左 - 垂直居中
+                return [$offset_x, (int)(($image_height-$txt_height)/2+$offset_y)];
+            case 'center':
+                // center:水平垂直居中
+                return [(int)(($image_width-$txt_width)/2+$offset_x), (int)(($image_height-$txt_height)/2+$offset_y)];
+            case 'right':
+                // right:右 - 垂直居中
+                return [(int)($image_width-$txt_width-$offset_x), (int)(($image_height-$txt_height)/2+$offset_y)];
+            case'bottom':
+                // bottom:下 - 水平居中
+                return [(int)(($image_width-$txt_width+$offset_x)/2), (int)($image_height-$txt_height-$offset_y)];
+            case'bottom-left':
+                // bottom-left:左下角
+                return [$offset_x, (int)($image_height-$txt_height-$offset_y)];
+            case'bottom-right':
+                // bottom-right:右下角
+                return [(int)($image_width-$txt_width-$offset_x), (int)($image_height-$txt_height-$offset_y)];
+            default:
+                throw new \InvalidArgumentException('Invalid position');
+        }
+    }
 
     /**
      * 上传视频
@@ -109,15 +344,38 @@ class Upload
             $filemd5  = $file->md5();
             $filesha1 = $file->sha1();
 
-            $video = SysVideoUploadRecordModel::md5($filemd5)->find();
+            // 获取视频上传配置
+            list(
+                'filename_keep'  => $filename_keep,
+                '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)) {
-                $filename = Filesystem::disk('video')->putFile($param['module'], $file);
+                // 保存位置配置 key
+                $disk = 'video';
+                // 检查是否需要保留原文件名
+                $name_rule = fn() => $filename_keep ? $this->filenameGenerator($file) : null;
+
+                // 保存到七牛云
+                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;
@@ -128,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
             ]);
@@ -152,23 +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"
+                '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();
 
-            $attachment = SysAttachmentUploadRecordModel::md5($filemd5)->find();
+            // 获取附件上传配置
+            list(
+                'filename_keep'  => $filename_keep,
+                '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)) {
-                $filename = Filesystem::disk('public')->putFile('attachments', $file);
+                // 保存位置配置 key
+                $disk = 'public';
+                // 检查是否需要保留原文件名
+                $name_rule = fn() => $filename_keep ? $this->filenameGenerator($file) : null;
 
-                // 保存视频
+                // 保存到七牛云
+                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;
@@ -178,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

@@ -50,7 +50,8 @@ class Video
                 'page'      => $params['page'],
             ])
             ->bindAttr('category', ['category_name'])
-            ->hidden(['category', 'category_id']);
+            ->hidden(['category', 'category_id'])
+            ?->each(fn($item) => $item->image = thumb($item->image));
 
         return success('获取成功', $videos);
     }
@@ -208,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',
@@ -229,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/controller/v1/VideoTrash.php

@@ -47,7 +47,8 @@ class VideoTrash
                 'page'      => $params['page'],
             ])
             ->bindAttr('category', ['category_name'])
-            ->hidden(['category_id', 'category']);
+            ->hidden(['category_id', 'category'])
+            ?->each(fn($item) => $item->image = thumb($item->image));
 
         return success('获取成功', $videos);
     }

app/admin/model/v1/ArticleModel.php

@@ -85,6 +85,10 @@ class ArticleModel extends ArticleBaseModel
     // 分类查询
     public function scopeCategory($query, $value)
     {
+        if (is_array($value) || str_contains($value, ',')) {
+            $query->whereIn('category_id', $value);
+            return;
+        }
         $query->where('category_id', '=', $value);
     }
     public function scopeCategoryNullable($query, $value) 
@@ -92,6 +96,10 @@ class ArticleModel extends ArticleBaseModel
         if (is_null($value)) {
             return;
         }
+        if (is_array($value) || str_contains($value, ',')) {
+            $query->whereIn('category_id', $value);
+            return;
+        }
         $query->where('category_id', '=', $value);
     }
 }

app/admin/model/v1/AttachmentModel.php

@@ -58,6 +58,10 @@ class AttachmentModel extends AttachmentBaseModel
     public function scopeCategoryId($query, $value)
     {
         if (empty($value)) return;
+        if (is_array($value) || str_contains($value, ',')) {
+            $query->whereIn('category_id', $value);
+            return;
+        }
         $query->where('category_id', '=', $value);
     }
 }

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

@@ -65,13 +65,27 @@ class ProductModel extends ProductBaseModel
         if (is_null($value)) {
             return;
         }
+        if (is_array($value) || str_contains($value, ',')) {
+            $query->whereIn('category_id', $value);
+            return;
+        }
         $query->where('category_id', '=', $value);
     }
     public function scopeCategory($query, $value)
     {
+        if (is_array($value) || str_contains($value, ',')) {
+            $query->whereIn('category_id', $value);
+            return;
+        }
         $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/model/v1/SysBannerItemModel.php

@@ -17,10 +17,8 @@ class SysBannerItemModel extends SysBannerItemBaseModel
     // 软删除字段
     protected $deleteTime = 'deleted_at';
 
-    // 绑定产品分类关联模型中字段到父模型
-    protected $append = ['rel_prod_cate_id', 'rel_prod_cate_name'];
     // 要隐藏的字段或关联模型数据字段
-    protected $hidden = ['prod_mapping'];
+    protected $hidden = ['prodMapping'];
 
     // 关联分类
     public function banner()
@@ -73,6 +71,10 @@ class SysBannerItemModel extends SysBannerItemBaseModel
     public function scopeBannerId($query, $value)
     {
         if (is_null($value)) return;
+        if (is_array($value) || str_contains($value, ',')) {
+            $query->whereIn('banner_id', $value);
+            return;
+        }
         $query->where('banner_id', '=', $value);
     }
 }

app/admin/model/v1/VideoModel.php

@@ -62,6 +62,10 @@ class VideoModel extends VideoBaseModel
         if (empty($value)) {
             return;
         }
+        if (is_array($value) || str_contains($value, ',')) {
+            $query->whereIn('category_id', $value);
+            return;
+        }
         $query->where('category_id', '=', $value);
     }
 }

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

@@ -16,16 +16,16 @@ class ArticleValidate extends Validate
     protected $rule = [
         'language_id'  => 'require|integer',
         'category_id'  => 'require|integer',
-        'title'        => 'require|max:64',
+        'title'        => 'require|max:128',
         'image'        => 'max:125',
         'link'         => 'max:255',
-        'desc'         => 'max:255',
+        'desc'         => 'max:512',
         '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

@@ -21,7 +21,7 @@ class NavigationItemValidate extends Validate
         'pid'       => 'integer|different:id|checkPidNotBeChildren',
         'name'      => 'require|max:64',
         'icon'      => 'max:64',
-        'link_to'   => 'require|max:64|in:article,article_category,product,product_category,custom',
+        'link_to'   => 'require|max:64|in:article,article_category,product,product_category,system_page,custom',
         'link'      => 'max:255',
         'sort'      => 'integer',
         'blank'     => 'in:0,1',
@@ -47,7 +47,7 @@ class NavigationItemValidate extends Validate
         'icon.max'                  => '图标最多不能超过64个字符',
         'link_to.require'           => '链接类型不能为空',
         'link_to.max'               => '链接类型最多不能超过64个字符',
-        'link_to.in'                => '链接类型必须是article,goods_category,goods,custom中之一',
+        'link_to.in'                => '链接类型必须是article,article_category,product_category,product,system_page,custom中之一',
         'link.max'                  => '链接最多不能超过255个字符',
         'sort.integer'              => '排序必须为整数',
         'blank.in'                  => '是否新窗口打开只能是0或1',
@@ -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,custom',
+        '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,custom中之一',
+        '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

@@ -45,10 +45,25 @@ class DataMigration extends Command
             // $this->migrateProductAttr();
 
             // 迁移产品
-            $this->migrateProduct();
+            // $this->migrateProduct();
+
+            // $files = $this->getLocalImages('/var/www/html/orico-official-website/public/migrate_temp_images');
+            // print_r($files);
+            // foreach ($files as $file) {
+            //     unlink($file);
+            // }
+
+            // 迁移产品关联产品数据
+            // $this->migrateProductRelated();
+
+            // 迁移产品购买链接
+            // $this->migrateProductPurchaseLinks();
 
             // 迁移文章
             // $this->migrateArticle([
+            //     16 => 7,
+            //     31 => 9,
+            //     32 => 8,
             //     68 => 10,
             //     69 => 11,
             //     70 => 12,
@@ -122,6 +137,31 @@ class DataMigration extends Command
         }
     }
 
+    // 获取本地图片
+    private function getLocalImages($path)
+    {
+        $files = [];
+        $dir = dir($path);
+        while (false !== ($entry = $dir->read())) {
+            if ($entry == '.' || $entry == '..') {
+                continue;
+            }
+            $file = $path . '/' . $entry;
+            if (is_dir($file)) {
+                $files = array_merge($files, $this->getLocalImages($file));
+            } else {
+                $info = stat($file);
+                if ($info['size'] == 0) {
+                    $files[] = $file;
+                }
+                // if (!is_valid_image($file)) {
+                //     $files[] = $file;
+                // }
+            }
+        }
+        return $files;
+    }
+
     // 迁移tco产品分类
     private function productTcoCategory()
     {
@@ -168,18 +208,25 @@ class DataMigration extends Command
             ->select()
             ->toArray();
 
+        $tree = array_to_tree($category, 0, 'pid', 1);
         // 处理数据
-        $this->handlerProductCategory(array_to_tree($category, 0, 'pid', 1), $tco_category_map);
+        $this->handlerProductCategory($tree, $tco_category_map);
     }
-    private function handlerProductCategory($category, $map) {
+    private function handlerProductCategory($category, $map, $path = []) {
         foreach ($category as $val) {
             $key = sprintf("%s_%s", $val['id'], $val['country_code']);
+            if ($val['pid'] == 0) {
+                $path = [];
+            } else {
+                if (!in_array($val['pid'], $path)) $path[] = $val['pid'];
+            }
             $item = [
                 'id'                   => $val['id'],
                 'language_id'          => $val['country_code'] == 'ZH' ? 1 : 2,
                 'unique_id'            => uniqid('PRO_CATE_'),
                 'pid'                  => $val['pid'],
                 'name'                 => $val['name'],
+                'path'                 => implode(',', $path),
                 'icon'                 => $val['icon'],
                 'desc'                 => $val['description'],
                 'related_tco_category' => isset($map[$key]) ? implode(',', $map[$key]) : '',
@@ -189,7 +236,7 @@ class DataMigration extends Command
             ];
             Db::name('product_category')->insert($item);
             if (isset($val['children'])) {
-                $this->handlerProductCategory($val['children'], $map);
+                $this->handlerProductCategory($val['children'], $map, $path);
             }
         }
     }
@@ -245,15 +292,28 @@ class DataMigration extends Command
 
         $old_db = Db::connect('old');
 
+        $success_map = [];
+        $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('id', '=', 128)
             ->where('country_code', 'in', ['ZH', 'US'])
+            ->where('id', 'in', array_unique(array_column($arr, 'cod_product_id')))
             ->order(['id' => 'asc'])
             ->cursor();
 
+        $total = 0;
         $uploadMgr = new UploadMannager();
         foreach ($products as $v)
         {
+            $start = microtime(true);
+            if (isset($success_map['p_' . $v['id']])) {
+                continue;
+            }
+
             Db::startTrans();
             try {
                 // 处理封面图片
@@ -262,8 +322,10 @@ class DataMigration extends Command
                 if ($image_ret['code'] == 0) {
                     $image = $image_ret['data']['path'];
                 } else {
+                    if ($image_ret['code'] != 400) {
                         $image = $image_ret['msg'];
                     }
+                }
 
                 // 处理视频
                 $video = '';
@@ -271,8 +333,10 @@ class DataMigration extends Command
                 if ($video_ret['code'] == 0) {
                     $video = $video_ret['data']['path'];
                 } else {
+                    if ($video_ret['code'] != 400) {
                         $video = $video_ret['msg'];
                     }
+                }
 
                 // 处理详情中图片
                 $content = preg_replace_callback('/<img[^>]*src=[\'"]([^\'"]*?)[\'"][^>]*>/is', function($matches) use ($uploadMgr) {
@@ -287,11 +351,11 @@ class DataMigration extends Command
                         return '<img src="解析替换图片失败，请手动处理" alt="" />';
                     }
                     return '<img src="' . $file_path . '" alt="" />';
-                }, $v['ld_md_content']);
+                }, $v['ld_md_content']??'');
 
                 $item = [
                     'language_id'  => $v['country_code'] == 'ZH' ? 1 : 2,
-                    'category_id'  => '',
+                    'category_id'  => $v['cid'],
                     'spu'          => $v['brand_id'],
                     'name'         => $v['name'],
                     'short_name'   => $v['shortname'],
@@ -302,21 +366,31 @@ class DataMigration extends Command
                     'is_sale'      => $v['is_onsale'],
                     'is_new'       => $v['isnew'],
                     'is_hot'       => $v['ishot'],
-                    'is_show'      => $v['is_show'],
+                    'is_show'      => $v['is_show'] == 0 ? 1 : 0,
-                    'sort'         => $v['sort'],
+                    'sort'         => $v['sort'] == 9999 ? 0 : $v['sort'],
                     'detail'       => $content,
                     'status'       => $v['stat'] == -1 ? -1 : 1,
                     'seo_title'    => $v['seo_title'],
                     'seo_keywords' => $v['seo_keyword'],
                     'seo_desc'     => $v['seo_description'],
                     'created_at'   => date('Y-m-d H:i:s', $v['createtime']),
-                    'updated_at'   => date('Y-m-d H:i:s', $v['updatetime']),
+                    'updated_at'   => $v['updatetime'] == 0 ? date('Y-m-d H:i:s', $v['createtime']) : date('Y-m-d H:i:s', $v['updatetime']),
                     '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'])) {
                     $prarms = [];
                     $views  = unserialize($v['product_view']);
                     foreach ($views as $p) {
@@ -326,7 +400,22 @@ 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数据
                 $skus = [];
@@ -350,6 +439,7 @@ class DataMigration extends Command
                     if (!isset($images[$pkey])) {
                         $images[$pkey]        = [];
                         $images[$pkey]['sku'] = $im['sku'];
+                        $images[$pkey]['attrs'] = [];
                     }
 
                     // 处理图册
@@ -365,6 +455,10 @@ class DataMigration extends Command
                                     $photo_album[$pkey] = [];
                                 }
                                 $photo_album[$pkey][] = $photos_ret['data']['path'];
+                            } else {
+                                if ($photos_ret['code'] != 400) {
+                                    $photo_album[$pkey][] = json_encode($photos_ret);
+                                }
                             }
                         }
                     }
@@ -372,19 +466,22 @@ class DataMigration extends Command
                     // 处理属性
                     $attrs = json_decode($im['image_color'], true);
                     if (!empty($attrs)) {
-                        foreach ($attrs as $k => $at) {
+                        foreach ($attrs as $attr) {
+                            foreach ($attr as $k => $at) {
                                 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]['attrs'] = [
+                                    $images[$pkey]['color'] = $at;
+                                    $images[$pkey]['attrs'][] = [
                                         'attr_id'    => $attrs_map[$v['country_code']][$k],
                                         'attr_value' => $attr_value,
                                     ];
                                 }
                             }
+                        }
                     } else {
                         $attr_value = $im['image_color'];
                         if (empty($attr_value) || $attr_value == '[]') {
@@ -398,28 +495,29 @@ 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 (
-                            empty($images[$pkey]['attrs']) || 
+                            empty($images[$pkey]['attrs']) || !array_some($images[$pkey]['attrs'], function($k, $v) use($attr_arr) {
-                            (!empty($images[$pkey]['attrs']) && empty(array_intersect($images[$pkey]['attrs'], $attr_arr)))
+                                return $v == $attr_arr;
+                            })
                         ) {
-                            
                             $images[$pkey]['attrs'][] = $attr_arr;
-                            file_put_contents(runtime_path() . 'attrs.txt', json_encode($attr_arr));
                         }
                     }
                 }
+                if (!empty($photo_album)) {
                     foreach ($images as $key => $image) {
+                        if (isset($photo_album[$key])) {
                             $images[$key]['photo_album'] = $photo_album[$key];
                         }
-                file_put_contents(runtime_path() . 'images.txt', json_encode($images, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE));
+                    }
-                file_put_contents(runtime_path() . 'photo_album.txt', json_encode($photo_album, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE));
+                }
                 
                 $two_images = $old_db->name('product_two_img')
                     ->where('product_id', '=', $v['id'])
-                    ->where('country_code', '=', $v['country_code'])
+                    // ->where('country_code', '=', $v['country_code'])
                     ->where('stat', '=', 0)
                     ->order(['id' => 'asc'])
                     ->select();
@@ -428,60 +526,93 @@ class DataMigration extends Command
                     if (!empty($ti['image_color'])) {
                         $tpkey = md5($ti['image_color']);
                     }
-                    if (!empty($ti['image_url'])) {
+                    if (!empty($ti['image_url']) && $ti['image_url'] != '[]') {
                         $main_image_ret = $uploadMgr->upload($uploadMgr->download($ti['image_url']), 'image', 'product');
                         if ($main_image_ret['code'] == 0) {
                             $ti['image_url'] = $main_image_ret['data']['path'];
                         }
                     }
-                    $skus[] = ['main_image' => $ti['image_url'], 'image_color' => $ti['image_color'], 'pkey' => $tpkey];
+                    if (\think\helper\Str::endsWith($ti['image_color'], ['.png', '.jpg', 'jpeg', '.gif'])) {
+                        $arrt_ret = $uploadMgr->upload($uploadMgr->download($ti['image_color']), 'image', 'product');
+                        if ($arrt_ret['code'] == 0) {
+                            $ti['image_color'] = $arrt_ret['data']['path'];
                         }
+                    }
+                    $skus[] = [
+                        'main_image' => $ti['image_url'],
+                        'attrs' => [[
+                            'attr_id'    => $attrs_map[$v['country_code']][$v['country_code'] == 'ZH' ? '颜色' : 'Color'],
+                            'attr_value' => $ti['image_color'],
+                        ]],
+                        'pkey'      => $tpkey
+                    ];
+                }
+
                 if (!empty($skus)) {
                     $temp        = [];
+                    $temp_images = [];
                     foreach ($skus as $idx => $sku) {
-                        if (isset($images[$sku['pkey']])) {
                         $skus[$idx]['product_id']  = $id;
-                            $skus[$idx]['sku']         = $images[$sku['pkey']]['sku'];
+                        foreach ($images as $im) {
-                            $skus[$idx]['photo_album'] = $images[$sku['pkey']]['photo_album'];
+                            if (isset($im['color'])) {
+                                if (md5($im['color']) == $sku['pkey']) {
+                                    $skus[$idx]['sku'] = $im['sku']??null;
+                                    $skus[$idx]['photo_album'] = $im['photo_album']??null;
+                                    if (!empty($im['attrs'])) {
+                                        $skus[$idx]['attrs'] = $im['attrs'];
+                                    }
+                                    continue 2;
+                                }
+                            }
+                        }
+
+                        if (isset($images[$sku['pkey']])) {
+                            $skus[$idx]['sku']         = $images[$sku['pkey']]['sku']??null;
+                            $skus[$idx]['photo_album'] = $images[$sku['pkey']]['photo_album']??null;
+                            if (!empty($images[$sku['pkey']]['attrs'])) {
                                 $skus[$idx]['attrs'] = $images[$sku['pkey']]['attrs'];
+                            }
                         } else {
-                            if (!empty($images[$idx])) {
+                            if (empty($temp_images)) {
-                                $temp = $images[$idx];
+                                $temp_images = array_values($images);
+                            }
+                            if (!empty($temp_images[$idx])) {
+                                $temp = $temp_images[$idx];
                             }
                             if (!empty($temp)) {
-                                $skus[$idx]['product_id']  = $id;
+                                $skus[$idx]['sku']         = $temp['sku']??null;
-                                $skus[$idx]['sku']         = $temp['sku'];
+                                $skus[$idx]['photo_album'] = $temp['photo_album']??null;
-                                $skus[$idx]['photo_album'] = $temp['photo_album'];
+                                if (!empty($temp['attrs'])) {
                                     $skus[$idx]['attrs'] = $temp['attrs'];
                                 }
                             }
+                        }
                         unset($skus[$idx]['pkey']);
-                        unset($skus[$idx]['image_color']);
                     }
                 } else {
                     foreach ($images as $image) {
                         $skus[] = [
                             'product_id'  => $id,
-                            'sku'         => $image['sku'],
+                            'sku'         => $image['sku']??null,
                             'main_image'  => '',
-                            'photo_album' => $image['photo_album'],
+                            'photo_album' => $image['photo_album']??null,
                             'skus'        => $image['attrs']
                         ];
                     }
                 }
-                file_put_contents(runtime_path() . 'skus.txt', json_encode($skus, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE));
-                // throw new \Exception("exit;");
 
                 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'],
+                        'sku'         => $sku['sku']??'',
-                        'main_image'  => $sku['main_image'],
+                        'main_image'  => $sku['main_image']??'',
-                        'photo_album' => json_encode($sku['photo_album']),
+                        'photo_album' => !empty($sku['photo_album']) ? json_encode($sku['photo_album']) : null,
                     ]);
                     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'],
@@ -491,13 +622,21 @@ class DataMigration extends Command
                         }
                     }
                 }
+
                 Db::commit();
-                $this->println(sprintf('迁移产品ID：%s => %s', $v['id'], $id));
+                $total += 1;
+                file_put_contents(
+                    runtime_path() . 'product_success.txt',
+                    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'], $id, round(microtime(true) - $start, 2) . 's'));
             } catch (\Throwable $th) {
                 Db::rollback();
                 file_put_contents(
                     runtime_path() . 'product_throwable.txt', 
-                    sprintf('【%s】 产品【%s】，迁移失败，错误【%s:%d】' . PHP_EOL, date('Y-h-d H:i:s'), $v['id'], $th->getMessage(), $th->getLine())
+                    sprintf('【%s】 产品【%s】，迁移失败，错误【%s:%d】' . PHP_EOL, date('Y-h-d H:i:s'), $v['id'], $th->getMessage(), $th->getLine()),
+                    FILE_APPEND
                 );
                 file_put_contents(
                     runtime_path() . 'product_throwable_details.txt',
@@ -505,6 +644,74 @@ class DataMigration extends Command
                 );
             }
         }
+
+        $this->println(sprintf('迁移产品完成，共迁移 %s 条数据', $total));
+    }
+
+    // 迁移产品关联产品数据
+    private function migrateProductRelated()
+    {
+        $sources = include_once(runtime_path() . 'product_success.php');
+        $maps = [];
+        foreach ($sources as $so) {
+            $maps[$so['cod_product_id']] = $so;
+        }
+
+        $old_db = Db::connect('old');
+        $related = $old_db->name('product_related')
+            ->where('country_code', 'in', ['ZH', 'US'])
+            ->where('stat', '=', 0)
+            ->cursor();
+
+        $data = [];
+        foreach ($related as $rl) {
+            if (empty($maps[$rl['product_id']]) || empty($maps[$rl['related_product_id']])) {
+                continue;
+            }
+            $data[] = [
+                'product_id'         => $maps[$rl['product_id']]['ow_product_id'],
+                'related_product_id' => $maps[$rl['related_product_id']]['ow_product_id'],
+                'desc'               => empty($rl['related_desc']) ? null : $rl['related_desc'],
+                'sort'               => $rl['related_sort'] == 9999 ? 0 : $rl['related_sort']
+            ];
+        }
+        Db::name('product_related')->insertAll($data);
+    }
+
+    // 迁移产品购买链接
+    private function migrateProductPurchaseLinks()
+    {
+        $platform_maps = [
+            1 => 2,
+            2 => 1,
+            3 => 3,
+            4 => 4
+        ];
+
+        $sources = include_once(runtime_path() . 'product_success.php');
+        $maps = [];
+        foreach ($sources as $so) {
+            $maps[$so['cod_product_id']] = $so;
+        }
+
+        $old_db = Db::connect('old');
+        $links = $old_db->name('product_purchase_links')
+            ->where('country_code', 'in', ['ZH', 'US'])
+            ->where('link', '<>', '')
+            ->cursor();
+
+        foreach ($links as $link) {
+            if (empty($maps[$link['product_id']])) {
+                continue;
+            }
+            $item = [
+                'language_id' => $link['country_code'] == 'ZH' ? 1 : 2,
+                'product_id'  => $maps[$link['product_id']]['ow_product_id'],
+                'platform_id' => $platform_maps[$link['platform_id']],
+                'link'        => $link['link']
+            ];
+            Db::name('product_purchase_link')->insert($item);
+        }
     }
 
     // 迁移文章
@@ -516,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();
 
@@ -567,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));
         }
@@ -601,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);
+            }
         }
     }
 
@@ -703,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();
@@ -743,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']);
         }
     }
@@ -751,18 +988,20 @@ 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';
     private $password          = 'Aa-1221';
     private $token             = '';
     private $retrys            = [];
+    private $maps              = [];
 
     public function __construct()
     {
         // 登录获取token
         $this->token = $this->getAuthorization();
+        $this->maps = []; // include_once(runtime_path() . 'fiber_product_image_mapping.php');
     }
 
     // 下载图片
@@ -805,21 +1044,14 @@ class UploadMannager
         
         $file_path = self::DOWNLOAD_TEMP_PATH . $file_name;
         if (file_exists($file_path)) {
+            if (!is_valid_image($file_path)) {
+                return '';
+            }
             return $file_path;
         }
 
-        // 使用file_get_contents下载
-        // $opts = [
-        //     'http' => [
-        //         'method' => 'GET',
-        //         'header' => 'User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64)'
-        //     ]
-        // ];
-        // $context = stream_context_create($opts);
-        // $file    = file_get_contents($url, false, $context);
-
         // 使用curl下载
-        $file = $this->file_get_withcurl($url);
+        $file = file_get_withcurl($url);
         $dir  = dirname($file_path);
         if (!is_dir($dir)) {
             mkdir($dir, 0777, true);
@@ -828,34 +1060,17 @@ class UploadMannager
         return $file_path;
     }
 
-    // 使用curl下载图片
-    private function file_get_withcurl($url)
-    {
-        $ch = curl_init($url);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-        curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10); // 连接超时 10 秒
-        curl_setopt($ch, CURLOPT_TIMEOUT, 30);        // 传输超时 30 秒
-        curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); // 跟随重定向
-        curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0'); // 模拟浏览器 UA
-
-        $data = curl_exec($ch);
-        if ($data === false) {
-            error_log(sprintf('cURL Error: %s; URL: %s', curl_error($ch), $url));
-            return false;
-        }
-        curl_close($ch);
-
-        return $data;
-    }
-
     // 上传图片
     public function upload($file_path, $field_name, $module = 'unknown') {
         if (empty($file_path)) {
-            return ['code' => 0, 'msg' => 'file_path为空', 'data' => ['path' => '']];
+            return ['code' => 400, 'msg' => 'file_path为空', 'data' => ['path' => '']];
         }
         if (\think\helper\Str::startsWith($file_path, 'http')) {
             return ['code' => 0, 'msg' => 'file_path为http', 'data' => ['path' => $file_path]];
         }
+        if (isset($this->maps[$file_path])) {
+            return ['code' => 0, 'msg' => '成功', 'data' => ['path' => $this->maps[$file_path]]];
+        }
 
         switch($field_name){
             case 'image': 
@@ -906,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);
@@ -939,3 +1155,48 @@ class UploadMannager
         return $result['data']['token'];
     }
 }
+
+// 使用curl下载图片
+function file_get_withcurl($url)
+{
+    $ch = curl_init($url);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+    curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10); // 连接超时 10 秒
+    curl_setopt($ch, CURLOPT_TIMEOUT, 60);        // 传输超时 30 秒
+    curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); // 跟随重定向
+    curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0'); // 模拟浏览器 UA
+
+    $data = curl_exec($ch);
+    if ($data === false) {
+        file_put_contents(runtime_path() . 'file_get_withcurl.txt', sprintf('cURL Error: %s; URL: %s' . PHP_EOL, curl_error($ch), $url), FILE_APPEND);
+        return false;
+    }
+    curl_close($ch);
+
+    return $data;
+}
+
+// 检查图片是否有效
+function is_valid_image($filepath) 
+{
+    try {
+        $image_size = getimagesize($filepath);
+        if ($image_size === false) {
+            return false;
+        }
+        [$width, $height] = $image_size;
+        return $width > 0 && $height > 0;
+    } catch (\Throwable $e) {
+        return false;
+    }
+}
+
+// 根据自定义函数检查数组
+function array_some($array, callable $ca): bool
+{
+    foreach ($array as $k => $v) {
+        if ($ca($k, $v)) return true;
+    }
+
+    return false;
+}

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;
                 }
@@ -103,3 +103,132 @@ if (!function_exists('array_to_tree')) {
         return $ret;
     }
 }
+
+if (!function_exists('array_flatten')) {
+    /**
+     * 将多维数组转换为一维数组
+     * @param array $array
+     * @return array
+     */
+    function array_flatten(array $array, int $depth = 1): array
+    {
+        return \think\helper\Arr::flatten($array, $depth);
+    }
+}
+
+if (!function_exists('thumb')) {
+    /**
+     * 获取缩略图
+     * @param string $url 图片地址
+     * @return string
+     */
+    function thumb(?string $url): string
+    {
+        if (empty($url)) {
+            return '';
+        }
+        if (
+            str_contains($url, '_thumb') || 
+            \think\helper\Str::startsWith($url, ['http://', 'https://']) ||
+            !\think\helper\Str::endsWith($url, ['.png', '.jpg', '.jpeg', '.gif', '.tif', '.svg', '.webp', '.bmp'])
+        ) {
+            return $url;
+        }
+
+        $idx = mb_strripos($url, '.', 0, 'utf-8');
+        if ($idx === false) {
+            return $url;
+        }
+
+        $len = mb_strlen($url, 'utf-8');
+
+        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/ProductSkuBaseModel.php

@@ -21,7 +21,7 @@ class ProductSkuBaseModel extends BaseModel
         'product_id'  => 'int',
         'sku'         => 'string',
         'main_image'  => 'string',
-        'photo_album' => 'string',
+        'photo_album' => 'json',
         'sort'        => 'int',
         'created_at'  => 'datetime',
         'updated_at'  => 'datetime'

app/common/model/ProductTcoCategoryBaseModel.php

@@ -25,6 +25,7 @@ class ProductTcoCategoryBaseModel extends BaseModel
         'tco_path'    => 'string',
         'erp_id'      => 'int',
         'erp_pid'     => 'int',
+        'erp_code'    => 'string',
         'erp_path'    => 'string',
         'disabled'    => 'int',
         'sync_time'   => 'int',

app/common/model/SysBannerItemBaseModel.php

@@ -21,10 +21,13 @@ class SysBannerItemBaseModel extends BaseModel
         'banner_id'             => 'int',
         'title'                 => 'string',
         'title_txt_color'       => 'string',
+        'short_title'           => 'string',
+        'short_title_txt_color' => 'string',
         'desc'                  => 'string',
         'desc_txt_color'        => 'string',
-        'type'            => 'int',
+        'type'                  => 'string',
         'image'                 => 'string',
+        'extra_image'           => 'string',
         'video'                 => 'string',
         'link_to'               => 'string',
         'link'                  => 'string',

app/common/model/SysConfigGroupBaseModel.php

@@ -19,6 +19,7 @@ class SysConfigGroupBaseModel extends BaseModel
     protected $schema = [
         'id'           => 'int',
         'language_id'  => 'int',
+        'unique_label' => 'string',
         'name'         => 'string',
         'sort'         => 'int',
         'status'       => 'int',

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

@@ -1,6 +1,8 @@
 <?php
 // 这是系统自动生成的公共文件
 
+use think\facade\Lang;
+
 if (!function_exists('str_contains')) {
     /**
      * 检查字符串是否包含子字符串
@@ -69,38 +71,7 @@ if (!function_exists('style')) {
     }
 }
 
-if (!function_exists('thumb')) {
+if (!function_exists('get_path_from_img_tag')) {
-    /**
-     * 获取缩略图
-     * @param string $url 图片地址
-     * @return string
-     */
-    function thumb(string $url): string
-    {
-        if (empty($url)) {
-            return '';
-        }
-        if (
-            str_contains($url, '_thumb') || 
-            \think\helper\Str::startsWith($url, ['http://', 'https://']) ||
-            !\think\helper\Str::endsWith($url, ['.png', '.jpg', '.jpeg', '.gif', '.tif', '.svg', '.webp', '.bmp'])
-        ) {
-            return $url;
-        }
-
-        $idx = mb_strripos($url, '.', 0, 'utf-8');
-        if ($idx === false) {
-            return $url;
-        }
-
-        $len = mb_strlen($url, 'utf-8');
-
-        return mb_substr($url, 0, $idx, 'utf-8') . '_thumb' . mb_substr($url, $idx, $len - $idx, 'utf-8');
-    }
-}
-
-if (!function_exists('get_path_from_img_tag'))
-{
     /**
      * 从img标签中获取图片路径
      * @param string $img
@@ -116,3 +87,157 @@ if (!function_exists('get_path_from_img_tag'))
         return '';
     }
 }
+
+if (!function_exists('lang_i18n')) {
+    /**
+     * 获取国际化语言包
+     * 根据请求页面path获取分组语言对应值
+     * 
+     * @param string $name 语言包名称
+     * @param array $vars 替换变量
+     * @param string $lang 语言标识
+     * @return string
+     */
+    function lang_i18n(string $name, array $vars = [], string $lang = ''): string 
+    {
+        if (is_null($name)) {
+            return '';
+        }
+        $path      = strtolower(request()->controller() . '/' . request()->action());
+        $lang_key  = "{$path}.{$name}";
+        if (!Lang::has($lang_key, $lang)) {
+            return Lang::get($name, $vars, $lang);
+        }
+        return Lang::get($lang_key, $vars, $lang);
+    }
+}
+
+if (!function_exists('date_format_i18n')) {
+    /**
+     * 格式化日期时间为指定语言
+     * @param int|string $datetime 要格式化的日期时间字符串
+     * @param string $lang 语言标识
+     * @param bool $keep_time 是否保留时间
+     * @return string
+     */
+    function date_format_i18n(int|string|null $datetime, string $lang = '', bool $keep_time = false): string
+    {
+        // 处理语言标识，若未提供则使用当前语言设置，并转换为小写
+        $lang = $lang ?: Lang::getLangSet();
+        $lang = strtolower($lang);
+
+        // 处理日期时间输入
+        if (is_numeric($datetime)) {
+            // 若输入为数字，直接作为时间戳处理
+            $timestamp = (int)$datetime;
+        } elseif (is_string($datetime)) {
+            // 尝试将字符串转换为时间戳
+            $timestamp = strtotime($datetime);
+            if ($timestamp === false) {
+                return '';
+            }
+        } else {
+            return '';
+        }
+
+        // 根据$datetime传值决定格式
+        $date_parts = [];
+        if (is_numeric($datetime)) {
+            $date_str = date('Y-m-d', $timestamp);
+            $date_parts = explode('-', $date_str);
+        } elseif (is_string($datetime)) {
+            if (preg_match('/^\d{4}$/', $datetime)) {
+                $date_parts = [$datetime];
+            } elseif (preg_match('/^\d{4}-\d{1,2}$/', $datetime)) {
+                $date_parts = explode('-', $datetime);
+            } elseif (preg_match('/^\d{4}-\d{1,2}-\d{1,2}(.{1,9})?$/', $datetime)) {
+                $date_parts = explode('-', $datetime);
+            }
+        }
+
+        // 定义默认格式
+        $fmt = '';
+
+        // 根据语言和日期部分数量设置日期格式
+        $format = [
+            'zh-cn'   => [0 => '', 1 => 'Y', 2 => 'Y-m', 3 => 'Y-m-d'],
+            'en-us'   => [0 => '', 1 => 'Y', 2 => 'F Y', 3 => 'F j, Y'],
+            'default' => [0 => '', 1 => 'Y', 2 => 'Y-m', 3 => 'Y-m-d']
+        ];
+        $fmt = $format[$lang][count($date_parts)] ?? $format['default'][count($date_parts)];
+
+        // 若需要保留时间
+        if ($keep_time) {
+            if ($lang === 'en-us') {
+                $fmt .= ', g:i A';
+            } else {
+                $fmt .= ' H:i:s';
+            }
+        }
+
+        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

@@ -0,0 +1,32 @@
+<?php
+// +----------------------------------------------------------------------
+// | 多语言设置
+// +----------------------------------------------------------------------
+
+return [
+    // 默认语言
+    'default_lang'    => env('DEFAULT_LANG', 'zh-cn'),
+    // 允许的语言列表
+    'allow_lang_list' => ['zh-cn', 'en-us'],
+    // 多语言自动侦测变量名
+    'detect_var'      => 'lang',
+    // 是否使用Cookie记录
+    'use_cookie'      => true,
+    // 多语言cookie变量
+    'cookie_var'      => 'think_lang',
+    // 多语言header变量
+    'header_var'      => 'think-lang',
+    // 扩展语言包
+    'extend_list'     => [
+        'en-us' => [
+            app()->getAppPath() . '/lang/en-us/' . get_platform() . '.php',
+            app()->getAppPath() . '/lang/en-us/validate.php',
+        ],
+    ],
+    // Accept-Language转义为对应语言包名称
+    'accept_language' => [
+        'zh-hans-cn' => 'zh-cn',
+    ],
+    // 是否支持语言分组
+    'allow_group'     => true,
+];

app/index/config/view.php

@@ -3,13 +3,15 @@
 // | 模板设置
 // +----------------------------------------------------------------------
 
+$view_device_name = get_platform();
+
 return [
     // 模板引擎类型使用Think
     'type'          => 'Think',
     // 默认模板渲染规则 1 解析为小写+下划线 2 全部转换小写 3 保持操作方法
     'auto_rule'     => 1,
     // 模板目录名
-    'view_dir_name' => 'view',
+    'view_dir_name' => "view/{$view_device_name}",
     // 模板后缀
     'view_suffix'   => 'html',
     // 模板文件名分隔符
@@ -24,8 +26,8 @@ return [
     'taglib_end'    => '}',
     // 模板输出替换
     'tpl_replace_string' =>  [
-        '__CSS__'    => '/static/index/css',
+        '__CSS__'    => "/static/index/{$view_device_name}/css",
-        '__JS__'     => '/static/index/js',
+        '__JS__'     => "/static/index/{$view_device_name}/js",
-        '__IMAGES__' => '/static/index/images',
+        '__IMAGES__' => "/static/index/{$view_device_name}/images",
     ]
 ];

app/index/controller/AboutUs.php

@@ -27,6 +27,7 @@ class AboutUs extends Common
                     ->where('status', '=', 1)
                     ->order(['sort' => 'asc', 'id' => 'desc']);
             }])
+            ->atPlatform(request()->from)
             ->uniqueLabel([
                 "BANNER_680744b1d0000",
                 "BANNER_680744e7cacb3",
@@ -62,7 +63,8 @@ class AboutUs extends Common
         // 获取品牌故事banner
         $banners = SysBannerItemModel::hasWhere('banner', [
                 'language_id'  => $this->lang_id,
-                'unique_label' => 'BANNER_67ff632a5f7aa'
+                'unique_label' => 'BANNER_67ff632a5f7aa',
+                'at_platform'  => request()->from,
             ])
             ->type('image')
             ->enabled(true)
@@ -87,6 +89,7 @@ class AboutUs extends Common
         $banner = SysBannerModel::with(['items' => function($query) {
                 $query->where('status', '=', 1)->order(['sort' => 'asc', 'id' => 'desc']);
             }])
+            ->atPlatform(request()->from)
             ->uniqueLabel([
                 'BANNER_67ff786dc9c8d',
                 'BANNER_67ff7ef1354cf',
@@ -124,6 +127,7 @@ class AboutUs extends Common
                     ->where('status', '=', 1)
                     ->order(['sort' => 'asc', 'id' => 'desc']);
             }])
+            ->atPlatform(request()->from)
             ->uniqueLabel([
                 "BANNER_68075a636e648",
                 "BANNER_68075bf4dd0f5",
@@ -157,6 +161,7 @@ class AboutUs extends Common
                     ->where('status', '=', 1)
                     ->order(['sort' => 'asc', 'id' => 'desc']);
             }])
+            ->atPlatform(request()->from)
             ->uniqueLabel([
                 "BANNER_6806f5f19c3d6",
                 "BANNER_6806f609b9fe9",

app/index/controller/Article.php

@@ -32,10 +32,12 @@ class Article extends Common
         // 获取banner焦点图
         $banner = SysBannerItemModel::hasWhere('banner', [
                 'language_id'  => $this->lang_id,
-                'unique_label' => 'BANNER_67f9fc71e27db'
+                'unique_label' => 'BANNER_67f9fc71e27db',
+                'at_platform'  => request()->from
             ])
             ->type('image')
             ->visible(['id', 'title', 'image', 'link'])
+            ->enabled()
             ->find();
         View::assign('banner', $banner);
 
@@ -58,15 +60,19 @@ class Article extends Common
                     'id',
                     'title',
                     'desc',
-                    'image'
+                    'image',
+                    'release_time'
                 ])
                 ->withSearch(['title'], ['title' => $param['keywords']??null])
                 ->category($param['cid']??$categorys[0]['id'])
-                ->where('release_time', '<=', date('Y-m-d H:i:s'))
                 ->order(['sort' => 'asc', 'release_time' => 'desc', 'id' => 'desc'])
                 ->paginate([
                     'list_rows' => $param['size'],
                     'page'      => $param['page'],
+                    'query'     => request()->param([
+                        'cid',
+                        'keywords',
+                    ]) // 保留查询参数，防止分页丢失
                 ]);
         }
         View::assign('articles', $articles??[]);
@@ -93,7 +99,25 @@ class Article extends Common
         $share_config = $this->getSysConfig($this->lang_id, ['article_share']);
         View::assign('share_config', $share_config['article_share']);
 
+        // 获取文章评论数据
+        $comments = ArticleLeaveMessageModel::field([
+                'id',
+                'name',
+                'email',
+                'content',
+                'created_at'
+            ])
+            ->article($id)
+            ->audited(true)
+            ->order(['id' => 'desc'])
+            ->limit(5)
+            ->select();
+        View::assign('comments', $comments);
+
         // 获取倒序或发布时间倒序3篇文章做为推荐文章
+        $category_model = new ArticleCategoryModel;
+        $parent_id      = $category_model->bypk($detail['category_id'])->value('pid');
+        $categorys      = $category_model->child($parent_id)->column('id');
         $recommends     = ArticleModel::field([
                 'id',
                 'title',
@@ -101,6 +125,8 @@ class Article extends Common
                 'image'
             ])
             ->where('id', '<>', $id)
+            ->language($this->lang_id)
+            ->category($categorys)
             ->order(['release_time' => 'desc', 'id' => 'desc'])
             ->limit(3)
             ->select();
@@ -123,12 +149,14 @@ class Article extends Common
 
         // 验证字段
         $validate = Validate::rule([
-            'name' => 'max:64',
+            'name'  => 'require|max:64',
-            'email' => 'email'
+            'email' => 'require|email'
         ])
         ->message([
-            'name.max' => '姓名不能超过64个字符',
+            'name.require'  => '姓名不能为空',
-            'email'    => '请输入正确的邮箱'
+            'name.max'      => '姓名不能超过:rule个字符',
+            'email.require' => '邮箱不能为空',
+            'email.email'   => '邮箱格式不正确'
         ]);
         if (!$validate->check($post)) {
             return error($validate->getError());
@@ -142,9 +170,9 @@ class Article extends Common
         ]);
         $ret = ArticleLeaveMessageModel::create($data);
         if ($ret->isEmpty()) {
-            return error('留言提交失败');
+            return error(lang('信息提交失败！'));
         }
 
-        return success('留言提交成功');
+        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']??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()) {
@@ -121,6 +122,7 @@ abstract class Common extends BaseController
         $products = ProductModel::field([
                 'id',
                 'name',
+                'short_name',
                 'cover_image',
             ])
             ->language($language)

app/index/controller/ContactUs.php

@@ -34,6 +34,7 @@ class ContactUs extends Common
                     ->where('status', '=', 1)
                     ->order(['sort' => 'asc', 'id' => 'desc']);
             }])
+            ->atPlatform(request()->from)
             ->uniqueLabel(['BANNER_6805e3d32dcc2', 'BANNER_6806090c1838f'])
             ->language($this->lang_id)
             ->enabled(true)
@@ -44,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;
-            })->chunk(4)->toArray();
         }
         View::assign('focus_image', $focus_image);
         View::assign('info_datas', $info_datas);
@@ -88,10 +82,10 @@ class ContactUs extends Common
                 'user_agent'  => request()->header('user-agent'),
             ]);
             if ($msg->isEmpty()) {
-                return error(lang('contact_message.send_fail'));
+                return error(lang('信息提交失败！'));
             }
 
-            return success(lang('contact_message.send_success'));
+            return success(lang('信息已成功提交！'));
         }
 
         $focus_image     = [];
@@ -102,6 +96,7 @@ class ContactUs extends Common
                     ->where('status', '=', 1)
                     ->order(['sort' => 'asc', 'id' => 'desc']);
             }])
+            ->atPlatform(request()->from)
             ->uniqueLabel([
                 'BANNER_6801be1e7d686',
                 'BANNER_6801c053ce12e',
@@ -134,6 +129,7 @@ class ContactUs extends Common
                 'corp_name',
                 'email',
                 'phone',
+                'website_url',
                 'business_type',
                 'enterprise_size',
                 'address',
@@ -153,7 +149,7 @@ class ContactUs extends Common
                'email'           => $form_data['email'],
                'phone'           => $form_data['phone'],
                'referer_url'     => request()->header('referer'),
-               'website_url'     => request()->header('host'),
+               'website_url'     => $form_data['website_url'],
                'business_type'   => $form_data['business_type'],
                'enterprise_size' => $form_data['enterprise_size'],
                'address'         => $form_data['address'],
@@ -161,9 +157,9 @@ class ContactUs extends Common
                'ip'              => request()->ip(),
             ]);
             if ($ret->isEmpty()) {
-                return error(lang('contact_distributor.send_fail'));
+                return error(lang('信息提交失败！'));
             }
-            return success(lang('contact_distributor.send_success'));
+            return success(lang('信息已成功提交！'));
         }
 
         // 获取企业规模
@@ -210,16 +206,16 @@ class ContactUs extends Common
                 'last_name'   => $form_data['last_name'],
                 'email'       => $form_data['email'],
                 'phone'       => $form_data['phone'],
-                'interested'  => $form_data['interested'],
+                'interested'  => is_array($form_data['interested']) ? implode(',', $form_data['interested']) : $form_data['interested'],
                 'referer_url' => request()->header('referer'),
                 'website_url' => request()->header('host'),
                 'message'     => $form_data['message'],
                 'ip'          => request()->ip(),
             ]);
             if ($ret->isEmpty()) {
-                return error(lang('contact_bulkbuy.send_fail'));
+                return error(lang('信息提交失败！'));
             }
-            return success(lang('contact_bulkbuy.send_success'));
+            return success(lang('信息已成功提交！'));
         }
 
         // 获取可选产品品类配置
@@ -229,7 +225,7 @@ class ContactUs extends Common
             ->byName('bulk_purchase_inquiry_interested')
             ->find();
         if (empty($config)) {
-            return error('当前选定语言的采购可选品类配置出错');
+            return error(lang('当前选定语言的采购可选品类配置出错'));
         }
         View::assign('interested', explode(',', preg_replace('/\r?\n/', ',', $config->value)));
 

app/index/controller/Faq.php

@@ -25,9 +25,11 @@ class Faq extends Common
         // 获取banner焦点图
         $banner = SysBannerItemModel::hasWhere('banner', [
                 'language_id'  => $this->lang_id,
-                'unique_label' => 'BANNER_67fa37f30e151'
+                'unique_label' => 'BANNER_67fa37f30e151',
+                'at_platform'  => request()->from
             ])
             ->type('image')
+            ->enabled()
             ->visible(['id', 'title', 'image', 'link'])
             ->find();
         View::assign('banner', $banner);

app/index/controller/Index.php

@@ -26,7 +26,14 @@ class Index extends Common
         View::assign('featured_topics', $banner['featured_topics']);
         View::assign('video', array_shift($banner['video']));
         View::assign('scenes', $banner['scenes']);
-        View::assign('brand_story', $banner['brand_story']);
+        View::assign('brand_story', array_map(function($item) {
+            $item['year'] = '';
+            $arr = explode('-', $item['title']);
+            if (count($arr) > 1) {
+                $item['year'] = $arr[0];
+            }
+            return $item;
+        }, $banner['brand_story']??null));
         View::assign('data_statistics', $banner['data_statistics']);
 
         // 获取明星产品/热点产品
@@ -45,8 +52,9 @@ class Index extends Common
     private function getBannerData()
     {
         $banners = SysBannerModel::with(['items' => function($query) {
-                $query->where('type', '=', 'image')->where('status', '=', 1)->order(['sort' => 'asc', 'id' => 'desc']);
+                $query->where('type', 'IN', ['image', 'video'])->where('status', '=', 1)->order(['sort' => 'asc', 'id' => 'desc']);
             }])
+            ->atPlatform(request()->from)
             ->uniqueLabel([
                 'BANNER_67f61cd70e8e1',
                 'BANNER_67f633023a5b3',

app/index/controller/Product.php

@@ -13,6 +13,7 @@ use app\index\model\ProductRelatedModel;
 use app\index\model\ProductSkuAttrModel;
 use app\index\model\ProductSkuModel;
 use app\index\model\SysBannerModel;
+use app\index\model\SysBannerProdCateMappingModel;
 use app\index\validate\ProductInquiryValidate;
 use think\facade\View;
 use think\helper\Arr;
@@ -22,24 +23,29 @@ use think\helper\Arr;
  */
 class Product extends Common
 {
-    // 产品分类
+    // 获取分类页的banner图焦点横幅
-    public function category()
+    private function getCategoryBanner($category_id)
     {
-        // 参数
-        $param = request()->param(['id']);
-
         $focus_image = [];
         // 获取产品分类页焦点横幅
-        $banner = SysBannerModel::with(['items' => function($query) {
+        $banner = SysBannerModel::with(['items' => function($query) use($category_id) {
                 $query->withoutField([
                         'status',
                         'created_at',
                         'updated_at',
                         'deleted_at'
                     ])
+                    ->whereExists(function($q) use($category_id) {
+                        $r = $q->getModel()->getTable();
+                        $m = new SysBannerProdCateMappingModel;
+                        $q->model($m)->name($m->getName())
+                            ->where("banner_item_id = $r.id")
+                            ->where('product_category_id' , '=', $category_id);
+                    })
                     ->where('status', '=', 1)
                     ->order(['sort' => 'asc', 'id' => 'desc']);
             }])
+            ->atPlatform(request()->from)
             ->uniqueLabel(['BANNER_6808abd813d78'])
             ->language($this->lang_id)
             ->enabled(true)
@@ -51,7 +57,109 @@ class Product extends Common
             }
             $focus_image = data_get($banner_map, 'BANNER_6808abd813d78')?->items->toArray();
         }
-        View::assign('focus_image', $focus_image);
+        return $focus_image;
+    }
+    // 产品分类 - 查看顶层分类
+    public function category()
+    {
+        // 参数
+        $param = request()->param(['id']);
+
+        // 获取产品分类页焦点横幅
+        View::assign('focus_image', $this->getCategoryBanner($param['id']));
+
+        // 获取分类及产品信息
+        $categorys_data = ProductCategoryModel::field(['id', 'pid', 'name', 'path', 'level'])
+            ->language($this->lang_id)
+            ->displayed(true)
+            ->children($param['id'])
+            ->order(['pid' => 'asc', 'sort' => 'asc', 'id' => 'desc'])
+            ->select()
+            ->toArray();
+
+        $list = [];
+        if (!empty($categorys_data)) {
+            // 分组分类
+            $list = array_filter($categorys_data, fn($it) => $it['level'] == 2);
+            foreach ($list as &$it) {
+                $it['children'] = array_column(array_filter($categorys_data, fn($v) => in_array($it['id'], explode(',', $v['path']))), 'id');
+            }
+            unset($it);
+
+            // 获取分类下的产品信息
+            if (!empty($list)) {
+                $product_model = new ProductModel;
+                $sql           = $product_model->field([
+                        'id',
+                        'category_id',
+                        'spu',
+                        'name',
+                        'cover_image',
+                        'is_new',
+                        '(' . $list[0]['id'] . ')' => 'group_mark'
+                    ])
+                    ->byCategory(data_get($list[0], 'children'))
+                    ->language($this->lang_id)
+                    ->enabled(true)
+                    ->onSale(true)
+                    ->onShelves(true)
+                    ->append(['p' => $list[0]['id']])
+                    ->order(['sort' => 'asc', 'created_at' => 'desc', 'id' => 'desc'])
+                    ->limit(5)
+                    ->buildSql();
+                $query = \think\facade\Db::table("($sql) as a");
+                foreach ($list as $it) {
+                    $query = $query->union(function($query) use($product_model, $it) {
+                        $query->model($product_model)
+                        ->name($product_model->getName())
+                        ->field([
+                            'id',
+                            'category_id',
+                            'spu',
+                            'name',
+                            'cover_image',
+                            'is_new',
+                            '(' . $it['id'] . ')' => 'group_mark'
+                        ])
+                        ->byCategory($it['children'])
+                        ->language($this->lang_id)
+                        ->enabled(true)
+                        ->onSale(true)
+                        ->onShelves(true)
+                        ->order(['sort' => 'asc', 'created_at' => 'desc', 'id' => 'desc'])
+                        ->limit(5);
+                    });
+                }
+                $pros = $query->select();
+                if (!empty($pros)) {
+                    $pros_map = [];
+                    foreach ($pros as $pro) {
+                        $pros_map[$pro['group_mark']][] = $pro;
+                    }
+                    foreach ($list as $k => &$it) {
+                        unset($it['children']);
+                        if (!isset($pros_map[$it['id']])) {
+                            unset($list[$k]);
+                            continue;
+                        }
+                        $it['products'] = $pros_map[$it['id']];
+                    }
+                    unset($it);
+                }
+            }
+        }
+        View::assign('list', $list);
+        
+        return View::fetch('category');
+    }
+    // 产品分类 - 查看子类
+    public function subcategory()
+    {
+        // 参数
+        $param = request()->param(['id']);
+
+        // 获取产品分类页焦点横幅
+        View::assign('focus_image', $this->getCategoryBanner($param['id']));
 
         // 获取分类及产品信息
         $categorys_data = ProductCategoryModel::field(['id', 'name', 'level'])
@@ -60,6 +168,7 @@ class Product extends Common
             ->child($param['id'], true)
             ->order(['sort' => 'asc', 'id' => 'desc'])
             ->select();
+
         if (!$categorys_data->isEmpty()) {
             if ($categorys_data->count() > 1) {
                 // 当分类数不只一个时，当前分类下有子分类，移除当前分类，只输出子分类
@@ -83,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信息
@@ -122,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;
                                 }
                             }
@@ -145,13 +254,61 @@ class Product extends Common
                     ];
                 }
                 foreach ($categorys_data as $k => $v) {
-                    $categorys_data[$k]['products'] = $products_map[$v['id']] ?? [];
+                    if (!isset($products_map[$v['id']])) {
+                        unset($categorys_data[$k]);
+                        continue;
+                    }
+                    $categorys_data[$k]['products'] = $products_map[$v['id']];
                 }
             }
         }
         View::assign('categorys_data', $categorys_data);
 
-        return View::fetch('category');
+        return View::fetch('subcategory');
+    }
+
+    /**
+     * 产品搜索
+     */
+    public function search()
+    {
+        $param = request()->param([
+            'keywords',
+            'page/d' => 1,
+            'size/d' => 10
+        ]);
+        $keywords = !empty($param['keywords']) ? trim($param['keywords']) : '';
+
+        // 关键词搜索
+        $products = ProductModel::field([
+                'id',
+                'name',
+                'short_name',
+                'cover_image',
+                'spu'
+            ])
+            ->where(fn ($query) => $query->withSearch(['keywords'], ['keywords' => $keywords]))
+            ->language($this->lang_id)
+            ->enabled(true)
+            ->onSale(true)
+            ->onShelves(true)
+            ->order(['sort' => 'asc', 'id' => 'desc'])
+            ->paginate([
+                'list_rows' => $param['size'],
+                'page'      => $param['page'],
+                'query'     => request()->param()
+            ])
+            ->each(function ($item) use($keywords) {
+                $replace            = fn($txt) => '<strong class="redpoint">' . $txt . '</strong>';
+                $item['spu']        = highlight_keywords($item['spu'], $keywords, $replace);
+                $item['name']       = highlight_keywords($item['name'], $keywords, $replace);
+                $item['short_name'] = highlight_keywords($item['short_name'], $keywords, $replace);
+                return $item;
+            });
+        View::assign('products', $products);
+        View::assign('page', $products->render());
+
+        return View::fetch('search');
     }
 
     /**
@@ -217,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'];
@@ -237,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) {
@@ -301,9 +463,9 @@ class Product extends Common
             'message'      => $post['message'],
         ]);
         if ($ret->isEmpty()) {
-            return error(lang('product_detail.send_fail'));
+            return error(lang('提交失败'));
         }
-        return success(lang('product_detail.send_success'));
+        return success(lang('提交成功'));
     }
 
     /**
@@ -323,6 +485,7 @@ class Product extends Common
                     ->where('status', '=', 1)
                     ->order(['sort' => 'asc', 'id' => 'desc']);
             }])
+            ->atPlatform(request()->from)
             ->uniqueLabel(['BANNER_680dd7ceaa529'])
             ->language($this->lang_id)
             ->enabled(true)
@@ -334,7 +497,7 @@ class Product extends Common
 
         $newpros = [];
         // 获取新品上市产品
-        $products = ProductModel::field(['id', 'category_id', 'name', 'spu', 'cover_image'])
+        $products = ProductModel::field(['id', 'category_id', 'name', 'spu', 'cover_image', 'is_new'])
             ->language($this->lang_id)
             ->enabled(true)
             ->onSale(true)
@@ -343,24 +506,45 @@ class Product extends Common
             ->order(['sort' => 'asc', 'id' => 'desc'])
             ->select();
         if (!$products->isEmpty()) {
-            // 按分类分组产品
-            $products_map = [];
-            foreach ($products as $product) {
-                $products_map[$product['category_id']][] = $product;
-            }
             // 获取产品分类信息
-            $categorys = ProductCategoryModel::field(['id', 'name'])
+            $categorys = ProductCategoryModel::field(['id', 'name', 'path', 'level'])
-                ->byPks(array_keys($products_map))
+                ->where(function($query) use($products) {
+                    $query->where('id', 'IN', Arr::pluck($products, 'category_id'))->whereOr('level', '=', 2);
+                })
                 ->language($this->lang_id)
                 ->displayed(true)
-                ->order(['sort' => 'asc', 'id' => 'desc'])
+                ->order(['sort' => 'asc', 'id' => 'asc'])
                 ->select();
             if (!$categorys->isEmpty()) {
+                // 根据产品分类path信息分组
+                $map = [];
                 foreach ($categorys as $category) {
+                    $map[$category['id']] = $category;
+                }
+                $pro_map = [];
+                foreach ($products as $pro) {
+                    if (!isset($map[$pro['category_id']])) {
+                        continue;
+                    }
+                    $m = $map[$pro['category_id']];
+                    $pro_map[$m['path']][] = $pro;
+                }
+
+                // 获取二级分类下的产品信息
+                foreach ($categorys as $val) {
+                    if ($val['level'] != 2) {
+                        continue;
+                    }
+                    
+                    foreach ($pro_map as $k => $pro) {
+                        if (in_array($val['id'], explode(',', strval($k)))) {
                             $newpros[] = [
-                        'category' => $category,
+                                'category' => $val,
-                        'products' => $products_map[$category['id']] ?? [],
+                                'products' => $pro,
                             ];
+                            break;
+                        }
+                    }
                 }
             }
         }

app/index/controller/TopicNas.php

@@ -20,6 +20,10 @@ class TopicNas extends Common
     {
         // 获取国家/语言列表
         $languages = $this->getLanguages();
+        // 输出国家/语言列表
+        if (get_platform() == 'mobile') {
+            View::assign('header_languages', $languages);
+        }
 
         // 获取当前语言
         $current_language = $this->getCurrentLanguage($languages);
@@ -61,8 +65,11 @@ class TopicNas extends Common
         $nas_software = [];
         // 获取banner数据
         $banners = SysBannerModel::with(['items' => function($query) {
-                $query->withoutField(['sort', 'created_at', 'updated_at', 'deleted_at']);
+                $query->withoutField(['sort', 'created_at', 'updated_at', 'deleted_at'])
+                    ->order(['sort' => 'asc', 'id' => 'desc'])
+                    ->enabled(true);
             }])
+            ->atPlatform(request()->from)
             ->uniqueLabel([
                 'BANNER_680f156a805a8',
                 'BANNER_680f15ca5482f',
@@ -104,8 +111,11 @@ class TopicNas extends Common
         $trial_instructions = [];
         // 获取banner数据
         $banners = SysBannerModel::with(['items' => function($query) {
-                $query->withoutField(['sort', 'created_at', 'updated_at', 'deleted_at']);
+                $query->withoutField(['sort', 'created_at', 'updated_at', 'deleted_at'])
+                    ->order(['sort' => 'asc', 'id' => 'desc'])
+                    ->enabled(true);
             }])
+            ->atPlatform(request()->from)
             ->uniqueLabel([
                 'BANNER_68103aaebe4c4',
                 'BANNER_68103acd1a8b9',
@@ -142,8 +152,11 @@ class TopicNas extends Common
         $cooperation_cotacts    = [];
         // 获取banner数据
         $banners = SysBannerModel::with(['items' => function($query) {
-                $query->withoutField(['sort', 'created_at', 'updated_at', 'deleted_at']);
+                $query->withoutField(['sort', 'created_at', 'updated_at', 'deleted_at'])
+                    ->order(['sort' => 'asc', 'id' => 'desc'])
+                    ->enabled(true);
             }])
+            ->atPlatform(request()->from)
             ->uniqueLabel([
                 'BANNER_6810670b8ef17',
                 'BANNER_681067451b78f',
@@ -179,25 +192,66 @@ 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'])->limit(3);
+                $query->field(['id', 'title', 'category_id'])
+                    ->order(['sort' => 'asc', 'id' => 'desc'])
+                    ->limit(3);
             }])
             ->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数据
         $banners = SysBannerModel::with(['items' => function ($query) {
-                $query->withoutField(['sort', 'created_at', 'updated_at', 'deleted_at']);
+                $query->withoutField(['sort', 'created_at', 'updated_at', 'deleted_at'])
+                    ->order(['sort' => 'asc', 'id' => 'desc'])
+                    ->enabled(true);
             }])
+            ->atPlatform(request()->from)
             ->uniqueLabel(['BANNER_6819754be2dc6'])
             ->language($this->lang_id)
             ->enabled(true)
@@ -226,20 +280,47 @@ class TopicNas extends Common
         View::assign('article', $article);
 
         // 获取文章分类及文章数据
-        $parent = ArticleCategoryModel::uniqueLabel('CATEGORY_681182e0a4529')->value('id');
+        $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']);
+                $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');
     }
@@ -251,17 +332,64 @@ class TopicNas extends Common
     {
         $keywords = request()->post('keywords');
         // 根据关键词查询文章
+        $parent = ArticleCategoryModel::uniqueLabel('CATEGORY_681182e0a4529')
+            ->language($this->lang_id)
+            ->value('id');
+            
+        // 获取帮且中心分类子分类
+        $categorys  = [];
+        $table_name = (new ArticleCategoryModel)->getTable();
+        if (env('DB_VERSION', '5') == '8') {
+            $categorys = \think\facade\Db::query(preg_replace(
+                '/\s+/u', 
+                ' ',
+                "WITH RECURSIVE article_tree_by AS (
+                    SELECT a.id, a.pid FROM $table_name a WHERE a.id = {$parent}
+                    UNION ALL
+                    SELECT k.id, k.pid FROM $table_name k INNER JOIN article_tree_by t ON t.id = k.pid
+                )
+                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', []);
+
+        // 获取文章数据
         $articles = ArticleModel::field([
                 'id',
+                'category_id',
                 'title'
             ])
             ->withSearch(['title'], [
                 'title' => $keywords??null
             ])
             ->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);
     }
     
     /**
@@ -272,8 +400,11 @@ class TopicNas extends Common
         $data = [];
         // 获取banner数据
         $banners = SysBannerModel::with(['items' => function($query) {
-                $query->withoutField(['sort', 'created_at', 'updated_at', 'deleted_at']);
+                $query->withoutField(['sort', 'created_at', 'updated_at', 'deleted_at'])
+                    ->order(['sort' => 'asc', 'id' => 'desc'])
+                    ->enabled(true);
             }])
+            ->atPlatform(request()->from)
             ->uniqueLabel([
                 'BANNER_6810798e6e828',
                 'BANNER_68107a0a63910',

app/index/controller/TopicPowerProdline.php

@@ -0,0 +1,127 @@
+<?php
+declare(strict_types=1);
+
+namespace app\index\controller;
+
+use app\index\model\SysBannerModel;
+use think\facade\View;
+use think\Request;
+
+/**
+ * 专题 - 电力品线控制器
+ */
+class TopicPowerProdline extends Common
+{
+    /**
+     * 重写控制器初始化
+     */
+    public function initialize()
+    {
+        // 获取国家/语言列表
+        $languages = $this->getLanguages();
+        // 输出国家/语言列表
+        if (get_platform() == 'mobile') {
+            View::assign('header_languages', $languages);
+        }
+
+        // 获取当前语言
+        $current_language = $this->getCurrentLanguage($languages);
+        if (!empty($current_language)) {
+            $this->lang_id = $current_language['id'];
+        }
+
+        // 获取产品分类
+        $categorys = $this->getProductCategory($this->lang_id);
+        // 输出产品分类
+        View::assign('header_categorys', $categorys);
+
+        // 获取系统配置
+        $configs = $this->getSysConfig($this->lang_id, ['basic', 'contact', 'media']);
+        $this->basic_config = $configs['basic'];
+        // 输出系统配置
+        View::assign('basic_config', $configs['basic']);
+        View::assign('contact_config', $configs['contact']);
+        View::assign('media_config', $configs['media']);
+
+        // 获取底部导航
+        $footer_navigation = $this->getNavigation('NAV_67f60be43df8d', $this->lang_id);
+        // 输出底部导航
+        View::assign('footer_navigation', $footer_navigation);
+    }
+
+    /**
+     * 专题 - 电力品线首页
+     */
+    public function index()
+    {
+        $banners = SysBannerModel::with([
+                'items' => function ($query) {
+                    $query->withoutField(['sort', 'created_at', 'updated_at', 'deleted_at'])
+                        ->order(['sort' => 'asc', 'id' => 'desc'])
+                        ->enabled(true);
+                }
+            ])
+            ->atPlatform(request()->from)
+            ->uniqueLabel([
+                'BANNER_691e729f2428d',
+                'BANNER_691e732e4ad69',
+                'BANNER_691e752d2bbe2',
+                'BANNER_691e75561c4d3',
+                'BANNER_691e75ec9391c',
+                'BANNER_691e7616545bf',
+                'BANNER_691e763fc08f4',
+                'BANNER_691e765a27eba',
+                'BANNER_691e76b6af393',
+            ])
+            ->language($this->lang_id)
+            ->enabled(true)
+            ->order(['sort' => 'asc', 'id' => 'desc'])
+            ->select();
+
+        $data = [];
+        if (!$banners->isEmpty()) {
+            $banners_map = [];
+            foreach ($banners as $banner) {
+                $banners_map[$banner->unique_label] = $banner;
+            }
+            // 焦点轮播图
+            $focus_image = data_get($banners_map, 'BANNER_691e729f2428d')?->items->toArray();
+            if (!empty($focus_image)) $data['focus_image'] = $focus_image;
+
+            // 分类
+            $category = data_get($banners_map, 'BANNER_691e732e4ad69')?->items->toArray();
+            if (!empty($category)) $data['category'] = $category;
+
+            // 为什么选择奥睿科相关数据
+            $why_choose = data_get($banners_map, 'BANNER_691e752d2bbe2')?->items->toArray();
+            if (!empty($why_choose)) $data['why_choose'] = $why_choose;
+
+            // 差旅充
+            $travel_charger = data_get($banners_map, 'BANNER_691e75561c4d3')?->items->toArray();
+            if (!empty($travel_charger)) $data['travel_charger'] = $travel_charger;
+
+            // 家居充
+            $home_charger = data_get($banners_map, 'BANNER_691e75ec9391c')?->items->toArray();
+            if (!empty($home_charger)) $data['home_charger'] = $home_charger;
+
+            // 桌面充
+            $desktop_charger = data_get($banners_map, 'BANNER_691e7616545bf')?->items->toArray();
+            if (!empty($desktop_charger)) $data['desktop_charger'] = $desktop_charger;
+
+            // 墙充
+            $wall_charger = data_get($banners_map, 'BANNER_691e763fc08f4')?->items->toArray();
+            if (!empty($wall_charger)) $data['wall_charger'] = $wall_charger;
+
+            // 转换器
+            $converter = data_get($banners_map, 'BANNER_691e765a27eba')?->items->toArray();
+            if (!empty($converter)) $data['converter'] = $converter;
+
+            // 底部介绍
+            $footer_info = data_get($banners_map, 'BANNER_691e76b6af393')?->items->toArray();
+            if (!empty($footer_info)) $data['footer_info'] = $footer_info;
+        }
+        View::assign('data', $data);
+
+        return View::fetch('index');
+    }
+}

app/index/lang/en-us.php

@@ -1,222 +0,0 @@
-<?php
-
-return [
-    'header_navigation' => [
-        'product_categorys' => 'Products'
-    ],
-    'header_search'  => [
-        'history'     => 'Search History',
-        'hot_product' => 'Popular Products',
-    ],
-    'footer_navigation' => [
-        'product_categorys' => 'Product'
-    ],
-    'footer_contact' => 'Contact',
-    'index'          => [
-        'featured_products'     => 'Featured Products',
-        'view_all'              => 'View All',
-        'learn_more'            => 'Learn More',
-        'orico_technology'      => 'ORICO Technology',
-        'orico_technology_desc' => 'Designed to be just as easy to learn as iPhone.Chatting with friends.',
-        'faq'                   => 'FAQ',
-        'faq_short_desc'        => 'What are you most concerned about',
-        'faq_desc'              => 'Our customer support is available Manday to Friday 9am600pmAverage arswer time 24h',
-    ],
-    'article' => [
-        'detail_share'                 => 'SHARE',
-        'detail_leave_reply'           => 'Leave a Reply',
-        'detail_leave_reply_name'      => 'Name',
-        'detail_leave_reply_email'     => 'Email',
-        'detail_leave_reply_email_tip' => 'Your email address will not be pulished.',
-        'detail_leave_reply_comment'   => 'Comment',
-        'detail_leave_reply_submit'    => 'POST COMMENT',
-        'detail_recommend'             => 'Recommended for you',
-    ],
-    'attachment' => [
-        'software_drives'    => 'Software and Drivers',
-        'video'              => 'Videos',
-        'support_model'      => 'Supported Models',
-        'support_platform'   => 'Supported Systems',
-        'search_placeholder' => 'Search model',
-        'no_data'            => 'No Result！',
-        'no_video'           => 'No Video！',
-    ],
-    'aboutus_introduction' => [
-        'title'                    => 'Introduction of the Brand',
-        'section_why_title'        => 'Why Choose Us',
-        'section_service_title'    => 'How We Can Help with Customization',
-        'section_difference_title' => 'For Different Situation',
-    ],
-    'aboutus_mileage' => [
-        'achievement' => 'Our Achievement',
-        'events'      => 'Brand Events',
-        'development' => 'Tech Development',
-    ],
-    'aboutus_policy' => [
-        'title'          => 'After-Sales Policy',
-        'banner_1_title' => 'After-sale Policy',
-        'banner_1_desc'  => 'ORICO commits to provide 7-day Refund, 15-day Exchange, 1-year Quality Warranty. ',
-        'banner_3_title' => 'For your own benefits, please mind the following information',
-        'banner_3_desc'  => 'For a smooth return and refund, quality warranty, please follow these steps:',
-        'banner_5_title' => 'ORICO is not liable for:'
-    ],
-    'contact_index' => [
-        'title'                     => 'contact us',
-    ],
-    'contact_message' => [
-        'title'                     => 'contact us',
-        'our_information'           => 'Our Information',
-        'send_question'             => 'Send Us Your Question',
-        'form_name'                 => 'Yuor Name',
-        'form_name_placeholder'     => 'This is your placeholder text',
-        'form_email'                => 'Your Email',
-        'form_email_placeholder'    => 'This is your placeholder text',
-        'form_question'             => 'Your Message',
-        'form_question_placeholder' => 'This is your placeholder text',
-        'form_submit'               => 'SEND',
-        'become_a_distributor'      => 'Become a Distributor',
-        // 验证器中文本
-        'validate_name_required'    => 'Name is required',
-        'validate_name_max'         => 'Name cannot exceed 64 characters',
-        'validate_email_required'   => 'Email is required',
-        'validate_email_email'      => 'Email format is incorrect',
-        'validate_email_max'        => 'Email cannot exceed 128 characters',
-        'validate_content_required' => 'Message is required',
-        'validate_content_max'      => 'Message cannot exceed 1024 characters',
-        // 返回文本  
-        'send_success' => 'success',
-        'send_fail'    => 'fail',
-    ],
-    'contact_distributor' => [
-        'title'                            => 'Become a Distributor',
-        'section_title'                    => 'To Be Our Distributor',
-        'section_desc_1'                   => 'Ready to join us?',
-        'section_desc_2'                   => 'Enter your details below and our Sales team will get back to you within 2 business days.',
-        'form_corp_name'                   => 'Company Name',
-        'form_corp_name_placeholder'       => 'Enter your Company Name',
-        'form_email'                       => 'Contact Email',
-        'form_email_placeholder'           => 'Enter your Email',
-        'form_phone'                       => 'Phone Number',
-        'form_phone_placeholder'           => 'This is your placeholder text',
-        'form_business_type'               => 'Type of Business',
-        'form_online_shop_url'             => 'Online Shop URL',
-        'form_online_shop_url_placeholder' => 'This is your placeholder URL',
-        'form_enterprise_size'             => 'Enterprise size',
-        'form_corp_address'                => 'Company Address',
-        'form_corp_address_placeholder'    => 'Enter Address',
-        'form_message'                     => 'Message',
-        'form_message_placeholder'         => 'Enter your message',
-        'form_submit'                      => 'SUBMIT',
-        // 验证器中文本
-        'validate_name_required'            => 'Company Name is required',
-        'validate_name_max'                 => 'Company Name cannot exceed 64 characters',
-        'validate_email_required'           => 'Email is required',
-        'validate_email_email'              => 'Email format is incorrect',
-        'validate_email_max'                => 'Email cannot exceed 128 characters',
-        'validate_phone_required'           => 'Phone Number is required',
-        'validate_phone_max'                => 'Phone Number cannot exceed 64 characters',
-        'validate_business_type_required'   => 'Type of Business is required',
-        'validate_business_type_max'        => 'Type of Business cannot exceed 128 characters',
-        'validate_enterprise_size_required' => 'Enterprise size is required',
-        'validate_enterprise_size_max'      => 'Enterprise size cannot exceed 128 characters',
-        'validate_address_required'         => 'Company Address is required',
-        'validate_address_max'              => 'Company Address cannot exceed 255 characters',
-        'validate_message_required'         => 'Message is required',
-        // 返回文本
-        'send_success' => 'Add Success！',
-        'send_fail'    => 'Add Fail！',
-    ],
-    'contact_bulkbuy' => [
-        'title'                        => '',
-        'form_title'                   => 'Bulk Buy',
-        'form_corp_name_label'         => 'Company Name',
-        'form_corp_name_placeholder'   => 'Legal business name',
-        'form_website_url_label'       => 'Official website',
-        'form_website_url_placeholder' => 'Please paste the URL',
-        'form_username_label'          => 'Your Name',
-        'form_firstname_placeholder'   => 'First name',
-        'form_lastname_placeholder'    => 'Last name',
-        'form_email_label'             => 'Email',
-        'form_email_placeholder'       => 'Please enter your email',
-        'form_phone_label'             => 'Phone Numbe',
-        'form_phone_placeholder'       => 'Please enter your phone number',
-        'form_checkbox_label'          => 'Products you are interested in?',
-        'form_message_label'           => 'Message',
-        'form_message_placeholder'     => 'Methods used',
-        'form_submit'                  => 'SUBMIT',
-        // 验证器中文本
-        'validate_corp_name_require'  => 'Company Name is required',
-        'validate_corp_name_max'      => 'Company Name cannot exceed 128 characters',
-        'validate_url_max'            => 'URL cannot exceed 255 characters',
-        'validate_first_name_require' => 'First Name is required',
-        'validate_first_name_max'     => 'First Name cannot exceed 64 characters',
-        'validate_last_name_require'  => 'Last Name is required',
-        'validate_last_name_max'      => 'Last Name cannot exceed 64 characters',
-        'validate_email_require'      => 'Email is required',
-        'validate_email_email'        => 'Email format is incorrect',
-        'validate_email_max'          => 'Email cannot exceed 128 characters',
-        'validate_phone_max'          => 'Phone Number cannot exceed 32 characters',
-        'validate_interested_max'     => 'Interested in cannot exceed 255 characters',
-        'validate_message_require'    => 'Message is required',
-        'validate_message_max'        => 'Message cannot exceed 1024 characters',
-        // 返回文本
-        'send_success' => 'Add Success！',
-        'send_fail'    => 'Add Fail！',
-    ],
-    'product_detail' => [
-        'detail_section_title'        => 'Product Description',
-        'related_products'            => 'Related Products',
-        'display_form'                => 'Send Inquiry',
-        'form_name'                   => 'Name',
-        'form_first_name_placeholder' => 'First name',
-        'form_last_name_placeholder'  => 'Last name',
-        'form_corp'                   => 'Company/Organization',
-        'form_email'                  => 'Email Address',
-        'form_phone'                  => 'Phone Number',
-        'form_country'                => 'Country',
-        'form_country_placeholder'    => '--- Select your country ---',
-        'form_industry'               => 'Industry',
-        'form_inquiry'                => 'Inquiry',
-        'form_submit'                 => 'SUBMIT',
-        // 验证器中文本
-        'validate_first_name_require'   => 'First Name is required',
-        'validate_first_name_max'       => 'First Name cannot exceed 64 characters',
-        'validate_last_name_require'    => 'Last Name is required',
-        'validate_last_name_max'        => 'Last Name cannot exceed 64 characters',
-        'validate_email_require'        => 'Email is required',
-        'validate_email_email'          => 'Email format is incorrect',
-        'validate_email_max'            => 'Email cannot exceed 128 characters',
-        'validate_phone_max'            => 'Phone Number cannot exceed 32 characters',
-        'validate_country_name_require' => 'Country is required',
-        'validate_country_name_max'     => 'Country cannot exceed 128 characters',
-        'validate_corp_name_require'    => 'Company/Organization is required',
-        'validate_corp_name_max'        => 'Company/Organization cannot exceed 128 characters',
-        'validate_industry_require'     => 'Industry is required',
-        'validate_industry_max'         => 'Industry cannot exceed 64 characters',
-        'validate_message_require'      => 'Message is required',
-        'validate_message_max'          => 'Message cannot exceed 1024 characters',
-        // 返回文本
-        'send_success' => 'Add Success！',
-        'send_fail'    => 'Add Fail！',
-    ],
-    'topic_nas_index' => [
-        'solution_section_title' => '<span style="color:#004BFA;">ORICO</span>网络存储解决方案',
-        'software_section_title' => '<span style="color:#004BFA">NAS</span>配套软件',
-    ],
-    'topic_nas_cooperation' => [
-        'advantages_section_title' => 'Cooperation advantages',
-        'contacts_section_title'   => 'Looking forward to working with you'
-    ],
-    'topic_nas_download' => [
-        'cyber_tab_title'  => 'CyberData',
-        'weline_tab_title' => 'Weline'
-    ],
-    'topic_nas_help' => [
-        'module_title'             => 'Quick Start Guide',
-        'search_input_placeholder' => 'What are you looking for?',
-        'article_section_title'    => 'User\' s Guide',
-        'contact_section_title'    => 'Contact US',
-        'view_more'                => 'Click to view more',
-        'content'                  => 'Content'
-    ]
-];

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

@@ -0,0 +1,222 @@
+<?php
+
+return [
+    // 公共header/footer
+    '首页' => 'Home',
+    '产品列表' => 'Products',
+    '搜索' => 'Search',
+    '搜索历史' => 'Search History',
+    '请择地区' => 'SELECT A REGION',
+    '产品' => 'Product',
+    '联系方式' => 'Contact',
+
+    // 返回文本
+    '提交成功' => 'success',
+    '提交失败' => 'fail',
+    '信息已成功提交！' => 'Add Success！',
+    '信息提交失败！' => 'Add Fail！',
+    '留言提交失败' => 'Message submit failed',
+    '留言提交成功' => 'Message submit success',
+    '当前选定语言的采购可选品类配置出错' => 'Current language configuration of purchase optional categories is incorrect',
+
+    // 首页
+    'index/index' => [
+        '查看所有' => 'View All',
+        '明星产品/热点产品' => 'Featured Products',
+        '了解更多' => 'Learn More',
+        'Orico 技术' => 'ORICO Technology',
+        '强大功能、简单使用' => 'designed to be just as easy to learn as iPhone. chatting with friends.',
+        '常见问题' => 'FAQ',
+        '回答您最关心的问题' => 'What are you most concerned about',
+        '客服团队的工作时间：周一到周五，早9点到晚6点 平均应答时间：24小时内' => 'Our customer support is available Monday to Friday: 9am-6:00pm. Average answer time: 24h',
+    ],
+
+    // 文章详情页
+    'article/detail' => [
+        '分享' => 'SHARE',
+        '留言' => 'Leave a Reply',
+        '名称' => 'Name',
+        '电子邮箱' => 'Email',
+        '您的电子邮件地址不会被公开' => 'Your email address will not be pulished.',
+        '留言内容' => 'Comment',
+        '评论' => 'COMMENT',
+        '提交留言' => 'POST COMMENT',
+        '你可能还喜欢' => 'Recommended for you',
+        '链接复制成功' => 'Link copied successfully',
+    ],
+
+    // 产品分类
+    'product/category' => [
+        '查看全部' => 'View All',
+    ],
+    // 产品搜索
+    'product/search' => [
+        '搜索' => 'Search',
+        '请搜索' => 'Please search...',
+        '暂无数据' => 'No data',
+    ],
+    // 产品详情
+    'product/detail' => [
+        '首页' => 'Home',
+        '型号' => 'Model',
+        '发送查询' => 'Send Inquiry',
+        '产品描述' => 'Product Description',
+        '关联产品' => 'Related Products',
+        '姓名' => 'Name',
+        '请输入您的名称' => 'First name',
+        '请输入您的姓氏' => 'Last name',
+        '公司/组织' => 'Company/Organization',
+        '邮箱' => 'Email',
+        '电话号码' => 'Phone Number',
+        '国家' => 'Country',
+        '请选择所属国家' => 'Select your country',
+        '行业' => 'Industry',
+        '询问内容' => 'Inquiry',
+        '提交' => 'SUBMIT',
+    ],
+
+    // 常见问题
+    'faq/index' => [
+        '常见FQ_下载与服务_中文官网帮助信息_ORICO/奥睿科官网' => 'FAQ',
+        '常见问题解答' => 'Frequently asked questions',
+    ],
+
+    // 附件下载
+    'attachment/index' => [
+        '软件下载' => 'Software download',
+        '支持型号' => 'Supported Models',
+        '支持系统' => 'Supported Systems',
+        '全站搜索' => 'Search',
+        '搜索' => 'Search',
+        '请搜索' => 'Please search...',
+    ],
+    'attachment/video' => [
+        '软件和驱动程序' => 'Software and Drivers',
+        '您的浏览器不支持 video 标签。' => 'Your browser does not support HTML5 video.', 
+    ],
+    
+    // 联系我们批量购买页面
+    'contactus/bulkbuy' => [
+        '批量购买' => 'Bulk Buy',
+        '公司名称' => 'Company Name',
+        '法定营业名称' => 'Legal business name',
+        '官方网站' => 'Official website',
+        '请粘贴网址' => 'Please paste the URL',
+        '姓名' => 'Your Name',
+        '姓' => 'Last name',
+        '名' => 'First name',
+        '邮箱' => 'Email',
+        '请输入邮箱' => 'Enter your Email',
+        '电话号码' => 'Phone Number',
+        '请输入电话号码' => 'Enter your Phone Number',
+        '您对哪个产品品类感兴趣？' => 'Products you are interested in?',
+        '留言' => 'Message',
+        '请输入留言' => 'Enter your message',
+        '提交' => 'SUBMIT',
+    ],
+    // 联系我们成为分销商页面
+    'contactus/distributor' => [
+        '成为经销商' => 'Become a Distributor',
+        '准备好加入我们了吗?<br>  在下面输入您的详细信息，我们的销售团队将在2个工作日内回复您。' => 'Ready to join us?<br/>Enter your details below and our Sales team will get back to you within 2 business days.',
+        '公司名称' => 'Company Name',
+        '请输入公司名称' => 'Enter your Company Name',
+        '电子邮件' => 'Contact Email',
+        '请输入邮箱' => 'Enter your Email',
+        '电话号码' => 'Phone Number',
+        '请输入电话号码' => 'Enter your Phone Number',
+        '业务类型' => 'Type of Business',
+        '在线商店网址' => 'Online Store URL',
+        '企业规模' => 'Enterprise Size',
+        '公司地址' => 'Company Address',
+        '请输入地址' => 'Enter Address',
+        '留言' => 'Message',
+        '请输入留言' => 'Enter your message',
+        '提交' => 'SUBMIT',
+    ],
+    // 联系我们留言页
+    'contactus/message' => [
+        '我们的信息' => 'Our Information',
+        '姓名' => 'Your name',
+        '电子邮箱' => 'Your email',
+        '您的问题' => 'Your message',
+        '提交您的问题' => 'Send Us Your Question',
+        '请输入内容...' => 'This is your placeholder text',
+        '发送' => 'SEND',
+        '成为经销商' => 'Become a Distributor',
+    ],
+
+    // 关于我们 - 品牌介绍
+    'aboutus/introduction' => [
+        '品牌介绍' => 'Introduction of the Brand',
+        '选择我们的理由' => 'Why Choose Us',
+        '为您提供专属定制服务' => 'How We Can Help with Customization',
+        '对于不同的情况' => 'For Different Situation',
+    ],
+
+    // 关于我们 - 文化介绍
+    'aboutus/culture' => [
+        '文化介绍' => 'Culture Introduction',
+    ],
+
+    // 关于我们 - 品牌历程
+    'aboutus/mileage' => [
+        'ORICO荣耀' => 'Our Achievement',
+        '品牌里程' => 'Brand Events',
+        '品牌活动' => 'Tech Development',
+    ],
+
+    // 关于我们 - 售后政策
+    'aboutus/policy' => [
+        '售后政策_注意事项' => 'After-Sales Policy',
+        '售后政策' => 'After-sale Policy',
+        'ORICO/奥睿科商城为您提供七天包退、15天换新、1年保修、终身维护的服务承诺' => 'ORICO commits to provide 7-day Refund, 15-day Exchange, 1-year Quality Warranty. ',
+        '为了保障您的合法权益，敬请关注以下信息' => 'For your own benefits, please mind the following information',
+        '为了得到深圳市元创时代科技有限公司给予您的“包修、包换、包退”的权益，请您：' => 'For a smooth return and refund, quality warranty, please follow these steps:',
+        '特别说明' => 'ORICO is not liable for:'
+    ],
+
+    // nas主题 - 首页
+    'topicnas/index' => [
+        '网络存储解决方案' => 'Network Storage Solutions',
+        '配套软件' => 'Software',
+    ],
+
+    // nas主题 - 客户合作页
+    'topicnas/cooperation' => [
+        '成为ORICO合作伙伴' => 'Be an ORICO partner',
+        '合作伙伴招募' => 'Partner recruitment',
+        '广告代理' => 'Advertising Agency',
+        '抖音销售' => 'Douyin Sales',
+        '代理经销合作' => 'Proxy and distribution cooperation',
+        'ODM合作' => 'ODM cooperation',
+        '合作优势' => 'Cooperation advantages',
+        '期待与您的合作' => 'Looking forward to working with you'
+    ],
+
+    // nas主题 - 下载页
+    'topicnas/download' => [
+        'CyberData赛博云空间' => 'CyberData',
+        'Weline微链接' => 'Weline'
+    ],
+
+    // nas主题 - 帮助页
+    'topicnas/help' => [
+        '帮助中心' => 'Quick Start Guide',
+        '请输入搜索关键字,如安装赛博云空间,影视库' => 'What are you looking for?',
+        '取消' => 'Cancel',
+        '使用教程' => 'User\' s Guide',
+        '查看更多' => 'Click to view more',
+        '联系我们' => 'Contact US',
+        '目录' => 'Content'
+    ],
+
+    // nas主题 - 帮助详情页
+    'topicnas/helpdetail' => [
+        '帮助中心' => 'Quick Start Guide',
+        '请输入搜索关键字,如安装赛博云空间,影视库' => 'What are you looking for?',
+        '取消' => 'Cancel',
+        '使用教程' => 'User\' s Guide',
+        '联系我们' => 'Contact US',
+        '目录' => 'Content'
+    ],
+];

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

@@ -0,0 +1,227 @@
+<?php
+
+return [
+    '首页' => 'Home',
+    '产品列表' => 'Products',
+    '店铺' => 'Store',
+    '搜索记录' => 'Search History',
+    '热销产品' => 'Popular Products',
+    '产品' => 'Product',
+    '联系我们' => 'Contact',
+
+    // 返回文本
+    '提交成功' => 'success',
+    '提交失败' => 'fail',
+    '信息已成功提交！' => 'Add Success！',
+    '信息提交失败！' => 'Add Fail！',
+    '当前选定语言的采购可选品类配置出错' => 'Current language configuration of purchase optional categories is incorrect',
+
+    // 首页
+    'index/index' => [
+        '查看所有' => 'View All',
+        '明星产品/热点产品' => 'Featured Products',
+        '了解更多' => 'Learn More',
+        'ORICO 技术' => 'ORICO Technology',
+        '强大功能、简单使用' => 'Designed to be just as easy to learn as iPhone.Chatting with friends.',
+        '常见问题' => 'FAQ',
+        '回答您最关心的问题' => 'What are you most concerned about',
+        '客服团队的工作时间：周一到周五，早9点到晚6点 平均应答时间：24小时内' => 'Our customer support is available Manday to Friday 9am600pmAverage arswer time 24h',
+    ],
+
+    // 文章详情页
+    'article/detail' => [
+        '分享' => 'SHARE',
+        '留言' => 'Leave a Reply',
+        '名称' => 'Name',
+        '电子邮箱' => 'Email',
+        '您的电子邮件地址不会被公开' => 'Your email address will not be pulished.',
+        '留言内容' => 'Comment',
+        '评论' => 'COMMENT',
+        '提交留言' => 'POST COMMENT',
+        '你可能还喜欢' => 'Recommended for you',
+        '链接复制成功' => 'Link copied successfully',
+    ],
+
+    // 常见问题
+    'faq/index' => [
+        '常见FQ_下载与服务_中文官网帮助信息_ORICO/奥睿科官网' => 'FAQ',
+    ],
+
+    // 附件页 - 软件下载
+    'attachment/index' => [
+        '软件和驱动程序' => 'Software and Drivers',
+        '视频' => 'Videos',
+        '支持型号' => 'Supported Models',
+        '支持系统' => 'Supported Systems',
+        '搜索' => 'Search',
+        '查询无结果！' => 'No Result！',
+    ],
+
+    // 附件页 - 视频
+    'attachment/video' => [
+        '软件和驱动程序' => 'Software and Drivers',
+        '搜索' => 'Search',
+        '视频' => 'Videos',
+        '查询无此视频！' => 'No Video！',
+    ],
+
+    // 关于我们 - 品牌介绍
+    'aboutus/introduction' => [
+        '品牌介绍' => 'Introduction of the Brand',
+        '选择我们的理由' => 'Why Choose Us',
+        '为您提供专属定制服务' => 'How We Can Help with Customization',
+        '对于不同的情况' => 'For Different Situation',
+    ],
+
+    // 关于我们 - 品牌历程
+    'aboutus/mileage' => [
+        'ORICO荣耀' => 'Our Achievement',
+        '品牌里程' => 'Brand Events',
+        '品牌活动' => 'Tech Development',
+    ],
+
+    // 关于我们 - 售后政策
+    'aboutus/policy' => [
+        '售后政策_注意事项' => 'After-Sales Policy',
+        '售后政策' => 'After-sale Policy',
+        'ORICO/奥睿科商城为您提供七天包退、15天换新、1年保修、终身维护的服务承诺' => 'ORICO commits to provide 7-day Refund, 15-day Exchange, 1-year Quality Warranty. ',
+        '为了保障您的合法权益，敬请关注以下信息' => 'For your own benefits, please mind the following information',
+        '为了得到深圳市元创时代科技有限公司给予您的“包修、包换、包退”的权益，请您：' => 'For a smooth return and refund, quality warranty, please follow these steps:',
+        '特别说明' => 'ORICO is not liable for:'
+    ],
+
+    // 关于我们 - 文化介绍
+    'aboutus/culture' => [
+        '文化介绍' => 'Culture Introduction',
+    ],
+
+    // 联系我们
+    'contactus/index' => [
+        '客户服务' => 'contact us',
+    ],
+
+    // 联系我们 - 留言
+    'contactus/message' => [
+        '联系我们' => 'contact us',
+        '我们的信息' => 'Our Information',
+        '提交您的问题' => 'Send Us Your Question',
+        '姓名' => 'Yuor Name',
+        '请输入你的姓名' => 'This is your placeholder text',
+        '电子邮箱' => 'Your Email',
+        '请输入你的邮箱' => 'This is your placeholder text',
+        '您的问题' => 'Your Message',
+        '请输入你的问题' => 'This is your placeholder text',
+        '发送' => 'SEND',
+        '成为经销商' => 'Become a Distributor',
+    ],
+
+    // 联系我们 - 成为经销商
+    'contactus/distributor' => [
+        '成为经销商' => 'To Be Our Distributor',
+        '准备好加入我们了吗?' => 'Ready to join us?',
+        '在下面输入您的详细信息，我们的销售团队将在2个工作日内回复您。' => 'Enter your details below and our Sales team will get back to you within 2 business days.',
+        '公司名称' => 'Company Name',
+        '请输入公司名称' => 'Enter your Company Name',
+        '电子邮箱' => 'Contact Email',
+        '请输入邮箱' => 'Enter your Email',
+        '电话号码' => 'Phone Number',
+        '请输入电话号码' => 'This is your placeholder text',
+        '业务类型' => 'Type of Business',
+        '在线商店网址' => 'Online Shop URL',
+        '请输入网址' => 'This is your placeholder URL',
+        '企业规模' => 'Enterprise size',
+        '公司地址' => 'Company Address',
+        '请输入地址' => 'Enter Address',
+        '留言' => 'Message',
+        '请输入留言' => 'Enter your message',
+        '提交' => 'SUBMIT',
+    ],
+
+    // 联系我们 - 批量购买
+    'contactus/bulkbuy' => [
+        '商务订单' => 'Bulk Buy',
+        '批量购买' => 'Bulk Buy',
+        '公司名称' => 'Company Name',
+        '法定营业名称' => 'Legal business name',
+        '官方网站' => 'Official website',
+        '请粘贴网址' => 'Please paste the URL',
+        '姓名' => 'Your Name',
+        '名' => 'First name',
+        '姓' => 'Last name',
+        '电子邮箱' => 'Email',
+        '请输入邮箱' => 'Please enter your email',
+        '电话号码' => 'Phone Numbe',
+        '请输入电话号码'  => 'Please enter your phone number',
+        '您对哪个产品品类感兴趣？' => 'Products you are interested in?',
+        '留言' => 'Message',
+        '请输入留言' => 'Methods used',
+        '提交' => 'SUBMIT',
+    ],
+
+    // 产品 - 产品详情页
+    'product/detail' => [
+        '首页' => 'Home',
+        '型号' => 'Product Model',
+        '产品详情' => 'Product Description',
+        '相关产品' => 'Related Products',
+        '发送查询' => 'Send Inquiry',
+        '姓名' => 'Name',
+        '请输入您的姓' => 'First name',
+        '请输入您的名' => 'Last name',
+        '公司/组织' => 'Company/Organization',
+        '电子邮箱' => 'Email Address',
+        '电话号码' => 'Phone Number',
+        '国家' => 'Country',
+        '请选择所属国家' => '--- Select your country ---',
+        '行业' => 'Industry',
+        '询问内容' => 'Inquiry',
+        '提交' => 'SUBMIT',
+    ],
+
+    // 产品 - 搜索
+    'product/search' => [
+        '暂无数据' => 'No data',
+    ],
+
+    // 产品 - 分类
+    'product/category' => [
+        '查看全部' => 'View All',
+    ],
+
+    // nas主题 - 首页
+    'topicnas/index' => [
+        '网络存储解决方案' => 'Network Storage Solutions',
+        '配套软件' => 'Software',
+    ],
+
+    // nas主题 - 客户合作页
+    'topicnas/cooperation' => [
+        '合作优势' => 'Cooperation advantages',
+        '期待与您的合作' => 'Looking forward to working with you'
+    ],
+
+    // nas主题 - 下载页
+    'topicnas/download' => [
+        'CyberData赛博云空间'  => 'CyberData',
+        'Weline微链接' => 'Weline'
+    ],
+
+    // nas主题 - 帮助页
+    'topicnas/help' => [
+        '帮助中心' => 'Quick Start Guide',
+        '请输入搜索关键字,如安装赛博云空间,影视库' => 'What are you looking for?',
+        '使用教程' => 'User\' s Guide',
+        '查看更多' => 'Click to view more',
+        '联系我们' => 'Contact US',
+        '目录' => 'Content'
+    ],
+
+    // nas主题 - 帮助详情页
+    'topicnas/helpdetail' => [
+        '帮助中心' => 'Quick Start Guide',
+        '请输入搜索关键字,如安装赛博云空间,影视库' => 'What are you looking for?',
+        '使用教程' => 'User\' s Guide',
+        '联系我们' => 'Contact US',
+        '目录' => 'Content'
+    ],
+];

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

@@ -0,0 +1,40 @@
+<?php
+
+return [
+    '姓不能为空' => 'Last name is required',
+    '姓不能超过:rule个字符' => 'Last name cannot exceed :rule characters',
+    '名不能为空' => 'First Name is required',
+    '名不能超过:rule个字符' => 'First name cannot exceed :rule characters',
+    '姓名不能为空' => 'Name is required',
+    '姓名不能超过:rule个字符' => 'Name cannot exceed :rule characters',
+    '电话号码不能为空' => 'Phone Number is required',
+    '电话号码不能超过:rule个字符' => 'Phone number cannot exceed :rule characters',
+    '感兴趣的产品种类不能为空' => 'Interested product categories is required',
+    '感兴趣的产品种类不能超过:rule个字符' => 'Interested product categories cannot exceed :rule characters',
+    '邮箱不能为空' => 'Email is required',
+    '邮箱格式不正确' => 'Email format is incorrect',
+    '邮箱不能超过:rule个字符' => 'Email cannot exceed :rule characters',
+    '国家不能为空' => 'Country is required',
+    '国家不能超过:rule个字符' => 'Country cannot exceed :rule characters',
+    '网址格式不正确' => 'URL format is incorrect',
+    '网址不能超过:rule个字符' => 'URL cannot exceed :rule characters',
+    '公司名称不能为空' => 'Company Name is required',
+    '公司名称不能超过:rule个字符' => 'Company name cannot exceed :rule characters',
+    '公司地址不能为空' => 'Company Address is required',
+    '公司地址不能超过:rule个字符' => 'Company Address cannot exceed :rule characters',
+    '留言不能为空' => 'Message is required',
+    '企业规模不能为空' => 'Enterprise Size is required',
+    '企业规模不能超过:rule个字符' => 'Enterprise Size cannot exceed :rule characters',
+    '业务类型不能为空' => 'Type of Business is required',
+    '业务类型不能超过:rule个字符' => 'Type of Business cannot exceed :rule characters',
+    '公司/组织不能为空' => 'Company/Organization is required',
+    '公司/组织不能超过:rule个字符' => 'Company/Organization cannot exceed :rule characters',
+    '行业不能为空' => 'Industry is required',
+    '行业不能超过:rule个字符' => 'Industry cannot exceed :rule characters',
+    '询问内容不能为空' => 'Inquiry is required',
+    '询问内容不能超过:rule个字符' => 'Inquiry cannot exceed :rule characters',
+    '留言内容不能为空' => 'Message content is required',
+    '留言内容不能超过:rule个字符' => 'Message content cannot exceed :rule characters',
+    '问题不能为空' => 'Question is required',
+    '问题不能超过:rule个字符' => 'Question cannot exceed :rule characters',
+];

app/index/lang/zh-cn.php

@@ -1,222 +0,0 @@
-<?php
-
-return [
-    'header_navigation' => [
-        'product_categorys' => '产品列表'
-    ],
-    'header_search'  => [
-        'hot_product' => '热销产品',
-        'history'     => '搜索记录',
-    ],
-    'footer_navigation' => [
-        'product_categorys' => '产品'
-    ],
-    'footer_contact' => '联系我们',
-    'index'          => [
-        'featured_products'     => '明星产品/热点产品',
-        'view_all'              => '查看所有',
-        'learn_more'            => '了解更多',
-        'orico_technology'      => 'ORICO 技术',
-        'orico_technology_desc' => '强大功能、简单使用',
-        'faq'                   => '常见问题',
-        'faq_short_desc'        => '回答您最关心的问题',
-        'faq_desc'              => '客服团队的工作时间：周一到周五，早9点到晚6点 平均应答时间：24小时内',
-    ],
-    'article' => [
-        'detail_share'                 => '分享',
-        'detail_leave_reply'           => '留言',
-        'detail_leave_reply_name'      => '名称',
-        'detail_leave_reply_email'     => '电子邮箱',
-        'detail_leave_reply_email_tip' => '您的电子邮件地址不会被公开',
-        'detail_leave_reply_comment'   => '留言',
-        'detail_leave_reply_submit'    => '提交留言',
-        'detail_recommend'             => '你可能还喜欢',
-    ],
-    'attachment' => [
-        'software_drives'    => '软件和驱动程序',
-        'video'              => '视频',
-        'support_model'      => '支持型号',
-        'support_platform'   => '支持系统',
-        'search_placeholder' => '搜索型号',
-        'no_data'            => '查询无结果！',
-        'no_video'           => '查询无此视频！',
-    ],
-    'aboutus_introduction' => [
-        'title'                    => '品牌介绍',
-        'section_why_title'        => '选择我们的理由',
-        'section_service_title'    => '为您提供专属定制服务',
-        'section_difference_title' => '对于不同的情况',
-    ],
-    'aboutus_mileage' => [
-        'achievement' => 'ORICO荣耀',
-        'events'      => '品牌里程',
-        'development' => '品牌活动',
-    ],
-    'aboutus_policy' => [
-        'title'          => '售后政策_注意事项',
-        'banner_1_title' => '售后政策',
-        'banner_1_desc'  => 'ORICO/奥睿科商城为您提供七天包退、15天换新、1年保修、终身维护的服务承诺',
-        'banner_3_title' => '为了保障您的合法权益，敬请关注以下信息',
-        'banner_3_desc'  => '为了得到深圳市元创时代科技有限公司给予您的“包修、包换、包退”的权益，请您：',
-        'banner_5_title' => '特别说明'
-    ],
-    'contact_index' => [
-        'title'                     => '客户服务',
-    ],
-    'contact_message' => [
-        'title'                     => '联系我们',
-        'our_information'           => '我们的信息',
-        'send_question'             => '提交您的问题',
-        'form_name'                 => '姓名',
-        'form_name_placeholder'     => '请输入你的姓名',
-        'form_email'                => '电子邮箱',
-        'form_email_placeholder'    => '请输入你的邮箱',
-        'form_question'             => '您的问题',
-        'form_question_placeholder' => '请输入你的问题',
-        'form_submit'               => '发送',
-        'become_a_distributor'      => '成为经销商',
-        // 验证器中文本
-        'validate_name_required'    => '姓名不能为空',
-        'validate_name_max'         => '姓名不能超过64个字符',
-        'validate_email_required'   => '邮箱不能为空',
-        'validate_email_email'      => '邮箱格式不正确',
-        'validate_email_max'        => '邮箱不能超过128个字符',
-        'validate_content_required' => '问题不能为空',
-        'validate_content_max'      => '问题不能超过1024个字符',
-        // 返回文本
-        'send_success' => '提交成功',
-        'send_fail'    => '提交失败',
-    ],
-    'contact_distributor' => [
-        'title'                            => '成为经销商',
-        'section_title'                    => '成为经销商',
-        'section_desc_1'                   => '准备好加入我们了吗?',
-        'section_desc_2'                   => '在下面输入您的详细信息，我们的销售团队将在2个工作日内回复您。',
-        'form_corp_name'                   => '公司名称',
-        'form_corp_name_placeholder'       => '请输入公司名称',
-        'form_email'                       => '电子邮箱',
-        'form_email_placeholder'           => '请输入邮箱',
-        'form_phone'                       => '电话号码',
-        'form_phone_placeholder'           => '请输入电话号码',
-        'form_business_type'               => '业务类型',
-        'form_online_shop_url'             => '在线商店网址',
-        'form_online_shop_url_placeholder' => '请输入网址',
-        'form_enterprise_size'             => '企业规模',
-        'form_corp_address'                => '公司地址',
-        'form_corp_address_placeholder'    => '请输入地址',
-        'form_message'                     => '留言',
-        'form_message_placeholder'         => '请输入留言',
-        'form_submit'                      => '提交',
-        // 验证器中文本
-        'validate_name_required'            => '公司名称不能为空',
-        'validate_name_max'                 => '公司名称不能超过64个字符',
-        'validate_email_required'           => '邮箱不能为空',
-        'validate_email_email'              => '邮箱格式不正确',
-        'validate_email_max'                => '邮箱不能超过128个字符',
-        'validate_phone_required'           => '电话号码不能为空',
-        'validate_phone_max'                => '电话号码不能超过64个字符',
-        'validate_business_type_required'   => '业务类型不能为空',
-        'validate_business_type_max'        => '业务类型不能超过128个字符',
-        'validate_enterprise_size_required' => '企业规模不能为空',
-        'validate_enterprise_size_max'      => '企业规模不能超过128个字符',
-        'validate_address_required'         => '公司地址不能为空',
-        'validate_address_max'              => '公司地址不能超过255个字符',
-        'validate_message_required'         => '留言内容不能为空',
-        // 返回文本
-        'send_success' => '信息已成功提交',
-        'send_fail'    => '信息提交失败',
-    ],
-    'contact_bulkbuy' => [
-        'title'                        => '商务订单',
-        'form_title'                   => '批量购买',
-        'form_corp_name_label'         => '公司名称',
-        'form_corp_name_placeholder'   => '法定营业名称',
-        'form_website_url_label'       => '官方网站',
-        'form_website_url_placeholder' => '请粘贴网址',
-        'form_username_label'          => '姓名',
-        'form_firstname_placeholder'   => '名',
-        'form_lastname_placeholder'    => '姓',
-        'form_email_label'             => '电子邮箱',
-        'form_email_placeholder'       => '请输入邮箱',
-        'form_phone_label'             => '电话号码',
-        'form_phone_placeholder'       => '请输入电话号码',
-        'form_checkbox_label'          => '您对哪个产品品类感兴趣？',
-        'form_message_label'           => '留言',
-        'form_message_placeholder'     => '请输入留言',
-        'form_submit'                  => '提交',
-        // 验证器中文本
-        'validate_corp_name_require'  => '公司名称不能为空',
-        'validate_corp_name_max'      => '公司名称不能超过128个字符',
-        'validate_url_max'            => '网址不能超过255个字符',
-        'validate_first_name_require' => '名不能为空',
-        'validate_first_name_max'     => '名不能超过64个字符',
-        'validate_last_name_require'  => '姓不能为空',
-        'validate_last_name_max'      => '姓不能超过64个字符',
-        'validate_email_require'      => '邮箱不能为空',
-        'validate_email_email'        => '邮箱格式不正确',
-        'validate_email_max'          => '邮箱不能超过128个字符',
-        'validate_phone_max'          => '电话号码不能超过32个字符',
-        'validate_interested_max'     => '感兴趣的产品种类不能超过255个字符',
-        'validate_message_require'    => '留言内容不能为空',
-        'validate_message_max'        => '留言内容不能超过1024个字符',
-        // 返回文本
-        'send_success' => '信息已成功提交',
-        'send_fail'    => '信息提交失败',
-    ],
-    'product_detail' => [
-        'detail_section_title'        => '产品详情',
-        'related_products'            => '相关产品',
-        'display_form'                => '发送查询',
-        'form_name'                   => '姓名',
-        'form_first_name_placeholder' => '请输入您的姓',
-        'form_last_name_placeholder'  => '请输入您的名',
-        'form_corp'                   => '公司/组织',
-        'form_email'                  => '电子邮箱',
-        'form_phone'                  => '电话号码',
-        'form_country'                => '国家',
-        'form_country_placeholder'    => '请选择所属国家',
-        'form_industry'               => '行业',
-        'form_inquiry'                => '询问内容',
-        'form_submit'                 => '提交',
-        // 验证器中文本
-        'validate_first_name_require'   => '名不能为空',
-        'validate_first_name_max'       => '名不能超过64个字符',
-        'validate_last_name_require'    => '姓不能为空',
-        'validate_last_name_max'        => '姓不能超过64个字符',
-        'validate_email_require'        => '邮箱不能为空',
-        'validate_email_email'          => '邮箱格式不正确',
-        'validate_email_max'            => '邮箱不能超过128个字符',
-        'validate_phone_max'            => '电话号码不能超过32个字符',
-        'validate_country_name_require' => '国家不能为空',
-        'validate_country_name_max'     => '国家不能超过128个字符',
-        'validate_corp_name_require'    => '公司/组织不能为空',
-        'validate_corp_name_max'        => '公司/组织不能超过128个字符',
-        'validate_industry_require'     => '行业不能为空',
-        'validate_industry_max'         => '行业不能超过64个字符',
-        'validate_message_require'      => '询问内容不能为空',
-        'validate_message_max'          => '询问内容不能超过1024个字符',
-        // 返回文本
-        'send_success' => '信息已成功提交',
-        'send_fail'    => '信息提交失败',
-    ],
-    'topic_nas_index' => [
-        'solution_section_title' => '<span style="color:#004BFA;">ORICO</span>网络存储解决方案',
-        'software_section_title' => '<span style="color:#004BFA">NAS</span>配套软件',
-    ],
-    'topic_nas_cooperation' => [
-        'advantages_section_title' => '合作优势',
-        'contacts_section_title'   => '期待与您的合作'
-    ],
-    'topic_nas_download' => [
-        'cyber_tab_title'  => 'CyberData赛博云空间',
-        'weline_tab_title' => 'Weline微链接'
-    ],
-    'topic_nas_help' => [
-        'module_title'             => '帮助中心',
-        'search_input_placeholder' => '请输入搜索关键字,如安装赛博云空间,影视库',
-        'article_section_title'    => '使用教程',
-        'contact_section_title'    => '联系我们',
-        'view_more'                => '查看更多',
-        'content'                  => '目录'
-    ]
-];

app/index/middleware.php

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

app/index/middleware/ConfirmRequestFrom.php

@@ -0,0 +1,22 @@
+<?php
+declare (strict_types = 1);
+
+namespace app\index\middleware;
+
+class ConfirmRequestFrom
+{
+    /**
+     * 处理请求
+     *
+     * @param \think\Request $request
+     * @param \Closure       $next
+     * @return Response
+     */
+    public function handle($request, \Closure $next)
+    {
+        // 确认请求来源
+        $request->from = get_platform();
+        
+        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,38 @@ 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)
+    {
+        $query->where(function($q) use($id, $merge_self) {
+            $q->where('pid', '=', $id);
+            if ($merge_self) {
+                $q->whereOr('id', '=', $id);
+            }
+        });
+    }
+
     // 是否显示状态范围查询
     public function scopeIsShow($query, bool $is_show)
     {

app/index/model/ArticleLeaveMessageModel.php

@@ -16,4 +16,16 @@ class ArticleLeaveMessageModel extends ArticleLeaveMessageBaseModel
     use SoftDelete;
     // 软删除字段
     protected $deleteTime = 'deleted_at';
+
+    // 文章文章范围查询
+    public function scopeArticle($query, $article_id)
+    {
+        $query->where('article_id', '=', $article_id);
+    }
+
+    // 审核状态范围查询
+    public function scopeAudited($query, bool $is_audited = true)
+    {
+        $query->where('is_audited', '=', (int)$is_audited);
+    }
 }

app/index/model/ArticleModel.php

@@ -32,6 +32,11 @@ class ArticleModel extends ArticleBaseModel
     // 文章分类范围查询
     public function scopeCategory($query, $category)
     {
+        if (is_null($category)) return;
+        if (is_array($category)) {
+            $query->where('category_id', 'in', $category);
+            return;
+        }
         $query->where('category_id', '=', $category);
     }
 

app/index/model/ProductModel.php

@@ -4,6 +4,7 @@ declare (strict_types = 1);
 namespace app\index\model;
 
 use app\common\model\ProductBaseModel;
+use think\facade\Db;
 use think\model\concern\SoftDelete;
 
 /**
@@ -74,4 +75,10 @@ class ProductModel extends ProductBaseModel
     {
         $query->where('is_new', '=', (int)$stat);
     }
+
+    // 关键词搜索
+    public function searchKeywordsAttr($query, string $keywords)
+    {
+        $query->whereRaw('spu LIKE "%' . $keywords . '%" OR name LIKE "%' . $keywords . '%" OR short_name LIKE "%' . $keywords . '%"');
+    }
 }

app/index/model/SysBannerModel.php

@@ -23,6 +23,16 @@ class SysBannerModel extends SysBannerBaseModel
         return $this->hasMany(SysBannerItemModel::class, 'banner_id', 'id');
     }
 
+    // 所属平台范围查询
+    public function scopeAtPlatform($query, string|array $platform)
+    {
+        if (is_array($platform)) {
+            $query->whereIn('at_platform', $platform);
+            return;
+        }
+        $query->where('at_platform', '=', $platform);
+    }
+
     // 唯一标识范围查询
     public function scopeUniqueLabel($query, string|array $unique_label)
     {

app/index/model/SysBannerProdCateMappingModel.php

@@ -0,0 +1,15 @@
+<?php
+declare (strict_types = 1);
+
+namespace app\index\model;
+
+use app\common\model\SysBannerProdCateMappingBaseModel;
+
+/**
+ * banner与产品分类关联表模型
+ * @mixin \think\Model
+ */
+class SysBannerProdCateMappingModel extends SysBannerProdCateMappingBaseModel
+{
+    //
+}

app/index/route/route.php

@@ -16,6 +16,8 @@ Route::get('/', 'Index/index');
 Route::group('product', function () {
     // 产品分类页
     Route::get('category/:id', 'Product/category');
+    // 产品分类 - 查看子类
+    Route::get('subcategory/:id', 'Product/subcategory');
     // 产品详情页
     Route::get('detail/:id', 'Product/detail');
     // 产品询盘
@@ -103,6 +105,12 @@ Route::group('topic', function () {
         // 专题-Nas软件下载页
         Route::get('download', 'TopicNas/download');
     });
+
+    // 专题 - 电力品线
+    Route::group("power_prodline", function() {
+       // 专题 - 电力品线首页
+       Route::get('index', 'TopicPowerProdline/index');
+    });
 });
 
 // 数据迁移

app/index/validate/ContactUsBulkBuyValidate.php

@@ -15,12 +15,12 @@ class ContactUsBulkBuyValidate extends Validate
      */
     protected $rule = [
         'corp_name'  => 'require|max:128',
-        'url'        => 'max:255',
+        'url'        => 'url|max:255',
         'first_name' => 'require|max:64',
         'last_name'  => 'require|max:64',
         'email'      => 'require|email|max:128',
         'phone'      => 'max:32',
-        'interested' => 'max:255',
+        'interested' => 'require|max:255',
         'message'    => 'require|max:1024',
     ];
 
@@ -31,19 +31,21 @@ class ContactUsBulkBuyValidate extends Validate
      * @var array
      */
     protected $message = [
-        'corp_name.require'  => 'valudate_corp_name_require',
+        'corp_name.require'  => '公司名称不能为空',
-        'corp_name.max'      => 'valudate_corp_name_max',
+        'corp_name.max'      => '公司名称不能超过:rule个字符',
-        'url.max'            => 'valudate_url_max',
+        'url.url'            => '网址格式不正确',
-        'first_name.require' => 'valudate_first_name_require',
+        'url.max'            => '网址不能超过:rule个字符',
-        'first_name.max'     => 'valudate_first_name_max',
+        'first_name.require' => '名不能为空',
-        'last_name.require'  => 'valudate_last_name_require',
+        'first_name.max'     => '名不能超过:rule个字符',
-        'last_name.max'      => 'valudate_last_name_max',
+        'last_name.require'  => '姓不能为空',
-        'email.require'      => 'valudate_email_require',
+        'last_name.max'      => '姓不能超过:rule个字符',
-        'email.email'        => 'valudate_email_email',
+        'email.require'      => '邮箱不能为空',
-        'email.max'          => 'valudate_email_max',
+        'email.email'        => '邮箱格式不正确',
-        'phone.max'          => 'valudate_phone_max',
+        'email.max'          => '邮箱不能超过:rule个字符',
-        'interested.max'     => 'valudate_interested_max'   ,
+        'phone.max'          => '电话号码不能超过:rule个字符',
-        'message.require'    => 'valudate_message_require',
+        'interested.require' => '感兴趣的产品种类不能为空',
-        'message.max'        => 'valudate_message_max',
+        'interested.max'     => '感兴趣的产品种类不能超过:rule个字符',
+        'message.require'    => '留言内容不能为空',
+        'message.max'        => '留言内容不能超过:rule个字符',
     ];
 }

app/index/validate/ContactUsDistributorValidate.php

@@ -17,6 +17,7 @@ class ContactUsDistributorValidate extends Validate
         'corp_name'       => 'require|max:64',
         'email'           => 'require|email|max:128',
         'phone'           => 'require|max:64',
+        'website_url'     => 'url|max:255',
         'business_type'   => 'require|max:128',
         'enterprise_size' => 'require|max:128',
         'address'         => 'require|max:255',
@@ -30,19 +31,21 @@ class ContactUsDistributorValidate extends Validate
      * @var array
      */
     protected $message = [
-       'corp_name.require'       => 'contact_distributor.validate_name_required',
+       'corp_name.require'       => '公司名称不能为空',
-       'corp_name.max'           => 'contact_distributor.validate_name_max',
+       'corp_name.max'           => '公司名称不能超过:rule个字符',
-       'email.require'           => 'contact_distributor.validate_email_required',
+       'email.require'           => '邮箱不能为空',
-       'email.email'             => 'contact_distributor.validate_email_email',
+       'email.email'             => '邮箱格式不正确',
-       'email.max'               => 'contact_distributor.validate_email_max',
+       'email.max'               => '邮箱不能超过:rule个字符',
-       'phone.require'           => 'contact_distributor.validate_phone_required',
+       'phone.require'           => '电话号码不能为空',
-       'phone.max'               => 'contact_distributor.validate_phone_max',
+       'phone.max'               => '电话号码不能超过:rule个字符',
-       'business_type.require'   => 'contact_distributor.validate_business_type_required',
+       'website_url.url'         => '网址格式不正确',
-       'business_type.max'       => 'contact_distributor.validate_business_type_max',
+       'website_url.max'         => '网址不能超过:rule个字符',
-       'enterprise_size.require' => 'contact_distributor.validate_enterprise_size_required',
+       'business_type.require'   => '业务类型不能为空',
-       'enterprise_size.max'     => 'contact_distributor.validate_enterprise_size_max',
+       'business_type.max'       => '业务类型不能超过:rule个字符',
-       'address.require'         => 'contact_distributor.validate_address_required',
+       'enterprise_size.require' => '企业规模不能为空',
-       'address.max'             => 'contact_distributor.validate_address_max',
+       'enterprise_size.max'     => '企业规模不能超过:rule个字符',
-       'message.require'         => 'contact_distributor.validate_message_required',
+       'address.require'         => '公司地址不能为空',
+       'address.max'             => '公司地址不能超过:rule个字符',
+       'message.require'         => '留言不能为空',
     ];
 }

app/index/validate/ContactUsMessageValidate.php

@@ -26,12 +26,12 @@ class ContactUsMessageValidate extends Validate
      * @var array
      */
     protected $message = [
-        'name.require'    => 'contact_message.validate_name_required',
+        'name.require'    => '姓名不能为空',
-        'name.max'        => 'contact_message.validate_name_max',
+        'name.max'        => '姓名不能超过:rule个字符',
-        'email.require'   => 'contact_message.validate_email_required',
+        'email.require'   => '邮箱不能为空',
-        'email.email'     => 'contact_message.validate_email_email',
+        'email.email'     => '邮箱格式不正确',
-        'email.max'       => 'contact_message.validate_email_max',
+        'email.max'       => '邮箱不能超过:rule个字符',
-        'content.require' => 'contact_message.validate_content_required',
+        'content.require' => '问题不能为空',
-        'content.max'     => 'contact_message.validate_content_max'
+        'content.max'     => '问题不能超过:rule个字符'
     ];
 }

app/index/validate/ProductInquiryValidate.php

@@ -31,21 +31,21 @@ class ProductInquiryValidate extends Validate
      * @var array
      */
     protected $message = [
-        'first_name.require'   => 'validate_first_name_require',
+        'first_name.require'   => '名不能为空',
-        'first_name.max'       => 'validate_first_name_max',
+        'first_name.max'       => '名不能超过:rule个字符',
-        'last_name.require'    => 'validate_last_name_require',
+        'last_name.require'    => '姓不能为空',
-        'last_name.max'        => 'validate_last_name_max',
+        'last_name.max'        => '姓不能超过:rule个字符',
-        'email.require'        => 'validate_email_require',
+        'email.require'        => '邮箱不能为空',
-        'email.email'          => 'validate_email_email',
+        'email.email'          => '邮箱格式不正确',
-        'email.max'            => 'validate_email_max',
+        'email.max'            => '邮箱不能超过:rule个字符',
-        'phone.max'            => 'validate_phone_max',
+        'phone.max'            => '电话号码不能超过:rule个字符',
-        'country_name.require' => 'validate_country_name_require',
+        'country_name.require' => '国家不能为空',
-        'country_name.max'     => 'validate_country_name_max',
+        'country_name.max'     => '国家不能超过:rule个字符',
-        'corp_name.require'    => 'validate_corp_name_require',
+        'corp_name.require'    => '公司/组织不能为空',
-        'corp_name.max'        => 'validate_corp_name_max',
+        'corp_name.max'        => '公司/组织不能超过:rule个字符',
-        'industry.require'     => 'validate_industry_require',
+        'industry.require'     => '行业不能为空',
-        'industry.max'         => 'validate_industry_max',
+        'industry.max'         => '行业不能超过:rule个字符',
-        'message.require'      => 'validate_message_require',
+        'message.require'      => '询问内容不能为空',
-        'message.max'          => 'validate_message_max'
+        'message.max'          => '询问内容不能超过:rule个字符'
     ];
 }

app/index/view/about_us/culture.html

@@ -1,99 +0,0 @@
-{extend name="public/base" /}
-{block name="title"}
-{notempty name=":lang('aboutus_culture.title')"}<title>{:lang('aboutus_culture.title')}</title>
-{else/}{__BLOCK__}{/notempty}
-{/block}
-{block name="style"}
-<link rel="stylesheet" type="text/css" href="__CSS__/aboutus_culture.css" />
-<link rel="stylesheet" type="text/css" href="__CSS__/animate.min.css" />
-{/block}
-{block name="main"}
-<div class="culture_top">
-    {notempty name="focus_image"}
-    {notempty name="focus_image.link"}
-    <a href="{$focus_image.link}">
-        <img src="{$focus_image.image}" />
-    </a>
-    {else/}
-    <img src="{$focus_image.image}" />
-    {/notempty}
-    {notempty name="culture"}
-    <div class="culture_bril_con swt-Container">
-        {volist name="culture" id="cul" offset="0" length="3"}
-        <div class="culture_bril_div">
-            <div class="iconimg"><img src="{$cul.image}" /></div>
-            <div class="title">
-                <p>{$cul.title}</p>
-            </div>
-            <div class="subtitle">{$cul.desc|raw}</div>
-        </div>
-        {/volist}
-    </div>
-    {/notempty}
-</div>
-{notempty name="culture"}
-<div class="culture_vision">
-    <div class="swt-Container">
-        <div class="title">
-            <!--Vision and Mission-->
-        </div>
-        {volist name="culture" id="cul" key="k" offset="3" mod="2"}
-        {eq name="mod" value="1"}
-        <div class="swt-Table img-responsive">
-            <div id="tab{$k}" class="Table-Row">
-                <div class="Table-Cell left"><img src="{$cul.image}" /></div>
-                <div class="Table-Cell center"></div>
-                <div class="Table-Cell right">
-                    <p class="subtitle">{$cul.title}</p>
-                    <p class="des">{$cul.desc|raw}</p>
-                </div>
-            </div>
-        </div>
-        {else /}
-        <div class="swt-Table img-responsive culture_vision_02">
-            <div id="tab{$k}" class="Table-Row">
-                <div class="Table-Cell left">
-                    <p class="subtitle">{$cul.title}</p>
-                    <p class="des">{$cul.desc|raw}</p>
-                </div>
-                <div class="Table-Cell center"></div>
-                <div class="Table-Cell right"><img src="{$cul.image}" /></div>
-            </div>
-        </div>
-        {/eq}
-        {/volist}
-    </div>
-</div>
-{/notempty}
-{/block}
-{block name="script"}
-<script type="text/javascript">
-    $(document).ready(function() {
-        $('.culture_bril_div').addClass('animated fadeInUp');
-
-        var myelement = $('#tab1'); // the element to act on if viewable
-        goScroll(myelement);
-        var myelement2 = $('#tab2'); // the element to act on if viewable
-        goScroll(myelement2);
-        var myelement3 = $('#tab3'); // the element to act on if viewable
-        goScroll(myelement3);
-
-        function goScroll(obj){
-            $(window).scroll(function() {
-                if(isScrolledIntoView(obj)) {
-                    $(obj).find('.left').addClass('animated fadeInLeft');
-                    $(obj).find('.right').addClass('animated fadeInRight');
-                } 
-            });
-        }
-
-        function isScrolledIntoView(elem) {
-            var docViewTop = $(window).scrollTop();
-            var docViewBottom = docViewTop + $(window).height();
-            var elemTop = $(elem).offset().top;
-            var elemBottom = elemTop + $(elem).height();
-            return (elemTop <= docViewBottom);
-        }
-    });
-</script>
-{/block}

app/index/view/article/detail.html

@@ -1,120 +0,0 @@
-{extend name="public/base" /}
-{block name="title"}
-    {notempty name="detail.seo_title"}<title>{$detail.seo_title}</title>{else /}{__BLOCK__}{/notempty}
-{/block}
-{block name="seo"}
-    {notempty name="detail.seo_keywords"}
-    <meta name="keywords" content="{$detail.seo_keywords}" />
-    <meta name="description" content="{$detail.seo_desc}" />
-    {else /}
-    {__BLOCK__}
-    {/notempty}
-{/block}
-{block name="style"}
-<link rel="stylesheet" href="__CSS__/article_detail.css">
-{/block}
-{block name="main"}
-<div class="orico_Page_articleDetail">
-    <!--内容 -->
-    <div class="articleDetailMain">
-        <div class="atmleft">
-            <div class="blog_title">
-                <h2>{$detail.title}</h2>
-                <p>{$detail.desc}</p>
-            </div>
-            <!-- 文本渲染-->
-            <div class="blog_content">{$detail.content|raw}</div>
-        </div>
-        <div class="atmright">
-            {notempty name="share_config"}
-            <div class="blog_share">
-                <h3>{:lang('article.detail_share')}</h3>
-                <div class="share_list">
-                    {volist name="share_config" id="sc"}
-                    <a class="atdit" {if condition="!empty($sc.is_blank) && $sc.is_blank.value == 1"}target="_blank"{/if} {notempty name="sc.url.value"}href="{$sc.url.value}"{/notempty}>
-                        <img src="{$sc.image.value}" />
-                        {eq name=":array_key_exists('triggered_qrcode', $sc)" value="true"}
-                        <div class="triggered_qrcode">
-                            <img src="{$sc.triggered_qrcode.value}" />
-                        </div>
-                        {/eq}
-                    </a>
-                    {/volist}
-                </div>
-            </div>
-            {/notempty}
-            <div class="repply">
-                <h3>{:lang('article.detail_leave_reply')}</h3>
-                <form action="{:url('article/comment', ['id' => $detail.id])}" method="POST" autocomplete="off">
-                    <span>{:lang('article.detail_leave_reply_name')}</span>
-                    <input class="form-control itinp new_name" type="text" name="name" style="text-indent: 10px;">
-                    <span>{:lang('article.detail_leave_reply_email')}</span>
-                    <input class="form-control itinp new_email" type="email" name="email" style="text-indent: 10px; margin-bottom:0;">
-                    <p style="color: #C6C7C9; font-size: 0.75rem; margin-bottom: 0.625rem;">{:lang('article.detail_leave_reply_email_tip')}</p>
-                    <span>{:lang('article.detail_leave_reply_comment')}</span>
-                    <textarea class="form-control itinp new_comment" name="content" rows="3" style="text-indent: 10px;width: 98%; margin-top: 0.625rem;margin-bottom: 0.625rem;border: 1px solid #DBDBDB;"></textarea>
-                    <div class="comment_btn" style="color:#ffffff;">{:lang('article.detail_leave_reply_submit')}</div>
-                </form>
-            </div>
-        </div>
-    </div>
-    {notempty name="$recommends"}
-    <div class="xq">
-        <!-- 猜您喜欢 -->
-        <div class="love">
-            <div class="love1">
-                <p class="tt">{:lang('article.detail_recommend')}</p>
-                <p><img src="__IMAGES__/1line.png" height="7"></p>
-            </div>
-            <ul class="love2">
-                {volist name="recommends" id="vo"}
-                <li>
-                    <a>
-                        <div class="lvimg"><img src="{$vo.image}"></div>
-                        <p class="lvtit">{$vo.title}</p>
-                    </a>
-                </li>
-                {/volist}
-                <div class="clear"></div>
-            </ul>
-        </div>
-    </div>
-    {/notempty}
-</div>
-{/block}
-{block name="script"}
-<script type="text/javascript">
-    $(document).ready(function() {
-        $('.comment_btn').click(function() {
-            var form = $(this).parents('form');
-            var form_data = form.serialize();
-            $.ajax({
-                url: form.attr('action'),
-                type: 'POST',
-                data: form_data,
-                dataType: 'json',
-                success: function(data) {
-                    alert(data.msg);
-                    if (data.code == 0) {
-                        window.location.reload();
-                    }
-                }
-            })
-        })
-    })
-    function shareCustomers(){
-        // 复制到粘贴板
-        const input = document.createElement('input')
-        input.setAttribute('readonly', 'readonly')
-        let url=window.location.href
-        input.setAttribute('value', url)
-        document.body.appendChild(input)
-        input.select()
-        if (document.execCommand('copy')) {
-            document.execCommand('copy')
-            alert('链接复制成功')
-        }
-        document.body.removeChild(input)
-    } 
-</script>
-{/block}

app/index/view/index/index.html

@@ -1,382 +0,0 @@
-{extend name="public/base" /}
-{block name="style"}
-<link rel="stylesheet" type="text/css" href="__CSS__/index.css" />
-{/block}
-{block name="main"}
-<div class="orico_Page_index">
-    <div class="pageMain">
-        <!-- banner -->
-        {notempty name="focus_images"}
-        <div class="swiper-container bannerswiper">
-            <div class="swiper-wrapper">
-                {volist name="focus_images" id="focus"}
-                <div class="swiper-slide">
-                    <a href="{$focus.link}" target="_blank"><img src="{$focus.image}" alt="{$focus.title}"></a>
-                </div>
-                {/volist}
-            </div>
-            <!-- 如果需要分页器 -->
-            <div class="swiper-pagination"></div>
-            <!-- 如果需要导航按钮 -->
-            <div class="swiper-button-prev"></div>
-            <div class="swiper-button-next"></div>
-        </div>
-        {/notempty}
-        <!-- 产品分类信息 -->
-        {notempty name="product_categorys"}
-        <div class="catMain">
-            {volist name="product_categorys" id="cate"}
-            <a class="catit" href="{$cate.link}">
-                <img src="{$cate.image}" src="catIcoImg" />
-                <span class="catName" {notempty name="cate.title_txt_color"}style="color:{$cate.title_txt_color};"{/notempty}>{$cate.title}</span>
-            </a>
-            {/volist}
-        </div>
-        {/notempty}
-        <!-- 特色专题及公司实力 -->
-        {notempty name="featured_topics"}
-        <div class="featuredtopicsMain">
-            <div class="ftcontent">
-                {volist name="featured_topics" id="topic" mod="2"}
-                <a class="ftItme" href="{$topic.link}">
-                    {if condition="$mod == '1'"}
-                    <div class="ftItme_right">
-                        <img src="{$topic.image}" />
-                    </div>
-                    <div class="ftItme_left">
-                        <p>{$topic.title}</p>
-                        <div class="subtitle">
-                            <span>{:lang('index.view_all')} ></span>
-                            <div class="tpicture"></div>
-                        </div>
-                    </div>
-                    {else/}
-                    <div class="ftItme_left">
-                        <p>{$topic.title}</p>
-                        <div class="subtitle">
-                            <span>{:lang('index.view_all')}</span>
-                            <div class="tpicture"></div>
-                        </div>
-                    </div>
-                    <div class="ftItme_right">
-                        <img src="{$topic.image}" />
-                    </div>
-                    {/if}
-                </a>
-                {/volist}
-            </div>
-        </div>
-        {/notempty}
-        <!-- 明星产品/热点产品 -->
-        {notempty name="featured_products"}
-        <div class="featuredProducts">
-            <p class="biaoti">{:lang('index.featured_products')}</p>
-            <div class="swiper fpSwiper">
-                <div class="swiper-wrapper">
-                    {volist name="featured_products" id="product"}
-                    <div class="swiper-slide picture">
-                        <a class="primg">
-                            <img src="{$product.cover_image}" />
-                        </a>
-                        <div class="fpptitle">{$product.name}</div>
-                        <div class="subtitle">{$product.short_name}</div>
-                        <a class="more">{:lang('index.learn_more')} ></a>
-                    </div>
-                    {/volist}
-                </div>
-                <div class="swiperasd">
-                    <div class="swiper-container1">
-                        <div class="slideshow-pag swiper-pagination"></div>
-                    </div>
-                    <div class="swiper-container swi1">
-                        <img class="slideshow-btn swiper-button-next" src="static/index/temp_images/rightcheck.png">
-                        <img class="slideshow-btn swiper-button-prev" src="static/index/temp_images/lefta.png">
-                    </div>
-                </div>
-            </div>
-        </div>
-        {/notempty}
-        <!-- 视频宣传 -->
-        {notempty name="video"}
-        <div class="hotProduct">
-            <div class="hotvideo">
-                <iframe src="{$video.video}" title="YouTube video player" style="width:100%;height:67rem;z-index:9999;" frameborder="0"
-                    allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
-                    allowfullscreen id="videoElement"></iframe>
-            </div>
-            <img src="{$video.image}" class="hotImg" />
-        </div>
-        {/notempty}
-        <!-- 场景介绍 -->
-        {notempty name="scenes"}
-        <div class="sceneIntroduction">
-            {volist name="scenes" id="scene"}
-            <div class="sceneitem">
-                <div class="sceneInfo">
-                    <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('index.learn_more')} ></a>
-                </div>
-                <div style="background-image: url('{$scene.image}');" class="sceneimg"></div>
-            </div>
-            {/volist}
-        </div>
-        {/notempty}
-        <!-- orico科技 -->
-        <div class="oricoTechnology">
-            <p class="ottitle">{:lang('index.orico_technology')}</p>
-            <span class="otsbtitle">{:lang('index.orico_technology_desc')}</span>
-            <div class="beforeafter">
-                <div id="after"></div>
-                <div id="before"></div>
-                <div class="drag-circle"></div>
-            </div>
-        </div>
-        <!-- 品牌故事 -->
-        {notempty name="brand_story"}
-        <div class="brandStory">
-            <div class="swiper brandStoryswiper">
-                <div class="swiper-wrapper">
-                    {volist name="brand_story" id="story"}
-                    <div class="swiper-slide bsitem">
-                        <div class="itmImg">
-                            <img src="{$story.image}" class="bsImg" />
-                        </div>
-                        <div class="bsinf">
-                            <div class="bstitle" {notempty name="story.title_txt_color"}style="color:{$story.title_txt_color};"{/notempty}>{$story.title}</div>
-                            <div class="bssubtitle" {notempty name="story.desc_txt_color"}style="color:{$story.desc_txt_color};"{/notempty}>{$story.desc|raw}</div>
-                            <a class="bsmore" href="{$story.link}">{:lang('index.learn_more')} ></a>
-                        </div>
-                    </div>
-                    {/volist}
-                </div>
-                <div class="swiperasd bs_swiperasd" id="timeline">
-                    <div class="bs_swcontainer">
-                        <div class="swiper-pagination bs_pagination"></div>
-                        <hr>
-                        <!-- <span class="time1">2021</span> -->
-                        <!-- <span class="time2">2022</span> -->
-                        <!-- <span class="time3">2023</span> -->
-                    </div>
-                    <div class="swiper-container bs_bts">
-                        <img class="slideshow-btn  swiper-button-next" src="static/index/temp_images/rightcheck.png" alt="" />
-                        <img class="slideshow-btn  swiper-button-prev " src="static/index/temp_images/lefta.png" alt="" />
-                    </div>
-                </div>
-            </div>
-        </div>
-        {/notempty}
-        <!-- 数据统计-->
-         {notempty name="data_statistics"}
-        <div class="oricoDataStatistics">
-            <div class="odsmain">
-                {volist name="data_statistics" id="ods"}
-                <div class="odsItem">
-                    <h1 {notempty name="ods.desc_txt_color"}style="color:{$ods.desc_txt_color};"{/notempty}>{$ods.desc|raw}</h1>
-                    <h3 {notempty name="ods.title_txt_color"}style="color:{$ods.title_txt_color};"{/notempty}>{$ods.title}</h3>
-                </div>
-                {/volist}
-            </div>
-        </div>
-        {/notempty}
-        <!-- 文章轮播 -->
-         {notempty name="recommend_articles"}
-        <div class="oricoPub">
-            <div class="swiper pubswiper">
-                <div class="swiper-wrapper">
-                    {volist name="recommend_articles" id="article"}
-                    <div class="swiper-slide  pubSwitem">
-                        <a class="pubimgdiv" href="{:url('article/index', ['id' => $article.id])}">
-                            <img src="{$article.image}" class="pubimg" />
-                        </a>
-                        <a class="pubinfo">
-                            <span>{$article.title}</span>
-                        </a>
-                    </div>
-                    {/volist}
-                </div>
-                <div class="swiperasd pubswiperasd">
-                    <div class="swiper-container">
-                        <img class="slideshow-btn swiper-button-next" src="static/index/temp_images/rightcheck.png">
-                        <img class="slideshow-btn swiper-button-prev" src="static/index/temp_images/lefta.png">
-                    </div>
-                </div>
-            </div>
-        </div>
-        {/notempty}
-        <!-- FAQ-->
-         {notempty name="recommend_faq"}
-        <div class="oricoFQA">
-            <div class="fqaleft">
-                <h1 class="title">{:lang('index.faq')}</h1>
-                <p class="dec">{:lang('index.faq_short_desc')}</p>
-                <p class="sudec">{:lang('index.faq_desc')}</p>
-            </div>
-            <div class="fqaright">
-                <ul class="accordion">
-                    {volist name="recommend_faq" id="faq"}
-                    <li class="fqali">
-                        <div class="fqa-question">
-                            <h3>{$faq.question} </h3>
-                            <span class="xiala">+</span>
-                        </div>
-                        <div class="fqa-answer">
-                            <p>{$faq.answer|raw}</p>
-                        </div>
-                    </li>
-                    {/volist}
-                </ul>
-            </div>
-        </div>
-        {/notempty}
-        <!-- 底部固定提示 -->
-        <div class="oricofixd-info">
-            <div class="ofiinfo">We use cookies to ensure you get the best experience on our website. By
-                continuing to browse, you agree to our use of cookies.</div>
-            <div class="ofibt"><button>OK,got it!</button></div>
-            <div class="oficlose"><span class="close-btn">×</span></div>
-        </div>
-    </div>
-</div>
-{/block}
-{block name="script"}
-<script>
-$(document).ready(function() {
-    let isDragging = false;
-    let startX;
-    let initialLeft;
-    $('.drag-circle').mousedown(function(e) {
-        isDragging = true;
-        startX = e.pageX;
-        initialLeft = $('.drag-circle').position().left;
-    });
-    $(document).mousemove(function(e) {
-        if (isDragging) {
-            const currentX = e.pageX;
-            const diffX = currentX - startX;
-            let newLeft = initialLeft + diffX;
-            const containerWidth = $('.beforeafter').width();
-            newLeft = Math.max(20, Math.min(containerWidth - 20, newLeft));
-            $('.drag-circle').css('left', newLeft);
-            $('#before').width(newLeft);
-        }
-    });
-    $(document).mouseup(function() {
-        isDragging = false;
-    });
-    // 底部关闭
-    $(".oficlose").on("click", function() {
-        $(".oricofixd-info").hide();
-    });
-});
-$(function() {
-    // banner轮播
-    var mySwiper = new Swiper('.bannerswiper', {
-        // 配置选项
-        loop: true,
-        autoplay: {
-            delay: 3000,
-        },
-        pagination: {
-            el: '.swiper-pagination',
-        },
-        navigation: {
-            nextEl: '.swiper-button-next',
-            prevEl: '.swiper-button-prev',
-        },
-    });
-    var fpSwiper = new Swiper(".fpSwiper", {
-        slidesPerView: 3,
-        spaceBetween: 30,
-        slidesPerGroup: 1,
-        loop: true,
-        autoplay: {
-            delay: 5000,
-            pauseOnMouseEnter: true,
-            disableOnInteraction: false,
-        },
-        slidesPerView: "auto",
-        centeredSlides: true,
-        loopFillGroupWithBlank: true,
-        loopAdditionalSlides: 3,
-        pagination: {
-            el: ".swiper-pagination",
-            type: "progressbar",
-        },
-        navigation: {
-            nextEl: ".swiper-button-next",
-            prevEl: ".swiper-button-prev",
-        },
-    });
-    //品牌故事轮播
-    var brandStoryswiper = new Swiper(".brandStoryswiper", {
-        pagination: {
-            el: ".swiper-pagination",
-        },
-        navigation: {
-            nextEl: ".swiper-button-next",
-            prevEl: ".swiper-button-prev",
-        },
-    });
-    // 宣传banner
-    var pubswiper = new Swiper(".pubswiper", {
-        loop: true,
-        autoplay: {
-            delay: 5000,
-            pauseOnMouseEnter: true,
-            disableOnInteraction: false,
-        },
-        //slidesPerView: 1,
-        slidesPerView: "auto",
-        centeredSlides: true,
-        spaceBetween: 32,
-        pagination: {
-            el: ".swiper-pagination",
-            click: true
-        },
-        navigation: {
-            nextEl: ".swiper-button-next",
-            prevEl: ".swiper-button-prev",
-        },
-    });
-    // FAQ问答展开收起
-    $(".fqali").on('click', function() {
-        if ($(this).children("div.fqa-answer").is(':visible')) {
-            $(".fqali").removeClass('active');
-            $(".fqa-answer").hide();
-            $(".text-name").addClass('text-hidden');
-            $(".xiala").text('+');
-        } else {
-            $(".fqali").removeClass('active');
-            $(".fqa-answer").hide();
-            $(".text-name").addClass('text-hidden')
-            $(".xiala").text('+');
-            $(this).addClass('active');
-            $(this).children('div.fqa-answer').show();
-            $(this).children('div.fqa-question').find('span').text('-');
-            $(this).children('div.fqa-question').find('h3').removeClass('text-hidden');
-        }
-    })
-
-
-    // 首先隐藏视频元素和加载中的图片  要放开注释
-    $("#hotvideo").hide();
-    // 监听视频的加载事件
-    setTimeout(function() {
-    	$("#hotvideo").on("load", function() {
-    		// 视频加载完成时，显示视频元素，隐藏加载中的图片
-    		$("#hotvideo").show();
-    		$("#hotImg").hide();
-    	});
-    }, 1000);
-    // 监听视频的加载失败事件
-    setTimeout(function() {
-    	$("#hotvideo").on("error", function() {
-    		// 视频加载失败时，显示加载中的图片，隐藏视频元素
-    		$("#hotImg").show();
-    		$("#videoElement").hide();
-    	});
-    }, 1500);
-});
-</script>
-{/block}

app/index/view/mobile/about_us/culture.html

@@ -0,0 +1,38 @@
+{extend name="public/base" /}
+{block name="title"}
+{notempty name=":lang_i18n('文化介绍')"}<title>{:lang_i18n('文化介绍')}</title>{else/}{__BLOCK__}{/notempty}
+{/block}
+{block name="style"}
+<link rel="stylesheet" type="text/css" href="__CSS__/aboutus_culture.css" />
+{/block}
+{block name="main"}
+<div class="oricoEGapp">
+    <!-- 内容 -->
+    <div class="oricoEGapp-product">
+        {notempty name="focus_image"}
+        <div class="img-responsive">
+            <a {notempty name="focus_image.link"}href="{$focus_image.link}"{/notempty}>
+                <img src="{$focus_image.image}">
+            </a>
+        </div>
+        {/notempty}
+        <!-- 产品介绍 -->
+        {notempty name="culture"}
+        {volist name="culture" id="cul" offset="0" length="3"}
+        <div class="m_vision">
+            <div class="img-responsive "><img src="{$cul.image}"></div>
+            <div class="vision-title  text_left margin-top-50">{$cul.title}</div>
+            <div class="vision-con text_gray  text_left line-height-40 margin-top-40">{$cul.desc|raw}</div>
+        </div>
+        {/volist}
+        <div class="m_vision">
+            {volist name="culture" id="cul" offset="3"}
+            <div class="img-responsive"><img src="{$cul.image}"></div>
+            <div class="vision-title  text_left margin-top-50">{$cul.title}</div>
+            <div class="vision-con text_gray  text_left line-height-40 margin-top-40">{$cul.desc|raw}</div>
+            {/volist}
+        </div>
+        {/notempty}
+    </div>
+</div>
+{/block}

app/index/view/mobile/about_us/introduction.html

@@ -0,0 +1,58 @@
+{extend name="public/base" /}
+{block name="title"}
+{notempty name=":lang_i18n('品牌介绍')"}<title>{:lang_i18n('品牌介绍')}</title>{else/}{__BLOCK__}{/notempty}
+{/block}
+{block name="style"}
+<link rel="stylesheet" type="text/css" href="__CSS__/aboutus_introduction.css" />
+{/block}
+{block name="main"}
+<div class="oricoEGapp">
+    <div class="iotbpage">
+        {notempty name="focus_image"}
+        <img src="{$focus_image.image}" alt="" class="bdimg1">
+        {/notempty}
+        {notempty name="why"}
+        <div class="iotb_bgw">
+            <h1 class="iotbt1">{:lang_i18n('选择我们的理由')}</h1>
+            <div class="iotb_part1">
+                {volist name="why" id="wh"}
+                <div class="iotb_p1_item" style="margin-bottom: 30px;">
+                    <img src="{$wh.image}" alt="" class="iotbic1">
+                    <p class="iotbtp1">{$wh.title}</p>
+                    <span class="iotbts1">{$wh.desc|raw}</span>
+                </div>
+                {/volist}
+            </div>
+        </div>
+        {/notempty}
+        {notempty name="service"}
+        <div class="iotb_part2 iotb_part22">
+            <h1 class="iotbt1">{:lang_i18n('为您提供专属定制服务')}</h1>
+            <div class="fdimgs wcu_list">
+                {assign name="flat_service" value=":array_flatten($service)" /}
+                {volist name="flat_service" id="fs"}
+                <div class="wcu_ltem">
+                    <img src="{$fs.image}" alt="" class="fbit">
+                    <span class="wcu_s1">{$fs.title}</span>
+                </div>
+                {/volist}
+            </div>
+        </div>
+        {/notempty}
+        {notempty name="difference"}
+        <div class="iotb_part2">
+            <h1 class="iotbt1">{:lang_i18n('对于不同的情况')}</h1>
+            <div class="fdimgs wcu_list">
+                {assign name="flat_difference" value=":array_flatten($difference)" /}
+                {volist name="flat_difference" id="di"}
+                <div class="wcu_ltem">
+                    <img src="{$di.image}" alt="" class="fbit">
+                    <span class="wcu_s1">{$di.title}</span>
+                </div>
+                {/volist}
+            </div>
+        </div>
+        {/notempty}
+    </div>
+</div>
+{/block}

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

@@ -0,0 +1,106 @@
+{extend name="public/base"/}
+{block name="style"}
+<link rel="stylesheet" href="__CSS__/aboutus_mileage.css">
+{/block}
+{block name="main"}
+<div class="oricoEGapp">
+    <!--公司里程 -->
+    <div class="oricoCnLc">
+        <div class="margin-top-60"></div>
+        <div class="m_ach">
+            <div class="img-responsive ">
+                <img src="__IMAGES__/achievement.jpg">
+            </div>
+            <div class="title">{:lang_i18n('ORICO荣耀')}</div>
+            <div class="list-num clearfix">
+                {notempty name="achievement"}
+                <ul>
+                    {volist name="achievement" id="ac"}
+                    <li>
+                        <h4 {:style(['color' => $ac['desc_txt_color']])}>{$ac.desc|raw}</h4>
+                        <p {:style(['color' => $ac['title_txt_color']])}>{$ac.title}</p>
+                    </li>
+                    {/volist}
+                </ul>
+                {/notempty}
+            </div>
+        </div>
+        {notempty name="events"}
+        <div class="m_ach-b">
+            <div class="title">{:lang_i18n('品牌里程')}</div>
+        </div>
+        <div class="contain">
+            <!-- 导航 -->
+            <div class="nav">
+                <div class="swiper-container gallery-thumbs">
+                    <div class="swiper-wrapper">
+                        {volist name="events" id="ev"}
+                        <div class="swiper-slide" {:style(['color' => $ev['title_txt_color']])}>{$ev.title}</div>
+                        {/volist}
+                    </div>
+                    <span class="swiper-notification" aria-live="assertive" aria-atomic="true"></span>
+                </div>
+                <!-- 切换按钮 -->
+                <div class="swiper-button-next swiper-button-white" tabindex="0" role="button" aria-label="Next slide" aria-disabled="false">
+                    <img src="__IMAGES__/ach-right.webp">
+                </div>
+                <div class="swiper-button-prev swiper-button-white swiper-button-disabled" tabindex="0" role="button" aria-label="Previous slide" aria-disabled="true">
+                    <img src="__IMAGES__/ach-left.webp">
+                </div>
+            </div>
+            <!-- 内容 -->
+            <div class="swiper-container gallery-top">
+                <div class="swiper-wrapper">
+                    {volist name="events" id="ev" key="k"}
+                    <div class="swiper-slide info">
+                        <h5 {:style(['color' => $ev['title_txt_color']])}>{$ev.title}</h5>
+                        <p {:style(['color' => $ev['desc_txt_color']])}>{$ev.desc|raw}</p>
+                    </div>
+                    {/volist}
+                </div>
+                <span class="swiper-notification" aria-live="assertive" aria-atomic="true"></span>
+            </div>
+        </div>
+        {/notempty}
+        {notempty name="development"}
+        <div class="m_ch">
+            <div class="m_ach-b">
+                <div class="chtitle">{:lang_i18n('品牌活动')}</div>
+            </div>
+            {volist name="development" id="de"}
+            <div class="ach-bg">
+                <div class="img-responsive ">
+                    <img src="{$de.image}">
+                </div>
+                <div class="m_ch-title  text_left margin-top-50">
+                    <img src="__IMAGES__/ach-icon.png">{$de.title}
+                </div>
+                <div class="m_ch-con text_gray  text_left line-height-40 margin-top-40">{$de.desc|raw}</div>
+            </div>
+            {/volist}
+        </div>
+        {/notempty}
+    </div>
+</div>
+{/block}
+{block name="script"}
+<script type="text/javascript">
+    var galleryThumbs = new Swiper('.gallery-thumbs', {
+        spaceBetween: 10,
+        slidesPerView: 5,
+        freeMode: true,
+        watchSlidesVisibility: true,
+        watchSlidesProgress: true
+    })
+    var galleryTop = new Swiper('.gallery-top', {
+        spaceBetween: 10,
+        thumbs: {
+            swiper: galleryThumbs
+        },
+        navigation: {
+            nextEl: '.swiper-button-next',
+            prevEl: '.swiper-button-prev'
+        }
+    })
+</script>
+{/block}

app/index/view/mobile/about_us/policy.html

@@ -0,0 +1,84 @@
+{extend name="public/base"/}
+{block name="title"}
+<title>{:lang_i18n('售后政策_注意事项')}</title>
+{/block}
+{block name="style"}
+<link rel="stylesheet" href="__CSS__/aboutus_policy.css">
+{/block}
+{block name="main"}
+<div class="oricoEGapp">
+    <!-- 内容 -->
+    <div class="oricoEGapp-policy">
+        {notempty name="policy.focus_image"}
+        <a {notempty name="policy.focus_image.link"}href="{$policy.focus_image.link}"{/notempty}>
+            <img src="{$policy.focus_image.image}" class="pl-img" />
+        </a>
+        {/notempty}
+        <div class="m_Container">
+            <strong class="textpoint">{:lang_i18n('售后政策')}</strong>
+            <p class="decs">{:lang_i18n('ORICO/奥睿科商城为您提供七天包退、15天换新、1年保修、终身维护的服务承诺')}</p>
+        </div>
+        {notempty name="policy.banner_1"}
+        {volist name="policy.banner_1" id="b1"}
+        <div class="m_Container">
+            <strong class="textpoint">{$b1.title}</strong>
+            <div class="decs">{$b1.desc|raw}</div>
+        </div>
+        {/volist}
+        {/notempty}
+
+        {notempty name="policy.banner_2"}
+        {volist name="policy.banner_2" id="b2"}
+        <img src="{$b2.image}" class="pl-img m-t" />
+        <div class="m_Container">
+            <strong class="textpoint">{$b2.title}</strong>
+            <div class="decs decs-left">{$b2.desc|raw}</div>
+        </div>
+        {/volist}
+        {/notempty}
+
+        {notempty name="policy.banner_3"}
+        <div class="m_Container">
+            <strong class="textpoint">{:lang_i18n('为了保障您的合法权益，敬请关注以下信息')}</strong>
+            <p class="decs">{:lang_i18n('为了得到深圳市元创时代科技有限公司给予您的“包修、包换、包退”的权益，请您：')}</p>
+            <div class="decs decs-left">
+                {volist name="policy.banner_3" id="b3"}
+                {$b3.title}<br/>
+                {/volist}
+            </div>
+        </div>
+        {/notempty}
+
+        {notempty name="policy.banner_4"}
+        {volist name="policy.banner_4" id="b4"}
+        <img src="{$b4.image}" class="pl-img m-t" />
+        <div class="m_Container">
+            <strong class="textpoint">{$b4.title}</strong>
+            <div class="decs decs-left">{$b4.desc|raw}</div>
+        </div>
+        {/volist}
+        {/notempty}
+
+        {notempty name="policy.banner_5"}
+        <div class="m_Container">
+            <strong class="textpoint">{:lang_i18n('特别说明')}</strong>
+            <p class="decs decs-left">
+                {volist name="policy.banner_5" id="b5" key="k"}
+                {$k+1}、{$b5.title}<br/>
+                {/volist}
+            </p>
+        </div>
+        {/notempty}
+
+        {notempty name="policy.banner_6"}
+        {volist name="policy.banner_6" id="b6"}
+        <img src="{$b6.image}" class="pl-img m-t" />
+        <div class="m_Container">
+            <strong class="textpoint">{$b6.title}</strong>
+            <div class="decs decs-left">{$b6.desc|raw}</div>
+        </div>
+        {/volist}
+        {/notempty}
+    </div>
+</div>
+{/block}

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

@@ -0,0 +1,32 @@
+{extend name="public/base" /}
+{block name="style"}
+<link rel="stylesheet" href="__CSS__/aboutus_story.css" />
+{/block}
+{block name="main"}
+<div class="oricoEGapp">
+    <!-- 内容-->
+    <div class="oricoEGapp-brand">
+        <div class="video-right img-responsive">
+            <img src="__IMAGES__/brand-banner.webp">
+        </div>
+        {notempty name="banners"}
+        <div class="m_brand">
+            {volist name="banners" id="ba" offset="0" length="2"}
+            <div class="brand_title text_left">{$ba.title}</div>
+            <div class="brand-con text_gray  text_left line-height-40 margin-top-40">{$ba.desc|raw}</div>
+            <div class="img-responsive">
+                <img src="{$ba.image}">
+            </div>
+            {/volist}
+            {volist name="banners" id="ba" offset="2" length="3"}
+            <div class="img-responsive text-center margin-4">
+                <img src="{$ba.image}">
+            </div>
+            <div class="vision-title  text_center margin-top-50">{$ba.title}</div>
+            <div class="brand-con text_gray text_center line-height-40 margin-top-40">{$ba.desc|raw}</div>
+            {/volist}
+        </div>
+        {/notempty}
+    </div>
+</div>
+{/block}

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

@@ -0,0 +1,159 @@
+{extend name="public/base" /}
+{block name="title"}
+    {notempty name="detail.seo_title"}<title>{$detail.seo_title}</title>{else /}{__BLOCK__}{/notempty}
+{/block}
+{block name="seo"}
+    {notempty name="detail.seo_keywords"}
+    <meta name="keywords" content="{$detail.seo_keywords}" />
+    <meta name="description" content="{$detail.seo_desc}" />
+    {else /}
+    {__BLOCK__}
+    {/notempty}
+{/block}
+{block name="style"}
+<link rel="stylesheet" href="__CSS__/article_detail.css">
+{/block}
+{block name="main"}
+<div class="oricoEGapp">
+    <!-- 内容 -->
+    <div class="oricoEGapp-articledetail">
+        <div class="content">
+            <div class="blog_detail">
+                <div class="blog_title">
+                    <h2>{$detail.title}</h2>
+                    <p>{$detail.release_time|date_format_i18n}</p>
+                </div>
+                <div class="blog_content">{$detail.content|raw}</div>
+            </div>
+            {notempty name="comments"}
+            <div class="pl_box">
+                <div class="blog_pl">
+                    <h3>{:lang_i18n('评论')}</h3>
+                    {volist name="comments" id="cm"}
+                    <div class="plitem">
+                        <div class="pl_name">{$cm.name}:</div>
+                        <div class="pl_text">{$cm.content}</div>
+                    </div>
+                    {/volist}
+                </div>
+            </div>
+            {/notempty}
+            <div class="share_box">
+                {notempty name="share_config"}
+                <div class="blog_share">
+                    <h3>{:lang_i18n('分享')}</h3>
+                    <ul class="share_list">
+                        {volist name="share_config" id="sc"}
+                        <li>
+                            <a 
+                            {if condition="!empty($sc.is_blank) && $sc.is_blank.value == 1"}target="_blank"{/if}
+                            {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 wechat_code">
+                                    <img src="{$sc.triggered_qrcode.value}" />
+                                </div>
+                                {else /}
+                                <img src="{$sc.image.value}" />
+                                {/eq}
+                            </a>
+                        </li>
+                        {/volist}
+                    </ul>
+                </div>
+                {/notempty}
+                <div class="comment">
+                    <h3>{:lang_i18n('留言')}</h3>
+                    <form action="{:url('article/comment', ['id' => $detail.id])}" method="POST" class="comment_form clearfix" autocomplete="off">
+                        <div style="margin-right: 0.625rem; margin-bottom: 0.5rem;">{:lang_i18n('名称')}:<br>
+                            <input class="form-control itinp new_name" type="text" name="name">
+                        </div>
+                        <div>{:lang_i18n('电子邮箱')}:<br>
+                            <input class="form-control itinp new_email" type="email" name="email">
+                            <p style="color: #C6C7C9; font-size: 0.75rem; margin-bottom: 0.5rem; ">
+                                {:lang_i18n('您的电子邮件地址不会被公开')}
+                            </p>
+                        </div>
+                        <div class="comment_area">{:lang_i18n('留言内容')}:<br>
+                            <textarea class="form-control itinp new_comment" style="height: 3rem;border: 1px solid #DBDBDB;" name="content"></textarea>
+                        </div>
+                    </form>
+                    <div class="comment_btn" style="color:#ffffff;">{:lang_i18n('提交留言')}</div>
+                </div>
+                {notempty name="$recommends"}
+                <div class="mblove">
+                    <div class="mianct">
+                        <p class="thtitle">{:lang_i18n('你可能还喜欢')}</p>
+                        <p><img src="__IMAGES__/1line.webp"></p>
+                    </div>
+                    <div class="swiper loveswiper">
+                        <div class="swiper-wrapper">
+                            {volist name="recommends" id="vo"}
+                            <div class="swiper-slide">
+                                <a href="{:url('article/detail', ['id' => $vo.id])}">
+                                    <img src="{$vo.image}" alt="{$vo.title}">
+                                    <p class="lvtit">{$vo.title}</p>
+                                </a>
+                            </div>
+                            {/volist}
+                        </div>
+                        <!-- 如果需要分页器 -->
+                        <div class="swiper-pagination"></div>
+                    </div>
+                </div>
+                {/notempty}
+            </div>
+        </div>
+    </div>
+</div>
+{/block}
+{block name="script"}
+<script type="text/javascript">
+    $(function() {
+        $('.comment_btn').click(function() {
+            var form = $('.comment_form');
+            var form_data = form.serialize();
+            $.ajax({
+                url: form.attr('action'),
+                type: 'POST',
+                data: form_data,
+                dataType: 'json',
+                success: function(data) {
+                    alert(data.msg);
+                    if (data.code == 0) {
+                        window.location.reload();
+                    }
+                }
+            })
+        })
+
+        $('.toggle_qrcode').click(function() {
+            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,
+        pagination: {
+            el: '.swiper-pagination',
+        }
+    });
+    function shareCustomers(){
+        // 复制到粘贴板
+        const input = document.createElement('input')
+        input.setAttribute('readonly', 'readonly')
+        let url=window.location.href
+        input.setAttribute('value', url)
+        document.body.appendChild(input)
+        input.select()
+        if (document.execCommand('copy')) {
+            document.execCommand('copy')
+            alert("{:lang_i18n('链接复制成功')}")
+        }
+        document.body.removeChild(input)
+    } 
+</script>
+{/block}

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

@@ -0,0 +1,62 @@
+{extend name="public/base" /}
+{block name="style"}
+<link rel="stylesheet" type="text/css" href="__CSS__/article_index.css" />
+{/block}
+{block name="main"}
+<div class="oricoEGapp">
+    <!-- 内容 -->
+    <div class="oricoEGapp-article">
+        <!-- banner -->
+        {notempty name="banner.image"}
+        <div class="banner img-responsive">
+            <img src="{$banner.image}">
+        </div>
+        {/notempty}
+        <!-- 新闻列表 -->
+        <div class="swt-Container">
+            <div class="news-vertu">
+                <div class="tab">
+                    {volist name="categorys" id="ca"}
+                    {if condition="$Request.get.cid == $ca.id || (!$Request.has.cid && $key == 0)"}
+                    <a class="on" href="{:url('article/index', ['pid' => $ca.pid, 'cid' => $ca.id])}">
+                    {else/}
+                    <a class="" href="{:url('article/index', ['pid' => $ca.pid, 'cid' => $ca.id])}">
+                    {/if}
+                        {$ca.name}
+                    </a>
+                    {/volist}
+                </div>
+                <div class="m_Container">
+                    <!-- Blog列表 s -->
+                    <div class="search_box">
+                        <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">{:lang_i18n('搜索')}</button>
+                        </form>
+                    </div>
+                    {notempty name="articles"}
+                    <div class="blog_list">
+                        <ul class="clearfix">
+                            {volist name="articles" id="ar"}
+                            <li>
+                                <a href="{:url('article/detail', ['id' => $ar.id])}">
+                                    <img src="{$ar.image}">
+                                    <h3>{$ar.title}</h3>
+                                    <p>{$ar.desc|raw}</p>
+                                </a>
+                                <span class="blue">{$ar.release_time|date_format_i18n}</span>
+                            </li>
+                            {/volist}
+                        </ul>
+                    </div>
+                    <!-- 分页  s -->
+                    <div>{$articles|raw}</div> 
+                    <!-- 分页  e -->
+                    {/notempty}
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+{/block}

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

@@ -0,0 +1,53 @@
+{extend name="public/base" /}
+{block name="style"}
+<link rel="stylesheet" type="text/css" href="__CSS__/attachment_index.css" />
+{/block}
+{block name="main"}
+<div class="oricoEGapp">
+    <!-- 内容-->
+    <div class="margin-45"></div>
+    <!--search-->
+    <div class="menu mobile-search margin-top-90">
+        <div class="search">
+            <form action="{:url('attachment/index')}" method="get">
+                <div class="search margin-bottom-30">
+                    <button class="updown_search_btn" type="sumbit">
+                        <span class="icon-search-svg"></span>
+                    </button>
+                    <input class="form-control" name="keyword" placeholder="{:lang_i18n('全站搜索')}" value="" type="text" />
+                </div>
+            </form>
+        </div>
+    </div>
+    <!--软件下载-->
+    <div class="download-title">{:lang_i18n('软件下载')}</div>
+    <!--循环产品列表-->
+    {notempty name="attachements"}
+    {volist name="attachements" id="att"}
+    <div class="download-bg clearfix">
+        <div class="download-left">
+            <img src="{:thumb($att.image)}" alt="{$att.name}">
+        </div>
+        <div class="download-right">
+            <div class="font-48">{$att.name}</div>
+            <div class="down-gray">
+                <p>{:lang_i18n('支持型号')}: {$att.applicable_to}</p>
+                <p>{:lang_i18n('支持系统')}: {$att.support_platform}</p>
+            </div>
+            {notempty name="att.attach"}
+            {volist name="att.attach" id="ch"}
+            <div class="down-btn">
+                <a href="{$ch.file_path}" data-cod="dl" target="_blank">
+                    <span class="l_button">{$ch.btn_name}</span>
+                </a>
+            </div>
+            {/volist}
+            {/notempty}
+        </div>
+    </div>
+    {/volist}
+    <!-- 分页-->
+    <div class="Pages">{$page|raw}</div>
+    {/notempty}
+</div>
+{/block}

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

@@ -0,0 +1,41 @@
+{extend name="public/base" /}
+{block name="style"}
+<link rel="stylesheet" type="text/css" href="__CSS__/attachment_video.css" />
+{/block}
+{block name="main"}
+<div class="oricoEGapp">
+    <!-- 主体内容-->
+    <div class="oricoEGapp-softDrviersVideo">
+        <div class="topbanner">
+            <img src="__IMAGES__/video-banner.webp" class="bannerimg" />
+            <span class="bannertitle">{:lang_i18n('软件和驱动程序')}</span>
+        </div>
+        <!-- 分类切换-->
+        <div class="tabs">
+            {notempty name="video_categorys"}
+            {volist name="video_categorys" id="va"}
+            <a href="{:url('attachment/video', ['id' => $va.id])}"><div class="tabit active">{$va.name}</div></a>
+            {/volist}
+            {/notempty}
+        </div>
+        <div class="infolist">
+            {notempty name="videos"}
+            {assign name="flat_videos" value=":array_flatten($videos->items())" /}
+            {volist name="flat_videos" id="vo"}
+            <div class="vd-item">
+                <video controls="" poster="{$vo.image|default=''}">
+                    <source src="{$vo.video}" type="video/mp4">
+                    {:lang_i18n('您的浏览器不支持 video 标签。')}
+                </video>
+                <div class="texts">
+                    <span class="t1">{$vo.name}</span>
+                    <span class="t2">{$vo.desc}</span>
+                </div>
+            </div>
+            {/volist}
+            <div>{$page|raw}</div>
+            {/notempty}
+        </div>
+    </div>
+</div>
+{/block}

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

@@ -0,0 +1,97 @@
+{extend name="public/base" /}
+{block name="style"}
+<link rel="stylesheet" type="text/css" href="__CSS__/contactus_bulkbuy.css" />
+{/block}
+{block name="main"}
+<div class="oricoEGapp">
+    <div class="bdpage" style="background: #fff;border-radius: 8px;padding-top: 50px;">
+        <div class="bd_main bd_main1 bd_main2">
+            <h1 class="t1 sfbt1">{:lang_i18n('批量购买')}</h1>
+            <form action="" method="post" autocomplete="off">
+                <!--内容-->
+                <div class="bd_ct ">
+                    <div class="bd_from" style="padding: 0 16px;">
+                        <div class="theit">
+                            <div class="bditem">
+                                <label class="itlable">{:lang_i18n('公司名称')}<span class="redtag">*</span></label>
+                                <input type="text" name="corp_name" class="form-control itinp companyName" placeholder="{:lang_i18n('法定营业名称')}">
+                            </div>
+                        </div>
+                        <div class="theit">
+                            <div class="bditem">
+                                <label class="itlable">{:lang_i18n('官方网站')}</label>
+                                <input type="text" name="url" class="form-control itinp url" placeholder="{:lang_i18n('请粘贴网址')}">
+                            </div>
+                        </div>
+                        <div class="theit">
+                            <div class="bditem">
+                                <label class="itlable">{:lang_i18n('姓名')}<span class="redtag">*</span></label>
+                                <input type="text" name="first_name" class="form-control itinp firstname" placeholder="{:lang_i18n('名')}">
+                                <input type="text" name="last_name" class="form-control itinp lastname" placeholder="{:lang_i18n('姓')}" style="margin-top: 8px;">
+                            </div>
+                        </div>
+                        <div class="theit">
+                            <div class="bditem">
+                                <label class="itlable">{:lang_i18n('邮箱')}<span class="redtag">*</span></label>
+                                <input type="text" name="email" class="form-control itinp email" placeholder="{:lang_i18n('请输入邮箱')}">
+                            </div>
+                        </div>
+                        <div class="theit">
+                            <div class="bditem bditem1">
+                                <label class="itlable">{:lang_i18n('电话号码')}</label>
+                                <input type="text" name="phone" class="form-control itinp phone" placeholder="{:lang_i18n('请输入电话号码')}">
+                            </div>
+                        </div>
+                        <div class="theit">
+                            <div class="bditem bditem1">
+                                <label class="itlable">{:lang_i18n('您对哪个产品品类感兴趣？')}<span class="redtag">*</span></label>
+                                <div class="sfbchecks">
+                                    {notempty name="interested"}
+                                    {volist name="interested" id="it"}
+                                    <label class="cit">
+                                        <input name="interested[]" type="checkbox" value="{$it}" class="sfbcheckboxit" />{$it}
+                                    </label>
+                                    {/volist}
+                                    {/notempty}
+                                </div>
+                            </div>
+                        </div>
+                        <div class="theit">
+                            <div class="bditem bditem1">
+                                <label class="itlable">{:lang_i18n('留言')}<span class="redtag">*</span></label>
+                                <textarea name="message" class="ittextarea ittextarea2 message" placeholder="{:lang_i18n('请输入留言')}"></textarea>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <!-- 提交-->
+                <div class="bttj" id="send">{:lang_i18n('提交')}</div>
+            </form>
+        </div>
+    </div>
+</div>
+{/block}
+{block name="script"}
+<script type="text/javascript">
+    $(function(){
+        $("#send").click(function(){
+            var form = $(this).parents("form");
+            $.ajax({
+                url: "{:url('contactus/bulkbuy')}",
+                type: "post",
+                dataType: "json",
+                data: form.serialize(),
+                success: function(r){
+                    if(r.code == 0){
+                        form.get(0).reset();
+                    }
+                    alert(r.msg);
+                },
+                error: function(e){
+                    console.error(e);
+                }
+            })
+        })
+    })
+</script>
+{/block}

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

@@ -0,0 +1,107 @@
+{extend name="public/base" /}
+{block name="style"}
+<link rel="stylesheet" type="text/css" href="__CSS__/contactus_distributor.css" />
+{/block}
+{block name="main"}
+<div class="oricoEGapp">
+    <!-- 内容-->
+    <div class="cooperapp_bdpage" style="background:#F2F2F2;">
+        <div class="cooperapp_bd_main" style="margin-top: 3.75rem;">
+            <form action="" method="post">
+                <h1 class="cooperapp_t1">{:lang_i18n('成为经销商')}</h1>
+                <p class="cooperapp_s1">{:lang_i18n('准备好加入我们了吗?<br>  在下面输入您的详细信息，我们的销售团队将在2个工作日内回复您。')}</p>
+                <!--内容-->
+                <div class="bd_ct cooperapp_bd_ct">
+                    <div class="thimg">
+                        <img src="__IMAGES__/distributor_focus_image.webp" alt="" srcset="" class="cooperapp_bdimg">
+                    </div>
+                    <div class="bd_from">
+                        <div class="theit">
+                            <div class="bditem">
+                                <label class="itlable">{:lang_i18n('公司名称')}<span class="redtag">*</span></label>
+                                <input type="text" name="corp_name" class="form-control itinp companyName" placeholder="{:lang_i18n('请输入公司名称')}" />
+                            </div>
+                        </div>
+                        <div class="theit">
+                            <div class="bditem">
+                                <label class="itlable">{:lang_i18n('电子邮件')}<span class="redtag">*</span></label>
+                                <input type="text" name="email" class="form-control itinp email" placeholder="{:lang_i18n('请输入邮箱')}" />
+                            </div>
+                        </div>
+                        <div class="theit">
+                            <div class="bditem bditem1">
+                                <label class="itlable">{:lang_i18n('电话号码')}<span class="redtag">*</span></label>
+                                <input type="text" name="phone" class="form-control itinp mphone" placeholder="{:lang_i18n('请输入电话号码')}" />
+                            </div>
+                        </div>
+                        <div class="theit">
+                            <div class="bditem">
+                                <label class="itlable">{:lang_i18n('业务类型')}<span class="redtag">*</span></label>
+                                <select name="business_type" class="form-control itinp business_type">
+                                    {volist name="types" id="ty"}
+                                    <option value="{$ty.value}">{$ty.name}</option>
+                                    {/volist}
+                                </select>
+                            </div>
+                        </div>
+                        <div class="theit">
+                            <div class="bditem">
+                                <label class="itlable">{:lang_i18n('在线商店网址')}</label>
+                                <input type="text" name="website_url" class="form-control itinp url" placeholder="{:lang_i18n('请输入网址')}" />
+                            </div>
+                        </div>
+                        <div class="theit">
+                            <div class="bditem bditem1">
+                                <label class="itlable">{:lang_i18n('企业规模')}<span class="redtag">*</span></label>
+                                <select name="enterprise_size" data-pf-type="FormInput" class="form-control itinp enterprise_size">
+                                    {volist name="sizes" id="si"}
+                                    <option value="{$si.value}">{$si.name}</option>
+                                    {/volist}
+                                </select>
+                            </div>
+                        </div>
+                        <div class="theit">
+                            <div class="bditem bditem1">
+                                <label class="itlable">{:lang_i18n('公司地址')}<span class="redtag">*</span></label>
+                                <input type="text" name="address" class="form-control itinp address" placeholder="{:lang_i18n('请输入地址')}">
+                            </div>
+                        </div>
+                        <div class="theit">
+                            <div class="bditem bditem1">
+                                <label class="itlable">{:lang_i18n('留言')}<span class="redtag">*</span></label>
+                                <textarea name="message" class="ittextarea message" placeholder="{:lang_i18n('请输入留言')}"></textarea>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <!-- 提交-->
+                <div class="bttj" id="send">{:lang_i18n('提交')}</div>
+            </form>
+        </div>
+    </div>
+</div>
+{/block}
+{block name="script"}
+<script type="text/javascript">
+    $(function () {
+        $("#send").click(function () {
+            var form = $(this).parents("form");
+            $.ajax({
+                url: "{:url('contactus/distributor')}",
+                type: "post",
+                data: form.serialize(),
+                dataType: "json",
+                success: function (r) {
+                    if (r.code == 0) {
+                        form.get(0).reset();
+                    }
+                    alert(r.msg);
+                },
+                error: function (e) {
+                    console.error(e);
+                }
+            })
+        })
+    })
+</script>
+{/block}

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

@@ -0,0 +1,71 @@
+{extend name="public/base" /}
+{block name="style"}
+<link rel="stylesheet" type="text/css" href="__CSS__/contactus_index.css" />
+{/block}
+{block name="main"}
+<div class="oricoEGapp">
+    <!-- 内容-->
+    <div class="oricoEGapp-Contact">
+        <!--banner-->
+        {notempty name="focus_image.image"}
+        <div class="banner img-responsives margin-top-90">
+            <img src="{$focus_image.image}" />
+        </div>
+        {/notempty}
+        <div class="narskfPage">
+            {notempty name="info_datas"}
+            <div class="narskf-content">
+                {assign name="chunks" value=":array_chunk($info_datas, 2)" /}
+                {assign name="sizeof_chunks" value=":count($chunks)" /}
+                {volist name="chunks" id="ch" key="k"}
+                {if condition="$k elt ($sizeof_chunks - 1)"}
+                    <div class="narskf-ct-row">
+                        {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" {:style(['color' => $item['title_txt_color']])}>{$item.title}</span>
+                            {notempty name="item.desc"}
+                            <span class="narskf-sm" {:style(['color' => $item['desc_txt_color']])}>{$item.desc|raw}</span>
+                            {/notempty}
+                            {notempty name="item.extra_image"}
+                            <div class="narskfactive-ewm" style="display: none;">
+                                <img src="{$item.extra_image}" alt="" />
+                            </div>
+                            {/notempty}
+                        </div>
+                        {/volist}
+                    </div>
+                {else/}
+                    {volist name="ch" id="item"}
+                    <div class="narskf-ct-row">
+                        <div class="narskfit narskfit2">
+                            <img src="{$item.image}" class="narskico-img">
+                            <div class="narskfit2-ct">
+                                <span class="narskf-title" {:style(['color' => $item['title_txt_color']])}>{$item.title}</span>
+                                <span class="narskf-sm" {:style(['color' => $item['desc_txt_color']])}>{$item.desc|raw}</span>
+                            </div>
+                        </div>
+                    </div>
+                    {/volist}
+                {/if}
+                {/volist}
+            </div>
+            {/notempty}
+        </div>
+    </div>
+</div>
+{/block}
+{block name="script"}
+<script type="text/javascript">
+    $(document).ready(function() {
+        $('.narskfit').on('click', function() {
+            var $ewm = $(this).find('.narskfactive-ewm');
+            if ($ewm.css('display') === 'none') {
+                $ewm.css('display', 'flex');
+            } else {
+                $ewm.css('display', 'none');
+            }
+        });
+    });
+</script>
+{/block}

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

@@ -0,0 +1,102 @@
+{extend name="public/base" /}
+{block name="style"}
+<link rel="stylesheet" type="text/css" href="__CSS__/contactus_message.css" />
+{/block}
+{block name="main"}
+<div class="oricoEGapp">
+    <!-- 内容 -->
+    <div class="oricoEGapp-Contact">
+        <!-- banner -->
+        {notempty name="focus_image"}
+        <div class="banner img-responsives margin-top-90">
+            <a {notempty name="focus_image.link"} href="{$focus_image.link}" {/notempty}>
+                <img src="{$focus_image.image}" />
+            </a>
+        </div>
+        {/notempty}
+        <!-- 我们的信息 -->
+        <div class="content">
+            <div class="title">{:lang_i18n('我们的信息')}</div>
+            {notempty name="our_information"}
+            {assign name="first_info" value="$our_information|array_shift"/}
+            <div class="info">
+                {notempty name="first_info.image"}
+                <div class="left"><img src="{$first_info.image}" /></div>
+                {/notempty}
+                <div class="right">
+                    <div class="des">{$first_info.desc|raw}</div>
+                </div>
+            </div>
+            {assign name="chunk_info" value="$our_information|array_chunk=2"}
+            {volist name="chunk_info" id="chunk"}
+            <div class="line"></div>
+            <div class="info">
+                {notempty name="chunk.0.image"}
+                <div class="left"><img src="{$chunk.0.image}" /></div>
+                {/notempty}
+                <div class="right">
+                    {volist name="chunk" id="info" key="k"}
+                    <div class="info_title {neq name='k' value='1'}m-t-20{/neq}">{$info.title}:</div>
+                    <div class="des"> {$info.desc|raw}</div>
+                    {/volist}
+                </div>
+            </div>
+            {/volist}
+            {/notempty}
+        </div>
+        <!-- question -->
+        <div class="content">
+            <div class="title">{:lang_i18n('提交您的问题')}</div>
+            <form action="" method="post" autocomplete="off">
+                <div class="question">
+                    <div class="title">{:lang_i18n('姓名')} <span class="red">*</span></div>
+                    <div class="des">
+                        <input type="text" name="name" id="name" placeholder="{:lang_i18n('请输入内容...')}" class="form-control itinp">
+                    </div>
+                </div>
+                <div class="question">
+                    <div class="title">{:lang_i18n('电子邮箱')} <span class="red">*</span></div>
+                    <div class="des">
+                        <input type="text" name="email" id="email" placeholder="{:lang_i18n('请输入内容...')}" class="form-control itinp">
+                    </div>
+                </div>
+                <div class="question">
+                    <div class="title">{:lang_i18n('您的问题')} <span class="red">*</span></div>
+                    <div class="des">
+                        <textarea rows="6" name="content" id="message" class="ittextarea message" placeholder="{:lang_i18n('请输入内容...')}"></textarea>
+                    </div>
+                </div>
+                <div class="question">
+                    <span class="send" id="send">{:lang_i18n('发送')}</span>
+                </div>
+            </form>
+        </div>
+        <!-- Become a Distributor -->
+        <div class="contact_b"><a href="{:url('contactus/distributor')}">{:lang_i18n('成为经销商')}</a></div>
+    </div>
+</div>
+{/block}
+{block name="script"}
+<script type="text/javascript">
+    $(function () {
+        $("#send").click(function () {
+            var form = $(this).parents("form");
+            $.ajax({
+                url: "{:url('contactus/message')}",
+                type: "post",
+                data: form.serialize(),
+                dataType: "json",
+                success: function (r) {
+                    if (r.code == 0) {
+                        form.get(0).reset();
+                    }
+                    alert(r.msg);
+                },
+                error: function (e) {
+                    console.error(e.msg);
+                }
+            })
+        })
+    })
+</script>
+{/block}

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

@@ -0,0 +1,34 @@
+{extend name="public/base" /}
+{block name="title"}
+<title>{:lang_i18n('常见FQ_下载与服务_中文官网帮助信息_ORICO/奥睿科官网')}</title>
+{/block}
+{block name="style"}
+<link rel="stylesheet" href="__CSS__/faq.css">
+{/block}
+{block name="main"}
+<div class="oricoEGapp">
+    <!-- 内容-->
+    <div class="oricoEGapp-fq">
+        <!--banner-->
+        {notempty name="banner.image"}
+        <div class="banner">
+            <img src="{$banner.image}">
+        </div>
+        {/notempty}
+        <!--常见问题解答-->
+        {notempty name="faq"}
+        <div class="m_Container">
+            <div class="title text_center margin-top-50 text_black"><strong>{:lang_i18n('常见问题解答')}</strong>
+            </div>
+            {volist name="faq" id="vo"}
+            <div class="img-responsives margin-top-40"><img src="{$vo.image}"></div>
+            <div class="subtitle text_black text_center margin-top-30">{$vo.question}</div>
+            <div class="des text_gray line-height-40 margin-top-40">{$vo.answer|raw}</div>
+            {/volist}
+        </div>
+        <!-- 分页-->
+        <div >{$faq|raw}</div>
+        {/notempty}
+    </div>
+</div>
+{/block}

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

@@ -0,0 +1,325 @@
+{extend name="public/base"/}
+{block name="style"}
+<link rel="stylesheet" type="text/css" href="__CSS__/index.css" />
+{/block}
+{block name="main"}
+<div class="oricoEGapp">
+    <!--首页 -->
+    <div class="oricoEGapp-index">
+        <!-- banner-->
+        <div class="oidx-banner">
+            {notempty name="focus_images"}
+            <div class="swiper-container bannerswiper">
+                <div class="swiper-wrapper">
+                    {volist name="focus_images" id="fi"}
+                    <div class="swiper-slide">
+                        <a href="{$fi.link}"><img src="{$fi.image}" alt="{$fi.title}"></a>
+                    </div>
+                    {/volist}
+                </div>
+                <!-- 如果需要分页器 -->
+                <div class="swiper-pagination"></div>
+            </div>
+            {/notempty}
+        </div>
+        <!-- 四大分类 -->
+        {notempty name="product_categorys"}
+        <div class="oidx-cate">
+            {volist name="product_categorys" id="pct"}
+            <div class="cateit">
+                <a href="{$pct.link}">
+                    <img src="{$pct.image}" />
+                    <span {:style(['color'=>$pct['title_txt_color']])}>{$pct.title}</span>
+                </a>
+            </div>
+            {/volist}
+        </div>
+        {/notempty}
+        <!-- 特色专题及公司实力 -->
+        {notempty name="featured_topics"}
+        <div class="oidx-gg">
+            {volist name="featured_topics" id="ft"}
+            <div class="index-img">
+                <img src="{$ft.image}">
+                <div class="Innew-text wow animated bounceInLeft animated">
+                    <p class="title">{$ft.title}</p>
+                    <div class="more">
+                        <a href="{$ft.link}" target="_blank">
+                            {:lang_i18n('查看所有')} <i class="icon-right-svg"></i>
+                        </a>
+                    </div>
+                </div>
+            </div>
+            {/volist}
+        </div>
+        {/notempty}
+        <!-- 明星产品/热点产品 -->
+        {notempty name="featured_products"}
+        <div class="oidx-FP">
+            <div class="Inpro-text">
+                <p class="title">{:lang_i18n('明星产品/热点产品')}</p>
+            </div>
+            <div class="m_Container">
+                <div class="swiper-container FPswiper">
+                    <div class="swiper-wrapper text_center">
+                        {volist name="featured_products" id="fp"}
+                        <div class="swiper-slide inproimg ">
+                            <a href="{:url('product/detail',['id'=>$fp.id])}"><img src="{$fp.cover_image}" alt="" /></a>
+                            <div class="inprotext">
+                                <p class="text_center title">{$fp.name}</p>
+                                <p class="t-f16"></p>
+                                <p class="timeblue">
+                                    <a href="{:url('product/detail',['id'=>$fp.id])}">
+                                        {:lang_i18n('了解更多')} <img src="__IMAGES__/more-r.png">
+                                    </a>
+                                </p>
+                            </div>
+                        </div>
+                        {/volist}
+                    </div>
+                    <!-- 如果需要分页器 -->
+                    <div class="swiper-pagination"></div>
+                </div>
+            </div>
+        </div>
+        {/notempty}
+        <!-- 专题图片展示 -->
+        <div class="oidx-ztpictureshow">
+            <!-- 视频 -->
+            {notempty name="video"}
+            <div class="vedio_in">
+                <img src="{$video.image}" />
+                <iframe class="margin-top-20" width="100%" style="z-index:9999;"
+                    src="{$video.video}" title="YouTube video player" frameborder="0"
+                    allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
+                    allowfullscreen="" id="videoElement"></iframe>
+            </div>
+            {/notempty}
+            {notempty name="scenes"}
+            {volist name="scenes" id="sc"}
+            <div class="indocking">
+                <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_400 timedesin" {:style(['color'=>$sc['desc_txt_color']])}>{$sc.desc|raw}</p>
+                    <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>
+            </div>
+            {/volist}
+            {/notempty}
+        </div>
+        <!-- orico技术 -->
+        <div class="oidx-tcly">
+            <div class="Tech-text">
+                <h3>{:lang_i18n('Orico 技术')}</h3>
+                <p>{:lang_i18n('强大功能、简单使用')}</p>
+            </div>
+            <div class="section  section-blends section-full">
+                <div class="section-stack section-stack--center ">
+                    <div class="section-stack__main">
+                        <div class="before-after shadow  text-custom ba-slider">
+                            <img src="__IMAGES__/back-img01.jpg">
+                            <div class="resize">
+                                <img src="__IMAGES__/back-img02.jpg" style="width: 390px;">
+                            </div>
+                            <span class="handle"></span>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <!-- 品牌故事 -->
+        {notempty name="brand_story"}
+        <div class="oidx-times">
+            <section class="cd-horizontal-timeline loaded">
+                <div class="events-content">
+                    <ul>
+                        {volist name="brand_story" id="bs" key="k"}
+                        <li class="{eq name='k' value='1'}selected{/eq}">
+                            <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_400 timedesin" {:style(['color'=>$bs['desc_txt_color']])}>{$bs.desc|raw}</p>
+                                <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>
+                                </p>
+                            </div>
+                        </li>
+                        {/volist}
+                    </ul>
+                </div>
+                <div class="timeline">
+                    <div class="events-wrapper">
+                        <div class="events">
+                            <ol>
+                                {volist name="brand_story" id="bs" key="k"}
+                                <li>
+                                    <a class="{eq name='k' value='1'}selected{/eq}">{$bs.year}</a>
+                                </li>
+                                {/volist}
+                            </ol>
+                            <span class="filling-line"></span>
+                        </div>
+                    </div>
+                </div>
+            </section>
+        </div>
+        {/notempty}
+        <!-- 数据统计 -->
+        {notempty name="data_statistics"}
+        <div class="oidx-total">
+            <div class="num-bg clearfix">
+                <ul>
+                    {volist name="data_statistics" id="ds"}
+                    <li>
+                        <h3 {:style(['color'=>$ds['desc_txt_color']])}>{$ds.desc|raw}</h3>
+                        <p {:style(['color'=>$ds['title_txt_color']])}>{$ds.title}</p>
+                    </li>
+                    {/volist}
+                </ul>
+            </div>
+        </div>
+        {/notempty}
+        <!-- 文章轮播 -->
+        {notempty name="recommend_articles"}
+        <div class="oidx-imgqh">
+            <div class="swiper-container imgqhswiper">
+                <div class="swiper-wrapper">
+                    {volist name="recommend_articles" id="ra"}
+                    <div class="swiper-slide">
+                        <a href="{:url('article/detail', ['id' => $ra.id])}">
+                            <div class="title pos-text">{$ra.title|raw}</div>
+                            <img src="{$ra.image}" alt="" />
+                        </a>
+                    </div>
+                    {/volist}
+                </div>
+                <!-- 如果需要分页器 -->
+                <div class="swiper-pagination"></div>
+            </div>
+        </div>
+        {/notempty}
+        <!-- 常见问题 -->
+        {notempty name="recommend_faq"}
+        <div class="oidx-fqa">
+            <div class="faq">
+                <div class="faq-title ">
+                    <h3>{:lang_i18n('常见问题')}</h3>
+                    <h5>{:lang_i18n('回答您最关心的问题')}</h5>
+                    <p>{:lang_i18n('客服团队的工作时间：周一到周五，早9点到晚6点 平均应答时间：24小时内')}</p>
+                </div>
+                {volist name="recommend_faq" id="rq"}
+                <dl>
+                    <dt class="cursor_p">
+                        {$rq.question}<i class="rotate icon-add-svg"></i>
+                    </dt>
+                    <dd>{$rq.answer|raw}</dd>
+                </dl>
+                {/volist}
+            </div>
+        </div>
+        {/notempty}
+    </div>
+</div>
+{/block}
+{block name="script"}
+<script src="__JS__/before-after.min.js" type="text/javascript"></script>
+<script type="text/javascript">
+    //banner轮播
+    var bannerswiper = new Swiper('.bannerswiper', {
+        // 配置选项
+        loop: true,
+        autoplay: {
+            delay: 3000,
+        },
+        pagination: {
+            el: '.swiper-pagination',
+        }
+    });
+    // 分类轮播
+    var FPswiper = new Swiper(".FPswiper", {
+        loop: true, //允许从第一张到最后一张，或者从最后一张到第一张  循环属性
+        slidesPerView: 2, // 设置显示一张
+        centeredSlides: true, //使当前图片居中显示
+        centeredSlidesBounds: true, //使左右两边的图片始终贴合边缘
+        autoplay: true, //可选选项，自动滑动
+        initialSlide: 0, //默认显示第二张图片索引从0开始
+        speed: 2000, //设置过度时间
+        autoplay: false,
+    });
+    // 图片切换
+    var imgqhswiper = new Swiper('.imgqhswiper', {
+        loop: true, //允许从第一张到最后一张，或者从最后一张到第一张  循环属性
+        effect: 'coverflow', //轮播效果，coverflow覆盖流效果
+        slidesPerView: 2,
+        centeredSlides: true,
+        slidesOffsetBefore: 0, //偏移，使第一张图片向右偏移150px */
+        autoplay: true, //可选选项，自动滑动
+        speed: 2000, //设置过度时间
+        autoplay: true,
+        pagination: {
+            el: '.swiper-pagination',
+            clickable: true,
+            dynamicBullets: true,
+        },
+    });
+    $(function() {
+        //视频播放
+        var videos = $(".vedio_in");
+        videos.on("click", function() {
+            var elm = $(this),
+                conts = elm.contents(),
+                le = conts.length,
+                ifr = null;
+            for (var i = 0; i < le; i++) {
+                if (conts[i].nodeType == 8) ifr = conts[i].textContent;
+            }
+            elm.addClass("player").html(ifr);
+            elm.off("click");
+        });
+        // 图片覆盖左右移动
+        $('.before-after').beforeAfter();
+        // 为日期链接添加点击事件处理函数
+        $('.events a').on('click', function() {
+            // 移除所有日期链接的 selected 类
+            $('.events a').removeClass('selected');
+            // 移除所有内容列表项的 selected 类
+            $('.events-content li').removeClass('selected');
+            // 为当前点击的日期链接添加 selected 类
+            $(this).addClass('selected');
+            // 获取当前点击链接的索引
+            var index = $('.events a').index(this);
+            // 为对应的内容列表项添加 selected 类
+            $('.events-content li').eq(index).addClass('selected');
+        });
+        // fqa
+        // 为所有带有 cursor_p 类的 dt 元素添加点击事件处理函数
+        $('.cursor_p').on('click', function() {
+            // 切换对应的 dd 元素的显示和隐藏状态
+            $(this).next('dd').slideToggle(400);
+            // 获取当前 dt 元素内的图标元素
+            var icon = $(this).find('i');
+            // 切换图标类名
+            if (icon.hasClass('icon-add-svg')) {
+                icon.removeClass('icon-add-svg').addClass('icon-jian-svg');
+            } else {
+                icon.removeClass('icon-jian-svg').addClass('icon-add-svg');
+            }
+        });
+
+        // 判断年份
+         // 计算.timeline下的li元素数量
+        var liCount = $('.timeline ol li').length;
+        
+        // 如果有li元素，则设置a标签的宽度
+        if (liCount > 0) {
+            var widthPerItem = (100 / liCount-0.3) + '%';
+            $('.timeline ol li a').css('width', widthPerItem);
+        }
+    });
+</script>
+{/block}

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

@@ -0,0 +1,93 @@
+{extend name="public/base" /}
+{block name="style"}
+<link rel="stylesheet" type="text/css" href="__CSS__/product_category.css" />
+{/block}
+{block name="main"}
+<div class="oricoEGapp">
+    <!-- banner轮播图 -->
+    {notempty name="focus_image"}
+    <div>
+        {volist name="focus_image" id="fi"}
+		<a {notempty name="fi.link" }href="{$fi.link}"{/notempty}>
+			<img src="{$fi.image}" style="width: 100%;margin-top: 3.5rem;"/>
+		</a>
+		{/volist}
+    </div>
+    {/notempty}
+    <div class="oricoEGapp-catelists">
+        <!-- 二级分类导航 -->
+        <div class="first_list_category">
+            <div class="scroller">
+                <ul class="clearfix">
+                    {volist name="list" id="vo"}
+                    <li>
+                        <a href="{:url('product/subcategory', ['id' => $vo.id])}">
+                            <div class="category_list">
+                                <p>{$vo.name}</p>
+                            </div>
+                        </a>
+                    </li>
+                    {/volist}
+                </ul>
+            </div>
+        </div>
+        <!-- 二级分类几个产品展示 -->
+        {volist name="list" id="vo"}
+        <div class="m_Container">
+            <div class="product_list_title">
+                <div class="product_title">{$vo.name}</div>
+                <a href="{:url('product/subcategory', ['id' => $vo.id])}" class="view_all text_gray">
+                    {:lang_i18n('查看全部')}<span class="icon-Double-Arrow"></span>
+                </a>
+            </div>
+            <div class="product_list">
+                {notempty name="vo.products"}
+                <ul>
+                    {volist name="vo.products" id="pro" length="4"}
+                    <li class="img-responsive">
+                        <a href="{:url('product/detail', ['id' => $pro.id])}">
+                            <img src="{:thumb($pro.cover_image)}">
+                            <span class="title">{$pro.name}</span>
+                            <span class="subtitle">{$pro.spu}</span>
+                        </a>
+                    </li>
+                    {/volist}
+                </ul>
+                {/notempty}
+            </div>
+        </div>
+        {/volist}
+    </div>
+</div>
+{/block}
+{block name="script"}
+<script type="text/javascript">
+    // 自定义 navbarscroll 方法
+    $(function() {
+        let startX = 0;
+        let isDragging = false;
+        let currentLi;
+        $('.scroller ul li').on('mousedown touchstart', function(e) {
+            startX = e.type === 'touchstart' ? e.originalEvent.touches[0].clientX : e.clientX;
+            isDragging = true;
+            currentLi = $(this);
+        });
+        $(document).on('mousemove touchmove', function(e) {
+            if (isDragging) {
+                const currentX = e.type === 'touchmove' ? e.originalEvent.touches[0].clientX : e.clientX;
+                const diffX = currentX - startX;
+                if (diffX > 20) { // 设定一个最小滑动距离，这里设为20像素
+                    // 右滑操作
+                    $('.scroller ul li').removeClass('cur');
+                    currentLi.addClass('cur');
+                    // 这里可以添加更多右滑后要执行的操作，例如显示对应内容
+                    isDragging = false;
+                }
+            }
+        });
+        $(document).on('mouseup touchend', function() {
+            isDragging = false;
+        });
+    });
+</script>
+{/block}

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

@@ -0,0 +1,273 @@
+{extend name="public/base" /}
+{block name="title"}
+    {notempty name="product.seo_title"}<title>{$product.seo_title}</title>{else /}{__BLOCK__}{/notempty}
+{/block}
+{block name="seo"}
+    {notempty name="product.seo_keywords"}
+    <meta name="keywords" content="{$product.seo_keywords}" />
+    <meta name="description" content="{$product.seo_desc}" />
+    {else/}
+    {__BLOCK__}
+    {/notempty}
+{/block}
+{block name="style"}
+<link rel="stylesheet" type="text/css" href="__CSS__/product_detail.css" />
+{/block}
+{block name="main"}
+<div class="oricoEGapp">
+    <!--产品详情-->
+    <div class="oricoEGapp-prdetail">
+        <div class="m_Container margin-top-90">
+            <div class="goods_address">
+                <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>
+        <!--产品轮播图 -->
+        {notempty name="product_skus"}
+        <div class="m_Container oricodtail-pdetailimgs">
+            {volist name="product_skus" id="sku" key="idx"}
+            <div class="swiper-container pdetailswiper" data-index="{$idx}" {neq name="idx" value="1"}style="display: none;"{/neq}>
+                <div class="swiper-wrapper">
+                    {volist name="sku.photo_album" id="photo"}
+                    <div class="swiper-slide">
+                        <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>
+            </div>
+            {/volist}
+        </div>
+        {/notempty}
+        <!-- 规格参数 -->
+        <div class="m_Container">
+            <!-- 颜色/属性 -->
+            {notempty name="product_sku_attrs"}
+            <div class="slideTxtBox">
+                <div class="hd clearfix">
+                    {volist name="product_sku_attrs" id="ps"}
+                    <div class="dt attr_type">
+                        <span>{$ps.attr_name}</span>
+                        {notempty name="ps.attr_values"}
+                        <ul class="hd clearfix">
+                            {volist name="ps.attr_values" id="pv" key="pk"}
+                            {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}">
+                            {else/}
+                            <li class="attr_value tip1 attr_item_defalut" data-index="{$pk}">
+                            {/between}
+                                {eq name="attr_value_type" value="IMAGE"}
+                                <span class="co-bg"><img src="{$pv.attr_value}" /></span>
+                                {elseif condition="$attr_value_type == 'RGB'" /}
+                                <span class="co-bg" {:style(['background-color'=>$pv.attr_value])}></span>
+                                {else/}
+                                <span>{$pv.attr_value}</span>
+                                {/eq}
+                            </li>
+                            {/volist}
+                        </ul>
+                        {/notempty}
+                    </div>
+                    {/volist}
+                </div>
+            </div>
+            {/notempty}
+            <div class="goods_all_title">
+                <div class="title">{$product.name}</div>
+            </div>
+            {notempty name="product_params"}
+            <div class="proTfg">
+                <ul class="msul swt-Table">
+                    <li class="Table-Row">
+                        <div class="ms1 Table-Cell">{:lang_i18n('型号')}</div>
+                        <div class="ms2 Table-Cell"></div>
+                        <div class="ms3 Table-Cell">{$product.spu}</div>
+                    </li>
+                    {volist name="product_params" id="param"}
+                    <li class="Table-Row">
+                        <div class="ms1 Table-Cell">{$param.name}</div>
+                        <div class="ms2 Table-Cell"></div>
+                        <div class="ms3 Table-Cell">{$param.value}</div>
+                    </li>
+                    {/volist}
+                </ul>
+            </div>
+            {/notempty}
+            <div class="platform_buy">
+                {eq name=":cookie('think_lang')" value="en-us"}
+                <a class="btn-blue-detail business-button">{:lang_i18n('发送查询')}</a>
+                {/eq}
+            </div>
+        </div>
+        <!-- 产品描述 -->
+        <div class="goods_details">
+            <ul class="cpa des cursor_p">
+                <li class="active" id="one">{:lang_i18n('产品描述')}</li>
+                {notempty name="product_related"}
+                <li onclick="javascript:location.href='#related'">{:lang_i18n('关联产品')}</li>
+                {/notempty}
+                <div class="clear"></div>
+            </ul>
+        </div>
+        <!-- 产品图片-->
+        <div class="goods_des img-responsives" id="description-tab">{$product.detail|raw}</div>
+        <!-- 关联产品-->
+        {notempty name="product_related"}
+        <div class="glcplist" id="related">
+            {volist name="product_related" id="rel"}
+            <div class="glcpitem">
+                <a href="{:url('product/detail', ['id'=>$rel.id])}">
+                    <img src="{:thumb($rel.cover_image)}" class="glcpimg" />
+                    <span class="glt1">{$rel.name}</span>
+                    <span class="glt2">{$rel.spu}</span>
+                </a>
+            </div>
+            {/volist}
+        </div>
+        {/notempty}
+        <!-- 弹窗-->
+        <div class="marsk-container-detail">
+            <div class="popup-quick">
+                <div class="title-text">{:lang_i18n('发送查询')}</div>
+                <div class="business-close"><img src="__IMAGES__/close2.png"></div>
+                <form action="" method="post" autocomplete="off" class="apply_content">
+                    <div class="detail_form">
+                        <div>
+                            <p><strong class="redstr">*</strong>{:lang_i18n('姓名')}</p>
+                            <div class="name clearfix">
+                                <input type="text" class="first detail-w02" placeholder="{:lang_i18n('请输入您的名称')}"
+                                    name="first_name" id="firstname" style="margin-right:0.5rem;">
+                                <input type="text" class="first detail-w02" placeholder="{:lang_i18n('请输入您的姓氏')}"
+                                    name="last_name" id="lastname">
+                            </div>
+                        </div>
+                        <div class=" clearfix">
+                            <p><strong class="redstr">*</strong>{:lang_i18n('公司/组织')}</p>
+                            <div class="redstr">
+                                <input type="text" class="first detail-w01" id="companyName" name="company_name">
+                            </div>
+                        </div>
+                        <div class=" clearfix">
+                            <p><strong class="redstr">*</strong>{:lang_i18n('邮箱')}</p>
+                            <div class="redstr">
+                                <input type="text" class="first detail-w01" id="email" name="email">
+                            </div>
+                        </div>
+                        <div class=" clearfix">
+                            <p><strong class="redstr">*</strong>{:lang_i18n('电话号码')}</p>
+                            <div class="redstr">
+                                <input type="text" class="first detail-w01" id="phone" name="phone">
+                            </div>
+                        </div>
+                        <div class="clearfix">
+                            <p><strong class="redstr">*</strong>{:lang_i18n('国家')}</p>
+                            <div class="redstr">
+                                <select class=" detail-w01" id="country" name="corp_name">
+                                    <option value="">--- {:lang_i18n('请选择所属国家')} ---</option>
+                                    {volist name="country_list" id="country"}
+                                    <option value="{$country}">{$country}</option>
+                                    {/volist}
+                                </select>
+                            </div>
+                        </div>
+                        <div class=" clearfix">
+                            <p><strong class="redstr">*</strong>{:lang_i18n('行业')}</p>
+                            <div class="redstr">
+                                <input type="text" class="first detail-w01" id="industry" name="industry">
+                            </div>
+                        </div>
+                        <div class=" clearfix">
+                            <p><strong style="color: red;">*</strong>{:lang_i18n('询问内容')}</p>
+                            <div>
+                                <textarea rows="3" cols="20" class="first detail-w01" id="message" name="message"></textarea>
+                            </div>
+                        </div>
+                        <div class="submit_btn" id="send">{:lang_i18n('提交')}</div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+</div>
+{/block}
+{block name="script"}
+<script type="text/javascript">
+    //产品图片轮播
+    var pdetailswiper = new Swiper('.pdetailswiper', {
+        // 配置选项
+        loop: true,
+        autoplay: {
+            delay: 3000,
+        },
+        pagination: {
+            el: '.swiper-pagination',
+        }
+    });
+    $(function() {
+        $('.business-button').click(function() {
+            $('.marsk-container-detail').show()
+        })
+        $('.business-close').click(function() {
+            $('.marsk-container-detail').hide()
+        })
+        // 产品描述和关联产品切换
+        $('.cpa li').on('click', function() {
+            $(this).siblings().removeClass('active');
+            $(this).addClass('active'); 
+            const targetTab = $(this).data('tab');
+            $('.tab-pane').hide();
+            if (targetTab === 'description') {
+              $('#description-tab').show();
+            } else if (targetTab === 'related') {
+              $('#description-tab').hide();
+            }
+        });
+        // 根据颜色切换图册
+        $('.attr_type').find('.attr_value').click(function() {
+            var index = $(this).data('index');
+            $('.pdetailswiper').hide();
+            $('.pdetailswiper[data-index="' + index + '"]').show();
+            $('.attr_value').removeClass('attr_item_on');
+            $(this).addClass('attr_item_on');
+        });
+
+        // 提交产品询价查询
+        // 提交询盘
+        $('#send').click(function() {
+            var form = $(this).parents('form');
+            $.ajax({
+                url: "{:url('product/inquiry')}",
+                type: 'POST',
+                data: form.serialize(),
+                success: function(r) {
+                    if (r.code == 0) {
+                        form[0].reset(); // 重置表单
+                        modal.hide();
+                    }
+                    alert(r.msg);
+                },
+                error: function(e) {
+                    console.error(e);
+                }
+            })
+        });
+    })
+</script>
+{/block}

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

@@ -0,0 +1,45 @@
+{extend name="public/base" /}
+{block name="style"}
+<link rel="stylesheet" type="text/css" href="__CSS__/product_newpro.css" />
+{/block}
+{block name="main"}
+<div class="oricoEGapp">
+    <div class="oricoEGapp-newarrival">
+        <!-- 顶部产品图-->
+        {notempty name="focus_image"}
+        {volist name="focus_image" id="fo"}
+        <a {notempty name="fo.link" }href="{$fo.link}"{/notempty}>
+            <img src="{$fo.image}" class="ona-topimg" />
+        </a>
+        {/volist}
+        {/notempty}
+        <!-- 产品列表 -->
+        {notempty name="newpros"}
+        <div class="ona-prlist">
+            {volist name="newpros" id="vo"}
+            <div class="m_Container">
+                <div class="product_list_title">
+                    <div class="product_title">{$vo.category.name|default=''}</div>
+                </div>
+                <div class="product_list">
+                    {notempty name="vo.products"}
+                    <ul>
+                        {volist name="vo.products" id="pro"}
+                        <li class="img-responsive">
+                            <a href="{:url('product/detail', ['id' => $pro.id])}">
+                                <img src="{:thumb($pro.cover_image)}">
+                                <span class="title">{$pro.name}</span>
+                                <span class="subtitle">{$pro.spu}</span>
+                            </a>
+                        </li>
+                        {/volist}
+                    </ul>
+                    {/notempty}
+                </div>
+            </div>
+            {/volist}
+        </div>
+        {/notempty}
+    </div>
+</div>
+{/block}