diff --git a/admin/src/addon/zhjw/api/hello_world.ts b/admin/src/addon/zhjw/api/hello_world.ts
new file mode 100644
index 00000000..637367ec
--- /dev/null
+++ b/admin/src/addon/zhjw/api/hello_world.ts
@@ -0,0 +1,7 @@
+
+import request from '@/utils/request'
+
+/***************************************************** hello world ****************************************************/
+export function getHelloWorld() {
+    return request.get(`zhjw/hello_world`)
+}
\ No newline at end of file
diff --git a/admin/src/addon/zhjw/lang/zh-cn/hello_world.index.json b/admin/src/addon/zhjw/lang/zh-cn/hello_world.index.json
new file mode 100644
index 00000000..0967ef42
--- /dev/null
+++ b/admin/src/addon/zhjw/lang/zh-cn/hello_world.index.json
@@ -0,0 +1 @@
+{}
diff --git a/admin/src/addon/zhjw/views/hello_world/index.vue b/admin/src/addon/zhjw/views/hello_world/index.vue
new file mode 100644
index 00000000..6d12da31
--- /dev/null
+++ b/admin/src/addon/zhjw/views/hello_world/index.vue
@@ -0,0 +1,17 @@
+<template>
+  <span class="text-[20px]">{{hello_world_text}}</span>
+</template>
+
+<script lang="ts" setup>
+import { ref } from 'vue'
+import { getHelloWorld } from '@/addon/zhjw/api/hello_world'
+
+const hello_world_text = ref('');
+const getHelloWorldInfo = async () => {
+  hello_world_text.value = await (await getHelloWorld()).data
+}
+getHelloWorldInfo()
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/niucloud/addon/zhjw/Addon.php b/niucloud/addon/zhjw/Addon.php
new file mode 100644
index 00000000..2f9c385b
--- /dev/null
+++ b/niucloud/addon/zhjw/Addon.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace addon\zhjw;
+
+
+/**
+ * 插件安装之后单独的插件方法
+ */
+class Addon
+{
+    /**
+     * 插件安装执行
+     */
+    public function install()
+    {
+
+        return true;
+    }
+
+    /**
+     * 插件卸载执行
+     */
+    public function uninstall()
+    {
+        return true;
+    }
+
+    /**
+     * 插件升级执行
+     */
+    public function upgrade()
+    {
+        return true;
+    }
+
+}
diff --git a/niucloud/addon/zhjw/admin/api/hello_world.ts b/niucloud/addon/zhjw/admin/api/hello_world.ts
new file mode 100644
index 00000000..637367ec
--- /dev/null
+++ b/niucloud/addon/zhjw/admin/api/hello_world.ts
@@ -0,0 +1,7 @@
+
+import request from '@/utils/request'
+
+/***************************************************** hello world ****************************************************/
+export function getHelloWorld() {
+    return request.get(`zhjw/hello_world`)
+}
\ No newline at end of file
diff --git a/niucloud/addon/zhjw/admin/lang/zh-cn/hello_world.index.json b/niucloud/addon/zhjw/admin/lang/zh-cn/hello_world.index.json
new file mode 100644
index 00000000..0967ef42
--- /dev/null
+++ b/niucloud/addon/zhjw/admin/lang/zh-cn/hello_world.index.json
@@ -0,0 +1 @@
+{}
diff --git a/niucloud/addon/zhjw/admin/views/hello_world/index.vue b/niucloud/addon/zhjw/admin/views/hello_world/index.vue
new file mode 100644
index 00000000..6d12da31
--- /dev/null
+++ b/niucloud/addon/zhjw/admin/views/hello_world/index.vue
@@ -0,0 +1,17 @@
+<template>
+  <span class="text-[20px]">{{hello_world_text}}</span>
+</template>
+
+<script lang="ts" setup>
+import { ref } from 'vue'
+import { getHelloWorld } from '@/addon/zhjw/api/hello_world'
+
+const hello_world_text = ref('');
+const getHelloWorldInfo = async () => {
+  hello_world_text.value = await (await getHelloWorld()).data
+}
+getHelloWorldInfo()
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/niucloud/addon/zhjw/app/adminapi/controller/hello_world/Index.php b/niucloud/addon/zhjw/app/adminapi/controller/hello_world/Index.php
new file mode 100644
index 00000000..ff596e11
--- /dev/null
+++ b/niucloud/addon/zhjw/app/adminapi/controller/hello_world/Index.php
@@ -0,0 +1,29 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\zhjw\app\adminapi\controller\hello_world;
+
+use core\base\BaseAdminController;
+use think\Response;
+
+class Index extends BaseAdminController
+{
+    /**
+     * Hello World
+     * @return Response
+     */
+    public function index()
+    {
+        return success('SUCCESS', 'Hello World');
+    }
+
+
+}
diff --git a/niucloud/addon/zhjw/app/adminapi/route/route.php b/niucloud/addon/zhjw/app/adminapi/route/route.php
new file mode 100644
index 00000000..bdcf880e
--- /dev/null
+++ b/niucloud/addon/zhjw/app/adminapi/route/route.php
@@ -0,0 +1,30 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+use think\facade\Route;
+
+use app\adminapi\middleware\AdminCheckRole;
+use app\adminapi\middleware\AdminCheckToken;
+use app\adminapi\middleware\AdminLog;
+
+/**
+ * 智慧教务系统
+ */
+Route::group('zhjw', function () {
+
+     /***************************************************** hello world ****************************************************/
+    Route::get('hello_world', 'addon\zhjw\app\adminapi\controller\hello_world\Index@index');
+
+})->middleware([
+    AdminCheckToken::class,
+    AdminCheckRole::class,
+    AdminLog::class
+]);
\ No newline at end of file
diff --git a/niucloud/addon/zhjw/app/api/controller/hello_world/Index.php b/niucloud/addon/zhjw/app/api/controller/hello_world/Index.php
new file mode 100644
index 00000000..4f2aa9c2
--- /dev/null
+++ b/niucloud/addon/zhjw/app/api/controller/hello_world/Index.php
@@ -0,0 +1,27 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+namespace addon\zhjw\app\api\controller\hello_world;
+
+use core\base\BaseApiController;
+use think\Response;
+
+class Index extends BaseApiController
+{
+    /**
+     * Hello World
+     * @return Response
+     */
+    public function index()
+    {
+        return success('SUCCESS', 'Hello World');
+    }
+}
diff --git a/niucloud/addon/zhjw/app/api/route/route.php b/niucloud/addon/zhjw/app/api/route/route.php
new file mode 100644
index 00000000..cf2015c0
--- /dev/null
+++ b/niucloud/addon/zhjw/app/api/route/route.php
@@ -0,0 +1,36 @@
+<?php
+// +----------------------------------------------------------------------
+// | Niucloud-admin 企业快速开发的多应用管理平台
+// +----------------------------------------------------------------------
+// | 官方网址：https://www.niucloud.com
+// +----------------------------------------------------------------------
+// | niucloud团队 版权所有 开源版本可自由商用
+// +----------------------------------------------------------------------
+// | Author: Niucloud Team
+// +----------------------------------------------------------------------
+
+use app\api\middleware\ApiCheckToken;
+use app\api\middleware\ApiLog;
+use app\api\middleware\ApiChannel;
+use think\facade\Route;
+
+
+/**
+ * 智慧教务系统
+ */
+Route::group('zhjw', function() {
+    /***************************************************** hello world ****************************************************/
+    Route::get('hello_world', 'addon\zhjw\app\api\controller\hello_world\Index@index');
+
+})->middleware(ApiChannel::class)
+    ->middleware(ApiCheckToken::class, false) //false表示不验证登录
+    ->middleware(ApiLog::class);
+
+
+
+Route::group('zhjw', function() {
+
+})->middleware(ApiChannel::class)
+    ->middleware(ApiCheckToken::class, true) //表示验证登录
+    ->middleware(ApiLog::class);
+
diff --git a/niucloud/addon/zhjw/app/dict/menu/admin.php b/niucloud/addon/zhjw/app/dict/menu/admin.php
new file mode 100644
index 00000000..81559a5b
--- /dev/null
+++ b/niucloud/addon/zhjw/app/dict/menu/admin.php
@@ -0,0 +1,33 @@
+<?php
+
+return  [
+    [
+        'menu_name' => '智慧教务系统',
+        'menu_key' => 'zhjw',
+        'menu_type' => 0,
+        'icon' => '',
+        'api_url' => '',
+        'router_path' => '',
+        'view_path' => '',
+        'methods' => '',
+        'sort' => 100,
+        'status' => 1,
+        'is_show' => 1,
+        'children' => [
+            [
+                'menu_name' => '智慧教务系统',
+                'menu_key' => 'zhjw_hello_world',
+                'menu_type' => 1,
+                'icon' => '',
+                'api_url' => 'zhjw/hello_world',
+                'router_path' => 'zhjw/hello_world',
+                'view_path' => 'hello_world/index',
+                'methods' => 'get',
+                'sort' => 100,
+                'status' => 1,
+                'is_show' => 1,
+                'children' => []
+            ],
+        ]
+    ]
+];
diff --git a/niucloud/addon/zhjw/app/event.php b/niucloud/addon/zhjw/app/event.php
new file mode 100644
index 00000000..ab1f4604
--- /dev/null
+++ b/niucloud/addon/zhjw/app/event.php
@@ -0,0 +1,12 @@
+<?php
+
+return [
+    'bind' => [
+
+    ],
+    'listen' => [
+
+    ],
+    'subscribe' => [
+    ],
+];
\ No newline at end of file
diff --git a/niucloud/addon/zhjw/app/lang/en/api.php b/niucloud/addon/zhjw/app/lang/en/api.php
new file mode 100644
index 00000000..6dd35523
--- /dev/null
+++ b/niucloud/addon/zhjw/app/lang/en/api.php
@@ -0,0 +1,4 @@
+<?php
+
+return [
+];
\ No newline at end of file
diff --git a/niucloud/addon/zhjw/app/lang/en/dict.php b/niucloud/addon/zhjw/app/lang/en/dict.php
new file mode 100644
index 00000000..6dd35523
--- /dev/null
+++ b/niucloud/addon/zhjw/app/lang/en/dict.php
@@ -0,0 +1,4 @@
+<?php
+
+return [
+];
\ No newline at end of file
diff --git a/niucloud/addon/zhjw/app/lang/en/validate.php b/niucloud/addon/zhjw/app/lang/en/validate.php
new file mode 100644
index 00000000..6dd35523
--- /dev/null
+++ b/niucloud/addon/zhjw/app/lang/en/validate.php
@@ -0,0 +1,4 @@
+<?php
+
+return [
+];
\ No newline at end of file
diff --git a/niucloud/addon/zhjw/app/lang/zh-cn/api.php b/niucloud/addon/zhjw/app/lang/zh-cn/api.php
new file mode 100644
index 00000000..6dd35523
--- /dev/null
+++ b/niucloud/addon/zhjw/app/lang/zh-cn/api.php
@@ -0,0 +1,4 @@
+<?php
+
+return [
+];
\ No newline at end of file
diff --git a/niucloud/addon/zhjw/app/lang/zh-cn/dict.php b/niucloud/addon/zhjw/app/lang/zh-cn/dict.php
new file mode 100644
index 00000000..6dd35523
--- /dev/null
+++ b/niucloud/addon/zhjw/app/lang/zh-cn/dict.php
@@ -0,0 +1,4 @@
+<?php
+
+return [
+];
\ No newline at end of file
diff --git a/niucloud/addon/zhjw/app/lang/zh-cn/validate.php b/niucloud/addon/zhjw/app/lang/zh-cn/validate.php
new file mode 100644
index 00000000..6dd35523
--- /dev/null
+++ b/niucloud/addon/zhjw/app/lang/zh-cn/validate.php
@@ -0,0 +1,4 @@
+<?php
+
+return [
+];
\ No newline at end of file
diff --git a/niucloud/addon/zhjw/info.json b/niucloud/addon/zhjw/info.json
new file mode 100644
index 00000000..66caf4cc
--- /dev/null
+++ b/niucloud/addon/zhjw/info.json
@@ -0,0 +1,11 @@
+{
+  "title": "智慧教务系统",
+  "desc": "智慧教务系统",
+  "key": "zhjw",
+  "version": "1.0.0",
+  "author": "836164388@qq.com",
+  "type": "app",
+  "support_app": "",
+  "compile":[],
+  "support_version": "1.5.1"
+}
diff --git a/niucloud/addon/zhjw/package/uni-app-pages.php b/niucloud/addon/zhjw/package/uni-app-pages.php
new file mode 100644
index 00000000..e315f636
--- /dev/null
+++ b/niucloud/addon/zhjw/package/uni-app-pages.php
@@ -0,0 +1,19 @@
+<?php
+return [
+    'pages' => <<<EOT
+            // PAGE_BEGIN
+            // *********************************** {{addon_name}} ***********************************
+            {
+                "root": "addon/{{addon_name}}",
+                "pages": [
+                    {
+                        "path": "pages/hello_world/index",
+                        "style": {
+                            "navigationBarTitleText": "%{{addon_name}}.pages.hello_world.index%"
+                        }
+                    }
+                ]
+            },
+            // PAGE_END
+EOT
+];
diff --git a/niucloud/addon/zhjw/resource/cover.png b/niucloud/addon/zhjw/resource/cover.png
new file mode 100644
index 00000000..428e3141
Binary files /dev/null and b/niucloud/addon/zhjw/resource/cover.png differ
diff --git a/niucloud/addon/zhjw/resource/icon.png b/niucloud/addon/zhjw/resource/icon.png
new file mode 100644
index 00000000..428e3141
Binary files /dev/null and b/niucloud/addon/zhjw/resource/icon.png differ
diff --git a/niucloud/addon/zhjw/sql/install.sql b/niucloud/addon/zhjw/sql/install.sql
new file mode 100644
index 00000000..e69de29b
diff --git a/niucloud/addon/zhjw/sql/uninstall.sql b/niucloud/addon/zhjw/sql/uninstall.sql
new file mode 100644
index 00000000..e69de29b
diff --git a/niucloud/addon/zhjw/uni-app/api/hello_world.ts b/niucloud/addon/zhjw/uni-app/api/hello_world.ts
new file mode 100644
index 00000000..cf5b8aa1
--- /dev/null
+++ b/niucloud/addon/zhjw/uni-app/api/hello_world.ts
@@ -0,0 +1,8 @@
+
+import request from '@/utils/request'
+
+/***************************************************** hello world ****************************************************/
+export function getHelloWorld() {
+    return request.get(`zhjw/hello_world`)
+}
+
diff --git a/niucloud/addon/zhjw/uni-app/locale/en.json b/niucloud/addon/zhjw/uni-app/locale/en.json
new file mode 100644
index 00000000..311847da
--- /dev/null
+++ b/niucloud/addon/zhjw/uni-app/locale/en.json
@@ -0,0 +1,2 @@
+{}
+
diff --git a/niucloud/addon/zhjw/uni-app/locale/zh-Hans.json b/niucloud/addon/zhjw/uni-app/locale/zh-Hans.json
new file mode 100644
index 00000000..311847da
--- /dev/null
+++ b/niucloud/addon/zhjw/uni-app/locale/zh-Hans.json
@@ -0,0 +1,2 @@
+{}
+
diff --git a/niucloud/addon/zhjw/uni-app/locale/zh-Hans/pages.hello_world.index.json b/niucloud/addon/zhjw/uni-app/locale/zh-Hans/pages.hello_world.index.json
new file mode 100644
index 00000000..311847da
--- /dev/null
+++ b/niucloud/addon/zhjw/uni-app/locale/zh-Hans/pages.hello_world.index.json
@@ -0,0 +1,2 @@
+{}
+
diff --git a/niucloud/addon/zhjw/uni-app/pages/hello_world/index.vue b/niucloud/addon/zhjw/uni-app/pages/hello_world/index.vue
new file mode 100644
index 00000000..5adac7af
--- /dev/null
+++ b/niucloud/addon/zhjw/uni-app/pages/hello_world/index.vue
@@ -0,0 +1,18 @@
+<template>
+	<text class="text-[20px]">{{helloWorld}}</text>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue';
+import { getHelloWorld } from '@/addon/zhjw/api/hello_world'
+import { onLoad } from '@dcloudio/uni-app'
+let helloWorld = ref('');
+onLoad(() => {
+    getHelloWorld().then((res) => {
+        helloWorld.value = res.data
+    })
+})
+</script>
+<style lang="scss" scoped>
+
+</style>
diff --git a/niucloud/addon/zhjw/web/api/hello_world.ts b/niucloud/addon/zhjw/web/api/hello_world.ts
new file mode 100644
index 00000000..ee46c94e
--- /dev/null
+++ b/niucloud/addon/zhjw/web/api/hello_world.ts
@@ -0,0 +1,8 @@
+
+/**
+ * hello world
+ */
+export function getHelloWorld() {
+    return request.get('zhjw/hello_world')
+}
+
diff --git a/niucloud/addon/zhjw/web/lang/zh-cn/hello_world.index.json b/niucloud/addon/zhjw/web/lang/zh-cn/hello_world.index.json
new file mode 100644
index 00000000..9e26dfee
--- /dev/null
+++ b/niucloud/addon/zhjw/web/lang/zh-cn/hello_world.index.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/niucloud/addon/zhjw/web/lang/zh-cn/pages.json b/niucloud/addon/zhjw/web/lang/zh-cn/pages.json
new file mode 100644
index 00000000..91446311
--- /dev/null
+++ b/niucloud/addon/zhjw/web/lang/zh-cn/pages.json
@@ -0,0 +1,9 @@
+{
+    "pages": {
+        "zhjw": {
+            "hello_world": {
+                "index": "hello_world"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/niucloud/addon/zhjw/web/pages/hello_world/index.vue b/niucloud/addon/zhjw/web/pages/hello_world/index.vue
new file mode 100644
index 00000000..7f7c8e5b
--- /dev/null
+++ b/niucloud/addon/zhjw/web/pages/hello_world/index.vue
@@ -0,0 +1,15 @@
+<template>
+		<span class="text-[24px]">{{hello_world_text}}</span>
+</template>
+
+<script lang="ts" setup>
+import { ref } from 'vue'
+import { getHelloWorld } from '@/addon/zhjw/api/hello_world'
+
+const hello_world_text = ref('');
+
+getHelloWorld().then(res => {
+    hello_world_text.value = res.data;
+})
+</script>
+<style lang="scss" scoped></style>
diff --git a/niucloud/addon/zhjw/web/pages/routes.ts b/niucloud/addon/zhjw/web/pages/routes.ts
new file mode 100644
index 00000000..70657d57
--- /dev/null
+++ b/niucloud/addon/zhjw/web/pages/routes.ts
@@ -0,0 +1,6 @@
+export default [
+    {
+        path: "/zhjw/hello_world/index",
+        component: () => import('~/addon/zhjw/pages/hello_world/index.vue')
+    }
+]
diff --git a/niucloud/public/addon/shop/attachment/200x200_active_cube_01.png b/niucloud/public/addon/shop/attachment/200x200_active_cube_01.png
new file mode 100644
index 00000000..b0cf834b
Binary files /dev/null and b/niucloud/public/addon/shop/attachment/200x200_active_cube_01.png differ
diff --git a/niucloud/public/addon/shop/attachment/200x200_active_cube_02.png b/niucloud/public/addon/shop/attachment/200x200_active_cube_02.png
new file mode 100644
index 00000000..44407910
Binary files /dev/null and b/niucloud/public/addon/shop/attachment/200x200_active_cube_02.png differ
diff --git a/niucloud/public/addon/shop/attachment/200x200_active_cube_03.png b/niucloud/public/addon/shop/attachment/200x200_active_cube_03.png
new file mode 100644
index 00000000..cdb92b39
Binary files /dev/null and b/niucloud/public/addon/shop/attachment/200x200_active_cube_03.png differ
diff --git a/niucloud/public/addon/shop/attachment/200x200_active_cube_04.png b/niucloud/public/addon/shop/attachment/200x200_active_cube_04.png
new file mode 100644
index 00000000..0e8183a7
Binary files /dev/null and b/niucloud/public/addon/shop/attachment/200x200_active_cube_04.png differ
diff --git a/niucloud/public/addon/shop/attachment/200x200_active_cube_05.png b/niucloud/public/addon/shop/attachment/200x200_active_cube_05.png
new file mode 100644
index 00000000..e020f05a
Binary files /dev/null and b/niucloud/public/addon/shop/attachment/200x200_active_cube_05.png differ
diff --git a/niucloud/public/addon/shop/attachment/200x200_active_cube_06.png b/niucloud/public/addon/shop/attachment/200x200_active_cube_06.png
new file mode 100644
index 00000000..4cded563
Binary files /dev/null and b/niucloud/public/addon/shop/attachment/200x200_active_cube_06.png differ
diff --git a/niucloud/public/addon/shop/attachment/200x200_active_cube_07.png b/niucloud/public/addon/shop/attachment/200x200_active_cube_07.png
new file mode 100644
index 00000000..6cc7c2f5
Binary files /dev/null and b/niucloud/public/addon/shop/attachment/200x200_active_cube_07.png differ
diff --git a/niucloud/public/addon/shop/attachment/200x200_active_cube_08.png b/niucloud/public/addon/shop/attachment/200x200_active_cube_08.png
new file mode 100644
index 00000000..ecba51b4
Binary files /dev/null and b/niucloud/public/addon/shop/attachment/200x200_active_cube_08.png differ
diff --git a/niucloud/public/addon/shop/attachment/200x200_image_ads_01.png b/niucloud/public/addon/shop/attachment/200x200_image_ads_01.png
new file mode 100644
index 00000000..ddee3cae
Binary files /dev/null and b/niucloud/public/addon/shop/attachment/200x200_image_ads_01.png differ
diff --git a/niucloud/public/addon/shop/attachment/200x200_nav_sow_community.png b/niucloud/public/addon/shop/attachment/200x200_nav_sow_community.png
new file mode 100644
index 00000000..1f219277
Binary files /dev/null and b/niucloud/public/addon/shop/attachment/200x200_nav_sow_community.png differ
diff --git a/niucloud/public/addon/zhjw/cover.png b/niucloud/public/addon/zhjw/cover.png
new file mode 100644
index 00000000..428e3141
Binary files /dev/null and b/niucloud/public/addon/zhjw/cover.png differ
diff --git a/niucloud/public/addon/zhjw/icon.png b/niucloud/public/addon/zhjw/icon.png
new file mode 100644
index 00000000..428e3141
Binary files /dev/null and b/niucloud/public/addon/zhjw/icon.png differ
diff --git a/niucloud/runtime/cache/01/c8e2ef1c2c504601d752e81c5f8f57.php b/niucloud/runtime/cache/01/c8e2ef1c2c504601d752e81c5f8f57.php
new file mode 100644
index 00000000..4c8109fa
--- /dev/null
+++ b/niucloud/runtime/cache/01/c8e2ef1c2c504601d752e81c5f8f57.php
@@ -0,0 +1,4 @@
+<?php
+//000000000000
+ exit();?>
+-1
\ No newline at end of file
diff --git a/niucloud/runtime/cache/04/a77b15025b2c34a79ecfe786681739.php b/niucloud/runtime/cache/04/a77b15025b2c34a79ecfe786681739.php
new file mode 100644
index 00000000..1616b942
--- /dev/null
+++ b/niucloud/runtime/cache/04/a77b15025b2c34a79ecfe786681739.php
@@ -0,0 +1,4 @@
+<?php
+//000000000000
+ exit();?>
+a:6:{s:2:"id";i:2;s:10:"config_key";s:23:"START_UP_PAGE_DIY_INDEX";s:5:"value";a:6:{s:4:"type";s:9:"DIY_INDEX";s:4:"name";s:10:"SHOP_INDEX";s:6:"parent";s:9:"SHOP_LINK";s:4:"page";s:23:"/addon/shop/pages/index";s:5:"title";s:24:"dict_diy.shop_link_index";s:6:"action";s:8:"decorate";}s:6:"status";i:1;s:11:"create_time";s:19:"2025-03-04 09:13:36";s:11:"update_time";s:19:"2025-03-04 09:13:36";}
\ No newline at end of file
diff --git a/niucloud/runtime/cache/2c/e25dcb326df717900650d384ad7cf0.php b/niucloud/runtime/cache/2c/e25dcb326df717900650d384ad7cf0.php
deleted file mode 100644
index a1912793..00000000
--- a/niucloud/runtime/cache/2c/e25dcb326df717900650d384ad7cf0.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-//000000000000
- exit();?>
-a:3:{i:0;s:88:"D:\phpstudy_pro\WWW\niushop\niucloud\runtime\cache\8d\4b55ce338f9b3a100a33ac8e8243e8.php";i:1;s:88:"D:\phpstudy_pro\WWW\niushop\niucloud\runtime\cache\20\336a007c8134208722cf4e14270f07.php";i:2;s:88:"D:\phpstudy_pro\WWW\niushop\niucloud\runtime\cache\32\0a87fb2f5a7e9725055a2c99bd1e51.php";}
\ No newline at end of file
diff --git a/niucloud/runtime/cache/52/d44be2ad665ecbf618377422b91c6d.php b/niucloud/runtime/cache/52/d44be2ad665ecbf618377422b91c6d.php
new file mode 100644
index 00000000..4a216178
--- /dev/null
+++ b/niucloud/runtime/cache/52/d44be2ad665ecbf618377422b91c6d.php
@@ -0,0 +1,4 @@
+<?php
+//000000000300
+ exit();?>
+a:2:{s:9:"secretKey";s:16:"hfk4kwq8r6p7ucrq";s:5:"point";O:27:"Fastknife\Domain\Vo\PointVo":2:{s:1:"x";i:179;s:1:"y";i:5;}}
\ No newline at end of file
diff --git a/niucloud/runtime/cache/59/6906eba8db5ea13aeb60bbd2e93269.php b/niucloud/runtime/cache/59/6906eba8db5ea13aeb60bbd2e93269.php
new file mode 100644
index 00000000..78ecd9a9
--- /dev/null
+++ b/niucloud/runtime/cache/59/6906eba8db5ea13aeb60bbd2e93269.php
@@ -0,0 +1,4 @@
+<?php
+//000000000300
+ exit();?>
+a:2:{s:9:"secretKey";s:16:"tzex4hnus36vtgyn";s:5:"point";O:27:"Fastknife\Domain\Vo\PointVo":2:{s:1:"x";i:181;s:1:"y";i:5;}}
\ No newline at end of file
diff --git a/niucloud/runtime/cache/60/20f2824b87d39008be5a28cef5ef03.php b/niucloud/runtime/cache/60/20f2824b87d39008be5a28cef5ef03.php
index dd001d4c..ea47cb6d 100644
--- a/niucloud/runtime/cache/60/20f2824b87d39008be5a28cef5ef03.php
+++ b/niucloud/runtime/cache/60/20f2824b87d39008be5a28cef5ef03.php
@@ -1,4 +1,4 @@
 <?php
 //000000000000
  exit();?>
-a:11:{i:0;s:88:"D:\phpstudy_pro\WWW\niushop\niucloud\runtime\cache\8d\edc20f770c6500c52ce13d6f306b10.php";i:1;s:88:"D:\phpstudy_pro\WWW\niushop\niucloud\runtime\cache\f0\8f735f0ec7f9eccc3e70aa516d941d.php";i:2;s:88:"D:\phpstudy_pro\WWW\niushop\niucloud\runtime\cache\47\0f6e29f334d3244ee0749eb9b1a151.php";i:3;s:88:"D:\phpstudy_pro\WWW\niushop\niucloud\runtime\cache\bd\359a5364051f6c84d65c787bf23f9a.php";i:4;s:88:"D:\phpstudy_pro\WWW\niushop\niucloud\runtime\cache\f4\073ed8013d62bb2e0f768418925e4d.php";i:5;s:88:"D:\phpstudy_pro\WWW\niushop\niucloud\runtime\cache\c8\a5c3cd9f43d503a892ec0eaeb9ab08.php";i:6;s:88:"D:\phpstudy_pro\WWW\niushop\niucloud\runtime\cache\a0\81b1d0c6234fbc717b33719be823a2.php";i:7;s:88:"D:\phpstudy_pro\WWW\niushop\niucloud\runtime\cache\95\228e6be1c6483f594d6d736cba9335.php";i:8;s:88:"D:\phpstudy_pro\WWW\niushop\niucloud\runtime\cache\8f\7fdd2caa2302a943c6b21d4b077526.php";i:9;s:88:"D:\phpstudy_pro\WWW\niushop\niucloud\runtime\cache\21\6e30a16639b283b1efa6b98838867b.php";i:10;s:88:"D:\phpstudy_pro\WWW\niushop\niucloud\runtime\cache\85\c6bb2855c5978a0ab5483ed7646a3b.php";}
\ No newline at end of file
+a:16:{i:0;s:88:"D:\phpstudy_pro\WWW\niushop\niucloud\runtime\cache\8d\edc20f770c6500c52ce13d6f306b10.php";i:1;s:88:"D:\phpstudy_pro\WWW\niushop\niucloud\runtime\cache\f0\8f735f0ec7f9eccc3e70aa516d941d.php";i:2;s:88:"D:\phpstudy_pro\WWW\niushop\niucloud\runtime\cache\47\0f6e29f334d3244ee0749eb9b1a151.php";i:3;s:88:"D:\phpstudy_pro\WWW\niushop\niucloud\runtime\cache\bd\359a5364051f6c84d65c787bf23f9a.php";i:4;s:88:"D:\phpstudy_pro\WWW\niushop\niucloud\runtime\cache\f4\073ed8013d62bb2e0f768418925e4d.php";i:5;s:88:"D:\phpstudy_pro\WWW\niushop\niucloud\runtime\cache\c8\a5c3cd9f43d503a892ec0eaeb9ab08.php";i:6;s:88:"D:\phpstudy_pro\WWW\niushop\niucloud\runtime\cache\a0\81b1d0c6234fbc717b33719be823a2.php";i:7;s:88:"D:\phpstudy_pro\WWW\niushop\niucloud\runtime\cache\95\228e6be1c6483f594d6d736cba9335.php";i:8;s:88:"D:\phpstudy_pro\WWW\niushop\niucloud\runtime\cache\8f\7fdd2caa2302a943c6b21d4b077526.php";i:9;s:88:"D:\phpstudy_pro\WWW\niushop\niucloud\runtime\cache\21\6e30a16639b283b1efa6b98838867b.php";i:10;s:88:"D:\phpstudy_pro\WWW\niushop\niucloud\runtime\cache\85\c6bb2855c5978a0ab5483ed7646a3b.php";i:11;s:121:"D:\DeveloperApp\phpstudy_pro\WWW\NiuCloud_ZhiHuiJiaoWu_Admin\niucloud\runtime\cache\01\c8e2ef1c2c504601d752e81c5f8f57.php";i:12;s:121:"D:\DeveloperApp\phpstudy_pro\WWW\NiuCloud_ZhiHuiJiaoWu_Admin\niucloud\runtime\cache\04\a77b15025b2c34a79ecfe786681739.php";i:13;s:121:"D:\DeveloperApp\phpstudy_pro\WWW\NiuCloud_ZhiHuiJiaoWu_Admin\niucloud\runtime\cache\ed\b6cf0da7ae6bc4e108cde29a092460.php";i:14;s:121:"D:\DeveloperApp\phpstudy_pro\WWW\NiuCloud_ZhiHuiJiaoWu_Admin\niucloud\runtime\cache\c0\2ea470914e2a1b4422c74fb53b3fb7.php";i:15;s:121:"D:\DeveloperApp\phpstudy_pro\WWW\NiuCloud_ZhiHuiJiaoWu_Admin\niucloud\runtime\cache\96\42cea4fc1e386bb972a5e5dec82fda.php";}
\ No newline at end of file
diff --git a/niucloud/runtime/cache/7e/a633578462c9bc9f474ad990ba553d.php b/niucloud/runtime/cache/7e/a633578462c9bc9f474ad990ba553d.php
deleted file mode 100644
index b979fdf4..00000000
--- a/niucloud/runtime/cache/7e/a633578462c9bc9f474ad990ba553d.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-//000000000000
- exit();?>
-a:1:{i:0;s:88:"D:\phpstudy_pro\WWW\niushop\niucloud\runtime\cache\11\96761b4a84f0e988872166216d02cd.php";}
\ No newline at end of file
diff --git a/niucloud/runtime/cache/8d/fdacbfbb7ae58ba988054e909e2307.php b/niucloud/runtime/cache/8d/fdacbfbb7ae58ba988054e909e2307.php
index a4964dda..e41e1ea6 100644
--- a/niucloud/runtime/cache/8d/fdacbfbb7ae58ba988054e909e2307.php
+++ b/niucloud/runtime/cache/8d/fdacbfbb7ae58ba988054e909e2307.php
@@ -1,4 +1,4 @@
 <?php
 //000000000000
  exit();?>
-a:3:{i:0;s:264:"eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1aWQiOjEsInVzZXJuYW1lIjoiYWRtaW4iLCJpc3MiOiJzaG9wYWRtaW4uY2MiLCJhdWQiOiJzaG9wYWRtaW4uY2MiLCJpYXQiOjE3NDEwMDc3MDIsIm5iZiI6MTc0MTAwNzcwMiwiZXhwIjoxNzQxNjEyNTAyLCJqdGkiOiIxX2FkbWluIn0.ARwVjIYCdNUSwEmmm1KhrY1zKEWhRME0j26HM_GUNc4";i:1;s:264:"eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1aWQiOjEsInVzZXJuYW1lIjoiYWRtaW4iLCJpc3MiOiJzaG9wYWRtaW4uY2MiLCJhdWQiOiJzaG9wYWRtaW4uY2MiLCJpYXQiOjE3NDEwNTA4MTYsIm5iZiI6MTc0MTA1MDgxNiwiZXhwIjoxNzQxNjU1NjE2LCJqdGkiOiIxX2FkbWluIn0.aZLpv4RBIlBCbnnqV9oXk9kC5AgdKHTUYiS3CCBSAqw";i:2;s:264:"eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1aWQiOjEsInVzZXJuYW1lIjoiYWRtaW4iLCJpc3MiOiJzaG9wYWRtaW4uY2MiLCJhdWQiOiJzaG9wYWRtaW4uY2MiLCJpYXQiOjE3NDEwNTE0MTksIm5iZiI6MTc0MTA1MTQxOSwiZXhwIjoxNzQxNjU2MjE5LCJqdGkiOiIxX2FkbWluIn0.znLMCEfxdiRUIwiCBFah2d4cMlkJAazGbfAPU2C4bfo";}
\ No newline at end of file
+a:4:{i:0;s:264:"eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1aWQiOjEsInVzZXJuYW1lIjoiYWRtaW4iLCJpc3MiOiJzaG9wYWRtaW4uY2MiLCJhdWQiOiJzaG9wYWRtaW4uY2MiLCJpYXQiOjE3NDEwMDc3MDIsIm5iZiI6MTc0MTAwNzcwMiwiZXhwIjoxNzQxNjEyNTAyLCJqdGkiOiIxX2FkbWluIn0.ARwVjIYCdNUSwEmmm1KhrY1zKEWhRME0j26HM_GUNc4";i:1;s:264:"eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1aWQiOjEsInVzZXJuYW1lIjoiYWRtaW4iLCJpc3MiOiJzaG9wYWRtaW4uY2MiLCJhdWQiOiJzaG9wYWRtaW4uY2MiLCJpYXQiOjE3NDEwNTA4MTYsIm5iZiI6MTc0MTA1MDgxNiwiZXhwIjoxNzQxNjU1NjE2LCJqdGkiOiIxX2FkbWluIn0.aZLpv4RBIlBCbnnqV9oXk9kC5AgdKHTUYiS3CCBSAqw";i:2;s:264:"eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1aWQiOjEsInVzZXJuYW1lIjoiYWRtaW4iLCJpc3MiOiJzaG9wYWRtaW4uY2MiLCJhdWQiOiJzaG9wYWRtaW4uY2MiLCJpYXQiOjE3NDEwNTE0MTksIm5iZiI6MTc0MTA1MTQxOSwiZXhwIjoxNzQxNjU2MjE5LCJqdGkiOiIxX2FkbWluIn0.znLMCEfxdiRUIwiCBFah2d4cMlkJAazGbfAPU2C4bfo";i:3;s:251:"eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1aWQiOjEsInVzZXJuYW1lIjoiYWRtaW4iLCJpc3MiOiJ6aGp3LmNjIiwiYXVkIjoiemhqdy5jYyIsImlhdCI6MTc0MTE1NjA1NSwibmJmIjoxNzQxMTU2MDU1LCJleHAiOjE3NDE3NjA4NTUsImp0aSI6IjFfYWRtaW4ifQ.Wt0Rfttva_ld-or-b7Ya5UI6TIJsTpu7ZyBIjXNJAsw";}
\ No newline at end of file
diff --git a/niucloud/runtime/cache/96/42cea4fc1e386bb972a5e5dec82fda.php b/niucloud/runtime/cache/96/42cea4fc1e386bb972a5e5dec82fda.php
new file mode 100644
index 00000000..4c8109fa
--- /dev/null
+++ b/niucloud/runtime/cache/96/42cea4fc1e386bb972a5e5dec82fda.php
@@ -0,0 +1,4 @@
+<?php
+//000000000000
+ exit();?>
+-1
\ No newline at end of file
diff --git a/niucloud/runtime/cache/9f/d2f37875d1da637002182ec566f162.php b/niucloud/runtime/cache/9f/d2f37875d1da637002182ec566f162.php
index cdb8fd4e..c1223740 100644
--- a/niucloud/runtime/cache/9f/d2f37875d1da637002182ec566f162.php
+++ b/niucloud/runtime/cache/9f/d2f37875d1da637002182ec566f162.php
@@ -1,4 +1,4 @@
 <?php
 //000000000000
  exit();?>
-a:1:{i:0;s:88:"D:\phpstudy_pro\WWW\niushop\niucloud\runtime\cache\8d\fdacbfbb7ae58ba988054e909e2307.php";}
\ No newline at end of file
+a:2:{i:0;s:88:"D:\phpstudy_pro\WWW\niushop\niucloud\runtime\cache\8d\fdacbfbb7ae58ba988054e909e2307.php";i:1;s:121:"D:\DeveloperApp\phpstudy_pro\WWW\NiuCloud_ZhiHuiJiaoWu_Admin\niucloud\runtime\cache\8d\fdacbfbb7ae58ba988054e909e2307.php";}
\ No newline at end of file
diff --git a/niucloud/runtime/cache/c0/2ea470914e2a1b4422c74fb53b3fb7.php b/niucloud/runtime/cache/c0/2ea470914e2a1b4422c74fb53b3fb7.php
new file mode 100644
index 00000000..4c8109fa
--- /dev/null
+++ b/niucloud/runtime/cache/c0/2ea470914e2a1b4422c74fb53b3fb7.php
@@ -0,0 +1,4 @@
+<?php
+//000000000000
+ exit();?>
+-1
\ No newline at end of file
diff --git a/niucloud/runtime/cache/ed/b6cf0da7ae6bc4e108cde29a092460.php b/niucloud/runtime/cache/ed/b6cf0da7ae6bc4e108cde29a092460.php
new file mode 100644
index 00000000..4c8109fa
--- /dev/null
+++ b/niucloud/runtime/cache/ed/b6cf0da7ae6bc4e108cde29a092460.php
@@ -0,0 +1,4 @@
+<?php
+//000000000000
+ exit();?>
+-1
\ No newline at end of file
diff --git a/uni-app/.babelrc b/uni-app/.babelrc
new file mode 100644
index 00000000..8aa924d7
--- /dev/null
+++ b/uni-app/.babelrc
@@ -0,0 +1,3 @@
+{
+  "presets": ["@babel/preset-env"]
+}
\ No newline at end of file
diff --git a/uni-app/.env.development b/uni-app/.env.development
new file mode 100644
index 00000000..2cb61c2c
--- /dev/null
+++ b/uni-app/.env.development
@@ -0,0 +1,19 @@
+NODE_ENV = 'development'
+
+# api请求地址
+VITE_APP_BASE_URL=''
+
+# 图片服务器地址
+VITE_IMG_DOMAIN=''
+
+# 本地存储时token的参数名
+VITE_REQUEST_STORAGE_TOKEN_KEY='wapToken'
+
+# 请求时header中token的参数名
+VITE_REQUEST_HEADER_TOKEN_KEY='token'
+
+# 请求时header中来源场景的参数名
+VITE_REQUEST_HEADER_CHANNEL_KEY='channel'
+
+# 应用版本
+VITE_APP_VERSION='1.0.1'
diff --git a/uni-app/.env.production b/uni-app/.env.production
new file mode 100644
index 00000000..d8528875
--- /dev/null
+++ b/uni-app/.env.production
@@ -0,0 +1,19 @@
+NODE_ENV = 'production'
+
+# api请求地址
+VITE_APP_BASE_URL=''
+
+# 图片服务器地址
+VITE_IMG_DOMAIN=''
+
+# 本地存储时token的参数名
+VITE_REQUEST_STORAGE_TOKEN_KEY='wapToken'
+
+# 请求时header中token的参数名
+VITE_REQUEST_HEADER_TOKEN_KEY='token'
+
+# 请求时header中来源场景的参数名
+VITE_REQUEST_HEADER_CHANNEL_KEY='channel'
+
+# 应用版本
+VITE_APP_VERSION='1.0.1'
diff --git a/uni-app/.gitignore b/uni-app/.gitignore
new file mode 100644
index 00000000..69c9a5b2
--- /dev/null
+++ b/uni-app/.gitignore
@@ -0,0 +1,21 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+.DS_Store
+dist
+*.local
+
+# Editor directories and files
+.idea
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
diff --git a/uni-app/index.html b/uni-app/index.html
new file mode 100644
index 00000000..f73e7300
--- /dev/null
+++ b/uni-app/index.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html lang="zh-cn">
+    <head>
+        <meta charset="UTF-8" />
+        <script>
+            var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
+                CSS.supports('top: constant(a)'))
+            document.write(
+                '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
+                (coverSupport ? ', viewport-fit=cover' : '') + '" />')
+        </script>
+        <title></title>
+        <!--preload-links-->
+        <!--app-context-->
+    </head>
+    <body>
+        <div id="app"><!--app-html--></div>
+        <script type="module" src="/src/main.js"></script>
+    </body>
+</html>
diff --git a/uni-app/package-lock.json b/uni-app/package-lock.json
new file mode 100644
index 00000000..39b485dc
--- /dev/null
+++ b/uni-app/package-lock.json
@@ -0,0 +1,21880 @@
+{
+    "name": "uni-preset-vue",
+    "version": "0.0.0",
+    "lockfileVersion": 2,
+    "requires": true,
+    "packages": {
+        "": {
+            "name": "uni-preset-vue",
+            "version": "0.0.0",
+            "dependencies": {
+                "@dcloudio/uni-app": "3.0.0-3080720230703001",
+                "@dcloudio/uni-app-plus": "3.0.0-3080720230703001",
+                "@dcloudio/uni-components": "3.0.0-3080720230703001",
+                "@dcloudio/uni-h5": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-alipay": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-baidu": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-jd": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-kuaishou": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-lark": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-qq": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-toutiao": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-weixin": "3.0.0-3080720230703001",
+                "@dcloudio/uni-quickapp-webview": "3.0.0-3080720230703001",
+                "html2canvas": "^1.4.1",
+                "image-tools": "^1.4.0",
+                "lodash-es": "^4.17.21",
+                "pinia": "2.0.36",
+                "qrcode": "^1.5.1",
+                "qs": "6.7.0",
+                "sortablejs": "^1.15.0",
+                "uview-plus": "^3.1.29",
+                "vue": "^3.3.0",
+                "vue-i18n": "^9.2.2",
+                "weixin-js-sdk": "^1.6.5"
+            },
+            "devDependencies": {
+                "@dcasia/mini-program-tailwind-webpack-plugin": "^1.5.6",
+                "@dcloudio/types": "^3.3.2",
+                "@dcloudio/uni-automator": "3.0.0-3080720230703001",
+                "@dcloudio/uni-cli-shared": "3.0.0-3080720230703001",
+                "@dcloudio/uni-stacktracey": "3.0.0-3080720230703001",
+                "@dcloudio/vite-plugin-uni": "3.0.0-3080720230703001",
+                "@rollup/plugin-commonjs": "^24.0.1",
+                "@types/qrcode": "^1.5.0",
+                "@types/sortablejs": "^1.15.0",
+                "@vue/tsconfig": "^0.1.3",
+                "sass": "^1.54.5",
+                "typescript": "^4.9.4",
+                "vite": "4.0.4",
+                "vite-plugin-windicss": "^1.8.10",
+                "vue-tsc": "^1.0.24",
+                "windicss": "^3.5.6"
+            }
+        },
+        "node_modules/@ampproject/remapping": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmmirror.com/@ampproject/remapping/-/remapping-2.3.0.tgz",
+            "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
+            "dependencies": {
+                "@jridgewell/gen-mapping": "^0.3.5",
+                "@jridgewell/trace-mapping": "^0.3.24"
+            },
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
+        "node_modules/@antfu/utils": {
+            "version": "0.7.8",
+            "resolved": "https://registry.npmmirror.com/@antfu/utils/-/utils-0.7.8.tgz",
+            "integrity": "sha512-rWQkqXRESdjXtc+7NRfK9lASQjpXJu1ayp7qi1d23zZorY+wBHVLHHoVcMsEnkqEBWTFqbztO7/QdJFzyEcLTg==",
+            "dev": true
+        },
+        "node_modules/@babel/code-frame": {
+            "version": "7.24.2",
+            "resolved": "https://registry.npmmirror.com/@babel/code-frame/-/code-frame-7.24.2.tgz",
+            "integrity": "sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==",
+            "dependencies": {
+                "@babel/highlight": "^7.24.2",
+                "picocolors": "^1.0.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/compat-data": {
+            "version": "7.24.4",
+            "resolved": "https://registry.npmmirror.com/@babel/compat-data/-/compat-data-7.24.4.tgz",
+            "integrity": "sha512-vg8Gih2MLK+kOkHJp4gBEIkyaIi00jgWot2D9QOmmfLC8jINSOzmCLta6Bvz/JSBCqnegV0L80jhxkol5GWNfQ==",
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/core": {
+            "version": "7.24.5",
+            "resolved": "https://registry.npmmirror.com/@babel/core/-/core-7.24.5.tgz",
+            "integrity": "sha512-tVQRucExLQ02Boi4vdPp49svNGcfL2GhdTCT9aldhXgCJVAI21EtRfBettiuLUwce/7r6bFdgs6JFkcdTiFttA==",
+            "dependencies": {
+                "@ampproject/remapping": "^2.2.0",
+                "@babel/code-frame": "^7.24.2",
+                "@babel/generator": "^7.24.5",
+                "@babel/helper-compilation-targets": "^7.23.6",
+                "@babel/helper-module-transforms": "^7.24.5",
+                "@babel/helpers": "^7.24.5",
+                "@babel/parser": "^7.24.5",
+                "@babel/template": "^7.24.0",
+                "@babel/traverse": "^7.24.5",
+                "@babel/types": "^7.24.5",
+                "convert-source-map": "^2.0.0",
+                "debug": "^4.1.0",
+                "gensync": "^1.0.0-beta.2",
+                "json5": "^2.2.3",
+                "semver": "^6.3.1"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/generator": {
+            "version": "7.24.5",
+            "resolved": "https://registry.npmmirror.com/@babel/generator/-/generator-7.24.5.tgz",
+            "integrity": "sha512-x32i4hEXvr+iI0NEoEfDKzlemF8AmtOP8CcrRaEcpzysWuoEb1KknpcvMsHKPONoKZiDuItklgWhB18xEhr9PA==",
+            "dependencies": {
+                "@babel/types": "^7.24.5",
+                "@jridgewell/gen-mapping": "^0.3.5",
+                "@jridgewell/trace-mapping": "^0.3.25",
+                "jsesc": "^2.5.1"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-annotate-as-pure": {
+            "version": "7.22.5",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz",
+            "integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==",
+            "dev": true,
+            "dependencies": {
+                "@babel/types": "^7.22.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
+            "version": "7.22.15",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.15.tgz",
+            "integrity": "sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/types": "^7.22.15"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-compilation-targets": {
+            "version": "7.23.6",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz",
+            "integrity": "sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==",
+            "dependencies": {
+                "@babel/compat-data": "^7.23.5",
+                "@babel/helper-validator-option": "^7.23.5",
+                "browserslist": "^4.22.2",
+                "lru-cache": "^5.1.1",
+                "semver": "^6.3.1"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-create-class-features-plugin": {
+            "version": "7.24.5",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.5.tgz",
+            "integrity": "sha512-uRc4Cv8UQWnE4NXlYTIIdM7wfFkOqlFztcC/gVXDKohKoVB3OyonfelUBaJzSwpBntZ2KYGF/9S7asCHsXwW6g==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-annotate-as-pure": "^7.22.5",
+                "@babel/helper-environment-visitor": "^7.22.20",
+                "@babel/helper-function-name": "^7.23.0",
+                "@babel/helper-member-expression-to-functions": "^7.24.5",
+                "@babel/helper-optimise-call-expression": "^7.22.5",
+                "@babel/helper-replace-supers": "^7.24.1",
+                "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
+                "@babel/helper-split-export-declaration": "^7.24.5",
+                "semver": "^6.3.1"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0"
+            }
+        },
+        "node_modules/@babel/helper-create-regexp-features-plugin": {
+            "version": "7.22.15",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.15.tgz",
+            "integrity": "sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-annotate-as-pure": "^7.22.5",
+                "regexpu-core": "^5.3.1",
+                "semver": "^6.3.1"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0"
+            }
+        },
+        "node_modules/@babel/helper-define-polyfill-provider": {
+            "version": "0.6.2",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.2.tgz",
+            "integrity": "sha512-LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-compilation-targets": "^7.22.6",
+                "@babel/helper-plugin-utils": "^7.22.5",
+                "debug": "^4.1.1",
+                "lodash.debounce": "^4.0.8",
+                "resolve": "^1.14.2"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+            }
+        },
+        "node_modules/@babel/helper-environment-visitor": {
+            "version": "7.22.20",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
+            "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-function-name": {
+            "version": "7.23.0",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
+            "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
+            "dependencies": {
+                "@babel/template": "^7.22.15",
+                "@babel/types": "^7.23.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-hoist-variables": {
+            "version": "7.22.5",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
+            "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
+            "dependencies": {
+                "@babel/types": "^7.22.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-member-expression-to-functions": {
+            "version": "7.24.5",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.5.tgz",
+            "integrity": "sha512-4owRteeihKWKamtqg4JmWSsEZU445xpFRXPEwp44HbgbxdWlUV1b4Agg4lkA806Lil5XM/e+FJyS0vj5T6vmcA==",
+            "dev": true,
+            "dependencies": {
+                "@babel/types": "^7.24.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-module-imports": {
+            "version": "7.24.3",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-module-imports/-/helper-module-imports-7.24.3.tgz",
+            "integrity": "sha512-viKb0F9f2s0BCS22QSF308z/+1YWKV/76mwt61NBzS5izMzDPwdq1pTrzf+Li3npBWX9KdQbkeCt1jSAM7lZqg==",
+            "dependencies": {
+                "@babel/types": "^7.24.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-module-transforms": {
+            "version": "7.24.5",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-module-transforms/-/helper-module-transforms-7.24.5.tgz",
+            "integrity": "sha512-9GxeY8c2d2mdQUP1Dye0ks3VDyIMS98kt/llQ2nUId8IsWqTF0l1LkSX0/uP7l7MCDrzXS009Hyhe2gzTiGW8A==",
+            "dependencies": {
+                "@babel/helper-environment-visitor": "^7.22.20",
+                "@babel/helper-module-imports": "^7.24.3",
+                "@babel/helper-simple-access": "^7.24.5",
+                "@babel/helper-split-export-declaration": "^7.24.5",
+                "@babel/helper-validator-identifier": "^7.24.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0"
+            }
+        },
+        "node_modules/@babel/helper-optimise-call-expression": {
+            "version": "7.22.5",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz",
+            "integrity": "sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/types": "^7.22.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-plugin-utils": {
+            "version": "7.24.5",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.5.tgz",
+            "integrity": "sha512-xjNLDopRzW2o6ba0gKbkZq5YWEBaK3PCyTOY1K2P/O07LGMhMqlMXPxwN4S5/RhWuCobT8z0jrlKGlYmeR1OhQ==",
+            "dev": true,
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-remap-async-to-generator": {
+            "version": "7.22.20",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz",
+            "integrity": "sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-annotate-as-pure": "^7.22.5",
+                "@babel/helper-environment-visitor": "^7.22.20",
+                "@babel/helper-wrap-function": "^7.22.20"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0"
+            }
+        },
+        "node_modules/@babel/helper-replace-supers": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-replace-supers/-/helper-replace-supers-7.24.1.tgz",
+            "integrity": "sha512-QCR1UqC9BzG5vZl8BMicmZ28RuUBnHhAMddD8yHFHDRH9lLTZ9uUPehX8ctVPT8l0TKblJidqcgUUKGVrePleQ==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-environment-visitor": "^7.22.20",
+                "@babel/helper-member-expression-to-functions": "^7.23.0",
+                "@babel/helper-optimise-call-expression": "^7.22.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0"
+            }
+        },
+        "node_modules/@babel/helper-simple-access": {
+            "version": "7.24.5",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-simple-access/-/helper-simple-access-7.24.5.tgz",
+            "integrity": "sha512-uH3Hmf5q5n7n8mz7arjUlDOCbttY/DW4DYhE6FUsjKJ/oYC1kQQUvwEQWxRwUpX9qQKRXeqLwWxrqilMrf32sQ==",
+            "dependencies": {
+                "@babel/types": "^7.24.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
+            "version": "7.22.5",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz",
+            "integrity": "sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==",
+            "dev": true,
+            "dependencies": {
+                "@babel/types": "^7.22.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-split-export-declaration": {
+            "version": "7.24.5",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.5.tgz",
+            "integrity": "sha512-5CHncttXohrHk8GWOFCcCl4oRD9fKosWlIRgWm4ql9VYioKm52Mk2xsmoohvm7f3JoiLSM5ZgJuRaf5QZZYd3Q==",
+            "dependencies": {
+                "@babel/types": "^7.24.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-string-parser": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-string-parser/-/helper-string-parser-7.24.1.tgz",
+            "integrity": "sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==",
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-validator-identifier": {
+            "version": "7.24.5",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.5.tgz",
+            "integrity": "sha512-3q93SSKX2TWCG30M2G2kwaKeTYgEUp5Snjuj8qm729SObL6nbtUldAi37qbxkD5gg3xnBio+f9nqpSepGZMvxA==",
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-validator-option": {
+            "version": "7.23.5",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz",
+            "integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==",
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-wrap-function": {
+            "version": "7.24.5",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-wrap-function/-/helper-wrap-function-7.24.5.tgz",
+            "integrity": "sha512-/xxzuNvgRl4/HLNKvnFwdhdgN3cpLxgLROeLDl83Yx0AJ1SGvq1ak0OszTOjDfiB8Vx03eJbeDWh9r+jCCWttw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-function-name": "^7.23.0",
+                "@babel/template": "^7.24.0",
+                "@babel/types": "^7.24.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helpers": {
+            "version": "7.24.5",
+            "resolved": "https://registry.npmmirror.com/@babel/helpers/-/helpers-7.24.5.tgz",
+            "integrity": "sha512-CiQmBMMpMQHwM5m01YnrM6imUG1ebgYJ+fAIW4FZe6m4qHTPaRHti+R8cggAwkdz4oXhtO4/K9JWlh+8hIfR2Q==",
+            "dependencies": {
+                "@babel/template": "^7.24.0",
+                "@babel/traverse": "^7.24.5",
+                "@babel/types": "^7.24.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/highlight": {
+            "version": "7.24.5",
+            "resolved": "https://registry.npmmirror.com/@babel/highlight/-/highlight-7.24.5.tgz",
+            "integrity": "sha512-8lLmua6AVh/8SLJRRVD6V8p73Hir9w5mJrhE+IPpILG31KKlI9iz5zmBYKcWPS59qSfgP9RaSBQSHHE81WKuEw==",
+            "dependencies": {
+                "@babel/helper-validator-identifier": "^7.24.5",
+                "chalk": "^2.4.2",
+                "js-tokens": "^4.0.0",
+                "picocolors": "^1.0.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/parser": {
+            "version": "7.24.5",
+            "resolved": "https://registry.npmmirror.com/@babel/parser/-/parser-7.24.5.tgz",
+            "integrity": "sha512-EOv5IK8arwh3LI47dz1b0tKUb/1uhHAnHJOrjgtQMIpu1uXd9mlFrJg9IUgGUgZ41Ch0K8REPTYpO7B76b4vJg==",
+            "bin": {
+                "parser": "bin/babel-parser.js"
+            },
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
+        "node_modules/@babel/plugin-bugfix-firefox-class-in-computed-class-key": {
+            "version": "7.24.5",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.24.5.tgz",
+            "integrity": "sha512-LdXRi1wEMTrHVR4Zc9F8OewC3vdm5h4QB6L71zy6StmYeqGi1b3ttIO8UC+BfZKcH9jdr4aI249rBkm+3+YvHw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-environment-visitor": "^7.22.20",
+                "@babel/helper-plugin-utils": "^7.24.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0"
+            }
+        },
+        "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.24.1.tgz",
+            "integrity": "sha512-y4HqEnkelJIOQGd+3g1bTeKsA5c6qM7eOn7VggGVbBc0y8MLSKHacwcIE2PplNlQSj0PqS9rrXL/nkPVK+kUNg==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.24.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0"
+            }
+        },
+        "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.1.tgz",
+            "integrity": "sha512-Hj791Ii4ci8HqnaKHAlLNs+zaLXb0EzSDhiAWp5VNlyvCNymYfacs64pxTxbH1znW/NcArSmwpmG9IKE/TUVVQ==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.24.0",
+                "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
+                "@babel/plugin-transform-optional-chaining": "^7.24.1"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.13.0"
+            }
+        },
+        "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.24.1.tgz",
+            "integrity": "sha512-m9m/fXsXLiHfwdgydIFnpk+7jlVbnvlK5B2EKiPdLUb6WX654ZaaEWJUjk8TftRbZpK0XibovlLWX4KIZhV6jw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-environment-visitor": "^7.22.20",
+                "@babel/helper-plugin-utils": "^7.24.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0"
+            }
+        },
+        "node_modules/@babel/plugin-proposal-private-property-in-object": {
+            "version": "7.21.0-placeholder-for-preset-env.2",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz",
+            "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==",
+            "dev": true,
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-async-generators": {
+            "version": "7.8.4",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+            "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.8.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-bigint": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
+            "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.8.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-class-properties": {
+            "version": "7.12.13",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
+            "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.12.13"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-class-static-block": {
+            "version": "7.14.5",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
+            "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.14.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-dynamic-import": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
+            "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.8.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-export-namespace-from": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
+            "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.8.3"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-import-assertions": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.24.1.tgz",
+            "integrity": "sha512-IuwnI5XnuF189t91XbxmXeCDz3qs6iDRO7GJ++wcfgeXNs/8FmIlKcpDSXNVyuLQxlwvskmI3Ct73wUODkJBlQ==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.24.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-import-attributes": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.24.1.tgz",
+            "integrity": "sha512-zhQTMH0X2nVLnb04tz+s7AMuasX8U0FnpE+nHTOhSOINjWMnopoZTxtIKsd45n4GQ/HIZLyfIpoul8e2m0DnRA==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.24.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-import-meta": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
+            "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.10.4"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-json-strings": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+            "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.8.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-jsx": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.1.tgz",
+            "integrity": "sha512-2eCtxZXf+kbkMIsXS4poTvT4Yu5rXiRa+9xGVT56raghjmBTKMpFNc9R4IDiB4emao9eO22Ox7CxuJG7BgExqA==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.24.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
+            "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.10.4"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+            "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.8.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-numeric-separator": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
+            "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.10.4"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-object-rest-spread": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+            "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.8.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-optional-catch-binding": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+            "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.8.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-optional-chaining": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+            "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.8.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-private-property-in-object": {
+            "version": "7.14.5",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
+            "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.14.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-top-level-await": {
+            "version": "7.14.5",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
+            "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.14.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-typescript": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.24.1.tgz",
+            "integrity": "sha512-Yhnmvy5HZEnHUty6i++gcfH1/l68AHnItFHnaCv6hn9dNh0hQvvQJsxpi4BMBFN5DLeHBuucT/0DgzXif/OyRw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.24.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-unicode-sets-regex": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz",
+            "integrity": "sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-create-regexp-features-plugin": "^7.18.6",
+                "@babel/helper-plugin-utils": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-arrow-functions": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.1.tgz",
+            "integrity": "sha512-ngT/3NkRhsaep9ck9uj2Xhv9+xB1zShY3tM3g6om4xxCELwCDN4g4Aq5dRn48+0hasAql7s2hdBOysCfNpr4fw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.24.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-async-generator-functions": {
+            "version": "7.24.3",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.24.3.tgz",
+            "integrity": "sha512-Qe26CMYVjpQxJ8zxM1340JFNjZaF+ISWpr1Kt/jGo+ZTUzKkfw/pphEWbRCb+lmSM6k/TOgfYLvmbHkUQ0asIg==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-environment-visitor": "^7.22.20",
+                "@babel/helper-plugin-utils": "^7.24.0",
+                "@babel/helper-remap-async-to-generator": "^7.22.20",
+                "@babel/plugin-syntax-async-generators": "^7.8.4"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-async-to-generator": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.24.1.tgz",
+            "integrity": "sha512-AawPptitRXp1y0n4ilKcGbRYWfbbzFWz2NqNu7dacYDtFtz0CMjG64b3LQsb3KIgnf4/obcUL78hfaOS7iCUfw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-module-imports": "^7.24.1",
+                "@babel/helper-plugin-utils": "^7.24.0",
+                "@babel/helper-remap-async-to-generator": "^7.22.20"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-block-scoped-functions": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.1.tgz",
+            "integrity": "sha512-TWWC18OShZutrv9C6mye1xwtam+uNi2bnTOCBUd5sZxyHOiWbU6ztSROofIMrK84uweEZC219POICK/sTYwfgg==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.24.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-block-scoping": {
+            "version": "7.24.5",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.24.5.tgz",
+            "integrity": "sha512-sMfBc3OxghjC95BkYrYocHL3NaOplrcaunblzwXhGmlPwpmfsxr4vK+mBBt49r+S240vahmv+kUxkeKgs+haCw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.24.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-class-properties": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.24.1.tgz",
+            "integrity": "sha512-OMLCXi0NqvJfORTaPQBwqLXHhb93wkBKZ4aNwMl6WtehO7ar+cmp+89iPEQPqxAnxsOKTaMcs3POz3rKayJ72g==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-create-class-features-plugin": "^7.24.1",
+                "@babel/helper-plugin-utils": "^7.24.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-class-static-block": {
+            "version": "7.24.4",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.24.4.tgz",
+            "integrity": "sha512-B8q7Pz870Hz/q9UgP8InNpY01CSLDSCyqX7zcRuv3FcPl87A2G17lASroHWaCtbdIcbYzOZ7kWmXFKbijMSmFg==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-create-class-features-plugin": "^7.24.4",
+                "@babel/helper-plugin-utils": "^7.24.0",
+                "@babel/plugin-syntax-class-static-block": "^7.14.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.12.0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-classes": {
+            "version": "7.24.5",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.24.5.tgz",
+            "integrity": "sha512-gWkLP25DFj2dwe9Ck8uwMOpko4YsqyfZJrOmqqcegeDYEbp7rmn4U6UQZNj08UF6MaX39XenSpKRCvpDRBtZ7Q==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-annotate-as-pure": "^7.22.5",
+                "@babel/helper-compilation-targets": "^7.23.6",
+                "@babel/helper-environment-visitor": "^7.22.20",
+                "@babel/helper-function-name": "^7.23.0",
+                "@babel/helper-plugin-utils": "^7.24.5",
+                "@babel/helper-replace-supers": "^7.24.1",
+                "@babel/helper-split-export-declaration": "^7.24.5",
+                "globals": "^11.1.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-computed-properties": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.1.tgz",
+            "integrity": "sha512-5pJGVIUfJpOS+pAqBQd+QMaTD2vCL/HcePooON6pDpHgRp4gNRmzyHTPIkXntwKsq3ayUFVfJaIKPw2pOkOcTw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.24.0",
+                "@babel/template": "^7.24.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-destructuring": {
+            "version": "7.24.5",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.5.tgz",
+            "integrity": "sha512-SZuuLyfxvsm+Ah57I/i1HVjveBENYK9ue8MJ7qkc7ndoNjqquJiElzA7f5yaAXjyW2hKojosOTAQQRX50bPSVg==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.24.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-dotall-regex": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.24.1.tgz",
+            "integrity": "sha512-p7uUxgSoZwZ2lPNMzUkqCts3xlp8n+o05ikjy7gbtFJSt9gdU88jAmtfmOxHM14noQXBxfgzf2yRWECiNVhTCw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-create-regexp-features-plugin": "^7.22.15",
+                "@babel/helper-plugin-utils": "^7.24.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-duplicate-keys": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.24.1.tgz",
+            "integrity": "sha512-msyzuUnvsjsaSaocV6L7ErfNsa5nDWL1XKNnDePLgmz+WdU4w/J8+AxBMrWfi9m4IxfL5sZQKUPQKDQeeAT6lA==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.24.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-dynamic-import": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.24.1.tgz",
+            "integrity": "sha512-av2gdSTyXcJVdI+8aFZsCAtR29xJt0S5tas+Ef8NvBNmD1a+N/3ecMLeMBgfcK+xzsjdLDT6oHt+DFPyeqUbDA==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.24.0",
+                "@babel/plugin-syntax-dynamic-import": "^7.8.3"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-exponentiation-operator": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.24.1.tgz",
+            "integrity": "sha512-U1yX13dVBSwS23DEAqU+Z/PkwE9/m7QQy8Y9/+Tdb8UWYaGNDYwTLi19wqIAiROr8sXVum9A/rtiH5H0boUcTw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.15",
+                "@babel/helper-plugin-utils": "^7.24.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-export-namespace-from": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.24.1.tgz",
+            "integrity": "sha512-Ft38m/KFOyzKw2UaJFkWG9QnHPG/Q/2SkOrRk4pNBPg5IPZ+dOxcmkK5IyuBcxiNPyyYowPGUReyBvrvZs7IlQ==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.24.0",
+                "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-for-of": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.1.tgz",
+            "integrity": "sha512-OxBdcnF04bpdQdR3i4giHZNZQn7cm8RQKcSwA17wAAqEELo1ZOwp5FFgeptWUQXFyT9kwHo10aqqauYkRZPCAg==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.24.0",
+                "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-function-name": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.24.1.tgz",
+            "integrity": "sha512-BXmDZpPlh7jwicKArQASrj8n22/w6iymRnvHYYd2zO30DbE277JO20/7yXJT3QxDPtiQiOxQBbZH4TpivNXIxA==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-compilation-targets": "^7.23.6",
+                "@babel/helper-function-name": "^7.23.0",
+                "@babel/helper-plugin-utils": "^7.24.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-json-strings": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.24.1.tgz",
+            "integrity": "sha512-U7RMFmRvoasscrIFy5xA4gIp8iWnWubnKkKuUGJjsuOH7GfbMkB+XZzeslx2kLdEGdOJDamEmCqOks6e8nv8DQ==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.24.0",
+                "@babel/plugin-syntax-json-strings": "^7.8.3"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-literals": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.24.1.tgz",
+            "integrity": "sha512-zn9pwz8U7nCqOYIiBaOxoQOtYmMODXTJnkxG4AtX8fPmnCRYWBOHD0qcpwS9e2VDSp1zNJYpdnFMIKb8jmwu6g==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.24.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-logical-assignment-operators": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.24.1.tgz",
+            "integrity": "sha512-OhN6J4Bpz+hIBqItTeWJujDOfNP+unqv/NJgyhlpSqgBTPm37KkMmZV6SYcOj+pnDbdcl1qRGV/ZiIjX9Iy34w==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.24.0",
+                "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-member-expression-literals": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.24.1.tgz",
+            "integrity": "sha512-4ojai0KysTWXzHseJKa1XPNXKRbuUrhkOPY4rEGeR+7ChlJVKxFa3H3Bz+7tWaGKgJAXUWKOGmltN+u9B3+CVg==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.24.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-modules-amd": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.24.1.tgz",
+            "integrity": "sha512-lAxNHi4HVtjnHd5Rxg3D5t99Xm6H7b04hUS7EHIXcUl2EV4yl1gWdqZrNzXnSrHveL9qMdbODlLF55mvgjAfaQ==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-module-transforms": "^7.23.3",
+                "@babel/helper-plugin-utils": "^7.24.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-modules-commonjs": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.1.tgz",
+            "integrity": "sha512-szog8fFTUxBfw0b98gEWPaEqF42ZUD/T3bkynW/wtgx2p/XCP55WEsb+VosKceRSd6njipdZvNogqdtI4Q0chw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-module-transforms": "^7.23.3",
+                "@babel/helper-plugin-utils": "^7.24.0",
+                "@babel/helper-simple-access": "^7.22.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-modules-systemjs": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.24.1.tgz",
+            "integrity": "sha512-mqQ3Zh9vFO1Tpmlt8QPnbwGHzNz3lpNEMxQb1kAemn/erstyqw1r9KeOlOfo3y6xAnFEcOv2tSyrXfmMk+/YZA==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-hoist-variables": "^7.22.5",
+                "@babel/helper-module-transforms": "^7.23.3",
+                "@babel/helper-plugin-utils": "^7.24.0",
+                "@babel/helper-validator-identifier": "^7.22.20"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-modules-umd": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.24.1.tgz",
+            "integrity": "sha512-tuA3lpPj+5ITfcCluy6nWonSL7RvaG0AOTeAuvXqEKS34lnLzXpDb0dcP6K8jD0zWZFNDVly90AGFJPnm4fOYg==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-module-transforms": "^7.23.3",
+                "@babel/helper-plugin-utils": "^7.24.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
+            "version": "7.22.5",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz",
+            "integrity": "sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+                "@babel/helper-plugin-utils": "^7.22.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-new-target": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.24.1.tgz",
+            "integrity": "sha512-/rurytBM34hYy0HKZQyA0nHbQgQNFm4Q/BOc9Hflxi2X3twRof7NaE5W46j4kQitm7SvACVRXsa6N/tSZxvPug==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.24.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.24.1.tgz",
+            "integrity": "sha512-iQ+caew8wRrhCikO5DrUYx0mrmdhkaELgFa+7baMcVuhxIkN7oxt06CZ51D65ugIb1UWRQ8oQe+HXAVM6qHFjw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.24.0",
+                "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-numeric-separator": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.24.1.tgz",
+            "integrity": "sha512-7GAsGlK4cNL2OExJH1DzmDeKnRv/LXq0eLUSvudrehVA5Rgg4bIrqEUW29FbKMBRT0ztSqisv7kjP+XIC4ZMNw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.24.0",
+                "@babel/plugin-syntax-numeric-separator": "^7.10.4"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-object-rest-spread": {
+            "version": "7.24.5",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.5.tgz",
+            "integrity": "sha512-7EauQHszLGM3ay7a161tTQH7fj+3vVM/gThlz5HpFtnygTxjrlvoeq7MPVA1Vy9Q555OB8SnAOsMkLShNkkrHA==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-compilation-targets": "^7.23.6",
+                "@babel/helper-plugin-utils": "^7.24.5",
+                "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+                "@babel/plugin-transform-parameters": "^7.24.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-object-super": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.1.tgz",
+            "integrity": "sha512-oKJqR3TeI5hSLRxudMjFQ9re9fBVUU0GICqM3J1mi8MqlhVr6hC/ZN4ttAyMuQR6EZZIY6h/exe5swqGNNIkWQ==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.24.0",
+                "@babel/helper-replace-supers": "^7.24.1"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-optional-catch-binding": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.24.1.tgz",
+            "integrity": "sha512-oBTH7oURV4Y+3EUrf6cWn1OHio3qG/PVwO5J03iSJmBg6m2EhKjkAu/xuaXaYwWW9miYtvbWv4LNf0AmR43LUA==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.24.0",
+                "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-optional-chaining": {
+            "version": "7.24.5",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.5.tgz",
+            "integrity": "sha512-xWCkmwKT+ihmA6l7SSTpk8e4qQl/274iNbSKRRS8mpqFR32ksy36+a+LWY8OXCCEefF8WFlnOHVsaDI2231wBg==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.24.5",
+                "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
+                "@babel/plugin-syntax-optional-chaining": "^7.8.3"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-parameters": {
+            "version": "7.24.5",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.5.tgz",
+            "integrity": "sha512-9Co00MqZ2aoky+4j2jhofErthm6QVLKbpQrvz20c3CH9KQCLHyNB+t2ya4/UrRpQGR+Wrwjg9foopoeSdnHOkA==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.24.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-private-methods": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.24.1.tgz",
+            "integrity": "sha512-tGvisebwBO5em4PaYNqt4fkw56K2VALsAbAakY0FjTYqJp7gfdrgr7YX76Or8/cpik0W6+tj3rZ0uHU9Oil4tw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-create-class-features-plugin": "^7.24.1",
+                "@babel/helper-plugin-utils": "^7.24.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-private-property-in-object": {
+            "version": "7.24.5",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.5.tgz",
+            "integrity": "sha512-JM4MHZqnWR04jPMujQDTBVRnqxpLLpx2tkn7iPn+Hmsc0Gnb79yvRWOkvqFOx3Z7P7VxiRIR22c4eGSNj87OBQ==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-annotate-as-pure": "^7.22.5",
+                "@babel/helper-create-class-features-plugin": "^7.24.5",
+                "@babel/helper-plugin-utils": "^7.24.5",
+                "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-property-literals": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.1.tgz",
+            "integrity": "sha512-LetvD7CrHmEx0G442gOomRr66d7q8HzzGGr4PMHGr+5YIm6++Yke+jxj246rpvsbyhJwCLxcTn6zW1P1BSenqA==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.24.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-regenerator": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.24.1.tgz",
+            "integrity": "sha512-sJwZBCzIBE4t+5Q4IGLaaun5ExVMRY0lYwos/jNecjMrVCygCdph3IKv0tkP5Fc87e/1+bebAmEAGBfnRD+cnw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.24.0",
+                "regenerator-transform": "^0.15.2"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-reserved-words": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.24.1.tgz",
+            "integrity": "sha512-JAclqStUfIwKN15HrsQADFgeZt+wexNQ0uLhuqvqAUFoqPMjEcFCYZBhq0LUdz6dZK/mD+rErhW71fbx8RYElg==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.24.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-shorthand-properties": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.1.tgz",
+            "integrity": "sha512-LyjVB1nsJ6gTTUKRjRWx9C1s9hE7dLfP/knKdrfeH9UPtAGjYGgxIbFfx7xyLIEWs7Xe1Gnf8EWiUqfjLhInZA==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.24.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-spread": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.1.tgz",
+            "integrity": "sha512-KjmcIM+fxgY+KxPVbjelJC6hrH1CgtPmTvdXAfn3/a9CnWGSTY7nH4zm5+cjmWJybdcPSsD0++QssDsjcpe47g==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.24.0",
+                "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-sticky-regex": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.24.1.tgz",
+            "integrity": "sha512-9v0f1bRXgPVcPrngOQvLXeGNNVLc8UjMVfebo9ka0WF3/7+aVUHmaJVT3sa0XCzEFioPfPHZiOcYG9qOsH63cw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.24.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-template-literals": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.1.tgz",
+            "integrity": "sha512-WRkhROsNzriarqECASCNu/nojeXCDTE/F2HmRgOzi7NGvyfYGq1NEjKBK3ckLfRgGc6/lPAqP0vDOSw3YtG34g==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.24.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-typeof-symbol": {
+            "version": "7.24.5",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.5.tgz",
+            "integrity": "sha512-UTGnhYVZtTAjdwOTzT+sCyXmTn8AhaxOS/MjG9REclZ6ULHWF9KoCZur0HSGU7hk8PdBFKKbYe6+gqdXWz84Jg==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.24.5"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-typescript": {
+            "version": "7.24.5",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.24.5.tgz",
+            "integrity": "sha512-E0VWu/hk83BIFUWnsKZ4D81KXjN5L3MobvevOHErASk9IPwKHOkTgvqzvNo1yP/ePJWqqK2SpUR5z+KQbl6NVw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-annotate-as-pure": "^7.22.5",
+                "@babel/helper-create-class-features-plugin": "^7.24.5",
+                "@babel/helper-plugin-utils": "^7.24.5",
+                "@babel/plugin-syntax-typescript": "^7.24.1"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-unicode-escapes": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.24.1.tgz",
+            "integrity": "sha512-RlkVIcWT4TLI96zM660S877E7beKlQw7Ig+wqkKBiWfj0zH5Q4h50q6er4wzZKRNSYpfo6ILJ+hrJAGSX2qcNw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.24.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-unicode-property-regex": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.24.1.tgz",
+            "integrity": "sha512-Ss4VvlfYV5huWApFsF8/Sq0oXnGO+jB+rijFEFugTd3cwSObUSnUi88djgR5528Csl0uKlrI331kRqe56Ov2Ng==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-create-regexp-features-plugin": "^7.22.15",
+                "@babel/helper-plugin-utils": "^7.24.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-unicode-regex": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.1.tgz",
+            "integrity": "sha512-2A/94wgZgxfTsiLaQ2E36XAOdcZmGAaEEgVmxQWwZXWkGhvoHbaqXcKnU8zny4ycpu3vNqg0L/PcCiYtHtA13g==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-create-regexp-features-plugin": "^7.22.15",
+                "@babel/helper-plugin-utils": "^7.24.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-unicode-sets-regex": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.24.1.tgz",
+            "integrity": "sha512-fqj4WuzzS+ukpgerpAoOnMfQXwUHFxXUZUE84oL2Kao2N8uSlvcpnAidKASgsNgzZHBsHWvcm8s9FPWUhAb8fA==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-create-regexp-features-plugin": "^7.22.15",
+                "@babel/helper-plugin-utils": "^7.24.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0"
+            }
+        },
+        "node_modules/@babel/preset-env": {
+            "version": "7.24.5",
+            "resolved": "https://registry.npmmirror.com/@babel/preset-env/-/preset-env-7.24.5.tgz",
+            "integrity": "sha512-UGK2ifKtcC8i5AI4cH+sbLLuLc2ktYSFJgBAXorKAsHUZmrQ1q6aQ6i3BvU24wWs2AAKqQB6kq3N9V9Gw1HiMQ==",
+            "dev": true,
+            "dependencies": {
+                "@babel/compat-data": "^7.24.4",
+                "@babel/helper-compilation-targets": "^7.23.6",
+                "@babel/helper-plugin-utils": "^7.24.5",
+                "@babel/helper-validator-option": "^7.23.5",
+                "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.24.5",
+                "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.24.1",
+                "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.24.1",
+                "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.24.1",
+                "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
+                "@babel/plugin-syntax-async-generators": "^7.8.4",
+                "@babel/plugin-syntax-class-properties": "^7.12.13",
+                "@babel/plugin-syntax-class-static-block": "^7.14.5",
+                "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+                "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
+                "@babel/plugin-syntax-import-assertions": "^7.24.1",
+                "@babel/plugin-syntax-import-attributes": "^7.24.1",
+                "@babel/plugin-syntax-import-meta": "^7.10.4",
+                "@babel/plugin-syntax-json-strings": "^7.8.3",
+                "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
+                "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+                "@babel/plugin-syntax-numeric-separator": "^7.10.4",
+                "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+                "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+                "@babel/plugin-syntax-optional-chaining": "^7.8.3",
+                "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
+                "@babel/plugin-syntax-top-level-await": "^7.14.5",
+                "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
+                "@babel/plugin-transform-arrow-functions": "^7.24.1",
+                "@babel/plugin-transform-async-generator-functions": "^7.24.3",
+                "@babel/plugin-transform-async-to-generator": "^7.24.1",
+                "@babel/plugin-transform-block-scoped-functions": "^7.24.1",
+                "@babel/plugin-transform-block-scoping": "^7.24.5",
+                "@babel/plugin-transform-class-properties": "^7.24.1",
+                "@babel/plugin-transform-class-static-block": "^7.24.4",
+                "@babel/plugin-transform-classes": "^7.24.5",
+                "@babel/plugin-transform-computed-properties": "^7.24.1",
+                "@babel/plugin-transform-destructuring": "^7.24.5",
+                "@babel/plugin-transform-dotall-regex": "^7.24.1",
+                "@babel/plugin-transform-duplicate-keys": "^7.24.1",
+                "@babel/plugin-transform-dynamic-import": "^7.24.1",
+                "@babel/plugin-transform-exponentiation-operator": "^7.24.1",
+                "@babel/plugin-transform-export-namespace-from": "^7.24.1",
+                "@babel/plugin-transform-for-of": "^7.24.1",
+                "@babel/plugin-transform-function-name": "^7.24.1",
+                "@babel/plugin-transform-json-strings": "^7.24.1",
+                "@babel/plugin-transform-literals": "^7.24.1",
+                "@babel/plugin-transform-logical-assignment-operators": "^7.24.1",
+                "@babel/plugin-transform-member-expression-literals": "^7.24.1",
+                "@babel/plugin-transform-modules-amd": "^7.24.1",
+                "@babel/plugin-transform-modules-commonjs": "^7.24.1",
+                "@babel/plugin-transform-modules-systemjs": "^7.24.1",
+                "@babel/plugin-transform-modules-umd": "^7.24.1",
+                "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5",
+                "@babel/plugin-transform-new-target": "^7.24.1",
+                "@babel/plugin-transform-nullish-coalescing-operator": "^7.24.1",
+                "@babel/plugin-transform-numeric-separator": "^7.24.1",
+                "@babel/plugin-transform-object-rest-spread": "^7.24.5",
+                "@babel/plugin-transform-object-super": "^7.24.1",
+                "@babel/plugin-transform-optional-catch-binding": "^7.24.1",
+                "@babel/plugin-transform-optional-chaining": "^7.24.5",
+                "@babel/plugin-transform-parameters": "^7.24.5",
+                "@babel/plugin-transform-private-methods": "^7.24.1",
+                "@babel/plugin-transform-private-property-in-object": "^7.24.5",
+                "@babel/plugin-transform-property-literals": "^7.24.1",
+                "@babel/plugin-transform-regenerator": "^7.24.1",
+                "@babel/plugin-transform-reserved-words": "^7.24.1",
+                "@babel/plugin-transform-shorthand-properties": "^7.24.1",
+                "@babel/plugin-transform-spread": "^7.24.1",
+                "@babel/plugin-transform-sticky-regex": "^7.24.1",
+                "@babel/plugin-transform-template-literals": "^7.24.1",
+                "@babel/plugin-transform-typeof-symbol": "^7.24.5",
+                "@babel/plugin-transform-unicode-escapes": "^7.24.1",
+                "@babel/plugin-transform-unicode-property-regex": "^7.24.1",
+                "@babel/plugin-transform-unicode-regex": "^7.24.1",
+                "@babel/plugin-transform-unicode-sets-regex": "^7.24.1",
+                "@babel/preset-modules": "0.1.6-no-external-plugins",
+                "babel-plugin-polyfill-corejs2": "^0.4.10",
+                "babel-plugin-polyfill-corejs3": "^0.10.4",
+                "babel-plugin-polyfill-regenerator": "^0.6.1",
+                "core-js-compat": "^3.31.0",
+                "semver": "^6.3.1"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/preset-modules": {
+            "version": "0.1.6-no-external-plugins",
+            "resolved": "https://registry.npmmirror.com/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz",
+            "integrity": "sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.0.0",
+                "@babel/types": "^7.4.4",
+                "esutils": "^2.0.2"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0 || ^8.0.0-0 <8.0.0"
+            }
+        },
+        "node_modules/@babel/regjsgen": {
+            "version": "0.8.0",
+            "resolved": "https://registry.npmmirror.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz",
+            "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==",
+            "dev": true
+        },
+        "node_modules/@babel/runtime": {
+            "version": "7.24.5",
+            "resolved": "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.24.5.tgz",
+            "integrity": "sha512-Nms86NXrsaeU9vbBJKni6gXiEXZ4CVpYVzEjDH9Sb8vmZ3UljyA1GSOJl/6LGPO8EHLuSF9H+IxNXHPX8QHJ4g==",
+            "dependencies": {
+                "regenerator-runtime": "^0.14.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/runtime/node_modules/regenerator-runtime": {
+            "version": "0.14.1",
+            "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+            "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="
+        },
+        "node_modules/@babel/template": {
+            "version": "7.24.0",
+            "resolved": "https://registry.npmmirror.com/@babel/template/-/template-7.24.0.tgz",
+            "integrity": "sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==",
+            "dependencies": {
+                "@babel/code-frame": "^7.23.5",
+                "@babel/parser": "^7.24.0",
+                "@babel/types": "^7.24.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/traverse": {
+            "version": "7.24.5",
+            "resolved": "https://registry.npmmirror.com/@babel/traverse/-/traverse-7.24.5.tgz",
+            "integrity": "sha512-7aaBLeDQ4zYcUFDUD41lJc1fG8+5IU9DaNSJAgal866FGvmD5EbWQgnEC6kO1gGLsX0esNkfnJSndbTXA3r7UA==",
+            "dependencies": {
+                "@babel/code-frame": "^7.24.2",
+                "@babel/generator": "^7.24.5",
+                "@babel/helper-environment-visitor": "^7.22.20",
+                "@babel/helper-function-name": "^7.23.0",
+                "@babel/helper-hoist-variables": "^7.22.5",
+                "@babel/helper-split-export-declaration": "^7.24.5",
+                "@babel/parser": "^7.24.5",
+                "@babel/types": "^7.24.5",
+                "debug": "^4.3.1",
+                "globals": "^11.1.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/types": {
+            "version": "7.24.5",
+            "resolved": "https://registry.npmmirror.com/@babel/types/-/types-7.24.5.tgz",
+            "integrity": "sha512-6mQNsaLeXTw0nxYUYu+NSa4Hx4BlF1x1x8/PMFbiR+GBSr+2DkECc69b8hgy2frEodNcvPffeH8YfWd3LI6jhQ==",
+            "dependencies": {
+                "@babel/helper-string-parser": "^7.24.1",
+                "@babel/helper-validator-identifier": "^7.24.5",
+                "to-fast-properties": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@bcoe/v8-coverage": {
+            "version": "0.2.3",
+            "resolved": "https://registry.npmmirror.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
+            "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/@dcasia/mini-program-tailwind-webpack-plugin": {
+            "version": "1.5.7",
+            "resolved": "https://registry.npmmirror.com/@dcasia/mini-program-tailwind-webpack-plugin/-/mini-program-tailwind-webpack-plugin-1.5.7.tgz",
+            "integrity": "sha512-BXcYi8iAFh9qRewsJPT9+paxBto5zdLLmad1Yx1GkZXmKFE6W7qHDRWxOmskXFtSCzCKdomFqZG2RzW1eBzMZg==",
+            "dev": true,
+            "dependencies": {
+                "@babel/core": "^7.17.5",
+                "@vivaxy/wxml": "^2.1.0",
+                "micromatch": "^4.0.5",
+                "postcss": "^8.4.7",
+                "webpack-sources": "^1.4.3",
+                "windicss-webpack-plugin": "^1.7.2"
+            }
+        },
+        "node_modules/@dcloudio/types": {
+            "version": "3.4.8",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/types/-/types-3.4.8.tgz",
+            "integrity": "sha512-IPXuoghLv7qNPOnRuP7vC5++MdRHhE0U7EMw9ia//uOh69fFXZiRTfoHd51+nzciD6R50gqYhbrCCZIxnxhM9Q=="
+        },
+        "node_modules/@dcloudio/uni-app": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-app/-/uni-app-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-6fip3G+s6pJDudu+Rsy/v7CtGYzjcc0ZjjKYZuXttM1Vgkg3QD1/qHhJW27Vb+nmzfL+Wg1tbRhTl7kgA+8TVA==",
+            "dependencies": {
+                "@dcloudio/uni-cloud": "3.0.0-3080720230703001",
+                "@dcloudio/uni-components": "3.0.0-3080720230703001",
+                "@dcloudio/uni-i18n": "3.0.0-3080720230703001",
+                "@dcloudio/uni-push": "3.0.0-3080720230703001",
+                "@dcloudio/uni-shared": "3.0.0-3080720230703001",
+                "@dcloudio/uni-stat": "3.0.0-3080720230703001",
+                "@vue/shared": "3.2.47"
+            },
+            "peerDependencies": {
+                "@dcloudio/types": "^3.3.2"
+            }
+        },
+        "node_modules/@dcloudio/uni-app-plus": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-app-plus/-/uni-app-plus-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-WGHniWrEJPIAVP3GDp+maf30fZz/Dc+gAfiPMDWvQdE12nAcnpbgnmaLEPifPDeeV2dr7/VuxoVM+Z2M5AlN1Q==",
+            "dependencies": {
+                "@dcloudio/uni-app-uts": "3.0.0-3080720230703001",
+                "@dcloudio/uni-app-vite": "3.0.0-3080720230703001",
+                "@dcloudio/uni-app-vue": "3.0.0-3080720230703001",
+                "debug": "^4.3.3",
+                "fs-extra": "^10.0.0",
+                "licia": "^1.29.0",
+                "postcss-selector-parser": "^6.0.6"
+            }
+        },
+        "node_modules/@dcloudio/uni-app-uts": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-app-uts/-/uni-app-uts-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-6GXBYE3/bfliADNMmnmm2UHLpzR2BF5hgs/ExIXcC9sMOxDAUd149R+YsDp9HUfUc+dA32DXHHjoQOhYunZTTA==",
+            "dependencies": {
+                "@babel/parser": "^7.16.4",
+                "@babel/types": "^7.20.7",
+                "@dcloudio/uni-cli-shared": "3.0.0-3080720230703001",
+                "@dcloudio/uni-i18n": "3.0.0-3080720230703001",
+                "@dcloudio/uni-nvue-styler": "3.0.0-3080720230703001",
+                "@dcloudio/uni-shared": "3.0.0-3080720230703001",
+                "@rollup/pluginutils": "^4.2.0",
+                "@vue/compiler-core": "3.2.47",
+                "@vue/compiler-sfc": "3.2.47",
+                "@vue/shared": "3.2.47",
+                "debug": "^4.3.3",
+                "es-module-lexer": "^1.2.1",
+                "fs-extra": "^10.0.0",
+                "picocolors": "^1.0.0",
+                "source-map": "^0.6.1"
+            }
+        },
+        "node_modules/@dcloudio/uni-app-vite": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-app-vite/-/uni-app-vite-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-OAFjSfrin2pLuBBfDMg3qvm7ZCS3Vqt0/CDxRicc7lD6ioiahUvaXdLhARTWykoO6rlYjbIckDmg3HuBbb3wjA==",
+            "dependencies": {
+                "@dcloudio/uni-cli-shared": "3.0.0-3080720230703001",
+                "@dcloudio/uni-i18n": "3.0.0-3080720230703001",
+                "@dcloudio/uni-nvue-styler": "3.0.0-3080720230703001",
+                "@dcloudio/uni-shared": "3.0.0-3080720230703001",
+                "@rollup/pluginutils": "^4.2.0",
+                "@vitejs/plugin-vue": "^4.2.1",
+                "@vue/compiler-dom": "3.2.47",
+                "@vue/compiler-sfc": "3.2.47",
+                "debug": "^4.3.3",
+                "fs-extra": "^10.0.0",
+                "picocolors": "^1.0.0"
+            }
+        },
+        "node_modules/@dcloudio/uni-app-vue": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-app-vue/-/uni-app-vue-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-VTeoupAGJ1GREy2GvB+E29KPkIoHJ0C9ElvxcNpT0bEYWXMAE8m+O6D10aI8Qfwn1dObnxx6ohaRCbrDG9TG3w=="
+        },
+        "node_modules/@dcloudio/uni-automator": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-automator/-/uni-automator-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-DbvYu6uGA+My5l103RgZ5BfqSlxGN5NbvK59ELH0NhK5mGge/f8RQPJ9zPz2rlLJT9/GUzjaw7b+f4FELeRpHg==",
+            "dev": true,
+            "dependencies": {
+                "@dcloudio/uni-cli-shared": "3.0.0-3080720230703001",
+                "address": "^1.1.2",
+                "cross-env": "^7.0.3",
+                "debug": "^4.3.3",
+                "default-gateway": "^6.0.3",
+                "fs-extra": "^10.0.0",
+                "jsonc-parser": "^3.2.0",
+                "licia": "^1.29.0",
+                "qrcode-reader": "^1.0.4",
+                "qrcode-terminal": "^0.12.0",
+                "ws": "^8.4.2"
+            },
+            "peerDependencies": {
+                "jest": "27.0.4",
+                "jest-environment-node": "27.5.1"
+            }
+        },
+        "node_modules/@dcloudio/uni-cli-shared": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-cli-shared/-/uni-cli-shared-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-WP5IfAXIlinWs/ItHu2/EP746kSCxl9+I8wBC6BfI4xq8RD2ga6F5WJt/+blBzbp2gVnJsW/13eafUQs5T3RFA==",
+            "dependencies": {
+                "@ampproject/remapping": "^2.1.2",
+                "@babel/core": "^7.21.3",
+                "@babel/parser": "^7.16.4",
+                "@babel/types": "^7.20.7",
+                "@dcloudio/uni-i18n": "3.0.0-3080720230703001",
+                "@dcloudio/uni-shared": "3.0.0-3080720230703001",
+                "@intlify/core-base": "9.1.9",
+                "@intlify/shared": "9.1.9",
+                "@intlify/vue-devtools": "9.1.9",
+                "@rollup/pluginutils": "^4.2.0",
+                "@vue/compiler-core": "3.2.47",
+                "@vue/compiler-dom": "3.2.47",
+                "@vue/compiler-sfc": "3.2.47",
+                "@vue/server-renderer": "3.2.47",
+                "@vue/shared": "3.2.47",
+                "autoprefixer": "^10.4.14",
+                "base64url": "^3.0.1",
+                "chokidar": "^3.5.3",
+                "compare-versions": "^3.6.0",
+                "debug": "^4.3.3",
+                "es-module-lexer": "^1.2.1",
+                "esbuild": "^0.17.5",
+                "estree-walker": "^2.0.2",
+                "fast-glob": "^3.2.11",
+                "fs-extra": "^10.0.0",
+                "hash-sum": "^2.0.0",
+                "jsonc-parser": "^3.0.0",
+                "magic-string": "^0.30.0",
+                "merge": "^2.1.1",
+                "mime": "^3.0.0",
+                "module-alias": "^2.2.2",
+                "os-locale-s-fix": "^1.0.8-fix-1",
+                "picocolors": "^1.0.0",
+                "postcss-import": "^14.0.2",
+                "postcss-load-config": "^3.1.1",
+                "postcss-modules": "^4.3.0",
+                "postcss-selector-parser": "^6.0.6",
+                "resolve": "^1.22.1",
+                "tapable": "^2.2.0",
+                "xregexp": "3.1.0"
+            },
+            "engines": {
+                "node": "^14.18.0 || >=16.0.0"
+            }
+        },
+        "node_modules/@dcloudio/uni-cli-shared/node_modules/@vue/reactivity": {
+            "version": "3.2.47",
+            "resolved": "https://registry.npmmirror.com/@vue/reactivity/-/reactivity-3.2.47.tgz",
+            "integrity": "sha512-7khqQ/75oyyg+N/e+iwV6lpy1f5wq759NdlS1fpAhFXa8VeAIKGgk2E/C4VF59lx5b+Ezs5fpp/5WsRYXQiKxQ==",
+            "peer": true,
+            "dependencies": {
+                "@vue/shared": "3.2.47"
+            }
+        },
+        "node_modules/@dcloudio/uni-cli-shared/node_modules/@vue/runtime-core": {
+            "version": "3.2.47",
+            "resolved": "https://registry.npmmirror.com/@vue/runtime-core/-/runtime-core-3.2.47.tgz",
+            "integrity": "sha512-RZxbLQIRB/K0ev0K9FXhNbBzT32H9iRtYbaXb0ZIz2usLms/D55dJR2t6cIEUn6vyhS3ALNvNthI+Q95C+NOpA==",
+            "peer": true,
+            "dependencies": {
+                "@vue/reactivity": "3.2.47",
+                "@vue/shared": "3.2.47"
+            }
+        },
+        "node_modules/@dcloudio/uni-cli-shared/node_modules/@vue/runtime-dom": {
+            "version": "3.2.47",
+            "resolved": "https://registry.npmmirror.com/@vue/runtime-dom/-/runtime-dom-3.2.47.tgz",
+            "integrity": "sha512-ArXrFTjS6TsDei4qwNvgrdmHtD930KgSKGhS5M+j8QxXrDJYLqYw4RRcDy1bz1m1wMmb6j+zGLifdVHtkXA7gA==",
+            "peer": true,
+            "dependencies": {
+                "@vue/runtime-core": "3.2.47",
+                "@vue/shared": "3.2.47",
+                "csstype": "^2.6.8"
+            }
+        },
+        "node_modules/@dcloudio/uni-cli-shared/node_modules/@vue/server-renderer": {
+            "version": "3.2.47",
+            "resolved": "https://registry.npmmirror.com/@vue/server-renderer/-/server-renderer-3.2.47.tgz",
+            "integrity": "sha512-dN9gc1i8EvmP9RCzvneONXsKfBRgqFeFZLurmHOveL7oH6HiFXJw5OGu294n1nHc/HMgTy6LulU/tv5/A7f/LA==",
+            "dependencies": {
+                "@vue/compiler-ssr": "3.2.47",
+                "@vue/shared": "3.2.47"
+            },
+            "peerDependencies": {
+                "vue": "3.2.47"
+            }
+        },
+        "node_modules/@dcloudio/uni-cli-shared/node_modules/csstype": {
+            "version": "2.6.21",
+            "resolved": "https://registry.npmmirror.com/csstype/-/csstype-2.6.21.tgz",
+            "integrity": "sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==",
+            "peer": true
+        },
+        "node_modules/@dcloudio/uni-cli-shared/node_modules/vue": {
+            "version": "3.2.47",
+            "resolved": "https://registry.npmmirror.com/vue/-/vue-3.2.47.tgz",
+            "integrity": "sha512-60188y/9Dc9WVrAZeUVSDxRQOZ+z+y5nO2ts9jWXSTkMvayiWxCWOWtBQoYjLeccfXkiiPZWAHcV+WTPhkqJHQ==",
+            "peer": true,
+            "dependencies": {
+                "@vue/compiler-dom": "3.2.47",
+                "@vue/compiler-sfc": "3.2.47",
+                "@vue/runtime-dom": "3.2.47",
+                "@vue/server-renderer": "3.2.47",
+                "@vue/shared": "3.2.47"
+            }
+        },
+        "node_modules/@dcloudio/uni-cloud": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-cloud/-/uni-cloud-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-xulo8fMQZ6+DsU7Bs6Re7i51OVF/tzT72GmooXvvNt3H+5XUAo/1mQIIiNlxeR4sKesR8Y9n7j+Z4dfs/2ce9w==",
+            "dependencies": {
+                "@dcloudio/uni-cli-shared": "3.0.0-3080720230703001",
+                "@dcloudio/uni-i18n": "3.0.0-3080720230703001",
+                "@dcloudio/uni-shared": "3.0.0-3080720230703001",
+                "@vue/shared": "3.2.47",
+                "fast-glob": "^3.2.11"
+            }
+        },
+        "node_modules/@dcloudio/uni-components": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-components/-/uni-components-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-Ggd7m9TOxdLZxfJ1PWkUBowTUyYVH1WuPsooMWmJNRkMpvnAtK6ZPdS0ThdglX0F/FT82IUUC+wdeZtFG/QRcA==",
+            "dependencies": {
+                "@dcloudio/uni-cloud": "3.0.0-3080720230703001",
+                "@dcloudio/uni-h5": "3.0.0-3080720230703001",
+                "@dcloudio/uni-i18n": "3.0.0-3080720230703001"
+            }
+        },
+        "node_modules/@dcloudio/uni-h5": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-h5/-/uni-h5-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-brRSBmxzg07Bt86AhJ70T0wsJBaDjgRAaAND0QsRQAaQfRFyEjqU1wp+x4Dt7GoNbg5hmNEabhdJKv24RweMnA==",
+            "dependencies": {
+                "@dcloudio/uni-h5-vite": "3.0.0-3080720230703001",
+                "@dcloudio/uni-h5-vue": "3.0.0-3080720230703001",
+                "@dcloudio/uni-i18n": "3.0.0-3080720230703001",
+                "@dcloudio/uni-shared": "3.0.0-3080720230703001",
+                "@vue/server-renderer": "3.2.47",
+                "@vue/shared": "3.2.47",
+                "debug": "^4.3.3",
+                "localstorage-polyfill": "^1.0.1",
+                "postcss-selector-parser": "^6.0.6",
+                "safe-area-insets": "^1.4.1",
+                "vue-router": "^4.1.6",
+                "xmlhttprequest": "^1.8.0"
+            }
+        },
+        "node_modules/@dcloudio/uni-h5-vite": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-h5-vite/-/uni-h5-vite-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-bqPj6p2Zj0TIMOoUFCryPaBR/LIGMdHg5vDGlxoU1F84VdtCXlgDTodbp/4n24MDCd6KiuHZEyURt4jODtxd8Q==",
+            "dependencies": {
+                "@dcloudio/uni-cli-shared": "3.0.0-3080720230703001",
+                "@dcloudio/uni-shared": "3.0.0-3080720230703001",
+                "@rollup/pluginutils": "^4.2.0",
+                "@vue/compiler-dom": "3.2.47",
+                "@vue/compiler-sfc": "3.2.47",
+                "@vue/server-renderer": "3.2.47",
+                "@vue/shared": "3.2.47",
+                "debug": "^4.3.3",
+                "fs-extra": "^10.0.0",
+                "mime": "^3.0.0",
+                "module-alias": "^2.2.2"
+            }
+        },
+        "node_modules/@dcloudio/uni-h5-vite/node_modules/@vue/reactivity": {
+            "version": "3.2.47",
+            "resolved": "https://registry.npmmirror.com/@vue/reactivity/-/reactivity-3.2.47.tgz",
+            "integrity": "sha512-7khqQ/75oyyg+N/e+iwV6lpy1f5wq759NdlS1fpAhFXa8VeAIKGgk2E/C4VF59lx5b+Ezs5fpp/5WsRYXQiKxQ==",
+            "peer": true,
+            "dependencies": {
+                "@vue/shared": "3.2.47"
+            }
+        },
+        "node_modules/@dcloudio/uni-h5-vite/node_modules/@vue/runtime-core": {
+            "version": "3.2.47",
+            "resolved": "https://registry.npmmirror.com/@vue/runtime-core/-/runtime-core-3.2.47.tgz",
+            "integrity": "sha512-RZxbLQIRB/K0ev0K9FXhNbBzT32H9iRtYbaXb0ZIz2usLms/D55dJR2t6cIEUn6vyhS3ALNvNthI+Q95C+NOpA==",
+            "peer": true,
+            "dependencies": {
+                "@vue/reactivity": "3.2.47",
+                "@vue/shared": "3.2.47"
+            }
+        },
+        "node_modules/@dcloudio/uni-h5-vite/node_modules/@vue/runtime-dom": {
+            "version": "3.2.47",
+            "resolved": "https://registry.npmmirror.com/@vue/runtime-dom/-/runtime-dom-3.2.47.tgz",
+            "integrity": "sha512-ArXrFTjS6TsDei4qwNvgrdmHtD930KgSKGhS5M+j8QxXrDJYLqYw4RRcDy1bz1m1wMmb6j+zGLifdVHtkXA7gA==",
+            "peer": true,
+            "dependencies": {
+                "@vue/runtime-core": "3.2.47",
+                "@vue/shared": "3.2.47",
+                "csstype": "^2.6.8"
+            }
+        },
+        "node_modules/@dcloudio/uni-h5-vite/node_modules/@vue/server-renderer": {
+            "version": "3.2.47",
+            "resolved": "https://registry.npmmirror.com/@vue/server-renderer/-/server-renderer-3.2.47.tgz",
+            "integrity": "sha512-dN9gc1i8EvmP9RCzvneONXsKfBRgqFeFZLurmHOveL7oH6HiFXJw5OGu294n1nHc/HMgTy6LulU/tv5/A7f/LA==",
+            "dependencies": {
+                "@vue/compiler-ssr": "3.2.47",
+                "@vue/shared": "3.2.47"
+            },
+            "peerDependencies": {
+                "vue": "3.2.47"
+            }
+        },
+        "node_modules/@dcloudio/uni-h5-vite/node_modules/csstype": {
+            "version": "2.6.21",
+            "resolved": "https://registry.npmmirror.com/csstype/-/csstype-2.6.21.tgz",
+            "integrity": "sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==",
+            "peer": true
+        },
+        "node_modules/@dcloudio/uni-h5-vite/node_modules/vue": {
+            "version": "3.2.47",
+            "resolved": "https://registry.npmmirror.com/vue/-/vue-3.2.47.tgz",
+            "integrity": "sha512-60188y/9Dc9WVrAZeUVSDxRQOZ+z+y5nO2ts9jWXSTkMvayiWxCWOWtBQoYjLeccfXkiiPZWAHcV+WTPhkqJHQ==",
+            "peer": true,
+            "dependencies": {
+                "@vue/compiler-dom": "3.2.47",
+                "@vue/compiler-sfc": "3.2.47",
+                "@vue/runtime-dom": "3.2.47",
+                "@vue/server-renderer": "3.2.47",
+                "@vue/shared": "3.2.47"
+            }
+        },
+        "node_modules/@dcloudio/uni-h5-vue": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-h5-vue/-/uni-h5-vue-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-dRb9y4bgVSvZgJySumu0ZLL+tb/K1KbHd7Rx5c2G9Q7Yw42y0rrooYgbKFQILw0LFF0bKpzZv0JjNwkpKcD/mA==",
+            "dependencies": {
+                "@dcloudio/uni-shared": "3.0.0-3080720230703001",
+                "@vue/server-renderer": "3.2.47"
+            }
+        },
+        "node_modules/@dcloudio/uni-h5-vue/node_modules/@vue/reactivity": {
+            "version": "3.2.47",
+            "resolved": "https://registry.npmmirror.com/@vue/reactivity/-/reactivity-3.2.47.tgz",
+            "integrity": "sha512-7khqQ/75oyyg+N/e+iwV6lpy1f5wq759NdlS1fpAhFXa8VeAIKGgk2E/C4VF59lx5b+Ezs5fpp/5WsRYXQiKxQ==",
+            "peer": true,
+            "dependencies": {
+                "@vue/shared": "3.2.47"
+            }
+        },
+        "node_modules/@dcloudio/uni-h5-vue/node_modules/@vue/runtime-core": {
+            "version": "3.2.47",
+            "resolved": "https://registry.npmmirror.com/@vue/runtime-core/-/runtime-core-3.2.47.tgz",
+            "integrity": "sha512-RZxbLQIRB/K0ev0K9FXhNbBzT32H9iRtYbaXb0ZIz2usLms/D55dJR2t6cIEUn6vyhS3ALNvNthI+Q95C+NOpA==",
+            "peer": true,
+            "dependencies": {
+                "@vue/reactivity": "3.2.47",
+                "@vue/shared": "3.2.47"
+            }
+        },
+        "node_modules/@dcloudio/uni-h5-vue/node_modules/@vue/runtime-dom": {
+            "version": "3.2.47",
+            "resolved": "https://registry.npmmirror.com/@vue/runtime-dom/-/runtime-dom-3.2.47.tgz",
+            "integrity": "sha512-ArXrFTjS6TsDei4qwNvgrdmHtD930KgSKGhS5M+j8QxXrDJYLqYw4RRcDy1bz1m1wMmb6j+zGLifdVHtkXA7gA==",
+            "peer": true,
+            "dependencies": {
+                "@vue/runtime-core": "3.2.47",
+                "@vue/shared": "3.2.47",
+                "csstype": "^2.6.8"
+            }
+        },
+        "node_modules/@dcloudio/uni-h5-vue/node_modules/@vue/server-renderer": {
+            "version": "3.2.47",
+            "resolved": "https://registry.npmmirror.com/@vue/server-renderer/-/server-renderer-3.2.47.tgz",
+            "integrity": "sha512-dN9gc1i8EvmP9RCzvneONXsKfBRgqFeFZLurmHOveL7oH6HiFXJw5OGu294n1nHc/HMgTy6LulU/tv5/A7f/LA==",
+            "dependencies": {
+                "@vue/compiler-ssr": "3.2.47",
+                "@vue/shared": "3.2.47"
+            },
+            "peerDependencies": {
+                "vue": "3.2.47"
+            }
+        },
+        "node_modules/@dcloudio/uni-h5-vue/node_modules/csstype": {
+            "version": "2.6.21",
+            "resolved": "https://registry.npmmirror.com/csstype/-/csstype-2.6.21.tgz",
+            "integrity": "sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==",
+            "peer": true
+        },
+        "node_modules/@dcloudio/uni-h5-vue/node_modules/vue": {
+            "version": "3.2.47",
+            "resolved": "https://registry.npmmirror.com/vue/-/vue-3.2.47.tgz",
+            "integrity": "sha512-60188y/9Dc9WVrAZeUVSDxRQOZ+z+y5nO2ts9jWXSTkMvayiWxCWOWtBQoYjLeccfXkiiPZWAHcV+WTPhkqJHQ==",
+            "peer": true,
+            "dependencies": {
+                "@vue/compiler-dom": "3.2.47",
+                "@vue/compiler-sfc": "3.2.47",
+                "@vue/runtime-dom": "3.2.47",
+                "@vue/server-renderer": "3.2.47",
+                "@vue/shared": "3.2.47"
+            }
+        },
+        "node_modules/@dcloudio/uni-h5/node_modules/@vue/reactivity": {
+            "version": "3.2.47",
+            "resolved": "https://registry.npmmirror.com/@vue/reactivity/-/reactivity-3.2.47.tgz",
+            "integrity": "sha512-7khqQ/75oyyg+N/e+iwV6lpy1f5wq759NdlS1fpAhFXa8VeAIKGgk2E/C4VF59lx5b+Ezs5fpp/5WsRYXQiKxQ==",
+            "peer": true,
+            "dependencies": {
+                "@vue/shared": "3.2.47"
+            }
+        },
+        "node_modules/@dcloudio/uni-h5/node_modules/@vue/runtime-core": {
+            "version": "3.2.47",
+            "resolved": "https://registry.npmmirror.com/@vue/runtime-core/-/runtime-core-3.2.47.tgz",
+            "integrity": "sha512-RZxbLQIRB/K0ev0K9FXhNbBzT32H9iRtYbaXb0ZIz2usLms/D55dJR2t6cIEUn6vyhS3ALNvNthI+Q95C+NOpA==",
+            "peer": true,
+            "dependencies": {
+                "@vue/reactivity": "3.2.47",
+                "@vue/shared": "3.2.47"
+            }
+        },
+        "node_modules/@dcloudio/uni-h5/node_modules/@vue/runtime-dom": {
+            "version": "3.2.47",
+            "resolved": "https://registry.npmmirror.com/@vue/runtime-dom/-/runtime-dom-3.2.47.tgz",
+            "integrity": "sha512-ArXrFTjS6TsDei4qwNvgrdmHtD930KgSKGhS5M+j8QxXrDJYLqYw4RRcDy1bz1m1wMmb6j+zGLifdVHtkXA7gA==",
+            "peer": true,
+            "dependencies": {
+                "@vue/runtime-core": "3.2.47",
+                "@vue/shared": "3.2.47",
+                "csstype": "^2.6.8"
+            }
+        },
+        "node_modules/@dcloudio/uni-h5/node_modules/@vue/server-renderer": {
+            "version": "3.2.47",
+            "resolved": "https://registry.npmmirror.com/@vue/server-renderer/-/server-renderer-3.2.47.tgz",
+            "integrity": "sha512-dN9gc1i8EvmP9RCzvneONXsKfBRgqFeFZLurmHOveL7oH6HiFXJw5OGu294n1nHc/HMgTy6LulU/tv5/A7f/LA==",
+            "dependencies": {
+                "@vue/compiler-ssr": "3.2.47",
+                "@vue/shared": "3.2.47"
+            },
+            "peerDependencies": {
+                "vue": "3.2.47"
+            }
+        },
+        "node_modules/@dcloudio/uni-h5/node_modules/csstype": {
+            "version": "2.6.21",
+            "resolved": "https://registry.npmmirror.com/csstype/-/csstype-2.6.21.tgz",
+            "integrity": "sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==",
+            "peer": true
+        },
+        "node_modules/@dcloudio/uni-h5/node_modules/vue": {
+            "version": "3.2.47",
+            "resolved": "https://registry.npmmirror.com/vue/-/vue-3.2.47.tgz",
+            "integrity": "sha512-60188y/9Dc9WVrAZeUVSDxRQOZ+z+y5nO2ts9jWXSTkMvayiWxCWOWtBQoYjLeccfXkiiPZWAHcV+WTPhkqJHQ==",
+            "peer": true,
+            "dependencies": {
+                "@vue/compiler-dom": "3.2.47",
+                "@vue/compiler-sfc": "3.2.47",
+                "@vue/runtime-dom": "3.2.47",
+                "@vue/server-renderer": "3.2.47",
+                "@vue/shared": "3.2.47"
+            }
+        },
+        "node_modules/@dcloudio/uni-i18n": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-i18n/-/uni-i18n-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-fmN3HnHhq2GXgT+PlCiy1g9KAVAD1HASErnv4cKtu4YofJH6Nh+uWAfPNWwp/6ZfNgPrblku7Rq7qdDFEltFcg=="
+        },
+        "node_modules/@dcloudio/uni-mp-alipay": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-mp-alipay/-/uni-mp-alipay-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-qTBERfPRxa4e3cHzptD82kTNrleT6Mxl+hdzDMK4/xSD4XLiMb2ZKDqsG8MtAAvNpHMe8QKiEKXR2/Oljs8A9A==",
+            "dependencies": {
+                "@dcloudio/uni-cli-shared": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-vite": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-vue": "3.0.0-3080720230703001",
+                "@dcloudio/uni-shared": "3.0.0-3080720230703001",
+                "@vue/compiler-core": "3.2.47",
+                "@vue/shared": "3.2.47"
+            }
+        },
+        "node_modules/@dcloudio/uni-mp-baidu": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-mp-baidu/-/uni-mp-baidu-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-22llCMmOgpPuuWtaJ8pExLStvIoy+/KJLL09/a+Y87z3F+W40VfA6WFNNF3peVX22pw8fDvUBMDN9nCusAVrqA==",
+            "dependencies": {
+                "@dcloudio/uni-cli-shared": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-compiler": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-vite": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-vue": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-weixin": "3.0.0-3080720230703001",
+                "@dcloudio/uni-shared": "3.0.0-3080720230703001",
+                "@vue/compiler-core": "3.2.47",
+                "@vue/shared": "3.2.47",
+                "jimp": "^0.10.1",
+                "licia": "^1.29.0",
+                "qrcode-reader": "^1.0.4",
+                "qrcode-terminal": "^0.12.0",
+                "ws": "^8.4.2"
+            }
+        },
+        "node_modules/@dcloudio/uni-mp-compiler": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-mp-compiler/-/uni-mp-compiler-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-osLFR5CDm5xrQiSSh0fqXDCDam0Zg8mGMohHKFtqSbPoKHBxv+i4KkdU1Ai3MhutPXK4xMU6xk6PqQ2XhJmxAg==",
+            "dependencies": {
+                "@babel/generator": "^7.20.5",
+                "@babel/parser": "^7.16.4",
+                "@babel/types": "^7.20.7",
+                "@dcloudio/uni-cli-shared": "3.0.0-3080720230703001",
+                "@dcloudio/uni-shared": "3.0.0-3080720230703001",
+                "@vue/compiler-core": "3.2.47",
+                "@vue/compiler-dom": "3.2.47",
+                "@vue/shared": "3.2.47",
+                "estree-walker": "^2.0.2"
+            }
+        },
+        "node_modules/@dcloudio/uni-mp-jd": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-mp-jd/-/uni-mp-jd-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-5FJ0ZtJnCUTaPWLbdcpwAfPG/XGAlyanWolgdwzq0eFMQtAGtcrbCCv2GXXcErMjDyDbM4LRBS3JPEmcBLe5Zw==",
+            "dependencies": {
+                "@dcloudio/uni-cli-shared": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-compiler": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-vite": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-vue": "3.0.0-3080720230703001",
+                "@dcloudio/uni-shared": "3.0.0-3080720230703001",
+                "@vue/shared": "3.2.47"
+            }
+        },
+        "node_modules/@dcloudio/uni-mp-kuaishou": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-mp-kuaishou/-/uni-mp-kuaishou-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-t1H8YaS5HUYNI/ArKTPaK17JqNyvLC4ge+oJpAtW1gJOxT/qdRE7BPyfIfoKUoN0QlDxQiuxbvz1ILdT00u0yg==",
+            "dependencies": {
+                "@dcloudio/uni-cli-shared": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-compiler": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-vite": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-vue": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-weixin": "3.0.0-3080720230703001",
+                "@dcloudio/uni-shared": "3.0.0-3080720230703001",
+                "@vue/compiler-core": "3.2.47",
+                "@vue/shared": "3.2.47"
+            }
+        },
+        "node_modules/@dcloudio/uni-mp-lark": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-mp-lark/-/uni-mp-lark-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-3E+vRxFypvcdTMPIGlfI3WWAVlUi3/IfKc0eM53YqNGHFTnzJOAofvFABqE6hcY24FjwepgNDttGddbaE8LtKA==",
+            "dependencies": {
+                "@dcloudio/uni-cli-shared": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-compiler": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-toutiao": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-vite": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-vue": "3.0.0-3080720230703001",
+                "@dcloudio/uni-shared": "3.0.0-3080720230703001",
+                "@vue/compiler-core": "3.2.47",
+                "@vue/shared": "3.2.47"
+            }
+        },
+        "node_modules/@dcloudio/uni-mp-qq": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-mp-qq/-/uni-mp-qq-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-nx9PoO/+zFWlA54O20aXj/gaefUHLqBrhrKPNERAphafFembjudIvo/YS1tjlDk5idJ9G+J5XJNWL60eQcnKNA==",
+            "dependencies": {
+                "@dcloudio/uni-cli-shared": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-vite": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-vue": "3.0.0-3080720230703001",
+                "@dcloudio/uni-shared": "3.0.0-3080720230703001",
+                "@vue/shared": "3.2.47",
+                "fs-extra": "^10.0.0"
+            }
+        },
+        "node_modules/@dcloudio/uni-mp-toutiao": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-mp-toutiao/-/uni-mp-toutiao-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-x39UGX+gelydwYXnDX8YlD7qCpwAWzUwY3DuDNig3GAmtBiBMheM4nQKxxs0zrImRB77eUffwtNn+1+kvTvjyA==",
+            "dependencies": {
+                "@dcloudio/uni-cli-shared": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-compiler": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-vite": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-vue": "3.0.0-3080720230703001",
+                "@dcloudio/uni-shared": "3.0.0-3080720230703001",
+                "@vue/compiler-core": "3.2.47",
+                "@vue/shared": "3.2.47"
+            }
+        },
+        "node_modules/@dcloudio/uni-mp-vite": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-mp-vite/-/uni-mp-vite-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-KGi1tfIrlzGx9vbcrU979I56jaZ+kpQsm+SfKOYg2j6JezQ0/GFqHEHaDdiAdhSZcTX759Qs1PXZmXFxMdDFDA==",
+            "dependencies": {
+                "@dcloudio/uni-cli-shared": "3.0.0-3080720230703001",
+                "@dcloudio/uni-i18n": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-compiler": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-vue": "3.0.0-3080720230703001",
+                "@dcloudio/uni-shared": "3.0.0-3080720230703001",
+                "@vue/compiler-sfc": "3.2.47",
+                "@vue/shared": "3.2.47",
+                "debug": "^4.3.3"
+            }
+        },
+        "node_modules/@dcloudio/uni-mp-vue": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-mp-vue/-/uni-mp-vue-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-Fo0lNHwGhVV2ceaU4Cta8OmB831k6PhJttpaJ18R0o1AM0RykI8NCw2OUuZ5Ex/TedoyejQBxs6skMDCvPb5IQ==",
+            "dependencies": {
+                "@dcloudio/uni-shared": "3.0.0-3080720230703001",
+                "@vue/shared": "3.2.47"
+            }
+        },
+        "node_modules/@dcloudio/uni-mp-weixin": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-mp-weixin/-/uni-mp-weixin-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-8S+6I1OuGk8r+s5nNfqo+Cq+BrK0M+RksDQUtkI8z2e798GrWZiHbTqQ89pEwVdtkhP5G+5orqUg6e5NCLaskQ==",
+            "dependencies": {
+                "@dcloudio/uni-cli-shared": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-vite": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-vue": "3.0.0-3080720230703001",
+                "@dcloudio/uni-shared": "3.0.0-3080720230703001",
+                "@vue/shared": "3.2.47",
+                "jimp": "^0.10.1",
+                "licia": "^1.29.0",
+                "qrcode-reader": "^1.0.4",
+                "qrcode-terminal": "^0.12.0",
+                "ws": "^8.4.2"
+            }
+        },
+        "node_modules/@dcloudio/uni-nvue-styler": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-nvue-styler/-/uni-nvue-styler-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-nhWQ/B/AYYqJZ/7HCmSWylARJ2dRrRyYVwBVs1Re8yk8SoaEkTvvgt5jas3tqjIxhyi5M8hzXeaxdpkY1Jgsyw==",
+            "dependencies": {
+                "@vue/shared": "3.2.47",
+                "parse-css-font": "^4.0.0",
+                "postcss": "^8.4.23"
+            }
+        },
+        "node_modules/@dcloudio/uni-push": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-push/-/uni-push-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-q0chMYDBdj+KGxj/pA2hOm356tPU9WsVxjB2f7JW3Ue6JUNl5snuq0Rk1C/s1IDDAU8W4DTgb9KjsRYTXHV77w==",
+            "dependencies": {
+                "@dcloudio/uni-cli-shared": "3.0.0-3080720230703001"
+            }
+        },
+        "node_modules/@dcloudio/uni-quickapp-webview": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-quickapp-webview/-/uni-quickapp-webview-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-LgV/CvGVp2IyLbIDeir4rPRAi+eglJLrBl86LT1ey+YA/Jecoz9LH4fHhB5gJEedm+KUqL7hjxd7F/XcrIULzg==",
+            "dependencies": {
+                "@dcloudio/uni-cli-shared": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-vite": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-vue": "3.0.0-3080720230703001",
+                "@dcloudio/uni-shared": "3.0.0-3080720230703001",
+                "@vue/shared": "3.2.47"
+            }
+        },
+        "node_modules/@dcloudio/uni-shared": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-shared/-/uni-shared-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-saa7FGqduwcEe0jxntYAFCE6wAtSM9aNG52uLAW5m0c4uRNYVFWJltBkm8Ev7eyko2xkvNhoQAGIGXDTQ+Hxhw==",
+            "dependencies": {
+                "@vue/shared": "3.2.47"
+            }
+        },
+        "node_modules/@dcloudio/uni-stacktracey": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-stacktracey/-/uni-stacktracey-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-xo0O4sQ9gXa0wg1V1I13l/6JxQSTmfTcjyyQWOb3t5E/ME6tVo/RSlA0QN/Guo9XlogmQXs99D30NW/r3KGdJA==",
+            "dev": true
+        },
+        "node_modules/@dcloudio/uni-stat": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-stat/-/uni-stat-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-jzX9nRWk24udvVneFVA/8cfzqedib/nHbTO6GsFPamc6KDFa7QXhLy2m+BV+3inLiMkedfVnvgxNkZDigujyLw==",
+            "dependencies": {
+                "@dcloudio/uni-cli-shared": "3.0.0-3080720230703001",
+                "@dcloudio/uni-shared": "3.0.0-3080720230703001",
+                "debug": "^4.3.3"
+            }
+        },
+        "node_modules/@dcloudio/vite-plugin-uni": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/vite-plugin-uni/-/vite-plugin-uni-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-PMDGsIDjBuoGNzzNPxLAHrXEzBsA2huoZgjbaGa3H8N+4cnbJZmEJEsy/OVdA3I9lrgZ+H6QW95qIA5aVO6djA==",
+            "dev": true,
+            "dependencies": {
+                "@babel/core": "^7.21.3",
+                "@babel/plugin-syntax-import-meta": "^7.10.4",
+                "@babel/plugin-transform-typescript": "^7.20.7",
+                "@dcloudio/uni-cli-shared": "3.0.0-3080720230703001",
+                "@dcloudio/uni-shared": "3.0.0-3080720230703001",
+                "@rollup/pluginutils": "^4.2.0",
+                "@vitejs/plugin-legacy": "^4.0.3",
+                "@vitejs/plugin-vue": "^4.2.1",
+                "@vitejs/plugin-vue-jsx": "^3.0.1",
+                "@vue/compiler-core": "3.2.47",
+                "@vue/compiler-dom": "3.2.47",
+                "@vue/compiler-sfc": "3.2.47",
+                "@vue/shared": "3.2.47",
+                "cac": "6.7.9",
+                "debug": "^4.3.3",
+                "estree-walker": "^2.0.2",
+                "express": "^4.17.1",
+                "fast-glob": "^3.2.11",
+                "fs-extra": "^10.0.0",
+                "hash-sum": "^2.0.0",
+                "jsonc-parser": "^3.0.0",
+                "magic-string": "^0.30.0",
+                "picocolors": "^1.0.0",
+                "terser": "^5.4.0"
+            },
+            "bin": {
+                "uni": "bin/uni.js"
+            },
+            "engines": {
+                "node": "^14.18.0 || >=16.0.0"
+            },
+            "peerDependencies": {
+                "vite": "^4.0.0"
+            }
+        },
+        "node_modules/@esbuild/android-arm": {
+            "version": "0.17.19",
+            "resolved": "https://registry.npmmirror.com/@esbuild/android-arm/-/android-arm-0.17.19.tgz",
+            "integrity": "sha512-rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A==",
+            "cpu": [
+                "arm"
+            ],
+            "optional": true,
+            "os": [
+                "android"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/android-arm64": {
+            "version": "0.17.19",
+            "resolved": "https://registry.npmmirror.com/@esbuild/android-arm64/-/android-arm64-0.17.19.tgz",
+            "integrity": "sha512-KBMWvEZooR7+kzY0BtbTQn0OAYY7CsiydT63pVEaPtVYF0hXbUaOyZog37DKxK7NF3XacBJOpYT4adIJh+avxA==",
+            "cpu": [
+                "arm64"
+            ],
+            "optional": true,
+            "os": [
+                "android"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/android-x64": {
+            "version": "0.17.19",
+            "resolved": "https://registry.npmmirror.com/@esbuild/android-x64/-/android-x64-0.17.19.tgz",
+            "integrity": "sha512-uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww==",
+            "cpu": [
+                "x64"
+            ],
+            "optional": true,
+            "os": [
+                "android"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/darwin-arm64": {
+            "version": "0.17.19",
+            "resolved": "https://registry.npmmirror.com/@esbuild/darwin-arm64/-/darwin-arm64-0.17.19.tgz",
+            "integrity": "sha512-80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg==",
+            "cpu": [
+                "arm64"
+            ],
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/darwin-x64": {
+            "version": "0.17.19",
+            "resolved": "https://registry.npmmirror.com/@esbuild/darwin-x64/-/darwin-x64-0.17.19.tgz",
+            "integrity": "sha512-IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw==",
+            "cpu": [
+                "x64"
+            ],
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/freebsd-arm64": {
+            "version": "0.17.19",
+            "resolved": "https://registry.npmmirror.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.19.tgz",
+            "integrity": "sha512-pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ==",
+            "cpu": [
+                "arm64"
+            ],
+            "optional": true,
+            "os": [
+                "freebsd"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/freebsd-x64": {
+            "version": "0.17.19",
+            "resolved": "https://registry.npmmirror.com/@esbuild/freebsd-x64/-/freebsd-x64-0.17.19.tgz",
+            "integrity": "sha512-4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ==",
+            "cpu": [
+                "x64"
+            ],
+            "optional": true,
+            "os": [
+                "freebsd"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/linux-arm": {
+            "version": "0.17.19",
+            "resolved": "https://registry.npmmirror.com/@esbuild/linux-arm/-/linux-arm-0.17.19.tgz",
+            "integrity": "sha512-cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA==",
+            "cpu": [
+                "arm"
+            ],
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/linux-arm64": {
+            "version": "0.17.19",
+            "resolved": "https://registry.npmmirror.com/@esbuild/linux-arm64/-/linux-arm64-0.17.19.tgz",
+            "integrity": "sha512-ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg==",
+            "cpu": [
+                "arm64"
+            ],
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/linux-ia32": {
+            "version": "0.17.19",
+            "resolved": "https://registry.npmmirror.com/@esbuild/linux-ia32/-/linux-ia32-0.17.19.tgz",
+            "integrity": "sha512-w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ==",
+            "cpu": [
+                "ia32"
+            ],
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/linux-loong64": {
+            "version": "0.17.19",
+            "resolved": "https://registry.npmmirror.com/@esbuild/linux-loong64/-/linux-loong64-0.17.19.tgz",
+            "integrity": "sha512-2iAngUbBPMq439a+z//gE+9WBldoMp1s5GWsUSgqHLzLJ9WoZLZhpwWuym0u0u/4XmZ3gpHmzV84PonE+9IIdQ==",
+            "cpu": [
+                "loong64"
+            ],
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/linux-mips64el": {
+            "version": "0.17.19",
+            "resolved": "https://registry.npmmirror.com/@esbuild/linux-mips64el/-/linux-mips64el-0.17.19.tgz",
+            "integrity": "sha512-LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A==",
+            "cpu": [
+                "mips64el"
+            ],
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/linux-ppc64": {
+            "version": "0.17.19",
+            "resolved": "https://registry.npmmirror.com/@esbuild/linux-ppc64/-/linux-ppc64-0.17.19.tgz",
+            "integrity": "sha512-/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg==",
+            "cpu": [
+                "ppc64"
+            ],
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/linux-riscv64": {
+            "version": "0.17.19",
+            "resolved": "https://registry.npmmirror.com/@esbuild/linux-riscv64/-/linux-riscv64-0.17.19.tgz",
+            "integrity": "sha512-FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA==",
+            "cpu": [
+                "riscv64"
+            ],
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/linux-s390x": {
+            "version": "0.17.19",
+            "resolved": "https://registry.npmmirror.com/@esbuild/linux-s390x/-/linux-s390x-0.17.19.tgz",
+            "integrity": "sha512-IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q==",
+            "cpu": [
+                "s390x"
+            ],
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/linux-x64": {
+            "version": "0.17.19",
+            "resolved": "https://registry.npmmirror.com/@esbuild/linux-x64/-/linux-x64-0.17.19.tgz",
+            "integrity": "sha512-68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw==",
+            "cpu": [
+                "x64"
+            ],
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/netbsd-x64": {
+            "version": "0.17.19",
+            "resolved": "https://registry.npmmirror.com/@esbuild/netbsd-x64/-/netbsd-x64-0.17.19.tgz",
+            "integrity": "sha512-CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q==",
+            "cpu": [
+                "x64"
+            ],
+            "optional": true,
+            "os": [
+                "netbsd"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/openbsd-x64": {
+            "version": "0.17.19",
+            "resolved": "https://registry.npmmirror.com/@esbuild/openbsd-x64/-/openbsd-x64-0.17.19.tgz",
+            "integrity": "sha512-cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g==",
+            "cpu": [
+                "x64"
+            ],
+            "optional": true,
+            "os": [
+                "openbsd"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/sunos-x64": {
+            "version": "0.17.19",
+            "resolved": "https://registry.npmmirror.com/@esbuild/sunos-x64/-/sunos-x64-0.17.19.tgz",
+            "integrity": "sha512-vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg==",
+            "cpu": [
+                "x64"
+            ],
+            "optional": true,
+            "os": [
+                "sunos"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/win32-arm64": {
+            "version": "0.17.19",
+            "resolved": "https://registry.npmmirror.com/@esbuild/win32-arm64/-/win32-arm64-0.17.19.tgz",
+            "integrity": "sha512-yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag==",
+            "cpu": [
+                "arm64"
+            ],
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/win32-ia32": {
+            "version": "0.17.19",
+            "resolved": "https://registry.npmmirror.com/@esbuild/win32-ia32/-/win32-ia32-0.17.19.tgz",
+            "integrity": "sha512-eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw==",
+            "cpu": [
+                "ia32"
+            ],
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/win32-x64": {
+            "version": "0.17.19",
+            "resolved": "https://registry.npmmirror.com/@esbuild/win32-x64/-/win32-x64-0.17.19.tgz",
+            "integrity": "sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA==",
+            "cpu": [
+                "x64"
+            ],
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@intlify/core-base": {
+            "version": "9.1.9",
+            "resolved": "https://registry.npmmirror.com/@intlify/core-base/-/core-base-9.1.9.tgz",
+            "integrity": "sha512-x5T0p/Ja0S8hs5xs+ImKyYckVkL4CzcEXykVYYV6rcbXxJTe2o58IquSqX9bdncVKbRZP7GlBU1EcRaQEEJ+vw==",
+            "dependencies": {
+                "@intlify/devtools-if": "9.1.9",
+                "@intlify/message-compiler": "9.1.9",
+                "@intlify/message-resolver": "9.1.9",
+                "@intlify/runtime": "9.1.9",
+                "@intlify/shared": "9.1.9",
+                "@intlify/vue-devtools": "9.1.9"
+            },
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@intlify/devtools-if": {
+            "version": "9.1.9",
+            "resolved": "https://registry.npmmirror.com/@intlify/devtools-if/-/devtools-if-9.1.9.tgz",
+            "integrity": "sha512-oKSMKjttG3Ut/1UGEZjSdghuP3fwA15zpDPcjkf/1FjlOIm6uIBGMNS5jXzsZy593u+P/YcnrZD6cD3IVFz9vQ==",
+            "dependencies": {
+                "@intlify/shared": "9.1.9"
+            },
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@intlify/message-compiler": {
+            "version": "9.1.9",
+            "resolved": "https://registry.npmmirror.com/@intlify/message-compiler/-/message-compiler-9.1.9.tgz",
+            "integrity": "sha512-6YgCMF46Xd0IH2hMRLCssZI3gFG4aywidoWQ3QP4RGYQXQYYfFC54DxhSgfIPpVoPLQ+4AD29eoYmhiHZ+qLFQ==",
+            "dependencies": {
+                "@intlify/message-resolver": "9.1.9",
+                "@intlify/shared": "9.1.9",
+                "source-map": "0.6.1"
+            },
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@intlify/message-resolver": {
+            "version": "9.1.9",
+            "resolved": "https://registry.npmmirror.com/@intlify/message-resolver/-/message-resolver-9.1.9.tgz",
+            "integrity": "sha512-Lx/DBpigeK0sz2BBbzv5mu9/dAlt98HxwbG7xLawC3O2xMF9MNWU5FtOziwYG6TDIjNq0O/3ZbOJAxwITIWXEA==",
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@intlify/runtime": {
+            "version": "9.1.9",
+            "resolved": "https://registry.npmmirror.com/@intlify/runtime/-/runtime-9.1.9.tgz",
+            "integrity": "sha512-XgPw8+UlHCiie3fI41HPVa/VDJb3/aSH7bLhY1hJvlvNV713PFtb4p4Jo+rlE0gAoMsMCGcsiT982fImolSltg==",
+            "dependencies": {
+                "@intlify/message-compiler": "9.1.9",
+                "@intlify/message-resolver": "9.1.9",
+                "@intlify/shared": "9.1.9"
+            },
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@intlify/shared": {
+            "version": "9.1.9",
+            "resolved": "https://registry.npmmirror.com/@intlify/shared/-/shared-9.1.9.tgz",
+            "integrity": "sha512-xKGM1d0EAxdDFCWedcYXOm6V5Pfw/TMudd6/qCdEb4tv0hk9EKeg7lwQF1azE0dP2phvx0yXxrt7UQK+IZjNdw==",
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@intlify/vue-devtools": {
+            "version": "9.1.9",
+            "resolved": "https://registry.npmmirror.com/@intlify/vue-devtools/-/vue-devtools-9.1.9.tgz",
+            "integrity": "sha512-YPehH9uL4vZcGXky4Ev5qQIITnHKIvsD2GKGXgqf+05osMUI6WSEQHaN9USRa318Rs8RyyPCiDfmA0hRu3k7og==",
+            "dependencies": {
+                "@intlify/message-resolver": "9.1.9",
+                "@intlify/runtime": "9.1.9",
+                "@intlify/shared": "9.1.9"
+            },
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@istanbuljs/load-nyc-config": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmmirror.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
+            "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "camelcase": "^5.3.1",
+                "find-up": "^4.1.0",
+                "get-package-type": "^0.1.0",
+                "js-yaml": "^3.13.1",
+                "resolve-from": "^5.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/@istanbuljs/load-nyc-config/node_modules/camelcase": {
+            "version": "5.3.1",
+            "resolved": "https://registry.npmmirror.com/camelcase/-/camelcase-5.3.1.tgz",
+            "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/@istanbuljs/schema": {
+            "version": "0.1.3",
+            "resolved": "https://registry.npmmirror.com/@istanbuljs/schema/-/schema-0.1.3.tgz",
+            "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/@jest/console": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/@jest/console/-/console-27.5.1.tgz",
+            "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "@jest/types": "^27.5.1",
+                "@types/node": "*",
+                "chalk": "^4.0.0",
+                "jest-message-util": "^27.5.1",
+                "jest-util": "^27.5.1",
+                "slash": "^3.0.0"
+            },
+            "engines": {
+                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+            }
+        },
+        "node_modules/@jest/console/node_modules/ansi-styles": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "color-convert": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/@jest/console/node_modules/chalk": {
+            "version": "4.1.2",
+            "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+            "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "ansi-styles": "^4.1.0",
+                "supports-color": "^7.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/@jest/console/node_modules/color-convert": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "color-name": "~1.1.4"
+            },
+            "engines": {
+                "node": ">=7.0.0"
+            }
+        },
+        "node_modules/@jest/console/node_modules/color-name": {
+            "version": "1.1.4",
+            "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/@jest/console/node_modules/has-flag": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/@jest/console/node_modules/supports-color": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/@jest/core": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/@jest/core/-/core-27.5.1.tgz",
+            "integrity": "sha512-AK6/UTrvQD0Cd24NSqmIA6rKsu0tKIxfiCducZvqxYdmMisOYAsdItspT+fQDQYARPf8XgjAFZi0ogW2agH5nQ==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "@jest/console": "^27.5.1",
+                "@jest/reporters": "^27.5.1",
+                "@jest/test-result": "^27.5.1",
+                "@jest/transform": "^27.5.1",
+                "@jest/types": "^27.5.1",
+                "@types/node": "*",
+                "ansi-escapes": "^4.2.1",
+                "chalk": "^4.0.0",
+                "emittery": "^0.8.1",
+                "exit": "^0.1.2",
+                "graceful-fs": "^4.2.9",
+                "jest-changed-files": "^27.5.1",
+                "jest-config": "^27.5.1",
+                "jest-haste-map": "^27.5.1",
+                "jest-message-util": "^27.5.1",
+                "jest-regex-util": "^27.5.1",
+                "jest-resolve": "^27.5.1",
+                "jest-resolve-dependencies": "^27.5.1",
+                "jest-runner": "^27.5.1",
+                "jest-runtime": "^27.5.1",
+                "jest-snapshot": "^27.5.1",
+                "jest-util": "^27.5.1",
+                "jest-validate": "^27.5.1",
+                "jest-watcher": "^27.5.1",
+                "micromatch": "^4.0.4",
+                "rimraf": "^3.0.0",
+                "slash": "^3.0.0",
+                "strip-ansi": "^6.0.0"
+            },
+            "engines": {
+                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+            },
+            "peerDependencies": {
+                "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+            },
+            "peerDependenciesMeta": {
+                "node-notifier": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@jest/core/node_modules/ansi-styles": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "color-convert": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/@jest/core/node_modules/chalk": {
+            "version": "4.1.2",
+            "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+            "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "ansi-styles": "^4.1.0",
+                "supports-color": "^7.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/@jest/core/node_modules/color-convert": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "color-name": "~1.1.4"
+            },
+            "engines": {
+                "node": ">=7.0.0"
+            }
+        },
+        "node_modules/@jest/core/node_modules/color-name": {
+            "version": "1.1.4",
+            "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/@jest/core/node_modules/has-flag": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/@jest/core/node_modules/supports-color": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/@jest/environment": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/@jest/environment/-/environment-27.5.1.tgz",
+            "integrity": "sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "@jest/fake-timers": "^27.5.1",
+                "@jest/types": "^27.5.1",
+                "@types/node": "*",
+                "jest-mock": "^27.5.1"
+            },
+            "engines": {
+                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+            }
+        },
+        "node_modules/@jest/fake-timers": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/@jest/fake-timers/-/fake-timers-27.5.1.tgz",
+            "integrity": "sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "@jest/types": "^27.5.1",
+                "@sinonjs/fake-timers": "^8.0.1",
+                "@types/node": "*",
+                "jest-message-util": "^27.5.1",
+                "jest-mock": "^27.5.1",
+                "jest-util": "^27.5.1"
+            },
+            "engines": {
+                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+            }
+        },
+        "node_modules/@jest/globals": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/@jest/globals/-/globals-27.5.1.tgz",
+            "integrity": "sha512-ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "@jest/environment": "^27.5.1",
+                "@jest/types": "^27.5.1",
+                "expect": "^27.5.1"
+            },
+            "engines": {
+                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+            }
+        },
+        "node_modules/@jest/reporters": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/@jest/reporters/-/reporters-27.5.1.tgz",
+            "integrity": "sha512-cPXh9hWIlVJMQkVk84aIvXuBB4uQQmFqZiacloFuGiP3ah1sbCxCosidXFDfqG8+6fO1oR2dTJTlsOy4VFmUfw==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "@bcoe/v8-coverage": "^0.2.3",
+                "@jest/console": "^27.5.1",
+                "@jest/test-result": "^27.5.1",
+                "@jest/transform": "^27.5.1",
+                "@jest/types": "^27.5.1",
+                "@types/node": "*",
+                "chalk": "^4.0.0",
+                "collect-v8-coverage": "^1.0.0",
+                "exit": "^0.1.2",
+                "glob": "^7.1.2",
+                "graceful-fs": "^4.2.9",
+                "istanbul-lib-coverage": "^3.0.0",
+                "istanbul-lib-instrument": "^5.1.0",
+                "istanbul-lib-report": "^3.0.0",
+                "istanbul-lib-source-maps": "^4.0.0",
+                "istanbul-reports": "^3.1.3",
+                "jest-haste-map": "^27.5.1",
+                "jest-resolve": "^27.5.1",
+                "jest-util": "^27.5.1",
+                "jest-worker": "^27.5.1",
+                "slash": "^3.0.0",
+                "source-map": "^0.6.0",
+                "string-length": "^4.0.1",
+                "terminal-link": "^2.0.0",
+                "v8-to-istanbul": "^8.1.0"
+            },
+            "engines": {
+                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+            },
+            "peerDependencies": {
+                "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+            },
+            "peerDependenciesMeta": {
+                "node-notifier": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@jest/reporters/node_modules/ansi-styles": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "color-convert": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/@jest/reporters/node_modules/brace-expansion": {
+            "version": "1.1.11",
+            "resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.11.tgz",
+            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
+            }
+        },
+        "node_modules/@jest/reporters/node_modules/chalk": {
+            "version": "4.1.2",
+            "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+            "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "ansi-styles": "^4.1.0",
+                "supports-color": "^7.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/@jest/reporters/node_modules/color-convert": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "color-name": "~1.1.4"
+            },
+            "engines": {
+                "node": ">=7.0.0"
+            }
+        },
+        "node_modules/@jest/reporters/node_modules/color-name": {
+            "version": "1.1.4",
+            "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/@jest/reporters/node_modules/glob": {
+            "version": "7.2.3",
+            "resolved": "https://registry.npmmirror.com/glob/-/glob-7.2.3.tgz",
+            "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^3.1.1",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+            },
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/@jest/reporters/node_modules/has-flag": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/@jest/reporters/node_modules/minimatch": {
+            "version": "3.1.2",
+            "resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-3.1.2.tgz",
+            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "brace-expansion": "^1.1.7"
+            },
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/@jest/reporters/node_modules/supports-color": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/@jest/source-map": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/@jest/source-map/-/source-map-27.5.1.tgz",
+            "integrity": "sha512-y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "callsites": "^3.0.0",
+                "graceful-fs": "^4.2.9",
+                "source-map": "^0.6.0"
+            },
+            "engines": {
+                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+            }
+        },
+        "node_modules/@jest/test-result": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/@jest/test-result/-/test-result-27.5.1.tgz",
+            "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "@jest/console": "^27.5.1",
+                "@jest/types": "^27.5.1",
+                "@types/istanbul-lib-coverage": "^2.0.0",
+                "collect-v8-coverage": "^1.0.0"
+            },
+            "engines": {
+                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+            }
+        },
+        "node_modules/@jest/test-sequencer": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/@jest/test-sequencer/-/test-sequencer-27.5.1.tgz",
+            "integrity": "sha512-LCheJF7WB2+9JuCS7VB/EmGIdQuhtqjRNI9A43idHv3E4KltCTsPsLxvdaubFHSYwY/fNjMWjl6vNRhDiN7vpQ==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "@jest/test-result": "^27.5.1",
+                "graceful-fs": "^4.2.9",
+                "jest-haste-map": "^27.5.1",
+                "jest-runtime": "^27.5.1"
+            },
+            "engines": {
+                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+            }
+        },
+        "node_modules/@jest/transform": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/@jest/transform/-/transform-27.5.1.tgz",
+            "integrity": "sha512-ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "@babel/core": "^7.1.0",
+                "@jest/types": "^27.5.1",
+                "babel-plugin-istanbul": "^6.1.1",
+                "chalk": "^4.0.0",
+                "convert-source-map": "^1.4.0",
+                "fast-json-stable-stringify": "^2.0.0",
+                "graceful-fs": "^4.2.9",
+                "jest-haste-map": "^27.5.1",
+                "jest-regex-util": "^27.5.1",
+                "jest-util": "^27.5.1",
+                "micromatch": "^4.0.4",
+                "pirates": "^4.0.4",
+                "slash": "^3.0.0",
+                "source-map": "^0.6.1",
+                "write-file-atomic": "^3.0.0"
+            },
+            "engines": {
+                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+            }
+        },
+        "node_modules/@jest/transform/node_modules/ansi-styles": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "color-convert": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/@jest/transform/node_modules/chalk": {
+            "version": "4.1.2",
+            "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+            "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "ansi-styles": "^4.1.0",
+                "supports-color": "^7.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/@jest/transform/node_modules/color-convert": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "color-name": "~1.1.4"
+            },
+            "engines": {
+                "node": ">=7.0.0"
+            }
+        },
+        "node_modules/@jest/transform/node_modules/color-name": {
+            "version": "1.1.4",
+            "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/@jest/transform/node_modules/convert-source-map": {
+            "version": "1.9.0",
+            "resolved": "https://registry.npmmirror.com/convert-source-map/-/convert-source-map-1.9.0.tgz",
+            "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/@jest/transform/node_modules/has-flag": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/@jest/transform/node_modules/supports-color": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/@jest/types": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/@jest/types/-/types-27.5.1.tgz",
+            "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "@types/istanbul-lib-coverage": "^2.0.0",
+                "@types/istanbul-reports": "^3.0.0",
+                "@types/node": "*",
+                "@types/yargs": "^16.0.0",
+                "chalk": "^4.0.0"
+            },
+            "engines": {
+                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+            }
+        },
+        "node_modules/@jest/types/node_modules/ansi-styles": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "color-convert": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/@jest/types/node_modules/chalk": {
+            "version": "4.1.2",
+            "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+            "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "ansi-styles": "^4.1.0",
+                "supports-color": "^7.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/@jest/types/node_modules/color-convert": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "color-name": "~1.1.4"
+            },
+            "engines": {
+                "node": ">=7.0.0"
+            }
+        },
+        "node_modules/@jest/types/node_modules/color-name": {
+            "version": "1.1.4",
+            "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/@jest/types/node_modules/has-flag": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/@jest/types/node_modules/supports-color": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/@jimp/bmp": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/bmp/-/bmp-0.10.3.tgz",
+            "integrity": "sha512-keMOc5woiDmONXsB/6aXLR4Z5Q+v8lFq3EY2rcj2FmstbDMhRuGbmcBxlEgOqfRjwvtf/wOtJ3Of37oAWtVfLg==",
+            "dependencies": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/utils": "^0.10.3",
+                "bmp-js": "^0.1.0",
+                "core-js": "^3.4.1"
+            },
+            "peerDependencies": {
+                "@jimp/custom": ">=0.3.5"
+            }
+        },
+        "node_modules/@jimp/core": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/core/-/core-0.10.3.tgz",
+            "integrity": "sha512-Gd5IpL3U2bFIO57Fh/OA3HCpWm4uW/pU01E75rI03BXfTdz3T+J7TwvyG1XaqsQ7/DSlS99GXtLQPlfFIe28UA==",
+            "dependencies": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/utils": "^0.10.3",
+                "any-base": "^1.1.0",
+                "buffer": "^5.2.0",
+                "core-js": "^3.4.1",
+                "exif-parser": "^0.1.12",
+                "file-type": "^9.0.0",
+                "load-bmfont": "^1.3.1",
+                "mkdirp": "^0.5.1",
+                "phin": "^2.9.1",
+                "pixelmatch": "^4.0.2",
+                "tinycolor2": "^1.4.1"
+            }
+        },
+        "node_modules/@jimp/custom": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/custom/-/custom-0.10.3.tgz",
+            "integrity": "sha512-nZmSI+jwTi5IRyNLbKSXQovoeqsw+D0Jn0SxW08wYQvdkiWA8bTlDQFgQ7HVwCAKBm8oKkDB/ZEo9qvHJ+1gAQ==",
+            "dependencies": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/core": "^0.10.3",
+                "core-js": "^3.4.1"
+            }
+        },
+        "node_modules/@jimp/gif": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/gif/-/gif-0.10.3.tgz",
+            "integrity": "sha512-vjlRodSfz1CrUvvrnUuD/DsLK1GHB/yDZXHthVdZu23zYJIW7/WrIiD1IgQ5wOMV7NocfrvPn2iqUfBP81/WWA==",
+            "dependencies": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/utils": "^0.10.3",
+                "core-js": "^3.4.1",
+                "omggif": "^1.0.9"
+            },
+            "peerDependencies": {
+                "@jimp/custom": ">=0.3.5"
+            }
+        },
+        "node_modules/@jimp/jpeg": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/jpeg/-/jpeg-0.10.3.tgz",
+            "integrity": "sha512-AAANwgUZOt6f6P7LZxY9lyJ9xclqutYJlsxt3JbriXUGJgrrFAIkcKcqv1nObgmQASSAQKYaMV9KdHjMlWFKlQ==",
+            "dependencies": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/utils": "^0.10.3",
+                "core-js": "^3.4.1",
+                "jpeg-js": "^0.3.4"
+            },
+            "peerDependencies": {
+                "@jimp/custom": ">=0.3.5"
+            }
+        },
+        "node_modules/@jimp/plugin-blit": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/plugin-blit/-/plugin-blit-0.10.3.tgz",
+            "integrity": "sha512-5zlKlCfx4JWw9qUVC7GI4DzXyxDWyFvgZLaoGFoT00mlXlN75SarlDwc9iZ/2e2kp4bJWxz3cGgG4G/WXrbg3Q==",
+            "dependencies": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/utils": "^0.10.3",
+                "core-js": "^3.4.1"
+            },
+            "peerDependencies": {
+                "@jimp/custom": ">=0.3.5"
+            }
+        },
+        "node_modules/@jimp/plugin-blur": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/plugin-blur/-/plugin-blur-0.10.3.tgz",
+            "integrity": "sha512-cTOK3rjh1Yjh23jSfA6EHCHjsPJDEGLC8K2y9gM7dnTUK1y9NNmkFS23uHpyjgsWFIoH9oRh2SpEs3INjCpZhQ==",
+            "dependencies": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/utils": "^0.10.3",
+                "core-js": "^3.4.1"
+            },
+            "peerDependencies": {
+                "@jimp/custom": ">=0.3.5"
+            }
+        },
+        "node_modules/@jimp/plugin-circle": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/plugin-circle/-/plugin-circle-0.10.3.tgz",
+            "integrity": "sha512-51GAPIVelqAcfuUpaM5JWJ0iWl4vEjNXB7p4P7SX5udugK5bxXUjO6KA2qgWmdpHuCKtoNgkzWU9fNSuYp7tCA==",
+            "dependencies": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/utils": "^0.10.3",
+                "core-js": "^3.4.1"
+            },
+            "peerDependencies": {
+                "@jimp/custom": ">=0.3.5"
+            }
+        },
+        "node_modules/@jimp/plugin-color": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/plugin-color/-/plugin-color-0.10.3.tgz",
+            "integrity": "sha512-RgeHUElmlTH7vpI4WyQrz6u59spiKfVQbsG/XUzfWGamFSixa24ZDwX/yV/Ts+eNaz7pZeIuv533qmKPvw2ujg==",
+            "dependencies": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/utils": "^0.10.3",
+                "core-js": "^3.4.1",
+                "tinycolor2": "^1.4.1"
+            },
+            "peerDependencies": {
+                "@jimp/custom": ">=0.3.5"
+            }
+        },
+        "node_modules/@jimp/plugin-contain": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/plugin-contain/-/plugin-contain-0.10.3.tgz",
+            "integrity": "sha512-bYJKW9dqzcB0Ihc6u7jSyKa3juStzbLs2LFr6fu8TzA2WkMS/R8h+ddkiO36+F9ILTWHP0CIA3HFe5OdOGcigw==",
+            "dependencies": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/utils": "^0.10.3",
+                "core-js": "^3.4.1"
+            },
+            "peerDependencies": {
+                "@jimp/custom": ">=0.3.5",
+                "@jimp/plugin-blit": ">=0.3.5",
+                "@jimp/plugin-resize": ">=0.3.5",
+                "@jimp/plugin-scale": ">=0.3.5"
+            }
+        },
+        "node_modules/@jimp/plugin-cover": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/plugin-cover/-/plugin-cover-0.10.3.tgz",
+            "integrity": "sha512-pOxu0cM0BRPzdV468n4dMocJXoMbTnARDY/EpC3ZW15SpMuc/dr1KhWQHgoQX5kVW1Wt8zgqREAJJCQ5KuPKDA==",
+            "dependencies": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/utils": "^0.10.3",
+                "core-js": "^3.4.1"
+            },
+            "peerDependencies": {
+                "@jimp/custom": ">=0.3.5",
+                "@jimp/plugin-crop": ">=0.3.5",
+                "@jimp/plugin-resize": ">=0.3.5",
+                "@jimp/plugin-scale": ">=0.3.5"
+            }
+        },
+        "node_modules/@jimp/plugin-crop": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/plugin-crop/-/plugin-crop-0.10.3.tgz",
+            "integrity": "sha512-nB7HgOjjl9PgdHr076xZ3Sr6qHYzeBYBs9qvs3tfEEUeYMNnvzgCCGtUl6eMakazZFCMk3mhKmcB9zQuHFOvkg==",
+            "dependencies": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/utils": "^0.10.3",
+                "core-js": "^3.4.1"
+            },
+            "peerDependencies": {
+                "@jimp/custom": ">=0.3.5"
+            }
+        },
+        "node_modules/@jimp/plugin-displace": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/plugin-displace/-/plugin-displace-0.10.3.tgz",
+            "integrity": "sha512-8t3fVKCH5IVqI4lewe4lFFjpxxr69SQCz5/tlpDLQZsrNScNJivHdQ09zljTrVTCSgeCqQJIKgH2Q7Sk/pAZ0w==",
+            "dependencies": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/utils": "^0.10.3",
+                "core-js": "^3.4.1"
+            },
+            "peerDependencies": {
+                "@jimp/custom": ">=0.3.5"
+            }
+        },
+        "node_modules/@jimp/plugin-dither": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/plugin-dither/-/plugin-dither-0.10.3.tgz",
+            "integrity": "sha512-JCX/oNSnEg1kGQ8ffZ66bEgQOLCY3Rn+lrd6v1jjLy/mn9YVZTMsxLtGCXpiCDC2wG/KTmi4862ysmP9do9dAQ==",
+            "dependencies": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/utils": "^0.10.3",
+                "core-js": "^3.4.1"
+            },
+            "peerDependencies": {
+                "@jimp/custom": ">=0.3.5"
+            }
+        },
+        "node_modules/@jimp/plugin-fisheye": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/plugin-fisheye/-/plugin-fisheye-0.10.3.tgz",
+            "integrity": "sha512-RRZb1wqe+xdocGcFtj2xHU7sF7xmEZmIa6BmrfSchjyA2b32TGPWKnP3qyj7p6LWEsXn+19hRYbjfyzyebPElQ==",
+            "dependencies": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/utils": "^0.10.3",
+                "core-js": "^3.4.1"
+            },
+            "peerDependencies": {
+                "@jimp/custom": ">=0.3.5"
+            }
+        },
+        "node_modules/@jimp/plugin-flip": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/plugin-flip/-/plugin-flip-0.10.3.tgz",
+            "integrity": "sha512-0epbi8XEzp0wmSjoW9IB0iMu0yNF17aZOxLdURCN3Zr+8nWPs5VNIMqSVa1Y62GSyiMDpVpKF/ITiXre+EqrPg==",
+            "dependencies": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/utils": "^0.10.3",
+                "core-js": "^3.4.1"
+            },
+            "peerDependencies": {
+                "@jimp/custom": ">=0.3.5",
+                "@jimp/plugin-rotate": ">=0.3.5"
+            }
+        },
+        "node_modules/@jimp/plugin-gaussian": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/plugin-gaussian/-/plugin-gaussian-0.10.3.tgz",
+            "integrity": "sha512-25eHlFbHUDnMMGpgRBBeQ2AMI4wsqCg46sue0KklI+c2BaZ+dGXmJA5uT8RTOrt64/K9Wz5E+2n7eBnny4dfpQ==",
+            "dependencies": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/utils": "^0.10.3",
+                "core-js": "^3.4.1"
+            },
+            "peerDependencies": {
+                "@jimp/custom": ">=0.3.5"
+            }
+        },
+        "node_modules/@jimp/plugin-invert": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/plugin-invert/-/plugin-invert-0.10.3.tgz",
+            "integrity": "sha512-effYSApWY/FbtlzqsKXlTLkgloKUiHBKjkQnqh5RL4oQxh/33j6aX+HFdDyQKtsXb8CMd4xd7wyiD2YYabTa0g==",
+            "dependencies": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/utils": "^0.10.3",
+                "core-js": "^3.4.1"
+            },
+            "peerDependencies": {
+                "@jimp/custom": ">=0.3.5"
+            }
+        },
+        "node_modules/@jimp/plugin-mask": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/plugin-mask/-/plugin-mask-0.10.3.tgz",
+            "integrity": "sha512-twrg8q8TIhM9Z6Jcu9/5f+OCAPaECb0eKrrbbIajJqJ3bCUlj5zbfgIhiQIzjPJ6KjpnFPSqHQfHkU1Vvk/nVw==",
+            "dependencies": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/utils": "^0.10.3",
+                "core-js": "^3.4.1"
+            },
+            "peerDependencies": {
+                "@jimp/custom": ">=0.3.5"
+            }
+        },
+        "node_modules/@jimp/plugin-normalize": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/plugin-normalize/-/plugin-normalize-0.10.3.tgz",
+            "integrity": "sha512-xkb5eZI/mMlbwKkDN79+1/t/+DBo8bBXZUMsT4gkFgMRKNRZ6NQPxlv1d3QpRzlocsl6UMxrHnhgnXdLAcgrXw==",
+            "dependencies": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/utils": "^0.10.3",
+                "core-js": "^3.4.1"
+            },
+            "peerDependencies": {
+                "@jimp/custom": ">=0.3.5"
+            }
+        },
+        "node_modules/@jimp/plugin-print": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/plugin-print/-/plugin-print-0.10.3.tgz",
+            "integrity": "sha512-wjRiI6yjXsAgMe6kVjizP+RgleUCLkH256dskjoNvJzmzbEfO7xQw9g6M02VET+emnbY0CO83IkrGm2q43VRyg==",
+            "dependencies": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/utils": "^0.10.3",
+                "core-js": "^3.4.1",
+                "load-bmfont": "^1.4.0"
+            },
+            "peerDependencies": {
+                "@jimp/custom": ">=0.3.5",
+                "@jimp/plugin-blit": ">=0.3.5"
+            }
+        },
+        "node_modules/@jimp/plugin-resize": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/plugin-resize/-/plugin-resize-0.10.3.tgz",
+            "integrity": "sha512-rf8YmEB1d7Sg+g4LpqF0Mp+dfXfb6JFJkwlAIWPUOR7lGsPWALavEwTW91c0etEdnp0+JB9AFpy6zqq7Lwkq6w==",
+            "dependencies": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/utils": "^0.10.3",
+                "core-js": "^3.4.1"
+            },
+            "peerDependencies": {
+                "@jimp/custom": ">=0.3.5"
+            }
+        },
+        "node_modules/@jimp/plugin-rotate": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/plugin-rotate/-/plugin-rotate-0.10.3.tgz",
+            "integrity": "sha512-YXLlRjm18fkW9MOHUaVAxWjvgZM851ofOipytz5FyKp4KZWDLk+dZK1JNmVmK7MyVmAzZ5jsgSLhIgj+GgN0Eg==",
+            "dependencies": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/utils": "^0.10.3",
+                "core-js": "^3.4.1"
+            },
+            "peerDependencies": {
+                "@jimp/custom": ">=0.3.5",
+                "@jimp/plugin-blit": ">=0.3.5",
+                "@jimp/plugin-crop": ">=0.3.5",
+                "@jimp/plugin-resize": ">=0.3.5"
+            }
+        },
+        "node_modules/@jimp/plugin-scale": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/plugin-scale/-/plugin-scale-0.10.3.tgz",
+            "integrity": "sha512-5DXD7x7WVcX1gUgnlFXQa8F+Q3ThRYwJm+aesgrYvDOY+xzRoRSdQvhmdd4JEEue3lyX44DvBSgCIHPtGcEPaw==",
+            "dependencies": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/utils": "^0.10.3",
+                "core-js": "^3.4.1"
+            },
+            "peerDependencies": {
+                "@jimp/custom": ">=0.3.5",
+                "@jimp/plugin-resize": ">=0.3.5"
+            }
+        },
+        "node_modules/@jimp/plugin-shadow": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/plugin-shadow/-/plugin-shadow-0.10.3.tgz",
+            "integrity": "sha512-/nkFXpt2zVcdP4ETdkAUL0fSzyrC5ZFxdcphbYBodqD7fXNqChS/Un1eD4xCXWEpW8cnG9dixZgQgStjywH0Mg==",
+            "dependencies": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/utils": "^0.10.3",
+                "core-js": "^3.4.1"
+            },
+            "peerDependencies": {
+                "@jimp/custom": ">=0.3.5",
+                "@jimp/plugin-blur": ">=0.3.5",
+                "@jimp/plugin-resize": ">=0.3.5"
+            }
+        },
+        "node_modules/@jimp/plugin-threshold": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/plugin-threshold/-/plugin-threshold-0.10.3.tgz",
+            "integrity": "sha512-Dzh0Yq2wXP2SOnxcbbiyA4LJ2luwrdf1MghNIt9H+NX7B+IWw/N8qA2GuSm9n4BPGSLluuhdAWJqHcTiREriVA==",
+            "dependencies": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/utils": "^0.10.3",
+                "core-js": "^3.4.1"
+            },
+            "peerDependencies": {
+                "@jimp/custom": ">=0.3.5",
+                "@jimp/plugin-color": ">=0.8.0",
+                "@jimp/plugin-resize": ">=0.8.0"
+            }
+        },
+        "node_modules/@jimp/plugins": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/plugins/-/plugins-0.10.3.tgz",
+            "integrity": "sha512-jTT3/7hOScf0EIKiAXmxwayHhryhc1wWuIe3FrchjDjr9wgIGNN2a7XwCgPl3fML17DXK1x8EzDneCdh261bkw==",
+            "dependencies": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/plugin-blit": "^0.10.3",
+                "@jimp/plugin-blur": "^0.10.3",
+                "@jimp/plugin-circle": "^0.10.3",
+                "@jimp/plugin-color": "^0.10.3",
+                "@jimp/plugin-contain": "^0.10.3",
+                "@jimp/plugin-cover": "^0.10.3",
+                "@jimp/plugin-crop": "^0.10.3",
+                "@jimp/plugin-displace": "^0.10.3",
+                "@jimp/plugin-dither": "^0.10.3",
+                "@jimp/plugin-fisheye": "^0.10.3",
+                "@jimp/plugin-flip": "^0.10.3",
+                "@jimp/plugin-gaussian": "^0.10.3",
+                "@jimp/plugin-invert": "^0.10.3",
+                "@jimp/plugin-mask": "^0.10.3",
+                "@jimp/plugin-normalize": "^0.10.3",
+                "@jimp/plugin-print": "^0.10.3",
+                "@jimp/plugin-resize": "^0.10.3",
+                "@jimp/plugin-rotate": "^0.10.3",
+                "@jimp/plugin-scale": "^0.10.3",
+                "@jimp/plugin-shadow": "^0.10.3",
+                "@jimp/plugin-threshold": "^0.10.3",
+                "core-js": "^3.4.1",
+                "timm": "^1.6.1"
+            },
+            "peerDependencies": {
+                "@jimp/custom": ">=0.3.5"
+            }
+        },
+        "node_modules/@jimp/png": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/png/-/png-0.10.3.tgz",
+            "integrity": "sha512-YKqk/dkl+nGZxSYIDQrqhmaP8tC3IK8H7dFPnnzFVvbhDnyYunqBZZO3SaZUKTichClRw8k/CjBhbc+hifSGWg==",
+            "dependencies": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/utils": "^0.10.3",
+                "core-js": "^3.4.1",
+                "pngjs": "^3.3.3"
+            },
+            "peerDependencies": {
+                "@jimp/custom": ">=0.3.5"
+            }
+        },
+        "node_modules/@jimp/tiff": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/tiff/-/tiff-0.10.3.tgz",
+            "integrity": "sha512-7EsJzZ5Y/EtinkBGuwX3Bi4S+zgbKouxjt9c82VJTRJOQgLWsE/RHqcyRCOQBhHAZ9QexYmDz34medfLKdoX0g==",
+            "dependencies": {
+                "@babel/runtime": "^7.7.2",
+                "core-js": "^3.4.1",
+                "utif": "^2.0.1"
+            },
+            "peerDependencies": {
+                "@jimp/custom": ">=0.3.5"
+            }
+        },
+        "node_modules/@jimp/types": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/types/-/types-0.10.3.tgz",
+            "integrity": "sha512-XGmBakiHZqseSWr/puGN+CHzx0IKBSpsKlmEmsNV96HKDiP6eu8NSnwdGCEq2mmIHe0JNcg1hqg59hpwtQ7Tiw==",
+            "dependencies": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/bmp": "^0.10.3",
+                "@jimp/gif": "^0.10.3",
+                "@jimp/jpeg": "^0.10.3",
+                "@jimp/png": "^0.10.3",
+                "@jimp/tiff": "^0.10.3",
+                "core-js": "^3.4.1",
+                "timm": "^1.6.1"
+            },
+            "peerDependencies": {
+                "@jimp/custom": ">=0.3.5"
+            }
+        },
+        "node_modules/@jimp/utils": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/utils/-/utils-0.10.3.tgz",
+            "integrity": "sha512-VcSlQhkil4ReYmg1KkN+WqHyYfZ2XfZxDsKAHSfST1GEz/RQHxKZbX+KhFKtKflnL0F4e6DlNQj3vznMNXCR2w==",
+            "dependencies": {
+                "@babel/runtime": "^7.7.2",
+                "core-js": "^3.4.1",
+                "regenerator-runtime": "^0.13.3"
+            }
+        },
+        "node_modules/@jridgewell/gen-mapping": {
+            "version": "0.3.5",
+            "resolved": "https://registry.npmmirror.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
+            "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
+            "dependencies": {
+                "@jridgewell/set-array": "^1.2.1",
+                "@jridgewell/sourcemap-codec": "^1.4.10",
+                "@jridgewell/trace-mapping": "^0.3.24"
+            },
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
+        "node_modules/@jridgewell/resolve-uri": {
+            "version": "3.1.2",
+            "resolved": "https://registry.npmmirror.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+            "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
+        "node_modules/@jridgewell/set-array": {
+            "version": "1.2.1",
+            "resolved": "https://registry.npmmirror.com/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+            "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
+        "node_modules/@jridgewell/source-map": {
+            "version": "0.3.6",
+            "resolved": "https://registry.npmmirror.com/@jridgewell/source-map/-/source-map-0.3.6.tgz",
+            "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
+            "devOptional": true,
+            "dependencies": {
+                "@jridgewell/gen-mapping": "^0.3.5",
+                "@jridgewell/trace-mapping": "^0.3.25"
+            }
+        },
+        "node_modules/@jridgewell/sourcemap-codec": {
+            "version": "1.4.15",
+            "resolved": "https://registry.npmmirror.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+            "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
+        },
+        "node_modules/@jridgewell/trace-mapping": {
+            "version": "0.3.25",
+            "resolved": "https://registry.npmmirror.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+            "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+            "dependencies": {
+                "@jridgewell/resolve-uri": "^3.1.0",
+                "@jridgewell/sourcemap-codec": "^1.4.14"
+            }
+        },
+        "node_modules/@nodelib/fs.scandir": {
+            "version": "2.1.5",
+            "resolved": "https://registry.npmmirror.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+            "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+            "dependencies": {
+                "@nodelib/fs.stat": "2.0.5",
+                "run-parallel": "^1.1.9"
+            },
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/@nodelib/fs.stat": {
+            "version": "2.0.5",
+            "resolved": "https://registry.npmmirror.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+            "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/@nodelib/fs.walk": {
+            "version": "1.2.8",
+            "resolved": "https://registry.npmmirror.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+            "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+            "dependencies": {
+                "@nodelib/fs.scandir": "2.1.5",
+                "fastq": "^1.6.0"
+            },
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/@rollup/plugin-commonjs": {
+            "version": "24.1.0",
+            "resolved": "https://registry.npmmirror.com/@rollup/plugin-commonjs/-/plugin-commonjs-24.1.0.tgz",
+            "integrity": "sha512-eSL45hjhCWI0jCCXcNtLVqM5N1JlBGvlFfY0m6oOYnLCJ6N0qEXoZql4sY2MOUArzhH4SA/qBpTxvvZp2Sc+DQ==",
+            "dev": true,
+            "dependencies": {
+                "@rollup/pluginutils": "^5.0.1",
+                "commondir": "^1.0.1",
+                "estree-walker": "^2.0.2",
+                "glob": "^8.0.3",
+                "is-reference": "1.2.1",
+                "magic-string": "^0.27.0"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            },
+            "peerDependencies": {
+                "rollup": "^2.68.0||^3.0.0"
+            },
+            "peerDependenciesMeta": {
+                "rollup": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@rollup/plugin-commonjs/node_modules/@rollup/pluginutils": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmmirror.com/@rollup/pluginutils/-/pluginutils-5.1.0.tgz",
+            "integrity": "sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==",
+            "dev": true,
+            "dependencies": {
+                "@types/estree": "^1.0.0",
+                "estree-walker": "^2.0.2",
+                "picomatch": "^2.3.1"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            },
+            "peerDependencies": {
+                "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0"
+            },
+            "peerDependenciesMeta": {
+                "rollup": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@rollup/plugin-commonjs/node_modules/magic-string": {
+            "version": "0.27.0",
+            "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.27.0.tgz",
+            "integrity": "sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==",
+            "dev": true,
+            "dependencies": {
+                "@jridgewell/sourcemap-codec": "^1.4.13"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@rollup/pluginutils": {
+            "version": "4.2.1",
+            "resolved": "https://registry.npmmirror.com/@rollup/pluginutils/-/pluginutils-4.2.1.tgz",
+            "integrity": "sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==",
+            "dependencies": {
+                "estree-walker": "^2.0.1",
+                "picomatch": "^2.2.2"
+            },
+            "engines": {
+                "node": ">= 8.0.0"
+            }
+        },
+        "node_modules/@sinonjs/commons": {
+            "version": "1.8.6",
+            "resolved": "https://registry.npmmirror.com/@sinonjs/commons/-/commons-1.8.6.tgz",
+            "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "type-detect": "4.0.8"
+            }
+        },
+        "node_modules/@sinonjs/fake-timers": {
+            "version": "8.1.0",
+            "resolved": "https://registry.npmmirror.com/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz",
+            "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "@sinonjs/commons": "^1.7.0"
+            }
+        },
+        "node_modules/@tootallnate/once": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmmirror.com/@tootallnate/once/-/once-1.1.2.tgz",
+            "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/@types/babel__core": {
+            "version": "7.20.5",
+            "resolved": "https://registry.npmmirror.com/@types/babel__core/-/babel__core-7.20.5.tgz",
+            "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "@babel/parser": "^7.20.7",
+                "@babel/types": "^7.20.7",
+                "@types/babel__generator": "*",
+                "@types/babel__template": "*",
+                "@types/babel__traverse": "*"
+            }
+        },
+        "node_modules/@types/babel__generator": {
+            "version": "7.6.8",
+            "resolved": "https://registry.npmmirror.com/@types/babel__generator/-/babel__generator-7.6.8.tgz",
+            "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "@babel/types": "^7.0.0"
+            }
+        },
+        "node_modules/@types/babel__template": {
+            "version": "7.4.4",
+            "resolved": "https://registry.npmmirror.com/@types/babel__template/-/babel__template-7.4.4.tgz",
+            "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "@babel/parser": "^7.1.0",
+                "@babel/types": "^7.0.0"
+            }
+        },
+        "node_modules/@types/babel__traverse": {
+            "version": "7.20.5",
+            "resolved": "https://registry.npmmirror.com/@types/babel__traverse/-/babel__traverse-7.20.5.tgz",
+            "integrity": "sha512-WXCyOcRtH37HAUkpXhUduaxdm82b4GSlyTqajXviN4EfiuPgNYR109xMCKvpl6zPIpua0DGlMEDCq+g8EdoheQ==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "@babel/types": "^7.20.7"
+            }
+        },
+        "node_modules/@types/estree": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmmirror.com/@types/estree/-/estree-1.0.5.tgz",
+            "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
+            "dev": true
+        },
+        "node_modules/@types/graceful-fs": {
+            "version": "4.1.9",
+            "resolved": "https://registry.npmmirror.com/@types/graceful-fs/-/graceful-fs-4.1.9.tgz",
+            "integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "@types/node": "*"
+            }
+        },
+        "node_modules/@types/istanbul-lib-coverage": {
+            "version": "2.0.6",
+            "resolved": "https://registry.npmmirror.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",
+            "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/@types/istanbul-lib-report": {
+            "version": "3.0.3",
+            "resolved": "https://registry.npmmirror.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz",
+            "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "@types/istanbul-lib-coverage": "*"
+            }
+        },
+        "node_modules/@types/istanbul-reports": {
+            "version": "3.0.4",
+            "resolved": "https://registry.npmmirror.com/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz",
+            "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "@types/istanbul-lib-report": "*"
+            }
+        },
+        "node_modules/@types/node": {
+            "version": "20.12.12",
+            "resolved": "https://registry.npmmirror.com/@types/node/-/node-20.12.12.tgz",
+            "integrity": "sha512-eWLDGF/FOSPtAvEqeRAQ4C8LSA7M1I7i0ky1I8U7kD1J5ITyW3AsRhQrKVoWf5pFKZ2kILsEGJhsI9r93PYnOw==",
+            "devOptional": true,
+            "dependencies": {
+                "undici-types": "~5.26.4"
+            }
+        },
+        "node_modules/@types/prettier": {
+            "version": "2.7.3",
+            "resolved": "https://registry.npmmirror.com/@types/prettier/-/prettier-2.7.3.tgz",
+            "integrity": "sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/@types/qrcode": {
+            "version": "1.5.5",
+            "resolved": "https://registry.npmmirror.com/@types/qrcode/-/qrcode-1.5.5.tgz",
+            "integrity": "sha512-CdfBi/e3Qk+3Z/fXYShipBT13OJ2fDO2Q2w5CIP5anLTLIndQG9z6P1cnm+8zCWSpm5dnxMFd/uREtb0EXuQzg==",
+            "dev": true,
+            "dependencies": {
+                "@types/node": "*"
+            }
+        },
+        "node_modules/@types/sortablejs": {
+            "version": "1.15.8",
+            "resolved": "https://registry.npmmirror.com/@types/sortablejs/-/sortablejs-1.15.8.tgz",
+            "integrity": "sha512-b79830lW+RZfwaztgs1aVPgbasJ8e7AXtZYHTELNXZPsERt4ymJdjV4OccDbHQAvHrCcFpbF78jkm0R6h/pZVg==",
+            "dev": true
+        },
+        "node_modules/@types/stack-utils": {
+            "version": "2.0.3",
+            "resolved": "https://registry.npmmirror.com/@types/stack-utils/-/stack-utils-2.0.3.tgz",
+            "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/@types/yargs": {
+            "version": "16.0.9",
+            "resolved": "https://registry.npmmirror.com/@types/yargs/-/yargs-16.0.9.tgz",
+            "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "@types/yargs-parser": "*"
+            }
+        },
+        "node_modules/@types/yargs-parser": {
+            "version": "21.0.3",
+            "resolved": "https://registry.npmmirror.com/@types/yargs-parser/-/yargs-parser-21.0.3.tgz",
+            "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/@vitejs/plugin-legacy": {
+            "version": "4.1.1",
+            "resolved": "https://registry.npmmirror.com/@vitejs/plugin-legacy/-/plugin-legacy-4.1.1.tgz",
+            "integrity": "sha512-um3gbVouD2Q/g19C0qpDfHwveXDCAHzs8OC3e9g6aXpKoD1H14himgs7wkMnhAynBJy7QqUoZNAXDuqN8zLR2g==",
+            "dev": true,
+            "dependencies": {
+                "@babel/core": "^7.22.9",
+                "@babel/preset-env": "^7.22.9",
+                "browserslist": "^4.21.9",
+                "core-js": "^3.31.1",
+                "magic-string": "^0.30.1",
+                "regenerator-runtime": "^0.13.11",
+                "systemjs": "^6.14.1"
+            },
+            "engines": {
+                "node": "^14.18.0 || >=16.0.0"
+            },
+            "peerDependencies": {
+                "terser": "^5.4.0",
+                "vite": "^4.0.0"
+            }
+        },
+        "node_modules/@vitejs/plugin-vue": {
+            "version": "4.6.2",
+            "resolved": "https://registry.npmmirror.com/@vitejs/plugin-vue/-/plugin-vue-4.6.2.tgz",
+            "integrity": "sha512-kqf7SGFoG+80aZG6Pf+gsZIVvGSCKE98JbiWqcCV9cThtg91Jav0yvYFC9Zb+jKetNGF6ZKeoaxgZfND21fWKw==",
+            "engines": {
+                "node": "^14.18.0 || >=16.0.0"
+            },
+            "peerDependencies": {
+                "vite": "^4.0.0 || ^5.0.0",
+                "vue": "^3.2.25"
+            }
+        },
+        "node_modules/@vitejs/plugin-vue-jsx": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmmirror.com/@vitejs/plugin-vue-jsx/-/plugin-vue-jsx-3.1.0.tgz",
+            "integrity": "sha512-w9M6F3LSEU5kszVb9An2/MmXNxocAnUb3WhRr8bHlimhDrXNt6n6D2nJQR3UXpGlZHh/EsgouOHCsM8V3Ln+WA==",
+            "dev": true,
+            "dependencies": {
+                "@babel/core": "^7.23.3",
+                "@babel/plugin-transform-typescript": "^7.23.3",
+                "@vue/babel-plugin-jsx": "^1.1.5"
+            },
+            "engines": {
+                "node": "^14.18.0 || >=16.0.0"
+            },
+            "peerDependencies": {
+                "vite": "^4.0.0 || ^5.0.0",
+                "vue": "^3.0.0"
+            }
+        },
+        "node_modules/@vivaxy/wxml": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmmirror.com/@vivaxy/wxml/-/wxml-2.1.0.tgz",
+            "integrity": "sha512-xqnfAB58tl5SPyfkQjrn7D7nuvq7XV9um7QUsjCrvA4X6aZBxcau9sAM47LsQTOpJIVPzjaKIMvq3ul07yZlOA==",
+            "dev": true
+        },
+        "node_modules/@volar/language-core": {
+            "version": "1.11.1",
+            "resolved": "https://registry.npmmirror.com/@volar/language-core/-/language-core-1.11.1.tgz",
+            "integrity": "sha512-dOcNn3i9GgZAcJt43wuaEykSluAuOkQgzni1cuxLxTV0nJKanQztp7FxyswdRILaKH+P2XZMPRp2S4MV/pElCw==",
+            "dev": true,
+            "dependencies": {
+                "@volar/source-map": "1.11.1"
+            }
+        },
+        "node_modules/@volar/source-map": {
+            "version": "1.11.1",
+            "resolved": "https://registry.npmmirror.com/@volar/source-map/-/source-map-1.11.1.tgz",
+            "integrity": "sha512-hJnOnwZ4+WT5iupLRnuzbULZ42L7BWWPMmruzwtLhJfpDVoZLjNBxHDi2sY2bgZXCKlpU5XcsMFoYrsQmPhfZg==",
+            "dev": true,
+            "dependencies": {
+                "muggle-string": "^0.3.1"
+            }
+        },
+        "node_modules/@volar/typescript": {
+            "version": "1.11.1",
+            "resolved": "https://registry.npmmirror.com/@volar/typescript/-/typescript-1.11.1.tgz",
+            "integrity": "sha512-iU+t2mas/4lYierSnoFOeRFQUhAEMgsFuQxoxvwn5EdQopw43j+J27a4lt9LMInx1gLJBC6qL14WYGlgymaSMQ==",
+            "dev": true,
+            "dependencies": {
+                "@volar/language-core": "1.11.1",
+                "path-browserify": "^1.0.1"
+            }
+        },
+        "node_modules/@vue/babel-helper-vue-transform-on": {
+            "version": "1.2.2",
+            "resolved": "https://registry.npmmirror.com/@vue/babel-helper-vue-transform-on/-/babel-helper-vue-transform-on-1.2.2.tgz",
+            "integrity": "sha512-nOttamHUR3YzdEqdM/XXDyCSdxMA9VizUKoroLX6yTyRtggzQMHXcmwh8a7ZErcJttIBIc9s68a1B8GZ+Dmvsw==",
+            "dev": true
+        },
+        "node_modules/@vue/babel-plugin-jsx": {
+            "version": "1.2.2",
+            "resolved": "https://registry.npmmirror.com/@vue/babel-plugin-jsx/-/babel-plugin-jsx-1.2.2.tgz",
+            "integrity": "sha512-nYTkZUVTu4nhP199UoORePsql0l+wj7v/oyQjtThUVhJl1U+6qHuoVhIvR3bf7eVKjbCK+Cs2AWd7mi9Mpz9rA==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-module-imports": "~7.22.15",
+                "@babel/helper-plugin-utils": "^7.22.5",
+                "@babel/plugin-syntax-jsx": "^7.23.3",
+                "@babel/template": "^7.23.9",
+                "@babel/traverse": "^7.23.9",
+                "@babel/types": "^7.23.9",
+                "@vue/babel-helper-vue-transform-on": "1.2.2",
+                "@vue/babel-plugin-resolve-type": "1.2.2",
+                "camelcase": "^6.3.0",
+                "html-tags": "^3.3.1",
+                "svg-tags": "^1.0.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            },
+            "peerDependenciesMeta": {
+                "@babel/core": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@vue/babel-plugin-jsx/node_modules/@babel/helper-module-imports": {
+            "version": "7.22.15",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz",
+            "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==",
+            "dev": true,
+            "dependencies": {
+                "@babel/types": "^7.22.15"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@vue/babel-plugin-resolve-type": {
+            "version": "1.2.2",
+            "resolved": "https://registry.npmmirror.com/@vue/babel-plugin-resolve-type/-/babel-plugin-resolve-type-1.2.2.tgz",
+            "integrity": "sha512-EntyroPwNg5IPVdUJupqs0CFzuf6lUrVvCspmv2J1FITLeGnUCuoGNNk78dgCusxEiYj6RMkTJflGSxk5aIC4A==",
+            "dev": true,
+            "dependencies": {
+                "@babel/code-frame": "^7.23.5",
+                "@babel/helper-module-imports": "~7.22.15",
+                "@babel/helper-plugin-utils": "^7.22.5",
+                "@babel/parser": "^7.23.9",
+                "@vue/compiler-sfc": "^3.4.15"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@vue/babel-plugin-resolve-type/node_modules/@babel/helper-module-imports": {
+            "version": "7.22.15",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz",
+            "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==",
+            "dev": true,
+            "dependencies": {
+                "@babel/types": "^7.22.15"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@vue/babel-plugin-resolve-type/node_modules/@vue/compiler-core": {
+            "version": "3.4.27",
+            "resolved": "https://registry.npmmirror.com/@vue/compiler-core/-/compiler-core-3.4.27.tgz",
+            "integrity": "sha512-E+RyqY24KnyDXsCuQrI+mlcdW3ALND6U7Gqa/+bVwbcpcR3BRRIckFoz7Qyd4TTlnugtwuI7YgjbvsLmxb+yvg==",
+            "dev": true,
+            "dependencies": {
+                "@babel/parser": "^7.24.4",
+                "@vue/shared": "3.4.27",
+                "entities": "^4.5.0",
+                "estree-walker": "^2.0.2",
+                "source-map-js": "^1.2.0"
+            }
+        },
+        "node_modules/@vue/babel-plugin-resolve-type/node_modules/@vue/compiler-dom": {
+            "version": "3.4.27",
+            "resolved": "https://registry.npmmirror.com/@vue/compiler-dom/-/compiler-dom-3.4.27.tgz",
+            "integrity": "sha512-kUTvochG/oVgE1w5ViSr3KUBh9X7CWirebA3bezTbB5ZKBQZwR2Mwj9uoSKRMFcz4gSMzzLXBPD6KpCLb9nvWw==",
+            "dev": true,
+            "dependencies": {
+                "@vue/compiler-core": "3.4.27",
+                "@vue/shared": "3.4.27"
+            }
+        },
+        "node_modules/@vue/babel-plugin-resolve-type/node_modules/@vue/compiler-sfc": {
+            "version": "3.4.27",
+            "resolved": "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-3.4.27.tgz",
+            "integrity": "sha512-nDwntUEADssW8e0rrmE0+OrONwmRlegDA1pD6QhVeXxjIytV03yDqTey9SBDiALsvAd5U4ZrEKbMyVXhX6mCGA==",
+            "dev": true,
+            "dependencies": {
+                "@babel/parser": "^7.24.4",
+                "@vue/compiler-core": "3.4.27",
+                "@vue/compiler-dom": "3.4.27",
+                "@vue/compiler-ssr": "3.4.27",
+                "@vue/shared": "3.4.27",
+                "estree-walker": "^2.0.2",
+                "magic-string": "^0.30.10",
+                "postcss": "^8.4.38",
+                "source-map-js": "^1.2.0"
+            }
+        },
+        "node_modules/@vue/babel-plugin-resolve-type/node_modules/@vue/compiler-ssr": {
+            "version": "3.4.27",
+            "resolved": "https://registry.npmmirror.com/@vue/compiler-ssr/-/compiler-ssr-3.4.27.tgz",
+            "integrity": "sha512-CVRzSJIltzMG5FcidsW0jKNQnNRYC8bT21VegyMMtHmhW3UOI7knmUehzswXLrExDLE6lQCZdrhD4ogI7c+vuw==",
+            "dev": true,
+            "dependencies": {
+                "@vue/compiler-dom": "3.4.27",
+                "@vue/shared": "3.4.27"
+            }
+        },
+        "node_modules/@vue/babel-plugin-resolve-type/node_modules/@vue/shared": {
+            "version": "3.4.27",
+            "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.4.27.tgz",
+            "integrity": "sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA==",
+            "dev": true
+        },
+        "node_modules/@vue/compiler-core": {
+            "version": "3.2.47",
+            "resolved": "https://registry.npmmirror.com/@vue/compiler-core/-/compiler-core-3.2.47.tgz",
+            "integrity": "sha512-p4D7FDnQb7+YJmO2iPEv0SQNeNzcbHdGByJDsT4lynf63AFkOTFN07HsiRSvjGo0QrxR/o3d0hUyNCUnBU2Tig==",
+            "dependencies": {
+                "@babel/parser": "^7.16.4",
+                "@vue/shared": "3.2.47",
+                "estree-walker": "^2.0.2",
+                "source-map": "^0.6.1"
+            }
+        },
+        "node_modules/@vue/compiler-dom": {
+            "version": "3.2.47",
+            "resolved": "https://registry.npmmirror.com/@vue/compiler-dom/-/compiler-dom-3.2.47.tgz",
+            "integrity": "sha512-dBBnEHEPoftUiS03a4ggEig74J2YBZ2UIeyfpcRM2tavgMWo4bsEfgCGsu+uJIL/vax9S+JztH8NmQerUo7shQ==",
+            "dependencies": {
+                "@vue/compiler-core": "3.2.47",
+                "@vue/shared": "3.2.47"
+            }
+        },
+        "node_modules/@vue/compiler-sfc": {
+            "version": "3.2.47",
+            "resolved": "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-3.2.47.tgz",
+            "integrity": "sha512-rog05W+2IFfxjMcFw10tM9+f7i/+FFpZJJ5XHX72NP9eC2uRD+42M3pYcQqDXVYoj74kHMSEdQ/WmCjt8JFksQ==",
+            "dependencies": {
+                "@babel/parser": "^7.16.4",
+                "@vue/compiler-core": "3.2.47",
+                "@vue/compiler-dom": "3.2.47",
+                "@vue/compiler-ssr": "3.2.47",
+                "@vue/reactivity-transform": "3.2.47",
+                "@vue/shared": "3.2.47",
+                "estree-walker": "^2.0.2",
+                "magic-string": "^0.25.7",
+                "postcss": "^8.1.10",
+                "source-map": "^0.6.1"
+            }
+        },
+        "node_modules/@vue/compiler-sfc/node_modules/magic-string": {
+            "version": "0.25.9",
+            "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.25.9.tgz",
+            "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==",
+            "dependencies": {
+                "sourcemap-codec": "^1.4.8"
+            }
+        },
+        "node_modules/@vue/compiler-ssr": {
+            "version": "3.2.47",
+            "resolved": "https://registry.npmmirror.com/@vue/compiler-ssr/-/compiler-ssr-3.2.47.tgz",
+            "integrity": "sha512-wVXC+gszhulcMD8wpxMsqSOpvDZ6xKXSVWkf50Guf/S+28hTAXPDYRTbLQ3EDkOP5Xz/+SY37YiwDquKbJOgZw==",
+            "dependencies": {
+                "@vue/compiler-dom": "3.2.47",
+                "@vue/shared": "3.2.47"
+            }
+        },
+        "node_modules/@vue/devtools-api": {
+            "version": "6.6.1",
+            "resolved": "https://registry.npmmirror.com/@vue/devtools-api/-/devtools-api-6.6.1.tgz",
+            "integrity": "sha512-LgPscpE3Vs0x96PzSSB4IGVSZXZBZHpfxs+ZA1d+VEPwHdOXowy/Y2CsvCAIFrf+ssVU1pD1jidj505EpUnfbA=="
+        },
+        "node_modules/@vue/language-core": {
+            "version": "1.8.27",
+            "resolved": "https://registry.npmmirror.com/@vue/language-core/-/language-core-1.8.27.tgz",
+            "integrity": "sha512-L8Kc27VdQserNaCUNiSFdDl9LWT24ly8Hpwf1ECy3aFb9m6bDhBGQYOujDm21N7EW3moKIOKEanQwe1q5BK+mA==",
+            "dev": true,
+            "dependencies": {
+                "@volar/language-core": "~1.11.1",
+                "@volar/source-map": "~1.11.1",
+                "@vue/compiler-dom": "^3.3.0",
+                "@vue/shared": "^3.3.0",
+                "computeds": "^0.0.1",
+                "minimatch": "^9.0.3",
+                "muggle-string": "^0.3.1",
+                "path-browserify": "^1.0.1",
+                "vue-template-compiler": "^2.7.14"
+            },
+            "peerDependencies": {
+                "typescript": "*"
+            },
+            "peerDependenciesMeta": {
+                "typescript": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@vue/language-core/node_modules/@vue/compiler-core": {
+            "version": "3.4.27",
+            "resolved": "https://registry.npmmirror.com/@vue/compiler-core/-/compiler-core-3.4.27.tgz",
+            "integrity": "sha512-E+RyqY24KnyDXsCuQrI+mlcdW3ALND6U7Gqa/+bVwbcpcR3BRRIckFoz7Qyd4TTlnugtwuI7YgjbvsLmxb+yvg==",
+            "dev": true,
+            "dependencies": {
+                "@babel/parser": "^7.24.4",
+                "@vue/shared": "3.4.27",
+                "entities": "^4.5.0",
+                "estree-walker": "^2.0.2",
+                "source-map-js": "^1.2.0"
+            }
+        },
+        "node_modules/@vue/language-core/node_modules/@vue/compiler-dom": {
+            "version": "3.4.27",
+            "resolved": "https://registry.npmmirror.com/@vue/compiler-dom/-/compiler-dom-3.4.27.tgz",
+            "integrity": "sha512-kUTvochG/oVgE1w5ViSr3KUBh9X7CWirebA3bezTbB5ZKBQZwR2Mwj9uoSKRMFcz4gSMzzLXBPD6KpCLb9nvWw==",
+            "dev": true,
+            "dependencies": {
+                "@vue/compiler-core": "3.4.27",
+                "@vue/shared": "3.4.27"
+            }
+        },
+        "node_modules/@vue/language-core/node_modules/@vue/shared": {
+            "version": "3.4.27",
+            "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.4.27.tgz",
+            "integrity": "sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA==",
+            "dev": true
+        },
+        "node_modules/@vue/language-core/node_modules/minimatch": {
+            "version": "9.0.4",
+            "resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-9.0.4.tgz",
+            "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==",
+            "dev": true,
+            "dependencies": {
+                "brace-expansion": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=16 || 14 >=14.17"
+            }
+        },
+        "node_modules/@vue/reactivity": {
+            "version": "3.4.27",
+            "resolved": "https://registry.npmmirror.com/@vue/reactivity/-/reactivity-3.4.27.tgz",
+            "integrity": "sha512-kK0g4NknW6JX2yySLpsm2jlunZJl2/RJGZ0H9ddHdfBVHcNzxmQ0sS0b09ipmBoQpY8JM2KmUw+a6sO8Zo+zIA==",
+            "dependencies": {
+                "@vue/shared": "3.4.27"
+            }
+        },
+        "node_modules/@vue/reactivity-transform": {
+            "version": "3.2.47",
+            "resolved": "https://registry.npmmirror.com/@vue/reactivity-transform/-/reactivity-transform-3.2.47.tgz",
+            "integrity": "sha512-m8lGXw8rdnPVVIdIFhf0LeQ/ixyHkH5plYuS83yop5n7ggVJU+z5v0zecwEnX7fa7HNLBhh2qngJJkxpwEEmYA==",
+            "dependencies": {
+                "@babel/parser": "^7.16.4",
+                "@vue/compiler-core": "3.2.47",
+                "@vue/shared": "3.2.47",
+                "estree-walker": "^2.0.2",
+                "magic-string": "^0.25.7"
+            }
+        },
+        "node_modules/@vue/reactivity-transform/node_modules/magic-string": {
+            "version": "0.25.9",
+            "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.25.9.tgz",
+            "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==",
+            "dependencies": {
+                "sourcemap-codec": "^1.4.8"
+            }
+        },
+        "node_modules/@vue/reactivity/node_modules/@vue/shared": {
+            "version": "3.4.27",
+            "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.4.27.tgz",
+            "integrity": "sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA=="
+        },
+        "node_modules/@vue/runtime-core": {
+            "version": "3.4.27",
+            "resolved": "https://registry.npmmirror.com/@vue/runtime-core/-/runtime-core-3.4.27.tgz",
+            "integrity": "sha512-7aYA9GEbOOdviqVvcuweTLe5Za4qBZkUY7SvET6vE8kyypxVgaT1ixHLg4urtOlrApdgcdgHoTZCUuTGap/5WA==",
+            "dependencies": {
+                "@vue/reactivity": "3.4.27",
+                "@vue/shared": "3.4.27"
+            }
+        },
+        "node_modules/@vue/runtime-core/node_modules/@vue/shared": {
+            "version": "3.4.27",
+            "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.4.27.tgz",
+            "integrity": "sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA=="
+        },
+        "node_modules/@vue/runtime-dom": {
+            "version": "3.4.27",
+            "resolved": "https://registry.npmmirror.com/@vue/runtime-dom/-/runtime-dom-3.4.27.tgz",
+            "integrity": "sha512-ScOmP70/3NPM+TW9hvVAz6VWWtZJqkbdf7w6ySsws+EsqtHvkhxaWLecrTorFxsawelM5Ys9FnDEMt6BPBDS0Q==",
+            "dependencies": {
+                "@vue/runtime-core": "3.4.27",
+                "@vue/shared": "3.4.27",
+                "csstype": "^3.1.3"
+            }
+        },
+        "node_modules/@vue/runtime-dom/node_modules/@vue/shared": {
+            "version": "3.4.27",
+            "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.4.27.tgz",
+            "integrity": "sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA=="
+        },
+        "node_modules/@vue/server-renderer": {
+            "version": "3.4.27",
+            "resolved": "https://registry.npmmirror.com/@vue/server-renderer/-/server-renderer-3.4.27.tgz",
+            "integrity": "sha512-dlAMEuvmeA3rJsOMJ2J1kXU7o7pOxgsNHVr9K8hB3ImIkSuBrIdy0vF66h8gf8Tuinf1TK3mPAz2+2sqyf3KzA==",
+            "dependencies": {
+                "@vue/compiler-ssr": "3.4.27",
+                "@vue/shared": "3.4.27"
+            },
+            "peerDependencies": {
+                "vue": "3.4.27"
+            }
+        },
+        "node_modules/@vue/server-renderer/node_modules/@vue/compiler-core": {
+            "version": "3.4.27",
+            "resolved": "https://registry.npmmirror.com/@vue/compiler-core/-/compiler-core-3.4.27.tgz",
+            "integrity": "sha512-E+RyqY24KnyDXsCuQrI+mlcdW3ALND6U7Gqa/+bVwbcpcR3BRRIckFoz7Qyd4TTlnugtwuI7YgjbvsLmxb+yvg==",
+            "dependencies": {
+                "@babel/parser": "^7.24.4",
+                "@vue/shared": "3.4.27",
+                "entities": "^4.5.0",
+                "estree-walker": "^2.0.2",
+                "source-map-js": "^1.2.0"
+            }
+        },
+        "node_modules/@vue/server-renderer/node_modules/@vue/compiler-dom": {
+            "version": "3.4.27",
+            "resolved": "https://registry.npmmirror.com/@vue/compiler-dom/-/compiler-dom-3.4.27.tgz",
+            "integrity": "sha512-kUTvochG/oVgE1w5ViSr3KUBh9X7CWirebA3bezTbB5ZKBQZwR2Mwj9uoSKRMFcz4gSMzzLXBPD6KpCLb9nvWw==",
+            "dependencies": {
+                "@vue/compiler-core": "3.4.27",
+                "@vue/shared": "3.4.27"
+            }
+        },
+        "node_modules/@vue/server-renderer/node_modules/@vue/compiler-ssr": {
+            "version": "3.4.27",
+            "resolved": "https://registry.npmmirror.com/@vue/compiler-ssr/-/compiler-ssr-3.4.27.tgz",
+            "integrity": "sha512-CVRzSJIltzMG5FcidsW0jKNQnNRYC8bT21VegyMMtHmhW3UOI7knmUehzswXLrExDLE6lQCZdrhD4ogI7c+vuw==",
+            "dependencies": {
+                "@vue/compiler-dom": "3.4.27",
+                "@vue/shared": "3.4.27"
+            }
+        },
+        "node_modules/@vue/server-renderer/node_modules/@vue/shared": {
+            "version": "3.4.27",
+            "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.4.27.tgz",
+            "integrity": "sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA=="
+        },
+        "node_modules/@vue/shared": {
+            "version": "3.2.47",
+            "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.2.47.tgz",
+            "integrity": "sha512-BHGyyGN3Q97EZx0taMQ+OLNuZcW3d37ZEVmEAyeoA9ERdGvm9Irc/0Fua8SNyOtV1w6BS4q25wbMzJujO9HIfQ=="
+        },
+        "node_modules/@vue/tsconfig": {
+            "version": "0.1.3",
+            "resolved": "https://registry.npmmirror.com/@vue/tsconfig/-/tsconfig-0.1.3.tgz",
+            "integrity": "sha512-kQVsh8yyWPvHpb8gIc9l/HIDiiVUy1amynLNpCy8p+FoCiZXCo6fQos5/097MmnNZc9AtseDsCrfkhqCrJ8Olg==",
+            "dev": true,
+            "peerDependencies": {
+                "@types/node": "*"
+            },
+            "peerDependenciesMeta": {
+                "@types/node": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@windicss/config": {
+            "version": "1.9.3",
+            "resolved": "https://registry.npmmirror.com/@windicss/config/-/config-1.9.3.tgz",
+            "integrity": "sha512-u8GUjsfC9r5X1AGYhzb1lX3zZj8wqk6SH1DYex8XUGmZ1M2UpvnUPOFi63XFViduspQ6l2xTX84QtG+lUzhEoQ==",
+            "dev": true,
+            "dependencies": {
+                "debug": "^4.3.4",
+                "jiti": "^1.18.2",
+                "windicss": "^3.5.6"
+            }
+        },
+        "node_modules/@windicss/plugin-utils": {
+            "version": "1.9.3",
+            "resolved": "https://registry.npmmirror.com/@windicss/plugin-utils/-/plugin-utils-1.9.3.tgz",
+            "integrity": "sha512-3VG5HEGeuIfG/9iTwLyzWWm/aGKNTbtSVkpkAabdRuDP/2lEmf6Hpo4uo5drwE+2O9gXfc6nSYgAwBjotx5CfQ==",
+            "dev": true,
+            "dependencies": {
+                "@antfu/utils": "^0.7.2",
+                "@windicss/config": "1.9.3",
+                "debug": "^4.3.4",
+                "fast-glob": "^3.2.12",
+                "magic-string": "^0.30.0",
+                "micromatch": "^4.0.5",
+                "windicss": "^3.5.6"
+            }
+        },
+        "node_modules/abab": {
+            "version": "2.0.6",
+            "resolved": "https://registry.npmmirror.com/abab/-/abab-2.0.6.tgz",
+            "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
+            "deprecated": "Use your platform's native atob() and btoa() methods instead",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/accepts": {
+            "version": "1.3.8",
+            "resolved": "https://registry.npmmirror.com/accepts/-/accepts-1.3.8.tgz",
+            "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
+            "dev": true,
+            "dependencies": {
+                "mime-types": "~2.1.34",
+                "negotiator": "0.6.3"
+            },
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/acorn": {
+            "version": "8.11.3",
+            "resolved": "https://registry.npmmirror.com/acorn/-/acorn-8.11.3.tgz",
+            "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==",
+            "devOptional": true,
+            "bin": {
+                "acorn": "bin/acorn"
+            },
+            "engines": {
+                "node": ">=0.4.0"
+            }
+        },
+        "node_modules/acorn-globals": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmmirror.com/acorn-globals/-/acorn-globals-6.0.0.tgz",
+            "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "acorn": "^7.1.1",
+                "acorn-walk": "^7.1.1"
+            }
+        },
+        "node_modules/acorn-globals/node_modules/acorn": {
+            "version": "7.4.1",
+            "resolved": "https://registry.npmmirror.com/acorn/-/acorn-7.4.1.tgz",
+            "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+            "dev": true,
+            "peer": true,
+            "bin": {
+                "acorn": "bin/acorn"
+            },
+            "engines": {
+                "node": ">=0.4.0"
+            }
+        },
+        "node_modules/acorn-walk": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmmirror.com/acorn-walk/-/acorn-walk-7.2.0.tgz",
+            "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=0.4.0"
+            }
+        },
+        "node_modules/address": {
+            "version": "1.2.2",
+            "resolved": "https://registry.npmmirror.com/address/-/address-1.2.2.tgz",
+            "integrity": "sha512-4B/qKCfeE/ODUaAUpSwfzazo5x29WD4r3vXiWsB7I2mSDAihwEqKO+g8GELZUQSSAo5e1XTYh3ZVfLyxBc12nA==",
+            "dev": true,
+            "engines": {
+                "node": ">= 10.0.0"
+            }
+        },
+        "node_modules/agent-base": {
+            "version": "6.0.2",
+            "resolved": "https://registry.npmmirror.com/agent-base/-/agent-base-6.0.2.tgz",
+            "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "debug": "4"
+            },
+            "engines": {
+                "node": ">= 6.0.0"
+            }
+        },
+        "node_modules/ansi-escapes": {
+            "version": "4.3.2",
+            "resolved": "https://registry.npmmirror.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+            "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "type-fest": "^0.21.3"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/ansi-regex": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-5.0.1.tgz",
+            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/ansi-styles": {
+            "version": "3.2.1",
+            "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-3.2.1.tgz",
+            "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+            "dependencies": {
+                "color-convert": "^1.9.0"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/any-base": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmmirror.com/any-base/-/any-base-1.1.0.tgz",
+            "integrity": "sha512-uMgjozySS8adZZYePpaWs8cxB9/kdzmpX6SgJZ+wbz1K5eYk5QMYDVJaZKhxyIHUdnnJkfR7SVgStgH7LkGUyg=="
+        },
+        "node_modules/anymatch": {
+            "version": "3.1.3",
+            "resolved": "https://registry.npmmirror.com/anymatch/-/anymatch-3.1.3.tgz",
+            "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+            "dependencies": {
+                "normalize-path": "^3.0.0",
+                "picomatch": "^2.0.4"
+            },
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/argparse": {
+            "version": "1.0.10",
+            "resolved": "https://registry.npmmirror.com/argparse/-/argparse-1.0.10.tgz",
+            "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "sprintf-js": "~1.0.2"
+            }
+        },
+        "node_modules/array-flatten": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmmirror.com/array-flatten/-/array-flatten-1.1.1.tgz",
+            "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
+            "dev": true
+        },
+        "node_modules/asynckit": {
+            "version": "0.4.0",
+            "resolved": "https://registry.npmmirror.com/asynckit/-/asynckit-0.4.0.tgz",
+            "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/autoprefixer": {
+            "version": "10.4.19",
+            "resolved": "https://registry.npmmirror.com/autoprefixer/-/autoprefixer-10.4.19.tgz",
+            "integrity": "sha512-BaENR2+zBZ8xXhM4pUaKUxlVdxZ0EZhjvbopwnXmxRUfqDmwSpC2lAi/QXvx7NRdPCo1WKEcEF6mV64si1z4Ew==",
+            "dependencies": {
+                "browserslist": "^4.23.0",
+                "caniuse-lite": "^1.0.30001599",
+                "fraction.js": "^4.3.7",
+                "normalize-range": "^0.1.2",
+                "picocolors": "^1.0.0",
+                "postcss-value-parser": "^4.2.0"
+            },
+            "bin": {
+                "autoprefixer": "bin/autoprefixer"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >=14"
+            },
+            "peerDependencies": {
+                "postcss": "^8.1.0"
+            }
+        },
+        "node_modules/babel-jest": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/babel-jest/-/babel-jest-27.5.1.tgz",
+            "integrity": "sha512-cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "@jest/transform": "^27.5.1",
+                "@jest/types": "^27.5.1",
+                "@types/babel__core": "^7.1.14",
+                "babel-plugin-istanbul": "^6.1.1",
+                "babel-preset-jest": "^27.5.1",
+                "chalk": "^4.0.0",
+                "graceful-fs": "^4.2.9",
+                "slash": "^3.0.0"
+            },
+            "engines": {
+                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.8.0"
+            }
+        },
+        "node_modules/babel-jest/node_modules/ansi-styles": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "color-convert": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/babel-jest/node_modules/chalk": {
+            "version": "4.1.2",
+            "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+            "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "ansi-styles": "^4.1.0",
+                "supports-color": "^7.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/babel-jest/node_modules/color-convert": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "color-name": "~1.1.4"
+            },
+            "engines": {
+                "node": ">=7.0.0"
+            }
+        },
+        "node_modules/babel-jest/node_modules/color-name": {
+            "version": "1.1.4",
+            "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/babel-jest/node_modules/has-flag": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/babel-jest/node_modules/supports-color": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/babel-plugin-istanbul": {
+            "version": "6.1.1",
+            "resolved": "https://registry.npmmirror.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
+            "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.0.0",
+                "@istanbuljs/load-nyc-config": "^1.0.0",
+                "@istanbuljs/schema": "^0.1.2",
+                "istanbul-lib-instrument": "^5.0.4",
+                "test-exclude": "^6.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/babel-plugin-jest-hoist": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.5.1.tgz",
+            "integrity": "sha512-50wCwD5EMNW4aRpOwtqzyZHIewTYNxLA4nhB+09d8BIssfNfzBRhkBIHiaPv1Si226TQSvp8gxAJm2iY2qs2hQ==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "@babel/template": "^7.3.3",
+                "@babel/types": "^7.3.3",
+                "@types/babel__core": "^7.0.0",
+                "@types/babel__traverse": "^7.0.6"
+            },
+            "engines": {
+                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+            }
+        },
+        "node_modules/babel-plugin-polyfill-corejs2": {
+            "version": "0.4.11",
+            "resolved": "https://registry.npmmirror.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.11.tgz",
+            "integrity": "sha512-sMEJ27L0gRHShOh5G54uAAPaiCOygY/5ratXuiyb2G46FmlSpc9eFCzYVyDiPxfNbwzA7mYahmjQc5q+CZQ09Q==",
+            "dev": true,
+            "dependencies": {
+                "@babel/compat-data": "^7.22.6",
+                "@babel/helper-define-polyfill-provider": "^0.6.2",
+                "semver": "^6.3.1"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+            }
+        },
+        "node_modules/babel-plugin-polyfill-corejs3": {
+            "version": "0.10.4",
+            "resolved": "https://registry.npmmirror.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.10.4.tgz",
+            "integrity": "sha512-25J6I8NGfa5YkCDogHRID3fVCadIR8/pGl1/spvCkzb6lVn6SR3ojpx9nOn9iEBcUsjY24AmdKm5khcfKdylcg==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-define-polyfill-provider": "^0.6.1",
+                "core-js-compat": "^3.36.1"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+            }
+        },
+        "node_modules/babel-plugin-polyfill-regenerator": {
+            "version": "0.6.2",
+            "resolved": "https://registry.npmmirror.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.2.tgz",
+            "integrity": "sha512-2R25rQZWP63nGwaAswvDazbPXfrM3HwVoBXK6HcqeKrSrL/JqcC/rDcf95l4r7LXLyxDXc8uQDa064GubtCABg==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-define-polyfill-provider": "^0.6.2"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+            }
+        },
+        "node_modules/babel-preset-current-node-syntax": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmmirror.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
+            "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "@babel/plugin-syntax-async-generators": "^7.8.4",
+                "@babel/plugin-syntax-bigint": "^7.8.3",
+                "@babel/plugin-syntax-class-properties": "^7.8.3",
+                "@babel/plugin-syntax-import-meta": "^7.8.3",
+                "@babel/plugin-syntax-json-strings": "^7.8.3",
+                "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
+                "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+                "@babel/plugin-syntax-numeric-separator": "^7.8.3",
+                "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+                "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+                "@babel/plugin-syntax-optional-chaining": "^7.8.3",
+                "@babel/plugin-syntax-top-level-await": "^7.8.3"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0"
+            }
+        },
+        "node_modules/babel-preset-jest": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/babel-preset-jest/-/babel-preset-jest-27.5.1.tgz",
+            "integrity": "sha512-Nptf2FzlPCWYuJg41HBqXVT8ym6bXOevuCTbhxlUpjwtysGaIWFvDEjp4y+G7fl13FgOdjs7P/DmErqH7da0Ag==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "babel-plugin-jest-hoist": "^27.5.1",
+                "babel-preset-current-node-syntax": "^1.0.0"
+            },
+            "engines": {
+                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0"
+            }
+        },
+        "node_modules/balanced-match": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmmirror.com/balanced-match/-/balanced-match-1.0.2.tgz",
+            "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+            "dev": true
+        },
+        "node_modules/base64-arraybuffer": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmmirror.com/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz",
+            "integrity": "sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ==",
+            "engines": {
+                "node": ">= 0.6.0"
+            }
+        },
+        "node_modules/base64-js": {
+            "version": "1.5.1",
+            "resolved": "https://registry.npmmirror.com/base64-js/-/base64-js-1.5.1.tgz",
+            "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
+        },
+        "node_modules/base64url": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmmirror.com/base64url/-/base64url-3.0.1.tgz",
+            "integrity": "sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A==",
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
+        "node_modules/big.js": {
+            "version": "5.2.2",
+            "resolved": "https://registry.npmmirror.com/big.js/-/big.js-5.2.2.tgz",
+            "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+            "dev": true,
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/binary-extensions": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmmirror.com/binary-extensions/-/binary-extensions-2.3.0.tgz",
+            "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/bmp-js": {
+            "version": "0.1.0",
+            "resolved": "https://registry.npmmirror.com/bmp-js/-/bmp-js-0.1.0.tgz",
+            "integrity": "sha512-vHdS19CnY3hwiNdkaqk93DvjVLfbEcI8mys4UjuWrlX1haDmroo8o4xCzh4wD6DGV6HxRCyauwhHRqMTfERtjw=="
+        },
+        "node_modules/body-parser": {
+            "version": "1.20.2",
+            "resolved": "https://registry.npmmirror.com/body-parser/-/body-parser-1.20.2.tgz",
+            "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",
+            "dev": true,
+            "dependencies": {
+                "bytes": "3.1.2",
+                "content-type": "~1.0.5",
+                "debug": "2.6.9",
+                "depd": "2.0.0",
+                "destroy": "1.2.0",
+                "http-errors": "2.0.0",
+                "iconv-lite": "0.4.24",
+                "on-finished": "2.4.1",
+                "qs": "6.11.0",
+                "raw-body": "2.5.2",
+                "type-is": "~1.6.18",
+                "unpipe": "1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.8",
+                "npm": "1.2.8000 || >= 1.4.16"
+            }
+        },
+        "node_modules/body-parser/node_modules/debug": {
+            "version": "2.6.9",
+            "resolved": "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz",
+            "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+            "dev": true,
+            "dependencies": {
+                "ms": "2.0.0"
+            }
+        },
+        "node_modules/body-parser/node_modules/ms": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz",
+            "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+            "dev": true
+        },
+        "node_modules/body-parser/node_modules/qs": {
+            "version": "6.11.0",
+            "resolved": "https://registry.npmmirror.com/qs/-/qs-6.11.0.tgz",
+            "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+            "dev": true,
+            "dependencies": {
+                "side-channel": "^1.0.4"
+            },
+            "engines": {
+                "node": ">=0.6"
+            }
+        },
+        "node_modules/brace-expansion": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-2.0.1.tgz",
+            "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+            "dev": true,
+            "dependencies": {
+                "balanced-match": "^1.0.0"
+            }
+        },
+        "node_modules/braces": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmmirror.com/braces/-/braces-3.0.2.tgz",
+            "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+            "dependencies": {
+                "fill-range": "^7.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/browser-process-hrtime": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmmirror.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
+            "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/browserslist": {
+            "version": "4.24.2",
+            "resolved": "https://registry.npmmirror.com/browserslist/-/browserslist-4.24.2.tgz",
+            "integrity": "sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==",
+            "dependencies": {
+                "caniuse-lite": "^1.0.30001669",
+                "electron-to-chromium": "^1.5.41",
+                "node-releases": "^2.0.18",
+                "update-browserslist-db": "^1.1.1"
+            },
+            "bin": {
+                "browserslist": "cli.js"
+            },
+            "engines": {
+                "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+            }
+        },
+        "node_modules/bser": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmmirror.com/bser/-/bser-2.1.1.tgz",
+            "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "node-int64": "^0.4.0"
+            }
+        },
+        "node_modules/buffer": {
+            "version": "5.7.1",
+            "resolved": "https://registry.npmmirror.com/buffer/-/buffer-5.7.1.tgz",
+            "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+            "dependencies": {
+                "base64-js": "^1.3.1",
+                "ieee754": "^1.1.13"
+            }
+        },
+        "node_modules/buffer-equal": {
+            "version": "0.0.1",
+            "resolved": "https://registry.npmmirror.com/buffer-equal/-/buffer-equal-0.0.1.tgz",
+            "integrity": "sha512-RgSV6InVQ9ODPdLWJ5UAqBqJBOg370Nz6ZQtRzpt6nUjc8v0St97uJ4PYC6NztqIScrAXafKM3mZPMygSe1ggA==",
+            "engines": {
+                "node": ">=0.4.0"
+            }
+        },
+        "node_modules/buffer-from": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmmirror.com/buffer-from/-/buffer-from-1.1.2.tgz",
+            "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+            "devOptional": true
+        },
+        "node_modules/bytes": {
+            "version": "3.1.2",
+            "resolved": "https://registry.npmmirror.com/bytes/-/bytes-3.1.2.tgz",
+            "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/cac": {
+            "version": "6.7.9",
+            "resolved": "https://registry.npmmirror.com/cac/-/cac-6.7.9.tgz",
+            "integrity": "sha512-XN5qEpfNQCJ8jRaZgitSkkukjMRCGio+X3Ks5KUbGGlPbV+pSem1l9VuzooCBXOiMFshUZgyYqg6rgN8rjkb/w==",
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/call-bind": {
+            "version": "1.0.7",
+            "resolved": "https://registry.npmmirror.com/call-bind/-/call-bind-1.0.7.tgz",
+            "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
+            "dev": true,
+            "dependencies": {
+                "es-define-property": "^1.0.0",
+                "es-errors": "^1.3.0",
+                "function-bind": "^1.1.2",
+                "get-intrinsic": "^1.2.4",
+                "set-function-length": "^1.2.1"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/callsites": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmmirror.com/callsites/-/callsites-3.1.0.tgz",
+            "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/camelcase": {
+            "version": "6.3.0",
+            "resolved": "https://registry.npmmirror.com/camelcase/-/camelcase-6.3.0.tgz",
+            "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+            "dev": true,
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/caniuse-lite": {
+            "version": "1.0.30001680",
+            "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001680.tgz",
+            "integrity": "sha512-rPQy70G6AGUMnbwS1z6Xg+RkHYPAi18ihs47GH0jcxIG7wArmPgY3XbS2sRdBbxJljp3thdT8BIqv9ccCypiPA=="
+        },
+        "node_modules/chalk": {
+            "version": "2.4.2",
+            "resolved": "https://registry.npmmirror.com/chalk/-/chalk-2.4.2.tgz",
+            "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+            "dependencies": {
+                "ansi-styles": "^3.2.1",
+                "escape-string-regexp": "^1.0.5",
+                "supports-color": "^5.3.0"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/char-regex": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmmirror.com/char-regex/-/char-regex-1.0.2.tgz",
+            "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/chokidar": {
+            "version": "3.6.0",
+            "resolved": "https://registry.npmmirror.com/chokidar/-/chokidar-3.6.0.tgz",
+            "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+            "dependencies": {
+                "anymatch": "~3.1.2",
+                "braces": "~3.0.2",
+                "glob-parent": "~5.1.2",
+                "is-binary-path": "~2.1.0",
+                "is-glob": "~4.0.1",
+                "normalize-path": "~3.0.0",
+                "readdirp": "~3.6.0"
+            },
+            "engines": {
+                "node": ">= 8.10.0"
+            },
+            "optionalDependencies": {
+                "fsevents": "~2.3.2"
+            }
+        },
+        "node_modules/ci-info": {
+            "version": "3.9.0",
+            "resolved": "https://registry.npmmirror.com/ci-info/-/ci-info-3.9.0.tgz",
+            "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/cjs-module-lexer": {
+            "version": "1.3.1",
+            "resolved": "https://registry.npmmirror.com/cjs-module-lexer/-/cjs-module-lexer-1.3.1.tgz",
+            "integrity": "sha512-a3KdPAANPbNE4ZUv9h6LckSl9zLsYOP4MBmhIPkRaeyybt+r4UghLvq+xw/YwUcC1gqylCkL4rdVs3Lwupjm4Q==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/clipboard": {
+            "version": "2.0.11",
+            "resolved": "https://registry.npmmirror.com/clipboard/-/clipboard-2.0.11.tgz",
+            "integrity": "sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==",
+            "dependencies": {
+                "good-listener": "^1.2.2",
+                "select": "^1.1.2",
+                "tiny-emitter": "^2.0.0"
+            }
+        },
+        "node_modules/cliui": {
+            "version": "7.0.4",
+            "resolved": "https://registry.npmmirror.com/cliui/-/cliui-7.0.4.tgz",
+            "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "string-width": "^4.2.0",
+                "strip-ansi": "^6.0.0",
+                "wrap-ansi": "^7.0.0"
+            }
+        },
+        "node_modules/co": {
+            "version": "4.6.0",
+            "resolved": "https://registry.npmmirror.com/co/-/co-4.6.0.tgz",
+            "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "iojs": ">= 1.0.0",
+                "node": ">= 0.12.0"
+            }
+        },
+        "node_modules/collect-v8-coverage": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmmirror.com/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz",
+            "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/color-convert": {
+            "version": "1.9.3",
+            "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-1.9.3.tgz",
+            "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+            "dependencies": {
+                "color-name": "1.1.3"
+            }
+        },
+        "node_modules/color-name": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.3.tgz",
+            "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
+        },
+        "node_modules/combined-stream": {
+            "version": "1.0.8",
+            "resolved": "https://registry.npmmirror.com/combined-stream/-/combined-stream-1.0.8.tgz",
+            "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "delayed-stream": "~1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/commander": {
+            "version": "2.20.3",
+            "resolved": "https://registry.npmmirror.com/commander/-/commander-2.20.3.tgz",
+            "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+            "devOptional": true
+        },
+        "node_modules/commondir": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmmirror.com/commondir/-/commondir-1.0.1.tgz",
+            "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==",
+            "dev": true
+        },
+        "node_modules/compare-versions": {
+            "version": "3.6.0",
+            "resolved": "https://registry.npmmirror.com/compare-versions/-/compare-versions-3.6.0.tgz",
+            "integrity": "sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA=="
+        },
+        "node_modules/computeds": {
+            "version": "0.0.1",
+            "resolved": "https://registry.npmmirror.com/computeds/-/computeds-0.0.1.tgz",
+            "integrity": "sha512-7CEBgcMjVmitjYo5q8JTJVra6X5mQ20uTThdK+0kR7UEaDrAWEQcRiBtWJzga4eRpP6afNwwLsX2SET2JhVB1Q==",
+            "dev": true
+        },
+        "node_modules/concat-map": {
+            "version": "0.0.1",
+            "resolved": "https://registry.npmmirror.com/concat-map/-/concat-map-0.0.1.tgz",
+            "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/content-disposition": {
+            "version": "0.5.4",
+            "resolved": "https://registry.npmmirror.com/content-disposition/-/content-disposition-0.5.4.tgz",
+            "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
+            "dev": true,
+            "dependencies": {
+                "safe-buffer": "5.2.1"
+            },
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/content-type": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmmirror.com/content-type/-/content-type-1.0.5.tgz",
+            "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/convert-source-map": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/convert-source-map/-/convert-source-map-2.0.0.tgz",
+            "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="
+        },
+        "node_modules/cookie": {
+            "version": "0.6.0",
+            "resolved": "https://registry.npmmirror.com/cookie/-/cookie-0.6.0.tgz",
+            "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/cookie-signature": {
+            "version": "1.0.6",
+            "resolved": "https://registry.npmmirror.com/cookie-signature/-/cookie-signature-1.0.6.tgz",
+            "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
+            "dev": true
+        },
+        "node_modules/core-js": {
+            "version": "3.37.1",
+            "resolved": "https://registry.npmmirror.com/core-js/-/core-js-3.37.1.tgz",
+            "integrity": "sha512-Xn6qmxrQZyB0FFY8E3bgRXei3lWDJHhvI+u0q9TKIYM49G8pAr0FgnnrFRAmsbptZL1yxRADVXn+x5AGsbBfyw==",
+            "hasInstallScript": true
+        },
+        "node_modules/core-js-compat": {
+            "version": "3.37.1",
+            "resolved": "https://registry.npmmirror.com/core-js-compat/-/core-js-compat-3.37.1.tgz",
+            "integrity": "sha512-9TNiImhKvQqSUkOvk/mMRZzOANTiEVC7WaBNhHcKM7x+/5E1l5NvsysR19zuDQScE8k+kfQXWRN3AtS/eOSHpg==",
+            "dev": true,
+            "dependencies": {
+                "browserslist": "^4.23.0"
+            }
+        },
+        "node_modules/cross-env": {
+            "version": "7.0.3",
+            "resolved": "https://registry.npmmirror.com/cross-env/-/cross-env-7.0.3.tgz",
+            "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==",
+            "dev": true,
+            "dependencies": {
+                "cross-spawn": "^7.0.1"
+            },
+            "bin": {
+                "cross-env": "src/bin/cross-env.js",
+                "cross-env-shell": "src/bin/cross-env-shell.js"
+            },
+            "engines": {
+                "node": ">=10.14",
+                "npm": ">=6",
+                "yarn": ">=1"
+            }
+        },
+        "node_modules/cross-spawn": {
+            "version": "7.0.3",
+            "resolved": "https://registry.npmmirror.com/cross-spawn/-/cross-spawn-7.0.3.tgz",
+            "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+            "dev": true,
+            "dependencies": {
+                "path-key": "^3.1.0",
+                "shebang-command": "^2.0.0",
+                "which": "^2.0.1"
+            },
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/css-font-size-keywords": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmmirror.com/css-font-size-keywords/-/css-font-size-keywords-1.0.0.tgz",
+            "integrity": "sha512-Q+svMDbMlelgCfH/RVDKtTDaf5021O486ZThQPIpahnIjUkMUslC+WuOQSWTgGSrNCH08Y7tYNEmmy0hkfMI8Q=="
+        },
+        "node_modules/css-font-stretch-keywords": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmmirror.com/css-font-stretch-keywords/-/css-font-stretch-keywords-1.0.1.tgz",
+            "integrity": "sha512-KmugPO2BNqoyp9zmBIUGwt58UQSfyk1X5DbOlkb2pckDXFSAfjsD5wenb88fNrD6fvS+vu90a/tsPpb9vb0SLg=="
+        },
+        "node_modules/css-font-style-keywords": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmmirror.com/css-font-style-keywords/-/css-font-style-keywords-1.0.1.tgz",
+            "integrity": "sha512-0Fn0aTpcDktnR1RzaBYorIxQily85M2KXRpzmxQPgh8pxUN9Fcn00I8u9I3grNr1QXVgCl9T5Imx0ZwKU973Vg=="
+        },
+        "node_modules/css-font-weight-keywords": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmmirror.com/css-font-weight-keywords/-/css-font-weight-keywords-1.0.0.tgz",
+            "integrity": "sha512-5So8/NH+oDD+EzsnF4iaG4ZFHQ3vaViePkL1ZbZ5iC/KrsCY+WHq/lvOgrtmuOQ9pBBZ1ADGpaf+A4lj1Z9eYA=="
+        },
+        "node_modules/css-line-break": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmmirror.com/css-line-break/-/css-line-break-2.1.0.tgz",
+            "integrity": "sha512-FHcKFCZcAha3LwfVBhCQbW2nCNbkZXn7KVUJcsT5/P8YmfsVja0FMPJr0B903j/E69HUphKiV9iQArX8SDYA4w==",
+            "dependencies": {
+                "utrie": "^1.0.2"
+            }
+        },
+        "node_modules/css-list-helpers": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/css-list-helpers/-/css-list-helpers-2.0.0.tgz",
+            "integrity": "sha512-9Bj8tZ0jWbAM3u/U6m/boAzAwLPwtjzFvwivr2piSvyVa3K3rChJzQy4RIHkNkKiZCHrEMWDJWtTR8UyVhdDnQ=="
+        },
+        "node_modules/css-system-font-keywords": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmmirror.com/css-system-font-keywords/-/css-system-font-keywords-1.0.0.tgz",
+            "integrity": "sha512-1umTtVd/fXS25ftfjB71eASCrYhilmEsvDEI6wG/QplnmlfmVM5HkZ/ZX46DT5K3eblFPgLUHt5BRCb0YXkSFA=="
+        },
+        "node_modules/cssesc": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmmirror.com/cssesc/-/cssesc-3.0.0.tgz",
+            "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+            "bin": {
+                "cssesc": "bin/cssesc"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/cssom": {
+            "version": "0.4.4",
+            "resolved": "https://registry.npmmirror.com/cssom/-/cssom-0.4.4.tgz",
+            "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/cssstyle": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmmirror.com/cssstyle/-/cssstyle-2.3.0.tgz",
+            "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "cssom": "~0.3.6"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/cssstyle/node_modules/cssom": {
+            "version": "0.3.8",
+            "resolved": "https://registry.npmmirror.com/cssom/-/cssom-0.3.8.tgz",
+            "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/csstype": {
+            "version": "3.1.3",
+            "resolved": "https://registry.npmmirror.com/csstype/-/csstype-3.1.3.tgz",
+            "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="
+        },
+        "node_modules/data-urls": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/data-urls/-/data-urls-2.0.0.tgz",
+            "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "abab": "^2.0.3",
+                "whatwg-mimetype": "^2.3.0",
+                "whatwg-url": "^8.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/dayjs": {
+            "version": "1.11.11",
+            "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.11.tgz",
+            "integrity": "sha512-okzr3f11N6WuqYtZSvm+F776mB41wRZMhKP+hc34YdW+KmtYYK9iqvHSwo2k9FEH3fhGXvOPV6yz2IcSrfRUDg=="
+        },
+        "node_modules/de-indent": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmmirror.com/de-indent/-/de-indent-1.0.2.tgz",
+            "integrity": "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==",
+            "dev": true
+        },
+        "node_modules/debug": {
+            "version": "4.3.4",
+            "resolved": "https://registry.npmmirror.com/debug/-/debug-4.3.4.tgz",
+            "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+            "dependencies": {
+                "ms": "2.1.2"
+            },
+            "engines": {
+                "node": ">=6.0"
+            },
+            "peerDependenciesMeta": {
+                "supports-color": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/decamelize": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmmirror.com/decamelize/-/decamelize-1.2.0.tgz",
+            "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/decimal.js": {
+            "version": "10.4.3",
+            "resolved": "https://registry.npmmirror.com/decimal.js/-/decimal.js-10.4.3.tgz",
+            "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/dedent": {
+            "version": "0.7.0",
+            "resolved": "https://registry.npmmirror.com/dedent/-/dedent-0.7.0.tgz",
+            "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/deepmerge": {
+            "version": "4.3.1",
+            "resolved": "https://registry.npmmirror.com/deepmerge/-/deepmerge-4.3.1.tgz",
+            "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/default-gateway": {
+            "version": "6.0.3",
+            "resolved": "https://registry.npmmirror.com/default-gateway/-/default-gateway-6.0.3.tgz",
+            "integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==",
+            "dev": true,
+            "dependencies": {
+                "execa": "^5.0.0"
+            },
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/define-data-property": {
+            "version": "1.1.4",
+            "resolved": "https://registry.npmmirror.com/define-data-property/-/define-data-property-1.1.4.tgz",
+            "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+            "dev": true,
+            "dependencies": {
+                "es-define-property": "^1.0.0",
+                "es-errors": "^1.3.0",
+                "gopd": "^1.0.1"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/delayed-stream": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmmirror.com/delayed-stream/-/delayed-stream-1.0.0.tgz",
+            "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=0.4.0"
+            }
+        },
+        "node_modules/delegate": {
+            "version": "3.2.0",
+            "resolved": "https://registry.npmmirror.com/delegate/-/delegate-3.2.0.tgz",
+            "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw=="
+        },
+        "node_modules/depd": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/depd/-/depd-2.0.0.tgz",
+            "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/destroy": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmmirror.com/destroy/-/destroy-1.2.0.tgz",
+            "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.8",
+                "npm": "1.2.8000 || >= 1.4.16"
+            }
+        },
+        "node_modules/detect-newline": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmmirror.com/detect-newline/-/detect-newline-3.1.0.tgz",
+            "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/diff-sequences": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/diff-sequences/-/diff-sequences-27.5.1.tgz",
+            "integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+            }
+        },
+        "node_modules/dijkstrajs": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmmirror.com/dijkstrajs/-/dijkstrajs-1.0.3.tgz",
+            "integrity": "sha512-qiSlmBq9+BCdCA/L46dw8Uy93mloxsPSbwnm5yrKn2vMPiy8KyAskTF6zuV/j5BMsmOGZDPs7KjU+mjb670kfA=="
+        },
+        "node_modules/dom-walk": {
+            "version": "0.1.2",
+            "resolved": "https://registry.npmmirror.com/dom-walk/-/dom-walk-0.1.2.tgz",
+            "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w=="
+        },
+        "node_modules/domexception": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/domexception/-/domexception-2.0.1.tgz",
+            "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==",
+            "deprecated": "Use your platform's native DOMException instead",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "webidl-conversions": "^5.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/domexception/node_modules/webidl-conversions": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmmirror.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
+            "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/ee-first": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmmirror.com/ee-first/-/ee-first-1.1.1.tgz",
+            "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
+            "dev": true
+        },
+        "node_modules/electron-to-chromium": {
+            "version": "1.5.59",
+            "resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.5.59.tgz",
+            "integrity": "sha512-faAXB6+gEbC8FsiRdpOXgOe4snP49YwjiXynEB8Mp7sUx80W5eN+BnnBHJ/F7eIeLzs+QBfDD40bJMm97oEFcw=="
+        },
+        "node_modules/emittery": {
+            "version": "0.8.1",
+            "resolved": "https://registry.npmmirror.com/emittery/-/emittery-0.8.1.tgz",
+            "integrity": "sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/emoji-regex": {
+            "version": "8.0.0",
+            "resolved": "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-8.0.0.tgz",
+            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+        },
+        "node_modules/emojis-list": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmmirror.com/emojis-list/-/emojis-list-3.0.0.tgz",
+            "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+            "dev": true,
+            "engines": {
+                "node": ">= 4"
+            }
+        },
+        "node_modules/encode-utf8": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmmirror.com/encode-utf8/-/encode-utf8-1.0.3.tgz",
+            "integrity": "sha512-ucAnuBEhUK4boH2HjVYG5Q2mQyPorvv0u/ocS+zhdw0S8AlHYY+GOFhP1Gio5z4icpP2ivFSvhtFjQi8+T9ppw=="
+        },
+        "node_modules/encodeurl": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmmirror.com/encodeurl/-/encodeurl-1.0.2.tgz",
+            "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/entities": {
+            "version": "4.5.0",
+            "resolved": "https://registry.npmmirror.com/entities/-/entities-4.5.0.tgz",
+            "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+            "engines": {
+                "node": ">=0.12"
+            }
+        },
+        "node_modules/error-ex": {
+            "version": "1.3.2",
+            "resolved": "https://registry.npmmirror.com/error-ex/-/error-ex-1.3.2.tgz",
+            "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "is-arrayish": "^0.2.1"
+            }
+        },
+        "node_modules/es-define-property": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmmirror.com/es-define-property/-/es-define-property-1.0.0.tgz",
+            "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+            "dev": true,
+            "dependencies": {
+                "get-intrinsic": "^1.2.4"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/es-errors": {
+            "version": "1.3.0",
+            "resolved": "https://registry.npmmirror.com/es-errors/-/es-errors-1.3.0.tgz",
+            "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/es-module-lexer": {
+            "version": "1.5.2",
+            "resolved": "https://registry.npmmirror.com/es-module-lexer/-/es-module-lexer-1.5.2.tgz",
+            "integrity": "sha512-l60ETUTmLqbVbVHv1J4/qj+M8nq7AwMzEcg3kmJDt9dCNrTk+yHcYFf/Kw75pMDwd9mPcIGCG5LcS20SxYRzFA=="
+        },
+        "node_modules/esbuild": {
+            "version": "0.17.19",
+            "resolved": "https://registry.npmmirror.com/esbuild/-/esbuild-0.17.19.tgz",
+            "integrity": "sha512-XQ0jAPFkK/u3LcVRcvVHQcTIqD6E2H1fvZMA5dQPSOWb3suUbWbfbRf94pjc0bNzRYLfIrDRQXr7X+LHIm5oHw==",
+            "hasInstallScript": true,
+            "bin": {
+                "esbuild": "bin/esbuild"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "optionalDependencies": {
+                "@esbuild/android-arm": "0.17.19",
+                "@esbuild/android-arm64": "0.17.19",
+                "@esbuild/android-x64": "0.17.19",
+                "@esbuild/darwin-arm64": "0.17.19",
+                "@esbuild/darwin-x64": "0.17.19",
+                "@esbuild/freebsd-arm64": "0.17.19",
+                "@esbuild/freebsd-x64": "0.17.19",
+                "@esbuild/linux-arm": "0.17.19",
+                "@esbuild/linux-arm64": "0.17.19",
+                "@esbuild/linux-ia32": "0.17.19",
+                "@esbuild/linux-loong64": "0.17.19",
+                "@esbuild/linux-mips64el": "0.17.19",
+                "@esbuild/linux-ppc64": "0.17.19",
+                "@esbuild/linux-riscv64": "0.17.19",
+                "@esbuild/linux-s390x": "0.17.19",
+                "@esbuild/linux-x64": "0.17.19",
+                "@esbuild/netbsd-x64": "0.17.19",
+                "@esbuild/openbsd-x64": "0.17.19",
+                "@esbuild/sunos-x64": "0.17.19",
+                "@esbuild/win32-arm64": "0.17.19",
+                "@esbuild/win32-ia32": "0.17.19",
+                "@esbuild/win32-x64": "0.17.19"
+            }
+        },
+        "node_modules/escalade": {
+            "version": "3.2.0",
+            "resolved": "https://registry.npmmirror.com/escalade/-/escalade-3.2.0.tgz",
+            "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/escape-html": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmmirror.com/escape-html/-/escape-html-1.0.3.tgz",
+            "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
+            "dev": true
+        },
+        "node_modules/escape-string-regexp": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmmirror.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+            "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+            "engines": {
+                "node": ">=0.8.0"
+            }
+        },
+        "node_modules/escodegen": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmmirror.com/escodegen/-/escodegen-2.1.0.tgz",
+            "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "esprima": "^4.0.1",
+                "estraverse": "^5.2.0",
+                "esutils": "^2.0.2"
+            },
+            "bin": {
+                "escodegen": "bin/escodegen.js",
+                "esgenerate": "bin/esgenerate.js"
+            },
+            "engines": {
+                "node": ">=6.0"
+            },
+            "optionalDependencies": {
+                "source-map": "~0.6.1"
+            }
+        },
+        "node_modules/esprima": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmmirror.com/esprima/-/esprima-4.0.1.tgz",
+            "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+            "dev": true,
+            "peer": true,
+            "bin": {
+                "esparse": "bin/esparse.js",
+                "esvalidate": "bin/esvalidate.js"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/estraverse": {
+            "version": "5.3.0",
+            "resolved": "https://registry.npmmirror.com/estraverse/-/estraverse-5.3.0.tgz",
+            "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=4.0"
+            }
+        },
+        "node_modules/estree-walker": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmmirror.com/estree-walker/-/estree-walker-2.0.2.tgz",
+            "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="
+        },
+        "node_modules/esutils": {
+            "version": "2.0.3",
+            "resolved": "https://registry.npmmirror.com/esutils/-/esutils-2.0.3.tgz",
+            "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/etag": {
+            "version": "1.8.1",
+            "resolved": "https://registry.npmmirror.com/etag/-/etag-1.8.1.tgz",
+            "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/execa": {
+            "version": "5.1.1",
+            "resolved": "https://registry.npmmirror.com/execa/-/execa-5.1.1.tgz",
+            "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+            "dev": true,
+            "dependencies": {
+                "cross-spawn": "^7.0.3",
+                "get-stream": "^6.0.0",
+                "human-signals": "^2.1.0",
+                "is-stream": "^2.0.0",
+                "merge-stream": "^2.0.0",
+                "npm-run-path": "^4.0.1",
+                "onetime": "^5.1.2",
+                "signal-exit": "^3.0.3",
+                "strip-final-newline": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/exif-parser": {
+            "version": "0.1.12",
+            "resolved": "https://registry.npmmirror.com/exif-parser/-/exif-parser-0.1.12.tgz",
+            "integrity": "sha512-c2bQfLNbMzLPmzQuOr8fy0csy84WmwnER81W88DzTp9CYNPJ6yzOj2EZAh9pywYpqHnshVLHQJ8WzldAyfY+Iw=="
+        },
+        "node_modules/exit": {
+            "version": "0.1.2",
+            "resolved": "https://registry.npmmirror.com/exit/-/exit-0.1.2.tgz",
+            "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">= 0.8.0"
+            }
+        },
+        "node_modules/expect": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/expect/-/expect-27.5.1.tgz",
+            "integrity": "sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "@jest/types": "^27.5.1",
+                "jest-get-type": "^27.5.1",
+                "jest-matcher-utils": "^27.5.1",
+                "jest-message-util": "^27.5.1"
+            },
+            "engines": {
+                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+            }
+        },
+        "node_modules/express": {
+            "version": "4.19.2",
+            "resolved": "https://registry.npmmirror.com/express/-/express-4.19.2.tgz",
+            "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==",
+            "dev": true,
+            "dependencies": {
+                "accepts": "~1.3.8",
+                "array-flatten": "1.1.1",
+                "body-parser": "1.20.2",
+                "content-disposition": "0.5.4",
+                "content-type": "~1.0.4",
+                "cookie": "0.6.0",
+                "cookie-signature": "1.0.6",
+                "debug": "2.6.9",
+                "depd": "2.0.0",
+                "encodeurl": "~1.0.2",
+                "escape-html": "~1.0.3",
+                "etag": "~1.8.1",
+                "finalhandler": "1.2.0",
+                "fresh": "0.5.2",
+                "http-errors": "2.0.0",
+                "merge-descriptors": "1.0.1",
+                "methods": "~1.1.2",
+                "on-finished": "2.4.1",
+                "parseurl": "~1.3.3",
+                "path-to-regexp": "0.1.7",
+                "proxy-addr": "~2.0.7",
+                "qs": "6.11.0",
+                "range-parser": "~1.2.1",
+                "safe-buffer": "5.2.1",
+                "send": "0.18.0",
+                "serve-static": "1.15.0",
+                "setprototypeof": "1.2.0",
+                "statuses": "2.0.1",
+                "type-is": "~1.6.18",
+                "utils-merge": "1.0.1",
+                "vary": "~1.1.2"
+            },
+            "engines": {
+                "node": ">= 0.10.0"
+            }
+        },
+        "node_modules/express/node_modules/debug": {
+            "version": "2.6.9",
+            "resolved": "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz",
+            "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+            "dev": true,
+            "dependencies": {
+                "ms": "2.0.0"
+            }
+        },
+        "node_modules/express/node_modules/ms": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz",
+            "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+            "dev": true
+        },
+        "node_modules/express/node_modules/qs": {
+            "version": "6.11.0",
+            "resolved": "https://registry.npmmirror.com/qs/-/qs-6.11.0.tgz",
+            "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+            "dev": true,
+            "dependencies": {
+                "side-channel": "^1.0.4"
+            },
+            "engines": {
+                "node": ">=0.6"
+            }
+        },
+        "node_modules/fast-glob": {
+            "version": "3.3.2",
+            "resolved": "https://registry.npmmirror.com/fast-glob/-/fast-glob-3.3.2.tgz",
+            "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
+            "dependencies": {
+                "@nodelib/fs.stat": "^2.0.2",
+                "@nodelib/fs.walk": "^1.2.3",
+                "glob-parent": "^5.1.2",
+                "merge2": "^1.3.0",
+                "micromatch": "^4.0.4"
+            },
+            "engines": {
+                "node": ">=8.6.0"
+            }
+        },
+        "node_modules/fast-json-stable-stringify": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmmirror.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+            "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/fastq": {
+            "version": "1.17.1",
+            "resolved": "https://registry.npmmirror.com/fastq/-/fastq-1.17.1.tgz",
+            "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
+            "dependencies": {
+                "reusify": "^1.0.4"
+            }
+        },
+        "node_modules/fb-watchman": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmmirror.com/fb-watchman/-/fb-watchman-2.0.2.tgz",
+            "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "bser": "2.1.1"
+            }
+        },
+        "node_modules/file-type": {
+            "version": "9.0.0",
+            "resolved": "https://registry.npmmirror.com/file-type/-/file-type-9.0.0.tgz",
+            "integrity": "sha512-Qe/5NJrgIOlwijpq3B7BEpzPFcgzggOTagZmkXQY4LA6bsXKTUstK7Wp12lEJ/mLKTpvIZxmIuRcLYWT6ov9lw==",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/fill-range": {
+            "version": "7.0.1",
+            "resolved": "https://registry.npmmirror.com/fill-range/-/fill-range-7.0.1.tgz",
+            "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+            "dependencies": {
+                "to-regex-range": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/finalhandler": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmmirror.com/finalhandler/-/finalhandler-1.2.0.tgz",
+            "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+            "dev": true,
+            "dependencies": {
+                "debug": "2.6.9",
+                "encodeurl": "~1.0.2",
+                "escape-html": "~1.0.3",
+                "on-finished": "2.4.1",
+                "parseurl": "~1.3.3",
+                "statuses": "2.0.1",
+                "unpipe": "~1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/finalhandler/node_modules/debug": {
+            "version": "2.6.9",
+            "resolved": "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz",
+            "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+            "dev": true,
+            "dependencies": {
+                "ms": "2.0.0"
+            }
+        },
+        "node_modules/finalhandler/node_modules/ms": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz",
+            "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+            "dev": true
+        },
+        "node_modules/find-up": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmmirror.com/find-up/-/find-up-4.1.0.tgz",
+            "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+            "dependencies": {
+                "locate-path": "^5.0.0",
+                "path-exists": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/form-data": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmmirror.com/form-data/-/form-data-3.0.1.tgz",
+            "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "asynckit": "^0.4.0",
+                "combined-stream": "^1.0.8",
+                "mime-types": "^2.1.12"
+            },
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/forwarded": {
+            "version": "0.2.0",
+            "resolved": "https://registry.npmmirror.com/forwarded/-/forwarded-0.2.0.tgz",
+            "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/fraction.js": {
+            "version": "4.3.7",
+            "resolved": "https://registry.npmmirror.com/fraction.js/-/fraction.js-4.3.7.tgz",
+            "integrity": "sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==",
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/fresh": {
+            "version": "0.5.2",
+            "resolved": "https://registry.npmmirror.com/fresh/-/fresh-0.5.2.tgz",
+            "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/fs-extra": {
+            "version": "10.1.0",
+            "resolved": "https://registry.npmmirror.com/fs-extra/-/fs-extra-10.1.0.tgz",
+            "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+            "dependencies": {
+                "graceful-fs": "^4.2.0",
+                "jsonfile": "^6.0.1",
+                "universalify": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/fs.realpath": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmmirror.com/fs.realpath/-/fs.realpath-1.0.0.tgz",
+            "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+            "dev": true
+        },
+        "node_modules/fsevents": {
+            "version": "2.3.3",
+            "resolved": "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.3.tgz",
+            "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+            "hasInstallScript": true,
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+            }
+        },
+        "node_modules/function-bind": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmmirror.com/function-bind/-/function-bind-1.1.2.tgz",
+            "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="
+        },
+        "node_modules/generic-names": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmmirror.com/generic-names/-/generic-names-4.0.0.tgz",
+            "integrity": "sha512-ySFolZQfw9FoDb3ed9d80Cm9f0+r7qj+HJkWjeD9RBfpxEVTlVhol+gvaQB/78WbwYfbnNh8nWHHBSlg072y6A==",
+            "dependencies": {
+                "loader-utils": "^3.2.0"
+            }
+        },
+        "node_modules/gensync": {
+            "version": "1.0.0-beta.2",
+            "resolved": "https://registry.npmmirror.com/gensync/-/gensync-1.0.0-beta.2.tgz",
+            "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/get-caller-file": {
+            "version": "2.0.5",
+            "resolved": "https://registry.npmmirror.com/get-caller-file/-/get-caller-file-2.0.5.tgz",
+            "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+            "engines": {
+                "node": "6.* || 8.* || >= 10.*"
+            }
+        },
+        "node_modules/get-intrinsic": {
+            "version": "1.2.4",
+            "resolved": "https://registry.npmmirror.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+            "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
+            "dev": true,
+            "dependencies": {
+                "es-errors": "^1.3.0",
+                "function-bind": "^1.1.2",
+                "has-proto": "^1.0.1",
+                "has-symbols": "^1.0.3",
+                "hasown": "^2.0.0"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/get-package-type": {
+            "version": "0.1.0",
+            "resolved": "https://registry.npmmirror.com/get-package-type/-/get-package-type-0.1.0.tgz",
+            "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=8.0.0"
+            }
+        },
+        "node_modules/get-port": {
+            "version": "6.1.2",
+            "resolved": "https://registry.npmmirror.com/get-port/-/get-port-6.1.2.tgz",
+            "integrity": "sha512-BrGGraKm2uPqurfGVj/z97/zv8dPleC6x9JBNRTrDNtCkkRF4rPwrQXFgL7+I+q8QSdU4ntLQX2D7KIxSy8nGw==",
+            "dev": true,
+            "engines": {
+                "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+            }
+        },
+        "node_modules/get-stream": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmmirror.com/get-stream/-/get-stream-6.0.1.tgz",
+            "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+            "dev": true,
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/glob": {
+            "version": "8.1.0",
+            "resolved": "https://registry.npmmirror.com/glob/-/glob-8.1.0.tgz",
+            "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
+            "dev": true,
+            "dependencies": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^5.0.1",
+                "once": "^1.3.0"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/glob-parent": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmmirror.com/glob-parent/-/glob-parent-5.1.2.tgz",
+            "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+            "dependencies": {
+                "is-glob": "^4.0.1"
+            },
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/global": {
+            "version": "4.4.0",
+            "resolved": "https://registry.npmmirror.com/global/-/global-4.4.0.tgz",
+            "integrity": "sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==",
+            "dependencies": {
+                "min-document": "^2.19.0",
+                "process": "^0.11.10"
+            }
+        },
+        "node_modules/globals": {
+            "version": "11.12.0",
+            "resolved": "https://registry.npmmirror.com/globals/-/globals-11.12.0.tgz",
+            "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/good-listener": {
+            "version": "1.2.2",
+            "resolved": "https://registry.npmmirror.com/good-listener/-/good-listener-1.2.2.tgz",
+            "integrity": "sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==",
+            "dependencies": {
+                "delegate": "^3.1.2"
+            }
+        },
+        "node_modules/gopd": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmmirror.com/gopd/-/gopd-1.0.1.tgz",
+            "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+            "dev": true,
+            "dependencies": {
+                "get-intrinsic": "^1.1.3"
+            }
+        },
+        "node_modules/graceful-fs": {
+            "version": "4.2.11",
+            "resolved": "https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.11.tgz",
+            "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
+        },
+        "node_modules/has-flag": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-3.0.0.tgz",
+            "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/has-property-descriptors": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmmirror.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+            "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
+            "dev": true,
+            "dependencies": {
+                "es-define-property": "^1.0.0"
+            }
+        },
+        "node_modules/has-proto": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmmirror.com/has-proto/-/has-proto-1.0.3.tgz",
+            "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/has-symbols": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmmirror.com/has-symbols/-/has-symbols-1.0.3.tgz",
+            "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/hash-sum": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-2.0.0.tgz",
+            "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg=="
+        },
+        "node_modules/hasown": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmmirror.com/hasown/-/hasown-2.0.2.tgz",
+            "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+            "dependencies": {
+                "function-bind": "^1.1.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/he": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmmirror.com/he/-/he-1.2.0.tgz",
+            "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+            "dev": true,
+            "bin": {
+                "he": "bin/he"
+            }
+        },
+        "node_modules/html-encoding-sniffer": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
+            "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "whatwg-encoding": "^1.0.5"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/html-escaper": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmmirror.com/html-escaper/-/html-escaper-2.0.2.tgz",
+            "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/html-tags": {
+            "version": "3.3.1",
+            "resolved": "https://registry.npmmirror.com/html-tags/-/html-tags-3.3.1.tgz",
+            "integrity": "sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==",
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/html2canvas": {
+            "version": "1.4.1",
+            "resolved": "https://registry.npmmirror.com/html2canvas/-/html2canvas-1.4.1.tgz",
+            "integrity": "sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==",
+            "dependencies": {
+                "css-line-break": "^2.1.0",
+                "text-segmentation": "^1.0.3"
+            },
+            "engines": {
+                "node": ">=8.0.0"
+            }
+        },
+        "node_modules/http-errors": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/http-errors/-/http-errors-2.0.0.tgz",
+            "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+            "dev": true,
+            "dependencies": {
+                "depd": "2.0.0",
+                "inherits": "2.0.4",
+                "setprototypeof": "1.2.0",
+                "statuses": "2.0.1",
+                "toidentifier": "1.0.1"
+            },
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/http-proxy-agent": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmmirror.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+            "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "@tootallnate/once": "1",
+                "agent-base": "6",
+                "debug": "4"
+            },
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/https-proxy-agent": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmmirror.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+            "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "agent-base": "6",
+                "debug": "4"
+            },
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/human-signals": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmmirror.com/human-signals/-/human-signals-2.1.0.tgz",
+            "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+            "dev": true,
+            "engines": {
+                "node": ">=10.17.0"
+            }
+        },
+        "node_modules/iconv-lite": {
+            "version": "0.4.24",
+            "resolved": "https://registry.npmmirror.com/iconv-lite/-/iconv-lite-0.4.24.tgz",
+            "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+            "dev": true,
+            "dependencies": {
+                "safer-buffer": ">= 2.1.2 < 3"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/icss-replace-symbols": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmmirror.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz",
+            "integrity": "sha512-chIaY3Vh2mh2Q3RGXttaDIzeiPvaVXJ+C4DAh/w3c37SKZ/U6PGMmuicR2EQQp9bKG8zLMCl7I+PtIoOOPp8Gg=="
+        },
+        "node_modules/icss-utils": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmmirror.com/icss-utils/-/icss-utils-5.1.0.tgz",
+            "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
+            "engines": {
+                "node": "^10 || ^12 || >= 14"
+            },
+            "peerDependencies": {
+                "postcss": "^8.1.0"
+            }
+        },
+        "node_modules/ieee754": {
+            "version": "1.2.1",
+            "resolved": "https://registry.npmmirror.com/ieee754/-/ieee754-1.2.1.tgz",
+            "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="
+        },
+        "node_modules/image-tools": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmmirror.com/image-tools/-/image-tools-1.4.0.tgz",
+            "integrity": "sha512-TKtvJ6iUwM0mfaD4keMnk1ENHFC470QEjBfA3IlvKdEOufzvWbjbaoNcoyYq6HlViF8+d5tOS1ooE6j7CHf1lQ=="
+        },
+        "node_modules/immutable": {
+            "version": "4.3.6",
+            "resolved": "https://registry.npmmirror.com/immutable/-/immutable-4.3.6.tgz",
+            "integrity": "sha512-Ju0+lEMyzMVZarkTn/gqRpdqd5dOPaz1mCZ0SH3JV6iFw81PldE/PEB1hWVEA288HPt4WXW8O7AWxB10M+03QQ==",
+            "devOptional": true
+        },
+        "node_modules/import-local": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmmirror.com/import-local/-/import-local-3.1.0.tgz",
+            "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "pkg-dir": "^4.2.0",
+                "resolve-cwd": "^3.0.0"
+            },
+            "bin": {
+                "import-local-fixture": "fixtures/cli.js"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/imurmurhash": {
+            "version": "0.1.4",
+            "resolved": "https://registry.npmmirror.com/imurmurhash/-/imurmurhash-0.1.4.tgz",
+            "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=0.8.19"
+            }
+        },
+        "node_modules/inflight": {
+            "version": "1.0.6",
+            "resolved": "https://registry.npmmirror.com/inflight/-/inflight-1.0.6.tgz",
+            "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+            "dev": true,
+            "dependencies": {
+                "once": "^1.3.0",
+                "wrappy": "1"
+            }
+        },
+        "node_modules/inherits": {
+            "version": "2.0.4",
+            "resolved": "https://registry.npmmirror.com/inherits/-/inherits-2.0.4.tgz",
+            "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+            "dev": true
+        },
+        "node_modules/invert-kv": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmmirror.com/invert-kv/-/invert-kv-3.0.1.tgz",
+            "integrity": "sha512-CYdFeFexxhv/Bcny+Q0BfOV+ltRlJcd4BBZBYFX/O0u4npJrgZtIcjokegtiSMAvlMTJ+Koq0GBCc//3bueQxw==",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/ipaddr.js": {
+            "version": "1.9.1",
+            "resolved": "https://registry.npmmirror.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+            "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.10"
+            }
+        },
+        "node_modules/is-arrayish": {
+            "version": "0.2.1",
+            "resolved": "https://registry.npmmirror.com/is-arrayish/-/is-arrayish-0.2.1.tgz",
+            "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/is-binary-path": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmmirror.com/is-binary-path/-/is-binary-path-2.1.0.tgz",
+            "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+            "dependencies": {
+                "binary-extensions": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/is-core-module": {
+            "version": "2.13.1",
+            "resolved": "https://registry.npmmirror.com/is-core-module/-/is-core-module-2.13.1.tgz",
+            "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
+            "dependencies": {
+                "hasown": "^2.0.0"
+            }
+        },
+        "node_modules/is-extglob": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmmirror.com/is-extglob/-/is-extglob-2.1.1.tgz",
+            "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/is-fullwidth-code-point": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmmirror.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+            "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/is-function": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmmirror.com/is-function/-/is-function-1.0.2.tgz",
+            "integrity": "sha512-lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ=="
+        },
+        "node_modules/is-generator-fn": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmmirror.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
+            "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/is-glob": {
+            "version": "4.0.3",
+            "resolved": "https://registry.npmmirror.com/is-glob/-/is-glob-4.0.3.tgz",
+            "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+            "dependencies": {
+                "is-extglob": "^2.1.1"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/is-number": {
+            "version": "7.0.0",
+            "resolved": "https://registry.npmmirror.com/is-number/-/is-number-7.0.0.tgz",
+            "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+            "engines": {
+                "node": ">=0.12.0"
+            }
+        },
+        "node_modules/is-potential-custom-element-name": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmmirror.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
+            "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/is-reference": {
+            "version": "1.2.1",
+            "resolved": "https://registry.npmmirror.com/is-reference/-/is-reference-1.2.1.tgz",
+            "integrity": "sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==",
+            "dev": true,
+            "dependencies": {
+                "@types/estree": "*"
+            }
+        },
+        "node_modules/is-stream": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/is-stream/-/is-stream-2.0.1.tgz",
+            "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/is-typedarray": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmmirror.com/is-typedarray/-/is-typedarray-1.0.0.tgz",
+            "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/isexe": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/isexe/-/isexe-2.0.0.tgz",
+            "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+            "dev": true
+        },
+        "node_modules/istanbul-lib-coverage": {
+            "version": "3.2.2",
+            "resolved": "https://registry.npmmirror.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
+            "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/istanbul-lib-instrument": {
+            "version": "5.2.1",
+            "resolved": "https://registry.npmmirror.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+            "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "@babel/core": "^7.12.3",
+                "@babel/parser": "^7.14.7",
+                "@istanbuljs/schema": "^0.1.2",
+                "istanbul-lib-coverage": "^3.2.0",
+                "semver": "^6.3.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/istanbul-lib-report": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmmirror.com/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
+            "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "istanbul-lib-coverage": "^3.0.0",
+                "make-dir": "^4.0.0",
+                "supports-color": "^7.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/istanbul-lib-report/node_modules/has-flag": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/istanbul-lib-report/node_modules/supports-color": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/istanbul-lib-source-maps": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmmirror.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
+            "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "debug": "^4.1.1",
+                "istanbul-lib-coverage": "^3.0.0",
+                "source-map": "^0.6.1"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/istanbul-reports": {
+            "version": "3.1.7",
+            "resolved": "https://registry.npmmirror.com/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
+            "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "html-escaper": "^2.0.0",
+                "istanbul-lib-report": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/jest": {
+            "version": "27.0.4",
+            "resolved": "https://registry.npmmirror.com/jest/-/jest-27.0.4.tgz",
+            "integrity": "sha512-Px1iKFooXgGSkk1H8dJxxBIrM3tsc5SIuI4kfKYK2J+4rvCvPGr/cXktxh0e9zIPQ5g09kOMNfHQEmusBUf/ZA==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "@jest/core": "^27.0.4",
+                "import-local": "^3.0.2",
+                "jest-cli": "^27.0.4"
+            },
+            "bin": {
+                "jest": "bin/jest.js"
+            },
+            "engines": {
+                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+            },
+            "peerDependencies": {
+                "node-notifier": "^8.0.1 || ^9.0.0"
+            },
+            "peerDependenciesMeta": {
+                "node-notifier": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/jest-changed-files": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/jest-changed-files/-/jest-changed-files-27.5.1.tgz",
+            "integrity": "sha512-buBLMiByfWGCoMsLLzGUUSpAmIAGnbR2KJoMN10ziLhOLvP4e0SlypHnAel8iqQXTrcbmfEY9sSqae5sgUsTvw==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "@jest/types": "^27.5.1",
+                "execa": "^5.0.0",
+                "throat": "^6.0.1"
+            },
+            "engines": {
+                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+            }
+        },
+        "node_modules/jest-circus": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/jest-circus/-/jest-circus-27.5.1.tgz",
+            "integrity": "sha512-D95R7x5UtlMA5iBYsOHFFbMD/GVA4R/Kdq15f7xYWUfWHBto9NYRsOvnSauTgdF+ogCpJ4tyKOXhUifxS65gdw==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "@jest/environment": "^27.5.1",
+                "@jest/test-result": "^27.5.1",
+                "@jest/types": "^27.5.1",
+                "@types/node": "*",
+                "chalk": "^4.0.0",
+                "co": "^4.6.0",
+                "dedent": "^0.7.0",
+                "expect": "^27.5.1",
+                "is-generator-fn": "^2.0.0",
+                "jest-each": "^27.5.1",
+                "jest-matcher-utils": "^27.5.1",
+                "jest-message-util": "^27.5.1",
+                "jest-runtime": "^27.5.1",
+                "jest-snapshot": "^27.5.1",
+                "jest-util": "^27.5.1",
+                "pretty-format": "^27.5.1",
+                "slash": "^3.0.0",
+                "stack-utils": "^2.0.3",
+                "throat": "^6.0.1"
+            },
+            "engines": {
+                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+            }
+        },
+        "node_modules/jest-circus/node_modules/ansi-styles": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "color-convert": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/jest-circus/node_modules/chalk": {
+            "version": "4.1.2",
+            "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+            "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "ansi-styles": "^4.1.0",
+                "supports-color": "^7.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/jest-circus/node_modules/color-convert": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "color-name": "~1.1.4"
+            },
+            "engines": {
+                "node": ">=7.0.0"
+            }
+        },
+        "node_modules/jest-circus/node_modules/color-name": {
+            "version": "1.1.4",
+            "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/jest-circus/node_modules/has-flag": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/jest-circus/node_modules/supports-color": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/jest-cli": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/jest-cli/-/jest-cli-27.5.1.tgz",
+            "integrity": "sha512-Hc6HOOwYq4/74/c62dEE3r5elx8wjYqxY0r0G/nFrLDPMFRu6RA/u8qINOIkvhxG7mMQ5EJsOGfRpI8L6eFUVw==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "@jest/core": "^27.5.1",
+                "@jest/test-result": "^27.5.1",
+                "@jest/types": "^27.5.1",
+                "chalk": "^4.0.0",
+                "exit": "^0.1.2",
+                "graceful-fs": "^4.2.9",
+                "import-local": "^3.0.2",
+                "jest-config": "^27.5.1",
+                "jest-util": "^27.5.1",
+                "jest-validate": "^27.5.1",
+                "prompts": "^2.0.1",
+                "yargs": "^16.2.0"
+            },
+            "bin": {
+                "jest": "bin/jest.js"
+            },
+            "engines": {
+                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+            },
+            "peerDependencies": {
+                "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+            },
+            "peerDependenciesMeta": {
+                "node-notifier": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/jest-cli/node_modules/ansi-styles": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "color-convert": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/jest-cli/node_modules/chalk": {
+            "version": "4.1.2",
+            "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+            "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "ansi-styles": "^4.1.0",
+                "supports-color": "^7.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/jest-cli/node_modules/color-convert": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "color-name": "~1.1.4"
+            },
+            "engines": {
+                "node": ">=7.0.0"
+            }
+        },
+        "node_modules/jest-cli/node_modules/color-name": {
+            "version": "1.1.4",
+            "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/jest-cli/node_modules/has-flag": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/jest-cli/node_modules/supports-color": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/jest-config": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/jest-config/-/jest-config-27.5.1.tgz",
+            "integrity": "sha512-5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "@babel/core": "^7.8.0",
+                "@jest/test-sequencer": "^27.5.1",
+                "@jest/types": "^27.5.1",
+                "babel-jest": "^27.5.1",
+                "chalk": "^4.0.0",
+                "ci-info": "^3.2.0",
+                "deepmerge": "^4.2.2",
+                "glob": "^7.1.1",
+                "graceful-fs": "^4.2.9",
+                "jest-circus": "^27.5.1",
+                "jest-environment-jsdom": "^27.5.1",
+                "jest-environment-node": "^27.5.1",
+                "jest-get-type": "^27.5.1",
+                "jest-jasmine2": "^27.5.1",
+                "jest-regex-util": "^27.5.1",
+                "jest-resolve": "^27.5.1",
+                "jest-runner": "^27.5.1",
+                "jest-util": "^27.5.1",
+                "jest-validate": "^27.5.1",
+                "micromatch": "^4.0.4",
+                "parse-json": "^5.2.0",
+                "pretty-format": "^27.5.1",
+                "slash": "^3.0.0",
+                "strip-json-comments": "^3.1.1"
+            },
+            "engines": {
+                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+            },
+            "peerDependencies": {
+                "ts-node": ">=9.0.0"
+            },
+            "peerDependenciesMeta": {
+                "ts-node": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/jest-config/node_modules/ansi-styles": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "color-convert": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/jest-config/node_modules/brace-expansion": {
+            "version": "1.1.11",
+            "resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.11.tgz",
+            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
+            }
+        },
+        "node_modules/jest-config/node_modules/chalk": {
+            "version": "4.1.2",
+            "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+            "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "ansi-styles": "^4.1.0",
+                "supports-color": "^7.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/jest-config/node_modules/color-convert": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "color-name": "~1.1.4"
+            },
+            "engines": {
+                "node": ">=7.0.0"
+            }
+        },
+        "node_modules/jest-config/node_modules/color-name": {
+            "version": "1.1.4",
+            "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/jest-config/node_modules/glob": {
+            "version": "7.2.3",
+            "resolved": "https://registry.npmmirror.com/glob/-/glob-7.2.3.tgz",
+            "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^3.1.1",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+            },
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/jest-config/node_modules/has-flag": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/jest-config/node_modules/minimatch": {
+            "version": "3.1.2",
+            "resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-3.1.2.tgz",
+            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "brace-expansion": "^1.1.7"
+            },
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/jest-config/node_modules/supports-color": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/jest-diff": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/jest-diff/-/jest-diff-27.5.1.tgz",
+            "integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "chalk": "^4.0.0",
+                "diff-sequences": "^27.5.1",
+                "jest-get-type": "^27.5.1",
+                "pretty-format": "^27.5.1"
+            },
+            "engines": {
+                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+            }
+        },
+        "node_modules/jest-diff/node_modules/ansi-styles": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "color-convert": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/jest-diff/node_modules/chalk": {
+            "version": "4.1.2",
+            "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+            "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "ansi-styles": "^4.1.0",
+                "supports-color": "^7.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/jest-diff/node_modules/color-convert": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "color-name": "~1.1.4"
+            },
+            "engines": {
+                "node": ">=7.0.0"
+            }
+        },
+        "node_modules/jest-diff/node_modules/color-name": {
+            "version": "1.1.4",
+            "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/jest-diff/node_modules/has-flag": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/jest-diff/node_modules/supports-color": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/jest-docblock": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/jest-docblock/-/jest-docblock-27.5.1.tgz",
+            "integrity": "sha512-rl7hlABeTsRYxKiUfpHrQrG4e2obOiTQWfMEH3PxPjOtdsfLQO4ReWSZaQ7DETm4xu07rl4q/h4zcKXyU0/OzQ==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "detect-newline": "^3.0.0"
+            },
+            "engines": {
+                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+            }
+        },
+        "node_modules/jest-each": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/jest-each/-/jest-each-27.5.1.tgz",
+            "integrity": "sha512-1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "@jest/types": "^27.5.1",
+                "chalk": "^4.0.0",
+                "jest-get-type": "^27.5.1",
+                "jest-util": "^27.5.1",
+                "pretty-format": "^27.5.1"
+            },
+            "engines": {
+                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+            }
+        },
+        "node_modules/jest-each/node_modules/ansi-styles": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "color-convert": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/jest-each/node_modules/chalk": {
+            "version": "4.1.2",
+            "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+            "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "ansi-styles": "^4.1.0",
+                "supports-color": "^7.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/jest-each/node_modules/color-convert": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "color-name": "~1.1.4"
+            },
+            "engines": {
+                "node": ">=7.0.0"
+            }
+        },
+        "node_modules/jest-each/node_modules/color-name": {
+            "version": "1.1.4",
+            "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/jest-each/node_modules/has-flag": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/jest-each/node_modules/supports-color": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/jest-environment-jsdom": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/jest-environment-jsdom/-/jest-environment-jsdom-27.5.1.tgz",
+            "integrity": "sha512-TFBvkTC1Hnnnrka/fUb56atfDtJ9VMZ94JkjTbggl1PEpwrYtUBKMezB3inLmWqQsXYLcMwNoDQwoBTAvFfsfw==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "@jest/environment": "^27.5.1",
+                "@jest/fake-timers": "^27.5.1",
+                "@jest/types": "^27.5.1",
+                "@types/node": "*",
+                "jest-mock": "^27.5.1",
+                "jest-util": "^27.5.1",
+                "jsdom": "^16.6.0"
+            },
+            "engines": {
+                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+            }
+        },
+        "node_modules/jest-environment-node": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/jest-environment-node/-/jest-environment-node-27.5.1.tgz",
+            "integrity": "sha512-Jt4ZUnxdOsTGwSRAfKEnE6BcwsSPNOijjwifq5sDFSA2kesnXTvNqKHYgM0hDq3549Uf/KzdXNYn4wMZJPlFLw==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "@jest/environment": "^27.5.1",
+                "@jest/fake-timers": "^27.5.1",
+                "@jest/types": "^27.5.1",
+                "@types/node": "*",
+                "jest-mock": "^27.5.1",
+                "jest-util": "^27.5.1"
+            },
+            "engines": {
+                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+            }
+        },
+        "node_modules/jest-get-type": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/jest-get-type/-/jest-get-type-27.5.1.tgz",
+            "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+            }
+        },
+        "node_modules/jest-haste-map": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/jest-haste-map/-/jest-haste-map-27.5.1.tgz",
+            "integrity": "sha512-7GgkZ4Fw4NFbMSDSpZwXeBiIbx+t/46nJ2QitkOjvwPYyZmqttu2TDSimMHP1EkPOi4xUZAN1doE5Vd25H4Jng==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "@jest/types": "^27.5.1",
+                "@types/graceful-fs": "^4.1.2",
+                "@types/node": "*",
+                "anymatch": "^3.0.3",
+                "fb-watchman": "^2.0.0",
+                "graceful-fs": "^4.2.9",
+                "jest-regex-util": "^27.5.1",
+                "jest-serializer": "^27.5.1",
+                "jest-util": "^27.5.1",
+                "jest-worker": "^27.5.1",
+                "micromatch": "^4.0.4",
+                "walker": "^1.0.7"
+            },
+            "engines": {
+                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+            },
+            "optionalDependencies": {
+                "fsevents": "^2.3.2"
+            }
+        },
+        "node_modules/jest-jasmine2": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/jest-jasmine2/-/jest-jasmine2-27.5.1.tgz",
+            "integrity": "sha512-jtq7VVyG8SqAorDpApwiJJImd0V2wv1xzdheGHRGyuT7gZm6gG47QEskOlzsN1PG/6WNaCo5pmwMHDf3AkG2pQ==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "@jest/environment": "^27.5.1",
+                "@jest/source-map": "^27.5.1",
+                "@jest/test-result": "^27.5.1",
+                "@jest/types": "^27.5.1",
+                "@types/node": "*",
+                "chalk": "^4.0.0",
+                "co": "^4.6.0",
+                "expect": "^27.5.1",
+                "is-generator-fn": "^2.0.0",
+                "jest-each": "^27.5.1",
+                "jest-matcher-utils": "^27.5.1",
+                "jest-message-util": "^27.5.1",
+                "jest-runtime": "^27.5.1",
+                "jest-snapshot": "^27.5.1",
+                "jest-util": "^27.5.1",
+                "pretty-format": "^27.5.1",
+                "throat": "^6.0.1"
+            },
+            "engines": {
+                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+            }
+        },
+        "node_modules/jest-jasmine2/node_modules/ansi-styles": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "color-convert": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/jest-jasmine2/node_modules/chalk": {
+            "version": "4.1.2",
+            "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+            "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "ansi-styles": "^4.1.0",
+                "supports-color": "^7.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/jest-jasmine2/node_modules/color-convert": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "color-name": "~1.1.4"
+            },
+            "engines": {
+                "node": ">=7.0.0"
+            }
+        },
+        "node_modules/jest-jasmine2/node_modules/color-name": {
+            "version": "1.1.4",
+            "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/jest-jasmine2/node_modules/has-flag": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/jest-jasmine2/node_modules/supports-color": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/jest-leak-detector": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/jest-leak-detector/-/jest-leak-detector-27.5.1.tgz",
+            "integrity": "sha512-POXfWAMvfU6WMUXftV4HolnJfnPOGEu10fscNCA76KBpRRhcMN2c8d3iT2pxQS3HLbA+5X4sOUPzYO2NUyIlHQ==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "jest-get-type": "^27.5.1",
+                "pretty-format": "^27.5.1"
+            },
+            "engines": {
+                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+            }
+        },
+        "node_modules/jest-matcher-utils": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz",
+            "integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "chalk": "^4.0.0",
+                "jest-diff": "^27.5.1",
+                "jest-get-type": "^27.5.1",
+                "pretty-format": "^27.5.1"
+            },
+            "engines": {
+                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+            }
+        },
+        "node_modules/jest-matcher-utils/node_modules/ansi-styles": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "color-convert": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/jest-matcher-utils/node_modules/chalk": {
+            "version": "4.1.2",
+            "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+            "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "ansi-styles": "^4.1.0",
+                "supports-color": "^7.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/jest-matcher-utils/node_modules/color-convert": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "color-name": "~1.1.4"
+            },
+            "engines": {
+                "node": ">=7.0.0"
+            }
+        },
+        "node_modules/jest-matcher-utils/node_modules/color-name": {
+            "version": "1.1.4",
+            "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/jest-matcher-utils/node_modules/has-flag": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/jest-matcher-utils/node_modules/supports-color": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/jest-message-util": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/jest-message-util/-/jest-message-util-27.5.1.tgz",
+            "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "@babel/code-frame": "^7.12.13",
+                "@jest/types": "^27.5.1",
+                "@types/stack-utils": "^2.0.0",
+                "chalk": "^4.0.0",
+                "graceful-fs": "^4.2.9",
+                "micromatch": "^4.0.4",
+                "pretty-format": "^27.5.1",
+                "slash": "^3.0.0",
+                "stack-utils": "^2.0.3"
+            },
+            "engines": {
+                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+            }
+        },
+        "node_modules/jest-message-util/node_modules/ansi-styles": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "color-convert": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/jest-message-util/node_modules/chalk": {
+            "version": "4.1.2",
+            "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+            "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "ansi-styles": "^4.1.0",
+                "supports-color": "^7.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/jest-message-util/node_modules/color-convert": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "color-name": "~1.1.4"
+            },
+            "engines": {
+                "node": ">=7.0.0"
+            }
+        },
+        "node_modules/jest-message-util/node_modules/color-name": {
+            "version": "1.1.4",
+            "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/jest-message-util/node_modules/has-flag": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/jest-message-util/node_modules/supports-color": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/jest-mock": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/jest-mock/-/jest-mock-27.5.1.tgz",
+            "integrity": "sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "@jest/types": "^27.5.1",
+                "@types/node": "*"
+            },
+            "engines": {
+                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+            }
+        },
+        "node_modules/jest-pnp-resolver": {
+            "version": "1.2.3",
+            "resolved": "https://registry.npmmirror.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
+            "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=6"
+            },
+            "peerDependencies": {
+                "jest-resolve": "*"
+            },
+            "peerDependenciesMeta": {
+                "jest-resolve": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/jest-regex-util": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/jest-regex-util/-/jest-regex-util-27.5.1.tgz",
+            "integrity": "sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+            }
+        },
+        "node_modules/jest-resolve": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/jest-resolve/-/jest-resolve-27.5.1.tgz",
+            "integrity": "sha512-FFDy8/9E6CV83IMbDpcjOhumAQPDyETnU2KZ1O98DwTnz8AOBsW/Xv3GySr1mOZdItLR+zDZ7I/UdTFbgSOVCw==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "@jest/types": "^27.5.1",
+                "chalk": "^4.0.0",
+                "graceful-fs": "^4.2.9",
+                "jest-haste-map": "^27.5.1",
+                "jest-pnp-resolver": "^1.2.2",
+                "jest-util": "^27.5.1",
+                "jest-validate": "^27.5.1",
+                "resolve": "^1.20.0",
+                "resolve.exports": "^1.1.0",
+                "slash": "^3.0.0"
+            },
+            "engines": {
+                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+            }
+        },
+        "node_modules/jest-resolve-dependencies": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.5.1.tgz",
+            "integrity": "sha512-QQOOdY4PE39iawDn5rzbIePNigfe5B9Z91GDD1ae/xNDlu9kaat8QQ5EKnNmVWPV54hUdxCVwwj6YMgR2O7IOg==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "@jest/types": "^27.5.1",
+                "jest-regex-util": "^27.5.1",
+                "jest-snapshot": "^27.5.1"
+            },
+            "engines": {
+                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+            }
+        },
+        "node_modules/jest-resolve/node_modules/ansi-styles": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "color-convert": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/jest-resolve/node_modules/chalk": {
+            "version": "4.1.2",
+            "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+            "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "ansi-styles": "^4.1.0",
+                "supports-color": "^7.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/jest-resolve/node_modules/color-convert": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "color-name": "~1.1.4"
+            },
+            "engines": {
+                "node": ">=7.0.0"
+            }
+        },
+        "node_modules/jest-resolve/node_modules/color-name": {
+            "version": "1.1.4",
+            "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/jest-resolve/node_modules/has-flag": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/jest-resolve/node_modules/supports-color": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/jest-runner": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/jest-runner/-/jest-runner-27.5.1.tgz",
+            "integrity": "sha512-g4NPsM4mFCOwFKXO4p/H/kWGdJp9V8kURY2lX8Me2drgXqG7rrZAx5kv+5H7wtt/cdFIjhqYx1HrlqWHaOvDaQ==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "@jest/console": "^27.5.1",
+                "@jest/environment": "^27.5.1",
+                "@jest/test-result": "^27.5.1",
+                "@jest/transform": "^27.5.1",
+                "@jest/types": "^27.5.1",
+                "@types/node": "*",
+                "chalk": "^4.0.0",
+                "emittery": "^0.8.1",
+                "graceful-fs": "^4.2.9",
+                "jest-docblock": "^27.5.1",
+                "jest-environment-jsdom": "^27.5.1",
+                "jest-environment-node": "^27.5.1",
+                "jest-haste-map": "^27.5.1",
+                "jest-leak-detector": "^27.5.1",
+                "jest-message-util": "^27.5.1",
+                "jest-resolve": "^27.5.1",
+                "jest-runtime": "^27.5.1",
+                "jest-util": "^27.5.1",
+                "jest-worker": "^27.5.1",
+                "source-map-support": "^0.5.6",
+                "throat": "^6.0.1"
+            },
+            "engines": {
+                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+            }
+        },
+        "node_modules/jest-runner/node_modules/ansi-styles": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "color-convert": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/jest-runner/node_modules/chalk": {
+            "version": "4.1.2",
+            "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+            "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "ansi-styles": "^4.1.0",
+                "supports-color": "^7.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/jest-runner/node_modules/color-convert": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "color-name": "~1.1.4"
+            },
+            "engines": {
+                "node": ">=7.0.0"
+            }
+        },
+        "node_modules/jest-runner/node_modules/color-name": {
+            "version": "1.1.4",
+            "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/jest-runner/node_modules/has-flag": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/jest-runner/node_modules/supports-color": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/jest-runtime": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/jest-runtime/-/jest-runtime-27.5.1.tgz",
+            "integrity": "sha512-o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "@jest/environment": "^27.5.1",
+                "@jest/fake-timers": "^27.5.1",
+                "@jest/globals": "^27.5.1",
+                "@jest/source-map": "^27.5.1",
+                "@jest/test-result": "^27.5.1",
+                "@jest/transform": "^27.5.1",
+                "@jest/types": "^27.5.1",
+                "chalk": "^4.0.0",
+                "cjs-module-lexer": "^1.0.0",
+                "collect-v8-coverage": "^1.0.0",
+                "execa": "^5.0.0",
+                "glob": "^7.1.3",
+                "graceful-fs": "^4.2.9",
+                "jest-haste-map": "^27.5.1",
+                "jest-message-util": "^27.5.1",
+                "jest-mock": "^27.5.1",
+                "jest-regex-util": "^27.5.1",
+                "jest-resolve": "^27.5.1",
+                "jest-snapshot": "^27.5.1",
+                "jest-util": "^27.5.1",
+                "slash": "^3.0.0",
+                "strip-bom": "^4.0.0"
+            },
+            "engines": {
+                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+            }
+        },
+        "node_modules/jest-runtime/node_modules/ansi-styles": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "color-convert": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/jest-runtime/node_modules/brace-expansion": {
+            "version": "1.1.11",
+            "resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.11.tgz",
+            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
+            }
+        },
+        "node_modules/jest-runtime/node_modules/chalk": {
+            "version": "4.1.2",
+            "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+            "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "ansi-styles": "^4.1.0",
+                "supports-color": "^7.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/jest-runtime/node_modules/color-convert": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "color-name": "~1.1.4"
+            },
+            "engines": {
+                "node": ">=7.0.0"
+            }
+        },
+        "node_modules/jest-runtime/node_modules/color-name": {
+            "version": "1.1.4",
+            "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/jest-runtime/node_modules/glob": {
+            "version": "7.2.3",
+            "resolved": "https://registry.npmmirror.com/glob/-/glob-7.2.3.tgz",
+            "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^3.1.1",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+            },
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/jest-runtime/node_modules/has-flag": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/jest-runtime/node_modules/minimatch": {
+            "version": "3.1.2",
+            "resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-3.1.2.tgz",
+            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "brace-expansion": "^1.1.7"
+            },
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/jest-runtime/node_modules/supports-color": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/jest-serializer": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/jest-serializer/-/jest-serializer-27.5.1.tgz",
+            "integrity": "sha512-jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "@types/node": "*",
+                "graceful-fs": "^4.2.9"
+            },
+            "engines": {
+                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+            }
+        },
+        "node_modules/jest-snapshot": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/jest-snapshot/-/jest-snapshot-27.5.1.tgz",
+            "integrity": "sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "@babel/core": "^7.7.2",
+                "@babel/generator": "^7.7.2",
+                "@babel/plugin-syntax-typescript": "^7.7.2",
+                "@babel/traverse": "^7.7.2",
+                "@babel/types": "^7.0.0",
+                "@jest/transform": "^27.5.1",
+                "@jest/types": "^27.5.1",
+                "@types/babel__traverse": "^7.0.4",
+                "@types/prettier": "^2.1.5",
+                "babel-preset-current-node-syntax": "^1.0.0",
+                "chalk": "^4.0.0",
+                "expect": "^27.5.1",
+                "graceful-fs": "^4.2.9",
+                "jest-diff": "^27.5.1",
+                "jest-get-type": "^27.5.1",
+                "jest-haste-map": "^27.5.1",
+                "jest-matcher-utils": "^27.5.1",
+                "jest-message-util": "^27.5.1",
+                "jest-util": "^27.5.1",
+                "natural-compare": "^1.4.0",
+                "pretty-format": "^27.5.1",
+                "semver": "^7.3.2"
+            },
+            "engines": {
+                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+            }
+        },
+        "node_modules/jest-snapshot/node_modules/ansi-styles": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "color-convert": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/jest-snapshot/node_modules/chalk": {
+            "version": "4.1.2",
+            "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+            "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "ansi-styles": "^4.1.0",
+                "supports-color": "^7.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/jest-snapshot/node_modules/color-convert": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "color-name": "~1.1.4"
+            },
+            "engines": {
+                "node": ">=7.0.0"
+            }
+        },
+        "node_modules/jest-snapshot/node_modules/color-name": {
+            "version": "1.1.4",
+            "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/jest-snapshot/node_modules/has-flag": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/jest-snapshot/node_modules/semver": {
+            "version": "7.6.2",
+            "resolved": "https://registry.npmmirror.com/semver/-/semver-7.6.2.tgz",
+            "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
+            "dev": true,
+            "peer": true,
+            "bin": {
+                "semver": "bin/semver.js"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/jest-snapshot/node_modules/supports-color": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/jest-util": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/jest-util/-/jest-util-27.5.1.tgz",
+            "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "@jest/types": "^27.5.1",
+                "@types/node": "*",
+                "chalk": "^4.0.0",
+                "ci-info": "^3.2.0",
+                "graceful-fs": "^4.2.9",
+                "picomatch": "^2.2.3"
+            },
+            "engines": {
+                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+            }
+        },
+        "node_modules/jest-util/node_modules/ansi-styles": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "color-convert": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/jest-util/node_modules/chalk": {
+            "version": "4.1.2",
+            "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+            "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "ansi-styles": "^4.1.0",
+                "supports-color": "^7.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/jest-util/node_modules/color-convert": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "color-name": "~1.1.4"
+            },
+            "engines": {
+                "node": ">=7.0.0"
+            }
+        },
+        "node_modules/jest-util/node_modules/color-name": {
+            "version": "1.1.4",
+            "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/jest-util/node_modules/has-flag": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/jest-util/node_modules/supports-color": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/jest-validate": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/jest-validate/-/jest-validate-27.5.1.tgz",
+            "integrity": "sha512-thkNli0LYTmOI1tDB3FI1S1RTp/Bqyd9pTarJwL87OIBFuqEb5Apv5EaApEudYg4g86e3CT6kM0RowkhtEnCBQ==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "@jest/types": "^27.5.1",
+                "camelcase": "^6.2.0",
+                "chalk": "^4.0.0",
+                "jest-get-type": "^27.5.1",
+                "leven": "^3.1.0",
+                "pretty-format": "^27.5.1"
+            },
+            "engines": {
+                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+            }
+        },
+        "node_modules/jest-validate/node_modules/ansi-styles": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "color-convert": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/jest-validate/node_modules/chalk": {
+            "version": "4.1.2",
+            "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+            "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "ansi-styles": "^4.1.0",
+                "supports-color": "^7.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/jest-validate/node_modules/color-convert": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "color-name": "~1.1.4"
+            },
+            "engines": {
+                "node": ">=7.0.0"
+            }
+        },
+        "node_modules/jest-validate/node_modules/color-name": {
+            "version": "1.1.4",
+            "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/jest-validate/node_modules/has-flag": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/jest-validate/node_modules/supports-color": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/jest-watcher": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/jest-watcher/-/jest-watcher-27.5.1.tgz",
+            "integrity": "sha512-z676SuD6Z8o8qbmEGhoEUFOM1+jfEiL3DXHK/xgEiG2EyNYfFG60jluWcupY6dATjfEsKQuibReS1djInQnoVw==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "@jest/test-result": "^27.5.1",
+                "@jest/types": "^27.5.1",
+                "@types/node": "*",
+                "ansi-escapes": "^4.2.1",
+                "chalk": "^4.0.0",
+                "jest-util": "^27.5.1",
+                "string-length": "^4.0.1"
+            },
+            "engines": {
+                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+            }
+        },
+        "node_modules/jest-watcher/node_modules/ansi-styles": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "color-convert": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/jest-watcher/node_modules/chalk": {
+            "version": "4.1.2",
+            "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+            "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "ansi-styles": "^4.1.0",
+                "supports-color": "^7.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/jest-watcher/node_modules/color-convert": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "color-name": "~1.1.4"
+            },
+            "engines": {
+                "node": ">=7.0.0"
+            }
+        },
+        "node_modules/jest-watcher/node_modules/color-name": {
+            "version": "1.1.4",
+            "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/jest-watcher/node_modules/has-flag": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/jest-watcher/node_modules/supports-color": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/jest-worker": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/jest-worker/-/jest-worker-27.5.1.tgz",
+            "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "@types/node": "*",
+                "merge-stream": "^2.0.0",
+                "supports-color": "^8.0.0"
+            },
+            "engines": {
+                "node": ">= 10.13.0"
+            }
+        },
+        "node_modules/jest-worker/node_modules/has-flag": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/jest-worker/node_modules/supports-color": {
+            "version": "8.1.1",
+            "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-8.1.1.tgz",
+            "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/jimp": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/jimp/-/jimp-0.10.3.tgz",
+            "integrity": "sha512-meVWmDMtyUG5uYjFkmzu0zBgnCvvxwWNi27c4cg55vWNVC9ES4Lcwb+ogx+uBBQE3Q+dLKjXaLl0JVW+nUNwbQ==",
+            "dependencies": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/custom": "^0.10.3",
+                "@jimp/plugins": "^0.10.3",
+                "@jimp/types": "^0.10.3",
+                "core-js": "^3.4.1",
+                "regenerator-runtime": "^0.13.3"
+            }
+        },
+        "node_modules/jiti": {
+            "version": "1.21.0",
+            "resolved": "https://registry.npmmirror.com/jiti/-/jiti-1.21.0.tgz",
+            "integrity": "sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==",
+            "dev": true,
+            "bin": {
+                "jiti": "bin/jiti.js"
+            }
+        },
+        "node_modules/jpeg-js": {
+            "version": "0.3.7",
+            "resolved": "https://registry.npmmirror.com/jpeg-js/-/jpeg-js-0.3.7.tgz",
+            "integrity": "sha512-9IXdWudL61npZjvLuVe/ktHiA41iE8qFyLB+4VDTblEsWBzeg8WQTlktdUK4CdncUqtUgUg0bbOmTE2bKBKaBQ=="
+        },
+        "node_modules/js-tokens": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmmirror.com/js-tokens/-/js-tokens-4.0.0.tgz",
+            "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
+        },
+        "node_modules/js-yaml": {
+            "version": "3.14.1",
+            "resolved": "https://registry.npmmirror.com/js-yaml/-/js-yaml-3.14.1.tgz",
+            "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "argparse": "^1.0.7",
+                "esprima": "^4.0.0"
+            },
+            "bin": {
+                "js-yaml": "bin/js-yaml.js"
+            }
+        },
+        "node_modules/jsdom": {
+            "version": "16.7.0",
+            "resolved": "https://registry.npmmirror.com/jsdom/-/jsdom-16.7.0.tgz",
+            "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "abab": "^2.0.5",
+                "acorn": "^8.2.4",
+                "acorn-globals": "^6.0.0",
+                "cssom": "^0.4.4",
+                "cssstyle": "^2.3.0",
+                "data-urls": "^2.0.0",
+                "decimal.js": "^10.2.1",
+                "domexception": "^2.0.1",
+                "escodegen": "^2.0.0",
+                "form-data": "^3.0.0",
+                "html-encoding-sniffer": "^2.0.1",
+                "http-proxy-agent": "^4.0.1",
+                "https-proxy-agent": "^5.0.0",
+                "is-potential-custom-element-name": "^1.0.1",
+                "nwsapi": "^2.2.0",
+                "parse5": "6.0.1",
+                "saxes": "^5.0.1",
+                "symbol-tree": "^3.2.4",
+                "tough-cookie": "^4.0.0",
+                "w3c-hr-time": "^1.0.2",
+                "w3c-xmlserializer": "^2.0.0",
+                "webidl-conversions": "^6.1.0",
+                "whatwg-encoding": "^1.0.5",
+                "whatwg-mimetype": "^2.3.0",
+                "whatwg-url": "^8.5.0",
+                "ws": "^7.4.6",
+                "xml-name-validator": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "peerDependencies": {
+                "canvas": "^2.5.0"
+            },
+            "peerDependenciesMeta": {
+                "canvas": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/jsdom/node_modules/ws": {
+            "version": "7.5.9",
+            "resolved": "https://registry.npmmirror.com/ws/-/ws-7.5.9.tgz",
+            "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=8.3.0"
+            },
+            "peerDependencies": {
+                "bufferutil": "^4.0.1",
+                "utf-8-validate": "^5.0.2"
+            },
+            "peerDependenciesMeta": {
+                "bufferutil": {
+                    "optional": true
+                },
+                "utf-8-validate": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/jsesc": {
+            "version": "2.5.2",
+            "resolved": "https://registry.npmmirror.com/jsesc/-/jsesc-2.5.2.tgz",
+            "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+            "bin": {
+                "jsesc": "bin/jsesc"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/json-parse-even-better-errors": {
+            "version": "2.3.1",
+            "resolved": "https://registry.npmmirror.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+            "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/json5": {
+            "version": "2.2.3",
+            "resolved": "https://registry.npmmirror.com/json5/-/json5-2.2.3.tgz",
+            "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+            "bin": {
+                "json5": "lib/cli.js"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/jsonc-parser": {
+            "version": "3.2.1",
+            "resolved": "https://registry.npmmirror.com/jsonc-parser/-/jsonc-parser-3.2.1.tgz",
+            "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA=="
+        },
+        "node_modules/jsonfile": {
+            "version": "6.1.0",
+            "resolved": "https://registry.npmmirror.com/jsonfile/-/jsonfile-6.1.0.tgz",
+            "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+            "dependencies": {
+                "universalify": "^2.0.0"
+            },
+            "optionalDependencies": {
+                "graceful-fs": "^4.1.6"
+            }
+        },
+        "node_modules/kleur": {
+            "version": "3.0.3",
+            "resolved": "https://registry.npmmirror.com/kleur/-/kleur-3.0.3.tgz",
+            "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/kolorist": {
+            "version": "1.8.0",
+            "resolved": "https://registry.npmmirror.com/kolorist/-/kolorist-1.8.0.tgz",
+            "integrity": "sha512-Y+60/zizpJ3HRH8DCss+q95yr6145JXZo46OTpFvDZWLfRCE4qChOyk1b26nMaNpfHHgxagk9dXT5OP0Tfe+dQ==",
+            "dev": true
+        },
+        "node_modules/lcid": {
+            "version": "3.1.1",
+            "resolved": "https://registry.npmmirror.com/lcid/-/lcid-3.1.1.tgz",
+            "integrity": "sha512-M6T051+5QCGLBQb8id3hdvIW8+zeFV2FyBGFS9IEK5H9Wt4MueD4bW1eWikpHgZp+5xR3l5c8pZUkQsIA0BFZg==",
+            "dependencies": {
+                "invert-kv": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/leven": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmmirror.com/leven/-/leven-3.1.0.tgz",
+            "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/licia": {
+            "version": "1.39.2",
+            "resolved": "https://registry.npmmirror.com/licia/-/licia-1.39.2.tgz",
+            "integrity": "sha512-4pte7gXufSAa3JcsR0iT+2Lj2RX5Qpj+Nc0n84xs0ynNmw7eJmeZzk2oPTEtsQqwHwtT+NiX0arGkL5HPjTs7g=="
+        },
+        "node_modules/lilconfig": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmmirror.com/lilconfig/-/lilconfig-2.1.0.tgz",
+            "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==",
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/lines-and-columns": {
+            "version": "1.2.4",
+            "resolved": "https://registry.npmmirror.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+            "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/load-bmfont": {
+            "version": "1.4.1",
+            "resolved": "https://registry.npmmirror.com/load-bmfont/-/load-bmfont-1.4.1.tgz",
+            "integrity": "sha512-8UyQoYmdRDy81Brz6aLAUhfZLwr5zV0L3taTQ4hju7m6biuwiWiJXjPhBJxbUQJA8PrkvJ/7Enqmwk2sM14soA==",
+            "dependencies": {
+                "buffer-equal": "0.0.1",
+                "mime": "^1.3.4",
+                "parse-bmfont-ascii": "^1.0.3",
+                "parse-bmfont-binary": "^1.0.5",
+                "parse-bmfont-xml": "^1.1.4",
+                "phin": "^2.9.1",
+                "xhr": "^2.0.1",
+                "xtend": "^4.0.0"
+            }
+        },
+        "node_modules/load-bmfont/node_modules/mime": {
+            "version": "1.6.0",
+            "resolved": "https://registry.npmmirror.com/mime/-/mime-1.6.0.tgz",
+            "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+            "bin": {
+                "mime": "cli.js"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/loader-utils": {
+            "version": "3.2.1",
+            "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-3.2.1.tgz",
+            "integrity": "sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==",
+            "engines": {
+                "node": ">= 12.13.0"
+            }
+        },
+        "node_modules/localstorage-polyfill": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmmirror.com/localstorage-polyfill/-/localstorage-polyfill-1.0.1.tgz",
+            "integrity": "sha512-m4iHVZxFH5734oQcPKU08025gIz2+4bjWR9lulP8ZYxEJR0BpA0w32oJmkzh8y3UI9ci7xCBehQDc3oA1X+VHw==",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/locate-path": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmmirror.com/locate-path/-/locate-path-5.0.0.tgz",
+            "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+            "dependencies": {
+                "p-locate": "^4.1.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/lodash": {
+            "version": "4.17.21",
+            "resolved": "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz",
+            "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+            "dev": true
+        },
+        "node_modules/lodash-es": {
+            "version": "4.17.21",
+            "resolved": "https://registry.npmmirror.com/lodash-es/-/lodash-es-4.17.21.tgz",
+            "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
+        },
+        "node_modules/lodash.camelcase": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmmirror.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
+            "integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA=="
+        },
+        "node_modules/lodash.debounce": {
+            "version": "4.0.8",
+            "resolved": "https://registry.npmmirror.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
+            "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==",
+            "dev": true
+        },
+        "node_modules/lru-cache": {
+            "version": "5.1.1",
+            "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-5.1.1.tgz",
+            "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+            "dependencies": {
+                "yallist": "^3.0.2"
+            }
+        },
+        "node_modules/magic-string": {
+            "version": "0.30.10",
+            "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.30.10.tgz",
+            "integrity": "sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==",
+            "dependencies": {
+                "@jridgewell/sourcemap-codec": "^1.4.15"
+            }
+        },
+        "node_modules/make-dir": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmmirror.com/make-dir/-/make-dir-4.0.0.tgz",
+            "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "semver": "^7.5.3"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/make-dir/node_modules/semver": {
+            "version": "7.6.2",
+            "resolved": "https://registry.npmmirror.com/semver/-/semver-7.6.2.tgz",
+            "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
+            "dev": true,
+            "peer": true,
+            "bin": {
+                "semver": "bin/semver.js"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/makeerror": {
+            "version": "1.0.12",
+            "resolved": "https://registry.npmmirror.com/makeerror/-/makeerror-1.0.12.tgz",
+            "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "tmpl": "1.0.5"
+            }
+        },
+        "node_modules/media-typer": {
+            "version": "0.3.0",
+            "resolved": "https://registry.npmmirror.com/media-typer/-/media-typer-0.3.0.tgz",
+            "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/merge": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmmirror.com/merge/-/merge-2.1.1.tgz",
+            "integrity": "sha512-jz+Cfrg9GWOZbQAnDQ4hlVnQky+341Yk5ru8bZSe6sIDTCIg8n9i/u7hSQGSVOF3C7lH6mGtqjkiT9G4wFLL0w=="
+        },
+        "node_modules/merge-descriptors": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmmirror.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+            "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==",
+            "dev": true
+        },
+        "node_modules/merge-stream": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/merge-stream/-/merge-stream-2.0.0.tgz",
+            "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+            "dev": true
+        },
+        "node_modules/merge2": {
+            "version": "1.4.1",
+            "resolved": "https://registry.npmmirror.com/merge2/-/merge2-1.4.1.tgz",
+            "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/methods": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmmirror.com/methods/-/methods-1.1.2.tgz",
+            "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/micromatch": {
+            "version": "4.0.5",
+            "resolved": "https://registry.npmmirror.com/micromatch/-/micromatch-4.0.5.tgz",
+            "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+            "dependencies": {
+                "braces": "^3.0.2",
+                "picomatch": "^2.3.1"
+            },
+            "engines": {
+                "node": ">=8.6"
+            }
+        },
+        "node_modules/mime": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmmirror.com/mime/-/mime-3.0.0.tgz",
+            "integrity": "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==",
+            "bin": {
+                "mime": "cli.js"
+            },
+            "engines": {
+                "node": ">=10.0.0"
+            }
+        },
+        "node_modules/mime-db": {
+            "version": "1.52.0",
+            "resolved": "https://registry.npmmirror.com/mime-db/-/mime-db-1.52.0.tgz",
+            "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/mime-types": {
+            "version": "2.1.35",
+            "resolved": "https://registry.npmmirror.com/mime-types/-/mime-types-2.1.35.tgz",
+            "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+            "dev": true,
+            "dependencies": {
+                "mime-db": "1.52.0"
+            },
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/mimic-fn": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmmirror.com/mimic-fn/-/mimic-fn-2.1.0.tgz",
+            "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+            "dev": true,
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/min-document": {
+            "version": "2.19.0",
+            "resolved": "https://registry.npmmirror.com/min-document/-/min-document-2.19.0.tgz",
+            "integrity": "sha512-9Wy1B3m3f66bPPmU5hdA4DR4PB2OfDU/+GS3yAB7IQozE3tqXaVv2zOjgla7MEGSRv95+ILmOuvhLkOK6wJtCQ==",
+            "dependencies": {
+                "dom-walk": "^0.1.0"
+            }
+        },
+        "node_modules/minimatch": {
+            "version": "5.1.6",
+            "resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-5.1.6.tgz",
+            "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+            "dev": true,
+            "dependencies": {
+                "brace-expansion": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/minimist": {
+            "version": "1.2.8",
+            "resolved": "https://registry.npmmirror.com/minimist/-/minimist-1.2.8.tgz",
+            "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA=="
+        },
+        "node_modules/mkdirp": {
+            "version": "0.5.6",
+            "resolved": "https://registry.npmmirror.com/mkdirp/-/mkdirp-0.5.6.tgz",
+            "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+            "dependencies": {
+                "minimist": "^1.2.6"
+            },
+            "bin": {
+                "mkdirp": "bin/cmd.js"
+            }
+        },
+        "node_modules/module-alias": {
+            "version": "2.2.3",
+            "resolved": "https://registry.npmmirror.com/module-alias/-/module-alias-2.2.3.tgz",
+            "integrity": "sha512-23g5BFj4zdQL/b6tor7Ji+QY4pEfNH784BMslY9Qb0UnJWRAt+lQGLYmRaM0KDBwIG23ffEBELhZDP2rhi9f/Q=="
+        },
+        "node_modules/ms": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.2.tgz",
+            "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+        },
+        "node_modules/muggle-string": {
+            "version": "0.3.1",
+            "resolved": "https://registry.npmmirror.com/muggle-string/-/muggle-string-0.3.1.tgz",
+            "integrity": "sha512-ckmWDJjphvd/FvZawgygcUeQCxzvohjFO5RxTjj4eq8kw359gFF3E1brjfI+viLMxss5JrHTDRHZvu2/tuy0Qg==",
+            "dev": true
+        },
+        "node_modules/nanoid": {
+            "version": "3.3.7",
+            "resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.7.tgz",
+            "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+            "bin": {
+                "nanoid": "bin/nanoid.cjs"
+            },
+            "engines": {
+                "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+            }
+        },
+        "node_modules/natural-compare": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmmirror.com/natural-compare/-/natural-compare-1.4.0.tgz",
+            "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/negotiator": {
+            "version": "0.6.3",
+            "resolved": "https://registry.npmmirror.com/negotiator/-/negotiator-0.6.3.tgz",
+            "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/node-int64": {
+            "version": "0.4.0",
+            "resolved": "https://registry.npmmirror.com/node-int64/-/node-int64-0.4.0.tgz",
+            "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/node-releases": {
+            "version": "2.0.18",
+            "resolved": "https://registry.npmmirror.com/node-releases/-/node-releases-2.0.18.tgz",
+            "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g=="
+        },
+        "node_modules/normalize-path": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmmirror.com/normalize-path/-/normalize-path-3.0.0.tgz",
+            "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/normalize-range": {
+            "version": "0.1.2",
+            "resolved": "https://registry.npmmirror.com/normalize-range/-/normalize-range-0.1.2.tgz",
+            "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/npm-run-path": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmmirror.com/npm-run-path/-/npm-run-path-4.0.1.tgz",
+            "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+            "dev": true,
+            "dependencies": {
+                "path-key": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/nwsapi": {
+            "version": "2.2.10",
+            "resolved": "https://registry.npmmirror.com/nwsapi/-/nwsapi-2.2.10.tgz",
+            "integrity": "sha512-QK0sRs7MKv0tKe1+5uZIQk/C8XGza4DAnztJG8iD+TpJIORARrCxczA738awHrZoHeTjSSoHqao2teO0dC/gFQ==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/object-inspect": {
+            "version": "1.13.1",
+            "resolved": "https://registry.npmmirror.com/object-inspect/-/object-inspect-1.13.1.tgz",
+            "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==",
+            "dev": true
+        },
+        "node_modules/omggif": {
+            "version": "1.0.10",
+            "resolved": "https://registry.npmmirror.com/omggif/-/omggif-1.0.10.tgz",
+            "integrity": "sha512-LMJTtvgc/nugXj0Vcrrs68Mn2D1r0zf630VNtqtpI1FEO7e+O9FP4gqs9AcnBaSEeoHIPm28u6qgPR0oyEpGSw=="
+        },
+        "node_modules/on-finished": {
+            "version": "2.4.1",
+            "resolved": "https://registry.npmmirror.com/on-finished/-/on-finished-2.4.1.tgz",
+            "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+            "dev": true,
+            "dependencies": {
+                "ee-first": "1.1.1"
+            },
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/once": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmmirror.com/once/-/once-1.4.0.tgz",
+            "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+            "dev": true,
+            "dependencies": {
+                "wrappy": "1"
+            }
+        },
+        "node_modules/onetime": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmmirror.com/onetime/-/onetime-5.1.2.tgz",
+            "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+            "dev": true,
+            "dependencies": {
+                "mimic-fn": "^2.1.0"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/os-locale-s-fix": {
+            "version": "1.0.8-fix-1",
+            "resolved": "https://registry.npmmirror.com/os-locale-s-fix/-/os-locale-s-fix-1.0.8-fix-1.tgz",
+            "integrity": "sha512-Sv0OvhPiMutICiwORAUefv02DCPb62IelBmo8ZsSrRHyI3FStqIWZvjqDkvtjU+lcujo7UNir+dCwKSqlEQ/5w==",
+            "dependencies": {
+                "lcid": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=10",
+                "yarn": "^1.22.4"
+            }
+        },
+        "node_modules/p-limit": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmmirror.com/p-limit/-/p-limit-2.3.0.tgz",
+            "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+            "dependencies": {
+                "p-try": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/p-locate": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmmirror.com/p-locate/-/p-locate-4.1.0.tgz",
+            "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+            "dependencies": {
+                "p-limit": "^2.2.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/p-try": {
+            "version": "2.2.0",
+            "resolved": "https://registry.npmmirror.com/p-try/-/p-try-2.2.0.tgz",
+            "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/pako": {
+            "version": "1.0.11",
+            "resolved": "https://registry.npmmirror.com/pako/-/pako-1.0.11.tgz",
+            "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
+        },
+        "node_modules/parse-bmfont-ascii": {
+            "version": "1.0.6",
+            "resolved": "https://registry.npmmirror.com/parse-bmfont-ascii/-/parse-bmfont-ascii-1.0.6.tgz",
+            "integrity": "sha512-U4RrVsUFCleIOBsIGYOMKjn9PavsGOXxbvYGtMOEfnId0SVNsgehXh1DxUdVPLoxd5mvcEtvmKs2Mmf0Mpa1ZA=="
+        },
+        "node_modules/parse-bmfont-binary": {
+            "version": "1.0.6",
+            "resolved": "https://registry.npmmirror.com/parse-bmfont-binary/-/parse-bmfont-binary-1.0.6.tgz",
+            "integrity": "sha512-GxmsRea0wdGdYthjuUeWTMWPqm2+FAd4GI8vCvhgJsFnoGhTrLhXDDupwTo7rXVAgaLIGoVHDZS9p/5XbSqeWA=="
+        },
+        "node_modules/parse-bmfont-xml": {
+            "version": "1.1.6",
+            "resolved": "https://registry.npmmirror.com/parse-bmfont-xml/-/parse-bmfont-xml-1.1.6.tgz",
+            "integrity": "sha512-0cEliVMZEhrFDwMh4SxIyVJpqYoOWDJ9P895tFuS+XuNzI5UBmBk5U5O4KuJdTnZpSBI4LFA2+ZiJaiwfSwlMA==",
+            "dependencies": {
+                "xml-parse-from-string": "^1.0.0",
+                "xml2js": "^0.5.0"
+            }
+        },
+        "node_modules/parse-css-font": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmmirror.com/parse-css-font/-/parse-css-font-4.0.0.tgz",
+            "integrity": "sha512-lnY7dTUfjRXsSo5G5C639L8RaBBaVSgL+5hacIFKsNHzeCJQ5SFSZv1DZmc7+wZv/22PFGOq2YbaEHLdaCS/mQ==",
+            "dependencies": {
+                "css-font-size-keywords": "^1.0.0",
+                "css-font-stretch-keywords": "^1.0.1",
+                "css-font-style-keywords": "^1.0.1",
+                "css-font-weight-keywords": "^1.0.0",
+                "css-list-helpers": "^2.0.0",
+                "css-system-font-keywords": "^1.0.0",
+                "unquote": "^1.1.1"
+            }
+        },
+        "node_modules/parse-headers": {
+            "version": "2.0.5",
+            "resolved": "https://registry.npmmirror.com/parse-headers/-/parse-headers-2.0.5.tgz",
+            "integrity": "sha512-ft3iAoLOB/MlwbNXgzy43SWGP6sQki2jQvAyBg/zDFAgr9bfNWZIUj42Kw2eJIl8kEi4PbgE6U1Zau/HwI75HA=="
+        },
+        "node_modules/parse-json": {
+            "version": "5.2.0",
+            "resolved": "https://registry.npmmirror.com/parse-json/-/parse-json-5.2.0.tgz",
+            "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "@babel/code-frame": "^7.0.0",
+                "error-ex": "^1.3.1",
+                "json-parse-even-better-errors": "^2.3.0",
+                "lines-and-columns": "^1.1.6"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/parse5": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmmirror.com/parse5/-/parse5-6.0.1.tgz",
+            "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/parseurl": {
+            "version": "1.3.3",
+            "resolved": "https://registry.npmmirror.com/parseurl/-/parseurl-1.3.3.tgz",
+            "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/path-browserify": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmmirror.com/path-browserify/-/path-browserify-1.0.1.tgz",
+            "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==",
+            "dev": true
+        },
+        "node_modules/path-exists": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmmirror.com/path-exists/-/path-exists-4.0.0.tgz",
+            "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/path-is-absolute": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmmirror.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+            "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/path-key": {
+            "version": "3.1.1",
+            "resolved": "https://registry.npmmirror.com/path-key/-/path-key-3.1.1.tgz",
+            "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/path-parse": {
+            "version": "1.0.7",
+            "resolved": "https://registry.npmmirror.com/path-parse/-/path-parse-1.0.7.tgz",
+            "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
+        },
+        "node_modules/path-to-regexp": {
+            "version": "0.1.7",
+            "resolved": "https://registry.npmmirror.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+            "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==",
+            "dev": true
+        },
+        "node_modules/pathe": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmmirror.com/pathe/-/pathe-1.1.2.tgz",
+            "integrity": "sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==",
+            "dev": true
+        },
+        "node_modules/phin": {
+            "version": "2.9.3",
+            "resolved": "https://registry.npmmirror.com/phin/-/phin-2.9.3.tgz",
+            "integrity": "sha512-CzFr90qM24ju5f88quFC/6qohjC144rehe5n6DH900lgXmUe86+xCKc10ev56gRKC4/BkHUoG4uSiQgBiIXwDA==",
+            "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info."
+        },
+        "node_modules/picocolors": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmmirror.com/picocolors/-/picocolors-1.1.1.tgz",
+            "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="
+        },
+        "node_modules/picomatch": {
+            "version": "2.3.1",
+            "resolved": "https://registry.npmmirror.com/picomatch/-/picomatch-2.3.1.tgz",
+            "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+            "engines": {
+                "node": ">=8.6"
+            }
+        },
+        "node_modules/pify": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmmirror.com/pify/-/pify-2.3.0.tgz",
+            "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/pinia": {
+            "version": "2.0.36",
+            "resolved": "https://registry.npmmirror.com/pinia/-/pinia-2.0.36.tgz",
+            "integrity": "sha512-4UKApwjlmJH+VuHKgA+zQMddcCb3ezYnyewQ9NVrsDqZ/j9dMv5+rh+1r48whKNdpFkZAWVxhBp5ewYaYX9JcQ==",
+            "dependencies": {
+                "@vue/devtools-api": "^6.5.0",
+                "vue-demi": "*"
+            },
+            "peerDependencies": {
+                "@vue/composition-api": "^1.4.0",
+                "typescript": ">=4.4.4",
+                "vue": "^2.6.14 || ^3.2.0"
+            },
+            "peerDependenciesMeta": {
+                "@vue/composition-api": {
+                    "optional": true
+                },
+                "typescript": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/pinia/node_modules/vue-demi": {
+            "version": "0.14.7",
+            "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.7.tgz",
+            "integrity": "sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA==",
+            "hasInstallScript": true,
+            "bin": {
+                "vue-demi-fix": "bin/vue-demi-fix.js",
+                "vue-demi-switch": "bin/vue-demi-switch.js"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "peerDependencies": {
+                "@vue/composition-api": "^1.0.0-rc.1",
+                "vue": "^3.0.0-0 || ^2.6.0"
+            },
+            "peerDependenciesMeta": {
+                "@vue/composition-api": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/pirates": {
+            "version": "4.0.6",
+            "resolved": "https://registry.npmmirror.com/pirates/-/pirates-4.0.6.tgz",
+            "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/pixelmatch": {
+            "version": "4.0.2",
+            "resolved": "https://registry.npmmirror.com/pixelmatch/-/pixelmatch-4.0.2.tgz",
+            "integrity": "sha512-J8B6xqiO37sU/gkcMglv6h5Jbd9xNER7aHzpfRdNmV4IbQBzBpe4l9XmbG+xPF/znacgu2jfEw+wHffaq/YkXA==",
+            "dependencies": {
+                "pngjs": "^3.0.0"
+            },
+            "bin": {
+                "pixelmatch": "bin/pixelmatch"
+            }
+        },
+        "node_modules/pkg-dir": {
+            "version": "4.2.0",
+            "resolved": "https://registry.npmmirror.com/pkg-dir/-/pkg-dir-4.2.0.tgz",
+            "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "find-up": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/pngjs": {
+            "version": "3.4.0",
+            "resolved": "https://registry.npmmirror.com/pngjs/-/pngjs-3.4.0.tgz",
+            "integrity": "sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==",
+            "engines": {
+                "node": ">=4.0.0"
+            }
+        },
+        "node_modules/postcss": {
+            "version": "8.4.38",
+            "resolved": "https://registry.npmmirror.com/postcss/-/postcss-8.4.38.tgz",
+            "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==",
+            "dependencies": {
+                "nanoid": "^3.3.7",
+                "picocolors": "^1.0.0",
+                "source-map-js": "^1.2.0"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >=14"
+            }
+        },
+        "node_modules/postcss-import": {
+            "version": "14.1.0",
+            "resolved": "https://registry.npmmirror.com/postcss-import/-/postcss-import-14.1.0.tgz",
+            "integrity": "sha512-flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw==",
+            "dependencies": {
+                "postcss-value-parser": "^4.0.0",
+                "read-cache": "^1.0.0",
+                "resolve": "^1.1.7"
+            },
+            "engines": {
+                "node": ">=10.0.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.0.0"
+            }
+        },
+        "node_modules/postcss-load-config": {
+            "version": "3.1.4",
+            "resolved": "https://registry.npmmirror.com/postcss-load-config/-/postcss-load-config-3.1.4.tgz",
+            "integrity": "sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==",
+            "dependencies": {
+                "lilconfig": "^2.0.5",
+                "yaml": "^1.10.2"
+            },
+            "engines": {
+                "node": ">= 10"
+            },
+            "peerDependencies": {
+                "postcss": ">=8.0.9",
+                "ts-node": ">=9.0.0"
+            },
+            "peerDependenciesMeta": {
+                "postcss": {
+                    "optional": true
+                },
+                "ts-node": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/postcss-modules": {
+            "version": "4.3.1",
+            "resolved": "https://registry.npmmirror.com/postcss-modules/-/postcss-modules-4.3.1.tgz",
+            "integrity": "sha512-ItUhSUxBBdNamkT3KzIZwYNNRFKmkJrofvC2nWab3CPKhYBQ1f27XXh1PAPE27Psx58jeelPsxWB/+og+KEH0Q==",
+            "dependencies": {
+                "generic-names": "^4.0.0",
+                "icss-replace-symbols": "^1.1.0",
+                "lodash.camelcase": "^4.3.0",
+                "postcss-modules-extract-imports": "^3.0.0",
+                "postcss-modules-local-by-default": "^4.0.0",
+                "postcss-modules-scope": "^3.0.0",
+                "postcss-modules-values": "^4.0.0",
+                "string-hash": "^1.1.1"
+            },
+            "peerDependencies": {
+                "postcss": "^8.0.0"
+            }
+        },
+        "node_modules/postcss-modules-extract-imports": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmmirror.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz",
+            "integrity": "sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q==",
+            "engines": {
+                "node": "^10 || ^12 || >= 14"
+            },
+            "peerDependencies": {
+                "postcss": "^8.1.0"
+            }
+        },
+        "node_modules/postcss-modules-local-by-default": {
+            "version": "4.0.5",
+            "resolved": "https://registry.npmmirror.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.5.tgz",
+            "integrity": "sha512-6MieY7sIfTK0hYfafw1OMEG+2bg8Q1ocHCpoWLqOKj3JXlKu4G7btkmM/B7lFubYkYWmRSPLZi5chid63ZaZYw==",
+            "dependencies": {
+                "icss-utils": "^5.0.0",
+                "postcss-selector-parser": "^6.0.2",
+                "postcss-value-parser": "^4.1.0"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >= 14"
+            },
+            "peerDependencies": {
+                "postcss": "^8.1.0"
+            }
+        },
+        "node_modules/postcss-modules-scope": {
+            "version": "3.2.0",
+            "resolved": "https://registry.npmmirror.com/postcss-modules-scope/-/postcss-modules-scope-3.2.0.tgz",
+            "integrity": "sha512-oq+g1ssrsZOsx9M96c5w8laRmvEu9C3adDSjI8oTcbfkrTE8hx/zfyobUoWIxaKPO8bt6S62kxpw5GqypEw1QQ==",
+            "dependencies": {
+                "postcss-selector-parser": "^6.0.4"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >= 14"
+            },
+            "peerDependencies": {
+                "postcss": "^8.1.0"
+            }
+        },
+        "node_modules/postcss-modules-values": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmmirror.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
+            "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
+            "dependencies": {
+                "icss-utils": "^5.0.0"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >= 14"
+            },
+            "peerDependencies": {
+                "postcss": "^8.1.0"
+            }
+        },
+        "node_modules/postcss-selector-parser": {
+            "version": "6.0.16",
+            "resolved": "https://registry.npmmirror.com/postcss-selector-parser/-/postcss-selector-parser-6.0.16.tgz",
+            "integrity": "sha512-A0RVJrX+IUkVZbW3ClroRWurercFhieevHB38sr2+l9eUClMqome3LmEmnhlNy+5Mr2EYN6B2Kaw9wYdd+VHiw==",
+            "dependencies": {
+                "cssesc": "^3.0.0",
+                "util-deprecate": "^1.0.2"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/postcss-value-parser": {
+            "version": "4.2.0",
+            "resolved": "https://registry.npmmirror.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+            "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
+        },
+        "node_modules/pretty-format": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/pretty-format/-/pretty-format-27.5.1.tgz",
+            "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "ansi-regex": "^5.0.1",
+                "ansi-styles": "^5.0.0",
+                "react-is": "^17.0.1"
+            },
+            "engines": {
+                "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+            }
+        },
+        "node_modules/pretty-format/node_modules/ansi-styles": {
+            "version": "5.2.0",
+            "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-5.2.0.tgz",
+            "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/process": {
+            "version": "0.11.10",
+            "resolved": "https://registry.npmmirror.com/process/-/process-0.11.10.tgz",
+            "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
+            "engines": {
+                "node": ">= 0.6.0"
+            }
+        },
+        "node_modules/prompts": {
+            "version": "2.4.2",
+            "resolved": "https://registry.npmmirror.com/prompts/-/prompts-2.4.2.tgz",
+            "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "kleur": "^3.0.3",
+                "sisteransi": "^1.0.5"
+            },
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/proxy-addr": {
+            "version": "2.0.7",
+            "resolved": "https://registry.npmmirror.com/proxy-addr/-/proxy-addr-2.0.7.tgz",
+            "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
+            "dev": true,
+            "dependencies": {
+                "forwarded": "0.2.0",
+                "ipaddr.js": "1.9.1"
+            },
+            "engines": {
+                "node": ">= 0.10"
+            }
+        },
+        "node_modules/psl": {
+            "version": "1.9.0",
+            "resolved": "https://registry.npmmirror.com/psl/-/psl-1.9.0.tgz",
+            "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/punycode": {
+            "version": "2.3.1",
+            "resolved": "https://registry.npmmirror.com/punycode/-/punycode-2.3.1.tgz",
+            "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/qrcode": {
+            "version": "1.5.3",
+            "resolved": "https://registry.npmmirror.com/qrcode/-/qrcode-1.5.3.tgz",
+            "integrity": "sha512-puyri6ApkEHYiVl4CFzo1tDkAZ+ATcnbJrJ6RiBM1Fhctdn/ix9MTE3hRph33omisEbC/2fcfemsseiKgBPKZg==",
+            "dependencies": {
+                "dijkstrajs": "^1.0.1",
+                "encode-utf8": "^1.0.3",
+                "pngjs": "^5.0.0",
+                "yargs": "^15.3.1"
+            },
+            "bin": {
+                "qrcode": "bin/qrcode"
+            },
+            "engines": {
+                "node": ">=10.13.0"
+            }
+        },
+        "node_modules/qrcode-reader": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmmirror.com/qrcode-reader/-/qrcode-reader-1.0.4.tgz",
+            "integrity": "sha512-rRjALGNh9zVqvweg1j5OKIQKNsw3bLC+7qwlnead5K/9cb1cEIAGkwikt/09U0K+2IDWGD9CC6SP7tHAjUeqvQ=="
+        },
+        "node_modules/qrcode-terminal": {
+            "version": "0.12.0",
+            "resolved": "https://registry.npmmirror.com/qrcode-terminal/-/qrcode-terminal-0.12.0.tgz",
+            "integrity": "sha512-EXtzRZmC+YGmGlDFbXKxQiMZNwCLEO6BANKXG4iCtSIM0yqc/pappSx3RIKr4r0uh5JsBckOXeKrB3Iz7mdQpQ==",
+            "bin": {
+                "qrcode-terminal": "bin/qrcode-terminal.js"
+            }
+        },
+        "node_modules/qrcode/node_modules/ansi-styles": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+            "dependencies": {
+                "color-convert": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/qrcode/node_modules/camelcase": {
+            "version": "5.3.1",
+            "resolved": "https://registry.npmmirror.com/camelcase/-/camelcase-5.3.1.tgz",
+            "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/qrcode/node_modules/cliui": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmmirror.com/cliui/-/cliui-6.0.0.tgz",
+            "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+            "dependencies": {
+                "string-width": "^4.2.0",
+                "strip-ansi": "^6.0.0",
+                "wrap-ansi": "^6.2.0"
+            }
+        },
+        "node_modules/qrcode/node_modules/color-convert": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+            "dependencies": {
+                "color-name": "~1.1.4"
+            },
+            "engines": {
+                "node": ">=7.0.0"
+            }
+        },
+        "node_modules/qrcode/node_modules/color-name": {
+            "version": "1.1.4",
+            "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+        },
+        "node_modules/qrcode/node_modules/pngjs": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmmirror.com/pngjs/-/pngjs-5.0.0.tgz",
+            "integrity": "sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw==",
+            "engines": {
+                "node": ">=10.13.0"
+            }
+        },
+        "node_modules/qrcode/node_modules/wrap-ansi": {
+            "version": "6.2.0",
+            "resolved": "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+            "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+            "dependencies": {
+                "ansi-styles": "^4.0.0",
+                "string-width": "^4.1.0",
+                "strip-ansi": "^6.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/qrcode/node_modules/y18n": {
+            "version": "4.0.3",
+            "resolved": "https://registry.npmmirror.com/y18n/-/y18n-4.0.3.tgz",
+            "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ=="
+        },
+        "node_modules/qrcode/node_modules/yargs": {
+            "version": "15.4.1",
+            "resolved": "https://registry.npmmirror.com/yargs/-/yargs-15.4.1.tgz",
+            "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+            "dependencies": {
+                "cliui": "^6.0.0",
+                "decamelize": "^1.2.0",
+                "find-up": "^4.1.0",
+                "get-caller-file": "^2.0.1",
+                "require-directory": "^2.1.1",
+                "require-main-filename": "^2.0.0",
+                "set-blocking": "^2.0.0",
+                "string-width": "^4.2.0",
+                "which-module": "^2.0.0",
+                "y18n": "^4.0.0",
+                "yargs-parser": "^18.1.2"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/qrcode/node_modules/yargs-parser": {
+            "version": "18.1.3",
+            "resolved": "https://registry.npmmirror.com/yargs-parser/-/yargs-parser-18.1.3.tgz",
+            "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+            "dependencies": {
+                "camelcase": "^5.0.0",
+                "decamelize": "^1.2.0"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/qs": {
+            "version": "6.7.0",
+            "resolved": "https://registry.npmmirror.com/qs/-/qs-6.7.0.tgz",
+            "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
+            "engines": {
+                "node": ">=0.6"
+            }
+        },
+        "node_modules/querystringify": {
+            "version": "2.2.0",
+            "resolved": "https://registry.npmmirror.com/querystringify/-/querystringify-2.2.0.tgz",
+            "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/queue-microtask": {
+            "version": "1.2.3",
+            "resolved": "https://registry.npmmirror.com/queue-microtask/-/queue-microtask-1.2.3.tgz",
+            "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="
+        },
+        "node_modules/range-parser": {
+            "version": "1.2.1",
+            "resolved": "https://registry.npmmirror.com/range-parser/-/range-parser-1.2.1.tgz",
+            "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/raw-body": {
+            "version": "2.5.2",
+            "resolved": "https://registry.npmmirror.com/raw-body/-/raw-body-2.5.2.tgz",
+            "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
+            "dev": true,
+            "dependencies": {
+                "bytes": "3.1.2",
+                "http-errors": "2.0.0",
+                "iconv-lite": "0.4.24",
+                "unpipe": "1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/react-is": {
+            "version": "17.0.2",
+            "resolved": "https://registry.npmmirror.com/react-is/-/react-is-17.0.2.tgz",
+            "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/read-cache": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmmirror.com/read-cache/-/read-cache-1.0.0.tgz",
+            "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==",
+            "dependencies": {
+                "pify": "^2.3.0"
+            }
+        },
+        "node_modules/readdirp": {
+            "version": "3.6.0",
+            "resolved": "https://registry.npmmirror.com/readdirp/-/readdirp-3.6.0.tgz",
+            "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+            "dependencies": {
+                "picomatch": "^2.2.1"
+            },
+            "engines": {
+                "node": ">=8.10.0"
+            }
+        },
+        "node_modules/regenerate": {
+            "version": "1.4.2",
+            "resolved": "https://registry.npmmirror.com/regenerate/-/regenerate-1.4.2.tgz",
+            "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
+            "dev": true
+        },
+        "node_modules/regenerate-unicode-properties": {
+            "version": "10.1.1",
+            "resolved": "https://registry.npmmirror.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz",
+            "integrity": "sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==",
+            "dev": true,
+            "dependencies": {
+                "regenerate": "^1.4.2"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/regenerator-runtime": {
+            "version": "0.13.11",
+            "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
+            "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
+        },
+        "node_modules/regenerator-transform": {
+            "version": "0.15.2",
+            "resolved": "https://registry.npmmirror.com/regenerator-transform/-/regenerator-transform-0.15.2.tgz",
+            "integrity": "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==",
+            "dev": true,
+            "dependencies": {
+                "@babel/runtime": "^7.8.4"
+            }
+        },
+        "node_modules/regexpu-core": {
+            "version": "5.3.2",
+            "resolved": "https://registry.npmmirror.com/regexpu-core/-/regexpu-core-5.3.2.tgz",
+            "integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==",
+            "dev": true,
+            "dependencies": {
+                "@babel/regjsgen": "^0.8.0",
+                "regenerate": "^1.4.2",
+                "regenerate-unicode-properties": "^10.1.0",
+                "regjsparser": "^0.9.1",
+                "unicode-match-property-ecmascript": "^2.0.0",
+                "unicode-match-property-value-ecmascript": "^2.1.0"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/regjsparser": {
+            "version": "0.9.1",
+            "resolved": "https://registry.npmmirror.com/regjsparser/-/regjsparser-0.9.1.tgz",
+            "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==",
+            "dev": true,
+            "dependencies": {
+                "jsesc": "~0.5.0"
+            },
+            "bin": {
+                "regjsparser": "bin/parser"
+            }
+        },
+        "node_modules/regjsparser/node_modules/jsesc": {
+            "version": "0.5.0",
+            "resolved": "https://registry.npmmirror.com/jsesc/-/jsesc-0.5.0.tgz",
+            "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==",
+            "dev": true,
+            "bin": {
+                "jsesc": "bin/jsesc"
+            }
+        },
+        "node_modules/require-directory": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmmirror.com/require-directory/-/require-directory-2.1.1.tgz",
+            "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/require-main-filename": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/require-main-filename/-/require-main-filename-2.0.0.tgz",
+            "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="
+        },
+        "node_modules/requires-port": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmmirror.com/requires-port/-/requires-port-1.0.0.tgz",
+            "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/resolve": {
+            "version": "1.22.8",
+            "resolved": "https://registry.npmmirror.com/resolve/-/resolve-1.22.8.tgz",
+            "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
+            "dependencies": {
+                "is-core-module": "^2.13.0",
+                "path-parse": "^1.0.7",
+                "supports-preserve-symlinks-flag": "^1.0.0"
+            },
+            "bin": {
+                "resolve": "bin/resolve"
+            }
+        },
+        "node_modules/resolve-cwd": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmmirror.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+            "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "resolve-from": "^5.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/resolve-from": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmmirror.com/resolve-from/-/resolve-from-5.0.0.tgz",
+            "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/resolve.exports": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmmirror.com/resolve.exports/-/resolve.exports-1.1.1.tgz",
+            "integrity": "sha512-/NtpHNDN7jWhAaQ9BvBUYZ6YTXsRBgfqWFWP7BZBaoMJO/I3G5OFzvTuWNlZC3aPjins1F+TNrLKsGbH4rfsRQ==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/reusify": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmmirror.com/reusify/-/reusify-1.0.4.tgz",
+            "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+            "engines": {
+                "iojs": ">=1.0.0",
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/rimraf": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmmirror.com/rimraf/-/rimraf-3.0.2.tgz",
+            "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "glob": "^7.1.3"
+            },
+            "bin": {
+                "rimraf": "bin.js"
+            }
+        },
+        "node_modules/rimraf/node_modules/brace-expansion": {
+            "version": "1.1.11",
+            "resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.11.tgz",
+            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
+            }
+        },
+        "node_modules/rimraf/node_modules/glob": {
+            "version": "7.2.3",
+            "resolved": "https://registry.npmmirror.com/glob/-/glob-7.2.3.tgz",
+            "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^3.1.1",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+            },
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/rimraf/node_modules/minimatch": {
+            "version": "3.1.2",
+            "resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-3.1.2.tgz",
+            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "brace-expansion": "^1.1.7"
+            },
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/rollup": {
+            "version": "3.29.4",
+            "resolved": "https://registry.npmmirror.com/rollup/-/rollup-3.29.4.tgz",
+            "integrity": "sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==",
+            "bin": {
+                "rollup": "dist/bin/rollup"
+            },
+            "engines": {
+                "node": ">=14.18.0",
+                "npm": ">=8.0.0"
+            },
+            "optionalDependencies": {
+                "fsevents": "~2.3.2"
+            }
+        },
+        "node_modules/run-parallel": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmmirror.com/run-parallel/-/run-parallel-1.2.0.tgz",
+            "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+            "dependencies": {
+                "queue-microtask": "^1.2.2"
+            }
+        },
+        "node_modules/safe-area-insets": {
+            "version": "1.4.1",
+            "resolved": "https://registry.npmmirror.com/safe-area-insets/-/safe-area-insets-1.4.1.tgz",
+            "integrity": "sha512-r/nRWTjFGhhm3w1Z6Kd/jY11srN+lHt2mNl1E/emQGW8ic7n3Avu4noibklfSM+Y34peNphHD/BSZecav0sXYQ=="
+        },
+        "node_modules/safe-buffer": {
+            "version": "5.2.1",
+            "resolved": "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.2.1.tgz",
+            "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+            "dev": true
+        },
+        "node_modules/safer-buffer": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmmirror.com/safer-buffer/-/safer-buffer-2.1.2.tgz",
+            "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+            "dev": true
+        },
+        "node_modules/sass": {
+            "version": "1.77.1",
+            "resolved": "https://registry.npmmirror.com/sass/-/sass-1.77.1.tgz",
+            "integrity": "sha512-OMEyfirt9XEfyvocduUIOlUSkWOXS/LAt6oblR/ISXCTukyavjex+zQNm51pPCOiFKY1QpWvEH1EeCkgyV3I6w==",
+            "devOptional": true,
+            "dependencies": {
+                "chokidar": ">=3.0.0 <4.0.0",
+                "immutable": "^4.0.0",
+                "source-map-js": ">=0.6.2 <2.0.0"
+            },
+            "bin": {
+                "sass": "sass.js"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/sax": {
+            "version": "1.3.0",
+            "resolved": "https://registry.npmmirror.com/sax/-/sax-1.3.0.tgz",
+            "integrity": "sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA=="
+        },
+        "node_modules/saxes": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmmirror.com/saxes/-/saxes-5.0.1.tgz",
+            "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "xmlchars": "^2.2.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/select": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmmirror.com/select/-/select-1.1.2.tgz",
+            "integrity": "sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA=="
+        },
+        "node_modules/semver": {
+            "version": "6.3.1",
+            "resolved": "https://registry.npmmirror.com/semver/-/semver-6.3.1.tgz",
+            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+            "bin": {
+                "semver": "bin/semver.js"
+            }
+        },
+        "node_modules/send": {
+            "version": "0.18.0",
+            "resolved": "https://registry.npmmirror.com/send/-/send-0.18.0.tgz",
+            "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+            "dev": true,
+            "dependencies": {
+                "debug": "2.6.9",
+                "depd": "2.0.0",
+                "destroy": "1.2.0",
+                "encodeurl": "~1.0.2",
+                "escape-html": "~1.0.3",
+                "etag": "~1.8.1",
+                "fresh": "0.5.2",
+                "http-errors": "2.0.0",
+                "mime": "1.6.0",
+                "ms": "2.1.3",
+                "on-finished": "2.4.1",
+                "range-parser": "~1.2.1",
+                "statuses": "2.0.1"
+            },
+            "engines": {
+                "node": ">= 0.8.0"
+            }
+        },
+        "node_modules/send/node_modules/debug": {
+            "version": "2.6.9",
+            "resolved": "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz",
+            "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+            "dev": true,
+            "dependencies": {
+                "ms": "2.0.0"
+            }
+        },
+        "node_modules/send/node_modules/debug/node_modules/ms": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz",
+            "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+            "dev": true
+        },
+        "node_modules/send/node_modules/mime": {
+            "version": "1.6.0",
+            "resolved": "https://registry.npmmirror.com/mime/-/mime-1.6.0.tgz",
+            "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+            "dev": true,
+            "bin": {
+                "mime": "cli.js"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/send/node_modules/ms": {
+            "version": "2.1.3",
+            "resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.3.tgz",
+            "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+            "dev": true
+        },
+        "node_modules/serve-static": {
+            "version": "1.15.0",
+            "resolved": "https://registry.npmmirror.com/serve-static/-/serve-static-1.15.0.tgz",
+            "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
+            "dev": true,
+            "dependencies": {
+                "encodeurl": "~1.0.2",
+                "escape-html": "~1.0.3",
+                "parseurl": "~1.3.3",
+                "send": "0.18.0"
+            },
+            "engines": {
+                "node": ">= 0.8.0"
+            }
+        },
+        "node_modules/set-blocking": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/set-blocking/-/set-blocking-2.0.0.tgz",
+            "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="
+        },
+        "node_modules/set-function-length": {
+            "version": "1.2.2",
+            "resolved": "https://registry.npmmirror.com/set-function-length/-/set-function-length-1.2.2.tgz",
+            "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
+            "dev": true,
+            "dependencies": {
+                "define-data-property": "^1.1.4",
+                "es-errors": "^1.3.0",
+                "function-bind": "^1.1.2",
+                "get-intrinsic": "^1.2.4",
+                "gopd": "^1.0.1",
+                "has-property-descriptors": "^1.0.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/setprototypeof": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmmirror.com/setprototypeof/-/setprototypeof-1.2.0.tgz",
+            "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
+            "dev": true
+        },
+        "node_modules/shebang-command": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/shebang-command/-/shebang-command-2.0.0.tgz",
+            "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+            "dev": true,
+            "dependencies": {
+                "shebang-regex": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/shebang-regex": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmmirror.com/shebang-regex/-/shebang-regex-3.0.0.tgz",
+            "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/side-channel": {
+            "version": "1.0.6",
+            "resolved": "https://registry.npmmirror.com/side-channel/-/side-channel-1.0.6.tgz",
+            "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
+            "dev": true,
+            "dependencies": {
+                "call-bind": "^1.0.7",
+                "es-errors": "^1.3.0",
+                "get-intrinsic": "^1.2.4",
+                "object-inspect": "^1.13.1"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/signal-exit": {
+            "version": "3.0.7",
+            "resolved": "https://registry.npmmirror.com/signal-exit/-/signal-exit-3.0.7.tgz",
+            "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+            "dev": true
+        },
+        "node_modules/sisteransi": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmmirror.com/sisteransi/-/sisteransi-1.0.5.tgz",
+            "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/slash": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmmirror.com/slash/-/slash-3.0.0.tgz",
+            "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/sortablejs": {
+            "version": "1.15.2",
+            "resolved": "https://registry.npmmirror.com/sortablejs/-/sortablejs-1.15.2.tgz",
+            "integrity": "sha512-FJF5jgdfvoKn1MAKSdGs33bIqLi3LmsgVTliuX6iITj834F+JRQZN90Z93yql8h0K2t0RwDPBmxwlbZfDcxNZA=="
+        },
+        "node_modules/source-list-map": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/source-list-map/-/source-list-map-2.0.1.tgz",
+            "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
+            "dev": true
+        },
+        "node_modules/source-map": {
+            "version": "0.6.1",
+            "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz",
+            "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/source-map-js": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.2.0.tgz",
+            "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/source-map-support": {
+            "version": "0.5.21",
+            "resolved": "https://registry.npmmirror.com/source-map-support/-/source-map-support-0.5.21.tgz",
+            "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+            "devOptional": true,
+            "dependencies": {
+                "buffer-from": "^1.0.0",
+                "source-map": "^0.6.0"
+            }
+        },
+        "node_modules/sourcemap-codec": {
+            "version": "1.4.8",
+            "resolved": "https://registry.npmmirror.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
+            "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
+            "deprecated": "Please use @jridgewell/sourcemap-codec instead"
+        },
+        "node_modules/sprintf-js": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmmirror.com/sprintf-js/-/sprintf-js-1.0.3.tgz",
+            "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/stack-utils": {
+            "version": "2.0.6",
+            "resolved": "https://registry.npmmirror.com/stack-utils/-/stack-utils-2.0.6.tgz",
+            "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "escape-string-regexp": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/stack-utils/node_modules/escape-string-regexp": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+            "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/statuses": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/statuses/-/statuses-2.0.1.tgz",
+            "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/string-hash": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmmirror.com/string-hash/-/string-hash-1.1.3.tgz",
+            "integrity": "sha512-kJUvRUFK49aub+a7T1nNE66EJbZBMnBgoC1UbCZ5n6bsZKBRga4KgBRTMn/pFkeCZSYtNeSyMxPDM0AXWELk2A=="
+        },
+        "node_modules/string-length": {
+            "version": "4.0.2",
+            "resolved": "https://registry.npmmirror.com/string-length/-/string-length-4.0.2.tgz",
+            "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "char-regex": "^1.0.2",
+                "strip-ansi": "^6.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/string-width": {
+            "version": "4.2.3",
+            "resolved": "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz",
+            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+            "dependencies": {
+                "emoji-regex": "^8.0.0",
+                "is-fullwidth-code-point": "^3.0.0",
+                "strip-ansi": "^6.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/strip-ansi": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz",
+            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+            "dependencies": {
+                "ansi-regex": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/strip-bom": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmmirror.com/strip-bom/-/strip-bom-4.0.0.tgz",
+            "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/strip-final-newline": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+            "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+            "dev": true,
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/strip-json-comments": {
+            "version": "3.1.1",
+            "resolved": "https://registry.npmmirror.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+            "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/supports-color": {
+            "version": "5.5.0",
+            "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-5.5.0.tgz",
+            "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+            "dependencies": {
+                "has-flag": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/supports-hyperlinks": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmmirror.com/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz",
+            "integrity": "sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "has-flag": "^4.0.0",
+                "supports-color": "^7.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/supports-hyperlinks/node_modules/has-flag": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/supports-hyperlinks/node_modules/supports-color": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/supports-preserve-symlinks-flag": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmmirror.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+            "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/svg-tags": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmmirror.com/svg-tags/-/svg-tags-1.0.0.tgz",
+            "integrity": "sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==",
+            "dev": true
+        },
+        "node_modules/symbol-tree": {
+            "version": "3.2.4",
+            "resolved": "https://registry.npmmirror.com/symbol-tree/-/symbol-tree-3.2.4.tgz",
+            "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/systemjs": {
+            "version": "6.15.1",
+            "resolved": "https://registry.npmmirror.com/systemjs/-/systemjs-6.15.1.tgz",
+            "integrity": "sha512-Nk8c4lXvMB98MtbmjX7JwJRgJOL8fluecYCfCeYBznwmpOs8Bf15hLM6z4z71EDAhQVrQrI+wt1aLWSXZq+hXA==",
+            "dev": true
+        },
+        "node_modules/tapable": {
+            "version": "2.2.1",
+            "resolved": "https://registry.npmmirror.com/tapable/-/tapable-2.2.1.tgz",
+            "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/terminal-link": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmmirror.com/terminal-link/-/terminal-link-2.1.1.tgz",
+            "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "ansi-escapes": "^4.2.1",
+                "supports-hyperlinks": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/terser": {
+            "version": "5.31.0",
+            "resolved": "https://registry.npmmirror.com/terser/-/terser-5.31.0.tgz",
+            "integrity": "sha512-Q1JFAoUKE5IMfI4Z/lkE/E6+SwgzO+x4tq4v1AyBLRj8VSYvRO6A/rQrPg1yud4g0En9EKI1TvFRF2tQFcoUkg==",
+            "devOptional": true,
+            "dependencies": {
+                "@jridgewell/source-map": "^0.3.3",
+                "acorn": "^8.8.2",
+                "commander": "^2.20.0",
+                "source-map-support": "~0.5.20"
+            },
+            "bin": {
+                "terser": "bin/terser"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/test-exclude": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmmirror.com/test-exclude/-/test-exclude-6.0.0.tgz",
+            "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "@istanbuljs/schema": "^0.1.2",
+                "glob": "^7.1.4",
+                "minimatch": "^3.0.4"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/test-exclude/node_modules/brace-expansion": {
+            "version": "1.1.11",
+            "resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.11.tgz",
+            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
+            }
+        },
+        "node_modules/test-exclude/node_modules/glob": {
+            "version": "7.2.3",
+            "resolved": "https://registry.npmmirror.com/glob/-/glob-7.2.3.tgz",
+            "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^3.1.1",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+            },
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/test-exclude/node_modules/minimatch": {
+            "version": "3.1.2",
+            "resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-3.1.2.tgz",
+            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "brace-expansion": "^1.1.7"
+            },
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/text-segmentation": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmmirror.com/text-segmentation/-/text-segmentation-1.0.3.tgz",
+            "integrity": "sha512-iOiPUo/BGnZ6+54OsWxZidGCsdU8YbE4PSpdPinp7DeMtUJNJBoJ/ouUSTJjHkh1KntHaltHl/gDs2FC4i5+Nw==",
+            "dependencies": {
+                "utrie": "^1.0.2"
+            }
+        },
+        "node_modules/throat": {
+            "version": "6.0.2",
+            "resolved": "https://registry.npmmirror.com/throat/-/throat-6.0.2.tgz",
+            "integrity": "sha512-WKexMoJj3vEuK0yFEapj8y64V0A6xcuPuK9Gt1d0R+dzCSJc0lHqQytAbSB4cDAK0dWh4T0E2ETkoLE2WZ41OQ==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/timm": {
+            "version": "1.7.1",
+            "resolved": "https://registry.npmmirror.com/timm/-/timm-1.7.1.tgz",
+            "integrity": "sha512-IjZc9KIotudix8bMaBW6QvMuq64BrJWFs1+4V0lXwWGQZwH+LnX87doAYhem4caOEusRP9/g6jVDQmZ8XOk1nw=="
+        },
+        "node_modules/tiny-emitter": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmmirror.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
+            "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
+        },
+        "node_modules/tinycolor2": {
+            "version": "1.6.0",
+            "resolved": "https://registry.npmmirror.com/tinycolor2/-/tinycolor2-1.6.0.tgz",
+            "integrity": "sha512-XPaBkWQJdsf3pLKJV9p4qN/S+fm2Oj8AIPo1BTUhg5oxkvm9+SVEGFdhyOz7tTdUTfvxMiAs4sp6/eZO2Ew+pw=="
+        },
+        "node_modules/tmpl": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmmirror.com/tmpl/-/tmpl-1.0.5.tgz",
+            "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/to-fast-properties": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+            "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/to-regex-range": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmmirror.com/to-regex-range/-/to-regex-range-5.0.1.tgz",
+            "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+            "dependencies": {
+                "is-number": "^7.0.0"
+            },
+            "engines": {
+                "node": ">=8.0"
+            }
+        },
+        "node_modules/toidentifier": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmmirror.com/toidentifier/-/toidentifier-1.0.1.tgz",
+            "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.6"
+            }
+        },
+        "node_modules/tough-cookie": {
+            "version": "4.1.4",
+            "resolved": "https://registry.npmmirror.com/tough-cookie/-/tough-cookie-4.1.4.tgz",
+            "integrity": "sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "psl": "^1.1.33",
+                "punycode": "^2.1.1",
+                "universalify": "^0.2.0",
+                "url-parse": "^1.5.3"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/tough-cookie/node_modules/universalify": {
+            "version": "0.2.0",
+            "resolved": "https://registry.npmmirror.com/universalify/-/universalify-0.2.0.tgz",
+            "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">= 4.0.0"
+            }
+        },
+        "node_modules/tr46": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmmirror.com/tr46/-/tr46-2.1.0.tgz",
+            "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "punycode": "^2.1.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/type-detect": {
+            "version": "4.0.8",
+            "resolved": "https://registry.npmmirror.com/type-detect/-/type-detect-4.0.8.tgz",
+            "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/type-fest": {
+            "version": "0.21.3",
+            "resolved": "https://registry.npmmirror.com/type-fest/-/type-fest-0.21.3.tgz",
+            "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/type-is": {
+            "version": "1.6.18",
+            "resolved": "https://registry.npmmirror.com/type-is/-/type-is-1.6.18.tgz",
+            "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+            "dev": true,
+            "dependencies": {
+                "media-typer": "0.3.0",
+                "mime-types": "~2.1.24"
+            },
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/typedarray-to-buffer": {
+            "version": "3.1.5",
+            "resolved": "https://registry.npmmirror.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
+            "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "is-typedarray": "^1.0.0"
+            }
+        },
+        "node_modules/typescript": {
+            "version": "4.9.5",
+            "resolved": "https://registry.npmmirror.com/typescript/-/typescript-4.9.5.tgz",
+            "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
+            "devOptional": true,
+            "bin": {
+                "tsc": "bin/tsc",
+                "tsserver": "bin/tsserver"
+            },
+            "engines": {
+                "node": ">=4.2.0"
+            }
+        },
+        "node_modules/undici-types": {
+            "version": "5.26.5",
+            "resolved": "https://registry.npmmirror.com/undici-types/-/undici-types-5.26.5.tgz",
+            "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+            "devOptional": true
+        },
+        "node_modules/unicode-canonical-property-names-ecmascript": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
+            "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==",
+            "dev": true,
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/unicode-match-property-ecmascript": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
+            "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
+            "dev": true,
+            "dependencies": {
+                "unicode-canonical-property-names-ecmascript": "^2.0.0",
+                "unicode-property-aliases-ecmascript": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/unicode-match-property-value-ecmascript": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmmirror.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz",
+            "integrity": "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==",
+            "dev": true,
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/unicode-property-aliases-ecmascript": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmmirror.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz",
+            "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==",
+            "dev": true,
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/universalify": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/universalify/-/universalify-2.0.1.tgz",
+            "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+            "engines": {
+                "node": ">= 10.0.0"
+            }
+        },
+        "node_modules/unpipe": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmmirror.com/unpipe/-/unpipe-1.0.0.tgz",
+            "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/unquote": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmmirror.com/unquote/-/unquote-1.1.1.tgz",
+            "integrity": "sha512-vRCqFv6UhXpWxZPyGDh/F3ZpNv8/qo7w6iufLpQg9aKnQ71qM4B5KiI7Mia9COcjEhrO9LueHpMYjYzsWH3OIg=="
+        },
+        "node_modules/update-browserslist-db": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmmirror.com/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz",
+            "integrity": "sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==",
+            "funding": [
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/browserslist"
+                },
+                {
+                    "type": "tidelift",
+                    "url": "https://tidelift.com/funding/github/npm/browserslist"
+                },
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/ai"
+                }
+            ],
+            "dependencies": {
+                "escalade": "^3.2.0",
+                "picocolors": "^1.1.0"
+            },
+            "bin": {
+                "update-browserslist-db": "cli.js"
+            },
+            "peerDependencies": {
+                "browserslist": ">= 4.21.0"
+            }
+        },
+        "node_modules/url-parse": {
+            "version": "1.5.10",
+            "resolved": "https://registry.npmmirror.com/url-parse/-/url-parse-1.5.10.tgz",
+            "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "querystringify": "^2.1.1",
+                "requires-port": "^1.0.0"
+            }
+        },
+        "node_modules/utif": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/utif/-/utif-2.0.1.tgz",
+            "integrity": "sha512-Z/S1fNKCicQTf375lIP9G8Sa1H/phcysstNrrSdZKj1f9g58J4NMgb5IgiEZN9/nLMPDwF0W7hdOe9Qq2IYoLg==",
+            "dependencies": {
+                "pako": "^1.0.5"
+            }
+        },
+        "node_modules/util-deprecate": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmmirror.com/util-deprecate/-/util-deprecate-1.0.2.tgz",
+            "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
+        },
+        "node_modules/utils-merge": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmmirror.com/utils-merge/-/utils-merge-1.0.1.tgz",
+            "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.4.0"
+            }
+        },
+        "node_modules/utrie": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmmirror.com/utrie/-/utrie-1.0.2.tgz",
+            "integrity": "sha512-1MLa5ouZiOmQzUbjbu9VmjLzn1QLXBhwpUa7kdLUQK+KQ5KA9I1vk5U4YHe/X2Ch7PYnJfWuWT+VbuxbGwljhw==",
+            "dependencies": {
+                "base64-arraybuffer": "^1.0.2"
+            }
+        },
+        "node_modules/uview-plus": {
+            "version": "3.2.22",
+            "resolved": "https://registry.npmmirror.com/uview-plus/-/uview-plus-3.2.22.tgz",
+            "integrity": "sha512-ouhq0CCGP/ElR7eCCu0rBFNPTGW/EctcrxKIerjj1DOkEIY9BwKBbdI0VTSSkMFnr6RFejSQLBw/aKkqd6Q+7g==",
+            "dependencies": {
+                "clipboard": "^2.0.11",
+                "dayjs": "^1.11.3"
+            },
+            "engines": {
+                "HBuilderX": "^3.1.0"
+            }
+        },
+        "node_modules/v8-to-istanbul": {
+            "version": "8.1.1",
+            "resolved": "https://registry.npmmirror.com/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz",
+            "integrity": "sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "@types/istanbul-lib-coverage": "^2.0.1",
+                "convert-source-map": "^1.6.0",
+                "source-map": "^0.7.3"
+            },
+            "engines": {
+                "node": ">=10.12.0"
+            }
+        },
+        "node_modules/v8-to-istanbul/node_modules/convert-source-map": {
+            "version": "1.9.0",
+            "resolved": "https://registry.npmmirror.com/convert-source-map/-/convert-source-map-1.9.0.tgz",
+            "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/v8-to-istanbul/node_modules/source-map": {
+            "version": "0.7.4",
+            "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.7.4.tgz",
+            "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/vary": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmmirror.com/vary/-/vary-1.1.2.tgz",
+            "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/vite": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmmirror.com/vite/-/vite-4.0.4.tgz",
+            "integrity": "sha512-xevPU7M8FU0i/80DMR+YhgrzR5KS2ORy1B4xcX/cXLsvnUWvfHuqMmVU6N0YiJ4JWGRJJsLCgjEzKjG9/GKoSw==",
+            "dependencies": {
+                "esbuild": "^0.16.3",
+                "postcss": "^8.4.20",
+                "resolve": "^1.22.1",
+                "rollup": "^3.7.0"
+            },
+            "bin": {
+                "vite": "bin/vite.js"
+            },
+            "engines": {
+                "node": "^14.18.0 || >=16.0.0"
+            },
+            "optionalDependencies": {
+                "fsevents": "~2.3.2"
+            },
+            "peerDependencies": {
+                "@types/node": ">= 14",
+                "less": "*",
+                "sass": "*",
+                "stylus": "*",
+                "sugarss": "*",
+                "terser": "^5.4.0"
+            },
+            "peerDependenciesMeta": {
+                "@types/node": {
+                    "optional": true
+                },
+                "less": {
+                    "optional": true
+                },
+                "sass": {
+                    "optional": true
+                },
+                "stylus": {
+                    "optional": true
+                },
+                "sugarss": {
+                    "optional": true
+                },
+                "terser": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/vite-plugin-windicss": {
+            "version": "1.9.3",
+            "resolved": "https://registry.npmmirror.com/vite-plugin-windicss/-/vite-plugin-windicss-1.9.3.tgz",
+            "integrity": "sha512-PqNiIsrEftCrgn0xIpj8ZMSdpz8NZn+OJ3gKXnOF+hFzbHFrKGJA49ViOUKCHDOquxoGBZMmTjepWr8GrftKcQ==",
+            "dev": true,
+            "dependencies": {
+                "@windicss/plugin-utils": "1.9.3",
+                "debug": "^4.3.4",
+                "kolorist": "^1.8.0",
+                "windicss": "^3.5.6"
+            },
+            "peerDependencies": {
+                "vite": "^2.0.1 || ^3.0.0 || ^4.0.0 || ^5.0.0"
+            }
+        },
+        "node_modules/vite/node_modules/@esbuild/android-arm": {
+            "version": "0.16.17",
+            "resolved": "https://registry.npmmirror.com/@esbuild/android-arm/-/android-arm-0.16.17.tgz",
+            "integrity": "sha512-N9x1CMXVhtWEAMS7pNNONyA14f71VPQN9Cnavj1XQh6T7bskqiLLrSca4O0Vr8Wdcga943eThxnVp3JLnBMYtw==",
+            "cpu": [
+                "arm"
+            ],
+            "optional": true,
+            "os": [
+                "android"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/vite/node_modules/@esbuild/android-arm64": {
+            "version": "0.16.17",
+            "resolved": "https://registry.npmmirror.com/@esbuild/android-arm64/-/android-arm64-0.16.17.tgz",
+            "integrity": "sha512-MIGl6p5sc3RDTLLkYL1MyL8BMRN4tLMRCn+yRJJmEDvYZ2M7tmAf80hx1kbNEUX2KJ50RRtxZ4JHLvCfuB6kBg==",
+            "cpu": [
+                "arm64"
+            ],
+            "optional": true,
+            "os": [
+                "android"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/vite/node_modules/@esbuild/android-x64": {
+            "version": "0.16.17",
+            "resolved": "https://registry.npmmirror.com/@esbuild/android-x64/-/android-x64-0.16.17.tgz",
+            "integrity": "sha512-a3kTv3m0Ghh4z1DaFEuEDfz3OLONKuFvI4Xqczqx4BqLyuFaFkuaG4j2MtA6fuWEFeC5x9IvqnX7drmRq/fyAQ==",
+            "cpu": [
+                "x64"
+            ],
+            "optional": true,
+            "os": [
+                "android"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/vite/node_modules/@esbuild/darwin-arm64": {
+            "version": "0.16.17",
+            "resolved": "https://registry.npmmirror.com/@esbuild/darwin-arm64/-/darwin-arm64-0.16.17.tgz",
+            "integrity": "sha512-/2agbUEfmxWHi9ARTX6OQ/KgXnOWfsNlTeLcoV7HSuSTv63E4DqtAc+2XqGw1KHxKMHGZgbVCZge7HXWX9Vn+w==",
+            "cpu": [
+                "arm64"
+            ],
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/vite/node_modules/@esbuild/darwin-x64": {
+            "version": "0.16.17",
+            "resolved": "https://registry.npmmirror.com/@esbuild/darwin-x64/-/darwin-x64-0.16.17.tgz",
+            "integrity": "sha512-2By45OBHulkd9Svy5IOCZt376Aa2oOkiE9QWUK9fe6Tb+WDr8hXL3dpqi+DeLiMed8tVXspzsTAvd0jUl96wmg==",
+            "cpu": [
+                "x64"
+            ],
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/vite/node_modules/@esbuild/freebsd-arm64": {
+            "version": "0.16.17",
+            "resolved": "https://registry.npmmirror.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.16.17.tgz",
+            "integrity": "sha512-mt+cxZe1tVx489VTb4mBAOo2aKSnJ33L9fr25JXpqQqzbUIw/yzIzi+NHwAXK2qYV1lEFp4OoVeThGjUbmWmdw==",
+            "cpu": [
+                "arm64"
+            ],
+            "optional": true,
+            "os": [
+                "freebsd"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/vite/node_modules/@esbuild/freebsd-x64": {
+            "version": "0.16.17",
+            "resolved": "https://registry.npmmirror.com/@esbuild/freebsd-x64/-/freebsd-x64-0.16.17.tgz",
+            "integrity": "sha512-8ScTdNJl5idAKjH8zGAsN7RuWcyHG3BAvMNpKOBaqqR7EbUhhVHOqXRdL7oZvz8WNHL2pr5+eIT5c65kA6NHug==",
+            "cpu": [
+                "x64"
+            ],
+            "optional": true,
+            "os": [
+                "freebsd"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/vite/node_modules/@esbuild/linux-arm": {
+            "version": "0.16.17",
+            "resolved": "https://registry.npmmirror.com/@esbuild/linux-arm/-/linux-arm-0.16.17.tgz",
+            "integrity": "sha512-iihzrWbD4gIT7j3caMzKb/RsFFHCwqqbrbH9SqUSRrdXkXaygSZCZg1FybsZz57Ju7N/SHEgPyaR0LZ8Zbe9gQ==",
+            "cpu": [
+                "arm"
+            ],
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/vite/node_modules/@esbuild/linux-arm64": {
+            "version": "0.16.17",
+            "resolved": "https://registry.npmmirror.com/@esbuild/linux-arm64/-/linux-arm64-0.16.17.tgz",
+            "integrity": "sha512-7S8gJnSlqKGVJunnMCrXHU9Q8Q/tQIxk/xL8BqAP64wchPCTzuM6W3Ra8cIa1HIflAvDnNOt2jaL17vaW+1V0g==",
+            "cpu": [
+                "arm64"
+            ],
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/vite/node_modules/@esbuild/linux-ia32": {
+            "version": "0.16.17",
+            "resolved": "https://registry.npmmirror.com/@esbuild/linux-ia32/-/linux-ia32-0.16.17.tgz",
+            "integrity": "sha512-kiX69+wcPAdgl3Lonh1VI7MBr16nktEvOfViszBSxygRQqSpzv7BffMKRPMFwzeJGPxcio0pdD3kYQGpqQ2SSg==",
+            "cpu": [
+                "ia32"
+            ],
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/vite/node_modules/@esbuild/linux-loong64": {
+            "version": "0.16.17",
+            "resolved": "https://registry.npmmirror.com/@esbuild/linux-loong64/-/linux-loong64-0.16.17.tgz",
+            "integrity": "sha512-dTzNnQwembNDhd654cA4QhbS9uDdXC3TKqMJjgOWsC0yNCbpzfWoXdZvp0mY7HU6nzk5E0zpRGGx3qoQg8T2DQ==",
+            "cpu": [
+                "loong64"
+            ],
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/vite/node_modules/@esbuild/linux-mips64el": {
+            "version": "0.16.17",
+            "resolved": "https://registry.npmmirror.com/@esbuild/linux-mips64el/-/linux-mips64el-0.16.17.tgz",
+            "integrity": "sha512-ezbDkp2nDl0PfIUn0CsQ30kxfcLTlcx4Foz2kYv8qdC6ia2oX5Q3E/8m6lq84Dj/6b0FrkgD582fJMIfHhJfSw==",
+            "cpu": [
+                "mips64el"
+            ],
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/vite/node_modules/@esbuild/linux-ppc64": {
+            "version": "0.16.17",
+            "resolved": "https://registry.npmmirror.com/@esbuild/linux-ppc64/-/linux-ppc64-0.16.17.tgz",
+            "integrity": "sha512-dzS678gYD1lJsW73zrFhDApLVdM3cUF2MvAa1D8K8KtcSKdLBPP4zZSLy6LFZ0jYqQdQ29bjAHJDgz0rVbLB3g==",
+            "cpu": [
+                "ppc64"
+            ],
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/vite/node_modules/@esbuild/linux-riscv64": {
+            "version": "0.16.17",
+            "resolved": "https://registry.npmmirror.com/@esbuild/linux-riscv64/-/linux-riscv64-0.16.17.tgz",
+            "integrity": "sha512-ylNlVsxuFjZK8DQtNUwiMskh6nT0vI7kYl/4fZgV1llP5d6+HIeL/vmmm3jpuoo8+NuXjQVZxmKuhDApK0/cKw==",
+            "cpu": [
+                "riscv64"
+            ],
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/vite/node_modules/@esbuild/linux-s390x": {
+            "version": "0.16.17",
+            "resolved": "https://registry.npmmirror.com/@esbuild/linux-s390x/-/linux-s390x-0.16.17.tgz",
+            "integrity": "sha512-gzy7nUTO4UA4oZ2wAMXPNBGTzZFP7mss3aKR2hH+/4UUkCOyqmjXiKpzGrY2TlEUhbbejzXVKKGazYcQTZWA/w==",
+            "cpu": [
+                "s390x"
+            ],
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/vite/node_modules/@esbuild/linux-x64": {
+            "version": "0.16.17",
+            "resolved": "https://registry.npmmirror.com/@esbuild/linux-x64/-/linux-x64-0.16.17.tgz",
+            "integrity": "sha512-mdPjPxfnmoqhgpiEArqi4egmBAMYvaObgn4poorpUaqmvzzbvqbowRllQ+ZgzGVMGKaPkqUmPDOOFQRUFDmeUw==",
+            "cpu": [
+                "x64"
+            ],
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/vite/node_modules/@esbuild/netbsd-x64": {
+            "version": "0.16.17",
+            "resolved": "https://registry.npmmirror.com/@esbuild/netbsd-x64/-/netbsd-x64-0.16.17.tgz",
+            "integrity": "sha512-/PzmzD/zyAeTUsduZa32bn0ORug+Jd1EGGAUJvqfeixoEISYpGnAezN6lnJoskauoai0Jrs+XSyvDhppCPoKOA==",
+            "cpu": [
+                "x64"
+            ],
+            "optional": true,
+            "os": [
+                "netbsd"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/vite/node_modules/@esbuild/openbsd-x64": {
+            "version": "0.16.17",
+            "resolved": "https://registry.npmmirror.com/@esbuild/openbsd-x64/-/openbsd-x64-0.16.17.tgz",
+            "integrity": "sha512-2yaWJhvxGEz2RiftSk0UObqJa/b+rIAjnODJgv2GbGGpRwAfpgzyrg1WLK8rqA24mfZa9GvpjLcBBg8JHkoodg==",
+            "cpu": [
+                "x64"
+            ],
+            "optional": true,
+            "os": [
+                "openbsd"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/vite/node_modules/@esbuild/sunos-x64": {
+            "version": "0.16.17",
+            "resolved": "https://registry.npmmirror.com/@esbuild/sunos-x64/-/sunos-x64-0.16.17.tgz",
+            "integrity": "sha512-xtVUiev38tN0R3g8VhRfN7Zl42YCJvyBhRKw1RJjwE1d2emWTVToPLNEQj/5Qxc6lVFATDiy6LjVHYhIPrLxzw==",
+            "cpu": [
+                "x64"
+            ],
+            "optional": true,
+            "os": [
+                "sunos"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/vite/node_modules/@esbuild/win32-arm64": {
+            "version": "0.16.17",
+            "resolved": "https://registry.npmmirror.com/@esbuild/win32-arm64/-/win32-arm64-0.16.17.tgz",
+            "integrity": "sha512-ga8+JqBDHY4b6fQAmOgtJJue36scANy4l/rL97W+0wYmijhxKetzZdKOJI7olaBaMhWt8Pac2McJdZLxXWUEQw==",
+            "cpu": [
+                "arm64"
+            ],
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/vite/node_modules/@esbuild/win32-ia32": {
+            "version": "0.16.17",
+            "resolved": "https://registry.npmmirror.com/@esbuild/win32-ia32/-/win32-ia32-0.16.17.tgz",
+            "integrity": "sha512-WnsKaf46uSSF/sZhwnqE4L/F89AYNMiD4YtEcYekBt9Q7nj0DiId2XH2Ng2PHM54qi5oPrQ8luuzGszqi/veig==",
+            "cpu": [
+                "ia32"
+            ],
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/vite/node_modules/@esbuild/win32-x64": {
+            "version": "0.16.17",
+            "resolved": "https://registry.npmmirror.com/@esbuild/win32-x64/-/win32-x64-0.16.17.tgz",
+            "integrity": "sha512-y+EHuSchhL7FjHgvQL/0fnnFmO4T1bhvWANX6gcnqTjtnKWbTvUMCpGnv2+t+31d7RzyEAYAd4u2fnIhHL6N/Q==",
+            "cpu": [
+                "x64"
+            ],
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/vite/node_modules/esbuild": {
+            "version": "0.16.17",
+            "resolved": "https://registry.npmmirror.com/esbuild/-/esbuild-0.16.17.tgz",
+            "integrity": "sha512-G8LEkV0XzDMNwXKgM0Jwu3nY3lSTwSGY6XbxM9cr9+s0T/qSV1q1JVPBGzm3dcjhCic9+emZDmMffkwgPeOeLg==",
+            "hasInstallScript": true,
+            "bin": {
+                "esbuild": "bin/esbuild"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "optionalDependencies": {
+                "@esbuild/android-arm": "0.16.17",
+                "@esbuild/android-arm64": "0.16.17",
+                "@esbuild/android-x64": "0.16.17",
+                "@esbuild/darwin-arm64": "0.16.17",
+                "@esbuild/darwin-x64": "0.16.17",
+                "@esbuild/freebsd-arm64": "0.16.17",
+                "@esbuild/freebsd-x64": "0.16.17",
+                "@esbuild/linux-arm": "0.16.17",
+                "@esbuild/linux-arm64": "0.16.17",
+                "@esbuild/linux-ia32": "0.16.17",
+                "@esbuild/linux-loong64": "0.16.17",
+                "@esbuild/linux-mips64el": "0.16.17",
+                "@esbuild/linux-ppc64": "0.16.17",
+                "@esbuild/linux-riscv64": "0.16.17",
+                "@esbuild/linux-s390x": "0.16.17",
+                "@esbuild/linux-x64": "0.16.17",
+                "@esbuild/netbsd-x64": "0.16.17",
+                "@esbuild/openbsd-x64": "0.16.17",
+                "@esbuild/sunos-x64": "0.16.17",
+                "@esbuild/win32-arm64": "0.16.17",
+                "@esbuild/win32-ia32": "0.16.17",
+                "@esbuild/win32-x64": "0.16.17"
+            }
+        },
+        "node_modules/vue": {
+            "version": "3.4.27",
+            "resolved": "https://registry.npmmirror.com/vue/-/vue-3.4.27.tgz",
+            "integrity": "sha512-8s/56uK6r01r1icG/aEOHqyMVxd1bkYcSe9j8HcKtr/xTOFWvnzIVTehNW+5Yt89f+DLBe4A569pnZLS5HzAMA==",
+            "dependencies": {
+                "@vue/compiler-dom": "3.4.27",
+                "@vue/compiler-sfc": "3.4.27",
+                "@vue/runtime-dom": "3.4.27",
+                "@vue/server-renderer": "3.4.27",
+                "@vue/shared": "3.4.27"
+            },
+            "peerDependencies": {
+                "typescript": "*"
+            },
+            "peerDependenciesMeta": {
+                "typescript": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/vue-i18n": {
+            "version": "9.13.1",
+            "resolved": "https://registry.npmmirror.com/vue-i18n/-/vue-i18n-9.13.1.tgz",
+            "integrity": "sha512-mh0GIxx0wPtPlcB1q4k277y0iKgo25xmDPWioVVYanjPufDBpvu5ySTjP5wOrSvlYQ2m1xI+CFhGdauv/61uQg==",
+            "dependencies": {
+                "@intlify/core-base": "9.13.1",
+                "@intlify/shared": "9.13.1",
+                "@vue/devtools-api": "^6.5.0"
+            },
+            "engines": {
+                "node": ">= 16"
+            },
+            "peerDependencies": {
+                "vue": "^3.0.0"
+            }
+        },
+        "node_modules/vue-i18n/node_modules/@intlify/core-base": {
+            "version": "9.13.1",
+            "resolved": "https://registry.npmmirror.com/@intlify/core-base/-/core-base-9.13.1.tgz",
+            "integrity": "sha512-+bcQRkJO9pcX8d0gel9ZNfrzU22sZFSA0WVhfXrf5jdJOS24a+Bp8pozuS9sBI9Hk/tGz83pgKfmqcn/Ci7/8w==",
+            "dependencies": {
+                "@intlify/message-compiler": "9.13.1",
+                "@intlify/shared": "9.13.1"
+            },
+            "engines": {
+                "node": ">= 16"
+            }
+        },
+        "node_modules/vue-i18n/node_modules/@intlify/message-compiler": {
+            "version": "9.13.1",
+            "resolved": "https://registry.npmmirror.com/@intlify/message-compiler/-/message-compiler-9.13.1.tgz",
+            "integrity": "sha512-SKsVa4ajYGBVm7sHMXd5qX70O2XXjm55zdZB3VeMFCvQyvLew/dLvq3MqnaIsTMF1VkkOb9Ttr6tHcMlyPDL9w==",
+            "dependencies": {
+                "@intlify/shared": "9.13.1",
+                "source-map-js": "^1.0.2"
+            },
+            "engines": {
+                "node": ">= 16"
+            }
+        },
+        "node_modules/vue-i18n/node_modules/@intlify/shared": {
+            "version": "9.13.1",
+            "resolved": "https://registry.npmmirror.com/@intlify/shared/-/shared-9.13.1.tgz",
+            "integrity": "sha512-u3b6BKGhE6j/JeRU6C/RL2FgyJfy6LakbtfeVF8fJXURpZZTzfh3e05J0bu0XPw447Q6/WUp3C4ajv4TMS4YsQ==",
+            "engines": {
+                "node": ">= 16"
+            }
+        },
+        "node_modules/vue-router": {
+            "version": "4.3.2",
+            "resolved": "https://registry.npmmirror.com/vue-router/-/vue-router-4.3.2.tgz",
+            "integrity": "sha512-hKQJ1vDAZ5LVkKEnHhmm1f9pMiWIBNGF5AwU67PdH7TyXCj/a4hTccuUuYCAMgJK6rO/NVYtQIEN3yL8CECa7Q==",
+            "dependencies": {
+                "@vue/devtools-api": "^6.5.1"
+            },
+            "peerDependencies": {
+                "vue": "^3.2.0"
+            }
+        },
+        "node_modules/vue-template-compiler": {
+            "version": "2.7.16",
+            "resolved": "https://registry.npmmirror.com/vue-template-compiler/-/vue-template-compiler-2.7.16.tgz",
+            "integrity": "sha512-AYbUWAJHLGGQM7+cNTELw+KsOG9nl2CnSv467WobS5Cv9uk3wFcnr1Etsz2sEIHEZvw1U+o9mRlEO6QbZvUPGQ==",
+            "dev": true,
+            "dependencies": {
+                "de-indent": "^1.0.2",
+                "he": "^1.2.0"
+            }
+        },
+        "node_modules/vue-tsc": {
+            "version": "1.8.27",
+            "resolved": "https://registry.npmmirror.com/vue-tsc/-/vue-tsc-1.8.27.tgz",
+            "integrity": "sha512-WesKCAZCRAbmmhuGl3+VrdWItEvfoFIPXOvUJkjULi+x+6G/Dy69yO3TBRJDr9eUlmsNAwVmxsNZxvHKzbkKdg==",
+            "dev": true,
+            "dependencies": {
+                "@volar/typescript": "~1.11.1",
+                "@vue/language-core": "1.8.27",
+                "semver": "^7.5.4"
+            },
+            "bin": {
+                "vue-tsc": "bin/vue-tsc.js"
+            },
+            "peerDependencies": {
+                "typescript": "*"
+            }
+        },
+        "node_modules/vue-tsc/node_modules/semver": {
+            "version": "7.6.2",
+            "resolved": "https://registry.npmmirror.com/semver/-/semver-7.6.2.tgz",
+            "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
+            "dev": true,
+            "bin": {
+                "semver": "bin/semver.js"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/vue/node_modules/@vue/compiler-core": {
+            "version": "3.4.27",
+            "resolved": "https://registry.npmmirror.com/@vue/compiler-core/-/compiler-core-3.4.27.tgz",
+            "integrity": "sha512-E+RyqY24KnyDXsCuQrI+mlcdW3ALND6U7Gqa/+bVwbcpcR3BRRIckFoz7Qyd4TTlnugtwuI7YgjbvsLmxb+yvg==",
+            "dependencies": {
+                "@babel/parser": "^7.24.4",
+                "@vue/shared": "3.4.27",
+                "entities": "^4.5.0",
+                "estree-walker": "^2.0.2",
+                "source-map-js": "^1.2.0"
+            }
+        },
+        "node_modules/vue/node_modules/@vue/compiler-dom": {
+            "version": "3.4.27",
+            "resolved": "https://registry.npmmirror.com/@vue/compiler-dom/-/compiler-dom-3.4.27.tgz",
+            "integrity": "sha512-kUTvochG/oVgE1w5ViSr3KUBh9X7CWirebA3bezTbB5ZKBQZwR2Mwj9uoSKRMFcz4gSMzzLXBPD6KpCLb9nvWw==",
+            "dependencies": {
+                "@vue/compiler-core": "3.4.27",
+                "@vue/shared": "3.4.27"
+            }
+        },
+        "node_modules/vue/node_modules/@vue/compiler-sfc": {
+            "version": "3.4.27",
+            "resolved": "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-3.4.27.tgz",
+            "integrity": "sha512-nDwntUEADssW8e0rrmE0+OrONwmRlegDA1pD6QhVeXxjIytV03yDqTey9SBDiALsvAd5U4ZrEKbMyVXhX6mCGA==",
+            "dependencies": {
+                "@babel/parser": "^7.24.4",
+                "@vue/compiler-core": "3.4.27",
+                "@vue/compiler-dom": "3.4.27",
+                "@vue/compiler-ssr": "3.4.27",
+                "@vue/shared": "3.4.27",
+                "estree-walker": "^2.0.2",
+                "magic-string": "^0.30.10",
+                "postcss": "^8.4.38",
+                "source-map-js": "^1.2.0"
+            }
+        },
+        "node_modules/vue/node_modules/@vue/compiler-ssr": {
+            "version": "3.4.27",
+            "resolved": "https://registry.npmmirror.com/@vue/compiler-ssr/-/compiler-ssr-3.4.27.tgz",
+            "integrity": "sha512-CVRzSJIltzMG5FcidsW0jKNQnNRYC8bT21VegyMMtHmhW3UOI7knmUehzswXLrExDLE6lQCZdrhD4ogI7c+vuw==",
+            "dependencies": {
+                "@vue/compiler-dom": "3.4.27",
+                "@vue/shared": "3.4.27"
+            }
+        },
+        "node_modules/vue/node_modules/@vue/shared": {
+            "version": "3.4.27",
+            "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.4.27.tgz",
+            "integrity": "sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA=="
+        },
+        "node_modules/w3c-hr-time": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmmirror.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
+            "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
+            "deprecated": "Use your platform's native performance.now() and performance.timeOrigin.",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "browser-process-hrtime": "^1.0.0"
+            }
+        },
+        "node_modules/w3c-xmlserializer": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz",
+            "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "xml-name-validator": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/walker": {
+            "version": "1.0.8",
+            "resolved": "https://registry.npmmirror.com/walker/-/walker-1.0.8.tgz",
+            "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "makeerror": "1.0.12"
+            }
+        },
+        "node_modules/webidl-conversions": {
+            "version": "6.1.0",
+            "resolved": "https://registry.npmmirror.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
+            "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=10.4"
+            }
+        },
+        "node_modules/webpack-sources": {
+            "version": "1.4.3",
+            "resolved": "https://registry.npmmirror.com/webpack-sources/-/webpack-sources-1.4.3.tgz",
+            "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+            "dev": true,
+            "dependencies": {
+                "source-list-map": "^2.0.0",
+                "source-map": "~0.6.1"
+            }
+        },
+        "node_modules/webpack-virtual-modules": {
+            "version": "0.5.0",
+            "resolved": "https://registry.npmmirror.com/webpack-virtual-modules/-/webpack-virtual-modules-0.5.0.tgz",
+            "integrity": "sha512-kyDivFZ7ZM0BVOUteVbDFhlRt7Ah/CSPwJdi8hBpkK7QLumUqdLtVfm/PX/hkcnrvr0i77fO5+TjZ94Pe+C9iw==",
+            "dev": true
+        },
+        "node_modules/weixin-js-sdk": {
+            "version": "1.6.5",
+            "resolved": "https://registry.npmmirror.com/weixin-js-sdk/-/weixin-js-sdk-1.6.5.tgz",
+            "integrity": "sha512-Gph1WAWB2YN/lMOFB/ymb+hbU/wYazzJgu6PMMktCy9cSCeW5wA6Zwt0dpahJbJ+RJEwtTv2x9iIu0U4enuVSQ=="
+        },
+        "node_modules/whatwg-encoding": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmmirror.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
+            "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "iconv-lite": "0.4.24"
+            }
+        },
+        "node_modules/whatwg-mimetype": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmmirror.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
+            "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/whatwg-url": {
+            "version": "8.7.0",
+            "resolved": "https://registry.npmmirror.com/whatwg-url/-/whatwg-url-8.7.0.tgz",
+            "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "lodash": "^4.7.0",
+                "tr46": "^2.1.0",
+                "webidl-conversions": "^6.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/which": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmmirror.com/which/-/which-2.0.2.tgz",
+            "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+            "dev": true,
+            "dependencies": {
+                "isexe": "^2.0.0"
+            },
+            "bin": {
+                "node-which": "bin/node-which"
+            },
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/which-module": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/which-module/-/which-module-2.0.1.tgz",
+            "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ=="
+        },
+        "node_modules/windicss": {
+            "version": "3.5.6",
+            "resolved": "https://registry.npmmirror.com/windicss/-/windicss-3.5.6.tgz",
+            "integrity": "sha512-P1mzPEjgFMZLX0ZqfFht4fhV/FX8DTG7ERG1fBLiWvd34pTLVReS5CVsewKn9PApSgXnVfPWwvq+qUsRwpnwFA==",
+            "dev": true,
+            "bin": {
+                "windicss": "cli/index.js"
+            },
+            "engines": {
+                "node": ">= 12"
+            }
+        },
+        "node_modules/windicss-webpack-plugin": {
+            "version": "1.8.0",
+            "resolved": "https://registry.npmmirror.com/windicss-webpack-plugin/-/windicss-webpack-plugin-1.8.0.tgz",
+            "integrity": "sha512-zCzNLJ4hjgl5A2+mq8XlPtbvM5RONNz/ol93YG9tcMSn+aH/6Ll/lA5UDnVJluBr8b2Ch5C/GIqXcIMGG8mmdA==",
+            "dev": true,
+            "dependencies": {
+                "@windicss/plugin-utils": "^1.9.1",
+                "debug": "^4.3.4",
+                "get-port": "^6.1.2",
+                "loader-utils": "^2.0.0",
+                "lodash": "^4.17.21",
+                "pathe": "^1.1.0",
+                "webpack-virtual-modules": "^0.5.0",
+                "windicss": "^3.5.6"
+            }
+        },
+        "node_modules/windicss-webpack-plugin/node_modules/loader-utils": {
+            "version": "2.0.4",
+            "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.4.tgz",
+            "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+            "dev": true,
+            "dependencies": {
+                "big.js": "^5.2.2",
+                "emojis-list": "^3.0.0",
+                "json5": "^2.1.2"
+            },
+            "engines": {
+                "node": ">=8.9.0"
+            }
+        },
+        "node_modules/wrap-ansi": {
+            "version": "7.0.0",
+            "resolved": "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+            "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "ansi-styles": "^4.0.0",
+                "string-width": "^4.1.0",
+                "strip-ansi": "^6.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/wrap-ansi/node_modules/ansi-styles": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "color-convert": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/wrap-ansi/node_modules/color-convert": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "color-name": "~1.1.4"
+            },
+            "engines": {
+                "node": ">=7.0.0"
+            }
+        },
+        "node_modules/wrap-ansi/node_modules/color-name": {
+            "version": "1.1.4",
+            "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/wrappy": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmmirror.com/wrappy/-/wrappy-1.0.2.tgz",
+            "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+            "dev": true
+        },
+        "node_modules/write-file-atomic": {
+            "version": "3.0.3",
+            "resolved": "https://registry.npmmirror.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
+            "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "imurmurhash": "^0.1.4",
+                "is-typedarray": "^1.0.0",
+                "signal-exit": "^3.0.2",
+                "typedarray-to-buffer": "^3.1.5"
+            }
+        },
+        "node_modules/ws": {
+            "version": "8.17.0",
+            "resolved": "https://registry.npmmirror.com/ws/-/ws-8.17.0.tgz",
+            "integrity": "sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow==",
+            "engines": {
+                "node": ">=10.0.0"
+            },
+            "peerDependencies": {
+                "bufferutil": "^4.0.1",
+                "utf-8-validate": ">=5.0.2"
+            },
+            "peerDependenciesMeta": {
+                "bufferutil": {
+                    "optional": true
+                },
+                "utf-8-validate": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/xhr": {
+            "version": "2.6.0",
+            "resolved": "https://registry.npmmirror.com/xhr/-/xhr-2.6.0.tgz",
+            "integrity": "sha512-/eCGLb5rxjx5e3mF1A7s+pLlR6CGyqWN91fv1JgER5mVWg1MZmlhBvy9kjcsOdRk8RrIujotWyJamfyrp+WIcA==",
+            "dependencies": {
+                "global": "~4.4.0",
+                "is-function": "^1.0.1",
+                "parse-headers": "^2.0.0",
+                "xtend": "^4.0.0"
+            }
+        },
+        "node_modules/xml-name-validator": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmmirror.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
+            "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/xml-parse-from-string": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmmirror.com/xml-parse-from-string/-/xml-parse-from-string-1.0.1.tgz",
+            "integrity": "sha512-ErcKwJTF54uRzzNMXq2X5sMIy88zJvfN2DmdoQvy7PAFJ+tPRU6ydWuOKNMyfmOjdyBQTFREi60s0Y0SyI0G0g=="
+        },
+        "node_modules/xml2js": {
+            "version": "0.5.0",
+            "resolved": "https://registry.npmmirror.com/xml2js/-/xml2js-0.5.0.tgz",
+            "integrity": "sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==",
+            "dependencies": {
+                "sax": ">=0.6.0",
+                "xmlbuilder": "~11.0.0"
+            },
+            "engines": {
+                "node": ">=4.0.0"
+            }
+        },
+        "node_modules/xmlbuilder": {
+            "version": "11.0.1",
+            "resolved": "https://registry.npmmirror.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
+            "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
+            "engines": {
+                "node": ">=4.0"
+            }
+        },
+        "node_modules/xmlchars": {
+            "version": "2.2.0",
+            "resolved": "https://registry.npmmirror.com/xmlchars/-/xmlchars-2.2.0.tgz",
+            "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
+            "dev": true,
+            "peer": true
+        },
+        "node_modules/xmlhttprequest": {
+            "version": "1.8.0",
+            "resolved": "https://registry.npmmirror.com/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz",
+            "integrity": "sha512-58Im/U0mlVBLM38NdZjHyhuMtCqa61469k2YP/AaPbvCoV9aQGUpbJBj1QRm2ytRiVQBD/fsw7L2bJGDVQswBA==",
+            "engines": {
+                "node": ">=0.4.0"
+            }
+        },
+        "node_modules/xregexp": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmmirror.com/xregexp/-/xregexp-3.1.0.tgz",
+            "integrity": "sha512-4Y1x6DyB8xRoxosooa6PlGWqmmSKatbzhrftZ7Purmm4B8R4qIEJG1A2hZsdz5DhmIqS0msC0I7KEq93GphEVg=="
+        },
+        "node_modules/xtend": {
+            "version": "4.0.2",
+            "resolved": "https://registry.npmmirror.com/xtend/-/xtend-4.0.2.tgz",
+            "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+            "engines": {
+                "node": ">=0.4"
+            }
+        },
+        "node_modules/y18n": {
+            "version": "5.0.8",
+            "resolved": "https://registry.npmmirror.com/y18n/-/y18n-5.0.8.tgz",
+            "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/yallist": {
+            "version": "3.1.1",
+            "resolved": "https://registry.npmmirror.com/yallist/-/yallist-3.1.1.tgz",
+            "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
+        },
+        "node_modules/yaml": {
+            "version": "1.10.2",
+            "resolved": "https://registry.npmmirror.com/yaml/-/yaml-1.10.2.tgz",
+            "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/yargs": {
+            "version": "16.2.0",
+            "resolved": "https://registry.npmmirror.com/yargs/-/yargs-16.2.0.tgz",
+            "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+            "dev": true,
+            "peer": true,
+            "dependencies": {
+                "cliui": "^7.0.2",
+                "escalade": "^3.1.1",
+                "get-caller-file": "^2.0.5",
+                "require-directory": "^2.1.1",
+                "string-width": "^4.2.0",
+                "y18n": "^5.0.5",
+                "yargs-parser": "^20.2.2"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/yargs-parser": {
+            "version": "20.2.9",
+            "resolved": "https://registry.npmmirror.com/yargs-parser/-/yargs-parser-20.2.9.tgz",
+            "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+            "dev": true,
+            "peer": true,
+            "engines": {
+                "node": ">=10"
+            }
+        }
+    },
+    "dependencies": {
+        "@ampproject/remapping": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmmirror.com/@ampproject/remapping/-/remapping-2.3.0.tgz",
+            "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
+            "requires": {
+                "@jridgewell/gen-mapping": "^0.3.5",
+                "@jridgewell/trace-mapping": "^0.3.24"
+            }
+        },
+        "@antfu/utils": {
+            "version": "0.7.8",
+            "resolved": "https://registry.npmmirror.com/@antfu/utils/-/utils-0.7.8.tgz",
+            "integrity": "sha512-rWQkqXRESdjXtc+7NRfK9lASQjpXJu1ayp7qi1d23zZorY+wBHVLHHoVcMsEnkqEBWTFqbztO7/QdJFzyEcLTg==",
+            "dev": true
+        },
+        "@babel/code-frame": {
+            "version": "7.24.2",
+            "resolved": "https://registry.npmmirror.com/@babel/code-frame/-/code-frame-7.24.2.tgz",
+            "integrity": "sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==",
+            "requires": {
+                "@babel/highlight": "^7.24.2",
+                "picocolors": "^1.0.0"
+            }
+        },
+        "@babel/compat-data": {
+            "version": "7.24.4",
+            "resolved": "https://registry.npmmirror.com/@babel/compat-data/-/compat-data-7.24.4.tgz",
+            "integrity": "sha512-vg8Gih2MLK+kOkHJp4gBEIkyaIi00jgWot2D9QOmmfLC8jINSOzmCLta6Bvz/JSBCqnegV0L80jhxkol5GWNfQ=="
+        },
+        "@babel/core": {
+            "version": "7.24.5",
+            "resolved": "https://registry.npmmirror.com/@babel/core/-/core-7.24.5.tgz",
+            "integrity": "sha512-tVQRucExLQ02Boi4vdPp49svNGcfL2GhdTCT9aldhXgCJVAI21EtRfBettiuLUwce/7r6bFdgs6JFkcdTiFttA==",
+            "requires": {
+                "@ampproject/remapping": "^2.2.0",
+                "@babel/code-frame": "^7.24.2",
+                "@babel/generator": "^7.24.5",
+                "@babel/helper-compilation-targets": "^7.23.6",
+                "@babel/helper-module-transforms": "^7.24.5",
+                "@babel/helpers": "^7.24.5",
+                "@babel/parser": "^7.24.5",
+                "@babel/template": "^7.24.0",
+                "@babel/traverse": "^7.24.5",
+                "@babel/types": "^7.24.5",
+                "convert-source-map": "^2.0.0",
+                "debug": "^4.1.0",
+                "gensync": "^1.0.0-beta.2",
+                "json5": "^2.2.3",
+                "semver": "^6.3.1"
+            }
+        },
+        "@babel/generator": {
+            "version": "7.24.5",
+            "resolved": "https://registry.npmmirror.com/@babel/generator/-/generator-7.24.5.tgz",
+            "integrity": "sha512-x32i4hEXvr+iI0NEoEfDKzlemF8AmtOP8CcrRaEcpzysWuoEb1KknpcvMsHKPONoKZiDuItklgWhB18xEhr9PA==",
+            "requires": {
+                "@babel/types": "^7.24.5",
+                "@jridgewell/gen-mapping": "^0.3.5",
+                "@jridgewell/trace-mapping": "^0.3.25",
+                "jsesc": "^2.5.1"
+            }
+        },
+        "@babel/helper-annotate-as-pure": {
+            "version": "7.22.5",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz",
+            "integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==",
+            "dev": true,
+            "requires": {
+                "@babel/types": "^7.22.5"
+            }
+        },
+        "@babel/helper-builder-binary-assignment-operator-visitor": {
+            "version": "7.22.15",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.15.tgz",
+            "integrity": "sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw==",
+            "dev": true,
+            "requires": {
+                "@babel/types": "^7.22.15"
+            }
+        },
+        "@babel/helper-compilation-targets": {
+            "version": "7.23.6",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz",
+            "integrity": "sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==",
+            "requires": {
+                "@babel/compat-data": "^7.23.5",
+                "@babel/helper-validator-option": "^7.23.5",
+                "browserslist": "^4.22.2",
+                "lru-cache": "^5.1.1",
+                "semver": "^6.3.1"
+            }
+        },
+        "@babel/helper-create-class-features-plugin": {
+            "version": "7.24.5",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.5.tgz",
+            "integrity": "sha512-uRc4Cv8UQWnE4NXlYTIIdM7wfFkOqlFztcC/gVXDKohKoVB3OyonfelUBaJzSwpBntZ2KYGF/9S7asCHsXwW6g==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-annotate-as-pure": "^7.22.5",
+                "@babel/helper-environment-visitor": "^7.22.20",
+                "@babel/helper-function-name": "^7.23.0",
+                "@babel/helper-member-expression-to-functions": "^7.24.5",
+                "@babel/helper-optimise-call-expression": "^7.22.5",
+                "@babel/helper-replace-supers": "^7.24.1",
+                "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
+                "@babel/helper-split-export-declaration": "^7.24.5",
+                "semver": "^6.3.1"
+            }
+        },
+        "@babel/helper-create-regexp-features-plugin": {
+            "version": "7.22.15",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.15.tgz",
+            "integrity": "sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-annotate-as-pure": "^7.22.5",
+                "regexpu-core": "^5.3.1",
+                "semver": "^6.3.1"
+            }
+        },
+        "@babel/helper-define-polyfill-provider": {
+            "version": "0.6.2",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.2.tgz",
+            "integrity": "sha512-LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-compilation-targets": "^7.22.6",
+                "@babel/helper-plugin-utils": "^7.22.5",
+                "debug": "^4.1.1",
+                "lodash.debounce": "^4.0.8",
+                "resolve": "^1.14.2"
+            }
+        },
+        "@babel/helper-environment-visitor": {
+            "version": "7.22.20",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
+            "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA=="
+        },
+        "@babel/helper-function-name": {
+            "version": "7.23.0",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
+            "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
+            "requires": {
+                "@babel/template": "^7.22.15",
+                "@babel/types": "^7.23.0"
+            }
+        },
+        "@babel/helper-hoist-variables": {
+            "version": "7.22.5",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
+            "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
+            "requires": {
+                "@babel/types": "^7.22.5"
+            }
+        },
+        "@babel/helper-member-expression-to-functions": {
+            "version": "7.24.5",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.5.tgz",
+            "integrity": "sha512-4owRteeihKWKamtqg4JmWSsEZU445xpFRXPEwp44HbgbxdWlUV1b4Agg4lkA806Lil5XM/e+FJyS0vj5T6vmcA==",
+            "dev": true,
+            "requires": {
+                "@babel/types": "^7.24.5"
+            }
+        },
+        "@babel/helper-module-imports": {
+            "version": "7.24.3",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-module-imports/-/helper-module-imports-7.24.3.tgz",
+            "integrity": "sha512-viKb0F9f2s0BCS22QSF308z/+1YWKV/76mwt61NBzS5izMzDPwdq1pTrzf+Li3npBWX9KdQbkeCt1jSAM7lZqg==",
+            "requires": {
+                "@babel/types": "^7.24.0"
+            }
+        },
+        "@babel/helper-module-transforms": {
+            "version": "7.24.5",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-module-transforms/-/helper-module-transforms-7.24.5.tgz",
+            "integrity": "sha512-9GxeY8c2d2mdQUP1Dye0ks3VDyIMS98kt/llQ2nUId8IsWqTF0l1LkSX0/uP7l7MCDrzXS009Hyhe2gzTiGW8A==",
+            "requires": {
+                "@babel/helper-environment-visitor": "^7.22.20",
+                "@babel/helper-module-imports": "^7.24.3",
+                "@babel/helper-simple-access": "^7.24.5",
+                "@babel/helper-split-export-declaration": "^7.24.5",
+                "@babel/helper-validator-identifier": "^7.24.5"
+            }
+        },
+        "@babel/helper-optimise-call-expression": {
+            "version": "7.22.5",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz",
+            "integrity": "sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==",
+            "dev": true,
+            "requires": {
+                "@babel/types": "^7.22.5"
+            }
+        },
+        "@babel/helper-plugin-utils": {
+            "version": "7.24.5",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.5.tgz",
+            "integrity": "sha512-xjNLDopRzW2o6ba0gKbkZq5YWEBaK3PCyTOY1K2P/O07LGMhMqlMXPxwN4S5/RhWuCobT8z0jrlKGlYmeR1OhQ==",
+            "dev": true
+        },
+        "@babel/helper-remap-async-to-generator": {
+            "version": "7.22.20",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz",
+            "integrity": "sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-annotate-as-pure": "^7.22.5",
+                "@babel/helper-environment-visitor": "^7.22.20",
+                "@babel/helper-wrap-function": "^7.22.20"
+            }
+        },
+        "@babel/helper-replace-supers": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-replace-supers/-/helper-replace-supers-7.24.1.tgz",
+            "integrity": "sha512-QCR1UqC9BzG5vZl8BMicmZ28RuUBnHhAMddD8yHFHDRH9lLTZ9uUPehX8ctVPT8l0TKblJidqcgUUKGVrePleQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-environment-visitor": "^7.22.20",
+                "@babel/helper-member-expression-to-functions": "^7.23.0",
+                "@babel/helper-optimise-call-expression": "^7.22.5"
+            }
+        },
+        "@babel/helper-simple-access": {
+            "version": "7.24.5",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-simple-access/-/helper-simple-access-7.24.5.tgz",
+            "integrity": "sha512-uH3Hmf5q5n7n8mz7arjUlDOCbttY/DW4DYhE6FUsjKJ/oYC1kQQUvwEQWxRwUpX9qQKRXeqLwWxrqilMrf32sQ==",
+            "requires": {
+                "@babel/types": "^7.24.5"
+            }
+        },
+        "@babel/helper-skip-transparent-expression-wrappers": {
+            "version": "7.22.5",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz",
+            "integrity": "sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==",
+            "dev": true,
+            "requires": {
+                "@babel/types": "^7.22.5"
+            }
+        },
+        "@babel/helper-split-export-declaration": {
+            "version": "7.24.5",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.5.tgz",
+            "integrity": "sha512-5CHncttXohrHk8GWOFCcCl4oRD9fKosWlIRgWm4ql9VYioKm52Mk2xsmoohvm7f3JoiLSM5ZgJuRaf5QZZYd3Q==",
+            "requires": {
+                "@babel/types": "^7.24.5"
+            }
+        },
+        "@babel/helper-string-parser": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-string-parser/-/helper-string-parser-7.24.1.tgz",
+            "integrity": "sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ=="
+        },
+        "@babel/helper-validator-identifier": {
+            "version": "7.24.5",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.5.tgz",
+            "integrity": "sha512-3q93SSKX2TWCG30M2G2kwaKeTYgEUp5Snjuj8qm729SObL6nbtUldAi37qbxkD5gg3xnBio+f9nqpSepGZMvxA=="
+        },
+        "@babel/helper-validator-option": {
+            "version": "7.23.5",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz",
+            "integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw=="
+        },
+        "@babel/helper-wrap-function": {
+            "version": "7.24.5",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-wrap-function/-/helper-wrap-function-7.24.5.tgz",
+            "integrity": "sha512-/xxzuNvgRl4/HLNKvnFwdhdgN3cpLxgLROeLDl83Yx0AJ1SGvq1ak0OszTOjDfiB8Vx03eJbeDWh9r+jCCWttw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-function-name": "^7.23.0",
+                "@babel/template": "^7.24.0",
+                "@babel/types": "^7.24.5"
+            }
+        },
+        "@babel/helpers": {
+            "version": "7.24.5",
+            "resolved": "https://registry.npmmirror.com/@babel/helpers/-/helpers-7.24.5.tgz",
+            "integrity": "sha512-CiQmBMMpMQHwM5m01YnrM6imUG1ebgYJ+fAIW4FZe6m4qHTPaRHti+R8cggAwkdz4oXhtO4/K9JWlh+8hIfR2Q==",
+            "requires": {
+                "@babel/template": "^7.24.0",
+                "@babel/traverse": "^7.24.5",
+                "@babel/types": "^7.24.5"
+            }
+        },
+        "@babel/highlight": {
+            "version": "7.24.5",
+            "resolved": "https://registry.npmmirror.com/@babel/highlight/-/highlight-7.24.5.tgz",
+            "integrity": "sha512-8lLmua6AVh/8SLJRRVD6V8p73Hir9w5mJrhE+IPpILG31KKlI9iz5zmBYKcWPS59qSfgP9RaSBQSHHE81WKuEw==",
+            "requires": {
+                "@babel/helper-validator-identifier": "^7.24.5",
+                "chalk": "^2.4.2",
+                "js-tokens": "^4.0.0",
+                "picocolors": "^1.0.0"
+            }
+        },
+        "@babel/parser": {
+            "version": "7.24.5",
+            "resolved": "https://registry.npmmirror.com/@babel/parser/-/parser-7.24.5.tgz",
+            "integrity": "sha512-EOv5IK8arwh3LI47dz1b0tKUb/1uhHAnHJOrjgtQMIpu1uXd9mlFrJg9IUgGUgZ41Ch0K8REPTYpO7B76b4vJg=="
+        },
+        "@babel/plugin-bugfix-firefox-class-in-computed-class-key": {
+            "version": "7.24.5",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.24.5.tgz",
+            "integrity": "sha512-LdXRi1wEMTrHVR4Zc9F8OewC3vdm5h4QB6L71zy6StmYeqGi1b3ttIO8UC+BfZKcH9jdr4aI249rBkm+3+YvHw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-environment-visitor": "^7.22.20",
+                "@babel/helper-plugin-utils": "^7.24.5"
+            }
+        },
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.24.1.tgz",
+            "integrity": "sha512-y4HqEnkelJIOQGd+3g1bTeKsA5c6qM7eOn7VggGVbBc0y8MLSKHacwcIE2PplNlQSj0PqS9rrXL/nkPVK+kUNg==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.24.0"
+            }
+        },
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.1.tgz",
+            "integrity": "sha512-Hj791Ii4ci8HqnaKHAlLNs+zaLXb0EzSDhiAWp5VNlyvCNymYfacs64pxTxbH1znW/NcArSmwpmG9IKE/TUVVQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.24.0",
+                "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
+                "@babel/plugin-transform-optional-chaining": "^7.24.1"
+            }
+        },
+        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.24.1.tgz",
+            "integrity": "sha512-m9m/fXsXLiHfwdgydIFnpk+7jlVbnvlK5B2EKiPdLUb6WX654ZaaEWJUjk8TftRbZpK0XibovlLWX4KIZhV6jw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-environment-visitor": "^7.22.20",
+                "@babel/helper-plugin-utils": "^7.24.0"
+            }
+        },
+        "@babel/plugin-proposal-private-property-in-object": {
+            "version": "7.21.0-placeholder-for-preset-env.2",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz",
+            "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==",
+            "dev": true,
+            "requires": {}
+        },
+        "@babel/plugin-syntax-async-generators": {
+            "version": "7.8.4",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+            "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.0"
+            }
+        },
+        "@babel/plugin-syntax-bigint": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
+            "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.0"
+            }
+        },
+        "@babel/plugin-syntax-class-properties": {
+            "version": "7.12.13",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
+            "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.12.13"
+            }
+        },
+        "@babel/plugin-syntax-class-static-block": {
+            "version": "7.14.5",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
+            "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.14.5"
+            }
+        },
+        "@babel/plugin-syntax-dynamic-import": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
+            "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.0"
+            }
+        },
+        "@babel/plugin-syntax-export-namespace-from": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
+            "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.3"
+            }
+        },
+        "@babel/plugin-syntax-import-assertions": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.24.1.tgz",
+            "integrity": "sha512-IuwnI5XnuF189t91XbxmXeCDz3qs6iDRO7GJ++wcfgeXNs/8FmIlKcpDSXNVyuLQxlwvskmI3Ct73wUODkJBlQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.24.0"
+            }
+        },
+        "@babel/plugin-syntax-import-attributes": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.24.1.tgz",
+            "integrity": "sha512-zhQTMH0X2nVLnb04tz+s7AMuasX8U0FnpE+nHTOhSOINjWMnopoZTxtIKsd45n4GQ/HIZLyfIpoul8e2m0DnRA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.24.0"
+            }
+        },
+        "@babel/plugin-syntax-import-meta": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
+            "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.10.4"
+            }
+        },
+        "@babel/plugin-syntax-json-strings": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+            "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.0"
+            }
+        },
+        "@babel/plugin-syntax-jsx": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.1.tgz",
+            "integrity": "sha512-2eCtxZXf+kbkMIsXS4poTvT4Yu5rXiRa+9xGVT56raghjmBTKMpFNc9R4IDiB4emao9eO22Ox7CxuJG7BgExqA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.24.0"
+            }
+        },
+        "@babel/plugin-syntax-logical-assignment-operators": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
+            "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.10.4"
+            }
+        },
+        "@babel/plugin-syntax-nullish-coalescing-operator": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+            "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.0"
+            }
+        },
+        "@babel/plugin-syntax-numeric-separator": {
+            "version": "7.10.4",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
+            "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.10.4"
+            }
+        },
+        "@babel/plugin-syntax-object-rest-spread": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+            "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.0"
+            }
+        },
+        "@babel/plugin-syntax-optional-catch-binding": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+            "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.0"
+            }
+        },
+        "@babel/plugin-syntax-optional-chaining": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+            "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.8.0"
+            }
+        },
+        "@babel/plugin-syntax-private-property-in-object": {
+            "version": "7.14.5",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
+            "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.14.5"
+            }
+        },
+        "@babel/plugin-syntax-top-level-await": {
+            "version": "7.14.5",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
+            "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.14.5"
+            }
+        },
+        "@babel/plugin-syntax-typescript": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.24.1.tgz",
+            "integrity": "sha512-Yhnmvy5HZEnHUty6i++gcfH1/l68AHnItFHnaCv6hn9dNh0hQvvQJsxpi4BMBFN5DLeHBuucT/0DgzXif/OyRw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.24.0"
+            }
+        },
+        "@babel/plugin-syntax-unicode-sets-regex": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz",
+            "integrity": "sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-create-regexp-features-plugin": "^7.18.6",
+                "@babel/helper-plugin-utils": "^7.18.6"
+            }
+        },
+        "@babel/plugin-transform-arrow-functions": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.1.tgz",
+            "integrity": "sha512-ngT/3NkRhsaep9ck9uj2Xhv9+xB1zShY3tM3g6om4xxCELwCDN4g4Aq5dRn48+0hasAql7s2hdBOysCfNpr4fw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.24.0"
+            }
+        },
+        "@babel/plugin-transform-async-generator-functions": {
+            "version": "7.24.3",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.24.3.tgz",
+            "integrity": "sha512-Qe26CMYVjpQxJ8zxM1340JFNjZaF+ISWpr1Kt/jGo+ZTUzKkfw/pphEWbRCb+lmSM6k/TOgfYLvmbHkUQ0asIg==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-environment-visitor": "^7.22.20",
+                "@babel/helper-plugin-utils": "^7.24.0",
+                "@babel/helper-remap-async-to-generator": "^7.22.20",
+                "@babel/plugin-syntax-async-generators": "^7.8.4"
+            }
+        },
+        "@babel/plugin-transform-async-to-generator": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.24.1.tgz",
+            "integrity": "sha512-AawPptitRXp1y0n4ilKcGbRYWfbbzFWz2NqNu7dacYDtFtz0CMjG64b3LQsb3KIgnf4/obcUL78hfaOS7iCUfw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-module-imports": "^7.24.1",
+                "@babel/helper-plugin-utils": "^7.24.0",
+                "@babel/helper-remap-async-to-generator": "^7.22.20"
+            }
+        },
+        "@babel/plugin-transform-block-scoped-functions": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.1.tgz",
+            "integrity": "sha512-TWWC18OShZutrv9C6mye1xwtam+uNi2bnTOCBUd5sZxyHOiWbU6ztSROofIMrK84uweEZC219POICK/sTYwfgg==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.24.0"
+            }
+        },
+        "@babel/plugin-transform-block-scoping": {
+            "version": "7.24.5",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.24.5.tgz",
+            "integrity": "sha512-sMfBc3OxghjC95BkYrYocHL3NaOplrcaunblzwXhGmlPwpmfsxr4vK+mBBt49r+S240vahmv+kUxkeKgs+haCw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.24.5"
+            }
+        },
+        "@babel/plugin-transform-class-properties": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.24.1.tgz",
+            "integrity": "sha512-OMLCXi0NqvJfORTaPQBwqLXHhb93wkBKZ4aNwMl6WtehO7ar+cmp+89iPEQPqxAnxsOKTaMcs3POz3rKayJ72g==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-create-class-features-plugin": "^7.24.1",
+                "@babel/helper-plugin-utils": "^7.24.0"
+            }
+        },
+        "@babel/plugin-transform-class-static-block": {
+            "version": "7.24.4",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.24.4.tgz",
+            "integrity": "sha512-B8q7Pz870Hz/q9UgP8InNpY01CSLDSCyqX7zcRuv3FcPl87A2G17lASroHWaCtbdIcbYzOZ7kWmXFKbijMSmFg==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-create-class-features-plugin": "^7.24.4",
+                "@babel/helper-plugin-utils": "^7.24.0",
+                "@babel/plugin-syntax-class-static-block": "^7.14.5"
+            }
+        },
+        "@babel/plugin-transform-classes": {
+            "version": "7.24.5",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.24.5.tgz",
+            "integrity": "sha512-gWkLP25DFj2dwe9Ck8uwMOpko4YsqyfZJrOmqqcegeDYEbp7rmn4U6UQZNj08UF6MaX39XenSpKRCvpDRBtZ7Q==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-annotate-as-pure": "^7.22.5",
+                "@babel/helper-compilation-targets": "^7.23.6",
+                "@babel/helper-environment-visitor": "^7.22.20",
+                "@babel/helper-function-name": "^7.23.0",
+                "@babel/helper-plugin-utils": "^7.24.5",
+                "@babel/helper-replace-supers": "^7.24.1",
+                "@babel/helper-split-export-declaration": "^7.24.5",
+                "globals": "^11.1.0"
+            }
+        },
+        "@babel/plugin-transform-computed-properties": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.1.tgz",
+            "integrity": "sha512-5pJGVIUfJpOS+pAqBQd+QMaTD2vCL/HcePooON6pDpHgRp4gNRmzyHTPIkXntwKsq3ayUFVfJaIKPw2pOkOcTw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.24.0",
+                "@babel/template": "^7.24.0"
+            }
+        },
+        "@babel/plugin-transform-destructuring": {
+            "version": "7.24.5",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.5.tgz",
+            "integrity": "sha512-SZuuLyfxvsm+Ah57I/i1HVjveBENYK9ue8MJ7qkc7ndoNjqquJiElzA7f5yaAXjyW2hKojosOTAQQRX50bPSVg==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.24.5"
+            }
+        },
+        "@babel/plugin-transform-dotall-regex": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.24.1.tgz",
+            "integrity": "sha512-p7uUxgSoZwZ2lPNMzUkqCts3xlp8n+o05ikjy7gbtFJSt9gdU88jAmtfmOxHM14noQXBxfgzf2yRWECiNVhTCw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-create-regexp-features-plugin": "^7.22.15",
+                "@babel/helper-plugin-utils": "^7.24.0"
+            }
+        },
+        "@babel/plugin-transform-duplicate-keys": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.24.1.tgz",
+            "integrity": "sha512-msyzuUnvsjsaSaocV6L7ErfNsa5nDWL1XKNnDePLgmz+WdU4w/J8+AxBMrWfi9m4IxfL5sZQKUPQKDQeeAT6lA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.24.0"
+            }
+        },
+        "@babel/plugin-transform-dynamic-import": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.24.1.tgz",
+            "integrity": "sha512-av2gdSTyXcJVdI+8aFZsCAtR29xJt0S5tas+Ef8NvBNmD1a+N/3ecMLeMBgfcK+xzsjdLDT6oHt+DFPyeqUbDA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.24.0",
+                "@babel/plugin-syntax-dynamic-import": "^7.8.3"
+            }
+        },
+        "@babel/plugin-transform-exponentiation-operator": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.24.1.tgz",
+            "integrity": "sha512-U1yX13dVBSwS23DEAqU+Z/PkwE9/m7QQy8Y9/+Tdb8UWYaGNDYwTLi19wqIAiROr8sXVum9A/rtiH5H0boUcTw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.15",
+                "@babel/helper-plugin-utils": "^7.24.0"
+            }
+        },
+        "@babel/plugin-transform-export-namespace-from": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.24.1.tgz",
+            "integrity": "sha512-Ft38m/KFOyzKw2UaJFkWG9QnHPG/Q/2SkOrRk4pNBPg5IPZ+dOxcmkK5IyuBcxiNPyyYowPGUReyBvrvZs7IlQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.24.0",
+                "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
+            }
+        },
+        "@babel/plugin-transform-for-of": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.1.tgz",
+            "integrity": "sha512-OxBdcnF04bpdQdR3i4giHZNZQn7cm8RQKcSwA17wAAqEELo1ZOwp5FFgeptWUQXFyT9kwHo10aqqauYkRZPCAg==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.24.0",
+                "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5"
+            }
+        },
+        "@babel/plugin-transform-function-name": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.24.1.tgz",
+            "integrity": "sha512-BXmDZpPlh7jwicKArQASrj8n22/w6iymRnvHYYd2zO30DbE277JO20/7yXJT3QxDPtiQiOxQBbZH4TpivNXIxA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-compilation-targets": "^7.23.6",
+                "@babel/helper-function-name": "^7.23.0",
+                "@babel/helper-plugin-utils": "^7.24.0"
+            }
+        },
+        "@babel/plugin-transform-json-strings": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.24.1.tgz",
+            "integrity": "sha512-U7RMFmRvoasscrIFy5xA4gIp8iWnWubnKkKuUGJjsuOH7GfbMkB+XZzeslx2kLdEGdOJDamEmCqOks6e8nv8DQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.24.0",
+                "@babel/plugin-syntax-json-strings": "^7.8.3"
+            }
+        },
+        "@babel/plugin-transform-literals": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.24.1.tgz",
+            "integrity": "sha512-zn9pwz8U7nCqOYIiBaOxoQOtYmMODXTJnkxG4AtX8fPmnCRYWBOHD0qcpwS9e2VDSp1zNJYpdnFMIKb8jmwu6g==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.24.0"
+            }
+        },
+        "@babel/plugin-transform-logical-assignment-operators": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.24.1.tgz",
+            "integrity": "sha512-OhN6J4Bpz+hIBqItTeWJujDOfNP+unqv/NJgyhlpSqgBTPm37KkMmZV6SYcOj+pnDbdcl1qRGV/ZiIjX9Iy34w==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.24.0",
+                "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
+            }
+        },
+        "@babel/plugin-transform-member-expression-literals": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.24.1.tgz",
+            "integrity": "sha512-4ojai0KysTWXzHseJKa1XPNXKRbuUrhkOPY4rEGeR+7ChlJVKxFa3H3Bz+7tWaGKgJAXUWKOGmltN+u9B3+CVg==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.24.0"
+            }
+        },
+        "@babel/plugin-transform-modules-amd": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.24.1.tgz",
+            "integrity": "sha512-lAxNHi4HVtjnHd5Rxg3D5t99Xm6H7b04hUS7EHIXcUl2EV4yl1gWdqZrNzXnSrHveL9qMdbODlLF55mvgjAfaQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-module-transforms": "^7.23.3",
+                "@babel/helper-plugin-utils": "^7.24.0"
+            }
+        },
+        "@babel/plugin-transform-modules-commonjs": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.1.tgz",
+            "integrity": "sha512-szog8fFTUxBfw0b98gEWPaEqF42ZUD/T3bkynW/wtgx2p/XCP55WEsb+VosKceRSd6njipdZvNogqdtI4Q0chw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-module-transforms": "^7.23.3",
+                "@babel/helper-plugin-utils": "^7.24.0",
+                "@babel/helper-simple-access": "^7.22.5"
+            }
+        },
+        "@babel/plugin-transform-modules-systemjs": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.24.1.tgz",
+            "integrity": "sha512-mqQ3Zh9vFO1Tpmlt8QPnbwGHzNz3lpNEMxQb1kAemn/erstyqw1r9KeOlOfo3y6xAnFEcOv2tSyrXfmMk+/YZA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-hoist-variables": "^7.22.5",
+                "@babel/helper-module-transforms": "^7.23.3",
+                "@babel/helper-plugin-utils": "^7.24.0",
+                "@babel/helper-validator-identifier": "^7.22.20"
+            }
+        },
+        "@babel/plugin-transform-modules-umd": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.24.1.tgz",
+            "integrity": "sha512-tuA3lpPj+5ITfcCluy6nWonSL7RvaG0AOTeAuvXqEKS34lnLzXpDb0dcP6K8jD0zWZFNDVly90AGFJPnm4fOYg==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-module-transforms": "^7.23.3",
+                "@babel/helper-plugin-utils": "^7.24.0"
+            }
+        },
+        "@babel/plugin-transform-named-capturing-groups-regex": {
+            "version": "7.22.5",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz",
+            "integrity": "sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+                "@babel/helper-plugin-utils": "^7.22.5"
+            }
+        },
+        "@babel/plugin-transform-new-target": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.24.1.tgz",
+            "integrity": "sha512-/rurytBM34hYy0HKZQyA0nHbQgQNFm4Q/BOc9Hflxi2X3twRof7NaE5W46j4kQitm7SvACVRXsa6N/tSZxvPug==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.24.0"
+            }
+        },
+        "@babel/plugin-transform-nullish-coalescing-operator": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.24.1.tgz",
+            "integrity": "sha512-iQ+caew8wRrhCikO5DrUYx0mrmdhkaELgFa+7baMcVuhxIkN7oxt06CZ51D65ugIb1UWRQ8oQe+HXAVM6qHFjw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.24.0",
+                "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+            }
+        },
+        "@babel/plugin-transform-numeric-separator": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.24.1.tgz",
+            "integrity": "sha512-7GAsGlK4cNL2OExJH1DzmDeKnRv/LXq0eLUSvudrehVA5Rgg4bIrqEUW29FbKMBRT0ztSqisv7kjP+XIC4ZMNw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.24.0",
+                "@babel/plugin-syntax-numeric-separator": "^7.10.4"
+            }
+        },
+        "@babel/plugin-transform-object-rest-spread": {
+            "version": "7.24.5",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.5.tgz",
+            "integrity": "sha512-7EauQHszLGM3ay7a161tTQH7fj+3vVM/gThlz5HpFtnygTxjrlvoeq7MPVA1Vy9Q555OB8SnAOsMkLShNkkrHA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-compilation-targets": "^7.23.6",
+                "@babel/helper-plugin-utils": "^7.24.5",
+                "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+                "@babel/plugin-transform-parameters": "^7.24.5"
+            }
+        },
+        "@babel/plugin-transform-object-super": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.1.tgz",
+            "integrity": "sha512-oKJqR3TeI5hSLRxudMjFQ9re9fBVUU0GICqM3J1mi8MqlhVr6hC/ZN4ttAyMuQR6EZZIY6h/exe5swqGNNIkWQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.24.0",
+                "@babel/helper-replace-supers": "^7.24.1"
+            }
+        },
+        "@babel/plugin-transform-optional-catch-binding": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.24.1.tgz",
+            "integrity": "sha512-oBTH7oURV4Y+3EUrf6cWn1OHio3qG/PVwO5J03iSJmBg6m2EhKjkAu/xuaXaYwWW9miYtvbWv4LNf0AmR43LUA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.24.0",
+                "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
+            }
+        },
+        "@babel/plugin-transform-optional-chaining": {
+            "version": "7.24.5",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.5.tgz",
+            "integrity": "sha512-xWCkmwKT+ihmA6l7SSTpk8e4qQl/274iNbSKRRS8mpqFR32ksy36+a+LWY8OXCCEefF8WFlnOHVsaDI2231wBg==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.24.5",
+                "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
+                "@babel/plugin-syntax-optional-chaining": "^7.8.3"
+            }
+        },
+        "@babel/plugin-transform-parameters": {
+            "version": "7.24.5",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.5.tgz",
+            "integrity": "sha512-9Co00MqZ2aoky+4j2jhofErthm6QVLKbpQrvz20c3CH9KQCLHyNB+t2ya4/UrRpQGR+Wrwjg9foopoeSdnHOkA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.24.5"
+            }
+        },
+        "@babel/plugin-transform-private-methods": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.24.1.tgz",
+            "integrity": "sha512-tGvisebwBO5em4PaYNqt4fkw56K2VALsAbAakY0FjTYqJp7gfdrgr7YX76Or8/cpik0W6+tj3rZ0uHU9Oil4tw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-create-class-features-plugin": "^7.24.1",
+                "@babel/helper-plugin-utils": "^7.24.0"
+            }
+        },
+        "@babel/plugin-transform-private-property-in-object": {
+            "version": "7.24.5",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.5.tgz",
+            "integrity": "sha512-JM4MHZqnWR04jPMujQDTBVRnqxpLLpx2tkn7iPn+Hmsc0Gnb79yvRWOkvqFOx3Z7P7VxiRIR22c4eGSNj87OBQ==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-annotate-as-pure": "^7.22.5",
+                "@babel/helper-create-class-features-plugin": "^7.24.5",
+                "@babel/helper-plugin-utils": "^7.24.5",
+                "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
+            }
+        },
+        "@babel/plugin-transform-property-literals": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.1.tgz",
+            "integrity": "sha512-LetvD7CrHmEx0G442gOomRr66d7q8HzzGGr4PMHGr+5YIm6++Yke+jxj246rpvsbyhJwCLxcTn6zW1P1BSenqA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.24.0"
+            }
+        },
+        "@babel/plugin-transform-regenerator": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.24.1.tgz",
+            "integrity": "sha512-sJwZBCzIBE4t+5Q4IGLaaun5ExVMRY0lYwos/jNecjMrVCygCdph3IKv0tkP5Fc87e/1+bebAmEAGBfnRD+cnw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.24.0",
+                "regenerator-transform": "^0.15.2"
+            }
+        },
+        "@babel/plugin-transform-reserved-words": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.24.1.tgz",
+            "integrity": "sha512-JAclqStUfIwKN15HrsQADFgeZt+wexNQ0uLhuqvqAUFoqPMjEcFCYZBhq0LUdz6dZK/mD+rErhW71fbx8RYElg==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.24.0"
+            }
+        },
+        "@babel/plugin-transform-shorthand-properties": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.1.tgz",
+            "integrity": "sha512-LyjVB1nsJ6gTTUKRjRWx9C1s9hE7dLfP/knKdrfeH9UPtAGjYGgxIbFfx7xyLIEWs7Xe1Gnf8EWiUqfjLhInZA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.24.0"
+            }
+        },
+        "@babel/plugin-transform-spread": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.1.tgz",
+            "integrity": "sha512-KjmcIM+fxgY+KxPVbjelJC6hrH1CgtPmTvdXAfn3/a9CnWGSTY7nH4zm5+cjmWJybdcPSsD0++QssDsjcpe47g==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.24.0",
+                "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5"
+            }
+        },
+        "@babel/plugin-transform-sticky-regex": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.24.1.tgz",
+            "integrity": "sha512-9v0f1bRXgPVcPrngOQvLXeGNNVLc8UjMVfebo9ka0WF3/7+aVUHmaJVT3sa0XCzEFioPfPHZiOcYG9qOsH63cw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.24.0"
+            }
+        },
+        "@babel/plugin-transform-template-literals": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.1.tgz",
+            "integrity": "sha512-WRkhROsNzriarqECASCNu/nojeXCDTE/F2HmRgOzi7NGvyfYGq1NEjKBK3ckLfRgGc6/lPAqP0vDOSw3YtG34g==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.24.0"
+            }
+        },
+        "@babel/plugin-transform-typeof-symbol": {
+            "version": "7.24.5",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.5.tgz",
+            "integrity": "sha512-UTGnhYVZtTAjdwOTzT+sCyXmTn8AhaxOS/MjG9REclZ6ULHWF9KoCZur0HSGU7hk8PdBFKKbYe6+gqdXWz84Jg==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.24.5"
+            }
+        },
+        "@babel/plugin-transform-typescript": {
+            "version": "7.24.5",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.24.5.tgz",
+            "integrity": "sha512-E0VWu/hk83BIFUWnsKZ4D81KXjN5L3MobvevOHErASk9IPwKHOkTgvqzvNo1yP/ePJWqqK2SpUR5z+KQbl6NVw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-annotate-as-pure": "^7.22.5",
+                "@babel/helper-create-class-features-plugin": "^7.24.5",
+                "@babel/helper-plugin-utils": "^7.24.5",
+                "@babel/plugin-syntax-typescript": "^7.24.1"
+            }
+        },
+        "@babel/plugin-transform-unicode-escapes": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.24.1.tgz",
+            "integrity": "sha512-RlkVIcWT4TLI96zM660S877E7beKlQw7Ig+wqkKBiWfj0zH5Q4h50q6er4wzZKRNSYpfo6ILJ+hrJAGSX2qcNw==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.24.0"
+            }
+        },
+        "@babel/plugin-transform-unicode-property-regex": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.24.1.tgz",
+            "integrity": "sha512-Ss4VvlfYV5huWApFsF8/Sq0oXnGO+jB+rijFEFugTd3cwSObUSnUi88djgR5528Csl0uKlrI331kRqe56Ov2Ng==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-create-regexp-features-plugin": "^7.22.15",
+                "@babel/helper-plugin-utils": "^7.24.0"
+            }
+        },
+        "@babel/plugin-transform-unicode-regex": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.1.tgz",
+            "integrity": "sha512-2A/94wgZgxfTsiLaQ2E36XAOdcZmGAaEEgVmxQWwZXWkGhvoHbaqXcKnU8zny4ycpu3vNqg0L/PcCiYtHtA13g==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-create-regexp-features-plugin": "^7.22.15",
+                "@babel/helper-plugin-utils": "^7.24.0"
+            }
+        },
+        "@babel/plugin-transform-unicode-sets-regex": {
+            "version": "7.24.1",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.24.1.tgz",
+            "integrity": "sha512-fqj4WuzzS+ukpgerpAoOnMfQXwUHFxXUZUE84oL2Kao2N8uSlvcpnAidKASgsNgzZHBsHWvcm8s9FPWUhAb8fA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-create-regexp-features-plugin": "^7.22.15",
+                "@babel/helper-plugin-utils": "^7.24.0"
+            }
+        },
+        "@babel/preset-env": {
+            "version": "7.24.5",
+            "resolved": "https://registry.npmmirror.com/@babel/preset-env/-/preset-env-7.24.5.tgz",
+            "integrity": "sha512-UGK2ifKtcC8i5AI4cH+sbLLuLc2ktYSFJgBAXorKAsHUZmrQ1q6aQ6i3BvU24wWs2AAKqQB6kq3N9V9Gw1HiMQ==",
+            "dev": true,
+            "requires": {
+                "@babel/compat-data": "^7.24.4",
+                "@babel/helper-compilation-targets": "^7.23.6",
+                "@babel/helper-plugin-utils": "^7.24.5",
+                "@babel/helper-validator-option": "^7.23.5",
+                "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.24.5",
+                "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.24.1",
+                "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.24.1",
+                "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.24.1",
+                "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
+                "@babel/plugin-syntax-async-generators": "^7.8.4",
+                "@babel/plugin-syntax-class-properties": "^7.12.13",
+                "@babel/plugin-syntax-class-static-block": "^7.14.5",
+                "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+                "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
+                "@babel/plugin-syntax-import-assertions": "^7.24.1",
+                "@babel/plugin-syntax-import-attributes": "^7.24.1",
+                "@babel/plugin-syntax-import-meta": "^7.10.4",
+                "@babel/plugin-syntax-json-strings": "^7.8.3",
+                "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
+                "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+                "@babel/plugin-syntax-numeric-separator": "^7.10.4",
+                "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+                "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+                "@babel/plugin-syntax-optional-chaining": "^7.8.3",
+                "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
+                "@babel/plugin-syntax-top-level-await": "^7.14.5",
+                "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
+                "@babel/plugin-transform-arrow-functions": "^7.24.1",
+                "@babel/plugin-transform-async-generator-functions": "^7.24.3",
+                "@babel/plugin-transform-async-to-generator": "^7.24.1",
+                "@babel/plugin-transform-block-scoped-functions": "^7.24.1",
+                "@babel/plugin-transform-block-scoping": "^7.24.5",
+                "@babel/plugin-transform-class-properties": "^7.24.1",
+                "@babel/plugin-transform-class-static-block": "^7.24.4",
+                "@babel/plugin-transform-classes": "^7.24.5",
+                "@babel/plugin-transform-computed-properties": "^7.24.1",
+                "@babel/plugin-transform-destructuring": "^7.24.5",
+                "@babel/plugin-transform-dotall-regex": "^7.24.1",
+                "@babel/plugin-transform-duplicate-keys": "^7.24.1",
+                "@babel/plugin-transform-dynamic-import": "^7.24.1",
+                "@babel/plugin-transform-exponentiation-operator": "^7.24.1",
+                "@babel/plugin-transform-export-namespace-from": "^7.24.1",
+                "@babel/plugin-transform-for-of": "^7.24.1",
+                "@babel/plugin-transform-function-name": "^7.24.1",
+                "@babel/plugin-transform-json-strings": "^7.24.1",
+                "@babel/plugin-transform-literals": "^7.24.1",
+                "@babel/plugin-transform-logical-assignment-operators": "^7.24.1",
+                "@babel/plugin-transform-member-expression-literals": "^7.24.1",
+                "@babel/plugin-transform-modules-amd": "^7.24.1",
+                "@babel/plugin-transform-modules-commonjs": "^7.24.1",
+                "@babel/plugin-transform-modules-systemjs": "^7.24.1",
+                "@babel/plugin-transform-modules-umd": "^7.24.1",
+                "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5",
+                "@babel/plugin-transform-new-target": "^7.24.1",
+                "@babel/plugin-transform-nullish-coalescing-operator": "^7.24.1",
+                "@babel/plugin-transform-numeric-separator": "^7.24.1",
+                "@babel/plugin-transform-object-rest-spread": "^7.24.5",
+                "@babel/plugin-transform-object-super": "^7.24.1",
+                "@babel/plugin-transform-optional-catch-binding": "^7.24.1",
+                "@babel/plugin-transform-optional-chaining": "^7.24.5",
+                "@babel/plugin-transform-parameters": "^7.24.5",
+                "@babel/plugin-transform-private-methods": "^7.24.1",
+                "@babel/plugin-transform-private-property-in-object": "^7.24.5",
+                "@babel/plugin-transform-property-literals": "^7.24.1",
+                "@babel/plugin-transform-regenerator": "^7.24.1",
+                "@babel/plugin-transform-reserved-words": "^7.24.1",
+                "@babel/plugin-transform-shorthand-properties": "^7.24.1",
+                "@babel/plugin-transform-spread": "^7.24.1",
+                "@babel/plugin-transform-sticky-regex": "^7.24.1",
+                "@babel/plugin-transform-template-literals": "^7.24.1",
+                "@babel/plugin-transform-typeof-symbol": "^7.24.5",
+                "@babel/plugin-transform-unicode-escapes": "^7.24.1",
+                "@babel/plugin-transform-unicode-property-regex": "^7.24.1",
+                "@babel/plugin-transform-unicode-regex": "^7.24.1",
+                "@babel/plugin-transform-unicode-sets-regex": "^7.24.1",
+                "@babel/preset-modules": "0.1.6-no-external-plugins",
+                "babel-plugin-polyfill-corejs2": "^0.4.10",
+                "babel-plugin-polyfill-corejs3": "^0.10.4",
+                "babel-plugin-polyfill-regenerator": "^0.6.1",
+                "core-js-compat": "^3.31.0",
+                "semver": "^6.3.1"
+            }
+        },
+        "@babel/preset-modules": {
+            "version": "0.1.6-no-external-plugins",
+            "resolved": "https://registry.npmmirror.com/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz",
+            "integrity": "sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.0.0",
+                "@babel/types": "^7.4.4",
+                "esutils": "^2.0.2"
+            }
+        },
+        "@babel/regjsgen": {
+            "version": "0.8.0",
+            "resolved": "https://registry.npmmirror.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz",
+            "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==",
+            "dev": true
+        },
+        "@babel/runtime": {
+            "version": "7.24.5",
+            "resolved": "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.24.5.tgz",
+            "integrity": "sha512-Nms86NXrsaeU9vbBJKni6gXiEXZ4CVpYVzEjDH9Sb8vmZ3UljyA1GSOJl/6LGPO8EHLuSF9H+IxNXHPX8QHJ4g==",
+            "requires": {
+                "regenerator-runtime": "^0.14.0"
+            },
+            "dependencies": {
+                "regenerator-runtime": {
+                    "version": "0.14.1",
+                    "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+                    "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="
+                }
+            }
+        },
+        "@babel/template": {
+            "version": "7.24.0",
+            "resolved": "https://registry.npmmirror.com/@babel/template/-/template-7.24.0.tgz",
+            "integrity": "sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==",
+            "requires": {
+                "@babel/code-frame": "^7.23.5",
+                "@babel/parser": "^7.24.0",
+                "@babel/types": "^7.24.0"
+            }
+        },
+        "@babel/traverse": {
+            "version": "7.24.5",
+            "resolved": "https://registry.npmmirror.com/@babel/traverse/-/traverse-7.24.5.tgz",
+            "integrity": "sha512-7aaBLeDQ4zYcUFDUD41lJc1fG8+5IU9DaNSJAgal866FGvmD5EbWQgnEC6kO1gGLsX0esNkfnJSndbTXA3r7UA==",
+            "requires": {
+                "@babel/code-frame": "^7.24.2",
+                "@babel/generator": "^7.24.5",
+                "@babel/helper-environment-visitor": "^7.22.20",
+                "@babel/helper-function-name": "^7.23.0",
+                "@babel/helper-hoist-variables": "^7.22.5",
+                "@babel/helper-split-export-declaration": "^7.24.5",
+                "@babel/parser": "^7.24.5",
+                "@babel/types": "^7.24.5",
+                "debug": "^4.3.1",
+                "globals": "^11.1.0"
+            }
+        },
+        "@babel/types": {
+            "version": "7.24.5",
+            "resolved": "https://registry.npmmirror.com/@babel/types/-/types-7.24.5.tgz",
+            "integrity": "sha512-6mQNsaLeXTw0nxYUYu+NSa4Hx4BlF1x1x8/PMFbiR+GBSr+2DkECc69b8hgy2frEodNcvPffeH8YfWd3LI6jhQ==",
+            "requires": {
+                "@babel/helper-string-parser": "^7.24.1",
+                "@babel/helper-validator-identifier": "^7.24.5",
+                "to-fast-properties": "^2.0.0"
+            }
+        },
+        "@bcoe/v8-coverage": {
+            "version": "0.2.3",
+            "resolved": "https://registry.npmmirror.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
+            "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
+            "dev": true,
+            "peer": true
+        },
+        "@dcasia/mini-program-tailwind-webpack-plugin": {
+            "version": "1.5.7",
+            "resolved": "https://registry.npmmirror.com/@dcasia/mini-program-tailwind-webpack-plugin/-/mini-program-tailwind-webpack-plugin-1.5.7.tgz",
+            "integrity": "sha512-BXcYi8iAFh9qRewsJPT9+paxBto5zdLLmad1Yx1GkZXmKFE6W7qHDRWxOmskXFtSCzCKdomFqZG2RzW1eBzMZg==",
+            "dev": true,
+            "requires": {
+                "@babel/core": "^7.17.5",
+                "@vivaxy/wxml": "^2.1.0",
+                "micromatch": "^4.0.5",
+                "postcss": "^8.4.7",
+                "webpack-sources": "^1.4.3",
+                "windicss-webpack-plugin": "^1.7.2"
+            }
+        },
+        "@dcloudio/types": {
+            "version": "3.4.8",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/types/-/types-3.4.8.tgz",
+            "integrity": "sha512-IPXuoghLv7qNPOnRuP7vC5++MdRHhE0U7EMw9ia//uOh69fFXZiRTfoHd51+nzciD6R50gqYhbrCCZIxnxhM9Q=="
+        },
+        "@dcloudio/uni-app": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-app/-/uni-app-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-6fip3G+s6pJDudu+Rsy/v7CtGYzjcc0ZjjKYZuXttM1Vgkg3QD1/qHhJW27Vb+nmzfL+Wg1tbRhTl7kgA+8TVA==",
+            "requires": {
+                "@dcloudio/uni-cloud": "3.0.0-3080720230703001",
+                "@dcloudio/uni-components": "3.0.0-3080720230703001",
+                "@dcloudio/uni-i18n": "3.0.0-3080720230703001",
+                "@dcloudio/uni-push": "3.0.0-3080720230703001",
+                "@dcloudio/uni-shared": "3.0.0-3080720230703001",
+                "@dcloudio/uni-stat": "3.0.0-3080720230703001",
+                "@vue/shared": "3.2.47"
+            }
+        },
+        "@dcloudio/uni-app-plus": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-app-plus/-/uni-app-plus-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-WGHniWrEJPIAVP3GDp+maf30fZz/Dc+gAfiPMDWvQdE12nAcnpbgnmaLEPifPDeeV2dr7/VuxoVM+Z2M5AlN1Q==",
+            "requires": {
+                "@dcloudio/uni-app-uts": "3.0.0-3080720230703001",
+                "@dcloudio/uni-app-vite": "3.0.0-3080720230703001",
+                "@dcloudio/uni-app-vue": "3.0.0-3080720230703001",
+                "debug": "^4.3.3",
+                "fs-extra": "^10.0.0",
+                "licia": "^1.29.0",
+                "postcss-selector-parser": "^6.0.6"
+            }
+        },
+        "@dcloudio/uni-app-uts": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-app-uts/-/uni-app-uts-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-6GXBYE3/bfliADNMmnmm2UHLpzR2BF5hgs/ExIXcC9sMOxDAUd149R+YsDp9HUfUc+dA32DXHHjoQOhYunZTTA==",
+            "requires": {
+                "@babel/parser": "^7.16.4",
+                "@babel/types": "^7.20.7",
+                "@dcloudio/uni-cli-shared": "3.0.0-3080720230703001",
+                "@dcloudio/uni-i18n": "3.0.0-3080720230703001",
+                "@dcloudio/uni-nvue-styler": "3.0.0-3080720230703001",
+                "@dcloudio/uni-shared": "3.0.0-3080720230703001",
+                "@rollup/pluginutils": "^4.2.0",
+                "@vue/compiler-core": "3.2.47",
+                "@vue/compiler-sfc": "3.2.47",
+                "@vue/shared": "3.2.47",
+                "debug": "^4.3.3",
+                "es-module-lexer": "^1.2.1",
+                "fs-extra": "^10.0.0",
+                "picocolors": "^1.0.0",
+                "source-map": "^0.6.1"
+            }
+        },
+        "@dcloudio/uni-app-vite": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-app-vite/-/uni-app-vite-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-OAFjSfrin2pLuBBfDMg3qvm7ZCS3Vqt0/CDxRicc7lD6ioiahUvaXdLhARTWykoO6rlYjbIckDmg3HuBbb3wjA==",
+            "requires": {
+                "@dcloudio/uni-cli-shared": "3.0.0-3080720230703001",
+                "@dcloudio/uni-i18n": "3.0.0-3080720230703001",
+                "@dcloudio/uni-nvue-styler": "3.0.0-3080720230703001",
+                "@dcloudio/uni-shared": "3.0.0-3080720230703001",
+                "@rollup/pluginutils": "^4.2.0",
+                "@vitejs/plugin-vue": "^4.2.1",
+                "@vue/compiler-dom": "3.2.47",
+                "@vue/compiler-sfc": "3.2.47",
+                "debug": "^4.3.3",
+                "fs-extra": "^10.0.0",
+                "picocolors": "^1.0.0"
+            }
+        },
+        "@dcloudio/uni-app-vue": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-app-vue/-/uni-app-vue-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-VTeoupAGJ1GREy2GvB+E29KPkIoHJ0C9ElvxcNpT0bEYWXMAE8m+O6D10aI8Qfwn1dObnxx6ohaRCbrDG9TG3w=="
+        },
+        "@dcloudio/uni-automator": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-automator/-/uni-automator-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-DbvYu6uGA+My5l103RgZ5BfqSlxGN5NbvK59ELH0NhK5mGge/f8RQPJ9zPz2rlLJT9/GUzjaw7b+f4FELeRpHg==",
+            "dev": true,
+            "requires": {
+                "@dcloudio/uni-cli-shared": "3.0.0-3080720230703001",
+                "address": "^1.1.2",
+                "cross-env": "^7.0.3",
+                "debug": "^4.3.3",
+                "default-gateway": "^6.0.3",
+                "fs-extra": "^10.0.0",
+                "jsonc-parser": "^3.2.0",
+                "licia": "^1.29.0",
+                "qrcode-reader": "^1.0.4",
+                "qrcode-terminal": "^0.12.0",
+                "ws": "^8.4.2"
+            }
+        },
+        "@dcloudio/uni-cli-shared": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-cli-shared/-/uni-cli-shared-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-WP5IfAXIlinWs/ItHu2/EP746kSCxl9+I8wBC6BfI4xq8RD2ga6F5WJt/+blBzbp2gVnJsW/13eafUQs5T3RFA==",
+            "requires": {
+                "@ampproject/remapping": "^2.1.2",
+                "@babel/core": "^7.21.3",
+                "@babel/parser": "^7.16.4",
+                "@babel/types": "^7.20.7",
+                "@dcloudio/uni-i18n": "3.0.0-3080720230703001",
+                "@dcloudio/uni-shared": "3.0.0-3080720230703001",
+                "@intlify/core-base": "9.1.9",
+                "@intlify/shared": "9.1.9",
+                "@intlify/vue-devtools": "9.1.9",
+                "@rollup/pluginutils": "^4.2.0",
+                "@vue/compiler-core": "3.2.47",
+                "@vue/compiler-dom": "3.2.47",
+                "@vue/compiler-sfc": "3.2.47",
+                "@vue/server-renderer": "3.2.47",
+                "@vue/shared": "3.2.47",
+                "autoprefixer": "^10.4.14",
+                "base64url": "^3.0.1",
+                "chokidar": "^3.5.3",
+                "compare-versions": "^3.6.0",
+                "debug": "^4.3.3",
+                "es-module-lexer": "^1.2.1",
+                "esbuild": "^0.17.5",
+                "estree-walker": "^2.0.2",
+                "fast-glob": "^3.2.11",
+                "fs-extra": "^10.0.0",
+                "hash-sum": "^2.0.0",
+                "jsonc-parser": "^3.0.0",
+                "magic-string": "^0.30.0",
+                "merge": "^2.1.1",
+                "mime": "^3.0.0",
+                "module-alias": "^2.2.2",
+                "os-locale-s-fix": "^1.0.8-fix-1",
+                "picocolors": "^1.0.0",
+                "postcss-import": "^14.0.2",
+                "postcss-load-config": "^3.1.1",
+                "postcss-modules": "^4.3.0",
+                "postcss-selector-parser": "^6.0.6",
+                "resolve": "^1.22.1",
+                "tapable": "^2.2.0",
+                "xregexp": "3.1.0"
+            },
+            "dependencies": {
+                "@vue/reactivity": {
+                    "version": "3.2.47",
+                    "resolved": "https://registry.npmmirror.com/@vue/reactivity/-/reactivity-3.2.47.tgz",
+                    "integrity": "sha512-7khqQ/75oyyg+N/e+iwV6lpy1f5wq759NdlS1fpAhFXa8VeAIKGgk2E/C4VF59lx5b+Ezs5fpp/5WsRYXQiKxQ==",
+                    "peer": true,
+                    "requires": {
+                        "@vue/shared": "3.2.47"
+                    }
+                },
+                "@vue/runtime-core": {
+                    "version": "3.2.47",
+                    "resolved": "https://registry.npmmirror.com/@vue/runtime-core/-/runtime-core-3.2.47.tgz",
+                    "integrity": "sha512-RZxbLQIRB/K0ev0K9FXhNbBzT32H9iRtYbaXb0ZIz2usLms/D55dJR2t6cIEUn6vyhS3ALNvNthI+Q95C+NOpA==",
+                    "peer": true,
+                    "requires": {
+                        "@vue/reactivity": "3.2.47",
+                        "@vue/shared": "3.2.47"
+                    }
+                },
+                "@vue/runtime-dom": {
+                    "version": "3.2.47",
+                    "resolved": "https://registry.npmmirror.com/@vue/runtime-dom/-/runtime-dom-3.2.47.tgz",
+                    "integrity": "sha512-ArXrFTjS6TsDei4qwNvgrdmHtD930KgSKGhS5M+j8QxXrDJYLqYw4RRcDy1bz1m1wMmb6j+zGLifdVHtkXA7gA==",
+                    "peer": true,
+                    "requires": {
+                        "@vue/runtime-core": "3.2.47",
+                        "@vue/shared": "3.2.47",
+                        "csstype": "^2.6.8"
+                    }
+                },
+                "@vue/server-renderer": {
+                    "version": "3.2.47",
+                    "resolved": "https://registry.npmmirror.com/@vue/server-renderer/-/server-renderer-3.2.47.tgz",
+                    "integrity": "sha512-dN9gc1i8EvmP9RCzvneONXsKfBRgqFeFZLurmHOveL7oH6HiFXJw5OGu294n1nHc/HMgTy6LulU/tv5/A7f/LA==",
+                    "requires": {
+                        "@vue/compiler-ssr": "3.2.47",
+                        "@vue/shared": "3.2.47"
+                    }
+                },
+                "csstype": {
+                    "version": "2.6.21",
+                    "resolved": "https://registry.npmmirror.com/csstype/-/csstype-2.6.21.tgz",
+                    "integrity": "sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==",
+                    "peer": true
+                },
+                "vue": {
+                    "version": "3.2.47",
+                    "resolved": "https://registry.npmmirror.com/vue/-/vue-3.2.47.tgz",
+                    "integrity": "sha512-60188y/9Dc9WVrAZeUVSDxRQOZ+z+y5nO2ts9jWXSTkMvayiWxCWOWtBQoYjLeccfXkiiPZWAHcV+WTPhkqJHQ==",
+                    "peer": true,
+                    "requires": {
+                        "@vue/compiler-dom": "3.2.47",
+                        "@vue/compiler-sfc": "3.2.47",
+                        "@vue/runtime-dom": "3.2.47",
+                        "@vue/server-renderer": "3.2.47",
+                        "@vue/shared": "3.2.47"
+                    }
+                }
+            }
+        },
+        "@dcloudio/uni-cloud": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-cloud/-/uni-cloud-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-xulo8fMQZ6+DsU7Bs6Re7i51OVF/tzT72GmooXvvNt3H+5XUAo/1mQIIiNlxeR4sKesR8Y9n7j+Z4dfs/2ce9w==",
+            "requires": {
+                "@dcloudio/uni-cli-shared": "3.0.0-3080720230703001",
+                "@dcloudio/uni-i18n": "3.0.0-3080720230703001",
+                "@dcloudio/uni-shared": "3.0.0-3080720230703001",
+                "@vue/shared": "3.2.47",
+                "fast-glob": "^3.2.11"
+            }
+        },
+        "@dcloudio/uni-components": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-components/-/uni-components-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-Ggd7m9TOxdLZxfJ1PWkUBowTUyYVH1WuPsooMWmJNRkMpvnAtK6ZPdS0ThdglX0F/FT82IUUC+wdeZtFG/QRcA==",
+            "requires": {
+                "@dcloudio/uni-cloud": "3.0.0-3080720230703001",
+                "@dcloudio/uni-h5": "3.0.0-3080720230703001",
+                "@dcloudio/uni-i18n": "3.0.0-3080720230703001"
+            }
+        },
+        "@dcloudio/uni-h5": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-h5/-/uni-h5-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-brRSBmxzg07Bt86AhJ70T0wsJBaDjgRAaAND0QsRQAaQfRFyEjqU1wp+x4Dt7GoNbg5hmNEabhdJKv24RweMnA==",
+            "requires": {
+                "@dcloudio/uni-h5-vite": "3.0.0-3080720230703001",
+                "@dcloudio/uni-h5-vue": "3.0.0-3080720230703001",
+                "@dcloudio/uni-i18n": "3.0.0-3080720230703001",
+                "@dcloudio/uni-shared": "3.0.0-3080720230703001",
+                "@vue/server-renderer": "3.2.47",
+                "@vue/shared": "3.2.47",
+                "debug": "^4.3.3",
+                "localstorage-polyfill": "^1.0.1",
+                "postcss-selector-parser": "^6.0.6",
+                "safe-area-insets": "^1.4.1",
+                "vue-router": "^4.1.6",
+                "xmlhttprequest": "^1.8.0"
+            },
+            "dependencies": {
+                "@vue/reactivity": {
+                    "version": "3.2.47",
+                    "resolved": "https://registry.npmmirror.com/@vue/reactivity/-/reactivity-3.2.47.tgz",
+                    "integrity": "sha512-7khqQ/75oyyg+N/e+iwV6lpy1f5wq759NdlS1fpAhFXa8VeAIKGgk2E/C4VF59lx5b+Ezs5fpp/5WsRYXQiKxQ==",
+                    "peer": true,
+                    "requires": {
+                        "@vue/shared": "3.2.47"
+                    }
+                },
+                "@vue/runtime-core": {
+                    "version": "3.2.47",
+                    "resolved": "https://registry.npmmirror.com/@vue/runtime-core/-/runtime-core-3.2.47.tgz",
+                    "integrity": "sha512-RZxbLQIRB/K0ev0K9FXhNbBzT32H9iRtYbaXb0ZIz2usLms/D55dJR2t6cIEUn6vyhS3ALNvNthI+Q95C+NOpA==",
+                    "peer": true,
+                    "requires": {
+                        "@vue/reactivity": "3.2.47",
+                        "@vue/shared": "3.2.47"
+                    }
+                },
+                "@vue/runtime-dom": {
+                    "version": "3.2.47",
+                    "resolved": "https://registry.npmmirror.com/@vue/runtime-dom/-/runtime-dom-3.2.47.tgz",
+                    "integrity": "sha512-ArXrFTjS6TsDei4qwNvgrdmHtD930KgSKGhS5M+j8QxXrDJYLqYw4RRcDy1bz1m1wMmb6j+zGLifdVHtkXA7gA==",
+                    "peer": true,
+                    "requires": {
+                        "@vue/runtime-core": "3.2.47",
+                        "@vue/shared": "3.2.47",
+                        "csstype": "^2.6.8"
+                    }
+                },
+                "@vue/server-renderer": {
+                    "version": "3.2.47",
+                    "resolved": "https://registry.npmmirror.com/@vue/server-renderer/-/server-renderer-3.2.47.tgz",
+                    "integrity": "sha512-dN9gc1i8EvmP9RCzvneONXsKfBRgqFeFZLurmHOveL7oH6HiFXJw5OGu294n1nHc/HMgTy6LulU/tv5/A7f/LA==",
+                    "requires": {
+                        "@vue/compiler-ssr": "3.2.47",
+                        "@vue/shared": "3.2.47"
+                    }
+                },
+                "csstype": {
+                    "version": "2.6.21",
+                    "resolved": "https://registry.npmmirror.com/csstype/-/csstype-2.6.21.tgz",
+                    "integrity": "sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==",
+                    "peer": true
+                },
+                "vue": {
+                    "version": "3.2.47",
+                    "resolved": "https://registry.npmmirror.com/vue/-/vue-3.2.47.tgz",
+                    "integrity": "sha512-60188y/9Dc9WVrAZeUVSDxRQOZ+z+y5nO2ts9jWXSTkMvayiWxCWOWtBQoYjLeccfXkiiPZWAHcV+WTPhkqJHQ==",
+                    "peer": true,
+                    "requires": {
+                        "@vue/compiler-dom": "3.2.47",
+                        "@vue/compiler-sfc": "3.2.47",
+                        "@vue/runtime-dom": "3.2.47",
+                        "@vue/server-renderer": "3.2.47",
+                        "@vue/shared": "3.2.47"
+                    }
+                }
+            }
+        },
+        "@dcloudio/uni-h5-vite": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-h5-vite/-/uni-h5-vite-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-bqPj6p2Zj0TIMOoUFCryPaBR/LIGMdHg5vDGlxoU1F84VdtCXlgDTodbp/4n24MDCd6KiuHZEyURt4jODtxd8Q==",
+            "requires": {
+                "@dcloudio/uni-cli-shared": "3.0.0-3080720230703001",
+                "@dcloudio/uni-shared": "3.0.0-3080720230703001",
+                "@rollup/pluginutils": "^4.2.0",
+                "@vue/compiler-dom": "3.2.47",
+                "@vue/compiler-sfc": "3.2.47",
+                "@vue/server-renderer": "3.2.47",
+                "@vue/shared": "3.2.47",
+                "debug": "^4.3.3",
+                "fs-extra": "^10.0.0",
+                "mime": "^3.0.0",
+                "module-alias": "^2.2.2"
+            },
+            "dependencies": {
+                "@vue/reactivity": {
+                    "version": "3.2.47",
+                    "resolved": "https://registry.npmmirror.com/@vue/reactivity/-/reactivity-3.2.47.tgz",
+                    "integrity": "sha512-7khqQ/75oyyg+N/e+iwV6lpy1f5wq759NdlS1fpAhFXa8VeAIKGgk2E/C4VF59lx5b+Ezs5fpp/5WsRYXQiKxQ==",
+                    "peer": true,
+                    "requires": {
+                        "@vue/shared": "3.2.47"
+                    }
+                },
+                "@vue/runtime-core": {
+                    "version": "3.2.47",
+                    "resolved": "https://registry.npmmirror.com/@vue/runtime-core/-/runtime-core-3.2.47.tgz",
+                    "integrity": "sha512-RZxbLQIRB/K0ev0K9FXhNbBzT32H9iRtYbaXb0ZIz2usLms/D55dJR2t6cIEUn6vyhS3ALNvNthI+Q95C+NOpA==",
+                    "peer": true,
+                    "requires": {
+                        "@vue/reactivity": "3.2.47",
+                        "@vue/shared": "3.2.47"
+                    }
+                },
+                "@vue/runtime-dom": {
+                    "version": "3.2.47",
+                    "resolved": "https://registry.npmmirror.com/@vue/runtime-dom/-/runtime-dom-3.2.47.tgz",
+                    "integrity": "sha512-ArXrFTjS6TsDei4qwNvgrdmHtD930KgSKGhS5M+j8QxXrDJYLqYw4RRcDy1bz1m1wMmb6j+zGLifdVHtkXA7gA==",
+                    "peer": true,
+                    "requires": {
+                        "@vue/runtime-core": "3.2.47",
+                        "@vue/shared": "3.2.47",
+                        "csstype": "^2.6.8"
+                    }
+                },
+                "@vue/server-renderer": {
+                    "version": "3.2.47",
+                    "resolved": "https://registry.npmmirror.com/@vue/server-renderer/-/server-renderer-3.2.47.tgz",
+                    "integrity": "sha512-dN9gc1i8EvmP9RCzvneONXsKfBRgqFeFZLurmHOveL7oH6HiFXJw5OGu294n1nHc/HMgTy6LulU/tv5/A7f/LA==",
+                    "requires": {
+                        "@vue/compiler-ssr": "3.2.47",
+                        "@vue/shared": "3.2.47"
+                    }
+                },
+                "csstype": {
+                    "version": "2.6.21",
+                    "resolved": "https://registry.npmmirror.com/csstype/-/csstype-2.6.21.tgz",
+                    "integrity": "sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==",
+                    "peer": true
+                },
+                "vue": {
+                    "version": "3.2.47",
+                    "resolved": "https://registry.npmmirror.com/vue/-/vue-3.2.47.tgz",
+                    "integrity": "sha512-60188y/9Dc9WVrAZeUVSDxRQOZ+z+y5nO2ts9jWXSTkMvayiWxCWOWtBQoYjLeccfXkiiPZWAHcV+WTPhkqJHQ==",
+                    "peer": true,
+                    "requires": {
+                        "@vue/compiler-dom": "3.2.47",
+                        "@vue/compiler-sfc": "3.2.47",
+                        "@vue/runtime-dom": "3.2.47",
+                        "@vue/server-renderer": "3.2.47",
+                        "@vue/shared": "3.2.47"
+                    }
+                }
+            }
+        },
+        "@dcloudio/uni-h5-vue": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-h5-vue/-/uni-h5-vue-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-dRb9y4bgVSvZgJySumu0ZLL+tb/K1KbHd7Rx5c2G9Q7Yw42y0rrooYgbKFQILw0LFF0bKpzZv0JjNwkpKcD/mA==",
+            "requires": {
+                "@dcloudio/uni-shared": "3.0.0-3080720230703001",
+                "@vue/server-renderer": "3.2.47"
+            },
+            "dependencies": {
+                "@vue/reactivity": {
+                    "version": "3.2.47",
+                    "resolved": "https://registry.npmmirror.com/@vue/reactivity/-/reactivity-3.2.47.tgz",
+                    "integrity": "sha512-7khqQ/75oyyg+N/e+iwV6lpy1f5wq759NdlS1fpAhFXa8VeAIKGgk2E/C4VF59lx5b+Ezs5fpp/5WsRYXQiKxQ==",
+                    "peer": true,
+                    "requires": {
+                        "@vue/shared": "3.2.47"
+                    }
+                },
+                "@vue/runtime-core": {
+                    "version": "3.2.47",
+                    "resolved": "https://registry.npmmirror.com/@vue/runtime-core/-/runtime-core-3.2.47.tgz",
+                    "integrity": "sha512-RZxbLQIRB/K0ev0K9FXhNbBzT32H9iRtYbaXb0ZIz2usLms/D55dJR2t6cIEUn6vyhS3ALNvNthI+Q95C+NOpA==",
+                    "peer": true,
+                    "requires": {
+                        "@vue/reactivity": "3.2.47",
+                        "@vue/shared": "3.2.47"
+                    }
+                },
+                "@vue/runtime-dom": {
+                    "version": "3.2.47",
+                    "resolved": "https://registry.npmmirror.com/@vue/runtime-dom/-/runtime-dom-3.2.47.tgz",
+                    "integrity": "sha512-ArXrFTjS6TsDei4qwNvgrdmHtD930KgSKGhS5M+j8QxXrDJYLqYw4RRcDy1bz1m1wMmb6j+zGLifdVHtkXA7gA==",
+                    "peer": true,
+                    "requires": {
+                        "@vue/runtime-core": "3.2.47",
+                        "@vue/shared": "3.2.47",
+                        "csstype": "^2.6.8"
+                    }
+                },
+                "@vue/server-renderer": {
+                    "version": "3.2.47",
+                    "resolved": "https://registry.npmmirror.com/@vue/server-renderer/-/server-renderer-3.2.47.tgz",
+                    "integrity": "sha512-dN9gc1i8EvmP9RCzvneONXsKfBRgqFeFZLurmHOveL7oH6HiFXJw5OGu294n1nHc/HMgTy6LulU/tv5/A7f/LA==",
+                    "requires": {
+                        "@vue/compiler-ssr": "3.2.47",
+                        "@vue/shared": "3.2.47"
+                    }
+                },
+                "csstype": {
+                    "version": "2.6.21",
+                    "resolved": "https://registry.npmmirror.com/csstype/-/csstype-2.6.21.tgz",
+                    "integrity": "sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==",
+                    "peer": true
+                },
+                "vue": {
+                    "version": "3.2.47",
+                    "resolved": "https://registry.npmmirror.com/vue/-/vue-3.2.47.tgz",
+                    "integrity": "sha512-60188y/9Dc9WVrAZeUVSDxRQOZ+z+y5nO2ts9jWXSTkMvayiWxCWOWtBQoYjLeccfXkiiPZWAHcV+WTPhkqJHQ==",
+                    "peer": true,
+                    "requires": {
+                        "@vue/compiler-dom": "3.2.47",
+                        "@vue/compiler-sfc": "3.2.47",
+                        "@vue/runtime-dom": "3.2.47",
+                        "@vue/server-renderer": "3.2.47",
+                        "@vue/shared": "3.2.47"
+                    }
+                }
+            }
+        },
+        "@dcloudio/uni-i18n": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-i18n/-/uni-i18n-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-fmN3HnHhq2GXgT+PlCiy1g9KAVAD1HASErnv4cKtu4YofJH6Nh+uWAfPNWwp/6ZfNgPrblku7Rq7qdDFEltFcg=="
+        },
+        "@dcloudio/uni-mp-alipay": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-mp-alipay/-/uni-mp-alipay-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-qTBERfPRxa4e3cHzptD82kTNrleT6Mxl+hdzDMK4/xSD4XLiMb2ZKDqsG8MtAAvNpHMe8QKiEKXR2/Oljs8A9A==",
+            "requires": {
+                "@dcloudio/uni-cli-shared": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-vite": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-vue": "3.0.0-3080720230703001",
+                "@dcloudio/uni-shared": "3.0.0-3080720230703001",
+                "@vue/compiler-core": "3.2.47",
+                "@vue/shared": "3.2.47"
+            }
+        },
+        "@dcloudio/uni-mp-baidu": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-mp-baidu/-/uni-mp-baidu-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-22llCMmOgpPuuWtaJ8pExLStvIoy+/KJLL09/a+Y87z3F+W40VfA6WFNNF3peVX22pw8fDvUBMDN9nCusAVrqA==",
+            "requires": {
+                "@dcloudio/uni-cli-shared": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-compiler": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-vite": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-vue": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-weixin": "3.0.0-3080720230703001",
+                "@dcloudio/uni-shared": "3.0.0-3080720230703001",
+                "@vue/compiler-core": "3.2.47",
+                "@vue/shared": "3.2.47",
+                "jimp": "^0.10.1",
+                "licia": "^1.29.0",
+                "qrcode-reader": "^1.0.4",
+                "qrcode-terminal": "^0.12.0",
+                "ws": "^8.4.2"
+            }
+        },
+        "@dcloudio/uni-mp-compiler": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-mp-compiler/-/uni-mp-compiler-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-osLFR5CDm5xrQiSSh0fqXDCDam0Zg8mGMohHKFtqSbPoKHBxv+i4KkdU1Ai3MhutPXK4xMU6xk6PqQ2XhJmxAg==",
+            "requires": {
+                "@babel/generator": "^7.20.5",
+                "@babel/parser": "^7.16.4",
+                "@babel/types": "^7.20.7",
+                "@dcloudio/uni-cli-shared": "3.0.0-3080720230703001",
+                "@dcloudio/uni-shared": "3.0.0-3080720230703001",
+                "@vue/compiler-core": "3.2.47",
+                "@vue/compiler-dom": "3.2.47",
+                "@vue/shared": "3.2.47",
+                "estree-walker": "^2.0.2"
+            }
+        },
+        "@dcloudio/uni-mp-jd": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-mp-jd/-/uni-mp-jd-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-5FJ0ZtJnCUTaPWLbdcpwAfPG/XGAlyanWolgdwzq0eFMQtAGtcrbCCv2GXXcErMjDyDbM4LRBS3JPEmcBLe5Zw==",
+            "requires": {
+                "@dcloudio/uni-cli-shared": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-compiler": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-vite": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-vue": "3.0.0-3080720230703001",
+                "@dcloudio/uni-shared": "3.0.0-3080720230703001",
+                "@vue/shared": "3.2.47"
+            }
+        },
+        "@dcloudio/uni-mp-kuaishou": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-mp-kuaishou/-/uni-mp-kuaishou-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-t1H8YaS5HUYNI/ArKTPaK17JqNyvLC4ge+oJpAtW1gJOxT/qdRE7BPyfIfoKUoN0QlDxQiuxbvz1ILdT00u0yg==",
+            "requires": {
+                "@dcloudio/uni-cli-shared": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-compiler": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-vite": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-vue": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-weixin": "3.0.0-3080720230703001",
+                "@dcloudio/uni-shared": "3.0.0-3080720230703001",
+                "@vue/compiler-core": "3.2.47",
+                "@vue/shared": "3.2.47"
+            }
+        },
+        "@dcloudio/uni-mp-lark": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-mp-lark/-/uni-mp-lark-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-3E+vRxFypvcdTMPIGlfI3WWAVlUi3/IfKc0eM53YqNGHFTnzJOAofvFABqE6hcY24FjwepgNDttGddbaE8LtKA==",
+            "requires": {
+                "@dcloudio/uni-cli-shared": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-compiler": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-toutiao": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-vite": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-vue": "3.0.0-3080720230703001",
+                "@dcloudio/uni-shared": "3.0.0-3080720230703001",
+                "@vue/compiler-core": "3.2.47",
+                "@vue/shared": "3.2.47"
+            }
+        },
+        "@dcloudio/uni-mp-qq": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-mp-qq/-/uni-mp-qq-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-nx9PoO/+zFWlA54O20aXj/gaefUHLqBrhrKPNERAphafFembjudIvo/YS1tjlDk5idJ9G+J5XJNWL60eQcnKNA==",
+            "requires": {
+                "@dcloudio/uni-cli-shared": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-vite": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-vue": "3.0.0-3080720230703001",
+                "@dcloudio/uni-shared": "3.0.0-3080720230703001",
+                "@vue/shared": "3.2.47",
+                "fs-extra": "^10.0.0"
+            }
+        },
+        "@dcloudio/uni-mp-toutiao": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-mp-toutiao/-/uni-mp-toutiao-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-x39UGX+gelydwYXnDX8YlD7qCpwAWzUwY3DuDNig3GAmtBiBMheM4nQKxxs0zrImRB77eUffwtNn+1+kvTvjyA==",
+            "requires": {
+                "@dcloudio/uni-cli-shared": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-compiler": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-vite": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-vue": "3.0.0-3080720230703001",
+                "@dcloudio/uni-shared": "3.0.0-3080720230703001",
+                "@vue/compiler-core": "3.2.47",
+                "@vue/shared": "3.2.47"
+            }
+        },
+        "@dcloudio/uni-mp-vite": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-mp-vite/-/uni-mp-vite-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-KGi1tfIrlzGx9vbcrU979I56jaZ+kpQsm+SfKOYg2j6JezQ0/GFqHEHaDdiAdhSZcTX759Qs1PXZmXFxMdDFDA==",
+            "requires": {
+                "@dcloudio/uni-cli-shared": "3.0.0-3080720230703001",
+                "@dcloudio/uni-i18n": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-compiler": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-vue": "3.0.0-3080720230703001",
+                "@dcloudio/uni-shared": "3.0.0-3080720230703001",
+                "@vue/compiler-sfc": "3.2.47",
+                "@vue/shared": "3.2.47",
+                "debug": "^4.3.3"
+            }
+        },
+        "@dcloudio/uni-mp-vue": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-mp-vue/-/uni-mp-vue-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-Fo0lNHwGhVV2ceaU4Cta8OmB831k6PhJttpaJ18R0o1AM0RykI8NCw2OUuZ5Ex/TedoyejQBxs6skMDCvPb5IQ==",
+            "requires": {
+                "@dcloudio/uni-shared": "3.0.0-3080720230703001",
+                "@vue/shared": "3.2.47"
+            }
+        },
+        "@dcloudio/uni-mp-weixin": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-mp-weixin/-/uni-mp-weixin-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-8S+6I1OuGk8r+s5nNfqo+Cq+BrK0M+RksDQUtkI8z2e798GrWZiHbTqQ89pEwVdtkhP5G+5orqUg6e5NCLaskQ==",
+            "requires": {
+                "@dcloudio/uni-cli-shared": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-vite": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-vue": "3.0.0-3080720230703001",
+                "@dcloudio/uni-shared": "3.0.0-3080720230703001",
+                "@vue/shared": "3.2.47",
+                "jimp": "^0.10.1",
+                "licia": "^1.29.0",
+                "qrcode-reader": "^1.0.4",
+                "qrcode-terminal": "^0.12.0",
+                "ws": "^8.4.2"
+            }
+        },
+        "@dcloudio/uni-nvue-styler": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-nvue-styler/-/uni-nvue-styler-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-nhWQ/B/AYYqJZ/7HCmSWylARJ2dRrRyYVwBVs1Re8yk8SoaEkTvvgt5jas3tqjIxhyi5M8hzXeaxdpkY1Jgsyw==",
+            "requires": {
+                "@vue/shared": "3.2.47",
+                "parse-css-font": "^4.0.0",
+                "postcss": "^8.4.23"
+            }
+        },
+        "@dcloudio/uni-push": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-push/-/uni-push-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-q0chMYDBdj+KGxj/pA2hOm356tPU9WsVxjB2f7JW3Ue6JUNl5snuq0Rk1C/s1IDDAU8W4DTgb9KjsRYTXHV77w==",
+            "requires": {
+                "@dcloudio/uni-cli-shared": "3.0.0-3080720230703001"
+            }
+        },
+        "@dcloudio/uni-quickapp-webview": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-quickapp-webview/-/uni-quickapp-webview-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-LgV/CvGVp2IyLbIDeir4rPRAi+eglJLrBl86LT1ey+YA/Jecoz9LH4fHhB5gJEedm+KUqL7hjxd7F/XcrIULzg==",
+            "requires": {
+                "@dcloudio/uni-cli-shared": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-vite": "3.0.0-3080720230703001",
+                "@dcloudio/uni-mp-vue": "3.0.0-3080720230703001",
+                "@dcloudio/uni-shared": "3.0.0-3080720230703001",
+                "@vue/shared": "3.2.47"
+            }
+        },
+        "@dcloudio/uni-shared": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-shared/-/uni-shared-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-saa7FGqduwcEe0jxntYAFCE6wAtSM9aNG52uLAW5m0c4uRNYVFWJltBkm8Ev7eyko2xkvNhoQAGIGXDTQ+Hxhw==",
+            "requires": {
+                "@vue/shared": "3.2.47"
+            }
+        },
+        "@dcloudio/uni-stacktracey": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-stacktracey/-/uni-stacktracey-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-xo0O4sQ9gXa0wg1V1I13l/6JxQSTmfTcjyyQWOb3t5E/ME6tVo/RSlA0QN/Guo9XlogmQXs99D30NW/r3KGdJA==",
+            "dev": true
+        },
+        "@dcloudio/uni-stat": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/uni-stat/-/uni-stat-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-jzX9nRWk24udvVneFVA/8cfzqedib/nHbTO6GsFPamc6KDFa7QXhLy2m+BV+3inLiMkedfVnvgxNkZDigujyLw==",
+            "requires": {
+                "@dcloudio/uni-cli-shared": "3.0.0-3080720230703001",
+                "@dcloudio/uni-shared": "3.0.0-3080720230703001",
+                "debug": "^4.3.3"
+            }
+        },
+        "@dcloudio/vite-plugin-uni": {
+            "version": "3.0.0-3080720230703001",
+            "resolved": "https://registry.npmmirror.com/@dcloudio/vite-plugin-uni/-/vite-plugin-uni-3.0.0-3080720230703001.tgz",
+            "integrity": "sha512-PMDGsIDjBuoGNzzNPxLAHrXEzBsA2huoZgjbaGa3H8N+4cnbJZmEJEsy/OVdA3I9lrgZ+H6QW95qIA5aVO6djA==",
+            "dev": true,
+            "requires": {
+                "@babel/core": "^7.21.3",
+                "@babel/plugin-syntax-import-meta": "^7.10.4",
+                "@babel/plugin-transform-typescript": "^7.20.7",
+                "@dcloudio/uni-cli-shared": "3.0.0-3080720230703001",
+                "@dcloudio/uni-shared": "3.0.0-3080720230703001",
+                "@rollup/pluginutils": "^4.2.0",
+                "@vitejs/plugin-legacy": "^4.0.3",
+                "@vitejs/plugin-vue": "^4.2.1",
+                "@vitejs/plugin-vue-jsx": "^3.0.1",
+                "@vue/compiler-core": "3.2.47",
+                "@vue/compiler-dom": "3.2.47",
+                "@vue/compiler-sfc": "3.2.47",
+                "@vue/shared": "3.2.47",
+                "cac": "6.7.9",
+                "debug": "^4.3.3",
+                "estree-walker": "^2.0.2",
+                "express": "^4.17.1",
+                "fast-glob": "^3.2.11",
+                "fs-extra": "^10.0.0",
+                "hash-sum": "^2.0.0",
+                "jsonc-parser": "^3.0.0",
+                "magic-string": "^0.30.0",
+                "picocolors": "^1.0.0",
+                "terser": "^5.4.0"
+            }
+        },
+        "@esbuild/android-arm": {
+            "version": "0.17.19",
+            "resolved": "https://registry.npmmirror.com/@esbuild/android-arm/-/android-arm-0.17.19.tgz",
+            "integrity": "sha512-rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A==",
+            "optional": true
+        },
+        "@esbuild/android-arm64": {
+            "version": "0.17.19",
+            "resolved": "https://registry.npmmirror.com/@esbuild/android-arm64/-/android-arm64-0.17.19.tgz",
+            "integrity": "sha512-KBMWvEZooR7+kzY0BtbTQn0OAYY7CsiydT63pVEaPtVYF0hXbUaOyZog37DKxK7NF3XacBJOpYT4adIJh+avxA==",
+            "optional": true
+        },
+        "@esbuild/android-x64": {
+            "version": "0.17.19",
+            "resolved": "https://registry.npmmirror.com/@esbuild/android-x64/-/android-x64-0.17.19.tgz",
+            "integrity": "sha512-uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww==",
+            "optional": true
+        },
+        "@esbuild/darwin-arm64": {
+            "version": "0.17.19",
+            "resolved": "https://registry.npmmirror.com/@esbuild/darwin-arm64/-/darwin-arm64-0.17.19.tgz",
+            "integrity": "sha512-80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg==",
+            "optional": true
+        },
+        "@esbuild/darwin-x64": {
+            "version": "0.17.19",
+            "resolved": "https://registry.npmmirror.com/@esbuild/darwin-x64/-/darwin-x64-0.17.19.tgz",
+            "integrity": "sha512-IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw==",
+            "optional": true
+        },
+        "@esbuild/freebsd-arm64": {
+            "version": "0.17.19",
+            "resolved": "https://registry.npmmirror.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.19.tgz",
+            "integrity": "sha512-pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ==",
+            "optional": true
+        },
+        "@esbuild/freebsd-x64": {
+            "version": "0.17.19",
+            "resolved": "https://registry.npmmirror.com/@esbuild/freebsd-x64/-/freebsd-x64-0.17.19.tgz",
+            "integrity": "sha512-4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ==",
+            "optional": true
+        },
+        "@esbuild/linux-arm": {
+            "version": "0.17.19",
+            "resolved": "https://registry.npmmirror.com/@esbuild/linux-arm/-/linux-arm-0.17.19.tgz",
+            "integrity": "sha512-cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA==",
+            "optional": true
+        },
+        "@esbuild/linux-arm64": {
+            "version": "0.17.19",
+            "resolved": "https://registry.npmmirror.com/@esbuild/linux-arm64/-/linux-arm64-0.17.19.tgz",
+            "integrity": "sha512-ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg==",
+            "optional": true
+        },
+        "@esbuild/linux-ia32": {
+            "version": "0.17.19",
+            "resolved": "https://registry.npmmirror.com/@esbuild/linux-ia32/-/linux-ia32-0.17.19.tgz",
+            "integrity": "sha512-w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ==",
+            "optional": true
+        },
+        "@esbuild/linux-loong64": {
+            "version": "0.17.19",
+            "resolved": "https://registry.npmmirror.com/@esbuild/linux-loong64/-/linux-loong64-0.17.19.tgz",
+            "integrity": "sha512-2iAngUbBPMq439a+z//gE+9WBldoMp1s5GWsUSgqHLzLJ9WoZLZhpwWuym0u0u/4XmZ3gpHmzV84PonE+9IIdQ==",
+            "optional": true
+        },
+        "@esbuild/linux-mips64el": {
+            "version": "0.17.19",
+            "resolved": "https://registry.npmmirror.com/@esbuild/linux-mips64el/-/linux-mips64el-0.17.19.tgz",
+            "integrity": "sha512-LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A==",
+            "optional": true
+        },
+        "@esbuild/linux-ppc64": {
+            "version": "0.17.19",
+            "resolved": "https://registry.npmmirror.com/@esbuild/linux-ppc64/-/linux-ppc64-0.17.19.tgz",
+            "integrity": "sha512-/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg==",
+            "optional": true
+        },
+        "@esbuild/linux-riscv64": {
+            "version": "0.17.19",
+            "resolved": "https://registry.npmmirror.com/@esbuild/linux-riscv64/-/linux-riscv64-0.17.19.tgz",
+            "integrity": "sha512-FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA==",
+            "optional": true
+        },
+        "@esbuild/linux-s390x": {
+            "version": "0.17.19",
+            "resolved": "https://registry.npmmirror.com/@esbuild/linux-s390x/-/linux-s390x-0.17.19.tgz",
+            "integrity": "sha512-IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q==",
+            "optional": true
+        },
+        "@esbuild/linux-x64": {
+            "version": "0.17.19",
+            "resolved": "https://registry.npmmirror.com/@esbuild/linux-x64/-/linux-x64-0.17.19.tgz",
+            "integrity": "sha512-68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw==",
+            "optional": true
+        },
+        "@esbuild/netbsd-x64": {
+            "version": "0.17.19",
+            "resolved": "https://registry.npmmirror.com/@esbuild/netbsd-x64/-/netbsd-x64-0.17.19.tgz",
+            "integrity": "sha512-CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q==",
+            "optional": true
+        },
+        "@esbuild/openbsd-x64": {
+            "version": "0.17.19",
+            "resolved": "https://registry.npmmirror.com/@esbuild/openbsd-x64/-/openbsd-x64-0.17.19.tgz",
+            "integrity": "sha512-cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g==",
+            "optional": true
+        },
+        "@esbuild/sunos-x64": {
+            "version": "0.17.19",
+            "resolved": "https://registry.npmmirror.com/@esbuild/sunos-x64/-/sunos-x64-0.17.19.tgz",
+            "integrity": "sha512-vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg==",
+            "optional": true
+        },
+        "@esbuild/win32-arm64": {
+            "version": "0.17.19",
+            "resolved": "https://registry.npmmirror.com/@esbuild/win32-arm64/-/win32-arm64-0.17.19.tgz",
+            "integrity": "sha512-yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag==",
+            "optional": true
+        },
+        "@esbuild/win32-ia32": {
+            "version": "0.17.19",
+            "resolved": "https://registry.npmmirror.com/@esbuild/win32-ia32/-/win32-ia32-0.17.19.tgz",
+            "integrity": "sha512-eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw==",
+            "optional": true
+        },
+        "@esbuild/win32-x64": {
+            "version": "0.17.19",
+            "resolved": "https://registry.npmmirror.com/@esbuild/win32-x64/-/win32-x64-0.17.19.tgz",
+            "integrity": "sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA==",
+            "optional": true
+        },
+        "@intlify/core-base": {
+            "version": "9.1.9",
+            "resolved": "https://registry.npmmirror.com/@intlify/core-base/-/core-base-9.1.9.tgz",
+            "integrity": "sha512-x5T0p/Ja0S8hs5xs+ImKyYckVkL4CzcEXykVYYV6rcbXxJTe2o58IquSqX9bdncVKbRZP7GlBU1EcRaQEEJ+vw==",
+            "requires": {
+                "@intlify/devtools-if": "9.1.9",
+                "@intlify/message-compiler": "9.1.9",
+                "@intlify/message-resolver": "9.1.9",
+                "@intlify/runtime": "9.1.9",
+                "@intlify/shared": "9.1.9",
+                "@intlify/vue-devtools": "9.1.9"
+            }
+        },
+        "@intlify/devtools-if": {
+            "version": "9.1.9",
+            "resolved": "https://registry.npmmirror.com/@intlify/devtools-if/-/devtools-if-9.1.9.tgz",
+            "integrity": "sha512-oKSMKjttG3Ut/1UGEZjSdghuP3fwA15zpDPcjkf/1FjlOIm6uIBGMNS5jXzsZy593u+P/YcnrZD6cD3IVFz9vQ==",
+            "requires": {
+                "@intlify/shared": "9.1.9"
+            }
+        },
+        "@intlify/message-compiler": {
+            "version": "9.1.9",
+            "resolved": "https://registry.npmmirror.com/@intlify/message-compiler/-/message-compiler-9.1.9.tgz",
+            "integrity": "sha512-6YgCMF46Xd0IH2hMRLCssZI3gFG4aywidoWQ3QP4RGYQXQYYfFC54DxhSgfIPpVoPLQ+4AD29eoYmhiHZ+qLFQ==",
+            "requires": {
+                "@intlify/message-resolver": "9.1.9",
+                "@intlify/shared": "9.1.9",
+                "source-map": "0.6.1"
+            }
+        },
+        "@intlify/message-resolver": {
+            "version": "9.1.9",
+            "resolved": "https://registry.npmmirror.com/@intlify/message-resolver/-/message-resolver-9.1.9.tgz",
+            "integrity": "sha512-Lx/DBpigeK0sz2BBbzv5mu9/dAlt98HxwbG7xLawC3O2xMF9MNWU5FtOziwYG6TDIjNq0O/3ZbOJAxwITIWXEA=="
+        },
+        "@intlify/runtime": {
+            "version": "9.1.9",
+            "resolved": "https://registry.npmmirror.com/@intlify/runtime/-/runtime-9.1.9.tgz",
+            "integrity": "sha512-XgPw8+UlHCiie3fI41HPVa/VDJb3/aSH7bLhY1hJvlvNV713PFtb4p4Jo+rlE0gAoMsMCGcsiT982fImolSltg==",
+            "requires": {
+                "@intlify/message-compiler": "9.1.9",
+                "@intlify/message-resolver": "9.1.9",
+                "@intlify/shared": "9.1.9"
+            }
+        },
+        "@intlify/shared": {
+            "version": "9.1.9",
+            "resolved": "https://registry.npmmirror.com/@intlify/shared/-/shared-9.1.9.tgz",
+            "integrity": "sha512-xKGM1d0EAxdDFCWedcYXOm6V5Pfw/TMudd6/qCdEb4tv0hk9EKeg7lwQF1azE0dP2phvx0yXxrt7UQK+IZjNdw=="
+        },
+        "@intlify/vue-devtools": {
+            "version": "9.1.9",
+            "resolved": "https://registry.npmmirror.com/@intlify/vue-devtools/-/vue-devtools-9.1.9.tgz",
+            "integrity": "sha512-YPehH9uL4vZcGXky4Ev5qQIITnHKIvsD2GKGXgqf+05osMUI6WSEQHaN9USRa318Rs8RyyPCiDfmA0hRu3k7og==",
+            "requires": {
+                "@intlify/message-resolver": "9.1.9",
+                "@intlify/runtime": "9.1.9",
+                "@intlify/shared": "9.1.9"
+            }
+        },
+        "@istanbuljs/load-nyc-config": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmmirror.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
+            "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "camelcase": "^5.3.1",
+                "find-up": "^4.1.0",
+                "get-package-type": "^0.1.0",
+                "js-yaml": "^3.13.1",
+                "resolve-from": "^5.0.0"
+            },
+            "dependencies": {
+                "camelcase": {
+                    "version": "5.3.1",
+                    "resolved": "https://registry.npmmirror.com/camelcase/-/camelcase-5.3.1.tgz",
+                    "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+                    "dev": true,
+                    "peer": true
+                }
+            }
+        },
+        "@istanbuljs/schema": {
+            "version": "0.1.3",
+            "resolved": "https://registry.npmmirror.com/@istanbuljs/schema/-/schema-0.1.3.tgz",
+            "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
+            "dev": true,
+            "peer": true
+        },
+        "@jest/console": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/@jest/console/-/console-27.5.1.tgz",
+            "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "@jest/types": "^27.5.1",
+                "@types/node": "*",
+                "chalk": "^4.0.0",
+                "jest-message-util": "^27.5.1",
+                "jest-util": "^27.5.1",
+                "slash": "^3.0.0"
+            },
+            "dependencies": {
+                "ansi-styles": {
+                    "version": "4.3.0",
+                    "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "color-convert": "^2.0.1"
+                    }
+                },
+                "chalk": {
+                    "version": "4.1.2",
+                    "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "ansi-styles": "^4.1.0",
+                        "supports-color": "^7.1.0"
+                    }
+                },
+                "color-convert": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "color-name": "~1.1.4"
+                    }
+                },
+                "color-name": {
+                    "version": "1.1.4",
+                    "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+                    "dev": true,
+                    "peer": true
+                },
+                "has-flag": {
+                    "version": "4.0.0",
+                    "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+                    "dev": true,
+                    "peer": true
+                },
+                "supports-color": {
+                    "version": "7.2.0",
+                    "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "has-flag": "^4.0.0"
+                    }
+                }
+            }
+        },
+        "@jest/core": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/@jest/core/-/core-27.5.1.tgz",
+            "integrity": "sha512-AK6/UTrvQD0Cd24NSqmIA6rKsu0tKIxfiCducZvqxYdmMisOYAsdItspT+fQDQYARPf8XgjAFZi0ogW2agH5nQ==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "@jest/console": "^27.5.1",
+                "@jest/reporters": "^27.5.1",
+                "@jest/test-result": "^27.5.1",
+                "@jest/transform": "^27.5.1",
+                "@jest/types": "^27.5.1",
+                "@types/node": "*",
+                "ansi-escapes": "^4.2.1",
+                "chalk": "^4.0.0",
+                "emittery": "^0.8.1",
+                "exit": "^0.1.2",
+                "graceful-fs": "^4.2.9",
+                "jest-changed-files": "^27.5.1",
+                "jest-config": "^27.5.1",
+                "jest-haste-map": "^27.5.1",
+                "jest-message-util": "^27.5.1",
+                "jest-regex-util": "^27.5.1",
+                "jest-resolve": "^27.5.1",
+                "jest-resolve-dependencies": "^27.5.1",
+                "jest-runner": "^27.5.1",
+                "jest-runtime": "^27.5.1",
+                "jest-snapshot": "^27.5.1",
+                "jest-util": "^27.5.1",
+                "jest-validate": "^27.5.1",
+                "jest-watcher": "^27.5.1",
+                "micromatch": "^4.0.4",
+                "rimraf": "^3.0.0",
+                "slash": "^3.0.0",
+                "strip-ansi": "^6.0.0"
+            },
+            "dependencies": {
+                "ansi-styles": {
+                    "version": "4.3.0",
+                    "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "color-convert": "^2.0.1"
+                    }
+                },
+                "chalk": {
+                    "version": "4.1.2",
+                    "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "ansi-styles": "^4.1.0",
+                        "supports-color": "^7.1.0"
+                    }
+                },
+                "color-convert": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "color-name": "~1.1.4"
+                    }
+                },
+                "color-name": {
+                    "version": "1.1.4",
+                    "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+                    "dev": true,
+                    "peer": true
+                },
+                "has-flag": {
+                    "version": "4.0.0",
+                    "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+                    "dev": true,
+                    "peer": true
+                },
+                "supports-color": {
+                    "version": "7.2.0",
+                    "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "has-flag": "^4.0.0"
+                    }
+                }
+            }
+        },
+        "@jest/environment": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/@jest/environment/-/environment-27.5.1.tgz",
+            "integrity": "sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "@jest/fake-timers": "^27.5.1",
+                "@jest/types": "^27.5.1",
+                "@types/node": "*",
+                "jest-mock": "^27.5.1"
+            }
+        },
+        "@jest/fake-timers": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/@jest/fake-timers/-/fake-timers-27.5.1.tgz",
+            "integrity": "sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "@jest/types": "^27.5.1",
+                "@sinonjs/fake-timers": "^8.0.1",
+                "@types/node": "*",
+                "jest-message-util": "^27.5.1",
+                "jest-mock": "^27.5.1",
+                "jest-util": "^27.5.1"
+            }
+        },
+        "@jest/globals": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/@jest/globals/-/globals-27.5.1.tgz",
+            "integrity": "sha512-ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "@jest/environment": "^27.5.1",
+                "@jest/types": "^27.5.1",
+                "expect": "^27.5.1"
+            }
+        },
+        "@jest/reporters": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/@jest/reporters/-/reporters-27.5.1.tgz",
+            "integrity": "sha512-cPXh9hWIlVJMQkVk84aIvXuBB4uQQmFqZiacloFuGiP3ah1sbCxCosidXFDfqG8+6fO1oR2dTJTlsOy4VFmUfw==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "@bcoe/v8-coverage": "^0.2.3",
+                "@jest/console": "^27.5.1",
+                "@jest/test-result": "^27.5.1",
+                "@jest/transform": "^27.5.1",
+                "@jest/types": "^27.5.1",
+                "@types/node": "*",
+                "chalk": "^4.0.0",
+                "collect-v8-coverage": "^1.0.0",
+                "exit": "^0.1.2",
+                "glob": "^7.1.2",
+                "graceful-fs": "^4.2.9",
+                "istanbul-lib-coverage": "^3.0.0",
+                "istanbul-lib-instrument": "^5.1.0",
+                "istanbul-lib-report": "^3.0.0",
+                "istanbul-lib-source-maps": "^4.0.0",
+                "istanbul-reports": "^3.1.3",
+                "jest-haste-map": "^27.5.1",
+                "jest-resolve": "^27.5.1",
+                "jest-util": "^27.5.1",
+                "jest-worker": "^27.5.1",
+                "slash": "^3.0.0",
+                "source-map": "^0.6.0",
+                "string-length": "^4.0.1",
+                "terminal-link": "^2.0.0",
+                "v8-to-istanbul": "^8.1.0"
+            },
+            "dependencies": {
+                "ansi-styles": {
+                    "version": "4.3.0",
+                    "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "color-convert": "^2.0.1"
+                    }
+                },
+                "brace-expansion": {
+                    "version": "1.1.11",
+                    "resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.11.tgz",
+                    "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "balanced-match": "^1.0.0",
+                        "concat-map": "0.0.1"
+                    }
+                },
+                "chalk": {
+                    "version": "4.1.2",
+                    "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "ansi-styles": "^4.1.0",
+                        "supports-color": "^7.1.0"
+                    }
+                },
+                "color-convert": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "color-name": "~1.1.4"
+                    }
+                },
+                "color-name": {
+                    "version": "1.1.4",
+                    "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+                    "dev": true,
+                    "peer": true
+                },
+                "glob": {
+                    "version": "7.2.3",
+                    "resolved": "https://registry.npmmirror.com/glob/-/glob-7.2.3.tgz",
+                    "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "fs.realpath": "^1.0.0",
+                        "inflight": "^1.0.4",
+                        "inherits": "2",
+                        "minimatch": "^3.1.1",
+                        "once": "^1.3.0",
+                        "path-is-absolute": "^1.0.0"
+                    }
+                },
+                "has-flag": {
+                    "version": "4.0.0",
+                    "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+                    "dev": true,
+                    "peer": true
+                },
+                "minimatch": {
+                    "version": "3.1.2",
+                    "resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-3.1.2.tgz",
+                    "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "brace-expansion": "^1.1.7"
+                    }
+                },
+                "supports-color": {
+                    "version": "7.2.0",
+                    "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "has-flag": "^4.0.0"
+                    }
+                }
+            }
+        },
+        "@jest/source-map": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/@jest/source-map/-/source-map-27.5.1.tgz",
+            "integrity": "sha512-y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "callsites": "^3.0.0",
+                "graceful-fs": "^4.2.9",
+                "source-map": "^0.6.0"
+            }
+        },
+        "@jest/test-result": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/@jest/test-result/-/test-result-27.5.1.tgz",
+            "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "@jest/console": "^27.5.1",
+                "@jest/types": "^27.5.1",
+                "@types/istanbul-lib-coverage": "^2.0.0",
+                "collect-v8-coverage": "^1.0.0"
+            }
+        },
+        "@jest/test-sequencer": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/@jest/test-sequencer/-/test-sequencer-27.5.1.tgz",
+            "integrity": "sha512-LCheJF7WB2+9JuCS7VB/EmGIdQuhtqjRNI9A43idHv3E4KltCTsPsLxvdaubFHSYwY/fNjMWjl6vNRhDiN7vpQ==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "@jest/test-result": "^27.5.1",
+                "graceful-fs": "^4.2.9",
+                "jest-haste-map": "^27.5.1",
+                "jest-runtime": "^27.5.1"
+            }
+        },
+        "@jest/transform": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/@jest/transform/-/transform-27.5.1.tgz",
+            "integrity": "sha512-ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "@babel/core": "^7.1.0",
+                "@jest/types": "^27.5.1",
+                "babel-plugin-istanbul": "^6.1.1",
+                "chalk": "^4.0.0",
+                "convert-source-map": "^1.4.0",
+                "fast-json-stable-stringify": "^2.0.0",
+                "graceful-fs": "^4.2.9",
+                "jest-haste-map": "^27.5.1",
+                "jest-regex-util": "^27.5.1",
+                "jest-util": "^27.5.1",
+                "micromatch": "^4.0.4",
+                "pirates": "^4.0.4",
+                "slash": "^3.0.0",
+                "source-map": "^0.6.1",
+                "write-file-atomic": "^3.0.0"
+            },
+            "dependencies": {
+                "ansi-styles": {
+                    "version": "4.3.0",
+                    "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "color-convert": "^2.0.1"
+                    }
+                },
+                "chalk": {
+                    "version": "4.1.2",
+                    "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "ansi-styles": "^4.1.0",
+                        "supports-color": "^7.1.0"
+                    }
+                },
+                "color-convert": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "color-name": "~1.1.4"
+                    }
+                },
+                "color-name": {
+                    "version": "1.1.4",
+                    "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+                    "dev": true,
+                    "peer": true
+                },
+                "convert-source-map": {
+                    "version": "1.9.0",
+                    "resolved": "https://registry.npmmirror.com/convert-source-map/-/convert-source-map-1.9.0.tgz",
+                    "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
+                    "dev": true,
+                    "peer": true
+                },
+                "has-flag": {
+                    "version": "4.0.0",
+                    "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+                    "dev": true,
+                    "peer": true
+                },
+                "supports-color": {
+                    "version": "7.2.0",
+                    "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "has-flag": "^4.0.0"
+                    }
+                }
+            }
+        },
+        "@jest/types": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/@jest/types/-/types-27.5.1.tgz",
+            "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "@types/istanbul-lib-coverage": "^2.0.0",
+                "@types/istanbul-reports": "^3.0.0",
+                "@types/node": "*",
+                "@types/yargs": "^16.0.0",
+                "chalk": "^4.0.0"
+            },
+            "dependencies": {
+                "ansi-styles": {
+                    "version": "4.3.0",
+                    "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "color-convert": "^2.0.1"
+                    }
+                },
+                "chalk": {
+                    "version": "4.1.2",
+                    "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "ansi-styles": "^4.1.0",
+                        "supports-color": "^7.1.0"
+                    }
+                },
+                "color-convert": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "color-name": "~1.1.4"
+                    }
+                },
+                "color-name": {
+                    "version": "1.1.4",
+                    "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+                    "dev": true,
+                    "peer": true
+                },
+                "has-flag": {
+                    "version": "4.0.0",
+                    "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+                    "dev": true,
+                    "peer": true
+                },
+                "supports-color": {
+                    "version": "7.2.0",
+                    "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "has-flag": "^4.0.0"
+                    }
+                }
+            }
+        },
+        "@jimp/bmp": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/bmp/-/bmp-0.10.3.tgz",
+            "integrity": "sha512-keMOc5woiDmONXsB/6aXLR4Z5Q+v8lFq3EY2rcj2FmstbDMhRuGbmcBxlEgOqfRjwvtf/wOtJ3Of37oAWtVfLg==",
+            "requires": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/utils": "^0.10.3",
+                "bmp-js": "^0.1.0",
+                "core-js": "^3.4.1"
+            }
+        },
+        "@jimp/core": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/core/-/core-0.10.3.tgz",
+            "integrity": "sha512-Gd5IpL3U2bFIO57Fh/OA3HCpWm4uW/pU01E75rI03BXfTdz3T+J7TwvyG1XaqsQ7/DSlS99GXtLQPlfFIe28UA==",
+            "requires": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/utils": "^0.10.3",
+                "any-base": "^1.1.0",
+                "buffer": "^5.2.0",
+                "core-js": "^3.4.1",
+                "exif-parser": "^0.1.12",
+                "file-type": "^9.0.0",
+                "load-bmfont": "^1.3.1",
+                "mkdirp": "^0.5.1",
+                "phin": "^2.9.1",
+                "pixelmatch": "^4.0.2",
+                "tinycolor2": "^1.4.1"
+            }
+        },
+        "@jimp/custom": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/custom/-/custom-0.10.3.tgz",
+            "integrity": "sha512-nZmSI+jwTi5IRyNLbKSXQovoeqsw+D0Jn0SxW08wYQvdkiWA8bTlDQFgQ7HVwCAKBm8oKkDB/ZEo9qvHJ+1gAQ==",
+            "requires": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/core": "^0.10.3",
+                "core-js": "^3.4.1"
+            }
+        },
+        "@jimp/gif": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/gif/-/gif-0.10.3.tgz",
+            "integrity": "sha512-vjlRodSfz1CrUvvrnUuD/DsLK1GHB/yDZXHthVdZu23zYJIW7/WrIiD1IgQ5wOMV7NocfrvPn2iqUfBP81/WWA==",
+            "requires": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/utils": "^0.10.3",
+                "core-js": "^3.4.1",
+                "omggif": "^1.0.9"
+            }
+        },
+        "@jimp/jpeg": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/jpeg/-/jpeg-0.10.3.tgz",
+            "integrity": "sha512-AAANwgUZOt6f6P7LZxY9lyJ9xclqutYJlsxt3JbriXUGJgrrFAIkcKcqv1nObgmQASSAQKYaMV9KdHjMlWFKlQ==",
+            "requires": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/utils": "^0.10.3",
+                "core-js": "^3.4.1",
+                "jpeg-js": "^0.3.4"
+            }
+        },
+        "@jimp/plugin-blit": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/plugin-blit/-/plugin-blit-0.10.3.tgz",
+            "integrity": "sha512-5zlKlCfx4JWw9qUVC7GI4DzXyxDWyFvgZLaoGFoT00mlXlN75SarlDwc9iZ/2e2kp4bJWxz3cGgG4G/WXrbg3Q==",
+            "requires": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/utils": "^0.10.3",
+                "core-js": "^3.4.1"
+            }
+        },
+        "@jimp/plugin-blur": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/plugin-blur/-/plugin-blur-0.10.3.tgz",
+            "integrity": "sha512-cTOK3rjh1Yjh23jSfA6EHCHjsPJDEGLC8K2y9gM7dnTUK1y9NNmkFS23uHpyjgsWFIoH9oRh2SpEs3INjCpZhQ==",
+            "requires": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/utils": "^0.10.3",
+                "core-js": "^3.4.1"
+            }
+        },
+        "@jimp/plugin-circle": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/plugin-circle/-/plugin-circle-0.10.3.tgz",
+            "integrity": "sha512-51GAPIVelqAcfuUpaM5JWJ0iWl4vEjNXB7p4P7SX5udugK5bxXUjO6KA2qgWmdpHuCKtoNgkzWU9fNSuYp7tCA==",
+            "requires": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/utils": "^0.10.3",
+                "core-js": "^3.4.1"
+            }
+        },
+        "@jimp/plugin-color": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/plugin-color/-/plugin-color-0.10.3.tgz",
+            "integrity": "sha512-RgeHUElmlTH7vpI4WyQrz6u59spiKfVQbsG/XUzfWGamFSixa24ZDwX/yV/Ts+eNaz7pZeIuv533qmKPvw2ujg==",
+            "requires": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/utils": "^0.10.3",
+                "core-js": "^3.4.1",
+                "tinycolor2": "^1.4.1"
+            }
+        },
+        "@jimp/plugin-contain": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/plugin-contain/-/plugin-contain-0.10.3.tgz",
+            "integrity": "sha512-bYJKW9dqzcB0Ihc6u7jSyKa3juStzbLs2LFr6fu8TzA2WkMS/R8h+ddkiO36+F9ILTWHP0CIA3HFe5OdOGcigw==",
+            "requires": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/utils": "^0.10.3",
+                "core-js": "^3.4.1"
+            }
+        },
+        "@jimp/plugin-cover": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/plugin-cover/-/plugin-cover-0.10.3.tgz",
+            "integrity": "sha512-pOxu0cM0BRPzdV468n4dMocJXoMbTnARDY/EpC3ZW15SpMuc/dr1KhWQHgoQX5kVW1Wt8zgqREAJJCQ5KuPKDA==",
+            "requires": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/utils": "^0.10.3",
+                "core-js": "^3.4.1"
+            }
+        },
+        "@jimp/plugin-crop": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/plugin-crop/-/plugin-crop-0.10.3.tgz",
+            "integrity": "sha512-nB7HgOjjl9PgdHr076xZ3Sr6qHYzeBYBs9qvs3tfEEUeYMNnvzgCCGtUl6eMakazZFCMk3mhKmcB9zQuHFOvkg==",
+            "requires": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/utils": "^0.10.3",
+                "core-js": "^3.4.1"
+            }
+        },
+        "@jimp/plugin-displace": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/plugin-displace/-/plugin-displace-0.10.3.tgz",
+            "integrity": "sha512-8t3fVKCH5IVqI4lewe4lFFjpxxr69SQCz5/tlpDLQZsrNScNJivHdQ09zljTrVTCSgeCqQJIKgH2Q7Sk/pAZ0w==",
+            "requires": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/utils": "^0.10.3",
+                "core-js": "^3.4.1"
+            }
+        },
+        "@jimp/plugin-dither": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/plugin-dither/-/plugin-dither-0.10.3.tgz",
+            "integrity": "sha512-JCX/oNSnEg1kGQ8ffZ66bEgQOLCY3Rn+lrd6v1jjLy/mn9YVZTMsxLtGCXpiCDC2wG/KTmi4862ysmP9do9dAQ==",
+            "requires": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/utils": "^0.10.3",
+                "core-js": "^3.4.1"
+            }
+        },
+        "@jimp/plugin-fisheye": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/plugin-fisheye/-/plugin-fisheye-0.10.3.tgz",
+            "integrity": "sha512-RRZb1wqe+xdocGcFtj2xHU7sF7xmEZmIa6BmrfSchjyA2b32TGPWKnP3qyj7p6LWEsXn+19hRYbjfyzyebPElQ==",
+            "requires": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/utils": "^0.10.3",
+                "core-js": "^3.4.1"
+            }
+        },
+        "@jimp/plugin-flip": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/plugin-flip/-/plugin-flip-0.10.3.tgz",
+            "integrity": "sha512-0epbi8XEzp0wmSjoW9IB0iMu0yNF17aZOxLdURCN3Zr+8nWPs5VNIMqSVa1Y62GSyiMDpVpKF/ITiXre+EqrPg==",
+            "requires": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/utils": "^0.10.3",
+                "core-js": "^3.4.1"
+            }
+        },
+        "@jimp/plugin-gaussian": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/plugin-gaussian/-/plugin-gaussian-0.10.3.tgz",
+            "integrity": "sha512-25eHlFbHUDnMMGpgRBBeQ2AMI4wsqCg46sue0KklI+c2BaZ+dGXmJA5uT8RTOrt64/K9Wz5E+2n7eBnny4dfpQ==",
+            "requires": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/utils": "^0.10.3",
+                "core-js": "^3.4.1"
+            }
+        },
+        "@jimp/plugin-invert": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/plugin-invert/-/plugin-invert-0.10.3.tgz",
+            "integrity": "sha512-effYSApWY/FbtlzqsKXlTLkgloKUiHBKjkQnqh5RL4oQxh/33j6aX+HFdDyQKtsXb8CMd4xd7wyiD2YYabTa0g==",
+            "requires": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/utils": "^0.10.3",
+                "core-js": "^3.4.1"
+            }
+        },
+        "@jimp/plugin-mask": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/plugin-mask/-/plugin-mask-0.10.3.tgz",
+            "integrity": "sha512-twrg8q8TIhM9Z6Jcu9/5f+OCAPaECb0eKrrbbIajJqJ3bCUlj5zbfgIhiQIzjPJ6KjpnFPSqHQfHkU1Vvk/nVw==",
+            "requires": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/utils": "^0.10.3",
+                "core-js": "^3.4.1"
+            }
+        },
+        "@jimp/plugin-normalize": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/plugin-normalize/-/plugin-normalize-0.10.3.tgz",
+            "integrity": "sha512-xkb5eZI/mMlbwKkDN79+1/t/+DBo8bBXZUMsT4gkFgMRKNRZ6NQPxlv1d3QpRzlocsl6UMxrHnhgnXdLAcgrXw==",
+            "requires": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/utils": "^0.10.3",
+                "core-js": "^3.4.1"
+            }
+        },
+        "@jimp/plugin-print": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/plugin-print/-/plugin-print-0.10.3.tgz",
+            "integrity": "sha512-wjRiI6yjXsAgMe6kVjizP+RgleUCLkH256dskjoNvJzmzbEfO7xQw9g6M02VET+emnbY0CO83IkrGm2q43VRyg==",
+            "requires": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/utils": "^0.10.3",
+                "core-js": "^3.4.1",
+                "load-bmfont": "^1.4.0"
+            }
+        },
+        "@jimp/plugin-resize": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/plugin-resize/-/plugin-resize-0.10.3.tgz",
+            "integrity": "sha512-rf8YmEB1d7Sg+g4LpqF0Mp+dfXfb6JFJkwlAIWPUOR7lGsPWALavEwTW91c0etEdnp0+JB9AFpy6zqq7Lwkq6w==",
+            "requires": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/utils": "^0.10.3",
+                "core-js": "^3.4.1"
+            }
+        },
+        "@jimp/plugin-rotate": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/plugin-rotate/-/plugin-rotate-0.10.3.tgz",
+            "integrity": "sha512-YXLlRjm18fkW9MOHUaVAxWjvgZM851ofOipytz5FyKp4KZWDLk+dZK1JNmVmK7MyVmAzZ5jsgSLhIgj+GgN0Eg==",
+            "requires": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/utils": "^0.10.3",
+                "core-js": "^3.4.1"
+            }
+        },
+        "@jimp/plugin-scale": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/plugin-scale/-/plugin-scale-0.10.3.tgz",
+            "integrity": "sha512-5DXD7x7WVcX1gUgnlFXQa8F+Q3ThRYwJm+aesgrYvDOY+xzRoRSdQvhmdd4JEEue3lyX44DvBSgCIHPtGcEPaw==",
+            "requires": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/utils": "^0.10.3",
+                "core-js": "^3.4.1"
+            }
+        },
+        "@jimp/plugin-shadow": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/plugin-shadow/-/plugin-shadow-0.10.3.tgz",
+            "integrity": "sha512-/nkFXpt2zVcdP4ETdkAUL0fSzyrC5ZFxdcphbYBodqD7fXNqChS/Un1eD4xCXWEpW8cnG9dixZgQgStjywH0Mg==",
+            "requires": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/utils": "^0.10.3",
+                "core-js": "^3.4.1"
+            }
+        },
+        "@jimp/plugin-threshold": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/plugin-threshold/-/plugin-threshold-0.10.3.tgz",
+            "integrity": "sha512-Dzh0Yq2wXP2SOnxcbbiyA4LJ2luwrdf1MghNIt9H+NX7B+IWw/N8qA2GuSm9n4BPGSLluuhdAWJqHcTiREriVA==",
+            "requires": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/utils": "^0.10.3",
+                "core-js": "^3.4.1"
+            }
+        },
+        "@jimp/plugins": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/plugins/-/plugins-0.10.3.tgz",
+            "integrity": "sha512-jTT3/7hOScf0EIKiAXmxwayHhryhc1wWuIe3FrchjDjr9wgIGNN2a7XwCgPl3fML17DXK1x8EzDneCdh261bkw==",
+            "requires": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/plugin-blit": "^0.10.3",
+                "@jimp/plugin-blur": "^0.10.3",
+                "@jimp/plugin-circle": "^0.10.3",
+                "@jimp/plugin-color": "^0.10.3",
+                "@jimp/plugin-contain": "^0.10.3",
+                "@jimp/plugin-cover": "^0.10.3",
+                "@jimp/plugin-crop": "^0.10.3",
+                "@jimp/plugin-displace": "^0.10.3",
+                "@jimp/plugin-dither": "^0.10.3",
+                "@jimp/plugin-fisheye": "^0.10.3",
+                "@jimp/plugin-flip": "^0.10.3",
+                "@jimp/plugin-gaussian": "^0.10.3",
+                "@jimp/plugin-invert": "^0.10.3",
+                "@jimp/plugin-mask": "^0.10.3",
+                "@jimp/plugin-normalize": "^0.10.3",
+                "@jimp/plugin-print": "^0.10.3",
+                "@jimp/plugin-resize": "^0.10.3",
+                "@jimp/plugin-rotate": "^0.10.3",
+                "@jimp/plugin-scale": "^0.10.3",
+                "@jimp/plugin-shadow": "^0.10.3",
+                "@jimp/plugin-threshold": "^0.10.3",
+                "core-js": "^3.4.1",
+                "timm": "^1.6.1"
+            }
+        },
+        "@jimp/png": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/png/-/png-0.10.3.tgz",
+            "integrity": "sha512-YKqk/dkl+nGZxSYIDQrqhmaP8tC3IK8H7dFPnnzFVvbhDnyYunqBZZO3SaZUKTichClRw8k/CjBhbc+hifSGWg==",
+            "requires": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/utils": "^0.10.3",
+                "core-js": "^3.4.1",
+                "pngjs": "^3.3.3"
+            }
+        },
+        "@jimp/tiff": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/tiff/-/tiff-0.10.3.tgz",
+            "integrity": "sha512-7EsJzZ5Y/EtinkBGuwX3Bi4S+zgbKouxjt9c82VJTRJOQgLWsE/RHqcyRCOQBhHAZ9QexYmDz34medfLKdoX0g==",
+            "requires": {
+                "@babel/runtime": "^7.7.2",
+                "core-js": "^3.4.1",
+                "utif": "^2.0.1"
+            }
+        },
+        "@jimp/types": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/types/-/types-0.10.3.tgz",
+            "integrity": "sha512-XGmBakiHZqseSWr/puGN+CHzx0IKBSpsKlmEmsNV96HKDiP6eu8NSnwdGCEq2mmIHe0JNcg1hqg59hpwtQ7Tiw==",
+            "requires": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/bmp": "^0.10.3",
+                "@jimp/gif": "^0.10.3",
+                "@jimp/jpeg": "^0.10.3",
+                "@jimp/png": "^0.10.3",
+                "@jimp/tiff": "^0.10.3",
+                "core-js": "^3.4.1",
+                "timm": "^1.6.1"
+            }
+        },
+        "@jimp/utils": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/@jimp/utils/-/utils-0.10.3.tgz",
+            "integrity": "sha512-VcSlQhkil4ReYmg1KkN+WqHyYfZ2XfZxDsKAHSfST1GEz/RQHxKZbX+KhFKtKflnL0F4e6DlNQj3vznMNXCR2w==",
+            "requires": {
+                "@babel/runtime": "^7.7.2",
+                "core-js": "^3.4.1",
+                "regenerator-runtime": "^0.13.3"
+            }
+        },
+        "@jridgewell/gen-mapping": {
+            "version": "0.3.5",
+            "resolved": "https://registry.npmmirror.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
+            "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
+            "requires": {
+                "@jridgewell/set-array": "^1.2.1",
+                "@jridgewell/sourcemap-codec": "^1.4.10",
+                "@jridgewell/trace-mapping": "^0.3.24"
+            }
+        },
+        "@jridgewell/resolve-uri": {
+            "version": "3.1.2",
+            "resolved": "https://registry.npmmirror.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+            "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw=="
+        },
+        "@jridgewell/set-array": {
+            "version": "1.2.1",
+            "resolved": "https://registry.npmmirror.com/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+            "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A=="
+        },
+        "@jridgewell/source-map": {
+            "version": "0.3.6",
+            "resolved": "https://registry.npmmirror.com/@jridgewell/source-map/-/source-map-0.3.6.tgz",
+            "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
+            "devOptional": true,
+            "requires": {
+                "@jridgewell/gen-mapping": "^0.3.5",
+                "@jridgewell/trace-mapping": "^0.3.25"
+            }
+        },
+        "@jridgewell/sourcemap-codec": {
+            "version": "1.4.15",
+            "resolved": "https://registry.npmmirror.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+            "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
+        },
+        "@jridgewell/trace-mapping": {
+            "version": "0.3.25",
+            "resolved": "https://registry.npmmirror.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+            "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+            "requires": {
+                "@jridgewell/resolve-uri": "^3.1.0",
+                "@jridgewell/sourcemap-codec": "^1.4.14"
+            }
+        },
+        "@nodelib/fs.scandir": {
+            "version": "2.1.5",
+            "resolved": "https://registry.npmmirror.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+            "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+            "requires": {
+                "@nodelib/fs.stat": "2.0.5",
+                "run-parallel": "^1.1.9"
+            }
+        },
+        "@nodelib/fs.stat": {
+            "version": "2.0.5",
+            "resolved": "https://registry.npmmirror.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+            "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="
+        },
+        "@nodelib/fs.walk": {
+            "version": "1.2.8",
+            "resolved": "https://registry.npmmirror.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+            "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+            "requires": {
+                "@nodelib/fs.scandir": "2.1.5",
+                "fastq": "^1.6.0"
+            }
+        },
+        "@rollup/plugin-commonjs": {
+            "version": "24.1.0",
+            "resolved": "https://registry.npmmirror.com/@rollup/plugin-commonjs/-/plugin-commonjs-24.1.0.tgz",
+            "integrity": "sha512-eSL45hjhCWI0jCCXcNtLVqM5N1JlBGvlFfY0m6oOYnLCJ6N0qEXoZql4sY2MOUArzhH4SA/qBpTxvvZp2Sc+DQ==",
+            "dev": true,
+            "requires": {
+                "@rollup/pluginutils": "^5.0.1",
+                "commondir": "^1.0.1",
+                "estree-walker": "^2.0.2",
+                "glob": "^8.0.3",
+                "is-reference": "1.2.1",
+                "magic-string": "^0.27.0"
+            },
+            "dependencies": {
+                "@rollup/pluginutils": {
+                    "version": "5.1.0",
+                    "resolved": "https://registry.npmmirror.com/@rollup/pluginutils/-/pluginutils-5.1.0.tgz",
+                    "integrity": "sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==",
+                    "dev": true,
+                    "requires": {
+                        "@types/estree": "^1.0.0",
+                        "estree-walker": "^2.0.2",
+                        "picomatch": "^2.3.1"
+                    }
+                },
+                "magic-string": {
+                    "version": "0.27.0",
+                    "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.27.0.tgz",
+                    "integrity": "sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==",
+                    "dev": true,
+                    "requires": {
+                        "@jridgewell/sourcemap-codec": "^1.4.13"
+                    }
+                }
+            }
+        },
+        "@rollup/pluginutils": {
+            "version": "4.2.1",
+            "resolved": "https://registry.npmmirror.com/@rollup/pluginutils/-/pluginutils-4.2.1.tgz",
+            "integrity": "sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==",
+            "requires": {
+                "estree-walker": "^2.0.1",
+                "picomatch": "^2.2.2"
+            }
+        },
+        "@sinonjs/commons": {
+            "version": "1.8.6",
+            "resolved": "https://registry.npmmirror.com/@sinonjs/commons/-/commons-1.8.6.tgz",
+            "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "type-detect": "4.0.8"
+            }
+        },
+        "@sinonjs/fake-timers": {
+            "version": "8.1.0",
+            "resolved": "https://registry.npmmirror.com/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz",
+            "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "@sinonjs/commons": "^1.7.0"
+            }
+        },
+        "@tootallnate/once": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmmirror.com/@tootallnate/once/-/once-1.1.2.tgz",
+            "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
+            "dev": true,
+            "peer": true
+        },
+        "@types/babel__core": {
+            "version": "7.20.5",
+            "resolved": "https://registry.npmmirror.com/@types/babel__core/-/babel__core-7.20.5.tgz",
+            "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "@babel/parser": "^7.20.7",
+                "@babel/types": "^7.20.7",
+                "@types/babel__generator": "*",
+                "@types/babel__template": "*",
+                "@types/babel__traverse": "*"
+            }
+        },
+        "@types/babel__generator": {
+            "version": "7.6.8",
+            "resolved": "https://registry.npmmirror.com/@types/babel__generator/-/babel__generator-7.6.8.tgz",
+            "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "@babel/types": "^7.0.0"
+            }
+        },
+        "@types/babel__template": {
+            "version": "7.4.4",
+            "resolved": "https://registry.npmmirror.com/@types/babel__template/-/babel__template-7.4.4.tgz",
+            "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "@babel/parser": "^7.1.0",
+                "@babel/types": "^7.0.0"
+            }
+        },
+        "@types/babel__traverse": {
+            "version": "7.20.5",
+            "resolved": "https://registry.npmmirror.com/@types/babel__traverse/-/babel__traverse-7.20.5.tgz",
+            "integrity": "sha512-WXCyOcRtH37HAUkpXhUduaxdm82b4GSlyTqajXviN4EfiuPgNYR109xMCKvpl6zPIpua0DGlMEDCq+g8EdoheQ==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "@babel/types": "^7.20.7"
+            }
+        },
+        "@types/estree": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmmirror.com/@types/estree/-/estree-1.0.5.tgz",
+            "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
+            "dev": true
+        },
+        "@types/graceful-fs": {
+            "version": "4.1.9",
+            "resolved": "https://registry.npmmirror.com/@types/graceful-fs/-/graceful-fs-4.1.9.tgz",
+            "integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "@types/node": "*"
+            }
+        },
+        "@types/istanbul-lib-coverage": {
+            "version": "2.0.6",
+            "resolved": "https://registry.npmmirror.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",
+            "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==",
+            "dev": true,
+            "peer": true
+        },
+        "@types/istanbul-lib-report": {
+            "version": "3.0.3",
+            "resolved": "https://registry.npmmirror.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz",
+            "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "@types/istanbul-lib-coverage": "*"
+            }
+        },
+        "@types/istanbul-reports": {
+            "version": "3.0.4",
+            "resolved": "https://registry.npmmirror.com/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz",
+            "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "@types/istanbul-lib-report": "*"
+            }
+        },
+        "@types/node": {
+            "version": "20.12.12",
+            "resolved": "https://registry.npmmirror.com/@types/node/-/node-20.12.12.tgz",
+            "integrity": "sha512-eWLDGF/FOSPtAvEqeRAQ4C8LSA7M1I7i0ky1I8U7kD1J5ITyW3AsRhQrKVoWf5pFKZ2kILsEGJhsI9r93PYnOw==",
+            "devOptional": true,
+            "requires": {
+                "undici-types": "~5.26.4"
+            }
+        },
+        "@types/prettier": {
+            "version": "2.7.3",
+            "resolved": "https://registry.npmmirror.com/@types/prettier/-/prettier-2.7.3.tgz",
+            "integrity": "sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA==",
+            "dev": true,
+            "peer": true
+        },
+        "@types/qrcode": {
+            "version": "1.5.5",
+            "resolved": "https://registry.npmmirror.com/@types/qrcode/-/qrcode-1.5.5.tgz",
+            "integrity": "sha512-CdfBi/e3Qk+3Z/fXYShipBT13OJ2fDO2Q2w5CIP5anLTLIndQG9z6P1cnm+8zCWSpm5dnxMFd/uREtb0EXuQzg==",
+            "dev": true,
+            "requires": {
+                "@types/node": "*"
+            }
+        },
+        "@types/sortablejs": {
+            "version": "1.15.8",
+            "resolved": "https://registry.npmmirror.com/@types/sortablejs/-/sortablejs-1.15.8.tgz",
+            "integrity": "sha512-b79830lW+RZfwaztgs1aVPgbasJ8e7AXtZYHTELNXZPsERt4ymJdjV4OccDbHQAvHrCcFpbF78jkm0R6h/pZVg==",
+            "dev": true
+        },
+        "@types/stack-utils": {
+            "version": "2.0.3",
+            "resolved": "https://registry.npmmirror.com/@types/stack-utils/-/stack-utils-2.0.3.tgz",
+            "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==",
+            "dev": true,
+            "peer": true
+        },
+        "@types/yargs": {
+            "version": "16.0.9",
+            "resolved": "https://registry.npmmirror.com/@types/yargs/-/yargs-16.0.9.tgz",
+            "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "@types/yargs-parser": "*"
+            }
+        },
+        "@types/yargs-parser": {
+            "version": "21.0.3",
+            "resolved": "https://registry.npmmirror.com/@types/yargs-parser/-/yargs-parser-21.0.3.tgz",
+            "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==",
+            "dev": true,
+            "peer": true
+        },
+        "@vitejs/plugin-legacy": {
+            "version": "4.1.1",
+            "resolved": "https://registry.npmmirror.com/@vitejs/plugin-legacy/-/plugin-legacy-4.1.1.tgz",
+            "integrity": "sha512-um3gbVouD2Q/g19C0qpDfHwveXDCAHzs8OC3e9g6aXpKoD1H14himgs7wkMnhAynBJy7QqUoZNAXDuqN8zLR2g==",
+            "dev": true,
+            "requires": {
+                "@babel/core": "^7.22.9",
+                "@babel/preset-env": "^7.22.9",
+                "browserslist": "^4.21.9",
+                "core-js": "^3.31.1",
+                "magic-string": "^0.30.1",
+                "regenerator-runtime": "^0.13.11",
+                "systemjs": "^6.14.1"
+            }
+        },
+        "@vitejs/plugin-vue": {
+            "version": "4.6.2",
+            "resolved": "https://registry.npmmirror.com/@vitejs/plugin-vue/-/plugin-vue-4.6.2.tgz",
+            "integrity": "sha512-kqf7SGFoG+80aZG6Pf+gsZIVvGSCKE98JbiWqcCV9cThtg91Jav0yvYFC9Zb+jKetNGF6ZKeoaxgZfND21fWKw==",
+            "requires": {}
+        },
+        "@vitejs/plugin-vue-jsx": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmmirror.com/@vitejs/plugin-vue-jsx/-/plugin-vue-jsx-3.1.0.tgz",
+            "integrity": "sha512-w9M6F3LSEU5kszVb9An2/MmXNxocAnUb3WhRr8bHlimhDrXNt6n6D2nJQR3UXpGlZHh/EsgouOHCsM8V3Ln+WA==",
+            "dev": true,
+            "requires": {
+                "@babel/core": "^7.23.3",
+                "@babel/plugin-transform-typescript": "^7.23.3",
+                "@vue/babel-plugin-jsx": "^1.1.5"
+            }
+        },
+        "@vivaxy/wxml": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmmirror.com/@vivaxy/wxml/-/wxml-2.1.0.tgz",
+            "integrity": "sha512-xqnfAB58tl5SPyfkQjrn7D7nuvq7XV9um7QUsjCrvA4X6aZBxcau9sAM47LsQTOpJIVPzjaKIMvq3ul07yZlOA==",
+            "dev": true
+        },
+        "@volar/language-core": {
+            "version": "1.11.1",
+            "resolved": "https://registry.npmmirror.com/@volar/language-core/-/language-core-1.11.1.tgz",
+            "integrity": "sha512-dOcNn3i9GgZAcJt43wuaEykSluAuOkQgzni1cuxLxTV0nJKanQztp7FxyswdRILaKH+P2XZMPRp2S4MV/pElCw==",
+            "dev": true,
+            "requires": {
+                "@volar/source-map": "1.11.1"
+            }
+        },
+        "@volar/source-map": {
+            "version": "1.11.1",
+            "resolved": "https://registry.npmmirror.com/@volar/source-map/-/source-map-1.11.1.tgz",
+            "integrity": "sha512-hJnOnwZ4+WT5iupLRnuzbULZ42L7BWWPMmruzwtLhJfpDVoZLjNBxHDi2sY2bgZXCKlpU5XcsMFoYrsQmPhfZg==",
+            "dev": true,
+            "requires": {
+                "muggle-string": "^0.3.1"
+            }
+        },
+        "@volar/typescript": {
+            "version": "1.11.1",
+            "resolved": "https://registry.npmmirror.com/@volar/typescript/-/typescript-1.11.1.tgz",
+            "integrity": "sha512-iU+t2mas/4lYierSnoFOeRFQUhAEMgsFuQxoxvwn5EdQopw43j+J27a4lt9LMInx1gLJBC6qL14WYGlgymaSMQ==",
+            "dev": true,
+            "requires": {
+                "@volar/language-core": "1.11.1",
+                "path-browserify": "^1.0.1"
+            }
+        },
+        "@vue/babel-helper-vue-transform-on": {
+            "version": "1.2.2",
+            "resolved": "https://registry.npmmirror.com/@vue/babel-helper-vue-transform-on/-/babel-helper-vue-transform-on-1.2.2.tgz",
+            "integrity": "sha512-nOttamHUR3YzdEqdM/XXDyCSdxMA9VizUKoroLX6yTyRtggzQMHXcmwh8a7ZErcJttIBIc9s68a1B8GZ+Dmvsw==",
+            "dev": true
+        },
+        "@vue/babel-plugin-jsx": {
+            "version": "1.2.2",
+            "resolved": "https://registry.npmmirror.com/@vue/babel-plugin-jsx/-/babel-plugin-jsx-1.2.2.tgz",
+            "integrity": "sha512-nYTkZUVTu4nhP199UoORePsql0l+wj7v/oyQjtThUVhJl1U+6qHuoVhIvR3bf7eVKjbCK+Cs2AWd7mi9Mpz9rA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-module-imports": "~7.22.15",
+                "@babel/helper-plugin-utils": "^7.22.5",
+                "@babel/plugin-syntax-jsx": "^7.23.3",
+                "@babel/template": "^7.23.9",
+                "@babel/traverse": "^7.23.9",
+                "@babel/types": "^7.23.9",
+                "@vue/babel-helper-vue-transform-on": "1.2.2",
+                "@vue/babel-plugin-resolve-type": "1.2.2",
+                "camelcase": "^6.3.0",
+                "html-tags": "^3.3.1",
+                "svg-tags": "^1.0.0"
+            },
+            "dependencies": {
+                "@babel/helper-module-imports": {
+                    "version": "7.22.15",
+                    "resolved": "https://registry.npmmirror.com/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz",
+                    "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==",
+                    "dev": true,
+                    "requires": {
+                        "@babel/types": "^7.22.15"
+                    }
+                }
+            }
+        },
+        "@vue/babel-plugin-resolve-type": {
+            "version": "1.2.2",
+            "resolved": "https://registry.npmmirror.com/@vue/babel-plugin-resolve-type/-/babel-plugin-resolve-type-1.2.2.tgz",
+            "integrity": "sha512-EntyroPwNg5IPVdUJupqs0CFzuf6lUrVvCspmv2J1FITLeGnUCuoGNNk78dgCusxEiYj6RMkTJflGSxk5aIC4A==",
+            "dev": true,
+            "requires": {
+                "@babel/code-frame": "^7.23.5",
+                "@babel/helper-module-imports": "~7.22.15",
+                "@babel/helper-plugin-utils": "^7.22.5",
+                "@babel/parser": "^7.23.9",
+                "@vue/compiler-sfc": "^3.4.15"
+            },
+            "dependencies": {
+                "@babel/helper-module-imports": {
+                    "version": "7.22.15",
+                    "resolved": "https://registry.npmmirror.com/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz",
+                    "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==",
+                    "dev": true,
+                    "requires": {
+                        "@babel/types": "^7.22.15"
+                    }
+                },
+                "@vue/compiler-core": {
+                    "version": "3.4.27",
+                    "resolved": "https://registry.npmmirror.com/@vue/compiler-core/-/compiler-core-3.4.27.tgz",
+                    "integrity": "sha512-E+RyqY24KnyDXsCuQrI+mlcdW3ALND6U7Gqa/+bVwbcpcR3BRRIckFoz7Qyd4TTlnugtwuI7YgjbvsLmxb+yvg==",
+                    "dev": true,
+                    "requires": {
+                        "@babel/parser": "^7.24.4",
+                        "@vue/shared": "3.4.27",
+                        "entities": "^4.5.0",
+                        "estree-walker": "^2.0.2",
+                        "source-map-js": "^1.2.0"
+                    }
+                },
+                "@vue/compiler-dom": {
+                    "version": "3.4.27",
+                    "resolved": "https://registry.npmmirror.com/@vue/compiler-dom/-/compiler-dom-3.4.27.tgz",
+                    "integrity": "sha512-kUTvochG/oVgE1w5ViSr3KUBh9X7CWirebA3bezTbB5ZKBQZwR2Mwj9uoSKRMFcz4gSMzzLXBPD6KpCLb9nvWw==",
+                    "dev": true,
+                    "requires": {
+                        "@vue/compiler-core": "3.4.27",
+                        "@vue/shared": "3.4.27"
+                    }
+                },
+                "@vue/compiler-sfc": {
+                    "version": "3.4.27",
+                    "resolved": "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-3.4.27.tgz",
+                    "integrity": "sha512-nDwntUEADssW8e0rrmE0+OrONwmRlegDA1pD6QhVeXxjIytV03yDqTey9SBDiALsvAd5U4ZrEKbMyVXhX6mCGA==",
+                    "dev": true,
+                    "requires": {
+                        "@babel/parser": "^7.24.4",
+                        "@vue/compiler-core": "3.4.27",
+                        "@vue/compiler-dom": "3.4.27",
+                        "@vue/compiler-ssr": "3.4.27",
+                        "@vue/shared": "3.4.27",
+                        "estree-walker": "^2.0.2",
+                        "magic-string": "^0.30.10",
+                        "postcss": "^8.4.38",
+                        "source-map-js": "^1.2.0"
+                    }
+                },
+                "@vue/compiler-ssr": {
+                    "version": "3.4.27",
+                    "resolved": "https://registry.npmmirror.com/@vue/compiler-ssr/-/compiler-ssr-3.4.27.tgz",
+                    "integrity": "sha512-CVRzSJIltzMG5FcidsW0jKNQnNRYC8bT21VegyMMtHmhW3UOI7knmUehzswXLrExDLE6lQCZdrhD4ogI7c+vuw==",
+                    "dev": true,
+                    "requires": {
+                        "@vue/compiler-dom": "3.4.27",
+                        "@vue/shared": "3.4.27"
+                    }
+                },
+                "@vue/shared": {
+                    "version": "3.4.27",
+                    "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.4.27.tgz",
+                    "integrity": "sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA==",
+                    "dev": true
+                }
+            }
+        },
+        "@vue/compiler-core": {
+            "version": "3.2.47",
+            "resolved": "https://registry.npmmirror.com/@vue/compiler-core/-/compiler-core-3.2.47.tgz",
+            "integrity": "sha512-p4D7FDnQb7+YJmO2iPEv0SQNeNzcbHdGByJDsT4lynf63AFkOTFN07HsiRSvjGo0QrxR/o3d0hUyNCUnBU2Tig==",
+            "requires": {
+                "@babel/parser": "^7.16.4",
+                "@vue/shared": "3.2.47",
+                "estree-walker": "^2.0.2",
+                "source-map": "^0.6.1"
+            }
+        },
+        "@vue/compiler-dom": {
+            "version": "3.2.47",
+            "resolved": "https://registry.npmmirror.com/@vue/compiler-dom/-/compiler-dom-3.2.47.tgz",
+            "integrity": "sha512-dBBnEHEPoftUiS03a4ggEig74J2YBZ2UIeyfpcRM2tavgMWo4bsEfgCGsu+uJIL/vax9S+JztH8NmQerUo7shQ==",
+            "requires": {
+                "@vue/compiler-core": "3.2.47",
+                "@vue/shared": "3.2.47"
+            }
+        },
+        "@vue/compiler-sfc": {
+            "version": "3.2.47",
+            "resolved": "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-3.2.47.tgz",
+            "integrity": "sha512-rog05W+2IFfxjMcFw10tM9+f7i/+FFpZJJ5XHX72NP9eC2uRD+42M3pYcQqDXVYoj74kHMSEdQ/WmCjt8JFksQ==",
+            "requires": {
+                "@babel/parser": "^7.16.4",
+                "@vue/compiler-core": "3.2.47",
+                "@vue/compiler-dom": "3.2.47",
+                "@vue/compiler-ssr": "3.2.47",
+                "@vue/reactivity-transform": "3.2.47",
+                "@vue/shared": "3.2.47",
+                "estree-walker": "^2.0.2",
+                "magic-string": "^0.25.7",
+                "postcss": "^8.1.10",
+                "source-map": "^0.6.1"
+            },
+            "dependencies": {
+                "magic-string": {
+                    "version": "0.25.9",
+                    "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.25.9.tgz",
+                    "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==",
+                    "requires": {
+                        "sourcemap-codec": "^1.4.8"
+                    }
+                }
+            }
+        },
+        "@vue/compiler-ssr": {
+            "version": "3.2.47",
+            "resolved": "https://registry.npmmirror.com/@vue/compiler-ssr/-/compiler-ssr-3.2.47.tgz",
+            "integrity": "sha512-wVXC+gszhulcMD8wpxMsqSOpvDZ6xKXSVWkf50Guf/S+28hTAXPDYRTbLQ3EDkOP5Xz/+SY37YiwDquKbJOgZw==",
+            "requires": {
+                "@vue/compiler-dom": "3.2.47",
+                "@vue/shared": "3.2.47"
+            }
+        },
+        "@vue/devtools-api": {
+            "version": "6.6.1",
+            "resolved": "https://registry.npmmirror.com/@vue/devtools-api/-/devtools-api-6.6.1.tgz",
+            "integrity": "sha512-LgPscpE3Vs0x96PzSSB4IGVSZXZBZHpfxs+ZA1d+VEPwHdOXowy/Y2CsvCAIFrf+ssVU1pD1jidj505EpUnfbA=="
+        },
+        "@vue/language-core": {
+            "version": "1.8.27",
+            "resolved": "https://registry.npmmirror.com/@vue/language-core/-/language-core-1.8.27.tgz",
+            "integrity": "sha512-L8Kc27VdQserNaCUNiSFdDl9LWT24ly8Hpwf1ECy3aFb9m6bDhBGQYOujDm21N7EW3moKIOKEanQwe1q5BK+mA==",
+            "dev": true,
+            "requires": {
+                "@volar/language-core": "~1.11.1",
+                "@volar/source-map": "~1.11.1",
+                "@vue/compiler-dom": "^3.3.0",
+                "@vue/shared": "^3.3.0",
+                "computeds": "^0.0.1",
+                "minimatch": "^9.0.3",
+                "muggle-string": "^0.3.1",
+                "path-browserify": "^1.0.1",
+                "vue-template-compiler": "^2.7.14"
+            },
+            "dependencies": {
+                "@vue/compiler-core": {
+                    "version": "3.4.27",
+                    "resolved": "https://registry.npmmirror.com/@vue/compiler-core/-/compiler-core-3.4.27.tgz",
+                    "integrity": "sha512-E+RyqY24KnyDXsCuQrI+mlcdW3ALND6U7Gqa/+bVwbcpcR3BRRIckFoz7Qyd4TTlnugtwuI7YgjbvsLmxb+yvg==",
+                    "dev": true,
+                    "requires": {
+                        "@babel/parser": "^7.24.4",
+                        "@vue/shared": "3.4.27",
+                        "entities": "^4.5.0",
+                        "estree-walker": "^2.0.2",
+                        "source-map-js": "^1.2.0"
+                    }
+                },
+                "@vue/compiler-dom": {
+                    "version": "3.4.27",
+                    "resolved": "https://registry.npmmirror.com/@vue/compiler-dom/-/compiler-dom-3.4.27.tgz",
+                    "integrity": "sha512-kUTvochG/oVgE1w5ViSr3KUBh9X7CWirebA3bezTbB5ZKBQZwR2Mwj9uoSKRMFcz4gSMzzLXBPD6KpCLb9nvWw==",
+                    "dev": true,
+                    "requires": {
+                        "@vue/compiler-core": "3.4.27",
+                        "@vue/shared": "3.4.27"
+                    }
+                },
+                "@vue/shared": {
+                    "version": "3.4.27",
+                    "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.4.27.tgz",
+                    "integrity": "sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA==",
+                    "dev": true
+                },
+                "minimatch": {
+                    "version": "9.0.4",
+                    "resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-9.0.4.tgz",
+                    "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==",
+                    "dev": true,
+                    "requires": {
+                        "brace-expansion": "^2.0.1"
+                    }
+                }
+            }
+        },
+        "@vue/reactivity": {
+            "version": "3.4.27",
+            "resolved": "https://registry.npmmirror.com/@vue/reactivity/-/reactivity-3.4.27.tgz",
+            "integrity": "sha512-kK0g4NknW6JX2yySLpsm2jlunZJl2/RJGZ0H9ddHdfBVHcNzxmQ0sS0b09ipmBoQpY8JM2KmUw+a6sO8Zo+zIA==",
+            "requires": {
+                "@vue/shared": "3.4.27"
+            },
+            "dependencies": {
+                "@vue/shared": {
+                    "version": "3.4.27",
+                    "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.4.27.tgz",
+                    "integrity": "sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA=="
+                }
+            }
+        },
+        "@vue/reactivity-transform": {
+            "version": "3.2.47",
+            "resolved": "https://registry.npmmirror.com/@vue/reactivity-transform/-/reactivity-transform-3.2.47.tgz",
+            "integrity": "sha512-m8lGXw8rdnPVVIdIFhf0LeQ/ixyHkH5plYuS83yop5n7ggVJU+z5v0zecwEnX7fa7HNLBhh2qngJJkxpwEEmYA==",
+            "requires": {
+                "@babel/parser": "^7.16.4",
+                "@vue/compiler-core": "3.2.47",
+                "@vue/shared": "3.2.47",
+                "estree-walker": "^2.0.2",
+                "magic-string": "^0.25.7"
+            },
+            "dependencies": {
+                "magic-string": {
+                    "version": "0.25.9",
+                    "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.25.9.tgz",
+                    "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==",
+                    "requires": {
+                        "sourcemap-codec": "^1.4.8"
+                    }
+                }
+            }
+        },
+        "@vue/runtime-core": {
+            "version": "3.4.27",
+            "resolved": "https://registry.npmmirror.com/@vue/runtime-core/-/runtime-core-3.4.27.tgz",
+            "integrity": "sha512-7aYA9GEbOOdviqVvcuweTLe5Za4qBZkUY7SvET6vE8kyypxVgaT1ixHLg4urtOlrApdgcdgHoTZCUuTGap/5WA==",
+            "requires": {
+                "@vue/reactivity": "3.4.27",
+                "@vue/shared": "3.4.27"
+            },
+            "dependencies": {
+                "@vue/shared": {
+                    "version": "3.4.27",
+                    "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.4.27.tgz",
+                    "integrity": "sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA=="
+                }
+            }
+        },
+        "@vue/runtime-dom": {
+            "version": "3.4.27",
+            "resolved": "https://registry.npmmirror.com/@vue/runtime-dom/-/runtime-dom-3.4.27.tgz",
+            "integrity": "sha512-ScOmP70/3NPM+TW9hvVAz6VWWtZJqkbdf7w6ySsws+EsqtHvkhxaWLecrTorFxsawelM5Ys9FnDEMt6BPBDS0Q==",
+            "requires": {
+                "@vue/runtime-core": "3.4.27",
+                "@vue/shared": "3.4.27",
+                "csstype": "^3.1.3"
+            },
+            "dependencies": {
+                "@vue/shared": {
+                    "version": "3.4.27",
+                    "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.4.27.tgz",
+                    "integrity": "sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA=="
+                }
+            }
+        },
+        "@vue/server-renderer": {
+            "version": "3.4.27",
+            "resolved": "https://registry.npmmirror.com/@vue/server-renderer/-/server-renderer-3.4.27.tgz",
+            "integrity": "sha512-dlAMEuvmeA3rJsOMJ2J1kXU7o7pOxgsNHVr9K8hB3ImIkSuBrIdy0vF66h8gf8Tuinf1TK3mPAz2+2sqyf3KzA==",
+            "requires": {
+                "@vue/compiler-ssr": "3.4.27",
+                "@vue/shared": "3.4.27"
+            },
+            "dependencies": {
+                "@vue/compiler-core": {
+                    "version": "3.4.27",
+                    "resolved": "https://registry.npmmirror.com/@vue/compiler-core/-/compiler-core-3.4.27.tgz",
+                    "integrity": "sha512-E+RyqY24KnyDXsCuQrI+mlcdW3ALND6U7Gqa/+bVwbcpcR3BRRIckFoz7Qyd4TTlnugtwuI7YgjbvsLmxb+yvg==",
+                    "requires": {
+                        "@babel/parser": "^7.24.4",
+                        "@vue/shared": "3.4.27",
+                        "entities": "^4.5.0",
+                        "estree-walker": "^2.0.2",
+                        "source-map-js": "^1.2.0"
+                    }
+                },
+                "@vue/compiler-dom": {
+                    "version": "3.4.27",
+                    "resolved": "https://registry.npmmirror.com/@vue/compiler-dom/-/compiler-dom-3.4.27.tgz",
+                    "integrity": "sha512-kUTvochG/oVgE1w5ViSr3KUBh9X7CWirebA3bezTbB5ZKBQZwR2Mwj9uoSKRMFcz4gSMzzLXBPD6KpCLb9nvWw==",
+                    "requires": {
+                        "@vue/compiler-core": "3.4.27",
+                        "@vue/shared": "3.4.27"
+                    }
+                },
+                "@vue/compiler-ssr": {
+                    "version": "3.4.27",
+                    "resolved": "https://registry.npmmirror.com/@vue/compiler-ssr/-/compiler-ssr-3.4.27.tgz",
+                    "integrity": "sha512-CVRzSJIltzMG5FcidsW0jKNQnNRYC8bT21VegyMMtHmhW3UOI7knmUehzswXLrExDLE6lQCZdrhD4ogI7c+vuw==",
+                    "requires": {
+                        "@vue/compiler-dom": "3.4.27",
+                        "@vue/shared": "3.4.27"
+                    }
+                },
+                "@vue/shared": {
+                    "version": "3.4.27",
+                    "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.4.27.tgz",
+                    "integrity": "sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA=="
+                }
+            }
+        },
+        "@vue/shared": {
+            "version": "3.2.47",
+            "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.2.47.tgz",
+            "integrity": "sha512-BHGyyGN3Q97EZx0taMQ+OLNuZcW3d37ZEVmEAyeoA9ERdGvm9Irc/0Fua8SNyOtV1w6BS4q25wbMzJujO9HIfQ=="
+        },
+        "@vue/tsconfig": {
+            "version": "0.1.3",
+            "resolved": "https://registry.npmmirror.com/@vue/tsconfig/-/tsconfig-0.1.3.tgz",
+            "integrity": "sha512-kQVsh8yyWPvHpb8gIc9l/HIDiiVUy1amynLNpCy8p+FoCiZXCo6fQos5/097MmnNZc9AtseDsCrfkhqCrJ8Olg==",
+            "dev": true,
+            "requires": {}
+        },
+        "@windicss/config": {
+            "version": "1.9.3",
+            "resolved": "https://registry.npmmirror.com/@windicss/config/-/config-1.9.3.tgz",
+            "integrity": "sha512-u8GUjsfC9r5X1AGYhzb1lX3zZj8wqk6SH1DYex8XUGmZ1M2UpvnUPOFi63XFViduspQ6l2xTX84QtG+lUzhEoQ==",
+            "dev": true,
+            "requires": {
+                "debug": "^4.3.4",
+                "jiti": "^1.18.2",
+                "windicss": "^3.5.6"
+            }
+        },
+        "@windicss/plugin-utils": {
+            "version": "1.9.3",
+            "resolved": "https://registry.npmmirror.com/@windicss/plugin-utils/-/plugin-utils-1.9.3.tgz",
+            "integrity": "sha512-3VG5HEGeuIfG/9iTwLyzWWm/aGKNTbtSVkpkAabdRuDP/2lEmf6Hpo4uo5drwE+2O9gXfc6nSYgAwBjotx5CfQ==",
+            "dev": true,
+            "requires": {
+                "@antfu/utils": "^0.7.2",
+                "@windicss/config": "1.9.3",
+                "debug": "^4.3.4",
+                "fast-glob": "^3.2.12",
+                "magic-string": "^0.30.0",
+                "micromatch": "^4.0.5",
+                "windicss": "^3.5.6"
+            }
+        },
+        "abab": {
+            "version": "2.0.6",
+            "resolved": "https://registry.npmmirror.com/abab/-/abab-2.0.6.tgz",
+            "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
+            "dev": true,
+            "peer": true
+        },
+        "accepts": {
+            "version": "1.3.8",
+            "resolved": "https://registry.npmmirror.com/accepts/-/accepts-1.3.8.tgz",
+            "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
+            "dev": true,
+            "requires": {
+                "mime-types": "~2.1.34",
+                "negotiator": "0.6.3"
+            }
+        },
+        "acorn": {
+            "version": "8.11.3",
+            "resolved": "https://registry.npmmirror.com/acorn/-/acorn-8.11.3.tgz",
+            "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==",
+            "devOptional": true
+        },
+        "acorn-globals": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmmirror.com/acorn-globals/-/acorn-globals-6.0.0.tgz",
+            "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "acorn": "^7.1.1",
+                "acorn-walk": "^7.1.1"
+            },
+            "dependencies": {
+                "acorn": {
+                    "version": "7.4.1",
+                    "resolved": "https://registry.npmmirror.com/acorn/-/acorn-7.4.1.tgz",
+                    "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+                    "dev": true,
+                    "peer": true
+                }
+            }
+        },
+        "acorn-walk": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmmirror.com/acorn-walk/-/acorn-walk-7.2.0.tgz",
+            "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
+            "dev": true,
+            "peer": true
+        },
+        "address": {
+            "version": "1.2.2",
+            "resolved": "https://registry.npmmirror.com/address/-/address-1.2.2.tgz",
+            "integrity": "sha512-4B/qKCfeE/ODUaAUpSwfzazo5x29WD4r3vXiWsB7I2mSDAihwEqKO+g8GELZUQSSAo5e1XTYh3ZVfLyxBc12nA==",
+            "dev": true
+        },
+        "agent-base": {
+            "version": "6.0.2",
+            "resolved": "https://registry.npmmirror.com/agent-base/-/agent-base-6.0.2.tgz",
+            "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "debug": "4"
+            }
+        },
+        "ansi-escapes": {
+            "version": "4.3.2",
+            "resolved": "https://registry.npmmirror.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+            "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "type-fest": "^0.21.3"
+            }
+        },
+        "ansi-regex": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-5.0.1.tgz",
+            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
+        },
+        "ansi-styles": {
+            "version": "3.2.1",
+            "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-3.2.1.tgz",
+            "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+            "requires": {
+                "color-convert": "^1.9.0"
+            }
+        },
+        "any-base": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmmirror.com/any-base/-/any-base-1.1.0.tgz",
+            "integrity": "sha512-uMgjozySS8adZZYePpaWs8cxB9/kdzmpX6SgJZ+wbz1K5eYk5QMYDVJaZKhxyIHUdnnJkfR7SVgStgH7LkGUyg=="
+        },
+        "anymatch": {
+            "version": "3.1.3",
+            "resolved": "https://registry.npmmirror.com/anymatch/-/anymatch-3.1.3.tgz",
+            "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+            "requires": {
+                "normalize-path": "^3.0.0",
+                "picomatch": "^2.0.4"
+            }
+        },
+        "argparse": {
+            "version": "1.0.10",
+            "resolved": "https://registry.npmmirror.com/argparse/-/argparse-1.0.10.tgz",
+            "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "sprintf-js": "~1.0.2"
+            }
+        },
+        "array-flatten": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmmirror.com/array-flatten/-/array-flatten-1.1.1.tgz",
+            "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
+            "dev": true
+        },
+        "asynckit": {
+            "version": "0.4.0",
+            "resolved": "https://registry.npmmirror.com/asynckit/-/asynckit-0.4.0.tgz",
+            "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+            "dev": true,
+            "peer": true
+        },
+        "autoprefixer": {
+            "version": "10.4.19",
+            "resolved": "https://registry.npmmirror.com/autoprefixer/-/autoprefixer-10.4.19.tgz",
+            "integrity": "sha512-BaENR2+zBZ8xXhM4pUaKUxlVdxZ0EZhjvbopwnXmxRUfqDmwSpC2lAi/QXvx7NRdPCo1WKEcEF6mV64si1z4Ew==",
+            "requires": {
+                "browserslist": "^4.23.0",
+                "caniuse-lite": "^1.0.30001599",
+                "fraction.js": "^4.3.7",
+                "normalize-range": "^0.1.2",
+                "picocolors": "^1.0.0",
+                "postcss-value-parser": "^4.2.0"
+            }
+        },
+        "babel-jest": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/babel-jest/-/babel-jest-27.5.1.tgz",
+            "integrity": "sha512-cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "@jest/transform": "^27.5.1",
+                "@jest/types": "^27.5.1",
+                "@types/babel__core": "^7.1.14",
+                "babel-plugin-istanbul": "^6.1.1",
+                "babel-preset-jest": "^27.5.1",
+                "chalk": "^4.0.0",
+                "graceful-fs": "^4.2.9",
+                "slash": "^3.0.0"
+            },
+            "dependencies": {
+                "ansi-styles": {
+                    "version": "4.3.0",
+                    "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "color-convert": "^2.0.1"
+                    }
+                },
+                "chalk": {
+                    "version": "4.1.2",
+                    "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "ansi-styles": "^4.1.0",
+                        "supports-color": "^7.1.0"
+                    }
+                },
+                "color-convert": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "color-name": "~1.1.4"
+                    }
+                },
+                "color-name": {
+                    "version": "1.1.4",
+                    "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+                    "dev": true,
+                    "peer": true
+                },
+                "has-flag": {
+                    "version": "4.0.0",
+                    "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+                    "dev": true,
+                    "peer": true
+                },
+                "supports-color": {
+                    "version": "7.2.0",
+                    "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "has-flag": "^4.0.0"
+                    }
+                }
+            }
+        },
+        "babel-plugin-istanbul": {
+            "version": "6.1.1",
+            "resolved": "https://registry.npmmirror.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
+            "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "@babel/helper-plugin-utils": "^7.0.0",
+                "@istanbuljs/load-nyc-config": "^1.0.0",
+                "@istanbuljs/schema": "^0.1.2",
+                "istanbul-lib-instrument": "^5.0.4",
+                "test-exclude": "^6.0.0"
+            }
+        },
+        "babel-plugin-jest-hoist": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.5.1.tgz",
+            "integrity": "sha512-50wCwD5EMNW4aRpOwtqzyZHIewTYNxLA4nhB+09d8BIssfNfzBRhkBIHiaPv1Si226TQSvp8gxAJm2iY2qs2hQ==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "@babel/template": "^7.3.3",
+                "@babel/types": "^7.3.3",
+                "@types/babel__core": "^7.0.0",
+                "@types/babel__traverse": "^7.0.6"
+            }
+        },
+        "babel-plugin-polyfill-corejs2": {
+            "version": "0.4.11",
+            "resolved": "https://registry.npmmirror.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.11.tgz",
+            "integrity": "sha512-sMEJ27L0gRHShOh5G54uAAPaiCOygY/5ratXuiyb2G46FmlSpc9eFCzYVyDiPxfNbwzA7mYahmjQc5q+CZQ09Q==",
+            "dev": true,
+            "requires": {
+                "@babel/compat-data": "^7.22.6",
+                "@babel/helper-define-polyfill-provider": "^0.6.2",
+                "semver": "^6.3.1"
+            }
+        },
+        "babel-plugin-polyfill-corejs3": {
+            "version": "0.10.4",
+            "resolved": "https://registry.npmmirror.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.10.4.tgz",
+            "integrity": "sha512-25J6I8NGfa5YkCDogHRID3fVCadIR8/pGl1/spvCkzb6lVn6SR3ojpx9nOn9iEBcUsjY24AmdKm5khcfKdylcg==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-define-polyfill-provider": "^0.6.1",
+                "core-js-compat": "^3.36.1"
+            }
+        },
+        "babel-plugin-polyfill-regenerator": {
+            "version": "0.6.2",
+            "resolved": "https://registry.npmmirror.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.2.tgz",
+            "integrity": "sha512-2R25rQZWP63nGwaAswvDazbPXfrM3HwVoBXK6HcqeKrSrL/JqcC/rDcf95l4r7LXLyxDXc8uQDa064GubtCABg==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-define-polyfill-provider": "^0.6.2"
+            }
+        },
+        "babel-preset-current-node-syntax": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmmirror.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
+            "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "@babel/plugin-syntax-async-generators": "^7.8.4",
+                "@babel/plugin-syntax-bigint": "^7.8.3",
+                "@babel/plugin-syntax-class-properties": "^7.8.3",
+                "@babel/plugin-syntax-import-meta": "^7.8.3",
+                "@babel/plugin-syntax-json-strings": "^7.8.3",
+                "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
+                "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+                "@babel/plugin-syntax-numeric-separator": "^7.8.3",
+                "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+                "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+                "@babel/plugin-syntax-optional-chaining": "^7.8.3",
+                "@babel/plugin-syntax-top-level-await": "^7.8.3"
+            }
+        },
+        "babel-preset-jest": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/babel-preset-jest/-/babel-preset-jest-27.5.1.tgz",
+            "integrity": "sha512-Nptf2FzlPCWYuJg41HBqXVT8ym6bXOevuCTbhxlUpjwtysGaIWFvDEjp4y+G7fl13FgOdjs7P/DmErqH7da0Ag==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "babel-plugin-jest-hoist": "^27.5.1",
+                "babel-preset-current-node-syntax": "^1.0.0"
+            }
+        },
+        "balanced-match": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmmirror.com/balanced-match/-/balanced-match-1.0.2.tgz",
+            "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+            "dev": true
+        },
+        "base64-arraybuffer": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmmirror.com/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz",
+            "integrity": "sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ=="
+        },
+        "base64-js": {
+            "version": "1.5.1",
+            "resolved": "https://registry.npmmirror.com/base64-js/-/base64-js-1.5.1.tgz",
+            "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
+        },
+        "base64url": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmmirror.com/base64url/-/base64url-3.0.1.tgz",
+            "integrity": "sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A=="
+        },
+        "big.js": {
+            "version": "5.2.2",
+            "resolved": "https://registry.npmmirror.com/big.js/-/big.js-5.2.2.tgz",
+            "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+            "dev": true
+        },
+        "binary-extensions": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmmirror.com/binary-extensions/-/binary-extensions-2.3.0.tgz",
+            "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw=="
+        },
+        "bmp-js": {
+            "version": "0.1.0",
+            "resolved": "https://registry.npmmirror.com/bmp-js/-/bmp-js-0.1.0.tgz",
+            "integrity": "sha512-vHdS19CnY3hwiNdkaqk93DvjVLfbEcI8mys4UjuWrlX1haDmroo8o4xCzh4wD6DGV6HxRCyauwhHRqMTfERtjw=="
+        },
+        "body-parser": {
+            "version": "1.20.2",
+            "resolved": "https://registry.npmmirror.com/body-parser/-/body-parser-1.20.2.tgz",
+            "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",
+            "dev": true,
+            "requires": {
+                "bytes": "3.1.2",
+                "content-type": "~1.0.5",
+                "debug": "2.6.9",
+                "depd": "2.0.0",
+                "destroy": "1.2.0",
+                "http-errors": "2.0.0",
+                "iconv-lite": "0.4.24",
+                "on-finished": "2.4.1",
+                "qs": "6.11.0",
+                "raw-body": "2.5.2",
+                "type-is": "~1.6.18",
+                "unpipe": "1.0.0"
+            },
+            "dependencies": {
+                "debug": {
+                    "version": "2.6.9",
+                    "resolved": "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz",
+                    "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+                    "dev": true,
+                    "requires": {
+                        "ms": "2.0.0"
+                    }
+                },
+                "ms": {
+                    "version": "2.0.0",
+                    "resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz",
+                    "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+                    "dev": true
+                },
+                "qs": {
+                    "version": "6.11.0",
+                    "resolved": "https://registry.npmmirror.com/qs/-/qs-6.11.0.tgz",
+                    "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+                    "dev": true,
+                    "requires": {
+                        "side-channel": "^1.0.4"
+                    }
+                }
+            }
+        },
+        "brace-expansion": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-2.0.1.tgz",
+            "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+            "dev": true,
+            "requires": {
+                "balanced-match": "^1.0.0"
+            }
+        },
+        "braces": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmmirror.com/braces/-/braces-3.0.2.tgz",
+            "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+            "requires": {
+                "fill-range": "^7.0.1"
+            }
+        },
+        "browser-process-hrtime": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmmirror.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
+            "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
+            "dev": true,
+            "peer": true
+        },
+        "browserslist": {
+            "version": "4.24.2",
+            "resolved": "https://registry.npmmirror.com/browserslist/-/browserslist-4.24.2.tgz",
+            "integrity": "sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==",
+            "requires": {
+                "caniuse-lite": "^1.0.30001669",
+                "electron-to-chromium": "^1.5.41",
+                "node-releases": "^2.0.18",
+                "update-browserslist-db": "^1.1.1"
+            }
+        },
+        "bser": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmmirror.com/bser/-/bser-2.1.1.tgz",
+            "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "node-int64": "^0.4.0"
+            }
+        },
+        "buffer": {
+            "version": "5.7.1",
+            "resolved": "https://registry.npmmirror.com/buffer/-/buffer-5.7.1.tgz",
+            "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+            "requires": {
+                "base64-js": "^1.3.1",
+                "ieee754": "^1.1.13"
+            }
+        },
+        "buffer-equal": {
+            "version": "0.0.1",
+            "resolved": "https://registry.npmmirror.com/buffer-equal/-/buffer-equal-0.0.1.tgz",
+            "integrity": "sha512-RgSV6InVQ9ODPdLWJ5UAqBqJBOg370Nz6ZQtRzpt6nUjc8v0St97uJ4PYC6NztqIScrAXafKM3mZPMygSe1ggA=="
+        },
+        "buffer-from": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmmirror.com/buffer-from/-/buffer-from-1.1.2.tgz",
+            "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+            "devOptional": true
+        },
+        "bytes": {
+            "version": "3.1.2",
+            "resolved": "https://registry.npmmirror.com/bytes/-/bytes-3.1.2.tgz",
+            "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+            "dev": true
+        },
+        "cac": {
+            "version": "6.7.9",
+            "resolved": "https://registry.npmmirror.com/cac/-/cac-6.7.9.tgz",
+            "integrity": "sha512-XN5qEpfNQCJ8jRaZgitSkkukjMRCGio+X3Ks5KUbGGlPbV+pSem1l9VuzooCBXOiMFshUZgyYqg6rgN8rjkb/w==",
+            "dev": true
+        },
+        "call-bind": {
+            "version": "1.0.7",
+            "resolved": "https://registry.npmmirror.com/call-bind/-/call-bind-1.0.7.tgz",
+            "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
+            "dev": true,
+            "requires": {
+                "es-define-property": "^1.0.0",
+                "es-errors": "^1.3.0",
+                "function-bind": "^1.1.2",
+                "get-intrinsic": "^1.2.4",
+                "set-function-length": "^1.2.1"
+            }
+        },
+        "callsites": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmmirror.com/callsites/-/callsites-3.1.0.tgz",
+            "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+            "dev": true,
+            "peer": true
+        },
+        "camelcase": {
+            "version": "6.3.0",
+            "resolved": "https://registry.npmmirror.com/camelcase/-/camelcase-6.3.0.tgz",
+            "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+            "dev": true
+        },
+        "caniuse-lite": {
+            "version": "1.0.30001680",
+            "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001680.tgz",
+            "integrity": "sha512-rPQy70G6AGUMnbwS1z6Xg+RkHYPAi18ihs47GH0jcxIG7wArmPgY3XbS2sRdBbxJljp3thdT8BIqv9ccCypiPA=="
+        },
+        "chalk": {
+            "version": "2.4.2",
+            "resolved": "https://registry.npmmirror.com/chalk/-/chalk-2.4.2.tgz",
+            "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+            "requires": {
+                "ansi-styles": "^3.2.1",
+                "escape-string-regexp": "^1.0.5",
+                "supports-color": "^5.3.0"
+            }
+        },
+        "char-regex": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmmirror.com/char-regex/-/char-regex-1.0.2.tgz",
+            "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
+            "dev": true,
+            "peer": true
+        },
+        "chokidar": {
+            "version": "3.6.0",
+            "resolved": "https://registry.npmmirror.com/chokidar/-/chokidar-3.6.0.tgz",
+            "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+            "requires": {
+                "anymatch": "~3.1.2",
+                "braces": "~3.0.2",
+                "fsevents": "~2.3.2",
+                "glob-parent": "~5.1.2",
+                "is-binary-path": "~2.1.0",
+                "is-glob": "~4.0.1",
+                "normalize-path": "~3.0.0",
+                "readdirp": "~3.6.0"
+            }
+        },
+        "ci-info": {
+            "version": "3.9.0",
+            "resolved": "https://registry.npmmirror.com/ci-info/-/ci-info-3.9.0.tgz",
+            "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==",
+            "dev": true,
+            "peer": true
+        },
+        "cjs-module-lexer": {
+            "version": "1.3.1",
+            "resolved": "https://registry.npmmirror.com/cjs-module-lexer/-/cjs-module-lexer-1.3.1.tgz",
+            "integrity": "sha512-a3KdPAANPbNE4ZUv9h6LckSl9zLsYOP4MBmhIPkRaeyybt+r4UghLvq+xw/YwUcC1gqylCkL4rdVs3Lwupjm4Q==",
+            "dev": true,
+            "peer": true
+        },
+        "clipboard": {
+            "version": "2.0.11",
+            "resolved": "https://registry.npmmirror.com/clipboard/-/clipboard-2.0.11.tgz",
+            "integrity": "sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==",
+            "requires": {
+                "good-listener": "^1.2.2",
+                "select": "^1.1.2",
+                "tiny-emitter": "^2.0.0"
+            }
+        },
+        "cliui": {
+            "version": "7.0.4",
+            "resolved": "https://registry.npmmirror.com/cliui/-/cliui-7.0.4.tgz",
+            "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "string-width": "^4.2.0",
+                "strip-ansi": "^6.0.0",
+                "wrap-ansi": "^7.0.0"
+            }
+        },
+        "co": {
+            "version": "4.6.0",
+            "resolved": "https://registry.npmmirror.com/co/-/co-4.6.0.tgz",
+            "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
+            "dev": true,
+            "peer": true
+        },
+        "collect-v8-coverage": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmmirror.com/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz",
+            "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==",
+            "dev": true,
+            "peer": true
+        },
+        "color-convert": {
+            "version": "1.9.3",
+            "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-1.9.3.tgz",
+            "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+            "requires": {
+                "color-name": "1.1.3"
+            }
+        },
+        "color-name": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.3.tgz",
+            "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
+        },
+        "combined-stream": {
+            "version": "1.0.8",
+            "resolved": "https://registry.npmmirror.com/combined-stream/-/combined-stream-1.0.8.tgz",
+            "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "delayed-stream": "~1.0.0"
+            }
+        },
+        "commander": {
+            "version": "2.20.3",
+            "resolved": "https://registry.npmmirror.com/commander/-/commander-2.20.3.tgz",
+            "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+            "devOptional": true
+        },
+        "commondir": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmmirror.com/commondir/-/commondir-1.0.1.tgz",
+            "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==",
+            "dev": true
+        },
+        "compare-versions": {
+            "version": "3.6.0",
+            "resolved": "https://registry.npmmirror.com/compare-versions/-/compare-versions-3.6.0.tgz",
+            "integrity": "sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA=="
+        },
+        "computeds": {
+            "version": "0.0.1",
+            "resolved": "https://registry.npmmirror.com/computeds/-/computeds-0.0.1.tgz",
+            "integrity": "sha512-7CEBgcMjVmitjYo5q8JTJVra6X5mQ20uTThdK+0kR7UEaDrAWEQcRiBtWJzga4eRpP6afNwwLsX2SET2JhVB1Q==",
+            "dev": true
+        },
+        "concat-map": {
+            "version": "0.0.1",
+            "resolved": "https://registry.npmmirror.com/concat-map/-/concat-map-0.0.1.tgz",
+            "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+            "dev": true,
+            "peer": true
+        },
+        "content-disposition": {
+            "version": "0.5.4",
+            "resolved": "https://registry.npmmirror.com/content-disposition/-/content-disposition-0.5.4.tgz",
+            "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
+            "dev": true,
+            "requires": {
+                "safe-buffer": "5.2.1"
+            }
+        },
+        "content-type": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmmirror.com/content-type/-/content-type-1.0.5.tgz",
+            "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
+            "dev": true
+        },
+        "convert-source-map": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/convert-source-map/-/convert-source-map-2.0.0.tgz",
+            "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="
+        },
+        "cookie": {
+            "version": "0.6.0",
+            "resolved": "https://registry.npmmirror.com/cookie/-/cookie-0.6.0.tgz",
+            "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==",
+            "dev": true
+        },
+        "cookie-signature": {
+            "version": "1.0.6",
+            "resolved": "https://registry.npmmirror.com/cookie-signature/-/cookie-signature-1.0.6.tgz",
+            "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
+            "dev": true
+        },
+        "core-js": {
+            "version": "3.37.1",
+            "resolved": "https://registry.npmmirror.com/core-js/-/core-js-3.37.1.tgz",
+            "integrity": "sha512-Xn6qmxrQZyB0FFY8E3bgRXei3lWDJHhvI+u0q9TKIYM49G8pAr0FgnnrFRAmsbptZL1yxRADVXn+x5AGsbBfyw=="
+        },
+        "core-js-compat": {
+            "version": "3.37.1",
+            "resolved": "https://registry.npmmirror.com/core-js-compat/-/core-js-compat-3.37.1.tgz",
+            "integrity": "sha512-9TNiImhKvQqSUkOvk/mMRZzOANTiEVC7WaBNhHcKM7x+/5E1l5NvsysR19zuDQScE8k+kfQXWRN3AtS/eOSHpg==",
+            "dev": true,
+            "requires": {
+                "browserslist": "^4.23.0"
+            }
+        },
+        "cross-env": {
+            "version": "7.0.3",
+            "resolved": "https://registry.npmmirror.com/cross-env/-/cross-env-7.0.3.tgz",
+            "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==",
+            "dev": true,
+            "requires": {
+                "cross-spawn": "^7.0.1"
+            }
+        },
+        "cross-spawn": {
+            "version": "7.0.3",
+            "resolved": "https://registry.npmmirror.com/cross-spawn/-/cross-spawn-7.0.3.tgz",
+            "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+            "dev": true,
+            "requires": {
+                "path-key": "^3.1.0",
+                "shebang-command": "^2.0.0",
+                "which": "^2.0.1"
+            }
+        },
+        "css-font-size-keywords": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmmirror.com/css-font-size-keywords/-/css-font-size-keywords-1.0.0.tgz",
+            "integrity": "sha512-Q+svMDbMlelgCfH/RVDKtTDaf5021O486ZThQPIpahnIjUkMUslC+WuOQSWTgGSrNCH08Y7tYNEmmy0hkfMI8Q=="
+        },
+        "css-font-stretch-keywords": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmmirror.com/css-font-stretch-keywords/-/css-font-stretch-keywords-1.0.1.tgz",
+            "integrity": "sha512-KmugPO2BNqoyp9zmBIUGwt58UQSfyk1X5DbOlkb2pckDXFSAfjsD5wenb88fNrD6fvS+vu90a/tsPpb9vb0SLg=="
+        },
+        "css-font-style-keywords": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmmirror.com/css-font-style-keywords/-/css-font-style-keywords-1.0.1.tgz",
+            "integrity": "sha512-0Fn0aTpcDktnR1RzaBYorIxQily85M2KXRpzmxQPgh8pxUN9Fcn00I8u9I3grNr1QXVgCl9T5Imx0ZwKU973Vg=="
+        },
+        "css-font-weight-keywords": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmmirror.com/css-font-weight-keywords/-/css-font-weight-keywords-1.0.0.tgz",
+            "integrity": "sha512-5So8/NH+oDD+EzsnF4iaG4ZFHQ3vaViePkL1ZbZ5iC/KrsCY+WHq/lvOgrtmuOQ9pBBZ1ADGpaf+A4lj1Z9eYA=="
+        },
+        "css-line-break": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmmirror.com/css-line-break/-/css-line-break-2.1.0.tgz",
+            "integrity": "sha512-FHcKFCZcAha3LwfVBhCQbW2nCNbkZXn7KVUJcsT5/P8YmfsVja0FMPJr0B903j/E69HUphKiV9iQArX8SDYA4w==",
+            "requires": {
+                "utrie": "^1.0.2"
+            }
+        },
+        "css-list-helpers": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/css-list-helpers/-/css-list-helpers-2.0.0.tgz",
+            "integrity": "sha512-9Bj8tZ0jWbAM3u/U6m/boAzAwLPwtjzFvwivr2piSvyVa3K3rChJzQy4RIHkNkKiZCHrEMWDJWtTR8UyVhdDnQ=="
+        },
+        "css-system-font-keywords": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmmirror.com/css-system-font-keywords/-/css-system-font-keywords-1.0.0.tgz",
+            "integrity": "sha512-1umTtVd/fXS25ftfjB71eASCrYhilmEsvDEI6wG/QplnmlfmVM5HkZ/ZX46DT5K3eblFPgLUHt5BRCb0YXkSFA=="
+        },
+        "cssesc": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmmirror.com/cssesc/-/cssesc-3.0.0.tgz",
+            "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg=="
+        },
+        "cssom": {
+            "version": "0.4.4",
+            "resolved": "https://registry.npmmirror.com/cssom/-/cssom-0.4.4.tgz",
+            "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==",
+            "dev": true,
+            "peer": true
+        },
+        "cssstyle": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmmirror.com/cssstyle/-/cssstyle-2.3.0.tgz",
+            "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "cssom": "~0.3.6"
+            },
+            "dependencies": {
+                "cssom": {
+                    "version": "0.3.8",
+                    "resolved": "https://registry.npmmirror.com/cssom/-/cssom-0.3.8.tgz",
+                    "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
+                    "dev": true,
+                    "peer": true
+                }
+            }
+        },
+        "csstype": {
+            "version": "3.1.3",
+            "resolved": "https://registry.npmmirror.com/csstype/-/csstype-3.1.3.tgz",
+            "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="
+        },
+        "data-urls": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/data-urls/-/data-urls-2.0.0.tgz",
+            "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "abab": "^2.0.3",
+                "whatwg-mimetype": "^2.3.0",
+                "whatwg-url": "^8.0.0"
+            }
+        },
+        "dayjs": {
+            "version": "1.11.11",
+            "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.11.tgz",
+            "integrity": "sha512-okzr3f11N6WuqYtZSvm+F776mB41wRZMhKP+hc34YdW+KmtYYK9iqvHSwo2k9FEH3fhGXvOPV6yz2IcSrfRUDg=="
+        },
+        "de-indent": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmmirror.com/de-indent/-/de-indent-1.0.2.tgz",
+            "integrity": "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==",
+            "dev": true
+        },
+        "debug": {
+            "version": "4.3.4",
+            "resolved": "https://registry.npmmirror.com/debug/-/debug-4.3.4.tgz",
+            "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+            "requires": {
+                "ms": "2.1.2"
+            }
+        },
+        "decamelize": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmmirror.com/decamelize/-/decamelize-1.2.0.tgz",
+            "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA=="
+        },
+        "decimal.js": {
+            "version": "10.4.3",
+            "resolved": "https://registry.npmmirror.com/decimal.js/-/decimal.js-10.4.3.tgz",
+            "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==",
+            "dev": true,
+            "peer": true
+        },
+        "dedent": {
+            "version": "0.7.0",
+            "resolved": "https://registry.npmmirror.com/dedent/-/dedent-0.7.0.tgz",
+            "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==",
+            "dev": true,
+            "peer": true
+        },
+        "deepmerge": {
+            "version": "4.3.1",
+            "resolved": "https://registry.npmmirror.com/deepmerge/-/deepmerge-4.3.1.tgz",
+            "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
+            "dev": true,
+            "peer": true
+        },
+        "default-gateway": {
+            "version": "6.0.3",
+            "resolved": "https://registry.npmmirror.com/default-gateway/-/default-gateway-6.0.3.tgz",
+            "integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==",
+            "dev": true,
+            "requires": {
+                "execa": "^5.0.0"
+            }
+        },
+        "define-data-property": {
+            "version": "1.1.4",
+            "resolved": "https://registry.npmmirror.com/define-data-property/-/define-data-property-1.1.4.tgz",
+            "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+            "dev": true,
+            "requires": {
+                "es-define-property": "^1.0.0",
+                "es-errors": "^1.3.0",
+                "gopd": "^1.0.1"
+            }
+        },
+        "delayed-stream": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmmirror.com/delayed-stream/-/delayed-stream-1.0.0.tgz",
+            "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+            "dev": true,
+            "peer": true
+        },
+        "delegate": {
+            "version": "3.2.0",
+            "resolved": "https://registry.npmmirror.com/delegate/-/delegate-3.2.0.tgz",
+            "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw=="
+        },
+        "depd": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/depd/-/depd-2.0.0.tgz",
+            "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+            "dev": true
+        },
+        "destroy": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmmirror.com/destroy/-/destroy-1.2.0.tgz",
+            "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
+            "dev": true
+        },
+        "detect-newline": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmmirror.com/detect-newline/-/detect-newline-3.1.0.tgz",
+            "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
+            "dev": true,
+            "peer": true
+        },
+        "diff-sequences": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/diff-sequences/-/diff-sequences-27.5.1.tgz",
+            "integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==",
+            "dev": true,
+            "peer": true
+        },
+        "dijkstrajs": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmmirror.com/dijkstrajs/-/dijkstrajs-1.0.3.tgz",
+            "integrity": "sha512-qiSlmBq9+BCdCA/L46dw8Uy93mloxsPSbwnm5yrKn2vMPiy8KyAskTF6zuV/j5BMsmOGZDPs7KjU+mjb670kfA=="
+        },
+        "dom-walk": {
+            "version": "0.1.2",
+            "resolved": "https://registry.npmmirror.com/dom-walk/-/dom-walk-0.1.2.tgz",
+            "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w=="
+        },
+        "domexception": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/domexception/-/domexception-2.0.1.tgz",
+            "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "webidl-conversions": "^5.0.0"
+            },
+            "dependencies": {
+                "webidl-conversions": {
+                    "version": "5.0.0",
+                    "resolved": "https://registry.npmmirror.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
+                    "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==",
+                    "dev": true,
+                    "peer": true
+                }
+            }
+        },
+        "ee-first": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmmirror.com/ee-first/-/ee-first-1.1.1.tgz",
+            "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
+            "dev": true
+        },
+        "electron-to-chromium": {
+            "version": "1.5.59",
+            "resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.5.59.tgz",
+            "integrity": "sha512-faAXB6+gEbC8FsiRdpOXgOe4snP49YwjiXynEB8Mp7sUx80W5eN+BnnBHJ/F7eIeLzs+QBfDD40bJMm97oEFcw=="
+        },
+        "emittery": {
+            "version": "0.8.1",
+            "resolved": "https://registry.npmmirror.com/emittery/-/emittery-0.8.1.tgz",
+            "integrity": "sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==",
+            "dev": true,
+            "peer": true
+        },
+        "emoji-regex": {
+            "version": "8.0.0",
+            "resolved": "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-8.0.0.tgz",
+            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+        },
+        "emojis-list": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmmirror.com/emojis-list/-/emojis-list-3.0.0.tgz",
+            "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+            "dev": true
+        },
+        "encode-utf8": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmmirror.com/encode-utf8/-/encode-utf8-1.0.3.tgz",
+            "integrity": "sha512-ucAnuBEhUK4boH2HjVYG5Q2mQyPorvv0u/ocS+zhdw0S8AlHYY+GOFhP1Gio5z4icpP2ivFSvhtFjQi8+T9ppw=="
+        },
+        "encodeurl": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmmirror.com/encodeurl/-/encodeurl-1.0.2.tgz",
+            "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+            "dev": true
+        },
+        "entities": {
+            "version": "4.5.0",
+            "resolved": "https://registry.npmmirror.com/entities/-/entities-4.5.0.tgz",
+            "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw=="
+        },
+        "error-ex": {
+            "version": "1.3.2",
+            "resolved": "https://registry.npmmirror.com/error-ex/-/error-ex-1.3.2.tgz",
+            "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "is-arrayish": "^0.2.1"
+            }
+        },
+        "es-define-property": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmmirror.com/es-define-property/-/es-define-property-1.0.0.tgz",
+            "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+            "dev": true,
+            "requires": {
+                "get-intrinsic": "^1.2.4"
+            }
+        },
+        "es-errors": {
+            "version": "1.3.0",
+            "resolved": "https://registry.npmmirror.com/es-errors/-/es-errors-1.3.0.tgz",
+            "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+            "dev": true
+        },
+        "es-module-lexer": {
+            "version": "1.5.2",
+            "resolved": "https://registry.npmmirror.com/es-module-lexer/-/es-module-lexer-1.5.2.tgz",
+            "integrity": "sha512-l60ETUTmLqbVbVHv1J4/qj+M8nq7AwMzEcg3kmJDt9dCNrTk+yHcYFf/Kw75pMDwd9mPcIGCG5LcS20SxYRzFA=="
+        },
+        "esbuild": {
+            "version": "0.17.19",
+            "resolved": "https://registry.npmmirror.com/esbuild/-/esbuild-0.17.19.tgz",
+            "integrity": "sha512-XQ0jAPFkK/u3LcVRcvVHQcTIqD6E2H1fvZMA5dQPSOWb3suUbWbfbRf94pjc0bNzRYLfIrDRQXr7X+LHIm5oHw==",
+            "requires": {
+                "@esbuild/android-arm": "0.17.19",
+                "@esbuild/android-arm64": "0.17.19",
+                "@esbuild/android-x64": "0.17.19",
+                "@esbuild/darwin-arm64": "0.17.19",
+                "@esbuild/darwin-x64": "0.17.19",
+                "@esbuild/freebsd-arm64": "0.17.19",
+                "@esbuild/freebsd-x64": "0.17.19",
+                "@esbuild/linux-arm": "0.17.19",
+                "@esbuild/linux-arm64": "0.17.19",
+                "@esbuild/linux-ia32": "0.17.19",
+                "@esbuild/linux-loong64": "0.17.19",
+                "@esbuild/linux-mips64el": "0.17.19",
+                "@esbuild/linux-ppc64": "0.17.19",
+                "@esbuild/linux-riscv64": "0.17.19",
+                "@esbuild/linux-s390x": "0.17.19",
+                "@esbuild/linux-x64": "0.17.19",
+                "@esbuild/netbsd-x64": "0.17.19",
+                "@esbuild/openbsd-x64": "0.17.19",
+                "@esbuild/sunos-x64": "0.17.19",
+                "@esbuild/win32-arm64": "0.17.19",
+                "@esbuild/win32-ia32": "0.17.19",
+                "@esbuild/win32-x64": "0.17.19"
+            }
+        },
+        "escalade": {
+            "version": "3.2.0",
+            "resolved": "https://registry.npmmirror.com/escalade/-/escalade-3.2.0.tgz",
+            "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA=="
+        },
+        "escape-html": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmmirror.com/escape-html/-/escape-html-1.0.3.tgz",
+            "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
+            "dev": true
+        },
+        "escape-string-regexp": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmmirror.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+            "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="
+        },
+        "escodegen": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmmirror.com/escodegen/-/escodegen-2.1.0.tgz",
+            "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "esprima": "^4.0.1",
+                "estraverse": "^5.2.0",
+                "esutils": "^2.0.2",
+                "source-map": "~0.6.1"
+            }
+        },
+        "esprima": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmmirror.com/esprima/-/esprima-4.0.1.tgz",
+            "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+            "dev": true,
+            "peer": true
+        },
+        "estraverse": {
+            "version": "5.3.0",
+            "resolved": "https://registry.npmmirror.com/estraverse/-/estraverse-5.3.0.tgz",
+            "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+            "dev": true,
+            "peer": true
+        },
+        "estree-walker": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmmirror.com/estree-walker/-/estree-walker-2.0.2.tgz",
+            "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="
+        },
+        "esutils": {
+            "version": "2.0.3",
+            "resolved": "https://registry.npmmirror.com/esutils/-/esutils-2.0.3.tgz",
+            "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+            "dev": true
+        },
+        "etag": {
+            "version": "1.8.1",
+            "resolved": "https://registry.npmmirror.com/etag/-/etag-1.8.1.tgz",
+            "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
+            "dev": true
+        },
+        "execa": {
+            "version": "5.1.1",
+            "resolved": "https://registry.npmmirror.com/execa/-/execa-5.1.1.tgz",
+            "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+            "dev": true,
+            "requires": {
+                "cross-spawn": "^7.0.3",
+                "get-stream": "^6.0.0",
+                "human-signals": "^2.1.0",
+                "is-stream": "^2.0.0",
+                "merge-stream": "^2.0.0",
+                "npm-run-path": "^4.0.1",
+                "onetime": "^5.1.2",
+                "signal-exit": "^3.0.3",
+                "strip-final-newline": "^2.0.0"
+            }
+        },
+        "exif-parser": {
+            "version": "0.1.12",
+            "resolved": "https://registry.npmmirror.com/exif-parser/-/exif-parser-0.1.12.tgz",
+            "integrity": "sha512-c2bQfLNbMzLPmzQuOr8fy0csy84WmwnER81W88DzTp9CYNPJ6yzOj2EZAh9pywYpqHnshVLHQJ8WzldAyfY+Iw=="
+        },
+        "exit": {
+            "version": "0.1.2",
+            "resolved": "https://registry.npmmirror.com/exit/-/exit-0.1.2.tgz",
+            "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
+            "dev": true,
+            "peer": true
+        },
+        "expect": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/expect/-/expect-27.5.1.tgz",
+            "integrity": "sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "@jest/types": "^27.5.1",
+                "jest-get-type": "^27.5.1",
+                "jest-matcher-utils": "^27.5.1",
+                "jest-message-util": "^27.5.1"
+            }
+        },
+        "express": {
+            "version": "4.19.2",
+            "resolved": "https://registry.npmmirror.com/express/-/express-4.19.2.tgz",
+            "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==",
+            "dev": true,
+            "requires": {
+                "accepts": "~1.3.8",
+                "array-flatten": "1.1.1",
+                "body-parser": "1.20.2",
+                "content-disposition": "0.5.4",
+                "content-type": "~1.0.4",
+                "cookie": "0.6.0",
+                "cookie-signature": "1.0.6",
+                "debug": "2.6.9",
+                "depd": "2.0.0",
+                "encodeurl": "~1.0.2",
+                "escape-html": "~1.0.3",
+                "etag": "~1.8.1",
+                "finalhandler": "1.2.0",
+                "fresh": "0.5.2",
+                "http-errors": "2.0.0",
+                "merge-descriptors": "1.0.1",
+                "methods": "~1.1.2",
+                "on-finished": "2.4.1",
+                "parseurl": "~1.3.3",
+                "path-to-regexp": "0.1.7",
+                "proxy-addr": "~2.0.7",
+                "qs": "6.11.0",
+                "range-parser": "~1.2.1",
+                "safe-buffer": "5.2.1",
+                "send": "0.18.0",
+                "serve-static": "1.15.0",
+                "setprototypeof": "1.2.0",
+                "statuses": "2.0.1",
+                "type-is": "~1.6.18",
+                "utils-merge": "1.0.1",
+                "vary": "~1.1.2"
+            },
+            "dependencies": {
+                "debug": {
+                    "version": "2.6.9",
+                    "resolved": "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz",
+                    "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+                    "dev": true,
+                    "requires": {
+                        "ms": "2.0.0"
+                    }
+                },
+                "ms": {
+                    "version": "2.0.0",
+                    "resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz",
+                    "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+                    "dev": true
+                },
+                "qs": {
+                    "version": "6.11.0",
+                    "resolved": "https://registry.npmmirror.com/qs/-/qs-6.11.0.tgz",
+                    "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+                    "dev": true,
+                    "requires": {
+                        "side-channel": "^1.0.4"
+                    }
+                }
+            }
+        },
+        "fast-glob": {
+            "version": "3.3.2",
+            "resolved": "https://registry.npmmirror.com/fast-glob/-/fast-glob-3.3.2.tgz",
+            "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
+            "requires": {
+                "@nodelib/fs.stat": "^2.0.2",
+                "@nodelib/fs.walk": "^1.2.3",
+                "glob-parent": "^5.1.2",
+                "merge2": "^1.3.0",
+                "micromatch": "^4.0.4"
+            }
+        },
+        "fast-json-stable-stringify": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmmirror.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+            "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+            "dev": true,
+            "peer": true
+        },
+        "fastq": {
+            "version": "1.17.1",
+            "resolved": "https://registry.npmmirror.com/fastq/-/fastq-1.17.1.tgz",
+            "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
+            "requires": {
+                "reusify": "^1.0.4"
+            }
+        },
+        "fb-watchman": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmmirror.com/fb-watchman/-/fb-watchman-2.0.2.tgz",
+            "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "bser": "2.1.1"
+            }
+        },
+        "file-type": {
+            "version": "9.0.0",
+            "resolved": "https://registry.npmmirror.com/file-type/-/file-type-9.0.0.tgz",
+            "integrity": "sha512-Qe/5NJrgIOlwijpq3B7BEpzPFcgzggOTagZmkXQY4LA6bsXKTUstK7Wp12lEJ/mLKTpvIZxmIuRcLYWT6ov9lw=="
+        },
+        "fill-range": {
+            "version": "7.0.1",
+            "resolved": "https://registry.npmmirror.com/fill-range/-/fill-range-7.0.1.tgz",
+            "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+            "requires": {
+                "to-regex-range": "^5.0.1"
+            }
+        },
+        "finalhandler": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmmirror.com/finalhandler/-/finalhandler-1.2.0.tgz",
+            "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+            "dev": true,
+            "requires": {
+                "debug": "2.6.9",
+                "encodeurl": "~1.0.2",
+                "escape-html": "~1.0.3",
+                "on-finished": "2.4.1",
+                "parseurl": "~1.3.3",
+                "statuses": "2.0.1",
+                "unpipe": "~1.0.0"
+            },
+            "dependencies": {
+                "debug": {
+                    "version": "2.6.9",
+                    "resolved": "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz",
+                    "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+                    "dev": true,
+                    "requires": {
+                        "ms": "2.0.0"
+                    }
+                },
+                "ms": {
+                    "version": "2.0.0",
+                    "resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz",
+                    "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+                    "dev": true
+                }
+            }
+        },
+        "find-up": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmmirror.com/find-up/-/find-up-4.1.0.tgz",
+            "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+            "requires": {
+                "locate-path": "^5.0.0",
+                "path-exists": "^4.0.0"
+            }
+        },
+        "form-data": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmmirror.com/form-data/-/form-data-3.0.1.tgz",
+            "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "asynckit": "^0.4.0",
+                "combined-stream": "^1.0.8",
+                "mime-types": "^2.1.12"
+            }
+        },
+        "forwarded": {
+            "version": "0.2.0",
+            "resolved": "https://registry.npmmirror.com/forwarded/-/forwarded-0.2.0.tgz",
+            "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
+            "dev": true
+        },
+        "fraction.js": {
+            "version": "4.3.7",
+            "resolved": "https://registry.npmmirror.com/fraction.js/-/fraction.js-4.3.7.tgz",
+            "integrity": "sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew=="
+        },
+        "fresh": {
+            "version": "0.5.2",
+            "resolved": "https://registry.npmmirror.com/fresh/-/fresh-0.5.2.tgz",
+            "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
+            "dev": true
+        },
+        "fs-extra": {
+            "version": "10.1.0",
+            "resolved": "https://registry.npmmirror.com/fs-extra/-/fs-extra-10.1.0.tgz",
+            "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+            "requires": {
+                "graceful-fs": "^4.2.0",
+                "jsonfile": "^6.0.1",
+                "universalify": "^2.0.0"
+            }
+        },
+        "fs.realpath": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmmirror.com/fs.realpath/-/fs.realpath-1.0.0.tgz",
+            "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+            "dev": true
+        },
+        "fsevents": {
+            "version": "2.3.3",
+            "resolved": "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.3.tgz",
+            "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+            "optional": true
+        },
+        "function-bind": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmmirror.com/function-bind/-/function-bind-1.1.2.tgz",
+            "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="
+        },
+        "generic-names": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmmirror.com/generic-names/-/generic-names-4.0.0.tgz",
+            "integrity": "sha512-ySFolZQfw9FoDb3ed9d80Cm9f0+r7qj+HJkWjeD9RBfpxEVTlVhol+gvaQB/78WbwYfbnNh8nWHHBSlg072y6A==",
+            "requires": {
+                "loader-utils": "^3.2.0"
+            }
+        },
+        "gensync": {
+            "version": "1.0.0-beta.2",
+            "resolved": "https://registry.npmmirror.com/gensync/-/gensync-1.0.0-beta.2.tgz",
+            "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="
+        },
+        "get-caller-file": {
+            "version": "2.0.5",
+            "resolved": "https://registry.npmmirror.com/get-caller-file/-/get-caller-file-2.0.5.tgz",
+            "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
+        },
+        "get-intrinsic": {
+            "version": "1.2.4",
+            "resolved": "https://registry.npmmirror.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+            "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
+            "dev": true,
+            "requires": {
+                "es-errors": "^1.3.0",
+                "function-bind": "^1.1.2",
+                "has-proto": "^1.0.1",
+                "has-symbols": "^1.0.3",
+                "hasown": "^2.0.0"
+            }
+        },
+        "get-package-type": {
+            "version": "0.1.0",
+            "resolved": "https://registry.npmmirror.com/get-package-type/-/get-package-type-0.1.0.tgz",
+            "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
+            "dev": true,
+            "peer": true
+        },
+        "get-port": {
+            "version": "6.1.2",
+            "resolved": "https://registry.npmmirror.com/get-port/-/get-port-6.1.2.tgz",
+            "integrity": "sha512-BrGGraKm2uPqurfGVj/z97/zv8dPleC6x9JBNRTrDNtCkkRF4rPwrQXFgL7+I+q8QSdU4ntLQX2D7KIxSy8nGw==",
+            "dev": true
+        },
+        "get-stream": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmmirror.com/get-stream/-/get-stream-6.0.1.tgz",
+            "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+            "dev": true
+        },
+        "glob": {
+            "version": "8.1.0",
+            "resolved": "https://registry.npmmirror.com/glob/-/glob-8.1.0.tgz",
+            "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
+            "dev": true,
+            "requires": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^5.0.1",
+                "once": "^1.3.0"
+            }
+        },
+        "glob-parent": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmmirror.com/glob-parent/-/glob-parent-5.1.2.tgz",
+            "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+            "requires": {
+                "is-glob": "^4.0.1"
+            }
+        },
+        "global": {
+            "version": "4.4.0",
+            "resolved": "https://registry.npmmirror.com/global/-/global-4.4.0.tgz",
+            "integrity": "sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==",
+            "requires": {
+                "min-document": "^2.19.0",
+                "process": "^0.11.10"
+            }
+        },
+        "globals": {
+            "version": "11.12.0",
+            "resolved": "https://registry.npmmirror.com/globals/-/globals-11.12.0.tgz",
+            "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
+        },
+        "good-listener": {
+            "version": "1.2.2",
+            "resolved": "https://registry.npmmirror.com/good-listener/-/good-listener-1.2.2.tgz",
+            "integrity": "sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==",
+            "requires": {
+                "delegate": "^3.1.2"
+            }
+        },
+        "gopd": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmmirror.com/gopd/-/gopd-1.0.1.tgz",
+            "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+            "dev": true,
+            "requires": {
+                "get-intrinsic": "^1.1.3"
+            }
+        },
+        "graceful-fs": {
+            "version": "4.2.11",
+            "resolved": "https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.11.tgz",
+            "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
+        },
+        "has-flag": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-3.0.0.tgz",
+            "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="
+        },
+        "has-property-descriptors": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmmirror.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+            "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
+            "dev": true,
+            "requires": {
+                "es-define-property": "^1.0.0"
+            }
+        },
+        "has-proto": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmmirror.com/has-proto/-/has-proto-1.0.3.tgz",
+            "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
+            "dev": true
+        },
+        "has-symbols": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmmirror.com/has-symbols/-/has-symbols-1.0.3.tgz",
+            "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+            "dev": true
+        },
+        "hash-sum": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-2.0.0.tgz",
+            "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg=="
+        },
+        "hasown": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmmirror.com/hasown/-/hasown-2.0.2.tgz",
+            "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+            "requires": {
+                "function-bind": "^1.1.2"
+            }
+        },
+        "he": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmmirror.com/he/-/he-1.2.0.tgz",
+            "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+            "dev": true
+        },
+        "html-encoding-sniffer": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
+            "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "whatwg-encoding": "^1.0.5"
+            }
+        },
+        "html-escaper": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmmirror.com/html-escaper/-/html-escaper-2.0.2.tgz",
+            "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+            "dev": true,
+            "peer": true
+        },
+        "html-tags": {
+            "version": "3.3.1",
+            "resolved": "https://registry.npmmirror.com/html-tags/-/html-tags-3.3.1.tgz",
+            "integrity": "sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==",
+            "dev": true
+        },
+        "html2canvas": {
+            "version": "1.4.1",
+            "resolved": "https://registry.npmmirror.com/html2canvas/-/html2canvas-1.4.1.tgz",
+            "integrity": "sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==",
+            "requires": {
+                "css-line-break": "^2.1.0",
+                "text-segmentation": "^1.0.3"
+            }
+        },
+        "http-errors": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/http-errors/-/http-errors-2.0.0.tgz",
+            "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+            "dev": true,
+            "requires": {
+                "depd": "2.0.0",
+                "inherits": "2.0.4",
+                "setprototypeof": "1.2.0",
+                "statuses": "2.0.1",
+                "toidentifier": "1.0.1"
+            }
+        },
+        "http-proxy-agent": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmmirror.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+            "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "@tootallnate/once": "1",
+                "agent-base": "6",
+                "debug": "4"
+            }
+        },
+        "https-proxy-agent": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmmirror.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+            "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "agent-base": "6",
+                "debug": "4"
+            }
+        },
+        "human-signals": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmmirror.com/human-signals/-/human-signals-2.1.0.tgz",
+            "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+            "dev": true
+        },
+        "iconv-lite": {
+            "version": "0.4.24",
+            "resolved": "https://registry.npmmirror.com/iconv-lite/-/iconv-lite-0.4.24.tgz",
+            "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+            "dev": true,
+            "requires": {
+                "safer-buffer": ">= 2.1.2 < 3"
+            }
+        },
+        "icss-replace-symbols": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmmirror.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz",
+            "integrity": "sha512-chIaY3Vh2mh2Q3RGXttaDIzeiPvaVXJ+C4DAh/w3c37SKZ/U6PGMmuicR2EQQp9bKG8zLMCl7I+PtIoOOPp8Gg=="
+        },
+        "icss-utils": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmmirror.com/icss-utils/-/icss-utils-5.1.0.tgz",
+            "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
+            "requires": {}
+        },
+        "ieee754": {
+            "version": "1.2.1",
+            "resolved": "https://registry.npmmirror.com/ieee754/-/ieee754-1.2.1.tgz",
+            "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="
+        },
+        "image-tools": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmmirror.com/image-tools/-/image-tools-1.4.0.tgz",
+            "integrity": "sha512-TKtvJ6iUwM0mfaD4keMnk1ENHFC470QEjBfA3IlvKdEOufzvWbjbaoNcoyYq6HlViF8+d5tOS1ooE6j7CHf1lQ=="
+        },
+        "immutable": {
+            "version": "4.3.6",
+            "resolved": "https://registry.npmmirror.com/immutable/-/immutable-4.3.6.tgz",
+            "integrity": "sha512-Ju0+lEMyzMVZarkTn/gqRpdqd5dOPaz1mCZ0SH3JV6iFw81PldE/PEB1hWVEA288HPt4WXW8O7AWxB10M+03QQ==",
+            "devOptional": true
+        },
+        "import-local": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmmirror.com/import-local/-/import-local-3.1.0.tgz",
+            "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "pkg-dir": "^4.2.0",
+                "resolve-cwd": "^3.0.0"
+            }
+        },
+        "imurmurhash": {
+            "version": "0.1.4",
+            "resolved": "https://registry.npmmirror.com/imurmurhash/-/imurmurhash-0.1.4.tgz",
+            "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+            "dev": true,
+            "peer": true
+        },
+        "inflight": {
+            "version": "1.0.6",
+            "resolved": "https://registry.npmmirror.com/inflight/-/inflight-1.0.6.tgz",
+            "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+            "dev": true,
+            "requires": {
+                "once": "^1.3.0",
+                "wrappy": "1"
+            }
+        },
+        "inherits": {
+            "version": "2.0.4",
+            "resolved": "https://registry.npmmirror.com/inherits/-/inherits-2.0.4.tgz",
+            "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+            "dev": true
+        },
+        "invert-kv": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmmirror.com/invert-kv/-/invert-kv-3.0.1.tgz",
+            "integrity": "sha512-CYdFeFexxhv/Bcny+Q0BfOV+ltRlJcd4BBZBYFX/O0u4npJrgZtIcjokegtiSMAvlMTJ+Koq0GBCc//3bueQxw=="
+        },
+        "ipaddr.js": {
+            "version": "1.9.1",
+            "resolved": "https://registry.npmmirror.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+            "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
+            "dev": true
+        },
+        "is-arrayish": {
+            "version": "0.2.1",
+            "resolved": "https://registry.npmmirror.com/is-arrayish/-/is-arrayish-0.2.1.tgz",
+            "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+            "dev": true,
+            "peer": true
+        },
+        "is-binary-path": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmmirror.com/is-binary-path/-/is-binary-path-2.1.0.tgz",
+            "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+            "requires": {
+                "binary-extensions": "^2.0.0"
+            }
+        },
+        "is-core-module": {
+            "version": "2.13.1",
+            "resolved": "https://registry.npmmirror.com/is-core-module/-/is-core-module-2.13.1.tgz",
+            "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
+            "requires": {
+                "hasown": "^2.0.0"
+            }
+        },
+        "is-extglob": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmmirror.com/is-extglob/-/is-extglob-2.1.1.tgz",
+            "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="
+        },
+        "is-fullwidth-code-point": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmmirror.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+            "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
+        },
+        "is-function": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmmirror.com/is-function/-/is-function-1.0.2.tgz",
+            "integrity": "sha512-lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ=="
+        },
+        "is-generator-fn": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmmirror.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
+            "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
+            "dev": true,
+            "peer": true
+        },
+        "is-glob": {
+            "version": "4.0.3",
+            "resolved": "https://registry.npmmirror.com/is-glob/-/is-glob-4.0.3.tgz",
+            "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+            "requires": {
+                "is-extglob": "^2.1.1"
+            }
+        },
+        "is-number": {
+            "version": "7.0.0",
+            "resolved": "https://registry.npmmirror.com/is-number/-/is-number-7.0.0.tgz",
+            "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
+        },
+        "is-potential-custom-element-name": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmmirror.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
+            "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
+            "dev": true,
+            "peer": true
+        },
+        "is-reference": {
+            "version": "1.2.1",
+            "resolved": "https://registry.npmmirror.com/is-reference/-/is-reference-1.2.1.tgz",
+            "integrity": "sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==",
+            "dev": true,
+            "requires": {
+                "@types/estree": "*"
+            }
+        },
+        "is-stream": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/is-stream/-/is-stream-2.0.1.tgz",
+            "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+            "dev": true
+        },
+        "is-typedarray": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmmirror.com/is-typedarray/-/is-typedarray-1.0.0.tgz",
+            "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
+            "dev": true,
+            "peer": true
+        },
+        "isexe": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/isexe/-/isexe-2.0.0.tgz",
+            "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+            "dev": true
+        },
+        "istanbul-lib-coverage": {
+            "version": "3.2.2",
+            "resolved": "https://registry.npmmirror.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
+            "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
+            "dev": true,
+            "peer": true
+        },
+        "istanbul-lib-instrument": {
+            "version": "5.2.1",
+            "resolved": "https://registry.npmmirror.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+            "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "@babel/core": "^7.12.3",
+                "@babel/parser": "^7.14.7",
+                "@istanbuljs/schema": "^0.1.2",
+                "istanbul-lib-coverage": "^3.2.0",
+                "semver": "^6.3.0"
+            }
+        },
+        "istanbul-lib-report": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmmirror.com/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
+            "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "istanbul-lib-coverage": "^3.0.0",
+                "make-dir": "^4.0.0",
+                "supports-color": "^7.1.0"
+            },
+            "dependencies": {
+                "has-flag": {
+                    "version": "4.0.0",
+                    "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+                    "dev": true,
+                    "peer": true
+                },
+                "supports-color": {
+                    "version": "7.2.0",
+                    "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "has-flag": "^4.0.0"
+                    }
+                }
+            }
+        },
+        "istanbul-lib-source-maps": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmmirror.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
+            "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "debug": "^4.1.1",
+                "istanbul-lib-coverage": "^3.0.0",
+                "source-map": "^0.6.1"
+            }
+        },
+        "istanbul-reports": {
+            "version": "3.1.7",
+            "resolved": "https://registry.npmmirror.com/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
+            "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "html-escaper": "^2.0.0",
+                "istanbul-lib-report": "^3.0.0"
+            }
+        },
+        "jest": {
+            "version": "27.0.4",
+            "resolved": "https://registry.npmmirror.com/jest/-/jest-27.0.4.tgz",
+            "integrity": "sha512-Px1iKFooXgGSkk1H8dJxxBIrM3tsc5SIuI4kfKYK2J+4rvCvPGr/cXktxh0e9zIPQ5g09kOMNfHQEmusBUf/ZA==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "@jest/core": "^27.0.4",
+                "import-local": "^3.0.2",
+                "jest-cli": "^27.0.4"
+            }
+        },
+        "jest-changed-files": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/jest-changed-files/-/jest-changed-files-27.5.1.tgz",
+            "integrity": "sha512-buBLMiByfWGCoMsLLzGUUSpAmIAGnbR2KJoMN10ziLhOLvP4e0SlypHnAel8iqQXTrcbmfEY9sSqae5sgUsTvw==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "@jest/types": "^27.5.1",
+                "execa": "^5.0.0",
+                "throat": "^6.0.1"
+            }
+        },
+        "jest-circus": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/jest-circus/-/jest-circus-27.5.1.tgz",
+            "integrity": "sha512-D95R7x5UtlMA5iBYsOHFFbMD/GVA4R/Kdq15f7xYWUfWHBto9NYRsOvnSauTgdF+ogCpJ4tyKOXhUifxS65gdw==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "@jest/environment": "^27.5.1",
+                "@jest/test-result": "^27.5.1",
+                "@jest/types": "^27.5.1",
+                "@types/node": "*",
+                "chalk": "^4.0.0",
+                "co": "^4.6.0",
+                "dedent": "^0.7.0",
+                "expect": "^27.5.1",
+                "is-generator-fn": "^2.0.0",
+                "jest-each": "^27.5.1",
+                "jest-matcher-utils": "^27.5.1",
+                "jest-message-util": "^27.5.1",
+                "jest-runtime": "^27.5.1",
+                "jest-snapshot": "^27.5.1",
+                "jest-util": "^27.5.1",
+                "pretty-format": "^27.5.1",
+                "slash": "^3.0.0",
+                "stack-utils": "^2.0.3",
+                "throat": "^6.0.1"
+            },
+            "dependencies": {
+                "ansi-styles": {
+                    "version": "4.3.0",
+                    "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "color-convert": "^2.0.1"
+                    }
+                },
+                "chalk": {
+                    "version": "4.1.2",
+                    "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "ansi-styles": "^4.1.0",
+                        "supports-color": "^7.1.0"
+                    }
+                },
+                "color-convert": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "color-name": "~1.1.4"
+                    }
+                },
+                "color-name": {
+                    "version": "1.1.4",
+                    "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+                    "dev": true,
+                    "peer": true
+                },
+                "has-flag": {
+                    "version": "4.0.0",
+                    "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+                    "dev": true,
+                    "peer": true
+                },
+                "supports-color": {
+                    "version": "7.2.0",
+                    "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "has-flag": "^4.0.0"
+                    }
+                }
+            }
+        },
+        "jest-cli": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/jest-cli/-/jest-cli-27.5.1.tgz",
+            "integrity": "sha512-Hc6HOOwYq4/74/c62dEE3r5elx8wjYqxY0r0G/nFrLDPMFRu6RA/u8qINOIkvhxG7mMQ5EJsOGfRpI8L6eFUVw==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "@jest/core": "^27.5.1",
+                "@jest/test-result": "^27.5.1",
+                "@jest/types": "^27.5.1",
+                "chalk": "^4.0.0",
+                "exit": "^0.1.2",
+                "graceful-fs": "^4.2.9",
+                "import-local": "^3.0.2",
+                "jest-config": "^27.5.1",
+                "jest-util": "^27.5.1",
+                "jest-validate": "^27.5.1",
+                "prompts": "^2.0.1",
+                "yargs": "^16.2.0"
+            },
+            "dependencies": {
+                "ansi-styles": {
+                    "version": "4.3.0",
+                    "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "color-convert": "^2.0.1"
+                    }
+                },
+                "chalk": {
+                    "version": "4.1.2",
+                    "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "ansi-styles": "^4.1.0",
+                        "supports-color": "^7.1.0"
+                    }
+                },
+                "color-convert": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "color-name": "~1.1.4"
+                    }
+                },
+                "color-name": {
+                    "version": "1.1.4",
+                    "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+                    "dev": true,
+                    "peer": true
+                },
+                "has-flag": {
+                    "version": "4.0.0",
+                    "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+                    "dev": true,
+                    "peer": true
+                },
+                "supports-color": {
+                    "version": "7.2.0",
+                    "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "has-flag": "^4.0.0"
+                    }
+                }
+            }
+        },
+        "jest-config": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/jest-config/-/jest-config-27.5.1.tgz",
+            "integrity": "sha512-5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "@babel/core": "^7.8.0",
+                "@jest/test-sequencer": "^27.5.1",
+                "@jest/types": "^27.5.1",
+                "babel-jest": "^27.5.1",
+                "chalk": "^4.0.0",
+                "ci-info": "^3.2.0",
+                "deepmerge": "^4.2.2",
+                "glob": "^7.1.1",
+                "graceful-fs": "^4.2.9",
+                "jest-circus": "^27.5.1",
+                "jest-environment-jsdom": "^27.5.1",
+                "jest-environment-node": "^27.5.1",
+                "jest-get-type": "^27.5.1",
+                "jest-jasmine2": "^27.5.1",
+                "jest-regex-util": "^27.5.1",
+                "jest-resolve": "^27.5.1",
+                "jest-runner": "^27.5.1",
+                "jest-util": "^27.5.1",
+                "jest-validate": "^27.5.1",
+                "micromatch": "^4.0.4",
+                "parse-json": "^5.2.0",
+                "pretty-format": "^27.5.1",
+                "slash": "^3.0.0",
+                "strip-json-comments": "^3.1.1"
+            },
+            "dependencies": {
+                "ansi-styles": {
+                    "version": "4.3.0",
+                    "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "color-convert": "^2.0.1"
+                    }
+                },
+                "brace-expansion": {
+                    "version": "1.1.11",
+                    "resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.11.tgz",
+                    "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "balanced-match": "^1.0.0",
+                        "concat-map": "0.0.1"
+                    }
+                },
+                "chalk": {
+                    "version": "4.1.2",
+                    "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "ansi-styles": "^4.1.0",
+                        "supports-color": "^7.1.0"
+                    }
+                },
+                "color-convert": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "color-name": "~1.1.4"
+                    }
+                },
+                "color-name": {
+                    "version": "1.1.4",
+                    "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+                    "dev": true,
+                    "peer": true
+                },
+                "glob": {
+                    "version": "7.2.3",
+                    "resolved": "https://registry.npmmirror.com/glob/-/glob-7.2.3.tgz",
+                    "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "fs.realpath": "^1.0.0",
+                        "inflight": "^1.0.4",
+                        "inherits": "2",
+                        "minimatch": "^3.1.1",
+                        "once": "^1.3.0",
+                        "path-is-absolute": "^1.0.0"
+                    }
+                },
+                "has-flag": {
+                    "version": "4.0.0",
+                    "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+                    "dev": true,
+                    "peer": true
+                },
+                "minimatch": {
+                    "version": "3.1.2",
+                    "resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-3.1.2.tgz",
+                    "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "brace-expansion": "^1.1.7"
+                    }
+                },
+                "supports-color": {
+                    "version": "7.2.0",
+                    "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "has-flag": "^4.0.0"
+                    }
+                }
+            }
+        },
+        "jest-diff": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/jest-diff/-/jest-diff-27.5.1.tgz",
+            "integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "chalk": "^4.0.0",
+                "diff-sequences": "^27.5.1",
+                "jest-get-type": "^27.5.1",
+                "pretty-format": "^27.5.1"
+            },
+            "dependencies": {
+                "ansi-styles": {
+                    "version": "4.3.0",
+                    "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "color-convert": "^2.0.1"
+                    }
+                },
+                "chalk": {
+                    "version": "4.1.2",
+                    "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "ansi-styles": "^4.1.0",
+                        "supports-color": "^7.1.0"
+                    }
+                },
+                "color-convert": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "color-name": "~1.1.4"
+                    }
+                },
+                "color-name": {
+                    "version": "1.1.4",
+                    "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+                    "dev": true,
+                    "peer": true
+                },
+                "has-flag": {
+                    "version": "4.0.0",
+                    "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+                    "dev": true,
+                    "peer": true
+                },
+                "supports-color": {
+                    "version": "7.2.0",
+                    "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "has-flag": "^4.0.0"
+                    }
+                }
+            }
+        },
+        "jest-docblock": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/jest-docblock/-/jest-docblock-27.5.1.tgz",
+            "integrity": "sha512-rl7hlABeTsRYxKiUfpHrQrG4e2obOiTQWfMEH3PxPjOtdsfLQO4ReWSZaQ7DETm4xu07rl4q/h4zcKXyU0/OzQ==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "detect-newline": "^3.0.0"
+            }
+        },
+        "jest-each": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/jest-each/-/jest-each-27.5.1.tgz",
+            "integrity": "sha512-1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "@jest/types": "^27.5.1",
+                "chalk": "^4.0.0",
+                "jest-get-type": "^27.5.1",
+                "jest-util": "^27.5.1",
+                "pretty-format": "^27.5.1"
+            },
+            "dependencies": {
+                "ansi-styles": {
+                    "version": "4.3.0",
+                    "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "color-convert": "^2.0.1"
+                    }
+                },
+                "chalk": {
+                    "version": "4.1.2",
+                    "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "ansi-styles": "^4.1.0",
+                        "supports-color": "^7.1.0"
+                    }
+                },
+                "color-convert": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "color-name": "~1.1.4"
+                    }
+                },
+                "color-name": {
+                    "version": "1.1.4",
+                    "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+                    "dev": true,
+                    "peer": true
+                },
+                "has-flag": {
+                    "version": "4.0.0",
+                    "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+                    "dev": true,
+                    "peer": true
+                },
+                "supports-color": {
+                    "version": "7.2.0",
+                    "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "has-flag": "^4.0.0"
+                    }
+                }
+            }
+        },
+        "jest-environment-jsdom": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/jest-environment-jsdom/-/jest-environment-jsdom-27.5.1.tgz",
+            "integrity": "sha512-TFBvkTC1Hnnnrka/fUb56atfDtJ9VMZ94JkjTbggl1PEpwrYtUBKMezB3inLmWqQsXYLcMwNoDQwoBTAvFfsfw==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "@jest/environment": "^27.5.1",
+                "@jest/fake-timers": "^27.5.1",
+                "@jest/types": "^27.5.1",
+                "@types/node": "*",
+                "jest-mock": "^27.5.1",
+                "jest-util": "^27.5.1",
+                "jsdom": "^16.6.0"
+            }
+        },
+        "jest-environment-node": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/jest-environment-node/-/jest-environment-node-27.5.1.tgz",
+            "integrity": "sha512-Jt4ZUnxdOsTGwSRAfKEnE6BcwsSPNOijjwifq5sDFSA2kesnXTvNqKHYgM0hDq3549Uf/KzdXNYn4wMZJPlFLw==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "@jest/environment": "^27.5.1",
+                "@jest/fake-timers": "^27.5.1",
+                "@jest/types": "^27.5.1",
+                "@types/node": "*",
+                "jest-mock": "^27.5.1",
+                "jest-util": "^27.5.1"
+            }
+        },
+        "jest-get-type": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/jest-get-type/-/jest-get-type-27.5.1.tgz",
+            "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==",
+            "dev": true,
+            "peer": true
+        },
+        "jest-haste-map": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/jest-haste-map/-/jest-haste-map-27.5.1.tgz",
+            "integrity": "sha512-7GgkZ4Fw4NFbMSDSpZwXeBiIbx+t/46nJ2QitkOjvwPYyZmqttu2TDSimMHP1EkPOi4xUZAN1doE5Vd25H4Jng==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "@jest/types": "^27.5.1",
+                "@types/graceful-fs": "^4.1.2",
+                "@types/node": "*",
+                "anymatch": "^3.0.3",
+                "fb-watchman": "^2.0.0",
+                "fsevents": "^2.3.2",
+                "graceful-fs": "^4.2.9",
+                "jest-regex-util": "^27.5.1",
+                "jest-serializer": "^27.5.1",
+                "jest-util": "^27.5.1",
+                "jest-worker": "^27.5.1",
+                "micromatch": "^4.0.4",
+                "walker": "^1.0.7"
+            }
+        },
+        "jest-jasmine2": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/jest-jasmine2/-/jest-jasmine2-27.5.1.tgz",
+            "integrity": "sha512-jtq7VVyG8SqAorDpApwiJJImd0V2wv1xzdheGHRGyuT7gZm6gG47QEskOlzsN1PG/6WNaCo5pmwMHDf3AkG2pQ==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "@jest/environment": "^27.5.1",
+                "@jest/source-map": "^27.5.1",
+                "@jest/test-result": "^27.5.1",
+                "@jest/types": "^27.5.1",
+                "@types/node": "*",
+                "chalk": "^4.0.0",
+                "co": "^4.6.0",
+                "expect": "^27.5.1",
+                "is-generator-fn": "^2.0.0",
+                "jest-each": "^27.5.1",
+                "jest-matcher-utils": "^27.5.1",
+                "jest-message-util": "^27.5.1",
+                "jest-runtime": "^27.5.1",
+                "jest-snapshot": "^27.5.1",
+                "jest-util": "^27.5.1",
+                "pretty-format": "^27.5.1",
+                "throat": "^6.0.1"
+            },
+            "dependencies": {
+                "ansi-styles": {
+                    "version": "4.3.0",
+                    "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "color-convert": "^2.0.1"
+                    }
+                },
+                "chalk": {
+                    "version": "4.1.2",
+                    "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "ansi-styles": "^4.1.0",
+                        "supports-color": "^7.1.0"
+                    }
+                },
+                "color-convert": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "color-name": "~1.1.4"
+                    }
+                },
+                "color-name": {
+                    "version": "1.1.4",
+                    "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+                    "dev": true,
+                    "peer": true
+                },
+                "has-flag": {
+                    "version": "4.0.0",
+                    "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+                    "dev": true,
+                    "peer": true
+                },
+                "supports-color": {
+                    "version": "7.2.0",
+                    "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "has-flag": "^4.0.0"
+                    }
+                }
+            }
+        },
+        "jest-leak-detector": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/jest-leak-detector/-/jest-leak-detector-27.5.1.tgz",
+            "integrity": "sha512-POXfWAMvfU6WMUXftV4HolnJfnPOGEu10fscNCA76KBpRRhcMN2c8d3iT2pxQS3HLbA+5X4sOUPzYO2NUyIlHQ==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "jest-get-type": "^27.5.1",
+                "pretty-format": "^27.5.1"
+            }
+        },
+        "jest-matcher-utils": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz",
+            "integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "chalk": "^4.0.0",
+                "jest-diff": "^27.5.1",
+                "jest-get-type": "^27.5.1",
+                "pretty-format": "^27.5.1"
+            },
+            "dependencies": {
+                "ansi-styles": {
+                    "version": "4.3.0",
+                    "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "color-convert": "^2.0.1"
+                    }
+                },
+                "chalk": {
+                    "version": "4.1.2",
+                    "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "ansi-styles": "^4.1.0",
+                        "supports-color": "^7.1.0"
+                    }
+                },
+                "color-convert": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "color-name": "~1.1.4"
+                    }
+                },
+                "color-name": {
+                    "version": "1.1.4",
+                    "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+                    "dev": true,
+                    "peer": true
+                },
+                "has-flag": {
+                    "version": "4.0.0",
+                    "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+                    "dev": true,
+                    "peer": true
+                },
+                "supports-color": {
+                    "version": "7.2.0",
+                    "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "has-flag": "^4.0.0"
+                    }
+                }
+            }
+        },
+        "jest-message-util": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/jest-message-util/-/jest-message-util-27.5.1.tgz",
+            "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "@babel/code-frame": "^7.12.13",
+                "@jest/types": "^27.5.1",
+                "@types/stack-utils": "^2.0.0",
+                "chalk": "^4.0.0",
+                "graceful-fs": "^4.2.9",
+                "micromatch": "^4.0.4",
+                "pretty-format": "^27.5.1",
+                "slash": "^3.0.0",
+                "stack-utils": "^2.0.3"
+            },
+            "dependencies": {
+                "ansi-styles": {
+                    "version": "4.3.0",
+                    "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "color-convert": "^2.0.1"
+                    }
+                },
+                "chalk": {
+                    "version": "4.1.2",
+                    "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "ansi-styles": "^4.1.0",
+                        "supports-color": "^7.1.0"
+                    }
+                },
+                "color-convert": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "color-name": "~1.1.4"
+                    }
+                },
+                "color-name": {
+                    "version": "1.1.4",
+                    "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+                    "dev": true,
+                    "peer": true
+                },
+                "has-flag": {
+                    "version": "4.0.0",
+                    "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+                    "dev": true,
+                    "peer": true
+                },
+                "supports-color": {
+                    "version": "7.2.0",
+                    "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "has-flag": "^4.0.0"
+                    }
+                }
+            }
+        },
+        "jest-mock": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/jest-mock/-/jest-mock-27.5.1.tgz",
+            "integrity": "sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "@jest/types": "^27.5.1",
+                "@types/node": "*"
+            }
+        },
+        "jest-pnp-resolver": {
+            "version": "1.2.3",
+            "resolved": "https://registry.npmmirror.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
+            "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
+            "dev": true,
+            "peer": true,
+            "requires": {}
+        },
+        "jest-regex-util": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/jest-regex-util/-/jest-regex-util-27.5.1.tgz",
+            "integrity": "sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg==",
+            "dev": true,
+            "peer": true
+        },
+        "jest-resolve": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/jest-resolve/-/jest-resolve-27.5.1.tgz",
+            "integrity": "sha512-FFDy8/9E6CV83IMbDpcjOhumAQPDyETnU2KZ1O98DwTnz8AOBsW/Xv3GySr1mOZdItLR+zDZ7I/UdTFbgSOVCw==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "@jest/types": "^27.5.1",
+                "chalk": "^4.0.0",
+                "graceful-fs": "^4.2.9",
+                "jest-haste-map": "^27.5.1",
+                "jest-pnp-resolver": "^1.2.2",
+                "jest-util": "^27.5.1",
+                "jest-validate": "^27.5.1",
+                "resolve": "^1.20.0",
+                "resolve.exports": "^1.1.0",
+                "slash": "^3.0.0"
+            },
+            "dependencies": {
+                "ansi-styles": {
+                    "version": "4.3.0",
+                    "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "color-convert": "^2.0.1"
+                    }
+                },
+                "chalk": {
+                    "version": "4.1.2",
+                    "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "ansi-styles": "^4.1.0",
+                        "supports-color": "^7.1.0"
+                    }
+                },
+                "color-convert": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "color-name": "~1.1.4"
+                    }
+                },
+                "color-name": {
+                    "version": "1.1.4",
+                    "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+                    "dev": true,
+                    "peer": true
+                },
+                "has-flag": {
+                    "version": "4.0.0",
+                    "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+                    "dev": true,
+                    "peer": true
+                },
+                "supports-color": {
+                    "version": "7.2.0",
+                    "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "has-flag": "^4.0.0"
+                    }
+                }
+            }
+        },
+        "jest-resolve-dependencies": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.5.1.tgz",
+            "integrity": "sha512-QQOOdY4PE39iawDn5rzbIePNigfe5B9Z91GDD1ae/xNDlu9kaat8QQ5EKnNmVWPV54hUdxCVwwj6YMgR2O7IOg==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "@jest/types": "^27.5.1",
+                "jest-regex-util": "^27.5.1",
+                "jest-snapshot": "^27.5.1"
+            }
+        },
+        "jest-runner": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/jest-runner/-/jest-runner-27.5.1.tgz",
+            "integrity": "sha512-g4NPsM4mFCOwFKXO4p/H/kWGdJp9V8kURY2lX8Me2drgXqG7rrZAx5kv+5H7wtt/cdFIjhqYx1HrlqWHaOvDaQ==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "@jest/console": "^27.5.1",
+                "@jest/environment": "^27.5.1",
+                "@jest/test-result": "^27.5.1",
+                "@jest/transform": "^27.5.1",
+                "@jest/types": "^27.5.1",
+                "@types/node": "*",
+                "chalk": "^4.0.0",
+                "emittery": "^0.8.1",
+                "graceful-fs": "^4.2.9",
+                "jest-docblock": "^27.5.1",
+                "jest-environment-jsdom": "^27.5.1",
+                "jest-environment-node": "^27.5.1",
+                "jest-haste-map": "^27.5.1",
+                "jest-leak-detector": "^27.5.1",
+                "jest-message-util": "^27.5.1",
+                "jest-resolve": "^27.5.1",
+                "jest-runtime": "^27.5.1",
+                "jest-util": "^27.5.1",
+                "jest-worker": "^27.5.1",
+                "source-map-support": "^0.5.6",
+                "throat": "^6.0.1"
+            },
+            "dependencies": {
+                "ansi-styles": {
+                    "version": "4.3.0",
+                    "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "color-convert": "^2.0.1"
+                    }
+                },
+                "chalk": {
+                    "version": "4.1.2",
+                    "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "ansi-styles": "^4.1.0",
+                        "supports-color": "^7.1.0"
+                    }
+                },
+                "color-convert": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "color-name": "~1.1.4"
+                    }
+                },
+                "color-name": {
+                    "version": "1.1.4",
+                    "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+                    "dev": true,
+                    "peer": true
+                },
+                "has-flag": {
+                    "version": "4.0.0",
+                    "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+                    "dev": true,
+                    "peer": true
+                },
+                "supports-color": {
+                    "version": "7.2.0",
+                    "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "has-flag": "^4.0.0"
+                    }
+                }
+            }
+        },
+        "jest-runtime": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/jest-runtime/-/jest-runtime-27.5.1.tgz",
+            "integrity": "sha512-o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "@jest/environment": "^27.5.1",
+                "@jest/fake-timers": "^27.5.1",
+                "@jest/globals": "^27.5.1",
+                "@jest/source-map": "^27.5.1",
+                "@jest/test-result": "^27.5.1",
+                "@jest/transform": "^27.5.1",
+                "@jest/types": "^27.5.1",
+                "chalk": "^4.0.0",
+                "cjs-module-lexer": "^1.0.0",
+                "collect-v8-coverage": "^1.0.0",
+                "execa": "^5.0.0",
+                "glob": "^7.1.3",
+                "graceful-fs": "^4.2.9",
+                "jest-haste-map": "^27.5.1",
+                "jest-message-util": "^27.5.1",
+                "jest-mock": "^27.5.1",
+                "jest-regex-util": "^27.5.1",
+                "jest-resolve": "^27.5.1",
+                "jest-snapshot": "^27.5.1",
+                "jest-util": "^27.5.1",
+                "slash": "^3.0.0",
+                "strip-bom": "^4.0.0"
+            },
+            "dependencies": {
+                "ansi-styles": {
+                    "version": "4.3.0",
+                    "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "color-convert": "^2.0.1"
+                    }
+                },
+                "brace-expansion": {
+                    "version": "1.1.11",
+                    "resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.11.tgz",
+                    "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "balanced-match": "^1.0.0",
+                        "concat-map": "0.0.1"
+                    }
+                },
+                "chalk": {
+                    "version": "4.1.2",
+                    "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "ansi-styles": "^4.1.0",
+                        "supports-color": "^7.1.0"
+                    }
+                },
+                "color-convert": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "color-name": "~1.1.4"
+                    }
+                },
+                "color-name": {
+                    "version": "1.1.4",
+                    "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+                    "dev": true,
+                    "peer": true
+                },
+                "glob": {
+                    "version": "7.2.3",
+                    "resolved": "https://registry.npmmirror.com/glob/-/glob-7.2.3.tgz",
+                    "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "fs.realpath": "^1.0.0",
+                        "inflight": "^1.0.4",
+                        "inherits": "2",
+                        "minimatch": "^3.1.1",
+                        "once": "^1.3.0",
+                        "path-is-absolute": "^1.0.0"
+                    }
+                },
+                "has-flag": {
+                    "version": "4.0.0",
+                    "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+                    "dev": true,
+                    "peer": true
+                },
+                "minimatch": {
+                    "version": "3.1.2",
+                    "resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-3.1.2.tgz",
+                    "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "brace-expansion": "^1.1.7"
+                    }
+                },
+                "supports-color": {
+                    "version": "7.2.0",
+                    "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "has-flag": "^4.0.0"
+                    }
+                }
+            }
+        },
+        "jest-serializer": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/jest-serializer/-/jest-serializer-27.5.1.tgz",
+            "integrity": "sha512-jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "@types/node": "*",
+                "graceful-fs": "^4.2.9"
+            }
+        },
+        "jest-snapshot": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/jest-snapshot/-/jest-snapshot-27.5.1.tgz",
+            "integrity": "sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "@babel/core": "^7.7.2",
+                "@babel/generator": "^7.7.2",
+                "@babel/plugin-syntax-typescript": "^7.7.2",
+                "@babel/traverse": "^7.7.2",
+                "@babel/types": "^7.0.0",
+                "@jest/transform": "^27.5.1",
+                "@jest/types": "^27.5.1",
+                "@types/babel__traverse": "^7.0.4",
+                "@types/prettier": "^2.1.5",
+                "babel-preset-current-node-syntax": "^1.0.0",
+                "chalk": "^4.0.0",
+                "expect": "^27.5.1",
+                "graceful-fs": "^4.2.9",
+                "jest-diff": "^27.5.1",
+                "jest-get-type": "^27.5.1",
+                "jest-haste-map": "^27.5.1",
+                "jest-matcher-utils": "^27.5.1",
+                "jest-message-util": "^27.5.1",
+                "jest-util": "^27.5.1",
+                "natural-compare": "^1.4.0",
+                "pretty-format": "^27.5.1",
+                "semver": "^7.3.2"
+            },
+            "dependencies": {
+                "ansi-styles": {
+                    "version": "4.3.0",
+                    "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "color-convert": "^2.0.1"
+                    }
+                },
+                "chalk": {
+                    "version": "4.1.2",
+                    "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "ansi-styles": "^4.1.0",
+                        "supports-color": "^7.1.0"
+                    }
+                },
+                "color-convert": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "color-name": "~1.1.4"
+                    }
+                },
+                "color-name": {
+                    "version": "1.1.4",
+                    "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+                    "dev": true,
+                    "peer": true
+                },
+                "has-flag": {
+                    "version": "4.0.0",
+                    "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+                    "dev": true,
+                    "peer": true
+                },
+                "semver": {
+                    "version": "7.6.2",
+                    "resolved": "https://registry.npmmirror.com/semver/-/semver-7.6.2.tgz",
+                    "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
+                    "dev": true,
+                    "peer": true
+                },
+                "supports-color": {
+                    "version": "7.2.0",
+                    "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "has-flag": "^4.0.0"
+                    }
+                }
+            }
+        },
+        "jest-util": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/jest-util/-/jest-util-27.5.1.tgz",
+            "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "@jest/types": "^27.5.1",
+                "@types/node": "*",
+                "chalk": "^4.0.0",
+                "ci-info": "^3.2.0",
+                "graceful-fs": "^4.2.9",
+                "picomatch": "^2.2.3"
+            },
+            "dependencies": {
+                "ansi-styles": {
+                    "version": "4.3.0",
+                    "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "color-convert": "^2.0.1"
+                    }
+                },
+                "chalk": {
+                    "version": "4.1.2",
+                    "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "ansi-styles": "^4.1.0",
+                        "supports-color": "^7.1.0"
+                    }
+                },
+                "color-convert": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "color-name": "~1.1.4"
+                    }
+                },
+                "color-name": {
+                    "version": "1.1.4",
+                    "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+                    "dev": true,
+                    "peer": true
+                },
+                "has-flag": {
+                    "version": "4.0.0",
+                    "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+                    "dev": true,
+                    "peer": true
+                },
+                "supports-color": {
+                    "version": "7.2.0",
+                    "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "has-flag": "^4.0.0"
+                    }
+                }
+            }
+        },
+        "jest-validate": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/jest-validate/-/jest-validate-27.5.1.tgz",
+            "integrity": "sha512-thkNli0LYTmOI1tDB3FI1S1RTp/Bqyd9pTarJwL87OIBFuqEb5Apv5EaApEudYg4g86e3CT6kM0RowkhtEnCBQ==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "@jest/types": "^27.5.1",
+                "camelcase": "^6.2.0",
+                "chalk": "^4.0.0",
+                "jest-get-type": "^27.5.1",
+                "leven": "^3.1.0",
+                "pretty-format": "^27.5.1"
+            },
+            "dependencies": {
+                "ansi-styles": {
+                    "version": "4.3.0",
+                    "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "color-convert": "^2.0.1"
+                    }
+                },
+                "chalk": {
+                    "version": "4.1.2",
+                    "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "ansi-styles": "^4.1.0",
+                        "supports-color": "^7.1.0"
+                    }
+                },
+                "color-convert": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "color-name": "~1.1.4"
+                    }
+                },
+                "color-name": {
+                    "version": "1.1.4",
+                    "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+                    "dev": true,
+                    "peer": true
+                },
+                "has-flag": {
+                    "version": "4.0.0",
+                    "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+                    "dev": true,
+                    "peer": true
+                },
+                "supports-color": {
+                    "version": "7.2.0",
+                    "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "has-flag": "^4.0.0"
+                    }
+                }
+            }
+        },
+        "jest-watcher": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/jest-watcher/-/jest-watcher-27.5.1.tgz",
+            "integrity": "sha512-z676SuD6Z8o8qbmEGhoEUFOM1+jfEiL3DXHK/xgEiG2EyNYfFG60jluWcupY6dATjfEsKQuibReS1djInQnoVw==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "@jest/test-result": "^27.5.1",
+                "@jest/types": "^27.5.1",
+                "@types/node": "*",
+                "ansi-escapes": "^4.2.1",
+                "chalk": "^4.0.0",
+                "jest-util": "^27.5.1",
+                "string-length": "^4.0.1"
+            },
+            "dependencies": {
+                "ansi-styles": {
+                    "version": "4.3.0",
+                    "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "color-convert": "^2.0.1"
+                    }
+                },
+                "chalk": {
+                    "version": "4.1.2",
+                    "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+                    "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "ansi-styles": "^4.1.0",
+                        "supports-color": "^7.1.0"
+                    }
+                },
+                "color-convert": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "color-name": "~1.1.4"
+                    }
+                },
+                "color-name": {
+                    "version": "1.1.4",
+                    "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+                    "dev": true,
+                    "peer": true
+                },
+                "has-flag": {
+                    "version": "4.0.0",
+                    "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+                    "dev": true,
+                    "peer": true
+                },
+                "supports-color": {
+                    "version": "7.2.0",
+                    "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "has-flag": "^4.0.0"
+                    }
+                }
+            }
+        },
+        "jest-worker": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/jest-worker/-/jest-worker-27.5.1.tgz",
+            "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "@types/node": "*",
+                "merge-stream": "^2.0.0",
+                "supports-color": "^8.0.0"
+            },
+            "dependencies": {
+                "has-flag": {
+                    "version": "4.0.0",
+                    "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+                    "dev": true,
+                    "peer": true
+                },
+                "supports-color": {
+                    "version": "8.1.1",
+                    "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-8.1.1.tgz",
+                    "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "has-flag": "^4.0.0"
+                    }
+                }
+            }
+        },
+        "jimp": {
+            "version": "0.10.3",
+            "resolved": "https://registry.npmmirror.com/jimp/-/jimp-0.10.3.tgz",
+            "integrity": "sha512-meVWmDMtyUG5uYjFkmzu0zBgnCvvxwWNi27c4cg55vWNVC9ES4Lcwb+ogx+uBBQE3Q+dLKjXaLl0JVW+nUNwbQ==",
+            "requires": {
+                "@babel/runtime": "^7.7.2",
+                "@jimp/custom": "^0.10.3",
+                "@jimp/plugins": "^0.10.3",
+                "@jimp/types": "^0.10.3",
+                "core-js": "^3.4.1",
+                "regenerator-runtime": "^0.13.3"
+            }
+        },
+        "jiti": {
+            "version": "1.21.0",
+            "resolved": "https://registry.npmmirror.com/jiti/-/jiti-1.21.0.tgz",
+            "integrity": "sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==",
+            "dev": true
+        },
+        "jpeg-js": {
+            "version": "0.3.7",
+            "resolved": "https://registry.npmmirror.com/jpeg-js/-/jpeg-js-0.3.7.tgz",
+            "integrity": "sha512-9IXdWudL61npZjvLuVe/ktHiA41iE8qFyLB+4VDTblEsWBzeg8WQTlktdUK4CdncUqtUgUg0bbOmTE2bKBKaBQ=="
+        },
+        "js-tokens": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmmirror.com/js-tokens/-/js-tokens-4.0.0.tgz",
+            "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
+        },
+        "js-yaml": {
+            "version": "3.14.1",
+            "resolved": "https://registry.npmmirror.com/js-yaml/-/js-yaml-3.14.1.tgz",
+            "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "argparse": "^1.0.7",
+                "esprima": "^4.0.0"
+            }
+        },
+        "jsdom": {
+            "version": "16.7.0",
+            "resolved": "https://registry.npmmirror.com/jsdom/-/jsdom-16.7.0.tgz",
+            "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "abab": "^2.0.5",
+                "acorn": "^8.2.4",
+                "acorn-globals": "^6.0.0",
+                "cssom": "^0.4.4",
+                "cssstyle": "^2.3.0",
+                "data-urls": "^2.0.0",
+                "decimal.js": "^10.2.1",
+                "domexception": "^2.0.1",
+                "escodegen": "^2.0.0",
+                "form-data": "^3.0.0",
+                "html-encoding-sniffer": "^2.0.1",
+                "http-proxy-agent": "^4.0.1",
+                "https-proxy-agent": "^5.0.0",
+                "is-potential-custom-element-name": "^1.0.1",
+                "nwsapi": "^2.2.0",
+                "parse5": "6.0.1",
+                "saxes": "^5.0.1",
+                "symbol-tree": "^3.2.4",
+                "tough-cookie": "^4.0.0",
+                "w3c-hr-time": "^1.0.2",
+                "w3c-xmlserializer": "^2.0.0",
+                "webidl-conversions": "^6.1.0",
+                "whatwg-encoding": "^1.0.5",
+                "whatwg-mimetype": "^2.3.0",
+                "whatwg-url": "^8.5.0",
+                "ws": "^7.4.6",
+                "xml-name-validator": "^3.0.0"
+            },
+            "dependencies": {
+                "ws": {
+                    "version": "7.5.9",
+                    "resolved": "https://registry.npmmirror.com/ws/-/ws-7.5.9.tgz",
+                    "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {}
+                }
+            }
+        },
+        "jsesc": {
+            "version": "2.5.2",
+            "resolved": "https://registry.npmmirror.com/jsesc/-/jsesc-2.5.2.tgz",
+            "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="
+        },
+        "json-parse-even-better-errors": {
+            "version": "2.3.1",
+            "resolved": "https://registry.npmmirror.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+            "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+            "dev": true,
+            "peer": true
+        },
+        "json5": {
+            "version": "2.2.3",
+            "resolved": "https://registry.npmmirror.com/json5/-/json5-2.2.3.tgz",
+            "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="
+        },
+        "jsonc-parser": {
+            "version": "3.2.1",
+            "resolved": "https://registry.npmmirror.com/jsonc-parser/-/jsonc-parser-3.2.1.tgz",
+            "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA=="
+        },
+        "jsonfile": {
+            "version": "6.1.0",
+            "resolved": "https://registry.npmmirror.com/jsonfile/-/jsonfile-6.1.0.tgz",
+            "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+            "requires": {
+                "graceful-fs": "^4.1.6",
+                "universalify": "^2.0.0"
+            }
+        },
+        "kleur": {
+            "version": "3.0.3",
+            "resolved": "https://registry.npmmirror.com/kleur/-/kleur-3.0.3.tgz",
+            "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
+            "dev": true,
+            "peer": true
+        },
+        "kolorist": {
+            "version": "1.8.0",
+            "resolved": "https://registry.npmmirror.com/kolorist/-/kolorist-1.8.0.tgz",
+            "integrity": "sha512-Y+60/zizpJ3HRH8DCss+q95yr6145JXZo46OTpFvDZWLfRCE4qChOyk1b26nMaNpfHHgxagk9dXT5OP0Tfe+dQ==",
+            "dev": true
+        },
+        "lcid": {
+            "version": "3.1.1",
+            "resolved": "https://registry.npmmirror.com/lcid/-/lcid-3.1.1.tgz",
+            "integrity": "sha512-M6T051+5QCGLBQb8id3hdvIW8+zeFV2FyBGFS9IEK5H9Wt4MueD4bW1eWikpHgZp+5xR3l5c8pZUkQsIA0BFZg==",
+            "requires": {
+                "invert-kv": "^3.0.0"
+            }
+        },
+        "leven": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmmirror.com/leven/-/leven-3.1.0.tgz",
+            "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
+            "dev": true,
+            "peer": true
+        },
+        "licia": {
+            "version": "1.39.2",
+            "resolved": "https://registry.npmmirror.com/licia/-/licia-1.39.2.tgz",
+            "integrity": "sha512-4pte7gXufSAa3JcsR0iT+2Lj2RX5Qpj+Nc0n84xs0ynNmw7eJmeZzk2oPTEtsQqwHwtT+NiX0arGkL5HPjTs7g=="
+        },
+        "lilconfig": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmmirror.com/lilconfig/-/lilconfig-2.1.0.tgz",
+            "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ=="
+        },
+        "lines-and-columns": {
+            "version": "1.2.4",
+            "resolved": "https://registry.npmmirror.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+            "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+            "dev": true,
+            "peer": true
+        },
+        "load-bmfont": {
+            "version": "1.4.1",
+            "resolved": "https://registry.npmmirror.com/load-bmfont/-/load-bmfont-1.4.1.tgz",
+            "integrity": "sha512-8UyQoYmdRDy81Brz6aLAUhfZLwr5zV0L3taTQ4hju7m6biuwiWiJXjPhBJxbUQJA8PrkvJ/7Enqmwk2sM14soA==",
+            "requires": {
+                "buffer-equal": "0.0.1",
+                "mime": "^1.3.4",
+                "parse-bmfont-ascii": "^1.0.3",
+                "parse-bmfont-binary": "^1.0.5",
+                "parse-bmfont-xml": "^1.1.4",
+                "phin": "^2.9.1",
+                "xhr": "^2.0.1",
+                "xtend": "^4.0.0"
+            },
+            "dependencies": {
+                "mime": {
+                    "version": "1.6.0",
+                    "resolved": "https://registry.npmmirror.com/mime/-/mime-1.6.0.tgz",
+                    "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
+                }
+            }
+        },
+        "loader-utils": {
+            "version": "3.2.1",
+            "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-3.2.1.tgz",
+            "integrity": "sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw=="
+        },
+        "localstorage-polyfill": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmmirror.com/localstorage-polyfill/-/localstorage-polyfill-1.0.1.tgz",
+            "integrity": "sha512-m4iHVZxFH5734oQcPKU08025gIz2+4bjWR9lulP8ZYxEJR0BpA0w32oJmkzh8y3UI9ci7xCBehQDc3oA1X+VHw=="
+        },
+        "locate-path": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmmirror.com/locate-path/-/locate-path-5.0.0.tgz",
+            "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+            "requires": {
+                "p-locate": "^4.1.0"
+            }
+        },
+        "lodash": {
+            "version": "4.17.21",
+            "resolved": "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz",
+            "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+            "dev": true
+        },
+        "lodash-es": {
+            "version": "4.17.21",
+            "resolved": "https://registry.npmmirror.com/lodash-es/-/lodash-es-4.17.21.tgz",
+            "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
+        },
+        "lodash.camelcase": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmmirror.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
+            "integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA=="
+        },
+        "lodash.debounce": {
+            "version": "4.0.8",
+            "resolved": "https://registry.npmmirror.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
+            "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==",
+            "dev": true
+        },
+        "lru-cache": {
+            "version": "5.1.1",
+            "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-5.1.1.tgz",
+            "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+            "requires": {
+                "yallist": "^3.0.2"
+            }
+        },
+        "magic-string": {
+            "version": "0.30.10",
+            "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.30.10.tgz",
+            "integrity": "sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==",
+            "requires": {
+                "@jridgewell/sourcemap-codec": "^1.4.15"
+            }
+        },
+        "make-dir": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmmirror.com/make-dir/-/make-dir-4.0.0.tgz",
+            "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "semver": "^7.5.3"
+            },
+            "dependencies": {
+                "semver": {
+                    "version": "7.6.2",
+                    "resolved": "https://registry.npmmirror.com/semver/-/semver-7.6.2.tgz",
+                    "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
+                    "dev": true,
+                    "peer": true
+                }
+            }
+        },
+        "makeerror": {
+            "version": "1.0.12",
+            "resolved": "https://registry.npmmirror.com/makeerror/-/makeerror-1.0.12.tgz",
+            "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "tmpl": "1.0.5"
+            }
+        },
+        "media-typer": {
+            "version": "0.3.0",
+            "resolved": "https://registry.npmmirror.com/media-typer/-/media-typer-0.3.0.tgz",
+            "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
+            "dev": true
+        },
+        "merge": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmmirror.com/merge/-/merge-2.1.1.tgz",
+            "integrity": "sha512-jz+Cfrg9GWOZbQAnDQ4hlVnQky+341Yk5ru8bZSe6sIDTCIg8n9i/u7hSQGSVOF3C7lH6mGtqjkiT9G4wFLL0w=="
+        },
+        "merge-descriptors": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmmirror.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+            "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==",
+            "dev": true
+        },
+        "merge-stream": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/merge-stream/-/merge-stream-2.0.0.tgz",
+            "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+            "dev": true
+        },
+        "merge2": {
+            "version": "1.4.1",
+            "resolved": "https://registry.npmmirror.com/merge2/-/merge2-1.4.1.tgz",
+            "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="
+        },
+        "methods": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmmirror.com/methods/-/methods-1.1.2.tgz",
+            "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
+            "dev": true
+        },
+        "micromatch": {
+            "version": "4.0.5",
+            "resolved": "https://registry.npmmirror.com/micromatch/-/micromatch-4.0.5.tgz",
+            "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+            "requires": {
+                "braces": "^3.0.2",
+                "picomatch": "^2.3.1"
+            }
+        },
+        "mime": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmmirror.com/mime/-/mime-3.0.0.tgz",
+            "integrity": "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A=="
+        },
+        "mime-db": {
+            "version": "1.52.0",
+            "resolved": "https://registry.npmmirror.com/mime-db/-/mime-db-1.52.0.tgz",
+            "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+            "dev": true
+        },
+        "mime-types": {
+            "version": "2.1.35",
+            "resolved": "https://registry.npmmirror.com/mime-types/-/mime-types-2.1.35.tgz",
+            "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+            "dev": true,
+            "requires": {
+                "mime-db": "1.52.0"
+            }
+        },
+        "mimic-fn": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmmirror.com/mimic-fn/-/mimic-fn-2.1.0.tgz",
+            "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+            "dev": true
+        },
+        "min-document": {
+            "version": "2.19.0",
+            "resolved": "https://registry.npmmirror.com/min-document/-/min-document-2.19.0.tgz",
+            "integrity": "sha512-9Wy1B3m3f66bPPmU5hdA4DR4PB2OfDU/+GS3yAB7IQozE3tqXaVv2zOjgla7MEGSRv95+ILmOuvhLkOK6wJtCQ==",
+            "requires": {
+                "dom-walk": "^0.1.0"
+            }
+        },
+        "minimatch": {
+            "version": "5.1.6",
+            "resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-5.1.6.tgz",
+            "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+            "dev": true,
+            "requires": {
+                "brace-expansion": "^2.0.1"
+            }
+        },
+        "minimist": {
+            "version": "1.2.8",
+            "resolved": "https://registry.npmmirror.com/minimist/-/minimist-1.2.8.tgz",
+            "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA=="
+        },
+        "mkdirp": {
+            "version": "0.5.6",
+            "resolved": "https://registry.npmmirror.com/mkdirp/-/mkdirp-0.5.6.tgz",
+            "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+            "requires": {
+                "minimist": "^1.2.6"
+            }
+        },
+        "module-alias": {
+            "version": "2.2.3",
+            "resolved": "https://registry.npmmirror.com/module-alias/-/module-alias-2.2.3.tgz",
+            "integrity": "sha512-23g5BFj4zdQL/b6tor7Ji+QY4pEfNH784BMslY9Qb0UnJWRAt+lQGLYmRaM0KDBwIG23ffEBELhZDP2rhi9f/Q=="
+        },
+        "ms": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.2.tgz",
+            "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+        },
+        "muggle-string": {
+            "version": "0.3.1",
+            "resolved": "https://registry.npmmirror.com/muggle-string/-/muggle-string-0.3.1.tgz",
+            "integrity": "sha512-ckmWDJjphvd/FvZawgygcUeQCxzvohjFO5RxTjj4eq8kw359gFF3E1brjfI+viLMxss5JrHTDRHZvu2/tuy0Qg==",
+            "dev": true
+        },
+        "nanoid": {
+            "version": "3.3.7",
+            "resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.7.tgz",
+            "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g=="
+        },
+        "natural-compare": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmmirror.com/natural-compare/-/natural-compare-1.4.0.tgz",
+            "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+            "dev": true,
+            "peer": true
+        },
+        "negotiator": {
+            "version": "0.6.3",
+            "resolved": "https://registry.npmmirror.com/negotiator/-/negotiator-0.6.3.tgz",
+            "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+            "dev": true
+        },
+        "node-int64": {
+            "version": "0.4.0",
+            "resolved": "https://registry.npmmirror.com/node-int64/-/node-int64-0.4.0.tgz",
+            "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==",
+            "dev": true,
+            "peer": true
+        },
+        "node-releases": {
+            "version": "2.0.18",
+            "resolved": "https://registry.npmmirror.com/node-releases/-/node-releases-2.0.18.tgz",
+            "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g=="
+        },
+        "normalize-path": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmmirror.com/normalize-path/-/normalize-path-3.0.0.tgz",
+            "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
+        },
+        "normalize-range": {
+            "version": "0.1.2",
+            "resolved": "https://registry.npmmirror.com/normalize-range/-/normalize-range-0.1.2.tgz",
+            "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA=="
+        },
+        "npm-run-path": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmmirror.com/npm-run-path/-/npm-run-path-4.0.1.tgz",
+            "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+            "dev": true,
+            "requires": {
+                "path-key": "^3.0.0"
+            }
+        },
+        "nwsapi": {
+            "version": "2.2.10",
+            "resolved": "https://registry.npmmirror.com/nwsapi/-/nwsapi-2.2.10.tgz",
+            "integrity": "sha512-QK0sRs7MKv0tKe1+5uZIQk/C8XGza4DAnztJG8iD+TpJIORARrCxczA738awHrZoHeTjSSoHqao2teO0dC/gFQ==",
+            "dev": true,
+            "peer": true
+        },
+        "object-inspect": {
+            "version": "1.13.1",
+            "resolved": "https://registry.npmmirror.com/object-inspect/-/object-inspect-1.13.1.tgz",
+            "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==",
+            "dev": true
+        },
+        "omggif": {
+            "version": "1.0.10",
+            "resolved": "https://registry.npmmirror.com/omggif/-/omggif-1.0.10.tgz",
+            "integrity": "sha512-LMJTtvgc/nugXj0Vcrrs68Mn2D1r0zf630VNtqtpI1FEO7e+O9FP4gqs9AcnBaSEeoHIPm28u6qgPR0oyEpGSw=="
+        },
+        "on-finished": {
+            "version": "2.4.1",
+            "resolved": "https://registry.npmmirror.com/on-finished/-/on-finished-2.4.1.tgz",
+            "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+            "dev": true,
+            "requires": {
+                "ee-first": "1.1.1"
+            }
+        },
+        "once": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmmirror.com/once/-/once-1.4.0.tgz",
+            "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+            "dev": true,
+            "requires": {
+                "wrappy": "1"
+            }
+        },
+        "onetime": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmmirror.com/onetime/-/onetime-5.1.2.tgz",
+            "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+            "dev": true,
+            "requires": {
+                "mimic-fn": "^2.1.0"
+            }
+        },
+        "os-locale-s-fix": {
+            "version": "1.0.8-fix-1",
+            "resolved": "https://registry.npmmirror.com/os-locale-s-fix/-/os-locale-s-fix-1.0.8-fix-1.tgz",
+            "integrity": "sha512-Sv0OvhPiMutICiwORAUefv02DCPb62IelBmo8ZsSrRHyI3FStqIWZvjqDkvtjU+lcujo7UNir+dCwKSqlEQ/5w==",
+            "requires": {
+                "lcid": "^3.0.0"
+            }
+        },
+        "p-limit": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmmirror.com/p-limit/-/p-limit-2.3.0.tgz",
+            "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+            "requires": {
+                "p-try": "^2.0.0"
+            }
+        },
+        "p-locate": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmmirror.com/p-locate/-/p-locate-4.1.0.tgz",
+            "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+            "requires": {
+                "p-limit": "^2.2.0"
+            }
+        },
+        "p-try": {
+            "version": "2.2.0",
+            "resolved": "https://registry.npmmirror.com/p-try/-/p-try-2.2.0.tgz",
+            "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
+        },
+        "pako": {
+            "version": "1.0.11",
+            "resolved": "https://registry.npmmirror.com/pako/-/pako-1.0.11.tgz",
+            "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
+        },
+        "parse-bmfont-ascii": {
+            "version": "1.0.6",
+            "resolved": "https://registry.npmmirror.com/parse-bmfont-ascii/-/parse-bmfont-ascii-1.0.6.tgz",
+            "integrity": "sha512-U4RrVsUFCleIOBsIGYOMKjn9PavsGOXxbvYGtMOEfnId0SVNsgehXh1DxUdVPLoxd5mvcEtvmKs2Mmf0Mpa1ZA=="
+        },
+        "parse-bmfont-binary": {
+            "version": "1.0.6",
+            "resolved": "https://registry.npmmirror.com/parse-bmfont-binary/-/parse-bmfont-binary-1.0.6.tgz",
+            "integrity": "sha512-GxmsRea0wdGdYthjuUeWTMWPqm2+FAd4GI8vCvhgJsFnoGhTrLhXDDupwTo7rXVAgaLIGoVHDZS9p/5XbSqeWA=="
+        },
+        "parse-bmfont-xml": {
+            "version": "1.1.6",
+            "resolved": "https://registry.npmmirror.com/parse-bmfont-xml/-/parse-bmfont-xml-1.1.6.tgz",
+            "integrity": "sha512-0cEliVMZEhrFDwMh4SxIyVJpqYoOWDJ9P895tFuS+XuNzI5UBmBk5U5O4KuJdTnZpSBI4LFA2+ZiJaiwfSwlMA==",
+            "requires": {
+                "xml-parse-from-string": "^1.0.0",
+                "xml2js": "^0.5.0"
+            }
+        },
+        "parse-css-font": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmmirror.com/parse-css-font/-/parse-css-font-4.0.0.tgz",
+            "integrity": "sha512-lnY7dTUfjRXsSo5G5C639L8RaBBaVSgL+5hacIFKsNHzeCJQ5SFSZv1DZmc7+wZv/22PFGOq2YbaEHLdaCS/mQ==",
+            "requires": {
+                "css-font-size-keywords": "^1.0.0",
+                "css-font-stretch-keywords": "^1.0.1",
+                "css-font-style-keywords": "^1.0.1",
+                "css-font-weight-keywords": "^1.0.0",
+                "css-list-helpers": "^2.0.0",
+                "css-system-font-keywords": "^1.0.0",
+                "unquote": "^1.1.1"
+            }
+        },
+        "parse-headers": {
+            "version": "2.0.5",
+            "resolved": "https://registry.npmmirror.com/parse-headers/-/parse-headers-2.0.5.tgz",
+            "integrity": "sha512-ft3iAoLOB/MlwbNXgzy43SWGP6sQki2jQvAyBg/zDFAgr9bfNWZIUj42Kw2eJIl8kEi4PbgE6U1Zau/HwI75HA=="
+        },
+        "parse-json": {
+            "version": "5.2.0",
+            "resolved": "https://registry.npmmirror.com/parse-json/-/parse-json-5.2.0.tgz",
+            "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "@babel/code-frame": "^7.0.0",
+                "error-ex": "^1.3.1",
+                "json-parse-even-better-errors": "^2.3.0",
+                "lines-and-columns": "^1.1.6"
+            }
+        },
+        "parse5": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmmirror.com/parse5/-/parse5-6.0.1.tgz",
+            "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
+            "dev": true,
+            "peer": true
+        },
+        "parseurl": {
+            "version": "1.3.3",
+            "resolved": "https://registry.npmmirror.com/parseurl/-/parseurl-1.3.3.tgz",
+            "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+            "dev": true
+        },
+        "path-browserify": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmmirror.com/path-browserify/-/path-browserify-1.0.1.tgz",
+            "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==",
+            "dev": true
+        },
+        "path-exists": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmmirror.com/path-exists/-/path-exists-4.0.0.tgz",
+            "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
+        },
+        "path-is-absolute": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmmirror.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+            "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+            "dev": true,
+            "peer": true
+        },
+        "path-key": {
+            "version": "3.1.1",
+            "resolved": "https://registry.npmmirror.com/path-key/-/path-key-3.1.1.tgz",
+            "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+            "dev": true
+        },
+        "path-parse": {
+            "version": "1.0.7",
+            "resolved": "https://registry.npmmirror.com/path-parse/-/path-parse-1.0.7.tgz",
+            "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
+        },
+        "path-to-regexp": {
+            "version": "0.1.7",
+            "resolved": "https://registry.npmmirror.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+            "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==",
+            "dev": true
+        },
+        "pathe": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmmirror.com/pathe/-/pathe-1.1.2.tgz",
+            "integrity": "sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==",
+            "dev": true
+        },
+        "phin": {
+            "version": "2.9.3",
+            "resolved": "https://registry.npmmirror.com/phin/-/phin-2.9.3.tgz",
+            "integrity": "sha512-CzFr90qM24ju5f88quFC/6qohjC144rehe5n6DH900lgXmUe86+xCKc10ev56gRKC4/BkHUoG4uSiQgBiIXwDA=="
+        },
+        "picocolors": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmmirror.com/picocolors/-/picocolors-1.1.1.tgz",
+            "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="
+        },
+        "picomatch": {
+            "version": "2.3.1",
+            "resolved": "https://registry.npmmirror.com/picomatch/-/picomatch-2.3.1.tgz",
+            "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="
+        },
+        "pify": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmmirror.com/pify/-/pify-2.3.0.tgz",
+            "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog=="
+        },
+        "pinia": {
+            "version": "2.0.36",
+            "resolved": "https://registry.npmmirror.com/pinia/-/pinia-2.0.36.tgz",
+            "integrity": "sha512-4UKApwjlmJH+VuHKgA+zQMddcCb3ezYnyewQ9NVrsDqZ/j9dMv5+rh+1r48whKNdpFkZAWVxhBp5ewYaYX9JcQ==",
+            "requires": {
+                "@vue/devtools-api": "^6.5.0",
+                "vue-demi": "*"
+            },
+            "dependencies": {
+                "vue-demi": {
+                    "version": "0.14.7",
+                    "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.7.tgz",
+                    "integrity": "sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA==",
+                    "requires": {}
+                }
+            }
+        },
+        "pirates": {
+            "version": "4.0.6",
+            "resolved": "https://registry.npmmirror.com/pirates/-/pirates-4.0.6.tgz",
+            "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
+            "dev": true,
+            "peer": true
+        },
+        "pixelmatch": {
+            "version": "4.0.2",
+            "resolved": "https://registry.npmmirror.com/pixelmatch/-/pixelmatch-4.0.2.tgz",
+            "integrity": "sha512-J8B6xqiO37sU/gkcMglv6h5Jbd9xNER7aHzpfRdNmV4IbQBzBpe4l9XmbG+xPF/znacgu2jfEw+wHffaq/YkXA==",
+            "requires": {
+                "pngjs": "^3.0.0"
+            }
+        },
+        "pkg-dir": {
+            "version": "4.2.0",
+            "resolved": "https://registry.npmmirror.com/pkg-dir/-/pkg-dir-4.2.0.tgz",
+            "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "find-up": "^4.0.0"
+            }
+        },
+        "pngjs": {
+            "version": "3.4.0",
+            "resolved": "https://registry.npmmirror.com/pngjs/-/pngjs-3.4.0.tgz",
+            "integrity": "sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w=="
+        },
+        "postcss": {
+            "version": "8.4.38",
+            "resolved": "https://registry.npmmirror.com/postcss/-/postcss-8.4.38.tgz",
+            "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==",
+            "requires": {
+                "nanoid": "^3.3.7",
+                "picocolors": "^1.0.0",
+                "source-map-js": "^1.2.0"
+            }
+        },
+        "postcss-import": {
+            "version": "14.1.0",
+            "resolved": "https://registry.npmmirror.com/postcss-import/-/postcss-import-14.1.0.tgz",
+            "integrity": "sha512-flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw==",
+            "requires": {
+                "postcss-value-parser": "^4.0.0",
+                "read-cache": "^1.0.0",
+                "resolve": "^1.1.7"
+            }
+        },
+        "postcss-load-config": {
+            "version": "3.1.4",
+            "resolved": "https://registry.npmmirror.com/postcss-load-config/-/postcss-load-config-3.1.4.tgz",
+            "integrity": "sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==",
+            "requires": {
+                "lilconfig": "^2.0.5",
+                "yaml": "^1.10.2"
+            }
+        },
+        "postcss-modules": {
+            "version": "4.3.1",
+            "resolved": "https://registry.npmmirror.com/postcss-modules/-/postcss-modules-4.3.1.tgz",
+            "integrity": "sha512-ItUhSUxBBdNamkT3KzIZwYNNRFKmkJrofvC2nWab3CPKhYBQ1f27XXh1PAPE27Psx58jeelPsxWB/+og+KEH0Q==",
+            "requires": {
+                "generic-names": "^4.0.0",
+                "icss-replace-symbols": "^1.1.0",
+                "lodash.camelcase": "^4.3.0",
+                "postcss-modules-extract-imports": "^3.0.0",
+                "postcss-modules-local-by-default": "^4.0.0",
+                "postcss-modules-scope": "^3.0.0",
+                "postcss-modules-values": "^4.0.0",
+                "string-hash": "^1.1.1"
+            }
+        },
+        "postcss-modules-extract-imports": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmmirror.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz",
+            "integrity": "sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q==",
+            "requires": {}
+        },
+        "postcss-modules-local-by-default": {
+            "version": "4.0.5",
+            "resolved": "https://registry.npmmirror.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.5.tgz",
+            "integrity": "sha512-6MieY7sIfTK0hYfafw1OMEG+2bg8Q1ocHCpoWLqOKj3JXlKu4G7btkmM/B7lFubYkYWmRSPLZi5chid63ZaZYw==",
+            "requires": {
+                "icss-utils": "^5.0.0",
+                "postcss-selector-parser": "^6.0.2",
+                "postcss-value-parser": "^4.1.0"
+            }
+        },
+        "postcss-modules-scope": {
+            "version": "3.2.0",
+            "resolved": "https://registry.npmmirror.com/postcss-modules-scope/-/postcss-modules-scope-3.2.0.tgz",
+            "integrity": "sha512-oq+g1ssrsZOsx9M96c5w8laRmvEu9C3adDSjI8oTcbfkrTE8hx/zfyobUoWIxaKPO8bt6S62kxpw5GqypEw1QQ==",
+            "requires": {
+                "postcss-selector-parser": "^6.0.4"
+            }
+        },
+        "postcss-modules-values": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmmirror.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
+            "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
+            "requires": {
+                "icss-utils": "^5.0.0"
+            }
+        },
+        "postcss-selector-parser": {
+            "version": "6.0.16",
+            "resolved": "https://registry.npmmirror.com/postcss-selector-parser/-/postcss-selector-parser-6.0.16.tgz",
+            "integrity": "sha512-A0RVJrX+IUkVZbW3ClroRWurercFhieevHB38sr2+l9eUClMqome3LmEmnhlNy+5Mr2EYN6B2Kaw9wYdd+VHiw==",
+            "requires": {
+                "cssesc": "^3.0.0",
+                "util-deprecate": "^1.0.2"
+            }
+        },
+        "postcss-value-parser": {
+            "version": "4.2.0",
+            "resolved": "https://registry.npmmirror.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+            "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
+        },
+        "pretty-format": {
+            "version": "27.5.1",
+            "resolved": "https://registry.npmmirror.com/pretty-format/-/pretty-format-27.5.1.tgz",
+            "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "ansi-regex": "^5.0.1",
+                "ansi-styles": "^5.0.0",
+                "react-is": "^17.0.1"
+            },
+            "dependencies": {
+                "ansi-styles": {
+                    "version": "5.2.0",
+                    "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-5.2.0.tgz",
+                    "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+                    "dev": true,
+                    "peer": true
+                }
+            }
+        },
+        "process": {
+            "version": "0.11.10",
+            "resolved": "https://registry.npmmirror.com/process/-/process-0.11.10.tgz",
+            "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A=="
+        },
+        "prompts": {
+            "version": "2.4.2",
+            "resolved": "https://registry.npmmirror.com/prompts/-/prompts-2.4.2.tgz",
+            "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "kleur": "^3.0.3",
+                "sisteransi": "^1.0.5"
+            }
+        },
+        "proxy-addr": {
+            "version": "2.0.7",
+            "resolved": "https://registry.npmmirror.com/proxy-addr/-/proxy-addr-2.0.7.tgz",
+            "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
+            "dev": true,
+            "requires": {
+                "forwarded": "0.2.0",
+                "ipaddr.js": "1.9.1"
+            }
+        },
+        "psl": {
+            "version": "1.9.0",
+            "resolved": "https://registry.npmmirror.com/psl/-/psl-1.9.0.tgz",
+            "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
+            "dev": true,
+            "peer": true
+        },
+        "punycode": {
+            "version": "2.3.1",
+            "resolved": "https://registry.npmmirror.com/punycode/-/punycode-2.3.1.tgz",
+            "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+            "dev": true,
+            "peer": true
+        },
+        "qrcode": {
+            "version": "1.5.3",
+            "resolved": "https://registry.npmmirror.com/qrcode/-/qrcode-1.5.3.tgz",
+            "integrity": "sha512-puyri6ApkEHYiVl4CFzo1tDkAZ+ATcnbJrJ6RiBM1Fhctdn/ix9MTE3hRph33omisEbC/2fcfemsseiKgBPKZg==",
+            "requires": {
+                "dijkstrajs": "^1.0.1",
+                "encode-utf8": "^1.0.3",
+                "pngjs": "^5.0.0",
+                "yargs": "^15.3.1"
+            },
+            "dependencies": {
+                "ansi-styles": {
+                    "version": "4.3.0",
+                    "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+                    "requires": {
+                        "color-convert": "^2.0.1"
+                    }
+                },
+                "camelcase": {
+                    "version": "5.3.1",
+                    "resolved": "https://registry.npmmirror.com/camelcase/-/camelcase-5.3.1.tgz",
+                    "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
+                },
+                "cliui": {
+                    "version": "6.0.0",
+                    "resolved": "https://registry.npmmirror.com/cliui/-/cliui-6.0.0.tgz",
+                    "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+                    "requires": {
+                        "string-width": "^4.2.0",
+                        "strip-ansi": "^6.0.0",
+                        "wrap-ansi": "^6.2.0"
+                    }
+                },
+                "color-convert": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+                    "requires": {
+                        "color-name": "~1.1.4"
+                    }
+                },
+                "color-name": {
+                    "version": "1.1.4",
+                    "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+                },
+                "pngjs": {
+                    "version": "5.0.0",
+                    "resolved": "https://registry.npmmirror.com/pngjs/-/pngjs-5.0.0.tgz",
+                    "integrity": "sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw=="
+                },
+                "wrap-ansi": {
+                    "version": "6.2.0",
+                    "resolved": "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+                    "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+                    "requires": {
+                        "ansi-styles": "^4.0.0",
+                        "string-width": "^4.1.0",
+                        "strip-ansi": "^6.0.0"
+                    }
+                },
+                "y18n": {
+                    "version": "4.0.3",
+                    "resolved": "https://registry.npmmirror.com/y18n/-/y18n-4.0.3.tgz",
+                    "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ=="
+                },
+                "yargs": {
+                    "version": "15.4.1",
+                    "resolved": "https://registry.npmmirror.com/yargs/-/yargs-15.4.1.tgz",
+                    "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+                    "requires": {
+                        "cliui": "^6.0.0",
+                        "decamelize": "^1.2.0",
+                        "find-up": "^4.1.0",
+                        "get-caller-file": "^2.0.1",
+                        "require-directory": "^2.1.1",
+                        "require-main-filename": "^2.0.0",
+                        "set-blocking": "^2.0.0",
+                        "string-width": "^4.2.0",
+                        "which-module": "^2.0.0",
+                        "y18n": "^4.0.0",
+                        "yargs-parser": "^18.1.2"
+                    }
+                },
+                "yargs-parser": {
+                    "version": "18.1.3",
+                    "resolved": "https://registry.npmmirror.com/yargs-parser/-/yargs-parser-18.1.3.tgz",
+                    "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+                    "requires": {
+                        "camelcase": "^5.0.0",
+                        "decamelize": "^1.2.0"
+                    }
+                }
+            }
+        },
+        "qrcode-reader": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmmirror.com/qrcode-reader/-/qrcode-reader-1.0.4.tgz",
+            "integrity": "sha512-rRjALGNh9zVqvweg1j5OKIQKNsw3bLC+7qwlnead5K/9cb1cEIAGkwikt/09U0K+2IDWGD9CC6SP7tHAjUeqvQ=="
+        },
+        "qrcode-terminal": {
+            "version": "0.12.0",
+            "resolved": "https://registry.npmmirror.com/qrcode-terminal/-/qrcode-terminal-0.12.0.tgz",
+            "integrity": "sha512-EXtzRZmC+YGmGlDFbXKxQiMZNwCLEO6BANKXG4iCtSIM0yqc/pappSx3RIKr4r0uh5JsBckOXeKrB3Iz7mdQpQ=="
+        },
+        "qs": {
+            "version": "6.7.0",
+            "resolved": "https://registry.npmmirror.com/qs/-/qs-6.7.0.tgz",
+            "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="
+        },
+        "querystringify": {
+            "version": "2.2.0",
+            "resolved": "https://registry.npmmirror.com/querystringify/-/querystringify-2.2.0.tgz",
+            "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
+            "dev": true,
+            "peer": true
+        },
+        "queue-microtask": {
+            "version": "1.2.3",
+            "resolved": "https://registry.npmmirror.com/queue-microtask/-/queue-microtask-1.2.3.tgz",
+            "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="
+        },
+        "range-parser": {
+            "version": "1.2.1",
+            "resolved": "https://registry.npmmirror.com/range-parser/-/range-parser-1.2.1.tgz",
+            "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+            "dev": true
+        },
+        "raw-body": {
+            "version": "2.5.2",
+            "resolved": "https://registry.npmmirror.com/raw-body/-/raw-body-2.5.2.tgz",
+            "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
+            "dev": true,
+            "requires": {
+                "bytes": "3.1.2",
+                "http-errors": "2.0.0",
+                "iconv-lite": "0.4.24",
+                "unpipe": "1.0.0"
+            }
+        },
+        "react-is": {
+            "version": "17.0.2",
+            "resolved": "https://registry.npmmirror.com/react-is/-/react-is-17.0.2.tgz",
+            "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
+            "dev": true,
+            "peer": true
+        },
+        "read-cache": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmmirror.com/read-cache/-/read-cache-1.0.0.tgz",
+            "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==",
+            "requires": {
+                "pify": "^2.3.0"
+            }
+        },
+        "readdirp": {
+            "version": "3.6.0",
+            "resolved": "https://registry.npmmirror.com/readdirp/-/readdirp-3.6.0.tgz",
+            "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+            "requires": {
+                "picomatch": "^2.2.1"
+            }
+        },
+        "regenerate": {
+            "version": "1.4.2",
+            "resolved": "https://registry.npmmirror.com/regenerate/-/regenerate-1.4.2.tgz",
+            "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
+            "dev": true
+        },
+        "regenerate-unicode-properties": {
+            "version": "10.1.1",
+            "resolved": "https://registry.npmmirror.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz",
+            "integrity": "sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==",
+            "dev": true,
+            "requires": {
+                "regenerate": "^1.4.2"
+            }
+        },
+        "regenerator-runtime": {
+            "version": "0.13.11",
+            "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
+            "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
+        },
+        "regenerator-transform": {
+            "version": "0.15.2",
+            "resolved": "https://registry.npmmirror.com/regenerator-transform/-/regenerator-transform-0.15.2.tgz",
+            "integrity": "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==",
+            "dev": true,
+            "requires": {
+                "@babel/runtime": "^7.8.4"
+            }
+        },
+        "regexpu-core": {
+            "version": "5.3.2",
+            "resolved": "https://registry.npmmirror.com/regexpu-core/-/regexpu-core-5.3.2.tgz",
+            "integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==",
+            "dev": true,
+            "requires": {
+                "@babel/regjsgen": "^0.8.0",
+                "regenerate": "^1.4.2",
+                "regenerate-unicode-properties": "^10.1.0",
+                "regjsparser": "^0.9.1",
+                "unicode-match-property-ecmascript": "^2.0.0",
+                "unicode-match-property-value-ecmascript": "^2.1.0"
+            }
+        },
+        "regjsparser": {
+            "version": "0.9.1",
+            "resolved": "https://registry.npmmirror.com/regjsparser/-/regjsparser-0.9.1.tgz",
+            "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==",
+            "dev": true,
+            "requires": {
+                "jsesc": "~0.5.0"
+            },
+            "dependencies": {
+                "jsesc": {
+                    "version": "0.5.0",
+                    "resolved": "https://registry.npmmirror.com/jsesc/-/jsesc-0.5.0.tgz",
+                    "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==",
+                    "dev": true
+                }
+            }
+        },
+        "require-directory": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmmirror.com/require-directory/-/require-directory-2.1.1.tgz",
+            "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="
+        },
+        "require-main-filename": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/require-main-filename/-/require-main-filename-2.0.0.tgz",
+            "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="
+        },
+        "requires-port": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmmirror.com/requires-port/-/requires-port-1.0.0.tgz",
+            "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
+            "dev": true,
+            "peer": true
+        },
+        "resolve": {
+            "version": "1.22.8",
+            "resolved": "https://registry.npmmirror.com/resolve/-/resolve-1.22.8.tgz",
+            "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
+            "requires": {
+                "is-core-module": "^2.13.0",
+                "path-parse": "^1.0.7",
+                "supports-preserve-symlinks-flag": "^1.0.0"
+            }
+        },
+        "resolve-cwd": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmmirror.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+            "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "resolve-from": "^5.0.0"
+            }
+        },
+        "resolve-from": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmmirror.com/resolve-from/-/resolve-from-5.0.0.tgz",
+            "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+            "dev": true,
+            "peer": true
+        },
+        "resolve.exports": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmmirror.com/resolve.exports/-/resolve.exports-1.1.1.tgz",
+            "integrity": "sha512-/NtpHNDN7jWhAaQ9BvBUYZ6YTXsRBgfqWFWP7BZBaoMJO/I3G5OFzvTuWNlZC3aPjins1F+TNrLKsGbH4rfsRQ==",
+            "dev": true,
+            "peer": true
+        },
+        "reusify": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmmirror.com/reusify/-/reusify-1.0.4.tgz",
+            "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="
+        },
+        "rimraf": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmmirror.com/rimraf/-/rimraf-3.0.2.tgz",
+            "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "glob": "^7.1.3"
+            },
+            "dependencies": {
+                "brace-expansion": {
+                    "version": "1.1.11",
+                    "resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.11.tgz",
+                    "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "balanced-match": "^1.0.0",
+                        "concat-map": "0.0.1"
+                    }
+                },
+                "glob": {
+                    "version": "7.2.3",
+                    "resolved": "https://registry.npmmirror.com/glob/-/glob-7.2.3.tgz",
+                    "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "fs.realpath": "^1.0.0",
+                        "inflight": "^1.0.4",
+                        "inherits": "2",
+                        "minimatch": "^3.1.1",
+                        "once": "^1.3.0",
+                        "path-is-absolute": "^1.0.0"
+                    }
+                },
+                "minimatch": {
+                    "version": "3.1.2",
+                    "resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-3.1.2.tgz",
+                    "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "brace-expansion": "^1.1.7"
+                    }
+                }
+            }
+        },
+        "rollup": {
+            "version": "3.29.4",
+            "resolved": "https://registry.npmmirror.com/rollup/-/rollup-3.29.4.tgz",
+            "integrity": "sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==",
+            "requires": {
+                "fsevents": "~2.3.2"
+            }
+        },
+        "run-parallel": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmmirror.com/run-parallel/-/run-parallel-1.2.0.tgz",
+            "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+            "requires": {
+                "queue-microtask": "^1.2.2"
+            }
+        },
+        "safe-area-insets": {
+            "version": "1.4.1",
+            "resolved": "https://registry.npmmirror.com/safe-area-insets/-/safe-area-insets-1.4.1.tgz",
+            "integrity": "sha512-r/nRWTjFGhhm3w1Z6Kd/jY11srN+lHt2mNl1E/emQGW8ic7n3Avu4noibklfSM+Y34peNphHD/BSZecav0sXYQ=="
+        },
+        "safe-buffer": {
+            "version": "5.2.1",
+            "resolved": "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.2.1.tgz",
+            "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+            "dev": true
+        },
+        "safer-buffer": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmmirror.com/safer-buffer/-/safer-buffer-2.1.2.tgz",
+            "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+            "dev": true
+        },
+        "sass": {
+            "version": "1.77.1",
+            "resolved": "https://registry.npmmirror.com/sass/-/sass-1.77.1.tgz",
+            "integrity": "sha512-OMEyfirt9XEfyvocduUIOlUSkWOXS/LAt6oblR/ISXCTukyavjex+zQNm51pPCOiFKY1QpWvEH1EeCkgyV3I6w==",
+            "devOptional": true,
+            "requires": {
+                "chokidar": ">=3.0.0 <4.0.0",
+                "immutable": "^4.0.0",
+                "source-map-js": ">=0.6.2 <2.0.0"
+            }
+        },
+        "sax": {
+            "version": "1.3.0",
+            "resolved": "https://registry.npmmirror.com/sax/-/sax-1.3.0.tgz",
+            "integrity": "sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA=="
+        },
+        "saxes": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmmirror.com/saxes/-/saxes-5.0.1.tgz",
+            "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "xmlchars": "^2.2.0"
+            }
+        },
+        "select": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmmirror.com/select/-/select-1.1.2.tgz",
+            "integrity": "sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA=="
+        },
+        "semver": {
+            "version": "6.3.1",
+            "resolved": "https://registry.npmmirror.com/semver/-/semver-6.3.1.tgz",
+            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
+        },
+        "send": {
+            "version": "0.18.0",
+            "resolved": "https://registry.npmmirror.com/send/-/send-0.18.0.tgz",
+            "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+            "dev": true,
+            "requires": {
+                "debug": "2.6.9",
+                "depd": "2.0.0",
+                "destroy": "1.2.0",
+                "encodeurl": "~1.0.2",
+                "escape-html": "~1.0.3",
+                "etag": "~1.8.1",
+                "fresh": "0.5.2",
+                "http-errors": "2.0.0",
+                "mime": "1.6.0",
+                "ms": "2.1.3",
+                "on-finished": "2.4.1",
+                "range-parser": "~1.2.1",
+                "statuses": "2.0.1"
+            },
+            "dependencies": {
+                "debug": {
+                    "version": "2.6.9",
+                    "resolved": "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz",
+                    "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+                    "dev": true,
+                    "requires": {
+                        "ms": "2.0.0"
+                    },
+                    "dependencies": {
+                        "ms": {
+                            "version": "2.0.0",
+                            "resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz",
+                            "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+                            "dev": true
+                        }
+                    }
+                },
+                "mime": {
+                    "version": "1.6.0",
+                    "resolved": "https://registry.npmmirror.com/mime/-/mime-1.6.0.tgz",
+                    "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+                    "dev": true
+                },
+                "ms": {
+                    "version": "2.1.3",
+                    "resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.3.tgz",
+                    "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+                    "dev": true
+                }
+            }
+        },
+        "serve-static": {
+            "version": "1.15.0",
+            "resolved": "https://registry.npmmirror.com/serve-static/-/serve-static-1.15.0.tgz",
+            "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
+            "dev": true,
+            "requires": {
+                "encodeurl": "~1.0.2",
+                "escape-html": "~1.0.3",
+                "parseurl": "~1.3.3",
+                "send": "0.18.0"
+            }
+        },
+        "set-blocking": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/set-blocking/-/set-blocking-2.0.0.tgz",
+            "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="
+        },
+        "set-function-length": {
+            "version": "1.2.2",
+            "resolved": "https://registry.npmmirror.com/set-function-length/-/set-function-length-1.2.2.tgz",
+            "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
+            "dev": true,
+            "requires": {
+                "define-data-property": "^1.1.4",
+                "es-errors": "^1.3.0",
+                "function-bind": "^1.1.2",
+                "get-intrinsic": "^1.2.4",
+                "gopd": "^1.0.1",
+                "has-property-descriptors": "^1.0.2"
+            }
+        },
+        "setprototypeof": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmmirror.com/setprototypeof/-/setprototypeof-1.2.0.tgz",
+            "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
+            "dev": true
+        },
+        "shebang-command": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/shebang-command/-/shebang-command-2.0.0.tgz",
+            "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+            "dev": true,
+            "requires": {
+                "shebang-regex": "^3.0.0"
+            }
+        },
+        "shebang-regex": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmmirror.com/shebang-regex/-/shebang-regex-3.0.0.tgz",
+            "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+            "dev": true
+        },
+        "side-channel": {
+            "version": "1.0.6",
+            "resolved": "https://registry.npmmirror.com/side-channel/-/side-channel-1.0.6.tgz",
+            "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
+            "dev": true,
+            "requires": {
+                "call-bind": "^1.0.7",
+                "es-errors": "^1.3.0",
+                "get-intrinsic": "^1.2.4",
+                "object-inspect": "^1.13.1"
+            }
+        },
+        "signal-exit": {
+            "version": "3.0.7",
+            "resolved": "https://registry.npmmirror.com/signal-exit/-/signal-exit-3.0.7.tgz",
+            "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+            "dev": true
+        },
+        "sisteransi": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmmirror.com/sisteransi/-/sisteransi-1.0.5.tgz",
+            "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
+            "dev": true,
+            "peer": true
+        },
+        "slash": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmmirror.com/slash/-/slash-3.0.0.tgz",
+            "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+            "dev": true,
+            "peer": true
+        },
+        "sortablejs": {
+            "version": "1.15.2",
+            "resolved": "https://registry.npmmirror.com/sortablejs/-/sortablejs-1.15.2.tgz",
+            "integrity": "sha512-FJF5jgdfvoKn1MAKSdGs33bIqLi3LmsgVTliuX6iITj834F+JRQZN90Z93yql8h0K2t0RwDPBmxwlbZfDcxNZA=="
+        },
+        "source-list-map": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/source-list-map/-/source-list-map-2.0.1.tgz",
+            "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
+            "dev": true
+        },
+        "source-map": {
+            "version": "0.6.1",
+            "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz",
+            "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        },
+        "source-map-js": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.2.0.tgz",
+            "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg=="
+        },
+        "source-map-support": {
+            "version": "0.5.21",
+            "resolved": "https://registry.npmmirror.com/source-map-support/-/source-map-support-0.5.21.tgz",
+            "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+            "devOptional": true,
+            "requires": {
+                "buffer-from": "^1.0.0",
+                "source-map": "^0.6.0"
+            }
+        },
+        "sourcemap-codec": {
+            "version": "1.4.8",
+            "resolved": "https://registry.npmmirror.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
+            "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA=="
+        },
+        "sprintf-js": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmmirror.com/sprintf-js/-/sprintf-js-1.0.3.tgz",
+            "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
+            "dev": true,
+            "peer": true
+        },
+        "stack-utils": {
+            "version": "2.0.6",
+            "resolved": "https://registry.npmmirror.com/stack-utils/-/stack-utils-2.0.6.tgz",
+            "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "escape-string-regexp": "^2.0.0"
+            },
+            "dependencies": {
+                "escape-string-regexp": {
+                    "version": "2.0.0",
+                    "resolved": "https://registry.npmmirror.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+                    "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+                    "dev": true,
+                    "peer": true
+                }
+            }
+        },
+        "statuses": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/statuses/-/statuses-2.0.1.tgz",
+            "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+            "dev": true
+        },
+        "string-hash": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmmirror.com/string-hash/-/string-hash-1.1.3.tgz",
+            "integrity": "sha512-kJUvRUFK49aub+a7T1nNE66EJbZBMnBgoC1UbCZ5n6bsZKBRga4KgBRTMn/pFkeCZSYtNeSyMxPDM0AXWELk2A=="
+        },
+        "string-length": {
+            "version": "4.0.2",
+            "resolved": "https://registry.npmmirror.com/string-length/-/string-length-4.0.2.tgz",
+            "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "char-regex": "^1.0.2",
+                "strip-ansi": "^6.0.0"
+            }
+        },
+        "string-width": {
+            "version": "4.2.3",
+            "resolved": "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz",
+            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+            "requires": {
+                "emoji-regex": "^8.0.0",
+                "is-fullwidth-code-point": "^3.0.0",
+                "strip-ansi": "^6.0.1"
+            }
+        },
+        "strip-ansi": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz",
+            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+            "requires": {
+                "ansi-regex": "^5.0.1"
+            }
+        },
+        "strip-bom": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmmirror.com/strip-bom/-/strip-bom-4.0.0.tgz",
+            "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
+            "dev": true,
+            "peer": true
+        },
+        "strip-final-newline": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+            "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+            "dev": true
+        },
+        "strip-json-comments": {
+            "version": "3.1.1",
+            "resolved": "https://registry.npmmirror.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+            "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+            "dev": true,
+            "peer": true
+        },
+        "supports-color": {
+            "version": "5.5.0",
+            "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-5.5.0.tgz",
+            "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+            "requires": {
+                "has-flag": "^3.0.0"
+            }
+        },
+        "supports-hyperlinks": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmmirror.com/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz",
+            "integrity": "sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "has-flag": "^4.0.0",
+                "supports-color": "^7.0.0"
+            },
+            "dependencies": {
+                "has-flag": {
+                    "version": "4.0.0",
+                    "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+                    "dev": true,
+                    "peer": true
+                },
+                "supports-color": {
+                    "version": "7.2.0",
+                    "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "has-flag": "^4.0.0"
+                    }
+                }
+            }
+        },
+        "supports-preserve-symlinks-flag": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmmirror.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+            "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="
+        },
+        "svg-tags": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmmirror.com/svg-tags/-/svg-tags-1.0.0.tgz",
+            "integrity": "sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==",
+            "dev": true
+        },
+        "symbol-tree": {
+            "version": "3.2.4",
+            "resolved": "https://registry.npmmirror.com/symbol-tree/-/symbol-tree-3.2.4.tgz",
+            "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
+            "dev": true,
+            "peer": true
+        },
+        "systemjs": {
+            "version": "6.15.1",
+            "resolved": "https://registry.npmmirror.com/systemjs/-/systemjs-6.15.1.tgz",
+            "integrity": "sha512-Nk8c4lXvMB98MtbmjX7JwJRgJOL8fluecYCfCeYBznwmpOs8Bf15hLM6z4z71EDAhQVrQrI+wt1aLWSXZq+hXA==",
+            "dev": true
+        },
+        "tapable": {
+            "version": "2.2.1",
+            "resolved": "https://registry.npmmirror.com/tapable/-/tapable-2.2.1.tgz",
+            "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ=="
+        },
+        "terminal-link": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmmirror.com/terminal-link/-/terminal-link-2.1.1.tgz",
+            "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "ansi-escapes": "^4.2.1",
+                "supports-hyperlinks": "^2.0.0"
+            }
+        },
+        "terser": {
+            "version": "5.31.0",
+            "resolved": "https://registry.npmmirror.com/terser/-/terser-5.31.0.tgz",
+            "integrity": "sha512-Q1JFAoUKE5IMfI4Z/lkE/E6+SwgzO+x4tq4v1AyBLRj8VSYvRO6A/rQrPg1yud4g0En9EKI1TvFRF2tQFcoUkg==",
+            "devOptional": true,
+            "requires": {
+                "@jridgewell/source-map": "^0.3.3",
+                "acorn": "^8.8.2",
+                "commander": "^2.20.0",
+                "source-map-support": "~0.5.20"
+            }
+        },
+        "test-exclude": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmmirror.com/test-exclude/-/test-exclude-6.0.0.tgz",
+            "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "@istanbuljs/schema": "^0.1.2",
+                "glob": "^7.1.4",
+                "minimatch": "^3.0.4"
+            },
+            "dependencies": {
+                "brace-expansion": {
+                    "version": "1.1.11",
+                    "resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.11.tgz",
+                    "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "balanced-match": "^1.0.0",
+                        "concat-map": "0.0.1"
+                    }
+                },
+                "glob": {
+                    "version": "7.2.3",
+                    "resolved": "https://registry.npmmirror.com/glob/-/glob-7.2.3.tgz",
+                    "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "fs.realpath": "^1.0.0",
+                        "inflight": "^1.0.4",
+                        "inherits": "2",
+                        "minimatch": "^3.1.1",
+                        "once": "^1.3.0",
+                        "path-is-absolute": "^1.0.0"
+                    }
+                },
+                "minimatch": {
+                    "version": "3.1.2",
+                    "resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-3.1.2.tgz",
+                    "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "brace-expansion": "^1.1.7"
+                    }
+                }
+            }
+        },
+        "text-segmentation": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmmirror.com/text-segmentation/-/text-segmentation-1.0.3.tgz",
+            "integrity": "sha512-iOiPUo/BGnZ6+54OsWxZidGCsdU8YbE4PSpdPinp7DeMtUJNJBoJ/ouUSTJjHkh1KntHaltHl/gDs2FC4i5+Nw==",
+            "requires": {
+                "utrie": "^1.0.2"
+            }
+        },
+        "throat": {
+            "version": "6.0.2",
+            "resolved": "https://registry.npmmirror.com/throat/-/throat-6.0.2.tgz",
+            "integrity": "sha512-WKexMoJj3vEuK0yFEapj8y64V0A6xcuPuK9Gt1d0R+dzCSJc0lHqQytAbSB4cDAK0dWh4T0E2ETkoLE2WZ41OQ==",
+            "dev": true,
+            "peer": true
+        },
+        "timm": {
+            "version": "1.7.1",
+            "resolved": "https://registry.npmmirror.com/timm/-/timm-1.7.1.tgz",
+            "integrity": "sha512-IjZc9KIotudix8bMaBW6QvMuq64BrJWFs1+4V0lXwWGQZwH+LnX87doAYhem4caOEusRP9/g6jVDQmZ8XOk1nw=="
+        },
+        "tiny-emitter": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmmirror.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
+            "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
+        },
+        "tinycolor2": {
+            "version": "1.6.0",
+            "resolved": "https://registry.npmmirror.com/tinycolor2/-/tinycolor2-1.6.0.tgz",
+            "integrity": "sha512-XPaBkWQJdsf3pLKJV9p4qN/S+fm2Oj8AIPo1BTUhg5oxkvm9+SVEGFdhyOz7tTdUTfvxMiAs4sp6/eZO2Ew+pw=="
+        },
+        "tmpl": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmmirror.com/tmpl/-/tmpl-1.0.5.tgz",
+            "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
+            "dev": true,
+            "peer": true
+        },
+        "to-fast-properties": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+            "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog=="
+        },
+        "to-regex-range": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmmirror.com/to-regex-range/-/to-regex-range-5.0.1.tgz",
+            "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+            "requires": {
+                "is-number": "^7.0.0"
+            }
+        },
+        "toidentifier": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmmirror.com/toidentifier/-/toidentifier-1.0.1.tgz",
+            "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
+            "dev": true
+        },
+        "tough-cookie": {
+            "version": "4.1.4",
+            "resolved": "https://registry.npmmirror.com/tough-cookie/-/tough-cookie-4.1.4.tgz",
+            "integrity": "sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "psl": "^1.1.33",
+                "punycode": "^2.1.1",
+                "universalify": "^0.2.0",
+                "url-parse": "^1.5.3"
+            },
+            "dependencies": {
+                "universalify": {
+                    "version": "0.2.0",
+                    "resolved": "https://registry.npmmirror.com/universalify/-/universalify-0.2.0.tgz",
+                    "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
+                    "dev": true,
+                    "peer": true
+                }
+            }
+        },
+        "tr46": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmmirror.com/tr46/-/tr46-2.1.0.tgz",
+            "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "punycode": "^2.1.1"
+            }
+        },
+        "type-detect": {
+            "version": "4.0.8",
+            "resolved": "https://registry.npmmirror.com/type-detect/-/type-detect-4.0.8.tgz",
+            "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+            "dev": true,
+            "peer": true
+        },
+        "type-fest": {
+            "version": "0.21.3",
+            "resolved": "https://registry.npmmirror.com/type-fest/-/type-fest-0.21.3.tgz",
+            "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+            "dev": true,
+            "peer": true
+        },
+        "type-is": {
+            "version": "1.6.18",
+            "resolved": "https://registry.npmmirror.com/type-is/-/type-is-1.6.18.tgz",
+            "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+            "dev": true,
+            "requires": {
+                "media-typer": "0.3.0",
+                "mime-types": "~2.1.24"
+            }
+        },
+        "typedarray-to-buffer": {
+            "version": "3.1.5",
+            "resolved": "https://registry.npmmirror.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
+            "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "is-typedarray": "^1.0.0"
+            }
+        },
+        "typescript": {
+            "version": "4.9.5",
+            "resolved": "https://registry.npmmirror.com/typescript/-/typescript-4.9.5.tgz",
+            "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
+            "devOptional": true
+        },
+        "undici-types": {
+            "version": "5.26.5",
+            "resolved": "https://registry.npmmirror.com/undici-types/-/undici-types-5.26.5.tgz",
+            "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+            "devOptional": true
+        },
+        "unicode-canonical-property-names-ecmascript": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
+            "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==",
+            "dev": true
+        },
+        "unicode-match-property-ecmascript": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
+            "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
+            "dev": true,
+            "requires": {
+                "unicode-canonical-property-names-ecmascript": "^2.0.0",
+                "unicode-property-aliases-ecmascript": "^2.0.0"
+            }
+        },
+        "unicode-match-property-value-ecmascript": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmmirror.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz",
+            "integrity": "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==",
+            "dev": true
+        },
+        "unicode-property-aliases-ecmascript": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmmirror.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz",
+            "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==",
+            "dev": true
+        },
+        "universalify": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/universalify/-/universalify-2.0.1.tgz",
+            "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw=="
+        },
+        "unpipe": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmmirror.com/unpipe/-/unpipe-1.0.0.tgz",
+            "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
+            "dev": true
+        },
+        "unquote": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmmirror.com/unquote/-/unquote-1.1.1.tgz",
+            "integrity": "sha512-vRCqFv6UhXpWxZPyGDh/F3ZpNv8/qo7w6iufLpQg9aKnQ71qM4B5KiI7Mia9COcjEhrO9LueHpMYjYzsWH3OIg=="
+        },
+        "update-browserslist-db": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmmirror.com/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz",
+            "integrity": "sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==",
+            "requires": {
+                "escalade": "^3.2.0",
+                "picocolors": "^1.1.0"
+            }
+        },
+        "url-parse": {
+            "version": "1.5.10",
+            "resolved": "https://registry.npmmirror.com/url-parse/-/url-parse-1.5.10.tgz",
+            "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "querystringify": "^2.1.1",
+                "requires-port": "^1.0.0"
+            }
+        },
+        "utif": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/utif/-/utif-2.0.1.tgz",
+            "integrity": "sha512-Z/S1fNKCicQTf375lIP9G8Sa1H/phcysstNrrSdZKj1f9g58J4NMgb5IgiEZN9/nLMPDwF0W7hdOe9Qq2IYoLg==",
+            "requires": {
+                "pako": "^1.0.5"
+            }
+        },
+        "util-deprecate": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmmirror.com/util-deprecate/-/util-deprecate-1.0.2.tgz",
+            "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
+        },
+        "utils-merge": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmmirror.com/utils-merge/-/utils-merge-1.0.1.tgz",
+            "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
+            "dev": true
+        },
+        "utrie": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmmirror.com/utrie/-/utrie-1.0.2.tgz",
+            "integrity": "sha512-1MLa5ouZiOmQzUbjbu9VmjLzn1QLXBhwpUa7kdLUQK+KQ5KA9I1vk5U4YHe/X2Ch7PYnJfWuWT+VbuxbGwljhw==",
+            "requires": {
+                "base64-arraybuffer": "^1.0.2"
+            }
+        },
+        "uview-plus": {
+            "version": "3.2.22",
+            "resolved": "https://registry.npmmirror.com/uview-plus/-/uview-plus-3.2.22.tgz",
+            "integrity": "sha512-ouhq0CCGP/ElR7eCCu0rBFNPTGW/EctcrxKIerjj1DOkEIY9BwKBbdI0VTSSkMFnr6RFejSQLBw/aKkqd6Q+7g==",
+            "requires": {
+                "clipboard": "^2.0.11",
+                "dayjs": "^1.11.3"
+            }
+        },
+        "v8-to-istanbul": {
+            "version": "8.1.1",
+            "resolved": "https://registry.npmmirror.com/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz",
+            "integrity": "sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "@types/istanbul-lib-coverage": "^2.0.1",
+                "convert-source-map": "^1.6.0",
+                "source-map": "^0.7.3"
+            },
+            "dependencies": {
+                "convert-source-map": {
+                    "version": "1.9.0",
+                    "resolved": "https://registry.npmmirror.com/convert-source-map/-/convert-source-map-1.9.0.tgz",
+                    "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
+                    "dev": true,
+                    "peer": true
+                },
+                "source-map": {
+                    "version": "0.7.4",
+                    "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.7.4.tgz",
+                    "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
+                    "dev": true,
+                    "peer": true
+                }
+            }
+        },
+        "vary": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmmirror.com/vary/-/vary-1.1.2.tgz",
+            "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
+            "dev": true
+        },
+        "vite": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmmirror.com/vite/-/vite-4.0.4.tgz",
+            "integrity": "sha512-xevPU7M8FU0i/80DMR+YhgrzR5KS2ORy1B4xcX/cXLsvnUWvfHuqMmVU6N0YiJ4JWGRJJsLCgjEzKjG9/GKoSw==",
+            "requires": {
+                "esbuild": "^0.16.3",
+                "fsevents": "~2.3.2",
+                "postcss": "^8.4.20",
+                "resolve": "^1.22.1",
+                "rollup": "^3.7.0"
+            },
+            "dependencies": {
+                "@esbuild/android-arm": {
+                    "version": "0.16.17",
+                    "resolved": "https://registry.npmmirror.com/@esbuild/android-arm/-/android-arm-0.16.17.tgz",
+                    "integrity": "sha512-N9x1CMXVhtWEAMS7pNNONyA14f71VPQN9Cnavj1XQh6T7bskqiLLrSca4O0Vr8Wdcga943eThxnVp3JLnBMYtw==",
+                    "optional": true
+                },
+                "@esbuild/android-arm64": {
+                    "version": "0.16.17",
+                    "resolved": "https://registry.npmmirror.com/@esbuild/android-arm64/-/android-arm64-0.16.17.tgz",
+                    "integrity": "sha512-MIGl6p5sc3RDTLLkYL1MyL8BMRN4tLMRCn+yRJJmEDvYZ2M7tmAf80hx1kbNEUX2KJ50RRtxZ4JHLvCfuB6kBg==",
+                    "optional": true
+                },
+                "@esbuild/android-x64": {
+                    "version": "0.16.17",
+                    "resolved": "https://registry.npmmirror.com/@esbuild/android-x64/-/android-x64-0.16.17.tgz",
+                    "integrity": "sha512-a3kTv3m0Ghh4z1DaFEuEDfz3OLONKuFvI4Xqczqx4BqLyuFaFkuaG4j2MtA6fuWEFeC5x9IvqnX7drmRq/fyAQ==",
+                    "optional": true
+                },
+                "@esbuild/darwin-arm64": {
+                    "version": "0.16.17",
+                    "resolved": "https://registry.npmmirror.com/@esbuild/darwin-arm64/-/darwin-arm64-0.16.17.tgz",
+                    "integrity": "sha512-/2agbUEfmxWHi9ARTX6OQ/KgXnOWfsNlTeLcoV7HSuSTv63E4DqtAc+2XqGw1KHxKMHGZgbVCZge7HXWX9Vn+w==",
+                    "optional": true
+                },
+                "@esbuild/darwin-x64": {
+                    "version": "0.16.17",
+                    "resolved": "https://registry.npmmirror.com/@esbuild/darwin-x64/-/darwin-x64-0.16.17.tgz",
+                    "integrity": "sha512-2By45OBHulkd9Svy5IOCZt376Aa2oOkiE9QWUK9fe6Tb+WDr8hXL3dpqi+DeLiMed8tVXspzsTAvd0jUl96wmg==",
+                    "optional": true
+                },
+                "@esbuild/freebsd-arm64": {
+                    "version": "0.16.17",
+                    "resolved": "https://registry.npmmirror.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.16.17.tgz",
+                    "integrity": "sha512-mt+cxZe1tVx489VTb4mBAOo2aKSnJ33L9fr25JXpqQqzbUIw/yzIzi+NHwAXK2qYV1lEFp4OoVeThGjUbmWmdw==",
+                    "optional": true
+                },
+                "@esbuild/freebsd-x64": {
+                    "version": "0.16.17",
+                    "resolved": "https://registry.npmmirror.com/@esbuild/freebsd-x64/-/freebsd-x64-0.16.17.tgz",
+                    "integrity": "sha512-8ScTdNJl5idAKjH8zGAsN7RuWcyHG3BAvMNpKOBaqqR7EbUhhVHOqXRdL7oZvz8WNHL2pr5+eIT5c65kA6NHug==",
+                    "optional": true
+                },
+                "@esbuild/linux-arm": {
+                    "version": "0.16.17",
+                    "resolved": "https://registry.npmmirror.com/@esbuild/linux-arm/-/linux-arm-0.16.17.tgz",
+                    "integrity": "sha512-iihzrWbD4gIT7j3caMzKb/RsFFHCwqqbrbH9SqUSRrdXkXaygSZCZg1FybsZz57Ju7N/SHEgPyaR0LZ8Zbe9gQ==",
+                    "optional": true
+                },
+                "@esbuild/linux-arm64": {
+                    "version": "0.16.17",
+                    "resolved": "https://registry.npmmirror.com/@esbuild/linux-arm64/-/linux-arm64-0.16.17.tgz",
+                    "integrity": "sha512-7S8gJnSlqKGVJunnMCrXHU9Q8Q/tQIxk/xL8BqAP64wchPCTzuM6W3Ra8cIa1HIflAvDnNOt2jaL17vaW+1V0g==",
+                    "optional": true
+                },
+                "@esbuild/linux-ia32": {
+                    "version": "0.16.17",
+                    "resolved": "https://registry.npmmirror.com/@esbuild/linux-ia32/-/linux-ia32-0.16.17.tgz",
+                    "integrity": "sha512-kiX69+wcPAdgl3Lonh1VI7MBr16nktEvOfViszBSxygRQqSpzv7BffMKRPMFwzeJGPxcio0pdD3kYQGpqQ2SSg==",
+                    "optional": true
+                },
+                "@esbuild/linux-loong64": {
+                    "version": "0.16.17",
+                    "resolved": "https://registry.npmmirror.com/@esbuild/linux-loong64/-/linux-loong64-0.16.17.tgz",
+                    "integrity": "sha512-dTzNnQwembNDhd654cA4QhbS9uDdXC3TKqMJjgOWsC0yNCbpzfWoXdZvp0mY7HU6nzk5E0zpRGGx3qoQg8T2DQ==",
+                    "optional": true
+                },
+                "@esbuild/linux-mips64el": {
+                    "version": "0.16.17",
+                    "resolved": "https://registry.npmmirror.com/@esbuild/linux-mips64el/-/linux-mips64el-0.16.17.tgz",
+                    "integrity": "sha512-ezbDkp2nDl0PfIUn0CsQ30kxfcLTlcx4Foz2kYv8qdC6ia2oX5Q3E/8m6lq84Dj/6b0FrkgD582fJMIfHhJfSw==",
+                    "optional": true
+                },
+                "@esbuild/linux-ppc64": {
+                    "version": "0.16.17",
+                    "resolved": "https://registry.npmmirror.com/@esbuild/linux-ppc64/-/linux-ppc64-0.16.17.tgz",
+                    "integrity": "sha512-dzS678gYD1lJsW73zrFhDApLVdM3cUF2MvAa1D8K8KtcSKdLBPP4zZSLy6LFZ0jYqQdQ29bjAHJDgz0rVbLB3g==",
+                    "optional": true
+                },
+                "@esbuild/linux-riscv64": {
+                    "version": "0.16.17",
+                    "resolved": "https://registry.npmmirror.com/@esbuild/linux-riscv64/-/linux-riscv64-0.16.17.tgz",
+                    "integrity": "sha512-ylNlVsxuFjZK8DQtNUwiMskh6nT0vI7kYl/4fZgV1llP5d6+HIeL/vmmm3jpuoo8+NuXjQVZxmKuhDApK0/cKw==",
+                    "optional": true
+                },
+                "@esbuild/linux-s390x": {
+                    "version": "0.16.17",
+                    "resolved": "https://registry.npmmirror.com/@esbuild/linux-s390x/-/linux-s390x-0.16.17.tgz",
+                    "integrity": "sha512-gzy7nUTO4UA4oZ2wAMXPNBGTzZFP7mss3aKR2hH+/4UUkCOyqmjXiKpzGrY2TlEUhbbejzXVKKGazYcQTZWA/w==",
+                    "optional": true
+                },
+                "@esbuild/linux-x64": {
+                    "version": "0.16.17",
+                    "resolved": "https://registry.npmmirror.com/@esbuild/linux-x64/-/linux-x64-0.16.17.tgz",
+                    "integrity": "sha512-mdPjPxfnmoqhgpiEArqi4egmBAMYvaObgn4poorpUaqmvzzbvqbowRllQ+ZgzGVMGKaPkqUmPDOOFQRUFDmeUw==",
+                    "optional": true
+                },
+                "@esbuild/netbsd-x64": {
+                    "version": "0.16.17",
+                    "resolved": "https://registry.npmmirror.com/@esbuild/netbsd-x64/-/netbsd-x64-0.16.17.tgz",
+                    "integrity": "sha512-/PzmzD/zyAeTUsduZa32bn0ORug+Jd1EGGAUJvqfeixoEISYpGnAezN6lnJoskauoai0Jrs+XSyvDhppCPoKOA==",
+                    "optional": true
+                },
+                "@esbuild/openbsd-x64": {
+                    "version": "0.16.17",
+                    "resolved": "https://registry.npmmirror.com/@esbuild/openbsd-x64/-/openbsd-x64-0.16.17.tgz",
+                    "integrity": "sha512-2yaWJhvxGEz2RiftSk0UObqJa/b+rIAjnODJgv2GbGGpRwAfpgzyrg1WLK8rqA24mfZa9GvpjLcBBg8JHkoodg==",
+                    "optional": true
+                },
+                "@esbuild/sunos-x64": {
+                    "version": "0.16.17",
+                    "resolved": "https://registry.npmmirror.com/@esbuild/sunos-x64/-/sunos-x64-0.16.17.tgz",
+                    "integrity": "sha512-xtVUiev38tN0R3g8VhRfN7Zl42YCJvyBhRKw1RJjwE1d2emWTVToPLNEQj/5Qxc6lVFATDiy6LjVHYhIPrLxzw==",
+                    "optional": true
+                },
+                "@esbuild/win32-arm64": {
+                    "version": "0.16.17",
+                    "resolved": "https://registry.npmmirror.com/@esbuild/win32-arm64/-/win32-arm64-0.16.17.tgz",
+                    "integrity": "sha512-ga8+JqBDHY4b6fQAmOgtJJue36scANy4l/rL97W+0wYmijhxKetzZdKOJI7olaBaMhWt8Pac2McJdZLxXWUEQw==",
+                    "optional": true
+                },
+                "@esbuild/win32-ia32": {
+                    "version": "0.16.17",
+                    "resolved": "https://registry.npmmirror.com/@esbuild/win32-ia32/-/win32-ia32-0.16.17.tgz",
+                    "integrity": "sha512-WnsKaf46uSSF/sZhwnqE4L/F89AYNMiD4YtEcYekBt9Q7nj0DiId2XH2Ng2PHM54qi5oPrQ8luuzGszqi/veig==",
+                    "optional": true
+                },
+                "@esbuild/win32-x64": {
+                    "version": "0.16.17",
+                    "resolved": "https://registry.npmmirror.com/@esbuild/win32-x64/-/win32-x64-0.16.17.tgz",
+                    "integrity": "sha512-y+EHuSchhL7FjHgvQL/0fnnFmO4T1bhvWANX6gcnqTjtnKWbTvUMCpGnv2+t+31d7RzyEAYAd4u2fnIhHL6N/Q==",
+                    "optional": true
+                },
+                "esbuild": {
+                    "version": "0.16.17",
+                    "resolved": "https://registry.npmmirror.com/esbuild/-/esbuild-0.16.17.tgz",
+                    "integrity": "sha512-G8LEkV0XzDMNwXKgM0Jwu3nY3lSTwSGY6XbxM9cr9+s0T/qSV1q1JVPBGzm3dcjhCic9+emZDmMffkwgPeOeLg==",
+                    "requires": {
+                        "@esbuild/android-arm": "0.16.17",
+                        "@esbuild/android-arm64": "0.16.17",
+                        "@esbuild/android-x64": "0.16.17",
+                        "@esbuild/darwin-arm64": "0.16.17",
+                        "@esbuild/darwin-x64": "0.16.17",
+                        "@esbuild/freebsd-arm64": "0.16.17",
+                        "@esbuild/freebsd-x64": "0.16.17",
+                        "@esbuild/linux-arm": "0.16.17",
+                        "@esbuild/linux-arm64": "0.16.17",
+                        "@esbuild/linux-ia32": "0.16.17",
+                        "@esbuild/linux-loong64": "0.16.17",
+                        "@esbuild/linux-mips64el": "0.16.17",
+                        "@esbuild/linux-ppc64": "0.16.17",
+                        "@esbuild/linux-riscv64": "0.16.17",
+                        "@esbuild/linux-s390x": "0.16.17",
+                        "@esbuild/linux-x64": "0.16.17",
+                        "@esbuild/netbsd-x64": "0.16.17",
+                        "@esbuild/openbsd-x64": "0.16.17",
+                        "@esbuild/sunos-x64": "0.16.17",
+                        "@esbuild/win32-arm64": "0.16.17",
+                        "@esbuild/win32-ia32": "0.16.17",
+                        "@esbuild/win32-x64": "0.16.17"
+                    }
+                }
+            }
+        },
+        "vite-plugin-windicss": {
+            "version": "1.9.3",
+            "resolved": "https://registry.npmmirror.com/vite-plugin-windicss/-/vite-plugin-windicss-1.9.3.tgz",
+            "integrity": "sha512-PqNiIsrEftCrgn0xIpj8ZMSdpz8NZn+OJ3gKXnOF+hFzbHFrKGJA49ViOUKCHDOquxoGBZMmTjepWr8GrftKcQ==",
+            "dev": true,
+            "requires": {
+                "@windicss/plugin-utils": "1.9.3",
+                "debug": "^4.3.4",
+                "kolorist": "^1.8.0",
+                "windicss": "^3.5.6"
+            }
+        },
+        "vue": {
+            "version": "3.4.27",
+            "resolved": "https://registry.npmmirror.com/vue/-/vue-3.4.27.tgz",
+            "integrity": "sha512-8s/56uK6r01r1icG/aEOHqyMVxd1bkYcSe9j8HcKtr/xTOFWvnzIVTehNW+5Yt89f+DLBe4A569pnZLS5HzAMA==",
+            "requires": {
+                "@vue/compiler-dom": "3.4.27",
+                "@vue/compiler-sfc": "3.4.27",
+                "@vue/runtime-dom": "3.4.27",
+                "@vue/server-renderer": "3.4.27",
+                "@vue/shared": "3.4.27"
+            },
+            "dependencies": {
+                "@vue/compiler-core": {
+                    "version": "3.4.27",
+                    "resolved": "https://registry.npmmirror.com/@vue/compiler-core/-/compiler-core-3.4.27.tgz",
+                    "integrity": "sha512-E+RyqY24KnyDXsCuQrI+mlcdW3ALND6U7Gqa/+bVwbcpcR3BRRIckFoz7Qyd4TTlnugtwuI7YgjbvsLmxb+yvg==",
+                    "requires": {
+                        "@babel/parser": "^7.24.4",
+                        "@vue/shared": "3.4.27",
+                        "entities": "^4.5.0",
+                        "estree-walker": "^2.0.2",
+                        "source-map-js": "^1.2.0"
+                    }
+                },
+                "@vue/compiler-dom": {
+                    "version": "3.4.27",
+                    "resolved": "https://registry.npmmirror.com/@vue/compiler-dom/-/compiler-dom-3.4.27.tgz",
+                    "integrity": "sha512-kUTvochG/oVgE1w5ViSr3KUBh9X7CWirebA3bezTbB5ZKBQZwR2Mwj9uoSKRMFcz4gSMzzLXBPD6KpCLb9nvWw==",
+                    "requires": {
+                        "@vue/compiler-core": "3.4.27",
+                        "@vue/shared": "3.4.27"
+                    }
+                },
+                "@vue/compiler-sfc": {
+                    "version": "3.4.27",
+                    "resolved": "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-3.4.27.tgz",
+                    "integrity": "sha512-nDwntUEADssW8e0rrmE0+OrONwmRlegDA1pD6QhVeXxjIytV03yDqTey9SBDiALsvAd5U4ZrEKbMyVXhX6mCGA==",
+                    "requires": {
+                        "@babel/parser": "^7.24.4",
+                        "@vue/compiler-core": "3.4.27",
+                        "@vue/compiler-dom": "3.4.27",
+                        "@vue/compiler-ssr": "3.4.27",
+                        "@vue/shared": "3.4.27",
+                        "estree-walker": "^2.0.2",
+                        "magic-string": "^0.30.10",
+                        "postcss": "^8.4.38",
+                        "source-map-js": "^1.2.0"
+                    }
+                },
+                "@vue/compiler-ssr": {
+                    "version": "3.4.27",
+                    "resolved": "https://registry.npmmirror.com/@vue/compiler-ssr/-/compiler-ssr-3.4.27.tgz",
+                    "integrity": "sha512-CVRzSJIltzMG5FcidsW0jKNQnNRYC8bT21VegyMMtHmhW3UOI7knmUehzswXLrExDLE6lQCZdrhD4ogI7c+vuw==",
+                    "requires": {
+                        "@vue/compiler-dom": "3.4.27",
+                        "@vue/shared": "3.4.27"
+                    }
+                },
+                "@vue/shared": {
+                    "version": "3.4.27",
+                    "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.4.27.tgz",
+                    "integrity": "sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA=="
+                }
+            }
+        },
+        "vue-i18n": {
+            "version": "9.13.1",
+            "resolved": "https://registry.npmmirror.com/vue-i18n/-/vue-i18n-9.13.1.tgz",
+            "integrity": "sha512-mh0GIxx0wPtPlcB1q4k277y0iKgo25xmDPWioVVYanjPufDBpvu5ySTjP5wOrSvlYQ2m1xI+CFhGdauv/61uQg==",
+            "requires": {
+                "@intlify/core-base": "9.13.1",
+                "@intlify/shared": "9.13.1",
+                "@vue/devtools-api": "^6.5.0"
+            },
+            "dependencies": {
+                "@intlify/core-base": {
+                    "version": "9.13.1",
+                    "resolved": "https://registry.npmmirror.com/@intlify/core-base/-/core-base-9.13.1.tgz",
+                    "integrity": "sha512-+bcQRkJO9pcX8d0gel9ZNfrzU22sZFSA0WVhfXrf5jdJOS24a+Bp8pozuS9sBI9Hk/tGz83pgKfmqcn/Ci7/8w==",
+                    "requires": {
+                        "@intlify/message-compiler": "9.13.1",
+                        "@intlify/shared": "9.13.1"
+                    }
+                },
+                "@intlify/message-compiler": {
+                    "version": "9.13.1",
+                    "resolved": "https://registry.npmmirror.com/@intlify/message-compiler/-/message-compiler-9.13.1.tgz",
+                    "integrity": "sha512-SKsVa4ajYGBVm7sHMXd5qX70O2XXjm55zdZB3VeMFCvQyvLew/dLvq3MqnaIsTMF1VkkOb9Ttr6tHcMlyPDL9w==",
+                    "requires": {
+                        "@intlify/shared": "9.13.1",
+                        "source-map-js": "^1.0.2"
+                    }
+                },
+                "@intlify/shared": {
+                    "version": "9.13.1",
+                    "resolved": "https://registry.npmmirror.com/@intlify/shared/-/shared-9.13.1.tgz",
+                    "integrity": "sha512-u3b6BKGhE6j/JeRU6C/RL2FgyJfy6LakbtfeVF8fJXURpZZTzfh3e05J0bu0XPw447Q6/WUp3C4ajv4TMS4YsQ=="
+                }
+            }
+        },
+        "vue-router": {
+            "version": "4.3.2",
+            "resolved": "https://registry.npmmirror.com/vue-router/-/vue-router-4.3.2.tgz",
+            "integrity": "sha512-hKQJ1vDAZ5LVkKEnHhmm1f9pMiWIBNGF5AwU67PdH7TyXCj/a4hTccuUuYCAMgJK6rO/NVYtQIEN3yL8CECa7Q==",
+            "requires": {
+                "@vue/devtools-api": "^6.5.1"
+            }
+        },
+        "vue-template-compiler": {
+            "version": "2.7.16",
+            "resolved": "https://registry.npmmirror.com/vue-template-compiler/-/vue-template-compiler-2.7.16.tgz",
+            "integrity": "sha512-AYbUWAJHLGGQM7+cNTELw+KsOG9nl2CnSv467WobS5Cv9uk3wFcnr1Etsz2sEIHEZvw1U+o9mRlEO6QbZvUPGQ==",
+            "dev": true,
+            "requires": {
+                "de-indent": "^1.0.2",
+                "he": "^1.2.0"
+            }
+        },
+        "vue-tsc": {
+            "version": "1.8.27",
+            "resolved": "https://registry.npmmirror.com/vue-tsc/-/vue-tsc-1.8.27.tgz",
+            "integrity": "sha512-WesKCAZCRAbmmhuGl3+VrdWItEvfoFIPXOvUJkjULi+x+6G/Dy69yO3TBRJDr9eUlmsNAwVmxsNZxvHKzbkKdg==",
+            "dev": true,
+            "requires": {
+                "@volar/typescript": "~1.11.1",
+                "@vue/language-core": "1.8.27",
+                "semver": "^7.5.4"
+            },
+            "dependencies": {
+                "semver": {
+                    "version": "7.6.2",
+                    "resolved": "https://registry.npmmirror.com/semver/-/semver-7.6.2.tgz",
+                    "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
+                    "dev": true
+                }
+            }
+        },
+        "w3c-hr-time": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmmirror.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
+            "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "browser-process-hrtime": "^1.0.0"
+            }
+        },
+        "w3c-xmlserializer": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz",
+            "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "xml-name-validator": "^3.0.0"
+            }
+        },
+        "walker": {
+            "version": "1.0.8",
+            "resolved": "https://registry.npmmirror.com/walker/-/walker-1.0.8.tgz",
+            "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "makeerror": "1.0.12"
+            }
+        },
+        "webidl-conversions": {
+            "version": "6.1.0",
+            "resolved": "https://registry.npmmirror.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
+            "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
+            "dev": true,
+            "peer": true
+        },
+        "webpack-sources": {
+            "version": "1.4.3",
+            "resolved": "https://registry.npmmirror.com/webpack-sources/-/webpack-sources-1.4.3.tgz",
+            "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+            "dev": true,
+            "requires": {
+                "source-list-map": "^2.0.0",
+                "source-map": "~0.6.1"
+            }
+        },
+        "webpack-virtual-modules": {
+            "version": "0.5.0",
+            "resolved": "https://registry.npmmirror.com/webpack-virtual-modules/-/webpack-virtual-modules-0.5.0.tgz",
+            "integrity": "sha512-kyDivFZ7ZM0BVOUteVbDFhlRt7Ah/CSPwJdi8hBpkK7QLumUqdLtVfm/PX/hkcnrvr0i77fO5+TjZ94Pe+C9iw==",
+            "dev": true
+        },
+        "weixin-js-sdk": {
+            "version": "1.6.5",
+            "resolved": "https://registry.npmmirror.com/weixin-js-sdk/-/weixin-js-sdk-1.6.5.tgz",
+            "integrity": "sha512-Gph1WAWB2YN/lMOFB/ymb+hbU/wYazzJgu6PMMktCy9cSCeW5wA6Zwt0dpahJbJ+RJEwtTv2x9iIu0U4enuVSQ=="
+        },
+        "whatwg-encoding": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmmirror.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
+            "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "iconv-lite": "0.4.24"
+            }
+        },
+        "whatwg-mimetype": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmmirror.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
+            "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==",
+            "dev": true,
+            "peer": true
+        },
+        "whatwg-url": {
+            "version": "8.7.0",
+            "resolved": "https://registry.npmmirror.com/whatwg-url/-/whatwg-url-8.7.0.tgz",
+            "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "lodash": "^4.7.0",
+                "tr46": "^2.1.0",
+                "webidl-conversions": "^6.1.0"
+            }
+        },
+        "which": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmmirror.com/which/-/which-2.0.2.tgz",
+            "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+            "dev": true,
+            "requires": {
+                "isexe": "^2.0.0"
+            }
+        },
+        "which-module": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/which-module/-/which-module-2.0.1.tgz",
+            "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ=="
+        },
+        "windicss": {
+            "version": "3.5.6",
+            "resolved": "https://registry.npmmirror.com/windicss/-/windicss-3.5.6.tgz",
+            "integrity": "sha512-P1mzPEjgFMZLX0ZqfFht4fhV/FX8DTG7ERG1fBLiWvd34pTLVReS5CVsewKn9PApSgXnVfPWwvq+qUsRwpnwFA==",
+            "dev": true
+        },
+        "windicss-webpack-plugin": {
+            "version": "1.8.0",
+            "resolved": "https://registry.npmmirror.com/windicss-webpack-plugin/-/windicss-webpack-plugin-1.8.0.tgz",
+            "integrity": "sha512-zCzNLJ4hjgl5A2+mq8XlPtbvM5RONNz/ol93YG9tcMSn+aH/6Ll/lA5UDnVJluBr8b2Ch5C/GIqXcIMGG8mmdA==",
+            "dev": true,
+            "requires": {
+                "@windicss/plugin-utils": "^1.9.1",
+                "debug": "^4.3.4",
+                "get-port": "^6.1.2",
+                "loader-utils": "^2.0.0",
+                "lodash": "^4.17.21",
+                "pathe": "^1.1.0",
+                "webpack-virtual-modules": "^0.5.0",
+                "windicss": "^3.5.6"
+            },
+            "dependencies": {
+                "loader-utils": {
+                    "version": "2.0.4",
+                    "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.4.tgz",
+                    "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+                    "dev": true,
+                    "requires": {
+                        "big.js": "^5.2.2",
+                        "emojis-list": "^3.0.0",
+                        "json5": "^2.1.2"
+                    }
+                }
+            }
+        },
+        "wrap-ansi": {
+            "version": "7.0.0",
+            "resolved": "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+            "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "ansi-styles": "^4.0.0",
+                "string-width": "^4.1.0",
+                "strip-ansi": "^6.0.0"
+            },
+            "dependencies": {
+                "ansi-styles": {
+                    "version": "4.3.0",
+                    "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+                    "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "color-convert": "^2.0.1"
+                    }
+                },
+                "color-convert": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+                    "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+                    "dev": true,
+                    "peer": true,
+                    "requires": {
+                        "color-name": "~1.1.4"
+                    }
+                },
+                "color-name": {
+                    "version": "1.1.4",
+                    "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+                    "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+                    "dev": true,
+                    "peer": true
+                }
+            }
+        },
+        "wrappy": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmmirror.com/wrappy/-/wrappy-1.0.2.tgz",
+            "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+            "dev": true
+        },
+        "write-file-atomic": {
+            "version": "3.0.3",
+            "resolved": "https://registry.npmmirror.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
+            "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "imurmurhash": "^0.1.4",
+                "is-typedarray": "^1.0.0",
+                "signal-exit": "^3.0.2",
+                "typedarray-to-buffer": "^3.1.5"
+            }
+        },
+        "ws": {
+            "version": "8.17.0",
+            "resolved": "https://registry.npmmirror.com/ws/-/ws-8.17.0.tgz",
+            "integrity": "sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow==",
+            "requires": {}
+        },
+        "xhr": {
+            "version": "2.6.0",
+            "resolved": "https://registry.npmmirror.com/xhr/-/xhr-2.6.0.tgz",
+            "integrity": "sha512-/eCGLb5rxjx5e3mF1A7s+pLlR6CGyqWN91fv1JgER5mVWg1MZmlhBvy9kjcsOdRk8RrIujotWyJamfyrp+WIcA==",
+            "requires": {
+                "global": "~4.4.0",
+                "is-function": "^1.0.1",
+                "parse-headers": "^2.0.0",
+                "xtend": "^4.0.0"
+            }
+        },
+        "xml-name-validator": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmmirror.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
+            "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
+            "dev": true,
+            "peer": true
+        },
+        "xml-parse-from-string": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmmirror.com/xml-parse-from-string/-/xml-parse-from-string-1.0.1.tgz",
+            "integrity": "sha512-ErcKwJTF54uRzzNMXq2X5sMIy88zJvfN2DmdoQvy7PAFJ+tPRU6ydWuOKNMyfmOjdyBQTFREi60s0Y0SyI0G0g=="
+        },
+        "xml2js": {
+            "version": "0.5.0",
+            "resolved": "https://registry.npmmirror.com/xml2js/-/xml2js-0.5.0.tgz",
+            "integrity": "sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==",
+            "requires": {
+                "sax": ">=0.6.0",
+                "xmlbuilder": "~11.0.0"
+            }
+        },
+        "xmlbuilder": {
+            "version": "11.0.1",
+            "resolved": "https://registry.npmmirror.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
+            "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA=="
+        },
+        "xmlchars": {
+            "version": "2.2.0",
+            "resolved": "https://registry.npmmirror.com/xmlchars/-/xmlchars-2.2.0.tgz",
+            "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
+            "dev": true,
+            "peer": true
+        },
+        "xmlhttprequest": {
+            "version": "1.8.0",
+            "resolved": "https://registry.npmmirror.com/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz",
+            "integrity": "sha512-58Im/U0mlVBLM38NdZjHyhuMtCqa61469k2YP/AaPbvCoV9aQGUpbJBj1QRm2ytRiVQBD/fsw7L2bJGDVQswBA=="
+        },
+        "xregexp": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmmirror.com/xregexp/-/xregexp-3.1.0.tgz",
+            "integrity": "sha512-4Y1x6DyB8xRoxosooa6PlGWqmmSKatbzhrftZ7Purmm4B8R4qIEJG1A2hZsdz5DhmIqS0msC0I7KEq93GphEVg=="
+        },
+        "xtend": {
+            "version": "4.0.2",
+            "resolved": "https://registry.npmmirror.com/xtend/-/xtend-4.0.2.tgz",
+            "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
+        },
+        "y18n": {
+            "version": "5.0.8",
+            "resolved": "https://registry.npmmirror.com/y18n/-/y18n-5.0.8.tgz",
+            "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+            "dev": true,
+            "peer": true
+        },
+        "yallist": {
+            "version": "3.1.1",
+            "resolved": "https://registry.npmmirror.com/yallist/-/yallist-3.1.1.tgz",
+            "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
+        },
+        "yaml": {
+            "version": "1.10.2",
+            "resolved": "https://registry.npmmirror.com/yaml/-/yaml-1.10.2.tgz",
+            "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg=="
+        },
+        "yargs": {
+            "version": "16.2.0",
+            "resolved": "https://registry.npmmirror.com/yargs/-/yargs-16.2.0.tgz",
+            "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+            "dev": true,
+            "peer": true,
+            "requires": {
+                "cliui": "^7.0.2",
+                "escalade": "^3.1.1",
+                "get-caller-file": "^2.0.5",
+                "require-directory": "^2.1.1",
+                "string-width": "^4.2.0",
+                "y18n": "^5.0.5",
+                "yargs-parser": "^20.2.2"
+            }
+        },
+        "yargs-parser": {
+            "version": "20.2.9",
+            "resolved": "https://registry.npmmirror.com/yargs-parser/-/yargs-parser-20.2.9.tgz",
+            "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+            "dev": true,
+            "peer": true
+        }
+    }
+}
diff --git a/uni-app/package.json b/uni-app/package.json
new file mode 100644
index 00000000..c8742b8c
--- /dev/null
+++ b/uni-app/package.json
@@ -0,0 +1,86 @@
+{
+    "name": "uni-preset-vue",
+    "version": "0.0.0",
+    "scripts": {
+        "dev:app": "uni -p app",
+        "dev:app-android": "uni -p app-android",
+        "dev:app-ios": "uni -p app-ios",
+        "dev:custom": "uni -p",
+        "dev:h5": "uni",
+        "dev:h5:ssr": "uni --ssr",
+        "dev:mp-alipay": "uni -p mp-alipay",
+        "dev:mp-baidu": "uni -p mp-baidu",
+        "dev:mp-jd": "uni -p mp-jd",
+        "dev:mp-kuaishou": "uni -p mp-kuaishou",
+        "dev:mp-lark": "uni -p mp-lark",
+        "dev:mp-qq": "uni -p mp-qq",
+        "dev:mp-toutiao": "uni -p mp-toutiao",
+        "dev:mp-weixin": "node publish.cjs mp-weixin dev",
+        "dev:niu-mp-weixin": "uni -p mp-weixin",
+        "dev:quickapp-webview": "uni -p quickapp-webview",
+        "dev:quickapp-webview-huawei": "uni -p quickapp-webview-huawei",
+        "dev:quickapp-webview-union": "uni -p quickapp-webview-union",
+        "build:app": "uni build -p app",
+        "build:app-android": "uni build -p app-android",
+        "build:app-ios": "uni build -p app-ios",
+        "build:custom": "uni build -p",
+        "build:h5": "uni build && node publish.cjs h5 build",
+        "build:h5:ssr": "uni build --ssr",
+        "build:mp-alipay": "uni build -p mp-alipay",
+        "build:mp-baidu": "uni build -p mp-baidu",
+        "build:mp-jd": "uni build -p mp-jd",
+        "build:mp-kuaishou": "uni build -p mp-kuaishou",
+        "build:mp-lark": "uni build -p mp-lark",
+        "build:mp-qq": "uni build -p mp-qq",
+        "build:mp-toutiao": "uni build -p mp-toutiao",
+        "build:mp-weixin": "uni build -p mp-weixin && node publish.cjs mp-weixin build",
+        "build:quickapp-webview": "uni build -p quickapp-webview",
+        "build:quickapp-webview-huawei": "uni build -p quickapp-webview-huawei",
+        "build:quickapp-webview-union": "uni build -p quickapp-webview-union",
+        "type-check": "vue-tsc --noEmit"
+    },
+    "dependencies": {
+        "@dcloudio/uni-app": "3.0.0-3080720230703001",
+        "@dcloudio/uni-app-plus": "3.0.0-3080720230703001",
+        "@dcloudio/uni-components": "3.0.0-3080720230703001",
+        "@dcloudio/uni-h5": "3.0.0-3080720230703001",
+        "@dcloudio/uni-mp-alipay": "3.0.0-3080720230703001",
+        "@dcloudio/uni-mp-baidu": "3.0.0-3080720230703001",
+        "@dcloudio/uni-mp-jd": "3.0.0-3080720230703001",
+        "@dcloudio/uni-mp-kuaishou": "3.0.0-3080720230703001",
+        "@dcloudio/uni-mp-lark": "3.0.0-3080720230703001",
+        "@dcloudio/uni-mp-qq": "3.0.0-3080720230703001",
+        "@dcloudio/uni-mp-toutiao": "3.0.0-3080720230703001",
+        "@dcloudio/uni-mp-weixin": "3.0.0-3080720230703001",
+        "@dcloudio/uni-quickapp-webview": "3.0.0-3080720230703001",
+        "html2canvas": "^1.4.1",
+        "image-tools": "^1.4.0",
+        "lodash-es": "^4.17.21",
+        "pinia": "2.0.36",
+        "qrcode": "^1.5.1",
+        "qs": "6.7.0",
+        "sortablejs": "^1.15.0",
+        "uview-plus": "^3.1.29",
+        "vue": "^3.3.0",
+        "vue-i18n": "^9.2.2",
+        "weixin-js-sdk": "^1.6.5"
+    },
+    "devDependencies": {
+        "@dcasia/mini-program-tailwind-webpack-plugin": "^1.5.6",
+        "@dcloudio/types": "^3.3.2",
+        "@dcloudio/uni-automator": "3.0.0-3080720230703001",
+        "@dcloudio/uni-cli-shared": "3.0.0-3080720230703001",
+        "@dcloudio/uni-stacktracey": "3.0.0-3080720230703001",
+        "@dcloudio/vite-plugin-uni": "3.0.0-3080720230703001",
+        "@rollup/plugin-commonjs": "^24.0.1",
+        "@types/qrcode": "^1.5.0",
+        "@types/sortablejs": "^1.15.0",
+        "@vue/tsconfig": "^0.1.3",
+        "sass": "^1.54.5",
+        "typescript": "^4.9.4",
+        "vite": "4.0.4",
+        "vite-plugin-windicss": "^1.8.10",
+        "vue-tsc": "^1.0.24",
+        "windicss": "^3.5.6"
+    }
+}
\ No newline at end of file
diff --git a/uni-app/publish.cjs b/uni-app/publish.cjs
new file mode 100644
index 00000000..115123a6
--- /dev/null
+++ b/uni-app/publish.cjs
@@ -0,0 +1,120 @@
+const fs = require('fs')
+const { spawn } = require('child_process');
+const path = require('path');
+
+const main = () => {
+    const params = process.argv.slice(2) || []
+    const port = params[0] || ''
+    const mode = params[1] || ''
+
+    switch (port) {
+        case 'h5':
+            publish()
+            break;
+        case 'mp-weixin':
+            if (mode == 'build') {
+                handleWeappAddonComponents(mode)
+                handleWeappLanguage(mode)
+            } else if (mode == 'dev') {
+                listenWeappRunDev()
+            }
+            break;
+    }
+}
+
+const publish = () => {
+    const src = './dist/build/h5'
+    const dest = '../niucloud/public/wap'
+
+    solve()
+
+    // 目标目录不存在停止复制
+    try {
+        const dir = fs.readdirSync(dest)
+    } catch (e) {
+        return
+    }
+
+    // 删除目标目录下文件
+    fs.rm(dest, { recursive: true }, err => {
+        if(err) {
+            console.log(err)
+            return
+        }
+
+        fs.cp(src, dest, { recursive: true }, (err) => {
+            if (err) {
+                console.error(err)
+            }
+        })
+    })
+}
+
+const solve = () => {
+    const src = './dist/build/h5/assets'
+    const filemaps = fs.readdirSync(src)
+
+    filemaps.forEach(file => {
+        if (/^(index-)(\w{8})(.js)$/.test(file)) {
+            const path = `${src}/${file}`
+            let content = fs.readFileSync(path, 'utf-8')
+            const first = 'const match = location.href.match(/\\/wap\\/(\\d*)\\//);'
+
+            if (content.indexOf(first) == -1) {
+                content = first + content
+                const replace = 'router:{mode:"history",base: match ? `/wap/${match[1]}/` : "/wap/",assets:"assets",routerBase: match ? `/wap/${match[1]}/` : "/wap/"},darkmode'
+                content = content.replace(/router:{(.*?)},darkmode/s, replace)
+                fs.writeFileSync(path, content, 'utf8')
+            }
+        }
+    })
+}
+
+const handleWeappAddonComponents = (mode) => {
+    const src = `./dist/${mode}/mp-weixin/addon/components/diy/group/index.json`
+
+    try {
+        const data = JSON.parse(fs.readFileSync(src, 'utf8'));
+        data.componentPlaceholder = {};
+
+        Object.keys(data.usingComponents).map(key => {
+            data.componentPlaceholder[key] = "view";
+        })
+        fs.writeFileSync(src, JSON.stringify(data))
+    } catch (err) {
+    }
+}
+
+const handleWeappLanguage = (mode) => {
+    const src = `./dist/${mode}/mp-weixin/locale/language.js`
+
+    try {
+        let content = fs.readFileSync(src, 'utf8');
+        content = content.replace(/Promise\.resolve\(require\(("[^"]+")\)\)/g, 'require.async($1)')
+        fs.writeFileSync(src, content)
+    } catch (err) {
+        console.log(err)
+    }
+}
+
+const listenWeappRunDev = () => {
+    const devProcess = spawn('npm', ['run', 'dev:niu-mp-weixin'], {
+        stdio: ['pipe', 'pipe', 'pipe'],
+        shell: true
+    });
+
+    let serverReady = false;
+
+    // 监听 stdout 输出
+    devProcess.stdout.on('data', (data) => {
+        const message = data.toString();
+        console.log(message)
+        if (!serverReady && message.includes('DONE  Build complete')) {
+            serverReady = true;
+            handleWeappAddonComponents('dev')
+            handleWeappLanguage('dev')
+        }
+    });
+}
+
+main()
diff --git a/uni-app/src/App.vue b/uni-app/src/App.vue
new file mode 100644
index 00000000..036d54f1
--- /dev/null
+++ b/uni-app/src/App.vue
@@ -0,0 +1,205 @@
+<script setup lang="ts">
+    import { onLaunch, onShow, onHide } from '@dcloudio/uni-app'
+    import { launchInterceptor } from '@/utils/interceptor'
+    import { getToken, isWeixinBrowser, currRoute, deepClone, setThemeColor } from '@/utils/common'
+    import useMemberStore from '@/stores/member'
+    import useConfigStore from '@/stores/config'
+    import useSystemStore from '@/stores/system'
+    import { useLogin } from '@/hooks/useLogin'
+    import { useShare } from '@/hooks/useShare'
+
+    onLaunch((data: any) => {
+
+        // 添加初始化拦截器
+        launchInterceptor()
+
+        // #ifdef H5
+        uni.getSystemInfoSync().platform == 'ios' && (uni.setStorageSync('initUrl', location.href))
+
+        // 传输给后台数据
+        window.parent.postMessage(JSON.stringify({
+            type: 'appOnLaunch',
+            message: '初始化加载完成'
+        }), '*');
+
+        // 监听父页面发来的消息
+        window.addEventListener('message', event => {
+            try {
+                let data = {
+                    type: ''
+                };
+                if (typeof event.data == 'string') {
+                    data = JSON.parse(event.data)
+                } else if (typeof event.data == 'object') {
+                    data = event.data
+                }
+                if (data.type && data.type == 'appOnReady') {
+                    window.parent.postMessage(JSON.stringify({
+                        type: 'appOnReady',
+                        message: '加载完成'
+                    }), '*');
+                }
+            } catch (e) {
+                console.log('uni-app App.vue 接受数据错误', e)
+            }
+        }, false);
+
+        const { wechatInit } = useShare()
+        wechatInit()
+        // #endif
+
+        // #ifdef MP
+        const updateManager = uni.getUpdateManager();
+        updateManager.onCheckForUpdate(function (res) {
+            // 请求完新版本信息的回调
+        });
+
+        updateManager.onUpdateReady(function (res) {
+            uni.showModal({
+                title: '更新提示',
+                content: '新版本已经准备好，是否重启应用？',
+                success(res) {
+                    if (res.confirm) {
+                        // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
+                        updateManager.applyUpdate();
+                    }
+                }
+            });
+        });
+
+        updateManager.onUpdateFailed(function (res) {
+            // 新的版本下载失败
+        });
+        // #endif
+
+        // 获取初始化数据信息
+        useSystemStore().getInitFn(async() => {
+
+            const configStore = useConfigStore()
+
+            let loginConfig = uni.getStorageSync('login_config')
+            if (!loginConfig) {
+                loginConfig = deepClone(configStore.login)
+            }
+
+            let url: any = currRoute()
+            // 设置主色调
+            setThemeColor(url)
+
+            // 判断在登录注册页面账号锁定后不进行请求三方登录注册
+            if ((['app/pages/auth/index', 'app/pages/auth/login', 'app/pages/auth/register', 'app/pages/auth/resetpwd'].indexOf(url) != -1) &&
+                (loginConfig.is_username || loginConfig.is_mobile || loginConfig.is_bind_mobile)) {
+                return false
+            }
+
+            // 判断是否已登录
+            if (getToken()) {
+                const memberStore: any = useMemberStore()
+
+                await memberStore.setToken(getToken(), () => {
+                    if (!uni.getStorageSync('openid')) {
+                        const memberInfo = useMemberStore().info
+                        const login = useLogin()
+
+                        // #ifdef MP-WEIXIN
+                        if (memberInfo.mobile) uni.setStorageSync('wap_member_mobile', memberInfo.mobile) // 存储会员手机号，防止重复请求微信获取手机号接口
+                        if (memberInfo && memberInfo.weapp_openid) {
+                            uni.setStorageSync('openid', memberInfo.weapp_openid)
+                        } else {
+                            login.getAuthCode({ updateFlag: true }) // 更新oppenid
+                        }
+                        // #endif
+
+                        // #ifdef H5
+                        if (isWeixinBrowser()) {
+                            if (memberInfo && memberInfo.wx_openid) {
+                                uni.setStorageSync('openid', memberInfo.wx_openid)
+                            } else {
+                                if (data.query.code) {
+                                    // 检测身份是否合法（当前登录的账号是不是我的），openid有效后才能更新登录
+                                    login.updateOpenid(data.query.code, () => {
+                                        login.authLogin({ code: data.query.code })
+                                    })
+                                } else {
+                                    if (loginConfig.is_force_access_user_info) {
+                                        // 强制获取用户信息
+                                        login.getAuthCode({ scopes: 'snsapi_userinfo' })
+                                    } else {
+                                        // 静默获取
+                                        login.getAuthCode({ scopes: 'snsapi_base' })
+                                    }
+                                }
+                            }
+                        }
+                        // #endif
+
+                    }
+
+                    // 开启强制绑定手机号
+                    if (uni.getStorageSync('isbindmobile')) {
+                        uni.removeStorageSync('isbindmobile');
+                    }
+
+                    if (loginConfig.is_bind_mobile && !memberStore.info.mobile) {
+                        // 强制绑定手机号
+                        uni.setStorageSync('isbindmobile', true)
+                    }
+                })
+
+            }
+
+            if (!getToken()) {
+
+                // #ifdef MP
+                // 小程序 会员退出后不会自动登录
+                if (uni.getStorageSync('autoLoginLock')) return;
+                // #endif
+
+                const login = useLogin()
+
+                // #ifdef MP
+                // 判断是否开启第三方自动注册登录
+                if (loginConfig.is_auth_register) {
+                    // 第三方平台自动登录
+                    login.getAuthCode()
+                }
+                // #endif
+
+                // #ifdef H5
+                if (isWeixinBrowser()) {
+                    if (uni.getStorageSync('autoLoginLock') && !uni.getStorageSync('wechat_login_back')) return;
+                    // 开启自动注册的情况下才能执行
+                    if (loginConfig.is_auth_register || uni.getStorageSync('wechat_login_back')) {
+                        uni.removeStorageSync('wechat_login_back') // 删除微信公众号手动授权登录回调标识
+                        if (data.query.code) {
+                            login.authLogin({ code: data.query.code })
+                        } else {
+                            if (loginConfig.is_force_access_user_info) {
+                                // 强制获取用户信息
+                                login.getAuthCode({ scopes: 'snsapi_userinfo' })
+                            } else {
+                                // 静默获取
+                                login.getAuthCode({ scopes: 'snsapi_base' })
+                            }
+                        }
+                    }
+                }
+                // #endif
+            }
+        })
+
+    }) 
+
+    onShow(() => {
+
+    })
+
+    onHide(() => {
+    })
+</script>
+
+<style>
+    uni-page-head {
+        display: none !important;
+    }
+</style>
diff --git a/uni-app/src/addon/components/diy-form-detail/index.vue b/uni-app/src/addon/components/diy-form-detail/index.vue
new file mode 100644
index 00000000..b095948b
--- /dev/null
+++ b/uni-app/src/addon/components/diy-form-detail/index.vue
@@ -0,0 +1,59 @@
+<template>
+    <view :style="themeColor()">
+        <view v-show="!loading" class="diy-template-wrap">
+            <diy-group ref="diyGroupRef" :data="diyFormData" />
+        </view>
+    </view>
+</template>
+<script lang="ts" setup>
+    import { ref, reactive, onMounted } from 'vue';
+    import diyGroup from '@/addon/components/diy/group/index.vue'
+    import { getFormRecord } from '@/app/api/diy_form';
+
+    const props = defineProps(['record_id','completeLayout']);
+    const emits = defineEmits(['callback'])
+
+    const loading = ref(true);
+
+    const diyFormData: any = reactive({
+        global: {},
+        value: []
+    })
+
+    onMounted(() => {
+        getFormRecord({
+            record_id: props.record_id
+        }).then((res: any) => {
+            diyFormData.global.completeLayout = props.completeLayout || 'style-1';
+            if (res.data.recordsFieldList) {
+
+                res.data.recordsFieldList.forEach((item: any) => {
+                    let comp = {
+                        id: item.field_key,
+                        componentName: item.field_type,
+                        pageStyle: '',
+                        viewFormDetail: true, // 查看表单详情标识
+                        field: {
+                            name: item.field_name,
+                            value: item.handle_field_value,
+                            required: item.field_required,
+                            unique: item.field_unique,
+                            privacyProtection: item.privacy_protection,
+                        },
+                        margin: {
+                            top: 0,
+                            bottom: 0,
+                            both: 0
+                        }
+                    };
+                    diyFormData.value.push(comp);
+                })
+            }
+            emits('callback', res.data.recordsFieldList)
+            loading.value = false;
+        }).catch(() => {
+            loading.value = false;
+            emits('callback', [])
+        })
+    })
+</script>
diff --git a/uni-app/src/addon/components/diy-form/index.vue b/uni-app/src/addon/components/diy-form/index.vue
new file mode 100644
index 00000000..8ac1171a
--- /dev/null
+++ b/uni-app/src/addon/components/diy-form/index.vue
@@ -0,0 +1,191 @@
+<template>
+    <view :style="themeColor()">
+        <!-- 自定义组件渲染 -->
+        <view v-show="requestData.status == 1  && !diy.getLoading()" class="diy-template-wrap">
+            <diy-group ref="diyGroupRef" :data="diyFormData" />
+        </view>
+    </view>
+</template>
+<script lang="ts" setup>
+    import { ref, reactive, computed, onMounted, watch } from 'vue';
+    import { useDiyForm } from '@/hooks/useDiyForm'
+    import { deepClone,getValidTime } from '@/utils/common'
+    import diyGroup from '@/addon/components/diy/group/index.vue'
+
+    const props = defineProps(['form_id', 'relate_id', 'storage_name', 'form_border']);
+
+    const diy = useDiyForm({
+        form_id: props.form_id,
+        needLogin: false // 不检测登录，调用业务自行处理
+    })
+
+    const diyGroupRef = ref(null)
+
+    const requestData = computed(() => {
+        return diy.requestData;
+    })
+
+    const diyFormData: any = reactive({})
+
+    onMounted(() => {
+        diy.getData(() => {
+            diyFormData.status = diy.data.status;
+            if (diyFormData.status) {
+                diyFormData.title = diy.data.title;
+                diyFormData.global = diy.data.global;
+                if (diyFormData.global) {
+                    diyFormData.global.topStatusBar.isShow = false; // 顶部导航栏强制隐藏
+                    diyFormData.global.bottomTabBarSwitch = false; // 底部导航强制隐藏
+                }
+                let value: any = [];
+				if(props.form_border == 'none'){
+					diyFormData.global.borderControl = false;
+				}
+                // 需要过滤 组件类型，筛选出来表单，排除表单提交组件
+                diy.data.value.forEach((item: any) => {
+                    if (item.componentType == 'diy_form' && item.componentName != 'FormSubmit') {
+                        value.push(item);
+                    }
+                })
+                diyFormData.value = value;
+                diyFormData.componentRefs = null;
+                diyGroupRef.value?.refresh();
+                watchFormData();
+            }
+        })
+    })
+
+    const watchFormData = () => {
+        watch(
+            () => diyFormData.value,
+            (newValue, oldValue) => {
+                if (newValue) {
+                    let formData: any = {
+                        validTime: getValidTime(5), // 缓存数据有效期为5分钟
+                        components: []
+                    };
+                    newValue.forEach((item: any) => {
+                        // 只存表单组件
+                        if (item.componentType == 'diy_form' && item.componentName != 'FormSubmit') {
+                            // 只存储表单数据，压缩存储空间
+                            let field = deepClone(item.field);
+                            // 移除不需要存储的数据
+                            delete field.remark; // 字段说明
+                            delete field.detailComponent; // 用于详情展示
+                            delete field.default; // 默认值
+                            formData.components.push({
+                                id: item.id,
+                                componentName: item.componentName,
+                                componentType: item.componentType,
+                                componentTitle: item.componentTitle,
+                                isHidden: item.isHidden,
+                                field: field
+                            })
+                        }
+                    })
+                    if (formData.components.length) {
+                        uni.setStorageSync('diyFormStorage_' + props.form_id, formData)
+                    }
+                }
+            },
+            { deep: true }
+        )
+    }
+
+    const verify = () => {
+        if(!diyFormData.status) return true;
+        if(!diyFormData.value) return true;
+        let allPass = true; // 是否全部通过验证
+
+        let componentRefs = diyGroupRef.value.getFormRef().componentRefs;
+
+        // 需要过滤 组件类型，筛选出来表单
+        for (let i = 0; i < diyFormData.value.length; i++) {
+            let item = diyFormData.value[i];
+            if (item.field.required || item.field.value) {
+                let refKey = `diy${ item.componentName }Ref`;
+                let isBreak = false;
+                if (componentRefs[refKey]) {
+                    for (let k = 0; k < componentRefs[refKey].length; k++) {
+                        let compRef = componentRefs[refKey][k];
+                        let verify = compRef.verify(); // 验证表单组件数据
+                        if (verify && !verify.code) {
+                            isBreak = true;
+                            uni.showToast({
+                                title: verify.message,
+                                icon: 'none'
+                            });
+                            break;
+                        }
+
+                    }
+                    if (isBreak) {
+                        allPass = false;
+                        break;
+                    }
+                }
+            }
+        }
+
+        if (!allPass) return false;
+
+        const data = {
+            form_id: props.form_id,
+            value: uni.getStorageSync('diyFormStorage_' + props.form_id),
+            relate_id: props.relate_id || 0 // 关联业务id
+        }
+        if (props.storage_name) {
+            uni.setStorageSync(props.storage_name, data)
+        }
+        return allPass;
+    }
+
+    // 获取数据
+    const getData = ()=> {
+        return {
+            form_id: props.form_id,
+            value: diyFormData.value,
+            relate_id: props.relate_id || 0 // 关联业务id
+        }
+    }
+
+    const clearStorage = (keys: any=[]) => {
+        uni.removeStorageSync('diyFormStorage_' + props.form_id)
+        if (props.storage_name) uni.removeStorageSync(props.storage_name)
+        if(keys) {
+            keys.forEach((key: any) => {
+                uni.removeStorageSync(key)
+            })
+        }
+    }
+
+    // 监听页面隐藏
+    diy.onHide();
+
+    // 监听页面卸载
+    diy.onUnload();
+
+    // 监听滚动事件
+    // diy.onPageScroll()
+
+    defineExpose({
+        verify,
+        getData,
+        clearStorage
+    })
+
+</script>
+
+<style lang="scss">
+    .diy-template-wrap {
+        /* #ifdef MP */
+        .child-diy-template-wrap {
+            ::v-deep .diy-group {
+                > .draggable-element.top-fixed-diy {
+                    display: block !important;
+                }
+            }
+        }
+        /* #endif */
+    }
+</style>
diff --git a/uni-app/src/addon/components/diy/group/index.scss b/uni-app/src/addon/components/diy/group/index.scss
new file mode 100644
index 00000000..4502ce63
--- /dev/null
+++ b/uni-app/src/addon/components/diy/group/index.scss
@@ -0,0 +1,29 @@
+.ignore-draggable-element, .draggable-element {
+  &.decorate {
+    &:hover:before {
+      content: '';
+      position: absolute;
+      top: 0;
+      left: 0;
+      right: 0;
+      bottom: 0;
+      border: 4rpx dotted $u-primary;
+      z-index: 10;
+      pointer-events: none;
+      cursor: move;
+    }
+
+    &.selected:before {
+      content: '';
+      position: absolute;
+      top: 0;
+      left: 0;
+      right: 0;
+      bottom: 0;
+      border: 4rpx solid $u-primary;
+      z-index: 10;
+      pointer-events: none;
+      cursor: move;
+    }
+  }
+}
diff --git a/uni-app/src/addon/components/diy/group/index.vue b/uni-app/src/addon/components/diy/group/index.vue
new file mode 100644
index 00000000..75fcc5e7
--- /dev/null
+++ b/uni-app/src/addon/components/diy/group/index.vue
@@ -0,0 +1,212 @@
+<template>
+    <view class="diy-group" id="componentList">
+        <top-tabbar :scrollBool="diyGroup.componentsScrollBool.TopTabbar" v-if="data.global && Object.keys(data.global).length && data.global.topStatusBar && data.global.topStatusBar.isShow" ref="topTabbarRef" :data="data.global" />
+        <view v-for="(component, index) in data.value" :key="component.id"
+        @click="diyStore.changeCurrentIndex(index, component)"
+        :class="diyGroup.getComponentClass(index,component)" :style="component.pageStyle">
+            <view class="relative" :style="{ marginTop : component.margin.top < 0 ? (component.margin.top * 2) + 'rpx' : '0' }">
+                <!-- 装修模式下，设置负上边距后超出的内容，禁止选中设置 -->
+                <view v-if="diyGroup.isShowPlaceHolder(index,component)" class="absolute w-full z-1" :style="{ height : (component.margin.top * 2 * -1) + 'rpx' }" @click.stop="diyGroup.placeholderEvent"></view>
+            <template v-if="component.componentName == 'ActiveCube'">
+                <diy-active-cube ref="diyActiveCubeRef" :component="component" :global="data.global" :index="index" :scrollBool="diyGroup.componentsScrollBool.ActiveCube" />
+            </template>
+            <template v-if="component.componentName == 'CarouselSearch'">
+                <diy-carousel-search ref="diyCarouselSearchRef" :component="component" :global="data.global" :index="index" :scrollBool="diyGroup.componentsScrollBool.CarouselSearch" />
+            </template>
+            <template v-if="component.componentName == 'FloatBtn'">
+                <diy-float-btn ref="diyFloatBtnRef" :component="component" :global="data.global" :index="index" :scrollBool="diyGroup.componentsScrollBool.FloatBtn" />
+            </template>
+            <template v-if="component.componentName == 'FormAddress'">
+                <diy-form-address ref="diyFormAddressRef" :component="component" :global="data.global" :index="index" :scrollBool="diyGroup.componentsScrollBool.FormAddress" />
+            </template>
+            <template v-if="component.componentName == 'FormCheckbox'">
+                <diy-form-checkbox ref="diyFormCheckboxRef" :component="component" :global="data.global" :index="index" :scrollBool="diyGroup.componentsScrollBool.FormCheckbox" />
+            </template>
+            <template v-if="component.componentName == 'FormDate'">
+                <diy-form-date ref="diyFormDateRef" :component="component" :global="data.global" :index="index" :scrollBool="diyGroup.componentsScrollBool.FormDate" />
+            </template>
+            <template v-if="component.componentName == 'FormDateScope'">
+                <diy-form-date-scope ref="diyFormDateScopeRef" :component="component" :global="data.global" :index="index" :scrollBool="diyGroup.componentsScrollBool.FormDateScope" />
+            </template>
+            <template v-if="component.componentName == 'FormEmail'">
+                <diy-form-email ref="diyFormEmailRef" :component="component" :global="data.global" :index="index" :scrollBool="diyGroup.componentsScrollBool.FormEmail" />
+            </template>
+            <template v-if="component.componentName == 'FormFile'">
+                <diy-form-file ref="diyFormFileRef" :component="component" :global="data.global" :index="index" :scrollBool="diyGroup.componentsScrollBool.FormFile" />
+            </template>
+            <template v-if="component.componentName == 'FormIdentity'">
+                <diy-form-identity ref="diyFormIdentityRef" :component="component" :global="data.global" :index="index" :scrollBool="diyGroup.componentsScrollBool.FormIdentity" />
+            </template>
+            <template v-if="component.componentName == 'FormIdentityPrivacy'">
+                <diy-form-identity-privacy ref="diyFormIdentityPrivacyRef" :component="component" :global="data.global" :index="index" :scrollBool="diyGroup.componentsScrollBool.FormIdentityPrivacy" />
+            </template>
+            <template v-if="component.componentName == 'FormImage'">
+                <diy-form-image ref="diyFormImageRef" :component="component" :global="data.global" :index="index" :scrollBool="diyGroup.componentsScrollBool.FormImage" />
+            </template>
+            <template v-if="component.componentName == 'FormInput'">
+                <diy-form-input ref="diyFormInputRef" :component="component" :global="data.global" :index="index" :scrollBool="diyGroup.componentsScrollBool.FormInput" />
+            </template>
+            <template v-if="component.componentName == 'FormLocation'">
+                <diy-form-location ref="diyFormLocationRef" :component="component" :global="data.global" :index="index" :scrollBool="diyGroup.componentsScrollBool.FormLocation" />
+            </template>
+            <template v-if="component.componentName == 'FormMobile'">
+                <diy-form-mobile ref="diyFormMobileRef" :component="component" :global="data.global" :index="index" :scrollBool="diyGroup.componentsScrollBool.FormMobile" />
+            </template>
+            <template v-if="component.componentName == 'FormNumber'">
+                <diy-form-number ref="diyFormNumberRef" :component="component" :global="data.global" :index="index" :scrollBool="diyGroup.componentsScrollBool.FormNumber" />
+            </template>
+            <template v-if="component.componentName == 'FormPrivacy'">
+                <diy-form-privacy ref="diyFormPrivacyRef" :component="component" :global="data.global" :index="index" :scrollBool="diyGroup.componentsScrollBool.FormPrivacy" />
+            </template>
+            <template v-if="component.componentName == 'FormPrivacyPop'">
+                <diy-form-privacy-pop ref="diyFormPrivacyPopRef" :component="component" :global="data.global" :index="index" :scrollBool="diyGroup.componentsScrollBool.FormPrivacyPop" />
+            </template>
+            <template v-if="component.componentName == 'FormRadio'">
+                <diy-form-radio ref="diyFormRadioRef" :component="component" :global="data.global" :index="index" :scrollBool="diyGroup.componentsScrollBool.FormRadio" />
+            </template>
+            <template v-if="component.componentName == 'FormSubmit'">
+                <diy-form-submit ref="diyFormSubmitRef" :component="component" :global="data.global" :index="index" :scrollBool="diyGroup.componentsScrollBool.FormSubmit" />
+            </template>
+            <template v-if="component.componentName == 'FormTable'">
+                <diy-form-table ref="diyFormTableRef" :component="component" :global="data.global" :index="index" :scrollBool="diyGroup.componentsScrollBool.FormTable" />
+            </template>
+            <template v-if="component.componentName == 'FormTextarea'">
+                <diy-form-textarea ref="diyFormTextareaRef" :component="component" :global="data.global" :index="index" :scrollBool="diyGroup.componentsScrollBool.FormTextarea" />
+            </template>
+            <template v-if="component.componentName == 'FormTime'">
+                <diy-form-time ref="diyFormTimeRef" :component="component" :global="data.global" :index="index" :scrollBool="diyGroup.componentsScrollBool.FormTime" />
+            </template>
+            <template v-if="component.componentName == 'FormTimeScope'">
+                <diy-form-time-scope ref="diyFormTimeScopeRef" :component="component" :global="data.global" :index="index" :scrollBool="diyGroup.componentsScrollBool.FormTimeScope" />
+            </template>
+            <template v-if="component.componentName == 'FormVideo'">
+                <diy-form-video ref="diyFormVideoRef" :component="component" :global="data.global" :index="index" :scrollBool="diyGroup.componentsScrollBool.FormVideo" />
+            </template>
+            <template v-if="component.componentName == 'FormWechatName'">
+                <diy-form-wechat-name ref="diyFormWechatNameRef" :component="component" :global="data.global" :index="index" :scrollBool="diyGroup.componentsScrollBool.FormWechatName" />
+            </template>
+            <template v-if="component.componentName == 'GraphicNav'">
+                <diy-graphic-nav ref="diyGraphicNavRef" :component="component" :global="data.global" :index="index" :scrollBool="diyGroup.componentsScrollBool.GraphicNav" />
+            </template>
+            <template v-if="component.componentName == 'HorzBlank'">
+                <diy-horz-blank ref="diyHorzBlankRef" :component="component" :global="data.global" :index="index" :scrollBool="diyGroup.componentsScrollBool.HorzBlank" />
+            </template>
+            <template v-if="component.componentName == 'HorzLine'">
+                <diy-horz-line ref="diyHorzLineRef" :component="component" :global="data.global" :index="index" :scrollBool="diyGroup.componentsScrollBool.HorzLine" />
+            </template>
+            <template v-if="component.componentName == 'HotArea'">
+                <diy-hot-area ref="diyHotAreaRef" :component="component" :global="data.global" :index="index" :scrollBool="diyGroup.componentsScrollBool.HotArea" />
+            </template>
+            <template v-if="component.componentName == 'ImageAds'">
+                <diy-image-ads ref="diyImageAdsRef" :component="component" :global="data.global" :index="index" :scrollBool="diyGroup.componentsScrollBool.ImageAds" />
+            </template>
+            <template v-if="component.componentName == 'MemberInfo'">
+                <diy-member-info ref="diyMemberInfoRef" :component="component" :global="data.global" :index="index" :scrollBool="diyGroup.componentsScrollBool.MemberInfo" />
+            </template>
+            <template v-if="component.componentName == 'MemberLevel'">
+                <diy-member-level ref="diyMemberLevelRef" :component="component" :global="data.global" :index="index" :scrollBool="diyGroup.componentsScrollBool.MemberLevel" />
+            </template>
+            <template v-if="component.componentName == 'Notice'">
+                <diy-notice ref="diyNoticeRef" :component="component" :global="data.global" :index="index" :scrollBool="diyGroup.componentsScrollBool.Notice" />
+            </template>
+            <template v-if="component.componentName == 'PictureShow'">
+                <diy-picture-show ref="diyPictureShowRef" :component="component" :global="data.global" :index="index" :scrollBool="diyGroup.componentsScrollBool.PictureShow" />
+            </template>
+            <template v-if="component.componentName == 'RichText'">
+                <diy-rich-text ref="diyRichTextRef" :component="component" :global="data.global" :index="index" :scrollBool="diyGroup.componentsScrollBool.RichText" />
+            </template>
+            <template v-if="component.componentName == 'RubikCube'">
+                <diy-rubik-cube ref="diyRubikCubeRef" :component="component" :global="data.global" :index="index" :scrollBool="diyGroup.componentsScrollBool.RubikCube" />
+            </template>
+            <template v-if="component.componentName == 'Text'">
+                <diy-text ref="diyTextRef" :component="component" :global="data.global" :index="index" :scrollBool="diyGroup.componentsScrollBool.Text" />
+            </template>
+            <template v-if="component.componentName == 'GoodsCoupon'">
+                <diy-goods-coupon ref="diyGoodsCouponRef" :component="component" :global="data.global" :index="index" :scrollBool="diyGroup.componentsScrollBool.GoodsCoupon" />
+            </template>
+            <template v-if="component.componentName == 'GoodsList'">
+                <diy-goods-list ref="diyGoodsListRef" :component="component" :global="data.global" :index="index" :scrollBool="diyGroup.componentsScrollBool.GoodsList" />
+            </template>
+            <template v-if="component.componentName == 'ManyGoodsList'">
+                <diy-many-goods-list ref="diyManyGoodsListRef" :component="component" :global="data.global" :index="index" :scrollBool="diyGroup.componentsScrollBool.ManyGoodsList" />
+            </template>
+            <template v-if="component.componentName == 'ShopExchangeGoods'">
+                <diy-shop-exchange-goods ref="diyShopExchangeGoodsRef" :component="component" :global="data.global" :index="index" :scrollBool="diyGroup.componentsScrollBool.ShopExchangeGoods" />
+            </template>
+            <template v-if="component.componentName == 'ShopExchangeInfo'">
+                <diy-shop-exchange-info ref="diyShopExchangeInfoRef" :component="component" :global="data.global" :index="index" :scrollBool="diyGroup.componentsScrollBool.ShopExchangeInfo" />
+            </template>
+            <template v-if="component.componentName == 'ShopGoodsRanking'">
+                <diy-shop-goods-ranking ref="diyShopGoodsRankingRef" :component="component" :global="data.global" :index="index" :scrollBool="diyGroup.componentsScrollBool.ShopGoodsRanking" />
+            </template>
+            <template v-if="component.componentName == 'ShopGoodsRecommend'">
+                <diy-shop-goods-recommend ref="diyShopGoodsRecommendRef" :component="component" :global="data.global" :index="index" :scrollBool="diyGroup.componentsScrollBool.ShopGoodsRecommend" />
+            </template>
+            <template v-if="component.componentName == 'ShopMemberInfo'">
+                <diy-shop-member-info ref="diyShopMemberInfoRef" :component="component" :global="data.global" :index="index" :scrollBool="diyGroup.componentsScrollBool.ShopMemberInfo" />
+            </template>
+            <template v-if="component.componentName == 'ShopNewcomer'">
+                <diy-shop-newcomer ref="diyShopNewcomerRef" :component="component" :global="data.global" :index="index" :scrollBool="diyGroup.componentsScrollBool.ShopNewcomer" />
+            </template>
+            <template v-if="component.componentName == 'ShopOrderInfo'">
+                <diy-shop-order-info ref="diyShopOrderInfoRef" :component="component" :global="data.global" :index="index" :scrollBool="diyGroup.componentsScrollBool.ShopOrderInfo" />
+            </template>
+            <template v-if="component.componentName == 'ShopSearch'">
+                <diy-shop-search ref="diyShopSearchRef" :component="component" :global="data.global" :index="index" :scrollBool="diyGroup.componentsScrollBool.ShopSearch" />
+            </template>
+            <template v-if="component.componentName == 'SingleRecommend'">
+                <diy-single-recommend ref="diySingleRecommendRef" :component="component" :global="data.global" :index="index" :scrollBool="diyGroup.componentsScrollBool.SingleRecommend" />
+            </template>
+            </view>
+        </view>
+        <template v-if="diyStore.mode == '' && data.global && data.global.bottomTabBarSwitch">
+            <view class="pt-[20rpx]"></view>
+            <tabbar />
+        </template>
+    </view>
+</template>
+<script lang="ts" setup>
+   import diyGoodsCoupon from '@/addon/shop/components/diy/goods-coupon/index.vue';
+   import diyGoodsList from '@/addon/shop/components/diy/goods-list/index.vue';
+   import diyManyGoodsList from '@/addon/shop/components/diy/many-goods-list/index.vue';
+   import diyShopExchangeGoods from '@/addon/shop/components/diy/shop-exchange-goods/index.vue';
+   import diyShopExchangeInfo from '@/addon/shop/components/diy/shop-exchange-info/index.vue';
+   import diyShopGoodsRanking from '@/addon/shop/components/diy/shop-goods-ranking/index.vue';
+   import diyShopGoodsRecommend from '@/addon/shop/components/diy/shop-goods-recommend/index.vue';
+   import diyShopMemberInfo from '@/addon/shop/components/diy/shop-member-info/index.vue';
+   import diyShopNewcomer from '@/addon/shop/components/diy/shop-newcomer/index.vue';
+   import diyShopOrderInfo from '@/addon/shop/components/diy/shop-order-info/index.vue';
+   import diyShopSearch from '@/addon/shop/components/diy/shop-search/index.vue';
+   import diySingleRecommend from '@/addon/shop/components/diy/single-recommend/index.vue';
+   import topTabbar from '@/components/top-tabbar/top-tabbar.vue'
+   import useDiyStore from '@/app/stores/diy';
+   import { useDiyGroup } from './useDiyGroup';
+   import { ref,getCurrentInstance } from 'vue';
+
+   const props = defineProps(['data']);
+   const instance: any = getCurrentInstance();
+   const getFormRef = () => {
+       return {
+           componentRefs: instance.refs
+       }
+   }
+   const diyStore = useDiyStore();
+   const diyGroup = useDiyGroup({
+       ...props,
+       getFormRef
+   });
+   const data = ref(diyGroup.data);
+
+   // 监听页面加载完成
+   diyGroup.onMounted();
+
+   // 监听滚动事件
+   diyGroup.onPageScroll();
+   defineExpose({
+       refresh: diyGroup.refresh,
+       getFormRef
+   })
+</script>
+<style lang="scss" scoped>
+   @import './index.scss';
+</style>
diff --git a/uni-app/src/addon/components/diy/group/useDiyGroup.ts b/uni-app/src/addon/components/diy/group/useDiyGroup.ts
new file mode 100644
index 00000000..045f5045
--- /dev/null
+++ b/uni-app/src/addon/components/diy/group/useDiyGroup.ts
@@ -0,0 +1,185 @@
+import { ref, onMounted, nextTick, computed } from 'vue';
+import Sortable from 'sortablejs';
+import { range } from 'lodash-es';
+import { onPageScroll, onHide, onShow } from '@dcloudio/uni-app';
+import useDiyStore from '@/app/stores/diy';
+
+export function useDiyGroup(params: any = {}) {
+
+    let scrollVal: any = ""; //组件滚动值集合
+    const componentsScrollBool: any = ref({}); //组件是否根据滚动进行相应改变
+    const diyStore = useDiyStore();
+
+    const positionFixed = ref(['fixed', 'top_fixed', 'right_fixed', 'bottom_fixed', 'left_fixed']);
+
+    const data = computed(() => {
+        if (diyStore.mode == 'decorate') {
+            return diyStore;
+        } else {
+            return params.data;
+        }
+    })
+
+    const getComponentClass = (index: any, component: any) => {
+        let obj: any = {
+            relative: true,
+            selected: diyStore.currentIndex == index,
+            decorate: diyStore.mode == 'decorate'
+        }
+        obj['top-fixed-' + diyStore.topFixedStatus] = true;
+
+        if (component.position && positionFixed.value.indexOf(component.position) != -1) {
+            //  找出置顶组件，设置禁止拖动
+            obj['ignore-draggable-element'] = true;
+        } else {
+            obj['draggable-element'] = true;
+        }
+        if (component.componentName == 'ImageAds') {
+            obj['overflow-hidden'] = true
+        }
+        return obj;
+    }
+
+    // 是否显示占位区域，用于禁止选中负上边距的内容
+    const isShowPlaceHolder = (index: any, component: any) => {
+        // #ifdef H5
+        if (diyStore.mode == 'decorate') {
+            let el: any = document.getElementById('componentList');
+            if (el && el.children.length && el.children[index]) {
+                let height = el.children[index].offsetHeight;
+                let top = 0;
+                if (component.margin.top < 0) {
+                    top = component.margin.top * 2 * -1;
+                    // 若负上边距大于组件的高度，则允许选中进行装修
+                    if (top > height) {
+                        return false;
+                    }
+                }
+            }
+            return true;
+        }
+        // #endif
+        return false;
+    }
+
+    // 监听页面加载完成
+    const onMountedLifeCycle = () => {
+        onMounted(() => {
+            // #ifdef H5
+            if (diyStore.mode == 'decorate') {
+                var el: any = document.getElementById('componentList');
+                const sortable = Sortable.create(el, {
+                    draggable: '.draggable-element',
+                    animation: 200,
+                    // 结束拖拽
+                    onEnd: event => {
+                        let temp = diyStore.value[event.oldIndex!];
+                        diyStore.value.splice(event.oldIndex!, 1);
+                        diyStore.value.splice(event.newIndex!, 0, temp);
+
+                        nextTick(() => {
+                            sortable.sort(range(diyStore.value.length).map((value: any) => {
+                                return value.toString();
+                            }));
+
+                            diyStore.postMessage(event.newIndex, diyStore.value[event.newIndex]);
+                        });
+                    }
+                });
+            }
+            // #endif
+
+            nextTick(() => {
+                setTimeout(() => {
+
+                    // 初始化组件滚动值
+                    scrollVal = uni.getStorageSync('componentsScrollValGroup');
+                    if (scrollVal) {
+                        for (let key in scrollVal) {
+                            componentsScrollBool.value[key] = -1;
+                        }
+                    }
+                }, 500)
+            });
+        });
+    }
+
+    // 页面onShow调用时，也会触发改方法
+    const refresh = () => {
+        nextTick(() => {
+            let time: any = null;
+            let fn = () => {
+                diyStore.componentRefs = params.getFormRef().componentRefs;
+                data.value.componentRefs = params.getFormRef().componentRefs;
+                params.getFormRef().componentRefs.topTabbarRef?.refresh();
+                if (time) clearInterval(time);
+            }
+
+            let getPass = () => {
+                let pass = false;
+                try {
+                    params.getFormRef()
+                    pass = true;
+                } catch (e) {
+                    pass = false;
+                }
+                if (pass) {
+                    fn();
+                }
+                return pass;
+            }
+
+            if (!getPass()) {
+                time = setInterval(() => {
+                    getPass()
+                }, 100)
+            }
+
+        })
+    }
+
+    // 空函数，禁止选中
+    const placeholderEvent = () => {
+    }
+
+    const isPagesHide = ref(false)
+    onShow(() => {
+        isPagesHide.value = false;
+    })
+    onHide(() => {
+        isPagesHide.value = true;
+    })
+
+    // 监听滚动事件
+    const scrollValStr = ref()
+    const onPageScrollLifeCycle = () => {
+        onPageScroll((e) => {
+            if (scrollVal && !isPagesHide.value) {
+                for (let key in scrollVal) {
+                    if (e.scrollTop <= 0) {
+                        // -1 表示页面滚动值小于零，组件随页面下拉而下来
+                        componentsScrollBool.value[key] = -1;
+                    } else if (e.scrollTop > scrollVal[key]) {
+                        // 1 表示页面滚动值大于传入滚动值，组件随页面上拉背景、文字颜色等采用滚动后的变量
+                        componentsScrollBool.value[key] = 1;
+                    } else {
+                        // 2 表示页面滚动值小于传入滚动值，组件随页面下拉背景、文字颜色等采用滚动前的变量
+                        componentsScrollBool.value[key] = 2
+                    }
+                }
+            }
+        })
+    }
+
+    return {
+        scrollV: scrollValStr.value,
+        data: data.value,
+        componentsScrollBool: componentsScrollBool.value,
+        placeholderEvent,
+        refresh,
+        isShowPlaceHolder,
+        getComponentClass,
+        onPageScroll: onPageScrollLifeCycle,
+        onMounted: onMountedLifeCycle
+    }
+}
diff --git a/uni-app/src/addon/shop/api/cart.ts b/uni-app/src/addon/shop/api/cart.ts
new file mode 100644
index 00000000..ed98448e
--- /dev/null
+++ b/uni-app/src/addon/shop/api/cart.ts
@@ -0,0 +1,59 @@
+import request from '@/utils/request'
+
+/**
+ * 添加购物车
+ */
+export function addCart(data: AnyObject) {
+    return request.post(`shop/cart`, data)
+}
+
+/**
+ * 编辑购物车数量
+ */
+export function editCart(data: AnyObject) {
+    return request.put(`shop/cart`, data)
+}
+
+/**
+ * 删除购物车
+ */
+export function deleteCart(data: AnyObject) {
+    return request.put(`shop/cart/delete`, data)
+}
+
+/**
+ * 清空购物车
+ */
+export function clearCart() {
+    return request.delete(`shop/cart/clear`)
+}
+
+/**
+ * 获取购物车列表
+ */
+export function getCartList(params: Record<string, any>) {
+    return request.get(`shop/cart`, params)
+}
+
+/**
+ * 获取购物车商品列表
+ */
+export function getCartGoodsList(params: Record<string, any>) {
+    return request.get(`shop/cart/goods`, params)
+}
+
+/**
+ * 获取购物车数量
+ */
+export function getCartSum(params: Record<string, any>) {
+    return request.get(`shop/cart/sum`, params)
+}
+
+
+/**
+ * 购物车计算
+ */
+export function getCartCalculate(params: Record<string, any>) {
+    return request.get(`shop/cart/calculate`, params)
+
+}
diff --git a/uni-app/src/addon/shop/api/config.ts b/uni-app/src/addon/shop/api/config.ts
new file mode 100644
index 00000000..71a3541a
--- /dev/null
+++ b/uni-app/src/addon/shop/api/config.ts
@@ -0,0 +1,8 @@
+import request from '@/utils/request'
+
+/**
+ * 获取发票配置
+ */
+export function getInvoiceConfig() {
+    return request.get(`shop/config/invoice`)
+}
diff --git a/uni-app/src/addon/shop/api/coupon.ts b/uni-app/src/addon/shop/api/coupon.ts
new file mode 100644
index 00000000..27b1b4c9
--- /dev/null
+++ b/uni-app/src/addon/shop/api/coupon.ts
@@ -0,0 +1,65 @@
+import request from '@/utils/request'
+
+/**
+ * 优惠券列表
+ */
+export function getShopCouponList(params: Record<string, any>) {
+    return request.get(`shop/coupon`, params)
+}
+
+/**
+ * 优惠券详情
+ */
+export function getShopCouponInfo(id: number) {
+    return request.get(`shop/coupon/${ id }`)
+}
+
+/**
+ * 优惠券二维码
+ */
+export function getShopCouponQrocde(id: number) {
+    return request.get(`shop/coupon/qrcode/${ id }`)
+}
+
+/**
+ * 领取优惠券
+ */
+export function getCoupon(params: Record<string, any>) {
+    return request.post(`shop/coupon`, params, { showSuccessMessage: true })
+}
+
+/**
+ * 获取我的优惠券
+ */
+export function getMyCouponList(params: Record<string, any>) {
+    return request.get(`shop/member/coupon`, params)
+}
+
+/**
+ * 获取优惠券列表供组件调用
+ */
+export function getShopCouponComponents(params: Record<string, any>) {
+    return request.get(`shop/coupon/components`, params)
+}
+
+/**
+ * 获取我的优惠券数量
+ * status 1：待使用，2：已使用，3：已过期，4：已失效
+ */
+export function getMyCouponCount(params: Record<string, any>) {
+    return request.get(`shop/member/coupon/count`, params)
+}
+
+/**
+ * 获取我的优惠券类型
+ */
+export function getMyCouponType() {
+    return request.get(`shop/coupon_type`)
+}
+
+/**
+ * 获取我的优惠数量
+ */
+export function getMyCouponStatusCount() {
+    return request.get(`shop/member/coupon/status_count`)
+}
diff --git a/uni-app/src/addon/shop/api/discount.ts b/uni-app/src/addon/shop/api/discount.ts
new file mode 100644
index 00000000..db42d553
--- /dev/null
+++ b/uni-app/src/addon/shop/api/discount.ts
@@ -0,0 +1,25 @@
+import request from '@/utils/request'
+
+/**
+ * 获取限时折扣轮播
+ * @returns
+ */
+export function getActiveDiscountConfig() {
+    return request.get(`shop/discount/config`);
+}
+
+/**
+ * 获取限时折扣列表
+ * @returns
+ */
+export function getActiveDiscountList(params: Record<string, any>) {
+    return request.get(`shop/discount`, params)
+}
+
+/**
+ * 获取限时折扣商品列表
+ * @returns
+ */
+export function getActiveDiscountGoodsList(params: Record<string, any>) {
+    return request.get(`shop/discount/goods`, params)
+}
\ No newline at end of file
diff --git a/uni-app/src/addon/shop/api/evaluate.ts b/uni-app/src/addon/shop/api/evaluate.ts
new file mode 100644
index 00000000..1d022b2c
--- /dev/null
+++ b/uni-app/src/addon/shop/api/evaluate.ts
@@ -0,0 +1,29 @@
+import request from '@/utils/request'
+
+/**
+ * 获取商品评价
+ */
+export function getEvaluateList(params: Record<string, any>) {
+    return request.get(`shop/goods/evaluate`, params)
+}
+
+/**
+ * 获取评价详情
+ */
+export function getEvaluateInfo(id: any) {
+    return request.get(`shop/goods/evaluate/${ id }`)
+}
+
+/**
+ * 提交评论
+ */
+export function setOrderEvaluate(params: Record<string, any>) {
+    return request.post('shop/goods/evaluate', params, { showSuccessMessage: true })
+}
+
+/**
+ * 获取订单评价
+ */
+export function getOrderEvaluate(id: any) {
+    return request.get(`shop/order/evaluate/${ id }`)
+}
diff --git a/uni-app/src/addon/shop/api/goods.ts b/uni-app/src/addon/shop/api/goods.ts
new file mode 100644
index 00000000..b44902f2
--- /dev/null
+++ b/uni-app/src/addon/shop/api/goods.ts
@@ -0,0 +1,107 @@
+import request from '@/utils/request'
+
+/**
+ * 获取商品分类模板配置
+ */
+export function getGoodsCategoryConfig() {
+    return request.get(`shop/goods/category/config`)
+}
+
+/**
+ * 获取商品分类树结构
+ */
+export function getGoodsCategoryTree() {
+    return request.get(`shop/goods/category/tree`)
+}
+
+/**
+ * 获取商品分类列表
+ */
+export function getGoodsCategoryList(params: Record<string, any>) {
+    return request.get(`shop/goods/category/list`, params)
+}
+
+/**
+ * 获取商品列表
+ */
+export function getGoodsPages(params: Record<string, any>) {
+    return request.get(`shop/goods/pages`, params)
+}
+
+/**
+ * 获取商品详情
+ */
+export function getGoodsDetail(params: Record<string, any>) {
+    return request.get(`shop/goods/detail`, params)
+}
+
+/**
+ * 获取商品规格
+ */
+export function getGoodsSku(sku_id: any) {
+    return request.get(`shop/goods/sku/${ sku_id }`)
+}
+
+/**
+ * 收藏列表
+ */
+export function getCollectList(params: Record<string, any>) {
+    return request.get(`shop/goods/collect`, params)
+}
+
+/**
+ * 取消收藏
+ */
+export function cancelCollect(params: Record<string, any>) {
+    return request.put(`shop/goods/collect`, params, { showSuccessMessage: true })
+}
+
+/**
+ *  收藏
+ */
+export function collect(goods_id: any) {
+    return request.post(`shop/goods/collect/${ goods_id }`)
+}
+
+
+/**
+ * 获取评价
+ */
+export function getEvaluateList(goods_id: any) {
+    return request.get(`shop/goods/evaluate/list`, { goods_id })
+}
+
+/**
+ * 获取商品列表供组件调用
+ */
+export function getGoodsComponents(params: Record<string, any>) {
+    return request.get(`shop/goods/components`, params)
+}
+
+/**
+ * 获取商品满减信息
+ */
+export function getManjian(params: Record<string, any>) {
+    return request.get(`shop/manjian/info`, params)
+}
+
+/**
+ *  商品足迹添加
+ */
+export function browse(params: Record<string, any>) {
+    return request.post(`shop/goods/browse`, params, { showSuccessMessage: false })
+}
+
+/**
+ *  商品足迹列表
+ */
+export function getBrowse(params: Record<string, any>) {
+    return request.get(`shop/goods/browse`, params)
+}
+
+/**
+ * 商品足迹删除
+ */
+export function delBrowse(params: Record<string, any>) {
+    return request.delete(`shop/goods/browse`, params)
+}
diff --git a/uni-app/src/addon/shop/api/newcomer.ts b/uni-app/src/addon/shop/api/newcomer.ts
new file mode 100644
index 00000000..b413b262
--- /dev/null
+++ b/uni-app/src/addon/shop/api/newcomer.ts
@@ -0,0 +1,16 @@
+import request from '@/utils/request'
+
+// 分享专区列表
+export function getNewcomerGoodsList(params: Record<string, any>) {
+    return request.get(`shop/newcomer/goods`, params)
+}
+
+export function getNewcomersConfig() {
+    return request.get(`shop/newcomer/config`)
+}
+
+// 首页新人专享列表
+export function getNewcomersComponentsList(params: Record<string, any>) {
+    return request.get(`shop/newcomer/goods/components`, params)
+}
+
diff --git a/uni-app/src/addon/shop/api/order.ts b/uni-app/src/addon/shop/api/order.ts
new file mode 100644
index 00000000..d3a9a718
--- /dev/null
+++ b/uni-app/src/addon/shop/api/order.ts
@@ -0,0 +1,86 @@
+import request from '@/utils/request'
+
+/***************************************************** 订单列表 ****************************************************/
+/**
+ * 获取订单设置
+ */
+export function getShopOrderConfig() {
+    return request.get(`shop/order/config`)
+}
+
+/**
+ * 获取订单状态列表
+ */
+export function getShopOrderStatus() {
+    return request.get(`shop/order/status`)
+}
+
+/**
+ * 获取订单列表
+ */
+export function getShopOrder(params: Record<string, any>) {
+    return request.get(`shop/order`, params)
+}
+
+/**
+ * 获取订单角标数据
+ */
+export function getShopOrderNum() {
+    return request.get(`shop/order/num`)
+}
+
+/**
+ * 获取订单详情
+ */
+export function getShopOrderDetail(order_id: any) {
+    return request.get(`shop/order/${ order_id }`)
+}
+
+/**
+ * 关闭订单
+ */
+export function orderClose(order_id: number) {
+    return request.put(`shop/order/close/${ order_id }`)
+}
+
+/**
+ * 订单完成
+ */
+export function orderFinish(order_id: number) {
+    return request.put(`shop/order/finish/${ order_id }`)
+}
+
+/**
+ * 订单创建计算
+ */
+export function orderCreateCalculate(params: Record<string, any>) {
+    return request.get('shop/order_create/calculate', params)
+}
+
+/**
+ * 订单创建
+ */
+export function orderCreate(params: Record<string, any>) {
+    return request.post('shop/order_create/create', params)
+}
+
+/**
+ * 查询订单可用优惠券
+ */
+export function orderCoupon(params: Record<string, any>) {
+    return request.get('shop/order_create/coupon', params)
+}
+
+/**
+ * 查询自提点
+ */
+export function getStoreList(params: Record<string, any>) {
+    return request.get('shop/order_create/store', params)
+}
+
+/**
+ * 查询物流信息
+ */
+export function getMaterialflowList(params: Record<string, any>) {
+    return request.get('shop/order/logistics', params)
+}
diff --git a/uni-app/src/addon/shop/api/point.ts b/uni-app/src/addon/shop/api/point.ts
new file mode 100644
index 00000000..fbdacd83
--- /dev/null
+++ b/uni-app/src/addon/shop/api/point.ts
@@ -0,0 +1,47 @@
+import request from '@/utils/request'
+
+/**
+ * 获取个人积分信息
+ * @returns
+ */
+export function getExchangePoint() {
+    return request.get(`shop/exchange/point`);
+}
+
+/**
+ * 获取积分商城推荐列表
+ * @returns
+ */
+export function getExchangeComponentsList(params: Record<string, any>) {
+    return request.get(`shop/exchange/components`, params)
+}
+
+/**
+ * 获取积分商城列表
+ * @returns
+ */
+export function getExchangeGoodsList(params: Record<string, any>) {
+    return request.get(`shop/exchange`, params)
+}
+
+/**
+ * 获取积分商品详情
+ */
+export function getExchangeGoodsDetail(id: any) {
+    return request.get(`shop/exchange/goods/${ id }`)
+}
+
+/**
+ * 订单创建计算
+ */
+export function orderCreateCalculate(params: Record<string, any>) {
+    return request.get('shop/exchange_order/calculate', params)
+}
+
+/**
+ * 订单创建
+ */
+export function orderCreate(params: Record<string, any>) {
+    return request.post('shop/exchange_order/create', params)
+}
+
diff --git a/uni-app/src/addon/shop/api/rank.ts b/uni-app/src/addon/shop/api/rank.ts
new file mode 100644
index 00000000..27995249
--- /dev/null
+++ b/uni-app/src/addon/shop/api/rank.ts
@@ -0,0 +1,29 @@
+import request from '@/utils/request'
+
+// 榜单分类列表
+export function getRankList() {
+    return request.get(`shop/rank`)
+}
+
+// 榜单商品列表
+export function getRankGoodsList(params: Record<string, any>) {
+    return request.get(`shop/rank/goods`, params)
+}
+
+// 获取排行榜配置
+export function getRankConfig() {
+    return request.get(`shop/rank/getRankConfig`)
+}
+
+// 榜单组件商品列表
+export function getRankComponentsGoodsList(params: Record<string, any>) {
+    return request.get(`shop/rank/components`, params)
+}
+
+
+
+
+ 
+
+
+
diff --git a/uni-app/src/addon/shop/api/refund.ts b/uni-app/src/addon/shop/api/refund.ts
new file mode 100644
index 00000000..93b71d81
--- /dev/null
+++ b/uni-app/src/addon/shop/api/refund.ts
@@ -0,0 +1,71 @@
+import request from '@/utils/request'
+
+/**
+ * 申请退款
+ */
+export function applyRefund(params: Record<string, any>) {
+    return request.post(`shop/refund/apply`, params, { showSuccessMessage: true })
+}
+
+/**
+ * 修改退款申请
+ */
+export function editRefund(params: Record<string, any>) {
+    return request.put(`shop/refund/${ params.order_refund_no }`, params, { showSuccessMessage: true })
+}
+
+/**
+ * 申请退款退货
+ */
+export function refundDelivery(params: Record<string, any>) {
+    return request.post(`shop/refund/delivery/${ params.order_refund_no }`, params, { showSuccessMessage: true })
+}
+
+/**
+ * 修改退款申请
+ */
+export function editRefundDelivery(params: Record<string, any>) {
+    return request.put(`shop/refund/delivery/${ params.order_refund_no }`, params, { showSuccessMessage: true })
+}
+
+/**
+ * 获取退款原因
+ */
+export function getRefundReason() {
+    return request.get('shop/refund/reason')
+}
+
+/**
+ * 获取退款列表
+ */
+export function getRefundList() {
+    return request.get('shop/order/refund')
+}
+
+/**
+ * 获取退款详情
+ */
+export function getRefundDetail(orderRefundNo: string) {
+    return request.get(`shop/order/refund/${ orderRefundNo }`)
+}
+
+/**
+ * 获取退款金额
+ */
+export function getRefundMoney(params: Record<string, any>) {
+    return request.get(`shop/refund/refund_data`, params)
+}
+
+/**
+ * 编辑退款金额
+ */
+export function getRefundMoneyAgain(params: Record<string, any>) {
+    return request.get(`shop/refund/refund_data_by_no`, params)
+}
+
+/**
+ * 取消维权
+ */
+export function closeRefund(orderRefundNo: string) {
+    return request.put(`shop/refund/close/${ orderRefundNo }`, {}, { showSuccessMessage: true })
+}
diff --git a/uni-app/src/addon/shop/api/shop.ts b/uni-app/src/addon/shop/api/shop.ts
new file mode 100644
index 00000000..eb0ac14b
--- /dev/null
+++ b/uni-app/src/addon/shop/api/shop.ts
@@ -0,0 +1,8 @@
+import request from '@/utils/request'
+
+/**
+ * 获取评论设置
+ */
+export function getEvaluateConfig() {
+    return request.get(`shop/goods/evaluate/config`)
+}
\ No newline at end of file
diff --git a/uni-app/src/addon/shop/components/diy/goods-coupon/index.vue b/uni-app/src/addon/shop/components/diy/goods-coupon/index.vue
new file mode 100644
index 00000000..a6b363f1
--- /dev/null
+++ b/uni-app/src/addon/shop/components/diy/goods-coupon/index.vue
@@ -0,0 +1,382 @@
+<template>
+	<x-skeleton :type="skeleton.type" :loading="skeleton.loading" :config="skeleton.config" v-if="couponList && Object.keys(couponList).length > 0">
+		<view :style="warpCss" class="overflow-hidden">
+
+			<view v-if="diyComponent.style == 'style-1'" class="coupon-wrap style-1 relative">
+				<scroll-view scroll-x="true" class="coupon-list" :style="{'background-image':'url(' + img('addon/shop/diy/goods_coupon/style1_bg2.png') + ')','background-size':'100%','background-repeat':'no-repeat'}">
+					<view class="coupon-class">
+						<block v-if="couponList.length > 1">
+							<view v-for="(item,index) in couponList" :key="index" class="rounded-[16rpx] box-border pt-[14rpx] inline-flex flex-col items-center relative w-[150rpx] h-[130rpx]" :class="{'mr-[20rpx]': index != couponList.length-1}" :style="{'background-image':'url(' + img('addon/shop/diy/goods_coupon/coupon_item_bg.png') + ')','background-size':'100%','background-repeat':'no-repeat'}" @click="couponItemLink(item)">
+								<view class="truncate w-full flex items-baseline justify-center price-font text-[var(--price-text-color)]">
+									<text class="text-[26rpx] font-500">￥</text>
+									<text class="text-[36rpx] truncate font-500">{{ parseFloat(item.price) }}</text>
+								</view>
+								<view class="text-[#303133] text-[20rpx] mt-[12rpx]">{{ item.min_condition_money == '0.00' ? '无门槛' : ('满'+parseFloat(item.min_condition_money)+'元可用') }}</view>
+								<view class="mt-[auto] rounded-b-[12rpx] text-[#f2333c] text-[20rpx] w-[100%] h-[36rpx] flex items-center justify-center bg-[#fff5f2]">{{item.type_name}}</view>
+							</view>
+						</block>
+						<block v-else>
+							<view v-for="(item,index) in couponList" :key="index" class="rounded-[16rpx] box-border pt-[14rpx] pl-[44rpx] pr-[44rpx] inline-flex items-center justify-between relative w-[100%] h-[130rpx]" :style="{'background-image':'url(' + img('addon/shop/diy/goods_coupon/style1_bg4.png') + ')','background-size':'100%','background-repeat':'no-repeat'}"  @click="couponItemLink(item)">
+								<view class="flex price-font text-[var(--price-text-color)] items-baseline">
+									<text class="text-[36rpx] mt-[16rpx] mr-[4rpx]">￥</text>
+									<text class="text-[85rpx] font-500 max-w-[170rpx] truncate">{{parseFloat(item.price)}}</text>
+								</view>
+								<view class="border-0 border-dashed border-r-[2rpx] border-[#FF323C] absolute left-[40%] top-[46rpx] bottom-0 w-[2rpx]"></view>
+								<view class="w-[270rpx]">
+									<view class="flex items-center mt-[auto]">
+										<text class="rounded-[4rpx] bg-[#fff3f0] text-[#f2333c] border-[2rpx] border-solid border-[#f2333c] text-[22rpx] px-[6rpx] pb-[4rpx] pt-[6rpx] flex items-center justify-center whitespace-nowrap">{{item.type_name}}</text>
+										<text class="ml-[4rpx] text-[#f2333c] max-w-[184rpx] truncate">{{item.title}}</text>
+									</view>
+									<view class="text-[#f2333c] text-[30rpx] font-500 mt-[10rpx] w-[270rpx] truncate">{{item.min_condition_money == '0.00' ? '无门槛' : ('消费满'+parseFloat(item.min_condition_money)+'元可用') }}</view>
+								</view>
+							</view>
+						</block>
+					</view>
+				</scroll-view>
+				<view class="w-[100%] h-[130rpx] pt-[24rpx] px-[26rpx] box-border flex items-center justify-between absolute left-0 right-0 bottom-0" :style="{'background-image':'url(' + img('addon/shop/diy/goods_coupon/style1_bg.png') + ')','background-size':'100% 130rpx','background-repeat':'no-repeat'}">
+					<view class="flex flex-col">
+						<text class="text-[30rpx] text-[#fff] font-400">{{ diyComponent.couponTitle }}</text>
+						<text class="text-[20rpx] text-[rgba(255,255,255,.8)] mt-[10rpx]">{{ diyComponent.couponSubTitle }}</text>
+					</view>
+					<text v-if="diyComponent.btnText" @click="toLink('/addon/shop/pages/coupon/list')" class="bg-[#fff] flex items-center justify-center text-[#FF4142] text-[22rpx] min-w-[100rpx] px-[24rpx] box-border h-[50rpx] coupon-buy-btn">{{diyComponent.btnText}}</text>
+				</view>
+			</view>
+
+			<view v-else-if="diyComponent.style == 'style-2'" class="coupon-wrap style-2 relative">
+				<scroll-view scroll-x="true" class="coupon-list">
+					<view v-for="(item,index) in couponList" :key="index" class="box-border pt-[14rpx] inline-flex flex-col items-center relative w-[140rpx] h-[130rpx] rounded-[10rpx]" :class="{'mr-[20rpx]': index != couponList.length-1, 'mr-[290rpx]': index == couponList.length-1}" :style="{'background-image':'url(' + img('addon/shop/diy/goods_coupon/coupon_item_bg.png') + ')','background-size':'100%','background-repeat':'no-repeat'}" @click="couponItemLink(item)">
+						<view class="flex items-baseline justify-center w-full truncate price-font text-[var(--price-text-color)]">
+							<text class="text-[24rpx]">￥</text>
+							<text class="text-[38rpx] font-bold truncate">{{parseFloat(item.price)}}</text>
+						</view>
+						<view class="text-[#303133] text-[20rpx] truncate max-w-[120rpx] mt-[12rpx]">{{item.min_condition_money == '0.00' ? '无门槛' : ('满'+parseFloat(item.min_condition_money)+'元可用') }}</view>
+						<view class="mt-[auto] rounded-b-[12rpx] text-[#f2333c] text-[20rpx] w-[100%] h-[36rpx] flex items-center justify-center bg-[#fff5f2]">{{item.type_name}}</view>
+					</view>
+				</scroll-view>
+				<view class="w-[290rpx] h-[170rpx] py-[20rpx] pl-[30rpx] box-border flex flex-col items-center justify-between absolute right-0 bottom-0" :style="{'background-image':'url(' + img('addon/shop/diy/goods_coupon/style2_bg.png') + ')','background-size':'290rpx 170rpx','background-repeat':'no-repeat'}">
+					<text class="text-[30rpx] text-[#fff] font-500">{{ diyComponent.couponTitle }}</text>
+					<text class="text-[20rpx] text-[rgba(255,255,255,.8)] mt-[14rpx]">{{ diyComponent.couponSubTitle }}</text>
+					<text v-if="diyComponent.btnText" @click="toLink('/addon/shop/pages/coupon/list')" class="bg-[#fff] text-[#FF4142] text-[22rpx] min-w-[100rpx] px-[24rpx] box-border h-[50rpx] leading-[50rpx] text-center coupon-buy-btn mt-auto">{{diyComponent.btnText}}</text>
+				</view>
+			</view>
+
+			<view v-else-if="diyComponent.style == 'style-3'" class="coupon-wrap style-3 relative" :style="{'background-image':'url(' + img('addon/shop/diy/goods_coupon/style3_bg.jpg') + ')','background-size':'100% 204rpx','background-repeat':'no-repeat'}">
+				<view class="desc flex flex-col">
+					<text class="text-[30rpx] text-[#fff] font-500">{{ diyComponent.couponTitle }}</text>
+					<text class="text-[22rpx] text-[rgba(255,255,255,.8)] mt-[10rpx]">{{ diyComponent.couponSubTitle }}</text>
+					<text v-if="diyComponent.btnText" @click="toLink('/addon/shop/pages/coupon/list')" class="bg-[#fff] text-[#FF4142] text-[24rpx] w-[140rpx] box-border h-[50rpx] leading-[50rpx] text-center coupon-buy-btn mt-auto">{{diyComponent.btnText}}</text>
+				</view>
+				<scroll-view scroll-x="true" class="coupon-list" v-if="couponList.length > 1">
+					<view v-for="(item,index) in couponList" :key="index" class="bg-[#fff] box-border p-[8rpx] pb-[12rpx] inline-flex flex-col items-center relative rounded-[20rpx] ml-[12rpx]" @click="couponItemLink(item)">
+						<view class="coupon-item-content">
+							<view class="text-[20rpx] text-[#fff]">{{item.type_name}}</view>
+							<view class="mt-[auto] flex items-baseline justify-center w-full truncate price-font text-[#fff]">
+								<text class="text-[24rpx]">￥</text>
+								<text class="text-[44rpx] font-bold truncate">{{parseFloat(item.price)}}</text>
+							</view>
+						</view>
+						<view class="text-[#303133] text-[22rpx] truncate max-w-[120rpx] mt-[12rpx]">{{item.min_condition_money == '0.00' ? '无门槛' : ('满'+parseFloat(item.min_condition_money)+'元可用') }}</view>
+					</view>
+				</scroll-view>
+				<view  v-if="couponList.length == 1" class="bg-[#fff] box-border p-[10rpx] relative rounded-[20rpx] single-coupon flex-1" @click="couponItemLink(couponList[0])">
+					<view class="flex items-center coupon-item-content">
+						<view class="coupon-left flex items-center justify-center text-[#fff] w-[156rpx] mr-[30rpx]">
+							<text class="text-[24rpx]">￥</text>
+							<text class="text-[44rpx] font-[500]">{{parseFloat(couponList[0].price)}}</text>
+						</view>
+						<view class="flex flex-col">
+							<view class="text-[#fff] text-[28rpx] mb-[14rpx]">{{couponList[0].min_condition_money == '0.00' ? '无门槛' : ('满'+parseFloat(couponList[0].min_condition_money)+'元可用') }}</view>
+							<view class="flex items-center">
+								<text class="bg-[#fff] mr-[10rpx] text-[red] text-[20rpx] px-[10rpx] py-[8rpx] rounded-[20rpx]">{{couponList[0].type_name}}</text>
+								<text class="text-[#fff] text-[24rpx]">店铺优惠券</text>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view v-else-if="diyComponent.style == 'style-4'" class="coupon-wrap style-4 relative" :style="couponStyle4Css">
+				<view class="desc flex items-center pt-[6rpx] pb-[26rpx]" @click="toLink('/addon/shop/pages/coupon/list')">
+					<text class="text-[32rpx] text-[#fff] font-500" :style="{color: diyComponent.titleColor}">{{ diyComponent.couponTitle }}</text>
+					<text class="text-[22rpx] text-[rgba(255,255,255,.8)] ml-[10rpx]" :style="{color: diyComponent.subTitleColor}">{{ diyComponent.couponSubTitle }}</text>
+				</view>
+				<scroll-view scroll-x="true" class="coupon-list">
+					<view v-for="(item,index) in couponList" :key="index" class="px-[10rpx] h-[120rpx] inline-flex items-center relative mr-[12rpx] coupon-item box-border min-w-[310rpx]" :style="{'background-color': diyComponent.couponItem.bgColor, 'border-radius': ((diyComponent.couponItem.aroundRadius*2)+'rpx')}" @click="couponItemLink(item)">
+						<view class="flex min-w-[110rpx] max-w-[120rpx] items-baseline justify-center truncate price-font mr-[10rpx]" :style="{'color': diyComponent.couponItem.moneyColor}">
+							<text class="text-[26rpx]">￥</text>
+							<text class="text-[46rpx] font-bold truncate">{{parseFloat(item.price)}}</text>
+						</view>
+						<view class="flex flex-col">
+							<view class="text-[28rpx] font-500" :style="{'color': diyComponent.couponItem.textColor}">{{item.type_name}}</view>
+							<view class="text-[#666] text-[24rpx] truncate max-w-[180rpx] mt-[12rpx]" :style="{'color': diyComponent.couponItem.subTextColor}">{{item.min_condition_money == '0.00' ? '无门槛' : ('满'+parseFloat(item.min_condition_money)+'元可用') }}</view>
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+		</view>
+	</x-skeleton>
+</template>
+
+<script setup lang="ts">
+	// 优惠券组件
+	import { ref, reactive, computed, watch, onMounted } from 'vue';
+	import { img, redirect } from '@/utils/common';
+	import useDiyStore from '@/app/stores/diy';
+	import { useLogin } from '@/hooks/useLogin';
+	import useMemberStore from '@/stores/member'
+    import { getShopCouponComponents,getCoupon } from '@/addon/shop/api/coupon';
+
+	const props = defineProps(['component', 'index']);
+	const diyStore = useDiyStore();
+	const memberStore = useMemberStore()
+	const userInfo = computed(() => memberStore.info)
+    const skeleton = reactive({
+        type: 'banner',
+        loading: false,
+        config: {
+            gridRows: 1,
+            gridRowsGap: '0rpx',
+            headHeight: '170rpx'
+        }
+    })
+
+	const diyComponent = computed(() => {
+		if (diyStore.mode == 'decorate') {
+			return diyStore.value[props.index];
+		} else {
+			return props.component;
+		}
+	})
+
+	const warpCss = computed(() => {
+		var style = '';
+		if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		return style;
+	})
+
+	const couponStyle4Css = computed(()=>{
+		var style = '';
+		if (diyComponent.value.componentStartBgColor && diyComponent.value.componentEndBgColor) style += `background:linear-gradient(${diyComponent.value.componentGradientAngle},${diyComponent.value.componentStartBgColor},${diyComponent.value.componentEndBgColor});`;
+		else style += 'background-color:' + (diyComponent.value.componentStartBgColor || diyComponent.value.componentEndBgColor) + ';';
+		return style;
+	})
+
+    const toLink = (url: any)=>{
+        if (diyStore.mode == 'decorate') return;
+        redirect({ url })
+    }
+
+    const couponList: any = ref([])
+    const getShopCouponListFn = () => {
+        let data: object = {
+            num: diyComponent.value.source == 'all' ? diyComponent.value.num : '',
+            coupon_ids: diyComponent.value.source == 'custom' ? diyComponent.value.couponIds : '',
+        };
+        getShopCouponComponents(data).then((res: any) => {
+            couponList.value = res.data
+            skeleton.loading = false;
+
+	        // 数据为空时隐藏整个组件
+	        // if(couponList.value.length == 0) {
+		    //     diyComponent.value.pageStyle = '';
+	        // }
+        })
+    }
+
+	const couponItemLink = (data:any)=> {
+		// redirect({ url: '/addon/shop/pages/coupon/detail', param: { coupon_id: data.id } })
+		collecting(data.id)
+	}
+
+    onMounted(() => {
+        refresh();
+    });
+
+    const refresh = () => {
+
+        // 装修模式下设置默认图
+        if (diyStore.mode == 'decorate') {
+            let obj = {
+                title: '满减券',
+                type_name: '通用券',
+                price: 100,
+                min_condition_money: 0,
+            };
+            for (let i = 0; i < 4; i++) {
+                couponList.value.push(obj);
+            }
+        } else {
+            getShopCouponListFn();
+        }
+    }
+
+	const collecting = (coupon_id: any) => {
+		if (diyStore.mode == 'decorate') return;
+	    if (!userInfo.value) {
+	        useLogin().setLoginBack({ url: '/addon/shop/pages/coupon/list' })
+	        return false
+	    }
+	    getCoupon({ coupon_id, number: 1 }).then(res => {
+	        // detail.value.btnType = 'using'
+	    })
+	}
+</script>
+
+<style lang="scss" scoped>
+	.coupon-wrap{
+		&.style-1{
+			.coupon-list{
+				position: relative;
+				height: 270rpx;
+				width: 100%;
+				white-space: nowrap;
+				padding: 30rpx 40rpx 0;
+				box-sizing: border-box;
+				&::before{
+					content: "";
+					position: absolute;
+					top: 0;
+					left: 20rpx;
+					right: 20rpx;
+					bottom: 0;
+					background: linear-gradient(#FEF9EC, #FCD9A5);
+					border-radius: 24rpx;
+				}
+			}
+			.coupon-buy-btn{
+				border-radius: 50rpx;
+			}
+		}
+		&.style-2{
+			.coupon-list{
+				position: relative;
+				height: 170rpx;
+				width: 100%;
+				white-space: nowrap;
+				padding: 20rpx 0 20rpx 20rpx;
+				box-sizing: border-box;
+				overflow: hidden;
+				background: linear-gradient(#EE3928, #EF3F30);
+			}
+			.coupon-buy-btn{
+				border-radius: 50rpx;
+			}
+		}
+		&.style-3{
+			display: flex;
+			align-items: center;
+			padding: 20rpx;
+			.desc{
+				padding-top: 12rpx;
+				height: 164rpx;
+				margin-right: 10rpx;
+				box-sizing: border-box;
+			}
+			.coupon-list{
+				flex: 1;
+				position: relative;
+				white-space: nowrap;
+				box-sizing: border-box;
+				overflow: hidden;
+				.coupon-item-content{
+					position: relative;
+					background: linear-gradient( 160deg, #FD5F2F 0%, #F6370F 100%);
+					width: 146rpx;
+					height: 108rpx;
+					border-radius: 12rpx;
+					display: flex;
+					flex-direction: column;
+					align-items: center;
+					justify-content: center;
+					padding: 12rpx 0 14rpx;
+					box-sizing: border-box;
+					&::after{
+						content: "";
+						position: absolute;
+						border: 12rpx solid #fff;
+						border-right-color: transparent;
+						border-top-color: transparent;
+						border-radius: 50%;
+						top: 50%;
+						transform: rotate(45deg) translateY(-50%);
+						right: -5rpx;
+					}
+					&::before{
+						content: "";
+						position: absolute;
+						border: 12rpx solid #fff;
+						border-left-color: transparent;
+						border-bottom-color: transparent;
+						border-radius: 50%;
+						top: 50%;
+						transform: rotate(45deg) translateY(-50%);
+						left: -22rpx;
+					}
+				}
+			}
+			.single-coupon{
+				.coupon-item-content{
+					position: relative;
+					background: linear-gradient( 160deg, #FD5F2F 0%, #F6370F 100%);
+					height: 144rpx;
+					border-radius: 12rpx;
+					padding: 12rpx 0 14rpx;
+					box-sizing: border-box;
+					&::after{
+						content: "";
+						position: absolute;
+						border: 14rpx solid #fff;
+						border-right-color: transparent;
+						border-top-color: transparent;
+						border-radius: 50%;
+						left: 139rpx;
+						transform: rotate(-45deg);
+						top: -18rpx;
+					}
+					&::before{
+						content: "";
+						position: absolute;
+						border: 14rpx solid #fff;
+						border-left-color: transparent;
+						border-bottom-color: transparent;
+						border-radius: 50%;
+						left: 139rpx;
+						transform: rotate(-45deg);
+						bottom: -16rpx;
+					}
+					.coupon-left{
+						position: relative;
+						&::after{
+							content: '';
+							position: absolute;
+							top: 50%;
+							right: 0;
+							transform: translateY(-50%);
+							border-right: 2rpx dashed #fff;
+							width: 2rpx;
+							height: 88rpx;
+						}
+					}
+				}
+			}
+			.coupon-buy-btn{
+				border-radius: 50rpx;
+			}
+		}
+		&.style-4{
+			padding: 20rpx 24rpx;
+			.coupon-list{
+				flex: 1;
+				position: relative;
+				white-space: nowrap;
+				box-sizing: border-box;
+				overflow: hidden;
+				.coupon-item{
+					width: calc(50% - 6rpx);
+				}
+			}
+		}
+	}
+</style>
diff --git a/uni-app/src/addon/shop/components/diy/goods-list/index.vue b/uni-app/src/addon/shop/components/diy/goods-list/index.vue
new file mode 100644
index 00000000..18c0edfb
--- /dev/null
+++ b/uni-app/src/addon/shop/components/diy/goods-list/index.vue
@@ -0,0 +1,434 @@
+<template>
+	<x-skeleton :type="skeleton.type" :loading="skeleton.loading" :config="skeleton.config">
+		<view :style="warpCss" class="overflow-hidden">
+			<view :style="maskLayer"></view>
+			<view :class="{'diy-shop-goods-list relative flex flex-wrap justify-between': diyComponent.style != 'style-2', 'biserial-goods-list': diyComponent.style == 'style-2'}">
+				<block v-if="diyComponent.style == 'style-1'">
+					<view class="bg-white w-full flex p-[20rpx] overflow-hidden" :class="{ 'mt-[20rpx]': index > 0 }" :style="itemCss" v-for="(item,index) in goodsList" :key="item.goods_id" @click="toLink(item)">
+						<u--image radius="var(--goods-rounded-big)" width="200rpx" height="200rpx" :src="img(item.goods_cover_thumb_mid || '')" model="aspectFill">
+							<template #error>
+								<image class="w-[200rpx] h-[200rpx] rounded-[var(--goods-rounded-big)] overflow-hidden" :src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill"></image>
+							</template>
+						</u--image>
+						<view class="flex-1 flex flex-col ml-[20rpx] py-[6rpx] relative">
+							<view class="text-[28rpx] leading-[40rpx] text-[#303133] multi-hidden mb-[10rpx]" :style="{ color : diyComponent.goodsNameStyle.color, fontWeight : diyComponent.goodsNameStyle.fontWeight }" v-if="diyComponent.goodsNameStyle.control">
+								<view class="brand-tag" v-if="item.goods_brand">
+									{{item.goods_brand.brand_name}}
+								</view>
+								{{item.goods_name}}
+							</view>
+							<view v-if="item.goods_label_name && item.goods_label_name.length && diyComponent.labelStyle.control" class="flex flex-wrap mb-[10rpx]">
+								<template v-for="(tagItem, tagIndex) in item.goods_label_name">
+									<image class="img-tag" v-if="tagItem.style_type == 'icon' && tagItem.icon" :src="img(tagItem.icon)" mode="heightFix" @error="diyGoods.error(tagItem,'icon')"></image>
+									<view class="base-tag" v-else-if="tagItem.style_type == 'diy' || !tagItem.icon" :style="diyGoods.baseTagStyle(tagItem)">
+										{{tagItem.label_name}}
+									</view>
+								</template>
+							</view>
+							<view class="mt-auto flex justify-between items-center">
+								<view class="flex flex-col">
+									<view class="flex items-baseline leading-[1]" v-if="diyComponent.priceStyle.control">
+										<view class="font-bold text-[var(--price-text-color)] price-font block truncate max-w-[350rpx]" :style="{ color : diyComponent.priceStyle.color }">
+											<text class="text-[24rpx] font-500 mr-[4rpx]">￥</text>
+											<text class="text-[40rpx] font-500">{{ parseFloat(diyGoods.goodsPrice(item)).toFixed(2)}}</text>
+										</view>
+										<image v-if="diyGoods.priceType(item) == 'member_price'" class="max-w-[50rpx] h-[28rpx] ml-[6rpx]" :src="img('addon/shop/VIP.png')" mode="heightFix" />
+									</view>
+									<text v-if="diyComponent.saleStyle.control" class="mt-[8rpx] text-[22rpx] text-[var(--text-color-light9)]" :style="{ color : diyComponent.saleStyle.color }">已售{{item.sale_num}}{{item.unit || '件'}}</text>
+								</view>
+								<view v-if="diyComponent.btnStyle.control" class="absolute right-[0] bottom-[0]">
+									<view v-if="diyComponent.btnStyle.style == 'button'" :style="goodsBtnCss" class="px-[18rpx] min-w-[100rpx] box-border h-[48rpx] flex items-center justify-center">
+										<text class="text-[20rpx]">{{diyComponent.btnStyle.text}}</text>
+									</view>
+									<view v-else :style="goodsBtnCss" class="w-[50rpx] h-[50rpx] rounded-[50%] flex items-center justify-center">
+										<text :class="[diyComponent.btnStyle.style]" class="nc-iconfont text-[30rpx]"></text>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</block>
+				<block v-if="diyComponent.style == 'style-2'">
+					<view>
+						<template v-for="(item,index) in goodsList">
+							<view v-if="(index%2) == 0" class="flex flex-col bg-[#fff] box-border overflow-hidden" :class="{'mt-[24rpx]': index > 1}" :style="itemCss" @click="toLink(item)">
+								<u--image :width="style2Width" :height="style2Width" :src="img(item.goods_cover_thumb_mid || '')" model="aspectFill">
+									<template #error>
+										<image :style="{'width': style2Width,'height': style2Width}" :src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill"></image>
+									</template>
+								</u--image>
+								<view class="relative min-h-[44rpx] px-[16rpx] flex-1 pt-[16rpx] pb-[20rpx] flex flex-col justify-between">
+									<view class="text-[#303133] leading-[40rpx] text-[28rpx] multi-hidden" :style="{ color : diyComponent.goodsNameStyle.color, fontWeight : diyComponent.goodsNameStyle.fontWeight }" v-if="diyComponent.goodsNameStyle.control">
+										<view class="brand-tag" v-if="item.goods_brand">
+											{{item.goods_brand.brand_name}}
+										</view>
+										{{item.goods_name}}
+									</view>
+									<view v-if="item.goods_label_name && item.goods_label_name.length && diyComponent.labelStyle.control" class="flex flex-wrap">
+										<template v-for="(tagItem, tagIndex) in item.goods_label_name">
+											<image class="img-tag" v-if="tagItem.style_type == 'icon' && tagItem.icon" :src="img(tagItem.icon)" mode="heightFix" @error="diyGoods.error(tagItem,'icon')"></image>
+											<view class="base-tag" v-else-if="tagItem.style_type == 'diy' || !tagItem.icon" :style="diyGoods.baseTagStyle(tagItem)">
+												{{tagItem.label_name}}
+											</view>
+										</template>
+									</view>
+									<view class="flex justify-between flex-wrap items-center mt-[20rpx]">
+										<view class="flex flex-col">
+											<view class="flex items-baseline leading-[1]" v-if="diyComponent.priceStyle.control">
+												<view class="text-[var(--price-text-color)] price-font block truncate max-w-[270rpx]" :style="{ color : diyComponent.priceStyle.color }">
+													<text class="text-[24rpx] font-400">￥</text>
+													<text class="text-[40rpx] font-500">{{ parseFloat(diyGoods.goodsPrice(item)).toFixed(2).split('.')[0] }}</text>
+													<text class="text-[24rpx] font-500">.{{ parseFloat(diyGoods.goodsPrice(item)).toFixed(2).split('.')[1] }}</text>
+												</view>
+												<image  v-if="diyGoods.priceType(item) == 'member_price'" class="max-w-[50rpx] h-[28rpx] ml-[6rpx]" :src="img('addon/shop/VIP.png')" mode="heightFix" />
+											</view>
+											<text v-if="diyComponent.saleStyle.control" class="text-[22rpx] mt-[8rpx] text-[var(--text-color-light9)]" :style="{ color : diyComponent.saleStyle.color }">已售{{item.sale_num}}{{item.unit || '件'}}</text>
+										</view>
+										<view class="absolute right-[16rpx] bottom-[16rpx]" v-if="diyComponent.btnStyle.control">
+											<view v-if="diyComponent.btnStyle.style == 'button'" :style="goodsBtnCss" class="px-[18rpx] h-[48rpx] flex items-center justify-center">
+												<text class="text-[20rpx]">{{diyComponent.btnStyle.text}}</text>
+											</view>
+											<view v-else :style="goodsBtnCss" class="w-[46rpx] h-[46rpx] rounded-[50%] flex items-center justify-center">
+												<text :class="[diyComponent.btnStyle.style]" class="nc-iconfont text-[30rpx]"></text>
+											</view>
+										</view>
+									</view>
+								</view>
+							</view>
+						</template>
+					</view>
+					<view>
+						<template v-for="(item,index) in goodsList">
+							<view v-if="(index%2) == 1" class="flex flex-col bg-[#fff] box-border overflow-hidden" :class="{'mt-[24rpx]': index > 1}" :style="itemCss" @click="toLink(item)">
+								<u--image :width="style2Width" :height="style2Width" :src="img(item.goods_cover_thumb_mid || '')" model="aspectFill">
+									<template #error>
+										<image :style="{'width': style2Width,'height': style2Width}" :src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill"></image>
+									</template>
+								</u--image>
+								<view class="relative min-h-[44rpx] px-[16rpx] flex-1 pt-[16rpx] pb-[20rpx] flex flex-col justify-between">
+									<view class="text-[#303133] leading-[40rpx] text-[28rpx] multi-hidden" :style="{ color : diyComponent.goodsNameStyle.color, fontWeight : diyComponent.goodsNameStyle.fontWeight }" v-if="diyComponent.goodsNameStyle.control">
+										<view class="brand-tag" v-if="item.goods_brand">
+											{{item.goods_brand.brand_name}}
+										</view>
+										{{item.goods_name}}
+									</view>
+									<view v-if="item.goods_label_name && item.goods_label_name.length && diyComponent.labelStyle.control" class="flex flex-wrap">
+										<template v-for="(tagItem, tagIndex) in item.goods_label_name">
+											<image class="img-tag" v-if="tagItem.style_type == 'icon' && tagItem.icon" :src="img(tagItem.icon)" mode="heightFix" @error="diyGoods.error(tagItem,'icon')"></image>
+											<view class="base-tag" v-else-if="tagItem.style_type == 'diy' || !tagItem.icon" :style="diyGoods.baseTagStyle(tagItem)">
+												{{tagItem.label_name}}
+											</view>
+										</template>
+									</view>
+									<view class="flex justify-between flex-wrap items-center mt-[20rpx]">
+										<view class="flex flex-col">
+											<view class="flex items-baseline leading-[1]" v-if="diyComponent.priceStyle.control">
+												<view class="text-[var(--price-text-color)] price-font block truncate max-w-[270rpx]" :style="{ color : diyComponent.priceStyle.color }">
+													<text class="text-[24rpx] font-400">￥</text>
+													<text class="text-[40rpx] font-500">{{ parseFloat(diyGoods.goodsPrice(item)).toFixed(2).split('.')[0] }}</text>
+													<text class="text-[24rpx] font-500">.{{ parseFloat(diyGoods.goodsPrice(item)).toFixed(2).split('.')[1] }}</text>
+												</view>
+												<image v-if="diyGoods.priceType(item) == 'member_price'" class="max-w-[50rpx] h-[28rpx] ml-[6rpx]" :src="img('addon/shop/VIP.png')" mode="heightFix" />
+											</view>
+											<text v-if="diyComponent.saleStyle.control" class="text-[22rpx] mt-[8rpx] text-[var(--text-color-light9)]" :style="{ color : diyComponent.saleStyle.color }">已售{{item.sale_num}}{{item.unit || '件'}}</text>
+										</view>
+										<view class="absolute right-[16rpx] bottom-[16rpx]" v-if="diyComponent.btnStyle.control">
+											<view v-if="diyComponent.btnStyle.style == 'button'" :style="goodsBtnCss" class="px-[18rpx] h-[48rpx] flex items-center justify-center">
+												<text class="text-[20rpx]">{{diyComponent.btnStyle.text}}</text>
+											</view>
+											<view v-else :style="goodsBtnCss" class="w-[46rpx] h-[46rpx] rounded-[50%] flex items-center justify-center">
+												<text :class="[diyComponent.btnStyle.style]" class="nc-iconfont text-[30rpx]"></text>
+											</view>
+										</view>
+									</view>
+								</view>
+							</view>
+						</template>
+					</view>
+				</block>
+				<block v-if="diyComponent.style == 'style-3'">
+					<view :style="style3Css" v-if="goodsList.length">
+						<scroll-view :id="'warpStyle3-'+diyComponent.id" class="whitespace-nowrap min-h-[290rpx]" :scroll-x="true">
+							<view :id="'item'+index+diyComponent.id" class="w-[214rpx] mb-[6rpx] inline-block bg-[#fff] box-border overflow-hidden" :class="{'!mr-[0rpx]' : index == (goodsList.length-1)}" :style="itemCss+itemStyle3" v-for="(item,index) in goodsList" :key="item.goods_id" @click="toLink(item)">
+								<u--image width="214rpx" height="160rpx" :src="img(item.goods_cover_thumb_mid || '')" model="aspectFill">
+									<template #error>
+										<image class="w-[214rpx] h-[160rpx]" :src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill"></image>
+									</template>
+								</u--image>
+								<view class="relative min-h-[40rpx] px-[10rpx] pt-[16rpx] pb-[10rpx]">
+									<view class="text-[26rpx] text-[#303133] truncate" :style="{ color : diyComponent.goodsNameStyle.color, fontWeight : diyComponent.goodsNameStyle.fontWeight }" v-if="diyComponent.goodsNameStyle.control">{{item.goods_name}}</view>
+									<view class="text-[var(--price-text-color)] pt-[16rpx] pb-[6rpx] font-bold price-font block truncate max-w-[160rpx] leading-[1] overflow-hidden" :style="{ color : diyComponent.priceStyle.color }" v-if="diyComponent.priceStyle.control">
+										<text class="text-[20rpx] font-400 mr-[2rpx]">￥</text>
+										<text class="text-[36rpx] font-500">{{ parseFloat(diyGoods.goodsPrice(item)).toFixed(2)}}</text>
+									</view>
+									<view v-if="diyComponent.btnStyle.control" class="absolute right-[10rpx] bottom-[12rpx]">
+										<view v-if="diyComponent.btnStyle.style != 'button'" :style="goodsBtnCss" class="w-[40rpx] h-[40rpx] rounded-[50%] flex items-center justify-center">
+											<text :class="[diyComponent.btnStyle.style]" class="nc-iconfont text-[28rpx]"></text>
+										</view>
+									</view>
+								</view>
+							</view>
+						</scroll-view>
+					</view>
+
+				</block>
+			</view>
+		</view>
+	</x-skeleton>
+</template>
+
+<script setup lang="ts">
+	// 商品列表
+    import { ref,reactive,computed, watch, onMounted, nextTick,getCurrentInstance } from 'vue';
+	import { redirect, img } from '@/utils/common';
+	import useDiyStore from '@/app/stores/diy';
+	import { getGoodsComponents } from '@/addon/shop/api/goods';
+	import {useGoods} from '@/addon/shop/hooks/useGoods'
+
+	const diyGoods = useGoods();
+	const props = defineProps(['component', 'index','value']);
+	const diyStore = useDiyStore();
+	const emits = defineEmits(['loadingFn']); //商品数据加载完成之后触发
+
+    const skeleton = reactive({
+        type: '',
+        loading: diyStore.mode == 'decorate' ? false : true,
+        config: {}
+    })
+
+	const goodsList = ref<Array<any>>([]);
+
+	const diyComponent = computed(() => {
+        if(props.value) {
+            return props.value;
+        }else if (diyStore.mode == 'decorate') {
+			return diyStore.value[props.index];
+		} else {
+			return props.component;
+		}
+	})
+
+	const warpCss = computed(() => {
+		var style = '';
+        style += 'position:relative;';
+		if (diyComponent.value.componentStartBgColor && diyComponent.value.componentEndBgColor) style += `background:linear-gradient(${diyComponent.value.componentGradientAngle},${diyComponent.value.componentStartBgColor},${diyComponent.value.componentEndBgColor});`;
+		else style += 'background-color:' + (diyComponent.value.componentStartBgColor || diyComponent.value.componentEndBgColor) + ';';
+
+        if(diyComponent.value.componentBgUrl) {
+            style += `background-image:url('${ img(diyComponent.value.componentBgUrl) }');`;
+            style += 'background-size: cover;background-repeat: no-repeat;';
+        }
+
+		if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		return style;
+	})
+
+    // 背景图加遮罩层
+    const maskLayer = computed(()=>{
+        var style = '';
+        if(diyComponent.value.componentBgUrl) {
+            style += 'position:absolute;top:0;width:100%;';
+            style += `background: rgba(0,0,0,${diyComponent.value.componentBgAlpha / 10});`;
+            style += `height:${height.value}px;`;
+
+            if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+            if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+            if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+            if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+        }
+
+        return style;
+    });
+
+    const itemCss = computed(() => {
+        var style = '';
+        if (diyComponent.value.elementBgColor) style += 'background-color:' + diyComponent.value.elementBgColor + ';';
+        if (diyComponent.value.topElementRounded) style += 'border-top-left-radius:' + diyComponent.value.topElementRounded * 2 + 'rpx;';
+        if (diyComponent.value.topElementRounded) style += 'border-top-right-radius:' + diyComponent.value.topElementRounded * 2 + 'rpx;';
+        if (diyComponent.value.bottomElementRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomElementRounded * 2 + 'rpx;';
+        if (diyComponent.value.bottomElementRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomElementRounded * 2 + 'rpx;';
+		if(diyComponent.value.style == 'style-2'){
+			if(diyComponent.value.margin && diyComponent.value.margin.both) style += 'width: calc((100vw - ' + (diyComponent.value.margin.both*4) + 'rpx - 20rpx) / 2);'
+			else style += 'width: calc((100vw - 20rpx) / 2 );'
+		}
+        return style;
+    })
+
+	const goodsBtnCss = computed(() => {
+        var style = '';
+        if (diyComponent.value.btnStyle.style == 'button' && diyComponent.value.btnStyle.aroundRadius) style += 'border-radius:' + diyComponent.value.btnStyle.aroundRadius * 2 + 'rpx;';
+        if (diyComponent.value.btnStyle.startBgColor && diyComponent.value.btnStyle.endBgColor){
+			style += `background:linear-gradient(${diyComponent.value.btnStyle.startBgColor},${diyComponent.value.btnStyle.endBgColor});`;
+		}else{
+			style += 'background-color:' + (diyComponent.value.btnStyle.startBgColor || diyComponent.value.btnStyle.endBgColor) + ';';
+		}
+        if (diyComponent.value.btnStyle.textColor) style += 'color:' + diyComponent.value.btnStyle.textColor + ';';
+		if (diyComponent.value.btnStyle.style == 'button' && diyComponent.value.btnStyle.fontWeight) style += 'font-weight: bold;';
+        return style;
+    })
+
+	const style2Width = computed(() => {
+		var style = '';
+		if(diyComponent.value.margin && diyComponent.value.margin.both) style += 'calc((100vw - ' + (diyComponent.value.margin.both*4) + 'rpx - 20rpx) / 2)'
+		else style += 'calc((100vw - 20rpx) / 2 )'
+		return style;
+	})
+
+	const style3Css = computed(() => {
+        var style = '';
+        style += 'padding:0 20rpx;';
+        if (diyComponent.value.margin && diyComponent.value.margin.both){style += 'width: calc(100vw - ' + ((diyComponent.value.margin.both * 4) + 40) + 'rpx);'}
+		else{style += 'box-sizing: border-box; width: 100vw;';}
+        return style;
+    })
+
+	//商品样式三
+	const itemStyle3 = ref('');
+	const setItemStyle3 = ()=>{
+		// #ifdef MP-WEIXIN
+			uni.createSelectorQuery().in(instance).select('#warpStyle3-'+diyComponent.value.id).boundingClientRect((res:any) => {
+				uni.createSelectorQuery().in(instance).select('#item0'+diyComponent.value.id).boundingClientRect((data:any) => {
+					itemStyle3.value = `margin-right:${(res.width - data.width*3)/2}px;`
+				}).exec()
+			}).exec()
+		// #endif
+		// #ifdef H5
+			itemStyle3.value= 'margin-right:14rpx;'
+		// #endif
+	}
+
+	const getGoodsListFn = () => {
+        let data = {
+            num: (diyComponent.value.source == 'all' || diyComponent.value.source == 'category') ? diyComponent.value.num : '',
+            goods_ids: diyComponent.value.source == 'custom' ? diyComponent.value.goods_ids : '',
+            goods_category: diyComponent.value.source == 'category' ? diyComponent.value.goods_category : '',
+            order: diyComponent.value.sortWay
+        }
+        getGoodsComponents(data).then((res) => {
+            goodsList.value = res.data;
+
+	        // 数据为空时隐藏整个组件
+	        // if(goodsList.value.length == 0 && diyComponent.value.pageStyle) {
+		    //     diyComponent.value.pageStyle = '';
+	        // }
+
+            skeleton.loading = false;
+			emits('loadingFn', res.data)
+            if(diyComponent.value.componentBgUrl) {
+                setTimeout(() => {
+                    const query = uni.createSelectorQuery().in(instance);
+                    query.select('.diy-shop-goods-list').boundingClientRect((data: any) => {
+                        if(data) height.value = data.height;
+                    }).exec();
+                }, 1000)
+            }
+			nextTick(()=>{
+				setTimeout(()=>{
+					if(diyComponent.value.style == 'style-3') setItemStyle3()
+				},500)
+			})
+        });
+    }
+
+	const initSkeleton = ()=> {
+        if (diyComponent.value.style == 'style-1') {
+
+            // 单列 风格
+            skeleton.type = 'list'
+            skeleton.type = 'list'
+            skeleton.config = {
+                textRows: 2
+            };
+        } else if (diyComponent.value.style == 'style-2') {
+
+            // 两列 风格
+            skeleton.type = 'waterfall'
+            skeleton.config = {
+                headHeight: '320rpx',
+                gridRows: 1,
+                textRows: 2,
+                textWidth: ['100%', '80%']
+            };
+        } else if (diyComponent.value.style == 'style-3') {
+
+            // 横向滑动 风格
+            skeleton.type = 'waterfall'
+            skeleton.config = {
+                gridRows: 1,
+                gridColumns: 3,
+                headHeight: '200rpx',
+                textRows: 2,
+                textWidth: ['100%', '80%']
+            };
+        }
+    }
+
+    const instance = getCurrentInstance();
+    const height = ref(0)
+
+	onMounted(() => {
+		refresh();
+        // 装修模式下刷新
+        if (diyStore.mode == 'decorate') {
+            watch(
+                () => diyComponent.value,
+                (newValue, oldValue) => {
+                    if (newValue && newValue.componentName == 'GoodsList') {
+                        nextTick(() => {
+                            const query = uni.createSelectorQuery().in(instance);
+                            query.select('.diy-shop-goods-list').boundingClientRect((data: any) => {
+                                if(data) height.value = data.height;
+                            }).exec();
+							if(diyComponent.value.style == 'style-3') setItemStyle3()
+                        })
+                    }
+                }
+            )
+        }else{
+            watch(
+                () => diyComponent.value,
+                (newValue, oldValue) => {
+                    refresh();
+                },
+                {deep: true}
+            )
+        }
+	});
+
+	const refresh = () => {
+		// 装修模式下设置默认图
+		if (diyStore.mode == 'decorate') {
+			let obj = {
+				goods_cover_thumb_mid: "",
+				goods_name: "商品名称",
+				sale_num: "100",
+				unit: "件",
+				goodsSku:{price:100}
+			};
+			goodsList.value.push(obj);
+			goodsList.value.push(obj);
+			nextTick(()=>{
+				if(diyComponent.value.style == 'style-3') setItemStyle3()
+			})
+		}else{
+            initSkeleton();
+			getGoodsListFn();
+		}
+
+	}
+
+	const toLink = (data: any) => {
+		redirect({ url: '/addon/shop/pages/goods/detail', param: { goods_id: data.goods_id } })
+	}
+</script>
+<style lang="scss" scoped>
+    @import '@/addon/shop/styles/common.scss';
+	.biserial-goods-list{
+		display: grid;
+		grid-template-columns: 1fr 1fr;
+		grid-gap: 10px;
+	}
+</style>
diff --git a/uni-app/src/addon/shop/components/diy/many-goods-list/index.vue b/uni-app/src/addon/shop/components/diy/many-goods-list/index.vue
new file mode 100644
index 00000000..4cc3ac55
--- /dev/null
+++ b/uni-app/src/addon/shop/components/diy/many-goods-list/index.vue
@@ -0,0 +1,340 @@
+<template>
+	<view class="overflow-hidden">
+		<scroll-view scroll-x="true" class="many-goods-list-head" :class="diyComponent.headStyle" :scroll-into-view="'a' + cateIndex" :style="warpCss">
+			<template v-if="diyComponent.headStyle == 'style-3'">
+				<template v-if="diyComponent.source == 'custom'">
+					<view v-for="(item,index) in diyComponent.list" :key="index" :class="['flex-col inline-flex items-center justify-center', { 'pr-[40rpx]': (index != diyComponent.list.length-1) }]" @click="changeCateIndex(item,index)">
+						<image :style="{ borderRadius : (diyComponent.aroundRadius * 2) + 'rpx' }" :class="['w-[90rpx] h-[90rpx] overflow-hidden border-[2rpx] border-solid border-transparent', {'border-[var(--primary-color)]': index == cateIndex }]" v-if="item.imageUrl" :src="img(item.imageUrl)" mode="aspectFit"/>
+						<image :style="{ borderRadius : (diyComponent.aroundRadius * 2) + 'rpx' }" :class="['w-[90rpx] h-[90rpx] overflow-hidden border-[2rpx] border-solid border-transparent', {'border-[var(--primary-color)]': index == cateIndex }]" v-else :src="img('static/resource/images/diy/figure.png')" mode="scaleToFill" />
+						<text :class="['text-[28rpx] mt-[16rpx]', {'font-500 text-[var(--primary-color)]' : index == cateIndex  }]">{{ item.title }}</text>
+					</view>
+				</template>
+				<template v-else-if="diyComponent.source == 'goods_category'">
+					<view class="pr-[40rpx] inline-flex flex-col items-center justify-center" @click="changeGoodsCategory({ category_id : 0 })">
+						<image :style="{ borderRadius : (diyComponent.aroundRadius * 2) + 'rpx' }" :class="['w-[90rpx] h-[90rpx] overflow-hidden border-[2rpx] border-solid border-transparent', {'border-[var(--primary-color)]': currentCategoryId == 0}]" :src="img('static/resource/images/diy/figure.png')" mode="scaleToFill" />
+						<text :class="['text-[28rpx] mt-[16rpx]', {'font-500 text-[var(--primary-color)]': currentCategoryId == 0}]">全部</text>
+					</view>
+					<view v-for="(item,index) in goodsCategoryListData" :key="index" :class="['flex-col inline-flex items-center justify-center', { 'pr-[40rpx]': (index != goodsCategoryListData.length-1) }]" @click="changeGoodsCategory(item)">
+						<image :style="{ borderRadius : (diyComponent.aroundRadius * 2) + 'rpx' }" :class="['w-[90rpx] h-[90rpx] overflow-hidden border-[2rpx] border-solid border-transparent', {'border-[var(--primary-color)]': currentCategoryId == item.category_id}]" v-if="item.image" :src="img(item.image)" mode="aspectFit"/>
+						<image :style="{ borderRadius : (diyComponent.aroundRadius * 2) + 'rpx' }" :class="['w-[90rpx] h-[90rpx] overflow-hidden border-[2rpx] border-solid border-transparent', {'border-[var(--primary-color)]': currentCategoryId == item.category_id}]" v-else :src="img('static/resource/images/diy/figure.png')" mode="scaleToFill" />
+						<text :class="['text-[28rpx] mt-[16rpx]', {'font-500 text-[var(--primary-color)]' : currentCategoryId == item.category_id}]">{{ item.category_name }}</text>
+					</view>
+				</template>
+			</template>
+			<template v-else>
+				<view v-for="(item, index) in diyComponent.list" class="scroll-item" :class="[diyComponent.headStyle, { active: index == cateIndex }]" :id="'a' + index" :key="index" @click="changeCateIndex(item, index)">
+					<view class="cate" v-if="diyComponent.headStyle == 'style-1'">
+						<view class="name">{{ item.title }}</view>
+						<view class="desc" :v-if="item.desc">{{ item.desc }}</view>
+					</view>
+					<view v-if="diyComponent.headStyle == 'style-2'" class="cate">
+						<view class="name">{{ item.title }}</view>
+						<text class="nc-iconfont nc-icon-xiaolian-2 !text-[40rpx] text-[var(--primary-color)] transform" v-if="index == cateIndex"></text>
+					</view>
+					<view v-if="diyComponent.headStyle == 'style-4'" class="cate">
+						<view class="name">{{ item.title }}</view>
+					</view>
+				</view>
+			</template>
+		</scroll-view>
+
+		<diy-goods-list class="many-goods-list-body" v-if="goodsValue" :value="goodsValue"></diy-goods-list>
+
+	</view>
+</template>
+
+<script setup lang="ts">
+	// 多商品组 组件
+	import { ref, computed, watch, onMounted } from 'vue';
+	import { img } from '@/utils/common';
+	import useDiyStore from '@/app/stores/diy';
+    import diyGoodsList from '@/addon/shop/components/diy/goods-list/index.vue';
+    import { getGoodsCategoryList } from '@/addon/shop/api/goods';
+
+	const props = defineProps(['component', 'index']);
+	const diyStore = useDiyStore();
+
+	const diyComponent = computed(() => {
+		if (diyStore.mode == 'decorate') {
+			return diyStore.value[props.index];
+		} else {
+			return props.component;
+		}
+	})
+
+	const warpCss = computed(() => {
+		var style = '';
+        if(diyComponent.value.componentStartBgColor) {
+            if (diyComponent.value.componentStartBgColor && diyComponent.value.componentEndBgColor) style += `background:linear-gradient(${diyComponent.value.componentGradientAngle},${diyComponent.value.componentStartBgColor},${diyComponent.value.componentEndBgColor});`;
+            else style += 'background-color:' + diyComponent.value.componentStartBgColor + ';';
+        }
+		if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		return style;
+	})
+
+	onMounted(() => {
+		refresh();
+        // 装修模式下刷新
+        if (diyStore.mode == 'decorate') {
+            watch(
+                () => diyComponent.value,
+                (newValue, oldValue) => {
+                    if (newValue && newValue.componentName == 'ManyGoodsList') {
+                        refresh();
+                    }
+                }
+            )
+        }
+	});
+
+	const refresh = () => {
+        // 装修模式下设置默认图
+		if(diyComponent.value.headStyle == 'style-3' && diyComponent.value.source == 'goods_category' && diyComponent.value.goods_category){
+            getGoodsCategoryFn(diyComponent.value.goods_category);
+		}else{
+            changeCateIndex(diyComponent.value.list[0], 0,true)
+		}
+    }
+
+    const cateIndex = ref(0) // 当前选中的分类id
+
+    const goodsValue:any = ref(null);
+
+	const changeCateIndex = (item:any, index:any, isFirst:any = false)=> {
+        // 装修模式禁止跳转
+        if (diyStore.mode == 'decorate' && !isFirst) return;
+
+        cateIndex.value = index;
+        refreshGoodsList({
+            source: item.source,
+            goods_category: item.goods_category,
+            goods_ids: item.goods_ids
+        })
+    }
+
+    const goodsCategoryListData = ref([])
+    const currentCategoryId = ref(0) // 当前选中的分类id
+
+    // 获取商品分类列表
+    const getGoodsCategoryFn = (pid:any)=> {
+        getGoodsCategoryList({
+            pid
+        }).then(res => {
+            if (res.code == 1) {
+                goodsCategoryListData.value = res.data;
+                if (goodsCategoryListData.value) {
+                    refreshGoodsList({
+                        source: 'category',
+                        goods_category: ''
+                    });
+                }
+            }
+        })
+    }
+
+    // 切换商品分类，查询商品列表数据
+    const changeGoodsCategory = (item :any)=> {
+        // 装修模式禁止跳转
+        if (diyStore.mode == 'decorate') return;
+        currentCategoryId.value = item.category_id
+        refreshGoodsList({
+            source: 'category',
+            goods_category: currentCategoryId.value
+        });
+    }
+
+    const refreshGoodsList = (obj:any)=> {
+        goodsValue.value = {
+            style: diyComponent.value.style,
+            margin: diyComponent.value.margin,
+            source: obj.source,
+
+            num: diyComponent.value.num,
+            sortWay: diyComponent.value.sortWay,
+
+            goodsNameStyle: diyComponent.value.goodsNameStyle,
+            priceStyle: diyComponent.value.priceStyle,
+            saleStyle: diyComponent.value.saleStyle,
+            btnStyle: diyComponent.value.btnStyle,
+			labelStyle: diyComponent.value.labelStyle,
+
+            elementBgColor: diyComponent.value.elementBgColor,
+            topElementRounded: diyComponent.value.topElementRounded,
+            bottomElementRounded: diyComponent.value.bottomElementRounded
+        };
+
+        if (obj.goods_category) {
+            goodsValue.value.goods_category = obj.goods_category
+        }
+        if (obj.goods_ids && obj.goods_ids.length) {
+            goodsValue.value.goods_ids = obj.goods_ids
+        }
+    }
+
+</script>
+
+<style lang="scss" scoped>
+	.many-goods-list-head {
+		left: 0;
+		right: 0;
+		z-index: 5;
+		width: 100%;
+		white-space: nowrap;
+		box-sizing: border-box;
+		padding: 20rpx 0 10rpx;
+		margin-bottom:20rpx;
+		position: relative;
+
+		&.style-1{
+			padding: 26rpx 0 14rpx;
+		}
+
+		&.style-2{
+			height: 100rpx;
+			padding: 20rpx 0 16rpx;
+		}
+
+		&.style-3{
+			padding: 26rpx 20rpx;
+			background-color: #fff;
+			margin-bottom: 20rpx;
+			width: 100%;
+			white-space: nowrap;
+			box-sizing: border-box;
+		}
+
+		&.style-4{
+			padding-bottom: 0;
+		}
+
+		.scroll-item {
+			display: inline-block;
+			text-align: center;
+			width: auto;
+			padding: 0 20rpx;
+
+			&.style-1{
+				&:first-child {
+					width: calc(25% - 20rpx);
+					padding-left: 0;
+				}
+
+				&.active {
+					.name{
+						color: var(--primary-color);
+						font-weight: 500;
+					}
+					.desc {
+						color: #ffffff;
+						border-radius: 20rpx;
+						background-color: var(--primary-color);
+					}
+				}
+
+				.name {
+					font-size: 30rpx;
+					color: #333;
+					line-height: 1;
+				}
+
+				.cate {
+					display: inline-block;
+				}
+
+				.desc {
+					font-size: 22rpx;
+					color: #999;
+					height: 38rpx;
+					line-height: 38rpx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					margin-top: 10rpx;
+					min-width: 110rpx;
+					max-width: 220rpx;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					padding: 0 10rpx;
+				}
+			}
+
+			&.style-2{
+				.cate{
+					display: flex;
+					flex-direction: column;
+					align-items: center;
+					position: relative;
+				}
+				.name{
+					font-size: 28rpx;
+					color: #333;
+					line-height: 32rpx;
+				}
+				&.active {
+					.name{
+						color:var(--primary-color);
+						font-weight: 500;
+					}
+					.nc-iconfont{
+						position: absolute;
+						bottom: -35rpx;
+					}
+				}
+			}
+			&.style-4{
+				padding: 0 10rpx 14rpx;
+				.cate{
+					display: flex;
+					flex-direction: column;
+					align-items: center;
+					position: relative;
+					padding: 10rpx 12rpx;
+					background-color: #F6F6F6;
+					border-radius: 12rpx;
+					min-width: 136rpx;
+					box-sizing: border-box;
+					border: 2rpx solid #F6F6F6;
+				}
+				.name{
+					font-size: 28rpx;
+					color: #333;
+					line-height: 32rpx;
+				}
+				&.active {
+					.cate{
+						background-color: var(--primary-color-light);
+						border-color: var(--primary-color);
+						position: relative;
+						&::after{
+							content: "";
+							width: 18rpx;
+							height: 18rpx;
+							position: absolute;
+							background-color: var(--primary-color-light);
+							border: 2rpx solid transparent;
+							border-bottom-color: var(--primary-color);
+							border-right-color: var(--primary-color);
+							bottom: -12rpx;
+							left: 50%;
+							transform: translateX(-50%) rotate(45deg);
+							border-bottom-right-radius: 10rpx;
+						}
+					}
+					.name{
+						color: var(--primary-color);
+						font-weight: 500;
+					}
+					.nc-iconfont{
+						position: absolute;
+						bottom: -35rpx;
+					}
+				}
+			}
+		}
+
+	}
+
+</style>
diff --git a/uni-app/src/addon/shop/components/diy/shop-exchange-goods/index.vue b/uni-app/src/addon/shop/components/diy/shop-exchange-goods/index.vue
new file mode 100644
index 00000000..929e9b3b
--- /dev/null
+++ b/uni-app/src/addon/shop/components/diy/shop-exchange-goods/index.vue
@@ -0,0 +1,234 @@
+<template>
+	<x-skeleton :type="skeleton.type" :loading="skeleton.loading" :config="skeleton.config">
+		<view class="overflow-hidden" :style="warpCss">
+			<view :style="maskLayer"></view>
+			<view class="diy-shop-exchange-goods-list relative flex flex-wrap justify-between" v-if="goodsList.length">
+				<view class="overflow-hidden bg-[#fff] flex flex-col box-border w-[calc(50%-10rpx)] rounded-[var(--rounded-mid)]" :class="{'mt-[20rpx]': index > 1}" :style="itemCss" v-for="(item,index) in goodsList" :key="item.goods_id" @click="toLink(item)">
+					<u--image :width="style2Width" :height="style2Width" radius="var(--rounded-mid)" :src="img(item.goods_cover_thumb_mid || '')" model="aspectFill">
+						<template #error>
+							<image class="rounded-[var(--rounded-mid)] overflow-hidden" :style="{'width': style2Width,'height': style2Width}" :src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill"></image>
+						</template>
+					</u--image>
+					<view class="flex-1 pt-[10rpx] pb-[20rpx] px-[16rpx] flex flex-col justify-between">
+						<view class="text-[#333] leading-[40rpx] text-[28rpx] multi-hidden" :style="{ color : diyComponent.goodsNameStyle.color, fontWeight : diyComponent.goodsNameStyle.fontWeight }">{{item.names}}</view>
+						<view class="text-[22rpx] leading-[28rpx] mt-[10rpx] text-[var(--text-color-light9)]" :style="{ color : diyComponent.saleStyle.color }">已兑{{item.total_exchange_num}}人</view>
+						<view class="flex justify-between flex-wrap items-center mt-[16rpx]" >
+							<view class="flex flex-col">
+								<view :style="{ color : diyComponent.priceStyle.mainColor }" class="text-[var(--price-text-color)] price-font ml-[2rpx] flex items-baseline">
+									<text class="text-[32rpx]">{{ item.point  }}</text>
+									<text class="text-[24rpx] ml-[4rpx]">积分</text>
+								</view>
+								<view v-if="item.price&&item.price>0" class="flex items-center mt-[6rpx] price-font">
+									<text :style="{ color : diyComponent.priceStyle.mainColor }" class="text-[#333] font-400 text-[32rpx]">+{{ parseFloat(item.price).toFixed(2)  }}</text>
+									<text :style="{ color : diyComponent.priceStyle.mainColor }" class="text-[var(--price-text-color)] font-400 ml-[4rpx] text-[24rpx]">元</text>
+								</view>
+							</view>
+							<view class="w-[120rpx] h-[54rpx] text-[22rpx] flex-center !text-[#fff] m-0 rounded-full primary-btn-bg remove-border text-center" shape="circle">去兑换</view>
+						</view>
+					</view>
+				</view>
+			</view>
+            <view v-else-if="!goodsList.length" class="empty-page">
+                <image class="img" :src="img('static/resource/images/system/empty.png')" model="aspectFit" />
+                <view class="desc">暂无商品</view>
+            </view>
+		</view>
+	</x-skeleton>
+</template>
+
+<script setup lang="ts">
+	// 积分商品列表
+    import { ref,reactive,computed, watch, onMounted, nextTick,getCurrentInstance } from 'vue';
+	import { redirect, img } from '@/utils/common';
+	import useDiyStore from '@/app/stores/diy';
+	import { getExchangeComponentsList } from '@/addon/shop/api/point';
+
+	const props = defineProps(['component', 'index','value']);
+	const diyStore = useDiyStore();
+
+    const skeleton = reactive({
+        type: '',
+        loading: diyStore.mode == 'decorate' ? false : true,
+        config: {}
+    })
+
+	const goodsList = ref<Array<any>>([]);
+
+	const diyComponent = computed(() => {
+        if(props.value) {
+            return props.value;
+        }else if (diyStore.mode == 'decorate') {
+			return diyStore.value[props.index];
+		} else {
+			return props.component;
+		}
+	})
+
+	const warpCss = computed(() => {
+		var style = '';
+        style += 'position:relative;';
+        if(diyComponent.value.componentStartBgColor) {
+            if (diyComponent.value.componentStartBgColor && diyComponent.value.componentEndBgColor) style += `background:linear-gradient(${diyComponent.value.componentGradientAngle},${diyComponent.value.componentStartBgColor},${diyComponent.value.componentEndBgColor});`;
+            else style += 'background-color:' + diyComponent.value.componentStartBgColor + ';';
+        }
+
+        if(diyComponent.value.componentBgUrl) {
+            style += `background-image:url('${ img(diyComponent.value.componentBgUrl) }');`;
+            style += 'background-size: cover;background-repeat: no-repeat;';
+        }
+
+		if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		return style;
+	})
+
+    // 背景图加遮罩层
+    const maskLayer = computed(()=>{
+        var style = '';
+        if(diyComponent.value.componentBgUrl) {
+            style += 'position:absolute;top:0;width:100%;';
+            style += `background: rgba(0,0,0,${diyComponent.value.componentBgAlpha / 10});`;
+            style += `height:${height.value}px;`;
+
+            if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+            if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+            if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+            if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+        }
+
+        return style;
+    });
+
+    const itemCss = computed(() => {
+        var style = '';
+        if (diyComponent.value.topElementRounded) style += 'border-top-left-radius:' + diyComponent.value.topElementRounded * 2 + 'rpx;';
+        if (diyComponent.value.topElementRounded) style += 'border-top-right-radius:' + diyComponent.value.topElementRounded * 2 + 'rpx;';
+        if (diyComponent.value.bottomElementRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomElementRounded * 2 + 'rpx;';
+        if (diyComponent.value.bottomElementRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomElementRounded * 2 + 'rpx;';
+        return style;
+    })
+
+	const style2Width = computed(() => {
+		var style = '';
+		if(diyComponent.value.margin && diyComponent.value.margin.both) style += 'calc((100vw - ' + (diyComponent.value.margin.both*4) + 'rpx - 20rpx) / 2)'
+		else style += 'calc((100vw - 20rpx) / 2 )'
+		return style;
+	})
+
+	const getGoodsListFn = () => {
+        let data = {
+            order: diyComponent.value.sortWay,
+            num: diyComponent.value.source == 'all' ? diyComponent.value.num : '',
+            ids: diyComponent.value.source == 'custom' ? diyComponent.value.goods_ids.join(',') : '',
+        }
+        getExchangeComponentsList(data).then((res) => {
+            goodsList.value = res.data;
+            skeleton.loading = false;
+
+	        // 数据为空时隐藏整个组件
+	        // if(goodsList.value.length == 0) {
+		    //     diyComponent.value.pageStyle = '';
+	        // }
+            if(diyComponent.value.componentBgUrl) {
+                setTimeout(() => {
+                    const query = uni.createSelectorQuery().in(instance);
+                    query.select('.diy-shop-exchange-goods-list').boundingClientRect((data: any) => {
+                        height.value = data.height;
+                    }).exec();
+                }, 1000)
+            }
+        });
+    }
+
+	const initSkeleton = ()=> {
+        if (diyComponent.value.style == 'style-1') {
+
+            // 单列 风格
+            skeleton.type = 'list'
+            skeleton.type = 'list'
+            skeleton.config = {
+                textRows: 2
+            };
+        } else if (diyComponent.value.style == 'style-2') {
+
+            // 两列 风格
+            skeleton.type = 'waterfall'
+            skeleton.config = {
+                headHeight: '320rpx',
+                gridRows: 1,
+                textRows: 2,
+                textWidth: ['100%', '80%']
+            };
+        } else if (diyComponent.value.style == 'style-3') {
+
+            // 横向滑动 风格
+            skeleton.type = 'waterfall'
+            skeleton.config = {
+                gridRows: 1,
+                gridColumns: 3,
+                headHeight: '200rpx',
+                textRows: 2,
+                textWidth: ['100%', '80%']
+            };
+        }
+    }
+
+    const instance = getCurrentInstance();
+    const height = ref(0)
+
+	onMounted(() => {
+		refresh();
+        // 装修模式下刷新
+        if (diyStore.mode == 'decorate') {
+            watch(
+                () => diyComponent.value,
+                (newValue, oldValue) => {
+                    if (newValue && newValue.componentName == 'ShopExchangeGoods') {
+                        nextTick(() => {
+                            const query = uni.createSelectorQuery().in(instance);
+                            query.select('.diy-shop-exchange-goods-list').boundingClientRect((data: any) => {
+                                height.value = data.height;
+                            }).exec();
+                        })
+                    }
+                }
+            )
+        }else{
+            watch(
+                () => diyComponent.value,
+                (newValue, oldValue) => {
+                    refresh();
+                },
+                {deep: true}
+            )
+        }
+	});
+
+	const refresh = () => {
+		// 装修模式下设置默认图
+		if (diyStore.mode == 'decorate') {
+			let obj = {
+				image: "",
+				names: "商品名称",
+				total_exchange_num: 100,
+				point: 100,
+				price:100
+			};
+			goodsList.value.push(obj);
+			goodsList.value.push(obj);
+		}else{
+            initSkeleton();
+			getGoodsListFn();
+		}
+	}
+
+	const toLink = (data: any) => {
+		redirect({ url: '/addon/shop/pages/point/detail', param: { id: data.id } })
+	}
+
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/uni-app/src/addon/shop/components/diy/shop-exchange-info/index.vue b/uni-app/src/addon/shop/components/diy/shop-exchange-info/index.vue
new file mode 100644
index 00000000..e25d05f1
--- /dev/null
+++ b/uni-app/src/addon/shop/components/diy/shop-exchange-info/index.vue
@@ -0,0 +1,125 @@
+<template>
+	<view :style="warpCss" class="shop-exchange-info-wrap">
+		<view class="pl-[60rpx] pt-[71rpx] pb-[133rpx] min-h-[382rpx] box-border text-[#fff]">
+			<!-- #ifdef MP-WEIXIN -->
+			<view :style="navbarInnerStyle"></view>
+			<!-- #endif -->
+			<template v-if="token">
+				<view class="text-[34rpx] leading-[48rpx]">我的积分</view>
+				<view class="text-[80rpx] font-500 price-font leading-[112rpx]">{{memberPoint.point||0}}</view>
+				<view class="text-[24rpx] font-400 leading-[34rpx]">今日获得：{{memberPoint.today_point||0}}</view>
+			</template>
+			<template v-else>
+				<view class="pt-[42rpx] title">积分当钱花</view>
+				<view class="text-[26rpx] leading-[36rpx] text-[#FEF2C0] mt-[10rpx]">做任务可领积分</view>
+			</template>
+		</view>
+	</view>
+</template>
+
+<script lang="ts" setup>
+	import { computed, ref, watch,onMounted } from 'vue'
+	import { getExchangePoint } from '@/addon/shop/api/point';
+	import { img, getToken } from '@/utils/common';
+	import { t } from '@/locale'
+	import useDiyStore from '@/app/stores/diy'
+
+	const props = defineProps(['component', 'index','global']);
+
+	const diyStore = useDiyStore();
+	const loading = ref(true)
+	const diyComponent = computed(() => {
+		if (diyStore.mode == 'decorate') {
+			return diyStore.value[props.index];
+		} else {
+			return props.component;
+		}
+	})
+
+	const warpCss = computed(() => {
+		var style = '';
+		if (diyComponent.value.bgUrl) {
+			style += 'background-image:url(' + img(diyComponent.value.bgUrl) + ');';
+			style += 'background-size: 100%;';
+			style += 'backgroundPosition: bottom;';
+			style += 'background-repeat: no-repeat;';
+		}
+		if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+
+		return style;
+	})
+
+
+	onMounted(() => {
+		refresh();
+	});
+
+	watch(
+	    () => diyComponent.value,
+		(newValue, oldValue) => {
+            refresh();
+    },{deep: true})
+
+	const memberPoint :Record<string, any> = ref({})
+
+	const token = ref(getToken())
+
+	const refresh = () => {
+        // 装修模式
+        if (diyStore.mode == 'decorate') {
+            memberPoint.value = {
+                point: 10500,
+                today_point: 500,
+            }
+        } else {
+            if (!token) {
+                return;
+            }
+            getExchangePointFn()
+        }
+    }
+
+	const getExchangePointFn= async()=> {
+        const res = await getExchangePoint()
+        memberPoint.value = res.data
+		loading.value = false
+    }
+
+	let menuButtonInfo: any = {};
+	// 如果是小程序，获取右上角胶囊的尺寸信息，避免导航栏右侧内容与胶囊重叠(支付宝小程序非本API，尚未兼容)
+	// #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+	menuButtonInfo = uni.getMenuButtonBoundingClientRect();
+	// #endif
+
+// 导航栏内部盒子的样式
+const navbarInnerStyle = computed(() => {
+    let style = '';
+    // 导航栏宽度，如果在小程序下，导航栏宽度为胶囊的左边到屏幕左边的距离
+    // #ifdef MP
+    if (props.global.topStatusBar.isShow == false) {
+        style += 'height:' + menuButtonInfo.height + 'px;';
+        style += 'padding-top:' + menuButtonInfo.top + 'px;';
+    }
+    // #endif
+    return style;
+})
+</script>
+
+<style lang="scss" scoped>
+.title{
+	width: 240rpx;
+	height: 58rpx;
+	font-family: FZLanTingHei-EB-GBK, FZLanTingHei-EB-GBK;
+	font-weight: 700;
+	font-size: 48rpx;
+	line-height: 56rpx;
+	text-align: left;
+	color: transparent;
+	background: linear-gradient(90.00002732075491deg, #FFFDF0 5%, #FEF1B9 88%);
+	-webkit-background-clip: text; /* 确保背景色可以应用到文字上 */
+	background-clip: text;
+}
+</style>
diff --git a/uni-app/src/addon/shop/components/diy/shop-goods-ranking/index.vue b/uni-app/src/addon/shop/components/diy/shop-goods-ranking/index.vue
new file mode 100644
index 00000000..23a7380b
--- /dev/null
+++ b/uni-app/src/addon/shop/components/diy/shop-goods-ranking/index.vue
@@ -0,0 +1,190 @@
+<template>
+	<view :style="warpCss" class="overflow-hidden">
+		<scroll-view scroll-x="true" class="w-[100%] whitespace-nowrap">
+			<view class="flex items-start">
+				<view class="inline-block" v-for="(item,index) in diyComponent.list" :key="index">
+					<view class="w-[460rpx] px-[20rpx] pb-[20rpx] pt-[20rpx] flex flex-col items-start" :class="{'mr-[20rpx]': (diyComponent.list.length-1) != index}" :style="swiperItemCss(item)" v-if="listGoods[item.rankIds[0]] && listGoods[item.rankIds[0]].length > 0">
+						<view class="flex items-center h-[50rpx]">
+							<image class="w-[30rpx] h-[30rpx] mr-[10rpx]" v-if="item.imgUrl" :src="img(item.imgUrl)" mode="aspectFill"></image>
+							<view :style="{'color': item.textColor}">
+								<text class="text-[30rpx] font-bold" v-if="item.text">{{ item.text }}</text>
+								<text class="text-[30rpx] font-bold" v-else>{{ listGoodsNames[item.rankIds[0]] }}</text>
+							</view>
+						</view>
+						<view class="flex items-center mt-[6rpx]" :style="{'color': item.subTitle.textColor}" @click="diyStore.toRedirect(item.subTitle.link)">
+							<text class="text-[24rpx] font-500" v-if="item.subTitle.text">{{item.subTitle.text}}</text>
+							<text class="iconfont iconyouV6xx !text-[24rpx]" v-if="item.subTitle.text"></text>
+						</view>
+						<view class="mt-[24rpx]">
+							<view class="flex bg-[rgba(255,255,255,0.94)] p-[10rpx] rounded-[16rpx] mb-[16rpx]"  v-for="(goods, gIndex) in listGoods[item.rankIds[0]]"  :class="{'mb-0': gIndex === listGoods[item.rankIds[0]].length - 1}" @click="toDetail(goods.goods_id)">
+								<view class="relative w-[130rpx] h-[130rpx] mr-[16rpx]">
+									<image class="absolute top-[6rpx] left-[8rpx] w-[30rpx] h-[36rpx]" :style="{ zIndex:2 }" :src="getRankBadge(goods.rank_num)" mode="aspectFill"></image>
+									<view class="absolute top-[2rpx] left-[-3rpx] flex items-center justify-center w-[50rpx] h-[50rpx]"  :style="{ zIndex: 3 }">
+									  <text class="text-[20rpx] font-bold text-[#fff]">{{ goods.rank_num }}</text>
+									</view>
+									<u--image radius="var(--goods-rounded-big)" width="130rpx" height="130rpx" :src="img(goods.goods_cover_thumb_mid || '')" model="aspectFill">
+										<template #error>
+											<image class="w-[130rpx] h-[130rpx] rounded-[var(--goods-rounded-big)] overflow-hidden" :src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill"></image>
+										</template>
+									</u--image>
+								</view>
+								<view class="flex flex-col">
+									<view class="leading-[1.3] multi-hidden w-[290rpx] text-[28rpx] whitespace-normal">{{goods.goods_name}}</view>
+									<view class="flex items-center justify-between mt-[auto]">
+										<view class="text-[var(--price-text-color)] price-font flex items-baseline">
+											<text class="text-[24rpx] font-500">￥</text>
+											<text class="text-[40rpx] font-500">{{ diyGoods.goodsPrice(goods).toFixed(2).split('.')[0] }}</text>
+											<text class="text-[24rpx] font-500">.{{ diyGoods.goodsPrice(goods).toFixed(2).split('.')[1] }}</text>
+										</view>
+										<view>
+											<text class="iconfont icongouwuche3 text-[var(--primary-color)] border-[2rpx] border-solid border-[var(--primary-color)] rounded-[50%] text-[22rpx] p-[6rpx]"></text>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+
+		</scroll-view>
+	</view>
+</template>
+
+<script lang="ts" setup>
+	// 排行榜
+    import { ref,reactive,computed, watch, onMounted } from 'vue';
+	import useDiyStore from '@/app/stores/diy';
+	import { redirect, img } from '@/utils/common';
+    import { getRankComponentsGoodsList } from '@/addon/shop/api/rank'
+	import { useGoods } from '@/addon/shop/hooks/useGoods'
+
+	const props = defineProps(['component', 'index']);
+	const diyGoods = useGoods();
+	const diyStore = useDiyStore();
+
+	const diyComponent = computed(() => {
+		if (diyStore.mode == 'decorate') {
+			return diyStore.value[props.index];
+		} else {
+			return props.component;
+		}
+	})
+
+	const warpCss = computed(() => {
+		var style = '';
+        style += 'position:relative;';
+        if(diyComponent.value.componentStartBgColor) {
+            if (diyComponent.value.componentStartBgColor && diyComponent.value.componentEndBgColor) style += `background:linear-gradient(${diyComponent.value.componentGradientAngle},${diyComponent.value.componentStartBgColor},${diyComponent.value.componentEndBgColor});`;
+            else style += 'background-color:' + diyComponent.value.componentStartBgColor + ';';
+        }
+
+		if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		return style;
+	})
+
+	const swiperItemCss = (data: any)=> {
+		var style = '';
+		if (data.listFrame.startColor) {
+			if (data.listFrame.startColor && data.listFrame.endColor) style += 'background: linear-gradient(90deg, ' + data.listFrame.startColor + ', ' + data.listFrame.endColor + ');';
+			else style = 'background-color:' + data.listFrame.startColor + ';';
+		}
+		if (data.bgUrl) {
+			style += 'background-image:' + 'url(' + img(data.bgUrl) + ');';
+			style += 'background-size: 100%;';
+			style += 'background-repeat: no-repeat;';
+		}
+
+		if (diyComponent.value.topElementRounded) style += 'border-top-left-radius:' + diyComponent.value.topElementRounded * 2 + 'rpx;';
+		if (diyComponent.value.topElementRounded) style += 'border-top-right-radius:' + diyComponent.value.topElementRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomElementRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomElementRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomElementRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomElementRounded * 2 + 'rpx;';
+		return style;
+	}
+
+	watch(
+	    () => diyComponent.value,
+		(newValue, oldValue) => {
+	        refresh();
+	},{deep: true})
+
+	const refresh = () => {
+		// 装修模式下刷新
+		if (diyStore.mode == 'decorate') {
+			if(diyComponent.value.componentName == 'ShopGoodsRanking') {
+				const fakeGoods = {
+					goods_name: '商品名称',
+					goods_cover_thumb_mid: '',
+					goodsSku: {
+						price: 10
+					},
+					rank_num: 0  // 初始化为 0，后续会递增
+				};
+				diyComponent.value.list.forEach(item => {
+					if (!item.goodsList) {
+						item.goodsList = [];
+					}
+
+					if (item.goodsList.length === 0) {
+						const fakeGoodsList = [];
+						// 生成三个商品，并为每个商品的 rank_num 递增
+						for (let i = 0; i < 3; i++) {
+							const newItem = { ...fakeGoods, rank_num: i + 1 };  // rank_num 从 1 开始递增
+							fakeGoodsList.push(newItem);
+						}
+						listGoods[item.rankIds[0]] = fakeGoodsList;
+					}
+				});
+			}
+		} else {
+			getRankGoodsListFn();
+		}
+
+	};
+
+	const listGoods = reactive({});
+	const listGoodsNames = reactive({});
+	const getRankGoodsListFn = () => {
+		diyComponent.value.list.forEach((item) => {
+			const rank_id = Array.isArray(item.rankIds) ? item.rankIds[0] : 0;
+			const data = {
+				rank_id: item.source === 'custom' ? rank_id : 0
+			};
+			getRankComponentsGoodsList(data).then((res) => {
+				if (res.data && res.data.goods_list.length > 0) {
+					listGoods[item.rankIds[0]] = res.data.goods_list;
+					listGoodsNames[item.rankIds[0]] = res.data.name;
+				}
+			}).catch((error) => {
+				console.error('获取商品数据失败:', error);
+			});
+
+		});
+	};
+
+	function getRankBadge(sort: any) {
+		switch (sort) {
+			case 1:
+				return img('addon/shop/rank/rank_first.png');
+			case 2:
+				return img('addon/shop/rank/rank_second.png');
+			case 3:
+				return img('addon/shop/rank/rank_third.png');
+			default:
+				return img('addon/shop/rank/rank.png');
+		}
+	}
+	const toDetail = (id: string | number) => {
+		redirect({ url: '/addon/shop/pages/goods/detail', param: { goods_id: id }, mode: 'navigateTo' })
+	}
+
+	onMounted(() => {
+	  refresh();
+	});
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/uni-app/src/addon/shop/components/diy/shop-goods-recommend/index.vue b/uni-app/src/addon/shop/components/diy/shop-goods-recommend/index.vue
new file mode 100644
index 00000000..b0069429
--- /dev/null
+++ b/uni-app/src/addon/shop/components/diy/shop-goods-recommend/index.vue
@@ -0,0 +1,203 @@
+<template>
+	<x-skeleton :type="skeleton.type" :loading="skeleton.loading" :config="skeleton.config">
+		<view :style="warpCss"  v-if="goodsNum">
+			<view class="w-full">
+				<scroll-view :id="'warpStyle-'+diyComponent.id" class="whitespace-nowrap h-[341rpx] w-full" :scroll-x="true">
+					<block v-for="(item,index) in goodsList" :key="index">
+						<view v-if="item.info" :id="'item'+index+diyComponent.id" class="w-[224rpx] h-[341rpx] mr-[20rpx] inline-block bg-[#fff] box-border overflow-hidden" :class="{'!mr-[0rpx]' : index == (goodsList.length-1)}" :style="itemCss+itemStyle" @click="toLink(item)">
+							<view class="w-full h-[134rpx]" :style="listFrameStyle(item)">
+								<view class="flex pl-[16rpx] pr-[20rpx] justify-between h-[63rpx] items-center">
+									<view class="text-[28rpx] leading-[34rpx] flex-1 mr-[8rpx]" :style="{'color':item.title.textColor}">{{item.title.text}}</view>
+									<view class="w-[68rpx] h-[34rpx] text-[22rpx] text-center leading-[34rpx] text-[#fff] rounded-[17rpx]" :style="moreTitleStyle(item)">{{item.moreTitle.text}}</view>
+								</view>
+							</view>
+							<view class="mt-[-71rpx] h-[278rpx] w-full px-[20rpx] pt-[18rpx] box-border bg-white" :style="itemCss">
+								<view class="flex items-center justify-center w-[184rpx] h-[184rpx]">
+									<u--image width="184rpx" height="184rpx" :radius="'var(--goods-rounded-small)'" :src="img(item.info.goods_cover_thumb_mid || '')" model="aspectFill">
+										<template #error>
+											<image class="w-[184rpx] h-[184rpx] rounded-[var(--goods-rounded-small)]" :src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill"></image>
+										</template>
+									</u--image>
+								</view>
+								<view class="pt-[12rpx]">
+									<view class="h-[44rpx] pl-[4rpx] min-w-[168rpx] box-border flex justify-between items-center mx-auto border-[2rpx] border-solid border-[var(--primary-color)] rounded-[20rpx]" :style="{'border-color':item.button.color}">
+										<view class="text-[var(--price-text-color)] font-bold price-font flex items-baseline leading-[40rpx] flex-1 justify-center" >
+											<view class="leading-[1] max-w-[105rpx] truncate" :style="{ color : diyComponent.priceStyle.mainColor }">
+												<text class="text-[18rpx] font-400 mr-[2rpx]">￥</text>
+												<text class="text-[28rpx] font-500">{{ parseFloat(diyGoods.goodsPrice(item.info.goodsSku)).toFixed(2)}}</text>
+											</view>
+										</view>
+										<view class="w-[70rpx] box-border text-right text-[#fff] pr-[8rpx] text-[22rpx] font-500 leading-[44rpx] rounded-tr-[20rpx] rounded-br-[20rpx] rounded-tl-[24rpx] relative" :style="{'background-color':item.button.color}">
+											<text>{{item.button.text}}</text>
+											<image class="w-[24rpx] h-[44rpx] absolute top-[-2rpx] left-0" :src="img('/addon/shop/Union.png')" />
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</block>
+				</scroll-view>
+
+			</view>
+		</view>
+	</x-skeleton>
+</template>
+
+<script setup lang="ts">
+	// 商品推荐
+    import { ref,reactive,computed, watch, onMounted, nextTick,getCurrentInstance } from 'vue';
+	import { redirect, img, deepClone } from '@/utils/common';
+	import useDiyStore from '@/app/stores/diy';
+	import { getGoodsComponents } from '@/addon/shop/api/goods';
+	import {useGoods} from '@/addon/shop/hooks/useGoods'
+
+	const diyGoods = useGoods();
+	const props = defineProps(['component', 'index','value']);
+	const diyStore = useDiyStore();
+	const emits = defineEmits(['loadingFn']); //商品数据加载完成之后触发
+
+	const goodsNum = ref(0);
+
+    const skeleton = reactive({
+        type: '',
+        loading: false,
+        config: {}
+    })
+
+	const goodsList = ref<Array<any>>([]);
+
+	const diyComponent = computed(() => {
+        if(props.value) {
+            return props.value;
+        }else if (diyStore.mode == 'decorate') {
+			return diyStore.value[props.index];
+		} else {
+			return props.component;
+		}
+	})
+	const warpCss = computed(() => {
+		var style = '';
+        style += 'position:relative;';
+        if(diyComponent.value.componentStartBgColor) {
+            if (diyComponent.value.componentStartBgColor && diyComponent.value.componentEndBgColor) style += `background:linear-gradient(${diyComponent.value.componentGradientAngle},${diyComponent.value.componentStartBgColor},${diyComponent.value.componentEndBgColor});`;
+            else style += 'background-color:' + diyComponent.value.componentStartBgColor + ';';
+        }
+
+		if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		return style;
+	})
+
+    const itemCss = computed(() => {
+        var style = '';
+        if (diyComponent.value.elementBgColor) style += 'background-color:' + diyComponent.value.elementBgColor + ';';
+        if (diyComponent.value.topElementRounded) style += 'border-top-left-radius:' + diyComponent.value.topElementRounded * 2 + 'rpx;';
+        if (diyComponent.value.topElementRounded) style += 'border-top-right-radius:' + diyComponent.value.topElementRounded * 2 + 'rpx;';
+        if (diyComponent.value.bottomElementRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomElementRounded * 2 + 'rpx;';
+        if (diyComponent.value.bottomElementRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomElementRounded * 2 + 'rpx;';
+        return style;
+    })
+
+	//listFrame样式
+	const listFrameStyle = (item:any)=>{
+		var style= '';
+		 if(item.listFrame.startColor){
+			if(item.listFrame.startColor && item.listFrame.endColor) style = `background:linear-gradient( 110deg, ${item.listFrame.startColor} 0%, ${item.listFrame.endColor} 100%);`;
+			else style = 'background-color:' + item.listFrame.startColor + ';';
+		 }
+		 return style
+	}
+
+	//moreTitle样式
+	const moreTitleStyle = (item:any)=>{
+		var style= '';
+		 if(item.moreTitle.startColor){
+			if(item.moreTitle.startColor && item.moreTitle.endColor) style = `background:linear-gradient( 0deg, ${item.moreTitle.startColor} 0%, ${item.moreTitle.endColor} 100%);`;
+			else style = 'background-color:' + item.moreTitle.startColor + ';';
+		 }
+		 return style
+	}
+
+	//商品样式
+	const itemStyle = ref('');
+	const setItemStyle = ()=>{
+		// #ifdef  MP-WEIXIN
+			// uni.createSelectorQuery().in(instance).select('#warpStyle-'+diyComponent.value.id).boundingClientRect((res:any) => {
+			// 	uni.createSelectorQuery().in(instance).select('#item0'+diyComponent.value.id).boundingClientRect((data:any) => {
+			// 		itemStyle.value = `margin-right:${(res.width - data.width*3)/2}px;`
+			// 	}).exec()
+			// }).exec()
+		// #endif
+		// #ifdef  H5
+			// itemStyle.value= 'margin-right:19rpx;'
+		// #endif
+		if(diyComponent.value.margin && diyComponent.value.margin.both) itemStyle.value = 'width: calc((100vw - ' + (diyComponent.value.margin.both*4) + 'rpx - 40rpx) / 3);'
+		else itemStyle.value = 'width: calc((100vw - 40rpx) / 3 );'
+	}
+
+	setItemStyle();
+
+	const getGoodsListFn = () => {
+        let data: any = {}
+        if(diyComponent.value.source == 'all') {
+	        data.num = diyComponent.value.list.length;
+        }else if(diyComponent.value.source == 'custom') {
+	        data.goods_ids = diyComponent.value.goods_ids;
+        }
+
+        getGoodsComponents(data).then((res) => {
+			let goodsObj = res.data;
+			goodsNum.value = goodsObj.length || 0;
+            diyComponent.value.list.filter((el:any, index)=>{
+				el.info=deepClone(goodsObj[index])
+			});
+			goodsList.value = deepClone(diyComponent.value.list)
+            skeleton.loading = false;
+        });
+    }
+
+	const instance = getCurrentInstance();
+
+	onMounted(() => {
+		refresh();
+	});
+	watch(
+	    () => diyComponent.value,
+	    (newValue, oldValue) => {
+	        refresh();
+	    },
+	)
+	const refresh = () => {
+		// 装修模式下设置默认图
+		if (diyStore.mode == 'decorate') {
+			nextTick(() => {
+				if(diyComponent.value && diyComponent.value.list){
+					goodsList.value = diyComponent.value.list.map((el:any)=>{
+						let obj = deepClone(el)
+						obj.info={
+							goods_cover_thumb_mid:'',
+							goodsSku:{
+								price:'10.00'
+							}
+						}
+						return obj
+					})
+					goodsNum.value = 3;
+					setItemStyle()
+				}
+			})
+		}else{
+			getGoodsListFn();
+		}
+	}
+
+	const toLink = (data: any) => {
+		redirect({ url: '/addon/shop/pages/goods/detail', param: { goods_id: data.info.goods_id } })
+	}
+
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/uni-app/src/addon/shop/components/diy/shop-member-info/index.vue b/uni-app/src/addon/shop/components/diy/shop-member-info/index.vue
new file mode 100644
index 00000000..5dd16147
--- /dev/null
+++ b/uni-app/src/addon/shop/components/diy/shop-member-info/index.vue
@@ -0,0 +1,262 @@
+<template>
+	<view :style="warpCss">
+		<view class="px-[30rpx] pt-[30rpx] box-border pb-[30rpx]" :class="{'!pb-[120rpx]':diyComponent.isShowAccount}">
+			<!-- #ifdef MP-WEIXIN -->
+			<view :style="navbarInnerStyle"></view>
+			<!-- #endif -->
+			<view v-if="info" class="flex items-center">
+				<!-- 唤起获取微信 -->
+				<u-avatar :src="img(info.headimg)" :size="'110rpx'" leftIcon="none" :default-url="img('static/resource/images/default_headimg.png')" @click="clickAvatar" />
+				<view class="ml-[20rpx] flex-1">
+					<view class="text-[#ffffff] flex items-baseline flex-wrap" :style="{ color : diyComponent.textColor }">
+						<view class="text-[32rpx] truncate max-w-[320rpx] font-500 leading-[38rpx]">{{ info.nickname }}</view>
+						<view class="text-[26rpx] font-400 leading-[28rpx] ml-[10rpx]" v-if="info.mobile">{{info.mobile.replace(info.mobile.substring(3,7), "****")}}</view>
+
+						<!-- #ifdef H5 -->
+						<view v-else-if="!info.mobile" @click="bindMobileFn" class="text-[22rpx] ml-[10rpx] px-[6rpx] border-[1rpx] border-solid border-[#E3E4E9] rounded-[8rpx] h-[34rpx] flex-center" :style="diyComponent.textColor ? { boxShadow: '0 0 0 1rpx ' + diyComponent.textColor, border: 'none' } : {}">{{ t('bindMobile') }}</view>
+						<!-- #endif -->
+
+						<!-- #ifdef MP-WEIXIN -->
+						<button v-else-if="!info.mobile" class="text-[22rpx] ml-[10rpx] bg-[#fff] px-[6rpx] border-[1rpx] border-solid border-[#E3E4E9] rounded-[8rpx] h-[37rpx] flex-center mr-0" :style="diyComponent.textColor ? { boxShadow: '0 0 0 1rpx ' + diyComponent.textColor, border: 'none' } : {}" open-type="getPhoneNumber" @getphonenumber="memberStore.bindMobile">{{t('bindMobile')}}</button>
+						<!-- #endif -->
+
+					</view>
+					<view class="text-[#666] text-[24rpx] font-400 leading-[28rpx] mt-[14rpx]" :style="{ color : diyComponent.uidTextColor }">UID：{{ info.member_no }}</view>
+				</view>
+				<text @click="redirect({ url: '/app/pages/setting/index' })" class="nc-iconfont nc-icon-shezhiV6xx1 text-[38rpx] ml-[10rpx]" :style="{ color : diyComponent.textColor }"></text>
+			</view>
+			<view v-else class="flex items-center">
+				<u-avatar :src="img('static/resource/images/default_headimg.png')" :size="'100rpx'" @click="toLogin" />
+				<view class="ml-[20rpx] flex-1" @click="toLogin">
+					<view class="text-[32rpx] font-500 leading-[38rpx]" :style="{ color : diyComponent.textColor }">
+						{{ t('login') }}/{{ t('register') }}
+					</view>
+				</view>
+				<view @click="redirect({ url: '/app/pages/setting/index' })">
+					<text class="nc-iconfont nc-icon-shezhiV6xx1 text-[38rpx] ml-[10rpx]" :style="{ color : diyComponent.textColor }"></text>
+				</view>
+			</view>
+			<view class="flex mt-[40rpx] items-center" v-if="diyComponent.isShowAccount">
+				<view class="text-center w-[33.333%] flex-shrink-0">
+					<view class="text-[36rpx] mb-[20rpx] font-500 price-font">
+						<view @click="redirect({url: '/app/pages/member/balance'})" :style="{ color : diyComponent.textColor }">{{ money }}</view>
+					</view>
+					<view class="text-[22rpx] font-400">
+						<view @click="redirect({url: '/app/pages/member/balance'})" :style="{ color : '#666' }">{{ t('balance') }}</view>
+					</view>
+				</view>
+				<view class="text-center w-[33.333%] flex-shrink-0">
+					<view class="text-[36rpx] mb-[20rpx] font-500 price-font">
+						<view @click="redirect({url: '/app/pages/member/point'})" :style="{ color : diyComponent.textColor }">{{ parseInt(info?.point) || 0 }}</view>
+					</view>
+					<view class="text-[22rpx] font-400">
+						<view @click="redirect({url: '/app/pages/member/point'})" :style="{ color : '#666' }">{{ t('point') }}</view>
+					</view>
+				</view>
+				<view class="text-center w-[33.333%] flex-shrink-0" @click="redirect({ url: '/addon/shop/pages/member/my_coupon' })">
+					<view class="text-[36rpx] mb-[20rpx] font-500 price-font">
+						<view :style="{ color : diyComponent.textColor }">{{ couponCount }}</view>
+					</view>
+					<view class="text-[22rpx] font-400">
+						<view :style="{ color : '#666' }">{{ t('coupon') }}</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- #ifdef MP-WEIXIN -->
+		<information-filling ref="infoFillRef"></information-filling>
+		<!-- #endif -->
+
+		<!-- 强制绑定手机号 -->
+		<bind-mobile ref="bindMobileRef" />
+
+	</view>
+</template>
+
+<script lang="ts" setup>
+	import { computed, ref, watch } from 'vue'
+	import useMemberStore from '@/stores/member'
+	import { useLogin } from '@/hooks/useLogin'
+	import { getMyCouponCount } from '@/addon/shop/api/coupon'
+	import { img, isWeixinBrowser, redirect, urlDeconstruction, moneyFormat } from '@/utils/common'
+	import { t } from '@/locale'
+	import { wechatSync } from '@/app/api/system'
+	import useDiyStore from '@/app/stores/diy'
+    import useConfigStore from '@/stores/config'
+	import bindMobile from '@/components/bind-mobile/bind-mobile.vue';
+
+	const props = defineProps(['component', 'index','global']);
+
+	const configStore = useConfigStore()
+	const diyStore = useDiyStore();
+
+	const diyComponent = computed(() => {
+		if (diyStore.mode == 'decorate') {
+			return diyStore.value[props.index];
+		} else {
+			return props.component;
+		}
+	})
+
+	const warpCss = computed(() => {
+		var style = '';
+        if(diyComponent.value.componentStartBgColor) {
+            if (diyComponent.value.componentStartBgColor && diyComponent.value.componentEndBgColor) style += `background:linear-gradient(${diyComponent.value.componentGradientAngle},${diyComponent.value.componentStartBgColor},${diyComponent.value.componentEndBgColor});`;
+            else style += 'background-color:' + diyComponent.value.componentStartBgColor + ';';
+        }
+		if (diyComponent.value.bgUrl) {
+			style += 'background-image:url(' + img(diyComponent.value.bgUrl) + ');';
+			style += 'background-size: 100%;';
+			style += 'background-repeat: no-repeat;';
+		}
+		if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+
+		return style;
+	})
+
+	const memberStore = useMemberStore()
+
+	// #ifdef H5
+	const { query } = urlDeconstruction(location.href)
+	if (query.code && isWeixinBrowser()) {
+		setTimeout(() =>{
+			wechatSync({ code: query.code }).then(res => {
+				memberStore.getMemberInfo()
+			})
+		},1500)
+	}
+	// #endif
+
+	const info = computed(() => {
+		// 装修模式
+		if (diyStore.mode == 'decorate') {
+			return {
+                headimg: '',
+                nickname: '昵称',
+                member_level_name: '普通会员',
+                balance: 0,
+                point: 0,
+                money: 0,
+                mobile: '155****0549',
+                member_no: 'NIU0000021'
+            }
+		} else {
+			getMyCouponCountFn()
+			return memberStore.info;
+		}
+	})
+
+	const money = computed(() => {
+		if (info.value) {
+			let m = parseFloat(info.value.balance) + parseFloat(info.value.money)
+			return moneyFormat(m.toString());
+		} else {
+			return 0;
+		}
+	})
+
+	const toLogin = () => {
+		let normalLogin = !configStore.login.is_username && !configStore.login.is_mobile && !configStore.login.is_bind_mobile; // 未开启普通登录
+		let authRegisterLogin = !configStore.login.is_auth_register; // 自动注册登录
+
+		// #ifdef H5
+		if (isWeixinBrowser()) {
+			// 微信浏览器
+			if (normalLogin && authRegisterLogin) {
+				uni.showToast({ title: '商家未开启登录注册', icon: 'none' })
+			} else if (configStore.login.is_username || configStore.login.is_mobile || configStore.login.is_bind_mobile) {
+				useLogin().setLoginBack({ url: '/addon/shop/pages/member/index' })
+			} else if (normalLogin && configStore.login.is_auth_register && configStore.login.is_force_access_user_info) {
+				// 判断是否开启第三方自动注册登录，并且开启强制获取用户信息
+				useLogin().getAuthCode({ scopes: 'snsapi_userinfo' })
+			} else if (normalLogin && configStore.login.is_auth_register && !configStore.login.is_force_access_user_info) {
+				// 判断是否开启第三方自动注册登录，并且关闭强制获取用户信息
+				useLogin().getAuthCode({ scopes: 'snsapi_base' })
+			}
+		} else {
+			// 普通浏览器
+			if (normalLogin) {
+				uni.showToast({ title: '商家未开启登录注册', icon: 'none' })
+			} else if (configStore.login.is_username || configStore.login.is_mobile || configStore.login.is_bind_mobile) {
+				useLogin().setLoginBack({ url: '/addon/shop/pages/member/index' })
+			}
+		}
+		// #endif
+
+		// #ifdef MP
+		if (normalLogin && authRegisterLogin) {
+			uni.showToast({ title: '商家未开启登录注册', icon: 'none' })
+		} else if (configStore.login.is_username || configStore.login.is_mobile || configStore.login.is_bind_mobile) {
+			useLogin().setLoginBack({ url: '/addon/shop/pages/member/index' })
+		} else if (normalLogin && configStore.login.is_auth_register && !configStore.login.is_force_access_user_info) {
+			// 判断是否开启第三方自动注册登录
+			useLogin().getAuthCode()
+		} else if (configStore.login.is_auth_register && configStore.login.is_force_access_user_info) {
+			// 开启了第三方自动注册登录，但是需要强制获取昵称
+			useLogin().setLoginBack({ url: '/addon/shop/pages/member/index' })
+		} else if (configStore.login.is_auth_register && configStore.login.is_bind_mobile) {
+			// 开启了第三方自动注册登录，但是需要强制获取手机号
+			useLogin().setLoginBack({ url: '/addon/shop/pages/member/index' })
+		}
+		// #endif
+
+	}
+
+	const infoFillRef:any = ref(false)
+	const clickAvatar = () => {
+		// #ifdef MP-WEIXIN
+		infoFillRef.value.show = true
+		// #endif
+
+		// #ifdef H5
+		if (isWeixinBrowser()) {
+			useLogin().getAuthCode({ scopes: 'snsapi_userinfo' })
+		} else {
+			redirect({ url: '/app/pages/member/personal' })
+		}
+		// #endif
+	}
+
+	const couponCount = ref(0)
+	const getMyCouponCountFn= async()=>{
+		try {
+			const res = await getMyCouponCount({status:1})
+			couponCount.value = res.data
+		} catch (e){
+			couponCount.value = 0
+		}
+
+	}
+
+	//强制绑定手机号
+    const bindMobileRef: any = ref(null)
+	const bindMobileFn = () =>{
+		bindMobileRef.value.open()
+	}
+
+	let menuButtonInfo: any = {};
+	// 如果是小程序，获取右上角胶囊的尺寸信息，避免导航栏右侧内容与胶囊重叠(支付宝小程序非本API，尚未兼容)
+	// #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+	menuButtonInfo = uni.getMenuButtonBoundingClientRect();
+	// #endif
+
+	// 导航栏内部盒子的样式
+	const navbarInnerStyle = computed(() => {
+		let style = '';
+		// 导航栏宽度，如果在小程序下，导航栏宽度为胶囊的左边到屏幕左边的距离
+		// #ifdef MP
+	    if (props.global.topStatusBar.isShow == false) {
+	        style += 'height:' + menuButtonInfo.height + 'px;';
+	        style += 'padding-top:' + menuButtonInfo.top + 'px;';
+	    }
+		// #endif
+		return style;
+	})
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/uni-app/src/addon/shop/components/diy/shop-newcomer/index.vue b/uni-app/src/addon/shop/components/diy/shop-newcomer/index.vue
new file mode 100644
index 00000000..7bf48bab
--- /dev/null
+++ b/uni-app/src/addon/shop/components/diy/shop-newcomer/index.vue
@@ -0,0 +1,476 @@
+<template>
+	<view class="shop-newcomer overflow-hidden" :style="warpCss" v-if="list && Object.keys(list).length">
+		<view class="style-1 p-[20rpx]" v-if="diyComponent.style.value == 'style-1'">
+			<view class="head flex justify-between items-center mb-[16rpx]" @click="toListFn()">
+				<image v-if="diyComponent.textImg" class="h-[34rpx] w-[auto]" :src="img(diyComponent.textImg)" mode="heightFix"></image>
+				<view class="time-wrap flex items-center ml-[auto]" v-show="timeData && Object.keys(timeData).length">
+					<text v-if="!getToken() && diyStore.mode != 'decorate'" class="text-[24rpx] font-500" :style="{color: diyComponent.countDown.otherColor}">活动未开始</text>
+					<block v-else-if="activeState()">
+						<text :style="{color: diyComponent.countDown.otherColor}" class="mr-[10rpx] text-[24rpx]">距结束还有</text>
+						<up-count-down class="text-[#fff] text-[28rpx]" :time="newcomerTime" format="HH:mm:ss" @change="onChange">
+							<view class="flex">
+								<view class="text-[24rpx] flex items-center">
+									<text class="time-num font-500" :style="countDownTextCss" v-if="dayTransitionHours()">{{ dayTransitionHours() }}</text>
+									<text class="time-num font-500" :style="countDownTextCss" v-else>00</text>
+									<text :style="{color: diyComponent.countDown.otherColor}" class="text-[20rpx] ml-[6rpx] mr-[7rpx]">:</text>
+								</view>
+								<view class="text-[24rpx] flex items-center">
+									<text class="time-num font-500" :style="countDownTextCss" v-if="timeData.minutes">{{ timeData.minutes >= 10?timeData.minutes:'0'+timeData.minutes }}</text>
+									<text class="time-num font-500" :style="countDownTextCss" v-else>00</text>
+									<text :style="{color: diyComponent.countDown.otherColor}" class="text-[20rpx] ml-[6rpx] mr-[7rpx]">:</text>
+								</view>
+								<view class="text-[24rpx] flex items-center">
+									<text class="time-num font-500" :style="countDownTextCss" v-if="timeData.seconds">{{ timeData.seconds<10 ? '0'+timeData.seconds : timeData.seconds}}</text>
+									<text class="time-num font-500" :style="countDownTextCss" v-else>00</text>
+								</view>
+							</view>
+						</up-count-down>
+					</block>
+					<text v-else class="text-[28rpx]" :style="{color: diyComponent.countDown.otherColor}">活动已结束</text>
+				</view>
+			</view>
+			<scroll-view scroll-x="true" class="content">
+				<view class="flex">
+					<view class="inline-flex bg-[#fff] p-[16rpx] box-border" :style="commonTempCss()" @click="toDetail(list[0])">
+						<view class="w-[150rpx] h-[150rpx] flex items-center justify-center">
+							<u--image radius="var(--goods-rounded-big)" width="150rpx" height="150rpx" :src="img(list[0].sku_image || '')" model="aspectFill">
+								<template #error>
+									<image class="w-[150rpx] h-[150rpx] rounded-[var(--goods-rounded-big)] overflow-hidden" :src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill"></image>
+								</template>
+							</u--image>
+						</view>
+						<view class="flex flex-col ml-[20rpx] py-[4rpx] flex-1">
+							<view class="text-[26rpx] w-[200rpx] whitespace-pre-wrap leading-[1.4] multi-hidden" v-if="list[0].goods">{{list[0].goods.goods_name}}</view>
+							<view class="flex items-center justify-between mt-[auto]">
+								<view class="flex flex-1 items-center">
+									<text class="text-[20rpx] text-[#FF0000]">￥</text>
+									<text class="text-[28rpx] font-500 text-[#FF0000] max-w[120rpx] truncate">{{goodsPrice(list[0])}}</text>
+								</view>
+								<text class="italic flex items-center justify-center rounded-[40rpx] w-[60rpx] h-[40rpx] leading-1 text-[#fff] font-bold first-btn-bg">抢</text>
+							</view>
+						</view>
+					</view>
+					<block v-for="(item,index) in list" :key="index">
+						<view v-if="index > 0" class="ml-[10rpx] inline-flex flex-col items-center p-[16rpx] bg-[#fff] box-border" :style="commonTempCss()" @click="toDetail(item)">
+							<view class="w-[110rpx] h-[110rpx] flex items-center justify-center">
+								<u--image radius="var(--goods-rounded-big)" width="110rpx" height="110rpx" :src="img(item.sku_image || '')" model="aspectFill">
+									<template #error>
+										<image class="w-[110rpx] h-[110rpx] rounded-[var(--goods-rounded-big)] overflow-hidden" :src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill"></image>
+									</template>
+								</u--image>
+							</view>
+							<view class="flex items-center mt-[auto]">
+								<text class="text-[24rpx] font-500">￥</text>
+								<text class="text-[24rpx] font-500 truncate">{{goodsPrice(item)}}</text>
+							</view>
+						</view>
+					</block>
+				</view>
+			</scroll-view>
+		</view>
+		<view class="style-2 p-[20rpx]" v-if="diyComponent.style.value == 'style-2'">
+			<view class="head flex justify-between items-center mb-[16rpx]" @click="toListFn()">
+				<image v-if="diyComponent.textImg" class="h-[34rpx] w-[auto]" :src="img(diyComponent.textImg)" mode="heightFix"></image>
+				<view class="time-wrap flex items-center ml-[auto]" v-show="timeData && Object.keys(timeData).length">
+					<text v-if="!getToken() && diyStore.mode != 'decorate'" class="text-[24rpx] font-500" :style="{color: diyComponent.countDown.otherColor}">活动未开始</text>
+					<block v-else-if="activeState()">
+						<text :style="{color: diyComponent.countDown.otherColor}" class="mr-[10rpx] text-[24rpx]">倒计时</text>
+						<up-count-down class="text-[#fff] text-[28rpx]" :time="newcomerTime" format="DD:HH:mm" @change="onChange">
+							<view class="flex">
+								<view class="text-[24rpx] flex items-center">
+									<text class="time-num" :style="countDownTextCss" v-if="timeData.days">{{ timeData.days }}</text>
+									<text class="time-num" :style="countDownTextCss" v-else>0</text>
+									<text :style="{color: diyComponent.countDown.otherColor}" class="text-[22rpx] ml-[6rpx] mr-[7rpx]">天</text>
+								</view>
+								<view class="text-[24rpx] flex items-center">
+									<text class="time-num" :style="countDownTextCss" v-if="timeData.hours">{{ timeData.hours>=10?timeData.hours:'0'+timeData.hours}}</text>
+									<text class="time-num" :style="countDownTextCss" v-else>00</text>
+									<text :style="{color: diyComponent.countDown.otherColor}" class="text-[22rpx] ml-[6rpx] mr-[7rpx]">时</text>
+								</view>
+								<view class="text-[24rpx] flex items-center">
+									<text class="time-num" :style="countDownTextCss" v-if="timeData.minutes">{{ timeData.minutes >= 10?timeData.minutes:'0'+timeData.minutes }}</text>
+									<text class="time-num" :style="countDownTextCss" v-else>00</text>
+									<text :style="{color: diyComponent.countDown.otherColor}" class="text-[22rpx] ml-[6rpx] mr-[7rpx]">分</text>
+								</view>
+							</view>
+						</up-count-down>
+					</block>
+					<text v-else class="text-[28rpx]" :style="{color: diyComponent.countDown.otherColor}">活动已结束</text>
+				</view>
+			</view>
+			<scroll-view scroll-x="true" class="content">
+				<view class="flex">
+					<view v-for="(item,index) in list" :key="index" class="item-bg mr-[10rpx] inline-flex flex-col items-center p-[6rpx] bg-[#fff] box-border" :style="commonTempCss()" @click="toDetail(item)">
+						<view class="flex items-center justify-center w-[146rpx] h-[146rpx]">
+							<u--image radius="var(--goods-rounded-small)" width="146rpx" height="146rpx" :src="img(item.sku_image || '')" model="aspectFill">
+								<template #error>
+									<image class="w-[146rpx] h-[146rpx] rounded-[var(--goods-rounded-small)] overflow-hidden" :src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill"></image>
+								</template>
+							</u--image>
+						</view>
+						<image class="h-[32rpx] w-[auto] mt-[12rpx] mb-[8rpx]" :src="img('addon/shop/diy/newcomer/style_2_img.png')" mode="heightFix"></image>
+						<view class="flex items-center text-[#fff] pb-[4rpx]">
+							<text class="text-[20rpx] font-500">￥</text>
+							<text class="text-[30rpx] max-w-[120rpx] font-500 truncate">{{goodsPrice(item)}}</text>
+						</view>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+		<view class="style-3 pt-[20rpx] pb-[10rpx] px-[10rpx]" v-if="diyComponent.style.value == 'style-3'">
+			<view class="head flex mx-[10rpx] items-center mb-[12rpx]" @click="toListFn()">
+				<image v-if="diyComponent.textImg" class="h-[34rpx] w-[auto] mr-[16rpx]" :src="img(diyComponent.textImg)" mode="heightFix"></image>
+				<view class="time-wrap flex items-center" v-show="timeData && Object.keys(timeData).length">
+					<text v-if="!getToken() && diyStore.mode != 'decorate'" :style="{color: diyComponent.countDown.otherColor}" class="text-[24rpx] font-500">活动未开始</text>
+					<up-count-down v-else-if="activeState()" class="text-[#fff] text-[28rpx]" :time="newcomerTime" format="HH:mm:ss" @change="onChange">
+						<view class="flex">
+							<view class="text-[24rpx] flex items-center">
+								<text class="time-num font-500" :style="countDownTextCss" v-if="dayTransitionHours()">{{ dayTransitionHours() }}</text>
+								<text class="time-num font-500" :style="countDownTextCss" v-else>00</text>
+								<text :style="{color: diyComponent.countDown.otherColor}" class="text-[20rpx] font-bold ml-[6rpx] mr-[7rpx]">:</text>
+							</view>
+							<view class="text-[24rpx] flex items-center">
+								<text class="time-num font-500" :style="countDownTextCss" v-if="timeData.minutes">{{ timeData.minutes >= 10?timeData.minutes:'0'+timeData.minutes }}</text>
+								<text class="time-num font-500" :style="countDownTextCss" v-else>00</text>
+								<text :style="{color: diyComponent.countDown.otherColor}" class="text-[20rpx] font-bold ml-[6rpx] mr-[7rpx]">:</text>
+							</view>
+							<view class="text-[24rpx] flex items-center">
+								<text class="time-num font-500" :style="countDownTextCss" v-if="timeData.seconds">{{ timeData.seconds<10 ? '0'+timeData.seconds : timeData.seconds}}</text>
+								<text class="time-num font-500" :style="countDownTextCss" v-else>00</text>
+							</view>
+						</view>
+					</up-count-down>
+					<text v-else :style="{color: diyComponent.countDown.otherColor}" class="text-[26rpx]">活动已结束</text>
+				</view>
+				<view class="ml-[auto] rounded-[20rpx] flex items-baseline pl-[16rpx] pr-[10rpx] pt-[10rpx] pb-[10rpx]" :style="subTitleCss" @click.stop="diyStore.toRedirect(diyComponent.subTitle.link)">
+					<text class="text-[22rpx]">{{diyComponent.subTitle.text}}</text>
+					<text class="iconfont iconarrow-right !text-[18rpx] font-bold"></text>
+				</view>
+			</view>
+			<scroll-view scroll-x="true" class="content bg-[#fff] box-border p-[16rpx] rounded-[var(--rounded-small)]">
+				<view class="flex">
+					<view v-for="(item,index) in list" :key="index" class="item-bg inline-flex flex-col items-center box-border" :class="{'mr-[16rpx]': index != (list.length-1)}" :style="commonTempCss()" @click="toDetail(item)">
+						<view class="bg-[#f8f8f8] flex items-center justify-center w-[152rpx] h-[152rpx]">
+							<u--image radius="var(--goods-rounded-small)" width="152rpx" height="152rpx" :src="img(item.sku_image || '')" model="aspectFill">
+								<template #error>
+									<image class="w-[152rpx] h-[152rpx] rounded-[var(--goods-rounded-small)] overflow-hidden" :src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill"></image>
+								</template>
+							</u--image>
+						</view>
+						<image class="h-[32rpx] w-[auto] mt-[12rpx] mb-[10rpx]" :src="img('addon/shop/diy/newcomer/style_3_img.png')" mode="heightFix"></image>
+						<view class="flex items-center text-[#FF0E00] pb-[2rpx]">
+							<text class="text-[20rpx] font-500">￥</text>
+							<text class="text-[30rpx] max-w-[120rpx] font-500 truncate">{{goodsPrice(item)}}</text>
+						</view>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+		<view class="style-4 p-[20rpx] pt-[24rpx]" v-if="diyComponent.style.value == 'style-4'"  :style="{ background: 'url(' + img('addon/shop/diy/newcomer/style_4_head.png') + ') no-repeat'}">
+			<view class="head flex mx-[10rpx] items-center justify-between mb-[24rpx]">
+				<image v-if="diyComponent.textImg" class="h-[34rpx] w-[auto]" :src="img(diyComponent.textImg)" mode="heightFix"></image>
+				<view class="time-wrap ml-[auto] flex items-center -mt-[8rpx]" v-show="timeData && Object.keys(timeData).length">
+					<text v-if="!getToken() && diyStore.mode != 'decorate'" :style="{color: diyComponent.countDown.otherColor}" class="w-[200rpx] text-center text-[24rpx] font-500 pb-[4rpx]">活动未开始</text>
+					<block v-else-if="activeState()">
+						<text :style="{color: diyComponent.countDown.otherColor}" class="mr-[8rpx] text-[24rpx]">本场仅剩</text>
+						<up-count-down class="text-[#fff] text-[28rpx]" :time="newcomerTime" format="HH:mm:ss" @change="onChange">
+							<view class="flex">
+								<view class="text-[28rpx] flex items-center">
+									<text class="time-num font-500" :style="countDownTextCss" v-if="dayTransitionHours()">{{ dayTransitionHours() }}</text>
+									<text class="time-num font-500" :style="countDownTextCss" v-else>00</text>
+									<text :style="{color: diyComponent.countDown.otherColor}" class="text-[20rpx] ml-[4rpx] font-bold mr-[5rpx]">:</text>
+								</view>
+								<view class="text-[28rpx] flex items-center">
+									<text class="time-num font-500" :style="countDownTextCss" v-if="timeData.minutes">{{ timeData.minutes >= 10?timeData.minutes:'0'+timeData.minutes }}</text>
+									<text class="time-num font-500" :style="countDownTextCss" v-else>00</text>
+									<text :style="{color: diyComponent.countDown.otherColor}" class="text-[20rpx] ml-[4rpx] font-bold mr-[5rpx]">:</text>
+								</view>
+								<view class="text-[28rpx] flex items-center">
+									<text class="time-num font-500" :style="countDownTextCss" v-if="timeData.seconds">{{ timeData.seconds<10 ? '0'+timeData.seconds : timeData.seconds}}</text>
+									<text class="time-num font-500" :style="countDownTextCss" v-else>00</text>
+								</view>
+							</view>
+						</up-count-down>
+					</block>
+					<text v-else :style="{color: diyComponent.countDown.otherColor}" class="w-[200rpx] text-center text-[24rpx] pb-[4rpx]">活动已结束</text>
+				</view>
+			</view>
+			<scroll-view scroll-x="true" class="content">
+				<view class="flex">
+					<view v-for="(item,index) in list" :key="index" class="item-bg inline-flex flex-col items-center box-border" :class="{'mr-[20rpx]': index != (list.length-1)}" :style="commonTempCss()" @click="toDetail(item)">
+						<view class="relative flex items-center justify-center w-[100%] h-[130rpx] pt-[40rpx] mb-[10rpx]">
+							<u--image radius="var(--goods-rounded-small)" width="130rpx" height="130rpx" :src="img(item.sku_image || '')" model="aspectFill">
+								<template #error>
+									<image class="w-[130rpx] h-[130rpx] rounded-[var(--goods-rounded-small)] overflow-hidden" :src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill"></image>
+								</template>
+							</u--image>
+							<view class="content-sign text-[20rpx] text-[#fff]">新人价</view>
+						</view>
+						<view class="w-[210rpx] relative -right-[2rpx] -bottom-[2rpx] flex items-center text-[#FF0E00] pb-[2rpx]">
+							<view class="flex items-center justify-center flex-1">
+								<text class="text-[20rpx] font-500">￥</text>
+								<text class="text-[36rpx] max-w-[140rpx] font-500 truncate">{{goodsPrice(item)}}</text>
+							</view>
+							<text class="btn-bg ml-auto">抢</text>
+						</view>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+	</view>
+</template>
+
+<script setup lang="ts">
+	// 新人专享
+    import { ref,reactive,computed, onMounted } from 'vue';
+	import { redirect, img, getToken } from '@/utils/common';
+	import useDiyStore from '@/app/stores/diy';
+    import { getNewcomersComponentsList } from '@/addon/shop/api/newcomer'
+
+	const props = defineProps(['component', 'index','value']);
+	const diyStore = useDiyStore();
+
+	const diyComponent = computed(() => {
+        if(props.value) {
+            return props.value;
+        }else if (diyStore.mode == 'decorate') {
+			return diyStore.value[props.index];
+		} else {
+			return props.component;
+		}
+	})
+
+	/********* 倒计时 - start ***********/
+	// 使用 reactive 创建响应式对象
+	const timeData = ref({});
+	// 定义 onChange 方法
+	const onChange = (e) => {
+	  timeData.value = e;
+	};
+	const newcomerTime: any = ref('');
+	/********* 倒计时 - end ***********/
+
+	const goodsPrice = (data: any)=> {
+		let price: any = 0;
+		if (data && data.newcomer_price) {
+			price = Number(data.newcomer_price).toFixed(2);
+		}
+		return price;
+	}
+
+	// 将天转换成时
+	const dayTransitionHours = ()=>{
+		let num = timeData.value.days * 24 + timeData.value.hours;
+		num = num ? num : 0;
+		num = num >=10 ? num : '0' + num;
+		return num;
+	}
+
+	// 活动状态
+	const activeState = ()=>{
+		let bool = true;
+		if(diyStore.mode != 'decorate' && timeData.value.days <= 0 && timeData.value.hours <= 0 && timeData.value.minutes <= 0 && timeData.value.seconds <= 0 && timeData.value.milliseconds <= 0){
+			bool = false;
+		}
+		return bool;
+	}
+
+	const warpCss = computed(() => {
+		var style = '';
+        style += 'position:relative;';
+        if(diyComponent.value.componentStartBgColor) {
+            if (diyComponent.value.componentStartBgColor && diyComponent.value.componentEndBgColor) style += `background:linear-gradient(${diyComponent.value.componentGradientAngle},${diyComponent.value.componentStartBgColor},${diyComponent.value.componentEndBgColor});`;
+            else style += 'background-color:' + diyComponent.value.componentStartBgColor + ';';
+        }
+
+		if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		return style;
+	})
+
+	// 倒计时样式
+	const countDownTextCss = computed(() => {
+		var style = '';
+	    if(diyComponent.value.countDown && diyComponent.value.countDown.numberBg) {
+			if (diyComponent.value.countDown.numberBg.startColor && diyComponent.value.countDown.numberBg.endColor) style += `background:linear-gradient(${diyComponent.value.countDown.numberBg.startColor},${diyComponent.value.countDown.numberBg.endColor});`;
+			else{
+				style += 'background-color:' + (diyComponent.value.countDown.numberBg.startColor || diyComponent.value.countDown.numberBg.endColor) + ';';
+			}
+	    }
+		if (diyComponent.value.countDown.numberColor) style += 'color:' + diyComponent.value.countDown.numberColor + ';';
+		return style;
+	})
+
+
+	// 公共模块颜色
+	const commonTempCss = ()=>{
+		var style = '';
+		if (diyComponent.value.topElementRounded) style += 'border-top-left-radius:' + diyComponent.value.topElementRounded * 2 + 'rpx;';
+		if (diyComponent.value.topElementRounded) style += 'border-top-right-radius:' + diyComponent.value.topElementRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomElementRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomElementRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomElementRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomElementRounded * 2 + 'rpx;';
+		return style;
+	}
+
+	// 副标题样式
+	const subTitleCss = computed(() => {
+		var style = '';
+	    if(diyComponent.value.subTitle) {
+			if (diyComponent.value.subTitle.startColor && diyComponent.value.subTitle.endColor) style += `background:linear-gradient(to right, ${diyComponent.value.subTitle.startColor},${diyComponent.value.subTitle.endColor});`;
+			else{
+				style += 'background-color:' + (diyComponent.value.subTitle.startColor || diyComponent.value.subTitle.endColor) + ';';
+			}
+	    }
+		if (diyComponent.value.subTitle.textColor) style += 'color:' + diyComponent.value.subTitle.textColor + ';';
+		return style;
+	})
+
+	const list: any = ref([])
+	const getNewcomerListFn = () => {
+		let data = {
+			limit: diyComponent.value.source == 'all' ? diyComponent.value.num : '',
+			sku_ids: diyComponent.value.source == 'custom' ? diyComponent.value.goods_ids : ''
+		}
+		getNewcomersComponentsList(data).then((res: any) => {
+			newcomerTime.value = res.data.validity_time;
+			let now = new Date();
+			let timestamp: any = now.getTime();
+			newcomerTime.value = Number(newcomerTime.value) * 1000 - timestamp;
+
+			list.value = res.data.goods_list
+
+			// 数据为空时隐藏整个组件
+			// if(!(list.value.length && (newcomerTime.value > 0 && isJoin.value == 0))) {
+			// 	diyComponent.value.pageStyle = '';
+			// }
+
+		})
+	}
+
+	onMounted(() => {
+		// 装修模式下刷新
+		if (diyStore.mode == 'decorate') {
+			let obj = {
+				goods: {
+					goods_name: "商品名称"
+				},
+				sku_image: "",
+				newcomer_price: 0.01
+			};
+			list.value.push(obj);
+			list.value.push(obj);
+			list.value.push(obj);
+		} else {
+			getNewcomerListFn();
+		}
+	});
+
+	// 跳转专享列表
+	const toListFn = ()=>{
+		redirect({ url: '/addon/shop/pages/newcomer/list'})
+	}
+	// 跳转详情
+	const toDetail = (data: any)=> {
+		redirect({ url: '/addon/shop/pages/goods/detail', param: { sku_id: data.sku_id, type: 'newcomer_discount' } })
+	}
+</script>
+
+<style lang="scss" scoped>
+	.shop-newcomer{
+		.style-1{
+			.content{
+				white-space: nowrap;
+			}
+			.first-btn-bg{
+				background: linear-gradient( 140deg, #FF9C24 0%, #FF4837 100%);
+			}
+			.time-num{
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				min-width: 42rpx;
+				padding: 0 6rpx;
+				height: 36rpx;
+				border-radius: 6rpx;
+				box-sizing: border-box;
+			}
+		}
+		.style-2{
+			.content{
+				white-space: nowrap;
+			}
+			.item-bg{
+				background: linear-gradient( 140deg, #FF7A41, #FF2E0A);
+			}
+			.time-num{
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				min-width: 42rpx;
+				padding: 0 6rpx;
+				height: 36rpx;
+				border-radius: 6rpx;
+				box-sizing: border-box;
+			}
+		}
+		.style-3{
+			.content{
+				white-space: nowrap;
+			}
+			.time-num{
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				min-width: 42rpx;
+				padding: 0 6rpx;
+				height: 36rpx;
+				border-radius: 6rpx;
+				box-sizing: border-box;
+			}
+		}
+		.style-4{
+			background-size: 100% 110rpx !important;
+			.content{
+				white-space: nowrap;
+			}
+			.time-wrap{
+				margin-right: -14rpx;
+				.time-num{
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					min-width: 32rpx;
+					height: 36rpx;
+					border-radius: 6rpx;
+					font-size: 26rpx;
+					box-sizing: border-box;
+				}
+			}
+			.item-bg{
+				background: linear-gradient(#FFFFFF 60%, #f7f7f7 100%);
+			}
+			.btn-bg{
+				background: linear-gradient( 140deg, #FE2B2B 0%, #FF7236 100%);
+				border-radius: 50%;
+				border-bottom-left-radius: 0;
+				font-size: 30rpx;
+				color: #fff;
+				width: 50rpx;
+				height: 50rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+			}
+			.content-sign{
+				position: absolute;
+				left: 0;
+				top: 20rpx;
+				z-index: 1;
+				background: linear-gradient( 140deg, #FE2B2B 0%, #FF7236 100%);
+				padding: 6rpx 8rpx;
+			}
+		}
+	}
+</style>
diff --git a/uni-app/src/addon/shop/components/diy/shop-order-info/index.vue b/uni-app/src/addon/shop/components/diy/shop-order-info/index.vue
new file mode 100644
index 00000000..955458dd
--- /dev/null
+++ b/uni-app/src/addon/shop/components/diy/shop-order-info/index.vue
@@ -0,0 +1,156 @@
+<template>
+	<view :style="warpCss">
+		<view class="diy-text relative">
+			<view class="px-[var(--pad-sidebar-m)] pt-[var(--pad-top-m)] pb-[40rpx] flex items-center justify-between">
+				<view @click="diyStore.toRedirect(diyComponent.link)">
+					<view class="max-w-[200rpx] truncate leading-[1] text-[30rpx]" :style="{ fontSize: diyComponent.fontSize * 2 + 'rpx', color: diyComponent.textColor, fontWeight: (diyComponent.fontWeight == 'normal' ? 500 : diyComponent.fontWeight) }">
+						{{ diyComponent.text }}
+					</view>
+				</view>
+				<view class="flex items-center">
+					<view  @click="redirect({ url: '/addon/shop/pages/order/list'})" class="flex items-center">
+						<text class="max-w-[200rpx] truncate text-[24rpx]" :style="{ color: diyComponent.more.color }">{{ diyComponent.more.text }}</text>
+						<text class="nc-iconfont nc-icon-youV6xx text-[24rpx]" :style="{ color: diyComponent.more.color }"></text>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="pb-[var(--pad-top-m)] px-[var(--pad-sidebar-m)] flex items-center justify-between text-center">
+			<view class="flex flex-col items-center w-[20%] flex-shrink-0" @click="toList(1)">
+				<view class="relative w-[44rpx] h-[44rpx]">
+					<image class="w-[44rpx] h-[44rpx]" :src="img('addon/shop/diy/member/order1.png')" />
+					<view v-if="orderInfo.wait_pay"
+						:class="['absolute left-[35rpx] top-[-10rpx] rounded-[28rpx] h-[28rpx] min-w-[28rpx] text-center leading-[30rpx] bg-[#FF4646] text-[#fff] text-[20rpx] font-500 box-border', orderInfo.wait_pay > 9 ? 'px-[10rpx]' : '']">
+						{{ orderInfo.wait_pay > 99 ? "99+" : orderInfo.wait_pay }}
+					</view>
+				</view>
+				<view class="mt-[20rpx] leading-[1]" :style="{
+					fontSize: diyComponent.item.fontSize * 2 + 'rpx',
+					color: diyComponent.item.color,
+					fontWeight: diyComponent.item.fontWeight
+				}">待付款</view>
+			</view>
+			<view class="flex flex-col items-center w-[20%] flex-shrink-0" @click="toList(2)">
+				<view class="relative w-[44rpx] h-[44rpx]">
+					<image class="w-[44rpx] h-[44rpx]" :src="img('addon/shop/diy/member/order2.png')" />
+					<view v-if="orderInfo.wait_shipping"
+						:class="['absolute left-[35rpx] top-[-10rpx] rounded-[28rpx] h-[28rpx] min-w-[28rpx] text-center leading-[30rpx] bg-[#FF4646] text-[#fff] text-[20rpx] font-500 box-border', orderInfo.wait_shipping > 9 ? 'px-[10rpx]' : '']">
+						{{ orderInfo.wait_shipping > 99 ? "99+" : orderInfo.wait_shipping }}
+					</view>
+				</view>
+				<view class="mt-[20rpx] leading-[1]" :style="{
+					fontSize: diyComponent.item.fontSize * 2 + 'rpx',
+					color: diyComponent.item.color,
+					fontWeight: diyComponent.item.fontWeight
+				}">待发货</view>
+			</view>
+			<view class="flex flex-col items-center w-[20%] flex-shrink-0" @click="toList(3)">
+				<view class="relative w-[44rpx] h-[44rpx]">
+					<image class="w-[44rpx] h-[44rpx]" :src="img('addon/shop/diy/member/order3.png')" />
+					<view v-if="orderInfo.wait_take"
+						:class="['absolute left-[35rpx] top-[-10rpx] rounded-[28rpx] h-[28rpx] min-w-[28rpx] text-center leading-[30rpx] bg-[#FF4646] text-[#fff] text-[20rpx] font-500 box-border', orderInfo.wait_take > 9 ? 'px-[10rpx]' : '']">
+						{{ orderInfo.wait_take > 99 ? "99+" : orderInfo.wait_take }}
+					</view>
+				</view>
+				<view class="mt-[20rpx] leading-[1]" :style="{
+					fontSize: diyComponent.item.fontSize * 2 + 'rpx',
+					color: diyComponent.item.color,
+					fontWeight: diyComponent.item.fontWeight
+				}">待收货</view>
+			</view>
+			<view class="flex flex-col items-center w-[20%] flex-shrink-0" @click="toList(5)">
+				<view class="relative w-[44rpx] h-[44rpx]">
+					<image class="w-[44rpx] h-[44rpx]" :src="img('addon/shop/diy/member/order4.png')" />
+					<view v-if="orderInfo.evaluate"
+						:class="['absolute left-[35rpx] top-[-10rpx] rounded-[28rpx] h-[28rpx] min-w-[28rpx] text-center leading-[30rpx] bg-[#FF4646] text-[#fff] text-[20rpx] font-500 box-border', orderInfo.evaluate > 9 ? 'px-[10rpx]' : '']">
+						{{ orderInfo.evaluate > 99 ? "99+" : orderInfo.evaluate }}
+					</view>
+				</view>
+				<view class="mt-[20rpx] leading-[1]" :style="{
+					fontSize: diyComponent.item.fontSize * 2 + 'rpx',
+					color: diyComponent.item.color,
+					fontWeight: diyComponent.item.fontWeight
+				}">待评价</view>
+			</view>
+			<view class="flex flex-col items-center w-[20%] flex-shrink-0" @click="redirect({ url: '/addon/shop/pages/refund/list'})">
+				<view class="relative w-[44rpx] h-[44rpx]">
+					<image class="w-[44rpx] h-[44rpx]" :src="img('addon/shop/diy/member/order5.png')" />
+					<view v-if="orderInfo.refund"
+						:class="['absolute left-[35rpx] top-[-10rpx] rounded-[28rpx] h-[28rpx] min-w-[28rpx] text-center leading-[30rpx] bg-[#FF4646] text-[#fff] text-[20rpx] font-500 box-border', orderInfo.refund > 9 ? 'px-[10rpx]' : '']">
+						{{ orderInfo.refund > 99 ? "99+" : orderInfo.refund }}
+					</view>
+				</view>
+				<view class="mt-[20rpx] leading-[1]" :style="{
+					fontSize: diyComponent.item.fontSize * 2 + 'rpx',
+					color: diyComponent.item.color,
+					fontWeight: diyComponent.item.fontWeight
+				}">售后/退款</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script lang="ts" setup>
+	import { ref, computed, watch,onMounted } from 'vue';
+	import useDiyStore from '@/app/stores/diy';
+	import { img,redirect } from '@/utils/common';
+	import {getShopOrderNum} from '@/addon/shop/api/order';
+
+	const props = defineProps(['component', 'index']);
+	const diyStore = useDiyStore();
+	const diyComponent = computed(() => {
+		if (diyStore.mode == 'decorate') {
+			return diyStore.value[props.index];
+		} else {
+			return props.component;
+		}
+	})
+
+	onMounted(() => {
+		refresh();
+	});
+
+	watch(
+	    () => diyComponent.value,
+		(newValue, oldValue) => {
+            refresh();
+    },{deep: true})
+
+	const refresh = () => {
+		// 装修模式
+		if (diyStore.mode == 'decorate') {
+			orderInfo.value = {
+	        }
+		} else {
+			getShopOrderNumFn()
+		}
+	}
+
+	const orderInfo = ref({})
+	const warpCss = computed(() => {
+		var style = '';
+	    style += 'position:relative;';
+	    if(diyComponent.value.componentStartBgColor) {
+	        if (diyComponent.value.componentStartBgColor && diyComponent.value.componentEndBgColor) style += `background:linear-gradient(${diyComponent.value.componentGradientAngle},${diyComponent.value.componentStartBgColor},${diyComponent.value.componentEndBgColor});`;
+	        else style += 'background-color:' + diyComponent.value.componentStartBgColor + ';';
+	    }
+
+		if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		return style;
+	})
+
+	const getShopOrderNumFn=()=>{
+		getShopOrderNum().then((res:any)=>{
+			orderInfo.value = res.data
+		})
+	}
+	const toList = (status:any) => {
+		redirect({ url: '/addon/shop/pages/order/list', param: { status } })
+	}
+</script>
+
+<style>
+</style>
diff --git a/uni-app/src/addon/shop/components/diy/shop-search/index.vue b/uni-app/src/addon/shop/components/diy/shop-search/index.vue
new file mode 100644
index 00000000..95993133
--- /dev/null
+++ b/uni-app/src/addon/shop/components/diy/shop-search/index.vue
@@ -0,0 +1,102 @@
+<template>
+	<view :style="warpCss">
+		<view :style="maskLayer"></view>
+		<view class="diy-shop-search relative overflow-hidden flex items-center">
+			<image :src="img('addon/shop/diy/search_01.png')" class="w-[40rpx] h-[40rpx]" mode="widthFix" @click="toLink('/addon/shop/pages/goods/category')"></image>
+			<view class="flex-1 ml-[24rpx] rounded-[32rpx] flex items-center bg-[var(--temp-bg)] opacity-90 py-[10rpx] pl-[38rpx] pr-[32rpx] justify-between h-[60rpx] box-border" @click="toLink('/addon/shop/pages/goods/search')">
+				<text class="text-[var(--text-color-light9)] text-[26rpx]">{{ diyComponent.text }}</text>
+				<text class="nc-iconfont nc-icon-sousuo-duanV6xx1 text-[24rpx]"></text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup lang="ts">
+	// 搜索
+    import { ref,computed, watch, onMounted, nextTick,getCurrentInstance } from 'vue';
+	import { img, redirect } from '@/utils/common';
+	import useDiyStore from '@/app/stores/diy';
+
+	const props = defineProps(['component', 'index']);
+	const diyStore = useDiyStore();
+
+	const diyComponent = computed(() => {
+		if (diyStore.mode == 'decorate') {
+			return diyStore.value[props.index];
+		} else {
+			return props.component;
+		}
+	})
+
+	const warpCss = computed(() => {
+		var style = '';
+        if(diyComponent.value.componentStartBgColor) {
+            if (diyComponent.value.componentStartBgColor && diyComponent.value.componentEndBgColor) style += `background:linear-gradient(${diyComponent.value.componentGradientAngle},${diyComponent.value.componentStartBgColor},${diyComponent.value.componentEndBgColor});`;
+            else style += 'background-color:' + diyComponent.value.componentStartBgColor + ';';
+        }
+
+        if(diyComponent.value.componentBgUrl) {
+            style += `background-image:url('${ img(diyComponent.value.componentBgUrl) }');`;
+            style += 'background-size: cover;background-repeat: no-repeat;';
+        }
+
+		if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		return style;
+	})
+
+    // 背景图加遮罩层
+    const maskLayer = computed(()=>{
+        var style = '';
+        if(diyComponent.value.componentBgUrl) {
+            style += 'position:absolute;top:0;width:100%;';
+            style += `background: rgba(0,0,0,${diyComponent.value.componentBgAlpha / 10});`;
+            style += `height:${height.value}px;`;
+
+            if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+            if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+            if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+            if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+        }
+
+        return style;
+    });
+
+    onMounted(() => {
+        refresh();
+        // 装修模式下刷新
+        if (diyStore.mode == 'decorate') {
+            watch(
+                () => diyComponent.value,
+                (newValue, oldValue) => {
+                    if (newValue && newValue.componentName == 'ShopSearch') {
+                        refresh();
+                    }
+                }
+            )
+        }
+    });
+
+    const instance = getCurrentInstance();
+    const height = ref(0)
+
+    const refresh = ()=> {
+        nextTick(() => {
+            const query = uni.createSelectorQuery().in(instance);
+            query.select('.diy-shop-search').boundingClientRect((data: any) => {
+                height.value = data.height;
+            }).exec();
+        })
+    }
+
+	const toLink = (url: any)=>{
+		if (diyStore.mode == 'decorate') return false;
+		redirect({ url })
+	}
+
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/uni-app/src/addon/shop/components/diy/single-recommend/index.vue b/uni-app/src/addon/shop/components/diy/single-recommend/index.vue
new file mode 100644
index 00000000..c4c86db7
--- /dev/null
+++ b/uni-app/src/addon/shop/components/diy/single-recommend/index.vue
@@ -0,0 +1,255 @@
+<template>
+	<view :style="warpCss" class="overflow-hidden" v-if="goodsList && goodsList[0]">
+		<view class="flex justify-between items-center mb-[20rpx]" v-if="diyComponent.textImg || diyComponent.subTitle.text">
+			<view class="h-[34rpx] flex items-center" v-if="diyComponent.textImg" @click="diyStore.toRedirect(diyComponent.textLink)">
+				<image class="h-[100%] w-[auto]" :src="img(diyComponent.textImg)" mode="heightFix" />
+			</view>
+			<view class="flex items-center ml-[auto]" v-if="diyComponent.subTitle.text" @click="diyStore.toRedirect(diyComponent.subTitle.link)" :style="{'color': diyComponent.subTitle.textColor}">
+				<text class="text-[24rpx]">{{diyComponent.subTitle.text}}</text>
+				<text class="text-[22rpx] iconfont iconxiangyoujiantou"></text>
+			</view>
+		</view>
+
+		<view class="flex justify-between">
+			<!-- 轮播图 -->
+			<view class="relative w-[340rpx] overflow-hidden" :style="carouselCss">
+				<view v-if="diyComponent.list.length == 1" class="leading-0 overflow-hidden">
+					<view @click="diyStore.toRedirect(diyComponent.list[0].link)">
+						<image v-if="diyComponent.list[0].imageUrl" :src="img(diyComponent.list[0].imageUrl)" mode="heightFix" class="h-[504rpx] !w-full" :show-menu-by-longpress="true"/>
+						<image v-else :src="img('static/resource/images/diy/figure.png')" mode="heightFix" class="h-[504rpx] !w-full" :show-menu-by-longpress="true"/>
+					</view>
+				</view>
+				<block v-else>
+					<swiper class="swiper ns-indicator-dots-three h-[504rpx]" autoplay="true" circular="true" :indicator-dots="isShowDots" @change="swiperChange"
+					:indicator-color="diyComponent.indicatorColor" :indicator-active-color="diyComponent.indicatorActiveColor">
+						<swiper-item class="swiper-item" v-for="(item) in diyComponent.list" :key="item.id">
+							<view @click="diyStore.toRedirect(item.link)">
+								<view class="item h-[504rpx]">
+									<image v-if="item.imageUrl" :src="img(item.imageUrl)" mode="scaleToFill" class="w-full h-full" :show-menu-by-longpress="true"/>
+									<image v-else :src="img('static/resource/images/diy/figure.png')" mode="scaleToFill" class="w-full h-full" :show-menu-by-longpress="true"/>
+								</view>
+							</view>
+						</swiper-item>
+					</swiper>
+					<!-- #ifdef MP-WEIXIN -->
+					<view v-if="diyComponent.list.length > 1" class="swiper-dot-box straightLineStyle2">
+						<view v-for="(numItem, numIndex) in diyComponent.list" :key="numIndex" :class="['swiper-dot', { active: numIndex == swiperIndex }]" :style="[numIndex == swiperIndex ? { backgroundColor: diyComponent.indicatorActiveColor } : { backgroundColor: diyComponent.indicatorColor }]"></view>
+					</view>
+					<!-- #endif -->
+				</block>
+			</view>
+
+			<view class="w-[340rpx] h-[504rpx] flex flex-col bg-[#fff] box-border overflow-hidden" :style="goodsTempCss" @click="toLink(goodsList[0])">
+				<view :style="goodsImgCss" class="w-[346rpx] h-[350rpx] overflow-hidden">
+					<u--image width="346rpx" height="350rpx" :src="img(goodsList[0].goods_cover_thumb_mid || '')" model="aspectFill">
+						<template #error>
+							<image class="w-[346rpx] h-[350rpx]" :src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill"></image>
+						</template>
+					</u--image>
+				</view>
+				<view class="px-[16rpx] flex-1 pt-[16rpx] pb-[20rpx] flex flex-col justify-between">
+					<view class="text-[#303133] leading-[40rpx] text-[28rpx] truncate" :style="{ color : diyComponent.goodsNameStyle.color, fontWeight : diyComponent.goodsNameStyle.fontWeight }">
+						{{goodsList[0].goods_name}}
+					</view>
+					<view class="flex justify-between flex-wrap items-baseline mt-[28rpx]" >
+						<view class="flex items-center">
+							<view class="text-[var(--price-text-color)] price-font truncate max-w-[200rpx]" :style="{ color : diyComponent.priceStyle.mainColor }">
+								<text class="text-[24rpx] font-400">￥</text>
+								<text class="text-[40rpx] font-500">{{ parseFloat(diyGoods.goodsPrice(goodsList[0])).toFixed(2).split('.')[0] }}</text>
+								<text class="text-[24rpx] font-500">.{{ parseFloat(diyGoods.goodsPrice(goodsList[0])).toFixed(2).split('.')[1] }}</text>
+							</view>
+							<image v-if="diyGoods.priceType(goodsList[0]) == 'member_price'" class="max-w-[50rpx] h-[28rpx] ml-[6rpx]" :src="img('addon/shop/VIP.png')" mode="heightFix" />
+						</view>
+
+						<view class="w-[44rpx] h-[44rpx] bg-[red] flex items-center justify-center rounded-[50%]" :style="{ backgroundColor : diyComponent.saleStyle.color }">
+							<text class="iconfont iconjia  font-500 text-[32rpx] text-[#fff]"></text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup lang="ts">
+	// 精选推荐
+    import { ref,reactive,computed, watch, onMounted } from 'vue';
+	import { redirect, img } from '@/utils/common';
+	import useDiyStore from '@/app/stores/diy';
+	import { getGoodsComponents } from '@/addon/shop/api/goods';
+	import {useGoods} from '@/addon/shop/hooks/useGoods'
+
+	const diyGoods = useGoods();
+	const props = defineProps(['component', 'index','value']);
+	const diyStore = useDiyStore();
+
+	const goodsList = ref<Array<any>>([]);
+
+	const diyComponent = computed(() => {
+        if(props.value) {
+            return props.value;
+        }else if (diyStore.mode == 'decorate') {
+			return diyStore.value[props.index];
+		} else {
+			return props.component;
+		}
+	})
+
+	// 轮播指示器
+	let isShowDots = ref(true)
+	// #ifdef H5
+	isShowDots.value = true;
+	// #endif
+
+	// #ifdef MP-WEIXIN
+	isShowDots.value = false;
+	// #endif
+
+	const warpCss = computed(() => {
+		var style = '';
+        style += 'position:relative;';
+        if(diyComponent.value.componentStartBgColor) {
+            if (diyComponent.value.componentStartBgColor && diyComponent.value.componentEndBgColor) style += `background:linear-gradient(${diyComponent.value.componentGradientAngle},${diyComponent.value.componentStartBgColor},${diyComponent.value.componentEndBgColor});`;
+            else style += 'background-color:' + diyComponent.value.componentStartBgColor + ';';
+        }
+
+		if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		return style;
+	})
+
+    const goodsTempCss = computed(() => {
+        var style = '';
+        if (diyComponent.value.elementBgColor) style += 'background-color:' + diyComponent.value.elementBgColor + ';';
+        if (diyComponent.value.topElementRounded) style += 'border-top-left-radius:' + diyComponent.value.topElementRounded * 2 + 'rpx;';
+        if (diyComponent.value.topElementRounded) style += 'border-top-right-radius:' + diyComponent.value.topElementRounded * 2 + 'rpx;';
+        if (diyComponent.value.bottomElementRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomElementRounded * 2 + 'rpx;';
+        if (diyComponent.value.bottomElementRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomElementRounded * 2 + 'rpx;';
+
+		if(diyComponent.value.margin && diyComponent.value.margin.both) style += 'width: calc((100vw - ' + (diyComponent.value.margin.both*4) + 'rpx - 20rpx) / 2);'
+		else style += 'width: calc((100vw - 20rpx) / 2 );'
+        return style;
+    })
+
+	const goodsImgCss = computed(() => {
+	    var style = '';
+	    if (diyComponent.value.topElementRounded) style += 'border-radius:' + diyComponent.value.topElementRounded * 2 + 'rpx;';
+	    return style;
+	})
+
+	const carouselCss = computed(() => {
+	    var style = '';
+	    if (diyComponent.value.topCarouselRounded) style += 'border-top-left-radius:' + diyComponent.value.topCarouselRounded * 2 + 'rpx;';
+	    if (diyComponent.value.topCarouselRounded) style += 'border-top-right-radius:' + diyComponent.value.topCarouselRounded * 2 + 'rpx;';
+	    if (diyComponent.value.bottomCarouselRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomCarouselRounded * 2 + 'rpx;';
+	    if (diyComponent.value.bottomCarouselRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomCarouselRounded * 2 + 'rpx;';
+
+		if(diyComponent.value.margin && diyComponent.value.margin.both) style += 'width: calc((100vw - ' + (diyComponent.value.margin.both*4) + 'rpx - 20rpx) / 2);'
+		else style += 'width: calc((100vw - 20rpx) / 2 );'
+	    return style;
+	})
+
+	const getGoodsListFn = () => {
+        let data = {
+            num: 1,
+            goods_ids: diyComponent.value.source == 'custom' ? diyComponent.value.goods_ids : ''
+        }
+        getGoodsComponents(data).then((res) => {
+            goodsList.value = res.data;
+        });
+    }
+
+	onMounted(() => {
+		refresh();
+        // 装修模式下刷新
+        if (diyStore.mode != 'decorate') {
+            watch(
+                () => diyComponent.value,
+                (newValue, oldValue) => {
+                    refresh();
+                },
+                {deep: true}
+            )
+        }
+	});
+
+	const refresh = () => {
+		// 装修模式下设置默认图
+		if (diyStore.mode == 'decorate') {
+			let obj = {
+				goods_cover_thumb_mid: "",
+				goods_name: "商品名称",
+				sale_num: "100",
+				unit: "件",
+				goodsSku:{price:100}
+			};
+			goodsList.value.push(obj);
+		}else{
+			getGoodsListFn();
+		}
+	}
+
+	const toLink = (data: any) => {
+		redirect({ url: '/addon/shop/pages/goods/detail', param: { goods_id: data.goods_id } })
+	}
+
+	const swiperIndex = ref(0);
+	const swiperChange = e => {
+	    swiperIndex.value = e.detail.current;
+	};
+</script>
+
+<style lang="scss" scoped>
+.swiper.ns-indicator-dots-three :deep(.uni-swiper-dots-horizontal) {
+	bottom: 12rpx;
+}
+.swiper.ns-indicator-dots-three :deep(.uni-swiper-dot) {
+	width: 8rpx;
+	height: 8rpx;
+	border-radius: 8rpx;
+	margin-right: 14rpx;
+}
+.swiper.ns-indicator-dots-three :deep(.uni-swiper-dot):last-of-type {
+	margin-right: 0;
+}
+.swiper.ns-indicator-dots-three :deep(.uni-swiper-dot-active) {
+	width: 30rpx;
+}
+
+.swiper-dot-box {
+	position: absolute;
+	bottom: 4rpx;
+	width: 100%;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	padding: 0 80rpx 8rpx;
+	box-sizing: border-box;
+
+	.swiper-dot {
+		background-color: #b2b2b2;
+		width: 10rpx;
+		border-radius: 50%;
+		height: 10rpx;
+		margin: 8rpx;
+	}
+
+	&.straightLineStyle2{
+		.swiper-dot {
+			width: 8rpx;
+			height: 8rpx;
+			border-radius: 8rpx;
+			margin: 0;
+			margin-right: 14rpx;
+			&.last-of-type {
+				margin-right: 0;
+			}
+			&.active {
+				width: 30rpx;
+			}
+		}
+	}
+}
+</style>
diff --git a/uni-app/src/addon/shop/components/ns-goods-manjian/ns-goods-manjian.vue b/uni-app/src/addon/shop/components/ns-goods-manjian/ns-goods-manjian.vue
new file mode 100644
index 00000000..d46b4dff
--- /dev/null
+++ b/uni-app/src/addon/shop/components/ns-goods-manjian/ns-goods-manjian.vue
@@ -0,0 +1,141 @@
+<template>
+	<!-- 满减 -->
+	<view @touchmove.prevent.stop>
+		<u-popup class="manjian-popup" :show="manjianShow" @close="manjianShow = false" zIndex="999999">
+			<view class="min-h-[480rpx] popup-common" @touchmove.prevent.stop>
+				<view class="title !pb-[30rpx]">满减送</view>
+				<scroll-view class="h-[520rpx]" scroll-y="true">
+					<view class="px-[var(--popup-sidebar-m)] pt-[30rpx]">
+						<view v-for="(item,index) in data.content" :key="index" class="mb-[40rpx]">
+							<view class="flex items-center">
+								<text class="nc-iconfont nc-icon-qianbaoyueV6xx !text-[28rpx] mr-[10rpx]"></text>
+								<text class="text-[26rpx] font-500">{{item.limit}}</text>
+							</view>
+							<view class="mt-[20rpx]">
+								<view v-if="item.goods && item.goods.length" class="flex mt-[20rpx]">
+									<view class="w-[100rpx] flex justify-end">
+										<view class="bg-[var(--primary-color-light)] text-[var(--primary-color)] rounded-[6rpx] text-[22rpx] flex items-center justify-center px-[12rpx] h-[38rpx] mr-[6rpx]">赠品</view>
+									</view>
+									<view class="flex-1 ml-[8rpx]">
+										<view class="flex p-[20rpx] bg-[#f8f8f8] rounded-[var(--goods-rounded-big)] overflow-hidden" :class="{'mb-[20rpx]': goodsIndex != (item.goods.length-1)}" v-for="(goodsItem,goodsIndex) in item.goods" :key="goodsIndex" @click="goodsEvent(goodsItem.goods_id)">
+											<u--image radius="var(--goods-rounded-mid)" width="120rpx" height="120rpx" :src="img(goodsItem.sku_image)" model="aspectFill">
+												<template #error>
+													<image class="w-[120rpx] h-[120rpx] rounded-[var(--goods-rounded-big)] overflow-hidden" :src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill"></image>
+												</template>
+											</u--image>
+											<view class="flex flex-1 w-0 flex-col justify-between ml-[20rpx] pt-[6rpx] pb-[10rpx]">
+												<view class="truncate text-[#303133] text-[24rpx] leading-[32rpx]">
+													{{goodsItem.goods_name}}
+												</view>
+												<view class="flex items-baseline">
+													<view v-if="goodsItem.sku_name" class="truncate text-[22rpx] mt-[4rpx] text-[#999]">
+														{{ goodsItem.sku_name }}
+													</view>
+													<view class="font-400 ml-[auto] text-[24rpx] text-[#303133]">
+														<text>x</text>
+														<text>{{goodsItem.num}}</text>
+													</view>
+												</view>
+											</view>
+										</view>
+									</view>
+								</view>
+								<block v-if="item.give && item.give.length">
+									<view class="flex items-center mt-[24rpx]" v-for="(giveItem,giveIndex) in item.give" :key="giveIndex">
+										<view class="w-[100rpx] flex justify-end">
+											<view class="bg-[var(--primary-color-light)] text-[var(--primary-color)] rounded-[6rpx] text-[22rpx] flex items-center justify-center px-[12rpx] h-[38rpx] mr-[6rpx]">{{giveItem.label}}</view>
+										</view>
+										<text class="text-[24rpx]">{{giveItem.content}}</text>
+									</view>
+								</block>
+								<view class="flex items-baseline mt-[24rpx]" v-if="item.coupon && item.coupon.length">
+									<view class="w-[100rpx] flex justify-end">
+										<view class="bg-[var(--primary-color-light)] text-[var(--primary-color)] rounded-[6rpx] text-[22rpx] flex items-center justify-center px-[12rpx] h-[38rpx] mr-[6rpx]">优惠券</view>
+									</view>
+									<view class="flex flex-wrap flex-1">
+										<text class="flex items-center text-[24rpx] leading-[1.3]" :class="{'mb-[16rpx]': couponIndex != (item.coupon.length-1)}" v-for="(couponItem,couponIndex) in item.coupon" :key="couponIndex">
+											{{couponItem.num}}张{{couponItem.coupon_name}}优惠券
+										</text>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</scroll-view>
+				<view class="btn-wrap">
+					<button class="primary-btn-bg btn" @click="manjianShow = false">确定</button>
+				</view>
+			</view>
+		</u-popup>
+	</view>
+</template>
+
+<script setup lang="ts">
+	import { ref } from 'vue';
+	import { img, deepClone, redirect } from '@/utils/common'
+	import { cloneDeep } from 'lodash-es'
+	import { t } from '@/locale'
+
+	const manjianShow = ref(false);
+	const data = ref({});
+	const open = (parameter:any = {})=>{
+		data.value = cloneDeep(parameter);
+		data.value.content = [];
+		data.value.rule_json.forEach((item,index)=>{
+			if(item.is_show || item.is_show == undefined){
+				let obj = {};
+				obj.limit = `门槛满${data.value.condition_type == 'over_n_yuan' ? parseFloat(item.limit).toFixed(2) : item.limit }${data.value.condition_type == 'over_n_yuan' ? '元' : '件'}`;
+				if(item.is_give_goods){
+					obj.goods = deepClone(item.goods);
+				}
+				obj.give = [];
+				if(item.is_discount && item.discount_money){
+					obj.give.push({
+						label: '满减',
+						content: `订单金额${item.discount_type == 1 ? '减' : '打'}${item.discount_type == 1 ? parseFloat(item.discount_money).toFixed(2) : item.discount_money}${item.discount_type == 1 ? '元' : '折'}`
+					})
+				}
+				if(item.is_free_shipping){
+					obj.give.push({
+						label: '包邮',
+						content: '商品包邮'
+					});
+				}
+				if(item.is_give_point && item.point){
+					obj.give.push({
+						label: '积分',
+						content: `送${item.point}积分`
+					});
+				}
+				if(item.is_give_balance && item.balance){
+					obj.give.push({
+						label: '余额',
+						content: `送${parseFloat(item.balance).toFixed(2)}余额`
+					});
+				}
+				if(item.is_give_coupon){obj.coupon = item.coupon;}
+				data.value.content.push(obj);
+			}
+		});
+		manjianShow.value = true;
+	}
+
+	const goodsEvent = (id : number) => {
+		redirect({
+			url: '/addon/shop/pages/goods/detail',
+			param: {
+				goods_id: id
+			}
+		})
+	}
+
+	defineExpose({
+		open
+	})
+</script>
+
+<style lang="scss" scoped>
+	::v-deep .manjian-popup .u-slide-up-enter-to{
+		z-index: 999999 !important;
+	}
+</style>
diff --git a/uni-app/src/addon/shop/components/ns-goods-recommend/ns-goods-recommend.vue b/uni-app/src/addon/shop/components/ns-goods-recommend/ns-goods-recommend.vue
new file mode 100644
index 00000000..3026688d
--- /dev/null
+++ b/uni-app/src/addon/shop/components/ns-goods-recommend/ns-goods-recommend.vue
@@ -0,0 +1,69 @@
+<template>
+    <view class="goods-recommend">
+        <view class="mt-[60rpx] flex flex-col items-center sidebar-margin pb-[50rpx]">
+            <view class="flex items-center mb-[30rpx]" v-if="goodsList && Object.keys(goodsList).length">
+                <image class="w-[38rpx] h-[22rpx]" :src="img('addon/shop_fenxiao/level/title_left.png')" mode="aspectFill"></image>
+                <text class="text-[30rpx] mx-[18rpx] font-500 text-[#EF000C]">猜你喜欢</text>
+                <image class="w-[38rpx] h-[22rpx]" :src="img('addon/shop_fenxiao/level/title_right.png')" mode="aspectFill"></image>
+            </view>
+            <diy-goods-list @loadingFn="getGoodsListFn" :component="goodsData"/>
+        </view>
+    </view>
+</template>
+
+<script setup lang="ts">
+import { img } from '@/utils/common';
+import { ref } from 'vue'
+import diyGoodsList from '@/addon/shop/components/diy/goods-list/index.vue';
+
+// 获取分销商品数据
+const goodsList = ref()
+const getGoodsListFn = (data: any)=>{
+    goodsList.value = data || {}
+}
+
+// 商品列表组件
+const goodsData = ref({
+    style: 'style-2',
+    num: 10,
+    source: 'all',
+    topElementRounded: 12,
+    bottomElementRounded: 12,
+    margin: {
+        both: 10,
+        bottom: 0,
+        top: 0
+    },
+    priceStyle: {
+        mainColor: "#FF4142",
+        control: true
+    },
+    goodsNameStyle:{
+        color: "#303133",
+        control: true,
+        fontWeight: "normal"
+    },
+    saleStyle: {
+        color: "#999",
+        control: true
+    },
+    labelStyle: {
+        isShow: true,
+        control: true
+    },
+    btnStyle: {
+        fontWeight:false,
+        padding: 0,
+        aroundRadius:25,
+        textColor: "#fff",
+        startBgColor: '#FF4142',
+        endBgColor: '#FF4142',
+        style: 'nc-icon-gouwuche1',
+        control: true
+    }
+});
+</script>
+
+<style lang="scss" scoped>
+
+</style>
diff --git a/uni-app/src/addon/shop/components/ns-goods-sku/ns-goods-sku.vue b/uni-app/src/addon/shop/components/ns-goods-sku/ns-goods-sku.vue
new file mode 100644
index 00000000..ed03e44f
--- /dev/null
+++ b/uni-app/src/addon/shop/components/ns-goods-sku/ns-goods-sku.vue
@@ -0,0 +1,459 @@
+<template>
+	<view @touchmove.prevent.stop>
+		<u-overlay :show="goodsSkuPop" @click="closeFn" zIndex="490">
+			<u-popup class="popup-type" :show="goodsSkuPop" @close="closeFn" mode="bottom" :overlay="false" zIndex="500">
+				<view class="py-[32rpx] relative" v-if="goodsDetail.detail" @touchmove.prevent.stop>
+					<view class="flex px-[32rpx]" :class="{'mb-[58rpx]':!(goodsDetail.is_newcomer && goodsDetail.newcomer_price != goodsDetail.price && (Object.keys(cartSkuList).length?parseInt(cartSkuList.num)+buyNum:buyNum)>1)}">
+
+						<view class="rounded-[var(--goods-rounded-big)] overflow-hidden w-[180rpx] h-[180rpx]">
+							<u--image width="180rpx" height="180rpx" :src="img(goodsDetail.detail.sku_image)" @click="imgListPreview(goodsDetail.detail.sku_image)" model="aspectFill">
+								<template #error>
+									<image class="w-[180rpx] h-[180rpx]" :src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill"></image>
+								</template>
+							</u--image>
+						</view>
+						<view class="flex flex-1 flex-col justify-between ml-[24rpx] py-[10rpx]">
+							<view class="w-[100%]">
+								<view class="text-[var(--price-text-color)] flex items-baseline">
+									<text class="text-[32rpx] font-bold price-font">￥</text>
+									<text class="text-[48rpx] price-font">{{ parseFloat(goodsPrice).toFixed(2).split('.')[0] }}</text>
+									<text class="text-[32rpx] mr-[6rpx] price-font">.{{ parseFloat(goodsPrice).toFixed(2).split('.')[1] }}</text>
+									<image class="h-[24rpx] ml-[6rpx] max-w-[60rpx]" v-if="priceType() == 'newcomer_price'" :src="img('addon/shop/newcomer.png')" mode="heightFix" />
+									<image class="h-[24rpx] ml-[6rpx] max-w-[44rpx]" v-if="priceType() == 'member_price'" :src="img('addon/shop/VIP.png')" mode="heightFix" />
+									<image class="h-[24rpx] ml-[6rpx] max-w-[72rpx]" v-if="priceType() == 'discount_price'" :src="img('addon/shop/discount.png')" mode="heightFix" />
+								</view>
+								 <view class="text-[26rpx] leading-[32rpx] text-[var(--text-color-light6)] mt-[12rpx]">库存{{goodsDetail.detail.stock}}{{ goodsDetail.goods.unit }}</view>
+							</view>
+							<view class="text-[26rpx] leading-[30rpx] text-[var(--text-color-light6)] w-[100%] max-h-[60rpx] multi-hidden" v-if="goodsDetail.goodsSpec && goodsDetail.goodsSpec.length">已选规格：{{goodsDetail.detail.sku_spec_format}}</view>
+	<!-- 						<view v-if="goodsDetail.goodsSpec && goodsDetail.goodsSpec.length">
+								<text>已选规格：{{goodsDetail.detail.sku_spec_format}}</text>
+							</view> -->
+						</view>
+					</view>
+					<view class="flex items-center px-[32rpx] pt-[8rpx] pb-[16rpx] h-[58rpx] box-border" v-if="goodsDetail.is_newcomer && goodsDetail.newcomer_price != goodsDetail.price && (Object.keys(cartSkuList).length?parseInt(cartSkuList.num)+buyNum:buyNum)>1">
+						<image class="h-[24rpx] w-[56rpx]" :src="img('addon/shop/newcomer.png')" mode="aspectFit" />
+						<view class="text-[24rpx] text-[#FFB000] leading-[34rpx] ml-[8rpx]">第1{{goodsDetail.goods.unit}}，￥{{parseFloat(goodsDetail.newcomer_price).toFixed(2)}}/{{goodsDetail.goods.unit}}；第{{(parseInt(cartSkuList.num||0)+buyNum)>2?'2~'+(parseInt(cartSkuList.num||0)+buyNum):'2'}}{{goodsDetail.goods.unit}}，￥{{parseFloat(parseFloat(goodsPrice)).toFixed(2)}}/{{goodsDetail.goods.unit}}</view>
+					</view>
+					<scroll-view class="h-[500rpx] px-[32rpx] box-border mb-[60rpx]" scroll-y="true">
+						<view :class="{'mt-[20rpx]': 0 != index }" v-for="(item,index) in goodsDetail.goodsSpec" :key="index">
+							<view class="text-[28rpx] leading-[36rpx] mb-[24rpx]">{{item.spec_name}}</view>
+							<view class="flex flex-wrap">
+								<view class="box-border bg-[var(--temp-bg)] text-[24rpx] px-[44rpx] text-center h-[56rpx] flex-center mr-[20rpx] mb-[20rpx] border-1 border-solid rounded-[50rpx] border-[var(--temp-bg)]"
+								 :class="{'!border-[var(--primary-color)] text-[var(--primary-color)] !bg-[var(--primary-color-light)]': subItem.selected}"
+								v-for="(subItem,subIndex) in item.values" :key="subIndex" @click="change(subItem, index)">
+									{{subItem.name}}
+								</view>
+							</view>
+						</view>
+						<view class="flex justify-between items-center my-[20rpx]">
+							<view class="text-[28rpx]">购买数量</view>
+							<text v-if="maxBuyShow > 0 && minBuyShow > 1" class="ml-[20rpx] mr-[auto] text-[24rpx] text-[var(--primary-color)]">
+								({{ minBuyShow }}{{ goodsDetail.goods.unit }}起售，限购{{ maxBuyShow }}{{ goodsDetail.goods.unit }})
+							</text>
+							<text v-else-if="maxBuyShow > 0" class="ml-[20rpx] mr-[auto] text-[24rpx] text-[var(--primary-color)]">(限购{{ maxBuyShow }}{{ goodsDetail.goods.unit }})</text>
+							<text v-else-if="minBuyShow > 1" class="ml-[20rpx] mr-[auto] text-[24rpx] text-[var(--primary-color)]">({{ minBuyShow }}{{ goodsDetail.goods.unit }}起售)</text>
+
+							<u-number-box :min="minBuy" :max="maxBuy" integer :step="1" input-width="68rpx" v-model="buyNum" input-height="52rpx">
+								<template #minus>
+									<view class="relative w-[30rpx] h-[30rpx]" @click="reduceNumChange">
+										<text class="text-[30rpx] nc-iconfont nc-icon-jianV6xx font-500 absolute flex items-center justify-center -left-[8rpx] -bottom-[8rpx] -right-[8rpx] -top-[8rpx]" :class="{ '!text-[var(--text-color-light9)]': buyNum <= minBuy }"></text>
+									</view>
+								</template>
+								<template #input>
+									<input class="text-[#303133] text-[28rpx] mx-[10rpx] w-[80rpx] h-[44rpx] bg-[var(--temp-bg)] leading-[44rpx] text-center rounded-[6rpx]" type="number" @input="goodsSkuInputFn" @blur="goodsSkuBlurFn" v-model="buyNum"  />
+								</template>
+								<template #plus>
+									<view class="relative w-[30rpx] h-[30rpx]" @click="addNumChange">
+										<text class="text-[30rpx] nc-iconfont nc-icon-jiahaoV6xx font-500 absolute flex items-center justify-center -left-[8rpx] -bottom-[8rpx] -right-[8rpx] -top-[8rpx]" :class="{ '!text-[var(--text-color-light9)]': buyNum >= maxBuy }"></text>
+									</view>
+								</template>
+							</u-number-box>
+						</view>
+						<view class="mt-[40rpx]">
+							<diy-form ref="diyFormRef" :form_id="goodsDetail.goods.form_id" :storage_name="'diyFormStorageByGoodsDetail_' + goodsDetail.sku_id" />
+						</view>
+					</scroll-view>
+					<view class="px-[20rpx]">
+
+						<!-- #ifdef H5 -->
+						<button v-if="goodsDetail.detail.stock > 0" hover-class="none" class="!h-[80rpx] leading-[80rpx] text-[26rpx] font-500 rounded-[50rpx] primary-btn-bg" type="primary" @click="confirm">确定</button>
+						<!-- #endif -->
+
+						<!-- #ifdef MP-WEIXIN -->
+						<template v-if="goodsDetail.detail.stock > 0">
+							<button v-if="isBindMobile && userInfo && !userInfo.mobile" hover-class="none" class="!h-[80rpx] leading-[80rpx] text-[26rpx] font-500 rounded-[50rpx] primary-btn-bg" type="primary" open-type="getPhoneNumber" @getphonenumber="memberStore.bindMobile">确定</button>
+							<button v-else hover-class="none" class="!h-[80rpx] leading-[80rpx] text-[26rpx] font-500 rounded-[50rpx] primary-btn-bg" type="primary" @click="confirm">确定</button>
+						</template>
+						<!-- #endif -->
+
+						<button hover-class="none" v-else class="!h-[80rpx] leading-[80rpx] text-[26rpx] font-500 text-[#fff] bg-[#ccc] rounded-[50rpx]">已售罄</button>
+					</view>
+				</view>
+			</u-popup>
+		</u-overlay>
+		 <!-- 强制绑定手机号 -->
+		<bind-mobile ref="bindMobileRef" />
+	</view>
+</template>
+
+<script setup lang="ts">
+	import { ref, computed, toRaw } from 'vue';
+	import { img, redirect, getToken } from '@/utils/common'
+	import useCartStore from '@/addon/shop/stores/cart'
+	import { useLogin } from '@/hooks/useLogin'
+	import useMemberStore from '@/stores/member'
+	import bindMobile from '@/components/bind-mobile/bind-mobile.vue';
+	import { cloneDeep } from 'lodash-es'
+	import { t } from '@/locale'
+	import diyForm from '@/addon/components/diy-form/index.vue'
+
+	const props = defineProps(['goodsDetail']);
+	const goodsSkuPop = ref(false);
+	const callback:any = ref(null);
+	const currSpec = ref({
+		skuId: "",
+		name: []
+	})
+	const openType = ref("");
+	const buyNum = ref(1)
+
+	const maxBuy = ref(0); // 限购
+	const minBuy = ref(0); // 起售
+	const maxBuyShow = ref(0); // 限购
+	const minBuyShow = ref(0); // 起售
+
+	// 商品价格
+	const goodsPrice = computed(() => {
+        let price = "0.00";
+        if (Object.keys(goodsDetail.value).length && goodsDetail.value.type == 'newcomer_discount' && goodsDetail.value.is_newcomer && goodsDetail.value.newcomer_price != goodsDetail.value.price && (Object.keys(cartSkuList.value).length ? parseInt(cartSkuList.value.num) + buyNum.value : buyNum.value) < 2) {
+            // 新人价
+            price = goodsDetail.value.newcomer_price;
+        } else if (Object.keys(goodsDetail.value).length && goodsDetail.value.type == 'discount' && Object.keys(goodsDetail.value.goods).length && goodsDetail.value.goods.is_discount && goodsDetail.value.sale_price != goodsDetail.value.price) {
+            price = goodsDetail.value.sale_price // 折扣价
+        } else if (Object.keys(goodsDetail.value).length && Object.keys(goodsDetail.value.goods).length && goodsDetail.value.goods.member_discount && getToken() && goodsDetail.value.member_price != goodsDetail.value.price) {
+            price = goodsDetail.value.member_price // 会员价
+        } else {
+            price = goodsDetail.value.price
+        }
+        return price;
+    })
+
+	// 价格类型
+	const priceType = () => {
+	    let type = "";
+	    if (goodsDetail.value.type == 'newcomer_discount' && Object.keys(goodsDetail.value).length && goodsDetail.value.is_newcomer && goodsDetail.value.newcomer_price != goodsDetail.value.price && getToken()) {
+	        type = 'newcomer_price'// 新人
+	    } else if (goodsDetail.value.type == 'discount' && Object.keys(goodsDetail.value).length && Object.keys(goodsDetail.value.goods).length && goodsDetail.value.goods.is_discount && goodsDetail.value.sale_price != goodsDetail.value.price) {
+	        type = 'discount_price'// 折扣
+	    } else if (Object.keys(goodsDetail.value).length && Object.keys(goodsDetail.value.goods).length && goodsDetail.value.goods.member_discount && getToken() && goodsDetail.value.member_price != goodsDetail.value.price) {
+	        type = 'member_price' // 会员价
+	    }
+	    return type;
+	}
+
+	// 会员信息
+	const memberStore = useMemberStore()
+	const userInfo = computed(() => memberStore.info)
+
+	// 购物车数量
+	const cartStore = useCartStore();
+	cartStore.getList();
+	const cartSkuList = computed(()=>{
+		if(goodsDetail.value && cartStore.cartList['goods_' + goodsDetail.value.goods_id] && cartStore.cartList['goods_' + goodsDetail.value.goods_id]['sku_' + goodsDetail.value.sku_id]) {
+			return cartStore.cartList['goods_' + goodsDetail.value.goods_id]['sku_' + goodsDetail.value.sku_id];
+		}else{
+			return {}
+		}
+	})
+	const cartList = computed(() => cartStore.cartList)
+	const open = (type="",fn = "")=>{
+		openType.value = type;
+		goodsSkuPop.value = true;
+		callback.value = fn;
+	}
+
+	const goodsSkuInputFn = ()=>{
+		setTimeout(() => {
+			if(!buyNum.value || buyNum.value <= minBuy.value ){
+				buyNum.value = minBuy.value || 1;
+			}
+			if(buyNum.value >= maxBuy.value){
+				buyNum.value = maxBuy.value;
+			}
+			// 起售大于库存，初始值也应该是零
+			if(minBuy.value > goodsDetail.value.detail.stock){
+				buyNum.value = 0;
+			}
+		},0)
+	}
+
+	const goodsSkuBlurFn = ()=>{
+		setTimeout(() => {
+			if(!buyNum.value || buyNum.value <= minBuy.value ){
+				buyNum.value = minBuy.value || 1;
+			}
+			if(buyNum.value >= maxBuy.value){
+				buyNum.value = maxBuy.value;
+			}
+
+			// 起售大于库存，初始值也应该是零
+			if(minBuy.value > goodsDetail.value.detail.stock){
+				buyNum.value = 0;
+				uni.showToast({
+				    title: '商品库存小于起购数量',
+				    icon: 'none'
+				});
+			}
+		},0)
+	}
+
+	const closeFn = ()=>{
+		goodsSkuPop.value = false
+	}
+
+	const goodsDetail = computed(() => {
+		let data = cloneDeep(props.goodsDetail);
+
+		// 重组数据结构
+		if(Object.keys(data).length){
+
+			if(!Object.keys(currSpec.value.name).length) currSpec.value.name = data.sku_spec_format.split(",");
+
+			data.goodsSpec.forEach((item: any,index: any)=>{
+				let specName = item.spec_values.split(",");
+				item.values = [];
+				specName.forEach((specItem: any, specIndex: any)=>{
+					item.values[specIndex] = {};
+					item.values[specIndex].name = specItem;
+					item.values[specIndex].selected = false;
+					item.values[specIndex].disabled = false;
+
+					// 选中规格
+					currSpec.value.name.forEach((currSpecItem, currSpecIndex)=>{
+						if(currSpecIndex == index && currSpecItem == specItem){
+							item.values[specIndex].selected = true;
+						}
+					})
+				})
+			})
+			getSkuId();
+
+			// 当前详情内容
+			if(data.skuList && Object.keys(data.skuList).length){
+				data.skuList.forEach((idItem: any, idIndex: any)=>{
+					if(idItem.sku_id == currSpec.value.skuId){
+						data.detail = idItem;
+					}
+				})
+			}
+		}
+
+		// 限购 - 是否开启限购
+		if(data.goods.is_limit){
+			if(data.goods.max_buy){
+				let max_buy = 0;
+				if(data.goods.limit_type == 1){ //单次限购
+					max_buy = data.goods.max_buy;
+				}else{ // 单人限购
+					let buyVal = data.goods.max_buy - (data.goods.has_buy||0);
+					max_buy = buyVal > 0 ? buyVal : 0;
+				}
+				if(max_buy > data.detail.stock){
+					maxBuy.value = data.detail.stock
+				}else if(max_buy <= data.detail.stock){
+					maxBuy.value = max_buy;
+				}
+
+				// 限购开启且最大购买变为零时，初始值也应该是零
+				if(maxBuy.value == 0){
+					buyNum.value = 0;
+				}
+			}
+			// 仅用于展示
+			maxBuyShow.value = data.goods.max_buy; // 限购
+		}else{
+			maxBuy.value = data.detail.stock;
+		}
+
+		// 起售
+		minBuy.value = data.goods.min_buy > 0 ? data.goods.min_buy : 1;
+		// 起售大于库存，初始值也应该是零
+		if(minBuy.value > data.detail.stock){
+			buyNum.value = 0;
+		}else{
+			buyNum.value = minBuy.value;
+		}
+		// 仅用于展示
+		minBuyShow.value = data.goods.min_buy;
+		return data;
+	})
+
+	const change = (data: any, index: any)=>{
+		currSpec.value.name[index] = data.name;
+		getSkuId(); // 刷新当前规格信息
+	}
+
+	const emits = defineEmits(['change'])
+	const getSkuId = ()=>{
+		props.goodsDetail.skuList.forEach((skuItem: any, skuIndex: any)=>{
+			if(skuItem.sku_spec_format == currSpec.value.name.toString()){
+				currSpec.value.skuId = skuItem.sku_id
+				emits('change',skuItem.sku_id)
+			}
+		})
+	}
+
+	const addNumChange = () => {
+		if(minBuy.value && minBuy.value > goodsDetail.value.detail.stock){
+			uni.showToast({ title: '商品库存小于起购数量', icon: 'none' })
+			return;
+		}
+		if(goodsDetail.value.goods.is_limit){
+			let tips = `该商品单次限购${goodsDetail.value.goods.max_buy}件`;
+			if(goodsDetail.value.goods.limit_type != 1){ //单次限购
+				tips = `该商品每人限购${goodsDetail.value.goods.max_buy}件`;
+				if(goodsDetail.value.goods.max_buy - maxBuy.value){
+					tips += `,已购${goodsDetail.value.goods.max_buy - maxBuy.value}件`;
+				}
+			}
+			if(buyNum.value >= maxBuy.value){
+				uni.showToast({ title: tips, icon: 'none' })
+			}
+		}
+	}
+
+	const reduceNumChange = () => {
+		if(minBuy.value > 1){
+			let tips = `该商品起购${minBuy.value}件`;
+			if(buyNum.value <= minBuy.value){
+				uni.showToast({ title: tips, icon: 'none' })
+			}
+		}
+	}
+
+	//强制绑定手机号
+	const bindMobileRef: any = ref(null)
+	const isBindMobile = ref(uni.getStorageSync('isbindmobile'))
+
+	const diyFormRef: any = ref(null)
+
+	//提交
+	const confirm = ()=> {
+		if(!diyFormRef.value.verify()) return;
+
+		if(buyNum.value < 1) return;
+
+        // 检测是否登录
+        if (!userInfo.value) {
+	        useLogin().setLoginBack({
+		        url: '/addon/shop/pages/goods/detail',
+		        param: {
+			        sku_id: goodsDetail.value.sku_id,
+			        type: goodsDetail.value.type
+		        }
+	        })
+	        return false
+        }
+
+        // #ifdef H5
+        // 绑定手机号
+        if (uni.getStorageSync('isbindmobile')) {
+            bindMobileRef.value.open()
+            return false
+        }
+        // #endif
+
+        // 加入购物车
+        if (openType.value == 'join_cart') {
+            let num = 0;
+			let limitNum = 0;
+            let cartId = "";
+
+            if (cartList.value['goods_' + goodsDetail.value.goods_id] && cartList.value['goods_' + goodsDetail.value.goods_id]['sku_' + goodsDetail.value.sku_id]) {
+                num = toRaw(cartList.value['goods_' + goodsDetail.value.goods_id]['sku_' + goodsDetail.value.sku_id].num);
+                cartId = toRaw(cartList.value['goods_' + goodsDetail.value.goods_id]['sku_' + goodsDetail.value.sku_id].id)
+            }
+			if (cartList.value['goods_' + goodsDetail.value.goods_id] && cartList.value['goods_' + goodsDetail.value.goods_id]) {
+			    limitNum = toRaw(cartList.value['goods_' + goodsDetail.value.goods_id].totalNum);
+			}
+
+            num += Number(buyNum.value);
+			limitNum += Number(buyNum.value);
+			/************** 限购-start **************/
+			if(goodsDetail.value.goods.is_limit){
+				let tips = `该商品单次限购${goodsDetail.value.goods.max_buy}件`;
+				if(goodsDetail.value.goods.limit_type != 1){ //单次限购
+					tips = `该商品每人限购${goodsDetail.value.goods.max_buy}件`;
+					if(goodsDetail.value.goods.max_buy - maxBuy.value){
+						tips += `,已购${goodsDetail.value.goods.max_buy - maxBuy.value}件`;
+					}
+				}
+				if(limitNum > maxBuy.value){
+					uni.showToast({ title: tips, icon: 'none' })
+					return false;
+				}
+			}
+			/************** 限购-end **************/
+            cartStore.increase({
+                id: cartId || '',
+                goods_id: goodsDetail.value.goods_id,
+                sku_id: goodsDetail.value.sku_id,
+                stock: goodsDetail.value.stock,
+                sale_price: goodsDetail.value.sale_price,
+                num: num
+            }, 0, () => {
+                uni.showToast({
+                    title: '加入购物车成功',
+                    icon: 'none'
+                });
+            });
+
+        } else if (openType.value == 'buy_now') {
+            // 立即购买
+            var data = {
+                sku_id: goodsDetail.value.sku_id,
+                num: buyNum.value
+            };
+
+            uni.setStorage({
+                key: 'orderCreateData',
+                data: {
+	                sku_data: [
+		                data
+	                ],
+	                extend_data: {
+		                relate_id: '',
+		                activity_type: goodsDetail.value.type // 目前营销活动有，新人价、限时折扣
+	                }
+                },
+                success: () => {
+                    redirect({ url: '/addon/shop/pages/order/payment' })
+                }
+            });
+        }
+
+        closeFn();
+    }
+
+	//预览图片
+	const imgListPreview = (item: any) => {
+		if (item === '') return false
+		var urlList = []
+		urlList.push(img(item))  //push中的参数为 :src="item.img_url" 中的图片地址
+		uni.previewImage({
+			indicator: "number",
+			loop: true,
+			urls: urlList
+		})
+	}
+	defineExpose({
+		open
+	})
+</script>
+
+<style lang="scss" scoped>
+	::v-deep .u-number-box .u-number-box__slot{
+		display: flex;
+		align-items: center;
+	}
+</style>
diff --git a/uni-app/src/addon/shop/hooks/useGoods.ts b/uni-app/src/addon/shop/hooks/useGoods.ts
new file mode 100644
index 00000000..194c9a2f
--- /dev/null
+++ b/uni-app/src/addon/shop/hooks/useGoods.ts
@@ -0,0 +1,50 @@
+import { getToken } from '@/utils/common';
+
+export function useGoods(params: any = {}) {
+
+    const baseTagStyle = (data: any) => {
+        let style = "";
+        if (data.color_json.text_color) {
+            style += `color:${ data.color_json.text_color };`;
+        }
+        if (data.color_json.border_color) {
+            style += `border-color: ${ data.color_json.border_color };`;
+        }
+        if (data.color_json.bg_color) {
+            style += `background-color: ${ data.color_json.bg_color };`;
+        }
+        return style;
+    }
+
+    // 价格类型
+    const priceType = (data: any) => {
+        let type = "";
+        if (data.member_discount && getToken() && data.goodsSku.member_price != data.goodsSku.price) {
+            type = 'member_price' // 会员价
+        }
+        return type;
+    }
+
+    // 商品价格
+    const goodsPrice = (data: any) => {
+        let price = "0.00";
+        if (data.member_discount && getToken() && data.goodsSku.member_price != data.goodsSku.price) {
+            price = data.goodsSku.member_price ? data.goodsSku.member_price : data.goodsSku.price // 会员价
+        } else {
+            price = data.goodsSku ? data.goodsSku.price : data.price; //兼容商品推荐组件
+        }
+        return parseFloat(price);
+    }
+
+    // 错误图片展示
+    const errorImgFn = (data: any, type: any) => {
+        data[type] = '';
+    }
+
+    return {
+        baseTagStyle: baseTagStyle,
+        goodsPrice: goodsPrice,
+        priceType: priceType,
+        error: errorImgFn
+    }
+}
diff --git a/uni-app/src/addon/shop/locale/en.json b/uni-app/src/addon/shop/locale/en.json
new file mode 100644
index 00000000..9e26dfee
--- /dev/null
+++ b/uni-app/src/addon/shop/locale/en.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/uni-app/src/addon/shop/locale/zh-Hans.json b/uni-app/src/addon/shop/locale/zh-Hans.json
new file mode 100644
index 00000000..3a8df682
--- /dev/null
+++ b/uni-app/src/addon/shop/locale/zh-Hans.json
@@ -0,0 +1,34 @@
+{
+    "pages.goods.search": "搜索",
+    "pages.goods.cart": "购物车",
+    "pages.goods.collect": "商品收藏",
+    "pages.goods.browse": "我的足迹",
+    "pages.goods.category": "商品分类",
+    "pages.goods.detail": "商品详情",
+    "pages.goods.list": "商品列表",
+    "pages.goods.rank": "排行榜",
+    "pages.member.index": "个人中心",
+    "pages.member.my_coupon": "我的优惠券",
+    "pages.order.list": "订单列表",
+    "pages.order.detail": "订单详情",
+    "pages.order.payment": "待付款订单",
+    "pages.evaluate.order_evaluate": "商品评价",
+    "pages.evaluate.order_evaluate_view": "商品评价",
+    "pages.evaluate.list": "评价列表",
+    "pages.coupon.list": "优惠券列表",
+    "pages.coupon.detail": "优惠券详情",
+    "pages.discount.list": "限时折扣",
+    "pages.refund.list": "退款列表",
+    "pages.refund.detail": "退款详情",
+    "pages.refund.apply": "申请退款",
+    "pages.refund.edit_apply": "编辑退款信息",
+    "pages.refund.log": "协商记录",
+    "pages.point.index": "积分商城",
+    "pages.point.list": "积分商品列表",
+    "pages.point.detail": "积分商品详情",
+    "pages.point.payment": "待付款订单",
+    "pages.point.order_list": "积分兑换记录",
+    "pages.newcomer.list": "新人专享",
+    "pages.pay.index": "待支付",
+    "pages.pay.result": ""
+}
\ No newline at end of file
diff --git a/uni-app/src/addon/shop/locale/zh-Hans/common.json b/uni-app/src/addon/shop/locale/zh-Hans/common.json
new file mode 100644
index 00000000..abfbb1b5
--- /dev/null
+++ b/uni-app/src/addon/shop/locale/zh-Hans/common.json
@@ -0,0 +1,7 @@
+{
+    "orderNo": "订单号",
+    "actualPayment": "实付款",
+    "orderClose": "关闭订单",
+    "orderFinish": "确认收货",
+    "coupon":"优惠劵"
+}
\ No newline at end of file
diff --git a/uni-app/src/addon/shop/locale/zh-Hans/pages.goods.cart.json b/uni-app/src/addon/shop/locale/zh-Hans/pages.goods.cart.json
new file mode 100644
index 00000000..2c63c085
--- /dev/null
+++ b/uni-app/src/addon/shop/locale/zh-Hans/pages.goods.cart.json
@@ -0,0 +1,2 @@
+{
+}
diff --git a/uni-app/src/addon/shop/locale/zh-Hans/pages.goods.category.json b/uni-app/src/addon/shop/locale/zh-Hans/pages.goods.category.json
new file mode 100644
index 00000000..2c63c085
--- /dev/null
+++ b/uni-app/src/addon/shop/locale/zh-Hans/pages.goods.category.json
@@ -0,0 +1,2 @@
+{
+}
diff --git a/uni-app/src/addon/shop/locale/zh-Hans/pages.goods.detail.json b/uni-app/src/addon/shop/locale/zh-Hans/pages.goods.detail.json
new file mode 100644
index 00000000..2c63c085
--- /dev/null
+++ b/uni-app/src/addon/shop/locale/zh-Hans/pages.goods.detail.json
@@ -0,0 +1,2 @@
+{
+}
diff --git a/uni-app/src/addon/shop/locale/zh-Hans/pages.goods.list.json b/uni-app/src/addon/shop/locale/zh-Hans/pages.goods.list.json
new file mode 100644
index 00000000..358a66be
--- /dev/null
+++ b/uni-app/src/addon/shop/locale/zh-Hans/pages.goods.list.json
@@ -0,0 +1,4 @@
+{
+    "all": "全部",
+    "price": "价格"
+}
diff --git a/uni-app/src/addon/shop/locale/zh-Hans/pages.goods.rank.json b/uni-app/src/addon/shop/locale/zh-Hans/pages.goods.rank.json
new file mode 100644
index 00000000..b6f022fc
--- /dev/null
+++ b/uni-app/src/addon/shop/locale/zh-Hans/pages.goods.rank.json
@@ -0,0 +1,3 @@
+{
+	"rankingRules":"榜单规则"
+}
\ No newline at end of file
diff --git a/uni-app/src/addon/shop/locale/zh-Hans/pages.index.json b/uni-app/src/addon/shop/locale/zh-Hans/pages.index.json
new file mode 100644
index 00000000..2c63c085
--- /dev/null
+++ b/uni-app/src/addon/shop/locale/zh-Hans/pages.index.json
@@ -0,0 +1,2 @@
+{
+}
diff --git a/uni-app/src/addon/shop/locale/zh-Hans/pages.member.index.json b/uni-app/src/addon/shop/locale/zh-Hans/pages.member.index.json
new file mode 100644
index 00000000..c8b96b1c
--- /dev/null
+++ b/uni-app/src/addon/shop/locale/zh-Hans/pages.member.index.json
@@ -0,0 +1,3 @@
+{
+  "coupon": "优惠券"
+}
diff --git a/uni-app/src/addon/shop/locale/zh-Hans/pages.order.detail.json b/uni-app/src/addon/shop/locale/zh-Hans/pages.order.detail.json
new file mode 100644
index 00000000..54f9825b
--- /dev/null
+++ b/uni-app/src/addon/shop/locale/zh-Hans/pages.order.detail.json
@@ -0,0 +1,24 @@
+{
+	"orderNo": "订单号",
+	"actualPayment": "实付款",
+	"orderClose": "关闭订单",
+	"orderFinish": "确认收货",
+	"topay": "去支付",
+	"orderDetail": "详情",
+	"orderTradeNo": "支付流水号",
+	"createTime": "创建时间",
+	"deliveryType": "配送方式",
+	"payTypeName": "支付方式",
+	"payTime": "支付时间",
+	"goodsMoney": "商品金额",
+	"deliveryMoney": "配送费用",
+	"orderMoney": "实付金额",
+	"evaluate": "评价",
+	"selectedEvaluate": "查看评价",
+	"index": "首页",
+	"discountMoney": "优惠金额",
+	"logisticsTracking":"查看物流",
+	"copy":"复制",
+	"detailedInformation":"详细信息",
+	"helpPay":"的帮付"
+}
diff --git a/uni-app/src/addon/shop/locale/zh-Hans/pages.order.list.json b/uni-app/src/addon/shop/locale/zh-Hans/pages.order.list.json
new file mode 100644
index 00000000..937a509b
--- /dev/null
+++ b/uni-app/src/addon/shop/locale/zh-Hans/pages.order.list.json
@@ -0,0 +1,16 @@
+{
+	"emptyAddress":"暂无收货地址，请先创建地址",
+	"addAddress":"新增收货地址",
+	"selectAddress":"选择地址",
+	"evaluate": "评价",
+	"money":"元",
+	"pendingPayment":"待支付",
+	"pendingPaymentTips":"剩余时间",
+	"service":"含物流运输服务",
+	"selectedEvaluate": "查看评价",
+	"orderClose": "关闭订单",
+	"orderFinish": "确认收货",
+	"topay": "支付",
+	"deliveryType":"配送方式",
+	"createTime":"下单时间"
+}
diff --git a/uni-app/src/addon/shop/locale/zh-Hans/pages.order.payment.json b/uni-app/src/addon/shop/locale/zh-Hans/pages.order.payment.json
new file mode 100644
index 00000000..5ba07973
--- /dev/null
+++ b/uni-app/src/addon/shop/locale/zh-Hans/pages.order.payment.json
@@ -0,0 +1,11 @@
+{
+    "orderNo": "订单号",
+    "actualPayment": "实付款",
+    "orderClose": "关闭订单",
+    "orderFinish": "确认收货",
+    "topay": "支付",
+    "orderDetail": "详情",
+	"evaluate": "评价",
+    "orderListempty":"暂无订单",
+	"emptyAddress":"暂无收货地址，请先创建地址"
+}
diff --git a/uni-app/src/addon/shop/locale/zh-Hans/pages.point.detail.json b/uni-app/src/addon/shop/locale/zh-Hans/pages.point.detail.json
new file mode 100644
index 00000000..e30ee619
--- /dev/null
+++ b/uni-app/src/addon/shop/locale/zh-Hans/pages.point.detail.json
@@ -0,0 +1,5 @@
+{
+	"point":"积分",
+	"priceUnit":"元",
+	"redeemed":"已兑"
+}
\ No newline at end of file
diff --git a/uni-app/src/addon/shop/locale/zh-Hans/pages.point.order_list.json b/uni-app/src/addon/shop/locale/zh-Hans/pages.point.order_list.json
new file mode 100644
index 00000000..31342def
--- /dev/null
+++ b/uni-app/src/addon/shop/locale/zh-Hans/pages.point.order_list.json
@@ -0,0 +1,14 @@
+{
+  "orderNo": "订单号",
+  "actualPayment": "订单金额",
+  "orderClose": "关闭订单",
+  "orderFinish": "确认收货",
+  "topay": "支付",
+  "orderDetail": "详情",
+  "evaluate": "评价",
+  "selectedEvaluate": "查看评价",
+  "orderListempty": "暂无订单",
+  "deliveryType":"配送方式",
+  "money":"元",
+  "point": "积分"
+}
diff --git a/uni-app/src/addon/shop/locale/zh-Hans/pages.refund.detail.json b/uni-app/src/addon/shop/locale/zh-Hans/pages.refund.detail.json
new file mode 100644
index 00000000..648c3b46
--- /dev/null
+++ b/uni-app/src/addon/shop/locale/zh-Hans/pages.refund.detail.json
@@ -0,0 +1,17 @@
+{
+	"refundDetail":"退货详情",
+	"fastRefundSuccessful":"极速退款成功",
+	"refundInfo":"由于你的信誉良好,已享受极速退款服务,退款即刻到账",
+	"refundType": "退款方式",
+	"refundMoney": "退款金额",
+	"refundCause": "退款原因",
+	"reasonRefusal": "拒绝原因",
+	"refundNo": "退款编号",
+	"createTime": "申请时间",
+	"createExplain": "退款说明",
+	"record": "协商记录",
+	"check": "查看",
+	"refundApply":"取消退款",
+	"cancelRefundContent": "撤销之后本次申请将会关闭,如后续仍有问题可再次发起申请。",
+	"index": "首页"
+}
\ No newline at end of file
diff --git a/uni-app/src/addon/shop/locale/zh-Hans/pages.refund.list.json b/uni-app/src/addon/shop/locale/zh-Hans/pages.refund.list.json
new file mode 100644
index 00000000..25a4e87c
--- /dev/null
+++ b/uni-app/src/addon/shop/locale/zh-Hans/pages.refund.list.json
@@ -0,0 +1,6 @@
+{
+	"refundMoney":"退款金额",
+	"refundApply":"取消退款",
+	"refund":"退款进度",
+	"cancelRefundContent": "撤销之后本次申请将会关闭,如后续仍有问题可再次发起申请。"
+}
\ No newline at end of file
diff --git a/uni-app/src/addon/shop/pages/coupon/detail.vue b/uni-app/src/addon/shop/pages/coupon/detail.vue
new file mode 100644
index 00000000..8ec48428
--- /dev/null
+++ b/uni-app/src/addon/shop/pages/coupon/detail.vue
@@ -0,0 +1,174 @@
+<template>
+	<view :style="themeColor()">
+		<view v-if="Object.keys(detail).length&&!loading" class="overflow-hidden min-h-screen bg-style relative" :style="{ 'background': 'url(' + img('addon/shop/coupon/coupon_bg.png') + ') no-repeat' }">
+			<!-- #ifdef MP -->
+			<top-tabbar :data="topTabbarData" :scrollBool="topTabarObj.getScrollBool()" />
+			<!-- #endif -->
+			<view class="relative mt-[236rpx] w-[100%] h-[932rpx]" :style="{ 'background': 'url(' + img('addon/shop/coupon/coupon_bg_02.png') + ') center / contain no-repeat' }">
+				<view v-if="detail.limit_count"
+				      :style="{ 'background': 'url(' + img('addon/shop/coupon/top_tab.png') + ') center / cover no-repeat', 'transform': 'translateX(-50%)'}"
+				      class="text-[32rpx] leading-[56rpx] top-[2rpx] left-[50%] px-[30rpx] box-border justify-center absolute min-w-[196rpx] h-[56rpx] flex items-center text-[#FFF9DD]">
+					限领{{ detail.limit_count }}张
+				</view>
+				<view class="flex justify-center pt-[90rpx]">
+					<text class="max-w-[380rpx] text-[var(--price-text-color)] text-[140rpx] truncate price-font">{{ detail.coupon_price || 0.00 }}</text>
+					<text class="flex items-center justify-center text-[44rpx] mt-[54rpx] ml-[8rpx] text-[#F7D894] bg-[var(--price-text-color)] rounded-full w-[70rpx] h-[70rpx]">元</text>
+				</view>
+				<view class="h-[64rpx] leading-[64rpx] text-[42rpx] text-[#E22D17] mt-[10rpx] text-center">
+					<text v-if="detail.min_condition_money === '0.00'">无门槛</text>
+					<text v-else>满{{ detail.coupon_min_price }}元可用</text>
+				</view>
+				<view class="text-[26rpx] h-[36rpx] text-[#E22D17] mt-[44rpx] text-center flex justify-center items-center">
+					<block v-if="detail.valid_type == 1">
+						<text>领取之日起</text>
+						<text>{{ detail.length}}</text>
+						<text>天内有效</text>
+					</block>
+					<block v-else>
+						<text>有效期至</text>
+						<text>{{ detail.valid_end_time ? detail.valid_end_time.slice(0, 10) : '' }}</text>
+					</block>
+				</view>
+				<view class="flex justify-center items-center mt-[20rpx]">
+					<text v-if="detail.btnType === 'collected'"
+					      class="!leading-[100rpx] text-center text-[rgba(255,255,255,1)] text-[46rpx] min-w-[240rpx] h-[106rpx]"
+					      :style="{ 'background': 'url(' + img('addon/shop/coupon/coupon_btn_02.png') + ')  center / contain no-repeat' }"
+					>已领完
+					</text>
+					<text v-if="detail.btnType === 'collecting'"
+					      class="!leading-[100rpx] text-center text-[#E22D17] text-[46rpx] min-w-[240rpx] h-[106rpx]"
+					      :style="{ 'background': 'url(' + img('addon/shop/coupon/coupon_btn.png') + ') center / contain no-repeat' }"
+					      @click="collecting(detail.id)">领取
+					</text>
+					<text v-if="detail.btnType === 'using'"
+					      class="!leading-[100rpx] text-center text-[#E22D17] text-[46rpx] min-w-[240rpx] h-[106rpx]"
+					      :style="{ 'background': 'url(' + img('addon/shop/coupon/coupon_btn.png') + ') center / contain no-repeat' }"
+					      @click="toLink(detail.id)">去使用
+					</text>
+				</view>
+				<view class="w-[230rpx] h-[230rpx] box-border p-[15rpx] bg-[#fff] mx-[auto] mt-[50rpx]">
+					<image class="w-[200rpx] h-[200rpx]" :src="codeUrl" mode="aspectFill" />
+				</view>
+				<view class="text-[24rpx] text-[rgba(255,255,255,0.7)] mt-[30rpx] text-center">注:扫描二维码或点击右上角进行分享</view>
+			</view>
+
+		</view>
+		<loading-page :loading="loading"></loading-page>
+	</view>
+</template>
+<script lang="ts" setup>
+    import { ref, computed } from 'vue'
+    import { onLoad } from '@dcloudio/uni-app'
+    import { img, redirect, handleOnloadParams, goback } from '@/utils/common'
+    import QRCode from "qrcode";
+    import { topTabar } from '@/utils/topTabbar'
+    import { getShopCouponInfo, getCoupon, getShopCouponQrocde } from '@/addon/shop/api/coupon'
+    import useMemberStore from '@/stores/member'
+    import { useLogin } from '@/hooks/useLogin'
+
+    const loading = ref(false)
+    const codeUrl = ref('')
+    const detail: any = ref({})
+    const memberStore = useMemberStore()
+    const userInfo = computed(() => memberStore.info)
+
+    /********* 自定义头部 - start ***********/
+    const topTabarObj = topTabar()
+    let topTabbarData = topTabarObj.setTopTabbarParam({title:'优惠券详情'})
+    /********* 自定义头部 - end ***********/
+
+    onLoad((option: any) => {
+
+        // #ifdef MP-WEIXIN
+        // 处理小程序场景值参数
+        option = handleOnloadParams(option);
+        // #endif
+
+        if (!option.coupon_id) {
+            let parameter = {
+				url:'/addon/shop/pages/coupon/list',
+				title: '优惠券不存在'
+			};
+			goback(parameter)
+        } else {
+            getShopCouponInfoFn(option.coupon_id)
+            getShopCouponQrocdeFn(option.coupon_id)
+        }
+    })
+
+    const getShopCouponInfoFn = (id: number) => {
+        loading.value = true
+        getShopCouponInfo(id).then((res: any) => {
+            detail.value = res.data
+            if (detail.value.sum_count != -1 && detail.value.receive_count === detail.value.sum_count) {
+                detail.value.btnType = 'collected'//已领完
+            }else if (!userInfo.value) {
+                detail.value.btnType = 'collecting'//领用
+            } else {
+                if (detail.value.is_receive && detail.value.limit_count === detail.value.member_receive_count) {
+                    detail.value.btnType = 'using'//去使用
+                } else {
+                    detail.value.btnType = 'collecting'//领用
+                }
+            }
+            loading.value = false
+
+        }).catch(() => {
+            loading.value = false
+            detail.value = {}
+            setTimeout(() => {
+                redirect({ url: '/addon/shop/pages/index', mode: 'reLaunch' })
+            }, 600)
+        })
+    }
+
+    const getShopCouponQrocdeFn = (id: any) => {
+        // #ifdef H5
+        QRCode.toDataURL(window.location.href, { errorCorrectionLevel: 'L', margin: 0, width: 100 }).then(url => {
+            codeUrl.value = url
+        });
+        // #endif
+
+        // #ifdef MP-WEIXIN
+        getShopCouponQrocde(id).then((res: any) => {
+            if (res.data) {
+                codeUrl.value = img(res.data);
+            }
+        })
+        // #endif
+    }
+
+    const collecting = (coupon_id: any) => {
+        if (!userInfo.value) {
+            useLogin().setLoginBack({ url: '/addon/shop/pages/coupon/list' })
+            return false
+        }
+        getCoupon({ coupon_id, number: 1 }).then(res => {
+            detail.value.btnType = 'using'
+        })
+    }
+    const toLink = (coupon_id: any) => {
+        redirect({ url: '/addon/shop/pages/goods/list', param: { coupon_id } })
+    }
+</script>
+<style lang="scss" scoped>
+	.border-color {
+		border-color: var(--primary-color) !important;
+	}
+
+	.text-color {
+		color: var(--primary-color) !important;
+	}
+
+	.bg-color {
+		background-color: var(--primary-color) !important;
+	}
+
+	.bg-style {
+		background-size: 100% 100% !important;
+	}
+
+	.code {
+		box-shadow: 0 0 20px -1px;
+	}
+</style>
diff --git a/uni-app/src/addon/shop/pages/coupon/list.vue b/uni-app/src/addon/shop/pages/coupon/list.vue
new file mode 100644
index 00000000..ddd87328
--- /dev/null
+++ b/uni-app/src/addon/shop/pages/coupon/list.vue
@@ -0,0 +1,338 @@
+<template>
+	<view class="bg-[var(--page-bg-color)] min-h-[100vh] overflow-hidden" :style="themeColor()">
+		<view class="coupon-header fixed  left-0 right-0 top-0 z-10080">
+			<!-- #ifdef MP-WEIXIN -->
+			<view :style="{height: headStyle, backgroundImage: 'url(' + img('addon/shop/coupon/coupon_uniapp.png') + ')',backgroundSize: '100%', backgroundPosition: 'bottom', backgroundRepeat: 'no-repeat'}">
+				<top-tabbar :data="param" class="top-header"/>
+			</view>
+			<!-- #endif -->
+			<!-- #ifdef H5 -->
+			<view class="h-[364rpx]" :style="{ backgroundImage: 'url(' + img('addon/shop/coupon/coupon_uniapp.png') + ')',backgroundSize: 'cover', backgroundPosition: 'bottom',backgroundRepeat: 'no-repeat'}"></view>
+			<!-- #endif -->
+			<view class="-mt-[-36rpx] px-[var(--sidebar-m)] py-[24rpx] flex items-center justify-between leading-[40rpx] text-[28rpx] bg-[var(--page-bg-color)] rounded-t-[26rpx] relative z-99999 !pl-[30rpx]" :class="{'!bg-[#fff]': typePopup}">
+				<text :class="{ 'text-primary font-500': searchType == 'all' }" @click="searchTypeFn('all')">默认排序</text>
+				<view class="flex items-center" :class="{ 'text-primary font-500': searchType == 'create_time' }" @click="searchTypeFn('create_time')">
+					<text class="mr-[4rpx]">最新</text>
+					<text v-if="create_time == 'asc'" class="text-[18rpx] text-[var(--text-color-light6)] nc-iconfont nc-icon-a-xiangshangV6xx1" :class="{ '!text-primary': searchType == 'create_time' }"></text>
+					<text  v-else class="text-[18rpx] text-[var(--text-color-light6)]  nc-iconfont nc-icon-a-xiangxiaV6xx1" :class="{ '!text-primary': searchType == 'create_time' }"></text>
+				</view>
+				<view class="flex items-center" :class="{ 'text-primary font-500': searchType == 'price' }" @click="searchTypeFn('price')">
+					<text class="mr-[4rpx]">价格</text>
+					<text v-if="price == 'asc'" class="text-[18rpx]  text-[var(--text-color-light6)] nc-iconfont nc-icon-a-xiangshangV6xx1" :class="{ '!text-primary': searchType == 'price' }"></text>
+					<text  v-else class="text-[18rpx] text-[var(--text-color-light6)] nc-iconfont nc-icon-a-xiangxiaV6xx1" :class="{ '!text-primary': searchType == 'price' }"></text>
+				</view>
+				<view class="flex items-center" :class="{'text-primary font-500': searchType == 'type' }" @click="searchTypeFn('type')">
+					<view class="w-[2rpx] h-[28rpx] bg-gradient-to-b from-[#333] to-[#fff] mr-[20rpx] flex-shrink-0"></view>
+					<text class="mr-[10rpx]">筛选</text>
+					 <text class="nc-iconfont color-[var(--text-color-light6)] nc-icon-shaixuanV6xx text-[28rpx]"></text>
+				</view>
+			</view>
+		</view>
+		<mescroll-body ref="mescrollRef"  @init="mescrollInit" :down="{ use: false }"  height="auto" @up="getShopCouponListFn" :top="mescrollTop">
+			<view v-if="list.length" class="pb-[var(--top-m)] sidebar-margin">
+				<template v-for="(item, index) in list">
+					<view v-if="item.btnType === 'collected'"
+							class="flex items-center relative w-[100%] rounded-[var(--rounded-big)] overflow-hidden bg-[#fff] py-[20rpx] background-size"
+							:class="{'mt-[var(--top-m)]':index}" :style="{ backgroundImage: 'url(' + img('addon/shop/coupon/coupn_loot.png') + ')'}" @click="toDetail(item.id)" >
+						<view class="box-border flex-1 border-0 border-r-[1px] border-[#FFDCDC] border-dashed flex items-center">
+							<view class="w-[164rpx] box-border flex justify-center ">
+								<view class="flex items-baseline text-[var(--price-text-color)]">
+									<text class="text-[28rpx] leading-[34rpx] text-center font-400 price-font mr-[4rpx]">￥</text>
+									<text class="text-[54rpx] font-500 text-left leading-[70rpx] max-w-[136rpx] price-font">{{ item.coupon_price }}</text>
+								</view>
+							</view>
+							<view class="flex-1 box-border ml-[10rpx]">
+								<view class="text-[26rpx] leading-[42rpx] text-left font-500">
+									<text v-if="item.min_condition_money === '0.00'">无门槛</text>
+									<text v-else>满{{ item.coupon_min_price }}元可用</text>
+								</view>
+								<view class="mt-[10rpx] text-left flex items-center">
+									<text class="w-[80rpx] text-center bg-[var(--primary-color-light)] whitespace-nowrap text-[var(--primary-color)] text-[18rpx] h-[30rpx] leading-[30rpx] rounded-[16rpx] mr-[10rpx] flex-shrink-0">{{ item.type_name }}</text>
+									<text class="text-[24rpx] truncate max-w-[190rpx] leading-[30rpx] text-[var(--text-color-light6)]">{{ item.title }}</text>
+								</view>
+								<view class="w-[100%] mt-[10rpx] text-[20rpx] leading-[30rpx] text-[var(--text-color-light6)]">
+									<text v-if="item.valid_type == 1">领取之日起{{ item.length || '' }}天内有效</text>
+									<text v-else> 有效期至{{ item.valid_end_time ? item.valid_end_time.slice(0, 10) : '' }}</text>
+								</view>
+							</view>
+						</view>
+						<view class="pr-[20rpx] pl-[34rpx]">
+							<button class="flex-center" :style="{width:'150rpx',height:'60rpx',color:'#fff', fontSize:'24rpx', padding:'0',backgroundColor:'var(--primary-color-disabled)', border:'none' ,opacity :'1',borderRadius:'30rpx'}"  disabled>已领完</button>
+						</view>
+						<view class="absolute top-0 right-[190rpx]  h-[10rpx] w-[20rpx] rounded-br-[20rpx] rounded-bl-[20rpx] bg-[var(--page-bg-color)] "></view>
+						<view class="absolute bottom-0 right-[190rpx] h-[10rpx] w-[20rpx] rounded-tr-[20rpx] rounded-tl-[20rpx] bg-[var(--page-bg-color)]"></view>
+					</view>
+					<view v-else class="flex items-center relative w-[100%] rounded-[var(--rounded-big)] overflow-hidden bg-[#fff] py-[20rpx] background-size" :class="{'mt-[var(--top-m)]':index}" @click="toDetail(item.id)">
+						<view class="relative box-border flex-1 border-0 border-r-[1px] border-[#FFDCDC] border-dashed flex items-center pl-[10rpx]">
+							<view class="w-[164rpx] box-border flex justify-center">
+								<view class="flex items-baseline text-[var(--price-text-color)]">
+									<text class="text-[28rpx] leading-[34rpx] text-center font-400 price-font  mr-[4rpx]">￥</text>
+									<text class="text-[54rpx] font-500 text-left leading-[70rpx] max-w-[136rpx] price-font">{{ item.coupon_price }}</text>
+								</view>
+							</view>
+							<view class="flex-1 box-border ml-[10rpx]">
+								<view class="text-[26rpx] leading-[42rpx] text-left font-500">
+									<text v-if="item.min_condition_money === '0.00'">无门槛</text>
+									<text v-else>满{{ item.coupon_min_price }}元可用</text>
+								</view>
+								<view class="mt-[10rpx] text-left flex items-center">
+									<text class="w-[80rpx] bg-[var(--primary-color-light)] whitespace-nowrap text-[var(--primary-color)] text-[18rpx] h-[30rpx] leading-[30rpx] text-center rounded-[16rpx] mr-[10rpx] flex-shrink-0">{{ item.type_name }}</text>
+									<text class="text-[24rpx] truncate max-w-[190rpx] leading-[30rpx] text-[var(--text-color-light9)]">{{ item.title }}</text>
+								</view>
+								<view class="w-[100%] mt-[6rpx] text-[20rpx] leading-[30rpx] text-[var(--text-color-light9)]">
+									<text v-if="item.valid_type == 1">领取之日起<text>{{ item.length || '' }}</text>天内有效</text>
+									<text v-else> 有效期至<text>{{ item.valid_end_time ? item.valid_end_time.slice(0, 10) : '' }}</text></text>
+								</view>
+							</view>
+						</view>
+						<view v-if="item.btnType === 'collecting'" @click.stop="collecting(item.id, index)" class="pr-[20rpx] pl-[34rpx]">
+							<button class="flex-center" :style="{width:'150rpx',height:'60rpx',color:'#fff', fontSize:'24rpx', padding:'0', backgroundColor:'var(--primary-color)',border:'none',borderRadius:'30rpx'}">立即领取</button>
+						</view>
+						<view v-if="item.btnType === 'using'" @click.stop="toLink(item.id)" class="pr-[20rpx] pl-[34rpx]">
+							<button class="flex-center" :style="{width:'150rpx',height:'60rpx',color:'var(--primary-color)', fontSize:'24rpx', padding:'0',backgroundColor:'transparent',border:'2rpx solid var(--primary-color)',borderRadius:'30rpx'}">去使用</button>
+						</view>
+						<view class="absolute top-0 right-[190rpx]  h-[10rpx] w-[20rpx] rounded-br-[20rpx] rounded-bl-[20rpx] bg-[var(--page-bg-color)] "></view>
+						<view class="absolute bottom-0 right-[190rpx] h-[10rpx] w-[20rpx] rounded-tr-[20rpx] rounded-tl-[20rpx] bg-[var(--page-bg-color)]"></view>
+					</view>
+				</template>
+				<!-- <view :style="{'height': nullPageHeight}" class="noData bg-[#fff] rounded-[var(--rounded-big)] flex items-center justify-center"> -->
+				<!-- </view> -->
+			</view>
+			<!-- <view class=""> -->
+				<mescroll-empty v-if="!list.length && !loading" :option="{tip : '暂无优惠券',btnText:'去逛逛'}" @emptyclick="redirect({ url: '/addon/shop/pages/goods/list' })"></mescroll-empty>
+			<!-- </view> -->
+		</mescroll-body>
+
+		<u-popup :show="typePopup" mode="top" @close="typePopup = false"  :customStyle="{top:typePopupTopVal}" :safeAreaInsetBottom="false">
+			<view @touchmove.prevent.stop>
+				<scroll-view :scroll-x="true" scroll-with-animation :scroll-into-view="'id' + (subActive ? subActive - 1 : 0)"  class="px-[var(--sidebar-m)]  box-border bg-white rounded-b-[26rpx]">
+					<view class="items-center flex py-[20rpx]  border-0 border-t-[2rpx] border-solid border-[#F0F2F8]">
+						<text class="flex-shrink-0 w-[120rpx] h-[50rpx] text-[24rpx] leading-[50rpx] text-center text-[#333] bg-[var(--temp-bg)] rounded-[30rpx] border-box mr-[20rpx] border-[2rpx] border-solid border-[#F8F9FD]" :class="{'!text-primary !border-primary !bg-[var(--primary-color-light)] font-500':item.value == curType}"
+							v-for="(item,index) in typeList" :key="index" :id="'id' + index" @click="typeClick(index,item.value)">{{item.label}}
+						</text>
+					</view>
+				</scroll-view>
+			</view>
+		</u-popup>
+	</view>
+</template>
+
+<script setup lang="ts">
+import { ref, computed, nextTick, getCurrentInstance } from 'vue'
+import { img, redirect, pxToRpx } from '@/utils/common'
+import { topTabar } from '@/utils/topTabbar'
+import { getShopCouponList, getCoupon, getMyCouponType } from '@/addon/shop/api/coupon'
+import MescrollBody from '@/components/mescroll/mescroll-body/mescroll-body.vue'
+import MescrollEmpty from '@/components/mescroll/mescroll-empty/mescroll-empty.vue'
+import useMescroll from '@/components/mescroll/hooks/useMescroll.js'
+import {onLoad, onPageScroll, onReachBottom } from '@dcloudio/uni-app'
+import useMemberStore from '@/stores/member'
+import { useLogin } from '@/hooks/useLogin'
+import { t } from '@/locale'
+
+const { mescrollInit, downCallback, getMescroll } = useMescroll(onPageScroll, onReachBottom)
+// 获取系统状态栏的高度
+let menuButtonInfo: any = {};
+// 如果是小程序，获取右上角胶囊的尺寸信息，避免导航栏右侧内容与胶囊重叠(支付宝小程序非本API，尚未兼容)
+// #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+menuButtonInfo = uni.getMenuButtonBoundingClientRect();
+// #endif
+/********* 自定义头部 - start ***********/
+const topTabarObj = topTabar()
+let param = topTabarObj.setTopTabbarParam({title:'优惠券列表'})
+/********* 自定义头部 - end ***********/
+
+// 头部图片的高度
+const headStyle = computed(() => {
+	let style = (pxToRpx(Number(menuButtonInfo.height)) + pxToRpx(menuButtonInfo.top) + pxToRpx(8) +  364) + 'rpx'
+	return style
+})
+
+const mescrollTop = computed(() => {
+	let style = Object.keys(menuButtonInfo).length ? (pxToRpx(Number(menuButtonInfo.height)) + pxToRpx(menuButtonInfo.top) + pxToRpx(8) +  416) + 'rpx' : '416rpx'
+	return style
+})
+
+const instance = getCurrentInstance();
+let typePopupTopVal = ref()
+const typePopupTopFn = () => {
+	nextTick(() => {
+		setTimeout(()=>{
+			const query = uni.createSelectorQuery().in(instance);
+			query.select('.coupon-header').boundingClientRect((data:any) => {
+				typePopupTopVal.value = data.height + 'px';
+			}).exec();
+		})
+	})
+}
+typePopupTopFn();
+
+// // 获取空页面高度
+// const nullPageHeight = computed(() => {
+// 	let hei = '';
+// 	// #ifndef  H5
+// 	// 屏幕高度 - 图片高度 - 上下padding + 内容框上移高度 - 苹果手机安全距离
+// 	hei = `calc(100vh - ${mescrollTop.value} - 40rpx)`
+// 	// #endif
+// 	// #ifdef H5
+// 	// 屏幕高度 - 图片高度 - 上下padding + 内容框上移高度 - 苹果手机安全距离
+// 	hei = `calc(100vh - 416rpx)`
+// 	// #endif
+// 	return hei
+// })
+
+const list: any = ref<Array<Object>>([]);
+const loading = ref<boolean>(true);
+const memberStore = useMemberStore()
+const userInfo = computed(() => memberStore.info)
+
+const getShopCouponListFn = (mescroll: any) => {
+	loading.value = true;
+	let data: object = {
+		page: mescroll.num,
+		limit: mescroll.size,
+		order: searchType.value === 'all' ? '' : searchType.value,
+		sort: searchType.value == 'price' ? price.value : create_time.value,
+		type: curType.value || ''
+	};
+
+	getShopCouponList(data).then((res: any) => {
+		let newArr = (res.data.data as Array<Object>).map((el: any) => {
+			if (el.sum_count != -1 && el.receive_count === el.sum_count) {
+				el.btnType = 'collected'//已领完
+			}else if (!userInfo.value) {
+				el.btnType = 'collecting'//领用
+			} else {
+				if (el.is_receive && el.limit_count === el.member_receive_count) {
+					el.btnType = 'using'//去使用
+				} else {
+					el.btnType = 'collecting'//领用
+				}
+			}
+			return el
+		})
+		//设置列表数据
+		if (mescroll.num == 1) {
+			list.value = []; //如果是第一页需手动制空列表
+		}
+		list.value = list.value.concat(newArr);
+		mescroll.endSuccess(newArr.length);
+		loading.value = false;
+	}).catch(() => {
+		loading.value = false;
+		mescroll.endErr(); // 请求失败, 结束加载
+	})
+}
+
+const collecting = (coupon_id: any, index: number) => {
+	if (!userInfo.value) {
+		useLogin().setLoginBack({ url: '/addon/shop/pages/coupon/list' })
+		return false
+	}
+	getCoupon({ coupon_id, number: 1, type: 'receive' }).then((res: any) => {
+		if (res.code > 0) {
+			list.value[index].member_receive_count += 1
+			list.value[index].receive_count += 1
+			if (list.value[index].member_receive_count == list.value[index].limit_count
+					|| (list.value[index].sum_count != -1 && list.value[index].receive_count === list.value[index].sum_count)
+			) {
+				list.value[index].btnType = 'using'
+			}
+		}
+
+	})
+}
+
+const toDetail = (coupon_id: any) => {
+	redirect({ url: '/addon/shop/pages/coupon/detail', param: { coupon_id } })
+}
+const toLink = (coupon_id: any) => {
+	redirect({ url: '/addon/shop/pages/goods/list', param: { coupon_id } })
+}
+
+// 优惠劵
+const price = ref('');
+const create_time = ref('');
+const searchType = ref('all');
+// 类型
+const subActive = ref<number>(0)
+const curType = ref('')
+const typeList = ref<Array<Object>>([])
+const typePopup = ref<boolean>(false)
+const getMyCouponTypeFn = () =>{
+    getMyCouponType().then((res: any) =>{
+        const obj = { label: '全部', value: '' };
+        typeList.value.push(obj)
+		typeList.value = typeList.value.concat(res.data)
+    })
+}
+onLoad(()=>{
+    getMyCouponTypeFn()
+})
+
+const typeClick = (index : number,data:any) =>{
+    subActive.value = index
+    curType.value = data
+    list.value = []
+    getMescroll().resetUpScroll()
+	typePopup.value = false
+}
+// 筛选
+const searchTypeFn = (type: any) => {
+	searchType.value = type;
+	if ( type == 'all') {
+		create_time.value = '';
+		price.value = '';
+	}
+	if ( type == 'price') {
+		create_time.value = '';
+		if(price.value){
+			price.value = price.value == 'asc' ? 'desc' : 'asc';
+		}else{
+			price.value = 'asc';
+		}
+	}
+	if ( type == 'create_time') {
+		price.value = '';
+		if(create_time.value){
+			create_time.value = create_time.value == 'asc' ? 'desc' : 'asc';
+		}else{
+			create_time.value = 'asc';
+		}
+	}
+	if (type == 'type') {
+		create_time.value = 'asc';
+		price.value = 'asc';
+		typePopup.value = true;
+
+	} else {
+		typePopup.value = false;
+		list.value = [];
+
+		getMescroll().resetUpScroll();
+	}
+}
+
+</script>
+
+<style lang="scss" scoped>
+	button{
+		box-sizing: border-box;
+		&::after {
+			display:none;
+		}
+	}
+.background-size{
+	background-repeat: no-repeat;
+	background-position: right top;
+	background-size: 27%;
+}
+
+:deep(.u-popup .u-popup__content){
+	border-bottom-left-radius:26rpx;
+	border-bottom-right-radius:26rpx;
+}
+:deep(.mescroll-empty){
+	margin-top: 0 !important;
+}
+</style>
diff --git a/uni-app/src/addon/shop/pages/discount/list.vue b/uni-app/src/addon/shop/pages/discount/list.vue
new file mode 100644
index 00000000..f77beca8
--- /dev/null
+++ b/uni-app/src/addon/shop/pages/discount/list.vue
@@ -0,0 +1,282 @@
+<template>
+    <view class="discount bg-[var(--page-bg-color)] min-h-[100vh]" :style="themeColor()">
+        <view  class="fixed top-0 left-0 w-full z-10 text-[0]">
+			<!-- #ifdef MP-WEIXIN -->
+			<view class="absolute top-0 left-0 right-0 z-999">
+				<top-tabbar :data="param"  class="top-header"/>
+			</view>
+			<!-- #endif -->
+			<u-swiper v-if="bannerList.length" :list="imgList" :indicator="bannerList.length" :indicatorStyle="{'bottom': '60rpx',}" :autoplay="true" :height="headStyle"  @click="toRedirect"></u-swiper>
+			<image v-if="!bannerListLoading&&!bannerList.length" :src="img('addon/shop/discount/discount_banner.png')" mode="scaleToFill" class="w-full" :style="{height: headStyle}" :show-menu-by-longpress="true"/>
+			<view class="relative w-full h-[110rpx] mt-[-40rpx] z-5" v-if="discountList.length">
+                <view class="bg-[var(--primary-color)] w-[750rpx] rounded-tl-[24rpx] rounded-tr-[24rpx] h-[96rpx] absolute left-0 bottom-[1rpx]"></view>
+                <scroll-view :scroll-x="true" class="h-[110rpx] absolute left-0 bottom-0 z-5">
+                    <view class="flex items-end h-[100%]" :style="{'width':187.5*discountList.length+'rpx'}" >
+                        <view class="w-[187.5rpx] h-[100rpx] relative flex-shrink-0" v-for="(item,index) in discountList" @click="navClick(item)">
+                            <view class="w-full absolute left-0 top-0 z-10 text-[#fff] text-center pt-[14rpx]">
+                                <view class="text-[28rpx] leading-[39rpx] font-500 px-[10rpx] h-[39rpx] overflow-hidden" :class="{'!text-[#333]':active==item.active_id}">{{item.active_desc}}</view>
+                                <view class="flex justify-center w-full">
+                                    <text class="text-[22rpx] h-[36rpx] flex-center mt-[5rpx]" :class="{'active flex items-center justify-center':active==item.active_id}">{{item.active_status=='not_active'?'预告':item.active_status_name}}</text>
+                                </view>
+                            </view>
+                            <template v-if="active==item.active_id">
+                                <image v-if="discountList.length<4" class="absolute bottom-0 z-5 h-[110rpx] z-5" :class="{'left-0 w-[230rpx]':index==0,'left-[-41.25rpx] w-[270rpx]':index!=0}" :src="img(index==0?'addon/shop/discount/nav-left.png':'addon/shop/discount/nav-center.png')" />
+                                <image v-if="discountList.length>=4" class="absolute bottom-0 z-5 h-[110rpx] z-5" :class="{'left-0 w-[230rpx]':index==0,'left-[-41.25rpx] w-[270rpx]':index!=0&&index!=discountList.length-1 ,'right-0 w-[230rpx]':index==discountList.length-1}" :src="img(index==0?'addon/shop/discount/nav-left.png':index==discountList.length-1?'addon/shop/discount/nav-right.png':'addon/shop/discount/nav-center.png')" />
+                            </template>
+                        </view>
+                    </view>
+                </scroll-view>
+            </view>
+
+        </view>
+
+	    <mescroll-body v-if="discountList.length" ref="mescrollRef" :top="mescrollTop" @init="mescrollInit" :down="{ use: false }" @up="getActiveDiscountGoodsListFn">
+            <view class="sidebar-margin py-[var(--top-m)] bg-[#F4F6F8]">
+				<block v-for="(item,index) in list" :key="index">
+					<view class="bg-[#fff] p-[20rpx] flex rounded-[var(--rounded-big)]" :class="{'mb-[var(--top-m)]':index<list.length-1}" @click="toLink(item)">
+						<view class="w-[240rpx] h-[240rpx] rounded-[var(--goods-rounded-big)] overflow-hidden">
+							<u--image width="240rpx" height="240rpx" :radius="'var(--goods-rounded-big)'" :src="img(item.goods_cover_thumb_mid ? item.goods_cover_thumb_mid : '')" model="aspectFill">
+								<template #error>
+									<image class="rounded-[var(--goods-rounded-big)] overflow-hidden w-[240rpx] h-[240rpx]" :src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill"></image>
+								</template>
+							</u--image>
+						</view>
+
+						<view class="ml-[20rpx] flex-1 flex flex-col justify-between">
+							<view class="text-[28rpx] leading-[1.4] multi-hidden">
+								{{ item.goods_name }}
+							</view>
+
+							<view v-if="item.goods_label_name && item.goods_label_name.length" class="flex flex-wrap mb-[auto]">
+								<template v-for="(tagItem, tagIndex) in item.goods_label_name">
+									<image class="img-tag" v-if="tagItem.style_type == 'icon' && tagItem.icon" :src="img(tagItem.icon)" mode="heightFix" @error="diyGoods.error(tagItem,'icon')"></image>
+									<view class="base-tag" v-else-if="tagItem.style_type == 'diy' || !tagItem.icon" :style="diyGoods.baseTagStyle(tagItem)">
+										{{tagItem.label_name}}
+									</view>
+								</template>
+							</view>
+
+							<view class="relative overflow-hidden w-full h-[88rpx] flex justify-between mt-[20rpx] rounded-[100rpx]" :class="{'bg-[var(--primary-color-light)]': item.activeGoods.active_goods_status=='active','bg-[#FFF6F1]': item.activeGoods.active_goods_status!='active' }">
+								<view class="mr-[20rpx] pl-[30rpx] flex-1 flex flex-col justify-center">
+									<view class="flex items-end">
+										<view class="text-[var(--price-text-color)] flex items-baseline" :class="{'!text-[var(--primary-color)]':item.activeGoods.active_goods_status!='active'}">
+											<text class="text-[26rpx] leading-[26rpx] font-500 mr-[4rpx] price-font">￥</text>
+											<text class="text-[44rpx] leading-[40rpx] font-500 price-font">{{parseFloat(item.goodsSku.active_discount_price).toFixed(2).split('.')[0]}}.</text>
+											<text class="text-[26rpx] leading-[28rpx] font-500 price-font">{{parseFloat(item.goodsSku.active_discount_price).toFixed(2).split('.')[1]}}</text>
+										</view>
+										<view v-if="item.goodsSku.active_discount_rate<10" class="mb-[4rpx] text-[var(--price-text-color)] px-[4rpx] border-[1rpx] border-[var(--primary-color)] border-solid  text-[18rpx] ml-[4rpx] rounded-[4rpx] leading-[24rpx]" :class="{'!border-[var(--primary-color)]':item.activeGoods.active_goods_status!='active'}">{{item.goodsSku.active_discount_rate}}折</view>
+									</view>
+									<view class="flex items-center mt-[4rpx]">
+										<view class="w-[20rpx] h-[20rpx] mr-[4rpx] rounded-[20rpx] text-[#fff] bg-[var(--primary-color)] flex items-center justify-center" :class="{'!bg-[var(--primary-color)]':item.activeGoods.active_goods_status!='active'}">
+											<text class="text-[10rpx] nc-icon-biaoqianV6mm1 nc-iconfont"></text>
+										</view>
+										<view class="text-[18rpx] font-400 text-[var(--price-text-color)] leading-[24rpx]" :class="{'!text-[var(--primary-color)]':item.activeGoods.active_goods_status!='active'}">已省{{item.goodsSku.active_reduce_money}}元</view>
+									</view>
+								</view>
+								<view class="discount-btn text-[var(--primary-color)] iconfont iconUnion" v-if="item.activeGoods.active_goods_status!='active'">
+									<text class="desc">{{item.activeGoods.active_goods_status_name}}</text>
+								</view>
+								<view class="discount-btn text-[var(--primary-color)] iconfont iconUnion" v-else>
+									<text class="icon iconfont iconqiang"></text>
+									<text class="arrow iconxiayibu iconfont"></text>
+								</view>
+							</view>
+						</view>
+					</view>
+                </block>
+				<mescroll-empty v-if="!list.length && !loading" :option="{tip : '暂无商品，请看看其他商品吧！'}"></mescroll-empty>
+            </view>
+        </mescroll-body>
+
+		<view v-if="!discountList.length && !loading" class="h-[calc(100vh-550rpx)]" :style="{'padding-top':mescrollTop}">
+			<mescroll-empty  :option="{tip : '暂无商品，请看看其他商品吧！','btnText': '去逛逛'}" @emptyclick="redirect({ url: '/addon/shop/pages/goods/list' })"></mescroll-empty>
+		</view>
+		<loading-page :loading="bannerListLoading"></loading-page>
+    </view>
+</template>
+
+<script setup lang="ts">
+import { ref, computed } from 'vue'
+import { useLogin } from '@/hooks/useLogin'
+import { img, redirect, getToken, currRoute, diyRedirect,pxToRpx } from '@/utils/common';
+import { getActiveDiscountConfig,getActiveDiscountList,getActiveDiscountGoodsList } from '@/addon/shop/api/discount'
+import MescrollBody from '@/components/mescroll/mescroll-body/mescroll-body.vue'
+import MescrollEmpty from '@/components/mescroll/mescroll-empty/mescroll-empty.vue'
+import useMescroll from '@/components/mescroll/hooks/useMescroll.js'
+import { onPageScroll, onReachBottom } from '@dcloudio/uni-app'
+import { topTabar } from '@/utils/topTabbar'
+import {useGoods} from '@/addon/shop/hooks/useGoods'
+
+let menuButtonInfo: any = {};
+// 如果是小程序，获取右上角胶囊的尺寸信息，避免导航栏右侧内容与胶囊重叠(支付宝小程序非本API，尚未兼容)
+// #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+menuButtonInfo = uni.getMenuButtonBoundingClientRect();
+// #endif
+const diyGoods = useGoods();
+const headStyle = computed(() => {
+	let style = Object.keys(menuButtonInfo).length ? (pxToRpx(Number(menuButtonInfo.height)) + pxToRpx(menuButtonInfo.top) + pxToRpx(8) + 368) + 'rpx' : '490rpx'
+	return style
+})
+
+const { mescrollInit, downCallback, getMescroll } = useMescroll(onPageScroll, onReachBottom)
+const bannerList: any = ref<Array<Object>>([])
+const discountList = ref<Array<Object>>([])
+const active = ref<number>(0)
+const active_name = ref<String>('')
+const list = ref<Array<Object>>([]);
+const loading = ref<boolean>(true);
+const bannerListLoading = ref<boolean>(true);
+
+/********* 自定义头部 - start ***********/
+const topTabarObj = topTabar()
+let param = topTabarObj.setTopTabbarParam({title:'限时折扣'})
+/********* 自定义头部 - end ***********/
+
+const imgList:any = ref([])
+
+const getActiveDiscountConfigFn = ()=>{
+	bannerListLoading.value = true
+    getActiveDiscountConfig().then((res:any)=>{
+        bannerList.value = res.data
+		imgList.value = bannerList.value.map((el: any)=>img(el.imageUrl))
+		bannerListLoading.value = false
+    }).catch(()=>{
+		bannerListLoading.value = false
+	})
+}
+
+getActiveDiscountConfigFn()
+const getActiveDiscountListFn = ()=>{
+    getActiveDiscountList({}).then((res:any)=>{
+        discountList.value = res.data
+		calculateHeight();
+		if(discountList.value&&discountList.value.length){
+			navClick(res.data[0]);
+		}else{
+			loading.value = false
+		}
+    })
+}
+
+getActiveDiscountListFn()
+const navClick = (item:any)=>{
+    active.value = item.active_id
+    active_name.value = item.active_status_name
+    getMescroll()?.resetUpScroll();
+	uni.pageScrollTo({
+	    scrollTop: 0, //距离页面顶部的距离
+	    duration: 1
+	});
+}
+const getActiveDiscountGoodsListFn = (mescroll: any) => {
+	if(discountList.value.length == 0) return;
+
+	loading.value = true;
+	let data: object = {
+		page: mescroll.num,
+		limit: mescroll.size,
+        active_id:active.value
+	};
+
+	getActiveDiscountGoodsList(data).then((res: any) => {
+		let newArr = (res.data.data as Array<Object>).map((el: any) => {return el})
+		//设置列表数据
+		if (mescroll.num == 1) {
+			list.value = []; //如果是第一页需手动制空列表
+		}
+		list.value = list.value.concat(newArr);
+		mescroll.endSuccess(newArr.length);
+		loading.value = false;
+	}).catch(() => {
+		loading.value = false;
+		mescroll.endErr(); // 请求失败, 结束加载
+	})
+}
+const toRedirect =(index:any)=>{
+	let data = bannerList.value[index].toLink
+	if (Object.keys(data).length) {
+		if (!data.name) return;
+		if (currRoute() == 'app/pages/member/index' && !getToken()) {
+			useLogin().setLoginBack({ url: data.url })
+			return;
+		}
+		diyRedirect(data);
+	}
+}
+
+const toLink = (item : any) => {
+	if (item.activeGoods.active_goods_status != 'active') {
+		uni.showToast({ title: `活动${ item.activeGoods.active_goods_status_name }`, icon: 'none' })
+		return;
+	}
+	redirect({ url: '/addon/shop/pages/goods/detail', param: { sku_id: item.goodsSku.sku_id, type: 'discount' } })
+}
+
+const mescrollTop = ref('')
+const calculateHeight = ()=>{
+	mescrollTop.value = Object.keys(menuButtonInfo).length ? (pxToRpx(Number(menuButtonInfo.height)) + pxToRpx(menuButtonInfo.top) + pxToRpx(8) + 368)+(discountList.value.length?70:0) + 'rpx' : (discountList.value.length?'560rpx':'490rpx')
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/addon/shop/styles/common.scss';
+.swiper.ns-indicator-dots :deep(.uni-swiper-dots-horizontal) {
+	bottom:40rpx
+}
+.swiper.ns-indicator-dots :deep(.uni-swiper-dot) {
+	background-color: #fff;
+	opacity: 0.5;
+}
+.swiper.ns-indicator-dots :deep(.uni-swiper-dot-active) {
+    background-color: #fff;
+    opacity: 1;
+}
+.active{
+    padding: 0 14rpx;
+    line-height: 34rpx;
+    border-radius: 29rpx;
+    background: linear-gradient( 94deg, var(--primary-color) 0%, var(--primary-color) 99%), #EF000C;
+}
+.active-button{
+    background-size: cover;
+    background-repeat: no-repeat;
+}
+:deep(.u-swiper-indicator__wrapper--line__bar){
+	height: 5rpx !important;
+}
+:deep(.u-swiper-indicator__wrapper--line){
+	height: 5rpx !important;
+}
+.discount-btn{
+	font-size: 88rpx;
+	margin-left: auto;
+	position: absolute;
+	right: -2rpx;
+	display: flex;
+	line-height: 1;
+	.icon{
+		position: absolute;
+		top: 50%;
+		transform: translateY(-50%);
+		left: 40rpx;
+		color: #fff;
+		font-size: 44rpx;
+	}
+	.arrow{
+		position: absolute;
+		top: 50%;
+		transform: translateY(-50%);
+		color: #fff;
+		right: 18rpx;
+		font-size: 16rpx;
+	}
+	.desc{
+		position: absolute;
+		top: 50%;
+		transform: translateY(-50%);
+		left: 34rpx;
+		color: #fff;
+		font-size: 26rpx;
+	}
+}
+</style>
diff --git a/uni-app/src/addon/shop/pages/evaluate/components/upload-img.vue b/uni-app/src/addon/shop/pages/evaluate/components/upload-img.vue
new file mode 100644
index 00000000..0cbf7a98
--- /dev/null
+++ b/uni-app/src/addon/shop/pages/evaluate/components/upload-img.vue
@@ -0,0 +1,96 @@
+<template>
+    <view class="flex flex-wrap">
+        <view v-for="(item, index) in value" class="mb-[18rpx] relative" :class="{'mr-[18rpx]': (index + 1) % 4 != 0 }">
+            <u--image class="rounded-[10rpx] overflow-hidden" width="140rpx" height="140rpx" :src="img(item || '')" model="aspectFill" @click="imgListPreview(item)">
+                <template #error>
+                    <u-icon name="photo" color="#999" size="50"></u-icon>
+                </template>
+            </u--image>
+            <view class="absolute top-0 right-[0] bg-[#373737] flex justify-end h-[28rpx] w-[28rpx] rounded-bl-[40rpx]" @click.stop="deleteImg(index)">
+                <text class="nc-iconfont nc-icon-guanbiV6xx !text-[20rpx] mt-[2rpx] mr-[2rpx] text-[#fff]"></text>
+            </view>
+        </view>
+        <view class="w-[140rpx] h-[140rpx]" v-show="value.length < maxCount">
+            <u-upload @afterRead="afterRead" :maxCount="maxCount" :multiple="prop.multiple">
+                <view class="flex items-center justify-center w-[140rpx] h-[140rpx] border-[2rpx] border-dashed border-[#ddd] text-center text-[var(--text-color-light9)] rounded-[var(--goods-rounded-big)]">
+                    <view>
+                        <view class="nc-iconfont nc-icon-xiangjiV6xx text-[50rpx]"></view>
+                        <view class="text-[24rpx] mt-[12rpx]">{{ value.length }}/{{ maxCount }}</view>
+                    </view>
+                </view>
+            </u-upload>
+        </view>
+
+    </view>
+</template>
+<script lang="ts" setup>
+import { computed } from 'vue';
+import { img } from '@/utils/common';
+import { uploadImage } from '@/app/api/system'
+
+const prop = defineProps({
+    modelValue: {
+        type: String || Array,
+    },
+    maxCount: {
+        type: Number,
+        default: 9
+    },
+    multiple: {
+        type: Boolean,
+        default: false
+    }
+})
+const emit = defineEmits(['update:modelValue'])
+const value: any = computed({
+    get() {
+        return prop.modelValue
+    },
+    set(value) {
+        emit('update:modelValue', value)
+    }
+})
+const maxCount = computed(() => {
+    return prop.maxCount
+})
+const afterRead = (event:any) => {
+    if (prop.multiple) {
+        event.file.forEach((file: any) => {
+            upload({ file })
+        })
+    } else {
+        upload(event)
+    }
+}
+
+const upload = (event:any) => {
+    if (value.value?.length >= maxCount.value) {
+        uni.showToast({ title: `最多允许上传${maxCount.value}张图片`, icon: 'none' })
+        return false
+    }
+
+    uploadImage({
+        filePath: event.file.url,
+        name: 'file'
+    }).then(res => {
+        if (value.value?.length < maxCount.value) value.value.push(res.data.url)
+    }).catch(() => {
+    })
+}
+
+const deleteImg = (index:number)=>{
+    value.value.splice(index,1)
+}
+
+//预览图片
+const imgListPreview = (item:any) => {
+    if (item === '') return false
+    var urlList = []
+    urlList.push(img(item))  //push中的参数为 :src="item.img_url" 中的图片地址
+    uni.previewImage({
+        indicator: "number",
+        loop: true,
+        urls: urlList
+    })
+}
+</script>
diff --git a/uni-app/src/addon/shop/pages/evaluate/list.vue b/uni-app/src/addon/shop/pages/evaluate/list.vue
new file mode 100644
index 00000000..abc6f7cb
--- /dev/null
+++ b/uni-app/src/addon/shop/pages/evaluate/list.vue
@@ -0,0 +1,229 @@
+<template>
+    <view class="bg-[var(--page-bg-color)] min-h-screen overflow-hidden" :style="themeColor()">
+        <view class="fixed left-0 top-0 right-0 z-10">
+            <scroll-view scroll-x="true" class="tab-style-2">
+                <view class="tab-content">
+                    <view class="tab-items" :class="{ 'class-select': evaluateStatus === item.status }" @click="statusClickFn(item.status, item.value)" v-for="(item, index) in statusList">{{ item.name }}</view>
+                </view>
+            </scroll-view>
+        </view>
+        <mescroll-body ref="mescrollRef" top="88rpx" @init="mescrollInit" :down="{ use: false }" @up="getEvaluateListFn">
+            <view class="sidebar-margin pt-[var(--top-m)]" v-if="list.length">
+                <template v-for="(item, index) in list">
+                    <view class="mb-[var(--top-m)] card-template !pb-[20rpx]">
+                        <view class="flex items-center  justify-between">
+                            <view class="flex items-center">
+                                <u-avatar :src="img(item.member_head)" :default-url="img('static/resource/images/default_headimg.png')" :size="'50rpx'" leftIcon="none" />
+                                <text class="text-[30rpx] font-500 ml-[10rpx]">{{ item.member_name }}</text>
+                            </view>
+                            <text class="text-[24rpx] text-[var(--text-color-light9)]">{{ item.create_time ? item.create_time.slice(0, 10) : '' }}</text>
+                        </view>
+
+                        <view class="pt-[30rpx] flex items-center">
+                            <u-rate :count="5" v-model="item.scores" active-color="var(--primary-color)" :size="'36rpx'" gutter="1" readonly></u-rate>
+                            <text class="ml-[20rpx] text-[26rpx] text-[var(--text-color-light9)]">{{ item.scores === 1 ? '差评' : item.scores === 2 || item.scores === 3 ? '中评' : '好评' }}</text>
+                        </view>
+                        <view class="text-[28rpx] break-all leading-[1.2] text-[#333] my-[20rpx] overflow-clip">{{ item.content }}</view>
+                        <template v-if="item.image_mid.length === 1">
+							<view class="w-[420rpx] mt-[10rpx]">
+								<u--image width="420rpx" height="420rpx" :radius="'var(--goods-rounded-big)'" :src="img(item.image_mid[0])" model="aspectFill" @click="imgListPreview(item.images[0])">
+									<template #error>
+										<u-icon name="photo" color="var(--text-color-light9)" size="50"></u-icon>
+									</template>
+								</u--image>
+							</view>
+                        </template>
+                        <template v-if="item.image_mid.length === 2">
+                            <view class="flex justify-between mt-[10rpx]">
+								<view class="w-[322rpx]">
+									<u--image width="322rpx" height="322rpx" :src="img(item.image_mid[0])" :radius="'var(--goods-rounded-big)'" model="aspectFill" @click="imgListPreview(item.images[0])">
+										<template #error>
+											<u-icon name="photo" color="var(--text-color-light9)" size="50"></u-icon>
+										</template>
+									</u--image>
+								</view>
+								<view class="w-[322rpx]">
+									<u--image width="322rpx" height="322rpx" :src="img(item.image_mid[1])" :radius="'var(--goods-rounded-big)'" model="aspectFill" @click="imgListPreview(item.images[1])">
+										<template #error>
+											<u-icon name="photo" color="var(--text-color-light9)" size="50"></u-icon>
+										</template>
+									</u--image>
+								</view>
+                            </view>
+                        </template>
+                        <template v-if="item.image_mid.length === 3">
+                            <view class="flex justify-between mt-[10rpx]">
+								<u--image width="430rpx" height="430rpx" :radius="'var(--goods-rounded-big)'" :src="img(item.image_mid[0])" model="aspectFill" @click="imgListPreview(item.images[0])">
+									<template #error>
+										<u-icon name="photo" color="var(--text-color-light9)" size="50"></u-icon>
+									</template>
+								</u--image>
+								<view>
+									<u--image width="205rpx" height="205rpx" :radius="'var(--goods-rounded-big)'" :src="img(item.image_mid[1])" model="aspectFill" @click="imgListPreview(item.images[1])">
+										<template #error>
+											<u-icon name="photo" color="var(--text-color-light9)" size="50"></u-icon>
+										</template>
+									</u--image>
+									<view class="mt-[20rpx]">
+										<u--image width="205rpx" height="205rpx" :radius="'var(--goods-rounded-big)'" :src="img(item.image_mid[2])" model="aspectFill" @click="imgListPreview(item.images[2])">
+											<template #error>
+												<u-icon name="photo" color="var(--text-color-light9)" size="50"></u-icon>
+											</template>
+										</u--image>
+									</view>
+								</view>
+							</view>
+                        </template>
+
+						<template v-if="item.image_mid.length === 4">
+                            <view class="flex flex-wrap mt-[10rpx]">
+								<view class="mr-[15rpx] mb-[15rpx]">
+									<u--image width="215rpx" height="215rpx" :radius="'var(--goods-rounded-big)'" :src="img(item.image_mid[0])" model="aspectFill" @click="imgListPreview(item.images[0])">
+										<template #error>
+											<u-icon name="photo" color="var(--text-color-light9)" size="50"></u-icon>
+										</template>
+									</u--image>
+								</view>
+								<view class="mr-[15rpx] mb-[15rpx]">
+									<u--image width="215rpx" height="215rpx" :radius="'var(--goods-rounded-big)'" :src="img(item.image_mid[1])" model="aspectFill" @click="imgListPreview(item.images[1])">
+										<template #error>
+											<u-icon name="photo" color="var(--text-color-light9)" size="50"></u-icon>
+										</template>
+									</u--image>
+								</view>
+								<view class="mr-[15rpx]">
+									<u--image width="215rpx" height="215rpx" :radius="'var(--goods-rounded-big)'" :src="img(item.image_mid[2])" model="aspectFill" @click="imgListPreview(item.images[2])">
+										<template #error>
+											<u-icon name="photo" color="var(--text-color-light9)" size="50"></u-icon>
+										</template>
+									</u--image>
+								</view>
+								<view class="mr-[15rpx]">
+									<u--image width="215rpx" height="215rpx" :radius="'var(--goods-rounded-big)'" :src="img(item.image_mid[3])" model="aspectFill" @click="imgListPreview(item.images[3])">
+										<template #error>
+											<u-icon name="photo" color="var(--text-color-light9)" size="50"></u-icon>
+										</template>
+									</u--image>
+								</view>
+                            </view>
+                        </template>
+                        <template v-if="item.image_mid.length > 4">
+                            <view class="flex flex-wrap mt-[10rpx]">
+								<view v-for="(imageItem, imageIndex) in item.image_mid" class="mb-[10rpx]" :class="{'mr-[10rpx]':(imageIndex + 1) % 3 != 0}">
+									<u--image width="211rpx" height="211rpx" :src="img(imageItem)" model="aspectFill" :radius="'var(--goods-rounded-big)'" @click="imgListPreview(item.images[imageIndex])">
+										<template #error>
+											<u-icon name="photo" color="var(--text-color-light9)" size="50"></u-icon>
+										</template>
+									</u--image>
+								</view>
+                            </view>
+                        </template>
+                        <view v-if="item.explain_first !=''" class="text-[26rpx]  !text-[var(--text-color-light6)] mt-[20rpx] pt-[20rpx] border-0 border-t-[2rpx] border-solid border-[#ebebec] w-[100%] overflow-clip leading-[1.2]  break-all">
+                            <text class=" text-[var(--primary-color)]">商家回复：</text>{{ item.explain_first }}
+                        </view>
+                    </view>
+                </template>
+            </view>
+            <mescroll-empty v-if="!list.length && loading" :option="{tip : '暂无评价'}"></mescroll-empty>
+        </mescroll-body>
+        <pay ref="payRef"></pay>
+    </view>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue'
+import { img } from '@/utils/common'
+import { getEvaluateList } from '@/addon/shop/api/evaluate'
+import MescrollBody from '@/components/mescroll/mescroll-body/mescroll-body.vue'
+import MescrollEmpty from '@/components/mescroll/mescroll-empty/mescroll-empty.vue'
+import useMescroll from '@/components/mescroll/hooks/useMescroll.js'
+import { onLoad, onUnload,onPageScroll, onReachBottom } from '@dcloudio/uni-app'
+
+const { mescrollInit, downCallback, getMescroll } = useMescroll(onPageScroll, onReachBottom)
+const list = ref<Array<Object>>([]);
+const loading = ref<boolean>(false);
+const statusList = <Array<Object>>([
+    { status: 1, name: '全部', value: [] },
+    { status: 2, name: '好评', value: [4, 5] },
+    { status: 3, name: '中评', value: [2, 3] },
+    { status: 4, name: '差评', value: [1] },
+]);
+const evaluateStatus = ref(1);
+const evaluateValue = ref([]);
+const goodsId = ref('')
+onLoad((option: any) => {
+    goodsId.value = option.goods_id || ''
+})
+
+const statusClickFn = (status: any, value: any) => {
+    evaluateStatus.value = status;
+    evaluateValue.value = value
+    list.value = []; //如果是第一页需手动制空列表
+    getMescroll().resetUpScroll();
+};
+
+const getEvaluateListFn = (mescroll:any) => {
+    loading.value = false;
+    let data: object = {
+        page: mescroll.num,
+        limit: mescroll.size,
+        goods_id: goodsId.value,
+        scores: evaluateValue.value
+    };
+
+    getEvaluateList(data).then((res:any) => {
+        let newArr = (res.data.data as Array<Object>);
+        //设置列表数据
+        if (mescroll.num == 1) {
+            list.value = []; //如果是第一页需手动制空列表
+        }
+        list.value = list.value.concat(newArr);
+
+        mescroll.endSuccess(newArr.length);
+        loading.value = true;
+    }).catch(() => {
+        loading.value = true;
+        mescroll.endErr(); // 请求失败, 结束加载
+    })
+}
+//预览图片
+const imgListPreview = (item:any) => {
+    if (item === '') return false
+    var urlList = []
+    urlList.push(img(item))  //push中的参数为 :src="item.img_url" 中的图片地址
+    uni.previewImage({
+        indicator: "number",
+        loop: true,
+        urls: urlList
+    })
+}
+
+//关闭预览图片
+onUnload(()=>{
+	// #ifdef  H5 || APP
+	try {
+		uni.closePreviewImage()
+	}catch (e) {
+
+	}
+	// #endif
+})
+</script>
+
+<style lang="scss" scoped>
+.class-select {
+    position: relative;
+    font-weight: bold;
+
+    &::before {
+        content: "";
+        position: absolute;
+        bottom: 0;
+        height: 6rpx;
+        background-color: var(--primary-color);
+        width: 90%;
+        left: 50%;
+        transform: translateX(-50%);
+    }
+}
+</style>
diff --git a/uni-app/src/addon/shop/pages/evaluate/order_evaluate.vue b/uni-app/src/addon/shop/pages/evaluate/order_evaluate.vue
new file mode 100644
index 00000000..6add4f65
--- /dev/null
+++ b/uni-app/src/addon/shop/pages/evaluate/order_evaluate.vue
@@ -0,0 +1,161 @@
+<template>
+	<view class="bg-[var(--page-bg-color)] min-h-screen" :style="themeColor()">
+		<view class="px-[var(--sidebar-m)] py-[var(--top-m)]">
+			<template v-for="(item, index)  in info" :key="index">
+				<view class="card-template mb-[var(--top-m)]">
+					<view class="bg-[var(--temp-bg)] p-[20rpx] rounded-[var(--rounded-mid)] flex">
+						<u--image radius="var(--goods-rounded-mid)" width="150rpx" height="150rpx" :src="img(item.goods_image_thumb_small ? item.goods_image_thumb_small : '')" model="aspectFill">
+							<template #error>
+								<u-icon name="photo" color="#999" size="50"></u-icon>
+							</template>
+						</u--image>
+						<view class="flex-1 flex flex-wrap ml-[20rpx] my-[4rpx]">
+							<view>
+								<view class="text-[26rpx] leading-[40rpx] max-w-[450rpx] truncate">{{ item.goods_name }}</view>
+								<view class="max-w-[450rpx] mt-[14rpx] truncate text-[22rpx] text-[var(--text-color-light9)] leading-[28rpx]" v-if="item.sku_name">{{ item.sku_name }}</view>
+							</view>
+							<view class="mt-auto w-full flex justify-between items-center">
+								<view class="flex items-baseline  price-font">
+									<text class="text-[24rpx] font-500">￥</text>
+									<text class="text-[40rpx] font-500">{{ parseFloat(item.price).toFixed(2).split('.')[0] }}</text>
+									<text class="text-[24rpx] font-500">.{{ parseFloat(item.price).toFixed(2).split('.')[1] }}</text>
+								</view>
+								<text class="font-400 text-[28rpx] text-[#333]">x{{ item.num }}</text>
+							</view>
+						</view>
+					</view>
+					<view class="flex items-center mt-[30rpx]">
+						<u-rate :count="5" v-model="form[index].scores" active-color="var(--primary-color)" :size="'36rpx'" gutter="1"></u-rate>
+						<text class="ml-[16rpx] text-[28rpx] pt-[2rpx] text-[var(--primary-color)]">{{ form[index].scores === 1 ? '差评' : form[index].scores === 2 || form[index].scores === 3 ? '中评' : '好评' }}</text>
+					</view>
+					<textarea
+						class="!text-[26rpx] px-[2rpx] mt-[16rpx] w-[100%] !text-[#333] !leading-[1.5]"
+						v-model.trim="form[index].content" placeholder="请在此处输入你的评价" placeholderClass="text-[26rpx] text-[var(--text-color-light9)]" maxlength="200" />
+					<!-- <view class="text-right text-[24rpx] text-[var(--text-color-light6)]">{{ form[index].content.length >= 200 ? 200 : form[index].content.length }}/200</view> -->
+					<upload-img class="mt-[20rpx]" v-model="form[index].images" :max-count="9" :multiple="true" />
+				</view>
+			</template>
+		</view>
+		<u-tabbar :fixed="true" :placeholder="true" :safeAreaInsetBottom="true" zIndex="9999">
+			<view class="flex items-center pl-[30rpx] pr-[20rpx] box-border  justify-between w-[100%]">
+				<view class="flex items-center" @click="selectCheck">
+					<text class="iconfont text-color text-[30rpx] mr-[12rpx] text-[var(--text-color-light9)]"
+						:class="{'iconxuanze1 text-[var(--primary-color)]' : is_anonymous === '1' ,'nc-iconfont nc-icon-yuanquanV6xx':is_anonymous !== '1'}"></text>
+					<text class="text-[28rpx] leading-[34rpx]"
+						:class="{'text-[var(--primary-color)]' :is_anonymous === '1', 'text-[var(--text-color-light6)]':is_anonymous !== '1'}">匿名</text>
+				</view>
+				<button
+					class="!w-[240rpx] !h-[70rpx] text-[26rpx] !m-0 flex-center rounded-full text-white primary-btn-bg remove-border font-500"
+					hover-class="none" @click="submit">提交</button>
+			</view>
+		</u-tabbar>
+		<loading-page :loading="loading"></loading-page>
+		<!-- #ifdef MP-WEIXIN -->
+		<!-- 小程序隐私协议 -->
+		<wx-privacy-popup ref="wxPrivacyPopupRef"></wx-privacy-popup>
+		<!-- #endif -->
+	</view>
+</template>
+<script lang="ts" setup>
+	import { ref,nextTick } from 'vue';
+	import { getShopOrderDetail } from '@/addon/shop/api/order';
+	import { setOrderEvaluate } from '@/addon/shop/api/evaluate';
+	import { onLoad } from '@dcloudio/uni-app';
+	import { img, redirect, goback } from '@/utils/common';
+	import uploadImg from '@/addon/shop/pages/evaluate/components/upload-img'
+
+	const info = ref<Array<any>>([])
+	const form = ref<Array<any>>([])
+	const is_anonymous = ref('2')
+	const loading = ref(false)
+	const order_id = ref('')
+
+	const wxPrivacyPopupRef:any = ref(null)
+
+	onLoad((option: any) => {
+        if(option.order_id){
+            order_id.value = option.order_id
+            getShopOrderDetailFn(order_id.value)
+
+            // #ifdef MP
+            nextTick(()=>{
+                if(wxPrivacyPopupRef.value) wxPrivacyPopupRef.value.proactive();
+            })
+            // #endif
+        }else{
+			let parameter = {
+				url:'/addon/shop/pages/order/list',
+				param: {
+					status: 5
+				},
+				title: '缺少订单id'
+			};
+			goback(parameter)
+        }
+	})
+
+	const getShopOrderDetailFn = (id: any) => {
+		loading.value = true
+		getShopOrderDetail(id).then((res: any) => {
+			if (res.data.is_evaluate) {
+				toLink(order_id.value)
+				return false
+			}
+			res.data.order_goods.forEach((el: any) => {
+				if (el.status != 1 || el.is_enable_refund == 1) {
+					// 排除存在退款的情况
+				}else {
+					info.value.push(el);
+					form.value.push({
+						order_id: el.order_id,
+						order_goods_id: el.order_goods_id,
+						goods_id: el.goods_id,
+						content: '',
+						images: [],
+						scores: 5
+					})
+				}
+
+			})
+			loading.value = false
+		}).catch(() => {
+			loading.value = false
+		})
+	}
+
+	const selectCheck = () => {
+		is_anonymous.value = is_anonymous.value === '1' ? '2' : '1'
+	}
+
+	const submit = () => {
+		if (form.value.some(el => el.content == '')) {
+			uni.showToast({ title: '请输入你的评价', icon: 'none' })
+			return false
+		}
+		for (let i = 0; i < form.value.length; i++) {
+			let item = form.value[i];
+			if (item.content.length > 200) {
+				item.content = item.content.substr(0, 200);
+			}
+		}
+		form.value.forEach(v => v.is_anonymous = is_anonymous.value)
+		loading.value = true
+		setOrderEvaluate({ evaluate_array: form.value }).then(res => {
+			loading.value = false
+			toLink(order_id.value)
+		}).catch(() => {
+			loading.value = false
+		})
+	}
+
+	const toLink = (order_id : any) => {
+		redirect({ url: '/addon/shop/pages/evaluate/order_evaluate_view', param: { order_id }, mode: 'redirectTo' })
+	}
+</script>
+<style lang="scss">
+	.remove-border {
+		&::after {
+			border: none;
+		}
+	}
+</style>
diff --git a/uni-app/src/addon/shop/pages/evaluate/order_evaluate_view.vue b/uni-app/src/addon/shop/pages/evaluate/order_evaluate_view.vue
new file mode 100644
index 00000000..c4bb8507
--- /dev/null
+++ b/uni-app/src/addon/shop/pages/evaluate/order_evaluate_view.vue
@@ -0,0 +1,177 @@
+<template>
+     <view class="bg-[var(--page-bg-color)] min-h-screen" :style="themeColor()">
+		 <mescroll-body ref="mescrollRef" @init="mescrollInit" :down="{ use: false }" @up="getShopOrderFn">
+			<view class="px-[var(--sidebar-m)] py-[var(--top-m)]" v-if="info.length">
+               <template v-for="(item, index)  in info" :key="index">
+                    <view class="card-template mb-[var(--top-m)]">
+						<view class="bg-[var(--temp-bg)] p-[20rpx] rounded-[var(--rounded-mid)] flex" @click="redirect({ url: '/addon/shop/pages/goods/detail', param: { goods_id: item.goods_id } })">
+							<u--image radius="var(--goods-rounded-mid)" width="150rpx" height="150rpx" :src="img(item.order_goods.goods_image_thumb_mid ? item.order_goods.goods_image_thumb_mid : '')" model="aspectFill">
+								 <template #error>
+                                     <u-icon name="photo" color="#999" size="50"></u-icon>
+								 </template>
+							</u--image>
+							<view class="flex-1 flex flex-wrap ml-[20rpx] my-[4rpx]">
+								 <view>
+									  <view class="text-[26rpx] leading-[40rpx] max-w-[450rpx] truncate">{{ item.order_goods.goods_name }}</view>
+									  <view class="max-w-[450rpx] mt-[14rpx] truncate text-[22rpx] text-[var(--text-color-light9)] leading-[28rpx]" v-if="item.order_goods.sku_name">{{ item.order_goods.sku_name }}</view>
+								 </view>
+								 <view class="mt-auto w-full flex justify-between items-center">
+									  <view class="flex items-baseline  price-font">
+										  <text class="text-[24rpx] font-500">￥</text>
+										  <text class="text-[40rpx] font-500">{{ parseFloat(item.order_goods.price).toFixed(2).split('.')[0] }}</text>
+										  <text class="text-[24rpx] font-500">.{{ parseFloat(item.order_goods.price).toFixed(2).split('.')[1] }}</text>
+									  </view>
+									  <text class="font-400 text-[28rpx] text-[#333]">x{{ item.order_goods.num }}</text>
+								 </view>
+							</view>
+						</view>
+                         <view class="flex items-center mt-[30rpx]">
+                            <u-rate :count="5" v-model="item.scores" active-color="var(--primary-color)" :size="'36rpx'" gutter="1" readonly></u-rate>
+                            <text class="ml-[16rpx] text-[28rpx] pt-[2rpx] text-[var(--primary-color)]">{{ item.scores === 1 ? '差评' : item.scores === 2 || item.scores === 3 ? '中评' : '好评' }}</text>
+                         </view>
+                         <view class="px-[2rpx] text-[28rpx] text-[#333] mt-[16rpx] mb-[20rpx] break-all leading-[1.5]">{{ item.content }}</view>
+                         <template v-if="item.image_mid.length === 1">
+                            <u--image class="rounded-[var(--goods-rounded-big)] overflow-hidden mt-[10rpx]" width="420rpx" height="420rpx" :src="img(item.image_mid[0])" model="aspectFill" @click="imgListPreview(item.images[0])">
+                                <template #error>
+                                    <u-icon name="photo" color="#999" size="50"></u-icon>
+                                </template>
+                            </u--image>
+                        </template>
+                        <template v-if="item.image_mid.length === 2">
+                            <view class="flex justify-between mt-[10rpx]">
+                                <u--image class="rounded-[var(--goods-rounded-big)] overflow-hidden" width="322rpx" height="322rpx" :src="img(item.image_mid[0])" model="aspectFill" @click="imgListPreview(item.images[0])">
+                                    <template #error>
+                                        <u-icon name="photo" color="#999" size="50"></u-icon>
+                                    </template>
+                                </u--image>
+                                <u--image class="rounded-[var(--goods-rounded-big)] overflow-hidden" width="322rpx" height="322rpx" :src="img(item.image_mid[1])" model="aspectFill" @click="imgListPreview(item.images[1])">
+                                    <template #error>
+                                        <u-icon name="photo" color="#999" size="50"></u-icon>
+                                    </template>
+                                </u--image>
+                            </view>
+                        </template>
+                        <template v-if="item.image_mid.length === 3">
+                            <view class="flex justify-between mt-[10rpx]">
+                                <u--image class="rounded-[var(--goods-rounded-big)] overflow-hidden" width="430rpx" height="430rpx" :src="img(item.image_mid[0])" model="aspectFill" @click="imgListPreview(item.images[0])">
+                                    <template #error>
+                                        <u-icon name="photo" color="#999" size="50"></u-icon>
+                                    </template>
+                                </u--image>
+                                <view>
+                                    <u--image class="rounded-[var(--goods-rounded-big)] overflow-hidden mb-[20rpx]" width="205rpx" height="205rpx" :src="img(item.image_mid[1])" model="aspectFill" @click="imgListPreview(item.images[1])">
+                                        <template #error>
+                                            <u-icon name="photo" color="#999" size="50"></u-icon>
+                                        </template>
+                                    </u--image>
+                                    <u--image class="rounded-[var(--goods-rounded-big)] overflow-hidden" width="205rpx" height="205rpx" :src="img(item.image_mid[2])" model="aspectFill" @click="imgListPreview(item.images[2])">
+                                        <template #error>
+                                            <u-icon name="photo" color="#999" size="50"></u-icon>
+                                        </template>
+                                    </u--image>
+                                </view>
+                            </view>
+                        </template>
+                        <template v-if="item.image_mid.length === 4">
+                            <view class="flex flex-wrap mt-[10rpx]">
+                                <u--image class="rounded-[var(--goods-rounded-big)] overflow-hidden mr-[15rpx] mb-[15rpx]" width="215rpx" height="215rpx" :src="img(item.image_mid[0])" model="aspectFill" @click="imgListPreview(item.images[0])">
+                                    <template #error>
+                                        <u-icon name="photo" color="#999" size="50"></u-icon>
+                                    </template>
+                                </u--image>
+                                <u--image class="rounded-[var(--goods-rounded-big)] overflow-hidden mr-[15rpx] mb-[15rpx]" width="215rpx" height="215rpx" :src="img(item.image_mid[1])" model="aspectFill" @click="imgListPreview(item.images[1])">
+                                    <template #error>
+                                        <u-icon name="photo" color="#999" size="50"></u-icon>
+                                    </template>
+                                </u--image>
+                                <u--image class="rounded-[var(--goods-rounded-big)] overflow-hidden mr-[15rpx]" width="215rpx" height="215rpx" :src="img(item.image_mid[2])" model="aspectFill" @click="imgListPreview(item.images[2])">
+                                    <template #error>
+                                        <u-icon name="photo" color="#999" size="50"></u-icon>
+                                    </template>
+                                </u--image>
+                                <u--image class="rounded-[var(--goods-rounded-big)] overflow-hidden mr-[15rpx]" width="215rpx" height="215rpx" :src="img(item.image_mid[3])" model="aspectFill" @click="imgListPreview(item.images[3])">
+                                    <template #error>
+                                        <u-icon name="photo" color="#999" size="50"></u-icon>
+                                    </template>
+                                </u--image>
+                            </view>
+                        </template>
+                        <template v-if="item.image_mid.length > 4">
+                            <view class="flex flex-wrap mt-[10rpx]">
+                                <u--image v-for="(imageItem, imageIndex) in item.images"
+                                    :class="['rounded-[var(--goods-rounded-big)] overflow-hidden mb-[10rpx]', (imageIndex + 1) % 3 === 0 ? '' : 'mr-[10rpx]']"
+                                    width="211rpx" height="211rpx" :src="img(imageItem)" model="aspectFill"
+                                    @click="imgListPreview(imageItem)">
+                                    <template #error>
+                                        <u-icon name="photo" color="#999" size="50"></u-icon>
+                                    </template>
+                                </u--image>
+                            </view>
+                        </template>
+                        <view v-if="item.explain_first !=''" class="text-[26rpx] !text-[var(--text-color-light6)] mt-[20rpx] pt-[20rpx] border-0 border-t-[2rpx] border-solid border-[#F1F2F5] w-[100%] overflow-clip leading-[34rpx] break-all">
+                            <text class="text-[var(--primary-color)]">商家回复：</text>
+							<text>{{ item.explain_first }}</text>
+                        </view>
+                    </view>
+               </template>
+			</view>
+			<mescroll-empty v-if="!info.length && !loading" :option="{tip : '暂无评价'}" ></mescroll-empty>
+		    <loading-page :loading="loading"></loading-page>
+		  </mescroll-body>
+     </view>
+</template>
+<script lang="ts" setup>
+import { ref } from 'vue';
+import { getOrderEvaluate } from '@/addon/shop/api/evaluate';
+import { onLoad,onUnload,onPageScroll,onReachBottom } from '@dcloudio/uni-app';
+import { img, redirect, goback } from '@/utils/common';
+import useMescroll from '@/components/mescroll/hooks/useMescroll.js';
+import MescrollEmpty from '@/components/mescroll/mescroll-empty/mescroll-empty.vue';
+
+const { mescrollInit, downCallback, getMescroll } = useMescroll(onPageScroll, onReachBottom);
+const info = ref<Array<any>>([])
+const loading = ref(true)
+onLoad((option:any) => {
+    if(option.order_id){
+        getOrderEvaluateFn(option.order_id)
+    }else{
+        let parameter = {
+            url:'/addon/shop/pages/evaluate/list',
+            title: '缺少订单id'
+        };
+        goback(parameter)
+    }
+})
+const getOrderEvaluateFn = (id: any) => {
+     loading.value = true
+     getOrderEvaluate(id).then((res: any) => {
+          info.value = res.data
+          loading.value = false
+     }).catch(()=>{
+          loading.value = false
+     })
+}
+
+//预览图片
+const imgListPreview = (item:any) => {
+    if (item === '') return false
+    var urlList = []
+    urlList.push(img(item))  //push中的参数为 :src="item.img_url" 中的图片地址
+    uni.previewImage({
+        indicator: "number",
+        loop: true,
+        urls: urlList
+    })
+}
+
+// 关闭预览图片
+onUnload(()=>{
+    // #ifdef  H5 || APP
+    try {
+        uni.closePreviewImage()
+    }catch (e) {
+
+    }
+    // #endif
+})
+</script>
diff --git a/uni-app/src/addon/shop/pages/goods/browse.vue b/uni-app/src/addon/shop/pages/goods/browse.vue
new file mode 100644
index 00000000..538cd848
--- /dev/null
+++ b/uni-app/src/addon/shop/pages/goods/browse.vue
@@ -0,0 +1,261 @@
+<template>
+    <view class="bg-[var(--page-bg-color)] min-h-screen overflow-hidden" :style="themeColor()">
+        <view class="fixed top-0 left-0 right-0 z-200">
+            <view class="tab-style-1 py-[20rpx] bg-[#fff] border-0  border-solid border-b-[1rpx] border-[#f6f6f6] ">
+                <view class="tab-left text-[28rpx]">
+                    <text>共</text>
+                    <text class="text-primary">{{ browseTotal }}</text>
+                    <text>条</text>
+                </view>
+                <view class="tab-right !items-center">
+                    <view class="flex items-center" @click="handleSelect">
+                        <view class="tab-right-date">日期</view>
+                        <view class="nc-iconfont nc-icon-a-riliV6xx-36 tab-right-icon"></view>
+                    </view>
+                    <view class="w-[2rpx] h-[28rpx] mx-[20rpx] bg-gradient-to-b from-[#333] to-[#fff]"></view>
+                    <view @click="isEdit = !isEdit" class="text-[#333] text-[28rpx]">{{ isEdit ? '完成' : '管理' }}</view>
+                </view>
+            </view>
+        </view>
+        <mescroll-body ref="mescrollRef" top="76" bottom="168"  @init="mescrollInit" :down="{ use: false }" @up="getBrowseListFn">
+            <view v-if="browseList.length">
+                <view class="bg-[#fff] mb-[20rpx] pt-[30rpx] px-[20rpx]"  v-for="(item,index) in browseList" :key="index">
+                    <view class="flex items-center h-[34rpx]  mb-[20rpx]">
+                        <view class="self-center w-[58rpx]  flex items-center" v-if="isEdit" @click.stop="isSelectGroup(item)">
+                            <view class="bg-[#fff] w-[34rpx] h-[34rpx] rounded-[17rpx] flex items-center justify-center">
+                                <text class=" iconfont text-primary text-[34rpx] w-[34rpx] h-[34rpx] rounded-[17rpx] overflow-hidden shrink-0" :class="{ 'iconxuanze1':item.checked,'bg-[#F5F5F5]':!item.checked}" ></text>
+                            </view>
+                        </view>
+                        <view class="text-[28rpx] font-500 text-[#333] ">{{ item.date }}</view>
+                    </view>
+                    <view class="flex flex-wrap">
+                        <view class="w-[230rpx] mb-[20rpx]" :class="{'mr-[10rpx]': (subIndex + 1) % 3 }" v-for="(subItem,subIndex) in item.list" :key="subIndex" @click="toDetail(subItem)">
+                            <view class="relative w-[230rpx] h-[230rpx] rounded-[var(--goods-rounded-mid)] overflow-hidden mb-[10rpx]">
+                                <u--image width="230rpx" height="230rpx" :radius="'var(--goods-rounded-mid)'" :src="img(subItem.goods_cover_thumb_mid ? subItem.goods_cover_thumb_mid : '')" mode="aspectFill">
+                                    <template #error>
+                                        <image class="w-[230rpx] h-[230rpx] rounded-[var(--goods-rounded-mid)] overflow-hidden" :src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill"></image>
+                                    </template>
+                                </u--image>
+                                <view v-if="subItem.status == 0 " class="absolute left-0 top-0  w-[230rpx] h-[230rpx]  leading-[230rpx] text-center " style="background-color: rgba(0,0,0,0.3);">
+                                    <text class="text-[#fff] text-[28rpx]">已失效</text>
+                                </view>
+                                <view class="absolute top-0 left-0 right-0 bottom-0 p-[10rpx] flex justify-end items-start z-100" v-if="isEdit" @click.stop="changeItem(item,subItem)">
+                                    <view class="bg-[#fff] w-[34rpx] h-[34rpx] rounded-[17rpx] flex items-center justify-center">
+                                        <text class="iconfont text-primary text-[34rpx] w-[34rpx] h-[34rpx] rounded-[17rpx] overflow-hidden shrink-0" :class="{ 'iconxuanze1':subItem.checked,'bg-[#F5F5F5]':!subItem.checked}"></text>
+                                    </view>
+                                </view>
+                            </view>
+                            <view class="text-[var(--price-text-color)] price-font">
+                                <text class="text-[24rpx] font-500">￥</text>
+                                <text class="text-[40rpx] font-500">{{ parseFloat(subItem.price).toFixed(2).split('.')[0] }}</text>
+                                <text class="text-[24rpx] font-500">.{{ parseFloat(subItem.price).toFixed(2).split('.')[1] }}</text>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+            <mescroll-empty  v-if="!browseList.length && loading" :option="{tip : '暂无浏览的商品'}"></mescroll-empty>
+        </mescroll-body>
+        <view v-if="browseList.length && isEdit" class="fixed left-0 right-0 bottom-0 z-200 bg-[#fff]  pb-ios">
+            <view v-if="checkedNum" class="h-[66rpx] flex items-center justify-between pl-[30rpx] pr-[20rpx] border-0  border-b-[1rpx] border-solid border-[#f6f6f6]">
+                <view class="text-[24rpx]">
+                    <text>已选</text>
+                    <text class="text-primary">{{ checkedNum }}</text>
+                    <text>件宝贝</text>
+                </view>
+                <view class="text-[24rpx] text-[#999]" @click="clearBrowseFn">一键清空宝贝足迹</view>
+            </view>
+            <view class="flex h-[100rpx] items-center  justify-between pl-[30rpx] pr-[20rpx]">
+                <view class="flex items-center" @click="allChange">
+                    <text class="self-center iconfont text-primary text-[34rpx] mr-[10rpx] w-[34rpx] h-[34rpx] rounded-[17rpx] overflow-hidden flex-shrink-0" :class="{'iconxuanze1': isSelectAll, 'bg-color': !isSelectAll }  "></text>
+                    <text class="font-400 text-[#303133] text-[26rpx]">全选</text>
+                </view>
+                <button class="w-[180rpx] h-[70rpx] font-500 text-[26rpx] leading-[70rpx] !text-[#fff] m-0 rounded-full primary-btn-bg remove-border" @click="deleteBrowseFn">删除</button>
+            </view>
+        </view>
+
+        <!-- 时间选择 -->
+		<select-date ref="selectDateRef" @confirm="confirmFn"  />
+    </view>
+</template>
+
+<script setup lang="ts">
+import { ref, computed } from 'vue'
+import { img, redirect } from '@/utils/common';
+import { getBrowse, delBrowse } from '@/addon/shop/api/goods';
+import selectDate from '@/components/select-date/select-date.vue';
+import MescrollBody from '@/components/mescroll/mescroll-body/mescroll-body.vue';
+import MescrollEmpty from '@/components/mescroll/mescroll-empty/mescroll-empty.vue';
+import useMescroll from '@/components/mescroll/hooks/useMescroll.js';
+import { onPageScroll, onReachBottom } from '@dcloudio/uni-app';
+const { mescrollInit, downCallback, getMescroll } = useMescroll(onPageScroll, onReachBottom);
+
+const isEdit = ref(false)
+let loading = ref<boolean>(false);
+const optionLoading = ref(false)
+const browseTotal = ref<number>(0);
+let browseList = ref<any>([]);
+const create_time = ref([])
+const getBrowseListFn = (mescroll: any) =>{
+    loading.value = false;
+    let data: object = {
+		page: mescroll.num,
+		limit: mescroll.size,
+        date: create_time.value
+	};
+    getBrowse(data).then((res: any) => {
+        browseTotal.value = res.data.total;
+        let newArr = (res.data.data as Array<Object>);
+        //设置列表数据
+		if (Number(mescroll.num) === 1) {
+			browseList.value = []; //如果是第一页需手动制空列表
+		}
+        // 按日期分组
+        const groupedData = newArr.reduce((acc: any, item: any) => {
+            const date = item.browse_time.split(' ')[0]; // 提取日期部分
+            if (!acc[date]) {
+                acc[date] = [];
+            }
+            acc[date].push(item);
+            return acc;
+        }, {});
+
+        // 转换为所需格式
+        const formattedData = Object.keys(groupedData).map(date => ({
+            date: date,
+            list: groupedData[date]
+        }));
+        formattedData.forEach((item: any) => {
+            item.checked = false;
+            item.list.forEach((subItem: any)=> {
+                subItem.checked = false; // 初始化选中状态
+            });
+        });
+        // 合并相同日期的数据
+        formattedData.forEach((newItem: any) => {
+            const existingItemIndex = browseList.value.findIndex((item: any) => item.date === newItem.date);
+            if (existingItemIndex !== -1) {
+                // 合并到已有的日期数据中
+                browseList.value[existingItemIndex].list = [...browseList.value[existingItemIndex].list, ...newItem.list];
+            } else {
+                // 新增日期数据
+                browseList.value.push(newItem);
+            }
+        });
+		mescroll.endSuccess(newArr.length);
+		loading.value = true;
+    }).catch(() => {
+        loading.value = true;
+		mescroll.endErr(); // 请求失败, 结束加载
+    })
+}
+
+// 选择数量
+const checkedNum = computed(() => {
+	let num = 0
+	browseList.value.forEach((item: any) => {
+		item.list.forEach((subItem: any)=>{
+            subItem.checked && (num += 1)
+        })
+	})
+	return num
+})
+
+/**
+ * 全选
+ */
+//判断是否全选状态
+const isSelectAll = ref(false)
+const isallclick = ()=>{
+    const isActive = browseList.value.every((item: any) => {
+        return item.checked
+    })
+    if (isActive) { isSelectAll.value = true } else { isSelectAll.value= false }
+}
+// 选择每天的
+const isSelectGroup = (data: any) =>{
+    data.checked = !data.checked
+    data.list.forEach((item :any) => {
+        item.checked = data.checked
+    })
+    isallclick()
+}
+// 全选
+const allChange = () =>{
+    isSelectAll.value = !isSelectAll.value
+    browseList.value.forEach((item: any) => {
+        item.checked = isSelectAll.value
+        item.list.forEach((subItem: any) => {
+            subItem.checked = isSelectAll.value
+        })
+    })
+}
+// 选择单个商品
+const changeItem = (data: any,value: any) =>{
+    value.checked = !value.checked
+    const isActive = data.list.every((item: any) => {
+        return item.checked
+    })
+    if (isActive) { data.checked = true } else { data.checked = false }
+    isallclick()
+}
+
+// 删除
+const deleteBrowseFn = () => {
+    if (!checkedNum.value) {
+		uni.showToast({ title: '还没有选择商品', icon: 'none' })
+		return
+	}
+    if (optionLoading.value) return
+	optionLoading.value = true
+
+    const ids: any = []
+	browseList.value.forEach((item: any) => {
+        item.list.forEach((subItem: any) => {
+            subItem.checked && ids.push(subItem.goods_id)
+        })
+    })
+    delBrowse({goods_ids: ids}).then((res: any) => {
+        optionLoading.value = false
+        getMescroll().resetUpScroll();
+    })
+}
+
+const clearBrowseFn = () => {
+    if (optionLoading.value) return
+	optionLoading.value = true
+
+    const ids: any = []
+	browseList.value.forEach((item: any) => {
+        item.list.forEach((subItem: any) => {
+            ids.push(subItem.goods_id)
+        })
+    })
+
+    delBrowse({goods_ids: ids}).then((res: any) => {
+        getMescroll().resetUpScroll();
+        optionLoading.value = false
+    })
+}
+//日期筛选
+const selectDateRef = ref<any>(null)
+const handleSelect = () =>{
+	selectDateRef.value.show = true
+}
+// 确定时间筛选
+const confirmFn = (data: any) =>{
+	create_time.value = data;
+    browseList.value = []
+    getMescroll().resetUpScroll();
+}
+
+const toDetail = (data: any) => {
+    redirect({ url: '/addon/shop/pages/goods/detail', param: { goods_id: data.goods_id } })
+}
+</script>
+
+<style lang="scss" scoped>
+.bg-color{
+	background-color: #f5f5f5;
+}
+</style>
diff --git a/uni-app/src/addon/shop/pages/goods/cart.vue b/uni-app/src/addon/shop/pages/goods/cart.vue
new file mode 100644
index 00000000..6f5bcbd5
--- /dev/null
+++ b/uni-app/src/addon/shop/pages/goods/cart.vue
@@ -0,0 +1,704 @@
+<template>
+    <view :style="themeColor()">
+        <view class="bg-page min-h-[100vh] overflow-hidden flex flex-col" v-if="!loading">
+			<view  v-if="!info" class="pb-[100rpx]">
+				<view class="empty-page">
+					<image class="img" :src="img('static/resource/images/system/login.png')" model="aspectFit" />
+					<view class="desc">暂未登录</view>
+					<button shape="circle" plain="true" class="btn" @click="toLogin">去登录</button>
+				</view>
+				<ns-goods-recommend></ns-goods-recommend>
+			</view>
+			<view v-else-if="!cartList.length&&!invalidList.length"  class="pb-[100rpx]">
+				<view  class="empty-page">
+					<image class="img" :src="img('addon/shop/cart-empty.png')" model="aspectFit" />
+					<view class="desc">赶紧去逛逛, 购买心仪的商品吧</view>
+					<button shape="circle" plain="true" class="btn" @click="redirect({ url: '/addon/shop/pages/goods/list' })">去逛逛</button>
+				</view>
+				<ns-goods-recommend></ns-goods-recommend>
+			</view>
+            <block v-else>
+                <view class="flex-1 h-0">
+                    <scroll-view class="scroll-height " :scroll-y="true">
+                        <view class="py-[var(--top-m)] sidebar-margin">
+                            <view class="bg-[#fff] pb-[10rpx] box-border rounded-[var(--rounded-big)]" v-if="cartList.length">
+                                <view class="flex mx-[var(--rounded-big)] pt-[var(--pad-top-m)] justify-between items-center box-border font-400 text-[24rpx] mb-[24rpx] leading-[30rpx]">
+                                    <view class="flex items-baseline text-[24rpx] text-[#333]">
+										<text>共</text>
+										<text class="text-[32rpx] mx-[2rpx] text-[var(--price-text-color)]">{{ cartList.length }}</text>
+										<text>种商品</text>
+									</view>
+                                    <text @click="isEdit = !isEdit" class="text-[var(--text-color-light6)] text-[24rpx]">{{ isEdit ? '完成' : '管理' }}</text>
+                                </view>
+                                <u-swipe-action ref="swipeActive">
+                                    <block v-for="(item, index) in cartList">
+                                            <view v-if="item.goodsSku" class="py-[20rpx] overflow-hidden w-full">
+                                                <u-swipe-action-item :options="cartOptions" @click="swipeClick(index,item)">
+                                                    <view class="flex px-[var(--pad-sidebar-m)]" @click.stop="selectOnlyGoods(item)">
+														<view class="self-center w-[34rpx] mr-[24rpx] h-[60rpx] flex items-center" @click.stop="selectOnlyGoods(item)">
+															<text
+																class=" iconfont text-color text-[34rpx] w-[34rpx] h-[34rpx] rounded-[17rpx] overflow-hidden shrink-0"
+																:class="{ 'iconxuanze1':item.checked,'bg-[#F5F5F5]':!item.checked}">
+															</text>
+														</view>
+                                                        <view class="w-[200rpx] h-[200rpx] flex items-center justify-center rounded-[var(--goods-rounded-big)] overflow-hidden" @click="toDetail(item)">
+															<u--image radius="var(--goods-rounded-big)" width="200rpx" height="200rpx" :src="img(item.goodsSku.sku_image_thumb_mid||'')" model="aspectFill">
+															    <template #error>
+															        <image class="w-[200rpx] h-[200rpx] rounded-[var(--goods-rounded-big)] overflow-hidden" :src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill"></image>
+															    </template>
+															</u--image>
+														</view>
+                                                        <view class="flex flex-1 flex-col justify-between ml-[20rpx]">
+                                                            <view class="w-[100%] flex flex-col items-baseline">
+                                                                <view class="text-[#333] text-[28rpx] max-h-[80rpx] leading-[40rpx] multi-hidden font-400">
+																	{{ item.goods.goods_name }}
+																</view>
+                                                                <view class="box-border max-w-[376rpx] mt-[10rpx] px-[14rpx] h-[36rpx] leading-[36rpx] truncate text-[var(--text-color-light6)] bg-[#F5F5F5] text-[22rpx] rounded-[20rpx]" v-if="item.goodsSku && item.goodsSku.sku_spec_format">
+                                                                    {{ item.goodsSku.sku_spec_format }}
+                                                                </view>
+                                                            </view>
+															<view v-if="item.goods && item.goods.goods_label_name && item.goods.goods_label_name.length" class="flex flex-wrap mb-[auto]">
+																<template v-for="(tagItem, tagIndex) in item.goods.goods_label_name">
+																	<image class="img-tag" v-if="tagItem.style_type == 'icon' && tagItem.icon" :src="img(tagItem.icon)" mode="heightFix" @error="diyGoods.error(tagItem,'icon')"></image>
+																	<view class="base-tag" v-else-if="tagItem.style_type == 'diy' || !tagItem.icon" :style="diyGoods.baseTagStyle(tagItem)">
+																		{{tagItem.label_name}}
+																	</view>
+																</template>
+															</view>
+															<view v-if="item.manjian_info && Object.keys(item.manjian_info).length && item.manjian_info.is_show" class="flex items-center mt-[8rpx] mb-[auto]" @click.stop="manjianOpenFn(item.manjian_info)">
+																<view class="bg-[var(--primary-color-light)] text-[var(--primary-color)] rounded-[6rpx] text-[20rpx] flex items-center justify-center w-[88rpx] h-[36rpx] mr-[6rpx]">满减送</view>
+																<text class="text-[22rpx] text-[#999]">{{item.manjian_info.manjian_name}}</text>
+															</view>
+															<view class="flex justify-between items-end self-end mt-[10rpx] w-[100%]">
+																<view class="text-[var(--price-text-color)] price-font truncate max-w-[200rpx]">
+																	<text class="text-[24rpx] font-500">￥</text>
+																	<text class="text-[40rpx] font-500">{{ parseFloat(goodsPrice(item)).toFixed(2).split('.')[0] }}</text>
+																	<text class="text-[24rpx] font-500">.{{ parseFloat(goodsPrice(item)).toFixed(2).split('.')[1] }}</text>
+																</view>
+																<u-number-box v-model="item.num" :min="numLimit(item).min"
+																	:max="numLimit(item).max" integer :step="1" input-width="68rpx"
+																	input-height="52rpx" button-size="52rpx" disabledInput
+																	@change="numChange($event, index)">
+																	<template #minus>
+																		<view class="relative w-[26rpx] h-[26rpx]" @click="reduceNumChange(item)">
+																			<text
+																				:class="{ 'text-[var(--text-color-light9)]': item.num === numLimit(item).min, 'text-[#303133]': item.num !== numLimit(item).min }"
+																				class="text-[24rpx] absolute flex items-center justify-center -left-[20rpx] -bottom-[20rpx] -right-[20rpx] -top-[20rpx] font-500 nc-iconfont nc-icon-jianV6xx"></text>
+																		</view>
+																	</template>
+																	<template #input>
+																		<input  class="text-[#303133] text-[28rpx] mx-[14rpx] w-[80rpx] h-[44rpx] bg-[var(--temp-bg)] leading-[44rpx] text-center rounded-[6rpx]" type="number" @input="goodsSkuInputFn(item)" @blur="goodsSkuBlurFn($event, index)" @click.stop v-model="item.num"  />
+																	</template>
+																	<template #plus>
+																		<view class="relative w-[26rpx] h-[26rpx]"  @click="addNumChange(item)">
+																			<text
+																				:class="{ 'text-[var(--text-color-light9)]': item.num === numLimit(item).max, ' text-[#303133]': item.num !== numLimit(item).max }"
+																				class="text-[24rpx] absolute flex items-center justify-center -left-[20rpx] -bottom-[20rpx] -right-[20rpx] -top-[20rpx] font-500 nc-iconfont nc-icon-jiahaoV6xx"></text>
+																		</view>
+																	</template>
+																</u-number-box>
+															</view>
+                                                        </view>
+                                                    </view>
+                                                </u-swipe-action-item>
+                                            </view>
+                                    </block>
+
+                                </u-swipe-action>
+                            </view>
+                            <view class="bg-[#fff] pb-[10rpx] box-border rounded-[var(--rounded-big)] mt-[var(--top-m)]" v-if="invalidList.length">
+                                <view class="flex mx-[var(--pad-sidebar-m)] pt-[var(--pad-top-m)] justify-between items-center box-border font-400 text-[#303133] text-[24rpx] mb-[24rpx] leading-[30rpx]">
+                                    <view class="flex items-center text-[24rpx] text-[#333]">
+										<text>共</text>
+										<text class="text-[28rpx] text-[var(--price-text-color)]">{{ invalidList.length }}</text>
+										<text>件失效商品</text>
+									</view>
+                                    <text class="text-[var(--text-color-light6)] text-[24rpx]" @click="deleteInvalidList">清空</text>
+                                </view>
+                                <view v-for="(item, index) in invalidList" class="py-[20rpx] overflow-hidden" >
+                                    <view class="flex px-[var(--pad-sidebar-m)]">
+                                        <text class="self-center iconfont iconxuanze1 text-[34rpx] mr-[32rpx] text-[#F5F5F5] rounded-[50%] overflow-hidden shrink-0"></text>
+                                        <view class="relative w-[200rpx] h-[200rpx] rounded-[var(--goods-rounded-big)] overflow-hidden">
+                                            <u--image radius="var(--goods-rounded-big)" width="200rpx" height="200rpx" :src="img(item.goodsSku.sku_image_thumb_mid)" model="aspectFill">
+                                                <template #error>
+                                                    <image class="w-[200rpx] h-[200rpx] rounded-[var(--goods-rounded-big)] overflow-hidden" :src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill"></image>
+                                                </template>
+                                            </u--image>
+                                            <view v-if="item.goodsSku.stock == 0 " class="absolute left-0 top-0  w-[200rpx] h-[200rpx]  leading-[200rpx] text-center " style="background-color: rgba(0,0,0,0.3);">
+                                                <text class="text-[#fff] text-[28rpx]">已售罄</text>
+                                            </view>
+                                            <view v-if="item.goodsSku.stock != 0 " class="absolute left-0 top-0  w-[200rpx] h-[200rpx]  leading-[200rpx] text-center " style="background-color: rgba(0,0,0,0.3);">
+                                                <text class="text-[#fff] text-[28rpx]">已失效</text>
+                                            </view>
+                                        </view>
+                                        <view class="flex flex-1 flex-wrap ml-[20rpx]">
+                                            <view class="w-[100%] flex flex-col items-baseline">
+                                                <view class="text-[#333] text-[28rpx] max-h-[80rpx] leading-[40rpx] font-400 multi-hidden">
+													{{ item.goods.goods_name }}
+												</view>
+                                                <view class="box-border max-w-[376rpx] mt-[10rpx] px-[14rpx] h-[36rpx] leading-[36rpx] truncate text-[var(--text-color-light6)] bg-[#F5F5F5] text-[22rpx] rounded-[20rpx]" v-if="item.goodsSku && item.goodsSku.sku_spec_format">
+                                                    {{ item.goodsSku.sku_spec_format }}
+                                                </view>
+                                            </view>
+                                            <view class="flex justify-between items-end self-end w-[100%]">
+												<view class="text-[var(--price-text-color)] price-font">
+													<text class="text-[24rpx] font-500">￥</text>
+													<text class="text-[36rpx] font-500">{{ parseFloat(goodsPrice(item)).toFixed(2).split('.')[0] }}</text>
+													<text class="text-[24rpx] font-500">.{{ parseFloat(goodsPrice(item)).toFixed(2).split('.')[1] }}</text>
+												</view>
+                                            </view>
+                                        </view>
+                                    </view>
+								</view>
+                            </view>
+                        </view>
+						<ns-goods-recommend></ns-goods-recommend>
+                    </scroll-view>
+                </view>
+            </block>
+        </view>
+		
+		<!-- 优惠明细 -->
+		<view @touchmove.prevent.stop>
+			<u-popup class="popup-type" :show="couponDetailsShow" @close="couponDetailsShow = false">
+				<view class="min-h-[200rpx] popup-common" @touchmove.prevent.stop>
+					<view class="flex justify-center items-center pt-[36rpx] pb-[56rpx] px-[26rpx] bg-[#fff] relative">
+						<text class="text-[32rpx]">优惠明细</text>
+						<text class="nc-iconfont nc-icon-guanbiV6xx text-[var(--text-color-light6)] absolute text-[32rpx] right-[26rpx]"  @click="couponDetailsShow = false"></text>
+					</view>
+					<scroll-view class="h-[360rpx]" scroll-y="true">
+						<view class="flex justify-between h-[60rpx] px-[var(--pad-sidebar-m)]">
+							<text class="text-[28rpx]">商品总额</text>
+							<text class="text-[28rpx]">￥{{total.goods_money}}</text>
+						</view>
+						<view class="flex justify-between h-[60rpx] px-[var(--pad-sidebar-m)]" v-if="Number(total.promotion_money)">
+							<text class="text-[28rpx]">满减</text>
+							<text class="text-[28rpx] text-[red]">-￥{{total.promotion_money}}</text>
+						</view>
+					</scroll-view>
+				</view>
+			</u-popup>
+		</view>
+
+        <!--  #ifdef  H5 -->
+        <view v-if="cartList.length" class="flex h-[96rpx] items-center bg-[#fff] fixed z-99999 left-0 right-0 bottom-[50px] pl-[30rpx] pr-[20rpx] box-solid mb-ios justify-between border-0 border-t-[2rpx] border-solid border-[#f6f6f6]">
+            <view class="flex items-center" @click="selectAll">
+                <text class="self-center iconfont text-color text-[34rpx] mr-[10rpx] w-[34rpx] h-[34rpx] rounded-[17rpx] overflow-hidden shrink-0" :class="cartList.length == checkedNum ? 'iconxuanze1' : 'bg-[#F5F5F5]'"></text>
+                <text class="font-400 text-[#303133] text-[26rpx]">全选</text>
+            </view>
+            <view class="flex items-center">
+                <view class="flex-1 flex items-center justify-between" v-if="!isEdit">
+                    <view class="mr-[20rpx]">
+						<view class="flex items-center text-[var(--price-text-color)] leading-[45rpx]">
+						    <view class="font-400 text-[#303133] text-[28rpx]">合计：</view>
+						    <text class="text-[var(--price-text-color)] price-font text-[32rpx] font-bold">
+						        ￥{{ parseFloat(total.order_money).toFixed(2) }}
+						    </text>
+						</view>
+						<view class="flex items-center justify-end mt-[6rpx]" v-if="Number(total.promotion_money)" @click="couponDetailsShow = true">
+							<text class="text-[22rpx] text-[#666]">优惠明细</text>
+							<text class="iconfont iconjiantoushang text-[#666] !text-[22rpx] ml-[4rpx] font-bold"></text>
+						</view>
+					</view>
+                    <button class="w-[180rpx] h-[70rpx] font-500 text-[26rpx] leading-[70rpx] !text-[#fff] m-0 rounded-full primary-btn-bg remove-border" @click="settlement">结算</button>
+                </view>
+                <view class="flex-1 flex items-center justify-end" v-else>
+                    <button class="w-[180rpx] h-[70rpx] font-500 text-[26rpx] leading-[70rpx] !text-[#fff] m-0 rounded-full primary-btn-bg remove-border" @click="deleteCartFn">删除</button>
+                </view>
+            </view>
+        </view>
+        <!--  #endif -->
+        <!--  #ifndef  H5 -->
+        <view v-if="cartList.length" class="pl-[30rpx] pr-[20rpx] flex h-[96rpx] items-center bg-[#fff] fixed z-99999 left-0 right-0 bottom-[100rpx] box-solid mb-ios justify-between border-0 border-t-[2rpx] border-solid border-[#f6f6f6]">
+            <view class="flex items-center" @click="selectAll">
+                <text class="self-center iconfont text-color text-[30rpx] mr-[20rpx] w-[34rpx] h-[34rpx] rounded-[17rpx] overflow-hidden shrink-0" :class="{'iconxuanze1' :cartList.length == checkedNum, 'bg-[#F5F5F5]':cartList.length != checkedNum}"></text>
+                <text class="font-400 text-[#303133] text-[26rpx]">全选</text>
+            </view>
+            <view class="flex items-center">
+                <view class="flex-1 flex items-center justify-between" v-if="!isEdit">
+					<view class="mr-[20rpx]">
+						<view class="flex items-center text-[var(--price-text-color)] leading-[45rpx]">
+						    <view class="font-400 text-[#303133] text-[28rpx]">合计：</view>
+						    <text class="text-[var(--price-text-color)] price-font text-[32rpx] font-bold">
+						        ￥{{ parseFloat(total.order_money).toFixed(2) }}
+						    </text>
+						</view>
+						<view class="flex items-center justify-end mt-[6rpx]" v-if="total.promotion_money" @click="couponDetailsShow = true">
+							<text class="text-[22rpx] text-[#666]">优惠明细</text>
+							<text class="iconfont iconjiantoushang text-[#666] !text-[22rpx] ml-[4rpx] font-bold"></text>
+						</view>
+					</view>
+
+                    <!-- #ifdef H5 -->
+                    <button class="w-[180rpx] h-[70rpx] font-500 text-[26rpx] leading-[70rpx] !text-[#fff] m-0 rounded-full primary-btn-bg remove-border" @click="settlement">结算</button>
+                    <!-- #endif -->
+
+                    <!-- #ifdef MP-WEIXIN -->
+                    <button v-if="isBindMobile && info && !info.mobile" class="w-[180rpx] h-[70rpx] font-500 text-[26rpx] leading-[70rpx] !text-[#fff] m-0 rounded-full primary-btn-bg remove-border" open-type="getPhoneNumber" @getphonenumber="memberStore.bindMobile">结算</button>
+                    <button v-else class="w-[180rpx] h-[70rpx] font-500 text-[26rpx] leading-[70rpx] !text-[#fff] m-0 rounded-full primary-btn-bg remove-border" @click="settlement">结算</button>
+                    <!-- #endif -->
+
+                </view>
+                <view class="flex-1 flex items-center justify-end" v-else>
+                    <button class="w-[180rpx] h-[70rpx] font-500 text-[26rpx] leading-[70rpx] !text-[#fff] m-0 rounded-full primary-btn-bg remove-border" @click="deleteCartFn">删除</button>
+                </view>
+            </view>
+        </view>
+        <!--  #endif -->
+		<loading-page :loading="loading"></loading-page>
+		<ns-goods-manjian ref="manjianShowRef"></ns-goods-manjian>
+        <tabbar />
+        <!-- 强制绑定手机号 -->
+		<bind-mobile ref="bindMobileRef" />
+    </view>
+</template>
+
+<script setup lang="ts">
+import { ref, computed, watch,nextTick } from 'vue'
+import useMemberStore from '@/stores/member'
+import { useLogin } from '@/hooks/useLogin'
+import { onShow } from '@dcloudio/uni-app'
+import { img, redirect, getToken } from '@/utils/common'
+import useCartStore from '@/addon/shop/stores/cart'
+import { getCartGoodsList, getCartCalculate } from '@/addon/shop/api/cart'
+import bindMobile from '@/components/bind-mobile/bind-mobile.vue';
+import {t} from "@/locale";
+import {useGoods} from '@/addon/shop/hooks/useGoods'
+import nsGoodsManjian from '@/addon/shop/components/ns-goods-manjian/ns-goods-manjian.vue';
+import nsGoodsRecommend from '@/addon/shop/components/ns-goods-recommend/ns-goods-recommend.vue';
+
+const diyGoods = useGoods();
+const memberStore = useMemberStore()
+const info = computed(() => memberStore.info)
+const loading = ref(true)
+const optionLoading = ref(false)
+const total = ref({
+	goods_money: 0, //商品金额
+	order_money: 0, //订单金额
+	promotion_money: 0 //优惠金额
+})
+const cartList = ref<object[]>([])
+const invalidList = ref<object[]>([]) //  失效商品：已下架、已删除
+const isEdit = ref(false)
+const querOne = ref(true)
+const cartStore = useCartStore();
+const manjianShowRef: any = ref(null); //满减送
+const couponDetailsShow: any = ref(false); //优惠明细
+
+const getCartGoodsListFn = () => {
+    getCartGoodsList({}).then(({ data }) => {
+        cartList.value = []
+        invalidList.value = []
+        data.forEach(item => {
+            item.checked = false
+            if (item.goodsSku) {
+                if (item.goods.status && item.goods.delete_time == 0) {
+                    if (item.goodsSku.stock) {
+                        if (item.num > item.goodsSku.stock) item.num = item.goodsSku.stock;
+                        cartList.value.push(item)
+                    } else {
+                        // 库存为0 时，移动到售罄商品
+                        invalidList.value.push(item)
+                    }
+                } else {
+                    invalidList.value.push(item)
+                }
+            }
+        })
+		
+        selectAll();
+		cartCalculateFn();
+		loading.value = false
+        if (querOne.value) querOne.value = false
+    }).catch((err) => {
+        if (err.code == 401) {
+            cartList.value = []
+            invalidList.value = []
+            loading.value = false
+        }
+    })
+}
+
+onShow(() => {
+    getCartGoodsListFn()
+    cartStore.getList();
+})
+
+const goodsSkuInputFn = (data)=>{
+	setTimeout(() => {
+		if(!data.num || data.num <= numLimit(data).min ){
+			data.num = numLimit(data).min;
+		}
+		if(data.num >= numLimit(data).max){
+			data.num = numLimit(data).max;
+		}
+		uni.$u.debounce((event: any) => {
+			cartStore.increase({
+				id: data.id,
+				goods_id: data.goods_id,
+				sku_id: data.sku_id,
+				stock: data.goodsSku.stock,
+				sale_price: data.goodsSku.sale_price,
+				num: Number(data.num)
+			}, 0);
+		}, 500)
+	},0)
+}
+const goodsSkuBlurFn = (event, index)=>{
+	setTimeout(() => {
+		const data: any = cartList.value[index]
+		if(!data.num || data.num <= numLimit(data).min ){
+			data.num = numLimit(data).min;
+		}
+		if(data.num >= numLimit(data).max){
+			data.num = numLimit(data).max;
+		}
+
+		uni.$u.debounce((event: any) => {
+			cartStore.increase({
+				id: data.id,
+				goods_id: data.goods_id,
+				sku_id: data.sku_id,
+				stock: data.goodsSku.stock,
+				sale_price: data.goodsSku.sale_price,
+				num: Number(data.num)
+			}, 0,cartCalculateFn());
+		}, 500)
+	},0)
+}
+
+const checkedNum = computed(() => {
+	let num = 0
+	cartList.value.forEach((item: any) => {
+		item.checked && (num += 1)
+	})
+	return num
+})
+
+const manjianOpenFn = (data:any) =>{
+	let obj = {};
+	obj.condition_type = data.condition_type;
+	obj.rule_json = data.rule_json;
+	obj.name = data.manjian_name;
+	manjianShowRef.value.open(obj);
+}
+
+let isLoadCalculate = false;
+const cartCalculateFn = () =>{
+	let calculateArr: Object = [];
+	cartList.value.forEach((item:any) => {
+	    if (item.checked && item.goodsSku) {
+			let obj = {};
+			obj.num = item.num;
+			obj.sku_id = item.sku_id;
+			calculateArr.push(obj);
+	    }
+	})
+	
+	if(!calculateArr.length){
+		total.value.order_money = 0
+		total.value.promotion_money = 0
+		return false;
+	}
+	
+	if(isLoadCalculate)return false;
+	isLoadCalculate = true;
+	
+	getCartCalculate({sku_ids: calculateArr}).then(({ data }) => {
+		total.value.goods_money = data.goods_money;
+		total.value.order_money = data.order_money;
+		total.value.promotion_money = data.promotion_money;
+		cartList.value.forEach((item,index)=>{
+			for(let subIndex = 0; subIndex < data.match_list.length; subIndex++){
+				if(item.goods_id == data.match_list[subIndex].goods_id && item.sku_id == data.match_list[subIndex].sku_id && item.manjian_info && Object.keys(item.manjian_info).length){
+					item.manjian_info.is_show = true;
+					let subTempShowNum = 0;
+					item.manjian_info.rule_json.forEach((threeItem, threeIndex)=>{
+						if(threeIndex == data.match_list[subIndex].level){
+							threeItem.is_show = true;
+							subTempShowNum++;
+						}else{
+							threeItem.is_show = false;
+						}
+					})
+					if(subTempShowNum == 0){
+						item.manjian_info.is_show = false;
+					}else{
+						item.manjian_info.is_show = true;
+					}
+					return;
+				}
+			}
+			if(item.manjian_info && Object.keys(item.manjian_info).length){
+				item.manjian_info.is_show = false;
+			}
+		})	
+		isLoadCalculate = false;
+	})
+}
+
+const toLogin = () => {
+	useLogin().setLoginBack({ url: '/addon/shop/pages/goods/cart' })
+}
+
+const toDetail = (data: any) => {
+    redirect({ url: '/addon/shop/pages/goods/detail', param: { goods_id: data.goods_id } })
+}
+
+const numChange = (event: any, index: any) => {
+	uni.$u.debounce((event: any) => {
+		const data: any = cartList.value[index]
+		cartStore.increase({
+			id: data.id,
+			goods_id: data.goods_id,
+			sku_id: data.sku_id,
+			stock: data.goodsSku.stock,
+			sale_price: data.goodsSku.sale_price,
+			num: data.num
+		}, 0, cartCalculateFn());
+	}, 500)
+}
+const addNumChange = (data: any) => {
+	if(data.num >= data.goods.stock){
+		uni.showToast({ title: "商品库存不足", icon: 'none' });
+		return ;
+	}
+	
+	if(data.goods.is_limit){
+		let tips = `该商品单次限购${data.goods.max_buy}件`;
+		if(data.goods.limit_type != 1){ //单次限购
+			tips = `该商品每人限购${data.goods.max_buy}件`;
+		}
+		if(data.num >= data.goods.max_buy){
+			uni.showToast({ title: tips, icon: 'none' })
+		}
+	}
+}
+
+const reduceNumChange = (data: any) => {
+	if(data.goods.is_limit && data.goods.min_buy){
+		let tips = `该商品起购${data.goods.min_buy}件`;	
+		if(data.num <= data.goods.min_buy){
+			uni.showToast({ title: tips, icon: 'none' })
+		}
+	}
+}
+
+const numLimit = (data: any) => {
+	let obj = {
+		min: 1,
+		max: data.goodsSku.stock || 1
+	};
+
+	// 限购 - 是否开启限购
+	if(data.goods.is_limit){
+		if(data.goods.max_buy){
+			let max_buy = 0;
+			max_buy = data.goods.max_buy;
+
+			if(max_buy > data.goods.stock){
+				obj.max = data.goods.stock
+			}else if(max_buy <= data.goods.stock){
+				obj.max = max_buy;
+			}
+		}
+	}
+
+	// 起售
+	if(data.goods.min_buy > 0){
+		obj.min = data.goods.min_buy;
+	}
+	return obj;
+}
+
+const cartOptions = ref([
+    {
+        text: t('delete'),
+        style: {
+            backgroundColor: 'var(--primary-color)', 
+			width: '100rpx',
+			height:'100%',
+			borderRadius: '10rpx'	   
+        }
+    }
+]);
+
+
+const swipeActive = ref()
+const swipeClick = (index:any,item:any) => {
+	if (optionLoading.value) return
+	optionLoading.value = true
+	cartStore.delete(item.id, () => {
+		cartList.value.splice(index, 1)
+		nextTick(()=>{if(swipeActive.value)swipeActive.value.closeOther() })
+		cartCalculateFn();
+		optionLoading.value = false
+	})
+}
+/**
+ * 选择单个商品
+ */
+const selectOnlyGoods = (data:any = {}) => {
+	data.checked = !data.checked
+	cartCalculateFn();
+}
+
+/**
+ * 全选
+ */
+const selectAll = () => {
+	const checked = cartList.value.length == checkedNum.value ? false : true
+	cartList.value.forEach((item: any) => {
+		item.checked = checked
+	})
+	cartCalculateFn();
+}
+
+ //强制绑定手机号
+const bindMobileRef: any = ref(null)
+const isBindMobile = ref(uni.getStorageSync('isbindmobile'))
+
+/**
+ * 结算
+ */
+const settlement = () => {
+
+    // #ifdef H5
+    if(uni.getStorageSync('isbindmobile')){
+        bindMobileRef.value.open()
+        return false
+    }
+    // #endif
+
+	if (!checkedNum.value) {
+		uni.showToast({ title: '还没有选择商品', icon: 'none' })
+		return
+	}
+	const ids: any = []
+	cartList.value.forEach((item: any) => {
+		if (item.checked) ids.push(item.id)
+	})
+
+	uni.setStorage({
+		key: 'orderCreateData',
+		data: {
+			cart_ids: ids
+		},
+		success() {
+			redirect({ url: '/addon/shop/pages/order/payment' })
+		}
+	})
+}
+
+/**
+ * 删除
+ */
+const deleteCartFn = () => {
+	if (!checkedNum.value) {
+		uni.showToast({ title: '还没有选择商品', icon: 'none' })
+		return
+	}
+	if (optionLoading.value) return
+	optionLoading.value = true
+
+	const ids: any = []
+	cartList.value.forEach((item: any) => {
+		if (item.checked) ids.push(item.id)
+	})
+
+	cartStore.delete(ids, () => {
+		getCartGoodsListFn()
+		optionLoading.value = false
+	})
+}
+/**
+ * 清空无效商品
+ */
+const deleteInvalidList = ()=>{
+	if (optionLoading.value) return
+	optionLoading.value = true
+	const ids = invalidList.value.map((el: any)=>el.id)
+
+	cartStore.delete(ids, () => {
+		getCartGoodsListFn()
+		optionLoading.value = false
+	})
+	invalidList.value = []
+}
+
+// 商品价格
+const goodsPrice = (data:any) => {
+    let price = "0.00";
+    if (data.goods.member_discount && getToken() && data.goodsSku.member_price != data.goodsSku.price) {
+        price = data.goodsSku.member_price ? data.goodsSku.member_price : data.goodsSku.price // 会员价
+    } else {
+        price = data.goodsSku.price
+    }
+    return price;
+}
+</script>
+<style lang="scss" scoped>
+@import '@/addon/shop/styles/common.scss';
+.remove-border {
+	&::after {
+		border: none;
+	}
+}
+:deep(uni-page) {
+	background: var(--page-bg-color);
+}
+
+uni-page-body {
+	height: 100%;
+}
+
+.text-color {
+	color: var(--primary-color);
+}
+
+.bg-color {
+	background-color: var(--primary-color);
+}
+
+:deep(.tab-bar-placeholder) {
+	display: none !important;
+}
+
+:deep(.u-tabbar__placeholder) {
+	display: none !important;
+}
+
+/*  #ifdef  H5  */
+.scroll-height {
+	height: calc(100vh - 100rpx - 50px - constant(safe-area-inset-bottom));
+	height: calc(100vh - 100rpx - 50px - env(safe-area-inset-bottom));
+}
+
+/*  #endif  */
+/*  #ifndef  H5  */
+.scroll-height {
+	height: calc(100vh - 200rpx - constant(safe-area-inset-bottom));
+	height: calc(100vh - 200rpx - env(safe-area-inset-bottom));
+}
+/*  #endif  */
+
+.text-ellipsis{
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+    overflow: hidden;
+}
+:deep(.u-swipe-action-item__right){
+	padding: 2rpx; 
+}
+:deep(.u-swipe-action-item__right__button__wrapper){
+    padding:0 10rpx !important;
+}
+:deep(.u-swipe-action-item__right__button__wrapper__text){
+    font-size:24rpx !important;
+}
+
+:deep(.u-tabbar .u-tabbar__content){
+	z-index: 99999 !important;
+}
+</style>
diff --git a/uni-app/src/addon/shop/pages/goods/category.vue b/uni-app/src/addon/shop/pages/goods/category.vue
new file mode 100644
index 00000000..a2cf00d1
--- /dev/null
+++ b/uni-app/src/addon/shop/pages/goods/category.vue
@@ -0,0 +1,133 @@
+<template>
+	<view :style="themeColor()">
+		<category-template-one-one class="category" v-if="config.level===1 && config.template === 'style-1'" :categoryId="categoryId" :config="config" />
+		<category-template-two-one v-if="config.level===2 && config.template === 'style-1'" :categoryId="categoryId" :config="config" />
+		<category-template-two-two class="category" v-if="config.level===2 && config.template === 'style-2'" :categoryId="categoryId" :config="config" />
+	</view>
+</template>
+<script setup lang="ts">
+import { onLoad, onShow } from '@dcloudio/uni-app'
+import { ref } from 'vue';
+import categoryTemplateTwoOne from '@/addon/shop/pages/goods/components/category-template-two-one.vue';
+import categoryTemplateOneOne from '@/addon/shop/pages/goods/components/category-template-one-one.vue';
+import categoryTemplateTwoTwo from '@/addon/shop/pages/goods/components/category-template-two-two.vue';
+import { getGoodsCategoryConfig } from '@/addon/shop/api/goods';
+import useCartStore from '@/addon/shop/stores/cart'
+
+const cartStore = useCartStore();
+const config: any = ref({})
+const categoryId = ref(0)
+
+const getGoodsCategoryConfigFn = () => {
+	getGoodsCategoryConfig().then(res => {
+		config.value = res.data
+        uni.setNavigationBarTitle({
+            title: config.value.page_title
+        });
+	})
+}
+
+onLoad((options:any) => {
+    categoryId.value = options.category_id || 0;
+    getGoodsCategoryConfigFn()
+});
+
+onShow(() => {
+	// 查询购物车列表
+	cartStore.getList();
+})
+
+</script>
+<style>
+
+/*  #ifdef  H5  */
+:deep(.category .detail .mescroll-body) {
+	padding-bottom: calc(50px  + constant(safe-area-inset-bottom)) !important;
+	padding-bottom: calc(50px  + env(safe-area-inset-bottom)) !important;
+}
+
+:deep(.category .cart .mescroll-body){
+	padding-bottom: calc(100rpx + 50px  + constant(safe-area-inset-bottom)) !important;
+	padding-bottom: calc(100rpx + 50px  + env(safe-area-inset-bottom)) !important;
+}
+/*  #endif  */
+/*  #ifndef  H5  */
+ .category .detail .mescroll-body {
+	padding-bottom: calc(100rpx + constant(safe-area-inset-bottom)) !important;
+	padding-bottom: calc(100rpx + env(safe-area-inset-bottom)) !important;
+}
+
+.category .cart .mescroll-body {
+	padding-bottom: calc(200rpx + constant(safe-area-inset-bottom)) !important;
+	padding-bottom: calc(200rpx + env(safe-area-inset-bottom)) !important;
+}
+/*
+.category .labelPopup :deep(.u-fade-enter-active) {
+	top: 92rpx !important;
+	left: 166rpx !important;
+	z-index: 8 !important;
+	
+	
+}
+.category .labelPopup :deep(.u-slide-down-enter-active){
+	top: 92rpx !important;
+	left: 165rpx !important;
+	z-index: 8 !important;
+}
+.category .labelPopup.active :deep(.u-fade-enter-active) {
+	top: 190rpx !important;
+	
+}
+.category .labelPopup.active :deep(.u-slide-down-enter-active){
+	top: 190rpx !important;
+}
+.category .labelPopup :deep(.u-fade-enter-to){
+	top: 92rpx !important;
+	left: 166rpx !important;
+	z-index: 8 !important;
+}
+.category .labelPopup :deep(.u-slide-down-leave-to){
+	top: 92rpx !important;
+	left: 165rpx !important;
+	z-index: 8 !important;
+} */
+.category .labelPopup :deep(.u-transition) {
+	top: 96rpx !important;
+	left: 170rpx !important;
+	z-index: 8 !important;
+	&:nth-child(2){
+		left: 168rpx !important;
+	}
+}
+.category .labelPopup.active :deep(.u-transition) {
+	top: 190rpx !important;
+}
+/*  #endif  */
+
+</style>
+<style lang="scss" scoped>
+:deep(.mescroll-upwarp) {
+	box-sizing: border-box;
+	padding-left: 182rpx;
+}
+
+:deep(.tab-bar-placeholder) {
+	display: none !important;
+}
+
+:deep(.u-tabbar__placeholder) {
+	display: none !important;
+}
+button::after{
+	border: 0 !important;
+}
+
+:deep(.part .mescroll-empty){
+	width: 542rpx;
+	height: 542rpx;
+	margin-top: 0;
+	margin-left: 0;
+	margin-right: 0;
+	padding-top: 50rpx;
+}
+</style>
diff --git a/uni-app/src/addon/shop/pages/goods/collect.vue b/uni-app/src/addon/shop/pages/goods/collect.vue
new file mode 100644
index 00000000..6fd44a24
--- /dev/null
+++ b/uni-app/src/addon/shop/pages/goods/collect.vue
@@ -0,0 +1,199 @@
+<template>
+    <view :style="themeColor()">
+        <view class="bg-page min-h-screen overflow-hidden ">
+            <mescroll-body ref="mescrollRef" top="0"  @init="mescrollInit" :down="{ use: false }" @up="getCollectListFn">
+                <view class="py-[var(--top-m)] sidebar-margin" v-if="goodsList.length">
+                    <view class="bg-[#fff] pb-[10rpx] box-border rounded-[var(--rounded-big)]" >
+                        <view class="flex mx-[var(--rounded-big)] pt-[var(--pad-top-m)] justify-between items-center box-border font-400 text-[24rpx] mb-[24rpx] leading-[30rpx]">
+                            <view class="flex items-baseline text-[24rpx] text-[#333]">
+                                <text>共</text>
+                                <text class="text-[32rpx] mx-[2rpx] text-[var(--price-text-color)]">{{ goodsList.length }}</text>
+                                <text>件商品</text>
+                            </view>
+                            <text @click="isEdit = !isEdit" class="text-[var(--text-color-light6)] text-[24rpx]">{{ isEdit ? '完成' : '管理' }}</text>
+                        </view>
+                        <u-swipe-action ref="swipeActive">
+                            <block v-for="(item, index) in goodsList" :key="index">
+                                <view class="py-[20rpx] overflow-hidden w-full">
+                                    <u-swipe-action-item :options="cartOptions" @click="swipeClick(item)">
+                                        <view class="flex px-[var(--pad-sidebar-m)]">
+                                            <view class="self-center w-[58rpx] h-[60rpx] flex items-center" v-if="isEdit" @click.stop="item.checked = !item.checked">
+                                                <text class=" iconfont text-primary text-[34rpx] w-[34rpx] h-[34rpx] rounded-[17rpx] overflow-hidden shrink-0"
+                                                    :class="{ 'iconxuanze1':item.checked,'bg-[#F5F5F5]':!item.checked}">
+                                                </text>
+                                            </view>
+                                            <view  class="flex flex-1" @click="toDetail(item)">
+                                                <view class="relative w-[200rpx] h-[200rpx] flex items-center justify-center rounded-[var(--goods-rounded-big)] overflow-hidden">
+                                                    <u--image radius="var(--goods-rounded-big)" width="200rpx" height="200rpx" :src="img(item.goods_cover_thumb_mid||'')" model="aspectFill">
+                                                        <template #error>
+                                                            <image class="w-[200rpx] h-[200rpx] rounded-[var(--goods-rounded-big)] overflow-hidden" :src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill"></image>
+                                                        </template>
+                                                    </u--image>
+                                                    <view v-if="item.status == 0 " class="absolute left-0 top-0 w-[200rpx] h-[200rpx]  leading-[200rpx] text-center " style="background-color: rgba(0,0,0,0.3);">
+                                                        <text class="text-[#fff] text-[28rpx]">已失效</text>
+                                                    </view>
+                                                </view>
+                                                <view class="flex flex-1 flex-wrap ml-[20rpx]">
+                                                    <view class="w-[100%] flex flex-col items-baseline">
+                                                        <view class="text-[#333] text-[28rpx] max-h-[80rpx] leading-[40rpx] multi-hidden font-400">
+                                                            {{ item.goods_name }}
+                                                        </view>
+                                                        <view class="box-border max-w-[376rpx] mt-[10rpx] px-[14rpx] h-[36rpx] leading-[36rpx] truncate text-[var(--text-color-light6)] bg-[#F5F5F5] text-[22rpx] rounded-[20rpx]" v-if="item.sku_name">
+                                                            {{ item.sku_name }}
+                                                        </view>
+                                                    </view>
+                                                    <view class="flex justify-between items-end self-end mt-[10rpx] w-[100%]">
+                                                        <view class="text-[var(--price-text-color)] price-font truncate max-w-[200rpx]">
+                                                            <text class="text-[24rpx] font-500">￥</text>
+                                                            <text class="text-[40rpx] font-500">{{ parseFloat(item.price).toFixed(2).split('.')[0] }}</text>
+                                                            <text class="text-[24rpx] font-500">.{{ parseFloat(item.price).toFixed(2).split('.')[1] }}</text>
+                                                        </view>
+                                                    </view>
+                                                </view>
+                                            </view>
+                                        </view>
+                                    </u-swipe-action-item>
+                                </view>
+                            </block>
+                        </u-swipe-action>
+                    </view>
+                </view>
+                <mescroll-empty v-if="!goodsList.length && loading" :option="{tip : '暂无收藏的商品'}"></mescroll-empty>
+            </mescroll-body>
+            <view v-if="goodsList.length && isEdit" class="flex h-[96rpx] items-center bg-[#fff] fixed left-0 right-0 bottom-0 pl-[30rpx] pr-[20rpx] box-solid mb-ios justify-between">
+                <view class="flex items-center" @click="selectAll">
+                    <text class="self-center iconfont text-primary text-[34rpx] mr-[10rpx] w-[34rpx] h-[34rpx] rounded-[17rpx] overflow-hidden flex-shrink-0" :class="{'iconxuanze1': goodsList.length == checkedNum, 'bg-color': goodsList.length != checkedNum }"></text>
+                    <text class="font-400 text-[#303133] text-[26rpx]">全选</text>
+                </view>
+                <button class="w-[180rpx] h-[70rpx] font-500 text-[26rpx] leading-[70rpx] !text-[#fff] m-0 rounded-full primary-btn-bg remove-border" @click="deleteCollectFn">取消收藏</button>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script setup lang="ts">
+import { ref, computed,} from 'vue'
+import {t} from "@/locale";
+import { img, redirect } from '@/utils/common'
+import { getCollectList, cancelCollect } from '@/addon/shop/api/goods';
+import MescrollBody from '@/components/mescroll/mescroll-body/mescroll-body.vue';
+import MescrollEmpty from '@/components/mescroll/mescroll-empty/mescroll-empty.vue';
+import useMescroll from '@/components/mescroll/hooks/useMescroll.js';
+import { onPageScroll, onReachBottom } from '@dcloudio/uni-app';
+
+const { mescrollInit, downCallback, getMescroll } = useMescroll(onPageScroll, onReachBottom);
+
+const loading = ref<boolean>(false);
+const optionLoading = ref(false)
+const goodsList = ref<Array<any>>([]);
+const isEdit = ref(false)
+
+interface mescrollStructure {
+	num: number,
+	size: number,
+	endSuccess: Function,
+	[propName: string]: any
+}
+
+const getCollectListFn = (mescroll: mescrollStructure) => {
+	loading.value = false
+    let data: object = {
+		page: mescroll.num,
+		limit: mescroll.size
+	};
+	getCollectList(data).then((res: any) => {
+		let newArr = (res.data.data as Array<Object>);
+		//设置列表数据
+		if (Number(mescroll.num) === 1) {
+			goodsList.value = []; //如果是第一页需手动制空列表
+		}
+        newArr = newArr.map((item: any) =>{
+            item.checked = false
+            return item
+        })
+		goodsList.value = goodsList.value.concat(newArr);
+		mescroll.endSuccess(newArr.length);
+		loading.value = true;
+	}).catch(() => {
+		loading.value = true;
+		mescroll.endErr(); // 请求失败, 结束加载
+	})
+}
+
+const cartOptions = ref([
+    {
+        text: t('delete'),
+        style: {
+            backgroundColor: '#EF000C',
+			width: '100rpx',
+			height:'100%',
+			borderRadius: '10rpx'
+        }
+    }
+]);
+
+// 取消单个收藏
+const swipeClick = (data: any) => {
+    if (optionLoading.value) return
+	optionLoading.value = true
+    cancelCollect({goods_ids: [data.goods_id]}).then((res: any) => {
+        optionLoading.value = false
+        getMescroll().resetUpScroll();
+    })
+}
+
+//取消全部收藏
+const  deleteCollectFn = () => {
+    if (!checkedNum.value) {
+		uni.showToast({ title: '请先选择收藏的商品', icon: 'none' })
+		return
+	}
+    if (optionLoading.value) return
+	optionLoading.value = true
+    const ids: any = []
+	goodsList.value.forEach((item: any) => {
+		if (item.checked) ids.push(item.goods_id)
+	})
+    cancelCollect({goods_ids: ids}).then((res: any) => {
+        optionLoading.value = false
+        getMescroll().resetUpScroll();
+    })
+}
+
+// 选中数量
+const checkedNum = computed(() => {
+	let num = 0
+	goodsList.value.forEach((item: any) => {
+		item.checked && (num += 1)
+	})
+	return num
+})
+
+/**
+ * 全选
+ */
+ const selectAll = () => {
+	const checked = goodsList.value.length == checkedNum.value ? false : true
+	goodsList.value.forEach((item: any) => {
+		item.checked = checked
+	})
+}
+const toDetail = (data: any) => {
+    redirect({ url: '/addon/shop/pages/goods/detail', param: { goods_id: data.goods_id } })
+}
+</script>
+
+<style lang="scss" scoped>
+.bg-color{
+	background-color: #f5f5f5;
+}
+:deep(.u-swipe-action-item__right){
+	padding: 2rpx;
+}
+:deep(.u-swipe-action-item__right__button__wrapper){
+    padding:0 10rpx !important;
+}
+:deep(.u-swipe-action-item__right__button__wrapper__text){
+    font-size:24rpx !important;
+}
+</style>
diff --git a/uni-app/src/addon/shop/pages/goods/components/add-cart-popup.vue b/uni-app/src/addon/shop/pages/goods/components/add-cart-popup.vue
new file mode 100644
index 00000000..319ffbd2
--- /dev/null
+++ b/uni-app/src/addon/shop/pages/goods/components/add-cart-popup.vue
@@ -0,0 +1,374 @@
+<template>
+	<view @touchmove.prevent.stop>
+		<u-popup :show="goodsSkuPop" @close="closeFn" mode="bottom">
+			<view v-if="Object.keys(goodsDetail).length"  @touchmove.prevent.stop class="rounded-t-[20rpx] overflow-hidden bg-[#fff] py-[32rpx] relative">
+				<view class="flex px-[32rpx] mb-[58rpx]">
+					<u--image width="180rpx" height="180rpx" :radius="'var(--goods-rounded-big)'" :src="img(detail.sku_image)" model="aspectFill">
+						<template #error>
+							<image class="w-[180rpx] h-[180rpx] rounded-[var(--goods-rounded-big)] overflow-hidden" :src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill"></image>
+						</template>
+					</u--image>
+
+					<view class="flex flex-1 flex-col justify-between ml-[20rpx] py-[10rpx]">
+						<view class="w-[100%]">
+							<view class=" text-[var(--price-text-color)]  flex items-baseline">
+								<text class="text-[32rpx] font-bold price-font mr-[4rpx]">￥</text>
+								<text class="text-[48rpx] price-font">{{ parseFloat(goodsPrice(detail)).toFixed(2).split('.')[0] }}</text>
+								<text class="text-[32rpx] price-font">.{{ parseFloat(goodsPrice(detail)).toFixed(2).split('.')[1] }}</text>
+								<image class="h-[24rpx] ml-[6rpx] max-w-[44rpx]" v-if="priceType(detail) == 'member_price'" :src="img('addon/shop/VIP.png')" mode="heightFix" />
+							</view>
+							<view class="text-[26rpx] leading-[32rpx] text-[#303133] mt-[12rpx]">库存{{ detail.stock }}{{ goodsDetail.goods.unit }}</view>
+						</view>
+						<view class="w-[100%] text-[26rpx] leading-[30rpx] text-[var(--text-color-light6)] multi-hidden max-h-[60rpx]" v-if="goodsDetail.goodsSpec && goodsDetail.goodsSpec.length">已选规格：{{ detail.sku_spec_format }}</view>
+					</view>
+				</view>
+				<scroll-view class="h-[500rpx] box-border px-[32rpx] mb-[30rpx]" scroll-y="true">
+					<view :class="{'mt-[36rpx]': 0 != index }" v-for="(item, index) in goodsDetail.goodsSpec" :key="index">
+						<view class="text-[26rpx] leading-[36rpx] mb-[24rpx]">{{ item.spec_name }}</view>
+						<view class="flex flex-wrap">
+							<view
+								class="box-border bg-[#f2f2f2] text-[24rpx] px-[44rpx] text-center h-[56rpx] leading-[52rpx] mr-[20rpx] mb-[20rpx] border-1 border-solid rounded-[50rpx] border-[#f2f2f2]"
+								:class="{'!border-[var(--primary-color)] text-[var(--primary-color)] !bg-[var(--primary-color-light)]': subItem.selected}"
+								v-for="(subItem, subIndex) in item.values" :key="subIndex" @click="change(subItem, index)">
+								{{ subItem.name }}
+							</view>
+						</view>
+					</view>
+					<view class="flex justify-between items-center mt-[8rpx]">
+						<view class="text-[26rpx]">购买数量</view>
+						<text v-if="maxBuyShow > 0 && minBuyShow > 1" class="ml-[20rpx] mr-[auto] text-[24rpx] text-[var(--primary-color)]">
+							({{ minBuyShow }}{{ goodsDetail.goods.unit }}起售，限购{{ maxBuyShow }}{{ goodsDetail.goods.unit }})
+						</text>
+						<text v-else-if="maxBuyShow > 0" class="ml-[20rpx] mr-[auto] text-[24rpx] text-[var(--primary-color)]">(限购{{ maxBuyShow }}{{ goodsDetail.goods.unit }})</text>
+						<text v-else-if="minBuyShow > 1" class="ml-[20rpx] mr-[auto] text-[24rpx] text-[var(--primary-color)]">({{ minBuyShow }}{{ goodsDetail.goods.unit }}起售)</text>
+						<u-number-box
+							v-if="cartList['goods_' + detail.goods_id] && cartList['goods_' + detail.goods_id]['sku_' + detail.sku_id]"
+							v-model="buyNum" :min="minBuy" :max="maxBuy" integer :step="1" input-width="98rpx"
+							input-height="54rpx">
+							<template #minus>
+								<view class="relative w-[34rpx] h-[34rpx]" @click="reduceNumChange()">
+									<text class="text-[34rpx] nc-iconfont nc-icon-jianV6xx font-500 absolute flex items-center justify-center -left-[8rpx] -bottom-[8rpx] -right-[8rpx] -top-[8rpx]" :class="{ '!text-[var(--text-color-light9)]': buyNum <= minBuy }"></text>
+								</view>
+							</template>
+							<template #input>
+								<input class="text-[#303133] text-[28rpx] mx-[10rpx] w-[80rpx] h-[44rpx] bg-[var(--temp-bg)] leading-[44rpx] text-center rounded-[6rpx]" type="number" @input="goodsSkuInputFn" @blur="goodsSkuBlurFn" v-model="buyNum"  />
+							</template>
+							<template #plus>
+								<view class="relative w-[34rpx] h-[34rpx]" @click="addNumChange()">
+									<text class="text-[34rpx] nc-iconfont nc-icon-jiahaoV6xx font-500 absolute flex items-center justify-center -left-[8rpx] -bottom-[8rpx] -right-[8rpx] -top-[8rpx]" :class="{ '!text-[var(--text-color-light9)]': buyNum >= maxBuy }"></text>
+								</view>
+							</template>
+						</u-number-box>
+						<u-number-box v-else v-model="buyNum" :min="minBuy" :max="maxBuy" integer :step="1" input-width="98rpx" input-height="54rpx">
+							<template #minus>
+								<view class="relative w-[34rpx] h-[34rpx]" @click="reduceNumChange()">
+									<text class="text-[34rpx] nc-iconfont nc-icon-jianV6xx font-500 absolute flex items-center justify-center -left-[8rpx] -bottom-[8rpx] -right-[8rpx] -top-[8rpx]" :class="{ '!text-[var(--text-color-light9)]': buyNum <= minBuy }"></text>
+								</view>
+							</template>
+							<template #input>
+								<input class="text-[#303133] text-[28rpx] mx-[10rpx] w-[80rpx] h-[44rpx] bg-[var(--temp-bg)] leading-[44rpx] text-center rounded-[6rpx]" type="number" @input="goodsSkuInputFn" @blur="goodsSkuBlurFn" v-model="buyNum"  />
+							</template>
+							<template #plus>
+								<view class="relative w-[34rpx] h-[34rpx]" @click="addNumChange()">
+									<text class="text-[34rpx] nc-iconfont nc-icon-jiahaoV6xx font-500 absolute flex items-center justify-center -left-[8rpx] -bottom-[8rpx] -right-[8rpx] -top-[8rpx]" :class="{ '!text-[var(--text-color-light9)]': buyNum >= maxBuy }"></text>
+								</view>
+							</template>
+						</u-number-box>
+					</view>
+				</scroll-view>
+				<view class="px-[20rpx]">
+					<button v-if="detail.stock > 0" class="!h-[80rpx] font-500 primary-btn-bg leading-[80rpx] text-[26rpx] rounded-[50rpx]" type="primary" @click="save">确定</button>
+					<button v-else class="!h-[80rpx] leading-[80rpx] font-500 text-[26rpx] text-[#fff] bg-[#ccc] rounded-[50rpx]">已售罄</button>
+				</view>
+			</view>
+		</u-popup>
+	</view>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive, computed, watch, toRaw } from 'vue';
+import { img, getToken } from '@/utils/common';
+import { getGoodsSku } from '@/addon/shop/api/goods';
+import useCartStore from '@/addon/shop/stores/cart'
+import { cloneDeep } from 'lodash-es'
+
+const cartStore = useCartStore();
+const cartList = computed(() => cartStore.cartList)
+
+const goodsSkuPop = ref(false);
+const currSpec: any = ref({
+	skuId: "",
+	name: []
+})
+const info: any = ref({})//获取原始数据
+const detail:any = ref({})//展示数据
+const buyNum = ref(1)
+
+const maxBuy = ref(0); // 限购
+const minBuy = ref(0); // 起售
+const maxBuyShow = ref(0); // 限购，只展示
+const minBuyShow = ref(0); // 起售，只展示
+
+const getGoodsSkuFn = (sku_id: any) => {
+	getGoodsSku(sku_id).then((res: any) => {
+		info.value = res.data
+		// 当前详情内容
+		currSpec.value.sku_id = sku_id
+		if (info.value.skuList && Object.keys(info.value.skuList).length) {
+			info.value.skuList.forEach((item: any) => {
+				if (item.sku_id == sku_id) {
+					detail.value = item;
+					currSpec.value.name = item.sku_spec_format.split(",");
+				}
+			})
+		}
+		goodsSkuPop.value = true;
+
+	})
+}
+
+const goodsSkuInputFn = ()=>{
+	setTimeout(() => {
+		if(!buyNum.value || buyNum.value <= minBuy.value ){
+			buyNum.value = minBuy.value || 1;
+		}
+		if(buyNum.value >= maxBuy.value){
+			buyNum.value = maxBuy.value;
+		}
+		// 起售大于库存，初始值也应该是零
+		if(minBuy.value > buyNum.value){
+			buyNum.value = 0;
+		}
+	},0)
+}
+const goodsSkuBlurFn = ()=>{
+	setTimeout(() => {
+		if(!buyNum.value || buyNum.value <= minBuy.value ){
+			buyNum.value = minBuy.value || 1;
+		}
+		if(buyNum.value >= maxBuy.value){
+			buyNum.value = maxBuy.value;
+		}
+
+		// 起售大于库存，初始值也应该是零
+		if(minBuy.value > buyNum.value){
+			buyNum.value = 0;
+			uni.showToast({
+			    title: '库存数量小于起购数量',
+			    icon: 'none'
+			});
+		}
+	},0)
+}
+
+const open = (sku_id: any) => {
+	getGoodsSkuFn(sku_id)
+}
+
+const closeFn = () => {
+	goodsSkuPop.value = false
+}
+
+const goodsDetail = computed(() => {
+	let data = cloneDeep(info.value);
+
+	// 重组数据结构
+	if (Object.keys(data).length) {
+
+		if (!Object.keys(currSpec.value.name).length) currSpec.value.name = data.sku_spec_format.split(",");
+
+		data.goodsSpec.forEach((item: any, index: any) => {
+			let specName = item.spec_values.split(",");
+			item.values = [];
+			specName.forEach((specItem: any, specIndex: any) => {
+				item.values[specIndex] = {};
+				item.values[specIndex].name = specItem;
+				item.values[specIndex].selected = false;
+				item.values[specIndex].disabled = false;
+
+				// 选中规格
+				currSpec.value.name.forEach((currSpecItem: any, currSpecIndex: any) => {
+					if (currSpecIndex == index && currSpecItem == specItem) {
+						item.values[specIndex].selected = true;
+					}
+				})
+			})
+		})
+		getSkuId();
+
+		// 当前详情内容
+		if (data.skuList && Object.keys(data.skuList).length) {
+			data.skuList.forEach((item: any) => {
+				if (item.sku_id == currSpec.value.skuId) {
+					detail.value = item;
+				}
+			})
+		}
+	}
+	/************************** 限购-start **************************/
+	maxBuy.value = detail.value.stock
+	// 限购 - 是否开启限购
+	if(data.goods.is_limit){
+		if(data.goods && data.goods.max_buy){
+			let max_buy = 0;
+			if(data.goods.limit_type == 1){ //单次限购
+				max_buy = data.goods.max_buy;
+			}else{ // 单人限购
+				let buyVal = data.goods.max_buy - (data.has_buy||0);
+				max_buy = buyVal > 0 ? buyVal : 0;
+			}
+
+			if(max_buy > detail.value.stock){
+				maxBuy.value = detail.value.stock
+			}else if(max_buy <= detail.value.stock){
+				maxBuy.value = max_buy;
+			}
+		}
+		// 仅用于展示
+		maxBuyShow.value = data.goods.max_buy; // 限购
+		// 限购开启且最大购买变为零时，初始值也应该是零
+		if(maxBuy.value == 0){
+			buyNum.value = 0;
+		}
+	}
+	// 起售
+	minBuy.value = data.goods.min_buy;
+	buyNum.value = minBuy.value > 0 ? data.goods.min_buy : 1;
+	// 仅用于展示
+	minBuyShow.value = data.goods.min_buy;
+	// 起售大于库存，初始值也应该是零
+	if(minBuy.value > detail.value.stock){
+		buyNum.value = 0;
+	}
+	/************************** 限购-end **************************/
+	return data;
+})
+
+watch(
+	() => detail.value,
+	(newValue, oldValue) => {
+		if (cartList.value['goods_' + detail.value.goods_id] && cartList.value['goods_' + detail.value.goods_id]['sku_' + detail.value.sku_id]) {
+			buyNum.value = toRaw(cartList.value['goods_' + detail.value.goods_id]['sku_' + detail.value.sku_id].num);
+			detail.value.cart_id = toRaw(cartList.value['goods_' + detail.value.goods_id]['sku_' + detail.value.sku_id].id)
+		} else {
+			// 起售大于库存，初始值也应该是零
+			let num = 1;
+			if(minBuy.value > 0){ num = minBuy.value; }
+			if(minBuy.value > detail.value.stock){ num = 0; }
+			buyNum.value = num;
+			detail.value.cart_id = '';
+		}
+
+	}
+)
+const change = (data: any, index: any) => {
+	currSpec.value.name[index] = data.name;
+}
+
+const getSkuId = () => {
+	info.value.skuList.forEach((skuItem: any, skuIndex: any) => {
+		let sku_spec_format = skuItem.sku_spec_format.split(',')
+		if (currSpec.value.name.every((v: any) => sku_spec_format.includes(v))) {
+			currSpec.value.skuId = skuItem.sku_id
+		}
+	})
+}
+
+const addNumChange = () => {
+	if(minBuy.value && minBuy.value > detail.value.stock){
+		uni.showToast({ title: '商品库存小于起购数量', icon: 'none' })
+		return;
+	}
+	if(goodsDetail.value.goods.is_limit){
+		let tips = `该商品单次限购${goodsDetail.value.goods.max_buy}件`;
+		if(goodsDetail.value.goods.limit_type != 1){ //单次限购
+			tips = `该商品每人限购${goodsDetail.value.goods.max_buy}件`;
+		}
+		if(buyNum.value >= goodsDetail.value.goods.max_buy){
+			uni.showToast({ title: tips, icon: 'none' })
+		}
+	}
+}
+
+const reduceNumChange = () => {
+	if(goodsDetail.value.goods.is_limit && minBuy.value){
+		let tips = `该商品起购${minBuy.value}件`;
+		if(buyNum.value <= minBuy.value){
+			uni.showToast({ title: tips, icon: 'none' })
+		}
+	}
+}
+
+const save = () => {
+    //删除商品
+    if (buyNum.value == 0) {
+        // 购物车减少数量
+        cartStore.reduce({
+            id: detail.value.cart_id || '',
+            goods_id: detail.value.goods_id,
+            sale_price: detail.value.sale_price,
+            sku_id: detail.value.sku_id
+        });
+    } else {
+
+        let price = 0
+
+         if (goodsDetail.value.goods.member_discount && getToken() && detail.value.member_price != detail.value.price) {
+            price = detail.value.member_price ? detail.value.member_price : detail.value.price // 会员价
+        } else {
+            price = detail.value.price
+        }
+
+        // 购物车添加数量
+        cartStore.increase({
+            id: detail.value.cart_id || '',
+            goods_id: detail.value.goods_id,
+            sku_id: detail.value.sku_id,
+            stock: detail.value.stock,
+            sale_price: price,
+            num: buyNum.value
+
+        }, 0, () => {
+            uni.showToast({
+                title: '加入购物车成功',
+                icon: 'none'
+            });
+        });
+    }
+    goodsSkuPop.value = false
+
+}
+
+// 商品价格
+const goodsPrice = (data:any) => {
+    let price = "0.00";
+    if (goodsDetail.value.goods.member_discount && getToken() && data.member_price != data.price) {
+        price = data.member_price ? data.member_price : data.price // 会员价
+    } else {
+        price = data.price
+    }
+    return price;
+}
+
+// 价格类型
+const priceType = (data:any) => {
+    let type = "";
+    if (goodsDetail.value.goods.member_discount && getToken() && data.member_price != data.price) {
+        type = 'member_price' // 会员价
+    } else {
+        type = ""
+    }
+    return type;
+}
+
+defineExpose({
+	open
+})
+</script>
+
+<style lang="scss" scoped>
+	::v-deep .u-number-box .u-number-box__slot{
+		display: flex;
+		align-items: center;
+	}
+</style>
diff --git a/uni-app/src/addon/shop/pages/goods/components/category-template-one-one.vue b/uni-app/src/addon/shop/pages/goods/components/category-template-one-one.vue
new file mode 100644
index 00000000..daf2d265
--- /dev/null
+++ b/uni-app/src/addon/shop/pages/goods/components/category-template-one-one.vue
@@ -0,0 +1,790 @@
+<template>
+	<view class="min-h-screen bg-[var(--page-bg-color)] overflow-hidden">
+		<view class="mescroll-box bg-[var(--page-bg-color)]" :class="{ 'cart': config.cart.control && config.cart.event === 'cart', 'detail': !(config.cart.control && config.cart.event === 'cart') }" v-if="tabsData.length">
+			<mescroll-body ref="mescrollRef" :down="{ use: false }" @init="mescrollInit" @up="getListFn">
+				<view v-if="config.search.control" class="search-box z-10 bg-[#fff] fixed top-0 left-0 right-0 h-[100rpx] box-border">
+					<view class="flex-1 search-input">
+						<text @click.stop="searchNameFn" class="nc-iconfont nc-icon-sousuo-duanV6xx1 btn"></text>
+						<input class="input" type="text" v-model.trim="searchName" :placeholder="config.search.title" @confirm="searchNameFn" placeholderClass="text-[var(--text-color-light9)]">
+						<text v-if="searchName" class="nc-iconfont nc-icon-cuohaoV6xx1 clear" @click="searchName=''"></text>
+					</view>
+				</view>
+				<!--  #ifdef  H5 -->
+				<view class="tabs-box z-2 fixed left-0 bg-[#fff] bottom-[50px] top-0" :class="{ '!top-[100rpx]': config.search.control, 'pb-[98rpx]': config.cart.control && config.cart.event === 'cart' }">
+					<scroll-view :scroll-y="true" class="scroll-height">
+						<view class="bg-[var(--temp-bg)]">
+							<view class="tab-item" :class="{ 'tab-item-active': index == tabActive,'rounded-br-[12rpx]':tabActive-1===index,'rounded-tr-[12rpx]':tabActive+1===index}" v-for="(item, index) in tabsData" :key="index" @click="firstLevelClick(index, item)">
+								<view class="text-box text-left leading-[1.3] break-words px-[16rpx]">
+									{{ item.category_name }}
+								</view>
+							</view>
+						</view>
+					</scroll-view>
+				</view>
+				<!--  #endif -->
+				<!--  #ifndef  H5 -->
+				<view class="tabs-box z-2 fixed left-0 bg-[#fff] pb-ios bottom-[100rpx] top-0" :class="{ 'top-[126rpx]': config.search.control, '!bottom-[198rpx]': config.cart.control && config.cart.event === 'cart' }">
+					<scroll-view :scroll-y="true" class="scroll-height">
+						<view class="bg-[var(--temp-bg)]">
+							<view class="tab-item" :class="{ 'tab-item-active': index == tabActive,'rounded-br-[12rpx]':tabActive-1===index,'rounded-tr-[12rpx]':tabActive+1===index}" v-for="(item, index) in tabsData" :key="index" @click="firstLevelClick(index, item)">
+								<view class="text-box text-left leading-[1.3] break-words px-[16rpx]">
+									{{ item.category_name }}
+								</view>
+							</view>
+						</view>
+					</scroll-view>
+				</view>
+				<!--  #endif -->
+				<view class="flex justify-center flex-wrap pl-[188rpx] pb-[20rpx]" :class="{ ' pt-[120rpx]': config.search.control, ' pt-[20rpx]': !(config.search.control) }">
+					<template v-for="(item, index) in list" :key="item.goods_id">
+						<view
+							class="box-border bg-white w-full flex mr-[20rpx] py-[24rpx] px-[20rpx] rounded-[var(--rounded-small)]"
+							:class="{ 'mt-[16rpx]': index }" @click.stop="toLink(item.goods_id)">
+							<view class="w-[168rpx] h-[168rpx] flex items-center justify-center rounded-[var(--goods-rounded-small)] overflow-hidden">
+								<u--image width="168rpx" height="168rpx" radius="var(--goods-rounded-small)" :src="img( item.goods_cover_thumb_mid || '')" model="aspectFill">
+									<template #error>
+										<image class="w-[168rpx] h-[168rpx]" :src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill"></image>
+									</template>
+								</u--image>
+							</view>
+							<view class="flex flex-1 ml-[20rpx] flex-wrap flex-col">
+								<view class="max-h-[80rpx] text-[26rpx] leading-[40rpx] multi-hidden">
+									{{ item.goods_name }}</view>
+								<view class="flex-1 flex items-end justify-between">
+									<view class="text-[var(--price-text-color)] price-font -mb-[8rpx]">
+										<text class="text-[24rpx] font-500">￥</text>
+										<text class="text-[40rpx] font-500">{{ parseFloat(goodsPrice(item)).toFixed(2).split('.')[0] }}</text>
+										<text class="text-[24rpx] font-500">.{{ parseFloat(goodsPrice(item)).toFixed(2).split('.')[1] }}</text>
+										<image class="h-[24rpx] max-w-[46rpx] ml-[6rpx]" v-if="priceType(item) == 'member_price'" :src="img('addon/shop/VIP.png')" mode="heightFix" />
+									</view>
+									<block v-if="!item.isMaxBuy">
+										<view v-if="
+											(item.goods_type == 'real' || (item.goods_type == 'virtual' && item.virtual_receive_type != 'verify')) &&
+											item.goodsSku.sku_spec_format === '' && cartList['goods_' + item.goods_id] && cartList['goods_' + item.goods_id]['sku_' + item.goodsSku.sku_id] && config.cart.control && config.cart.event === 'cart'"
+											class="flex items-center">
+											<view class="relative w-[32rpx] h-[32rpx]">
+												<text class="text-[32rpx] text-color nc-iconfont nc-icon-jianshaoV6xx absolute flex items-center justify-center -left-[14rpx] -bottom-[14rpx] -right-[14rpx] -top-[14rpx]"
+													@click.stop="reduceCart(item, cartList['goods_' + item.goods_id]['sku_' + item.goodsSku.sku_id])"></text>
+											</view>
+											<text class="text-[#333] text-[24rpx] mx-[16rpx]">{{ cartList['goods_' + item.goods_id]['sku_' + item.goodsSku.sku_id].num }}</text>
+											<view class="relative w-[32rpx] h-[32rpx]">
+												<text class="text-[32rpx] text-color iconfont iconjiahao2fill absolute flex items-center justify-center -left-[14rpx] -bottom-[14rpx] -right-[14rpx] -top-[14rpx]"
+													:id="'itemCart' + index"
+													@click.stop="addCartBtn(item,cartList['goods_' + item.goods_id]['sku_' + item.goodsSku.sku_id],'itemCart' + index)"></text>
+											</view>
+										</view>
+										<template v-else-if="(item.goods_type == 'virtual' && config.cart.event !== 'cart') || item.goods_type == 'real'">
+											<view v-if="config.cart.control && config.cart.style === 'style-1'" class="h-[44rpx] relative">
+												<view :id="'itemCart' + index" class="w-[102rpx] box-border text-center text-[#fff] primary-btn-bg h-[46rpx] text-[22rpx] leading-[46rpx] rounded-[100rpx]" @click.stop="itemCart(item, 'itemCart' + index)">
+													{{ config.cart.text }}
+												</view>
+												<view
+													v-if="cartList['goods_' + item.goods_id] && cartList['goods_' + item.goods_id].totalNum"
+													:class="['absolute right-[-16rpx] top-[-16rpx] rounded-[30rpx] h-[30rpx] min-w-[30rpx] text-center leading-[26rpx] bg-[var(--primary-color)]  text-[#fff] text-[20rpx] font-500 box-border box-border border-[2rpx] border-solid border-[#fff]', cartList['goods_' + item.goods_id].totalNum > 9 ? 'px-[10rpx]' : '']">
+													{{ cartList['goods_' + item.goods_id].totalNum }}
+												</view>
+											</view>
+											<view v-if="config.cart.control && config.cart.style === 'style-2'" class="w-[50rpx] h-[50rpx] relative"  @click.stop="itemCart(item, 'itemCart' + index)">
+												<text :id="'itemCart' + index" class="text-color nc-iconfont nc-icon-tianjiaV6xx text-[44rpx]"></text>
+												<view
+													v-if="cartList['goods_' + item.goods_id] && cartList['goods_' + item.goods_id].totalNum"
+													:class="['absolute right-[-16rpx] top-[-16rpx] rounded-[30rpx] h-[30rpx] min-w-[30rpx] text-center leading-[26rpx] bg-[var(--primary-color)] text-[#fff] text-[20rpx] font-500 box-border box-border border-[2rpx] border-solid border-[#fff]', cartList['goods_' + item.goods_id].totalNum > 9 ? 'px-[10rpx]' : '']">
+													{{ cartList['goods_' + item.goods_id].totalNum }}
+												</view>
+											</view>
+											<view v-if="config.cart.control && config.cart.style === 'style-3'" class="w-[50rpx] flex justify-center items-end  h-[50rpx]  relative" @click.stop="itemCart(item, 'itemCart' + index)">
+												<text :id="'itemCart' + index"
+													class="text-color nc-iconfont nc-icon-gouwucheV6xx6 !text-[34rpx]"></text>
+												<view
+													v-if="cartList['goods_' + item.goods_id] && cartList['goods_' + item.goods_id].totalNum"
+													:class="['absolute right-[-10rpx] top-[-2rpx] rounded-[30rpx] h-[30rpx] min-w-[30rpx] text-center leading-[26rpx] bg-[var(--primary-color)] text-[#fff] text-[20rpx] font-500 box-border box-border border-[2rpx] border-solid border-[#fff]', cartList['goods_' + item.goods_id].totalNum > 9 ? 'px-[10rpx]' : '']">
+													{{ cartList['goods_' + item.goods_id].totalNum }}
+												</view>
+											</view>
+											<view v-if="config.cart.control && config.cart.style === 'style-4'" class="w-[50rpx] h-[50rpx] justify-center flex items-end relative" @click.stop="itemCart(item, 'itemCart' + index)">
+												<view :id="'itemCart' + index"
+													class=" flex items-center justify-center text-[#fff] bg-color h-[44rpx] w-[44rpx] rounded-[22rpx] text-center">
+													<text class="nc-iconfont nc-icon-gouwucheV6xx6 !text-[26rpx]"></text>
+												</view>
+												<view
+													v-if="cartList['goods_' + item.goods_id] && cartList['goods_' + item.goods_id].totalNum"
+													:class="['absolute right-[-10rpx] top-[-10rpx] rounded-[30rpx] h-[30rpx] min-w-[30rpx] text-center leading-[26rpx] bg-[var(--primary-color)] text-[#fff] text-[20rpx] font-500 box-border border-[2rpx] border-solid border-[#fff]', cartList['goods_' + item.goods_id].totalNum > 9 ? 'px-[10rpx]' : '']">
+													{{ cartList['goods_' + item.goods_id].totalNum }}
+												</view>
+											</view>
+										</template>
+									</block>
+								</view>
+							</view>
+						</view>
+
+					</template>
+					<mescroll-empty class="part" v-if="!list.length && !loading && listLoading" :option="{tip : '暂无商品'}"></mescroll-empty>
+				</view>
+				<add-cart-popup ref="cartRef" />
+			</mescroll-body>
+			<!--  #ifdef  H5 -->
+			<view v-if="config.cart.control && config.cart.event === 'cart'"
+				class="bg-[#fff] z-10 flex justify-between items-center fixed left-0 right-0 bottom-[50px] box-solid px-[24rpx] py-[17rpx] mb-ios border-[0] border-t-[2rpx] border-solid border-[#f6f6f6]">
+				<view class="flex items-center">
+					<view class="w-[66rpx] h-[66rpx] mr-[27rpx] relative">
+						<view id="animation-end" class="w-[66rpx] h-[66rpx] rounded-[35rpx] bg-[var(--primary-color)] text-center leading-[70rpx]" @click.stop="toCart">
+							<text class="nc-iconfont nc-icon-gouwucheV6mm1 text-[#fff] text-[32rpx]"></text>
+						</view>
+						<view v-if="totalNum"
+							class="border-[1rpx] border-solid border-[#fff]"
+							:class="['absolute left-[40rpx] top-[-10rpx] rounded-[28rpx] h-[28rpx] min-w-[28rpx] text-center leading-[26rpx] bg-[var(--primary-color)] text-[#fff] text-[20rpx] font-500 box-border', totalNum > 9 ? 'px-[10rpx]' : '']">
+							{{ totalNum > 99 ? "99+" : totalNum }}
+						</view>
+					</view>
+					<text class="text-[26rpx] font-500 text-[#333]">总计：</text>
+					<view class="text-[var(--price-text-color)] price-font font-bold flex items-baseline">
+						<text class="text-[26rpx] mr-[6rpx]">￥</text>
+						<text class="text-[44rpx]">{{ parseFloat(totalMoney) }}</text>
+					</view>
+				</view>
+				<button class="w-[180rpx] h-[70rpx] text-[26rpx] leading-[70rpx] font-500 m-0 rounded-full remove-border" :class="{'primary-btn-bg !text-[#fff]': parseFloat(totalMoney) > 0, 'bg-[#F7F7F7] !text-[var(--text-color-light9)]': parseFloat(totalMoney) <= 0}" @click="settlement">去结算</button>
+			</view>
+			<!--  #endif -->
+
+			<!-- #ifdef MP-WEIXIN -->
+			<view v-if="config.cart.control && config.cart.event === 'cart'"
+				class="bg-[#fff] z-10 flex justify-between items-center fixed left-0 right-0 bottom-[100rpx] box-solid px-[24rpx] py-[17rpx] mb-ios border-[0] border-t-[2rpx] border-solid border-[#f6f6f6]">
+				<view class="flex items-center">
+					<view class="w-[66rpx] h-[66rpx] mr-[27rpx] relative">
+						<view id="animation-end" class="w-[66rpx] h-[66rpx] rounded-[35rpx] bg-[var(--primary-color)] text-center leading-[66rpx]"
+							@click.stop="toCart">
+							<text class="nc-iconfont nc-icon-gouwucheV6mm1 text-[#fff] text-[32rpx]"></text>
+						</view>
+						<view v-if="totalNum" class="border-[1rpx] border-solid border-[#fff]"
+							:class="['absolute left-[40rpx] top-[-10rpx] rounded-[28rpx] h-[28rpx] min-w-[28rpx] text-center leading-[26rpx] bg-[var(--primary-color)] text-[#fff] text-[20rpx] font-500 box-border', totalNum > 9 ? 'px-[10rpx]' : '']">
+							{{ totalNum > 99 ? "99+" : totalNum }}
+						</view>
+					</view>
+					<text class="text-[26rpx] font-500 text-[#333]">总计：</text>
+					<view class="text-[var(--price-text-color)] price-font font-bold inline-block">
+						<text class="text-[26rpx] mr-[6rpx]">￥</text>
+						<text class="text-[44rpx]">{{ parseFloat(totalMoney) }}</text>
+					</view>
+				</view>
+				<button v-if="isBindMobile && userInfo && !userInfo.mobile" class="w-[180rpx] h-[70rpx] text-[26rpx] leading-[70rpx] font-500 m-0 rounded-full remove-border" :class="{'primary-btn-bg !text-[#fff]': parseFloat(totalMoney) > 0, 'bg-[#F7F7F7] !text-[var(--text-color-light9)]': parseFloat(totalMoney) <= 0}" open-type="getPhoneNumber" @getphonenumber="memberStore.bindMobile">去结算</button>
+				<button v-else class="w-[180rpx] h-[70rpx] text-[26rpx] leading-[70rpx] font-500 m-0 rounded-full remove-border" :class="{'primary-btn-bg !text-[#fff]': parseFloat(totalMoney) > 0, 'bg-[#F7F7F7] !text-[var(--text-color-light9)]': parseFloat(totalMoney) <= 0}" @click="settlement">去结算</button>
+			</view>
+			<!--  #endif -->
+		</view>
+
+		<view v-show="animationElStatus" :style="animationElStatus"
+			class="fixed z-999 flex items-center justify-center text-[#fff] bg-color h-[44rpx] w-[44rpx] rounded-[22rpx] text-center">
+			<text class=" nc-iconfont nc-icon-gouwucheV6xx6 !text-[30rpx]"></text>
+		</view>
+		<mescroll-empty v-if="!tabsData.length && !loading" :option="{tip : '暂无商品分类'}"></mescroll-empty>
+		<loading-page :loading="loading"></loading-page>
+
+		<tabbar />
+		<!-- 强制绑定手机号 -->
+		<bind-mobile ref="bindMobileRef" />
+	</view>
+</template>
+
+<script setup lang="ts">
+import { ref, onMounted, computed, getCurrentInstance } from 'vue';
+import { t } from '@/locale';
+import { img, redirect, getToken } from '@/utils/common';
+import { getGoodsCategoryTree, getGoodsPages } from '@/addon/shop/api/goods';
+import MescrollBody from '@/components/mescroll/mescroll-body/mescroll-body.vue';
+import MescrollEmpty from '@/components/mescroll/mescroll-empty/mescroll-empty.vue';
+import useMescroll from '@/components/mescroll/hooks/useMescroll.js';
+import addCartPopup from './add-cart-popup.vue'
+import bindMobile from '@/components/bind-mobile/bind-mobile.vue';
+import { onPageScroll, onReachBottom } from '@dcloudio/uni-app';
+import { useLogin } from '@/hooks/useLogin'
+import useMemberStore from '@/stores/member'
+import useCartStore from '@/addon/shop/stores/cart'
+import { cloneDeep } from 'lodash-es'
+
+const cartStore = useCartStore();
+
+// 查询购物车列表
+cartStore.getList();
+
+const cartList = computed(() => cartStore.cartList)
+const totalNum = computed(() => cartStore.totalNum)
+const totalMoney = computed(() => cartStore.totalMoney)
+const memberStore = useMemberStore()
+const userInfo = computed(() => memberStore.info)
+const { mescrollInit, getMescroll } = useMescroll(onPageScroll, onReachBottom);
+const prop = defineProps({
+	config: {
+		type: Object,
+		default: (() => { return {} })
+	},
+    categoryId:{
+	    type:[String,Number],
+	    default:0
+    }
+})
+let config = prop.config
+let categoryId = prop.categoryId;
+const list = ref<Array<Object>>([]);
+const searchName = ref("");
+const loading = ref<boolean>(true);//页面加载动画
+const listLoading = ref<boolean>(false);//列表加载动画
+const cartData = ref<Array<any>>([])
+const instance = getCurrentInstance(); // 获取组件实例
+cartData.value = uni.getStorageSync('shopCart') || []
+interface acceptingDataStructure {
+	data: acceptingDataItemStructure,
+	msg: string,
+	code: number
+}
+interface acceptingDataItemStructure {
+	data: object,
+	[propName: string]: number | string | object
+}
+interface mescrollStructure {
+	num: number,
+	size: number,
+	endSuccess: Function,
+	[propName: string]: any
+}
+const getListFn = (mescroll: mescrollStructure) => {
+	listLoading.value = false
+	getGoodsPages({
+		page: mescroll.num,
+		limit: mescroll.size,
+		goods_category: categoryId, // 商品分类id
+	}).then((res: any) => {
+		let newArr = res.data.data
+		//设置列表数据
+
+		if (mescroll.num == 1) {
+			list.value = []; //如果是第一页需手动制空列表
+		}
+		list.value = list.value.concat(newArr);
+		// 商品限购
+		goodsMaxBuy();
+		loading.value = false;
+		mescroll.endSuccess(newArr.length);
+		if (!list.value.length) listLoading.value = true
+	}).catch(() => {
+		loading.value = false;
+		listLoading.value = true
+		mescroll.endErr(); // 请求失败, 结束加载
+	})
+}
+
+const goodsMaxBuy = ()=>{
+	list.value.forEach((data,index)=>{
+		data.isMaxBuy = false;
+
+		let maxBuyNum = -1;
+		// 限购 - 是否开启限购
+		if(data.is_limit){
+			if(data.max_buy){
+				let max_buy = 0;
+				if(data.limit_type == 1){ //单次限购
+					max_buy = data.max_buy;
+				}else{ // 单人限购
+					let buyVal = data.max_buy - (data.has_buy||0);
+					max_buy = buyVal > 0 ? buyVal : 0;
+				}
+
+				if(max_buy > data.stock){
+					maxBuyNum = data.stock
+				}else if(max_buy <= data.stock){
+					maxBuyNum = max_buy;
+				}
+			}
+		}
+
+		if(maxBuyNum == 0){
+			data.isMaxBuy = true;
+		}
+	})
+}
+
+const toLink = (goods_id: string) => {
+	redirect({ url: '/addon/shop/pages/goods/detail', param: { goods_id } })
+}
+
+onMounted(() => {
+	getCategoryData()
+})
+
+//设置购物车动画
+const animationElStatus = ref('')
+const animationAddRepeatFlag = ref<Boolean>(false)
+const cartRepeatFlag = ref<Boolean>(false)
+const animationAddCart = (row: any, id: any) => {
+	if (animationAddRepeatFlag.value || cartRepeatFlag.value) return false
+	animationAddRepeatFlag.value = true
+	cartRepeatFlag.value = true
+
+	let obj: any = {
+		goods_id: row.goodsSku.goods_id,
+		sku_id: row.goodsSku.sku_id,
+		sale_price: goodsPrice(row),
+		stock: row.goodsSku.stock
+	};
+	if (row.id) {
+		obj.num = row.num;
+		obj.id = row.id;
+	}
+
+	// 起购
+	let num = 1;
+	if(row.min_buy > 0 && !row.num){
+		num = row.min_buy;
+	}else{
+		num = 1;
+	}
+
+	cartStore.increase(obj, num, () => {
+		cartRepeatFlag.value = false
+	});
+	// #ifdef  MP-WEIXIN
+	setTimeout(() => {
+		uni.createSelectorQuery().in(instance).select('#animation-end').boundingClientRect((res: any) => {
+			uni.createSelectorQuery().in(instance).select('#' + id).boundingClientRect((position: any) => {
+				animationElStatus.value = `top: ${ position.top }px; left: ${ position.left }px;`
+				setTimeout(() => {
+					animationElStatus.value = `top: ${ res.top + res.height / 2 - position.height / 3 }px; left: ${ res.left + res.width / 2 - position.width / 3 }px; transition: all 0.8s; transform: rotate(-720deg);`
+				}, 20);
+
+				setTimeout(() => {
+					animationElStatus.value = ''
+					animationAddRepeatFlag.value = false
+				}, 1020);
+
+			}).exec()
+
+		}).exec()
+	}, 100)
+	// #endif
+	// #ifdef  H5
+	setTimeout(() => {
+		const animationEnd: any = window.document.getElementById('animation-end');
+		const animationEndLeft = animationEnd.getBoundingClientRect().left;
+		const animationEndTop = animationEnd.getBoundingClientRect().top;
+
+		const itemCart: any = window.document.getElementById(id);
+		const itemCartLift = itemCart.getBoundingClientRect().left;
+		const itemCartTop = itemCart.getBoundingClientRect().top;
+		animationElStatus.value = `top: ${ itemCartTop }px; left: ${ itemCartLift }px;`
+
+		setTimeout(() => {
+			animationElStatus.value = `top: ${ animationEndTop + animationEnd.offsetHeight / 2 - itemCart.offsetHeight / 3 }px; left: ${ animationEndLeft + animationEnd.offsetWidth / 2 - itemCart.offsetHeight / 3 }px; transition: all 0.8s; transform: rotate(-720deg);`
+		}, 20);
+		setTimeout(() => {
+			animationElStatus.value = ''
+			animationAddRepeatFlag.value = false
+		}, 1020);
+
+	}, 100);
+	// #endif
+}
+
+/**
+ * @description 获取分类数据
+ * */
+const tabsData:any = ref<Array<Object>>([])
+const getCategoryData = () => {
+	loading.value = true;
+	getGoodsCategoryTree().then((res: any) => {
+		tabsData.value = res.data;
+        if (categoryId) {
+            for (let i = 0; i < tabsData.value.length; i++) {
+                if (tabsData.value[i].category_id == categoryId) {
+                    tabActive.value = i;
+                    break;
+                }
+                if(tabsData.value[i].child_list){
+                    for(let k=0;k<tabsData.value[i].child_list.length;k++){
+                        if(tabsData.value[i].child_list[k].category_id == categoryId){
+                            tabActive.value = i;
+                            break;
+                        }
+                    }
+                }
+            }
+        }else{
+            categoryId = res.data[0].category_id;
+        }
+		loading.value = false;
+	}).catch(() => {
+		loading.value = false;
+	});
+}
+
+// 一级菜单样式控制
+const tabActive = ref<number>(0)
+
+// 一级菜单点击事件
+const firstLevelClick = (index: number, data: any) => {
+	tabActive.value = index;
+    categoryId = data.category_id;
+	list.value = [];
+	getMescroll().resetUpScroll();
+}
+
+// 搜索名字
+const searchNameFn = () => {
+	// getMescroll().resetUpScroll();
+	// if(searchName.value) 
+	redirect({ url: '/addon/shop/pages/goods/list', param: { goods_name: encodeURIComponent(searchName.value) } })
+}
+
+//点击商品购物车按钮
+const cartRef = ref()
+const itemCart = (row: any, id: any) => {
+    // 虚拟商品，并且需要核销，禁止加入购物车
+    if(row.goods_type == 'virtual' && row.virtual_receive_type == 'verify'){
+        return toLink(row.goodsSku.goods_id)
+    }
+
+	if (config.cart.event !== 'cart') {
+		return toLink(row.goodsSku.goods_id)
+	}
+
+	if (!userInfo.value) {
+		useLogin().setLoginBack({ url: '/addon/shop/pages/goods/category' })
+		return false
+	}
+
+	if (row.goodsSku.sku_spec_format) {
+		cartRef.value.open(row.goodsSku.sku_id)
+	} else {
+		//单规格添加购物车
+		if (!row.goodsSku.stock || parseInt(row.goodsSku.num||0) > parseInt(row.goodsSku.stock)) {
+		    uni.showToast({ title: '商品库存不足', icon: 'none' })
+		    return;
+		}
+		if(row.min_buy && row.min_buy > parseInt(row.stock)){
+			uni.showToast({ title: '商品库存小于起购数量', icon: 'none' })
+			return;
+		}
+		animationAddCart(row, id)
+	}
+}
+
+//点击购物车加号 添加数量
+const addCartBtn = (item: any, row: any, id: string) => {
+	if (parseInt(row.num) >= parseInt(row.stock)) {
+	    uni.showToast({ title: '商品库存不足', icon: 'none' })
+	    return;
+	}
+
+	// 起购
+	let num = row.num;
+	if(item.min_buy > 0 && item.min_buy > num){
+		num = item.min_buy;
+	}
+
+	/************** 限购-start *****************/
+	let maxBuyNum = -1;
+	// 限购 - 是否开启限购
+	if(item.is_limit && item.max_buy){
+		let max_buy = 0;
+		if(item.limit_type == 1){ //单次限购
+			max_buy = item.max_buy;
+		}else{ // 单人限购
+			let buyVal = item.max_buy - (item.has_buy||0);
+			max_buy = buyVal > 0 ? buyVal : 0;
+		}
+
+		if(max_buy > item.goodsSku.stock){
+			maxBuyNum = item.goodsSku.stock
+		}else if(max_buy <= item.goodsSku.stock){
+			maxBuyNum = max_buy;
+		}
+	}
+
+	if(item.is_limit && num >= item.max_buy){
+		let tips = `该商品单次限购${item.max_buy}件`;
+		if(item.limit_type != 1){ //单次限购
+			tips = `该商品每人限购${item.max_buy}件`;
+		}
+		uni.showToast({ title: tips, icon: 'none' })
+		return false;
+	}
+	/************** 限购-end *****************/
+
+	let obj = cloneDeep(item)
+    obj.num = num;
+    obj.id = row.id;
+	animationAddCart(obj, id)
+}
+
+//点击购物车减号
+const reduceCart = (data: any, row: any) => {
+	if(cartRepeatFlag.value) return false
+	cartRepeatFlag.value = true
+
+	let reduceNum = 1;
+	if(data.min_buy > 0 && data.min_buy == row.num){
+		reduceNum = data.min_buy;
+	}
+
+	cartStore.reduce({
+		id: row.id,
+		goods_id: row.goods_id,
+		sku_id: row.sku_id,
+		stock: row.stock,
+		sale_price: row.sale_price,
+		num: row.num
+	}, reduceNum, () => {
+		cartRepeatFlag.value = false
+	})
+
+}
+
+//进入购物车
+const toCart = () => {
+	redirect({ url: '/addon/shop/pages/goods/cart' })
+}
+
+//强制绑定手机号
+const bindMobileRef: any = ref(null)
+const isBindMobile = ref(uni.getStorageSync('isbindmobile'))
+
+/**
+ * 结算
+ */
+const settlement = () => {
+
+	// #ifdef H5
+	// 绑定手机号
+	if(uni.getStorageSync('isbindmobile')){
+		bindMobileRef.value.open()
+		return false
+	}
+	// #endif
+
+	if (!totalNum.value) {
+		uni.showToast({ title: '还没有选择商品', icon: 'none' })
+		return
+	}
+	const cart_ids:any = []
+	Object.values(cartList.value).forEach(item => {
+		Object.keys(item).forEach(v => {
+			if (v != 'totalNum' && v != 'totalMoney') cart_ids.push(item[v].id)
+		})
+
+	})
+	if(cart_ids.length == 0){
+		return;
+	}
+	uni.setStorage({
+		key: 'orderCreateData',
+		data: { cart_ids },
+		success() {
+			redirect({ url: '/addon/shop/pages/order/payment' })
+		}
+	})
+}
+
+// 价格类型
+const priceType = (data:any) =>{
+	let type = "";
+    if(data.member_discount && getToken() && data.goodsSku.member_price != data.goodsSku.price) {
+        type = 'member_price' // 会员价
+    }
+    return type;
+}
+
+// 商品价格
+const goodsPrice = (data:any) =>{
+	let price = "0.00";
+    if (data.member_discount && getToken() && data.goodsSku.member_price != data.goodsSku.price) {
+        price = data.goodsSku.member_price ? data.goodsSku.member_price : data.goodsSku.price // 会员价
+    } else {
+        price = data.goodsSku.price
+    }
+    return price;
+}
+</script>
+
+<style lang="scss" scoped>
+.remove-border {
+	&::after {
+		border: none;
+	}
+}
+.border-color {
+	border-color: var(--primary-color) !important;
+}
+
+.text-color {
+	color: var(--primary-color) !important;
+}
+
+.bg-color {
+	background-color: var(--primary-color) !important;
+}
+
+.class-select {
+	position: relative;
+	font-weight: bold;
+
+	&::before {
+		content: "";
+		position: absolute;
+		bottom: 0;
+		height: 6rpx;
+		background-color: var(--primary-color);
+		width: 90%;
+		left: 50%;
+		transform: translateX(-50%);
+	}
+}
+
+.list-select {
+	position: relative;
+	margin-right: 28rpx;
+
+	&::before {
+		content: "";
+		position: absolute;
+		background-color: #999;
+		width: 2rpx;
+		height: 70%;
+		top: 50%;
+		right: -14rpx;
+		transform: translatey(-50%);
+	}
+}
+
+.transform-rotate {
+	transform: rotate(180deg);
+}
+
+.text-color {
+	color: var(--primary-color);
+}
+
+.bg-color {
+	background-color: var(--primary-color);
+}
+
+// search input
+.search-box {
+	display: flex;
+	align-items: center;
+	padding: 0 30rpx;
+}
+
+.search-box .search-ipt {
+	height: 58rpx;
+	background-color: #F6F8F8;
+	border-radius: 33rpx;
+}
+
+.search-box .search-ipt .input-placeholder {
+	color: #A5A6A6;
+}
+
+.tabs-box {
+	width: 168rpx;
+	font-size: 26rpx;
+}
+
+.tabs-box .tab-item {
+	min-height: 56rpx;
+	padding: 20rpx 0;
+	text-align: center;
+	background-color:#fff;
+	display: flex;
+	align-items: center;
+}
+
+.tabs-box .tab-item-active {
+	position: relative;
+	color: var(--primary-color);
+	background-color:var(--temp-bg);
+	&::before {
+		display: inline-block;
+		position: absolute;
+		left: 0rpx;
+		top: 50%;
+		transform: translateY(-50%);
+		content: '';
+		width: 6rpx;
+		height: 48rpx;
+		background-color: var(--primary-color);
+	}
+
+	&::after {
+		display: inline-block;
+		position: absolute;
+		left: 0rpx;
+		top: 50%;
+		transform: translateY(-50%);
+		content: '';
+		width: 6rpx;
+		height: 48rpx;
+		background-color: var(--primary-color);
+	}
+}
+
+.scroll-height{
+	height: 100%;
+}
+/*  #ifdef  H5  */
+.cart{
+	.noData1{
+		height: calc(100vh - 146rpx - 100rpx - 50px - constant(safe-area-inset-bottom));
+		height: calc(100vh - 146rpx - 100rpx - 50px - env(safe-area-inset-bottom));
+	}
+	.noData2{
+		height: calc(100vh - 40rpx - 100rpx - 50px - constant(safe-area-inset-bottom));
+		height: calc(100vh - 40rpx - 100rpx - 50px - env(safe-area-inset-bottom));
+	}
+}
+.detail{
+	.noData1{
+		height: calc(100vh - 146rpx - 50px - constant(safe-area-inset-bottom));
+		height: calc(100vh - 146rpx - 50px - env(safe-area-inset-bottom));
+	}
+	.noData2{
+		height: calc(100vh - 40rpx - 50px - constant(safe-area-inset-bottom));
+		height: calc(100vh - 40rpx - 50px - env(safe-area-inset-bottom));
+	}
+}
+/*  #endif  */
+/*  #ifndef  H5  */
+.cart{
+	.noData1{
+		height: calc(100vh - 146rpx - 100rpx - 100rpx - constant(safe-area-inset-bottom));
+		height: calc(100vh - 146rpx - 100rpx - 100rpx - env(safe-area-inset-bottom));
+	}
+	.noData2{
+		height: calc(100vh - 40rpx - 100rpx - 100rpx - constant(safe-area-inset-bottom));
+		height: calc(100vh - 40rpx - 100rpx - 100rpx - env(safe-area-inset-bottom));
+	}
+}
+.detail{
+	.noData1{
+		height: calc(100vh - 146rpx - 100rpx - constant(safe-area-inset-bottom));
+		height: calc(100vh - 146rpx - 100rpx - env(safe-area-inset-bottom));
+	}
+	.noData2{
+		height: calc(100vh - 40rpx - 100rpx - constant(safe-area-inset-bottom));
+		height: calc(100vh - 40rpx - 100rpx - env(safe-area-inset-bottom));
+	}
+}
+/*  #endif  */
+
+// 空页面
+.mescroll-empty.empty-page.part{
+	width: 542rpx;
+	height: 542rpx;
+	margin-top: 0;
+	margin-left: 0;
+	padding-top: 50rpx;
+	.img{
+		width: 160rpx !important;
+		height: 120rpx !important;
+	}
+}
+</style>
+
diff --git a/uni-app/src/addon/shop/pages/goods/components/category-template-two-one.vue b/uni-app/src/addon/shop/pages/goods/components/category-template-two-one.vue
new file mode 100644
index 00000000..5b9b01b3
--- /dev/null
+++ b/uni-app/src/addon/shop/pages/goods/components/category-template-two-one.vue
@@ -0,0 +1,307 @@
+<template>
+	<view class=" bg-[var(--page-bg-color)] overflow-hidden min-h-screen">
+		<view class="mescroll-box" v-if="tabsData.length">
+			<view v-if="config.search.control" class="search-box box-border z-10 fixed top-0 left-0 right-0  h-[100rpx] bg-[#fff]">
+				<view class="flex-1 search-input">
+					<text @click.stop="searchNameFn" class="nc-iconfont nc-icon-sousuo-duanV6xx1 btn"></text>
+					<input class="input" type="text" v-model.trim="searchName" :placeholder="config.search.title" placeholderClass="text-[var(--text-color-light9)]" @confirm="searchNameFn">
+					<text v-if="searchName" class="nc-iconfont nc-icon-cuohaoV6xx1 clear" @click="searchName=''"></text>
+				</view>
+			</view>
+			<view class="tabs-box z-2 fixed left-0 bg-[#fff] bottom-[50px] top-0" :class="{ '!top-[100rpx]': config.search.control }">
+				<scroll-view :scroll-y="true" class="scroll-height">
+					<view class="bg-[var(--temp-bg)]">
+						<view class="tab-item" :class="{ 'tab-item-active': index == tabActive,'rounded-br-[12rpx]':tabActive-1===index,'rounded-tr-[12rpx]':tabActive+1===index  }" v-for="(item, index) in tabsData" :key="index" @click="firstLevelClick(index, item)">
+							<view class="text-box text-left leading-[1.3] break-words px-[16rpx]">
+								{{ item.category_name }}
+							</view>
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+			<scroll-view class="h-[100vh]" :scroll-y="true">
+				<view class="pl-[188rpx] scroll-ios pt-[20rpx] pr-[20rpx]" :class="{ '!pt-[120rpx]': config.search.control }">
+					<view class="bg-[#fff] grid grid-cols-3 gap-x-[50rpx] gap-y-[32rpx] py-[32rpx] px-[24rpx] rounded-[var(--rounded-big)]" v-if="tabsData[tabActive]?.child_list && !loading">
+						<template v-for="(item, index) in tabsData[tabActive]?.child_list" :key="item.category_id">
+							<view @click="toLink(item.category_id)" class=" flex items-center justify-center flex-col">
+								<u--image radius="var(--goods-rounded-big)" width="120rpx" height="120rpx" :src="img(item.image ? item.image : '')" model="aspectFill">
+									<template #error>
+										<image class="rounded-[var(--goods-rounded-big)] overflow-hidden w-[120rpx] h-[120rpx]" :src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill"></image>
+									</template>
+								</u--image>
+								<view class="text-[24rpx] text-center mt-[16rpx] leading-[34rpx]">{{ item.category_name }}</view>
+							</view>
+						</template>
+					</view>
+					<mescroll-empty class="part" v-if="!tabsData[tabActive]?.child_list && !loading" :option="{tip : '暂无商品分类'}"></mescroll-empty>
+				</view>
+			</scroll-view>
+		</view>
+		<tabbar />
+		<mescroll-empty  v-if="!tabsData.length && !loading" :option="{tip : '暂无商品分类'}"></mescroll-empty>
+		<loading-page :loading="loading"></loading-page>
+	</view>
+</template>
+
+<script setup lang="ts">
+import { ref, onMounted } from 'vue';
+import { img, redirect } from '@/utils/common';
+import { getGoodsCategoryTree } from '@/addon/shop/api/goods';
+import MescrollEmpty from '@/components/mescroll/mescroll-empty/mescroll-empty.vue';
+import { t } from '@/locale';
+
+const prop = defineProps({
+    config: {
+        type: Object,
+        default: (() => {
+            return {}
+        })
+    },
+    categoryId: {
+        type: [String, Number],
+        default: 0
+    }
+})
+let config = prop.config
+let categoryId = prop.categoryId;
+const searchName = ref("");
+const loading = ref<boolean>(true);
+
+onMounted(() => {
+	getCategoryData()
+})
+
+/**
+ * @description 获取分类数据
+ * */
+const tabsData: any = ref<Array<Object>>([])
+const getCategoryData = () => {
+    loading.value = true;
+    getGoodsCategoryTree().then((res: any) => {
+        tabsData.value = res.data;
+        if (categoryId) {
+            for (let i = 0; i < tabsData.value.length; i++) {
+                if (tabsData.value[i].category_id == categoryId) {
+                    tabActive.value = i;
+                    break;
+                }
+                if(tabsData.value[i].child_list){
+                    for(let k=0;k<tabsData.value[i].child_list.length;k++){
+                        if(tabsData.value[i].child_list[k].category_id == categoryId){
+                            tabActive.value = i;
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+        loading.value = false;
+    }).catch(() => {
+        loading.value = false;
+    });
+}
+
+// 一级菜单样式控制
+const tabActive = ref<number>(0)
+
+// 一级菜单点击事件
+const firstLevelClick = (index: number, data: Object) => {
+	tabActive.value = index;
+}
+const toLink = (curr_goods_category: string) => {
+	redirect({ url: '/addon/shop/pages/goods/list', param: { curr_goods_category } })
+}
+// 搜索名字
+const searchNameFn = () => {
+	// getMescroll().resetUpScroll();
+	// if(searchName.value) 
+	redirect({ url: '/addon/shop/pages/goods/list', param: { goods_name: encodeURIComponent(searchName.value) } })
+}
+</script>
+
+<style lang="scss" scoped>
+.border-color {
+	border-color: var(--primary-color) !important;
+}
+
+.text-color {
+	color: var(--primary-color) !important;
+}
+
+.bg-color {
+	background-color: var(--primary-color) !important;
+}
+
+.class-select {
+	position: relative;
+	font-weight: bold;
+
+	&::before {
+		content: "";
+		position: absolute;
+		bottom: 0;
+		height: 6rpx;
+		background-color: $u-primary;
+		width: 90%;
+		left: 50%;
+		transform: translateX(-50%);
+	}
+}
+
+.list-select {
+	position: relative;
+	margin-right: 28rpx;
+
+	&::before {
+		content: "";
+		position: absolute;
+		background-color: #999;
+		width: 2rpx;
+		height: 70%;
+		top: 50%;
+		right: -14rpx;
+		transform: translatey(-50%);
+	}
+}
+
+.transform-rotate {
+	transform: rotate(180deg);
+}
+
+.text-color {
+	color: $u-primary;
+}
+
+.bg-color {
+	background-color: $u-primary;
+}
+
+.search-box {
+	display: flex;
+	align-items: center;
+	padding: 0 30rpx;
+}
+
+.search-box .search-ipt {
+	height: 58rpx;
+	background-color: #fff;
+	border-radius: 33rpx;
+}
+
+.search-box .search-ipt .input-placeholder {
+	color: #A5A6A6;
+}
+
+.tabs-box {
+	width: 168rpx;
+	font-size: 28rpx;
+}
+
+.tabs-box .tab-item {
+	min-height: 48rpx;
+	padding: 18rpx 0;
+	text-align: center;
+	background-color:#fff;
+	display: flex;
+	align-items: center;
+}
+
+.tabs-box .tab-item-active {
+	position: relative;
+	color: var(--primary-color);
+	background-color: var(--temp-bg);
+	&::before {
+		display: inline-block;
+		position: absolute;
+		left: 0rpx;
+		top: 50%;
+		transform: translateY(-50%);
+		content: '';
+		width: 6rpx;
+		height: 48rpx;
+		background-color: var(--primary-color);
+	}
+
+	&::after {
+		display: inline-block;
+		position: absolute;
+		left: 0rpx;
+		top: 50%;
+		transform: translateY(-50%);
+		content: '';
+		width: 6rpx;
+		height: 48rpx;
+		background-color: var(--primary-color);
+	}
+}
+
+$white-bj: #fff;
+
+.mescroll-box {
+	height: 100vh;
+}
+
+.panic-buying {
+	background-color: var(--primary-color);
+	color: $white-bj;
+}
+
+:deep(.mescroll-upwarp) {
+	box-sizing: border-box;
+	padding-left: 182rpx;
+}
+
+:deep(.tab-bar-placeholder) {
+	display: none !important;
+}
+
+:deep(.u-tabbar__placeholder) {
+	display: none !important;
+}
+/*  #ifdef  H5  */
+.scroll-ios{
+	padding-bottom: calc(50px + 20rpx + constant(safe-area-inset-bottom)) !important;
+	padding-bottom: calc(50px  + 20rpx  + env(safe-area-inset-bottom)) !important;
+}
+/*  #endif  */
+/*  #ifndef  H5  */
+.scroll-ios{
+	padding-bottom: calc(120rpx  + constant(safe-area-inset-bottom)) !important;
+	padding-bottom: calc(120rpx  + env(safe-area-inset-bottom)) !important;
+}
+/*  #endif  */
+.scroll-height{
+	height: 100%;
+}
+/*  #ifdef  H5  */
+	.noData1{
+		height: calc(100vh - 146rpx - 50px - constant(safe-area-inset-bottom));
+		height: calc(100vh - 146rpx - 50px - env(safe-area-inset-bottom));
+	}
+	.noData2{
+		height: calc(100vh - 40rpx - 50px - constant(safe-area-inset-bottom));
+		height: calc(100vh - 40rpx - 50px - env(safe-area-inset-bottom));
+	}
+/*  #endif  */
+/*  #ifndef  H5  */
+	.noData1{
+		height: calc(100vh - 146rpx - 100rpx - constant(safe-area-inset-bottom));
+		height: calc(100vh - 146rpx - 100rpx - env(safe-area-inset-bottom));
+	}
+	.noData2{
+		height: calc(100vh - 40rpx - 100rpx - constant(safe-area-inset-bottom));
+		height: calc(100vh - 40rpx - 100rpx - env(safe-area-inset-bottom));
+	}
+/*  #endif  */
+.mescroll-empty.empty-page.part{
+	width: 542rpx;
+	height: 542rpx;
+	margin-top: 0;
+	margin-left: 0;
+	padding-top: 50rpx;
+	.img{
+		width: 160rpx !important;
+		height: 120rpx !important;
+	}
+}
+</style>
diff --git a/uni-app/src/addon/shop/pages/goods/components/category-template-two-two.vue b/uni-app/src/addon/shop/pages/goods/components/category-template-two-two.vue
new file mode 100644
index 00000000..840de689
--- /dev/null
+++ b/uni-app/src/addon/shop/pages/goods/components/category-template-two-two.vue
@@ -0,0 +1,896 @@
+<template>
+	<view class="min-h-screen bg-[var(--page-bg-color)] overflow-hidden">
+		<view class="mescroll-box bg-[#f6f6f6]" :class="{ 'cart': config.cart.control && config.cart.event === 'cart', 'detail': !(config.cart.control && config.cart.event === 'cart') }" v-if="tabsData.length">
+			<mescroll-body ref="mescrollRef" :down="{ use: false }" @init="mescrollInit" @up="getListFn">
+				<view v-if="config.search.control" class="box-border search-box z-10 bg-[#fff] fixed top-0 left-0 right-0 h-[96rpx]">
+					<view class="flex-1 search-input">
+						<text @click.stop="searchNameFn" class="nc-iconfont nc-icon-sousuo-duanV6xx1 btn"></text>
+						<input class="input" type="text" v-model.trim="searchName" :placeholder="config.search.title" placeholderClass="text-[var(--text-color-light9)]" @confirm="searchNameFn">
+						<text v-if="searchName" class="nc-iconfont nc-icon-cuohaoV6xx1 clear" @click="searchName=''"></text>
+					</view>
+				</view>
+
+				<!--  #ifdef  H5 -->
+				<view class="tabs-box z-2 fixed left-0 bg-[#fff] bottom-[50px] top-0" :class="{ '!top-[96rpx]': config.search.control, 'pb-[98rpx]': config.cart.control && config.cart.event === 'cart' }">
+					<scroll-view :scroll-y="true" class="scroll-height">
+						<view class="bg-[var(--temp-bg)]">
+							<view class="tab-item"
+							      :class="{ 'tab-item-active ': index == tabActive,'rounded-br-[12rpx]':tabActive-1===index && (!tabsData[tabActive].child_list || !tabsData[tabActive].child_list.length),'rounded-tr-[12rpx]':tabActive+1===index&&(!tabsData[tabActive].child_list || !tabsData[tabActive].child_list.length) }" v-for="(item, index) in tabsData" :key="index" @click="firstLevelClick(index, item)">
+								<view class="text-box leading-[1.3] break-words px-[24rpx]">{{ item.category_name }}</view>
+							</view>
+						</view>
+					</scroll-view>
+				</view>
+				<!--  #endif -->
+
+				<!--  #ifndef  H5 -->
+				<view class="tabs-box z-2 fixed left-0 bg-[#fff] pb-ios bottom-[100rpx] top-0" :class="{ 'top-[96rpx]': config.search.control, '!bottom-[198rpx]': config.cart.control && config.cart.event === 'cart' }">
+					<scroll-view :scroll-y="true" class="scroll-height">
+						<view class="bg-[var(--temp-bg)]">
+							<view class="tab-item" :class="{ 'tab-item-active': index == tabActive,'rounded-br-[12rpx]':tabActive-1===index&&(!tabsData[tabActive].child_list || !tabsData[tabActive].child_list.length),'rounded-tr-[12rpx]':tabActive+1===index&&(!tabsData[tabActive].child_list || !tabsData[tabActive].child_list.length) }" v-for="(item, index) in tabsData" :key="index" @click="firstLevelClick(index, item)">
+								<view class="text-box px-[16rpx] leading-[1.3] break-words">
+									{{ item.category_name }}
+								</view>
+							</view>
+						</view>
+					</scroll-view>
+				</view>
+				<!--  #endif -->
+				<view class="flex items-center h-[98rpx] pl-[24rpx] pr-[48rpx] py-[20rpx] z-10 bg-white fixed left-[168rpx] right-0 box-border top-0"
+					:class="{ '!top-[94rpx]': config.search.control }"
+					v-if="tabsData[tabActive]?.child_list && tabsData[tabActive]?.child_list.length">
+					<template v-if="!labelPopup">
+						<scroll-view :scroll-x="true" scroll-with-animation
+							:scroll-into-view="'id' + (subActive ? subActive - 1 : 0)"
+							class="flex-1 h-[54rpx] scroll-Y box-border pr-[24rpx] bg-white">
+							<view class="flex items-center h-[54rpx] box-border">
+								<text
+									class="w-[150rpx] flex-shrink-0 px-[14rpx] h-[54rpx] truncate  text-center !leading-[50rpx] !text-[24rpx] border-[2rpx] border-solid !rounded-[100rpx] box-border text-[#333] box-border"
+									:class="{ 'bg-[var(--primary-color-light)] font-500 text-[var(--primary-color)] border-[var(--primary-color)]': index === subActive, 'border-[var(--temp-bg)]  bg-[var(--temp-bg)]': index != subActive, ' ml-[24rpx]': index != 0 }"
+									v-for="(item, index) in tabsData[tabActive]?.child_list"
+									:key="tabsData[tabActive].category_id" :id="'id' + index"
+									@click="subMenuClick(index, item)">{{ item.category_name }}</text>
+							</view>
+						</scroll-view>
+						<view class="absolute right-[24rpx] nc-iconfont nc-icon-xiaV6xx text-[30rpx] w-[30rpx] h-[30rpx] text-center transform " @click="labelPopup = true"></view>
+					</template>
+					<template v-else>
+						<view class="flex-1 h-[48rpx] text-[28rpx] text-[var(--text-color-light9)] pr-[24rpx] leading-[48rpx]">全部分类</view>
+						<text class="absolute right-[24rpx] nc-iconfont nc-icon-shangV6xx-1 text-[#333] text-[30rpx]" @click="labelPopup = false"></text>
+					</template>
+				</view>
+				<view class="labelPopup" :class="{ 'active': config.search.control }">
+					<u-popup :show="labelPopup" mode="top" @close="labelPopup = false">
+						<view class="flex flex-wrap pt-[20rpx] pb-[24rpx]" @touchmove.prevent.stop>
+							<text
+								class="px-[14rpx] flex-shrink-0 w-[160rpx] box-border ml-[20rpx] mb-[26rpx] h-[60rpx] text-center leading-[56rpx] text-[24rpx] border-[2rpx] border-solid !rounded-[100rpx] text-[#333] truncate"
+								:class="{ 'bg-[var(--primary-color-light)] font-500 text-[var(--primary-color)] border-[var(--primary-color)]': index === subActive, 'border-[var(--temp-bg)]  bg-[var(--temp-bg)]': index != subActive }"
+								v-for="(item, index) in tabsData[tabActive]?.child_list"
+								:key="tabsData[tabActive].category_id" @click="subMenuClick(index, item)">{{ item.category_name }}</text>
+						</view>
+					</u-popup>
+				</view>
+				<view class="flex justify-center flex-wrap pl-[168rpx] pt-[20rpx] pb-[20rpx]"
+					:class="{ '!pt-[214rpx]': config.search.control && tabsData[tabActive]?.child_list && tabsData[tabActive]?.child_list.length, 'pt-[120rpx]': config.search.control && (!tabsData[tabActive].child_list || !tabsData[tabActive].child_list.length), 'pt-[118rpx]': tabsData[tabActive]?.child_list && tabsData[tabActive]?.child_list.length && !config.search.control }">
+					<template v-for="(item, index) in list" :key="item.goods_id">
+						<view class="w-[536rpx] box-border bg-white w-full flex mx-[20rpx] py-[24rpx] px-[20rpx] rounded-[var(--rounded-small)]"
+							:class="{ 'mt-[20rpx]': index }" @click.stop="toLink(item.goods_id)">
+							<view class="w-[168rpx] h-[168rpx] flex items-center justify-center mr-[20rpx] rounded-[var(--goods-rounded-small)] overflow-hidden">
+								<u--image width="168rpx" height="168rpx" :radius="'var(--goods-rounded-small)'" :src="img( item.goods_cover_thumb_mid || '')" model="aspectFill">
+									<template #error>
+										<image class="w-[168rpx] h-[168rpx]" :src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill"></image>
+									</template>
+								</u--image>
+							</view>
+							<view class="flex flex-1 flex-wrap flex-col">
+								<view class="max-h-[80rpx] text-[26rpx] leading-[40rpx] multi-hidden">
+									{{ item.goods_name }}</view>
+								<view class="flex  items-end justify-between flex-1">
+									<view class="text-[var(--price-text-color)] price-font -mb-[8rpx]">
+										<text class="text-[24rpx] font-500">￥</text>
+										<text class="text-[40rpx] font-500">{{ parseFloat(goodsPrice(item)).toFixed(2).split('.')[0] }}</text>
+										<text class="text-[24rpx] font-500">.{{ parseFloat(goodsPrice(item)).toFixed(2).split('.')[1] }}</text>
+										<image class="h-[24rpx] max-w-[46rpx] ml-[6rpx]" v-if="priceType(item) == 'member_price'" :src="img('addon/shop/VIP.png')" mode="heightFix" />
+									</view>
+									<block v-if="!item.isMaxBuy">
+										<view
+											v-if="(item.goods_type == 'real' || (item.goods_type == 'virtual' && item.virtual_receive_type != 'verify')) &&
+											item.goodsSku.sku_spec_format === '' && cartList['goods_' + item.goods_id] && cartList['goods_' + item.goods_id]['sku_' + item.goodsSku.sku_id] && config.cart.control && config.cart.event === 'cart'"
+											class="flex items-center">
+											<view class="relative w-[32rpx] h-[32rpx]">
+												<text class="text-[32rpx] text-color nc-iconfont nc-icon-jianshaoV6xx absolute flex items-center justify-center -left-[12rpx] -bottom-[14rpx] -right-[14rpx] -top-[14rpx]" @click.stop="reduceCart(item,cartList['goods_' + item.goods_id]['sku_' + item.goodsSku.sku_id])"></text>
+											</view>
+											<text class="text-[#333] text-[24rpx] mx-[16rpx]">{{ cartList['goods_' + item.goods_id]['sku_' + item.goodsSku.sku_id].num }}</text>
+											<view class="relative w-[32rpx] h-[32rpx]">
+												<text class="text-[32rpx] text-color iconfont iconjiahao2fill absolute flex items-center justify-center -left-[14rpx] -bottom-[14rpx] -right-[14rpx] -top-[14rpx]" :id="'itemCart' + index" @click.stop="addCartBtn(item,cartList['goods_' + item.goods_id]['sku_' + item.goodsSku.sku_id], 'itemCart' + index)"></text>
+											</view>
+										</view>
+										<template v-else-if="(item.goods_type == 'virtual' && config.cart.event !== 'cart') || item.goods_type == 'real'">
+											<view v-if="config.cart.control && config.cart.style === 'style-1'" class="h-[44rpx] relative  pl-[20rpx]">
+												<view :id="'itemCart' + index"
+													class="w-[102rpx] box-border text-center text-[#fff] primary-btn-bg h-[46rpx] text-[22rpx] leading-[46rpx] rounded-[100rpx]"
+													@click.stop="itemCart(item, 'itemCart' + index)">
+													{{ config.cart.text }}
+												</view>
+												<view
+													v-if="cartList['goods_' + item.goods_id] && cartList['goods_' + item.goods_id].totalNum"
+													:class="['absolute right-[-16rpx] top-[-16rpx] rounded-[30rpx] h-[30rpx] min-w-[30rpx] text-center leading-[26rpx] bg-[var(--primary-color)] text-[#fff] text-[20rpx] font-500 box-border box-border border-[2rpx] border-solid border-[#fff]', cartList['goods_' + item.goods_id].totalNum > 9 ? 'px-[10rpx]' : '']">
+													{{ cartList['goods_' + item.goods_id].totalNum }}
+												</view>
+											</view>
+											<view v-if="config.cart.control && config.cart.style === 'style-2'" class="w-[50rpx] h-[50rpx] relative" @click.stop="itemCart(item, 'itemCart' + index)">
+												<text :id="'itemCart' + index"
+													class="text-color nc-iconfont nc-icon-tianjiaV6xx text-[44rpx]"></text>
+												<view
+													v-if="cartList['goods_' + item.goods_id] && cartList['goods_' + item.goods_id].totalNum"
+													:class="['absolute right-[-16rpx] top-[-16rpx] rounded-[30rpx] h-[30rpx] min-w-[30rpx] text-center leading-[26rpx] bg-[var(--primary-color)] text-[#fff] text-[20rpx] font-500 box-border box-border border-[2rpx] border-solid border-[#fff]', cartList['goods_' + item.goods_id].totalNum > 9 ? 'px-[10rpx]' : '']">
+													{{ cartList['goods_' + item.goods_id].totalNum }}
+												</view>
+											</view>
+											<view v-if="config.cart.control && config.cart.style === 'style-3'" class="w-[50rpx] h-[50rpx] flex justify-center items-end  relative" @click.stop="itemCart(item, 'itemCart' + index)">
+												<text :id="'itemCart' + index"
+													class="text-color nc-iconfont nc-icon-gouwucheV6xx6 !text-[34rpx]"></text>
+												<view
+													v-if="cartList['goods_' + item.goods_id] && cartList['goods_' + item.goods_id].totalNum"
+													:class="['absolute right-[-10rpx] top-[-2rpx] rounded-[30rpx] h-[30rpx] min-w-[30rpx] text-center leading-[26rpx] bg-[var(--primary-color)] text-[#fff] text-[20rpx] font-500 box-border box-border border-[2rpx] border-solid border-[#fff]', cartList['goods_' + item.goods_id].totalNum > 9 ? 'px-[10rpx]' : '']">
+													{{ cartList['goods_' + item.goods_id].totalNum }}
+												</view>
+											</view>
+											<view v-if="config.cart.control && config.cart.style === 'style-4'" class="w-[50rpx] h-[50rpx] flex items-end relative" @click.stop="itemCart(item, 'itemCart' + index)">
+												<view :id="'itemCart' + index"
+													class=" flex items-center justify-center text-[#fff] bg-color h-[44rpx] w-[44rpx] rounded-[22rpx] text-center">
+													<text class="nc-iconfont nc-icon-gouwucheV6xx6 !text-[26rpx]"></text>
+												</view>
+												<view
+													v-if="cartList['goods_' + item.goods_id] && cartList['goods_' + item.goods_id].totalNum"
+													:class="['absolute right-[-10rpx] top-[-10rpx] rounded-[30rpx] h-[30rpx] min-w-[30rpx] text-center leading-[26rpx] bg-[var(--primary-color)] text-[#fff] text-[20rpx] font-500 box-border border-[2rpx] border-solid border-[#fff]', cartList['goods_' + item.goods_id].totalNum > 9 ? 'px-[10rpx]' : '']">
+													{{ cartList['goods_' + item.goods_id].totalNum }}
+												</view>
+											</view>
+										</template>
+									</block>
+								</view>
+							</view>
+						</view>
+
+					</template>
+					<mescroll-empty class="part" v-if="!list.length && !loading && listLoading" :option="{tip : '暂无商品'}"></mescroll-empty>
+				</view>
+				<add-cart-popup ref="cartRef" />
+			</mescroll-body>
+			<!--  #ifdef  H5 -->
+			<view v-if="config.cart.control && config.cart.event === 'cart'" class="bg-[#fff] z-10 flex justify-between items-center fixed left-0 right-0 bottom-[50px] box-solid px-[24rpx] py-[17rpx] mb-ios border-[0] border-t-[2rpx] border-solid border-[#f6f6f6]">
+				<view class="flex items-center">
+					<view class="w-[66rpx] h-[66rpx] mr-[27rpx] relative">
+						<view id="animation-end" class="w-[66rpx] h-[66rpx] rounded-[35rpx] bg-[var(--primary-color)] text-center leading-[70rpx]" @click.stop="toCart">
+							<text class="nc-iconfont nc-icon-gouwucheV6mm1 text-[#fff] text-[32rpx]"></text>
+						</view>
+						<view v-if="totalNum"
+							class="border-[1rpx] border-solid border-[#fff]"
+							:class="['absolute left-[40rpx] top-[-10rpx] rounded-[28rpx] h-[28rpx] min-w-[28rpx] text-center leading-[26rpx] bg-[var(--primary-color)] text-[#fff] text-[20rpx] font-500 box-border', totalNum > 9 ? 'px-[10rpx]' : '']">
+							{{ totalNum > 99 ? "99+" : totalNum }}
+						</view>
+					</view>
+					<text class="text-[26rpx] text-[#333]">总计：</text>
+					<view class="text-[var(--price-text-color)] price-font font-bold flex items-baseline">
+						<text class="text-[26rpx] mr-[6rpx]">￥</text>
+						<text class="text-[44rpx]">{{ parseFloat(totalMoney) }}</text>
+					</view>
+				</view>
+				<button class="w-[180rpx] h-[70rpx] text-[26rpx] leading-[70rpx] font-500 m-0 rounded-full remove-border" :class="{'primary-btn-bg !text-[#fff]': parseFloat(totalMoney) > 0, 'bg-[#F7F7F7] !text-[var(--text-color-light9)]': parseFloat(totalMoney) <= 0}" @click="settlement">去结算</button>
+			</view>
+			<!--  #endif -->
+
+			<!-- #ifdef MP-WEIXIN -->
+			<view v-if="config.cart.control && config.cart.event === 'cart'"
+				class="bg-[#fff] z-10 flex justify-between items-center fixed left-0 right-0 bottom-[100rpx] box-solid px-[24rpx] py-[17rpx] mb-ios border-[0] border-t-[2rpx] border-solid border-[#f6f6f6]">
+				<view class="flex items-center">
+					<view class="w-[66rpx] h-[66rpx] mr-[27rpx] relative">
+						<view id="animation-end" class="w-[66rpx] h-[66rpx] rounded-[35rpx] bg-[var(--primary-color)] text-center leading-[66rpx]" @click.stop="toCart">
+							<text class="nc-iconfont nc-icon-gouwucheV6mm1 text-[#fff] text-[32rpx]"></text>
+						</view>
+						<view v-if="totalNum" class="border-[1rpx] border-solid border-[#fff]"
+							:class="['absolute left-[40rpx] top-[-10rpx] rounded-[28rpx] h-[28rpx] min-w-[28rpx] text-center leading-[26rpx] bg-[var(--primary-color)] text-[#fff] text-[20rpx] font-500 box-border', totalNum > 9 ? 'px-[10rpx]' : '']">
+							{{ totalNum > 99 ? "99+" : totalNum }}
+						</view>
+					</view>
+					<text class="text-[26rpx] text-[#333]">总计：</text>
+					<view class="text-[var(--price-text-color)] price-font font-bold inline-block">
+						<text class="text-[26rpx] mr-[6rpx]">￥</text>
+						<text class="text-[44rpx]">{{ parseFloat(totalMoney) }}</text>
+					</view>
+				</view>
+				<button v-if="isBindMobile && userInfo && !userInfo.mobile" class="w-[180rpx] h-[70rpx] text-[26rpx] leading-[70rpx] font-500 m-0 rounded-full remove-border"  :class="{'primary-btn-bg !text-[#fff]': parseFloat(totalMoney) > 0, 'bg-[#F7F7F7] !text-[var(--text-color-light9)]': parseFloat(totalMoney) <= 0}" open-type="getPhoneNumber" @getphonenumber="memberStore.bindMobile">去结算</button>
+				<button v-else class="w-[180rpx] h-[70rpx] text-[26rpx] leading-[70rpx] font-500 m-0 rounded-full remove-border"  :class="{'primary-btn-bg !text-[#fff]': parseFloat(totalMoney) > 0, 'bg-[#F7F7F7] !text-[var(--text-color-light9)]': parseFloat(totalMoney) <= 0}" @click="settlement">去结算</button>
+			</view>
+			<!--  #endif -->
+		</view>
+
+		<view v-show="animationElStatus" :style="animationElStatus"
+			class="fixed z-999 flex items-center justify-center text-[#fff] bg-color h-[44rpx] w-[44rpx] rounded-[22rpx] text-center">
+			<text class=" nc-iconfont nc-icon-gouwucheV6xx6 !text-[30rpx]"></text>
+		</view>
+		<view class="flex justify-center items-center w-[100%]" v-if="!tabsData.length && !loading">
+			<mescroll-empty :option="{tip : '暂无商品分类'}"></mescroll-empty>
+		</view>
+		<loading-page :loading="loading"></loading-page>
+		<tabbar />
+		<!-- 强制绑定手机号 -->
+		<bind-mobile ref="bindMobileRef" />
+	</view>
+</template>
+
+<script setup lang="ts">
+import { ref, onMounted, computed, getCurrentInstance } from 'vue';
+import { t } from '@/locale';
+import { img, redirect, getToken } from '@/utils/common';
+import { getGoodsCategoryTree, getGoodsPages } from '@/addon/shop/api/goods';
+import MescrollBody from '@/components/mescroll/mescroll-body/mescroll-body.vue';
+import MescrollEmpty from '@/components/mescroll/mescroll-empty/mescroll-empty.vue';
+import useMescroll from '@/components/mescroll/hooks/useMescroll.js';
+import addCartPopup from './add-cart-popup.vue'
+import bindMobile from '@/components/bind-mobile/bind-mobile.vue';
+import { onPageScroll, onReachBottom } from '@dcloudio/uni-app';
+import { useLogin } from '@/hooks/useLogin'
+import useMemberStore from '@/stores/member'
+import useCartStore from '@/addon/shop/stores/cart'
+import { cloneDeep } from 'lodash-es'
+
+const instance = getCurrentInstance(); // 获取组件实例
+const cartStore = useCartStore();
+// 查询购物车列表
+cartStore.getList();
+
+const cartList = computed(() => cartStore.cartList)
+const totalNum = computed(() => cartStore.totalNum)
+const totalMoney = computed(() => cartStore.totalMoney)
+const memberStore = useMemberStore()
+const userInfo = computed(() => memberStore.info)
+const { mescrollInit, getMescroll } = useMescroll(onPageScroll, onReachBottom);
+const prop = defineProps({
+	config: {
+		type: Object,
+		default: (() => { return {} })
+	},
+    categoryId:{
+        type:[String,Number],
+        default:0
+    }
+})
+let config = prop.config
+let categoryId = prop.categoryId;
+const list = ref<Array<Object>>([]);
+const searchName = ref("");
+const loading = ref<boolean>(true);//页面加载动画
+const listLoading = ref<boolean>(false);//列表加载动画
+const labelPopup = ref<boolean>(false)
+const cartData = ref<Array<any>>([])
+cartData.value = uni.getStorageSync('shopCart') || []
+interface acceptingDataStructure {
+	data: acceptingDataItemStructure,
+	msg: string,
+	code: number
+}
+interface acceptingDataItemStructure {
+	data: object,
+	[propName: string]: number | string | object
+}
+interface mescrollStructure {
+	num: number,
+	size: number,
+	endSuccess: Function,
+	[propName: string]: any
+}
+const getListFn = (mescroll: mescrollStructure) => {
+	listLoading.value = false
+	getGoodsPages({
+		page: mescroll.num,
+		limit: mescroll.size,
+		goods_category: categoryId, // 商品分类id
+	}).then((res: any) => {
+		let newArr = res.data.data
+		//设置列表数据
+		if (mescroll.num == 1) {
+			list.value = []; //如果是第一页需手动制空列表
+		}
+		list.value = list.value.concat(newArr);
+		// 商品限购
+		goodsMaxBuy();
+		loading.value = false;
+		mescroll.endSuccess(newArr.length);
+		if (!list.value.length) listLoading.value = true
+	}).catch(() => {
+		loading.value = false;
+		listLoading.value = true
+		mescroll.endErr(); // 请求失败, 结束加载
+	})
+}
+
+const goodsMaxBuy = ()=>{
+	list.value.forEach((data,index)=>{
+		data.isMaxBuy = false;
+
+		let maxBuyNum = -1;
+		// 限购 - 是否开启限购
+		if(data.is_limit){
+			if(data.max_buy){
+				let max_buy = 0;
+				if(data.limit_type == 1){ //单次限购
+					max_buy = data.max_buy;
+				}else{ // 单人限购
+					let buyVal = data.max_buy - (data.has_buy||0);
+					max_buy = buyVal > 0 ? buyVal : 0;
+				}
+
+				if(max_buy > data.stock){
+					maxBuyNum = data.stock
+				}else if(max_buy <= data.stock){
+					maxBuyNum = max_buy;
+				}
+			}
+		}
+		if(maxBuyNum == 0){
+			data.isMaxBuy = true;
+		}
+	})
+}
+
+const toLink = (goods_id: string) => {
+	redirect({ url: '/addon/shop/pages/goods/detail', param: { goods_id } })
+}
+
+onMounted(() => {
+	getCategoryData()
+})
+
+//设置购物车动画
+const animationElStatus = ref('')
+const animationAddRepeatFlag = ref<Boolean>(false)
+const cartRepeatFlag = ref<Boolean>(false)
+const animationAddCart = (row: any, id: any) => {
+	if (animationAddRepeatFlag.value || cartRepeatFlag.value) return false
+	animationAddRepeatFlag.value = true
+	cartRepeatFlag.value = true
+
+	let obj: any = {
+		goods_id: row.goodsSku.goods_id,
+		sku_id: row.goodsSku.sku_id,
+		sale_price: goodsPrice(row),
+		stock: row.goodsSku.stock
+	};
+	if (row.id) {
+		obj.num = row.num;
+		obj.id = row.id;
+	}
+
+	// 起购
+	let num = 1;
+	if(row.min_buy > 0 && !row.num){
+		num = row.min_buy;
+	}else{
+		num = 1;
+	}
+
+	cartStore.increase(obj, num, () => {
+		cartRepeatFlag.value = false
+	});
+	// #ifdef  MP-WEIXIN
+	setTimeout(() => {
+		uni.createSelectorQuery().in(instance).select('#animation-end').boundingClientRect((res: any) => {
+			uni.createSelectorQuery().in(instance).select('#' + id).boundingClientRect((position: any) => {
+				animationElStatus.value = `top: ${ position.top }px; left: ${ position.left }px;`
+				setTimeout(() => {
+					animationElStatus.value = `top: ${ res.top + res.height / 2 - position.height / 3 }px; left: ${ res.left + res.width / 2 - position.width / 3 }px; transition: all 0.8s; transform: rotate(-720deg);`
+				}, 20);
+
+				setTimeout(() => {
+					animationElStatus.value = ''
+					animationAddRepeatFlag.value = false
+				}, 1020);
+
+			}).exec()
+
+		}).exec()
+	}, 100)
+	// #endif
+	// #ifdef  H5
+	setTimeout(() => {
+		const animationEnd: any = window.document.getElementById('animation-end');
+		const animationEndLeft = animationEnd.getBoundingClientRect().left;
+		const animationEndTop = animationEnd.getBoundingClientRect().top;
+
+		const itemCart: any = window.document.getElementById(id);
+		const itemCartLift = itemCart.getBoundingClientRect().left;
+		const itemCartTop = itemCart.getBoundingClientRect().top;
+		animationElStatus.value = `top: ${ itemCartTop }px; left: ${ itemCartLift }px;`
+
+		setTimeout(() => {
+			animationElStatus.value = `top: ${ animationEndTop + animationEnd.offsetHeight / 2 - itemCart.offsetHeight / 3 }px; left: ${ animationEndLeft + animationEnd.offsetWidth / 2 - itemCart.offsetHeight / 3 }px; transition: all 0.8s; transform: rotate(-720deg);`
+		}, 20);
+		setTimeout(() => {
+			animationElStatus.value = ''
+			animationAddRepeatFlag.value = false
+		}, 1020);
+
+	}, 100);
+	// #endif
+}
+
+/**
+ * 获取购物车数据
+ * @description 获取分类数据
+ * */
+const initAll = ref({
+	allActive : -1,
+	data: { category_name: "全部", category_id: '' }
+})
+
+const tabsData:any = ref<Array<Object>>([])
+const getCategoryData = () => {
+	loading.value = true;
+	getGoodsCategoryTree().then((res: any) => {
+		tabsData.value = res.data;
+		for (let i = 0; i < tabsData.value.length; i++) {
+			if(tabsData.value[i].child_list){
+				let obj = {
+					category_name: "全部",
+					category_id: tabsData.value[i].category_id
+				};
+				tabsData.value[i].child_list.unshift(obj)
+			}
+		}
+        if (categoryId) {
+            for (let i = 0; i < tabsData.value.length; i++) {
+                if (tabsData.value[i].category_id == categoryId) {
+                    tabActive.value = i;
+                    break;
+                }
+                if(tabsData.value[i].child_list){
+                    for(let k=0;k<tabsData.value[i].child_list.length;k++){
+                        if(tabsData.value[i].child_list[k].category_id == categoryId){
+                            tabActive.value = i;
+                            subActive.value = k;
+                            break;
+                        }
+                    }
+                }
+            }
+        }else{
+            categoryId = res.data[0].category_id;
+        }
+		loading.value = false;
+	}).catch(() => {
+		loading.value = false;
+	});
+}
+
+// 一级菜单样式控制
+const tabActive = ref<number>(0)
+// 二级菜单样式控制
+const subActive = ref<number>(0)
+
+// 一级菜单点击事件
+const firstLevelClick = (index: number, data: any) => {
+	tabActive.value = index;
+	if (data.child_list && data.child_list.length) {
+		subMenuClick(0, data.child_list[0]);
+	} else {
+        categoryId = data.category_id;
+		list.value = [];
+		getMescroll().resetUpScroll();
+	}
+}
+
+/**
+ * @description 二级菜单点击事件
+ * @param {number} index
+ * @param {Object} data
+ * */
+const subMenuClick = (index: number, data: any) => {
+	subActive.value = index;
+    categoryId = data.category_id;
+	labelPopup.value = false
+	list.value = [];
+	getMescroll().resetUpScroll();
+}
+
+// 搜索名字
+const searchNameFn = () => {
+	// getMescroll().resetUpScroll();
+	// if(searchName.value) 
+	redirect({ url: '/addon/shop/pages/goods/list', param: { goods_name: encodeURIComponent(searchName.value) } })
+}
+
+//点击商品购物车按钮
+const cartRef = ref()
+const itemCart = (row: any, id: any) => {
+    // 虚拟商品，并且需要核销，禁止加入购物车
+    if (row.goods_type == 'virtual' && row.virtual_receive_type == 'verify') {
+        return toLink(row.goodsSku.goods_id)
+    }
+
+    if (config.cart.event !== 'cart') {
+        return toLink(row.goods_id)
+    }
+
+    if (!userInfo.value) {
+        useLogin().setLoginBack({url: '/addon/shop/pages/goods/category'})
+        return false
+    }
+
+    if (row.goodsSku.sku_spec_format) {
+        cartRef.value.open(row.goodsSku.sku_id)
+    } else {
+        //单规格添加购物车
+		if (!row.goodsSku.stock || parseInt(row.goodsSku.num||0) > parseInt(row.goodsSku.stock)) {
+		    uni.showToast({ title: '商品库存不足', icon: 'none' })
+		    return;
+		}
+		if(row.min_buy && row.min_buy > parseInt(row.stock)){
+			uni.showToast({ title: '商品库存小于起购数量', icon: 'none' })
+			return;
+		}
+        animationAddCart(row, id)
+    }
+}
+
+//点击购物车加号 添加数量
+const addCartBtn = (item: any, row: any, id: string) => {
+    if (parseInt(row.num) >= parseInt(row.stock)) {
+        uni.showToast({ title: '商品库存不足', icon: 'none' })
+        return;
+    }
+
+	// 起购
+	let num = row.num;
+	if(item.min_buy > 0 && item.min_buy > row.num){
+		num = item.min_buy;
+	}
+
+	/************** 限购-start *****************/
+	// let maxBuyNum = -1;
+	// 限购 - 是否开启限购
+	if(item.is_limit && item.max_buy){
+		let max_buy = 0;
+		if(item.limit_type == 1){ //单次限购
+			max_buy = item.max_buy;
+		}else{ // 单人限购
+			let buyVal = item.max_buy - (item.has_buy||0);
+			max_buy = buyVal > 0 ? buyVal : 0;
+		}
+
+		// if(max_buy > item.goodsSku.stock){
+		// 	maxBuyNum = item.goodsSku.stock
+		// }else if(max_buy <= item.goodsSku.stock){
+		// 	maxBuyNum = max_buy;
+		// }
+	}
+	if(item.is_limit && num >= item.max_buy){
+		let tips = `该商品单次限购${item.max_buy}件`;
+		if(item.limit_type != 1){ //单次限购
+			tips = `该商品每人限购${item.max_buy}件`;
+		}
+		uni.showToast({ title: tips, icon: 'none' })
+		return false;
+	}
+	/************** 限购-end *****************/
+
+    let obj = cloneDeep(item)
+    obj.num = num;
+    obj.id = row.id;
+    animationAddCart(obj, id)
+}
+
+//点击购物车减号
+const reduceCart = (data: any,row: any) => {
+	if(cartRepeatFlag.value) return false
+	cartRepeatFlag.value = true
+
+	let reduceNum = 1;
+	if(data.min_buy > 0 && data.min_buy == row.num){
+		reduceNum = data.min_buy;
+	}
+
+	cartStore.reduce({
+		id: row.id,
+		goods_id: row.goods_id,
+		sku_id: row.sku_id,
+		stock: row.stock,
+		sale_price: row.sale_price,
+		num: row.num
+	}, reduceNum, () => {
+		cartRepeatFlag.value = false
+	})
+
+}
+
+//进入购物车
+const toCart = () => {
+	redirect({ url: '/addon/shop/pages/goods/cart' })
+}
+
+//强制绑定手机号
+const bindMobileRef: any = ref(null)
+const isBindMobile = ref(uni.getStorageSync('isbindmobile'))
+
+/**
+ * 结算
+ */
+const settlement = () => {
+
+	// #ifdef H5
+	// 绑定手机号
+	if(uni.getStorageSync('isbindmobile')){
+		bindMobileRef.value.open()
+		return false
+	}
+	// #endif
+
+    if (!totalNum.value) {
+        uni.showToast({ title: '还没有选择商品', icon: 'none' })
+        return
+    }
+    const cart_ids: any = []
+    Object.values(cartList.value).forEach(item => {
+        Object.keys(item).forEach(v => {
+            if (v != 'totalNum' && v != 'totalMoney') cart_ids.push(item[v].id)
+        })
+    })
+	if(cart_ids.length == 0){
+		return;
+	}
+    uni.setStorage({
+        key: 'orderCreateData',
+        data: { cart_ids },
+        success() {
+            redirect({ url: '/addon/shop/pages/order/payment' })
+        }
+    })
+}
+
+// 价格类型
+const priceType = (data:any) =>{
+	let type = "";
+    if(data.member_discount && getToken() && data.goodsSku.member_price != data.goodsSku.price) {
+        type = 'member_price' // 会员价
+    }
+    return type;
+}
+
+// 商品价格
+const goodsPrice = (data:any) => {
+    let price = "0.00";
+    if (data.member_discount && getToken() && data.goodsSku.member_price != data.goodsSku.price) {
+        price = data.goodsSku.member_price ? data.goodsSku.member_price : data.goodsSku.price // 会员价
+    } else {
+        price = data.goodsSku.price
+    }
+    return price;
+}
+</script>
+
+<style lang="scss" scoped>
+.remove-border {
+	&::after {
+		border: none;
+	}
+}
+.border-color {
+	border-color: var(--primary-color) !important;
+}
+
+.text-color {
+	color: var(--primary-color) !important;
+}
+
+.bg-color {
+	background-color: var(--primary-color) !important;
+}
+
+.class-select {
+	position: relative;
+	font-weight: bold;
+
+	&::before {
+		content: "";
+		position: absolute;
+		bottom: 0;
+		height: 6rpx;
+		background-color: $u-primary;
+		width: 90%;
+		left: 50%;
+		transform: translateX(-50%);
+	}
+}
+
+.list-select {
+	position: relative;
+	margin-right: 28rpx;
+
+	&::before {
+		content: "";
+		position: absolute;
+		background-color: #999;
+		width: 2rpx;
+		height: 70%;
+		top: 50%;
+		right: -14rpx;
+		transform: translatey(-50%);
+	}
+}
+
+.transform-rotate {
+	transform: rotate(180deg);
+}
+
+.text-color {
+	color: $u-primary;
+}
+.border-color {
+	border-color: $u-primary;
+}
+.bg-color {
+	background-color: $u-primary;
+}
+
+// search input
+.search-box {
+	display: flex;
+	align-items: center;
+	padding: 0 30rpx;
+}
+
+.search-box .search-ipt {
+	height: 58rpx;
+	background-color: #F6F8F8;
+	border-radius: 33rpx;
+}
+
+.search-box .search-ipt .input-placeholder {
+	color: #A5A6A6;
+}
+
+.tabs-box {
+	width: 168rpx;
+	font-size: 26rpx;
+}
+
+.tabs-box .tab-item {
+	display: flex;
+	align-items: center;
+	min-height: 56rpx;
+	padding: 20rpx 0;
+	background-color: #fff;
+}
+.tabs-box .tab-item-active {
+	position: relative;
+	color: var(--primary-color);
+	background-color:#f6f6f6;
+	&::before {
+		display: inline-block;
+		position: absolute;
+		left: 0rpx;
+		top: 50%;
+		transform: translateY(-50%);
+		content: '';
+		width: 6rpx;
+		height: 48rpx;
+		background-color: var(--primary-color);
+	}
+
+	&::after {
+		display: inline-block;
+		position: absolute;
+		left: 0rpx;
+		top: 50%;
+		transform: translateY(-50%);
+		content: '';
+		width: 6rpx;
+		height: 48rpx;
+		background-color: var(--primary-color);
+	}
+}
+
+/*  #ifdef  H5  */
+.category .labelPopup :deep(.u-transition) {
+	top: 92rpx !important;
+	left: 168rpx !important;
+	z-index: 8 !important;
+}
+
+.category .labelPopup.active :deep(.u-transition) {
+	top: 192rpx !important;
+}
+
+/*  #endif  */
+
+.scroll-height{
+	height: 100%;
+}
+/*  #ifdef  H5  */
+.cart{
+	.child.noData1{
+		height: calc(100vh - 146rpx - 92rpx - 100rpx - 50px - constant(safe-area-inset-bottom));
+		height: calc(100vh - 146rpx - 92rpx - 100rpx - 50px - env(safe-area-inset-bottom));
+	}
+	.child.noData2{
+		height: calc(100vh - 40rpx - 92rpx - 100rpx - 50px - constant(safe-area-inset-bottom));
+		height: calc(100vh - 40rpx - 92rpx - 100rpx - 50px - env(safe-area-inset-bottom));
+	}
+	.noChild.noData1{
+		height: calc(100vh - 146rpx - 100rpx - 50px - constant(safe-area-inset-bottom));
+		height: calc(100vh - 146rpx - 100rpx - 50px - env(safe-area-inset-bottom));
+	}
+	.noChild.noData2{
+		height: calc(100vh - 40rpx - 100rpx - 50px - constant(safe-area-inset-bottom));
+		height: calc(100vh - 40rpx - 100rpx - 50px - env(safe-area-inset-bottom));
+	}
+}
+.detail{
+	.child.noData1{
+		height: calc(100vh - 146rpx - 92rpx - 50px - constant(safe-area-inset-bottom));
+		height: calc(100vh - 146rpx - 92rpx - 50px - env(safe-area-inset-bottom));
+	}
+	.child.noData2{
+		height: calc(100vh - 40rpx - 92rpx - 50px - constant(safe-area-inset-bottom));
+		height: calc(100vh - 40rpx - 92rpx - 50px - env(safe-area-inset-bottom));
+	}
+	.noChild.noData1{
+		height: calc(100vh - 146rpx - 50px - constant(safe-area-inset-bottom));
+		height: calc(100vh - 146rpx - 50px - env(safe-area-inset-bottom));
+	}
+	.noChild.noData2{
+		height: calc(100vh - 40rpx - 50px - constant(safe-area-inset-bottom));
+		height: calc(100vh - 40rpx - 50px - env(safe-area-inset-bottom));
+	}
+}
+/*  #endif  */
+/*  #ifndef  H5  */
+.cart{
+	.child.noData1{
+		height: calc(100vh - 146rpx - 92rpx - 100rpx - 100rpx - constant(safe-area-inset-bottom));
+		height: calc(100vh - 146rpx - 92rpx - 100rpx - 100rpx - env(safe-area-inset-bottom));
+	}
+	.child.noData2{
+		height: calc(100vh - 40rpx - 92rpx - 100rpx - 100rpx - constant(safe-area-inset-bottom));
+		height: calc(100vh - 40rpx - 92rpx - 100rpx - 100rpx - env(safe-area-inset-bottom));
+	}
+	.noChild.noData1{
+		height: calc(100vh - 146rpx - 100rpx - 100rpx - constant(safe-area-inset-bottom));
+		height: calc(100vh - 146rpx - 100rpx - 100rpx - env(safe-area-inset-bottom));
+	}
+	.noChild.noData2{
+		height: calc(100vh - 40rpx - 100rpx - 100rpx - constant(safe-area-inset-bottom));
+		height: calc(100vh - 40rpx - 100rpx - 100rpx - env(safe-area-inset-bottom));
+	}
+}
+.detail{
+	.child.noData1{
+		height: calc(100vh - 146rpx - 92rpx - 100rpx - constant(safe-area-inset-bottom));
+		height: calc(100vh - 146rpx - 92rpx - 100rpx - env(safe-area-inset-bottom));
+	}
+	.child.noData2{
+		height: calc(100vh - 40rpx - 92rpx - 100rpx - constant(safe-area-inset-bottom));
+		height: calc(100vh - 40rpx - 92rpx - 100rpx - env(safe-area-inset-bottom));
+	}
+	.noChild.noData1{
+		height: calc(100vh - 146rpx - 100rpx - constant(safe-area-inset-bottom));
+		height: calc(100vh - 146rpx - 100rpx - env(safe-area-inset-bottom));
+	}
+	.noChild.noData2{
+		height: calc(100vh - 40rpx - 100rpx - constant(safe-area-inset-bottom));
+		height: calc(100vh - 40rpx - 100rpx - env(safe-area-inset-bottom));
+	}
+}
+/*  #endif  */
+.mescroll-empty.empty-page.part{
+	width: 542rpx;
+	height: 542rpx;
+	margin: 0;
+	padding-top: 50rpx;
+	.img{
+		width: 160rpx !important;
+		height: 120rpx !important;
+	}
+}
+</style>
diff --git a/uni-app/src/addon/shop/pages/goods/detail.vue b/uni-app/src/addon/shop/pages/goods/detail.vue
new file mode 100644
index 00000000..fa093144
--- /dev/null
+++ b/uni-app/src/addon/shop/pages/goods/detail.vue
@@ -0,0 +1,1027 @@
+<template>
+	<view :style="themeColor()">
+		<view class="bg-[var(--page-bg-color)] min-h-[100vh] relative" v-if="Object.keys(goodsDetail).length">
+			<!-- 自定义头部 -->
+			<view class="flex items-center fixed left-0 right-0 z-10 bg-transparent detail-head" :class="{'!bg-[#fff]' :detailHeadBgChange}" :style="navbarInnerStyle">
+				<text class="nc-iconfont nc-icon-zuoV6xx" :style="navbarInnerArrowStyle" @click="backToPrevious()"></text>
+				<view class="ml-auto !pt-[12rpx] !pb-[8rpx] p-[10rpx] bg-[rgba(255,255,255,.4)] rounded-full border-[2rpx] border-solid border-transparent box-border nc-iconfont nc-icon-fenxiangV6xx font-bold text-[#303133] text-[36rpx]" :class="{'border-[#d8d8d8]': detailHeadBgChange}"  @click="openShareFn"></view>
+			</view>
+
+			<view class="w-full h-[100vw] relative overflow-hidden">
+				<view class="absolute top-0 left-0 w-full h-full transition-transform duration-300 ease-linear transform"
+					:class="{'translate-x-0':switchMedia === 'img','translate-x-full':switchMedia != 'img'}">
+					<u-swiper :list="goodsDetail.goods.goods_image" :indicator="goodsDetail.goods.goods_image.length" :indicatorStyle="{'bottom': '70rpx'}" :autoplay="switchMedia === 'img'?true:false" height="100vw" radius="0" @click="swiperClick"></u-swiper>
+				</view>
+				<!-- <view class="media-mode absolute top-0 left-0 w-full h-full transition-transform duration-300 ease-linear transform"
+					:class="{'translate-x-0':switchMedia === 'video','-translate-x-full':switchMedia != 'video'}">
+					<video id="goodsVideo" class="w-full h-full" :src="img(goodsDetail.goods.goods_video)" :poster="img(goodsDetail.goods.goods_cover_thumb_mid)" objectFit="cover"></video>
+				</view> -->
+				<!-- 切换视频、图片 -->
+				<!-- <view class="media-mode absolute bottom-[74rpx] w-full text-center leading-[50rpx] " v-if="goodsDetail.goods.goods_video != ''">
+				    <text :class="{ '!bg-[var(--primary-color)]': switchMedia == 'video' }" @click="switchMedia = 'video'">视频</text>
+				    <text :class="{ '!bg-[var(--primary-color)]': switchMedia == 'img' }" @click="(switchMedia = 'img'), videoContext.pause()">图片</text>
+				</view> -->
+			</view>
+			<view v-if="priceType != ''" class="rounded-t-[40rpx] -mt-[44rpx] relative flex items-center justify-between !bg-cover box-border pb-[26rpx] h-[136rpx] px-[30rpx]" :style="{ background: 'url(' + img('addon/shop/detail/discount_price_bg.png') + ') no-repeat'}">
+				<view class="text-[#fff]">
+					<text class="text-[26rpx] mr-[10rpx] font-500 leading-[36rpx]" v-if="priceType == 'newcomer_price'">新人价</text>
+					<text class="text-[26rpx] mr-[10rpx] font-500 leading-[36rpx]" v-else-if="priceType == 'discount_price'">折扣价</text>
+					<text class="text-[26rpx] mr-[10rpx] font-500 leading-[36rpx]" v-else-if="priceType == 'member_price'">会员价</text>
+					<view class="inline-block mr-[14rpx]">
+						<text class="text-[32rpx] price-font mr-[4rpx]">￥</text>
+						<text class="text-[48rpx] -mb-[4rpx] price-font">{{ parseFloat(goodsPrice).toFixed(2).split('.')[0] }}</text>
+						<text class="text-[32rpx] price-font">.{{ parseFloat(goodsPrice).toFixed(2).split('.')[1] }}</text>
+					</view>
+					<view class="inline-block">
+						<text class="text-[26rpx] mr-[6rpx]" v-if="goodsDetail.price">售价:</text>
+						<text class="text-[26rpx] price-font leading-[36rpx]">￥{{ goodsDetail.price }}</text>
+					</view>
+				</view>
+				<view v-if="priceType == 'discount_price'" class="flex flex-col text-[#fff] items-end h-[59rpx] justify-between">
+					<image class="h-[28rpx] w-[auto] mr-[2rpx]" :src="img('addon/shop/detail/discount_price.png')" mode="heightFix"></image>
+					<view class="flex items-center text-[24rpx] -mb-[10rpx] overflow-hidden h-[28rpx]">
+						<text class="mr-[4rpx] whitespace-nowrap">距结束</text>
+						<up-count-down class="text-[#fff] text-[28rpx]" :time="discountTime" format="DD:HH:mm:ss" @change="onChange">
+							<view class="flex">
+								<view class="text-[24rpx] flex items-center" v-if="timeData.days>0">
+									<text>{{ timeData.days }}</text>
+									<text class="ml-[4rpx] text-[20rpx]">天</text>
+								</view>
+								<view class="text-[24rpx] flex items-center">
+									<text class="min-w-[30rpx] text-center" v-if="timeData.hours">{{ timeData.hours>=10?timeData.hours:'0'+timeData.hours}}</text>
+									<text class="min-w-[30rpx] text-center" v-else>00</text>
+									<text class="text-[20rpx]">时</text>
+								</view>
+								<view class="text-[24rpx] flex items-center">
+									<text class="min-w-[30rpx] text-center">{{ timeData.minutes >= 10 ? timeData.minutes : '0'+timeData.minutes }}</text>
+									<text class="text-[20rpx]">分</text>
+								</view>
+								<view class="text-[24rpx] flex items-center">
+									<text class="min-w-[30rpx] text-center">{{ timeData.seconds<10 ? '0'+timeData.seconds : timeData.seconds}}</text>
+									<text class="text-[20rpx]">秒</text>
+								</view>
+							</view>
+						</up-count-down>
+					</view>
+				</view>
+			</view>
+			<view class="bg-[var(--page-bg-color)] rounded-[40rpx] overflow-hidden -mt-[34rpx] relative">
+				<view class="datail-title relative px-[30rpx]" :class="{'pt-[40rpx]': priceType != '','pt-[30rpx]': priceType == ''}">
+					<view class="text-[var(--price-text-color)] flex items-baseline mb-[12rpx]" v-if="priceType === ''">
+						<view class="inline-block goods-price-time">
+							<text class="price-font text-[32rpx]">￥</text>
+							<text class="price-font text-[48rpx]">{{ parseFloat(goodsPrice).toFixed(2).split('.')[0] }}</text>
+							<text class="price-font text-[32rpx] mr-[10rpx]">.{{ parseFloat(goodsPrice).toFixed(2).split('.')[1] }}</text>
+						</view>
+						<!-- <text class="text-[26rpx] text-[var(--text-color-light9)] line-through price-font" v-if="goodsDetail.market_price && parseFloat(goodsDetail.market_price)">
+							￥{{ goodsDetail.market_price }}
+						</text> -->
+					</view>
+					<view class="text-[#333] font-medium text-[30rpx] multi-hidden leading-[40rpx]">
+						<view class="brand-tag middle" v-if="goodsDetail.goods.goods_brand">
+							{{goodsDetail.goods.goods_brand.brand_name}}
+						</view>
+						{{ goodsDetail.goods.goods_name }}
+					</view>
+					<view class="flex justify-between items-start mt-[24rpx]">
+						<view class="text-[24rpx] leading-[34rpx] text-[var(--text-color-light6)]" v-if="goodsDetail.market_price && parseFloat(goodsDetail.market_price)">
+							<text class="whitespace-nowrap mr-[4rpx]">划线价:</text>
+							<text class="line-through">￥{{ goodsDetail.market_price }}</text>
+						</view>
+						<view class="text-[24rpx] leading-[34rpx] text-[var(--text-color-light6)]">
+							<text class="whitespace-nowrap mr-[4rpx]">库存:</text>
+							<text class="">{{ goodsDetail.stock }}</text>
+							<text class="">{{ goodsDetail.goods.unit }}</text>
+						</view>
+						<view class="text-[24rpx] leading-[34rpx] text-[var(--text-color-light6)] flex items-baseline">
+							<text class="whitespace-nowrap mr-[4rpx]">销量:</text>
+							<text class="mx-[2rpx]">{{ goodsDetail.goods.sale_num }}</text>
+							<text class="">{{ goodsDetail.goods.unit }}</text>
+						</view>
+					</view>
+					<view class="flex flex-wrap mt-[16rpx]" v-if="goodsDetail.label_info && goodsDetail.label_info.length">
+						<block v-for="item in goodsDetail.label_info" :key="item.label_id">
+							<image class="img-tag middle" v-if="item.style_type == 'icon' && item.icon" :src="img(item.icon)" mode="heightFix" @error="diyGoods.error(item,'icon')"></image>
+							<view class="base-tag middle" v-else-if="item.style_type == 'diy' || !item.icon" :style="diyGoods.baseTagStyle(item)">
+								{{item.label_name}}
+							</view>
+						</block>
+					</view>
+				</view>
+				<view class="mt-[24rpx] sidebar-margin card-template" v-if="isGoodsPropertyTemp">
+					<view @click="servicesDataShow = !servicesDataShow" v-if="goodsDetail.service && goodsDetail.service.length" class="card-template-item">
+						<text class="text-[#333] text-[26rpx] leading-[30rpx] font-400 shrink-0">服务</text>
+						<view class="text-[#343434] text-[26rpx] leading-[30rpx] font-400 truncate ml-auto">
+							{{ goodsDetail.service[0].service_name }}
+						</view>
+						<text class="nc-iconfont nc-icon-youV6xx text-[26rpx] text-[var(--text-color-light6)] ml-[8rpx]"></text>
+					</view>
+					<view @click="buyFn" v-if="goodsDetail.goodsSpec && goodsDetail.goodsSpec.length" class="card-template-item">
+						<text class="text-[#333] text-[26rpx] leading-[30rpx] font-400 shrink-0 mr-[20rpx]">已选</text>
+						<view class="ml-auto text-right truncate flex-1 text-[#343434] text-[26rpx] leading-[30rpx] font-400">
+							{{ goodsDetail.sku_spec_format }}
+						</view>
+						<text class="nc-iconfont nc-icon-youV6xx text-[26rpx] text-[var(--text-color-light6)] ml-[8rpx]"></text>
+					</view>
+					<view class="card-template-item" @click="distributionDataOpen" v-if="goodsDetail.goods.goods_type == 'real'&&goodsDetail.delivery_type_list&&goodsDetail.delivery_type_list.length">
+						<text class="text-[#333] text-[26rpx] leading-[30rpx] font-400 shrink-0">配送</text>
+						<view class="ml-auto flex items-center text-[#343434] text-[26rpx] leading-[30rpx] font-400">
+							{{ goodsDetail.delivery_type_list[selectDeliveryType].name }}
+						</view>
+						<text class="nc-iconfont nc-icon-youV6xx text-[26rpx] text-[var(--text-color-light6)] ml-[8rpx]"></text>
+					</view>
+					<view @click="couponListShow = true" v-if="couponList.length" class="card-template-item">
+						<text class="text-[#333] text-[26rpx] leading-[30rpx] font-400 shrink-0 mr-[20rpx]">领券</text>
+						<view class="ml-auto flex-1 flex-nowrap flex items-center overflow-hidden h-[44rpx] content-between">
+							<block v-for="(item, index) in couponList" :key="index">
+								<text v-if="index < 3" class="tag-item whitespace-nowrap border-[2rpx] px-[6rpx] h-[40rpx] border-solid border-[var(--primary-color)] text-[var(--primary-color)] mt-[4rpx]" :class="{'mr-[12rpx]': couponList.length != (index+1) && index < 2, 'ml-auto': index == 0}">
+									{{ item.title }}
+								</text>
+							</block>
+						</view>
+						<text class="nc-iconfont nc-icon-youV6xx text-[26rpx] text-[var(--text-color-light6)] ml-[8rpx]"></text>
+					</view>
+					<view class="card-template-item" @click="manjianOpenFn" v-if="Object.keys(manjianData).length">
+						<text class="text-[#333] text-[26rpx] leading-[30rpx] font-400 shrink-0 mr-[20rpx]">优惠</text>
+						<view class="ml-auto flex-1 flex-nowrap flex items-center overflow-hidden h-[44rpx] justify-end">
+							<view class="bg-[var(--primary-color-light)] text-[var(--primary-color)] rounded-[6rpx]	text-[22rpx] flex items-center justify-center w-[86rpx] h-[34rpx] mr-[6rpx]">满减送</view>
+							<view class="truncate max-w-[430rpx] text-[26rpx]">{{manjianData.name}}</view>
+						</view>
+						<text class="nc-iconfont nc-icon-youV6xx text-[26rpx] text-[var(--text-color-light6)] ml-[8rpx]"></text>
+					</view>
+				</view>
+
+				<sow-show v-if="goodsDetail.sow_show_list" :items="goodsDetail.sow_show_list" class="sidebar-margin"></sow-show>
+
+				<view v-if="goodsDetail.evaluate_is_show" class="mt-[var(--top-m)] sidebar-margin card-template">
+					<view class="flex items-center justify-between min-h-[40rpx]" :class="{'mb-[30rpx]': evaluate && evaluate.list && evaluate.list.length}">
+						<text class="title !mb-[0]">宝贝评价({{ evaluate.count }})</text>
+						<view v-if="evaluate.count" class="h-[40rpx] flex items-center" @click="toLink(goodsDetail.goods_id)">
+							<text class="text-[24rpx] text-[var(--text-color-light9)]">查看全部</text>
+							<text class="nc-iconfont nc-icon-youV6xx text-[26rpx] text-[var(--text-color-light9)]"></text>
+						</view>
+						<text v-if="!evaluate.count" class="text-[24rpx] text-[var(--text-color-light6)]">暂无评价</text>
+					</view>
+					<view>
+						<view :class="{'pb-[34rpx]': index != (evaluate.list.length-1)}" v-for="(item, index) in evaluate.list" :key="index">
+							<view class="flex items-center w-full">
+								<u-avatar :default-url="img('static/resource/images/default_headimg.png')" :src="img(item.member_head)" :size="'50rpx'" leftIcon="none" />
+								<text class="ml-[10rpx] text-[28rpx] text-[#333]">{{ item.member_name }}</text>
+							</view>
+							<view class="flex justify-between w-full mt-[16rpx]">
+								<view class="flex-1 w-[540rpx] text-[26rpx] text-[#333] max-h-[72rpx] leading-[36rpx] multi-hidden mr-[50rpx]">{{ item.content }}</view>
+								<view class="w-[80rpx] shrink-0">
+									<u--image v-if="item.image_mid && item.image_mid.length" width="80rpx" height="80rpx" radius="var(--goods-rounded-mid)" :src="img(item.image_mid[0])" model="aspectFill" @click="imgListPreview(item.images[0])">
+										<template #error>
+											<u-icon name="photo" color="#999" size="50"></u-icon>
+										</template>
+									</u--image>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+
+				<view class="my-[var(--top-m)] goods-sku sidebar-margin card-template" v-if="goodsDetail.goods && goodsDetail.goods.attr_format && Object.keys(goodsDetail.goods.attr_format).length">
+					<view class="title mb-[30rpx]">商品属性</view>
+					<view>
+						<block v-for="(item,index) in goodsDetail.goods.attr_format" :key="index">
+							<view v-if="index < 4 || isAttrFormatShow" class="card-template-item">
+								<text class="text-[26rpx] leading-[30rpx] w-[160rpx] font-400 shrink-0 text-[var(--text-color-light9)]">{{item.attr_value_name}}</text>
+								<view class="text-[#333] box-border value-wid text-[26rpx] leading-[30rpx] font-400 pl-[20rpx]">
+									{{Array.isArray(item.attr_child_value_name) ? item.attr_child_value_name.join(',') : item.attr_child_value_name }}
+								</view>
+								<!-- <text class="nc-iconfont nc-icon-youV6xx text-[26rpx] text-[var(--text-color-light6)] ml-[8rpx]"></text> -->
+							</view>
+						</block>
+						<view v-if="goodsDetail.goods.attr_format.length > 4" class="flex-center" @click="isAttrFormatShow = !isAttrFormatShow">
+							<text class="text-[24rpx] mr-[10rpx]">{{!isAttrFormatShow ? '展开' : '收起'}}</text>
+							<text class="nc-iconfont !text-[22rpx]" :class="{'nc-icon-xiaV6xx': !isAttrFormatShow, 'nc-icon-shangV6xx-1': isAttrFormatShow}"></text>
+						</view>
+					</view>
+				</view>
+
+				<view class="my-[var(--top-m)] sidebar-margin card-template px-[var(--pad-sidebar-m)]">
+					<view class="title">商品详情</view>
+					<view class="u-content">
+						<u-parse :content="goodsDetail.goods.goods_desc" :tagStyle="{img: 'vertical-align: top;',p:'overflow: hidden;word-break:break-word;' }"></u-parse>
+					</view>
+				</view>
+
+				<ns-goods-recommend></ns-goods-recommend>
+
+				<view class="tab-bar-placeholder"></view>
+				<view class="border-[0] border-t-[2rpx] border-solid border-[#f5f5f5] w-[100%] flex justify-between pl-[32rpx] pr-[4rpx] bg-[#fff] box-border fixed left-0 bottom-0 tab-bar z-1 items-center">
+					<view class="flex items-center">
+						<view class="flex flex-col justify-center items-center mr-[38rpx]" @click="redirect({ url: '/addon/shop/pages/index', mode: 'reLaunch' })">
+							<view class="nc-iconfont nc-icon-shouyeV6xx11 text-[36rpx]"></view>
+							<text class="text-[20rpx] mt-[10rpx]">首页</text>
+						</view>
+						<!-- #ifdef H5 -->
+						<view class="flex flex-col justify-center items-center mr-[38rpx]" @click="redirect({ url: '/addon/shop/pages/goods/cart'})">
+							<view class="iconfont icongouwuche2 text-[38rpx]"></view>
+							<text class="text-[20rpx] mt-[10rpx]">购物车</text>
+						</view>
+						<!-- #endif -->
+						<view class="flex flex-col justify-center items-center mr-[38rpx]" @click="collectFn">
+							<text class="nc-iconfont text-[36rpx]" :class="{'text-[#ff0000] nc-icon-xihuanV6mm': isCollect, 'text-[#303133] nc-icon-guanzhuV6xx' : !isCollect}"></text>
+							<text class="text-[20rpx] mt-[10rpx]">收藏</text>
+						</view>
+
+						<!-- #ifdef MP-WEIXIN -->
+						<view>
+							<nc-contact
+									:send-message-title="sendMessageTitle"
+									:send-message-path="sendMessagePath"
+									:send-message-img="sendMessageImg">
+								<view class="flex flex-col justify-center items-center mr-[38rpx]">
+									<text class="nc-iconfont nc-icon-kefuV6xx-1 text-[36rpx]"></text>
+									<text class="text-[20rpx] mt-[10rpx]">客服</text>
+								</view>
+							</nc-contact>
+						</view>
+						<!-- #endif -->
+					</view>
+					<view class="flex flex-1" v-if="goodsDetail.goods.status == 1">
+						<button v-if="goodsDetail.goods.is_gift"
+							class="!w-[420rpx] flex-1 !h-[70rpx] font-500 text-[26rpx] !text-[#fff] !bg-[#ccc] !m-0 leading-[70rpx] rounded-full remove-border"
+							>商品为赠品不可购买</button>
+						<block v-else-if="maxBuy > 0 || maxBuy == -1">
+							<button
+								v-if="goodsDetail.type == '' && (goodsDetail.goods.goods_type == 'real' || (goodsDetail.goods.goods_type == 'virtual' && goodsDetail.goods.virtual_receive_type != 'verify'))"
+								class="flex-1 !h-[70rpx] font-500 text-[26rpx] !text-[#fff] !m-0 !mr-[16rpx] leading-[70rpx] rounded-full remove-border"
+								style="background: linear-gradient(127deg, #FFB000 0%, #FFA029 100%);" @click="buyFn('join_cart')">
+								加入购物车</button>
+							<button
+								v-if="isShowSingleSku"
+								:style="{ width : (goodsDetail.goods.goods_type == 'real' || (goodsDetail.goods.goods_type == 'virtual' && goodsDetail.goods.virtual_receive_type != 'verify')) ?  '200rpx' : '400rpx' + '!important'  }"
+								class="flex-1 !h-[70rpx] font-500 text-[26rpx] !text-[#fff] primary-btn-bg !m-0 !mr-[16rpx] leading-[70rpx] rounded-full remove-border"
+								@click="buyFn('buy_now')">立即购买</button>
+							<button v-else
+								:style="{ width : (goodsDetail.goods.goods_type == 'real' || (goodsDetail.goods.goods_type == 'virtual' && goodsDetail.goods.virtual_receive_type != 'verify')) ?  '200rpx' : '400rpx' + '!important'  }"
+								class="flex-1 !h-[70rpx] font-500 text-[26rpx] !text-[#fff] !bg-[#ccc] !m-0 !mr-[16rpx] leading-[70rpx] rounded-full remove-border"
+								>已售罄</button>
+						</block>
+						<button v-else-if="maxBuy == 0"
+							:style="{ width : '420rpx' + '!important'  }"
+							class="flex-1 !h-[70rpx] font-500 text-[26rpx] !text-[#fff] !bg-[#ccc] !m-0 leading-[70rpx] rounded-full remove-border"
+							>已达限购数量</button>
+					</view>
+					<view class="flex flex-1" v-else>
+						<button class="w-[100%] !h-[70rpx] font-500 text-[26rpx] !text-[#fff] !bg-[#ccc] !m-0 leading-[70rpx] rounded-full remove-border">该商品已下架</button>
+					</view>
+				</view>
+			</view>
+			<!-- 服务 -->
+			<view @touchmove.prevent.stop>
+				<u-popup class="popup-type" :show="servicesDataShow" @close="servicesDataShow = false">
+					<view class="min-h-[480rpx] popup-common" @touchmove.prevent.stop>
+						<view class="title">商品服务</view>
+						<scroll-view class="h-[520rpx]" scroll-y="true">
+							<view class="pl-[22rpx] pb-[28rpx] pr-[37rpx]">
+								<view class="flex mb-[28rpx]" v-for="(item, index) in goodsDetail.service">
+									<image class="mt-[4rpx] w-[32rpx] h-[32rpx] mr-[14rpx]" :src="img(item.image || 'addon/shop/icon_service.png')" mode="aspectFit" />
+									<view class="flex-1">
+										<view class="text-[30rpx] leading-[36rpx] text-[#333] mb-[8rpx]">{{ item.service_name }}</view>
+										<view class="text-[24rpx] leading-[36rpx] text-[var(--text-color-light9)]">{{ item.desc }}</view>
+									</view>
+								</view>
+							</view>
+						</scroll-view>
+					</view>
+				</u-popup>
+			</view>
+			<!-- 配送 -->
+			<view @touchmove.prevent.stop>
+				<u-popup class="popup-type" :show="distributionDataShow" @close="distributionDataShow = false">
+					<view class="min-h-[360rpx] popup-common" @touchmove.prevent.stop>
+						<view class="title">配送方式</view>
+						<scroll-view class="h-[520rpx]" scroll-y="true">
+							<view class="px-[var(--popup-sidebar-m)]">
+								<view class="flex mb-[40rpx]" v-for="(item, index) in goodsDetail.delivery_type_list" @click="distributionListFn(item,index)">
+									<image class="mt-[4rpx] w-[32rpx] h-[32rpx] mr-[14rpx]" :src="img('addon/shop/icon_service.png')" mode="aspectFit" />
+									<view class="flex-1">
+										<view class="text-[30rpx] leading-[36rpx] text-[#333] mb-[8rpx]">{{ item.name }}</view>
+										<view class="text-[24rpx] leading-[36rpx] text-[var(--text-color-light9)]">{{ item.desc }}</view>
+									</view>
+								</view>
+							</view>
+						</scroll-view>
+					</view>
+				</u-popup>
+			</view>
+			<!-- 优惠券 -->
+			<view @touchmove.prevent.stop>
+				<u-popup class="popup-type" :show="couponListShow" @close="couponListShow = false">
+					<view class="min-h-[480rpx] popup-common" @touchmove.prevent.stop>
+						<view class="title">优惠券</view>
+						<scroll-view class="h-[520rpx]" scroll-y="true">
+							<view class="px-[32rpx]">
+								<view
+									class="mb-[30rpx] flex items-center border-[2rpx] border-solid border-[rgba(0,0,0,.1)] rounded-[var(--rounded-small)]"
+									v-for="(item, index) in couponList" :key="index">
+									<view class="flex flex-col items-center my-[20rpx] w-[200rpx] border-0 border-r-[2rpx] border-dashed border-[rgba(0,0,0,.1)]">
+										<view class="text-xs price-font">
+											<text class="text-[28rpx]">￥</text>
+											<text class="text-[48rpx]">{{ Number(item.price) }}</text>
+										</view>
+										<text class="text-xs mt-[12rpx]">{{ Number(item.min_condition_money) ? ('满' + Number(item.min_condition_money) + '元可用') : '无门槛' }}</text>
+									</view>
+									<view class="ml-[20rpx] flex-1 flex flex-col py-[20rpx]">
+										<text class="text-xs font-500">{{ item.title }}</text>
+										<text class="text-xs text-[var(--text-color-light6)] mt-[12rpx]">{{ item.valid_type == 1 &&
+											('领取之日起' + item.length + '天内有效') || item.valid_type == 2 &&
+											('领取之日起至' + item.valid_end_time) }}</text>
+									</view>
+									<text v-if="item.btnType === 'collecting'"
+										class="bg-[var(--primary-color)] mr-[20rpx] w-[106rpx] box-border text-center text-[#fff] h-[50rpx] text-[22rpx] px-[20rpx] leading-[50rpx] rounded-[100rpx]"
+										@click="getCouponFn(item, index)">领取</text>
+									<text v-else class="!bg-[var(--primary-color-disabled)] mr-[20rpx] text-[#fff] mr-[20rpx] h-[50rpx] text-[22rpx] px-[20rpx] leading-[50rpx] rounded-[100rpx]">{{ item.btnType === 'collected' ? '已领完' : '已领取' }}</text>
+								</view>
+							</view>
+						</scroll-view>
+						<view class="btn-wrap">
+							<button class="primary-btn-bg btn" @click="couponListShow = false">确定</button>
+						</view>
+					</view>
+				</u-popup>
+			</view>
+			<ns-goods-sku v-if="loading" ref="goodsSkuRef" :goods-detail="goodsDetail" @change="specSelectFn"></ns-goods-sku>
+			<ns-goods-manjian ref="manjianShowRef"></ns-goods-manjian>
+			<share-poster ref="sharePosterRef" posterType="shop_goods" :posterId="goodsDetail.goods.poster_id" :posterParam="posterParam" :copyUrlParam="copyUrlParam" />
+		</view>
+
+		<!-- #ifdef MP-WEIXIN -->
+		<!-- 小程序隐私协议 -->
+		<wx-privacy-popup ref="wxPrivacyPopupRef"></wx-privacy-popup>
+		<!-- #endif -->
+	</view>
+</template>
+
+<script setup lang="ts">
+import { ref, computed, getCurrentInstance, nextTick } from 'vue';
+import { onLoad, onShow, onUnload,onPageScroll } from '@dcloudio/uni-app'
+import { img, redirect,handleOnloadParams, getToken, deepClone, goback } from '@/utils/common';
+import { t } from '@/locale';
+import { getGoodsDetail, browse, collect, cancelCollect, getEvaluateList, getManjian } from '@/addon/shop/api/goods';
+import { getShopCouponList, getCoupon } from '@/addon/shop/api/coupon';
+import nsGoodsSku from '@/addon/shop/components/ns-goods-sku/ns-goods-sku.vue';
+import nsGoodsManjian from '@/addon/shop/components/ns-goods-manjian/ns-goods-manjian.vue';
+import useCartStore from '@/addon/shop/stores/cart'
+import { useLogin } from '@/hooks/useLogin'
+import useMemberStore from '@/stores/member'
+import { useShare }from '@/hooks/useShare'
+import sharePoster from '@/components/share-poster/share-poster.vue'
+import {useGoods} from '@/addon/shop/hooks/useGoods'
+import useSystemStore from '@/stores/system'
+import nsGoodsRecommend from '@/addon/shop/components/ns-goods-recommend/ns-goods-recommend.vue';
+import sowShow from '@/components/sow-show/sow-show.vue';
+
+const diyGoods = useGoods();
+// 使用 reactive 创建响应式对象
+const timeData = ref({});
+// 定义 onChange 方法
+const onChange = (e) => {
+  timeData.value = e;
+};
+
+// 分享
+const{setShare} = useShare()
+
+// 会员信息
+const memberStore = useMemberStore()
+const userInfo = computed(() => memberStore.info)
+
+// 购物车数量
+const cartStore = useCartStore();
+const cartTotalNum = computed(() => cartStore.totalNum)
+
+const goodsSkuRef: any = ref(null);
+const goodsDetail: any = ref({});
+const switchMedia: any = ref('img');
+const manjianShowRef: any = ref(null); //满减送
+
+const isAttrFormatShow = ref(false); //控制属性是否展开
+
+const loading = ref<boolean>(false);
+const servicesDataShow = ref<boolean>(false)
+const distributionDataShow =  ref<boolean>(false) //配送
+const couponListShow = ref<boolean>(false) //优惠券
+const discountTime = ref(0)
+
+const sendMessageTitle = ref('')
+const sendMessagePath = ref('')
+const sendMessageImg = ref('')
+
+const wxPrivacyPopupRef:any = ref(null)
+const videoContext: any = ref(null)
+let pageParameter = {};
+
+onLoad((option: any) => {
+	// #ifdef MP-WEIXIN
+	// 处理小程序场景值参数
+	option = handleOnloadParams(option);
+	// #endif
+	pageParameter = option;
+})
+
+onShow(() => {
+	setTimeout(()=>{ //延迟器用于sku框中的表单上传图片时，让onshow慢与图片上传方法
+		// 详情sku-表单，上传图片时不触发onshow内部方法
+		if(!uni.getStorageSync('sku_form_refresh')){
+			loading.value = false;
+			// 删除配送方式
+			uni.removeStorageSync('distributionType');
+			cartStore.getList();
+			getManjianInfo();
+			getDetailInfo();
+		}else{
+			uni.removeStorageSync('sku_form_refresh');
+		}
+	})
+})
+
+const getDetailInfo = ()=>{
+	getGoodsDetail({
+		goods_id: pageParameter.goods_id || '',
+		sku_id: pageParameter.sku_id || '',
+		type: pageParameter.type || ''  // 来源营销活动类型，例如：discount：限时折扣，newcomer_discount：新人价
+	}).then((res: any) => {
+		if (!res.data.goods || JSON.stringify(res.data) === '[]') {
+	        let goBackParameter = {
+	            url:'/addon/shop/pages/index',
+	            title: '找不到该商品',
+	            mode: 'reLaunch'
+	        };
+	        goback(goBackParameter)
+			return false
+		}
+
+		goodsDetail.value = deepClone(res.data);
+		isCollect.value = goodsDetail.value.goods.is_collect;
+		goodsDetail.value.delivery_type_list = goodsDetail.value.goods.delivery_type_list ? Object.values(goodsDetail.value.goods.delivery_type_list) : [];
+		goodsDetail.value.goods.goods_image = goodsDetail.value.goods.goods_image_thumb_big;
+		goodsDetail.value.goods.goods_image.forEach((item: any, index: any) => {
+			goodsDetail.value.goods.goods_image[index] = img(item);
+		})
+
+		loading.value = true;
+
+		let data: any = deepClone(res.data);
+		goodsDetail.value.goods.attr_format = []
+		if (data.goods && data.goods.attr_format) {
+			let attrFormatArr: any = deepClone(JSON.parse(data.goods.attr_format));
+			attrFormatArr.forEach((item: any, index: any) => {
+				if ((item.attr_child_value_name && !(item.attr_child_value_name instanceof Array)) || ((item.attr_child_value_name instanceof Array) && item.attr_child_value_name.length)) {
+					goodsDetail.value.goods.attr_format.push(item);
+				}
+			})
+		}
+		if(goodsDetail.value.goods.goods_video != '') videoContext.value = uni.createVideoContext('goodsVideo');
+		sendMessageTitle.value = goodsDetail.value.goods.goods_name
+		sendMessagePath.value = '/addon/shop/pages/goods/detail?sku_id=' + goodsDetail.value.sku_id;
+		if(goodsDetail.value.type) {
+			sendMessagePath.value += '&type=' + goodsDetail.value.type;
+		}
+		sendMessageImg.value = img(goodsDetail.value.goods.goods_cover_thumb_mid)
+
+		// 分享 - start
+		let share = {
+			title: goodsDetail.value.goods.goods_name,
+			desc: goodsDetail.value.goods.sub_title,
+			url: goodsDetail.value.goods.goods_cover_thumb_mid
+		}
+		uni.setNavigationBarTitle({
+			title: goodsDetail.value.goods.goods_name
+		})
+
+		setShare({
+			wechat: {
+				...share
+			},
+			weapp: {
+				...share
+			}
+		});
+		// 分享 - end
+
+		// 折扣信息
+		if (Object.keys(goodsDetail.value.goods).length && goodsDetail.value.type == 'discount' && goodsDetail.value.goods.is_discount && Object.keys(goodsDetail.value.discount_info).length) {
+			let now = new Date();
+			let timestamp: any = now.getTime();
+			discountTime.value = goodsDetail.value.discount_info.active.end_time * 1000 - timestamp.toFixed(0)
+		}
+		// 商品限购
+		goodsMaxBuy(goodsDetail.value);
+
+		// 获取优惠券列表
+		getShopCouponListFn();
+
+		// 获取评价
+		getEvaluateListFn();
+
+		if(getToken()) {
+			// 我的足迹
+			myBrowseFn(goodsDetail.value.goods.goods_id);
+		}
+
+		copyUrlFn();
+
+		nextTick(() => {
+
+			setTimeout(() => {
+				const query = uni.createSelectorQuery().in(instance);
+				query.select('.swiper-box').boundingClientRect((data: any) => {
+					swiperHeight = data ? data.height : 0;
+				}).exec();
+				query.select('.detail-head').boundingClientRect((data: any) => {
+					if (data) {
+						detailHead = data.height ? data.height : 0;
+					}
+				}).exec();
+
+				if(sharePosterRef.value) {
+					posterParam.sku_id = goodsDetail.value.sku_id;
+					if (userInfo.value && userInfo.value.member_id) posterParam.member_id = userInfo.value.member_id;
+					sharePosterRef.value.loadPoster();
+				}
+
+			}, 400)
+
+			// #ifdef MP
+			if(wxPrivacyPopupRef.value) wxPrivacyPopupRef.value.proactive();
+			// #endif
+		})
+	})
+}
+
+// 我的足迹
+const myBrowseFn = (goods_id:any)=>{
+	browse({
+		goods_id
+	}).then((res: any) => {})
+}
+
+// 获取满减信息
+let manjianData = ref({})
+const getManjianInfo = ()=>{
+	getManjian({
+		goods_id: pageParameter.goods_id || '',
+		sku_id: pageParameter.sku_id || ''
+	}).then((res: any) => {
+		if(Object.keys(res.data).length){
+			manjianData.value.condition_type = res.data.condition_type;
+			manjianData.value.rule_json = res.data.rule_json;
+			manjianData.value.name = res.data.manjian_name;
+		}
+	})
+}
+
+// 商品限购
+const maxBuy = ref(-1);
+const goodsMaxBuy = (data:any = {})=>{
+	// 限购 - 是否开启限购
+	if(data.goods.is_limit && userInfo.value && data.goods.stock > 0){
+		if(data.goods.max_buy){
+			let max_buy = 0;
+			if(data.goods.limit_type == 1){ //单次限购
+				max_buy = data.goods.max_buy;
+			}else{ // 单人限购
+				let buyVal = data.goods.max_buy - (data.goods.has_buy||0);
+				max_buy = buyVal > 0 ? buyVal : 0;
+			}
+
+			if(max_buy > data.goods.stock){
+				maxBuy.value = data.goods.stock
+			}else if(max_buy <= data.goods.stock){
+				maxBuy.value = max_buy;
+			}
+		}
+	}
+}
+
+const specSelectFn = (id: any) => {
+	goodsDetail.value.skuList.forEach((item: any, index: any) => {
+		if (item.sku_id == id) {
+			Object.assign(goodsDetail.value, item);
+		}
+	})
+}
+
+// 判断单规格库存是否为0
+const isShowSingleSku = computed(() => {
+	let isSingleSpec = false // 是否为单规格，true：多规格，false：单规格
+	goodsDetail.value.skuList.forEach((item: any,index: any)=>{
+		if(item.sku_spec_format){
+			isSingleSpec = true
+		}
+	})
+
+	// 单规格，库存为0，显示已售罄
+	if(!isSingleSpec && goodsDetail.value.stock <= 0){
+	    return false;
+	}else if(!isSingleSpec && goodsDetail.value.stock > 0){
+	    // 单规格，库存大于0，可以购买
+        return true;
+    }
+	return true;
+})
+
+// 判断商品属性模块是否展示
+const isGoodsPropertyTemp = computed(() => {
+	let bool = false;
+	if(goodsDetail.value.service && goodsDetail.value.service.length ||
+	goodsDetail.value.goodsSpec && goodsDetail.value.goodsSpec.length ||
+	goodsDetail.value.goods.goods_type == 'real'&&goodsDetail.value.delivery_type_list&&goodsDetail.value.delivery_type_list.length || couponList.value.length){
+		bool = true;
+	}
+	return bool;
+})
+
+const manjianOpenFn = () =>{
+	manjianShowRef.value.open(manjianData.value);
+}
+
+const buyFn = (type: any) => {
+	if(goodsSkuRef.value){
+		goodsSkuRef.value.open(type)
+	}
+}
+
+// 收藏
+const isCollect: any = ref(0);
+const collectFn = () => {
+	// 检测是否登录
+	if (!userInfo.value) {
+		uni.showToast({
+			title: '未登录，请先登录后再收藏商品',
+			icon: 'none'
+		});
+		return false
+	}
+	let api = isCollect.value ? cancelCollect({ goods_ids: [goodsDetail.value.goods_id]}) : collect(goodsDetail.value.goods_id);
+	api.then(res => {
+		isCollect.value = !isCollect.value;
+		if (isCollect.value) {
+			uni.showToast({
+				title: '收藏成功',
+				icon: 'none'
+			});
+		} else {
+			uni.showToast({
+				title: '取消收藏',
+				icon: 'none'
+			});
+		}
+	})
+}
+
+// 优惠券
+const couponList = ref([]);
+const getShopCouponListFn = () => {
+	getShopCouponList({
+		category_id: goodsDetail.value.goods.goods_category || '',
+		goods_id: goodsDetail.value.goods_id || ''
+	}).then((res: any) => {
+		couponList.value = res.data.data.map((el: any) => {
+			if (el.sum_count != -1 && el.receive_count === el.sum_count) {
+				el.btnType = 'collected'//已领完
+			}
+			if (!userInfo.value) {
+				el.btnType = 'collecting'//领用
+			} else {
+				if (el.is_receive && el.limit_count === el.member_receive_count) {
+					el.btnType = 'using'//去使用
+				} else {
+					el.btnType = 'collecting'//领用
+				}
+			}
+			return el
+		});
+	})
+}
+
+// 领取优惠券
+const getCouponFn = (data: any, index: any) => {
+	// 检测是否登录
+	if (!userInfo.value) {
+		useLogin().setLoginBack({
+			url: '/addon/shop/pages/goods/detail',
+			param: { sku_id: goodsDetail.value.sku_id, type: goodsDetail.value.type }
+		})
+		return false
+	}
+	getCoupon({
+		coupon_id: data.id || '',
+		number: 1,
+	}).then(res => {
+		// couponList.value[index].btnType = 'using'
+		getShopCouponListFn();
+	})
+}
+
+// 获取评价
+const evaluate = ref({
+	count : 0
+})
+
+const getEvaluateListFn = () => {
+	getEvaluateList(goodsDetail.value.goods_id).then((res: any) => {
+		evaluate.value = res.data
+	})
+}
+
+//进入评论
+const toLink = () => {
+	redirect({ url: '/addon/shop/pages/evaluate/list', param: { goods_id: goodsDetail.value.goods_id } })
+}
+
+//预览图片
+const imgListPreview = (item:any,index:any) => {
+	if(Array.isArray(item)){
+		if (!item.length) return false
+		var urlList =item;
+		uni.previewImage({
+			indicator: "number",
+			current:index,
+			loop: true,
+			urls: urlList
+		})
+	}else{
+		if (item === '') return false
+		var urlList = []
+		urlList.push(img(item))  //push中的参数为 :src="item.img_url" 中的图片地址
+		uni.previewImage({
+			indicator: "number",
+			loop: true,
+			urls: urlList
+		})
+	}
+
+}
+
+// 返回上一页
+const backToPrevious=()=> {
+	if(getCurrentPages().length > 1){
+		uni.navigateBack({
+			delta: 1
+		});
+	}else{
+        redirect({
+			url: '/addon/shop/pages/index',
+            mode: 'reLaunch'
+		});
+	}
+}
+
+/************ 选择配送方式-start ****************/
+const selectDeliveryType = ref(0);
+const distributionDataOpen = (()=>{
+	distributionDataShow.value = true;
+});
+const distributionListFn = ((data: any,index: any)=>{
+	selectDeliveryType.value =  index;
+	distributionDataShow.value = false;
+	uni.setStorageSync('distributionType', data.name);
+});
+/************ 选择配送方式-end ****************/
+
+
+/************ 自定义头部-start ****************/
+// 获取系统状态栏的高度
+let systemInfo = uni.getSystemInfoSync();
+let platform = systemInfo.platform;
+let menuButtonInfo: any = {};
+// 如果是小程序，获取右上角胶囊的尺寸信息，避免导航栏右侧内容与胶囊重叠(支付宝小程序非本API，尚未兼容)
+// #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+menuButtonInfo = uni.getMenuButtonBoundingClientRect();
+// #endif
+
+// 导航栏内部盒子的样式
+const navbarInnerStyle = computed(() => {
+	let style = '';
+	// 导航栏宽度，如果在小程序下，导航栏宽度为胶囊的左边到屏幕左边的距离
+	// #ifdef MP
+	let rightButtonWidth = menuButtonInfo.width ? menuButtonInfo.width * 2 + 'rpx' : '70rpx';
+	style += 'height:' + menuButtonInfo.height + 'px;';
+	style += 'padding-right:calc(' + rightButtonWidth + ' + 30rpx);';
+	style += 'padding-left:calc(' + rightButtonWidth + ' + 30rpx);';
+	style += 'padding-top:' + menuButtonInfo.top + 'px;';
+	style += 'padding-bottom: 8px;';
+
+	style += 'font-size: 32rpx;';
+	if (platform === 'ios') {
+		// 苹果(iOS)设备
+		style += 'font-weight: 500;';
+	} else if (platform === 'android') {
+	  // 安卓(Android)设备
+		style += 'font-size: 36rpx;';
+	}
+	// #endif
+
+	// #ifdef H5
+	style += 'height: 100rpx;';
+	style += 'padding-right: 30rpx;';
+	style += 'padding-left: 30rpx;';
+
+	style += 'font-size: 32rpx;';
+	if (platform === 'ios') {
+		// 苹果(iOS)设备
+		style += 'font-weight: 500;';
+	} else if (platform === 'android') {
+	  // 安卓(Android)设备
+		style += 'font-size: 36rpx;';
+	}
+	// #endif
+	return style;
+})
+
+// 导航栏内部盒子的样式
+const navbarInnerArrowStyle = computed(() => {
+	let style = '';
+	// 导航栏宽度，如果在小程序下，导航栏宽度为胶囊的左边到屏幕左边的距离
+	// #ifdef MP
+	style += "padding-left: 10rpx;"
+	style += "padding-right: 10rpx;"
+	style += 'position: absolute;';
+	style += 'left:calc( 100vw - ' + menuButtonInfo.right + 'px);';
+	style += 'font-size: 26px;';
+	if (platform === 'ios') {
+		// 苹果(iOS)设备
+		style += 'font-weight: 700;';
+	} else if (platform === 'android') {
+	  // 安卓(Android)设备
+	}
+	// #endif
+	// #ifdef H5
+	style += 'font-size: 26px;';
+	// #endif
+	return style;
+})
+
+// 头部滚动
+const instance = getCurrentInstance();
+let swiperHeight = 0
+let detailHead = 0
+
+const detailHeadBgChange = ref(false)
+onPageScroll((e)=> {
+    if (swiperHeight == 0 || detailHead == 0) return;
+    let height = swiperHeight - detailHead - 20;
+    detailHeadBgChange.value = false;
+    if (e.scrollTop >= height) {
+        detailHeadBgChange.value = true;
+    }
+})
+/************ 自定义头部-end ****************/
+
+const swiperClick = (index: any)=>{
+	if(typeof index == 'number') imgListPreview(goodsDetail.value.goods.goods_image,index)
+}
+
+/************* 分享海报-start **************/
+const sharePosterRef: any = ref(null);
+const copyUrlParam = ref('');
+let posterParam: any = {};
+
+// 分享海报链接
+const copyUrlFn = ()=>{
+	copyUrlParam.value = '?sku_id='+goodsDetail.value.sku_id;
+	if(goodsDetail.value.type) {
+		copyUrlParam.value += '&type=' + goodsDetail.value.type;
+	}
+	if (userInfo.value && userInfo.value.member_id) copyUrlParam.value += '&mid=' + userInfo.value.member_id;
+}
+
+const openShareFn = ()=>{
+	sharePosterRef.value.openShare()
+}
+/************* 分享海报-end **************/
+
+// 价格类型
+const priceType = ref('') //''=>原价，新人价=>newcomer_price，discount_price=>折扣价，member_price=>会员价
+
+// 商品价格
+const goodsPrice = computed(() => {
+    let price = "0.00";
+	if (Object.keys(goodsDetail.value).length && goodsDetail.value.type == 'newcomer_discount' && goodsDetail.value.is_newcomer && goodsDetail.value.newcomer_price != goodsDetail.value.price) {
+		// 新人价
+		price = goodsDetail.value.newcomer_price;
+		priceType.value = 'newcomer_price'
+	} else if (Object.keys(goodsDetail.value).length && goodsDetail.value.type == 'discount' && Object.keys(goodsDetail.value.goods).length && goodsDetail.value.goods.is_discount && goodsDetail.value.sale_price != goodsDetail.value.price) {
+        // 折扣价
+        price = goodsDetail.value.sale_price ? goodsDetail.value.sale_price : goodsDetail.value.price;
+        priceType.value = 'discount_price'
+    } else if (Object.keys(goodsDetail.value).length && Object.keys(goodsDetail.value.goods).length && goodsDetail.value.goods.member_discount && getToken() && goodsDetail.value.member_price != goodsDetail.value.price) {
+        // 会员价
+        price = goodsDetail.value.member_price ? goodsDetail.value.member_price : goodsDetail.value.price;
+        priceType.value = 'member_price'
+    } else {
+        price = goodsDetail.value.price
+        priceType.value = ''
+    }
+    return price;
+})
+
+// 关闭预览图片
+onUnload(()=>{
+	// #ifdef  H5 || APP
+	try {
+		uni.closePreviewImage()
+	}catch (e) {
+
+	}
+	// #endif
+})
+</script>
+<style lang="scss" scoped>
+@import '@/addon/shop/styles/common.scss';
+:deep(.uni-video-bar){
+	bottom: 34rpx !important;
+}
+:deep(.uni-video-cover) {
+	background: none;
+}
+
+:deep(.uni-video-cover-duration) {
+	display: none;
+}
+
+:deep(.uni-video-cover-play-button) {
+	border-radius: 50%;
+	border: 4rpx solid #fff;
+	width: 120rpx;
+	height: 120rpx;
+	background-size: 30%;
+}
+
+.remove-border {
+	&::after {
+		border: none;
+	}
+}
+:deep(.u-cell-group__wrapper) {
+	.u-cell__body {
+		padding: 23rpx 32rpx;
+	}
+}
+
+.tab-bar-placeholder {
+	padding-bottom: calc(constant(safe-area-inset-bottom) + 100rpx);
+	padding-bottom: calc(env(safe-area-inset-bottom) + 100rpx);
+}
+
+.tab-bar {
+	padding-top: 16rpx;
+	padding-bottom: calc(constant(safe-area-inset-bottom) + 16rpx);
+	padding-bottom: calc(env(safe-area-inset-bottom) + 16rpx);
+}
+:deep(.u-count-down) .u-count-down__text{
+	color: #fff;
+	font-size: 28rpx;
+}
+:deep(.u-swiper-indicator__wrapper--line__bar){
+	height: 5rpx !important;
+}
+:deep(.u-swiper-indicator__wrapper--line){
+	height: 5rpx !important;
+}
+.datail-title{
+	background: linear-gradient(#fff 70%, #F6F6F6);
+}
+.goods-sku .value-wid{
+	width: calc(100% - 160rpx);
+}
+.media-mode{
+	text {
+		background: rgba(100, 100, 100, 0.4);
+		color: #fff;
+		font-size: 24rpx;
+		line-height: 50rpx;
+		border-radius: 20rpx;
+		padding: 0 30rpx;
+		display: inline-block;
+
+		&:last-child {
+			margin-left: 40rpx;
+		}
+	}
+}
+/*  #ifdef MP  */
+.goods-price-time{
+	animation: fadein .1s;
+}
+/* 进入动画 */
+@keyframes fadein {
+  0% {
+	opacity: 0;
+  }
+  99% {
+  	opacity: 0;
+  }
+  100% {
+	opacity: 1;
+  }
+}
+/*  #endif  */
+</style>
diff --git a/uni-app/src/addon/shop/pages/goods/list.vue b/uni-app/src/addon/shop/pages/goods/list.vue
new file mode 100644
index 00000000..18f3ce9c
--- /dev/null
+++ b/uni-app/src/addon/shop/pages/goods/list.vue
@@ -0,0 +1,329 @@
+<template>
+	<view class="bg-gray-100 min-h-[100vh]" :style="themeColor()">
+		<view class="fixed left-0 right-0 top-0 product-warp bg-[#fff]">
+			<view class="py-[14rpx] flex items-center justify-between px-[20rpx]">
+				<view class="flex-1 search-input mr-[20rpx]">
+					<text @click.stop="searchTypeFn('all')" class="nc-iconfont nc-icon-sousuo-duanV6xx1 btn"></text>
+					<input class="input" maxlength="50" type="text" v-model="goods_name" placeholder="请搜索您想要的商品" placeholderClass="text-[var(--text-color-light9)] text-[24rpx]" confirm-type="search" @confirm="searchTypeFn('all')">
+					<text v-if="goods_name" class="nc-iconfont nc-icon-cuohaoV6xx1 clear" @click="goods_name=''"></text>
+				</view>
+				<view :class="['iconfont text-[32rpx] text-[#333] -mb-[2rpx]', listType ? 'icona-yingyongzhongxinV6xx-32' : 'icona-yingyongliebiaoV6xx-32']" @click="listIconBtn"></view>
+			</view>
+			<view class="flex justify-between tems-center h-[88rpx] px-[30rpx]">
+				<view class=" flex items-center justify-between text-[26rpx] flex-1">
+					<text class="text-[#333]"  :class="{ 'text-[var(--primary-color)] font-500': searchType == 'all' }" @click="searchTypeFn('all')">综合排序</text>
+					<view class="flex items-center text-[#333]" :class="{ 'text-[var(--primary-color)] font-500': searchType == 'sale_num' }" @click="searchTypeFn('sale_num')">
+						<text class="mr-[4rpx]">销量</text>
+						<text v-if="sale_num == 'asc'" class="text-[16rpx] nc-iconfont nc-icon-a-xiangshangV6xx1" :class="{'text-[var(--primary-color)]': searchType == 'sale_num' }"></text>
+						<text  v-else class="text-[16rpx] nc-iconfont nc-icon-a-xiangxiaV6xx1" :class="{'text-[var(--primary-color)]': searchType == 'sale_num' }"></text>
+					</view>
+					<view class="flex items-center text-[#333]" :class="{'text-[var(--primary-color)] font-500': searchType == 'price' }" @click="searchTypeFn('price')">
+						<text class="mr-[4rpx]">价格</text>
+						<text v-if="price == 'asc'" class="text-[16rpx] nc-iconfont nc-icon-a-xiangshangV6xx1" :class="{'text-[var(--primary-color)]': searchType == 'price' }"></text>
+						<text v-else class="text-[16rpx] nc-iconfont nc-icon-a-xiangxiaV6xx1" :class="{'text-[var(--primary-color)]': searchType == 'price' }"></text>
+					</view>
+					<view class="flex items-center" :class="{'text-[var(--primary-color)] font-500': searchType == 'label', 'text-[#333]': searchType != 'label' }" @click="searchTypeFn('label')">
+						<text class="mr-[8rpx]">筛选</text>
+						<text class="iconfont font-500 icona-shaixuanV6xx-34 -mb-[4rpx] !text-[26rpx]"></text>
+					</view>
+				</view>
+			</view>
+		</view>
+		<u-popup :show="labelPopup" mode="top" @close="labelPopup = false">
+			<view @touchmove.prevent.stop>
+				<view class="text-[28rpx] px-[30rpx] mt-[40rpx]">全部分类</view>
+				<view class="flex flex-wrap pl-[30rpx] pt-[30rpx]">
+					<text @click="loadCategory(item.category_id)" v-for="(item, index) in categoryList" :key="item.category_id"
+						:class="{ 'label-select': currGoodsCategory == item.category_id }" class="truncate text-[#333] px-[10rpx] border-[2rpx] border-solid border-transparent w-[184rpx] h-[56rpx] flex items-center justify-center mr-[30rpx] mb-[30rpx] box-border bg-[var(--temp-bg)] rounded-[50rpx] text-[24rpx]">
+						{{ item.category_name }}
+					</text>
+				</view>
+			</view>
+		</u-popup>
+
+		<mescroll-body ref="mescrollRef" top="176rpx" bottom="60px" @init="mescrollInit" :down="{ use: false }" @up="getAllAppListFn">
+			<view v-if="goodsList.length" :class="['sidebar-margin', !listType ? 'biserial-goods-list' : '']">
+				<template v-if="listType">
+					<view v-for="(item, index) in goodsList" :key="index" class="bg-white flex px-[20rpx] py-[24rpx] rounded-[var(--rounded-small)] overflow-hidden top-mar" :class="{ 'mb-[20rpx]': (index+1) == goodsList.length}" @click="toDetail(item.goods_id)">
+						<image v-if="item.goods_cover_thumb_mid" class="w-[190rpx] h-[190rpx] rounded-[var(--rounded-mid)]" :src="img(item.goods_cover_thumb_mid)" :mode="'aspectFill'" @error="item.goods_cover_thumb_mid='static/resource/images/diy/shop_default.jpg'"></image>
+						<image v-else class="w-[190rpx] h-[190rpx] rounded-[var(--rounded-mid)]" :src="img('static/resource/images/diy/shop_default.jpg')" :mode="'aspectFill'"></image>
+						<view class="flex-1 flex flex-col ml-[20rpx] py-[6rpx]">
+							<view class="text-[28rpx] text-[#333] leading-[40rpx] multi-hidden mb-[10rpx]">
+								<view class="brand-tag" v-if="item.goods_brand">
+									{{item.goods_brand.brand_name}}
+								</view>
+								{{ item.goods_name }}
+							</view>
+							<view v-if="item.goods_label_name && item.goods_label_name.length" class="flex flex-wrap">
+								<template v-for="(tagItem, tagIndex) in item.goods_label_name">
+									<image class="img-tag" v-if="tagItem.style_type == 'icon' && tagItem.icon" :src="img(tagItem.icon)" mode="heightFix" @error="diyGoods.error(tagItem,'icon')"></image>
+									<view class="base-tag" v-else-if="tagItem.style_type == 'diy' || !tagItem.icon" :style="diyGoods.baseTagStyle(tagItem)">
+										{{tagItem.label_name}}
+									</view>
+								</template>
+							</view>
+							<view class="mt-auto flex justify-between items-baseline">
+								<view class="flex items-baseline mt-[20rpx]">
+									<view class="text-[var(--price-text-color)] price-font flex items-baseline">
+										<text class="text-[24rpx] font-500 mr-[4rpx]">￥</text>
+										<text class="text-[40rpx] font-500">{{ diyGoods.goodsPrice(item).toFixed(2).split('.')[0] }}</text>
+										<text class="text-[24rpx] font-500">.{{ diyGoods.goodsPrice(item).toFixed(2).split('.')[1] }}</text>
+									</view>
+									<image v-if="diyGoods.priceType(item) == 'member_price'" class="max-w-[50rpx] h-[28rpx] ml-[6rpx]" :src="img('addon/shop/VIP.png')" mode="heightFix" />
+								</view>
+								<text class="text-[22rpx] mt-[20rpx] text-[var(--text-color-light9)]">已售{{ item.sale_num }}{{ item.unit }}</text>
+							</view>
+						</view>
+					</view>
+				</template>
+				<template v-else>
+					<view>
+						<template v-for="(item, index) in goodsList">
+							<view v-if="(index%2) == 0" class="flex flex-col bg-[#fff] box-border rounded-[var(--rounded-mid)] overflow-hidden mt-[var(--top-m)]" @click="toDetail(item.goods_id)">
+								 <image v-if="item.goods_cover_thumb_mid" class="w-[100%] h-[344rpx] rounded-tl-[var(--rounded-mid)] rounded-tr-[var(--rounded-mid)]" :src="img(item.goods_cover_thumb_mid)" :mode="'aspectFill'" @error="item.goods_cover_thumb_mid='static/resource/images/diy/shop_default.jpg'"></image>
+								 <image v-else class="w-[100%] h-[344rpx] rounded-tl-[var(--rounded-mid)] rounded-tr-[var(--rounded-mid)]" :src="img('static/resource/images/diy/shop_default.jpg')" :mode="'aspectFill'"></image>
+								<view class="px-[20rpx] flex-1 pt-[16rpx] pb-[24rpx] flex flex-col justify-between">
+									<view class="text-[#303133] leading-[40rpx] text-[28rpx] multi-hidden">
+										<view class="brand-tag" v-if="item.goods_brand">
+											{{item.goods_brand.brand_name}}
+										</view>
+										{{ item.goods_name }}
+									</view>
+									<view v-if="item.goods_label_name && item.goods_label_name.length" class="flex flex-wrap">
+										<template v-for="(tagItem, tagIndex) in item.goods_label_name">
+											<image class="img-tag" v-if="tagItem.style_type == 'icon' && tagItem.icon" :src="img(tagItem.icon)" mode="heightFix" @error="diyGoods.error(tagItem,'icon')"></image>
+											<view class="base-tag" v-else-if="tagItem.style_type == 'diy' || !tagItem.icon" :style="diyGoods.baseTagStyle(tagItem)">
+												{{tagItem.label_name}}
+											</view>
+										</template>
+									</view>
+									<view class="flex justify-between flex-wrap items-end">
+										<view class="flex items-baseline mt-[20rpx]">
+											<view class="text-[var(--price-text-color)] price-font flex items-baseline">
+												<text class="text-[24rpx] font-500">￥</text>
+												<text class="text-[40rpx] font-500">{{ diyGoods.goodsPrice(item).toFixed(2).split('.')[0] }}</text>
+												<text class="text-[24rpx] font-500">.{{ diyGoods.goodsPrice(item).toFixed(2).split('.')[1] }}</text>
+											</view>
+											<image v-if="diyGoods.priceType(item) == 'member_price'" class="max-w-[50rpx] h-[28rpx] ml-[6rpx]" :src="img('addon/shop/VIP.png')" mode="heightFix" />
+										</view>
+										<text class="text-[22rpx] text-[var(--text-color-light9)] mt-[20rpx]">已售{{ item.sale_num }}{{ item.unit}}</text>
+									</view>
+								</view>
+							</view>
+						</template>
+					</view>
+					<view>
+						<template v-for="(item, index) in goodsList">
+							<view v-if="(index%2) == 1" class="flex flex-col bg-[#fff] box-border rounded-[var(--rounded-mid)] overflow-hidden mt-[var(--top-m)]" @click="toDetail(item.goods_id)">
+								 <image v-if="item.goods_cover_thumb_mid" class="w-[100%] h-[344rpx] rounded-tl-[var(--rounded-mid)] rounded-tr-[var(--rounded-mid)]" :src="img(item.goods_cover_thumb_mid)" :mode="'aspectFill'" @error="item.goods_cover_thumb_mid='static/resource/images/diy/shop_default.jpg'"></image>
+								 <image v-else class="w-[100%] h-[344rpx] rounded-tl-[var(--rounded-mid)] rounded-tr-[var(--rounded-mid)]" :src="img('static/resource/images/diy/shop_default.jpg')" :mode="'aspectFill'"></image>
+								<view class="px-[20rpx] flex-1 pt-[16rpx] pb-[24rpx] flex flex-col justify-between">
+									<view class="text-[#303133] leading-[40rpx] text-[28rpx] multi-hidden">
+										<view class="brand-tag" v-if="item.goods_brand">
+											{{item.goods_brand.brand_name}}
+										</view>
+										{{ item.goods_name }}
+									</view>
+									<view v-if="item.goods_label_name && item.goods_label_name.length" class="flex flex-wrap">
+										<template v-for="(tagItem, tagIndex) in item.goods_label_name">
+											<image class="img-tag" v-if="tagItem.style_type == 'icon' && tagItem.icon" :src="img(tagItem.icon)" mode="heightFix" @error="diyGoods.error(tagItem,'icon')"></image>
+											<view class="base-tag" v-else-if="tagItem.style_type == 'diy' || !tagItem.icon" :style="diyGoods.baseTagStyle(tagItem)">
+												{{tagItem.label_name}}
+											</view>
+										</template>
+									</view>
+									<view class="flex justify-between flex-wrap items-baseline">
+										<view class="flex items-baseline mt-[20rpx]">
+											<view class="text-[var(--price-text-color)] price-font flex items-baseline">
+												<text class="text-[24rpx] font-500">￥</text>
+												<text class="text-[40rpx] font-500">{{ diyGoods.goodsPrice(item).toFixed(2).split('.')[0] }}</text>
+												<text class="text-[24rpx] font-500">.{{ diyGoods.goodsPrice(item).toFixed(2).split('.')[1] }}</text>
+											</view>
+											<image v-if="diyGoods.priceType(item) == 'member_price'" class="max-w-[50rpx] h-[28rpx] ml-[6rpx]" :src="img('addon/shop/VIP.png')" mode="heightFix" />
+										</view>
+										<text class="mt-[20rpx] text-[22rpx] text-[var(--text-color-light9)]">已售{{ item.sale_num }}{{ item.unit}}</text>
+									</view>
+								</view>
+							</view>
+						</template>
+					</view>
+				</template>
+			</view>
+			<mescroll-empty v-if="!goodsList.length && loading" :option="{tip : '暂无商品', btnText:'去逛逛'}"  @emptyclick="redirect({ url: '/addon/shop/pages/index', mode: 'reLaunch' })"></mescroll-empty>
+		</mescroll-body>
+
+		<tabbar />
+	</view>
+</template>
+
+<script setup lang="ts">
+import { reactive, ref, onMounted } from 'vue'
+import { t } from '@/locale'
+import { redirect, img } from '@/utils/common';
+import { getGoodsCategoryTree, getGoodsPages } from '@/addon/shop/api/goods';
+import MescrollBody from '@/components/mescroll/mescroll-body/mescroll-body.vue';
+import MescrollEmpty from '@/components/mescroll/mescroll-empty/mescroll-empty.vue';
+import useMescroll from '@/components/mescroll/hooks/useMescroll.js';
+import { onLoad, onPageScroll, onReachBottom } from '@dcloudio/uni-app';
+import {useGoods} from '@/addon/shop/hooks/useGoods'
+
+const { mescrollInit, downCallback, getMescroll } = useMescroll(onPageScroll, onReachBottom);
+const diyGoods = useGoods();
+const categoryList = ref<Array<Object>>([]);
+const goodsList = ref<Array<any>>([]);
+const coupon_id = ref<number | string>('');
+const currGoodsCategory = ref<number | string>('');
+const mescrollRef = ref(null);
+const loading = ref<boolean>(false);
+// 标签
+const labelPopup = ref(false);
+const goods_name = ref("");
+const price = ref("");
+const sale_num = ref("");
+const searchType = ref('all');
+const isShow = ref(false)//输入框清除文字按钮
+//列表类型
+const listType = ref(true)
+onLoad(async (option: any) => {
+	currGoodsCategory.value = option.curr_goods_category || ''
+	goods_name.value = option.goods_name ? decodeURIComponent(option.goods_name) : ''
+	coupon_id.value = option.coupon_id || ''
+	await getGoodsCategoryTree().then((res: any) => {
+		const initData = { category_name: "全部", category_id: '' };
+		categoryList.value.push(initData);
+		categoryList.value = categoryList.value.concat(res.data);
+	});
+})
+
+interface mescrollStructure {
+	num: number,
+	size: number,
+	endSuccess: Function,
+	[propName: string]: any
+}
+
+const getAllAppListFn = (mescroll: mescrollStructure) => {
+	loading.value = false;
+	let data: object = {
+		goods_category: currGoodsCategory.value,
+		page: mescroll.num,
+		limit: mescroll.size,
+		keyword: goods_name.value,
+		coupon_id: coupon_id.value,
+		order: searchType.value === 'all' ? '' : searchType.value,
+		sort: searchType.value == 'price' ? price.value : sale_num.value
+	};
+	getGoodsPages(data).then((res: any) => {
+		let newArr = (res.data.data as Array<Object>);
+		//设置列表数据
+		if (Number(mescroll.num) === 1) {
+			goodsList.value = []; //如果是第一页需手动制空列表
+		}
+		goodsList.value = goodsList.value.concat(newArr);
+		mescroll.endSuccess(newArr.length);
+		loading.value = true;
+	}).catch(() => {
+		loading.value = true;
+		mescroll.endErr(); // 请求失败, 结束加载
+	})
+}
+
+const loadCategory = (id: string) => {
+	currGoodsCategory.value = id;
+	goodsList.value = [];
+	getMescroll().resetUpScroll();
+	labelPopup.value = false;
+}
+
+// 搜索
+const searchTypeFn = (type: any) => {
+	searchType.value = type;
+	if (type == 'all') {
+		sale_num.value = '';
+		price.value = '';
+	}
+	if (type == 'price') {
+		sale_num.value = '';
+		if (price.value) {
+			price.value = price.value == 'asc' ? 'desc' : 'asc';
+		} else {
+			price.value = 'asc';
+		}
+	}
+	if (type == 'sale_num') {
+		price.value = '';
+		if (sale_num.value) {
+			sale_num.value = sale_num.value == 'asc' ? 'desc' : 'asc';
+		} else {
+			sale_num.value = 'asc';
+		}
+	}
+	if (type == 'label') {
+		sale_num.value = 'asc';
+		price.value = 'asc';
+		labelPopup.value = true;
+	} else {
+		labelPopup.value = false;
+		goodsList.value = [];
+
+		getMescroll().resetUpScroll();
+	}
+}
+
+//列表样式切换
+const listIconBtn = () => {
+	listType.value = !listType.value
+}
+const toDetail = (id: string | number) => {
+	redirect({ url: '/addon/shop/pages/goods/detail', param: { goods_id: id }, mode: 'navigateTo' })
+}
+onMounted(() => {
+	setTimeout(() => {
+		getMescroll().optUp.textNoMore = t("end");
+	}, 500)
+});
+</script>
+
+<style lang="scss" scoped>
+@import '@/addon/shop/styles/common.scss';
+.scroll-view-wrap {
+	word-break: keep-all;
+}
+
+.text-color {
+	color: var(--primary-color);
+}
+
+.label-select {
+	color: var(--primary-color);
+	border-color: var(--primary-color);
+	background-color: var(--primary-color-light);
+}
+
+:deep(.u-popup .u-transition) {
+	top: 156rpx !important;
+}
+
+.product-warp {
+	z-index: 99999;
+}
+
+:deep(.tab-bar-placeholder) {
+	display: none !important;
+}
+
+:deep(.u-tabbar__placeholder) {
+	display: none !important;
+}
+:deep(.u-input__content__clear){
+	width: 28rpx;
+	height: 28rpx;
+	font-size: 28rpx;
+	background-color: var(--text-color-light9);
+}
+.biserial-goods-list{
+	display: grid;
+	grid-template-columns: 1fr 1fr;
+	grid-gap: 10px;
+}
+</style>
diff --git a/uni-app/src/addon/shop/pages/goods/rank.vue b/uni-app/src/addon/shop/pages/goods/rank.vue
new file mode 100644
index 00000000..98f954a5
--- /dev/null
+++ b/uni-app/src/addon/shop/pages/goods/rank.vue
@@ -0,0 +1,328 @@
+<template>
+	<view class="min-h-[100vh]" :style="themeColor()">
+		<!-- #ifdef MP-WEIXIN -->
+		<top-tabbar :data="param" :isFill="false"/>
+		<!-- #endif -->
+		<!-- 顶部图片 -->
+		<view class="rank-head">
+			<image class="w-[100%] h-[435rpx]" :src="img(rankConfig.rank_images)" mode="aspectFill"></image>
+			<view class="content-box">
+				<!-- 榜单分类按钮 -->
+				<scroll-view scroll-x="true" class="category-slider" scroll-with-animation :scroll-into-view="'id' + activeIndex">
+					<view class="category-con" :style="{ justifyContent: centered ? 'center' : 'flex-start' }">
+						<view class="category-btn" v-for="(item, index) in rankList" :key="index"  :id="'id' + index" @click="selectCategory(item, index)" :style="{ color: activeIndex === index ? rankConfig.select_color : rankConfig.no_color, background: activeIndex === index ? `linear-gradient(to right, ${rankConfig.select_bg_color_start}, ${rankConfig.select_bg_color_end})`: 'transparent'}">
+							<view>{{ item.name }}</view>
+						</view>
+					</view>
+
+				</scroll-view>
+				<!-- <view class="content">
+					<text class="text-[26rpx]">{{rankConfig.rank_name}}</text>
+				</view> -->
+			</view>
+			<view class="side-tab" :style="{ top: topStyle }" @click="rankPopup = true" v-if="rankConfig.rank_remark">
+			  <text class="iconfont icona-paihangbangpc30 icon"></text>
+			  <text class="desc">{{t('rankingRules')}}</text>
+			</view>
+
+		</view>
+		<view class="rank-list p-[20rpx] relative -mt-[42rpx]">
+
+			<!-- 列表 -->
+			<mescroll-body ref="mescrollRef" :height="listHeight"  @init="mescrollInit" :down="{ use: false }" @up="getRankGoodsListFn">
+				<view class="bg-[#fff] flex rounded-[var(--rounded-mid)] p-[20rpx]" v-for="(item,index) in rankGoodsList" :key="item.goods_id" :class="{'mb-[20rpx]': (rankGoodsList.length-1) != index}" v-if="rankGoodsList.length"  @click="toLink(item.goods_id)">
+					<view class="w-[240rpx] h-[240rpx] flex items-center justify-center relative">
+						  <!-- 榜单排名图片 -->
+						<image v-if="index < 5" class="absolute top-[7rpx] left-[10rpx] w-[50rpx] h-[58rpx]" :style="{ zIndex:9 }"  :src="getRankBadge(item.rank_num)" mode="aspectFill"></image>
+						<view class="absolute top-[15rpx] left-[10rpx] flex items-center justify-center w-[50rpx] h-[50rpx]" v-if="index < 5" :style="{ zIndex: 10 }">
+						  <text class="text-[24rpx] font-bold text-[#fff]">{{ index + 1 }}</text>
+						</view>
+
+						<image v-if="item.goods_cover_thumb_mid" class="w-[250rpx] h-[250rpx] rounded-[var(--rounded-mid)]" :src="img(item.goods_cover_thumb_mid)" :mode="'aspectFill'" @error="item.goods_cover_thumb_mid='static/resource/images/diy/shop_default.jpg'"></image>
+						<image class="w-[240rpx] h-[240rpx] rounded-[var(--rounded-mid)]" v-else :src="img('static/resource/images/diy/shop_default.jpg')" :mode="'aspectFill'"></image>
+
+					</view>
+					<view class="flex flex-col flex-1 justify-between ml-[20rpx] pt-[4rpx]">
+						<view class="text-[28rpx] text-[#333] leading-[40rpx] multi-hidden mb-[10rpx]">
+							<view class="brand-tag" v-if="item.goods_brand">
+								{{item.goods_brand.brand_name}}
+							</view>
+							{{ item.goods_name }}
+						</view>
+						<view v-if="item.goods_label_name && item.goods_label_name.length" class="flex flex-wrap">
+							<template v-for="(tagItem, tagIndex) in item.goods_label_name">
+								<image class="img-tag" v-if="tagItem.style_type == 'icon' && tagItem.icon" :src="img(tagItem.icon)" mode="heightFix" @error="diyGoods.error(tagItem,'icon')"></image>
+								<view class="base-tag" v-else-if="tagItem.style_type == 'diy' || !tagItem.icon" :style="diyGoods.baseTagStyle(tagItem)">
+									{{tagItem.label_name}}
+								</view>
+							</template>
+						</view>
+						<view class="flex items-center justify-between">
+							<view class="text-[var(--price-text-color)] price-font flex items-baseline">
+								<text class="text-[24rpx] font-500">￥</text>
+								<text class="text-[40rpx] font-500">{{ diyGoods.goodsPrice(item).toFixed(2).split('.')[0] }}</text>
+								<text class="text-[24rpx] font-500">.{{ diyGoods.goodsPrice(item).toFixed(2).split('.')[1] }}</text>
+							</view>
+							<view :id="'itemCart' + index" class="w-[102rpx] box-border text-center text-[#fff] primary-btn-bg h-[46rpx] text-[22rpx] leading-[46rpx] rounded-[100rpx]">去购买</view>
+						</view>
+					</view>
+				</view>
+				<mescroll-empty v-if="!rankGoodsList.length && loading" :option="{tip : '暂无商品', btnText:'去逛逛'}" @emptyclick="redirect({ url: '/addon/shop/pages/goods/list'})"></mescroll-empty>
+			</mescroll-body>
+
+			<view @touchmove.prevent.stop>
+				<u-popup :show="rankPopup" @close="closeFn" mode="center" round="var(--rounded-big)">
+					<view class="w-[570rpx] px-[32rpx] popup-common center">
+						<view class="title">{{t('rankingRules')}}</view>
+						<scroll-view :scroll-y="true" class="px-[30rpx] box-border max-h-[260rpx]">
+					        <view class="text-[28rpx] leading-[40rpx] mb-[20rpx]">{{rankConfig.rank_remark}}</view>
+						</scroll-view>
+						<view class="btn-wrap !pt-[40rpx]">
+						    <button class="primary-btn-bg w-[480rpx] h-[70rpx] text-[26rpx] leading-[70rpx] rounded-[35rpx] !text-[#fff] font-500"  @click="rankPopup = false">我知道了</button>
+						</view>
+					</view>
+				</u-popup>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup lang="ts">
+import { reactive, ref, computed,nextTick } from 'vue'
+import { t } from '@/locale'
+import { redirect, img, pxToRpx } from '@/utils/common';
+import { getRankList ,getRankGoodsList,getRankConfig} from '@/addon/shop/api/rank';
+import MescrollBody from '@/components/mescroll/mescroll-body/mescroll-body.vue';
+import useMescroll from '@/components/mescroll/hooks/useMescroll.js';
+import MescrollEmpty from '@/components/mescroll/mescroll-empty/mescroll-empty.vue'
+import { onLoad, onPageScroll, onReachBottom } from '@dcloudio/uni-app';
+import useDiyStore from '@/app/stores/diy';
+import { topTabar } from '@/utils/topTabbar'
+import { useGoods } from '@/addon/shop/hooks/useGoods'
+
+const diyGoods = useGoods();
+const { mescrollInit, downCallback, getMescroll } = useMescroll(onPageScroll, onReachBottom);
+const mescrollRef = ref(null);
+const loading = ref<boolean>(false);
+const diyStore = useDiyStore();
+// 获取系统状态栏的高度
+let menuButtonInfo : any = {};
+// 如果是小程序，获取右上角胶囊的尺寸信息，避免导航栏右侧内容与胶囊重叠(支付宝小程序非本API，尚未兼容)
+// #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+menuButtonInfo = uni.getMenuButtonBoundingClientRect();
+// #endif
+/********* 自定义头部 - start ***********/
+const topTabarObj = topTabar()
+let param = topTabarObj.setTopTabbarParam({ title: '' })
+const topStyle = computed(() => {
+	let style = pxToRpx(Number(menuButtonInfo.height) + menuButtonInfo.top + 8)+ 30 + 'rpx;'
+	return style
+})
+/********* 自定义头部 - end ***********/
+
+// 获取系统信息
+const systemInfo = uni.getSystemInfoSync();
+const topImageHeight = 450; 
+const screenHeight = systemInfo.windowHeight; 
+// 将屏幕高度转换为 rpx
+const screenHeightInRpx = (screenHeight / systemInfo.screenWidth) * 750;
+// 计算列表高度
+const listHeight = computed(() => {
+  const listHeightValue = screenHeightInRpx - topImageHeight;
+  return `${listHeightValue}rpx`;
+});
+/**************** 榜单规则 ********************/
+const rankPopup = ref(false)
+const closeFn = () =>{
+	rankPopup.value = false
+}
+const rankList = ref<Array<any>>([]);
+const rankGoodsList = ref<Array<any>>([]);
+
+const centered = ref(false); // 是否居中
+const calculateCentered = () => {
+	nextTick(() => {
+		const query = uni.createSelectorQuery();
+		query.selectAll('.category-btn').boundingClientRect((rects) => {
+			if (rects && rects.length > 0) {
+				const totalWidth = rects.reduce((sum, rect) => sum + rect.width, 0);
+				const screenWidth = uni.getSystemInfoSync().windowWidth;
+				centered.value = totalWidth <= screenWidth; // 判断是否需要居中
+			} else {
+				console.error('Failed to get .category-btn elements.');
+			}
+		})
+		.exec();
+	});
+};
+
+// 加载分类数据
+const getRankListFn = (isFirstLoad = false) => {
+	getRankList().then((res) => {
+		rankList.value = res.data
+		// 仅在首次加载时选择第一个分类
+		if (isFirstLoad && rankList.value && rankList.value.length) {
+			selectCategory(rankList.value[0], 0);
+		} else if (!rankList.value.length) {
+			loading.value = true;
+		}
+		calculateCentered();
+		
+    }).catch((error) => {
+		console.error("加载分类数据失败", error);
+    })
+};
+
+const rankConfig = reactive({});
+
+// 榜单设置
+const getRankConfigFn = () => {
+  getRankConfig().then((res: any) => {
+    Object.assign(rankConfig, res.data); // 合并新数据
+  });
+};
+
+// 当前选中的分类的索引
+const activeIndex = ref(0)
+// 当前选中的分类的rank_id
+const rankId = ref(0)
+// 当前选中的分类的goods_source
+const goodsSource = ref()
+// 点击分类按钮时，更新选中的分类
+function selectCategory(rank:any, index:any) {
+	loading.value = false;
+	// 清空之前选中的商品列表
+	rankGoodsList.value = [];
+	activeIndex.value = index
+	rankId.value = rank.rank_id
+	goodsSource.value = rank.goods_source
+	getMescroll()?.resetUpScroll();
+}
+
+//获取榜单商品
+const getRankGoodsListFn = (mescroll: any) => {
+	if(rankList.value.length == 0) return;
+	loading.value = false;
+	let data: object = {
+		page: mescroll.num,
+		limit: mescroll.size,
+        rank_id:rankId.value
+	};
+
+	getRankGoodsList(data).then((res: any) => {
+		let newArr = (res.data.data as Array<Object>).map((el: any) => {return el})
+		let ifPage = true
+		//设置列表数据
+		if (mescroll.num == 1) {
+			rankGoodsList.value = []; //如果是第一页需手动制空列表
+		}
+		rankGoodsList.value = rankGoodsList.value.concat(newArr);
+		if(goodsSource.value=='goods'){
+			ifPage = false
+		}else{
+			ifPage = true
+		}
+		mescroll.endSuccess(newArr.length,ifPage);
+
+		
+		loading.value = true;
+	}).catch(() => {
+		loading.value = true;
+		mescroll.endErr(); // 请求失败, 结束加载
+	})
+}
+
+// 跳转商品详情
+const toLink = (goods_id: any) => {
+	redirect({url:'/addon/shop/pages/goods/detail',param:{ goods_id }})
+}
+
+// 获取排行榜名次图片的函数
+function getRankBadge(sort:any) {
+  switch (sort) {
+    case 1:
+      return img('addon/shop/rank/rank_first.png');
+    case 2:
+      return img('addon/shop/rank/rank_second.png');
+    case 3:
+      return img('addon/shop/rank/rank_third.png');
+    default:
+      return img('addon/shop/rank/rank.png');
+  }
+}
+
+onLoad(async (option : any) => {
+	getRankConfigFn()
+	getRankListFn(true)
+})
+
+</script>
+
+<style lang="scss" scoped>
+@import '@/addon/shop/styles/common.scss';
+
+.rank-head {
+	position: relative;
+	.content-box{
+		width: 100%;
+		position: absolute;
+		top: 328rpx;
+		.category-slider {
+			width: 95%;
+			margin: 0 auto;
+			line-height: 100rpx;
+			white-space: nowrap;
+			flex-direction: row;
+			justify-content: center;
+			align-items: center;
+				.category-con{
+					width: 100%;
+					display: flex;
+					align-items: center;
+					.category-btn {
+						display: inline-block;
+						padding: 0 20rpx;
+						height: 55rpx;
+						text-align: center;
+						line-height: 55rpx;
+						justify-content: center;
+						align-items: center;
+						border-radius: 40rpx;
+						font-size: 24rpx;
+						margin-right: 20rpx;
+					}
+				}
+
+		}
+	// 	.content {
+	// 		display: flex;
+	// 		justify-content: center;
+	// 		align-items: center;
+	// 		border-radius: 30rpx;
+	// 		padding: 0 20rpx;
+	// 		height: 44rpx;
+	// 		font-size: 26rpx;
+	// 		color: var(--primary-color);
+	// 		background: linear-gradient(to right, #FFEBD7, #FFFFFF, #FFEBD7);
+	// }
+	}
+
+}
+
+.rank-list {
+	background: #F8F8F8;
+	border-radius: 34rpx 34rpx 0 0;
+
+	.bank-buying {
+		width: 100rpx;
+		height: 44rpx;
+		border-radius: 10rpx;
+		font-family: PingFang SC, PingFang SC;
+		font-weight: 500;
+		font-size: 24rpx;
+		color: #FFFFFF;
+		line-height: 44rpx;
+		text-align: center;
+	}
+}
+</style>
diff --git a/uni-app/src/addon/shop/pages/goods/search.vue b/uni-app/src/addon/shop/pages/goods/search.vue
new file mode 100644
index 00000000..4d643e7c
--- /dev/null
+++ b/uni-app/src/addon/shop/pages/goods/search.vue
@@ -0,0 +1,207 @@
+<template>
+	<view :style="themeColor()">
+		<view class="flex items-center px-[20rpx] h-[120rpx]">
+			<view class="h-[68rpx] bg-[var(--temp-bg)] px-[30rpx] flex items-center rounded-[100rpx] flex-1">	
+				<text class="nc-iconfont nc-icon-sousuo-duanV6xx1 text-[var(--text-color-light9)] text-[26rpx] mr-[18rpx]"></text>
+				<input class="text-[28rpx] flex-1" maxlength="50" type="text" v-model="inputValue"  placeholder="请搜索您想要的商品" confirm-type="search" placeholderClass="text-[var(--text-color-light9)] text-[28rpx]" @confirm="search">
+				<text v-if="inputValue" class="nc-iconfont nc-icon-cuohaoV6xx1 text-[24rpx] text-[var(--text-color-light9)]" @click="inputValue=''"></text>
+			</view>
+			<text @click.stop="search()" class="text-[26rpx] ml-[32rpx] -mb-[2rpx]">搜索</text>
+		</view>
+
+		<view class="search-content">
+			<!-- 历史搜索 -->
+			<view class="history" v-if="historyList.length">
+				<view class="history-box">
+					<view class="history-top">
+						<view class="title font-500">历史搜索</view>
+						<view class="icon nc-iconfont nc-icon-shanchu-yuangaizhiV6xx !text-[24rpx] text-[var(--text-color-light6)]" @click="deleteHistoryList"></view>
+					</view>
+					<view class="history-bottom " id="history-list" :style="{ maxHeight: !isAllHistory ? '100%' : '148rpx' }">
+						<block v-for="(item, index) in historyList" :key="index">
+							<view class="history-li" @click="otherSearch(item)" v-if="item">
+								<view>{{ item }}</view>
+							</view>
+						</block>
+						<view class="history-li history_more" v-if="isAllHistory" @click="isAllHistory = false">
+							<view class="content-box">
+								<text class="text-[30rpx] nc-iconfont nc-icon-xiaV6xx"></text>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+	</view>
+</template>
+<script setup lang="ts">
+import { onLoad, onShow } from '@dcloudio/uni-app'
+import { ref, nextTick } from 'vue';
+import { redirect } from '@/utils/common';
+import useConfigStore from "@/stores/config";
+
+const inputValue = ref('') //搜索框的值
+const historyList = ref([]) //历史搜索记录
+const isAllHistory = ref(false)
+
+onLoad((options:any) => {
+    uni.getStorageSync('goodsSearchHistory') ? '' : uni.setStorageSync('goodsSearchHistory', []);
+});
+
+onShow(() => {
+    findHistoryList()
+    nextTick(()=> {
+        getHistoryHeight();
+    });
+})
+
+//获取历史搜索记录
+const findHistoryList =()=> {
+    historyList.value = uni.getStorageSync('goodsSearchHistory').reverse();
+}
+
+// 删除所有历史记录
+const deleteHistoryList =()=> {
+    uni.showModal({
+        title: '提示',
+        content: '确认删除全部历史记录？',
+        confirmColor: useConfigStore().themeColor['--primary-color'],
+        success: res => {
+            if (res.confirm) {
+                uni.setStorageSync('goodsSearchHistory', []);
+                findHistoryList();
+            }
+        }
+    });
+}
+
+//搜索
+const search = ()=> {
+    // if (inputValue.value.trim() != '') {
+
+        // 对历史搜索处理,判断有无,最近搜索显示在最前
+        let historyList = uni.getStorageSync('goodsSearchHistory');
+        let array = [];
+        if (historyList.length) {
+            array = historyList.filter(v => {
+                return v != inputValue.value.trim();
+            });
+            array.push(inputValue.value.trim());
+        } else {
+            array.push(inputValue.value.trim());
+        }
+        uni.setStorageSync('goodsSearchHistory', array);
+
+        redirect({ url: '/addon/shop/pages/goods/list', param: { goods_name: encodeURIComponent(inputValue.value) }, mode: 'navigateTo' })
+    // }
+}
+
+// 点击历史搜索
+const otherSearch = (e:any)=> {
+    inputValue.value = e;
+    search();
+}
+
+// 获取元素高度
+const getHistoryHeight =()=> {
+    const query = uni.createSelectorQuery().in(this);
+    query.select('#history-list').boundingClientRect((data: any) => {
+        if (data && data.height > uni.upx2px(70) * 2 + uni.upx2px(35) * 2) {
+            isAllHistory.value = true;
+        }
+    }).exec();
+}
+
+</script>
+<style lang="scss" scoped>
+	.content {
+		width: 100vw;
+		/* #ifdef MP */
+		height: 100vh;
+		/* #endif */
+		/* #ifdef H5 */
+		height: calc(100vh - env(safe-area-inset-bottom) - var(--status-bar-height));
+		height: calc(100vh - constant(safe-area-inset-bottom) - var(--status-bar-height));
+		/* #endif */
+		/* #ifdef APP-PLUS */
+		height: calc(100vh - 44px - env(safe-area-inset-bottom));
+		height: calc(100vh - 44px - constant(safe-area-inset-bottom));
+		/* #endif */
+		background: #ffffff;
+	}
+
+	.search-content {
+		box-sizing: border-box;
+		background: #ffffff;
+	}
+
+	.history {
+		width: 100%;
+		box-sizing: border-box;
+
+		.history-box {
+			width: 100%;
+			height: 100%;
+			background: #ffffff;
+			padding: 16rpx 20rpx 0rpx 20rpx;
+
+			box-sizing: border-box;
+			overflow: hidden;
+
+			.history-top {
+				width: 100%;
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+
+				.title {
+					font-size: 28rpx;
+				}
+
+				.iconfont {
+					color: var(--text-color-light9);
+					font-size: 28rpx;
+				}
+			}
+
+			.history-bottom {
+				width: 100%;
+				padding-top: 20rpx;
+				position: relative;
+
+				.history-li {
+					display: inline-block;
+					margin-right: 20rpx;
+					margin-bottom: 15rpx;
+					max-width: 100%;
+
+					view {
+						line-height: 56rpx;
+						background: var(--temp-bg) !important;
+						height: 56rpx;
+						color: #333 !important;
+						margin: 0 0rpx 4rpx 0 !important;
+						padding: 0 24rpx;
+						overflow: hidden;
+						white-space: nowrap;
+						text-overflow: ellipsis;
+						border-radius: 100rpx;
+						font-size: 24rpx;
+					}
+
+					&.history_more {
+						margin-right: 0;
+						position: absolute;
+						bottom: 0;
+						right: 0;
+						.content-box{
+							box-shadow: 2rpx 2rpx 8rpx rgba(0,0,0,.1);
+						}
+					}
+				}
+			}
+		}
+	}
+
+</style>
diff --git a/uni-app/src/addon/shop/pages/index.vue b/uni-app/src/addon/shop/pages/index.vue
new file mode 100644
index 00000000..374510db
--- /dev/null
+++ b/uni-app/src/addon/shop/pages/index.vue
@@ -0,0 +1,75 @@
+<template>
+	<view :style="themeColor()">
+
+		<loading-page :loading="diy.getLoading()"></loading-page>
+
+		<view v-show="!diy.getLoading()">
+
+			<!-- 自定义模板渲染 -->
+			<view class="diy-template-wrap bg-index" :style="diy.pageStyle()">
+
+				<diy-group ref="diyGroupRef" :data="diy.data" />
+
+			</view>
+
+		</view>
+
+		<!-- #ifdef MP-WEIXIN -->
+		<!-- 小程序隐私协议 -->
+		<wx-privacy-popup ref="wxPrivacyPopupRef"></wx-privacy-popup>
+		<!-- #endif -->
+
+	</view>
+</template>
+
+<script setup lang="ts">
+    import { ref,nextTick } from 'vue';
+    import {useDiy} from '@/hooks/useDiy'
+    import diyGroup from '@/addon/components/diy/group/index.vue'
+
+    const diy = useDiy({
+        name: 'DIY_SHOP_INDEX'
+    })
+
+    const diyGroupRef = ref(null)
+
+    const wxPrivacyPopupRef:any = ref(null)
+
+    // 监听页面加载
+    diy.onLoad();
+
+    // 监听页面显示
+    diy.onShow((data: any) => {
+        diyGroupRef.value?.refresh();
+	    // #ifdef MP
+	    nextTick(()=>{
+		    if(wxPrivacyPopupRef.value) wxPrivacyPopupRef.value.proactive();
+	    })
+	    // #endif
+    });
+
+    // 监听页面隐藏
+    diy.onHide();
+
+	// 监听页面卸载
+	diy.onUnload();
+
+    // 监听滚动事件
+    diy.onPageScroll()
+</script>
+<style lang="scss" scoped>
+	@import '@/styles/diy.scss';
+</style>
+<style lang="scss">
+.diy-template-wrap {
+  /* #ifdef MP */
+  .child-diy-template-wrap {
+    ::v-deep .diy-group {
+      > .draggable-element.top-fixed-diy {
+        display: block !important;
+      }
+    }
+  }
+  /* #endif */
+}
+</style>
diff --git a/uni-app/src/addon/shop/pages/member/index.vue b/uni-app/src/addon/shop/pages/member/index.vue
new file mode 100644
index 00000000..44b99a86
--- /dev/null
+++ b/uni-app/src/addon/shop/pages/member/index.vue
@@ -0,0 +1,83 @@
+<template>
+	<view :style="themeColor()">
+
+		<loading-page :loading="diy.getLoading()"></loading-page>
+
+		<view v-show="!diy.getLoading()">
+
+			<!-- 自定义模板渲染 -->
+			<view class="diy-template-wrap bg-index" :style="diy.pageStyle()">
+
+				<diy-group ref="diyGroupRef" :data="diy.data" />
+
+			</view>
+
+		</view>
+
+		<!-- #ifdef MP-WEIXIN -->
+		<!-- 小程序隐私协议 -->
+		<wx-privacy-popup ref="wxPrivacyPopupRef"></wx-privacy-popup>
+		<!-- #endif -->
+
+	</view>
+</template>
+
+<script setup lang="ts">
+    import {ref, computed,nextTick} from 'vue';
+    import {useDiy} from '@/hooks/useDiy'
+    import diyGroup from '@/addon/components/diy/group/index.vue'
+    import useMemberStore from '@/stores/member'
+
+    // 会员信息
+    const memberStore = useMemberStore()
+    const userInfo = computed(() => memberStore.info)
+
+    const diy = useDiy({
+        name: 'DIY_SHOP_MEMBER_INDEX'
+    })
+
+    const diyGroupRef = ref(null)
+
+    const wxPrivacyPopupRef:any = ref(null)
+
+    // 监听页面加载
+    diy.onLoad();
+
+    // 监听页面显示
+    diy.onShow((data: any) => {
+        diyGroupRef.value?.refresh();
+        if (userInfo.value) {
+          useMemberStore().getMemberInfo()
+        }
+	    // #ifdef MP
+	    nextTick(()=>{
+		    if(wxPrivacyPopupRef.value) wxPrivacyPopupRef.value.proactive();
+	    })
+	    // #endif
+    });
+
+    // 监听页面隐藏
+    diy.onHide();
+
+	// 监听页面卸载
+	diy.onUnload();
+
+    // 监听滚动事件
+    diy.onPageScroll()
+</script>
+<style lang="scss" scoped>
+	@import '@/styles/diy.scss';
+</style>
+<style lang="scss">
+.diy-template-wrap {
+  /* #ifdef MP */
+  .child-diy-template-wrap {
+    ::v-deep .diy-group {
+      > .draggable-element.top-fixed-diy {
+        display: block !important;
+      }
+    }
+  }
+  /* #endif */
+}
+</style>
diff --git a/uni-app/src/addon/shop/pages/member/my_coupon.vue b/uni-app/src/addon/shop/pages/member/my_coupon.vue
new file mode 100644
index 00000000..da92ff5d
--- /dev/null
+++ b/uni-app/src/addon/shop/pages/member/my_coupon.vue
@@ -0,0 +1,220 @@
+<template>
+    <view class="bg-[#f8f8f8] min-h-screen overflow-hidden" :style="themeColor()" v-if="memberStore.info">
+        <view class="fixed left-0 top-0 right-0 z-10">
+            <scroll-view :scroll-x="true" class="scroll-Y box-border px-[var(--sidebar-m)] bg-white">
+                <view class="flex whitespace-nowrap justify-around items-center h-[88rpx]">
+                    <view :class="['text-[28rpx] text-[#333] h-[88rpx] leading-[88rpx] font-400', { 'class-select !text-primary': couponStatus === item.status }]" @click="statusClickFn(item.status)" v-for="(item, index) in statusList">{{ item.status_name }}({{ item.count }})</view>
+                </view>
+            </scroll-view>
+            <scroll-view :scroll-x="true" scroll-with-animation :scroll-into-view="'id' + (subActive ? subActive - 1 : 0)"  class="px-[var(--sidebar-m)]  box-border bg-white">
+				<view class="items-center flex h-[88rpx]">
+					<text class="flex-shrink-0 w-[126rpx] h-[54rpx] text-[24rpx] flex-center text-center text-[#333] bg-[var(--temp-bg)] rounded-[30rpx] box-border mr-[20rpx] border-[2rpx] border-solid border-[#F8F9FD]" :class="{'!text-primary !border-primary font-500 !bg-[var(--primary-color-light)]':item.value == curType}"
+						v-for="(item,index) in typeList" :key="index" :id="'id' + index"
+							@click="typeClick(index,item.value)">{{item.label}}
+						</text>
+				</view>
+			</scroll-view>
+        </view>
+
+        <mescroll-body ref="mescrollRef" top="176rpx" @init="mescrollInit" :down="{ use: false }" @up="getMyCouponListFn">
+            <view class="py-[var(--top-m)] px-[var(--sidebar-m)]" v-if="list.length">
+                <template v-for="(item, index) in list">
+
+                    <view v-if="couponStatus != 1"
+						class="flex items-center relative w-[100%] rounded-[var(--rounded-small)] overflow-hidden bg-[#fff]" :class="{'mt-[var(--top-m)]':index}">
+                        <view class=" w-[186rpx] h-[160rpx] flex  flex-col items-center justify-center rounded-[var(--rounded-small)] relative coupon-item" :class="{'bg-[var(--primary-color-disabled)]':couponStatus == 2 , 'bg-[var(--primary-color-light)]' :couponStatus == 3}">
+                            <view class="price-font flex items-baseline" :class="{'text-[#fff]' : couponStatus == 2 , 'text-[#FFB4B1]' : couponStatus == 3}">
+                                <text class="text-[30rpx] leading-[34rpx] mr-[2rpx] text-center price-font font-500">￥</text>
+                                <text class="text-[54rpx] font-500 leading-[58rpx] price-font truncate">{{ item.coupon_price }}</text>
+                            </view>
+							<text class="truncate max-w-[176rpx] mt-[6rpx] text-[24rpx] h-[32rpx] leading-[32rpx]" :class="{'text-[#fff]': couponStatus == 2 , 'text-[var(--primary-color-disabled)]': couponStatus == 3}">{{ item.title }}</text>
+                        </view>	
+                        <view class="ml-[30rpx] flex-1 h-[100%] box-border py-[20rpx]">
+                            <view class="text-[26rpx] leading-[40rpx] text-left font-500">
+                                <text v-if="item.min_condition_money === '0.00'">无门槛</text>
+                                <text v-else>满{{ item.coupon_min_price }}元可用</text>
+                            </view>
+                            <view class="mt-[10rpx] flex items-center">
+                                <text class="w-[80rpx] text-center bg-[var(--primary-color-light)] whitespace-nowrap text-[var(--primary-color)] text-[18rpx] h-[30rpx] leading-[30rpx] rounded-[15rpx] mr-[10rpx] flex-shrink-0">{{ item.type_name }}</text>
+                                <text class="truncate max-w-[226rpx] text-[24rpx] text-[var(--text-color-light6)] leading-[34rpx]">{{ item.title }}</text>
+                            </view>
+                            <view class="w-[100%] mt-[6rpx] text-[20rpx] leading-[34rpx] text-[var(--text-color-light6)]">
+                                <text>有效期至<text>{{ item.expire_time ? item.expire_time.slice(0, 10) : '' }}</text></text>
+                            </view>
+                        </view>
+						<view class="px-[20rpx]">
+                            <button class="flex-center rounded-full remove-border" :style="{width:'150rpx',height:'60rpx',color:'#fff', fontSize:'24rpx', padding:'0',border:'none',backgroundColor:'var(--primary-color-disabled)'}" v-if="couponStatus == 2">已使用</button>
+                            <button class="flex-center rounded-full remove-border" :style="{width:'150rpx',height:'60rpx',color:'var(--primary-color-disabled)', fontSize:'24rpx', padding:'0',border:'none',backgroundColor:'var(--primary-color-light)'}" v-if="couponStatus == 3">已过期</button>
+                        </view>
+					</view>
+                    <view v-else class="flex items-center relative w-[100%] rounded-[var(--rounded-small)] overflow-hidden bg-[#fff]" :class="{'mt-[var(--top-m)]' : index}">
+                        <view class="coupon-bg w-[186rpx] h-[160rpx] flex  flex-col items-center justify-center rounded-[var(--rounded-small)] relative coupon-item">
+                            <view class="price-font flex items-baseline text-[#fff]">
+								<text class="text-[30rpx] leading-[34rpx] mr-[2rpx] text-center price-font font-500">￥</text>
+								<text class="text-[54rpx] font-500 leading-[58rpx] price-font truncate">{{ item.coupon_price }}</text>
+                            </view>
+							<text class="truncate max-w-[176rpx] mt-[6rpx] text-[22rpx] text-[#fff] h-[32rpx] leading-[32rpx]">{{ item.title }}</text>
+                        </view>
+                        <view class="ml-[30rpx] flex-1 h-[100%] box-border py-[20rpx]">
+                            <view class="text-[26rpx] leading-[40rpx] text-left font-500">
+                                <text v-if="item.min_condition_money === '0.00'">无门槛</text>
+                                <text v-else>满{{ item.coupon_min_price }}元可用</text>
+                            </view>
+                            <view class="text-[20rpx]  mt-[10rpx] flex items-center">
+                                <text class="w-[80rpx] text-center bg-[var(--primary-color-light)] whitespace-nowrap text-[var(--primary-color)] text-[18rpx] h-[30rpx] leading-[30rpx] rounded-[15rpx] mr-[10rpx] flex-shrink-0">{{ item.type_name }}</text>
+                                <text class="truncate max-w-[226rpx] text-[24rpx] text-[var(--text-color-light9)] leading-[34rpx]">{{ item.title }}</text>
+                            </view>
+                            <view class="w-[100%] mt-[6rpx] text-[20rpx] leading-[34rpx] text-[var(--text-color-light9)]">
+                                <text>有效期至<text>{{ item.expire_time ? item.expire_time.slice(0, 10) : '' }}</text></text>
+                            </view>
+                        </view>
+                        <view class="px-[20rpx]" v-if="couponStatus === 1">
+							<button hover-class="none" class="flex-center rounded-full remove-border primary-btn-bg" :style="{width:'150rpx',height:'60rpx',color:'#fff', fontSize:'24rpx', padding:'0',border:'none'}" @click="toLink(item.coupon_id)">去使用</button>
+                        </view>
+                    </view>
+                </template>
+            </view>
+            <mescroll-empty v-if="!list.length && loading" :option="{'tip' : '暂无优惠券'}"></mescroll-empty>
+        </mescroll-body>
+        <pay ref="payRef"></pay>
+    </view>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue'
+import { img, redirect } from '@/utils/common'
+import { getMyCouponList, getMyCouponType, getMyCouponStatusCount } from '@/addon/shop/api/coupon'
+import useMemberStore from '@/stores/member'
+import MescrollBody from '@/components/mescroll/mescroll-body/mescroll-body.vue'
+import MescrollEmpty from '@/components/mescroll/mescroll-empty/mescroll-empty.vue'
+import useMescroll from '@/components/mescroll/hooks/useMescroll.js'
+import { onLoad,onPageScroll, onReachBottom } from '@dcloudio/uni-app'
+import { t } from '@/locale'
+
+const memberStore = useMemberStore()
+const { mescrollInit, downCallback, getMescroll } = useMescroll(onPageScroll, onReachBottom)
+const list = ref<Array<Object>>([]);
+const loading = ref<boolean>(false);
+const statusList = ref<Array<Object>>([]);
+const couponStatus = ref(1);
+
+const getMyCouponStatusCountFn = () =>{
+    getMyCouponStatusCount().then((res: any) =>{
+        statusList.value = res.data.filter((item: any) => item.status != 4)
+    })
+}
+const statusClickFn = (status: any) => {
+    couponStatus.value = status;
+    list.value = []; //如果是第一页需手动制空列表
+    getMescroll().resetUpScroll();
+};
+
+const getMyCouponListFn = (mescroll: any) => {
+    loading.value = false;
+    let data: object = {
+        page: mescroll.num,
+        limit: mescroll.size,
+        status: couponStatus.value,
+        type: curType.value
+    };
+
+    getMyCouponList(data).then((res: any) => {
+        let newArr = (res.data.data as Array<Object>);
+        //设置列表数据
+        if (mescroll.num == 1) {
+            list.value = []; //如果是第一页需手动制空列表
+        }
+        list.value = list.value.concat(newArr);
+        mescroll.endSuccess(newArr.length);
+        loading.value = true;
+    }).catch(() => {
+        loading.value = true;
+        mescroll.endErr(); // 请求失败, 结束加载
+    })
+}
+const toLink = (coupon_id:any) => {
+	redirect({ url: '/addon/shop/pages/goods/list',param:{coupon_id} })
+}
+
+// 类型
+const subActive = ref<number>(0)
+const curType = ref('all')
+const typeList = ref<Array<Object>>([])
+const getMyCouponTypeFn = () =>{
+    getMyCouponType().then((res: any) =>{
+        const obj = { label: '全部', value: 'all' };
+        typeList.value.push(obj)
+		typeList.value = typeList.value.concat(res.data)
+    })
+}
+onLoad(()=>{
+    getMyCouponTypeFn()
+    getMyCouponStatusCountFn()
+})
+
+const typeClick = (index : number,data:any) =>{
+    subActive.value = index
+    curType.value = data
+    list.value = []
+    getMescroll().resetUpScroll()
+}
+</script>
+
+<style lang="scss" scoped>
+    .remove-border {
+        &::after {
+            border: none;
+        }
+    }
+
+.class-select {
+    position: relative;
+    font-weight: 500 !important;
+
+    &::before {
+        content: "";
+        position: absolute;
+        bottom: 10rpx;
+        height: 6rpx;
+        background-color: $u-primary;
+        width: 40rpx;
+        left: 50%;
+		border-radius: 100rpx;
+        transform: translateX(-50%);
+    }
+}
+
+.coupon-bg{
+	background: linear-gradient( 169deg, var(--primary-color)0%, var(--primary-color) 86%);
+}
+
+.coupon-item{
+	:before{
+		content: '';
+		display: block;
+		width: 28rpx;
+		height: 28rpx;
+		background-color: #f8f8f8;
+		position: absolute;
+		top: 50%;
+		left: -14rpx;
+		border-radius:14rpx;
+		transform: translateY(-50%);
+	}
+	:after{
+		content: '';
+		display: block;
+		width: 28rpx;
+		height: 28rpx;
+		background-color: #fff;
+		position: absolute;
+		top: 50%;
+		right: -14rpx;
+		border-radius:14rpx;
+		transform: translateY(-50%);
+	}
+}
+:deep(.mescroll-empty){
+	border-radius: var(--rounded-small) !important;
+}
+</style>
\ No newline at end of file
diff --git a/uni-app/src/addon/shop/pages/newcomer/list.vue b/uni-app/src/addon/shop/pages/newcomer/list.vue
new file mode 100644
index 00000000..c9a308f8
--- /dev/null
+++ b/uni-app/src/addon/shop/pages/newcomer/list.vue
@@ -0,0 +1,267 @@
+<template>
+	<view class="min-h-[100vh] bg-[#f6f6f6] overflow-hidden" :style="themeColor()">
+		<block v-if="Object.keys(configInfo).length &&configInfo.active_status =='active'">
+			<mescroll-body ref="mescrollRef" @init="mescrollInit" :down="{ use: false }" @up="getGoodsListFn">
+				<view class="marketing-head" v-if="!pageLoading">
+					<!-- #ifdef MP-WEIXIN -->
+					<top-tabbar :data="param" :isFill="false" class="top-header"/>
+					<image v-if="configInfo.banner_list && configInfo.banner_list.length" class="w-[100%] h-[434rpx]" :src="img(configInfo.banner_list[0].imageUrl)" mode="aspectFill"  @click="diyStore.toRedirect(configInfo.banner_list[0].toLink)"></image>
+					<!-- 占位作用 -->
+					<view v-else class="w-[100%] h-[434rpx]"></view>
+					<view v-if="configInfo.active_desc" class="side-tab" :style="{top: topStyle}"  @click="newcomerPopup = true">
+						 <text class="iconfont iconbiaoqianV6xx2 icon"></text>
+						<text class="desc">活动规则</text>
+					</view>
+					<!-- #endif -->
+					<!-- #ifdef H5 -->
+					<image v-if="configInfo.banner_list && configInfo.banner_list.length" class="w-[100%] h-[434rpx] -mt-[130rpx]" :src="img(configInfo.banner_list[0].imageUrl)" mode="aspectFill"  @click="diyStore.toRedirect(configInfo.banner_list[0].toLink)"></image>
+					<!-- 占位作用 -->
+					<view v-else class="w-[100%] h-[434rpx] -mt-[130rpx]"></view>
+					<view v-if="configInfo.active_desc" class="side-tab !top-[30rpx]" @click="newcomerPopup = true">
+						<text class="iconfont iconxinrenV6xx icon"></text>
+						<text class="desc">活动规则</text>
+					</view>
+					<!-- #endif -->
+					<view class="time newcomer-time" v-if="newcomerTime > 0 && newcomerTime != undefined" :style="{'background-image': 'url('+ img('addon/shop/newcomer/time_bg.png') +')'}">
+						<text class="text-[26rpx]">距结束还有：</text>
+						<up-count-down class="text-[#fff] min-w-[150rpx] text-[28rpx]" :time="newcomerTime" format="DD:HH:mm:ss" @change="onChange">
+							<view class="flex">
+								<view class="text-[24rpx] flex items-center" v-if="timeData.days && timeData.days>0">
+									<text class="min-w-[30rpx] text-right">{{ timeData.days }}</text>
+									<text class="text-[20rpx]">天</text>
+								</view>
+								<view class="text-[24rpx] flex items-center">
+									<text class="min-w-[30rpx] text-center" v-if="timeData.hours">{{ timeData.hours>=10?timeData.hours:'0'+timeData.hours}}</text>
+									<text class="min-w-[30rpx] text-center" v-else>00</text>
+									<text class="text-[20rpx]">时</text>
+								</view>
+								<view class="text-[24rpx] flex items-center">
+									<text class="min-w-[30rpx] text-center" v-if="timeData.minutes">{{ timeData.minutes >= 10 ? timeData.minutes :'0'+timeData.minutes }}</text>
+									<text class="min-w-[30rpx] text-center" v-else>00</text>
+									<text class="text-[20rpx]">分</text>
+								</view>
+								<view class="text-[24rpx] flex items-center">
+									<text class="min-w-[30rpx] text-center" v-if="timeData.seconds">{{ timeData.seconds<10 ? '0'+timeData.seconds : timeData.seconds}}</text>
+									<text class="min-w-[30rpx] text-center" v-else>00</text>
+									<text class="text-[20rpx]">秒</text>
+								</view>
+							</view>
+						</up-count-down>
+					</view>
+				</view>
+				<view class="marketing-list p-[20rpx] relative -mt-[50rpx]" v-if="goodsList.length">
+					<view class="bg-[#fff] flex rounded-[var(--rounded-mid)] p-[20rpx]" v-for="(item,index) in goodsList" :key="index" :class="{'mb-[20rpx]': (goodsList.length-1) != index}" @click="toDetail(item)">
+						<view class="w-[250rpx] h-[250rpx] flex items-center justify-center">
+							<image v-if="item.goods_cover" class="w-[250rpx] h-[250rpx] rounded-[var(--rounded-mid)]" :src="img(item.goods_cover_thumb_mid)" :mode="'aspectFill'" @error="item.goods_cover_thumb_mid='static/resource/images/diy/shop_default.jpg'"></image>
+							<image v-else class="w-[250rpx] h-[250rpx] rounded-[var(--rounded-mid)]" :src="img('static/resource/images/diy/shop_default.jpg')" :mode="'aspectFill'"></image>
+						</view>
+						<view class="flex flex-col flex-1 ml-[20rpx] pt-[4rpx]">
+							<view class="text-[28rpx] multi-hidden leading-[1.3]">{{item.goods_name}}</view>
+							<view class="w-[400rpx] flex items-center justify-center">
+								<image class="w-[400rpx] h-[106rpx] mt-[auto] mb-[10rpx]" :src="img('addon/shop/newcomer/subsidy.png')" mode="aspectFit"></image>
+							</view>
+							<view class="flex items-center justify-center btn-wrap">
+								<view class="flex items-center text-[#FFF3E0] relative z-4" :style="{'background': 'linear-gradient(to right, #FF8A04 0%, #ff1b1b 84%)'}">
+									<text class="text-[22rpx]">新人价</text>
+									<text class="text-[20rpx] ml-[6rpx] mr-[2rpx]">￥</text>
+									<text class="text-[36rpx] truncate max-w-[160rpx]">{{parseFloat(item.goodsSku.newcomer_price).toFixed(2)}}</text>
+								</view>
+								<image class="w-[26rpx] h-[54rpx]" :src="img('addon/shop/newcomer/btn_02.png')" mode="heightFix"></image>
+								<image class="w-[84rpx] h-[54rpx] relative ml-[-5rpx] z-2" :src="img('addon/shop/newcomer/btn_03.png')" mode="aspectFit"></image>
+							</view>
+						</view>
+					</view>
+				</view>
+				<mescroll-empty v-else-if="!goodsList.length && loading" :option="{tip : '暂无商品，请看看其他商品吧！', btnText:'去逛逛'}" @emptyclick="redirect({ url: '/addon/shop/pages/goods/list' })"></mescroll-empty>
+			</mescroll-body>
+		</block>
+		<block v-if="!pageLoading && Object.keys(configInfo).length && configInfo.active_status !='active'">
+			<top-tabbar :data="pageNullParam" class="top-header"/>
+			<mescroll-empty :option="{tip : '活动未开启,请看看其他商品吧！', btnText:'去逛逛'}" @emptyclick="redirect({ url: '/addon/shop/pages/index' })"></mescroll-empty>
+		</block>
+		<view @touchmove.prevent.stop>
+			<u-popup :show="newcomerPopup" @close="closeFn" mode="center" round="var(--rounded-big)">
+				<view class="w-[570rpx] px-[32rpx] popup-common center">
+					<view class="title">活动规则</view>
+					<scroll-view :scroll-y="true" class="px-[30rpx] box-border max-h-[260rpx]" v-if="configInfo.active_desc">
+					    <block v-for="(item) in configInfo.active_desc.split('\n')">
+					        <view class="text-[28rpx] leading-[40rpx] mb-[20rpx]">{{ item }}</view>
+					    </block>
+					</scroll-view>
+					<view class="btn-wrap !pt-[40rpx]">
+					    <button class="primary-btn-bg w-[480rpx] h-[70rpx] text-[26rpx] leading-[70rpx] rounded-[35rpx] !text-[#fff] font-500"  @click="newcomerPopup = false">我知道了</button>
+					</view>
+				</view>
+			</u-popup>
+		</view>
+		<loading-page :loading="pageLoading"></loading-page>
+	</view>
+</template>
+
+<script setup lang="ts">
+import { reactive, ref, computed } from 'vue'
+import { t } from '@/locale'
+import { redirect, img, getToken, pxToRpx, timeTurnTimeStamp } from '@/utils/common';
+import { getNewcomerGoodsList, getNewcomersConfig } from '@/addon/shop/api/newcomer';
+import MescrollBody from '@/components/mescroll/mescroll-body/mescroll-body.vue';
+import useMescroll from '@/components/mescroll/hooks/useMescroll.js';
+import MescrollEmpty from '@/components/mescroll/mescroll-empty/mescroll-empty.vue'
+import { onLoad, onPageScroll, onReachBottom } from '@dcloudio/uni-app';
+import useDiyStore from '@/app/stores/diy';
+import { topTabar } from '@/utils/topTabbar'
+import { useLogin } from '@/hooks/useLogin'
+
+const { mescrollInit, downCallback, getMescroll } = useMescroll(onPageScroll, onReachBottom);
+const goodsList = ref<Array<any>>([]);
+const mescrollRef = ref(null);
+const loading = ref<boolean>(false);
+const pageLoading = ref<boolean>(true);
+const diyStore = useDiyStore();
+// 获取系统状态栏的高度
+let menuButtonInfo: any = {};
+// 如果是小程序，获取右上角胶囊的尺寸信息，避免导航栏右侧内容与胶囊重叠(支付宝小程序非本API，尚未兼容)
+// #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+menuButtonInfo = uni.getMenuButtonBoundingClientRect();
+// #endif
+/********* 自定义头部 - start ***********/
+const topTabarObj = topTabar()
+let param = topTabarObj.setTopTabbarParam({title:'',topStatusBar: {textColor: '#fff'}})
+let pageNullParam = topTabarObj.setTopTabbarParam({title:'新人专享列表',topStatusBar: {textColor: '#333'} })
+const topStyle = computed(() => {
+	let style = pxToRpx(Number(menuButtonInfo.height) + menuButtonInfo.top + 8)+ 30 + 'rpx;'
+	return style
+})
+/********* 自定义头部 - end ***********/
+
+
+/********* 倒计时 - start ***********/
+// 使用 reactive 创建响应式对象
+const timeData = ref({});
+// 定义 onChange 方法
+const onChange = (e) => {
+  timeData.value = e;
+};
+const newcomerTime = ref('');
+/********* 倒计时 - end ***********/
+
+/**************** 活动规则 ********************/
+const newcomerPopup = ref(false)
+const closeFn = () =>{
+	newcomerPopup.value = false
+}
+/**************** 活动规则 - end ********************/
+onLoad(async (option: any) => {
+	getNewcomersConfigFn();
+})
+
+const configInfo = ref({});
+const getNewcomersConfigFn = () => {
+	getNewcomersConfig().then((res: any) => {
+		configInfo.value = res.data;
+		let time = configInfo.value && configInfo.value.validity_time ? timeTurnTimeStamp(configInfo.value.validity_time) : 0;
+		pageLoading.value = false;
+	}).catch(()=>{
+		pageLoading.value = false;
+	})
+}
+
+interface mescrollStructure {
+	num: number,
+	size: number,
+	endSuccess: Function,
+	[propName: string]: any
+}
+
+const isJoin = ref(0) // 是否参与过新人专享活动，1：是，0：否
+const getGoodsListFn = (mescroll: mescrollStructure) => {
+	loading.value = false;
+	let data: object = {
+		page: mescroll.num,
+		limit: mescroll.size
+	};
+	getNewcomerGoodsList(data).then((res: any) => {
+		isJoin.value = res.data.is_join;
+		let newArr = (res.data.data as Array<Object>);
+		let now = new Date();
+		let timestamp: any = now.getTime();
+		newcomerTime.value = Number(res.data.validity_time) * 1000 - timestamp;
+		//设置列表数据
+		if (Number(mescroll.num) === 1) {
+			goodsList.value = []; //如果是第一页需手动制空列表
+		}
+		goodsList.value = goodsList.value.concat(newArr);
+		mescroll.endSuccess(newArr.length);
+		loading.value = true;
+
+	}).catch(() => {
+		loading.value = true;
+		mescroll.endErr(); // 请求失败, 结束加载
+	})
+}
+
+const toDetail = (data: any) => {
+	redirect({ url: '/addon/shop/pages/goods/detail', param: { sku_id: data.goodsSku.sku_id, type: 'newcomer_discount' } })
+}
+</script>
+
+<style lang="scss" scoped>
+.marketing-head{
+	position: relative;
+	.time{
+		position: absolute;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		height: 44rpx;
+		line-height: 1;
+		font-size: 26rpx;
+		color: #fff;
+		width: 660rpx;
+		background-repeat: no-repeat;
+		bottom: 84rpx;
+		left: 50%;
+		transform: translateX(-50%);
+		background-size: 100% 100%;
+	}
+}
+.marketing-list{
+	// background: linear-gradient(180deg, rgba(255,240,242, 1), rgba(255,255,255, 0) 35%);
+	background: linear-gradient( 180deg, #FFF2F0 23%, #F6F6F6 92%);
+	border-radius: 34rpx 34rpx 0 0;
+	.btn-wrap{
+		border-radius: 50rpx;
+		overflow: hidden;
+		align-self: center;
+		position: relative;
+		view{
+			height: 54rpx;
+			padding-left: 16rpx;
+			padding-right: 30rpx;
+		}
+		image:nth-of-type(1){
+			position: absolute;
+			right: 54rpx;
+			top: 0rpx;
+			height: 54rpx;
+			z-index: 5;
+		}
+	}
+}
+/*  #ifdef MP  */
+.newcomer-time{
+	animation: fadein .15s;
+}
+/* 进入动画 */
+@keyframes fadein {
+  0% {
+	opacity: 0;
+  }
+  99% {
+  	opacity: 0;
+  }
+  100% {
+	opacity: 1;
+  }
+}
+/*  #endif  */
+</style>
diff --git a/uni-app/src/addon/shop/pages/order/components/address-list/address-list.vue b/uni-app/src/addon/shop/pages/order/components/address-list/address-list.vue
new file mode 100644
index 00000000..0dfed880
--- /dev/null
+++ b/uni-app/src/addon/shop/pages/order/components/address-list/address-list.vue
@@ -0,0 +1,100 @@
+<template>
+    <u-popup :show="show" @close="show = false" mode="bottom" :round="10">
+        <view @touchmove.prevent.stop class="popup-common">
+			<view class="title">{{t('selectAddress')}}</view>
+			<scroll-view scroll-y="true" class="h-[50vh]">
+				<view v-for="(item,index) in addressList" :key="item.id" class="flex items-center mx-[var(--popup-sidebar-m)] border-1 border-[#eee] border-solid rounded-[var(--rounded-mid)] px-[var(--pad-sidebar-m)] py-[var(--pad-top-m)]" :class="{'mb-[var(--top-m)]': addressList.length-1 != index, 'text-[var(--primary-color)] !border-[var(--primary-color)]': item.id == currAddressId}" @click="selectAddress(index)">
+					<text class="nc-iconfont nc-icon-dingweiV6xx-1 text-[36rpx]"></text>
+					<view class="flex flex-col mx-[20rpx] w-[480rpx]">
+						<view class="flex items-center truncate leading-[1.5]">
+							<text class="mr-[8rpx] text-[30rpx] truncate max-w-[300rpx]">{{item.name}}</text>
+							<text class="text-[30rpx]">{{item.mobile}}</text>
+						</view>
+						<view class="truncate text-[26rpx] leading-[1.5] mt-[12rpx]">{{item.full_address}}</view>
+					</view>
+					<text class="nc-iconfont nc-icon-xiugaiV6xx text-[32rpx] ml-auto" @click="editAddress(item)"></text>
+				</view>
+				<view v-if="!addressList || addressList && !addressList.length" class="text-[var(--text-color-light6)] text-[28rpx] text-center">{{t('emptyAddress')}}</view>
+			</scroll-view>
+			
+			<view class="btn-wrap">
+                <button class="primary-btn-bg btn" @click="addAddress">{{t('addAddress')}}</button>
+			</view>
+		</view>
+    </u-popup>
+</template>
+
+<script setup lang="ts">
+    import { ref } from 'vue'
+    import { getAddressList } from '@/app/api/member'
+    import { t } from '@/locale'
+    import { redirect } from '@/utils/common'
+
+    const show = ref(false)
+	const loading = ref(false)
+	const currAddressId = ref('') // 选中的索引
+	const propData: any = ref({})
+	const addressList: any = ref([])
+	
+	const emits = defineEmits(['confirm'])
+	
+    const open = (data: any) => {
+        show.value = true;
+		propData.value = data;
+		currAddressId.value = data.id;
+    }
+
+	getAddressList({}).then(({ data }) => {
+		addressList.value = data;
+	    loading.value = false
+	})
+	
+	const selectAddress = (index: number) => {
+		let data = addressList.value[index];
+		if(propData.value.delivery == 'local_delivery' && !data.lat && !data.lng){
+			// 待支付订单-同城配送，选择的地址没有经纬度的情况，会直接跳转到地图界面进行选择
+			// 参数二，表示是否直接跳转到地图界面, 1跳转到地图界面，2表示不跳
+			editAddress(data,1);
+		}else{
+			let obj:any = {}
+			obj.address_id = addressList.value[index].id
+			obj.delivery = propData.value.delivery
+			emits('confirm', obj)
+		}
+		show.value = false;
+	}
+	
+	const editAddress = (data: any, isSelectMap: number = 2)=>{
+		uni.setStorage({
+		    key: 'selectAddressCallback',
+		    data: {
+		        back: '/addon/shop/pages/order/payment',
+		        delivery: propData.value.delivery
+		    },
+		    success() {
+		        redirect({ url: '/app/pages/member/address_edit', param: { id: data.id, source: 'shop_order_payment', isSelectMap } })
+		    }
+		})
+	}
+
+	const addAddress = () =>{
+		uni.setStorage({
+		    key: 'selectAddressCallback',
+		    data: {
+		        back: '/addon/shop/pages/order/payment',
+		        delivery: propData.value.delivery
+		    },
+		    success() {
+		        redirect({ url: '/app/pages/member/address_edit', param: { source: 'shop_order_payment' } })
+		    }
+		})
+	}
+	
+    defineExpose({
+        open
+    })
+</script>
+
+<style lang="scss" scoped>
+
+</style>
diff --git a/uni-app/src/addon/shop/pages/order/components/invoice/invoice.vue b/uni-app/src/addon/shop/pages/order/components/invoice/invoice.vue
new file mode 100644
index 00000000..348daf2f
--- /dev/null
+++ b/uni-app/src/addon/shop/pages/order/components/invoice/invoice.vue
@@ -0,0 +1,188 @@
+<template>
+    <u-popup :show="invoicePop" @close="closeFn" mode="bottom" >
+		<!-- class="bg-[#fff] rounded-[10rpx] popup-common" @touchmove.prevent.stop -->
+        <view class="popup-common">
+			<view class="title">请填写发票信息</view>
+			<scroll-view :scroll-y="true"  class="h-[50vh]">
+				<view class="px-[var(--popup-sidebar-m)] pb-[60rpx] pt-0 text-sm ">
+					<u-form labelPosition="left" :model="formData" labelWidth="200rpx" :labelStyle="{'font-size': '28rpx'}" errorType='toast' :rules="rules" ref="formRef">
+						<view class="mt-[10rpx]">
+							<u-form-item label="需要发票" leftIconStyle="text-[28rpx]">
+								<view class="flex">
+									<view
+										class="h-[60rpx] box-border rounded px-[30rpx] leading-[56rpx] mr-[20rpx] border-[2rpx] border-[var(--temp-bg)] bg-[var(--temp-bg)] border-solid text-[24rpx]"
+										:class="{'!bg-[var(--primary-color-light)] !text-[var(--primary-color)] !border-primary': !need}"
+										@click="need = false">不需要</view>
+									<view class="h-[60rpx] box-border rounded px-[30rpx] leading-[56rpx] border-[2rpx] border-[var(--temp-bg)] border-solid text-[24rpx] bg-[var(--temp-bg)]"
+										:class="{'!bg-[var(--primary-color-light)] !text-[var(--primary-color)] !border-primary': need}"
+										@click="need = true">需要</view>
+								</view>
+							</u-form-item>
+						</view>
+						<view v-show="need">
+							<view class="mt-[10rpx]">
+								<u-form-item label="抬头类型">
+									<view class="flex">
+										<view
+											class="h-[60rpx] box-border rounded px-[30rpx] mr-[20rpx] leading-[56rpx] border-[2rpx] border-[var(--temp-bg)] border-solid text-[24rpx] bg-[var(--temp-bg)]"
+											:class="{'!bg-[var(--primary-color-light)] !text-[var(--primary-color)] !border-primary': formData.header_type == 1}"
+											@click="formData.header_type = 1">个人</view>
+										<view class="h-[60rpx] box-border rounded px-[30rpx] leading-[56rpx] border-[2rpx] border-[var(--temp-bg)] border-solid text-[24rpx] bg-[var(--temp-bg)]"
+											:class="{'!bg-[var(--primary-color-light)] !text-[var(--primary-color)] !border-primary': formData.header_type == 2}"
+											@click="formData.header_type = 2">企业</view>
+									</view>
+								</u-form-item>
+							</view>
+							<view class="mt-[10rpx]">
+								<u-form-item label="发票内容" prop="header_name">
+									<view class="flex flex-wrap">
+										<block v-for="(item,index) in config.invoice_content">
+											<view class="box-border rounded px-[20rpx] py-[12rpx] leading-[1.4] border-[2rpx] border-[var(--temp-bg)] border-solid text-[24rpx] bg-[var(--temp-bg)] my-[10rpx]"
+												:class="{'!bg-[var(--primary-color-light)] !text-[var(--primary-color)] !border-primary': formData.name == item, 'mr-[20rpx]': (config.invoice_content.length-1) != index}"
+												@click="formData.name = item">{{ item  }}</view>
+										</block>
+									</view>
+								</u-form-item>
+							</view>
+							<view class="mt-[10rpx]">
+								<u-form-item label="发票抬头" prop="header_name">
+									<u-input fontSize="28rpx" v-model.trim="formData.header_name" border="none" placeholder-class="!text-[var(--text-color-light9)] text-[28rpx]" clearable placeholder="请输入发票抬头" ></u-input>
+								</u-form-item>
+							</view>
+							<view v-if="formData.header_type == 2">
+								<view class="mt-[10rpx]">
+									<u-form-item label="纳税人识别号" prop="tax_number">
+										<u-input fontSize="28rpx" v-model.trim="formData.tax_number" border="none" clearable placeholder="请输入纳税人识别号" placeholder-class="!text-[var(--text-color-light9)] text-[28rpx]" @change="inputChange"></u-input>
+									</u-form-item>
+								</view>
+								<!-- <view class="py-[20rpx] h-[48rpx] flex items-center">
+									<text class="text-[30rpx]">更多选填内容</text>
+									<text class="text-xs text-gray-subtitle ml-[10rpx]">注册地址、电话、开户银行及账号</text>
+									<view class="text-xs text-right flex-1" @click="optionalShow = !optionalShow">
+										<text>{{ optionalShow ? '收起' : '展开' }}</text>
+										<text class="text-[30rpx] nc-iconfont text-gray-subtitle ml-[5rpx]" :class="optionalShow ? 'nc-icon-shangV6xx-1' : 'nc-icon-xiaV6xx'"></text>
+									</view>
+								</view> -->
+								<view class="mt-[10rpx]">
+									<u-form-item label="注册地址">
+										<u-input fontSize="28rpx" v-model="formData.address" placeholder-class="!text-[var(--text-color-light9)] text-[28rpx]" border="none" clearable placeholder="(选填)请输入企业注册地址"></u-input>
+									</u-form-item>
+								</view>
+								<view class="mt-[10rpx]">
+									<u-form-item label="注册电话">
+										<u-input fontSize="28rpx" v-model="formData.telephone" placeholder-class="!text-[var(--text-color-light9)] text-[28rpx]" border="none" clearable placeholder="(选填)请输入企业注册电话"></u-input>
+									</u-form-item>
+								</view>
+								<view class="mt-[10rpx]">
+									<u-form-item label="开户银行">
+										<u-input fontSize="28rpx" v-model="formData.bank_name" placeholder-class="!text-[var(--text-color-light9)] text-[28rpx]" border="none" clearable placeholder="(选填)请输入企业开户银行"></u-input>
+									</u-form-item>
+								</view>
+								<view class="mt-[10rpx]">
+									<u-form-item label="银行账号">
+										<u-input fontSize="28rpx" v-model="formData.bank_card_number" placeholder-class="!text-[var(--text-color-light9)] text-[28rpx]" border="none" clearable placeholder="(选填)请输入企业开户银行账号"></u-input>
+									</u-form-item>
+								</view>
+							</view>
+						</view>
+					</u-form>
+				</view>
+			</scroll-view>
+			<view class="btn-wrap">
+                <button class="primary-btn-bg btn" @click="confirm">确认</button>
+			</view>
+		</view>
+    </u-popup>
+</template>
+
+<script setup lang="ts">
+    import { ref, computed,nextTick } from 'vue'
+    import { getInvoiceConfig } from '@/addon/shop/api/config'
+
+    const invoicePop = ref(false)
+    const config = ref({
+        is_invoice: 2,
+        invoice_content: []
+    })
+    const need = ref(false)
+    const optionalShow = ref(false)
+    const formData: any = ref({
+        header_type: 1,
+        header_name: '',
+        type: '',
+        name: '',
+        tax_number: '',
+        telephone: '',
+        address: '',
+        bank_name: '',
+        bank_card_number: ''
+    })
+
+    const invoiceOpen = computed(() => {
+        return config.value.is_invoice == 1
+    })
+
+    getInvoiceConfig().then(({ data }) => {
+        config.value = data
+        data.invoice_content.length && (formData.value.name = data.invoice_content[0])
+    }).catch()
+
+	const inputChange = (e: any) =>{
+		nextTick(()=>{
+			formData.value.tax_number = e.replace(/[^0-9a-zA-Z]/g,'')
+		})
+	}
+
+    const formRef: any = ref(null)
+
+    const rules = computed(() => {
+        return {
+            'header_name': {
+                type: 'string',
+                required: need.value,
+                message: '请输入发票抬头',
+                trigger: ['blur', 'change'],
+            },
+            'tax_number': [{
+                type: 'string',
+                required: need.value && formData.value.header_type == 2,
+                message: '请输入纳税人识别号',
+                trigger: ['blur', 'change'],
+            }, {
+                validator(rule: any, value: any, callback: any) {
+                    const limit = /^[0-9a-zA-Z]+$/;
+                    if (!limit.test(value) && formData.header_type == 2) {
+                        callback(new Error('请输入正确的纳税人识别号'))
+                    } else {
+                        callback()
+                    }
+                }
+            }]
+        }
+    })
+
+    const open = () => {
+		invoicePop.value = true;
+    }
+
+    const emits = defineEmits(['confirm'])
+
+    const confirm = () => {
+        formRef.value.validate().then(() => {
+            const invoice = need.value ? formData.value : {}
+            emits('confirm', invoice)
+             invoicePop.value = false;
+        })
+    }
+	const closeFn = () =>{
+		invoicePop.value = false;
+	}
+
+    defineExpose({
+        open,
+        invoiceOpen
+    })
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/uni-app/src/addon/shop/pages/order/components/logistics-tracking/logistics-tracking.vue b/uni-app/src/addon/shop/pages/order/components/logistics-tracking/logistics-tracking.vue
new file mode 100644
index 00000000..40205426
--- /dev/null
+++ b/uni-app/src/addon/shop/pages/order/components/logistics-tracking/logistics-tracking.vue
@@ -0,0 +1,114 @@
+<template>
+	<view @touchmove.prevent.stop>
+		<u-popup :show="showpop" mode="bottom" :round="10" @close="close" :closeable="true" :safeAreaInsetBottom="true" @touchmove.prevent.stop>
+			<view class="h-[70vh] px-[24rpx] bg-page pb-[20rpx]" @touchmove.prevent.stop v-if="Object.keys(showList).length">
+				<view class="font-500 text-center text-[32rpx] leading-[104rpx] box-border h-[104rpx]">{{t('detailedInformation')}}</view>
+				<scroll-view :scroll-x="true" scroll-with-animation :scroll-into-view="'id' + (subActive>3 ? subActive - 2 : 0)" >
+					<view class="flex py-[22rpx] whitespace-nowrap" v-if="packageList.length > 1">
+						<view :id="'id' + index" class="text-[26rpx] leading-[36rpx] mr-[30rpx] text-[#626779]" :class="{'!text-primary class-select': item.id ==  current}" v-for="(item,index) in packageList" :key="index" @click="handleClick(item,index)">{{ item.name }}</view>
+					</view>
+				</scroll-view>
+				<view class="text-[28rpx] mt-[20rpx] ">
+					<view class="flex justify-between mb-[20rpx]">
+						<template v-if="showList.sub_delivery_type == 'none_express'">
+							<text class="mr-[20rpx]">无需物流</text>
+						</template>
+						<template v-else>
+							<text class="mr-[20rpx]">{{showList.company.company_name}}</text>
+							<view>
+								<text class="mr-[14rpx]">{{showList.express_number}}</text>
+								<text @click="copy(showList.express_number)">{{t('copy')}}</text>
+							</view>
+						</template>
+					</view>
+				</view>
+				<view class="parcel" style="height: 53vh;" v-if="showList.sub_delivery_type == 'express'">
+					<view class="h-[56vh] flex flex-col items-center justify-center" v-if="showList.traces.success == false">
+						<text class="nc-iconfont nc-icon-daishouhuoV6xx text-[180rpx] text-[#bfbfbf]"></text>
+						<view class="text-[28rpx] text-[#bfbfbf] leading-8">暂无物流信息～～</view>
+					</view>
+					<scroll-view v-else :scroll-y="true" style="height:53vh;padding: 20rpx;box-sizing: border-box;" class="bg-white rounded-md">
+						<u-steps :current="0" dot direction="column" activeColor="var(--primary-color)">
+							<block v-for="(item,index) in showList.traces.list" :key="index + 'id'">
+								<u-steps-item :title="item.remark" :desc="item.datetime"></u-steps-item>
+							</block>
+						</u-steps>
+					</scroll-view>
+				</view>
+				<view  style="height: 53vh;" v-else-if="showList.sub_delivery_type == 'none_express'">
+					<view class="h-[56vh] flex-col flex items-center justify-center">
+						<text class="nc-iconfont nc-icon-daishouhuoV6xx text-[180rpx] text-[#bfbfbf]"></text>
+						<view class="text-[28rpx] text-[#bfbfbf] leading-8">无需物流～～</view>
+					</view>
+				</view>
+			</view>
+		</u-popup>
+	</view>
+</template>
+
+<script setup lang="ts">
+    import {ref} from 'vue'
+    import {t} from '@/locale'
+    import {img, redirect, copy} from '@/utils/common';
+    import {getMaterialflowList} from '@/addon/shop/api/order';
+
+    const showpop = ref(false)
+    const packageList = ref([])
+    const showList = ref<any>({})
+    const loadList = async (params: any) => {
+        let data: any = await getMaterialflowList(params)
+        showList.value = data.data
+    }
+	const current = ref(0)
+	const subActive = ref(0)
+
+    const open = (params: any) => {
+		current.value= params.id
+        loadList(params)
+        showpop.value = true
+    }
+
+    const close = () => {
+        showpop.value = false
+    }
+    const handleClick = (item: any,index:number) => {
+        current.value = item.id
+		subActive.value = index
+        let params = {
+            id: item.id,
+            mobile: item.mobile
+        }
+        loadList(params)
+    }
+    defineExpose({
+        packageList,
+        open
+    })
+</script>
+
+<style lang="scss" scoped>
+	.parcel :deep(.u-text__value) {
+		font-size: 24rpx !important;
+		line-height: 42rpx !important;
+	}
+
+	.parcel :deep(.u-steps-item__content) {
+		margin-left: 20rpx !important;
+	}
+	.class-select {
+    position: relative;
+    font-weight: 500;
+
+    &::before {
+        content: "";
+        position: absolute;
+        bottom: -6rpx;
+        height: 4rpx;
+        background-color: $u-primary;
+        width: 26rpx;
+        left: 50%;
+        transform: translateX(-50%);
+    }
+}
+</style>
+
diff --git a/uni-app/src/addon/shop/pages/order/components/select-coupon/select-coupon.vue b/uni-app/src/addon/shop/pages/order/components/select-coupon/select-coupon.vue
new file mode 100644
index 00000000..33a6a83e
--- /dev/null
+++ b/uni-app/src/addon/shop/pages/order/components/select-coupon/select-coupon.vue
@@ -0,0 +1,133 @@
+<template>
+    <u-popup :show="show" @close="show = false" mode="bottom" :round="10" :closeable="true">
+		<view @touchmove.prevent.stop class="popup-common">
+			<view class="title">请选择优惠券</view>
+			<view v-if="!type" class="-mt-[20rpx]">
+				<u-tabs :list="tabs" @click="switchTab" :current="current" itemStyle="width:50%;height:88rpx;box-sizing: border-box; font-size: 28rpx;"
+				:activeStyle="{
+					color: 'var(--primary-color)'
+				}" lineColor="var(--primary-color)"></u-tabs>
+			</view>
+			<scroll-view scroll-y="true" class="h-[50vh] pt-[10rpx]">
+				<view class="px-[var(--popup-sidebar-m)] pb-[30rpx] pt-0 text-sm" v-show="current == 0">
+					<view class="mt-[var(--top-m)] px-[var(--pad-sidebar-m)] py-[var(--pad-top-m)] border-1 border-[#eee] border-solid rounded-[20rpx]"
+						:class="{'!border-[var(--primary-color)] bg-[var(--primary-color-light2)]': coupon && coupon.id == item.id}"
+						v-for="item in couponList" @click="selectCoupon(item)">
+						<view class="flex border-0 !border-b border-[#eee] border-dashed pb-[20rpx]" :class="{ '!border-[var(--primary-color)]': coupon && coupon.id == item.id }">
+							<view class="flex-1 w-0">
+								<view class="text-[30rpx] mb-[20rpx] font-500">{{ item.title }}</view>
+								<view class="text-[24rpx] text-[var(--text-color-light6)]" v-if="item.min_condition_money > 0">满{{ item.min_condition_money }}可用</view>
+								<view class="text-[24rpx] text-[var(--text-color-light6)]" v-else>无门槛券</view>
+							</view>
+							<view class="text-[36rpx] price-font"><text class="text-xs mr-[2rpx]">￥</text>{{ item.price }}</view>
+						</view>
+						<view class="pt-[20rpx] text-[24rpx] text-[var(--text-color-light6)]">{{ item.create_time }} ~ {{ item.expire_time }}有效</view>
+					</view>
+				</view>
+				<view class="px-[var(--popup-sidebar-m)] pb-[30rpx] pt-0 text-sm" v-show="current == 1">
+					<view class="mt-[var(--top-m)] px-[var(--pad-sidebar-m)] py-[var(--pad-top-m)] border-1 !border-[#eee] border-solid rounded-[var(--rounded-mid)] bg-[var(--temp-bg)]" v-for="item in disabledCouponList">
+						<view class="flex border-0 !border-b !border-[#ddd] border-dashed pb-[20rpx]">
+							<view class="flex-1 w-0">
+								<view class="text-[30rpx] mb-[20rpx] font-500">{{ item.title }}</view>
+								<view class="text-[24rpx] text-[var(--text-color-light9)]" v-if="item.min_condition_money > 0">满{{ item.min_condition_money }}可用</view>
+								<view class="text-[24rpx] text-[var(--text-color-light9)]" v-else>无门槛券</view>
+							</view>
+							<view class="text-[36rpx] price-font"><text class="text-xs mr-[2rpx]">￥</text>{{ item.price }}</view>
+						</view>
+						<view class="pt-[20rpx] text-[24rpx]  text-[var(--text-color-light9)]">{{ item.create_time }} ~ {{ item.expire_time }}期间有效</view>
+						<view class="text-[24rpx] pt-[10rpx] flex  text-[var(--text-color-light9)]">
+							不可用原因：{{ item.error }}
+						</view>
+					</view>
+				</view>
+			</scroll-view>
+			<view class="btn-wrap">
+                <button class="primary-btn-bg btn" @click="confirm">确认</button>
+			</view>
+		</view>
+    </u-popup>
+</template>
+
+<script setup lang="ts">
+    import { ref, watch, computed } from 'vue'
+    import { orderCoupon } from '@/addon/shop/api/order'
+
+    const prop = defineProps({
+        orderKey: {
+            type: String,
+            default: ''
+        }
+    })
+
+    const current = ref(0)
+    const couponList = ref<object[]>([])
+    const disabledCouponList = ref<object[]>([])
+    const show = ref(false)
+    const coupon = ref<null | object>(null)
+    const emits = defineEmits(['confirm'])
+
+    watch(() => prop.orderKey, () => {
+        if (prop.orderKey && !couponList.value.length) {
+            orderCoupon({order_key: prop.orderKey}).then(({data}) => {
+                const list = [], disabled = []
+
+                if (data.length) {
+                    data.forEach(item => {
+                        item.is_normal ? list.push(item) : disabled.push(item)
+                    })
+                }
+
+                disabledCouponList.value = disabled
+                couponList.value = list
+
+                if (list.length) {
+                    coupon.value = list[0]
+                    emits('confirm', coupon.value)
+                }
+            }).catch()
+        }
+    }, { immediate: true })
+
+    const tabs = computed(() => {
+        return [
+            { name: `可用优惠券(${couponList.value.length})`, key: 'normal' },
+            { name: `不可用优惠券(${disabledCouponList.value.length})`, key: 'disabled' }
+        ]
+    })
+
+    const switchTab = (event: any)=> {
+        current.value = event.index
+    }
+
+    const open = (coupon_id:any)=> {
+        show.value = true
+	    if(coupon_id){
+	        for(let i=0;i<couponList.value.length;i++){
+	            if(couponList.value[i].id == coupon_id){
+                    coupon.value = couponList.value[i];
+	                break;
+	            }
+	        }
+	    }
+    }
+
+    const selectCoupon = (data: object)=> {
+        if (coupon.value) {
+            coupon.value = coupon.value.id != data.id ? data : null
+        } else {
+            coupon.value = data
+        }
+    }
+
+    const confirm = ()=> {
+        emits('confirm', coupon.value)
+        show.value = false
+    }
+
+    defineExpose({
+    	open,
+        couponList
+    })
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/uni-app/src/addon/shop/pages/order/components/select-store/select-store.vue b/uni-app/src/addon/shop/pages/order/components/select-store/select-store.vue
new file mode 100644
index 00000000..f13cb019
--- /dev/null
+++ b/uni-app/src/addon/shop/pages/order/components/select-store/select-store.vue
@@ -0,0 +1,140 @@
+<template>
+    <u-popup :show="show" @close="show = false" mode="bottom" :round="10">
+        <view @touchmove.prevent.stop class="popup-common">
+			<view class="title">请选择自提点</view>
+			<scroll-view scroll-y="true" class="h-[50vh]">
+				<view class="p-[var(--popup-sidebar-m)] pt-0 text-sm">
+					<view class="mt-[var(--top-m)] border-1 border-[#eee] border-solid rounded-[var(--rounded-mid)] px-[var(--pad-sidebar-m)] py-[var(--pad-top-m)] mb-[var(--top-m)]" :class="{'!border-primary bg-[var(--primary-color-light2)]': store && store.store_id == item.store_id}" v-for="item in storeList" @click="selectStore(item)">
+						<view class="flex">
+							<view class="flex-1 w-0">
+								<text class="text-[30rpx] text-[#333]">{{ item.store_name }}</text>
+								<text class="text-[26rpx] ml-[12rpx] text-[var(--text-color-light6)]">{{ item.store_mobile }}</text>
+							</view>
+							<view v-if="item.distance">
+								<text class="text-red text-[26rpx] font-normal">{{ distanceFormat(item.distance) }}</text>
+							</view>
+						</view>
+						<view class="mt-[20rpx] text-[26rpx] leading-[1.4] flex">
+							<text class="flex-shrink-0">门店地址：</text>
+							<text>{{ item.full_address }}</text>
+						</view>
+						<view class="mt-[16rpx] text-[26rpx]">营业时间：{{ item.trade_time }}</view>
+					</view>
+				</view>
+				<view class="h-[50vh] flex items-center flex-col justify-center" v-if="loading">
+					<u-loading-icon :vertical="true"></u-loading-icon>
+				</view>
+				<view class="h-[95%] flex items-center flex-col justify-center" v-if="!loading && !storeList.length">
+					<u-empty text="没有可选择的自提点" width="214" :icon="img('static/resource/images/empty.png')"/>
+				</view>
+			</scroll-view>
+			<view class="btn-wrap">
+                <button class="primary-btn-bg btn" @click="confirm">确认</button>
+			</view>
+		</view>
+    </u-popup>
+</template>
+
+<script setup lang="ts">
+    import { ref,reactive } from 'vue'
+    import { getStoreList } from '@/addon/shop/api/order'
+    import { img } from '@/utils/common'
+
+    const show = ref(false)
+    const loaded = ref(false)
+    const loading = ref(true)
+    const storeList = ref<object[]>([])
+    const store = ref<null | object>(null)
+
+    const latlng = reactive({
+        lat:0,
+        lng:0
+    })
+	
+	const getStoreListFn = (callback:any)=>{
+		if (!loaded.value) {
+		    loaded.value = true
+			
+			if(uni.getStorageSync('location_address')){
+				let location_address = uni.getStorageSync('location_address');
+				latlng.lat = location_address.latitude;
+				latlng.lng = location_address.longitude;
+			}else{
+				uni.getLocation({
+				    type: 'gcj02',
+				    success: (res) => {
+					    latlng.lat = res.latitude
+					    latlng.lng = res.longitude
+				    },
+				    fail: (res) => {
+					    if (res.errno) {
+						    if (res.errno == 104) {
+							    let msg = '用户未授权隐私权限，获取位置失败';
+							    uni.showToast({ title: msg, icon: 'none' })
+						    } else if (res.errno == 112) {
+							    let msg = '隐私协议中未声明，获取位置失败';
+							    uni.showToast({ title: msg, icon: 'none' })
+						    }
+					    }
+					    if (res.errMsg) {
+						    if (res.errMsg.indexOf('getLocation:fail') != -1 || res.errMsg.indexOf('deny') != -1 || res.errMsg.indexOf('denied') != -1) {
+							    let msg = '用户未授权获取位置权限，将无法提供距离最近的门店';
+							    uni.showToast({ title: msg, icon: 'none' })
+						    } else {
+							    uni.showToast({ title: res.errMsg, icon: 'none' })
+						    }
+					    }
+				    }
+				});
+			}
+		
+		    setTimeout(() => {
+			    getStoreList({ latlng }).then(({ data }) => {
+				    storeList.value = data
+					if(typeof callback == 'function'){
+						callback(data);
+					}
+				    loading.value = false
+			    }).catch(() => {
+				    loading.value = false
+			    })
+		    }, 1500)
+		}
+	}
+
+    const open = ()=> {
+	    show.value = true
+    }
+
+    const selectStore = (data: object)=> {
+        if (store.value) {
+            store.value = store.value.store_id != data.store_id ? data : null
+        } else {
+            store.value = data
+        }
+    }
+
+    const emits = defineEmits(['confirm'])
+
+    const confirm = ()=> {
+        emits('confirm', store.value)
+        show.value = false
+    }
+
+    const distanceFormat = (distance: any) => {
+        distance = parseFloat(distance)
+        if (distance < 1000) {
+            return `${distance}m`;
+        } else {
+            const km = (distance / 1000).toFixed(2)
+            return `${km}km`;
+        }
+    }
+
+    defineExpose({
+    	open,
+		getData: getStoreListFn
+    })
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/uni-app/src/addon/shop/pages/order/detail.vue b/uni-app/src/addon/shop/pages/order/detail.vue
new file mode 100644
index 00000000..1fb8047a
--- /dev/null
+++ b/uni-app/src/addon/shop/pages/order/detail.vue
@@ -0,0 +1,743 @@
+<template>
+	<view :style="themeColor()">
+		<view class="bg-[var(--page-bg-color)] min-h-screen overflow-hidden" v-if="!loading">
+			<view v-if="!loading" class="pb-20rpx">
+				<view v-if="detail.status_name" class="pl-[40rpx] pr-[50rpx] bg-linear pb-[100rpx]">
+					<!-- #ifdef MP-WEIXIN -->
+					<top-tabbar :data="topTabbarData" :scrollBool="topTabarObj.getScrollBool()" />
+					<!-- #endif -->
+					<view class="flex justify-between items-center pt-[40rpx]">
+						<view class="text-[#fff] text-[36rpx] font-500 leading-[42rpx]">{{ detail.status_name.name }}</view>
+						<image v-if="detail.status == 1" class="w-[180rpx] h-[140rpx]" :src="img('addon/shop/detail/payment.png')" mode="aspectFit" />
+						<image v-if="detail.status == 2" class="w-[180rpx] h-[140rpx]" :src="img('addon/shop/detail/deliver_goods.png')" mode="aspectFit" />
+						<image v-if="detail.status == 3" class="w-[180rpx] h-[140rpx]" :src="img('addon/shop/detail/receive.png')" mode="aspectFit" />
+						<image v-if="detail.status == 5" class="w-[180rpx] h-[140rpx]" :src="img('addon/shop/detail/complete.png')" mode="aspectFit" />
+						<image v-if="detail.status == -1" class="w-[180rpx] h-[140rpx]" :src="img('addon/shop/detail/close.png')" mode="aspectFit" />
+					</view>
+				</view>
+				<view class="sidebar-margin mt-[-86rpx] card-template" v-if="detail.delivery_type != 'virtual'">
+					<view v-if="detail.delivery_type == 'express'">
+						<view class="text-[#303133] flex">
+							<text class="nc-iconfont nc-icon-dizhiguanliV6xx text-[40rpx] pt-[12rpx] mr-[20rpx]"></text>
+							<view class="flex flex-col">
+								<view class="text-[30rpx] leading-[38rpx] overflow-hidden">
+									<text>{{ detail.taker_name }}</text>
+									<text class="ml-[15rpx]">{{ detail.taker_mobile }}</text>
+								</view>
+								<view class="mt-[12rpx] text-[24rpx] text-[var(--text-color-light6)] using-hidden leading-[26rpx]">
+									{{detail.taker_full_address.split(detail.taker_address)[0]}}{{detail.taker_address}}
+								</view>
+							</view>
+
+						</view>
+					</view>
+					<view v-if="detail.delivery_type == 'store'">
+						<view class="flex items-center">
+							<view>
+								<u--image class="overflow-hidden" radius="var(--goods-rounded-mid)" width="100rpx" height="100rpx" :src="img(detail.store.store_logo ? detail.store.store_logo : '')" model="aspectFill">
+									<template #error>
+										<image class="w-[100rpx] h-[100rpx] rounded-[var(--goods-rounded-mid)] overflow-hidden" :src="img('addon/shop/store_default.png')" mode="aspectFill"></image>
+									</template>
+								</u--image>
+							</view>
+							<view class="flex flex-col ml-[20rpx]">
+								<text class="text-[30rpx] font-500 text-[#303133] mb-[20rpx]">{{ detail.store.store_name }}</text>
+								<text class="text-[24rpx] text-[var(--text-color-light6)] mb-[14rpx]">{{ detail.store.trade_time }}</text>
+								<text class="text-[24rpx] text-[var(--text-color-light6)] leading-[1.4]">{{ detail.store.full_address }}</text>
+							</view>
+						</view>
+					</view>
+					<view class="flex" v-if="detail.delivery_type == 'local_delivery'">
+						<text @click="getAddress" class="nc-iconfont nc-icon-dizhiguanliV6xx text-[40rpx] pt-[12rpx] mr-[20rpx]"></text>
+						<view class="flex flex-col">
+							<view class="flex leading-[38rpx] overflow-hidden">
+								<text class="text-[30rpx]">{{ detail.taker_name }}</text>
+								<text class="text-[30rpx] ml-[15rpx]">{{ detail.taker_mobile }}</text>
+							</view>
+							<text class="text-[24rpx] mt-[12rpx] leading-[26rpx]">{{ detail.taker_full_address }}</text>
+						</view>
+					</view>
+				</view>
+				<view class="sidebar-margin card-template p-[0] py-[var(--pad-top-m)] overflow-hidden" :class="{'pb-[var(--pad-top-m)]': detail.gift_goods.length <= 0}" :style="detail.delivery_type == 'virtual' ? 'margin-top: -86rpx' : 'margin-top: 20rpx'">
+					<view v-for="(goodsItem, goodsIndex) in detail.goods" :key="goodsIndex" class="px-[var(--pad-sidebar-m)]">
+						<view class="order-goods-item flex justify-between flex-wrap mb-[20rpx]">
+							<view class="w-[150rpx] h-[150rpx] rounded-[var(--goods-rounded-big)] overflow-hidden" @click="goodsEvent(goodsItem.goods_id)">
+								<u--image class="overflow-hidden" radius="var(--goods-rounded-big)" width="150rpx" height="150rpx"
+									:src="img(goodsItem.goods_image_thumb_small ? goodsItem.goods_image_thumb_small : '')"
+									model="aspectFill">
+									<template #error>
+										<image
+											class="w-[150rpx] h-[150rpx] rounded-[var(--goods-rounded-big)] overflow-hidden"
+											:src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill">
+										</image>
+									</template>
+								</u--image>
+							</view>
+
+							<view class="ml-[20rpx] flex flex-1 flex-col justify-between">
+								<view>
+									<view class="text-[28rpx] max-w-[490rpx] truncate leading-[40rpx] text-[#333]">{{ goodsItem.goods_name }}</view>
+									<view v-if="goodsItem.sku_name">
+										<view class="text-[22rpx] mt-[14rpx] text-[var(--text-color-light9)] truncate max-w-[490rpx] leading-[28rpx]">{{ goodsItem.sku_name }}</view>
+									</view>
+								</view>
+								<view v-if="goodsItem.manjian_info && Object.keys(goodsItem.manjian_info).length" class="flex items-center mt-[10rpx] mb-[auto]" @click.stop="manjianOpenFn(goodsItem.manjian_info)">
+									<view class="bg-[var(--primary-color-light)] text-[var(--primary-color)] rounded-[6rpx] text-[20rpx] flex items-center justify-center w-[88rpx] h-[36rpx] mr-[6rpx]">满减送</view>
+									<text class="text-[22rpx] text-[#999]">{{goodsItem.manjian_info.manjian_name}}</text>
+								</view>
+								<view class="flex justify-between items-baseline leading-[28rpx] text-[#333]">
+									<view class="price-font">
+										<view class="text-[40rpx] inline-block" v-if="goodsItem.extend && parseFloat(goodsItem.extend.point) > 0">
+											<text class="text-[40rpx] font-200">{{goodsItem.extend.point}}</text>
+											<text class="text-[32rpx] ml-[4rpx]">积分</text>
+										</view>
+										<text class="mx-[4rpx] text-[32rpx]" v-if="parseFloat(goodsItem.price) && goodsItem.extend && parseFloat(goodsItem.extend.point) > 0">+</text>
+										<block v-if="parseFloat(goodsItem.price) && goodsItem.extend && parseFloat(goodsItem.extend.point) > 0">
+											<text class="text-[40rpx] font-200">{{ parseFloat(goodsItem.price).toFixed(2) }}</text>
+											<text class="text-[32rpx] ml-[4rpx]">元</text>
+										</block>
+										<block v-if="goodsItem.extend && goodsItem.extend && goodsItem.extend.is_newcomer">
+											<text class="text-[24rpx]">￥</text>
+											<text class="text-[40rpx] font-500">{{ parseFloat(goodsItem.price).toFixed(2).split('.')[0] }}</text>
+											<text class="text-[24rpx] font-500">.{{ parseFloat(goodsItem.price).toFixed(2).split('.')[1] }}</text>
+										</block>
+										<block v-if="!goodsItem.extend">
+											<text class="text-[24rpx]">￥</text>
+											<text class="text-[40rpx] font-500">{{ parseFloat(goodsItem.price).toFixed(2).split('.')[0] }}</text>
+											<text class="text-[24rpx] font-500">.{{ parseFloat(goodsItem.price).toFixed(2).split('.')[1] }}</text>
+										</block>
+									</view>
+									<text class="text-right text-[26rpx]">x{{ goodsItem.num }}</text>
+								</view>
+							</view>
+						</view>
+						<view class="flex items-center box-border mt-[8rpx]" v-if="goodsItem.extend && goodsItem.extend.is_newcomer && goodsItem.num>1">
+							<image class="h-[24rpx] w-[56rpx]" :src="img('addon/shop/newcomer.png')" mode="heightFix" />
+							<view class="text-[24rpx] text-[#FFB000] leading-[34rpx] ml-[8rpx]">第1{{goodsItem.unit}}，￥{{parseFloat(goodsItem.extend.newcomer_price).toFixed(2)}}/{{goodsItem.unit}}；第{{goodsItem.num>2?'2~'+goodsItem.num:'2'}}{{goodsItem.unit}}，￥{{parseFloat(goodsItem.price).toFixed(2)}}/{{goodsItem.unit}}</view>
+						</view>
+						<view class="flex justify-end w-[100%] mt-[30rpx]" v-if="(goodsItem.status != '1') || (goodsItem.is_enable_refund == 1)">
+							<view v-if="goodsItem.status != '1'"
+								class="text-[22rpx] text-[#303133] leading-[50rpx] px-[20rpx] border-[2rpx] border-solid border-[#999] rounded-full"
+								@click="redirect({ url: '/addon/shop/pages/refund/detail', param: { order_refund_no : goodsItem.order_refund_no } })">
+								查看退款</view>
+							<view v-else-if="goodsItem.is_enable_refund == 1"
+								class="text-[22rpx] text-[#303133]  leading-[50rpx] px-[20rpx] border-[2rpx] border-solid border-[#999] rounded-full ml-[20rpx]"
+								@click="applyRefund(goodsItem.order_goods_id)">申请退款</view>
+						</view>
+
+						<!-- 商品的万能表单信息 -->
+						<view :class="{'diy-form-wrap' : goodsDiyFormData.length }" v-if="goodsItem.form_record_id">
+							<diy-form-detail :record_id="goodsItem.form_record_id" completeLayout="style-2" @callback="getGoodsDiyFormDetailCallback" />
+						</view>
+					</view>
+					<view class="pt-[20rpx] bg-[#f9f9f9] mt-[20rpx] mx-[var(--pad-sidebar-m)] rounded-[var(--rounded-big)]" v-if="detail.gift_goods.length">
+						<view class="order-goods-item flex justify-between flex-wrap px-[var(--pad-sidebar-m)] pb-[20rpx]" v-for="(goodsItem, goodsIndex) in detail.gift_goods" :key="goodsIndex">
+							<view class="w-[120rpx] h-[120rpx] rounded-[var(--goods-rounded-big)] overflow-hidden" @click="goodsEvent(goodsItem.goods_id)">
+								<u--image class="overflow-hidden" radius="var(--goods-rounded-big)" width="120rpx" height="120rpx"
+									:src="img(goodsItem.goods_image_thumb_small ? goodsItem.goods_image_thumb_small : '')"
+									model="aspectFill">
+									<template #error>
+										<image class="w-[120rpx] h-[120rpx] rounded-[var(--goods-rounded-big)] overflow-hidden"
+											:src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill">
+										</image>
+									</template>
+								</u--image>
+							</view>
+							<view class="ml-[16rpx] py-[8rpx] flex flex-1 flex-col justify-between">
+								<view class="flex items-center">
+									<view class="bg-[var(--primary-color-light)] whitespace-nowrap text-[var(--primary-color)] rounded-[6rpx] text-[22rpx] flex items-center justify-center w-[64rpx] h-[34rpx] mr-[6rpx]">赠品</view>
+									<view class="text-[26rpx] max-w-[400rpx] truncate leading-[40rpx] text-[#333]">{{ goodsItem.goods_name }}</view>
+								</view>
+								<view class="flex items-center">
+									<view v-if="goodsItem.sku_name" class="text-[22rpx] text-[var(--text-color-light9)] truncate max-w-[400rpx] leading-[28rpx]">
+										{{ goodsItem.sku_name }}
+									</view>
+									<view class="ml-[auto] font-400 text-[26rpx] text-[#303133]">
+										<text>x</text>
+										<text>{{ goodsItem.num }}</text>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="sidebar-margin mt-[var(--top-m)] card-template">
+					<view class="justify-between card-template-item">
+						<view  class="text-[28rpx]">{{ t('orderNo') }}</view>
+						<view class="flex items-center text-[28rpx]">
+							<text>{{ detail.order_no }}</text>
+							<text class="w-[2rpx] h-[20rpx] bg-[#999] mx-[10rpx]"></text>
+							<text class="text-[var(--primary-color)]" @click="copy(detail.order_no)">复制</text>
+						</view>
+					</view>
+					<view v-if="detail.out_trade_no" class="justify-between card-template-item">
+						<view class="text-[28rpx]">{{ t('orderTradeNo') }}</view>
+						<view class="text-[28rpx]">{{ detail.out_trade_no }}</view>
+					</view>
+					<view class="justify-between card-template-item">
+						<view class="text-[28rpx]">{{ t('createTime') }}</view>
+						<view class="text-[28rpx]">{{ detail.create_time }}</view>
+					</view>
+					<view class=" card-template-item justify-between">
+						<view class="text-[28rpx]">{{ t('deliveryType') }}</view>
+						<view class="text-[28rpx]">{{ detail.delivery_type_name }}</view>
+					</view>
+					<view v-if="detail.pay" class=" card-template-item justify-between !mb-[18rpx]">
+						<view class="text-[28rpx]">{{ t('payTypeName') }}</view>
+						<view class="text-[28rpx]">{{ detail.pay.type_name }}</view>
+					</view>
+					<view v-if="detail.pay && detail.member_id !== detail.pay.main_id && detail.pay.status == 2 " class="card-template-item justify-end">
+						<view class="friend-pay relative px-[20rpx] py-[12rpx] bg-[#F2F2F2] rounded-[10rpx] flex items-center">
+							<u-avatar :src="img(detail.pay.pay_member_headimg)" size="20" leftIcon="none" :default-url="img('static/resource/images/default_headimg.png')"  />
+							<text class="ml-[14rpx] text-[24rpx] using-hidden">{{ detail.pay.pay_member }}{{ t('helpPay') }}</text>
+						</view>
+					</view>
+					<view v-if="detail.pay" class=" card-template-item justify-between">
+						<view class="text-[28rpx]">{{ t('payTime') }}</view>
+						<view class="text-[28rpx]">{{ detail.pay.pay_time }}</view>
+					</view>
+
+				</view>
+				<!-- 核销码 -->
+				<block v-if="isShowVerify">
+					<view class="sidebar-margin  mt-[var(--top-m)] card-template" v-if="verifyInfo && verifyInfo.length">
+						<swiper class="h-[450rpx]" circular indicator-dots="true" v-if="verifyInfo.length > 1">
+							<swiper-item v-for="(item,index) in verifyInfo" :key="index">
+								<view class="flex flex-col items-center justify-center">
+									<image :src="item.qrcode" class="w-[300rpx] h-[auto]" mode="widthFix"></image>
+								</view>
+								<view class="flex items-center justify-center mt-[30rpx]">
+									<text class="text-[28rpx] font-500">{{item.code}}</text>
+									<text
+										class="text-[var(--text-color-light6)] text-[24rpx] ml-[10rpx] border-[2rpx] border-solid border-[#666] bg-[#f7f7f7] px-[12rpx] py-[6rpx] rounded"
+										@click="copy(item.code)">复制</text>
+								</view>
+							</swiper-item>
+						</swiper>
+						<block v-else>
+							<view class="flex flex-col items-center justify-center">
+								<image :src="verifyInfo[0].qrcode" class="w-[300rpx] h-[auto]" mode="widthFix"></image>
+							</view>
+							<view class="flex items-center justify-center mt-[30rpx]">
+								<text class="text-[28rpx] font-500">{{verifyInfo[0].code}}</text>
+								<text
+									class="text-[var(--text-color-light6)] text-[24rpx] ml-[10rpx] border-[2rpx] border-solid border-[#666] bg-[#f7f7f7] px-[12rpx] py-[6rpx] rounded"
+									@click="copy(verifyInfo[0].code)">复制</text>
+							</view>
+						</block>
+
+					</view>
+					<view class="sidebar-margin mt-[var(--top-m)] card-template">
+						<view class="title">核销信息</view>
+						<view class="card-template-item justify-between">
+							<view class="text-[28rpx]">核销次数</view>
+							<view class="price-font font-500 text-[28rpx]">
+								{{'剩余'+(verifyGoodsData.num - verifyGoodsData.verify_count)+'次'}}/{{'共'+verifyGoodsData.num+'次'}}
+							</view>
+						</view>
+						<view class="card-template-item justify-between">
+							<view class="text-[28rpx]">有效期</view>
+							<view class="price-font font-500 text-[28rpx]">
+								{{verifyGoodsData.verify_expire_time ? verifyGoodsData.verify_expire_time : '永久'}}
+							</view>
+						</view>
+					</view>
+				</block>
+
+				<!-- 待付款订单的万能表单信息 -->
+				<view :class="{'sidebar-margin mt-[var(--top-m)] card-template' : orderDiyFormData.length }" v-if="detail.form_record_id">
+					<diy-form-detail :record_id="detail.form_record_id" completeLayout="style-2" @callback="getOrderDiyFormDetailCallback" />
+				</view>
+				<view class="sidebar-margin mt-[var(--top-m)] card-template">
+					<view class="card-template-item justify-between">
+						<view class="text-[28rpx]">{{ t('goodsMoney') }}</view>
+						<view class="price-font font-500">
+							<text v-if="parseFloat(detail.point) > 0" class="text-[28rpx]">{{detail.point}}积分</text>
+							<text v-if="parseFloat(detail.point) > 0 && parseFloat(detail.goods_money)" class="mx-[4rpx] text-[28rpx]">+</text>
+							<block v-if="parseFloat(detail.goods_money) || !parseFloat(detail.point)">
+								<text class="text-[28rpx]">￥</text>
+								<text class="text-[28rpx]">{{ parseFloat(detail.goods_money).toFixed(2).split('.')[0] }}</text>
+								<text class="text-[28rpx]">.{{ parseFloat(detail.goods_money).toFixed(2).split('.')[1] }}</text>
+							</block>
+						</view>
+					</view>
+					<view class=" card-template-item justify-between" v-if="parseFloat(detail.delivery_money)">
+						<view class="text-[28rpx]">{{ t('deliveryMoney') }}</view>
+						<view class="price-font font-500 text-[28rpx]">
+							￥{{ parseFloat(detail.delivery_money).toFixed(2) }}
+						</view>
+					</view>
+					<!-- <view class=" card-template-item justify-between">
+						<view class="text-[28rpx]">{{ t('discountMoney') }}</view>
+						<view class="price-font font-500 text-[28rpx]">
+							-￥{{ parseFloat(detail.discount_money).toFixed(2) }}
+						</view>
+					</view> -->
+					<view class=" card-template-item justify-between" v-if="parseFloat(detail.coupon_money)">
+						<view class="text-[28rpx]">优惠券优惠</view>
+						<view class="price-font font-500 text-[28rpx]">
+							-￥{{ parseFloat(detail.coupon_money).toFixed(2) }}
+						</view>
+					</view>
+					<view class=" card-template-item justify-between" v-if="parseFloat(detail.manjian_discount_money)">
+						<view class="text-[28rpx]">满减优惠</view>
+						<view class="price-font font-500 text-[28rpx]">
+							-￥{{ parseFloat(detail.manjian_discount_money).toFixed(2) }}
+						</view>
+					</view>
+					<view class=" card-template-item justify-between items-baseline">
+						<view class="text-[28rpx]">{{ t('orderMoney') }}</view>
+						<view class="text-[var(--price-text-color)] price-font">
+							<text v-if="parseFloat(detail.point) > 0" class="text-[28rpx]">{{detail.point}}积分</text>
+							<text v-if="parseFloat(detail.point) > 0 && parseFloat(detail.order_money)" class="mx-[4rpx] text-[28rpx]">+</text>
+							<text v-if="parseFloat(detail.order_money) || !parseFloat(detail.point)" class="text-[28rpx]">￥{{ parseFloat(detail.order_money).toFixed(2) }} </text>
+						</view>
+					</view>
+				</view>
+
+				<view class="flex z-2 justify-between items-center bg-[#fff] fixed left-0 right-0 bottom-0 min-h-[100rpx] pl-[30rpx] pr-[20rpx] flex-wrap  pb-ios">
+					<view class="flex">
+						<view class="flex  mr-[34rpx] flex-col justify-center items-center" @click="orderBtnFn('index')">
+							<view class="nc-iconfont nc-icon-shouyeV6xx11 text-[36rpx]"></view>
+							<text class="text-[20rpx] mt-[10rpx]">{{t('index')}}</text>
+						</view>
+						<!-- #ifdef MP-WEIXIN -->
+						<view>
+							<nc-contact :send-message-title="sendMessageTitle" :send-message-path="sendMessagePath" :send-message-img="sendMessageImg">
+								<view class="flex flex-col justify-center items-center">
+									<view class="w-[36rpx] h-[36rpx] flex-center">
+										<text class="nc-iconfont nc-icon-kefuV6xx-1 text-[34rpx]"></text>
+									</view>
+									<text class="text-[20rpx] mt-[10rpx]">客服</text>
+								</view>
+							</nc-contact>
+						</view>
+						<!-- #endif -->
+					</view>
+					<view class="flex justify-end">
+						<view class="min-w-[180rpx]  box-border text-[26rpx] h-[70rpx] flex-center border-[2rpx] border-solid border-[#999] rounded-full ml-[20rpx] text-[var(--text-color-light6)]"
+							@click="orderBtnFn('logistics')" v-if="showLogistics(detail)">
+							{{ t('logisticsTracking') }}
+						</view>
+						<view class="min-w-[180rpx] box-border text-[26rpx]  h-[70rpx] flex-center text-center border-[2rpx] border-solid border-[#999] rounded-full ml-[20rpx] text-[var(--text-color-light6)]"
+							 v-if="detail.status == 1" @click="orderBtnFn('close')">{{ t('orderClose') }}</view>
+						<view class="min-w-[180rpx] box-border  text-[26rpx] h-[70rpx] flex-center text-center text-[#fff] primary-btn-bg rounded-full ml-[20rpx]"
+							 v-if="detail.status == 1" @click="orderBtnFn('pay')">{{ t('topay') }}</view>
+						<view v-if="detail.status == 3"
+							class="min-w-[180rpx] box-border  text-[26rpx] h-[70rpx] flex-center text-center  text-[#fff]  primary-btn-bg rounded-full ml-[20rpx]"
+							@click="orderBtnFn('finish')">{{ t('orderFinish') }}</view>
+						<block v-if="detail.status == 5 && isShowEvaluate">
+							<view
+								v-if="detail.is_evaluate == 1 || (detail.is_evaluate != 1 && evaluateConfig.is_evaluate == 1)"
+								class="min-w-[180rpx] box-border text-[26rpx]  h-[70rpx] flex-center border-[2rpx] border-solid border-[#999] rounded-full ml-[20rpx] !text-[var(--text-color-light6)]"
+								@click="orderBtnFn('evaluate')">
+								{{ detail.is_evaluate == 1 ? t('selectedEvaluate') : t('evaluate') }}
+							</view>
+						</block>
+					</view>
+				</view>
+			</view>
+			<view class="tab-bar-placeholder"></view>
+			<pay ref="payRef" @close="payClose"></pay>
+			<logistics-tracking ref="materialRef"></logistics-tracking>
+			<!-- 满减 -->
+			<ns-goods-manjian ref="manjianShowRef"></ns-goods-manjian>
+		</view>
+
+		<loading-page :loading="loading"></loading-page>
+
+		<!-- #ifdef MP-WEIXIN -->
+		<!-- 小程序隐私协议 -->
+		<wx-privacy-popup ref="wxPrivacyPopupRef"></wx-privacy-popup>
+		<!-- #endif -->
+	</view>
+</template>
+
+<script setup lang="ts">
+	import { ref, reactive, computed,nextTick } from 'vue';
+	import { onLoad } from '@dcloudio/uni-app'
+	import { t } from '@/locale'
+	import { img, redirect, copy, goback } from '@/utils/common';
+	import { getShopOrderDetail, orderClose, orderFinish } from '@/addon/shop/api/order';
+	import { getEvaluateConfig } from '@/addon/shop/api/shop';
+	import { getVerifyCode } from '@/app/api/verify';
+	import logisticsTracking from '@/addon/shop/pages/order/components/logistics-tracking/logistics-tracking.vue'
+	import useConfigStore from "@/stores/config";
+	import nsGoodsManjian from '@/addon/shop/components/ns-goods-manjian/ns-goods-manjian.vue';
+	import { topTabar } from '@/utils/topTabbar';
+	import { cloneDeep } from 'lodash-es';
+	import diyFormDetail from '@/addon/components/diy-form-detail/index.vue'
+
+	/********* 自定义头部 - start ***********/
+	const topTabarObj = topTabar()
+	let topTabbarData = topTabarObj.setTopTabbarParam({ title: '订单详情' })
+	/********* 自定义头部 - end ***********/
+
+	const detail: any = ref<Object>({});
+	const loading = ref<boolean>(true);
+	const type = ref('')
+	const orderId = ref('')
+	const orderStepsShow = ref(false)
+	const evaluateConfig = ref<Object>({});
+	const isShowEvaluate = ref(true)
+	const manjianShowRef: any = ref(null); //满减送
+
+	const sendMessageTitle = ref('')
+	const sendMessagePath = ref('')
+	const sendMessageImg = ref('')
+
+	const wxPrivacyPopupRef:any = ref(null)
+
+	onLoad((option: any) => {
+        if(option.order_id){
+            orderId.value = option.order_id;
+            orderDetailFn(orderId.value);
+            // #ifdef MP
+            nextTick(()=>{
+                if(wxPrivacyPopupRef.value) wxPrivacyPopupRef.value.proactive();
+            })
+            // #endif
+        }else{
+            let parameter = {
+				url:'/addon/shop/pages/order/list',
+				title: '缺少订单id'
+			};
+			goback(parameter)
+        }
+	});
+
+	getEvaluateConfig().then(({ data }) => {
+		evaluateConfig.value = data
+	})
+
+	const orderDetailFn = (id: any) => {
+		loading.value = true;
+		getShopOrderDetail(id).then((res: any) => {
+			detail.value = res.data;
+			if (res.data.order_goods && res.data.order_goods.length && isShowVerify.value) {
+				let obj: any = {};
+				obj.order_goods_id = res.data.order_goods[0].order_goods_id
+				getVerifyCodeFn(obj);
+			}
+
+			detail.value.goods = []; //购买商品
+			detail.value.gift_goods = []; //赠品
+			detail.value.order_goods.forEach((item,index)=>{
+				if(item.is_gift){
+					detail.value.gift_goods.push(item);
+				}else{
+					detail.value.goods.push(item);
+				}
+			})
+
+			let evaluateCount = 0;
+			for (let i = 0; i < detail.value.order_goods.length; i++) {
+				if (detail.value.order_goods[i].status != 1 || detail.value.order_goods[i].is_enable_refund == 1) {
+					evaluateCount++;
+				}
+			}
+
+			if (evaluateCount == detail.value.order_goods.length) {
+				isShowEvaluate.value = false;
+			}
+
+			sendMessageTitle.value = detail.value.order_goods[0].goods_name
+			sendMessageImg.value = img(detail.value.order_goods[0].goods_image_thumb_small || '')
+			loading.value = false;
+		}).catch(() => {
+			loading.value = false;
+		})
+	}
+
+	// 满减
+	const manjianOpenFn = (data:any) =>{
+		let obj = {};
+		obj.condition_type = cloneDeep(data).condition_type;
+		obj.rule_json = [cloneDeep(data).rule];
+		obj.name = cloneDeep(data).manjian_name;
+		manjianShowRef.value.open(obj);
+	}
+
+	//关闭订单
+	const close = (item : any) => {
+		uni.showModal({
+			title: '提示',
+			content: '您确定要关闭该订单吗？',
+			confirmColor: useConfigStore().themeColor['--primary-color'],
+			success: res => {
+				if (res.confirm) {
+					orderClose(item.order_id).then((data) => {
+						orderDetailFn(item.order_id);
+					})
+				}
+			}
+		})
+	}
+
+	//订单完成
+	const finish = (item : any) => {
+		// 如果不在微信小程序中
+		// #ifndef MP-WEIXIN
+		uni.showModal({
+			title: '提示',
+			content: '您确定物品已收到吗？',
+			confirmColor: useConfigStore().themeColor['--primary-color'],
+			success: res => {
+				if (res.confirm) {
+					orderFinish(item.order_id).then((data) => {
+						orderDetailFn(item.order_id);
+					})
+				}
+			}
+		})
+		// #endif
+
+		// #ifdef MP-WEIXIN
+		// 检测微信小程序是否已开通发货信息管理服务
+		if (item.pay && item.pay.type == 'wechatpay' && item.is_trade_managed && wx.openBusinessView) {
+			wx.openBusinessView({
+				businessType: 'weappOrderConfirm',
+				extraData: {
+					merchant_id: item.mch_id,
+					merchant_trade_no: item.out_trade_no
+				},
+				success: (res : any) => {
+					orderFinish(item.order_id).then((data) => {
+						orderDetailFn(item.order_id);
+					})
+				},
+				fail: (res : any) => {
+					console.log('小程序确认收货组件打开失败 fail', res);
+				}
+			})
+		} else {
+			uni.showModal({
+				title: '提示',
+				content: '您确定物品已收到吗？',
+				confirmColor: useConfigStore().themeColor['--primary-color'],
+				success: res => {
+					if (res.confirm) {
+						orderFinish(item.order_id).then((data) => {
+							orderDetailFn(item.order_id);
+						})
+					}
+				}
+			})
+		}
+		// #endif
+	}
+
+	const goodsEvent = (id : number) => {
+		if (detail.value.activity_type == 'exchange') {
+			redirect({
+				url: '/addon/shop/pages/point/detail',
+				param: {
+					id: detail.value.relate_id
+				}
+			})
+		} else {
+			redirect({
+				url: '/addon/shop/pages/goods/detail',
+				param: {
+					goods_id: id
+				}
+			})
+		}
+	}
+
+	const payRef = ref(null)
+	const materialRef: any = ref(null)
+	const orderBtnFn = (type = '') => {
+		if (type == 'pay')
+			payRef.value?.open(detail.value.order_type, detail.value.order_id, `/addon/shop/pages/order/detail?order_id=${detail.value.order_id}`);
+		else if (type == 'close') {
+			close(detail.value);
+		} else if (type == 'finish') {
+			finish(detail.value);
+		} else if (type == 'index') {
+			redirect({
+				url: '/addon/shop/pages/index',
+				mode: 'reLaunch'
+			});
+		} else if (type == 'logistics') {
+			if (detail.value.order_delivery.length > 0) {
+				let params = {
+					id: detail.value.order_delivery[0].id,
+					mobile: detail.value.taker_mobile
+				}
+				let list : any = []
+				detail.value.order_delivery.forEach((item : any, index : number) => {
+					item.name = `包裹${index + 1}`
+					list.push(item)
+				})
+
+				materialRef.value.open(params);
+				materialRef.value.packageList = list
+			}
+		} else if (type == 'evaluate') {
+			if (!detail.value.is_evaluate) {
+				redirect({ url: '/addon/shop/pages/evaluate/order_evaluate', param: { order_id: detail.value.order_id } })
+			} else {
+				redirect({ url: '/addon/shop/pages/evaluate/order_evaluate_view', param: { order_id: detail.value.order_id } })
+			}
+		}
+	}
+
+	const dateFormat = (res: any, type: any) => {
+		let data;
+		if (res.indexOf('/') != -1) {
+			data = res.split("/");
+		} else if (res.indexOf('-') != -1) {
+			data = res.split("-");
+		}
+
+		let time;
+		const index = new Date(res).getDay();
+		const week = ['周日', '周一', '周二', '周三', '周四', '周五', '周六']
+		if (type == "yearMonthDay") {
+			time = data[0] + '年' + data[1] + '月' + data[2] + '日';
+		} else if (type == "yearMonthDayWeek") {
+			time = data[0] + '年' + data[1] + '月' + data[2] + '日 ' + week[index];
+		} else if (type == "monthDayWeek") {
+			time = data[1] + '月' + data[2] + '日 ' + week[index];
+		} else {
+			time = data[1] + '月' + data[2] + '日';
+		}
+
+		return time;
+	}
+
+	const applyRefund = (orderGoodsId : number) => {
+		redirect({
+			url: '/addon/shop/pages/refund/apply',
+			param: {
+				order_id: detail.value.order_id,
+				order_goods_id: orderGoodsId
+			}
+		})
+	}
+
+	const getAddress = () => {
+		uni.openLocation({
+			latitude: Number(detail.value.taker_latitude),
+			longitude: Number(detail.value.taker_longitude),
+			success: function () { }
+		});
+	}
+
+	const showLogistics = (data : any) => {
+		let status = false
+		if (data.delivery_type != 'express') return false;
+		for (let i = 0; i < data.order_delivery.length; i++) {
+			let item = data.order_delivery[i];
+			if (item.sub_delivery_type === 'express' && data.status === '3') {
+				status = true;
+				break;
+			} else if (item.sub_delivery_type === 'express' && data.status === '5') {
+				status = true;
+				break;
+			} else {
+				status = false
+			}
+		}
+		return status
+	}
+
+	/************ 虚拟商品核销-start ***************/
+	const verifyGoodsData = ref({}) //虚拟商品
+	const isShowVerify = computed(() => {
+		let bool =  false;
+		if(detail.value.order_goods.length == 1){
+			verifyGoodsData.value = detail.value.order_goods[0]
+
+			let data = detail.value.order_goods[0];
+			bool = data.is_verify == 1 && data.goods_type == 'virtual' && data.delivery_status == 'delivery_finish' && detail.value.status == 3 ? true : false;
+		}
+		return bool
+	})
+	const verifyInfo = ref([])
+	const getVerifyCodeFn = (data:any) => {
+		verifyInfo.value = [];
+
+		getVerifyCode('shopVirtualGoods', data).then((res: any) => {
+			verifyInfo.value = res.data;
+		})
+	}
+	/************ 虚拟商品核销-end ***************/
+
+	// 商品表单信息
+	const goodsDiyFormData = ref([]);
+	const getGoodsDiyFormDetailCallback = (data: any) => {
+		goodsDiyFormData.value = data;
+	}
+
+	// 订单表单信息
+	const orderDiyFormData = ref([]);
+	const getOrderDiyFormDetailCallback = (data: any) => {
+		orderDiyFormData.value = data;
+	}
+</script>
+<style lang="scss" scoped>
+	.text-item {
+		overflow: hidden;
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		-webkit-line-clamp: 2;
+		-webkit-box-orient: vertical;
+	}
+
+	.order-goods-item:nth-child(1) {
+		margin-top: 0rpx;
+	}
+
+	.text-color {
+		color: $u-primary;
+	}
+
+	.bg-color {
+		background-color: $u-primary;
+	}
+
+	.bg-linear {
+		background: linear-gradient(94deg, #F84949 8%, #FF9A68 99%);
+	}
+
+	.triangle {
+		@apply relative;
+
+		&::before {
+			content: "";
+			@apply absolute;
+			width: 0;
+			height: 0;
+			position: absolute;
+			bottom: -40rpx;
+			border: 20rpx solid #EEF3FF;
+			border-left-color: transparent;
+			border-right-color: transparent;
+			border-bottom-color: transparent;
+		}
+	}
+
+	.tab-bar-placeholder {
+		padding-bottom: calc(constant(safe-area-inset-bottom) + 100rpx);
+		padding-bottom: calc(env(safe-area-inset-bottom) + 100rpx);
+	}
+	:deep(.u-image__error){
+		background-color: transparent !important;
+	}
+	.friend-pay{
+		&::after{
+			content: '';
+			display: block;
+			width: 20rpx;
+			height: 20rpx;
+			background-color: #f2f2f2;
+			position: absolute;
+			right: 30rpx;
+			top: 0;
+			transform: translateY(-50%) rotate(45deg);
+			border-radius: 4rpx;
+		}
+	}
+</style>
diff --git a/uni-app/src/addon/shop/pages/order/list.vue b/uni-app/src/addon/shop/pages/order/list.vue
new file mode 100644
index 00000000..cdf77980
--- /dev/null
+++ b/uni-app/src/addon/shop/pages/order/list.vue
@@ -0,0 +1,328 @@
+<template>
+	<view class="bg-[var(--page-bg-color)] min-h-screen overflow-hidden order-list" :style="themeColor()">
+		<view class="fixed left-0 top-0 right-0 z-10" v-if="statusLoading">
+			<scroll-view :scroll-x="true" class="tab-style-2">
+				<view class="tab-content">
+					<view class="tab-items" :class="{ 'class-select': orderState === item.status.toString() }" @click="orderStateFn(item.status)" v-for="(item, index) in orderStateList">{{ item.name }}</view>
+				</view>
+			</scroll-view>
+		</view>
+
+		<mescroll-body ref="mescrollRef" top="88rpx" @init="mescrollInit" :down="{ use: false }" @up="getShopOrderFn">
+			<view class="sidebar-margin pt-[var(--top-m)]" v-if="list.length">
+				<template v-for="(item, index) in list" :key="index">
+					<view class="mb-[var(--top-m)] card-template">
+						<view @click.stop="toLink(item)">
+							<view class="flex justify-between items-center">
+								<view class="text-[#303133] text-[26rpx] font-400 leading-[36rpx]">
+									<text>{{ t('orderNo') }}:</text>
+									<text class="ml-[10rpx]">{{ item.order_no }}</text>
+									<text class="text-[#303133] text-[26rpx] font-400 nc-iconfont nc-icon-fuzhiV6xx1 ml-[11rpx]" @click.stop="copy(item.order_no)"></text>
+								</view>
+								<view class="text-[#303133] text-[26rpx] leading-[34rpx]" :class="{'text-primary': item.status  == 1,'!text-[var(--text-color-light9)]' :item.status  == 5 || item.status  == -1}">{{ item.status_name.name }}</view>
+							</view>
+							<block v-for="(subItem, index) in item.order_goods" :key="index">
+								<view class="flex box-border mt-[20rpx]">
+									<u--image width="150rpx" height="150rpx" :radius="'var(--goods-rounded-big)'" :src="img(subItem.goods_image_thumb_small ? subItem.goods_image_thumb_small : '')" mode="aspectFill">
+										<template #error>
+											<image class="w-[150rpx] h-[150rpx] rounded-[var(--goods-rounded-big)] overflow-hidden" :src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill"></image>
+										</template>
+									</u--image>
+									<view class="ml-[20rpx] flex flex-1 flex-col box-border">
+										<view class="flex justify-between items-baseline">
+											<view class="max-w-[322rpx] text-[28rpx] leading-[40rpx] font-400 truncate text-[#303133]">{{ subItem.goods_name }}</view>
+											<block v-if="item.activity_type == 'exchange'">
+												<view class="text-right ml-[10rpx] leading-[42rpx]" v-if="parseFloat(subItem.price)">
+													<text class="text-[22rpx] font-400 price-font">￥</text>
+													<text class="text-[36rpx] font-500 price-font">{{parseFloat(subItem.price).toFixed(2).split('.')[0] }}</text>
+													<text class="text-[22rpx] font-500 price-font">.{{parseFloat(subItem.price).toFixed(2).split('.')[1] }}</text>
+												</view>
+											</block>
+											<block v-else>
+												<view class="text-right leading-[42rpx] ml-[10rpx]">
+													<text class="text-[22rpx] price-font">￥</text>
+													<text class="text-[36rpx] font-500 price-font">{{parseFloat(subItem.price).toFixed(2).split('.')[0] }}</text>
+													<text class="text-[22rpx] font-500 price-font">.{{parseFloat(subItem.price).toFixed(2).split('.')[1] }}</text>
+												</view>
+											</block>
+										</view>
+										<view class="flex justify-between items-baseline text-[#303133] mt-[14rpx]">
+											<view>
+												<view class="text-[24rpx] text-[var(--text-color-light6)] font-400 truncate leading-[34rpx] max-w-[369rpx] mb-[10rpx]" v-if="subItem.sku_name">{{ subItem.sku_name }}</view>
+												<view class="text-[24rpx] font-400 leading-[34rpx] text-[var(--text-color-light6)]" v-if="item.delivery_type != 'virtual'">
+													{{t('deliveryType') }} ： {{item.delivery_type_name}}
+												</view>
+												<view class="text-[24rpx] font-400 leading-[34rpx] text-[var(--text-color-light6)]" v-else>{{t('createTime') }} ：{{item.create_time}}</view>
+											</view>
+											<text class="text-right text-[26rpx] font-400 w-[90rpx] leading-[36rpx]">x{{ subItem.num }}</text>
+										</view>
+									</view>
+								</view>
+								<view class="flex items-center box-border mt-[8rpx]" v-if="subItem.extend && subItem.extend.is_newcomer && subItem.num > 1">
+									<image class="h-[24rpx] w-[56rpx]" :src="img('addon/shop/newcomer.png')" mode="heightFix" />
+									<view class="text-[24rpx] text-[#FFB000] leading-[34rpx] ml-[8rpx]">第1{{subItem.unit}}，￥{{parseFloat(subItem.extend.newcomer_price).toFixed(2)}}/{{subItem.unit}}；第{{subItem.num>2?'2~'+subItem.num:'2'}}{{subItem.unit}}，￥{{parseFloat(subItem.price).toFixed(2)}}/{{subItem.unit}}</view>
+								</view>
+							</block>
+						</view>
+						<view class="flex justify-end items-center mt-[20rpx]">
+							<view class="flex items-baseline">
+								<view class="text-[22rpx] text-[var(--text-color-light9)] leading-[30rpx] mr-[6rpx]" v-if="parseFloat(item.delivery_money)">{{ t('service') }}</view>
+								<view class="text-[22rpx] font-400 leading-[30rpx] text-[#303133]">{{ t('actualPayment') }}：</view>
+								<view class="leading-[1] text-[var(--price-text-color)]">
+									<block v-if="item.activity_type == 'exchange'">
+										<text class="text-[36rpx] mr-[2rpx] leading-[40rpx] price-font font-500">{{ item.point }}</text>
+										<text  class="text-[20rpx] leading-[28rpx] font-500">{{ t('point') }}</text>
+										<block v-if="parseFloat(item.order_money)">
+											<text class="text-[20rpx] mx-[4rpx] font-500 leading-[28rpx]">+</text>
+											<text class="text-[36rpx] font-500 leading-[40rpx] price-font">{{ parseFloat(item.order_money).toFixed(2) }}</text>
+											<text class="text-[20rpx] font-500 leading-[28rpx] ml-[2rpx]">{{ t('money') }}</text>
+										</block>
+									</block>
+									<block v-else>
+										<text class="text-[22rpx] leading-[26rpx] price-font">￥</text>
+										<text class="text-[36rpx] font-500 leading-[40rpx] price-font">{{ parseFloat(item.order_money).toFixed(2).split('.')[0]  }}</text>
+										<text class="text-[22rpx] font-500 leading-[28rpx] price-font">.{{ parseFloat(item.order_money).toFixed(2).split('.')[1]  }}</text>
+									</block>
+								</view>
+							</view>
+						</view>
+						<view class="flex justify-end text-[28rpx] mt-[20rpx] items-center" v-if="(item.status == 1) || (item.status == 3) || (item.status == 5 && item.is_show_evaluate && evaluateConfig.is_evaluate == 1)">
+							<view class="text-[24rpx] font-500 leading-[52rpx] h-[56rpx] min-w-[150rpx] text-center border-[2rpx] border-solid border-[var(--text-color-light9)] rounded-full text-[var(--text-color-light6)] box-border" v-if="item.status == 1" @click.stop="orderBtnFn(item, 'close')">{{ t('orderClose') }}</view>
+							<view class="text-[24rpx] font-500 flex-center h-[56rpx] min-w-[150rpx] text-center border-[0] text-[#fff] primary-btn-bg rounded-full ml-[20rpx] box-border" v-if="item.status == 1" @click.stop="orderBtnFn(item, 'pay')">{{ t('topay') }}</view>
+							<view class="text-[24rpx] font-500 flex-center h-[56rpx] min-w-[150rpx] text-center border-[0] text-[#fff] primary-btn-bg rounded-full ml-[20rpx] box-border" v-if="item.status == 3" @click.stop="orderBtnFn(item, 'finish')">{{ t('orderFinish') }}</view>
+							<view class="text-[24rpx] font-500 leading-[52rpx] h-[56rpx] min-w-[150rpx] text-center border-[2rpx] border-solid border-[var(--text-color-light9)] rounded-full ml-[20rpx]  text-[var(--text-color-light6)] box-border" v-if="item.status == 5 && item.is_show_evaluate && evaluateConfig.is_evaluate == 1" @click.stop="orderBtnFn(item, 'evaluate')">{{ item.is_evaluate == 1 ? t('selectedEvaluate') : t('evaluate') }}</view>
+						</view>
+					</view>
+				</template>
+			</view>
+			<mescroll-empty v-if="!list.length && loading" :option="{tip : '暂无订单'}"></mescroll-empty>
+		</mescroll-body>
+		<pay ref="payRef" @close="payClose"></pay>
+		<!-- #ifdef MP-WEIXIN -->
+		<!-- 小程序隐私协议 -->
+		<wx-privacy-popup ref="wxPrivacyPopupRef"></wx-privacy-popup>
+		<!-- #endif -->
+	</view>
+</template>
+
+<script setup lang="ts">
+import { ref,nextTick } from 'vue';
+import { t } from '@/locale'
+import { img, redirect,copy } from '@/utils/common'
+import { getShopOrderStatus, getShopOrder, orderClose, orderFinish } from '@/addon/shop/api/order';
+import { getEvaluateConfig } from '@/addon/shop/api/shop';
+import MescrollBody from '@/components/mescroll/mescroll-body/mescroll-body.vue';
+import MescrollEmpty from '@/components/mescroll/mescroll-empty/mescroll-empty.vue';
+import useMescroll from '@/components/mescroll/hooks/useMescroll.js';
+import { onLoad, onPageScroll, onReachBottom, onShow } from '@dcloudio/uni-app';
+import useConfigStore from "@/stores/config";
+
+const { mescrollInit, downCallback, getMescroll } = useMescroll(onPageScroll, onReachBottom);
+const list = ref<Array<Object>>([]);
+const loading = ref<boolean>(false);
+const statusLoading = ref<boolean>(false);
+const orderState = ref('')
+const orderStateList: any = ref([]);
+const evaluateConfig = ref("")
+
+const mch_id = ref('')
+const isTradeManaged = ref(false)
+
+const wxPrivacyPopupRef:any = ref(null)
+
+onLoad((option: any) => {
+	orderState.value = option.status || "";
+	evaluateEvent()
+	getShopOrderStatusFn();
+	// #ifdef MP
+	nextTick(()=>{
+		if(wxPrivacyPopupRef.value) wxPrivacyPopupRef.value.proactive();
+	})
+	// #endif
+});
+
+onShow(() => {
+	nextTick(()=>{
+		// 评价完成之后，会返回到订单列表，需要请求最新数据
+		if(getMescroll()){ getMescroll().resetUpScroll();}
+	})
+})
+
+const evaluateEvent = () => {
+	getEvaluateConfig().then((data: any) => {
+		evaluateConfig.value = data.data
+	})
+}
+
+const getShopOrderFn = (mescroll: any) => {
+	loading.value = false;
+	let data: object = {
+		page: mescroll.num,
+		limit: mescroll.size,
+		status: orderState.value
+	};
+
+	getShopOrder(data).then((res: any) => {
+		let newArr = (res.data.data as Array<Object>);
+		//设置列表数据
+		if (mescroll.num == 1) {
+			list.value = []; //如果是第一页需手动制空列表
+		}
+
+		newArr.forEach((item:any)=> {
+			item.is_show_evaluate = true;
+			let evaluateCount = 0;
+			for (let i = 0; i < item.order_goods.length; i++) {
+				if (item.order_goods[i].status != 1 || item.order_goods[i].is_enable_refund == 1) {
+					evaluateCount++;
+				}
+			}
+			if (evaluateCount == item.order_goods.length) {
+				item.is_show_evaluate = false;
+			}
+		})
+
+		list.value = list.value.concat(newArr);
+		mescroll.endSuccess(newArr.length);
+
+        mch_id.value = res.data.mch_id;
+        isTradeManaged.value = res.data.is_trade_managed;
+		loading.value = true;
+	}).catch(() => {
+		loading.value = true;
+		mescroll.endErr(); // 请求失败, 结束加载
+	})
+}
+
+const getShopOrderStatusFn = () => {
+	statusLoading.value = false;
+	orderStateList.value = [];
+	let obj = { name: '全部', status: '' };
+	orderStateList.value.push(obj);
+
+	getShopOrderStatus().then((res: any) => {
+		Object.values(res.data).forEach((item, index) => {
+			orderStateList.value.push(item);
+		});
+		statusLoading.value = true;
+	}).catch(() => {
+		statusLoading.value = true;
+	})
+}
+
+const orderStateFn = (status: any) => {
+	orderState.value = status.toString();
+	list.value = [];
+	getMescroll().resetUpScroll();
+};
+
+const toLink = (data: any) => {
+	redirect({ url: '/addon/shop/pages/order/detail', param: { order_id: data.order_id } })
+}
+
+// 支付
+const payRef = ref(null)
+const orderBtnFn = (data: any, type = '') => {
+	if (type == 'pay')
+		payRef.value?.open(data.order_type, data.order_id, `/addon/shop/pages/order/detail?order_id=${data.order_id}`);
+	else if (type == 'close') {
+		close(data);
+	} else if (type == 'finish') {
+		finish(data);
+	} else if (type == 'evaluate') {
+		if (!data.is_evaluate) {
+			redirect({ url: '/addon/shop/pages/evaluate/order_evaluate', param: { order_id: data.order_id } })
+		} else {
+			redirect({ url: '/addon/shop/pages/evaluate/order_evaluate_view', param: { order_id: data.order_id } })
+		}
+	}
+}
+
+//关闭订单
+const close = (item: any) => {
+	uni.showModal({
+		title: '提示',
+		content: '您确定要关闭该订单吗？',
+        confirmColor: useConfigStore().themeColor['--primary-color'],
+		success: res => {
+			if (res.confirm) {
+				orderClose(item.order_id).then((data) => {
+					getMescroll().resetUpScroll();
+				})
+			}
+		}
+	})
+}
+
+//订单完成
+const finish = (item: any) => {
+    // 如果不在微信小程序中
+    // #ifndef MP-WEIXIN
+	uni.showModal({
+		title: '提示',
+		content: '您确定物品已收到吗？',
+        confirmColor: useConfigStore().themeColor['--primary-color'],
+		success: res => {
+			if (res.confirm) {
+				orderFinish(item.order_id).then((data) => {
+					getMescroll().resetUpScroll();
+				})
+			}
+		}
+	})
+    // #endif
+
+    // #ifdef MP-WEIXIN
+    // 检测微信小程序是否已开通发货信息管理服务
+    if (item.pay && item.pay.type == 'wechatpay' && isTradeManaged.value && wx.openBusinessView) {
+        wx.openBusinessView({
+            businessType: 'weappOrderConfirm',
+            extraData: {
+                merchant_id: mch_id.value,
+                merchant_trade_no: item.out_trade_no
+            },
+            success: (res:any) => {
+                orderFinish(item.order_id).then((data) => {
+                    getMescroll().resetUpScroll();
+                })
+            },
+            fail: (res:any) => {
+                console.log('小程序确认收货组件打开失败 fail', res);
+            }
+        })
+    }else{
+        uni.showModal({
+            title: '提示',
+            content: '您确定物品已收到吗？',
+            confirmColor: useConfigStore().themeColor['--primary-color'],
+            success: res => {
+                if (res.confirm) {
+                    orderFinish(item.order_id).then((data) => {
+                        getMescroll().resetUpScroll();
+                    })
+                }
+            }
+        })
+    }
+    // #endif
+}
+</script>
+<style>
+.order-list .mescroll-body {
+	padding-bottom: constant(safe-area-inset-bottom) !important;
+	padding-bottom: env(safe-area-inset-bottom) !important;
+}
+.order-list :deep(.u-count-down__text){
+	font-size: 24rpx !important;
+	color:#EF000C !important;
+}
+</style>
+<style lang="scss" scoped>
+.text-color {
+	color: var(--primary-color);
+}
+
+.bg-color {
+	background-color: var(--primary-color);
+}
+</style>
diff --git a/uni-app/src/addon/shop/pages/order/payment.vue b/uni-app/src/addon/shop/pages/order/payment.vue
new file mode 100644
index 00000000..b367c523
--- /dev/null
+++ b/uni-app/src/addon/shop/pages/order/payment.vue
@@ -0,0 +1,568 @@
+<template>
+    <view :style="themeColor()">
+        <view class="bg-[var(--page-bg-color)] min-h-[100vh]" v-if="orderData">
+			<view class="pt-[30rpx] sidebar-margin payment-bottom">
+                <!-- 配送方式 -->
+                <view class="mb-[var(--top-m)] rounded-[var(--rounded-big)] bg-white" v-if="orderData.basic.has_goods_types.includes('real') && delivery_type_list.length">
+                    <view class="rounded-tl-[var(--rounded-big)] rounded-tr-[var(--rounded-big)] head-tab flex items-center w-full bg-[#F1F1F1]" v-if="delivery_type_list.length > 1">
+                        <view v-for="(item, index) in delivery_type_list" :key="index"  class="head-tab-item flex-1 relative" :class="{'active': index === activeIndex}">
+                            <view class="h-[74rpx] relative z-10 text-center leading-[74rpx] text-[28rpx]" @click="switchDeliveryType(item.key, index)">
+                                {{ item.name }}
+                            </view>
+                            <image v-if="index === activeIndex && delivery_type_list.length == 3" class="tab-image absolute bottom-[-2rpx] h-[94rpx] w-[240rpx]" :src="img(`addon/shop/payment/tab_${index}.png`)" mode="aspectFit"></image>
+                            <image v-else-if="index === activeIndex && delivery_type_list.length == 2" class="tab-img absolute  bottom-[-2rpx]  h-[95rpx] w-[354rpx]" :src="img(`addon/shop/payment/tabstyle_${index}.png`)" mode="aspectFit"></image>
+                        </view>
+                    </view>
+                    <view class="min-h-[140rpx] flex items-center px-[30rpx]">
+                        <!-- 收货地址 -->
+                        <view class="w-full" v-if="['express', 'local_delivery'].includes(createData.delivery.delivery_type)" @click="toSelectAddress">
+                            <view v-if="!$u.test.isEmpty(orderData.delivery.take_address)" class="pt-[20rpx] pb-[30rpx] flex items-center">
+								<image class="w-[60rpx] h-[60rpx] mr-[20rpx] flex-shrink-0" :src="img('addon/shop/payment/position_01.png')" mode="aspectFit"></image>
+								<view class="flex flex-col overflow-hidden">
+									<text class="text-[26rpx] text-[var(--text-color-light9)] mt-[16rpx] truncate max-w-[536rpx]">{{orderData.delivery.take_address.full_address.split(orderData.delivery.take_address.address)[0]}}</text>
+									<text class="font-500 text-[30rpx] mt-[14rpx] text-[#333] truncate max-w-[536rpx]">{{orderData.delivery.take_address.address}}</text>
+									<view class="flex items-center text-[26rpx] text-[var(--text-color-light6)] mt-[16rpx]">
+										<text class="mr-[16rpx]">{{ orderData.delivery.take_address.name }}</text>
+										<text>{{ mobileHide(orderData.delivery.take_address.mobile) }}</text>
+									</view>
+								</view>
+								<text class="ml-auto nc-iconfont nc-icon-youV6xx text-[26rpx] text-[var(--text-color-light9)]"></text>
+                            </view>
+                            <view v-else class="flex items-center">
+                                <image class="w-[26rpx] h-[30rpx] mr-[10rpx]" :src="img('addon/shop/payment/position_02.png')" mode="aspectFit"></image>
+                                <text class="text-[28rpx]">添加收货地址</text>
+                                <text class="nc-iconfont nc-icon-youV6xx text-[26rpx] text-[var(--text-color-light9)] ml-auto"></text>
+                            </view>
+                        </view>
+
+                        <!-- 自提点 -->
+                        <view class="flex items-center w-full" v-if="createData.delivery.delivery_type == 'store'" @click="storeRef.open()">
+                            <view v-if="!$u.test.isEmpty(orderData.delivery.take_store)" class="pt-[40rpx] pb-[30rpx] w-full flex items-center">
+								<view class="flex flex-col">
+									<view class="text-[30rpx] font-500 text-[#303133] mb-[20rpx]">{{ orderData.delivery.take_store.store_name }}</view>
+									<view class="text-[24rpx] text-[var(--text-color-light6)] mb-[20rpx] leading-[1.4] flex">
+                                        <text class="flex-shrink-0">门店地址：</text>
+                                        <text class="max-w-[490rpx]">{{ orderData.delivery.take_store.full_address }}</text>
+                                    </view>
+									<view class="text-[24rpx] text-[var(--text-color-light6)] mb-[20rpx]">
+                                        <text>联系电话：</text>
+                                        <text>{{ orderData.delivery.take_store.store_mobile }}</text>
+                                    </view>
+									<view class="text-[24rpx] text-[var(--text-color-light6)]">
+                                        <text>营业时间：</text>
+                                        <text>{{ orderData.delivery.take_store.trade_time }}</text>
+                                    </view>
+								</view>
+								<text class="ml-auto nc-iconfont nc-icon-youV6xx text-[26rpx] text-[var(--text-color-light9)]"></text>
+                            </view>
+                            <view v-else class="flex items-center w-full">
+                                <image class="w-[26rpx] h-[30rpx] mr-[10rpx]" :src="img('addon/shop/payment/position_02.png')" mode="aspectFit"></image>
+                                <text class="text-[28rpx]">请选择自提点</text>
+                                <text class="ml-auto nc-iconfont nc-icon-youV6xx text-[26rpx] text-[var(--text-color-light9)]"></text>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+                <view v-if="orderData.basic.has_goods_types.includes('real') && !delivery_type_list.length" class="mb-[var(--top-m)] card-template h-[100rpx] flex items-center">
+                    <p class="text-[28rpx] text-[var(--primary-color)]">商家尚未配置配送方式</p>
+                </view>
+
+                <view class="mb-[var(--top-m)] card-template p-[0] pb-[var(--pad-top-m)]">
+					<view class="pt-[var(--pad-top-m)] pb-[14rpx]">
+						<view class="px-[var(--pad-sidebar-m)]" :class="{'mb-[20rpx]': (index+1) != orderData.goods.length}" v-for="(item, index) in orderData.goods" :key="index">
+							<view class="flex">
+								<u--image radius="var(--goods-rounded-big)" width="180rpx" height="180rpx" :src="img(item.sku_image)" model="aspectFill">
+									<template #error>
+										<image class="w-[180rpx] h-[180rpx] rounded-[var(--goods-rounded-big)] overflow-hidden" :src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill"></image>
+									</template>
+								</u--image>
+								<view class="flex flex-1 w-0 flex-col justify-between ml-[20rpx] py-[6rpx]">
+									<view class="line-normal">
+										<view class="truncate text-[#303133] text-[28rpx] leading-[32rpx]">
+											{{ item.goods.goods_name }}
+										</view>
+										<view class="mt-[14rpx] flex" v-if="item.sku_name">
+											<text class="truncate text-[24rpx] text-[var(--text-color-light9)] leading-[28rpx]">{{ item.sku_name }}</text>
+										</view>
+									</view>
+									<view v-if="item.manjian_info && Object.keys(item.manjian_info).length" class="flex items-center mt-[10rpx] mb-[auto]" @click.stop="manjianOpenFn(item.manjian_info)">
+										<view class="bg-[var(--primary-color-light)] text-[var(--primary-color)] rounded-[6rpx] text-[20rpx] flex items-center justify-center w-[88rpx] h-[36rpx] mr-[6rpx]">满减送</view>
+										<text class="text-[22rpx] text-[#999]">{{item.manjian_info.manjian_name}}</text>
+									</view>
+									<view class="mb-auto" :class="{'mt-[6rpx]': !item.sku_name}" v-if="item.not_support_delivery">
+										<u-alert type="error" description="该商品不支持当前所选配送方式" class="leading-[30rpx] !inline-block" fontSize="11"></u-alert>
+									</view>
+									<view class="flex justify-between items-baseline">
+										<view class="text-[var(--price-text-color)] flex items-baseline  price-font">
+											<text class="text-[24rpx] font-500 mr-[4rpx]">￥</text>
+											<text class="text-[40rpx] font-500">{{ parseFloat(item.price).toFixed(2).split('.')[0] }}</text>
+											<text class="text-[24rpx] font-500">.{{ parseFloat(item.price).toFixed(2).split('.')[1] }}</text>
+										</view>
+										<view class="font-400 text-[28rpx] text-[#303133]">
+											<text>x</text>
+											<text>{{ item.num }}</text>
+										</view>
+									</view>
+								</view>
+							</view>
+							<view class="flex items-center mt-[8rpx]" :class="{'pb-[40rpx]': (index + 1) != Object.keys(orderData.goods_data).length}" v-if="item.is_newcomer && item.newcomer_price != item.price && item.num>1">
+								<image class="h-[24rpx] w-[56rpx]" :src="img('addon/shop/newcomer.png')" mode="heightFix" />
+								<view class="text-[24rpx] text-[#FFB000] leading-[34rpx] ml-[8rpx]"
+							>第1{{item.goods.unit}}，￥{{parseFloat(item.newcomer_price).toFixed(2)}}/{{item.goods.unit}}；第{{item.num>2?'2~'+item.num:'2'}}{{item.goods.unit}}，￥{{parseFloat(item.price).toFixed(2)}}/{{item.goods.unit}}</view>
+							</view>
+							<view class="card-template !p-[0]" v-if="item.goods.form_id">
+								<diy-form ref="diyFormGoodsRef" :form_id="item.goods.form_id" :relate_id="item.sku_id" :storage_name="'diyFormStorageByGoodsDetail_' + item.sku_id" form_border="none" />
+							</view>
+						</view>
+						<!-- 赠品 -->
+						<view v-if="orderData.gift_goods && Object.keys(orderData.gift_goods).length" class="pt-[20rpx] mb-[10rpx] bg-[#f9f9f9] mt-[24rpx] mx-[var(--pad-sidebar-m)] rounded-[30rpx]">
+							<view v-for="(item, key, index) in orderData.gift_goods" :key="index" class="flex px-[var(--pad-sidebar-m)] pb-[20rpx]">
+								<u--image radius="var(--goods-rounded-big)" width="120rpx" height="120rpx" :src="img(item.sku_image)" model="aspectFill">
+									<template #error>
+										<image class="w-[120rpx] h-[120rpx] rounded-[var(--goods-rounded-big)] overflow-hidden" :src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill"></image>
+									</template>
+								</u--image>
+								<view class="ml-[16rpx] py-[8rpx] flex flex-1 flex-col justify-between">
+									<view class="flex items-center">
+										<view class="bg-[var(--primary-color-light)] whitespace-nowrap text-[var(--primary-color)] rounded-[6rpx] text-[22rpx] flex items-center justify-center w-[64rpx] h-[34rpx] mr-[6rpx]">赠品</view>
+										<view class="text-[26rpx] max-w-[400rpx] truncate leading-[40rpx] text-[#333]">{{ item.goods.goods_name }}</view>
+									</view>
+									<view class="flex items-center">
+										<view v-if="item.sku_name" class="text-[22rpx] text-[var(--text-color-light9)] truncate max-w-[400rpx] leading-[28rpx]">
+											{{ item.sku_name }}
+										</view>
+										<view class="ml-[auto] font-400 text-[26rpx] text-[#303133]">
+											<text>x</text>
+											<text>{{ item.num }}</text>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+                    <!-- 买家留言 -->
+                    <view class="bg-white flex items-center leading-[30rpx] px-[var(--pad-sidebar-m)]">
+                        <view class="text-[28rpx] w-[150rpx] text-[#303133]">买家留言</view>
+                        <view class="flex-1 text-[#303133]">
+                            <input type="text" v-model="createData.member_remark" class="text-right text-[#333] text-[28rpx]" maxlength="50" placeholder="请输入留言信息给卖家" placeholder-class="text-[var(--text-color-light9)] text-[28rpx]">
+                        </view>
+                    </view>
+                    <!-- 发票 -->
+                    <view v-if="invoiceRef && invoiceRef.invoiceOpen" class="flex items-center text-[#303133] leading-[30rpx] mt-[30rpx] px-[var(--pad-sidebar-m)]" @click="invoiceRef.open()">
+                        <view class="text-[28rpx] w-[150rpx] text-[#303133]">发票信息</view>
+                        <view class="flex-1 w-0 text-right truncate">
+                            <text class="text-[28rpx] text-[#333]">{{ createData.invoice.header_name || '不需要发票' }}</text>
+                        </view>
+                        <text class="nc-iconfont nc-icon-youV6xx text-[26rpx] text-[var(--text-color-light9)]"></text>
+                    </view>
+
+                </view>
+
+                <view class="mb-[var(--top-m)] card-template" v-if="couponRef && couponList.length">
+                    <!-- 优惠券 -->
+                    <view class="flex items-center h-[40rpx] leading-[40rpx]" @click="couponRef.open(createData.discount.coupon_id)" v-if="couponList.length">
+                        <view class="text-[28rpx] w-[150rpx] text-[#303133] flex-shrink-0">优惠券</view>
+                        <view class="flex-1 flex justify-end truncate">
+                            <text v-if="orderData.discount && orderData.discount.coupon" class="text-[var(--primary-color)] text-[28rpx] truncate ">
+                                {{ orderData.discount.coupon.title }}
+                            </text>
+                            <text class="text-[28rpx] text-gray-subtitle" v-else>请选择优惠券</text>
+                        </view>
+                        <text class="nc-iconfont nc-icon-youV6xx -mb-[2rpx] text-[26rpx] text-[var(--text-color-light9)]"></text>
+                    </view>
+                </view>
+
+				<view class="card-template py-[10rpx] mb-[var(--top-m)]" v-if="orderData.form_id">
+					<diy-form ref="diyFormRef" :form_id="orderData.form_id" :storage_name="'diyFormStorageByOrderPayment'" />
+				</view>
+
+                <view class="card-template">
+                    <view class="title">价格明细</view>
+                    <view class="card-template-item">
+                        <view class="text-[28rpx] w-[150rpx] leading-[30rpx] text-[#303133]">商品金额</view>
+                        <view class="flex-1 w-0 text-right  price-font text-[#333] text-[32rpx]">
+							￥{{ parseFloat(orderData.basic.goods_money).toFixed(2) }}
+                        </view>
+                    </view>
+                    <view class="card-template-item" v-if="parseFloat(orderData.basic.delivery_money)">
+                        <view class="text-[28rpx] w-[150rpx] leading-[30rpx] text-[#303133]">配送费用</view>
+                        <view class="flex-1 w-0 text-right price-font text-[#333] text-[32rpx]">
+                            ￥{{ parseFloat(orderData.basic.delivery_money).toFixed(2) }}
+                        </view>
+                    </view>
+                    <!-- <view class="card-template-item" v-if="orderData.basic.discount_money">
+                        <view class="text-[28rpx] w-[150rpx] leading-[30rpx] text-[#303133]">优惠金额</view>
+                        <view class="flex-1 w-0 text-right text-[var(--price-text-color)] text-[32rpx] price-font leading-[1]">
+                            -￥{{parseFloat(orderData.basic.discount_money)}}
+                        </view>
+                    </view> -->
+					<view class="card-template-item" v-if="parseFloat(orderData.basic.coupon_money)">
+					    <view class="text-[28rpx] w-[170rpx] leading-[30rpx] text-[#303133]">优惠券优惠</view>
+					    <view class="flex-1 w-0 text-right text-[var(--price-text-color)] text-[32rpx] price-font leading-[1]">
+					        -￥{{parseFloat(orderData.basic.coupon_money).toFixed(2)}}
+					    </view>
+					</view>
+					<view class="card-template-item" v-if="parseFloat(orderData.basic.manjian_discount_money)">
+					    <view class="text-[28rpx] w-[170rpx] leading-[30rpx] text-[#303133]">满减优惠</view>
+					    <view class="flex-1 w-0 text-right text-[var(--price-text-color)] text-[32rpx] price-font leading-[1]">
+					        -￥{{parseFloat(orderData.basic.manjian_discount_money).toFixed(2)}}
+					    </view>
+					</view>
+                </view>
+            </view>
+            <u-tabbar :fixed="true" :placeholder="true" :safeAreaInsetBottom="true" zIndex="10">
+                <view class="flex-1 flex items-center justify-between pl-[30rpx] pr-[20rpx]">
+                    <view class="flex items-baseline">
+                        <text class="text-[26rpx] text-[#333] leading-[32rpx]">合计：</text>
+						<view class="inline-block">
+							<text class="text-[26rpx] font-500 text-[var(--price-text-color)] price-font leading-[30rpx]">￥</text>
+							<text class="text-[44rpx]  font-500  text-[var(--price-text-color)] price-font leading-[46rpx]">{{ parseFloat(orderData.basic.order_money).toFixed(2).split('.')[0] }}</text>
+							<text class="text-[26rpx]  font-500  text-[var(--price-text-color)] price-font leading-[46rpx]">.{{ parseFloat(orderData.basic.order_money).toFixed(2).split('.')[1] }}</text>
+						</view>
+                    </view>
+                    <button class="w-[196rpx]  h-[70rpx] font-500 text-[26rpx] leading-[70rpx] !text-[#fff] m-0  rounded-full  primary-btn-bg remove-border" hover-class="none" @click="create">提交订单</button>
+                </view>
+            </u-tabbar>
+
+            <!-- 选择优惠券 -->
+            <select-coupon :order-key="createData.order_key" ref="couponRef" @confirm="confirmSelectCoupon" />
+        </view>
+
+		<!-- 选择自提点 -->
+		<select-store ref="storeRef" @confirm="confirmSelectStore" />
+		<!-- 发票 -->
+		<invoice ref="invoiceRef" @confirm="confirmInvoice" />
+		<!-- 地址 -->
+		<address-list ref="addressRef" @confirm="confirmAddress" />
+		<!-- 满减 -->
+		<ns-goods-manjian ref="manjianShowRef"></ns-goods-manjian>
+		<pay ref="payRef" @close="payClose" />
+
+    </view>
+</template>
+
+<script setup lang="ts">
+import { ref, computed, watch, nextTick } from 'vue'
+import { orderCreateCalculate, orderCreate } from '@/addon/shop/api/order'
+import { redirect, img, moneyFormat, mobileHide } from '@/utils/common'
+import selectCoupon from './components/select-coupon/select-coupon'
+import selectStore from './components/select-store/select-store'
+import addressList from './components/address-list/address-list'
+import invoice from './components/invoice/invoice'
+import nsGoodsManjian from '@/addon/shop/components/ns-goods-manjian/ns-goods-manjian.vue';
+import { useSubscribeMessage } from '@/hooks/useSubscribeMessage'
+import { onShow } from '@dcloudio/uni-app'
+import { cloneDeep } from 'lodash-es'
+import diyForm from '@/addon/components/diy-form/index.vue'
+
+const createData: any = ref({
+	order_key: '',
+	member_remark: '',
+	discount: {},
+	invoice: {},
+	delivery: {
+		delivery_type: ''
+	},
+	extend_data: {}, // 扩展数据，目前礼品卡用到
+	form_data: {} // 万能表单数据（商品+待付款订单）
+})
+const manjianShowRef: any = ref(null); //满减送
+
+const orderData: any = ref(null)
+const couponRef = ref()
+const storeRef = ref()
+const payRef = ref()
+const addressRef = ref()
+const invoiceRef = ref()
+const createLoading = ref(false)
+const activeIndex = ref(0)//配送方式激活
+const delivery_type_list = ref([])
+uni.getStorageSync('orderCreateData') && Object.assign(createData.value, uni.getStorageSync('orderCreateData'))
+
+const diyFormRef: any = ref(null)
+const diyFormGoodsRef: any = ref(null)
+
+onShow(() => {
+	nextTick(()=>{
+		if(storeRef.value){
+			storeRef.value.getData((data:any)=>{
+				if(data.length){
+					createData.value.delivery.take_store_id = ((data[0] && data[0].store_id) ? data[0].store_id: 0)
+				}
+			});
+		}
+	})
+})
+
+// 选择地址之后跳转回来
+const selectAddress = uni.getStorageSync('selectAddressCallback')
+if (selectAddress) {
+    createData.value.order_key = ''
+    createData.value.delivery.delivery_type = selectAddress.delivery
+    createData.value.delivery.take_address_id = selectAddress.address_id
+    uni.removeStorage({ key: 'selectAddressCallback' })
+}
+
+// 切换配送方式
+const switchDeliveryType = (type: string, index: number) => {
+    if (createData.value.delivery.delivery_type != type) {
+        activeIndex.value = index
+        createData.value.order_key = ''
+        createData.value.delivery.delivery_type = type
+        createData.value.delivery.take_address_id = 0
+        calculate()
+    }
+}
+
+// 满减
+const manjianOpenFn = (data:any) =>{
+	let obj = {};
+	obj.condition_type = cloneDeep(data).condition_type;
+	obj.rule_json = [cloneDeep(data).rule];
+	obj.name = cloneDeep(data).manjian_name;
+	manjianShowRef.value.open(obj);
+}
+
+/**
+ * 订单计算
+ */
+const calculate = () => {
+	orderCreateCalculate(createData.value).then(({ data }) => {
+		orderData.value = cloneDeep(data);
+
+		orderData.value.goods = []; //购买商品
+		if (orderData.value.goods_data && Object.values(orderData.value.goods_data).length) {
+			Object.values(orderData.value.goods_data).forEach((item: any, index) => {
+				orderData.value.goods.push(item);
+			})
+		}
+
+		createData.value.order_key = data.order_key
+		if (orderData.value.delivery.delivery_type_list) {
+			delivery_type_list.value = Object.values(orderData.value.delivery.delivery_type_list)
+		}
+		if (orderData.value.discount && orderData.value.discount.manjian) {
+			orderData.value.manjian = orderData.value.discount.manjian
+		}
+
+		if (selectAddress) activeIndex.value = delivery_type_list.value.findIndex(el => el.key === orderData.value.delivery.delivery_type)
+		!createData.value.delivery.delivery_type && data.delivery.delivery_type && (createData.value.delivery.delivery_type = data.delivery.delivery_type)
+
+	}).catch()
+}
+
+calculate()
+
+// 改变配送方式
+watch(
+	() => delivery_type_list.value.length,
+	(newValue, oldValue) => {
+		if(delivery_type_list.value.length && uni.getStorageSync('distributionType')){
+			delivery_type_list.value.forEach((item: any,index)=>{
+				if(item.name == uni.getStorageSync('distributionType')){
+					activeIndex.value = index;
+					switchDeliveryType(item.key, index)
+				}
+			})
+			uni.removeStorage({ key: 'distributionType' })
+		}
+	}
+)
+
+let orderId = 0
+/**
+ * 订单创建
+ */
+const create = () => {
+	if (!verify() || createLoading.value) return
+	if (diyFormGoodsRef.value) {
+		let pass = true;
+		for (let i = 0; i < diyFormGoodsRef.value.length; i++) {
+			if (!diyFormGoodsRef.value[i].verify()) {
+				pass = false;
+				break;
+			}
+		}
+		if (!pass) return;
+	}
+
+	if (diyFormRef.value && !diyFormRef.value.verify()) return;
+	createLoading.value = true
+
+	useSubscribeMessage().request('shop_order_pay,shop_order_delivery')
+
+	createData.value.form_data.order = {};
+	createData.value.form_data.goods = {};
+	if (diyFormRef.value) {
+		createData.value.form_data.form_id = orderData.value.form_id;
+		createData.value.form_data.order = diyFormRef.value.getData();
+	}
+	if (diyFormGoodsRef.value) {
+		orderData.value.goods.forEach((item: any) => {
+			if (item.goods.form_id) {
+				for (let i = 0; i < diyFormGoodsRef.value.length; i++) {
+					let formItem = diyFormGoodsRef.value[i].getData();
+					if (formItem.relate_id == item.sku_id && item.goods.form_id == formItem.form_id) {
+						createData.value.form_data.goods[item.sku_id] = formItem;
+					}
+				}
+			}
+		})
+	}
+
+	orderCreate(createData.value).then(({ data }) => {
+		orderId = data.order_id
+		if (diyFormRef.value) diyFormRef.value.clearStorage();
+		if (diyFormGoodsRef.value) {
+			for (let i = 0; i < diyFormGoodsRef.value.length; i++) {
+				diyFormGoodsRef.value[i].clearStorage()
+			}
+		}
+		createData.value.form_data = {}
+		if (orderData.value.basic.order_money == 0) {
+			redirect({ url: '/addon/shop/pages/order/detail', param: { order_id: orderId }, mode: 'redirectTo' })
+		} else {
+			payRef.value?.open(data.trade_type, data.order_id, `/addon/shop/pages/order/detail?order_id=${ data.order_id }`)
+		}
+	}).catch(() => {
+		createData.value.form_data = {}
+		createLoading.value = false
+	})
+}
+
+/**
+ * 下单校验
+ */
+const verify = () => {
+    const data = createData.value
+    let verify = true
+
+    if (orderData.value.basic.has_goods_types.includes('real')) {
+        if (['express', 'local_delivery'].includes(data.delivery.delivery_type) && !orderData.value.delivery.take_address) {
+            uni.showToast({ title: '请选择收货地址', icon: 'none' })
+            return false
+        }
+
+        if (data.delivery.delivery_type == 'store' && !data.delivery.take_store_id) {
+            uni.showToast({ title: '请选择自提点', icon: 'none' })
+            return false
+        }
+    }
+
+    return verify
+}
+
+/**
+ * 支付弹窗关闭
+ */
+const payClose = () => {
+    redirect({ url: '/addon/shop/pages/order/detail', param: { order_id: orderId }, mode: 'redirectTo' })
+}
+
+/**
+ * 选择地址
+ */
+const toSelectAddress = () => {
+	let data: any = {};
+	data.delivery = createData.value.delivery.delivery_type;
+	data.type = createData.value.delivery.delivery_type == 'local_delivery' ? 'location_address' : 'address';
+	data.id = orderData.value.delivery.take_address.id;
+	addressRef.value.open(data);
+}
+
+const couponList = computed(() => {
+    return couponRef.value?.couponList || []
+})
+
+/**
+ * 选择优惠券
+ */
+const confirmSelectCoupon = (coupon: any) => {
+    createData.value.discount.coupon_id = coupon ? coupon.id : 0
+    calculate()
+}
+
+/**
+ * 选择自提点
+ */
+const confirmSelectStore = (store: any) => {
+    createData.value.delivery.take_store_id = ((store && store.store_id) ? store.store_id: 0)
+    calculate()
+}
+
+const confirmInvoice = (invoice: object) => {
+    createData.value.invoice = invoice
+}
+
+const confirmAddress = (data:any) => {
+	createData.value.order_key = ''
+	createData.value.delivery.delivery_type = data.delivery
+	createData.value.delivery.take_address_id = data.address_id
+	calculate();
+}
+</script>
+
+<style lang="scss" scoped>
+.head-tab{
+	.head-tab-item{
+		.tab-image{
+            left: 50%;
+			transform: translateX(-50%);
+		}
+		&:nth-child(1).active{
+			view{
+				padding-right: 40rpx;
+			}
+		}
+		&:nth-child(2){
+			.tab-image{
+				width: 312rpx;
+			}
+		}
+		&:nth-child(3).active{
+			view{
+				padding-left: 30rpx;
+			}
+		}
+		&.active{
+			view{
+                font-weight: bold;
+				color: var(--primary-color);
+			}
+		}
+        .tab-img{
+            left: 50%;
+			transform: translateX(-50%);
+        }
+
+	}
+}
+
+:deep(.u-alert) {
+    padding: 6rpx 16rpx !important;
+    display: inline-block !important;
+}
+.alert-wrap{
+    display: inline-block !important;
+    :deep(.u-fade-enter-active){
+        display: inline-block !important;
+    }
+}
+
+.text-ellipsis {
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+    overflow: hidden;
+}
+.line-normal{
+    line-height: normal;
+}
+.bg-color{
+    background: linear-gradient( 94deg, var(--primary-help-color) 0%, var(--primary-color) 69%),var(--primary-color) ;
+}
+.payment-bottom{
+	padding-bottom: calc(20rpx + constant(safe-area-inset-bottom));
+	padding-bottom: calc(20rpx + env(safe-area-inset-bottom));
+}
+</style>
diff --git a/uni-app/src/addon/shop/pages/point/components/address-list/address-list.vue b/uni-app/src/addon/shop/pages/point/components/address-list/address-list.vue
new file mode 100644
index 00000000..3d7a1afe
--- /dev/null
+++ b/uni-app/src/addon/shop/pages/point/components/address-list/address-list.vue
@@ -0,0 +1,100 @@
+<template>
+    <u-popup :show="show" @close="show = false" mode="bottom" :round="10">
+        <view @touchmove.prevent.stop class="popup-common">
+			<view class="title">{{t('selectAddress')}}</view>
+			<scroll-view scroll-y="true" class="h-[50vh]">
+				<view v-for="(item,index) in addressList" :key="item.id" class="flex items-center mx-[var(--popup-sidebar-m)] border-1 border-[#eee] border-solid rounded-[var(--rounded-mid)] px-[var(--pad-sidebar-m)] py-[var(--pad-top-m)]" :class="{'mb-[var(--top-m)]': addressList.length-1 != index, 'text-[var(--primary-color)] !border-[var(--primary-color)]': item.id == currAddressId}" @click="selectAddress(index)">
+					<text class="nc-iconfont nc-icon-dingweiV6xx-1 text-[36rpx]"></text>
+					<view class="flex flex-col mx-[20rpx] w-[480rpx]">
+						<view class="flex items-center truncate leading-[1.5]">
+							<text class="mr-[8rpx] text-[30rpx] truncate max-w-[300rpx]">{{item.name}}</text>
+							<text class="text-[30rpx]">{{item.mobile}}</text>
+						</view>
+						<view class="truncate text-[26rpx] leading-[1.5] mt-[12rpx]">{{item.full_address}}</view>
+					</view>
+					<text class="nc-iconfont nc-icon-xiugaiV6xx text-[32rpx] ml-auto" @click="editAddress(item)"></text>
+				</view>
+				<view v-if="!addressList || addressList && !addressList.length" class="text-[var(--text-color-light6)] text-[28rpx] text-center">{{t('emptyAddress')}}</view>
+			</scroll-view>
+			
+			<view class="btn-wrap"> 
+                <button class="primary-btn-bg btn" @click="addAddress">{{t('addAddress')}}</button>
+			</view>
+		</view>
+    </u-popup>
+</template>
+
+<script setup lang="ts">
+    import { ref } from 'vue'
+    import { getAddressList } from '@/app/api/member'
+    import { t } from '@/locale'
+    import { redirect } from '@/utils/common'
+
+    const show = ref(false)
+	const loading = ref(false)
+	const currAddressId = ref('') // 选中的索引
+	const propData: any = ref({})
+	const addressList = ref([])
+	
+	const emits = defineEmits(['confirm'])
+	
+    const open = (data: Object) => {
+        show.value = true;
+		propData.value = data;
+		currAddressId.value = data.id;
+    }
+
+	getAddressList({}).then(({ data }) => {
+		addressList.value = data;
+	    loading.value = false
+	})
+	
+	const selectAddress = (index: number) => {
+		let data: any = addressList.value[index];
+		if(propData.value.delivery == 'local_delivery' && !data.lat && !data.lng){
+			// 待支付订单-同城配送，选择的地址没有经纬度的情况，会直接跳转到地图界面进行选择
+			// 参数二，表示是否直接跳转到地图界面, 1跳转到地图界面，2表示不跳
+			editAddress(data,1);
+		}else{
+			let obj:any = {}
+			obj.address_id = addressList.value[index].id
+			obj.delivery = propData.value.delivery
+			emits('confirm', obj)
+		}
+		show.value = false;
+	}
+	
+	const editAddress = (data: Object, isSelectMap: number = 2)=>{
+		uni.setStorage({
+		    key: 'selectAddressCallback',
+		    data: {
+		        back: '/addon/shop/pages/point/payment',
+		        delivery: propData.value.delivery
+		    },
+		    success() {
+		        redirect({ url: '/app/pages/member/address_edit', param: { id: data.id, source: 'shop_order_payment', isSelectMap } })
+		    }
+		})
+	}
+
+	const addAddress = () =>{
+		uni.setStorage({
+		    key: 'selectAddressCallback',
+		    data: {
+		        back: '/addon/shop/pages/point/payment',
+		        delivery: propData.value.delivery
+		    },
+		    success() {
+		        redirect({ url: '/app/pages/member/address_edit', param: { source: 'shop_order_payment' } })
+		    }
+		})
+	}
+	
+    defineExpose({
+        open
+    })
+</script>
+
+<style lang="scss" scoped>
+
+</style>
diff --git a/uni-app/src/addon/shop/pages/point/components/goods-sku.vue b/uni-app/src/addon/shop/pages/point/components/goods-sku.vue
new file mode 100644
index 00000000..6f555391
--- /dev/null
+++ b/uni-app/src/addon/shop/pages/point/components/goods-sku.vue
@@ -0,0 +1,282 @@
+<template>
+	<view @touchmove.prevent.stop>
+		<u-popup class="popup-type" :show="goodsSkuPop" @close="closeFn" mode="bottom">
+			<view class="py-[32rpx] relative" v-if="goodsDetail.detail" @touchmove.prevent.stop>
+				<view class="flex px-[32rpx] mb-[40rpx]">
+					<view class="w-[180rpx] h-[180rpx]">
+						<u--image width="180rpx" height="180rpx" :radius="'var(--goods-rounded-big)'" :src="img(goodsDetail.detail.sku_image)" @click="imgListPreview(goodsDetail.detail.sku_image)" model="aspectFill">
+							<template #error>
+								<image class="w-[180rpx] h-[180rpx] rounded-[var(--goods-rounded-big)] overflow-hidden" :src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill"></image>
+							</template>
+						</u--image>
+					</view>
+					<view class="flex flex-1 flex-col justify-between ml-[20rpx] py-[10rpx]">
+						<view class="w-[100%]">
+							<view class="text-[var(--price-text-color)] flex items-baseline">
+								<text class="price-font" v-if="goodsDetail.point">
+									<text class="text-[44rpx]">{{goodsDetail.point}}</text>
+									<text class="text-[38rpx]">{{t('point')}}</text>
+								</text>
+								<text class="text-[38rpx]" v-if="goodsDetail.point&&parseFloat(goodsDetail.price)">+</text>
+								<template v-if="goodsDetail.point&&parseFloat(goodsDetail.price)">
+									<text class="text-[44rpx] price-font">{{ parseFloat(goodsDetail.price).toFixed(2) }}</text>
+									<text class="text-[38rpx] price-font">元</text>
+								</template>
+								<template v-if="!goodsDetail.point&&!parseFloat(goodsDetail.price)">
+									<text class="text-[26rpx] price-font">￥</text>
+									<text class="text-[44rpx] price-font">{{ parseFloat(goodsDetail.price).toFixed(2).split('.')[0] }}</text>
+									<text class="text-[26rpx] mr-[6rpx] price-font">.{{ parseFloat(goodsPrice).toFixed(2).split('.')[1] }}</text>
+								</template>
+								
+							</view>
+							<view class="text-[26rpx] leading-[32rpx] text-[var(--text-color-light6)] mt-[10rpx]">库存{{goodsDetail.detail.stock}}{{ goodsDetail.goods.unit }}</view>
+						</view>
+						<view class="text-[26rpx] leading-[30rpx] text-[var(--text-color-light6)] w-[100%] max-h-[60rpx] multi-hidden" v-if="goodsDetail.goodsSpec && goodsDetail.goodsSpec.length">已选规格：{{goodsDetail.detail.sku_spec_format}}</view>
+					</view>
+				</view>
+				<scroll-view class="h-[500rpx] px-[32rpx] box-border mb-[60rpx]" scroll-y="true">
+					<view :class="{'mt-[20rpx]': 0 != index }" v-for="(item,index) in goodsDetail.goodsSpec" :key="index">
+						<view class="text-[28rpx] leading-[36rpx] mb-[24rpx]">{{item.spec_name}}</view>
+						<view class="flex flex-wrap">
+							<view class="box-border bg-[var(--temp-bg)] text-[24rpx] px-[44rpx] text-center h-[56rpx] flex-center mr-[20rpx] mb-[20rpx] border-1 border-solid rounded-[50rpx] border-[var(--temp-bg)]"
+							 :class="{'!border-[var(--primary-color)] text-[var(--primary-color)] !bg-[var(--primary-color-light)]': subItem.selected}"
+							v-for="(subItem,subIndex) in item.values" :key="subIndex"
+							@click="change(subItem, index)">
+								{{subItem.name}}
+							</view>
+						</view>
+					</view>
+					<view class="flex justify-between items-center mt-[8rpx]">
+						<view class="text-[28rpx]">购买数量</view>
+						<text v-if="goodsDetail.detail.limit_num > 0" class="ml-[20rpx] mr-[auto] text-[24rpx] text-[var(--primary-color)]">(限购{{ goodsDetail.detail.limit_num }}{{ goodsDetail.goods.unit }})</text>
+						<u-number-box :min="1" :max="parseInt(goodsDetail.detail.limit_num)<goodsDetail.stock?parseInt(goodsDetail.detail.limit_num):goodsDetail.stock" integer :step="1" input-width="68rpx" v-model="buyNum" input-height="52rpx">
+							<template #minus>
+								<text class="text-[30rpx] nc-iconfont nc-icon-jianV6xx font-500" :class="{ '!text-[var(--text-color-light9)]': buyNum <= 1 }"></text>
+							</template>
+							<template #input>
+								<input  class="text-[#303133] text-[28rpx] mx-[10rpx] w-[80rpx] h-[44rpx] bg-[var(--temp-bg)] leading-[44rpx] text-center rounded-[6rpx]" type="number" @input="goodsSkuInputFn" @blur="goodsSkuBlurFn" v-model="buyNum"  />
+							</template>
+							<template #plus>
+								<text class="text-[30rpx] nc-iconfont nc-icon-jiahaoV6xx font-500" :class="{ '!text-[var(--text-color-light9)]': buyNum >= goodsDetail.stock || buyNum ==parseInt(goodsDetail.detail.limit_num)}"></text>
+							</template>
+						</u-number-box>
+					</view>
+				</scroll-view>
+				<view class="px-[20rpx]">
+					<!-- #ifdef H5 -->
+					<button v-if="goodsDetail.detail.stock > 0" hover-class="none" class="!h-[80rpx] primary-btn-bg leading-[80rpx] text-[26rpx] rounded-[50rpx] font-500" type="primary" @click="confirm">确定</button>
+					<!-- #endif -->
+
+					<!-- #ifdef MP-WEIXIN -->
+					<template v-if="goodsDetail.detail.stock > 0">
+						<button v-if="isBindMobile && userInfo && !userInfo.mobile" hover-class="none" class="!h-[80rpx] primary-btn-bg leading-[80rpx] text-[26rpx] rounded-[50rpx] font-500" type="primary" open-type="getPhoneNumber" @getphonenumber="memberStore.bindMobile">确定</button>
+						<button v-else hover-class="none" class="!h-[80rpx] primary-btn-bg leading-[80rpx] text-[26rpx] rounded-[50rpx] font-500" type="primary" @click="confirm">确定</button>
+					</template>
+					<!-- #endif -->
+
+					<button hover-class="none" v-else class="!h-[80rpx] leading-[80rpx] text-[26rpx] text-[#fff] bg-[#ccc] rounded-[50rpx] font-500">已售罄</button>
+				</view>
+			</view>
+		</u-popup>
+		<!-- 强制绑定手机号 -->
+		<bind-mobile ref="bindMobileRef" /> 
+	</view>
+</template>
+
+<script setup lang="ts">
+	import { ref, reactive, computed } from 'vue';
+	import { img, redirect, getToken } from '@/utils/common'
+	import bindMobile from '@/components/bind-mobile/bind-mobile.vue';
+	import { useLogin } from '@/hooks/useLogin'
+	import useMemberStore from '@/stores/member'
+	import { t } from '@/locale';
+	import { cloneDeep } from 'lodash-es'
+
+	const props = defineProps(['goodsDetail']);
+	const goodsSkuPop = ref(false);
+	const callback:any = ref(null);
+	const currSpec: any = ref({
+		skuId: "",
+		name: []
+	})
+	const openType = ref("");
+	const buyNum = ref(1)
+	
+	// 商品价格
+	const goodsPrice = computed(() => {
+        let price = "0.00";
+        if (Object.keys(goodsDetail.value).length && Object.keys(goodsDetail.value.goods).length && goodsDetail.value.goods.member_discount && getToken() && goodsDetail.value.member_price != goodsDetail.value.price) {
+            // 会员价
+            price = goodsDetail.value.member_price ? goodsDetail.value.member_price : goodsDetail.value.price;
+        } else {
+            price = goodsDetail.value.price
+        }
+        return price;
+    })
+	
+	const goodsSkuInputFn = ()=>{
+		setTimeout(() => {
+			if(!buyNum.value || buyNum.value <= 0 ){
+				buyNum.value =  1;
+			}
+			if(buyNum.value >= Number(goodsDetail.value.detail.limit_num)){
+				buyNum.value = goodsDetail.value.detail.limit_num;
+			}
+		},0)
+	}
+	
+	const goodsSkuBlurFn = ()=>{
+		setTimeout(() => {
+			if(!buyNum.value || buyNum.value <= 0 ){
+				buyNum.value = 1;
+			}
+			if(buyNum.value >=  Number(goodsDetail.value.detail.limit_num)){
+				buyNum.value = goodsDetail.value.detail.limit_num;
+			}
+		},0)
+	}
+
+	// 会员信息
+	const memberStore = useMemberStore()
+	const userInfo = computed(() => memberStore.info)
+
+	const open = (type="",fn = "")=>{
+		openType.value = type;
+		goodsSkuPop.value = true;
+		callback.value = fn;
+	}
+
+	const closeFn = ()=>{
+		goodsSkuPop.value = false
+	}
+
+	const goodsDetail = computed(() => {
+		let data = cloneDeep(props.goodsDetail);
+
+		// 重组数据结构
+		if(Object.keys(data).length){
+
+			if(!Object.keys(currSpec.value.name).length) currSpec.value.name = data.sku_spec_format.split(",");
+
+			data.goodsSpec.forEach((item: any,index: any)=>{
+				let specName = item.spec_values.split(",");
+				item.values = [];
+				specName.forEach((specItem: any, specIndex: any)=>{
+					item.values[specIndex] = {};
+					item.values[specIndex].name = specItem;
+					item.values[specIndex].selected = false;
+					item.values[specIndex].disabled = false;
+
+					// 选中规格
+					currSpec.value.name.forEach((currSpecItem, currSpecIndex)=>{
+						if(currSpecIndex == index && currSpecItem == specItem){
+							item.values[specIndex].selected = true;
+						}
+					})
+				})
+			})
+			getSkuId();
+
+			// 当前详情内容
+			if(data.skuList && Object.keys(data.skuList).length){
+				data.skuList.forEach((idItem: any, idIndex: any)=>{
+					if(idItem.sku_id == currSpec.value.skuId){
+						data.detail = idItem;
+					}
+				})
+			}
+		}
+		return data;
+	})
+
+	const change = (data: any, index: any)=>{
+		currSpec.value.name[index] = data.name;
+		buyNum.value = 1
+		getSkuId();
+	}
+
+	const emits = defineEmits(['change'])
+	const getSkuId = ()=>{
+		props.goodsDetail.skuList.forEach((skuItem: any, skuIndex: any)=>{
+			if(skuItem.sku_spec_format == currSpec.value.name.toString()){
+				currSpec.value.skuId = skuItem.sku_id
+				emits('change',skuItem.sku_id)
+			}
+		})
+	}
+
+	//强制绑定手机号
+	const bindMobileRef: any = ref(null)
+	const isBindMobile = ref(uni.getStorageSync('isbindmobile'))
+
+	const confirm = ()=> {
+        // 检测是否登录
+        if (!userInfo.value) {
+            useLogin().setLoginBack({url: '/addon/shop/pages/point/detail', param: {id: goodsDetail.value.exchange_id}})
+            return false
+        }
+
+		// #ifdef H5
+		// 绑定手机号
+		if(uni.getStorageSync('isbindmobile')){
+			bindMobileRef.value.open()
+			return false
+		}
+		// #endif
+
+        // 立即购买
+        var data = {
+            sku_id: goodsDetail.value.sku_id,
+            num: buyNum.value
+        };
+
+        uni.setStorage({
+            key: 'orderCreateData',
+            data: {
+                sku_data: [
+                    data
+                ]
+            },
+            success: () => {
+                redirect({url: '/addon/shop/pages/point/payment'})
+            }
+        });
+
+        closeFn();
+    }
+
+	//预览图片
+	const imgListPreview = (item: any) => {
+		if (item === '') return false
+		var urlList = []
+		urlList.push(img(item))  //push中的参数为 :src="item.img_url" 中的图片地址
+		uni.previewImage({
+			indicator: "number",
+			loop: true,
+			urls: urlList
+		})
+	}
+
+	defineExpose({
+		open
+	})
+</script>
+
+<style lang="scss" scoped>
+.popup-type {
+	:deep(.u-popup__content) {
+		border-top-left-radius: 16rpx;
+		border-top-right-radius: 16rpx;
+		overflow: hidden;
+	}
+}
+// 防止覆盖住图片放大
+.u-popup :deep(.u-transition){
+	z-index: 999 !important;
+}
+::v-deep .u-number-box .u-number-box__slot{
+	display: flex;
+	align-items: center;
+}
+</style>
+
diff --git a/uni-app/src/addon/shop/pages/point/detail.vue b/uni-app/src/addon/shop/pages/point/detail.vue
new file mode 100644
index 00000000..f2982c8e
--- /dev/null
+++ b/uni-app/src/addon/shop/pages/point/detail.vue
@@ -0,0 +1,634 @@
+<template>
+	<view :style="themeColor()">
+		<scroll-view scroll-y="true" class="h-[100vh] w-full">
+		<view class="bg-[var(--page-bg-color)] min-h-[100vh] relative" v-if="Object.keys(goodsDetail).length">
+			<!-- 自定义头部 -->
+			<view class="flex items-center fixed left-0 right-0 z-10 bg-transparent detail-head" :class="{'!bg-[#fff]' :detailHeadBgChange}" :style="navbarInnerStyle">
+				<text class="nc-iconfont nc-icon-zuoV6xx" :style="navbarInnerArrowStyle" @click="backToPrevious()"></text>
+				<view class="ml-auto !pt-[12rpx] !pb-[8rpx] p-[10rpx] bg-[rgba(255,255,255,.4)] rounded-full border-[2rpx] border-solid border-transparent box-border nc-iconfont nc-icon-fenxiangV6xx font-bold text-[#303133] text-[36rpx]" :class="{'border-[#d8d8d8]': detailHeadBgChange}"  @click="openShareFn"></view>
+			</view>
+
+			<view class="swiper-box">
+				<u-swiper :list="goodsDetail.goods.goods_image" :indicator="goodsDetail.goods.goods_image.length" :indicatorStyle="{'bottom': '68rpx',}" :autoplay="true" height="100vw" @click="swiperClick"></u-swiper>
+			</view>
+			<view class="rounded-t-[40rpx] -mt-[40rpx] relative flex items-center justify-between !bg-cover box-border pb-[26rpx] h-[136rpx] px-[30rpx]" :style="{ background: 'url(' + img('addon/shop/detail/discount_price_bg.png') + ') no-repeat'}">
+				<view class="flex items-baseline text-[#fff]">
+					<view class="flex items-center">
+						<view class="inline-block price-font" v-if="goodsDetail.point">
+							<text class="text-[44rpx]">{{goodsDetail.point}}</text>
+							<text class="text-[38rpx]">{{t('point')}}</text>
+						</view>
+						<text class="text-[38rpx]" v-if="goodsDetail.point&&parseFloat(goodsDetail.price)">+</text>
+						<view class="inline-block price-font" v-if="parseFloat(goodsDetail.price)">
+							<text class="text-[44rpx]">{{parseFloat(goodsDetail.price).toFixed(2)}}</text>
+							<text class="text-[38rpx]">{{t('priceUnit')}}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<view class="bg-[var(--page-bg-color)] overflow-hidden rounded-[40rpx] -mt-[28rpx] relative">
+				<view class="datail-title relative px-[30rpx] pt-[40rpx]">
+					<view class="text-[#333] font-medium text-[30rpx] multi-hidden leading-[40rpx]">
+						<view class="brand-tag middle" v-if="goodsDetail.goods.goods_brand">
+							{{goodsDetail.goods.goods_brand.brand_name}}
+						</view>
+						{{ goodsDetail.goods.goods_name }}
+					</view>
+					<view class="flex justify-between items-start mt-[24rpx]  ">
+						<view class="text-[24rpx] leading-[34rpx] text-[var(--text-color-light6)]" v-if="goodsDetail.market_price && parseFloat(goodsDetail.market_price)">
+							<text class="whitespace-nowrap mr-[4rpx]">划线价:</text>
+							<text class="line-through">￥{{ goodsDetail.market_price }}</text>
+						</view>
+						<view class="text-[24rpx] leading-[34rpx] text-[var(--text-color-light6)]" v-if="goodsDetail.stock && parseFloat(goodsDetail.stock)">
+							<text class="whitespace-nowrap mr-[4rpx]">库存:</text>
+							<text class="">{{ goodsDetail.stock }}</text>
+							<text class="">{{ goodsDetail.goods.unit }}</text>
+						</view>
+						<view class="text-[24rpx] leading-[34rpx] text-[var(--text-color-light6)] flex items-baseline">
+							<text class="whitespace-nowrap mr-[4rpx]">销量:</text>
+							<text class="mx-[2rpx]">{{ goodsDetail.goods.sale_num }}</text>
+							<text class="">{{ goodsDetail.goods.unit }}</text>
+						</view>
+					</view>
+					<view class="flex flex-wrap mt-[16rpx]" v-if="goodsDetail.label_info && goodsDetail.label_info.length">
+						<block v-for="item in goodsDetail.label_info" :key="item.label_id">
+							<image class="img-tag middle" v-if="item.style_type == 'icon' && item.icon" :src="img(item.icon)" mode="heightFix" @error="diyGoods.error(item,'icon')"></image>
+							<view class="base-tag middle" v-else-if="item.style_type == 'diy' || !item.icon" :style="diyGoods.baseTagStyle(item)">
+								{{item.label_name}}
+							</view>
+						</block>
+					</view>
+				</view>
+				<view class="mt-[24rpx] sidebar-margin card-template" v-if="isGoodsPropertyTemp">
+					<view @click="servicesDataShow = !servicesDataShow" v-if="goodsDetail.service && goodsDetail.service.length" class="card-template-item">
+						<text class="text-[#333] text-[26rpx] leading-[30rpx] font-400 shrink-0">服务</text>
+						<view class="text-[#343434] text-[26rpx] leading-[30rpx] font-400 truncate ml-auto">
+							{{ goodsDetail.service[0].service_name }}
+						</view>
+						<text class="nc-iconfont nc-icon-youV6xx text-[26rpx] text-[var(--text-color-light6)] ml-[8rpx]"></text>
+					</view>
+					<view @click="buyFn" v-if="goodsDetail.goodsSpec && goodsDetail.goodsSpec.length" class="card-template-item">
+						<text class="text-[#333] text-[26rpx] leading-[30rpx] font-400 shrink-0  mr-[20rpx]">已选</text>
+						<view class="ml-auto text-right truncate flex-1 text-[#343434] text-[26rpx] leading-[30rpx] font-400">
+							{{ goodsDetail.sku_spec_format }}
+						</view>
+						<text class="nc-iconfont nc-icon-youV6xx text-[26rpx] text-[var(--text-color-light6)] ml-[8rpx]"></text>
+					</view>
+					<view class="card-template-item" @click="distributionDataOpen" v-if="goodsDetail.goods.goods_type == 'real' && goodsDetail.delivery_type_list && goodsDetail.delivery_type_list.length" >
+						<text class="text-[#333] text-[26rpx] leading-[30rpx] font-400 shrink-0">配送</text>
+						<view class="ml-auto flex items-center text-[#343434] text-[26rpx] leading-[30rpx] font-400">
+							{{ goodsDetail.delivery_type_list[selectDeliveryType].name }}
+						</view>
+						<text class="nc-iconfont nc-icon-youV6xx text-[26rpx] text-[var(--text-color-light6)] ml-[8rpx]"></text>
+					</view>
+
+				</view>
+
+				<view class="mt-[var(--top-m)] sidebar-margin card-template">
+					<view class="flex items-center justify-between min-h-[40rpx]" :class="{'mb-[30rpx]': evaluate && evaluate.list && evaluate.list.length}">
+						<text class="title !mb-[0]">宝贝评价({{ evaluate.count }})</text>
+						<view v-if="evaluate.count" class="h-[40rpx] flex items-center" @click="toLink(goodsDetail.goods_id)">
+							<text class="text-[24rpx] text-[var(--text-color-light9)]">查看全部</text>
+							<text class="nc-iconfont nc-icon-youV6xx text-[26rpx] text-[var(--text-color-light9)]"></text>
+						</view>
+						<text v-if="!evaluate.count" class="text-[24rpx] text-[var(--text-color-light6)]">暂无评价</text>
+					</view>
+					<view>
+						<view :class="{'pb-[34rpx]': index != (evaluate.list.length-1)}" v-for="(item, index) in evaluate.list" :key="index">
+							<view class="flex items-center w-full">
+								<u-avatar :default-url="img('static/resource/images/default_headimg.png')" :src="img(item.member_head)" :size="'50rpx'" leftIcon="none" />
+								<text class="ml-[10rpx] text-[28rpx] text-[#333]">{{ item.member_name }}</text>
+							</view>
+							<view class="flex justify-between w-full mt-[16rpx]">
+								<view class="flex-1 w-[540rpx] text-[26rpx] text-[#333] max-h-[72rpx] leading-[36rpx] multi-hidden mr-[50rpx]">{{ item.content }}</view>
+								<view class="w-[80rpx] shrink-0">
+									<u--image v-if="item.image_mid && item.image_mid.length" width="80rpx" height="80rpx" radius="16rpx" :src="img(item.image_mid[0])" model="aspectFill" @click="imgListPreview(item.images[0])">
+										<template #error>
+											<u-icon name="photo" color="#999" size="50"></u-icon>
+										</template>
+									</u--image>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+
+				<view class="my-[var(--top-m)] goods-sku sidebar-margin card-template" v-if="goodsDetail.goods && goodsDetail.goods.attr_format && Object.keys(goodsDetail.goods.attr_format).length">
+					<view class="title mb-[30rpx]">商品属性</view>
+					<view>
+						<block v-for="(item,index) in goodsDetail.goods.attr_format" :key="index">
+							<view v-if="index < 4 || isAttrFormatShow" class="card-template-item">
+								<view class="text-[26rpx] leading-[30rpx] w-[160rpx] font-400 shrink-0 text-[var(--text-color-light9)]">{{item.attr_value_name}}</view>
+								<view class="text-[#333] box-border value-wid text-[26rpx] leading-[30rpx] font-400 pl-[20rpx]">{{Array.isArray(item.attr_child_value_name) ? item.attr_child_value_name.join(',') : item.attr_child_value_name }}</view>
+							</view>
+						</block>
+						<view v-if="goodsDetail.goods.attr_format.length > 4" class="flex-center" @click="isAttrFormatShow = !isAttrFormatShow">
+							<text class="text-[24rpx] mr-[10rpx]">{{isAttrFormatShow ? '展开' : '收起'}}</text>
+							<text class="nc-iconfont !text-[22rpx]" :class="{'nc-icon-xiaV6xx': isAttrFormatShow, 'nc-icon-shangV6xx-1': !isAttrFormatShow}"></text>
+						</view>
+					</view>
+				</view>
+
+				<view class="my-[var(--top-m)] sidebar-margin card-template px-[var(--pad-sidebar-m)]">
+					<view class="title">商品详情</view>
+					<view class="u-content">
+						<u-parse :content="goodsDetail.goods.goods_desc" :tagStyle="{img: 'vertical-align: top;',p:'overflow: hidden;word-break:break-word;' }"></u-parse>
+					</view>
+				</view>
+
+				<view class="tab-bar-placeholder"></view>
+				<view class="border-[0] border-t-[2rpx] border-solid border-[#f5f5f5] w-[100%] flex justify-between pl-[32rpx] pr-[4rpx] bg-[#fff] box-border fixed left-0 bottom-0 tab-bar z-1 items-center">
+					<view class="flex items-center">
+						<view class="flex flex-col justify-center items-center mr-[38rpx]" @click="redirect({ url: '/addon/shop/pages/index', mode: 'reLaunch' })">
+							<view class="nc-iconfont nc-icon-shouyeV6xx text-[36rpx]"></view>
+							<text class="text-[20rpx] mt-[10rpx]">首页</text>
+						</view>
+						<!-- #ifdef H5 -->
+						<view class="flex flex-col justify-center items-center mr-[38rpx]" @click="openShareFn">
+							<view class="nc-iconfont nc-icon-fenxiangV6xx text-[36rpx]"></view>
+							<text class="text-[20rpx] mt-[10rpx]">分享</text>
+						</view>
+						<!-- #endif -->
+						<!-- #ifdef MP-WEIXIN -->
+						<view>
+							<nc-contact
+									:send-message-title="sendMessageTitle"
+									:send-message-path="sendMessagePath"
+									:send-message-img="sendMessageImg">
+								<view class="flex flex-col justify-center items-center mr-[38rpx]">
+									<text class="nc-iconfont nc-icon-kefuV6xx-1 text-[36rpx]"></text>
+									<text class="text-[20rpx] mt-[10rpx]">客服</text>
+								</view>
+							</nc-contact>
+						</view>
+						<!-- #endif -->
+					</view>
+					<view class="flex flex-1" v-if="goodsDetail.goods.status == 1">
+						<button
+							v-if="isShowSingleSku"
+							class="primary-btn-bg flex-1 !h-[70rpx] font-500 text-[26rpx] !text-[#fff] !m-0 !mr-[16rpx] leading-[70rpx] rounded-full remove-border"
+							@click="buyFn('buy_now')">立即兑换</button>
+						<button v-else
+							class="flex-1 !h-[70rpx] font-500 text-[26rpx] !text-[#fff] !bg-[#ccc] !m-0 !mr-[16rpx] leading-[70rpx] rounded-full remove-border"
+							>已售罄</button>
+					</view>
+					<view class="flex flex-1" v-else>
+						<button class="w-[100%] !h-[70rpx] font-500 text-[26rpx] !text-[#fff] !bg-[#ccc] !m-0 leading-[70rpx] rounded-full remove-border">该商品已下架</button>
+					</view>
+				</view>
+			</view>
+			<!-- 服务 -->
+			<view @touchmove.prevent.stop>
+				<u-popup class="popup-type" :show="servicesDataShow" @close="servicesDataShow = false">
+					<view class="popup-common min-h-[480rpx]" @touchmove.prevent.stop>
+						<view class="title">商品服务</view>
+						<scroll-view class="h-[520rpx]" scroll-y="true">
+							<view class="pl-[22rpx] pb-[28rpx] pr-[37rpx]">
+								<view class="flex mb-[28rpx]" v-for="(item, index) in goodsDetail.service">
+									<image class="mt-[4rpx] w-[32rpx] h-[32rpx] mr-[14rpx]" :src="img(item.image || 'addon/shop/icon_service.png')" mode="aspectFit" />
+									<view class="flex-1">
+										<view class="text-[30rpx] leading-[36rpx] text-[#333] mb-[8rpx]">{{ item.service_name }}</view>
+										<view class="text-[24rpx] leading-[36rpx] text-[var(--text-color-light9)]">{{ item.desc }}</view>
+									</view>
+								</view>
+							</view>
+						</scroll-view>
+					</view>
+				</u-popup>
+			</view>
+			<!-- 配送 -->
+			<view @touchmove.prevent.stop>
+				<u-popup class="popup-type" :show="distributionDataShow" @close="distributionDataShow = false">
+					<view class="min-h-[360rpx] popup-common" @touchmove.prevent.stop>
+						<view class="title">配送方式</view>
+						<scroll-view class="h-[520rpx]" scroll-y="true">
+							<view class="px-[var(--popup-sidebar-m)]">
+								<view class="flex mb-[40rpx]" v-for="(item, index) in goodsDetail.delivery_type_list" @click="distributionListFn(item,index)">
+									<image class="mt-[4rpx] w-[32rpx] h-[32rpx] mr-[14rpx]" :src="img('addon/shop/icon_service.png')" mode="aspectFit" />
+									<view class="flex-1">
+										<view class="text-[30rpx] leading-[36rpx] text-[#333] mb-[8rpx]">{{ item.name }}</view>
+										<view class="text-[24rpx] leading-[36rpx] text-[var(--text-color-light9)]">{{ item.desc }}</view>
+									</view>
+								</view>
+							</view>
+						</scroll-view>
+					</view>
+				</u-popup>
+			</view>
+			<goods-sku ref="goodsSkuRef" :goods-detail="goodsDetail" @change="specSelectFn"></goods-sku>
+			<share-poster ref="sharePosterRef" posterType="shop_point_goods" :posterParam="posterParam" :copyUrlParam="copyUrlParam" />
+		</view>
+		</scroll-view>
+		<loading-page :loading="loading"></loading-page>
+
+		<!-- #ifdef MP-WEIXIN -->
+		<!-- 小程序隐私协议 -->
+		<wx-privacy-popup ref="wxPrivacyPopupRef"></wx-privacy-popup>
+		<!-- #endif -->
+	</view>
+</template>
+
+<script setup lang="ts">
+import { ref, computed, getCurrentInstance, nextTick } from 'vue';
+import { onLoad, onShow,onUnload,onPageScroll } from '@dcloudio/uni-app'
+import { img, redirect,handleOnloadParams, deepClone, goback } from '@/utils/common';
+import { t } from '@/locale';
+import { getEvaluateList } from '@/addon/shop/api/goods';
+import { getExchangeGoodsDetail } from '@/addon/shop/api/point';
+import goodsSku from '@/addon/shop/pages/point/components/goods-sku.vue';
+import useMemberStore from '@/stores/member'
+import { useShare }from '@/hooks/useShare'
+import sharePoster from '@/components/share-poster/share-poster.vue'
+import {useGoods} from '@/addon/shop/hooks/useGoods'
+
+const diyGoods = useGoods();
+// 分享
+const{setShare} = useShare()
+
+// 会员信息
+const memberStore = useMemberStore()
+const userInfo = computed(() => memberStore.info)
+
+const sendMessageTitle = ref('')
+const sendMessagePath = ref('')
+const sendMessageImg = ref('')
+
+const goodsSkuRef: any = ref(null);
+const goodsDetail: any = ref({});
+
+const isAttrFormatShow = ref(false); //控制属性是否展开
+
+const loading = ref<boolean>(false);
+const servicesDataShow = ref<boolean>(false)
+const distributionDataShow =  ref<boolean>(false) //配送
+
+const wxPrivacyPopupRef:any = ref(null)
+
+onLoad((option: any) => {
+
+	// #ifdef MP-WEIXIN
+	// 处理小程序场景值参数
+	option = handleOnloadParams(option);
+	// #endif
+	//
+	getExchangeGoodsDetail(option.id || '',).then((res: any) => {
+		if (JSON.stringify(res.data) === '[]') {
+            let goBackParameter = {
+                url:'/addon/shop/pages/index',
+                title: '找不到该商品',
+                mode: 'reLaunch'
+            };
+            goback(goBackParameter)
+			return false
+		}
+
+		goodsDetail.value = deepClone(res.data);
+
+		goodsDetail.value.delivery_type_list = goodsDetail.value.goods.delivery_type_list ? Object.values(goodsDetail.value.goods.delivery_type_list) : [];
+		goodsDetail.value.goods.goods_image = goodsDetail.value.goods.goods_image_thumb_big;
+		goodsDetail.value.goods.goods_image.forEach((item: any, index: any) => {
+			goodsDetail.value.goods.goods_image[index] = img(item);
+		})
+
+		let data: any = deepClone(res.data);
+		goodsDetail.value.goods.attr_format = []
+		if (data.goods && data.goods.attr_format) {
+			let attrFormatArr: any = deepClone(JSON.parse(data.goods.attr_format));
+			attrFormatArr.forEach((item: any, index: any) => {
+				if ((item.attr_child_value_name && !(item.attr_child_value_name instanceof Array)) || ((item.attr_child_value_name instanceof Array) && item.attr_child_value_name.length)) {
+					goodsDetail.value.goods.attr_format.push(item);
+				}
+			})
+		}
+
+		sendMessageTitle.value = goodsDetail.value.goods.goods_name
+		sendMessagePath.value = '/addon/shop/pages/point/detail?sku_id=' + goodsDetail.value.sku_id;
+		sendMessageImg.value = img(goodsDetail.value.goods.goods_cover_thumb_mid)
+
+		// 分享 - start
+		let share = {
+			title: goodsDetail.value.goods.goods_name,
+			desc: goodsDetail.value.goods.sub_title,
+			url: goodsDetail.value.goods.goods_cover_thumb_mid
+		}
+		uni.setNavigationBarTitle({
+			title: goodsDetail.value.goods.goods_name
+		})
+		setShare({
+			wechat: {
+				...share
+			},
+			weapp: {
+				...share
+			}
+		});
+		// 分享 - end
+
+		// 获取评价
+		getEvaluateListFn();
+
+		copyUrlFn();
+
+		nextTick(() => {
+			setTimeout(() => {
+				const query = uni.createSelectorQuery().in(instance);
+				query.select('.swiper-box').boundingClientRect((data: any) => {
+					swiperHeight = data ? data.height : 0;
+				}).exec();
+				query.select('.detail-head').boundingClientRect((data: any) => {
+					if (data) {
+						detailHead = data.height ? data.height : 0;
+					}
+				}).exec();
+			}, 400)
+			// #ifdef MP
+			if(wxPrivacyPopupRef.value) wxPrivacyPopupRef.value.proactive();
+			// #endif
+		})
+	})
+})
+
+onShow(() => {
+	// 删除配送方式
+	uni.removeStorageSync('distributionType');
+})
+
+const specSelectFn = (id: any) => {
+	goodsDetail.value.skuList.forEach((item: any, index: any) => {
+		if (item.sku_id == id) {
+			Object.assign(goodsDetail.value, item);
+		}
+	})
+}
+
+// 判断单规格库存是否为0
+const isShowSingleSku = computed(() => {
+	let isSingleSpec = false // 是否为单规格，true：多规格，false：单规格
+	goodsDetail.value.skuList.forEach((item: any,index: any)=>{
+		if(item.sku_spec_format){
+			isSingleSpec = true
+		}
+	})
+
+	// 单规格，库存为0，显示已售罄
+	if(!isSingleSpec && goodsDetail.value.stock <= 0){
+	    return false;
+	}else if(!isSingleSpec && goodsDetail.value.stock > 0){
+	    // 单规格，库存大于0，可以购买
+        return true;
+    }
+	return true;
+})
+
+// 判断商品属性模块是否展示
+const isGoodsPropertyTemp = computed(() => {
+	let bool = false;
+	if(goodsDetail.value.service && goodsDetail.value.service.length ||
+	goodsDetail.value.goodsSpec && goodsDetail.value.goodsSpec.length ||
+	goodsDetail.value.goods.goods_type == 'real'&&goodsDetail.value.delivery_type_list&&goodsDetail.value.delivery_type_list.length){
+		bool = true;
+	}
+	return bool;
+})
+
+const buyFn = (type: any) => {
+	goodsSkuRef.value.open(type)
+}
+
+// 获取评价
+const evaluate = ref({
+	count : 0
+})
+
+const getEvaluateListFn = () => {
+	getEvaluateList(goodsDetail.value.goods_id).then((res: any) => {
+		evaluate.value = res.data
+	})
+}
+
+//进入评论
+const toLink = () => {
+	redirect({ url: '/addon/shop/pages/evaluate/list', param: { goods_id: goodsDetail.value.goods_id } })
+}
+
+//预览图片
+const imgListPreview = (item:any,index:any) => {
+	if(Array.isArray(item)){
+		var urlList =item;
+		if (!item.length) return false
+		uni.previewImage({
+			indicator: "number",
+			current:index,
+			loop: true,
+			urls: urlList
+		})
+	}else{
+		if (item === '') return false
+		var urlList = []
+		urlList.push(img(item))  //push中的参数为 :src="item.img_url" 中的图片地址
+		uni.previewImage({
+			indicator: "number",
+			loop: true,
+			urls: urlList
+		})
+	}
+
+}
+// 返回上一页
+const backToPrevious=()=> {
+	if(getCurrentPages().length > 1){
+		uni.navigateBack({
+			delta: 1
+		});
+	}else{
+        redirect({
+			url: '/addon/shop/pages/index',
+            mode: 'reLaunch'
+		});
+	}
+}
+
+/************ 选择配送方式-start ****************/
+const selectDeliveryType = ref(0);
+const distributionDataOpen = (()=>{
+	distributionDataShow.value = true;
+});
+const distributionListFn = ((data: any,index: any)=>{
+	selectDeliveryType.value =  index;
+	distributionDataShow.value = false;
+	uni.setStorageSync('distributionType', data.name);
+});
+/************ 选择配送方式-end ****************/
+
+
+/************ 自定义头部-start ****************/
+// 获取系统状态栏的高度
+let systemInfo = uni.getSystemInfoSync();
+let platform = systemInfo.platform;
+let menuButtonInfo: any = {};
+// 如果是小程序，获取右上角胶囊的尺寸信息，避免导航栏右侧内容与胶囊重叠(支付宝小程序非本API，尚未兼容)
+// #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+menuButtonInfo = uni.getMenuButtonBoundingClientRect();
+// #endif
+
+// 导航栏内部盒子的样式
+const navbarInnerStyle = computed(() => {
+	let style = '';
+	// 导航栏宽度，如果在小程序下，导航栏宽度为胶囊的左边到屏幕左边的距离
+	// #ifdef MP
+	let rightButtonWidth = menuButtonInfo.width ? menuButtonInfo.width * 2 + 'rpx' : '70rpx';
+	style += 'height:' + menuButtonInfo.height + 'px;';
+	style += 'padding-right:calc(' + rightButtonWidth + ' + 30rpx);';
+	style += 'padding-left:calc(' + rightButtonWidth + ' + 30rpx);';
+	style += 'padding-top:' + menuButtonInfo.top + 'px;';
+	style += 'padding-bottom: 8px;';
+
+	style += 'font-size: 32rpx;';
+	if (platform === 'ios') {
+		// 苹果(iOS)设备
+		style += 'font-weight: 500;';
+	} else if (platform === 'android') {
+	  // 安卓(Android)设备
+		style += 'font-size: 36rpx;';
+	}
+	// #endif
+
+	// #ifdef H5
+	style += 'height: 100rpx;';
+	style += 'padding-right: 30rpx;';
+	style += 'padding-left: 30rpx;';
+
+	style += 'font-size: 32rpx;';
+	if (platform === 'ios') {
+		// 苹果(iOS)设备
+		style += 'font-weight: 500;';
+	} else if (platform === 'android') {
+	  // 安卓(Android)设备
+		style += 'font-size: 36rpx;';
+	}
+	// #endif
+	return style;
+})
+
+// 导航栏内部盒子的样式
+const navbarInnerArrowStyle = computed(() => {
+	let style = '';
+	// 导航栏宽度，如果在小程序下，导航栏宽度为胶囊的左边到屏幕左边的距离
+	// #ifdef MP
+	style += "padding-left: 10rpx;"
+	style += "padding-right: 10rpx;"
+	style += 'position: absolute;';
+	style += 'left:calc( 100vw - ' + menuButtonInfo.right + 'px);';
+	style += 'font-size: 26px;';
+	// style += 'font-weight: bold;';
+	if (platform === 'ios') {
+		// 苹果(iOS)设备
+		style += 'font-weight: 700;';
+	} else if (platform === 'android') {
+	  // 安卓(Android)设备
+	}
+	// #endif
+	// #ifdef H5
+	style += 'font-size: 26px;';
+	// #endif
+	return style;
+})
+
+// 头部滚动
+const instance = getCurrentInstance();
+let swiperHeight = 0
+let detailHead = 0
+
+const detailHeadBgChange = ref(false)
+onPageScroll((e)=>{
+	let height = swiperHeight - detailHead - 20;
+	detailHeadBgChange.value = false;
+	if(e.scrollTop >= height){
+		detailHeadBgChange.value = true;
+	}
+})
+/************ 自定义头部-end ****************/
+
+const swiperClick = (index: any)=>{
+	if(typeof index == 'number') imgListPreview(goodsDetail.value.goods.goods_image,index)
+}
+
+/************* 分享海报-start **************/
+const sharePosterRef: any = ref(null);
+const copyUrlParam = ref('');
+let posterParam: any = {};
+
+// 分享海报链接
+const copyUrlFn = ()=>{
+	copyUrlParam.value = '?id='+goodsDetail.value.exchange_id;
+	if (userInfo.value && userInfo.value.member_id) copyUrlParam.value += '&mid=' + userInfo.value.member_id;
+}
+const openShareFn = ()=>{
+    posterParam.id = goodsDetail.value.exchange_id;
+    if (userInfo.value && userInfo.value.member_id) {
+        posterParam.member_id = userInfo.value.member_id;
+    }
+	sharePosterRef.value.openShare()
+}
+/************* 分享海报-end **************/
+
+// 关闭预览图片
+onUnload(()=>{
+    // #ifdef  H5 || APP
+	try {
+		uni.closePreviewImage()
+	}catch (e) {
+
+	}
+    // #endif
+})
+</script>
+<style lang="scss" scoped>
+@import '@/addon/shop/styles/common.scss';
+.remove-border {
+	&::after {
+		border: none;
+	}
+}
+:deep(.u-cell-group__wrapper) {
+	.u-cell__body {
+		padding: 23rpx 32rpx;
+	}
+}
+
+.popup-type {
+	:deep(.u-popup__content) {
+		border-top-left-radius: 16rpx;
+		border-top-right-radius: 16rpx;
+		overflow: hidden;
+	}
+}
+
+.tab-bar-placeholder {
+	padding-bottom: calc(constant(safe-area-inset-bottom) + 100rpx);
+	padding-bottom: calc(env(safe-area-inset-bottom) + 100rpx);
+}
+
+.tab-bar {
+	padding-top: 16rpx;
+	padding-bottom: calc(constant(safe-area-inset-bottom) + 16rpx);
+	padding-bottom: calc(env(safe-area-inset-bottom) + 16rpx);
+}
+:deep(.u-count-down) .u-count-down__text{
+	color: #fff;
+	font-size: 28rpx;
+}
+:deep(.u-swiper-indicator__wrapper--line__bar){
+	height: 5rpx !important;
+}
+:deep(.u-swiper-indicator__wrapper--line){
+	height: 5rpx !important;
+}
+.datail-title{
+	background: linear-gradient(#fff 70%, #F6F6F6);
+}
+.goods-sku .value-wid{
+	width: calc(100% - 160rpx);
+}
+</style>
diff --git a/uni-app/src/addon/shop/pages/point/index.vue b/uni-app/src/addon/shop/pages/point/index.vue
new file mode 100644
index 00000000..c612cbdb
--- /dev/null
+++ b/uni-app/src/addon/shop/pages/point/index.vue
@@ -0,0 +1,75 @@
+<template>
+	<view :style="themeColor()">
+
+		<loading-page :loading="diy.getLoading()"></loading-page>
+
+		<view v-show="!diy.getLoading()">
+
+			<!-- 自定义模板渲染 -->
+			<view class="diy-template-wrap bg-index" :style="diy.pageStyle()">
+
+				<diy-group ref="diyGroupRef" :data="diy.data" />
+
+			</view>
+
+		</view>
+
+		<!-- #ifdef MP-WEIXIN -->
+		<!-- 小程序隐私协议 -->
+		<wx-privacy-popup ref="wxPrivacyPopupRef"></wx-privacy-popup>
+		<!-- #endif -->
+
+	</view>
+</template>
+
+<script setup lang="ts">
+    import {ref,nextTick} from 'vue';
+    import {useDiy} from '@/hooks/useDiy'
+    import diyGroup from '@/addon/components/diy/group/index.vue'
+
+    const diy = useDiy({
+        name: 'DIY_SHOP_POINT_INDEX'
+    })
+
+    const diyGroupRef = ref(null)
+
+    const wxPrivacyPopupRef:any = ref(null)
+
+    // 监听页面加载
+    diy.onLoad();
+
+    // 监听页面显示
+    diy.onShow((data: any) => {
+        diyGroupRef.value?.refresh();
+	    // #ifdef MP
+	    nextTick(()=>{
+		    if(wxPrivacyPopupRef.value) wxPrivacyPopupRef.value.proactive();
+	    })
+	    // #endif
+    });
+
+    // 监听页面隐藏
+    diy.onHide();
+
+	// 监听页面卸载
+	diy.onUnload();
+
+    // 监听滚动事件
+    diy.onPageScroll()
+</script>
+<style lang="scss" scoped>
+	@import '@/styles/diy.scss';
+</style>
+<style lang="scss">
+.diy-template-wrap {
+  /* #ifdef MP */
+  .child-diy-template-wrap {
+    ::v-deep .diy-group {
+      > .draggable-element.top-fixed-diy {
+        display: block !important;
+      }
+    }
+  }
+  /* #endif */
+}
+</style>
diff --git a/uni-app/src/addon/shop/pages/point/list.vue b/uni-app/src/addon/shop/pages/point/list.vue
new file mode 100644
index 00000000..29b1b394
--- /dev/null
+++ b/uni-app/src/addon/shop/pages/point/list.vue
@@ -0,0 +1,207 @@
+<template>
+	<view class="bg-[var(--page-bg-color)] min-h-[100vh]" :style="themeColor()">
+		<view class="fixed left-0 right-0 top-0 product-warp bg-[#fff]">
+
+			<view class="py-[14rpx] flex items-center justify-between px-[20rpx]">
+				<view class="flex-1 search-input">
+					<text @click.stop="searchTypeFn('all')" class="nc-iconfont nc-icon-sousuo-duanV6xx1 btn"></text>
+					<input class="input" maxlength="50" type="text" v-model="goods_name" placeholder="请搜索您想要的商品" placeholderClass="text-[var(--text-color-light9)] text-[24rpx]" confirm-type="search" @confirm="searchTypeFn('all')">
+					<text v-if="goods_name" class="nc-iconfont nc-icon-cuohaoV6xx1 clear" @click="goods_name=''"></text>
+				</view>
+			</view>
+			<view class="h-[88rpx] px-[30rpx]">
+				<view class=" flex items-center justify-between text-[26rpx] text-[var(--text-color-light6)] h-[88rpx]">
+					<text :class="{ '!text-[var(--primary-color)] font-500': searchType == 'total_order_num' }" @click="searchTypeFn('total_order_num')">综合排序</text>
+					<view class="flex items-center" @click="searchTypeFn('total_exchange_num')">
+						<text class="mr-[4rpx]" :class="{ '!text-[var(--primary-color)] font-500': searchType == 'total_exchange_num' }">销量</text>
+						<text v-if="sale_num == 'asc'" class="text-[16rpx] text-[var(--text-color-light6)] nc-iconfont nc-icon-a-xiangshangV6xx1"
+						:class="{ '!text-[var(--primary-color)]': searchType == 'total_exchange_num' }"
+						></text>
+						<text  v-else class="text-[16rpx] text-[var(--text-color-light6)] nc-iconfont nc-icon-a-xiangxiaV6xx1"
+						:class="{ '!text-[var(--primary-color)]': searchType == 'total_exchange_num' }"></text>
+					</view>
+					<view class="flex items-center" @click="searchTypeFn('price')">
+						<text class="mr-[4rpx]" :class="{'!text-[var(--primary-color)] font-500': searchType == 'price' }">价格</text>
+						<text v-if="price == 'asc'" class="text-[16rpx] text-[var(--text-color-light6)] nc-iconfont nc-icon-a-xiangshangV6xx1"
+						 :class="{'!text-[var(--primary-color)]': searchType == 'price' }"></text>
+						<text v-else class="text-[16rpx] text-[var(--text-color-light6)] nc-iconfont nc-icon-a-xiangxiaV6xx1"
+						 :class="{'!text-[var(--primary-color)]': searchType == 'price' }"></text>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<mescroll-body ref="mescrollRef" top="176rpx" bottom="60px" @init="mescrollInit" :down="{ use: false }" @up="getAllAppListFn">
+			<view v-if="goodsList.length" class="sidebar-margin flex justify-between flex-wrap">
+				<template v-for="(item, index) in goodsList">
+					<view class="goods-item-style-two flex flex-col bg-[#fff] box-border rounded-[var(--rounded-mid)] overflow-hidden mt-[var(--top-m)]" @click="toDetail(item.id)">
+						<!-- <u--image width="100%" height="350rpx" :src="img(item.goods_cover_thumb_mid ? item.goods_cover_thumb_mid : '')" model="aspectFill">
+							<template #error>
+								<image class="w-[100%] h-[350rpx]" :src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill"></image>
+							</template>
+						</u--image> -->
+						<image v-if="item.goods_cover_thumb_mid" class="w-[100%] h-[350rpx] rounded-tl-[var(--rounded-mid)] rounded-tr-[var(--rounded-mid)]" :src="img(item.goods_cover_thumb_mid)" :mode="'aspectFill'" @error="item.goods_cover_thumb_mid='static/resource/images/diy/shop_default.jpg'"></image>
+						<image v-else class="w-[100%] h-[350rpx] rounded-tl-[var(--rounded-mid)] rounded-tr-[var(--rounded-mid)]" :src="img('static/resource/images/diy/shop_default.jpg')" :mode="'aspectFill'"></image>
+						<view class="px-[16rpx] flex-1 pt-[10rpx] pb-[20rpx] flex flex-col justify-between">
+                            <view class="text-[] leading-[40rpx] text-[28rpx] multi-hidden">{{item.names}}</view>
+                            <view class="text-[24rpx] font-400 leading-[34rpx] mt-[10rpx] text-[var(--text-color-light9)]">已兑{{item.total_exchange_num}}人</view>
+                            <view class="flex justify-between flex-wrap items-center mt-[16rpx]" >
+								<view class="flex flex-col">
+									<view class="text-[var(--price-text-color)] price-font ml-[2rpx] flex items-center">
+										<text class="text-[32rpx]">{{ item.point  }}</text>
+										<text class="text-[26rpx] ml-[4rpx]">积分</text>
+									</view>
+									<view v-if="item.price&&item.price>0" class="flex items-center price-font mt-[6rpx]">
+										<text class="text-[var(--price-text-color)] font-400 text-[32rpx]">+{{ parseFloat(item.price).toFixed(2)  }}</text>
+										<text class="text-[var(--price-text-color)] font-400 ml-[4rpx] text-[20rpx]">元</text>
+									</view>
+								</view>
+								<view class="w-[120rpx] h-[54rpx] text-[22rpx] flex-center !text-[#fff] m-0 rounded-full primary-btn-bg remove-border text-center" shape="circle">去兑换</view>
+                            </view>
+                        </view>
+					</view>
+				</template>
+			</view>
+			<mescroll-empty v-if="!goodsList.length && loading" :option="{tip : '暂无商品'}"></mescroll-empty>
+		</mescroll-body>
+
+		<tabbar />
+	</view>
+</template>
+
+<script setup lang="ts">
+import { reactive, ref, onMounted } from 'vue'
+import { t } from '@/locale'
+import { redirect, img } from '@/utils/common';
+import { getExchangeGoodsList } from '@/addon/shop/api/point';
+import MescrollBody from '@/components/mescroll/mescroll-body/mescroll-body.vue';
+import MescrollEmpty from '@/components/mescroll/mescroll-empty/mescroll-empty.vue';
+import useMescroll from '@/components/mescroll/hooks/useMescroll.js';
+import { onShow, onPageScroll, onReachBottom } from '@dcloudio/uni-app';
+
+const { mescrollInit, downCallback, getMescroll } = useMescroll(onPageScroll, onReachBottom);
+const goodsList = ref<Array<any>>([]);
+const coupon_id = ref<number | string>('');
+const currGoodsCategory = ref<number | string>('');
+const mescrollRef = ref(null);
+const loading = ref<boolean>(false);
+const goods_name = ref("");
+const price = ref("");
+const sale_num = ref("");
+const searchType = ref('total_order_num');
+interface mescrollStructure {
+	num: number,
+	size: number,
+	endSuccess: Function,
+	[propName: string]: any
+}
+
+const getAllAppListFn = (mescroll: mescrollStructure) => {
+	loading.value = false;
+	let data: object = {
+		goods_category: currGoodsCategory.value,
+		page: mescroll.num,
+		limit: mescroll.size,
+		names: goods_name.value,
+		coupon_id: coupon_id.value,
+		order: searchType.value === 'total_order_num' ? '' : searchType.value,
+		sort: searchType.value == 'price' ? price.value : sale_num.value
+	};
+	getExchangeGoodsList(data).then((res: any) => {
+		let newArr = (res.data.data as Array<Object>);
+		//设置列表数据
+		if (Number(mescroll.num) === 1) {
+			goodsList.value = []; //如果是第一页需手动制空列表
+		}
+		goodsList.value = goodsList.value.concat(newArr);
+		mescroll.endSuccess(newArr.length);
+		loading.value = true;
+	}).catch(() => {
+		loading.value = true;
+		mescroll.endErr(); // 请求失败, 结束加载
+	})
+}
+
+// 搜索
+const searchTypeFn = (type:string) => {
+	searchType.value = type;
+    if ( type == 'total_order_num') {
+		sale_num.value = '';
+		price.value = '';
+	}
+	if ( type == 'price') {
+		sale_num.value = '';
+		if(price.value){
+			price.value = price.value == 'asc' ? 'desc' : 'asc';
+		}else{
+			price.value = 'asc';
+		}
+	}
+	if ( type == 'total_exchange_num') {
+		price.value = '';
+		if(sale_num.value){
+			sale_num.value = sale_num.value == 'asc' ? 'desc' : 'asc';
+		}else{
+			sale_num.value = 'asc';
+		}
+	}
+	goodsList.value = [];
+    getMescroll().resetUpScroll();
+}
+const toDetail = (id: string | number) => {
+	redirect({ url: '/addon/shop/pages/point/detail', param: { id: id }, mode: 'navigateTo' })
+}
+onMounted(() => {
+	setTimeout(() => {
+		getMescroll().optUp.textNoMore = t("end");
+	}, 500)
+});
+</script>
+
+<style lang="scss" scoped>
+.bg-color{
+	background: linear-gradient( 180deg, #EF000C 16%, rgba(239,0,12,0) 92%);
+}
+.nav-item.active {
+	color: $u-primary;
+}
+
+.scroll-view-wrap {
+	word-break: keep-all;
+}
+
+.text-color {
+	color: var(--primary-color);
+}
+
+.label-select {
+	color: var(--primary-color);
+	border-color: var(--primary-color);
+	background-color: var(--primary-color-light);
+}
+
+:deep(.u-popup .u-transition) {
+	top: 156rpx !important;
+}
+
+.product-warp {
+	z-index: 99999;
+}
+
+:deep(.tab-bar-placeholder) {
+	display: none !important;
+}
+
+:deep(.u-tabbar__placeholder) {
+	display: none !important;
+}
+:deep(.u-input__content__clear){
+	width: 28rpx;
+	height: 28rpx;
+	font-size: 28rpx;
+	background-color: var(--text-color-light9);
+}
+.goods-item-style-two{
+	width: calc(50% - 10rpx);
+}
+</style>
diff --git a/uni-app/src/addon/shop/pages/point/order_list.vue b/uni-app/src/addon/shop/pages/point/order_list.vue
new file mode 100644
index 00000000..e2e2c289
--- /dev/null
+++ b/uni-app/src/addon/shop/pages/point/order_list.vue
@@ -0,0 +1,296 @@
+<template>
+	<view class="bg-[var(--page-bg-color)] min-h-screen overflow-hidden order-list" :style="themeColor()">
+		<view class="fixed left-0 top-0 right-0 z-10" v-if="statusLoading">
+			<scroll-view :scroll-x="true" class="tab-style-2">
+				<view class="tab-content">
+					<view class="tab-items" :class="{ 'class-select': orderState === item.status.toString() }" @click="orderStateFn(item.status)" v-for="(item, index) in orderStateList">{{ item.name }}</view>
+				</view>
+			</scroll-view>
+		</view>
+		<mescroll-body ref="mescrollRef" top="88rpx" @init="mescrollInit" :down="{ use: false }" @up="getShopOrderFn">
+			<view class="sidebar-margin pt-[var(--top-m)]" v-if="list.length">
+				<template v-for="(item, index) in list" :key="index">
+					<view class="mb-[var(--top-m)] card-template">
+						<view @click="toLink(item)">
+							<view class="flex justify-between items-center">
+								<view class="text-[#303133] text-[26rpx] font-400 leading-[30rpx]">
+									<text>{{ t('orderNo') }}:</text>
+									<text class="ml-[10rpx]">{{ item.order_no }}</text>
+									<text class="text-[303133] text-[26rpx] font-400 nc-iconfont nc-icon-fuzhiV6xx1 ml-[11rpx]" @click.stop="copy(item.order_no)"></text>
+								</view>
+								<view class="text-[#303133] text-[26rpx] leading-[34rpx]" :class="{'text-primary': item.status  == 1,'!text-[var(--text-color-light9)]' :item.status  == 5 || item.status  == -1}">{{ item.status_name.name }}</view>
+							</view>
+							<view class="flex box-border mt-[20rpx]" v-for="(subitem, index) in item.order_goods" :key="index">
+								
+								<image v-if="subitem.goods_image_thumb_small" class="w-[150rpx] h-[150rpx] rounded-[var(--rounded-mid)]" :src="img(subitem.goods_image_thumb_small)" :mode="'aspectFill'" @error="subitem.goods_image_thumb_small='static/resource/images/diy/shop_default.jpg'"></image>
+								<image v-else class="w-[150rpx h-[150rpx] rounded-[var(--rounded-mid)]" :src="img('static/resource/images/diy/shop_default.jpg')" :mode="'aspectFill'"></image>
+								<view class="ml-[20rpx] flex flex-1 flex-col box-border">
+									<view class="max-w-[490rpx] text-[28rpx] leading-[40rpx] font-400 truncate text-[#303133]">{{ subitem.goods_name }}</view>
+									<view class="flex justify-between items-baseline text-[#303133] mt-[14rpx]">
+										<view>
+											<view v-if="subitem.sku_name" class="text-[24rpx] text-[var(--text-color-light6)] font-400 truncate leading-[34rpx] max-w-[369rpx] mb-[10rpx]">{{ subitem.sku_name }}</view>
+											<view class="text-[24rpx] font-400 leading-[34rpx] text-[var(--text-color-light6)]" v-if="item.delivery_type != 'virtual'">
+												{{t('deliveryType') }} ： {{item.delivery_type_name}}
+											</view>
+											<view class="text-[24rpx] font-400 leading-[34rpx] text-[var(--text-color-light6)]" v-else>{{t('createTime') }} ：{{item.create_time}}</view>
+										</view>
+										<text class="text-right text-[26rpx] font-400 w-[90rpx] leading-[36rpx]">x{{ subitem.num }}</text>
+									</view>
+								
+								</view>
+							</view>
+						</view>
+						<view class="flex justify-end items-center mt-[20rpx]">
+							<view class="text-[22rpx] text-[var(--text-color-light9)] leading-[30rpx] mr-[6rpx]" v-if="parseFloat(item.delivery_money)">{{ t('service') }}</view>
+							<view class="flex items-center">
+								<view class="text-[22rpx] font-400 leading-[30rpx] text-[#303133]">{{ t('actualPayment') }}：</view>
+								<view class="text-[var(--price-text-color)] price-font">
+										<text class="text-[36rpx] mr-[2rpx]">{{ item.point }}</text>
+										<text  class="text-[30rpx]">{{ t('point') }}</text>
+										<block v-if="parseFloat(item.order_money)">
+											<text class="text-[30rpx] mx-[4rpx]">+</text>
+											<text class="text-[36rpx] price-font">{{ parseFloat(item.order_money)}}</text>
+											<text class="text-[30rpx] price-font ml-[2rpx]">{{ t('money') }}</text>
+										</block>
+								</view>
+							</view>
+						</view>
+						<view class="flex justify-end text-[28rpx] mt-[20rpx] items-center" v-if="(item.status == 1) || (item.status == 3) || (item.status == 5 && evaluateConfig.is_evaluate == 1)">
+							<view
+								class="text-[24rpx] font-500 leading-[52rpx] h-[56rpx] min-w-[150rpx] text-center border-[2rpx] border-solid border-[var(--text-color-light9)] rounded-full text-[var(--text-color-light6)] box-bordertext-[24rpx] font-500 leading-[52rpx] h-[56rpx] min-w-[150rpx] text-center border-[2rpx] border-solid border-[var(--text-color-light9)] rounded-full text-[var(--text-color-light6)] box-border"
+								@click.stop="orderBtnFn(item, 'close')" v-if="item.status == 1">{{ t('orderClose') }}</view>
+							<view
+								class="text-[24rpx] font-500 leading-[52rpx] h-[56rpx] min-w-[150rpx] text-center border-[2rpx] border-solid text-[#fff] border-primary bg-primary rounded-full ml-[20rpx] box-border"
+								@click.stop="orderBtnFn(item, 'pay')" v-if="item.status == 1">{{ t('topay') }}</view>
+							<view
+								class="text-[24rpx] font-500 leading-[52rpx] h-[56rpx] min-w-[150rpx] text-center border-[2rpx] border-solid text-[#fff] border-primary bg-primary rounded-full ml-[20rpx] box-border"
+								@click.stop="orderBtnFn(item, 'finish')" v-if="item.status == 3">{{ t('orderFinish') }}</view>
+							<view
+								class="text-[24rpx] font-500 leading-[52rpx] h-[56rpx] min-w-[150rpx] text-center border-[2rpx] border-solid border-[var(--text-color-light9)] rounded-full ml-[20rpx]  text-[var(--text-color-light6)] box-border" 
+								v-if="item.status == 5 && evaluateConfig.is_evaluate == 1"
+								@click.stop="orderBtnFn(item, 'evaluate')">{{ item.is_evaluate == 1 ? t('selectedEvaluate') : t('evaluate') }}</view>
+						</view>
+					</view>
+				</template>
+			</view>
+			<mescroll-empty v-if="!list.length && loading" :option="{tip : '暂无订单'}"></mescroll-empty>
+		</mescroll-body>
+		<pay ref="payRef" @close="payClose"></pay>
+	</view>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue';
+import { t } from '@/locale'
+import { img, redirect,copy } from '@/utils/common';
+import { getShopOrderStatus, getShopOrder, orderClose, orderFinish } from '@/addon/shop/api/order';
+import { getEvaluateConfig } from '@/addon/shop/api/shop';
+import MescrollBody from '@/components/mescroll/mescroll-body/mescroll-body.vue';
+import MescrollEmpty from '@/components/mescroll/mescroll-empty/mescroll-empty.vue';
+import useMescroll from '@/components/mescroll/hooks/useMescroll.js';
+import { onLoad, onPageScroll, onReachBottom } from '@dcloudio/uni-app';
+import useConfigStore from "@/stores/config";
+
+const { mescrollInit, downCallback, getMescroll } = useMescroll(onPageScroll, onReachBottom);
+const list = ref<Array<Object>>([]);
+const loading = ref<boolean>(false);
+const statusLoading = ref<boolean>(false);
+const orderState = ref('')
+const orderStateList: any = ref([]);
+const evaluateConfig = ref("")
+
+const mch_id = ref('')
+const isTradeManaged = ref(false)
+
+onLoad((option: any) => {
+	orderState.value = option.status || "";
+	evaluateEvent()
+	getShopOrderStatusFn();
+});
+
+const evaluateEvent = () => {
+	getEvaluateConfig().then((data: any) => {
+		evaluateConfig.value = data.data
+	})
+}
+
+const getShopOrderFn = (mescroll: any) => {
+	loading.value = false;
+	let data: object = {
+		page: mescroll.num,
+		limit: mescroll.size,
+		status: orderState.value,
+		activity_type:'exchange'
+	};
+
+	getShopOrder(data).then((res: any) => {
+		let newArr = (res.data.data as Array<Object>);
+		//设置列表数据
+		if (mescroll.num == 1) {
+			list.value = []; //如果是第一页需手动制空列表
+		}
+		list.value = list.value.concat(newArr);
+		mescroll.endSuccess(newArr.length);
+
+        mch_id.value = res.data.mch_id;
+        isTradeManaged.value = res.data.is_trade_managed;
+		loading.value = true;
+	}).catch(() => {
+		loading.value = true;
+		mescroll.endErr(); // 请求失败, 结束加载
+	})
+}
+
+const getShopOrderStatusFn = () => {
+	statusLoading.value = false;
+	orderStateList.value = [];
+	let obj = { name: '全部', status: '' };
+	orderStateList.value.push(obj);
+
+	getShopOrderStatus().then((res: any) => {
+		Object.values(res.data).forEach((item, index) => {
+			orderStateList.value.push(item);
+		});
+		statusLoading.value = true;
+	}).catch(() => {
+		statusLoading.value = true;
+	})
+}
+
+const orderStateFn = (status: any) => {
+	orderState.value = status.toString();
+	list.value = [];
+	getMescroll().resetUpScroll();
+};
+
+const toLink = (data: any) => {
+	redirect({ url: '/addon/shop/pages/order/detail', param: { order_id: data.order_id } })
+}
+
+// 支付
+const payRef = ref(null)
+const orderBtnFn = (data: any, type = '') => {
+	if (type == 'pay')
+		payRef.value?.open(data.order_type, data.order_id, `/addon/shop/pages/order/detail?order_id=${data.order_id}`);
+	else if (type == 'close') {
+		close(data);
+	} else if (type == 'finish') {
+		finish(data);
+	} else if (type == 'evaluate') {
+		if (!data.is_evaluate) {
+			redirect({ url: '/addon/shop/pages/evaluate/order_evaluate', param: { order_id: data.order_id } })
+		} else {
+			redirect({ url: '/addon/shop/pages/evaluate/order_evaluate_view', param: { order_id: data.order_id } })
+		}
+	}
+}
+
+//关闭订单
+const close = (item: any) => {
+	uni.showModal({
+		title: '提示',
+		content: '您确定要关闭该订单吗？',
+        confirmColor: useConfigStore().themeColor['--primary-color'],
+		success: res => {
+			if (res.confirm) {
+				orderClose(item.order_id).then((data) => {
+					getMescroll().resetUpScroll();
+				})
+			}
+		}
+	})
+}
+
+//订单完成
+const finish = (item: any) => {
+    // 如果不在微信小程序中
+    // #ifndef MP-WEIXIN
+	uni.showModal({
+		title: '提示',
+		content: '您确定物品已收到吗？',
+        confirmColor: useConfigStore().themeColor['--primary-color'],
+		success: res => {
+			if (res.confirm) {
+				orderFinish(item.order_id).then((data) => {
+					getMescroll().resetUpScroll();
+				})
+			}
+		}
+	})
+    // #endif
+
+    // #ifdef MP-WEIXIN
+    // 检测微信小程序是否已开通发货信息管理服务
+    if (item.pay && item.pay.type == 'wechatpay' && isTradeManaged.value && wx.openBusinessView) {
+        wx.openBusinessView({
+            businessType: 'weappOrderConfirm',
+            extraData: {
+                merchant_id: mch_id.value,
+                merchant_trade_no: item.out_trade_no
+            },
+            success: (res:any) => {
+                orderFinish(item.order_id).then((data) => {
+                    getMescroll().resetUpScroll();
+                })
+            },
+            fail: (res:any) => {
+                console.log('小程序确认收货组件打开失败 fail', res);
+            }
+        })
+    }else{
+        uni.showModal({
+            title: '提示',
+            content: '您确定物品已收到吗？',
+            confirmColor: useConfigStore().themeColor['--primary-color'],
+            success: res => {
+                if (res.confirm) {
+                    orderFinish(item.order_id).then((data) => {
+                        getMescroll().resetUpScroll();
+                    })
+                }
+            }
+        })
+    }
+    // #endif
+}
+</script>
+<style>
+.order-list .mescroll-body {
+	padding-bottom: constant(safe-area-inset-bottom) !important;
+	padding-bottom: env(safe-area-inset-bottom) !important;
+}
+</style>
+<style lang="scss" scoped>
+.text-item {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	display: -webkit-box;
+	-webkit-line-clamp: 2;
+	-webkit-box-orient: vertical;
+}
+
+.text-color {
+	color: var(--primary-color);
+}
+
+.bg-color {
+	background-color: var(--primary-color);
+}
+
+.class-select {
+	position: relative;
+	font-weight: 500;
+	color: var(--primary-color);
+	&::before {
+		content: "";
+		position: absolute;
+		bottom: 0;
+		height: 4rpx;
+		border-radius: 4rpx;
+		background-color: var(--primary-color);
+		width: 40rpx;
+		left: 50%;
+		transform: translateX(-50%);
+	}
+}
+</style>
diff --git a/uni-app/src/addon/shop/pages/point/payment.vue b/uni-app/src/addon/shop/pages/point/payment.vue
new file mode 100644
index 00000000..395bafd0
--- /dev/null
+++ b/uni-app/src/addon/shop/pages/point/payment.vue
@@ -0,0 +1,422 @@
+<template>
+    <view :style="themeColor()">
+        <view class="bg-[var(--page-bg-color)] min-h-[100vh]" v-if="orderData">
+            <view class="pt-[30rpx] sidebar-margin payment-bottom">
+                <!-- 配送方式 -->
+                <view class="mb-[var(--top-m)] rounded-[var(--rounded-big)] bg-white" v-if="orderData.basic.has_goods_types.includes('real') && delivery_type_list.length">
+                    <view class="rounded-tl-[var(--rounded-big)] rounded-tr-[var(--rounded-big)] head-tab flex items-center w-full bg-[#f1f1f1]" v-if="delivery_type_list.length > 1">
+                        <view v-for="(item, index) in delivery_type_list" :key="index"  class="head-tab-item flex-1 relative" :class="{'active': index === activeIndex}">
+                            <view class="h-[74rpx] relative z-10 text-center leading-[74rpx] text-[28rpx]" @click="switchDeliveryType(item.key, index)">
+                                {{ item.name }}
+                            </view>
+                            <image v-if="index === activeIndex && delivery_type_list.length == 3" class="tab-image absolute bottom-[-2rpx] h-[94rpx] w-[240rpx]" :src="img(`addon/shop/payment/tab_${index}.png`)" mode="aspectFit"></image>
+                            <image v-else-if="index === activeIndex && delivery_type_list.length == 2" class="tab-img absolute  bottom-[-2rpx]  h-[95rpx] w-[354rpx]" :src="img(`addon/shop/payment/tabstyle_${index}.png`)" mode="aspectFit"></image>
+                        </view>
+                    </view>
+                    <view class="min-h-[140rpx] flex items-center px-[30rpx]">
+                        <!-- 收货地址 -->
+                        <view class="w-full" v-if="['express', 'local_delivery'].includes(createData.delivery.delivery_type)" @click="toSelectAddress">
+                            <view v-if="!$u.test.isEmpty(orderData.delivery.take_address)" class="pt-[20rpx] pb-[30rpx] flex items-center">
+								<image class="w-[60rpx] h-[60rpx] mr-[20rpx] flex-shrink-0" :src="img('addon/shop/payment/position_01.png')" mode="aspectFit"></image>
+								<view class="flex flex-col overflow-hidden">
+									<text class="text-[26rpx] text-[var(--text-color-light9)] mt-[16rpx] truncate max-w-[536rpx]">{{orderData.delivery.take_address.full_address.split(orderData.delivery.take_address.address)[0]}}</text>
+									<text class="font-500 text-[30rpx] mt-[14rpx] text-[#333] truncate max-w-[536rpx]">{{orderData.delivery.take_address.address}}</text>
+									<view class="flex items-center text-[26rpx] text-[var(--text-color-light6)] mt-[16rpx]">
+									    <text class="mr-[16rpx]">{{ orderData.delivery.take_address.name }}</text>
+									    <text>{{ mobileHide(orderData.delivery.take_address.mobile) }}</text>
+									</view>
+								</view>
+								<text class="ml-auto nc-iconfont nc-icon-youV6xx text-[26rpx] text-[var(--text-color-light9)]"></text>
+                            </view>
+                            <view v-else class="flex items-center">
+                                <image class="w-[26rpx] h-[30rpx] mr-[10rpx]" :src="img('addon/shop/payment/position_02.png')" mode="aspectFit"></image>
+                                <text class="text-[28rpx]">添加收货地址</text>
+                                <text class="nc-iconfont nc-icon-youV6xx text-[26rpx] text-[var(--text-color-light9)] ml-auto"></text>
+                            </view>
+                        </view>
+
+                        <!-- 自提点 -->
+                        <view class="flex items-center w-full flex items-center" v-if="createData.delivery.delivery_type == 'store'" @click="storeRef.open()">
+                            <view v-if="!$u.test.isEmpty(orderData.delivery.take_store)" class="pt-[26rpx] pb-[30rpx] w-full flex items-centerv">
+                                <view class="flex flex-col">
+									<view class="text-[30rpx] font-500 text-[#303133] mb-[20rpx]">{{ orderData.delivery.take_store.store_name }}</view>
+									<view class="text-[24rpx] text-[var(--text-color-light6)] mb-[14rpx]">门店地址：{{ orderData.delivery.take_store.full_address }}</view>
+                                    <view class="text-[24rpx] text-[var(--text-color-light6)] mb-[14rpx]">联系电话：{{ orderData.delivery.take_store.store_mobile }}</view>
+                                    <view class="text-[24rpx] text-[var(--text-color-light6)]">营业时间：{{ orderData.delivery.take_store.trade_time }}</view>
+                                </view>
+								<text class="ml-auto nc-iconfont nc-icon-youV6xx text-[26rpx] text-[var(--text-color-light9)]"></text>
+                            </view>
+                            <view v-else class="flex items-center w-full">
+                                <image class="w-[26rpx] h-[30rpx] mr-[10rpx]" :src="img('addon/shop/payment/position_02.png')" mode="aspectFit"></image>
+                                <text class="text-[28rpx]">请选择自提点</text>
+                                <text class="ml-auto nc-iconfont nc-icon-youV6xx text-[26rpx] text-[var(--text-color-light9)]"></text>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+                <view class="mb-[var(--top-m)] card-template h-[100rpx] flex items-center" v-if="orderData.basic.has_goods_types.includes('real') && !delivery_type_list.length">
+                    <p class="text-[28rpx] text-[var(--primary-color)]">商家尚未配置配送方式</p>
+                </view>
+
+                <view class="mb-[var(--top-m)] card-template">
+                    <view class="mb-[30rpx]">
+                        <view class="flex" v-for="(item, key, index) in orderData.goods_data" :key="index" :class="{'pb-[40rpx]': (index + 1) != Object.keys(orderData.goods_data).length}">
+                            <u--image radius="var(--goods-rounded-big)" width="180rpx" height="180rpx" :src="img(item.sku_image.split(',')[0])" model="aspectFill">
+                                <template #error>
+									<image class="w-[180rpx] h-[180rpx] rounded-[var(--goods-rounded-big)] overflow-hidden" :src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill"/>
+                                </template>
+                            </u--image>
+                            <view class="flex flex-1 w-0 flex-col justify-between ml-[20rpx] py-[6rpx]">
+                                <view class="line-normal">
+                                    <view class="truncate text-[#303133] text-[28rpx] leading-[32rpx]">{{ item.goods.goods_name }}</view>
+                                    <view v-if="item.sku_name" class="mt-[14rpx] flex">
+                                        <text class="truncate text-[24rpx] text-[var(--text-color-light9)] leading-[28rpx]">{{ item.sku_name }}</text>
+                                    </view>
+                                </view>
+                                <view class="mb-auto" :class="{'mt-[6rpx]': !item.sku_name}"  v-if="item.not_support_delivery">
+                                    <u-alert type="error" description="该商品不支持当前所选配送方式" class="leading-[30rpx] !inline-block" fontSize="11"></u-alert>
+                                </view>
+                                <view class="flex justify-between items-baseline">
+                                    <view class="text-[var(--price-text-color)] flex items-baseline  price-font">
+										<view class="flex items-baseline price-font">
+											<text class="text-[40rpx] font-200">{{item.exchange_info.point}}</text>
+											<text class="text-[32rpx]">积分</text>
+										</view>
+										<block v-if="parseFloat(item.price)">
+											<text class="mx-[4rpx] text-[32rpx]">+</text>
+											<view class="flex items-baseline price-font">
+												<text class="text-[40rpx] font-200">{{ parseFloat(item.price).toFixed(2) }}</text>
+												<text class="text-[32rpx]">元</text>
+											</view>
+										</block>
+                                    </view>
+                                    <view class="font-400 text-[28rpx] text-[#303133]">
+                                        <text>x</text>
+                                        <text>{{ item.num }}</text>
+                                    </view>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+
+                    <!-- 买家留言 -->
+                    <view class="bg-white flex items-center leading-[30rpx]">
+                        <view class="text-[28rpx] w-[150rpx] text-[#303133]">买家留言</view>
+                        <view class="flex-1 text-[#303133]">
+                            <input type="text" v-model="createData.member_remark" class="text-right text-[#333] text-[28rpx]" maxlength="50" placeholder="请输入留言信息给卖家" placeholder-class="text-[var(--text-color-light9)] text-[28rpx]">
+                        </view>
+                        <!-- <text class="nc-iconfont nc-icon-youV6xx text-[26rpx] text-[var(--text-color-light9)]"></text> -->
+                    </view>
+                    <!-- 发票 -->
+                    <view class="flex items-center text-[#303133] leading-[30rpx] mt-[30rpx]" @click="invoiceRef.open()" v-if="invoiceRef && invoiceRef.invoiceOpen">
+                        <view class="text-[28rpx] w-[150rpx] text-[#303133]">发票信息</view>
+                        <view class="flex-1 w-0 text-right truncate">
+                            <text class="text-[28rpx] text-[#333]">{{ createData.invoice.header_name || '不需要发票' }}</text>
+                        </view>
+                        <text class="nc-iconfont nc-icon-youV6xx text-[26rpx] text-[var(--text-color-light9)]"></text>
+                    </view>
+                </view>
+
+                <view class="card-template">
+                    <view class="title">价格明细</view>
+                    <view class="card-template-item">
+                        <view class="text-[28rpx] w-[150rpx] leading-[30rpx] text-[#303133]">商品金额</view>
+                        <view class="flex-1 w-0 text-right  price-font text-[#333] text-[32rpx]">
+							<view class="inline-block">
+								<text class="text-[32rpx] mr-[2rpx]">{{ orderData.basic.point_sum }}</text>
+								<text class="text-[30rpx]">积分</text>
+							</view>
+							<block v-if="orderData.basic && parseFloat(orderData.basic.goods_money)">
+								<text class="text-[28rpx] mx-[4rpx]">+</text>
+								<view class="inline-block">
+									<text class="text-[32rpx] mr-[2rpx]">{{ parseFloat(orderData.basic.goods_money).toFixed(2) }}</text>
+									<text class="text-[30rpx]">元</text>
+								</view>
+							</block>
+                        </view>
+                    </view>
+                    <view class="card-template-item" v-if="orderData.basic.delivery_money">
+                        <view class="text-[26rpx] w-[150rpx] leading-[30rpx] text-[#303133]">配送费用</view>
+                        <view class="flex-1 w-0 text-right price-font text-[#333] text-[32rpx]">
+                            ￥{{ parseFloat(orderData.basic.delivery_money) }}
+                        </view>
+                    </view>
+                    <view class="card-template-item" v-if="orderData.basic.discount_money">
+                        <view class="text-[26rpx] w-[150rpx] leading-[30rpx] text-[#303133]">优惠金额</view>
+                        <view class="flex-1 w-0 text-right text-[var(--price-text-color)] text-[32rpx] price-font leading-[1]">
+                            -￥{{ parseFloat(orderData.basic.discount_money) }}
+                        </view>
+                    </view>
+                </view>
+            </view>
+            <u-tabbar :fixed="true" :placeholder="true" :safeAreaInsetBottom="true">
+                <view class="flex-1 flex items-center justify-between pl-[30rpx] pr-[20rpx]">
+                    <view class="flex items-baseline">
+                        <text class="text-[26rpx] text-[#333] leading-[32rpx]">合计：</text>
+						<text class="text-[var(--price-text-color)] price-font inline-block">
+							<text class="text-[44rpx]">{{ orderData.basic.point_sum }}</text>
+							<text class="text-[38rpx]">积分</text>
+						</text>
+						<block v-if="orderData.basic && parseFloat(orderData.basic.goods_money)">
+							<text class="text-[38rpx] text-[var(--price-text-color)] price-font mx-[4rpx]">+</text>
+							<view class="inline-block">
+								<text class="text-[44rpx] text-[var(--price-text-color)] price-font">{{ parseFloat(orderData.basic.order_money).toFixed(2) }}</text>
+								<text class="text-[38rpx] text-[var(--price-text-color)] price-font">元</text>
+							</view>
+						</block>
+                    </view>
+                    <button class="primary-btn-bg w-[196rpx] h-[70rpx] font-500 text-[26rpx] leading-[70rpx] !text-[#fff] !border-[0] rounded-[100rpx] m-0" hover-class="none" @click="create">提交订单</button>
+                </view>
+            </u-tabbar>
+            <!-- 选择自提点 -->
+            <select-store ref="storeRef" @confirm="confirmSelectStore" />
+            <!-- 发票 -->
+            <invoice ref="invoiceRef" @confirm="confirmInvoice" />
+			<!-- 地址 -->
+			<address-list ref="addressRef" @confirm="confirmAddress" />
+
+            <pay ref="payRef" @close="payClose" />
+        </view>
+    </view>
+</template>
+
+<script setup lang="ts">
+import { ref, watch, nextTick } from 'vue'
+import { orderCreateCalculate, orderCreate } from '@/addon/shop/api/point'
+import { redirect, img, moneyFormat, mobileHide } from '@/utils/common'
+import { onShow } from '@dcloudio/uni-app'
+import selectStore from './../order/components/select-store/select-store'
+import invoice from './../order/components/invoice/invoice'
+import addressList from './components/address-list/address-list'
+import { useSubscribeMessage } from '@/hooks/useSubscribeMessage'
+
+const createData: any = ref({
+    order_key: '',
+    member_remark: '',
+    discount: {},
+    invoice: {},
+    delivery: {
+        delivery_type: ''
+    }
+})
+
+const orderData = ref(null)
+const storeRef = ref()
+const payRef = ref()
+const invoiceRef = ref()
+const createLoading = ref(false)
+const activeIndex = ref(0)//配送方式激活
+const delivery_type_list = ref([])
+const addressRef = ref()
+uni.getStorageSync('orderCreateData') && Object.assign(createData.value, uni.getStorageSync('orderCreateData'))
+
+onShow(() => {
+	setTimeout(() =>{
+        nextTick(()=>{
+            if(storeRef.value){
+                storeRef.value.getData((data:any)=>{
+                    if(data.length){
+                        createData.value.delivery.take_store_id = ((data[0] && data[0].store_id) ? data[0].store_id: 0)
+                    }
+                });
+            }
+        })
+    },1500)
+})
+
+// 选择地址之后跳转回来
+const selectAddress = uni.getStorageSync('selectAddressCallback')
+if (selectAddress) {
+    createData.value.order_key = ''
+    createData.value.delivery.delivery_type = selectAddress.delivery
+    createData.value.delivery.take_address_id = selectAddress.address_id
+    uni.removeStorage({ key: 'selectAddressCallback' })
+}
+
+// 切换配送方式
+const switchDeliveryType = (type: string, index: number) => {
+    if (createData.value.delivery.delivery_type != type) {
+        activeIndex.value = index
+        createData.value.order_key = ''
+        createData.value.delivery.delivery_type = type
+        createData.value.delivery.take_address_id = 0
+        calculate()
+    }
+}
+
+/**
+ * 订单计算
+ */
+const calculate = () => {
+    orderCreateCalculate(createData.value).then(({data}) => {
+        orderData.value = data
+        createData.value.order_key = data.order_key
+        if (orderData.value.delivery.delivery_type_list) {
+            delivery_type_list.value = Object.values(orderData.value.delivery.delivery_type_list)
+        }
+
+        if (selectAddress) activeIndex.value = delivery_type_list.value.findIndex(el => el.key === orderData.value.delivery.delivery_type)
+        !createData.value.delivery.delivery_type && data.delivery.delivery_type && (createData.value.delivery.delivery_type = data.delivery.delivery_type)
+    }).catch()
+}
+calculate()
+
+// 改变配送方式
+watch(
+	() => delivery_type_list.value.length,
+	(newValue, oldValue) => {
+		if(delivery_type_list.value.length && uni.getStorageSync('distributionType')){
+			delivery_type_list.value.forEach((item: any,index: any)=>{
+				if(item.name == uni.getStorageSync('distributionType')){
+					activeIndex.value = index;
+					switchDeliveryType(item.key, index)
+				}
+			})
+			uni.removeStorage({ key: 'distributionType' })
+		}
+	}
+)
+
+let orderId = 0
+/**
+ * 订单创建
+ */
+const create = () => {
+    if (!verify() || createLoading.value) return
+    createLoading.value = true
+
+    useSubscribeMessage().request('shop_order_pay,shop_order_delivery')
+
+    orderCreate(createData.value).then(({ data }) => {
+        orderId = data.order_id
+        if (orderData.value.basic.order_money == 0) {
+            redirect({ url: '/addon/shop/pages/order/detail', param: { order_id: orderId }, mode: 'redirectTo' })
+        } else {
+            payRef.value?.open(data.trade_type, data.order_id, `/addon/shop/pages/order/detail?order_id=${ data.order_id }`)
+        }
+    }).catch(() => {
+        createLoading.value = false
+    })
+}
+
+/**
+ * 下单校验
+ */
+const verify = () => {
+    const data = createData.value
+    let verify = true
+
+    if (orderData.value.basic.has_goods_types.includes('real')) {
+        if (['express', 'local_delivery'].includes(data.delivery.delivery_type) && !orderData.value.delivery.take_address) {
+            uni.showToast({ title: '请选择收货地址', icon: 'none' })
+            return false
+        }
+
+        if (data.delivery.delivery_type == 'store' && !data.delivery.take_store_id) {
+            uni.showToast({ title: '请选择自提点', icon: 'none' })
+            return false
+        }
+    }
+
+    return verify
+}
+
+/**
+ * 支付弹窗关闭
+ */
+const payClose = () => {
+    redirect({ url: '/addon/shop/pages/order/detail', param: { order_id: orderId }, mode: 'redirectTo' })
+}
+
+/**
+ * 选择地址
+ */
+const toSelectAddress = () => {
+	let data: any = {};
+	data.delivery = createData.value.delivery.delivery_type;
+	data.type = createData.value.delivery.delivery_type == 'local_delivery' ? 'location_address' : 'address';
+	data.id = orderData.value.delivery.take_address.id;
+	addressRef.value.open(data);
+}
+
+/**
+ * 选择自提点
+ */
+const confirmSelectStore = (store: any) => {
+    createData.value.delivery.take_store_id = ((store && store.store_id) ? store.store_id: 0)
+    calculate()
+}
+
+const confirmInvoice = (invoice: object) => {
+    createData.value.invoice = invoice
+}
+
+const confirmAddress = (data:object) => {
+	createData.value.order_key = ''
+	createData.value.delivery.delivery_type = data.delivery
+	createData.value.delivery.take_address_id = data.address_id
+	calculate();
+}
+</script>
+
+<style lang="scss" scoped>
+.head-tab{
+	.head-tab-item{
+		.tab-image{
+            left: 50%;
+			transform: translateX(-50%);
+		}
+		&:nth-child(1).active{
+			view{
+				padding-right: 40rpx;
+			}
+		}
+		&:nth-child(2){
+			.tab-image{
+				width: 312rpx;
+			}
+		}
+		&:nth-child(3).active{
+			view{
+				padding-left: 30rpx;
+			}
+		}
+		&.active{
+			view{
+                font-weight: bold;
+				color: var(--primary-color);
+			}
+		}
+        .tab-img{
+            left: 50%;
+			transform: translateX(-50%);
+        }
+
+	}
+}
+
+:deep(.u-alert) {
+    padding: 6rpx 16rpx !important;
+    display: inline-block !important;
+}
+.alert-wrap{
+    display: inline-block !important;
+    :deep(.u-fade-enter-active){
+        display: inline-block !important;
+    }
+}
+
+.text-ellipsis {
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+    overflow: hidden;
+}
+.line-normal{
+    line-height: normal;
+}
+.payment-bottom{
+	padding-bottom: calc(20rpx + constant(safe-area-inset-bottom));
+	padding-bottom: calc(20rpx + env(safe-area-inset-bottom));
+}
+</style>
diff --git a/uni-app/src/addon/shop/pages/refund/apply.vue b/uni-app/src/addon/shop/pages/refund/apply.vue
new file mode 100644
index 00000000..871a5251
--- /dev/null
+++ b/uni-app/src/addon/shop/pages/refund/apply.vue
@@ -0,0 +1,285 @@
+<template>
+    <view :style="themeColor()">
+        <swiper :indicator-dots="false" :autoplay="false" :disable-touch="true" :current="step" class="h-screen" :duration="300" v-if="detail">
+            <swiper-item>
+                <scroll-view scroll-y="true" class="bg-page min-h-screen overflow-hidden">
+                    <view class="m-[var(--top-m)] sidebar-margin px-[var(--pad-sidebar-m)] py-[var(--pad-top-m)] rounded-[var(--rounded-big)] bg-white">
+                        <view class="flex">
+                            <view class="w-[120rpx] h-[120rpx] flex items-center justify-center">
+                            	<u--image :radius="'var(--goods-rounded-small)'" width="120rpx" height="120rpx" :src="img(orderDetail.sku_image.split(',')[0])" model="aspectFill">
+                            	    <template #error>
+                            	        <image class="w-[120rpx] h-[120rpx] rounded-[var(--goods-rounded-small)] overflow-hidden" :src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill"></image>
+                            	    </template>
+                            	</u--image>
+                            </view>
+                            <view class="flex-1 w-0 ml-[20rpx]">
+								<view class="text-ellipsis text-[28rpx] leading-normal truncate">{{orderDetail.goods_name}}</view>
+								<view v-if="orderDetail.sku_name" class="mt-[6rpx] text-[24rpx] leading-[1.3] text-[var(--text-color-light9)] truncate">{{ orderDetail.sku_name }}</view>
+                            </view>
+                        </view>
+                    </view>
+
+                    <view class="my-[var(--top-m)] sidebar-margin px-[var(--pad-sidebar-m)] rounded-[var(--rounded-big)] bg-white">
+                        <view class="py-[var(--pad-top-m)] flex items-center" @click="selectRefundType(1)">
+                            <view class="flex-1">
+                                <view class="text-[30rpx]">仅退款</view>
+                                <view class="text-[24rpx] mt-[20rpx] text-[var(--text-color-light9)]" v-if="orderDetail.goods_type == 'real'">未收到货，或与商家协商一致不用退货只退款</view>
+                                <view class="text-[24rpx] mt-[20rpx] text-[var(--text-color-light9)]" v-else-if="orderDetail.goods_type == 'virtual'">与商家协商一致不用退货只退款</view>
+                            </view>
+                            <text class="nc-iconfont nc-icon-youV6xx text-[28rpx] text-[var(--text-color-light9)]"></text>
+                        </view>
+						
+                        <view class="py-[var(--pad-top-m)] flex items-center border-0 !border-t !border-[#f5f5f5] border-solid" v-if="orderDetail.goods_type == 'real' && (!orderDetail.delivery_status || orderDetail.delivery_status != 'wait_delivery')" @click="selectRefundType(2)">
+                            <view class="flex-1">
+                                <view class="text-[30rpx]">退货退款</view>
+                                <view class="text-[24rpx] mt-[20rpx] text-[var(--text-color-light9)]">已收到货，需退还收到的货物</view>
+                            </view>
+                            <text class="nc-iconfont nc-icon-youV6xx text-[28rpx] text-[var(--text-color-light9)]"></text>
+                        </view>
+                    </view>
+                </scroll-view>
+            </swiper-item>
+            <swiper-item>
+				<scroll-view scroll-y="true" class="bg-page min-h-screen overflow-hidden">
+                    <view class="my-[var(--top-m)] sidebar-margin px-[var(--pad-sidebar-m)] rounded-[var(--rounded-big)] bg-white">
+                        <view class="py-[var(--pad-top-m)] flex justify-between items-center">
+                            <view class="text-[28rpx]">退款原因</view>
+                            <view class="flex ml-[auto] items-center h-[30rpx]" @click="refundCausePopup = true">
+								<text class="text-[26rpx] text-[var(--text-color-light9)] truncate max-w-[460rpx]">{{ formData.reason || '请选择' }}</text>
+                                <text class="nc-iconfont nc-icon-youV6xx pt-[4rpx] text-[24rpx] text-[var(--text-color-light9)]"></text>
+                            </view>
+                        </view>
+                    </view>
+                    <view class="my-[var(--top-m)] sidebar-margin px-[var(--pad-sidebar-m)] rounded-[var(--rounded-big)] bg-white">
+                        <view class="py-[var(--pad-top-m)]">
+							<view class="flex items-center justify-between">
+								<view class="text-[28rpx] font-500">退款金额</view>
+								<view class="flex justify-end items-center text-[var(--price-text-color)] price-font">
+								    <text class="font-500 text-[36rpx] leading-none">￥</text>
+								    <!-- <input type="digit" v-model.number="formData.apply_money" class="font-500 text-[36rpx] leading-none" :style="{ width: inputWidth(formData.apply_money) }" @blur="handleInput"> -->
+								    <text class="font-500 text-[36rpx] leading-none">{{ formData.apply_money }}</text>
+								</view>
+							</view>
+							<view class="text-right text-[24rpx] text-[var(--text-color-light9)] mt-[10rpx]">
+								<!-- <text>最多可退￥{{ refundMoney.refund_money }}</text> -->
+								<text v-if="refundMoney.is_refund_delivery === 1 && Number(refundMoney.refund_delivery_money) > 0" class="ml-[10rpx]">(包含运费￥{{ refundMoney.refund_delivery_money }})</text>
+							</view>
+                        </view>
+                    </view>
+                    <view class="my-[var(--top-m)] sidebar-margin px-[var(--pad-sidebar-m)] rounded-[var(--rounded-big)] bg-white">
+                        <view class="pt-[var(--pad-top-m)] pb-[14rpx] ">
+                            <view class="text-[28rpx] flex items-center">
+								<text class="font-500">上传凭证</text>
+								<text class="text-[24rpx] text-[var(--text-color-light9)] ml-[10rpx]">选填</text>
+							</view>
+                            <view class="mt-[30rpx]">
+                                <u-upload :fileList="voucherListPreview" @afterRead="afterRead" @delete="deletePic" multiple :maxCount="9"/>
+                            </view>
+                        </view>
+                    </view>
+                    <view class="my-[var(--top-m)] sidebar-margin px-[var(--pad-sidebar-m)] rounded-[var(--rounded-big)] bg-white">
+                        <view class="py-[var(--pad-top-m)]">
+                            <view class="text-[28rpx] flex items-center">
+								<text class="font-500">补充描述</text>
+								<text class="text-[24rpx] text-[var(--text-color-light9)] ml-[10rpx]">选填</text>
+							</view>
+                            <view class="mt-[30rpx] h-[200rpx]">
+                                <textarea class="leading-[1.5] h-[100%] w-[100%] text-[28rpx]" v-model="formData.remark" cols="30" rows="5" placeholder="补充描述,有助于更好的处理售后问题" placeholder-class="text-[26rpx] text-[var(--text-color-light9)]"></textarea>
+                            </view>
+                        </view>
+                    </view>
+                    <view class="w-full">
+						<view class="py-[var(--top-m)] px-[var(--sidebar-m)] box-border">
+							<button class="primary-btn-bg !text-[#fff] h-[80rpx] leading-[80rpx] rounded-[100rpx] text-[26rpx] font-500" :loading="operateLoading" @click="save">提交</button>
+						</view>
+                    </view>
+
+                    <!-- 退款原因 -->
+                    <u-popup :show="refundCausePopup" @close="refundCausePopup = false">
+                        <view class="popup-common" @touchmove.prevent.stop>
+							<view class="title">退款原因</view>
+                            <scroll-view scroll-y="true" class="h-[450rpx] px-[30rpx] box-border">
+                                <u-radio-group v-model="currReasonName" placement="column" iconPlacement="right">
+                                    <u-radio activeColor="var(--primary-color)" :labelSize="'30rpx'" labelColor="#333" :customStyle="{marginBottom: '34rpx'}" v-for="(item, index) in reason" :key="index" :label="item" :name="item"></u-radio>
+                                </u-radio-group>
+                            </scroll-view>
+							<view class="btn-wrap">
+								<button class="primary-btn-bg btn" @click="refundCausePopupFn">确定</button>
+							</view>
+                        </view>
+                    </u-popup>
+                </scroll-view>
+            </swiper-item>
+        </swiper>
+    </view>
+</template>
+
+<script setup lang="ts">
+    import { ref, computed } from 'vue'
+    import { onLoad } from '@dcloudio/uni-app'
+    import { redirect, img, moneyFormat, goback } from '@/utils/common'
+    import { t } from '@/locale'
+    import { getShopOrderDetail } from '@/addon/shop/api/order'
+    import { getRefundReason, applyRefund,getRefundMoney } from '@/addon/shop/api/refund'
+    import { uploadImage } from '@/app/api/system'
+    import {useSubscribeMessage} from "@/hooks/useSubscribeMessage";
+
+    const detail = ref(null)
+	const orderDetail = ref({})
+    const orderGoodsId = ref(0)
+    const step = ref(0)
+	const refundCausePopup = ref(false)
+    const formData = ref({
+        order_id: detail.value?.order_id,
+        order_goods_id: orderGoodsId.value,
+        refund_type: '',
+        apply_money: '',
+        reason: '',
+        remark: '',
+        voucher: []
+    })
+    const refundMoney = ref<any>({})
+    const reason = ref<string[]>([])
+    const currReasonName = ref('')
+
+    getRefundReason().then(({ data }) => {
+        reason.value = data
+		if(reason.value && reason.value.length) currReasonName.value = reason.value[0];
+    })
+
+    onLoad((data) => {
+        orderGoodsId.value = data.order_goods_id || 0
+        formData.value.order_goods_id = orderGoodsId.value
+        formData.value.order_id = data.order_id || 0
+        if(data.order_id && data.order_goods_id){
+            getShopOrderDetail(data.order_id).then(({ data }) => {
+                detail.value = data
+                detail.value.order_goods.forEach((item,index)=>{
+                    if(orderGoodsId.value == item.order_goods_id){
+                        orderDetail.value = item;
+                    }
+                })
+                formData.value.apply_money = moneyFormat(refundMoney.value.refund_money)
+            })
+
+            // 获取可退款金额
+            getRefundMoney({order_goods_id: data.order_goods_id}).then(res =>{
+                refundMoney.value = res.data
+            })
+        }else{
+            let parameter = {
+				url:'/addon/shop/pages/order/list',
+				title: '缺少订单id'
+			};
+            goback(parameter);
+        }
+        
+    })
+
+    const inputWidth = computed((value) => {
+        return function (value) {
+            if (value == '' || value == 0) {
+                return '70rpx';
+            } else {
+                return String(value).length * 17 + 'rpx';
+            }
+        };
+    })
+
+    const selectRefundType = (type : number) => {
+        formData.value.refund_type = type
+        step.value = 1
+    }
+
+    const voucherListPreview = computed(() => {
+        return formData.value.voucher.map(item => {
+            return {url: img(item)}
+        })
+    })
+
+    const afterRead = (event: any) => {
+        event.file.forEach(item => {
+            uploadImage({
+                filePath: item.url,
+                name: 'file'
+            }).then(res => {
+                if (formData.value.voucher.length < 9 ) {
+                    formData.value.voucher.push(res.data.url)
+                }
+            })
+        })
+    }
+
+    const deletePic = (event: any)=> {
+        formData.value.voucher.splice(event.index, 1)
+    }
+
+    const operateLoading = ref(false)
+    const save = ()=> {
+
+		if(!formData.value.reason){
+			uni.showToast({
+				title: '请选择退款原因',
+				icon: 'none'
+			});
+			return false;
+		}
+
+		if((Number(formData.value.apply_money).toFixed(2)) < 0 ){
+            uni.showToast({
+                title: '退款金额不能为0,保留两位小数',
+                icon: 'none'
+            });
+            return false;
+		}
+
+		if(Number(formData.value.apply_money)>Number(refundMoney.value.refund_money)) {
+            uni.showToast({
+                title: '退款金额不能大于可退款总额',
+                icon: 'none'
+            });
+            return false;
+        }
+
+		if (operateLoading.value) return
+		operateLoading.value = true
+
+        useSubscribeMessage().request('shop_refund_agree,shop_refund_refuse')
+
+        applyRefund(formData.value).then((res) => {
+            operateLoading.value = false
+            setTimeout(()=> {
+                redirect({ url: '/addon/shop/pages/order/detail', param: { order_id: formData.value.order_id } })
+            }, 1000)
+        }).catch(() => {
+            operateLoading.value = false
+        })
+    }
+
+	const refundCausePopupFn = ()=>{
+		formData.value.reason = currReasonName.value;
+		refundCausePopup.value = false;
+	}
+
+    const handleInput = (event:any) =>{
+       if(Number(event.detail.value) > Number(refundMoney.value.refund_money)){
+            uni.showToast({
+				title: '退款金额不能大于可退款总额',
+				icon: 'none'
+			});
+       }
+    }
+</script>
+<style lang="scss" scoped>
+    :deep(.u-upload__button) {
+        width: 70px !important;
+        height: 70px !important;
+        border: 1px dashed #ddd;
+		background-color: #fff;
+		border-radius: 20rpx !important;
+    }
+    :deep(.u-upload__wrap__preview__image) {
+        width: 70px!important;
+        height: 70px!important;
+    }
+</style>
diff --git a/uni-app/src/addon/shop/pages/refund/detail.vue b/uni-app/src/addon/shop/pages/refund/detail.vue
new file mode 100644
index 00000000..d828f2a0
--- /dev/null
+++ b/uni-app/src/addon/shop/pages/refund/detail.vue
@@ -0,0 +1,371 @@
+<template>
+    <view :style="themeColor()">
+        <view class="bg-[var(--page-bg-color)] min-h-screen overflow-hidden" v-if="!loading">
+            <view class="pb-[200rpx]" v-if="type != 'logistics'">
+                <view class="bg-linear">
+                    <!-- #ifdef MP-WEIXIN -->
+                    <top-tabbar :data="topTabbarData" :scrollBool="topTabarObj.getScrollBool()" />
+                    <!-- #endif -->
+                    <view v-if="detail.status_name" class="flex justify-between items-center pl-[40rpx] pr-[50rpx]  h-[280rpx] box-border pb-[90rpx]">
+                        <view class="text-[36rpx] font-500 leading-[42rpx] text-[#fff]">{{ detail.status_name }}</view>
+                        <view class="flex items-center">
+                            <image v-if="['1','2','4','6','7'].indexOf(detail.status) != -1" class="w-[180rpx] h-[140rpx]" :src="img('addon/shop/detail/payment.png')" mode="aspectFit"/>
+                            <image v-if="['8'].indexOf(detail.status) != -1" class="w-[180rpx] h-[140rpx]" :src="img('addon/shop/detail/complete.png')" mode="aspectFit" />
+                            <image v-if="['3','5','-1'].indexOf(detail.status) != -1" class="w-[180rpx] h-[140rpx]" :src="img('addon/shop/detail/close.png')" mode="aspectFit" />
+                        </view>
+                    </view>
+                </view>
+                <view class="sidebar-margin card-template flex justify-between flex-wrap mt-[-76rpx]">
+                    <view class="w-[150rpx] h-[150rpx] rounded-[var(--goods-rounded-big)] overflow-hidden" @click="goodsEvent(detail.order_goods.goods_id)">
+                        <u--image radius="var(--goods-rounded-big)" width="150rpx" height="150rpx" :src="img(detail.order_goods.goods_image_thumb_small ? detail.order_goods.goods_image_thumb_small : '')" model="aspectFill">
+                            <template #error>
+                                <image class="w-[150rpx] h-[150rpx] rounded-[var(--goods-rounded-big)] overflow-hidden" :src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill"></image>
+                            </template>
+                        </u--image>
+                    </view>
+                    <view class="ml-[20rpx] flex flex-1 flex-col justify-between">
+                        <view>
+                            <view class="text-[28rpx] max-w-[490rpx] truncate leading-[40rpx]">{{ detail.order_goods.goods_name }}</view>
+							<view class="text-[22rpx] mt-[10rpx] text-[var(--text-color-light9)] truncate max-w-[490rpx] leading-[28rpx]"  v-if="detail.order_goods.sku_name">{{ detail.order_goods.sku_name }}</view>
+                        </view>
+                        <view class="flex justify-between items-center leading-[28rpx] ">
+                            <view class="price-font">
+                                <text class="text-[24rpx]">￥</text>
+                                <text class="text-[40rpx] font-500">{{ parseFloat(detail.order_goods.price).toFixed(2).split('.')[0] }}</text>
+                                <text class="text-[24rpx] font-500">.{{ parseFloat(detail.order_goods.price).toFixed(2).split('.')[1] }}</text>
+                            </view>
+                            <text class="text-right text-[26rpx]">x{{ detail.order_goods.num }}</text>
+                        </view>
+                    </view>
+                </view>
+                <view class="sidebar-margin mt-[var(--top-m)] card-template">
+					<view class="justify-between text-[28rpx] card-template-item">
+					    <view>{{t('refundMoney')}}</view>
+						<view class="price-font text-[var(--price-text-color)]">
+							<text class="text-[24rpx] mr-[4rpx]">￥</text>
+							<text class="text-[28rpx]" v-if="detail.status == 8">{{ parseFloat(detail.money).toFixed(2) }}</text>
+                            <text class="text-[28rpx]" v-else>{{ parseFloat(detail.apply_money).toFixed(2) }}</text>
+						</view>
+					</view>
+                    <view class="justify-between text-[28rpx] card-template-item">
+                        <view>{{t('refundType')}}</view>
+                        <view>{{ detail.refund_type_name }}</view>
+                    </view>
+                    <view class="justify-between text-[28rpx] card-template-item">
+                        <view>{{t('refundCause')}}</view>
+                        <view class="w-[400rpx] multi-hidden text-right">{{ detail.reason || '--' }}</view>
+                    </view>
+                    <view class="justify-between text-[28rpx] card-template-item">
+                        <view>{{t('refundNo')}}</view>
+                        <view>{{ detail.order_refund_no }}</view>
+                    </view>
+                    <view class="justify-between text-[28rpx] card-template-item">
+                        <view>{{t('createTime')}}</view>
+                        <view>{{ detail.create_time }}</view>
+                    </view>
+                    <view class="justify-between text-[28rpx] card-template-item !items-baseline">
+                        <view>{{t('createExplain')}}</view>
+                        <view class="flex-1 ml-[60rpx] text-right leading-[1.5] flex justify-end break-all">{{ detail.remark }}</view>
+                    </view>
+                    <view class="justify-between text-[28rpx] card-template-item !items-baseline break-all" v-if="detail.shop_reason">
+                        <view>{{t('reasonRefusal')}}</view>
+                        <view class="flex-1 ml-[60rpx] leading-[1.5] text-right text-[#333]">{{ detail.shop_reason }}</view>
+                    </view>
+                </view>
+
+                <view class="sidebar-margin mt-[var(--top-m)] card-template">
+                    <view class="justify-between text-[28rpx] card-template-item">
+                        <view>{{t('record')}}</view>
+                        <view class="flex items-center" @click="redirect({url: '/addon/shop/pages/refund/log', param: { order_refund_no: orderRefundNo }})">
+                            <text class="text-[26rpx] text-[var(--text-color-light9)]">{{t('check')}}</text>
+                            <text class="nc-iconfont nc-icon-youV6xx text-[24rpx] text-[var(--text-color-light9)] pt-[2rpx]"></text>
+                        </view>
+                    </view>
+                </view>
+
+                <view class="flex tab-bar justify-between items-center bg-[#fff] fixed left-0 right-0 bottom-0 min-h-[100rpx] pl-[30rpx] pr-[20rpx] flex-wrap">
+                    <view class="flex">
+						<view class="flex mr-[20rpx] flex-col justify-center items-center" @click="redirect({ url: '/addon/shop/pages/index', mode: 'reLaunch' })">
+						    <view class="nc-iconfont nc-icon-shouyeV6xx11 text-[36rpx]"></view>
+						    <text class="text-[20rpx] mt-[10rpx]">{{t('index')}}</text>
+						</view>
+						<!-- #ifdef MP-WEIXIN -->
+						<view>
+							<nc-contact
+									:send-message-title="sendMessageTitle"
+									:send-message-path="sendMessagePath"
+									:send-message-img="sendMessageImg">
+								<view class="flex flex-col justify-center items-center">
+									<text class="nc-iconfont nc-icon-kefuV6xx-1 text-[36rpx]"></text>
+									<text class="text-[20rpx] mt-[10rpx]">客服</text>
+								</view>
+							</nc-contact>
+						</view>
+						<!-- #endif -->
+					</view>
+
+                    <view class="flex justify-end">
+                        <view class="min-w-[180rpx] box-border text-[26rpx] h-[70rpx] flex-center border-[2rpx] border-solid border-[#ccc] text-[#333] rounded-full ml-[20rpx]" @click="refundBtnFn('cancel')" v-if="['6','7','8','-1'].indexOf(detail.status) == -1">{{t('refundApply')}}</view>
+                        <view v-if="['3'].indexOf(detail.status) != -1" class="min-w-[180rpx] box-border text-[#333] text-[26rpx] h-[70rpx] flex-center border-[2rpx] border-solid border-[#ccc] rounded-full ml-[20rpx] px-[20rpx]" @click.stop="refundBtnFn('edit')" >编辑退款信息</view>
+                        <view v-if="['2'].indexOf(detail.status) != -1" class="min-w-[180rpx] box-border text-[#333] text-[26rpx] h-[70rpx] flex-center border-[2rpx] border-solid border-[#ccc] rounded-full ml-[20rpx] px-[20rpx]" @click.stop="refundBtnFn('logistics')">填写发货物流</view>
+                        <view v-if="['5'].indexOf(detail.status) != -1" class="min-w-[180rpx] box-border text-[#333] text-[26rpx] h-[70rpx] flex-center border-[2rpx] border-solid border-[#ccc] rounded-full ml-[20rpx] px-[20rpx]" @click.stop="refundBtnFn('editLogistics')">编辑发货物流</view>
+                    </view>
+                </view>
+            </view>
+            <view v-else>
+                <view class="bg-linear">
+                    <!-- #ifdef MP-WEIXIN -->
+                    <top-tabbar :data="topTabbarData" :scrollBool="topTabarObj.getScrollBool()" />
+                    <!-- #endif -->
+                    <view class="flex justify-between items-center pl-[40rpx] pr-[50rpx]  h-[280rpx] box-border pb-[90rpx]">
+                        <view class="text-[36rpx] font-500 leading-[42rpx] text-[#fff]">{{ detail.status_name }}</view>
+                        <view class="flex items-center">
+                            <image class="w-[180rpx] h-[140rpx]" :src="img('addon/shop/detail/payment.png')" mode="aspectFit"/>
+                        </view>
+                    </view>
+                </view>
+                <view class="sidebar-margin card-template mt-[-79rpx] flex justify-between flex-wrap">
+                    <view class="w-[150rpx] h-[150rpx] flex-2" @click="goodsEvent(detail.order_goods.goods_id)">
+                        <u--image  radius="var(--goods-rounded-big)" width="150rpx" height="150rpx" :src="img(detail.order_goods.sku_image ? detail.order_goods.sku_image.split(',')[0] : '')" model="aspectFill">
+                            <template #error>
+                                <image class="w-[150rpx] h-[150rpx] rounded-[var(--goods-rounded-big)] overflow-hidden" :src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill"></image>
+                            </template>
+                        </u--image>
+                    </view>
+                    <view class="ml-[20rpx] flex flex-1 flex-col justify-between">
+                        <view>
+                            <view class="text-[28rpx] max-w-[490rpx] truncate leading-[40rpx]">{{ detail.order_goods.goods_name }}</view>
+                            <view class="text-[24rpx] mt-[14rpx] text-[var(--text-color-light9)] truncate max-w-[490rpx] leading-[28rpx]" v-if="detail.order_goods.sku_name">
+                                {{ detail.order_goods.sku_name }}
+                            </view>
+                        </view>
+                        <view class="flex justify-between items-center leading-[28rpx]">
+                            <view class="price-font">
+                                <text class="text-[24rpx] font-500">￥</text>
+                                <text class="text-[40rpx] font-500">{{ parseFloat(detail.order_goods.price).toFixed(2).split('.')[0] }}</text>
+                                <text class="text-[24rpx] font-500">.{{ parseFloat(detail.order_goods.price).toFixed(2).split('.')[1] }}</text>
+                            </view>
+                            <text class="text-right text-[26rpx]">x{{ detail.order_goods.num }}</text>
+                        </view>
+                    </view>
+                </view>
+                <view class="sidebar-margin card-template top-mar">
+                    <view class="card-template-item justify-between text-[28rpx]">
+                        <view>联系人</view>
+                        <view>{{ detail.refund_address.contact_name }}</view>
+                    </view>
+                    <view class="card-template-item justify-between text-[28rpx]">
+                        <view>手机号</view>
+                        <view>{{ detail.refund_address.mobile }}</view>
+                    </view>
+                    <view class="card-template-item justify-between text-[28rpx]">
+                        <view>退货地址</view>
+                        <view class="w-[460rpx] text-sm text-right" v-if="detail.refund_address">{{ detail.refund_address.full_address || '--' }}</view>
+                    </view>
+                </view>
+                <view class="sidebar-margin card-template top-mar py-[var(--top-m)] mb-[var(--top-m)]">
+					<view class="title">物流信息</view>
+                    <u--form labelPosition="left" :model="formData" :rules="rules"  errorType='toast' ref="deliveryForm" labelWidth="140rpx" :labelStyle="{'fontSize': '28rpx'}">
+                        <u-form-item label="物流公司" prop="express_company" :borderBottom="false">
+                            <u--input border="none" v-model="formData.express_company" placeholder="请输入物流公司" placeholderClass="text-sm !text-[var(--text-color-light9)]" fontSize="28rpx" maxlength="50"></u--input>
+                        </u-form-item>
+						<view class="mt-[16rpx]">
+							<u-form-item label="物流单号" prop="express_number" :borderBottom="false">
+								<u--input border="none" placeholder="请输入物流单号" v-model="formData.express_number" placeholderClass="text-sm !text-[var(--text-color-light9)]" fontSize="28rpx" maxlength="100"></u--input>
+							</u-form-item>
+						</view>
+						<view class="mt-[16rpx]">
+							<u-form-item label="物流说明" :borderBottom="false">
+								<u--input border="none" placeholder="选填" v-model="formData.remark" placeholderClass="text-sm !text-[var(--text-color-light9)]" fontSize="28rpx" maxlength="100"></u--input>
+							</u-form-item>
+						</view>
+                    </u--form>
+                </view>
+                <u-tabbar :fixed="true" :placeholder="true" :safeAreaInsetBottom="true" zIndex="10">
+                    <view class="flex-1 pl-[var(--sidebar-m)] pr-[var(--sidebar-m)] bg-[var(--page-bg-color)]">
+                        <button class=" primary-btn-bg text-[#fff] h-[80rpx] leading-[80rpx] rounded-[100rpx] text-[26rpx] font-500"   hover-class="none" @click="deliverySave">提交</button>
+                    </view>
+                </u-tabbar>
+				
+            </view>
+            <logistics-tracking ref="materialRef"></logistics-tracking>
+            <u-modal :show="cancelRefundShow" confirmColor="var(--primary-color)" :content="t('cancelRefundContent')" :showCancelButton="true" :closeOnClickOverlay="true" @cancel="refundCancel" @confirm="refundConfirm"></u-modal>
+        </view>
+
+		<loading-page :loading="loading"></loading-page>
+
+        <!-- #ifdef MP-WEIXIN -->
+        <!-- 小程序隐私协议 -->
+        <wx-privacy-popup ref="wxPrivacyPopupRef"></wx-privacy-popup>
+        <!-- #endif -->
+    </view>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive, computed, nextTick } from 'vue';
+import { onLoad } from '@dcloudio/uni-app'
+import { t } from '@/locale'
+import { img, redirect, copy, goback } from '@/utils/common';
+import { topTabar } from '@/utils/topTabbar'
+import { getRefundDetail, refundDelivery, editRefundDelivery, closeRefund } from '@/addon/shop/api/refund';
+import logisticsTracking from '@/addon/shop/pages/order/components/logistics-tracking/logistics-tracking.vue'
+
+/********* 自定义头部 - start ***********/
+const topTabarObj = topTabar()
+let topTabbarData = topTabarObj.setTopTabbarParam({title:'退款详情'})
+/********* 自定义头部 - end ***********/
+
+const detail = ref<Object>({});
+const loading = ref<boolean>(true);
+const orderRefundNo = ref('');
+const type = ref('');
+const isEditDelivery = ref(false);
+
+const sendMessageTitle = ref('')
+const sendMessagePath = ref('')
+const sendMessageImg = ref('')
+// 物流信息
+const formData = ref({
+	express_number: '',
+	express_company: '',
+	remark: ''
+})
+
+// 物流验证
+const rules = computed(() => {
+	return {
+		'express_number': {
+			type: 'string',
+			required: true,
+			message: '请输入物流单号',
+			trigger: ['blur', 'change']
+		},
+		'express_company': {
+			type: 'string',
+			required: true,
+			message: '请输入物流公司',
+			trigger: ['blur', 'change']
+		},
+	}
+})
+
+const wxPrivacyPopupRef:any = ref(null)
+
+onLoad((option: any) => {
+    orderRefundNo.value = option.order_refund_no;
+    if(orderRefundNo.value){
+        type.value = option.type;
+        isEditDelivery.value = option.is_edit_delivery;
+
+        refundDetailFn(orderRefundNo.value);
+        // #ifdef MP
+        nextTick(()=>{
+            if(wxPrivacyPopupRef.value) wxPrivacyPopupRef.value.proactive();
+        })
+        // #endif
+    }else{
+        let parameter = {
+            url:'/addon/shop/pages/refund/list',
+            title: '缺少订单号'
+        };
+        goback(parameter);
+    }
+});
+
+const refundDetailFn = (refundNo: any) => {
+	loading.value = true;
+	getRefundDetail(refundNo).then((res: any) => {
+		detail.value = res.data;
+		// 赋值物流信息
+		if(isEditDelivery.value && detail.value.delivery){
+			formData.value.express_number = detail.value.delivery.express_number
+			formData.value.express_company = detail.value.delivery.express_company
+			formData.value.remark = detail.value.delivery.remark
+		}
+
+		sendMessageTitle.value = detail.value.order_goods.goods_name
+		sendMessageImg.value = img(detail.value.order_goods.goods_image_thumb_small || '')
+		loading.value = false;
+	}).catch(() => {
+		loading.value = false;
+	})
+}
+
+const goodsEvent = (id: number) => {
+	redirect({
+		url: '/addon/shop/pages/goods/detail',
+		param: {
+			goods_id: id
+		}
+	})
+}
+
+// 提交物流信息
+const deliveryForm = ref()
+const deliverySave = ()=>{
+	deliveryForm.value.validate().then(res => {
+		let obj = {delivery: formData.value,order_refund_no: detail.value.order_refund_no}
+		let api = isEditDelivery.value ? editRefundDelivery(obj) : refundDelivery(obj);
+		api.then((res) => {
+			setTimeout(()=>{
+				redirect({ url: '/addon/shop/pages/refund/list' })
+			},500)
+		}).catch(() => {
+		})
+	})
+}
+
+const refundBtnFn = (type:any) => {
+    if(type == 'cancel'){
+        currRefundOn = detail.value.order_refund_no;
+        cancelRefundShow.value = true;
+    }else if(type == 'edit'){
+        redirect({ url: '/addon/shop/pages/refund/edit_apply', param: { order_refund_no : detail.value.order_refund_no } })
+    }else if(type == 'logistics'){
+        redirect({ url: '/addon/shop/pages/refund/detail', param: { order_refund_no : detail.value.order_refund_no, type: 'logistics' } })
+    }else if(type == 'editLogistics'){
+        redirect({ url: '/addon/shop/pages/refund/detail', param: { order_refund_no : detail.value.order_refund_no, type: 'logistics', is_edit_delivery: true } })
+    }
+}
+
+// 撤销维权
+const cancelRefundShow = ref(false);
+let currRefundOn = "";
+
+const refundConfirm = ()=>{
+    closeRefund(currRefundOn).then((res) => {
+        cancelRefundShow.value = false;
+        refundDetailFn(orderRefundNo.value);
+    }).catch(() => {
+        cancelRefundShow.value = false;
+    })
+}
+
+const refundCancel = ()=>{
+    cancelRefundShow.value = false;
+}
+
+</script>
+<style lang="scss" scoped>
+.text-item {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	display: -webkit-box;
+	-webkit-line-clamp: 2;
+	-webkit-box-orient: vertical;
+}
+
+.bg-linear {
+	background: linear-gradient( 94deg, #F84949 8%, #FF9A68 99%);
+}
+:deep(.u-form-item__body__left__content__label){
+		height: 40rpx !important;
+}
+:deep(.u-form-item__body){
+	padding: 0 !important;
+	height: 40rpx !important;
+}
+:deep(.u-form-item){
+	margin-bottom: 34rpx;
+}
+</style>
diff --git a/uni-app/src/addon/shop/pages/refund/edit_apply.vue b/uni-app/src/addon/shop/pages/refund/edit_apply.vue
new file mode 100644
index 00000000..de90bc6d
--- /dev/null
+++ b/uni-app/src/addon/shop/pages/refund/edit_apply.vue
@@ -0,0 +1,272 @@
+<template>
+    <view :style="themeColor()">
+        <swiper :indicator-dots="false" :autoplay="false" :disable-touch="true" :current="step" class="h-screen" :duration="300" v-if="detail">
+            <swiper-item>
+                <scroll-view scroll-y="true" class="bg-page min-h-screen overflow-hidden">
+                    <view class="m-[var(--top-m)] sidebar-margin px-[var(--pad-sidebar-m)] py-[var(--pad-top-m)] rounded-[var(--rounded-big)] bg-white">
+                        <view class="flex">
+                            <u--image :radius="'var(--goods-rounded-small)'" width="120rpx" height="120rpx" :src="img(orderDetail.sku_image.split(',')[0])" model="aspectFill">
+                                <template #error>
+                                    <image class="w-[120rpx] h-[120rpx]" :radius="'var(--goods-rounded-small)'" :src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill"></image>
+                                </template>
+                            </u--image>
+                            <view class="flex-1 w-0 ml-[20rpx]">
+								<view class="text-ellipsis text-[28rpx] leading-normal truncate">{{orderDetail.goods_name}}</view>
+								<view v-if="orderDetail.sku_name" class="mt-[6rpx] text-[24rpx] leading-[1.3] text-[var(--text-color-light9)] truncate">{{ orderDetail.sku_name }}</view>
+                            </view>
+                        </view>
+                    </view>
+
+                    <view class="my-[var(--top-m)] sidebar-margin px-[var(--pad-sidebar-m)] rounded-[var(--rounded-big)] bg-white">
+                        <view class="py-[var(--pad-top-m)] flex items-center" @click="selectRefundType(1)">
+                            <view class="flex-1">
+                                <view class="text-[30rpx]">仅退款</view>
+                                <view class="text-[24rpx] mt-[20rpx] text-[var(--text-color-light9)]" v-if="orderDetail.goods_type == 'real'">未收到货，或与商家协商一致不用退货只退款</view>
+                                <view class="text-[24rpx] mt-[20rpx] text-[var(--text-color-light9)]" v-else-if="orderDetail.goods_type == 'virtual'">与商家协商一致不用退货只退款</view>
+                            </view>
+                            <text class="nc-iconfont nc-icon-youV6xx text-[28rpx] text-[var(--text-color-light9)]"></text>
+                        </view>
+                        <view class="py-[var(--pad-top-m)] flex items-center border-0 !border-t !border-[#f5f5f5] border-solid" v-if="orderDetail.goods_type == 'real' && (!orderDetail.delivery_status || orderDetail.delivery_status != 'wait_delivery')" @click="selectRefundType(2)">
+                            <view class="flex-1">
+                                <view class="text-[30rpx]">退货退款</view>
+                                <view class="text-[24rpx] mt-[20rpx] text-[var(--text-color-light9)]">已收到货，需退还收到的货物</view>
+                            </view>
+                            <text class="nc-iconfont nc-icon-youV6xx text-[28rpx] text-[var(--text-color-light9)]"></text>
+                        </view>
+                    </view>
+                </scroll-view>
+            </swiper-item>
+            <swiper-item>
+                <scroll-view scroll-y="true" class="bg-page min-h-screen overflow-hidden">
+                    <view class="my-[var(--top-m)] sidebar-margin px-[var(--pad-sidebar-m)] rounded-[var(--rounded-big)] bg-white">
+                        <view class="py-[var(--pad-top-m)] flex justify-between items-center">
+                            <view class="text-[28rpx]">退款原因</view>
+                            <view class="flex ml-[auto] items-center h-[30rpx]" @click="refundCausePopup = true">
+								<text class="text-[26rpx] text-[var(--text-color-light9)] truncate max-w-[460rpx]">{{ formData.reason || '请选择' }}</text>
+                                <text class="nc-iconfont nc-icon-youV6xx pt-[4rpx] text-[24rpx] text-[var(--text-color-light9)]"></text>
+                            </view>
+                        </view>
+                    </view>
+                    <view class="my-[var(--top-m)] sidebar-margin px-[var(--pad-sidebar-m)] rounded-[var(--rounded-big)] bg-white">
+                        <view class="py-[var(--pad-top-m)]">
+							<view class="flex items-center justify-between">
+								<view class="text-[28rpx] font-500">退款金额</view>
+								<view class="flex justify-end items-center text-[var(--price-text-color)] price-font">
+									<text class="font-500 text-[36rpx] leading-none">￥</text>
+									<text class="font-500 text-[36rpx] leading-none">{{ formData.apply_money }}</text>
+									<!-- <input type="digit" v-model.number="formData.apply_money" class="font-500 text-[36rpx] leading-none" :style="{ width: inputWidth(formData.apply_money) }" @blur="handleInput"> -->
+								</view>
+							</view>
+							<view class="text-right text-[24rpx] text-[var(--text-color-light9)] mt-[10rpx]">
+								<!-- <text>最多可退￥{{ refundMoney.refund_money }}</text> -->
+								<text v-if="refundMoney.is_refund_delivery === 1 && Number(refundMoney.refund_delivery_money) > 0" class="ml-[10rpx]">(包含运费￥{{ refundMoney.refund_delivery_money }})</text>
+							</view>
+                        </view>
+                    </view>
+                    <view class="my-[var(--top-m)] sidebar-margin px-[var(--pad-sidebar-m)] rounded-[var(--rounded-big)] bg-white">
+                        <view class="pt-[var(--pad-top-m)] pb-[14rpx]">
+                            <view class="text-[28rpx] flex items-center">
+								<text class="font-500">上传凭证</text>
+								<text class="text-[24rpx] text-[var(--text-color-light9)] ml-[10rpx]">选填</text>
+							</view>
+                            <view class="mt-[30rpx]">
+                                <u-upload :fileList="voucherListPreview" @afterRead="afterRead" @delete="deletePic" multiple :maxCount="9"/>
+                            </view>
+                        </view>
+                    </view>
+                    <view class="my-[24rpx] sidebar-margin px-[24rpx] rounded-md bg-white">
+                        <view class="py-[var(--pad-top-m)]">
+							<view class="text-[28rpx] flex items-center">
+								<text class="font-500">补充描述</text>
+								<text class="text-[24rpx] text-[var(--text-color-light9)] ml-[10rpx]">选填</text>
+							</view>
+                            <view class="mt-[30rpx] h-[200rpx]">
+                                <textarea class="leading-[1.5] h-[100%] w-[100%] text-[28rpx]" v-model="formData.remark" cols="30" rows="5" placeholder="补充描述,有助于更好的处理售后问题" placeholder-class="text-[26rpx] text-[var(--text-color-light9)]"></textarea>
+                            </view>
+                        </view>
+                    </view>
+                    <view class="w-full">
+                    	<view class="py-[var(--top-m)] px-[var(--sidebar-m)] box-border">
+                    		<button class="primary-btn-bg !text-[#fff] h-[80rpx] leading-[80rpx] rounded-[100rpx] text-[26rpx] font-500" :loading="operateLoading" @click="save">提交</button>
+                    	</view>
+                    </view>
+                    
+                    <!-- 退款原因 -->
+                    <u-popup :show="refundCausePopup" @close="refundCausePopup = false" @open="open"  :closeable="true">
+                        <view class="popup-common" @touchmove.prevent.stop>
+                            <view class="title">退款原因</view>
+                            <scroll-view scroll-y="true" class="h-[450rpx] px-[30rpx] box-border">
+                                <u-radio-group v-model="currReasonName" placement="column" iconPlacement="right">
+                                    <u-radio activeColor="var(--primary-color)" :labelSize="'30rpx'" labelColor="#333" :customStyle="{marginBottom: '34rpx'}" v-for="(item, index) in reason" :key="index" :label="item" :name="item"></u-radio>
+                                </u-radio-group>
+                            </scroll-view>
+							<view class="btn-wrap">
+								<button class="primary-btn-bg btn" @click="refundCausePopupFn">确定</button>
+							</view>
+                        </view>
+                    </u-popup>
+                </scroll-view>
+            </swiper-item>
+        </swiper>
+    </view>
+</template>
+
+<script setup lang="ts">
+    import { ref, computed } from 'vue'
+    import { onLoad } from '@dcloudio/uni-app'
+    import { redirect, img, moneyFormat, goback } from '@/utils/common'
+    import { t } from '@/locale'
+    import { getRefundReason, editRefund, getRefundDetail,getRefundMoneyAgain } from '@/addon/shop/api/refund'
+    import { uploadImage } from '@/app/api/system'
+
+    const detail = ref(null)
+	const orderDetail = ref({})
+    const orderGoodsId = ref(0)
+    const step = ref(0)
+	const refundCausePopup = ref(false)
+    const formData = ref({
+        order_id: detail.value?.order_id,
+        order_goods_id: orderGoodsId.value,
+        order_refund_no:'',
+        refund_type: '',
+        apply_money: '',
+        reason: '',
+        remark: '',
+        voucher: []
+    })
+    const refundMoney = ref<any>({})
+    const reason = ref<string[]>([])
+    const currReasonName = ref('')
+
+	getRefundReason().then(({ data }) => {
+	    reason.value = data
+		if(reason.value && reason.value.length) currReasonName.value = reason.value[0];
+	})
+
+    onLoad((option: any) => {
+        orderGoodsId.value = option.order_goods_id || 0
+		if(option.order_refund_no){
+            getRefundDetail(option.order_refund_no).then(({ data }) => {
+                detail.value = data
+                orderDetail.value = data.order_goods;
+
+                // 初始化信息
+                formData.value.order_goods_id = data.order_goods_id;
+                formData.value.order_id = data.order_id;
+                formData.value.order_refund_no = data.order_refund_no;
+                formData.value.remark = data.remark;
+                formData.value.reason = data.reason;
+                currReasonName.value = data.reason;
+                formData.value.voucher = data.voucher;
+            })
+            getRefundMoneyAgain({order_refund_no: option.order_refund_no}).then(res =>{
+                refundMoney.value = res.data
+                formData.value.apply_money = moneyFormat(refundMoney.value.refund_money)
+            })
+        }else{
+            let parameter = {
+                url:'/addon/shop/pages/refund/list',
+                title: '缺少订单号'
+            };
+            goback(parameter);
+        }
+    })
+
+    const inputWidth = computed((value) => {
+        return function (value) {
+            if (value == '' || value == 0) {
+                return '70rpx';
+            } else {
+                return String(value).length * 17 + 'rpx';
+            }
+        };
+    })
+
+    const selectRefundType = (type : number) => {
+        formData.value.refund_type = type
+        step.value = 1
+    }
+
+    const voucherListPreview = computed(() => {
+        return formData.value.voucher.map(item => {
+            return {url: img(item)}
+        })
+    })
+
+    const afterRead = (event) => {
+        event.file.forEach(item => {
+            uploadImage({
+                filePath: item.url,
+                name: 'file'
+            }).then(res => {
+                if (formData.value.voucher.length < 9 ) {
+                    formData.value.voucher.push(res.data.url)
+                }
+            }).catch(() => {
+            })
+        })
+    }
+
+    const deletePic = (event)=> {
+        formData.value.voucher.splice(event.index, 1)
+    }
+
+    const operateLoading = ref(false)
+    const save = ()=> {
+        if (!formData.value.reason) {
+            uni.showToast({
+                title: '请选择退款原因',
+                icon: 'none'
+            });
+            return false;
+        }
+
+        if ((Number(formData.value.apply_money).toFixed(2)) < 0) {
+            uni.showToast({
+                title: '退款金额不能为0,保留两位小数',
+                icon: 'none'
+            });
+            return false;
+        }
+
+        if (Number(formData.value.apply_money) > Number(refundMoney.value.refund_money)) {
+            uni.showToast({
+                title: '退款金额不能大于可退款总额',
+                icon: 'none'
+            });
+            return false;
+        }
+
+        if (operateLoading.value) return
+        operateLoading.value = true
+
+        editRefund(formData.value).then((res) => {
+            operateLoading.value = false
+            setTimeout(() => {
+                redirect({ url: '/addon/shop/pages/order/detail', param: { order_id: formData.value.order_id } })
+            }, 1000)
+        }).catch(() => {
+            operateLoading.value = false
+        })
+    }
+
+	const refundCausePopupFn = ()=>{
+		formData.value.reason = currReasonName.value;
+		refundCausePopup.value = false;
+	}
+</script>
+
+<style lang="scss" scoped>
+    :deep(.u-upload__button) {
+        width: 70px !important;
+        height: 70px !important;
+        border: 1px dashed #ddd;
+		background-color: #fff;
+    	border-radius: 20rpx !important;
+    }
+    :deep(.u-upload__wrap__preview__image) {
+        width: 70px!important;
+        height: 70px!important;
+    }
+   
+</style>
diff --git a/uni-app/src/addon/shop/pages/refund/list.vue b/uni-app/src/addon/shop/pages/refund/list.vue
new file mode 100644
index 00000000..6468b434
--- /dev/null
+++ b/uni-app/src/addon/shop/pages/refund/list.vue
@@ -0,0 +1,163 @@
+<template>
+	<view class="bg-[var(--page-bg-color)] min-h-screen overflow-hidden" :style="themeColor()">
+
+		<mescroll-body ref="mescrollRef" @init="mescrollInit" :down="{ use: false }" @up="getRefundListFn">
+			<view class="sidebar-margin pt-[var(--top-m)]" v-if="list.length">
+				<view class="mb-[var(--top-m)] card-template" v-for="(item,index) in list" :key="index">
+					<view @click="toLink(item)">
+						<view class="flex justify-between items-center">
+							<view class="text-[#303133] text-[26rpx] font-400 leading-[34rpx]">
+								<text>{{ t('orderNo') }}:</text>
+								<text class="ml-[10rpx]">{{ item.order_refund_no }}</text>
+								<text class="text-[#303133] text-[24rpx] font-400 nc-iconfont nc-icon-fuzhiV6xx1 ml-[11rpx]" @click.stop="copy(item.order_refund_no)"></text>
+							</view>
+							<view class="text-[26rpx] leading-[34rpx] !text-[var(--primary-color)]">{{item.refund_type_name}}</view>
+						</view>
+						<view class="flex mt-[20rpx]">
+							<u--image width="150rpx" height="150rpx" :radius="'var(--goods-rounded-big)'" :src="img(item.order_goods.goods_image_thumb_small ? item.order_goods.goods_image_thumb_small : '')" model="aspectFill">
+								<template #error>
+									<image class="w-[150rpx] h-[150rpx] rounded-[var(--goods-rounded-big)] overflow-hidden" :src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill"></image>
+								</template>
+							</u--image>
+							<view class="ml-[20rpx] flex flex-1 flex-col box-border">
+								<view class="flex justify-between items-baseline">
+									<view class="text-[28rpx] leading-[40rpx] text-[#303133] max-w-[322rpx]  truncate font-400">{{ item.order_goods.goods_name }}</view>
+									<view class="text-right leading-[42rpx] ml-[10rpx]">
+										<text class="text-[22rpx] price-font">￥</text>
+										<text class="text-[36rpx] font-500 price-font">{{parseFloat(item.order_goods.price).toFixed(2).split('.')[0] }}</text>
+										<text class="text-[22rpx] font-500 price-font">.{{parseFloat(item.order_goods.price).toFixed(2).split('.')[1] }}</text>
+									</view>
+								</view>
+								<view class="flex justify-between items-baseline mt-[14rpx]">
+									<view class="flex flex-col">
+										<view class="text-[26rpx] truncate text-[var(--text-color-light6)] leading-[36rpx] max-w-[369rpx] mb-[10rpx]" v-if="item.order_goods.sku_name">{{ item.order_goods.sku_name }}</view>
+										<view class="text-[26rpx] font-400 leading-[36rpx] text-[var(--text-color-light6)]">退款状态：{{ item.status_name }}</view>
+									</view>
+									<text class="text-right text-[26rpx] font-400 w-[90rpx] leading-[36rpx]">x{{ item.order_goods.num }}</text>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="flex justify-end items-baseline mt-[20rpx]">
+						<view class="flex items-center">
+							<text class="text-[22rpx] leading-[30rpx] font-400 mr-[4rpx]">{{ t('refundMoney') }}：</text>
+							<view class="price-font leading-[42rpx] text-[var(--price-text-color)]">
+								<text class="text-[22rpx]">￥</text>
+								<template v-if="item.status == 8">
+									<text class="text-[36rpx] font-500">{{ parseFloat(item.money).toFixed(2).split('.')[0] }}</text>
+									<text class="text-[22rpx] font-500">.{{ parseFloat(item.money).toFixed(2).split('.')[1] }}</text>
+								</template>
+								<template v-else>
+									<text class="text-[36rpx] font-500">{{ parseFloat(item.apply_money).toFixed(2).split('.')[0] }}</text>
+									<text class="text-[22rpx] font-500">.{{ parseFloat(item.apply_money).toFixed(2).split('.')[1] }}</text>
+								</template>
+							</view>
+						</view>
+					</view>
+					<view class="mt-[20rpx] flex flex-wrap justify-end" v-if="['6','7','8','-1','3','2','5'].indexOf(item.status) == -1">
+						<view class="text-[24rpx] text-[var(--text-color-light6)] font-500 h-[56rpx] leading-[52rpx] box-border px-[23rpx] border-[2rpx] border-solid border-[var(--text-color-light9)] rounded-full ml-[20rpx]" @click.stop="refundBtnFn(item,'cancel')" v-if="['6','7','8','-1'].indexOf(item.status) == -1">{{t('refundApply')}}</view>
+						<view v-if="['3'].indexOf(item.status) != -1" class="text-[24rpx] font-500 text-[var(--text-color-light6)] h-[56rpx] box-border leading-[52rpx] px-[23rpx] border-[2rpx] border-solid border-[var(--text-color-light9)] rounded-full ml-[20rpx]" @click.stop="refundBtnFn(item,'edit')" >编辑退款信息</view>
+						<view v-if="['2'].indexOf(item.status) != -1" class=" text-[24rpx] font-500 text-[var(--text-color-light6)] h-[56rpx] box-border leading-[52rpx] px-[23rpx] border-[2rpx] border-solid border-[var(--text-color-light9)] rounded-full ml-[20rpx]" @click.stop="refundBtnFn(item,'logistics')">填写发货物流</view>
+						<view v-if="['5'].indexOf(item.status) != -1" class="text-[24rpx] font-500 text-[var(--text-color-light6)] h-[56rpx] box-border  leading-[52rpx] px-[23rpx] border-[2rpx] border-solid border-[var(--text-color-light9)] rounded-full ml-[20rpx]" @click.stop="refundBtnFn(item,'editLogistics')">编辑发货物流</view>
+					</view>
+				</view>
+			</view>
+			<mescroll-empty :option="{tip : '暂无订单'}" v-if="!list.length && loading"></mescroll-empty>
+			
+		</mescroll-body>
+		<u-modal :show="cancelRefundShow" confirmColor="var(--primary-color)" :content="t('cancelRefundContent')" :showCancelButton="true" :closeOnClickOverlay="true" @cancel="refundCancel" @confirm="refundConfirm"></u-modal>
+		<!-- #ifdef MP-WEIXIN -->
+		<!-- 小程序隐私协议 -->
+		<wx-privacy-popup ref="wxPrivacyPopupRef"></wx-privacy-popup>
+		<!-- #endif -->
+	</view>
+</template>
+
+<script setup lang="ts">
+	import { ref,nextTick } from 'vue';
+	import { t } from '@/locale'
+	import { img, redirect,copy } from '@/utils/common'
+	import { getRefundList, closeRefund } from '@/addon/shop/api/refund';
+	import MescrollBody from '@/components/mescroll/mescroll-body/mescroll-body.vue';
+	import MescrollEmpty from '@/components/mescroll/mescroll-empty/mescroll-empty.vue';
+	import useMescroll from '@/components/mescroll/hooks/useMescroll.js';
+	import { onLoad,onPageScroll, onReachBottom } from '@dcloudio/uni-app';
+
+	const { mescrollInit, downCallback, getMescroll } = useMescroll(onPageScroll, onReachBottom);
+	const list = ref<Array<Object>>([]);
+	const loading = ref<boolean>(false);
+	const cancelRefundShow = ref(false);
+
+	const wxPrivacyPopupRef:any = ref(null)
+
+	onLoad(()=>{
+		// #ifdef MP
+		nextTick(()=>{
+			if(wxPrivacyPopupRef.value) wxPrivacyPopupRef.value.proactive();
+		})
+		// #endif
+	})
+
+	const getRefundListFn = (mescroll) => {
+		loading.value = false;
+		let data : object = {
+			page: mescroll.num,
+			limit: mescroll.size
+		};
+
+		getRefundList(data).then((res) => {
+			let newArr = (res.data.data as Array<Object>);
+			//设置列表数据
+			if (mescroll.num == 1) {
+				list.value = []; //如果是第一页需手动制空列表
+			}
+			list.value = list.value.concat(newArr);
+			mescroll.endSuccess(newArr.length);
+			loading.value = true;
+		}).catch(() => {
+			loading.value = true;
+			mescroll.endErr(); // 请求失败, 结束加载
+		})
+	}
+
+	const toLink = (data) => {
+		redirect({ url: '/addon/shop/pages/refund/detail', param: { order_refund_no : data.order_refund_no } })
+	}
+
+	let currRefundOn = "";
+	const refundBtnFn = (data, type) => {
+		if(type == 'cancel'){
+			currRefundOn = data.order_refund_no;
+			cancelRefundShow.value = true;
+		}else if(type == 'edit'){
+			redirect({ url: '/addon/shop/pages/refund/edit_apply', param: { order_refund_no : data.order_refund_no } })
+		}else if(type == 'logistics'){
+			redirect({ url: '/addon/shop/pages/refund/detail', param: { order_refund_no : data.order_refund_no, type: 'logistics' } })
+		}else if(type == 'editLogistics'){
+			redirect({ url: '/addon/shop/pages/refund/detail', param: { order_refund_no : data.order_refund_no, type: 'logistics', is_edit_delivery: true } })
+		}
+	}
+
+	const refundConfirm = ()=>{
+		closeRefund(currRefundOn).then((res) => {
+			cancelRefundShow.value = false;
+			getMescroll().resetUpScroll();
+		}).catch(() => {
+			cancelRefundShow.value = false;
+		})
+	}
+
+	const refundCancel = ()=>{
+		cancelRefundShow.value = false;
+	}
+
+</script>
+<style lang="scss" scoped>
+	.text-item {
+		overflow: hidden;
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		-webkit-line-clamp: 2;
+		-webkit-box-orient: vertical;
+	}
+</style>
diff --git a/uni-app/src/addon/shop/pages/refund/log.vue b/uni-app/src/addon/shop/pages/refund/log.vue
new file mode 100644
index 00000000..86f5c5a1
--- /dev/null
+++ b/uni-app/src/addon/shop/pages/refund/log.vue
@@ -0,0 +1,61 @@
+<template>
+    <view :style="themeColor()">
+        <view class="bg-[var(--page-bg-color)] min-h-screen overflow-hidden" v-if="!loading">
+			<view class="pt-[var(--top-m)]">
+				<view class="card-template sidebar-margin mb-[var(--top-m)]" v-for="(item,index) in detail.refund_log">
+					<view class="text-[28rpx]">{{item.type_name || '--'}}</view>
+					<view class="text-[24rpx] mt-[20rpx] mb-[10rpx] text-[var(--text-color-light9)]">{{item.main_type_name}} {{item.main_name}}</view>
+					<view class="text-[24rpx] text-[var(--text-color-light9)]">{{item.create_time}}</view>
+				</view>
+				<view class="w-full footer">
+					<view class="py-[var(--top-m)] px-[var(--sidebar-m)] footer w-full fixed bottom-0 left-0 right-0 box-border">
+						<button class="primary-btn-bg text-[#fff] h-[80rpx] leading-[80rpx] rounded-[100rpx] text-[26rpx] mx-0 flex-1 font-500" @click="redirect({url: '/addon/shop/pages/refund/detail', param: { order_refund_no: orderRefundNo }})">返回详情</button>
+					</view>
+				</view>
+			</view>
+        </view>
+
+		<loading-page :loading="loading"></loading-page>
+    </view>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive, computed } from 'vue';
+import { onLoad } from '@dcloudio/uni-app'
+import { t } from '@/locale'
+import { img, redirect, goback } from '@/utils/common';
+import { getRefundDetail } from '@/addon/shop/api/refund';
+
+const detail = ref<Object>({});
+const loading = ref<boolean>(true);
+const orderRefundNo = ref('')
+
+onLoad((option: any) => {
+    orderRefundNo.value = option.order_refund_no;
+    if(option.order_refund_no){
+        refundDetailFn(option.order_refund_no);
+    }else{
+        let parameter = {
+            url:'/addon/shop/pages/refund/list',
+            title: '缺少订单号'
+        };
+        goback(parameter);
+    }
+});
+
+const refundDetailFn = (refundNo: any) => {
+	loading.value = true;
+	getRefundDetail(refundNo).then((res: any) => {
+		detail.value = res.data;
+		loading.value = false;
+	}).catch(() => {
+		loading.value = false;
+	})
+}
+</script>
+<style lang="scss" scoped>
+.footer{
+	height: calc(80rpx + var(--top-m) + var(--top-m) + constant(safe-area-inset-bottom)) !important;
+	height: calc(80rpx + var(--top-m) + var(--top-m) + env(safe-area-inset-bottom)) !important;
+}
+</style>
diff --git a/uni-app/src/addon/shop/stores/cart.ts b/uni-app/src/addon/shop/stores/cart.ts
new file mode 100644
index 00000000..43112d9a
--- /dev/null
+++ b/uni-app/src/addon/shop/stores/cart.ts
@@ -0,0 +1,209 @@
+import { defineStore } from 'pinia'
+import { t } from '@/locale'
+import { redirect, getToken } from '@/utils/common'
+import { addCart, editCart, deleteCart, getCartList } from '@/addon/shop/api/cart';
+
+interface Cart {
+    cartList: AnyObject
+    totalNum: number
+    totalMoney: number
+    isRepeat: boolean
+}
+
+const useCartStore = defineStore('cart', {
+    state: (): Cart => {
+        return {
+            cartList: {}, // 购物车列表
+            totalNum: 0, // 购物车商品总数量
+            totalMoney: 0, // 购物车商品总价格
+            isRepeat: false
+        }
+    },
+    actions: {
+        // 查询购物车列表
+        getList(callback: any = null) {
+            if (!getToken()) {
+                // 每次查询清空
+                for (let k in this.cartList) {
+                    delete this.cartList[k];
+                }
+                this.totalNum = 0;
+                this.totalMoney = 0;
+                return;
+            }
+            getCartList({}).then((res: any) => {
+                let data = res.data;
+
+                // 每次查询清空
+                for (let k in this.cartList) {
+                    delete this.cartList[k];
+                }
+                if (data) {
+                    data.forEach((item: any) => {
+                        if (item.goods.status == 1 && item.goods.delete_time == 0 && item.goodsSku) {
+                            let cart: any = {
+                                id: item.id,
+                                goods_id: item.goods_id,
+                                sku_id: item.sku_id,
+                                stock: item.goodsSku.stock,
+                                num: item.num,
+                                sale_price: item.goodsSku.price
+                            };
+
+                            if (item.goods.member_discount && getToken() && item.goodsSku.member_price != item.goodsSku.price) {
+                                cart.sale_price = item.goodsSku.member_price ? item.goodsSku.member_price : item.goodsSku.price // 会员价
+                            }
+
+                            // todo sale_price 改成 price
+
+                            if (!this.cartList['goods_' + cart.goods_id]) {
+                                this.cartList['goods_' + cart.goods_id] = {};
+                            }
+                            this.cartList['goods_' + cart.goods_id]['sku_' + cart.sku_id] = cart;
+                        }
+                    })
+                }
+                this.calculateNum();
+                if (callback && typeof callback == 'function') callback();
+            })
+        },
+        /**
+         * 购物车数量增加
+         * data：数据源
+         * step：记步数量，默认为：1，每次加一个，设置为：0时，按照 num 修改
+         */
+        increase(data: any, step = 1, callback: any = null) {
+            if (!data || (data && Object.keys(data).length == 0) || !data.goods_id || !data.sku_id) return;
+            if (!getToken()) return;
+
+            let num = data.num || 0; // 当前数量
+            let updateNum = num + step; // 变更数量
+
+            let api = data.id ? editCart : addCart;
+
+            if (updateNum > parseInt(data.stock)) {
+                uni.showToast({ title: '商品库存不足', icon: 'none' })
+                return;
+            }
+
+            if (this.isRepeat) return;
+            this.isRepeat = true;
+
+            // 更新存储数据
+            if (data.id) {
+                this.cartList['goods_' + data.goods_id]['sku_' + data.sku_id].num = updateNum;
+            } else {
+
+                // 如果商品第一次添加，则初始化数据
+                if (!this.cartList['goods_' + data.goods_id]) {
+                    this.cartList['goods_' + data.goods_id] = {};
+                }
+                this.cartList['goods_' + data.goods_id]['sku_' + data.sku_id] = {
+                    id: data.id,
+                    goods_id: data.goods_id,
+                    sku_id: data.sku_id,
+                    stock: data.stock,
+                    num: updateNum,
+                    sale_price: data.sale_price
+                };
+            }
+
+            this.calculateNum();
+
+            api({
+                id: data.id,
+                goods_id: data.goods_id,
+                sku_id: data.sku_id,
+                num: updateNum
+            }).then(res => {
+                this.getList(callback)
+                this.isRepeat = false;
+            }).catch(res => {
+                this.isRepeat = false;
+            })
+
+        },
+        /**
+         * 购物车数量减少
+         * data：数据源
+         * step：记步数量，默认为：1，每次减一个，设置为：0时，按照 num 修改
+         */
+        reduce(data: any, step = 1, callback: any = null) {
+            if (!data || (data && Object.keys(data).length == 0) || !data.goods_id || !data.sku_id) return;
+            if (!getToken()) return;
+
+            let num = data.num || 0; // 当前数量
+            let updateNum = num - step; // 变更数量
+
+            let api = updateNum > 0 ? editCart : deleteCart;
+
+            if (this.isRepeat) return;
+            this.isRepeat = true;
+
+            // 更新存储数据
+            if (updateNum > 0) {
+                this.cartList['goods_' + data.goods_id]['sku_' + data.sku_id].num = updateNum;
+            } else {
+                delete this.cartList['goods_' + data.goods_id]['sku_' + data.sku_id];
+                if (Object.keys(this.cartList['goods_' + data.goods_id]).length == 0) delete this.cartList['goods_' + data.goods_id];
+            }
+
+            this.calculateNum();
+
+            api({
+                ids: data.id, // 删除接口用
+                id: data.id,
+                goods_id: data.goods_id,
+                sku_id: data.sku_id,
+                num: updateNum
+            }).then(res => {
+                this.getList(callback);
+                this.isRepeat = false;
+            }).catch(res => {
+                this.isRepeat = false;
+            })
+        },
+        // 购物车删除
+        delete(ids: any, callback: any = null) {
+            if (!ids) return;
+
+            deleteCart({
+                ids
+            }).then(res => {
+                this.getList();
+                this.isRepeat = false;
+                if (callback) callback();
+            }).catch(res => {
+                this.isRepeat = false;
+            })
+        },
+
+        // 计算购物车商品的总数量、总价格
+        calculateNum() {
+            this.totalNum = 0;
+            this.totalMoney = 0;
+
+            if (Object.keys(this.cartList).length) {
+                for (let goods in this.cartList) {
+                    let totalNum = 0;
+                    let totalMoney = 0;
+                    for (let sku in this.cartList[goods]) {
+                        if (typeof this.cartList[goods][sku] == 'object') {
+                            totalNum += this.cartList[goods][sku].num;
+                            totalMoney += this.cartList[goods][sku].num * this.cartList[goods][sku].sale_price;
+                        }
+                    }
+                    this.cartList[goods].totalNum = totalNum;
+                    this.cartList[goods].totalMoney = totalMoney.toFixed(2);
+
+                    this.totalNum += totalNum;
+                    this.totalMoney += totalMoney;
+
+                }
+            }
+            this.totalMoney = this.totalMoney.toFixed(2);
+        }
+    }
+})
+
+export default useCartStore
diff --git a/uni-app/src/addon/shop/styles/common.scss b/uni-app/src/addon/shop/styles/common.scss
new file mode 100644
index 00000000..52a8cd5a
--- /dev/null
+++ b/uni-app/src/addon/shop/styles/common.scss
@@ -0,0 +1,65 @@
+.remove-border {
+  &::after {
+    border: none;
+  }
+}
+
+/******************** 商品列表 state **********************/
+.brand-tag{
+	position: relative;
+	top: -2rpx;
+	display: inline;
+	line-height: 38rpx;
+	padding: 4rpx 8rpx;
+	border-radius: 4rpx;
+	margin-right: 8rpx;
+	background: red;
+	vertical-align: middle;
+	font-size: 18rpx;
+	color: #fff;
+	&.middle{
+		padding: 4rpx 8rpx;
+		border-radius: 8rpx;
+		font-size: 20rpx;
+		margin-right: 6rpx;
+	}
+}
+
+.base-tag {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    height: 34rpx;
+    font-size: 18rpx;
+    padding: 0 8rpx;
+    color: #333;
+    border-radius: 4rpx;
+    background-color: #fff;
+    margin-right: 8rpx;
+    box-sizing: border-box;
+	margin-top: 8rpx;
+	border: 2rpx solid transparent;
+	&.middle{
+	    height: 40rpx;
+		padding: 0 12rpx;
+		border-radius: 8rpx;
+		font-size: 20rpx;
+		margin-right: 16rpx;
+	}
+}
+
+.img-tag {
+    display: block;
+    height: 34rpx;
+	width: auto;
+    border-radius: 4rpx;
+    margin-right: 14rpx;
+    box-sizing: border-box;
+	margin-top: 8rpx;
+	&.middle{
+	    height: 38rpx;
+	    border-radius: 8rpx;
+	    margin-right: 16rpx;
+	}
+}
+/******************** 商品列表 end **********************/
diff --git a/uni-app/src/addon/shop/utils/map/openMap.js b/uni-app/src/addon/shop/utils/map/openMap.js
new file mode 100644
index 00000000..901449ed
--- /dev/null
+++ b/uni-app/src/addon/shop/utils/map/openMap.js
@@ -0,0 +1,109 @@
+import TransformCoordinate from './transformCoordinate.js'
+import useConfigStore from "@/stores/config";
+
+function openMapByDefault(latitude, longitude, name) {
+	uni.openLocation({
+		latitude: latitude,
+		longitude: longitude,
+		name: name,
+		fail: (e) => {
+			uni.showModal({
+				content: '打开地图失败，请稍后重试',
+				confirmColor: useConfigStore().themeColor['--primary-color'],
+			})
+		},
+	})
+}
+
+function openMapByAndroid(latitude, longitude, name) {
+	let url = ''; // 回调地址
+	let identity = ''; // 程序名称
+	if (plus.runtime.isApplicationExist({
+			pname: 'com.baidu.BaiduMap'
+		})) { // baidumap
+		url = `baidumap://map/marker?location=${latitude},${longitude}&title=${name}&coord_type=gcj02&src=andr.baidu.openAPIdemo`
+		identity = 'com.baidu.BaiduMap'
+		openURL(url, identity)
+	} else if (plus.runtime.isApplicationExist({
+			pname: 'com.autonavi.minimap'
+		})) { // 高德
+		url = `androidamap://viewMap?sourceApplication=appname&poiname=${name}&lat=${latitude}&lon=${longitude}&dev=0`
+		identity = 'com.autonavi.minimap'
+		openURL(url, identity)
+	} else {
+		openMapByDefault(latitude, longitude, name)
+	}
+}
+
+function openMapByIos(latitude, longitude, name) {
+	let url = ''; // 回调地址
+	let errorCB = ''; // url失败的回调地址
+	let identity = ''; // 程序名称
+
+	if (plus.runtime.isApplicationExist({
+			action: 'baidumap://'
+		})) { // baidumap
+		url =
+			`baidumap://map/marker?location=${latitude},${longitude}&title=${name}&content=${name}&src=ios.baidu.openAPIdemo&coord_type=gcj02`;
+		openURL(url, identity)
+	} else if (plus.runtime.isApplicationExist({
+			action: 'iosamap://'
+		})) { // 高德
+		url = `iosamap://viewMap?sourceApplication=applicationName&poiname=${name}&lat=${latitude}&lon=${longitude}&dev=0`
+		openURL(url, identity)
+	} else {
+		openMapByDefault(latitude, longitude, name)
+	}
+}
+
+function openURL(url, identity) {
+	let newurl = encodeURI(url);
+	plus.runtime.openURL(newurl, function(res) {
+		uni.showModal({
+			content: res.message,
+			confirmColor: useConfigStore().themeColor['--primary-color'],
+		})
+	}, identity);
+}
+
+function getCoordByType(longitude, latitude, coord_type) {
+	switch (coord_type) {
+		case 'gcj02':
+			return [longitude, latitude]
+			break;
+		case 'bd09':
+			return TransformCoordinate.bd09togcj02(longitude, latitude)
+			break;
+		case 'wgs84':
+			return TransformCoordinate.wgs84togcj02(longitude, latitude)
+			break;
+		default:
+			return [longitude, latitude]
+			break;
+	}
+}
+export default {
+	/* 打开地图 */
+	openMap(latitude, longitude, name, coord_type = 'gcj02') {
+		let arr = getCoordByType(longitude, latitude, coord_type)
+		// #ifdef APP-PLUS
+		switch (uni.getSystemInfoSync().platform) {
+			case 'android':
+				// console.log('运行Android上')
+				openMapByAndroid(arr[1], arr[0], name)
+				break;
+			case 'ios':
+				// console.log('运行iOS上')
+				openMapByIos(arr[1], arr[0], name)
+				break;
+			default:
+				openMapByDefault(arr[1], arr[0], name)
+				// console.log('运行在开发者工具上')
+				break;
+		}
+		// #endif
+		// #ifndef APP-PLUS
+		openMapByDefault(arr[1], arr[0], name)
+		// #endif
+	}
+}
diff --git a/uni-app/src/addon/shop/utils/map/transformCoordinate.js b/uni-app/src/addon/shop/utils/map/transformCoordinate.js
new file mode 100644
index 00000000..50ac7e68
--- /dev/null
+++ b/uni-app/src/addon/shop/utils/map/transformCoordinate.js
@@ -0,0 +1,124 @@
+/**
+ * Created by Wandergis on 2015/7/8.
+ * 提供了百度坐标（BD09）、国测局坐标（火星坐标，GCJ02）、和WGS84坐标系之间的转换
+ */
+
+//定义一些常量
+var x_PI = 3.14159265358979324 * 3000.0 / 180.0;
+var PI = 3.1415926535897932384626;
+var a = 6378245.0;
+var ee = 0.00669342162296594323;
+
+/**
+ * 百度坐标系 (BD-09) 与 火星坐标系 (GCJ-02)的转换
+ * 即 百度 转 谷歌、高德
+ * @param bd_lon
+ * @param bd_lat
+ * @returns {*[]}
+ */
+function bd09togcj02(bd_lon, bd_lat) {
+	var x_pi = 3.14159265358979324 * 3000.0 / 180.0;
+	var x = bd_lon - 0.0065;
+	var y = bd_lat - 0.006;
+	var z = Math.sqrt(x * x + y * y) - 0.00002 * Math.sin(y * x_pi);
+	var theta = Math.atan2(y, x) - 0.000003 * Math.cos(x * x_pi);
+	var gg_lng = z * Math.cos(theta);
+	var gg_lat = z * Math.sin(theta);
+	return [gg_lng, gg_lat]
+}
+
+/**
+ * 火星坐标系 (GCJ-02) 与百度坐标系 (BD-09) 的转换
+ * 即谷歌、高德 转 百度
+ * @param lng
+ * @param lat
+ * @returns {*[]}
+ */
+function gcj02tobd09(lng, lat) {
+	var z = Math.sqrt(lng * lng + lat * lat) + 0.00002 * Math.sin(lat * x_PI);
+	var theta = Math.atan2(lat, lng) + 0.000003 * Math.cos(lng * x_PI);
+	var bd_lng = z * Math.cos(theta) + 0.0065;
+	var bd_lat = z * Math.sin(theta) + 0.006;
+	return [bd_lng, bd_lat]
+}
+
+/**
+ * WGS84转GCj02
+ * @param lng
+ * @param lat
+ * @returns {*[]}
+ */
+function wgs84togcj02(lng, lat) {
+	if (out_of_china(lng, lat)) {
+		return [lng, lat]
+	} else {
+		var dlat = transformlat(lng - 105.0, lat - 35.0);
+		var dlng = transformlng(lng - 105.0, lat - 35.0);
+		var radlat = lat / 180.0 * PI;
+		var magic = Math.sin(radlat);
+		magic = 1 - ee * magic * magic;
+		var sqrtmagic = Math.sqrt(magic);
+		dlat = (dlat * 180.0) / ((a * (1 - ee)) / (magic * sqrtmagic) * PI);
+		dlng = (dlng * 180.0) / (a / sqrtmagic * Math.cos(radlat) * PI);
+		var mglat = lat + dlat;
+		var mglng = lng + dlng;
+		return [mglng, mglat]
+	}
+}
+
+/**
+ * GCJ02 转换为 WGS84
+ * @param lng
+ * @param lat
+ * @returns {*[]}
+ */
+function gcj02towgs84(lng, lat) {
+	if (out_of_china(lng, lat)) {
+		return [lng, lat]
+	} else {
+		var dlat = transformlat(lng - 105.0, lat - 35.0);
+		var dlng = transformlng(lng - 105.0, lat - 35.0);
+		var radlat = lat / 180.0 * PI;
+		var magic = Math.sin(radlat);
+		magic = 1 - ee * magic * magic;
+		var sqrtmagic = Math.sqrt(magic);
+		dlat = (dlat * 180.0) / ((a * (1 - ee)) / (magic * sqrtmagic) * PI);
+		dlng = (dlng * 180.0) / (a / sqrtmagic * Math.cos(radlat) * PI);
+		var mglat = lat + dlat;
+		var mglng = lng + dlng;
+		return [lng * 2 - mglng, lat * 2 - mglat]
+	}
+}
+
+function transformlat(lng, lat) {
+	var ret = -100.0 + 2.0 * lng + 3.0 * lat + 0.2 * lat * lat + 0.1 * lng * lat + 0.2 * Math.sqrt(Math.abs(lng));
+	ret += (20.0 * Math.sin(6.0 * lng * PI) + 20.0 * Math.sin(2.0 * lng * PI)) * 2.0 / 3.0;
+	ret += (20.0 * Math.sin(lat * PI) + 40.0 * Math.sin(lat / 3.0 * PI)) * 2.0 / 3.0;
+	ret += (160.0 * Math.sin(lat / 12.0 * PI) + 320 * Math.sin(lat * PI / 30.0)) * 2.0 / 3.0;
+	return ret
+}
+
+function transformlng(lng, lat) {
+	var ret = 300.0 + lng + 2.0 * lat + 0.1 * lng * lng + 0.1 * lng * lat + 0.1 * Math.sqrt(Math.abs(lng));
+	ret += (20.0 * Math.sin(6.0 * lng * PI) + 20.0 * Math.sin(2.0 * lng * PI)) * 2.0 / 3.0;
+	ret += (20.0 * Math.sin(lng * PI) + 40.0 * Math.sin(lng / 3.0 * PI)) * 2.0 / 3.0;
+	ret += (150.0 * Math.sin(lng / 12.0 * PI) + 300.0 * Math.sin(lng / 30.0 * PI)) * 2.0 / 3.0;
+	return ret
+}
+
+/**
+ * 判断是否在国内，不在国内则不做偏移
+ * @param lng
+ * @param lat
+ * @returns {boolean}
+ */
+function out_of_china(lng, lat) {
+	return (lng < 72.004 || lng > 137.8347) || ((lat < 0.8293 || lat > 55.8271) || false);
+}
+
+export default {
+	bd09togcj02: bd09togcj02, // 百度坐标系 (BD-09) 与 火星坐标系 (GCJ-02)的转换
+	gcj02tobd09: gcj02tobd09, // 火星坐标系 (GCJ-02) 与百度坐标系 (BD-09) 的转换
+	wgs84togcj02: wgs84togcj02, //
+	gcj02towgs84: gcj02towgs84,
+}
diff --git a/uni-app/src/addon/zhjw/api/hello_world.ts b/uni-app/src/addon/zhjw/api/hello_world.ts
new file mode 100644
index 00000000..cf5b8aa1
--- /dev/null
+++ b/uni-app/src/addon/zhjw/api/hello_world.ts
@@ -0,0 +1,8 @@
+
+import request from '@/utils/request'
+
+/***************************************************** hello world ****************************************************/
+export function getHelloWorld() {
+    return request.get(`zhjw/hello_world`)
+}
+
diff --git a/uni-app/src/addon/zhjw/locale/en.json b/uni-app/src/addon/zhjw/locale/en.json
new file mode 100644
index 00000000..311847da
--- /dev/null
+++ b/uni-app/src/addon/zhjw/locale/en.json
@@ -0,0 +1,2 @@
+{}
+
diff --git a/uni-app/src/addon/zhjw/locale/zh-Hans.json b/uni-app/src/addon/zhjw/locale/zh-Hans.json
new file mode 100644
index 00000000..311847da
--- /dev/null
+++ b/uni-app/src/addon/zhjw/locale/zh-Hans.json
@@ -0,0 +1,2 @@
+{}
+
diff --git a/uni-app/src/addon/zhjw/locale/zh-Hans/pages.hello_world.index.json b/uni-app/src/addon/zhjw/locale/zh-Hans/pages.hello_world.index.json
new file mode 100644
index 00000000..311847da
--- /dev/null
+++ b/uni-app/src/addon/zhjw/locale/zh-Hans/pages.hello_world.index.json
@@ -0,0 +1,2 @@
+{}
+
diff --git a/uni-app/src/addon/zhjw/pages/hello_world/index.vue b/uni-app/src/addon/zhjw/pages/hello_world/index.vue
new file mode 100644
index 00000000..5adac7af
--- /dev/null
+++ b/uni-app/src/addon/zhjw/pages/hello_world/index.vue
@@ -0,0 +1,18 @@
+<template>
+	<text class="text-[20px]">{{helloWorld}}</text>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue';
+import { getHelloWorld } from '@/addon/zhjw/api/hello_world'
+import { onLoad } from '@dcloudio/uni-app'
+let helloWorld = ref('');
+onLoad(() => {
+    getHelloWorld().then((res) => {
+        helloWorld.value = res.data
+    })
+})
+</script>
+<style lang="scss" scoped>
+
+</style>
diff --git a/uni-app/src/app/api/auth.ts b/uni-app/src/app/api/auth.ts
new file mode 100644
index 00000000..830eb5d9
--- /dev/null
+++ b/uni-app/src/app/api/auth.ts
@@ -0,0 +1,126 @@
+import request from '@/utils/request'
+
+/**
+ * 用户名登录
+ */
+export function usernameLogin(data: AnyObject) {
+    if (uni.getStorageSync('pid')) {
+        data.pid = uni.getStorageSync('pid');
+    }
+    return request.get('login', data, { showErrorMessage: true })
+}
+
+/**
+ * 手机验证码登录
+ */
+export function mobileLogin(data: AnyObject) {
+    if (uni.getStorageSync('pid')) {
+        data.pid = uni.getStorageSync('pid');
+    }
+    return request.post('login/mobile', data, { showErrorMessage: true })
+}
+
+/**
+ * 获取登录配置
+ */
+export function getConfig(params: Record<string, any>) {
+    return request.get('login/config', params)
+}
+
+/**
+ * 退出登录
+ */
+export function logout() {
+    return request.put('auth/logout')
+}
+
+/**
+ * 用户名注册
+ */
+export function usernameRegister(data: AnyObject) {
+    let url = 'register'
+    if (uni.getStorageSync('pid')) {
+        data.pid = uni.getStorageSync('pid');
+    }
+    return request.post(url, data, { showErrorMessage: true })
+}
+
+/**
+ * 手机号注册
+ */
+export function mobileRegister(data: AnyObject) {
+    let url = 'register/mobile'
+    if (uni.getStorageSync('pid')) {
+        data.pid = uni.getStorageSync('pid');
+    }
+    return request.post(url, data, { showErrorMessage: true })
+}
+
+/**
+ * 微信公众号授权信息
+ */
+export function wechatUser(data: AnyObject) {
+    return request.get('wechat/user', data, { showErrorMessage: false })
+}
+
+/**
+ * 微信公众号授权信息登录（openid）
+ */
+export function wechatUserLogin(data: AnyObject) {
+    if (uni.getStorageSync('pid')) {
+        data.pid = uni.getStorageSync('pid');
+    }
+    return request.post('wechat/userlogin', data, { showErrorMessage: true })
+}
+
+/**
+ * 微信公众号授权登录
+ */
+export function wechatLogin(data: AnyObject) {
+    if (uni.getStorageSync('pid')) {
+        data.pid = uni.getStorageSync('pid');
+    }
+    return request.post('wechat/login', data, { showErrorMessage: false })
+}
+
+/**
+ * 微信公众号号修改openid
+ */
+export function updateWechatOpenid(data: AnyObject) {
+    return request.put('wechat/update_openid', data, { showErrorMessage: false })
+}
+
+/**
+ * 微信小程序授权登录
+ */
+export function weappLogin(data: AnyObject) {
+    if (uni.getStorageSync('pid')) {
+        data.pid = uni.getStorageSync('pid');
+    }
+    return request.post('weapp/login', data, { showErrorMessage: false })
+}
+
+/**
+ * 微信小程序修改openid
+ */
+export function updateWeappOpenid(data: AnyObject) {
+    return request.put('weapp/update_openid', data, { showErrorMessage: false })
+}
+
+/**
+ * 绑定手机号
+ */
+export function bind(data: AnyObject) {
+    let url = 'bind'
+    if (uni.getStorageSync('pid')) {
+        data.pid = uni.getStorageSync('pid');
+    }
+    return request.post(url, data, { showErrorMessage: true })
+}
+
+/**
+ * 记录会员访问日志【目前只更新最后访问时间】
+ */
+export function memberLog(data: AnyObject) {
+    return request.post('member/log', data, { showErrorMessage: false })
+}
diff --git a/uni-app/src/app/api/diy.ts b/uni-app/src/app/api/diy.ts
new file mode 100644
index 00000000..a6595028
--- /dev/null
+++ b/uni-app/src/app/api/diy.ts
@@ -0,0 +1,22 @@
+import request from '@/utils/request'
+
+/**
+ * 获取自定义页面信息
+ */
+export function getDiyInfo(params: Record<string, any>) {
+    return request.get('diy/diy', params)
+}
+
+/**
+ * 获取底部导航列表
+ */
+export function getTabbarList(params: Record<string, any>) {
+    return request.get('diy/tabbar/list', params)
+}
+
+/**
+ * 获取页面分享信息
+ */
+export function getShareInfo(params: Record<string, any>) {
+    return request.get('diy/share', params)
+}
diff --git a/uni-app/src/app/api/diy_form.ts b/uni-app/src/app/api/diy_form.ts
new file mode 100644
index 00000000..cb2b7d5b
--- /dev/null
+++ b/uni-app/src/app/api/diy_form.ts
@@ -0,0 +1,29 @@
+import request from '@/utils/request'
+
+/**
+ * 获取自定义表单信息
+ */
+export function getDiyFormInfo(params: Record<string, any>) {
+    return request.get(`diy/form`,params)
+}
+
+/**
+ * 提交表单数据
+ */
+export function addFormRecord(params: Record<string, any>) {
+    return request.post('diy/form/record', params)
+}
+
+/**
+ * 获取表单填写结果信息
+ */
+export function getFormResultInfo(params: Record<string, any>) {
+    return request.get('diy/form/result', params)
+}
+
+/**
+ * 获取表单填写记录
+ */
+export function getFormRecord(params: Record<string, any>) {
+    return request.get(`diy/form/record`,params)
+}
diff --git a/uni-app/src/app/api/friendspay.ts b/uni-app/src/app/api/friendspay.ts
new file mode 100644
index 00000000..a9a9417b
--- /dev/null
+++ b/uni-app/src/app/api/friendspay.ts
@@ -0,0 +1,7 @@
+import request from '@/utils/request'
+/**
+ * 获取帮付信息
+ */
+export function getFriendspayInfo(tradeType : string, tradeId : number) {
+    return request.get(`pay/friendspay/info/${tradeType}/${tradeId}`, {}, { showErrorMessage: true })
+}
\ No newline at end of file
diff --git a/uni-app/src/app/api/member.ts b/uni-app/src/app/api/member.ts
new file mode 100644
index 00000000..eb261368
--- /dev/null
+++ b/uni-app/src/app/api/member.ts
@@ -0,0 +1,277 @@
+import request from '@/utils/request'
+
+export function getMemberInfo() {
+    return request.get('member/member')
+}
+
+/**
+ * 获取积分流水
+ */
+export function getPointList(data: AnyObject) {
+    return request.get('member/account/point', data)
+}
+
+/**
+ * 获取积分来源用途
+ */
+export function getPointType(account_type: string) {
+    return request.get(`member/account/fromtype/${ account_type }`)
+}
+
+/**
+ * 获取不可提现余额流水
+ */
+export function getBalanceList(data: AnyObject) {
+    return request.get('member/account/balance', data)
+}
+
+/**
+ * 获取余额流水,条件获取
+ */
+export function getBalanceListAll(data: AnyObject) {
+    return request.get('member/account/balance_list', data)
+}
+
+/**
+ * 获取可提现余额流水
+ */
+export function getMoneyList(data: AnyObject) {
+    return request.get('member/account/money', data)
+}
+
+/**
+ * 会员信息修改
+ */
+export function modifyMember(data: AnyObject) {
+    return request.put(`member/modify/${ data.field }`, data, { showErrorMessage: true })
+}
+
+/**
+ * 登录会员绑定手机号
+ */
+export function bindMobile(data: AnyObject) {
+    if (uni.getStorageSync('pid')) {
+        data.pid = uni.getStorageSync('pid');
+    }
+    return request.put('member/mobile', data, { showErrorMessage: true })
+}
+
+/**
+ * 获取手机号
+ */
+export function getMobile(data: AnyObject) {
+    if (uni.getStorageSync('pid')) {
+        data.pid = uni.getStorageSync('pid');
+    }
+    return request.put('member/getmobile', data, { showErrorMessage: true })
+}
+
+/**
+ * 提现转账方式
+ */
+export function cashOutTransferType() {
+    return request.get('member/cash_out/transfertype')
+}
+
+/**
+ * 提现配置
+ */
+export function cashOutConfig() {
+    return request.get('member/cash_out/config')
+}
+
+/**
+ * 申请余额提现
+ */
+export function cashOutApply(data: AnyObject) {
+    return request.post('member/cash_out/apply', data, { showSuccessMessage: true, showErrorMessage: true })
+}
+
+/**
+ * 获取提现账户信息
+ */
+export function getCashoutAccountInfo(data: AnyObject) {
+    return request.get(`member/cashout_account/${ data.account_id }`, {})
+}
+
+/**
+ * 获取首条提现账户信息
+ */
+export function getFirstCashoutAccountInfo(data: AnyObject) {
+    return request.get('member/cashout_account/firstinfo', data)
+}
+
+/**
+ * 获取提现账户列表
+ */
+export function getCashoutAccountList(data: AnyObject) {
+    return request.get(`member/cashout_account`, data)
+}
+
+/**
+ * 获取提现记录列表
+ */
+export function getCashOutList(data: AnyObject) {
+    return request.get(`member/cash_out`, data)
+}
+
+/**
+ * 获取提现记录详情
+ */
+export function getCashOutDetail(id: number) {
+    return request.get(`member/cash_out/${ id }`)
+}
+
+/**
+ * 添加提现账户
+ */
+export function addCashoutAccount(data: AnyObject) {
+    return request.post('member/cashout_account', data, { showSuccessMessage: true, showErrorMessage: true })
+}
+
+/**
+ * 添加提现账户
+ */
+export function editCashoutAccount(data: AnyObject) {
+    return request.put(`member/cashout_account/${ data.account_id }`, data, {
+        showSuccessMessage: true,
+        showErrorMessage: true
+    })
+}
+
+/**
+ * 删除提现账户
+ */
+export function deleteCashoutAccount(accountId: number) {
+    return request.delete(`member/cashout_account/${ accountId }`, { showSuccessMessage: true, showErrorMessage: true })
+}
+
+/**
+ * 佣金账户流水
+ */
+export function getMemberCommission(data: AnyObject) {
+    return request.get(`member/account/commission`, data)
+}
+
+/**
+ * 佣金列表
+ */
+export function getCommissionList(data: AnyObject) {
+    return request.get(`member/account/commission`, data)
+}
+
+/**
+ * 获取账号变动类型
+ */
+export function getAccountType(params: Record<string, any>) {
+    return request.get(`member/account/fromtype/${ params.account_type }`)
+}
+
+/**
+ * 获取会员收货地址列表
+ * @param params
+ * @returns
+ */
+export function getAddressList(params: Record<string, any>) {
+    return request.get(`member/address`, params)
+}
+
+/**
+ * 获取会员收货地址详情
+ * @param id 会员收货地址id
+ * @returns
+ */
+export function getAddressInfo(id: number) {
+    return request.get(`member/address/${ id }`);
+}
+
+/**
+ * 添加会员收货地址
+ * @param params
+ * @returns
+ */
+export function addAddress(params: Record<string, any>) {
+    return request.post('member/address', params, { showErrorMessage: true, showSuccessMessage: true })
+}
+
+/**
+ * 编辑会员收货地址
+ * @param params
+ * @returns
+ */
+export function editAddress(params: Record<string, any>) {
+    return request.put(`member/address/${ params.id }`, params, { showErrorMessage: true, showSuccessMessage: true })
+}
+
+/**
+ * 删除会员收货地址
+ * @param id
+ * @returns
+ */
+export function deleteAddress(id: number) {
+    return request.delete(`member/address/${ id }`, { showErrorMessage: true, showSuccessMessage: true })
+}
+
+/**
+ * 获取会员等级
+ */
+export function getMemberLevel() {
+    return request.get(`member/level`);
+}
+
+/**
+ * 获取成长值任务
+ */
+export function getTaskGrowth() {
+    return request.get(`task/growth`);
+}
+
+/**
+ * 获取签到日期
+ */
+export function getSignInfo(data: AnyObject) {
+    return request.get(`member/sign/info/${ data.year }/${ data.month }`, {})
+}
+
+/**
+ * 获取日签到奖励
+ */
+export function getDayPack(data: AnyObject) {
+    return request.get(`member/sign/award/${ data.year }/${ data.month }/${ data.day }`)
+}
+
+/**
+ * 获取签到设置
+ */
+export function getSignConfig() {
+    return request.get(`member/sign/config`)
+}
+
+/**
+ * 点击签到
+ * @returns
+ */
+export function setSign() {
+    return request.post('member/sign')
+}
+
+/**
+ * 获取个人积分
+ */
+export function getMemberAccountPointcount() {
+    return request.get(`member/account/pointcount`)
+}
+
+/**
+ * 获取积分任务
+ */
+export function getTaskPoint() {
+    return request.get(`task/point`)
+}
+
+/**
+ * 充值配置
+ */
+export function rechargeConfig() {
+    return request.get('recharge/config')
+}
diff --git a/uni-app/src/app/api/pay.ts b/uni-app/src/app/api/pay.ts
new file mode 100644
index 00000000..18f86337
--- /dev/null
+++ b/uni-app/src/app/api/pay.ts
@@ -0,0 +1,15 @@
+import request from '@/utils/request'
+
+/**
+ * 支付
+ */
+export function pay(data : AnyObject) {
+    return request.post(`pay`, data, { showErrorMessage: true })
+}
+
+/**
+ * 获取支付信息
+ */
+export function getPayInfo(tradeType : string, tradeId : number, params: Record<string, any>) {
+    return request.get(`pay/info/${tradeType}/${tradeId}`, params, { showErrorMessage: true })
+}
\ No newline at end of file
diff --git a/uni-app/src/app/api/system.ts b/uni-app/src/app/api/system.ts
new file mode 100644
index 00000000..33c19c9a
--- /dev/null
+++ b/uni-app/src/app/api/system.ts
@@ -0,0 +1,153 @@
+import request from '@/utils/request'
+
+/**
+ * 获取验证码
+ */
+export function getCaptcha() {
+    return request.get('captcha', {}, { showErrorMessage: true })
+}
+
+/**
+ * 获取微信公众号授权码
+ */
+export function getWechatAuthCode(data: AnyObject) {
+    return request.get('wechat/codeurl', data, { showErrorMessage: false })
+}
+
+/**
+ * 同步微信信息
+ */
+export function wechatSync(data: AnyObject) {
+    return request.post('wechat/sync', data, { showErrorMessage: false })
+}
+
+/**
+ * 获取协议信息
+ */
+export function getAgreementInfo(key: string) {
+    return request.get(`agreement/${ key }`)
+}
+
+/**
+ * 重置密码
+ */
+export function resetPassword(data: AnyObject) {
+    return request.post(`password/reset`, data, { showErrorMessage: true })
+}
+
+/**
+ * 发送短信验证码
+ */
+export function sendSms(data: AnyObject) {
+    return request.post(`send/mobile/${ data.type }`, data, { showErrorMessage: true })
+}
+
+/**
+ * 获取微信jssdk config
+ */
+export function getWechatSdkConfig(data: AnyObject) {
+    return request.get('wechat/jssdkconfig', data, { showErrorMessage: false })
+}
+
+/**
+ * 上传图片
+ */
+export function uploadImage(data: AnyObject) {
+    return request.upload('file/image', data, { showErrorMessage: true })
+}
+
+/**
+ * 拉取图片
+ */
+export function fetchImage(data: AnyObject) {
+    return request.post('file/image/fetch', data)
+}
+
+/**
+ * 拉取base64图片
+ */
+export function fetchBase64Image(data: AnyObject) {
+    return request.post('file/image/base64', data)
+}
+
+/**
+ * 上传视频
+ */
+export function uploadVideo(data: AnyObject) {
+    return request.upload('file/video', data, { showErrorMessage: true })
+}
+/**
+ * 获取站点信息
+ */
+export function getSiteInfo() {
+    return request.get('site')
+}
+
+/**
+ * 获取微信小程序订阅消息模板id
+ */
+export function getWeappTemplateId(keys: string) {
+    return request.get('weapp/subscribemsg', { keys })
+}
+
+/**
+ * 获取下级地址列表
+ * @param pid
+ */
+export function getAreaListByPid(pid: number = 0) {
+    return request.get(`area/list_by_pid/${ pid }`)
+}
+
+/**
+ * 获取地址树列表
+ * @param level
+ */
+export function getAreatree(level: number = 1) {
+    return request.get(`area/tree/${ level }`)
+}
+
+/**
+ * 获取地址
+ * @param code
+ */
+export function getAreaByCode(code: number | string) {
+    return request.get(`area/code/${ code }`)
+}
+
+/**
+ * 通过经纬度查询地址
+ * @param params
+ */
+export function getAddressByLatlng(params: Record<string, any>) {
+    return request.get(`area/address_by_latlng`, params, { showErrorMessage: true })
+}
+
+/**
+ * 获取海报
+ * @returns
+ */
+export function getPoster(params: Record<string, any>) {
+    return request.get("poster", params)
+}
+
+/**
+ * 获取地图设置
+ */
+export function getMap() {
+    return request.get('map')
+}
+
+/**
+ * 通过外部交易号获取消息跳转路径
+ * @param params
+ */
+export function getMsgJumpPath(params: Record<string, any>) {
+    return request.get('weapp/getMsgJumpPath', params)
+}
+
+/**
+ * 获取初始化数据信息
+ */
+export function getInitInfo(params: Record<string, any>) {
+    return request.get('init', params)
+}
\ No newline at end of file
diff --git a/uni-app/src/app/api/verify.ts b/uni-app/src/app/api/verify.ts
new file mode 100644
index 00000000..7c03bd42
--- /dev/null
+++ b/uni-app/src/app/api/verify.ts
@@ -0,0 +1,43 @@
+import request from '@/utils/request'
+
+/**
+ * 获取核销信息
+ */
+export function getVerifyCode(type: string, params: AnyObject) {
+    return request.get('verify', { type, data: params })
+}
+
+/**
+ * 获取核销记录
+ */
+export function getVerifyRecords(params: Record<string, any>) {
+    return request.get('verify_records', params)
+}
+
+/**
+ * 判断是否是核销员
+ */
+export function getCheckVerifier() {
+    return request.get('check_verifier')
+}
+
+/**
+ * 获取核销信息
+ */
+export function getVerifierInfo(params: Record<string, any>) {
+    return request.get(`get_verify_by_code`,params)
+}
+
+/**
+ * 核销
+ */
+export function verify(code: string) {
+    return request.post(`verify/${ code }`, {}, { showErrorMessage: true })
+}
+
+/**
+ * 获取核销详情
+ */
+export function getVerifyDetail(code: string) {
+    return request.get(`verify_detail/${ code }`, {}, { showErrorMessage: true })
+}
diff --git a/uni-app/src/app/components/diy/active-cube/index.vue b/uni-app/src/app/components/diy/active-cube/index.vue
new file mode 100644
index 00000000..28762547
--- /dev/null
+++ b/uni-app/src/app/components/diy/active-cube/index.vue
@@ -0,0 +1,274 @@
+<template>
+	<view :style="warpCss">
+		<view :style="maskLayer"></view>
+
+		<view class="diy-active-cube relative">
+			<view class="active-cube-wrap pt-[28rpx] px-[20rpx] pb-[24rpx]">
+				<view class="flex items-center" v-if="diyComponent.titleStyle.value == 'style-1'">
+					<view class="mr-[10rpx] font-500 text-[30rpx]" :style="{color: diyComponent.titleColor }" @click="diyStore.toRedirect(diyComponent.textLink)">{{ diyComponent.text }}</view>
+					<view v-if="diyComponent.subTitle.text" @click="diyStore.toRedirect(diyComponent.subTitle.link)" class="text-center text-[22rpx] rounded-[40rpx] rounded-tl-[10rpx] py-[6rpx] px-[14rpx]" :style="{'color': diyComponent.subTitle.textColor, background: 'linear-gradient(90deg, '+ diyComponent.subTitle.startColor + ', '+ diyComponent.subTitle.endColor + ')'}">{{ diyComponent.subTitle.text }}</view>
+				</view>
+				<view class="flex items-center" v-if="diyComponent.titleStyle.value == 'style-2'">
+					<view class="mr-[10rpx] font-500 text-[30rpx]" :style="{color: diyComponent.titleColor }" @click="diyStore.toRedirect(diyComponent.textLink)">{{ diyComponent.text }}</view>
+					<view v-if="diyComponent.subTitle.text" @click="diyStore.toRedirect(diyComponent.subTitle.link)" class="text-center text-[22rpx] rounded-[6rpx] py-[6rpx] px-[14rpx]" :style="{'color': diyComponent.subTitle.textColor, background: 'linear-gradient(90deg, '+ diyComponent.subTitle.startColor + ', '+ diyComponent.subTitle.endColor + ')'}">{{ diyComponent.subTitle.text }}</view>
+				</view>
+				<view class="flex items-center" v-if="diyComponent.titleStyle.value == 'style-3'">
+					<view class="mr-[10rpx] font-500 text-[30rpx]" @click="diyStore.toRedirect(diyComponent.textLink)" :style="{color: diyComponent.titleColor }">{{ diyComponent.text }}</view>
+					<view class="relative h-[36rpx]" @click="diyStore.toRedirect(diyComponent.subTitle.link)">
+						<view v-if="diyComponent.subTitle.text" class="flex items-center text-[22rpx] leading-0 min-w-[60rpx] h-[34rpx] pl-[10rpx] pr-[34rpx]" :style="{'color': diyComponent.subTitle.textColor, 'background-image':'url('+img('static/resource/images/diy/active_cube/bg_2.png')+')','background-size': '100% 100%','background-repeat': 'no-repeat'}">{{ diyComponent.subTitle.text }}</view>
+<!-- 						<image class="absolute left-0 top-0 bottom-0 !w-[16rpx] !h-[36rpx]" :src="img('static/resource/images/diy/active_cube/block_style2_1.png')" mode="scaleToFill"/>
+						<image class="absolute right-0 top-0 bottom-0 !w-[28rpx] !h-[36rpx]" :src="img('static/resource/images/diy/active_cube/block_style2_2.png')" mode="scaleToFill"/> -->
+					</view>
+				</view>
+				<view class="flex items-center justify-between" v-if="diyComponent.titleStyle.value == 'style-4'">
+					<view class="font-500 text-[30rpx]" @click="diyStore.toRedirect(diyComponent.textLink)" :style="{color: diyComponent.titleColor }">{{ diyComponent.text }}</view>
+					<view v-if="diyComponent.subTitle.text" @click="diyStore.toRedirect(diyComponent.subTitle.link)" class="text-[22rpx] rounded-[40rpx] pl-[16rpx] pr-[8rpx] h-[42rpx] flex-center" :style="{'color': diyComponent.subTitle.textColor, background: 'linear-gradient(90deg, '+ diyComponent.subTitle.startColor + ', '+ diyComponent.subTitle.endColor + ')'}">
+						<text>{{ diyComponent.subTitle.text }}</text>
+						<text class="nc-iconfont nc-icon-youV6xx !text-[26rpx]"></text>
+					</view>
+				</view>
+				<view class="flex items-center" v-if="diyComponent.titleStyle.value == 'style-5'">
+					<view class="h-[32rpx] flex items-center" v-if="diyComponent.textImg" @click="diyStore.toRedirect(diyComponent.textLink)">
+						<image class="h-[100%] w-[auto]" :src="img(diyComponent.textImg)" mode="heightFix" />
+					</view>
+					<view v-if="diyComponent.subTitle.text && diyComponent.textImg" class="mx-[16rpx] w-[2rpx] h-[24rpx]" :style="{'background': diyComponent.subTitle.textColor}"></view>
+					<view v-if="diyComponent.subTitle.text" @click="diyStore.toRedirect(diyComponent.subTitle.link)" class="text-center text-[22rpx] py-[6rpx]" :style="{'color': diyComponent.subTitle.textColor, background: 'linear-gradient(90deg, '+ diyComponent.subTitle.startColor + ', '+ diyComponent.subTitle.endColor + ')'}">{{ diyComponent.subTitle.text }}</view>
+				</view>
+
+				<view class="bd flex flex-wrap justify-between">
+					<template v-for="item in diyComponent.list" :key="item.id">
+						<view v-if="diyComponent.blockStyle.value == 'style-1'" @click="diyStore.toRedirect(item.link)" class="item flex justify-between px-[20rpx] py-[30rpx] bg-white mt-[20rpx]" :style="commonTempCss(item)">
+							<view class="flex-1 flex items-baseline flex-col">
+								<view class="text-[28rpx] pb-[10rpx] text-[#333]" :style="{ fontWeight : diyComponent.blockStyle.fontWeight }">{{ item.title.text }}</view>
+								<view class="text-[22rpx] text-[#999] pb-[30rpx]">{{ item.subTitle.text }}</view>
+								<view class="link relative text-[22rpx] leading-[40rpx] flex items-center text-white rounded-r-[20rpx] h-[40rpx] pl-[26rpx] pr-[10rpx]" :style="btnCss(item.moreTitle)" v-if="item.moreTitle.text">
+									<text class="mr-[8rpx]">{{ item.moreTitle.text }}</text>
+									<text class="iconfont iconjiantou-you-cuxiantiao-fill !text-[20rpx] text-[#fff]"></text>
+									<image class="absolute left-0 top-0 bottom-0 !w-[28rpx]" :src="img('static/resource/images/diy/active_cube/block_style1_1.png')" mode="scaleToFill"/>
+								</view>
+							</view>
+							<view class="img-box ml-[10rpx] w-[130rpx]" v-if="item.imageUrl">
+								<image :src="img(item.imageUrl)" mode="aspectFit" />
+							</view>
+							<view class="img-box ml-[10rpx] flex items-center justify-center w-[130rpx] bg-[#f3f4f6]" v-else>
+								<u-icon name="photo" color="#999" size="50"></u-icon>
+							</view>
+						</view>
+
+						<view v-if="diyComponent.blockStyle.value == 'style-2'" @click="diyStore.toRedirect(item.link)" class="item h-[150rpx] flex justify-between p-[20rpx] bg-white mt-[20rpx]" :style="commonTempCss(item)">
+							<view class="flex-1 flex items-baseline flex-col">
+								<view class="text-[26rpx] mt-[10rpx] pb-[16rpx]" :style="{ fontWeight : diyComponent.blockStyle.fontWeight }">{{ item.title.text }}</view>
+								<view class="text-[22rpx] text-gray-500 pb-[26rpx]">{{ item.subTitle.text }}</view>
+								<view class="link relative text-[22rpx] leading-[40rpx] flex items-center text-white rounded-[20rpx] h-[40rpx] pl-[20rpx] pr-[10rpx]" :style="btnCss(item.moreTitle)" v-if="item.moreTitle.text">
+									<text class="mr-[8rpx]" :class="{'italic': diyComponent.blockStyle.btnText == 'italics'}">{{ item.moreTitle.text }}</text>
+									<text class="iconfont iconjiantou-you-cuxiantiao-fill !text-[20rpx] text-[#fff]"></text>
+								</view>
+							</view>
+							<view class="img-box ml-[10rpx] w-[130rpx]" v-if="item.imageUrl">
+								<image :src="img(item.imageUrl)" mode="aspectFit" />
+							</view>
+							<view class="img-box ml-[10rpx] flex items-center justify-center w-[130rpx] bg-[#f3f4f6]" v-else>
+								<u-icon name="photo" color="#999" size="50"></u-icon>
+							</view>
+						</view>
+					</template>
+				</view>
+				<scroll-view :scroll-x="true" class="whitespace-nowrap" :id="'warpStyle3-'+diyComponent.id" v-if="diyComponent.blockStyle.value == 'style-3'">
+					<view v-for="(item,index) in diyComponent.list" :key="item.id" class="inline-flex">
+						<view :id="'item'+index+diyComponent.id" @click="diyStore.toRedirect(item.link)" class="flex flex-col items-center justify-between p-[10rpx] bg-white mt-[20rpx] w-[157rpx] h-[200rpx] box-border" :style="itemStyle3 + commonTempCss(item)"  :class="{'!mr-[0rpx]': index+1 === diyComponent.list.length}">
+							<view class="w-[141rpx] h-[141rpx] rounded-[var(--rounded-small)] overflow-hidden" v-if="item.imageUrl">
+								<image class="w-[141rpx] h-[141rpx]" :src="img(item.imageUrl)" mode="aspectFit" />
+							</view>
+							<view class="w-[141rpx] h-[141rpx] relative flex-shrink-0" v-else>
+								<view class="absolute left-0 top-0 flex items-center justify-center w-[141rpx] h-[141rpx] bg-[#f3f4f6]">
+									<u-icon name="photo" color="#999" size="50"></u-icon>
+								</view>
+							</view>
+							<view class="mt-[10rpx] mb-[2rpx] text-[26rpx]" :style="{ color : item.title.textColor,fontWeight : diyComponent.blockStyle.fontWeight }">{{ item.title.text }}</view>
+						</view>
+					</view>
+				</scroll-view>
+
+				<scroll-view scroll-x="true" class="whitespace-nowrap" :id="'warpStyle4-'+diyComponent.id" v-if="diyComponent.blockStyle.value == 'style-4'">
+					<view v-for="(item,index) in diyComponent.list" :key="item.id" class="inline-flex">
+						<view :id="'item'+index+diyComponent.id" @click="diyStore.toRedirect(item.link)" class="flex flex-col items-center justify-between p-[4rpx] bg-[#F93D02] mt-[20rpx] box-border" :class="{'!mr-[0rpx]': index+1 === diyComponent.list.length}" :style="commonTempCss(item) + itemStyle4">
+							<view class="w-[149rpx] h-[149rpx] box-border px-[18rpx] pt-[16rpx] pb-[6rpx] bg-[#fff] flex flex-col items-center rounded-[var(--rounded-small)]">
+								<view class="w-[112rpx] h-[102rpx]" v-if="item.imageUrl">
+									<image class="w-[112rpx] h-[102rpx]" :src="img(item.imageUrl)" mode="aspectFit" />
+								</view>
+								<view class="w-[112rpx] h-[102rpx] relative flex-shrink-0" v-else>
+									<view class="absolute left-0 top-0 flex items-center justify-center w-[112rpx] h-[102rpx] bg-[#f3f4f6]">
+										<u-icon name="photo" color="#999" size="50"></u-icon>
+									</view>
+								</view>
+								<view class="relative -mt-[10rpx] text-[20rpx] bg-[#F3DAC5] text-[#ED6E00] rounded-[16rpx] px-[12rpx] h-[34rpx] flex-center" :style="{ color : item.subTitle.textColor, background : 'linear-gradient(to right,'+ item.subTitle.startColor +','+ item.subTitle.endColor + ')' }">{{ item.subTitle.text }}</view>
+							</view>
+							<view class="mt-[12rpx] mb-[12rpx] text-[26rpx] text-[#fff]" :style="{ fontWeight : (diyComponent.blockStyle.fontWeight == 'bold' ? diyComponent.blockStyle.fontWeight : '500') }">{{ item.title.text }}</view>
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup lang="ts">
+	// 活动魔方组件
+	import { ref,computed, watch, onMounted, nextTick,getCurrentInstance } from 'vue';
+	import useDiyStore from '@/app/stores/diy';
+	import { img } from '@/utils/common';
+
+	const props = defineProps(['component', 'index']);
+
+	const diyStore = useDiyStore();
+
+	const diyComponent = computed(() => {
+		if (diyStore.mode == 'decorate') {
+			return diyStore.value[props.index];
+		} else {
+			return props.component;
+		}
+	})
+
+    const warpCss = computed(() => {
+        var style = '';
+        style += 'position:relative;';
+        if(diyComponent.value.componentStartBgColor) {
+            if (diyComponent.value.componentStartBgColor && diyComponent.value.componentEndBgColor) style += `background:linear-gradient(${diyComponent.value.componentGradientAngle},${diyComponent.value.componentStartBgColor},${diyComponent.value.componentEndBgColor});`;
+            else style += 'background-color:' + diyComponent.value.componentStartBgColor + ';';
+        }
+
+        if(diyComponent.value.componentBgUrl) {
+            style += `background-image:url('${ img(diyComponent.value.componentBgUrl) }');`;
+            style += 'background-size: cover;background-repeat: no-repeat;';
+        }
+
+        if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+        if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+        if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+        if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+
+        return style;
+
+    })
+
+	// 背景图加遮罩层
+	const maskLayer = computed(()=>{
+        var style = '';
+        if(diyComponent.value.componentBgUrl) {
+            style += 'position:absolute;top:0;width:100%;';
+            style += `background: rgba(0,0,0,${diyComponent.value.componentBgAlpha / 10});`;
+            style += `height:${height.value}px;`;
+
+            if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+            if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+            if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+            if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+        }
+
+		return style;
+	});
+	//商品样式三
+	const itemStyle3 = ref('');
+	const setItemStyle3 = ()=>{
+		// #ifdef MP-WEIXIN
+			uni.createSelectorQuery().in(instance).select('#warpStyle3-'+diyComponent.value.id).boundingClientRect((res:any) => {
+				uni.createSelectorQuery().in(instance).select('#item0'+diyComponent.value.id).boundingClientRect((data:any) => {
+					itemStyle3.value = `margin-right:${(res.width - data.width*4)/3}px;`
+				}).exec()
+			}).exec()
+		// #endif
+		// #ifdef H5
+			itemStyle3.value= 'margin-right:14rpx;'
+		// #endif
+	};
+	//商品样式四
+	const itemStyle4 = ref('');
+	const setItemStyle4 = ()=>{
+		// #ifdef MP-WEIXIN
+			uni.createSelectorQuery().in(instance).select('#warpStyle4-'+diyComponent.value.id).boundingClientRect((res:any) => {
+				uni.createSelectorQuery().in(instance).select('#item0'+diyComponent.value.id).boundingClientRect((data:any) => {
+					itemStyle4.value = `margin-right:${(res.width - data.width*4)/3}px;`
+				}).exec()
+			}).exec()
+		// #endif
+		// #ifdef H5
+			itemStyle4.value= 'margin-right:14rpx;'
+		// #endif
+	};
+
+	// 公共模块颜色
+	const commonTempCss = (data: any)=>{
+		var style = '';
+		if(data.listFrame.startColor && data.listFrame.endColor){
+			style += `background:linear-gradient(${data.listFrame.startColor},${data.listFrame.endColor});`;
+		}else{
+			style += `background:${data.listFrame.startColor || data.listFrame.endColor};`;
+		}
+		if (diyComponent.value.topElementRounded) style += 'border-top-left-radius:' + diyComponent.value.topElementRounded * 2 + 'rpx;';
+		if (diyComponent.value.topElementRounded) style += 'border-top-right-radius:' + diyComponent.value.topElementRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomElementRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomElementRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomElementRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomElementRounded * 2 + 'rpx;';
+		style += 'overflow: hidden;';
+		return style;
+	}
+
+    const btnCss = (item:any) => {
+        var style = '';
+        style += `background:linear-gradient(90deg,${item.startColor},${item.endColor});`;
+        return style;
+    };
+
+    onMounted(() => {
+	    refresh();
+	    // 装修模式下刷新
+	    if (diyStore.mode == 'decorate') {
+		    watch(
+				    () => diyComponent.value,
+				    (newValue, oldValue) => {
+					    if (newValue && newValue.componentName == 'ActiveCube') {
+						    refresh();
+					    }
+				    }
+		    )
+	    } else {
+		    watch(
+				    () => diyComponent.value,
+				    (newValue, oldValue) => {
+					    refresh();
+				    }
+		    )
+	    }
+    });
+
+    const instance = getCurrentInstance();
+    const height = ref(0)
+
+    const refresh = ()=> {
+        nextTick(() => {
+            const query = uni.createSelectorQuery().in(instance);
+            query.select('.diy-active-cube').boundingClientRect((data: any) => {
+                height.value = data.height;
+            }).exec();
+
+			if(diyComponent.value.blockStyle.value == 'style-3') setItemStyle3()
+			if(diyComponent.value.blockStyle.value == 'style-4') setItemStyle4()
+        })
+    }
+</script>
+
+<style lang="scss" scoped>
+	.active-cube-wrap {
+		.bd {
+			.item {
+				width: calc(46% - 20rpx);
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+
+			}
+		}
+	}
+</style>
diff --git a/uni-app/src/app/components/diy/carousel-search/index.vue b/uni-app/src/app/components/diy/carousel-search/index.vue
new file mode 100644
index 00000000..92b8998f
--- /dev/null
+++ b/uni-app/src/app/components/diy/carousel-search/index.vue
@@ -0,0 +1,798 @@
+<template>
+	<view :style="warpCss" class="goods-carousel-search-wrap">
+		<view class="relative pb-[20rpx]">
+			<view class="bg-img" :class="{'!-bottom-[200rpx]': diyComponent.bgGradient == true}">
+				<image v-if="diyComponent.swiper.control && diyComponent.swiper.list && diyComponent.swiper.list[swiperIndex].imageUrl" :src="img(diyComponent.swiper.list[swiperIndex].imageUrl)" mode="scaleToFill" class="w-full h-full" :show-menu-by-longpress="true"/>
+				<view v-else class="w-full h-full bg-[#fff]"></view>
+				<view class="bg-img-box" :style="bgImgBoxStyle"></view>
+			</view>
+			<view class="fixed-wrap" :style="fixedStyle">
+				<view v-if="diyComponent.search.style == 'style-1'" class="diy-search-wrap relative z-10" @click="diyStore.toRedirect(diyComponent.search.link)" :style="navbarInnerStyle">
+					<view class="img-wrap" v-if="diyComponent.search.logo">
+						<image :src="img(diyComponent.search.logo)" mode="aspectFit"/>
+					</view>
+					<view class="search-content" :style="{backgroundColor: diyComponent.search.bgColor }" @click.stop="diyStore.toRedirect(diyComponent.search.link)">
+						<text class="input-content text-[#fff] text-[24rpx] leading-[68rpx]" :style="{color: diyComponent.search.color }">{{isShowSearchPlaceholder ? diyComponent.search.text : ''}}</text>
+						<text class="nc-iconfont nc-icon-sousuo-duanV6xx1 w-[80rpx] h-[52rpx] flex items-center justify-center rounded-[50rpx] text-[28rpx] text-[#fff]" :style="{backgroundColor: diyComponent.search.btnBgColor, color: diyComponent.search.btnColor }"></text>
+						<swiper class="swiper-wrap" :interval="diyComponent.search.hotWord.interval * 1000" autoplay="true" vertical="true" circular="true" v-if="!isShowSearchPlaceholder">
+							<swiper-item class="swiper-item" v-for="(item) in diyComponent.search.hotWord.list" :key="item.id">
+								<view class="leading-[64rpx] text-[24rpx]" :style="{color: diyComponent.search.color }">{{ item.text }}</view>
+							</swiper-item>
+						</swiper>
+					</view>
+				</view>
+				<view v-if="diyComponent.search.style == 'style-2'" class="diy-search-wrap style-2 relative z-10" @click="diyStore.toRedirect(diyComponent.search.link)" >
+					<view class="flex items-center" :style="navbarInnerStyle">
+						<view class="img-wrap" v-if="diyComponent.search.logo">
+							<image :src="img(diyComponent.search.logo)" mode="aspectFit"/>
+						</view>
+						<view :style="searchSubTitleCss" class="text-[24rpx] h-[38rpx] flex items-center px-[12rpx] rounded-r-[20rpx] rounded-t-[20rpx] rounded-bl-[2rpx]">{{diyComponent.search.subTitle.text}}</view>
+					</view>
+					<view class="flex items-center w-full mt-[16rpx]">
+						<view @click.stop="locationVal.reposition()" v-if="systemStore.diyAddressInfo" :style="{color: diyComponent.search.positionColor}" class="mr-[30rpx]">
+							<view class="flex items-baseline font-500">
+								<text class="text-[24rpx] mr-[2rpx]">{{systemStore.diyAddressInfo.city}}</text>
+								<text class="iconfont iconxiaV6xx !text-[24rpx]"></text>
+							</view>
+							<view class="text-[18rpx] mt-[10rpx] truncate max-w-[160rpx]" v-if="systemStore.diyAddressInfo.community">{{systemStore.diyAddressInfo.community}}</view>
+						</view>
+						<view @click.stop="locationVal.reposition()" class="text-[24rpx] mr-[30rpx] truncate max-w-[160rpx]" :style="{color: diyComponent.search.positionColor}" v-else>{{ systemStore.defaultPositionAddress }}</view>
+
+						<view class="search-content" :style="{backgroundColor: diyComponent.search.bgColor }" @click.stop="diyStore.toRedirect(diyComponent.search.link)">
+							<text class="input-content text-[#fff] text-[24rpx] leading-[68rpx]" :style="{color: diyComponent.search.color }">{{isShowSearchPlaceholder ? diyComponent.search.text : ''}}</text>
+							<text class="nc-iconfont nc-icon-sousuo-duanV6xx1 w-[80rpx] h-[52rpx] flex items-center justify-center rounded-[50rpx] text-[28rpx] text-[#fff]" :style="{backgroundColor: diyComponent.search.btnBgColor, color: diyComponent.search.btnColor }"></text>
+							<swiper class="swiper-wrap" :interval="diyComponent.search.hotWord.interval * 1000" autoplay="true" vertical="true" circular="true" v-if="!isShowSearchPlaceholder">
+								<swiper-item class="swiper-item" v-for="(item) in diyComponent.search.hotWord.list" :key="item.id">
+									<view class="leading-[64rpx] text-[24rpx]" :style="{color: diyComponent.search.color }">{{ item.text }}</view>
+								</swiper-item>
+							</swiper>
+						</view>
+					</view>
+				</view>
+
+				<view class="tab-list-wrap relative z-10" v-if="diyComponent.tab.control">
+					<scroll-view scroll-x="true" class="scroll-wrap" :scroll-into-view="'a' + currTabIndex">
+						<view @click="changeData({ source : 'home' },-1)" class="scroll-item" :class="[{ active: currTabIndex == -1 }]">
+							<view class="name" :style="{'color': getTabColor(currTabIndex == -1)}">首页</view>
+							<!-- <view class="line" :style="{'background-color': getTabColor(currTabIndex == -1)}" v-if="currTabIndex == -1"></view> -->
+						</view>
+						<view v-for="(item, index) in diyComponent.tab.list" class="scroll-item" :class="[{ active: index == currTabIndex }]" @click="changeData(item,index)" :id="'a' + index" :key="index">
+							<view class="name" :style="{'color': getTabColor(index == currTabIndex)}">{{ item.text }}</view>
+							<!-- <view class="line" :style="{'background-color': getTabColor(index == currTabIndex)}" v-if="index == currTabIndex"></view> -->
+						</view>
+					</scroll-view>
+					<view v-if="diyComponent.tab.list.length" class="absolute tab-btn iconfont icona-yingyongliebiaoV6xx-32" @click="tabAllPopup = true"></view>
+				</view>
+
+				<view class="bg-img" v-if="fixedStyleBg">
+					<image v-if="diyComponent.swiper.control && diyComponent.swiper.list && diyComponent.swiper.list[swiperIndex].imageUrl" :src="img(diyComponent.swiper.list[swiperIndex].imageUrl)" mode="widthFix" class="w-full h-full" :show-menu-by-longpress="true"/>
+					<view v-else class="w-full h-full bg-[#fff]"></view>
+				</view>
+			</view>
+
+			<!-- 解决fixed定位后导航栏塌陷的问题 -->
+			<template v-if="diyStore.mode != 'decorate'">
+				<view v-if="diyComponent.positionWay == 'fixed' && props.scrollBool != undefined && props.scrollBool != -1" class="u-navbar-placeholder" :style="{ width: '100%', paddingTop: moduleHeight }"></view>
+			</template>
+
+			<!-- 轮播图 -->
+			<view class="relative" :class="{'mx-[20rpx]': swiperStyleBool && diyComponent.swiper.swiperStyle != 'style-3', 'swiper-style-3': diyComponent.swiper.swiperStyle == 'style-3'}" :style="carouselSwiperStyle()">
+				<swiper v-if="diyComponent.swiper.control" class="swiper" :style="{ height: imgHeight }" autoplay="true" circular="true" @change="swiperChange"
+					:class="{
+						'swiper-left': diyComponent.swiper.indicatorAlign == 'left',
+						'swiper-right': diyComponent.swiper.indicatorAlign == 'right',
+						'ns-indicator-dots': diyComponent.swiper.indicatorStyle == 'style-2',
+						'ns-indicator-dots-three': diyComponent.swiper.indicatorStyle == 'style-3'
+					}"
+					:previous-margin="swiperStyleBool ? 0 : '26rpx'" :next-margin="swiperStyleBool ? 0 : '26rpx'"
+				    :interval="diyComponent.swiper.interval * 1000" :indicator-dots="isShowDots"
+				    :indicator-color="diyComponent.swiper.indicatorColor" :indicator-active-color="diyComponent.swiper.indicatorActiveColor">
+					<swiper-item class="swiper-item" v-for="(item,index) in diyComponent.swiper.list" :key="item.id" :style="swiperWarpCss">
+						<view @click="diyStore.toRedirect(item.link)">
+							<view class="item" :style="{height: imgHeight}">
+								<image v-if="item.imageUrl" :src="img(item.imageUrl)" mode="scaleToFill" :style="swiperWarpCss" :class="['w-full h-full',{'swiper-animation': (swiperIndex != index && diyComponent.swiper.indicatorStyle != 'style-3')}]" :show-menu-by-longpress="true"/>
+								<image v-else :src="img('static/resource/images/diy/figure.png')" :style="swiperWarpCss" mode="scaleToFill" :class="['w-full h-full',{'swiper-animation': (swiperIndex != index && diyComponent.swiper.indicatorStyle != 'style-3')}]" :show-menu-by-longpress="true"/>
+							</view>
+						</view>
+					</swiper-item>
+				</swiper>
+				<!-- #ifdef MP-WEIXIN -->
+				<view v-if="diyComponent.swiper.list.length > 1" :class="[
+						'swiper-dot-box',
+						{ 'straightLine': diyComponent.swiper.indicatorStyle == 'style-2' },
+						{ 'straightLineStyle2': diyComponent.swiper.indicatorStyle == 'style-3' },
+						{ 'swiper-left': diyComponent.swiper.indicatorAlign == 'left' },
+						{ 'swiper-right': diyComponent.swiper.indicatorAlign == 'right' }
+					]">
+					<view v-for="(numItem, numIndex) in diyComponent.swiper.list" :key="numIndex" :class="['swiper-dot', { active: numIndex == swiperIndex }]" :style="[numIndex == swiperIndex ? { backgroundColor: diyComponent.swiper.indicatorActiveColor } : { backgroundColor: diyComponent.swiper.indicatorColor }]"></view>
+				</view>
+				<!-- #endif -->
+			</view>
+
+			<!-- 分类展开 -->
+			<u-popup :safeAreaInsetTop="true" :show="tabAllPopup" mode="top" @close="tabAllPopup = false">
+				<view class="text-sm px-[30rpx] pt-3" :style="{'padding-top':(menuButtonInfo.top+'px')}">全部分类</view>
+				<view class="flex flex-wrap pl-[30rpx] pt-[30rpx]">
+					<view @click="changeData({ source : 'home' },-1)" :class="['px-[26rpx] border-[2rpx] border-solid border-transparent h-[60rpx] mr-[30rpx] mb-[30rpx] flex items-center justify-center bg-[#F4F4F4] rounded-[8rpx] text-xs', { 'tab-select-popup': currTabIndex == -1 }]">
+						首页
+					</view>
+					<text @click="changeData(item,index)" v-for="(item, index) in diyComponent.tab.list" :key="index"
+						:class="['px-[26rpx] border-[2rpx] border-solid border-transparent h-[60rpx] mr-[30rpx] mb-[30rpx] flex items-center justify-center bg-[#F4F4F4] rounded-[8rpx] text-xs', { 'tab-select-popup': index == currTabIndex }]">
+						{{ item.text }}
+					</text>
+				</view>
+			</u-popup>
+		</view>
+
+		<!-- 展示微页面数据 -->
+		<template v-if="currentSource == 'diy_page'">
+
+			<view class="child-diy-template-wrap bg-index">
+
+				<diy-group :data="diyPageData"></diy-group>
+
+			</view>
+		</template>
+	</view>
+</template>
+
+<script setup lang="ts">
+	// 轮播搜索
+	import { ref, reactive, computed, watch, onMounted, nextTick, getCurrentInstance } from 'vue';
+	import { img } from '@/utils/common';
+	import useDiyStore from '@/app/stores/diy';
+    import diyGroup from '@/addon/components/diy/group/index.vue';
+    import { getDiyInfo } from '@/app/api/diy';
+    import {useLocation} from '@/hooks/useLocation'
+	import useSystemStore from '@/stores/system';
+	const systemStore = useSystemStore();
+	const systemInfo = uni.getSystemInfoSync();
+
+	const instance = getCurrentInstance();
+	const props = defineProps(['component', 'index', 'global', 'scrollBool']);
+	const diyStore = useDiyStore();
+	const diyComponent = computed(() => {
+		if (diyStore.mode == 'decorate') {
+			return diyStore.value[props.index];
+		} else {
+			return props.component;
+		}
+	})
+
+	/************** 定位-start ****************/
+	let isOpenLocation = false;
+	if(diyComponent.value && diyComponent.value.search.style == 'style-2' && diyStore.mode != 'decorate') {
+		isOpenLocation = true;
+	}
+
+	const locationVal = useLocation(isOpenLocation);
+	locationVal.onLoad();
+	locationVal.init();
+	/************** 定位-end ****************/
+
+	const warpCss = computed(() => {
+		var style = '';
+        if(diyComponent.value.componentStartBgColor) {
+            if (diyComponent.value.componentStartBgColor && diyComponent.value.componentEndBgColor) style += `background:linear-gradient(${diyComponent.value.componentGradientAngle},${diyComponent.value.componentStartBgColor},${diyComponent.value.componentEndBgColor});`;
+            else style += 'background-color:' + diyComponent.value.componentStartBgColor + ';';
+        }
+		if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		return style;
+	})
+
+    const moduleHeight:any = ref('')
+    const setModuleLocation = ()=> {
+        nextTick(() => {
+			setTimeout(()=>{
+				if(diyComponent.value.swiper.swiperStyle != 'style-3'){
+					const query = uni.createSelectorQuery().in(instance);
+					query.select('.fixed-wrap').boundingClientRect((data:any) => {
+						moduleHeight.value = (data.height || 0) + 'px';
+					}).exec();
+				}else{
+					moduleHeight.value = '';
+				}
+			})
+        })
+    }
+
+    const fixedStyleBg = ref(false);
+	const fixedStyle = computed(()=>{
+		var style = '';
+		if(diyComponent.value.swiper.swiperStyle == 'style-3'){
+			style += 'position: absolute;z-index: 99;left: 0;right: 0;';
+		}
+
+        // #ifdef H5
+		if(props.global.topStatusBar.isShow && props.global.topStatusBar.style == 'style-4') {
+            style += 'top:' + diyStore.topTabarHeight + 'px;';
+        }
+		if(diyComponent.value.swiper.swiperStyle == 'style-3'){
+			// h5,上移的像素，采取的是平均值
+			if (systemInfo.platform === 'ios') {
+			    style += 'top: 55px;';
+			}else{
+				style += 'top: 44.5px;';
+			}
+		}
+        // #endif
+
+		if (diyStore.mode == 'decorate') return style;
+
+        if(diyComponent.value.positionWay == 'fixed') {
+			if (props.scrollBool != undefined && props.scrollBool != -1) {
+				style += 'position: fixed;z-index: 99;top: 0;left: 0;right: 0;';
+			}
+
+            // #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+			menuButtonInfo = uni.getMenuButtonBoundingClientRect();
+			if(props.global.topStatusBar.isShow) {
+				style += 'top:' + diyStore.topTabarHeight + 'px;';
+			}
+            // #endif
+
+			if (props.scrollBool == 1 || props.scrollBool == 2) {
+				// #ifdef H5
+				if(props.global.topStatusBar.isShow && props.global.topStatusBar.style == 'style-4') {
+					style += 'top:' + diyStore.topTabarHeight + 'px;';
+				}
+				// #endif
+			}
+
+
+			fixedStyleBg.value = false;
+            if (props.scrollBool == 1) {
+				let str = diyComponent.value.fixedBgColor || "";
+				let arr = str.split(',');
+				let num = diyComponent.value.fixedBgColor ? parseInt(arr[arr.length - 1]) : 0;
+				if (!diyComponent.value.fixedBgColor || num == 0) {
+					fixedStyleBg.value = true;
+				} else {
+					fixedStyleBg.value = false;
+					style += 'background-color:' + diyComponent.value.fixedBgColor + ';';
+				}
+            }
+        }
+        return style;
+	})
+
+	// 轮播样式
+	const carouselSwiperStyle = ()=> {
+		let style = "";
+		if(diyComponent.value.swiper.swiperStyle == 'style-3'){
+			// #ifdef H5
+			// h5,上移的像素，采取的是平均值
+			if (systemInfo.platform === 'ios') {
+			    style = 'margin-top: -55px;';
+			}else{
+				style = 'margin-top: -44.5px;';
+			}
+			// #endif
+		}
+	    return style;
+	}
+
+	const getTabColor = (flag:any)=>{
+	    let color = '';
+        if(flag){
+            color = diyComponent.value.tab.selectColor;
+            if(diyComponent.value.positionWay == 'fixed' && props.scrollBool == 1) {
+                color = diyComponent.value.tab.fixedSelectColor;
+            }
+        }else{
+            color = diyComponent.value.tab.noColor;
+            if(diyComponent.value.positionWay == 'fixed' && props.scrollBool == 1) {
+                color = diyComponent.value.tab.fixedNoColor;
+            }
+        }
+
+        return color;
+	}
+
+	const isShowSearchPlaceholder = computed(()=> {
+        let flag = true;
+        for (let i = 0; i < diyComponent.value.search.hotWord.list.length; i++) {
+            let item = diyComponent.value.search.hotWord.list[i];
+            if (item.text) {
+                flag = false;
+                break;
+            }
+        }
+        return flag;
+    })
+
+	// 背景渐变
+	const bgImgBoxStyle = computed(()=>{
+		var style = '';
+		let str = props.global.pageStartBgColor ? props.global.pageStartBgColor : 'rgba(255,255,255,1)';
+		if(str.indexOf('(') > -1) {
+            let arr = str.split('(')[1].split(')')[0].split(',');
+            if (diyComponent.value.bgGradient == true) {
+                style += `background: linear-gradient(rgba(${arr[0]}, ${arr[1]}, ${arr[2]}, 0) 65%, rgba(${arr[0]}, ${arr[1]}, ${arr[2]}, 0.6) 70%, rgba(${arr[0]}, ${arr[1]}, ${arr[2]}, 0.85) 80%, rgba(${arr[0]}, ${arr[1]}, ${arr[2]}, 0.95) 90%,  rgb(${arr[0]}, ${arr[1]}, ${arr[2]}, 1) 100%);`;
+            }
+        }else{
+            style += `background: (${str});`;
+		}
+		return style;
+	});
+
+	// 轮播样式二
+	const swiperStyleBool = computed(()=>{
+		var style = diyComponent.value.swiper.swiperStyle == 'style-2' || diyComponent.value.swiper.swiperStyle == 'style-3' ? true : false;
+		return style;
+	})
+
+    const imgHeight = computed(() => {
+        return (diyComponent.value.swiper.imageHeight * 2) + 'rpx';
+    })
+
+    const swiperIndex = ref(0);
+
+    const swiperChange = e => {
+        swiperIndex.value = e.detail.current;
+    };
+
+    const swiperWarpCss = computed(() => {
+        var style = '';
+        if (diyComponent.value.swiper.topRounded) style += 'border-top-left-radius:' + diyComponent.value.swiper.topRounded * 2 + 'rpx;';
+        if (diyComponent.value.swiper.topRounded) style += 'border-top-right-radius:' + diyComponent.value.swiper.topRounded * 2 + 'rpx;';
+        if (diyComponent.value.swiper.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.swiper.bottomRounded * 2 + 'rpx;';
+        if (diyComponent.value.swiper.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.swiper.bottomRounded * 2 + 'rpx;';
+        return style;
+    })
+
+	const searchSubTitleCss = computed(() => {
+	    var style = '';
+	    if (diyComponent.value.search.subTitle.textColor) style += 'color:' + diyComponent.value.search.subTitle.textColor + ';';
+	    if (diyComponent.value.search.subTitle.startColor && diyComponent.value.search.subTitle.endColor) style += `background:linear-gradient(${diyComponent.value.search.subTitle.startColor}, ${diyComponent.value.search.subTitle.endColor});`;
+		else style += 'background-color:' + (diyComponent.value.search.subTitle.startColor || diyComponent.value.search.subTitle.endColor) + ';';
+		return style;
+	})
+
+	const currTabIndex = ref(-1)
+
+	const currentSource = ref('')
+
+	const changeData = (item:any,index:any)=> {
+        if (diyStore.mode == 'decorate') return false;
+        currentSource.value = item.source;
+        currTabIndex.value = index;
+	    if(item.source == 'home'){
+
+	        // 首页
+            diyStore.topFixedStatus = 'home'
+
+	    }else if (item.source == 'diy_page') {
+
+            // 查询微页面数据
+            diyStore.topFixedStatus = 'diy'
+            getDiyInfoFn(item.diy_id);
+
+        }
+    }
+
+    const tabAllPopup = ref(false);
+    let menuButtonInfo: any = {};
+    const navbarInnerStyle = ref('')
+	// 如果是小程序，获取右上角胶囊的尺寸信息，避免导航栏右侧内容与胶囊重叠(支付宝小程序非本API，尚未兼容)
+	// #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+		menuButtonInfo = uni.getMenuButtonBoundingClientRect();
+		// 导航栏内部盒子的样式
+		// 导航栏宽度，如果在小程序下，导航栏宽度为胶囊的左边到屏幕左边的距离
+		// 如果是各家小程序，导航栏内部的宽度需要减少右边胶囊的宽度
+		navbarInnerStyle.value += 'padding-top:' + menuButtonInfo.top + 'px;';
+	// #endif
+    onMounted(() => {
+        refresh();
+        // 装修模式下刷新
+        if (diyStore.mode == 'decorate') {
+            watch(
+                () => diyComponent.value,
+                (newValue, oldValue) => {
+                    if (newValue && newValue.componentName == 'CarouselSearch') {
+                        refresh();
+                    }
+                }
+            )
+        }
+		// 判断让轮播指示器是否出现
+		// #ifdef H5
+		isShowDots = computed(() => {
+			return diyComponent.value?.swiper?.list?.length > 1;
+		});
+		// #endif
+
+        // 如果是小程序，获取右上角胶囊的尺寸信息，避免导航栏右侧内容与胶囊重叠(支付宝小程序非本API，尚未兼容)
+        // #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+	    if(diyComponent.value.positionWay == 'fixed') {
+			if(props.global.topStatusBar.isShow == false) {
+				navbarInnerStyle.value = ''
+				let rightButtonWidth = menuButtonInfo.width ? menuButtonInfo.width * 2 + 'rpx' : '70rpx';
+				navbarInnerStyle.value += 'padding-right:calc(' + rightButtonWidth + ' + 30rpx);';
+				navbarInnerStyle.value += 'padding-top:' + menuButtonInfo.top + 'px;';
+			}else if(props.global.topStatusBar){
+				navbarInnerStyle.value = ''
+			}
+
+        }
+        // #endif
+    });
+
+	const refresh = ()=> {
+		setModuleLocation();
+		// 刷新定位
+		locationVal.refresh();
+
+		changeData({ source : 'home' },-1)
+        diyComponent.value.swiper.list.forEach((item : any) => {
+            if (item.imageUrl == '') {
+                item.imgWidth = 690;
+                item.imgHeight = 330;
+            }
+        });
+    }
+
+    const diyPageData = reactive({
+        pageMode: 'diy',
+        title: '',
+        global: {},
+        value: []
+    });
+
+    const getDiyInfoFn = (id:any) => {
+	    if(!id){
+			diyPageData.pageMode = 'diy';
+			diyPageData.title = '';
+			diyPageData.global = {};
+			diyPageData.value = [];
+			return;
+		}
+        getDiyInfo({
+            id
+        }).then((res : any) => {
+            if (res.data.value) {
+                let data = res.data;
+                diyPageData.pageMode = data.mode;
+                diyPageData.title = data.title;
+
+                let sources = JSON.parse(data.value);
+                diyPageData.global = sources.global;
+				diyPageData.global.topStatusBar.isShow = false; // 子页面不需要展示顶部导航栏
+                diyPageData.global.bottomTabBarSwitch = false; // 子页面不需要展示底部导航
+                diyPageData.value = sources.value;
+
+                diyPageData.value.forEach((item: any, index) => {
+                    item.pageStyle = '';
+                    if(item.pageStartBgColor) {
+                        if (item.pageStartBgColor && item.pageEndBgColor) item.pageStyle += `background:linear-gradient(${item.pageGradientAngle},${item.pageStartBgColor},${item.pageEndBgColor});`;
+                        else item.pageStyle += 'background-color:' + item.pageStartBgColor + ';';
+                    }
+
+                    if (item.margin) {
+                        if (item.margin.top > 0) {
+                            item.pageStyle += 'padding-top:' + item.margin.top * 2 + 'rpx' + ';';
+                        }
+                        item.pageStyle += 'padding-bottom:' + item.margin.bottom * 2 + 'rpx' + ';';
+                        item.pageStyle += 'padding-right:' + item.margin.both * 2 + 'rpx' + ';';
+                        item.pageStyle += 'padding-left:' + item.margin.both * 2 + 'rpx' + ';';
+                    }
+                });
+                uni.setNavigationBarTitle({
+                    title: diyPageData.title
+                })
+            }
+        });
+    }
+
+	// 轮播指示器
+	let isShowDots = ref(true)
+	// #ifdef H5
+	isShowDots.value = true;
+	// #endif
+
+	// #ifdef MP-WEIXIN
+	isShowDots.value = false;
+	// #endif
+
+	/******************************* 存储滚动值-start ***********************/
+	// 键名和组件名一致即可
+	let componentsScrollVal = uni.getStorageSync('componentsScrollValGroup')
+	if(componentsScrollVal && (typeof componentsScrollVal == "object")){
+		componentsScrollVal.CarouselSearch = 20
+		uni.setStorageSync('componentsScrollValGroup', componentsScrollVal);
+	}else{
+		let obj = {
+			CarouselSearch: 20
+		}
+		uni.setStorageSync('componentsScrollValGroup', obj);
+	}
+	/******************************* 存储滚动值-end ***********************/
+</script>
+
+<style lang="scss" scoped>
+	.goods-carousel-search-wrap{
+		.bg-img{
+			position: absolute;
+			width: 100%;
+			top: 0;
+			bottom: 0;
+			z-index: 0;
+			-webkit-filter: blur(0);
+			filter: blur(0);
+			overflow: hidden;
+			uni-image, image{
+				-webkit-filter: blur(15px);
+				filter: blur(15px);
+				-webkit-transform: scale(2) translateY(15%);
+				transform: scale(2) translateY(15%);
+			}
+			&.no-filter{
+				uni-image, image{
+					-webkit-filter: blur(0);
+					filter: blur(0);
+				}
+			}
+			.bg-img-box{
+				position: absolute;
+				top: 0;
+				right: 0;
+				bottom: 0;
+				left: 0;
+			}
+		}
+	}
+
+	.fixed-wrap {
+		&.fixed {
+			position: fixed;
+			left: 0;
+			right: 0;
+			top: 0;
+			z-index: 991;
+			transition: background .3s;
+		}
+	}
+
+	.diy-search-wrap{
+		display: flex;
+		position: relative;
+		align-items: center;
+		padding:16rpx;
+		.img-wrap{
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 140rpx;
+			height: 60rpx;
+			margin-right: 20rpx;
+			image{
+				width: 100%;
+				height:100%;
+			}
+		}
+
+		.search-content {
+			display: flex;
+			align-items: center;
+			padding-left: 32rpx;
+			padding-right: 6rpx;
+			border-radius: 50rpx;
+			background-color: rgba(255,255,255,.2);
+			flex: 1;
+			position: relative;
+			.input-content, .uni-input {
+				box-sizing: border-box;
+				display: block;
+				height: 60rpx;
+				line-height: 64rpx;
+				width: 100%;
+				padding-right: 20rpx;
+				color: #fff;
+				background: none;
+				flex: 1;
+			}
+			.iconfont {
+				font-size: 30rpx;
+				font-weight: bold;
+				color: #fff;
+			}
+			.swiper-wrap{
+				position: absolute;
+				width:80%;
+				height: 64rpx;
+				line-height: 64rpx;
+				color:#fff;
+			}
+		}
+
+		&.style-2{
+			flex-direction: column;
+			align-items: baseline;
+			.img-wrap{
+				margin-right: 10rpx;
+			}
+		}
+	}
+
+	.tab-list-wrap {
+		.scroll-wrap {
+			left: 0;
+			right: 0;
+			z-index: 5;
+			width: 100%;
+			white-space: nowrap;
+			box-sizing: border-box;
+			padding: 24rpx 80rpx 26rpx 20rpx;
+			line-height: 1;
+		}
+		.scroll-item {
+			display: inline-block;
+			text-align: center;
+			vertical-align: top;
+			width: auto;
+			position: relative;
+			padding: 0 20rpx;
+			.name {
+				font-size: 28rpx;
+				color: #333;
+				line-height: 32rpx;
+			}
+
+			&.active {
+				position: relative;
+				.name {
+					font-size: 30rpx;
+					font-weight: 500;
+				}
+			}
+		}
+		.tab-btn{
+			font-size: 34rpx;
+			/* #ifdef H5 */
+			top: 22rpx;
+			right: 20rpx;
+			line-height: 1;
+			color: #fff;
+			&::after{
+				content: "";
+				position: absolute;
+				top: 2rpx;
+				bottom: -4rpx;
+				left: -14rpx;
+				width: 2rpx;
+				background: linear-gradient( 180deg, #FFFFFF 16%, rgba(255,255,255,0) 86%);
+			}
+			/* #endif */
+			/* #ifdef MP-WEIXIN */
+			top: 24rpx;
+			right: 20rpx;
+			color: #fff;
+			&::after{
+				content: "";
+				position: absolute;
+				top: 2rpx;
+				bottom: 0;
+				left: -16rpx;
+				width: 4rpx;
+				background: linear-gradient( 180deg, #FFFFFF 16%, rgba(255,255,255,0) 92%);
+			}
+			/* #endif */
+		}
+	}
+	.tab-select-popup{
+		color: var(--primary-color);
+		border-color: var(--primary-color);
+		background-color: var(--primary-color-light);
+	}
+	.swiper-animation{
+		transform: scale(0.96, 0.96);
+		transition-duration: 0.3s;
+		transition-timing-function: ease;
+	}
+	// 轮播指示器
+	.swiper-right :deep(.uni-swiper-dots-horizontal) {
+		right: 80rpx;
+		display: flex;
+		justify-content: flex-end;
+		transform: translate(0);
+	}
+	.swiper-left :deep(.uni-swiper-dots-horizontal) {
+		left: 80rpx;
+		transform: translate(0);
+	}
+	// 指示器样式一
+	.swiper :deep(.uni-swiper-dot) {
+		width: 12rpx;
+		height: 12rpx;
+	}
+
+	// 指示器样式二
+	.swiper.ns-indicator-dots :deep(.uni-swiper-dot) {
+		width: 18rpx;
+		height: 6rpx;
+		border-radius: 4rpx;
+	}
+	.swiper.ns-indicator-dots :deep(.uni-swiper-dot-active) {
+		width: 36rpx;
+	}
+
+	// 指示器样式三
+	.swiper.ns-indicator-dots-three :deep(.uni-swiper-dot) {
+		width: 8rpx;
+		height: 8rpx !important;
+		border-radius: 6rpx;
+		margin-right: 14rpx;
+	}
+	.swiper.ns-indicator-dots-three :deep(.uni-swiper-dot):last-of-type {
+		margin-right: 0;
+	}
+	.swiper.ns-indicator-dots-three :deep(.uni-swiper-dot-active) {
+		width: 30rpx;
+	}
+
+	.swiper-dot-box {
+		position: absolute;
+		bottom: 20rpx;
+		width: 100%;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		padding: 0 80rpx 8rpx;
+		box-sizing: border-box;
+
+		&.swiper-left {
+			justify-content: flex-start;
+		}
+
+		&.swiper-right {
+			justify-content: flex-end;
+		}
+
+		.swiper-dot {
+			background-color: #b2b2b2;
+			width: 12rpx;
+			border-radius: 50%;
+			height: 12rpx;
+			margin: 8rpx;
+		}
+
+		&.straightLine {
+			.swiper-dot {
+				width: 18rpx;
+				height: 6rpx;
+				border-radius: 6rpx;
+
+				&.active {
+					width: 36rpx;
+				}
+			}
+		}
+		&.straightLineStyle2{
+			.swiper-dot {
+				width: 10rpx;
+				height: 10rpx;
+				border-radius: 6rpx;
+				margin: 0;
+				margin-right: 14rpx;
+				&.last-of-type {
+					margin-right: 0;
+				}
+				&.active {
+					width: 30rpx;
+				}
+			}
+		}
+	}
+
+	.swiper-style-3{
+		:deep(.uni-swiper-dots-horizontal){
+			bottom: 46rpx !important;
+		}
+		.swiper-dot-box{
+			bottom: 38rpx !important;
+		}
+	}
+</style>
diff --git a/uni-app/src/app/components/diy/float-btn/index.vue b/uni-app/src/app/components/diy/float-btn/index.vue
new file mode 100644
index 00000000..5340c329
--- /dev/null
+++ b/uni-app/src/app/components/diy/float-btn/index.vue
@@ -0,0 +1,167 @@
+<template>
+	<view class="float-btn fixed z-1000" :class="[diyComponent.style,diyComponent.bottomPosition, diyStore.mode == 'decorate' ? 'float-btn-border' : '']" :style="floatBtnWrapCss">
+		<view v-if="diyComponent.style==='style-1'" class="flex flex-col items-center p-[24rpx]" :style="warpCss">
+			<view v-for="(item,index) in diyComponent.list" :key="index" @click="diyStore.toRedirect(item.link)" :class="{'flex items-center justify-center' : true, 'mb-[20rpx]': diyComponent.list.length != index+1 }" :style="floatBtnItemCss">
+				<image v-if="item && item.imageUrl" :style="floatBtnItemCss" :src="img(item.imageUrl)" mode="aspectFit"></image>
+				<image v-else :src="img('static/resource/images/diy/figure.png')" mode="aspectFit" :style="floatBtnItemCss"/>
+			</view>
+		</view>
+		<!-- <view v-if="diyComponent.style==='style-2'" class="relative w-[3rpx] h-[3rpx]">
+			<view class="py-[14rpx] overflow-hidden absolute right-[25rpx] top-[1rpx] transform -translate-y-1/2" :style="styleTwoWarpCss">
+				<swiper :style="{'width':diyComponent.imageSize * 2+24+'rpx','height':diyComponent.imageSize * 2+44+'rpx !important',}" circular>
+					<swiper-item v-for="(item,index) in diyComponent.list" :key="index">
+						<view @click="diyStore.toRedirect(item.link)" class="px-[12rpx] flex flex-col items-center justify-center">
+							<image v-if="item && item.imageUrl" :style="floatBtnItemCss" :src="img(item.imageUrl)" mode="aspectFit"></image>
+							<image v-else :src="img('static/resource/images/diy/figure.png')" mode="aspectFit" :style="floatBtnItemCss"/>
+							<view class="text-[24rpx] text-[303133] text-center mt-[20rpx]">{{ item.link.title }}</view>
+						</view>
+					</swiper-item>
+				</swiper>
+			</view>
+			<view class="w-[60rpx] h-[60rpx] absolute right-[-64rpx] top-[1rpx] transform -translate-y-1/2 rounded-[30rpx] flex items-center" :style="styleTwoSphere">
+				<text class="!text-[60rpx] iconfont iconxiaolian-1 text-[var(--primary-color)] font-400  transform rotate-90 translate-x-[-13rpx]"></text>
+			</view>
+		</view> -->
+	</view>
+</template>
+
+<script setup lang="ts">
+	// 浮动按钮组件
+	import { computed, watch,ref } from 'vue';
+	import { onPageScroll } from '@dcloudio/uni-app';
+	import useDiyStore from '@/app/stores/diy';
+	import { img } from '@/utils/common';
+
+	const props = defineProps(['component', 'index']);
+
+	const diyStore = useDiyStore();
+
+	const diyComponent = computed(() => {
+		if (diyStore.mode == 'decorate') {
+			return diyStore.value[props.index];
+		} else {
+			return props.component;
+		}
+	})
+
+	const warpCss = computed(() => {
+		var style = '';
+        if(diyComponent.value.componentStartBgColor) {
+            if (diyComponent.value.componentStartBgColor && diyComponent.value.componentEndBgColor) style += `background:linear-gradient(${diyComponent.value.componentGradientAngle},${diyComponent.value.componentStartBgColor},${diyComponent.value.componentEndBgColor});`;
+            else style += 'background-color:' + diyComponent.value.componentStartBgColor + ';';
+        }
+		if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+
+		return style;
+	})
+
+	const floatBtnItemCss = computed(() => {
+		var style = '';
+		style += 'width:' + diyComponent.value.imageSize * 2 + 'rpx;';
+		style += 'height:' + diyComponent.value.imageSize * 2 + 'rpx;';
+		style += 'border-radius:' + diyComponent.value.aroundRadius * 2 + 'rpx;';
+		return style;
+	})
+
+	const floatBtnWrapCss = computed(() => {
+		let style = '';
+		if(diyComponent.value.offset){
+			if(diyComponent.value.bottomPosition == 'lowerRight' || diyComponent.value.bottomPosition == 'lowerLeft'){
+				style += 'transform: translateY('+ ((-diyComponent.value.offset) * 2) + 'rpx)';
+			}else if(diyComponent.value.bottomPosition == 'upperRight' || diyComponent.value.bottomPosition == 'upperLeft'){
+				style += 'transform: translateX('+ diyComponent.value.offset * 2 + 'rpx);';
+			}
+		}
+		return style;
+	})
+
+	//样式二
+	const styleTwoRepeat = ref(true)
+	const styleTwoRepeatTime: any = ref(null)
+	const styleTwoWarpCss =	computed(() => {
+		var style = '';
+        if(diyComponent.value.componentStartBgColor) {
+            if (diyComponent.value.componentStartBgColor && diyComponent.value.componentEndBgColor) style += `background:linear-gradient(${diyComponent.value.componentGradientAngle},${diyComponent.value.componentStartBgColor},${diyComponent.value.componentEndBgColor});`;
+            else style += 'background-color:' + diyComponent.value.componentStartBgColor + ';';
+        }
+		if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		style += 'transition: right .25s;box-shadow:0px 32rpx 96rpx 32rpx rgba(0, 0, 0, .08), 0px 24rpx 64px rgba(0, 0, 0, .12), 0px 16rpx 32rpx -16rpx rgba(0, 0, 0, .16);'
+		style +=styleTwoRepeat.value?'transition-delay: 0.25s;':('right:-'+(diyComponent.value.imageSize * 2+24)+'rpx !important;');
+		return style;
+	})
+
+	const styleTwoSphere = computed(()=>{
+		var style = 'transition: right .25s;background: rgba(0, 0, 0, 0.5);';
+		style +=styleTwoRepeat.value?'':'right:-32rpx !important;transition-delay: 0.25s;';
+		return style
+	})
+
+	onPageScroll(() => {
+		if(diyComponent.value.style==='style-2'){
+			if(styleTwoRepeatTime) clearTimeout(styleTwoRepeatTime.value)
+			styleTwoRepeat.value = false
+			styleTwoRepeatTime.value = setTimeout(()=>{
+				styleTwoRepeat.value = true
+				clearTimeout(styleTwoRepeatTime.value)
+			},200)
+		}
+	})
+
+</script>
+
+<style lang="scss" scoped>
+	.float-btn{
+		&.upperLeft {
+			top: 100rpx;
+			left: 30rpx;
+			&.style-2{
+				left:0 ;
+			}
+		}
+
+		&.upperRight {
+			top: 100rpx;
+			right: 30rpx;
+			&.style-2{
+				right:0 ;
+			}
+		}
+
+		&.lowerLeft {
+			bottom: 160rpx;
+			left: 30rpx;
+			padding-bottom: constant(safe-area-inset-bottom);
+			/*兼容 IOS<11.2*/
+			padding-bottom: env(safe-area-inset-bottom);
+			/*兼容 IOS>11.2*/
+			&.style-2{
+				left:0 ;
+			}
+
+		}
+
+		&.lowerRight {
+			bottom: 160rpx;
+			right: 30rpx;
+			padding-bottom: constant(safe-area-inset-bottom);
+			/*兼容 IOS<11.2*/
+			padding-bottom: env(safe-area-inset-bottom);
+			/*兼容 IOS>11.2*/
+			&.style-2{
+				right:0 ;
+			}
+		}
+	}
+	.z-1000{
+		z-index: 1000;
+	}
+	.float-btn-border{
+		border: 4rpx dashed var(--primary-color);
+	}
+</style>
diff --git a/uni-app/src/app/components/diy/form-address/index.vue b/uni-app/src/app/components/diy/form-address/index.vue
new file mode 100644
index 00000000..7b0bce15
--- /dev/null
+++ b/uni-app/src/app/components/diy/form-address/index.vue
@@ -0,0 +1,96 @@
+<template>
+	<view :style="warpCss">
+		表单 地址组件
+		<view class="relative">
+			<view class="p-[10rpx]  flex items-center ">
+				<view class="w-[27%] mr-[10rpx] flex items-center">
+					<text class="text-overflow-ellipsis" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx' ,'font-weight': diyComponent.fontWeight}">{{ diyComponent.field.name }}</text>
+					<text class="text-[#ec0003]">{{ diyComponent.field.required ? '*' : '' }}</text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup lang="ts">
+	// 表单 地址组件
+	import { ref, computed, watch,onMounted } from 'vue';
+	import { img } from '@/utils/common';
+	import useDiyStore from '@/app/stores/diy';
+
+	const props = defineProps(['component', 'index','global']);
+	const diyStore = useDiyStore();
+
+	const diyComponent = computed(() => {
+		if (diyStore.mode == 'decorate') {
+			return diyStore.value[props.index];
+		} else {
+			return props.component;
+		}
+	})
+
+	const warpCss = computed(() => {
+		var style = '';
+        style += 'position:relative;';
+        if(diyComponent.value.componentStartBgColor) {
+            if (diyComponent.value.componentStartBgColor && diyComponent.value.componentEndBgColor) style += `background:linear-gradient(${diyComponent.value.componentGradientAngle},${diyComponent.value.componentStartBgColor},${diyComponent.value.componentEndBgColor});`;
+            else style += 'background-color:' + diyComponent.value.componentStartBgColor + ';';
+        }
+
+        if(diyComponent.value.componentBgUrl) {
+            style += `background-image:url('${ img(diyComponent.value.componentBgUrl) }');`;
+            style += 'background-size: cover;background-repeat: no-repeat;';
+        }
+
+		if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		return style;
+	})
+
+    onMounted(() => {
+        refresh();
+        // 装修模式下刷新
+        if (diyStore.mode == 'decorate') {
+            watch(
+                () => diyComponent.value,
+                (newValue, oldValue) => {
+                    if (newValue && newValue.componentName == 'FormAddress') {
+                        refresh();
+                    }
+                }
+            )
+        }else{
+		}
+    });
+
+    const refresh = ()=> {
+    }
+
+	// 表单组件验证
+	const verify = () => {
+		const res = { code: true, message: '' }
+		// todo 验证组件，diyComponent.value.field.value
+		return res;
+	}
+
+	// 重置表单组件数据
+	const reset = () => {
+		// todo 清空组件数据，diyComponent.value.field.value = '';
+	}
+
+	defineExpose({
+		verify,
+		reset
+	})
+</script>
+
+<style lang="scss" scoped>
+	@import '@/styles/diy_form.scss';
+	.text-overflow-ellipsis {
+	  white-space: nowrap;
+	  overflow: hidden;
+	  text-overflow: ellipsis;
+	}
+</style>
\ No newline at end of file
diff --git a/uni-app/src/app/components/diy/form-checkbox/index.vue b/uni-app/src/app/components/diy/form-checkbox/index.vue
new file mode 100644
index 00000000..6bc7304f
--- /dev/null
+++ b/uni-app/src/app/components/diy/form-checkbox/index.vue
@@ -0,0 +1,325 @@
+<template>
+	<view v-if="diyComponent.viewFormDetail" class="form-item-frame">
+		<view class="base-layout-one" v-if="diyGlobal.completeLayout == 'style-1'">
+			<view class="detail-one-content">
+				<view class="detail-one-content-label">{{ diyComponent.field.name }}</view>
+				<view class="flex detail-one-content-value">
+					<view class="" v-for="(item,index) in diyComponent.field.value" :key="index" >{{ item.text}}<text v-if="index !== diyComponent.field.value.length - 1">、</text></view>
+				</view>
+			</view>
+		</view>
+		<view class="base-layout-two" v-if="diyGlobal.completeLayout == 'style-2'">
+			<view class="detail-two-content">
+				<view class="detail-two-content-label">{{ diyComponent.field.name }}</view>
+				<view class="detail-two-content-value flex w-[80%] justify-end">
+					<view class="" v-for="(item,index) in diyComponent.field.value" :key="index" >{{ item.text}}<text v-if="index !== diyComponent.field.value.length - 1">、</text></view>
+				</view>
+			</view>
+		</view>
+	</view>
+	<view v-else :style="warpCss" class="form-item-frame">
+		<view class="base-layout-one" v-if="diyGlobal.completeLayout == 'style-1'">
+			<view class="layout-one-label">
+				<text class="name" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx' ,'font-weight': diyComponent.fontWeight}">{{ diyComponent.field.name }}</text>
+				<text class="required">{{ diyComponent.field.required ? '*' : '' }}</text>
+				<text v-if="diyStore.mode == 'decorate' && diyComponent.isHidden" class="is-hidden">{{ t('hidden') }}</text>
+			</view>
+			<view v-if="diyComponent.field.remark.text" class="layout-one-remark" :style="{ color: diyComponent.field.remark.color, fontSize: (diyComponent.field.remark.fontSize * 2 ) + 'rpx' }">{{ diyComponent.field.remark.text }}</view>
+			<view class="layout-one-error-message" v-if="errorInfo && !errorInfo.code">{{errorInfo.message}}</view>
+			
+			<view class="layout-one-content"  v-if="diyComponent.style == 'style-1'">
+				<u-checkbox-group v-model="selectValue" @change="checkboxChange" iconPlacement="left">
+					<view v-for="(item, index) in diyComponent.options" :key="index" class="mr-[40rpx]">
+						<u-checkbox activeColor="var(--primary-color)" :labelSize="(diyComponent.fontSize * 2) + 'rpx'" :labelColor="diyComponent.textColor" :label="item.text" :name="item.id"></u-checkbox>
+					</view>
+				</u-checkbox-group>
+			</view>
+			
+			<u-checkbox-group v-if="diyComponent.style == 'style-2'" v-model="selectValue" @change="checkboxChange" iconPlacement="left" placement="column">
+				<view v-for="(item, index) in diyComponent.options" :key="index" @click="selectRadio(item)" class="layout-one-content mb-[16rpx]" :class="{'!mb-[0]': (diyComponent.options.length-1) == index}">
+					<u-checkbox class="!m-[0]" activeColor="var(--primary-color)" :labelSize="(diyComponent.fontSize * 2) + 'rpx'" :labelColor="diyComponent.textColor" :label="item.text" :name="item.id"></u-checkbox>
+				</view>
+			</u-checkbox-group>
+
+			<view v-if="diyComponent.style == 'style-3'" @click="openPicker" class="layout-one-content justify-between">
+				<view v-if="diyComponent.field.value && diyComponent.field.value.length">
+					<text class="mr-[10rpx] text-[28rpx]" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx'}" v-for="(item,index) in diyComponent.field.value">{{item.text}}<text v-if="index !== diyComponent.field.value.length - 1">,</text></text>
+				</view>
+				<text v-else class="text-[28rpx] text-[#999]" :style="{'font-size': (diyComponent.fontSize * 2) + 'rpx'}">{{checkboxPlaceholder}}</text>
+				<text class="nc-iconfont nc-icon-xiaV6xx pull-down-arrow text-[#666]" :class="{'selected': selectShow}" :style="{'font-size': (diyComponent.fontSize * 2+2) + 'rpx !important'}"></text>
+			</view>
+			
+			<view class="layout-one-attribute-wrap" v-if="inputAttribute().length">
+				<view v-for="(item,index) in inputAttribute()" :key="index" @click="eventFn(item.type)" class="layout-one-attribute-item">{{item.title}}</view>
+			</view>
+		</view>
+		<view class="base-layout-two" v-if="diyGlobal.completeLayout == 'style-2'">
+			<text v-if="diyStore.mode == 'decorate' && diyComponent.isHidden" class="layout-two-is-hidden">{{ t('hidden') }}</text>
+			<view class="layout-two-wrap" :class="{'!pb-[20rpx]': ((diyComponent.style == 'style-2' || diyComponent.style == 'style-3') && diyGlobal.borderControl),'no-border': !diyGlobal.borderControl}">
+				<view class="layout-two-label" :class="{'justify-start': diyGlobal.completeAlign == 'left', 'justify-end': diyGlobal.completeAlign == 'right'}">
+					<text class="required" v-if="diyComponent.field.required">{{ diyComponent.field.required ? '*' : '' }}</text>
+					<text class="name" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx' ,'font-weight': diyComponent.fontWeight}">{{ diyComponent.field.name }}</text>
+				</view>
+				<view class="layout-two-content" v-if= "diyComponent.style == 'style-1'">
+					<u-checkbox-group v-model="selectValue" @change="checkboxChange" iconPlacement="left"  class="justify-end">
+						<view v-for="(item, index) in diyComponent.options" class="ml-[30rpx]">
+							<u-checkbox activeColor="var(--primary-color)" :labelSize="(diyComponent.fontSize * 2) + 'rpx'" :labelColor="diyComponent.textColor" :key="index" :label="item.text" :name="item.id"></u-checkbox>
+						</view>
+					</u-checkbox-group>
+				</view>
+				
+				<view class="layout-two-content" v-if="diyComponent.style == 'style-2'">
+					<view class="justify-end w-full">
+						<u-checkbox-group v-model="selectValue" placement="column" @change="checkboxChange" iconPlacement="left">
+							<view v-for="(item, index) in diyComponent.options" :key="index" @click="selectRadio(item)" class="border-solid border-[2rpx] border-[#e6e6e6] rounded-[10rpx] flex items-center h-[80rpx] mb-[16rpx] px-[16rpx] box-border" :class="{'mb-[0]': diyComponent.options.length == (index+1)}">
+								<u-checkbox activeColor="var(--primary-color)" :labelSize="(diyComponent.fontSize * 2) + 'rpx'" :labelColor="diyComponent.textColor" class="!m-[0]" :label="item.text" :name="item.id"></u-checkbox>
+							</view>
+						</u-checkbox-group>
+					</view>
+				</view>
+				
+				<view class="layout-two-content" v-if= "diyComponent.style == 'style-3'">
+					<view @click="openPicker" class="px-[16rpx] box-border h-[80rpx] flex items-center justify-between border-solid border-[2rpx] border-[#e6e6e6] rounded-[10rpx] w-[100%]">
+						<view v-if="diyComponent.field.value && diyComponent.field.value.length">
+							<text class="mr-[10rpx] text-[28rpx]" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx'}" v-for="(item,index) in diyComponent.field.value">{{item.text}}<text v-if="index !== diyComponent.field.value.length - 1">,</text></text>
+						</view>
+						<text v-else class="text-[28rpx] text-[#999]" :style="{'font-size': (diyComponent.fontSize * 2) + 'rpx'}">{{checkboxPlaceholder}}</text>
+						<text class="nc-iconfont nc-icon-xiaV6xx pull-down-arrow text-[#666]" :class="{'selected': selectShow}" :style="{'font-size': (diyComponent.fontSize * 2+2) + 'rpx !important'}"></text>
+					</view>
+				</view>
+			</view>
+			<view class="layout-two-error-message" v-if="errorInfo && !errorInfo.code">{{errorInfo.message}}</view>
+			<view v-if="diyComponent.field.remark.text" class="layout-two-remark" :style="{ color: diyComponent.field.remark.color, fontSize: (diyComponent.field.remark.fontSize * 2 ) + 'rpx' }">{{ diyComponent.field.remark.text }}</view>
+			<view class="layout-two-attribute-wrap" v-if="inputAttribute().length">
+				<view v-for="(item,index) in inputAttribute()" :key="index" @click="eventFn(item.type)" class="layout-two-attribute-item">{{item.title}}</view>
+			</view>
+		</view>
+		<!-- 样式三，下拉弹窗 -->
+		<u-popup :show="selectShow" mode="bottom" @close="selectShow=false" >
+			<view class="p-[15rpx]">
+				<scroll-view scroll-y="true" class="max-h-[450rpx] px-[14rpx] box-border">
+					<u-checkbox-group v-model="pullDownVal" placement="column" iconPlacement="right">
+						<view v-for="(item, index) in diyComponent.options" :key="index" class="border-solid border-[0] border-b-[2rpx] border-[#e6e6e6] py-[20rpx]">
+							<u-checkbox activeColor="var(--primary-color)" :labelSize="'30rpx'" labelColor="#333"  :style="{'width': '100%'}" :label="item.text" :name="item.id"></u-checkbox>
+						</view>
+					</u-checkbox-group>
+				</scroll-view>
+				
+				<view class="flex items-center pt-[20rpx]">
+					<view @click="pullDownCancelFn" class="flex-1 flex justify-center h-[70rpx] leading-[70rpx] text-[#333] bg-[#eee] text-[26rpx] border-[0] font-500 rounded-[10rpx] mr-[20rpx]">{{ t('cancel') }}</view>
+					<view @click="pullDownConfirmFn" class="flex-1 flex justify-center bg-[var(--primary-color)] h-[70rpx] leading-[70rpx] text-[#fff] text-[26rpx] border-[0] rounded-[10rpx]">{{ t('confirm') }}</view>
+				</view>
+			</view>
+		</u-popup>
+		<view v-if="diyStore.mode == 'decorate'" class="form-item-mask"></view>
+		<!-- 隐私弹窗 -->
+		<form-privacy-pop ref="formPrivacyRef" :data="formPrivacyData" />
+	</view>
+</template>
+
+<script setup lang="ts">
+	// 表单 多选项组件
+	import { ref, computed, watch,onMounted } from 'vue';
+    import { img } from '@/utils/common';
+	import { t } from '@/locale'
+	import useDiyStore from '@/app/stores/diy';
+    import formPrivacyPop from './../form-privacy-pop/index.vue';
+
+	const props = defineProps(['component', 'index','global']);
+	const diyStore = useDiyStore();
+	const selectValue = ref([])
+	const selectShow = ref(false);
+	const pullDownVal = ref([])
+	
+	const errorInfo:any = ref(null);
+	const formPrivacyRef: any = ref(null);
+
+	const diyComponent = computed(() => {
+		if (diyStore.mode == 'decorate') {
+			return diyStore.value[props.index];
+		} else {
+			return props.component;
+		}
+	})
+	
+	const diyGlobal = computed(() => {
+		return props.global;
+	})
+	
+	const formPrivacyData = computed(() => {
+		let str = `${diyComponent.value.field.name}已开启隐私保护，提交后会部分打码，只有你自己和管理员才能查看完整信息`;
+		return str;
+	})
+	
+	// input属性
+	const inputAttribute = ()=>{
+		let arr = [];
+		if(diyComponent.value.autofill){
+			let obj = {
+				title: '已自动填充'
+			};
+			arr.push(obj);
+		}
+		if(diyComponent.value.field.privacyProtection){
+			let obj = {
+				title: '已开启隐私保护',
+				type: 'privacy'
+			};
+			arr.push(obj);
+		}
+		
+		arr.forEach((item,index,arr)=>{
+			if(index != (arr.length-1)){
+				let obj = {
+					title: '|'
+				};
+				arr.push(obj);
+			}
+		})
+		return arr;
+	}
+	
+	const eventFn = (type:any)=>{
+		if(type == 'privacy'){
+			// 查看隐私
+			formPrivacyRef.value.open();
+		}
+	}
+
+	const warpCss = computed(() => {
+		var style = '';
+        style += 'position:relative;';
+        if (diyComponent.value.componentStartBgColor && diyComponent.value.componentEndBgColor) style += `background:linear-gradient(${diyComponent.value.componentGradientAngle},${diyComponent.value.componentStartBgColor},${diyComponent.value.componentEndBgColor});`;
+        else if (diyComponent.value.componentStartBgColor) style += 'background-color:' + diyComponent.value.componentStartBgColor + ';';
+        else if (diyComponent.value.componentEndBgColor) style += 'background-color:' + diyComponent.value.componentEndBgColor + ';';
+
+        if(diyComponent.value.componentBgUrl) {
+            style += `background-image:url('${ img(diyComponent.value.componentBgUrl) }');`;
+            style += 'background-size: cover;background-repeat: no-repeat;';
+        }
+
+		if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		return style;
+	})
+
+    onMounted(() => {
+        refresh();
+        // 装修模式下刷新
+        if (diyStore.mode == 'decorate') {
+            watch(
+                () => diyComponent.value,
+                (newValue, oldValue) => {
+                    if (newValue && newValue.componentName == 'FormCheckbox') {
+                        refresh();
+                    }
+                }
+            )
+        }else{
+		}
+		if(diyComponent.value.style == 'style-3'){
+			pullDownVal.value = diyComponent.value.field.value.map(item => item.id);
+		}
+		if(diyComponent.value.field.value.length>0){
+			selectValue.value = diyComponent.value.field.value.map(item => item.id);
+		}
+    });
+
+    const refresh = ()=> {
+    	// console.log('diyComponent.value.field.value',diyComponent.value.field.value)
+    }
+	
+	const checkboxPlaceholder = computed(() => {
+		let str = '';
+		str += `请选择${ diyComponent.value.field.name }`
+		return str;
+	})
+
+    // 表单组件验证
+    const verify = () => {
+        const res = { code: true, message: '' }
+        if (diyComponent.value.field.required && diyComponent.value.field.value.length == '' && diyStore.mode != 'decorate') {
+            res.code = false
+            res.message = checkboxPlaceholder.value;
+        }
+		errorInfo.value = res;
+        return res;
+    }
+	const backupValue = ref([]);
+
+	// 重置表单组件数据
+    const reset = () => {
+		pullDownVal.value = [];
+	    selectValue.value = [];
+	    diyComponent.value.field.value = [];
+	}
+	 
+	const pullDownCancelFn = ()=>{
+		selectShow.value = false;
+		pullDownVal.value = backupValue.value.map(item => item.id);
+	}
+
+	const pullDownConfirmFn = () => {
+		selectShow.value = false;
+		const selectedItems = diyComponent.value.options.filter(item => pullDownVal.value.includes(item.id));
+		diyComponent.value.field.value = selectedItems.map(item => ({ id: item.id, text: item.text }));
+	}
+
+	const isDisabled = computed(() => {
+		return diyStore.mode === 'decorate';
+	});
+
+	const openPicker = () => {
+		if(isDisabled.value){
+			return
+		}
+		backupValue.value = [...diyComponent.value.field.value];  // 保存当前的值
+		selectShow.value = true;
+	}
+
+	// 保存数据到 store
+	const checkboxChange = (value: any) => {
+	  const selectedItems = diyComponent.value.options.filter(item => value.includes(item.id));
+	  diyComponent.value.field.value = selectedItems.map(item => ({ id: item.id, text: item.text }));
+	};
+	const selectRadio = (item) => {
+	  if (isDisabled.value) {
+	    return;
+	  }
+	  const itemId = item.id;
+	  const index = selectValue.value.indexOf(itemId);
+	  if (index > -1) {
+	    selectValue.value.splice(index, 1);
+	  } else {
+	    selectValue.value.push(itemId);
+	  }
+	  const selectedItems = diyComponent.value.options.filter(item => selectValue.value.includes(item.id));
+	  
+	  diyComponent.value.field.value = selectedItems.map(item => ({ id: item.id, text: item.text }));
+	};
+
+
+
+
+    defineExpose({
+        verify,
+	    reset
+    })
+</script>
+
+<style lang="scss" scoped>
+	@import '@/styles/diy_form.scss';
+	.pull-down-arrow{
+		transition: all .3s;
+		transform: rotate(0);
+		&.selected{
+			transform: rotate(180deg);
+		}
+	}
+	.form-item-frame :deep(.u-checkbox .u-checkbox__icon-wrap){
+		width: 30rpx !important;
+		height: 30rpx !important;
+	}
+</style>
diff --git a/uni-app/src/app/components/diy/form-date-scope/index.vue b/uni-app/src/app/components/diy/form-date-scope/index.vue
new file mode 100644
index 00000000..b62edd82
--- /dev/null
+++ b/uni-app/src/app/components/diy/form-date-scope/index.vue
@@ -0,0 +1,314 @@
+<template>
+	<view v-if="diyComponent.viewFormDetail" class="form-item-frame">
+		<view class="base-layout-one" v-if="diyGlobal.completeLayout == 'style-1'">
+			<view class="detail-one-content" v-if="diyComponent.field.value.start.date || diyComponent.field.value.end.date">
+				<text class="detail-one-content-label">{{ diyComponent.field.name }}</text>
+				<view class="detail-one-content-value">
+					<text>{{ diyComponent.field.value.start.date }} </text>
+					<text v-if="diyComponent.field.value.start.date && diyComponent.field.value.end.date">-</text>
+					<text>{{ diyComponent.field.value.end.date }}</text>
+				</view>
+				
+			</view>
+		</view>
+		<view class="base-layout-two" v-if="diyGlobal.completeLayout == 'style-2'">
+			<view class="detail-two-content" v-if="diyComponent.field.value.start.date || diyComponent.field.value.end.date">
+				<text class="detail-two-content-label">{{ diyComponent.field.name }}</text>
+				<view class="detail-two-content-value w-[80%]">
+					<text>{{ diyComponent.field.value.start.date }}</text>
+					<text v-if="diyComponent.field.value.start.date && diyComponent.field.value.end.date">-</text>
+					<text> {{ diyComponent.field.value.end.date }}</text>
+				</view>
+			</view>
+		</view>
+	</view>
+	<view v-else :style="warpCss" class="form-item-frame">
+		<view class="base-layout-one" v-if="diyGlobal.completeLayout == 'style-1'">
+			<view class="layout-one-label">
+				<text class="name" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx' ,'font-weight': diyComponent.fontWeight}">{{ diyComponent.field.name }}</text>
+				<text class="required">{{ diyComponent.field.required ? '*' : '' }}</text>
+				<text v-if="diyStore.mode == 'decorate' && diyComponent.isHidden" class="is-hidden">{{ t('hidden') }}</text>
+			</view>
+			<view v-if="diyComponent.field.remark.text" class="layout-one-remark" :style="{ color: diyComponent.field.remark.color, fontSize: (diyComponent.field.remark.fontSize * 2 ) + 'rpx' }">{{ diyComponent.field.remark.text }}</view>
+			<view class="layout-one-error-message" v-if="errorInfo && !errorInfo.code">{{errorInfo.message}}</view>
+
+			<view class="flex items-center">
+				<view class="layout-one-content flex-1" @click="openCalendar">
+					<view class="nc-iconfont nc-icon-a-riliV6xx-36 !text-[32rpx] text-[#999] mr-[16rpx]"></view>
+					<view class="flex-1 text-overflow-ellipsis" :class="{'!text-[#999]' : !diyComponent.field.value.start.timestamp && !diyComponent.defaultControl}" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx' }">
+						{{ startDate }}
+					</view>
+				</view>
+				<view class="mx-[10rpx]" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx'}">-</view>
+				<view class="layout-one-content flex-1" @click="openCalendar">
+					<view class="nc-iconfont nc-icon-a-riliV6xx-36 !text-[32rpx] text-[#999] mr-[16rpx]"></view>
+					<view class="flex-1 text-overflow-ellipsis" :class="{'!text-[#999]' : !diyComponent.field.value.end.timestamp && !diyComponent.defaultControl}" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx'}">
+						{{ endDate }}
+					</view>
+				</view>
+			</view>
+			<view class="layout-one-attribute-wrap" v-if="inputAttribute().length">
+				<view v-for="(item,index) in inputAttribute()" :key="index" @click="eventFn(item.type)" class="layout-one-attribute-item">{{item.title}}</view>
+			</view>
+		</view>
+		<view class="base-layout-two" v-if="diyGlobal.completeLayout == 'style-2'">
+			<text v-if="diyStore.mode == 'decorate' && diyComponent.isHidden" class="layout-two-is-hidden">{{ t('hidden') }}</text>
+			<view class="layout-two-wrap" :class="{'no-border': !diyGlobal.borderControl}">
+				<view class="layout-two-label" :class="{'justify-start': diyGlobal.completeAlign == 'left', 'justify-end': diyGlobal.completeAlign == 'right'}">
+					<text class="required" v-if="diyComponent.field.required">{{ diyComponent.field.required ? '*' : '' }}</text>
+					<text class="name" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx' ,'font-weight': diyComponent.fontWeight}">{{ diyComponent.field.name }}</text>
+				</view>
+				<view class="layout-two-content" @click="openCalendar">
+					<view class="text-overflow-ellipsis flex justify-center" :class="{'!text-[#999]' : !diyComponent.field.value.start.timestamp && !diyComponent.defaultControl}" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx'}">
+						{{ startDate }}
+					</view>
+					<view class="mx-[10rpx]" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx'}">-</view>
+					<view class="text-overflow-ellipsis flex justify-center"  :class="{'!text-[#999]' : !diyComponent.field.value.end.timestamp && !diyComponent.defaultControl}" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx'}">
+						{{ endDate }}
+					</view>
+					<text class="nc-iconfont !text-[#666] !text-[36rpx] nc-icon-youV6xx -mr-[8rpx]"></text>
+				</view>
+			</view>
+			<view class="layout-two-error-message" v-if="errorInfo && !errorInfo.code">{{errorInfo.message}}</view>
+			<view v-if="diyComponent.field.remark.text" class="layout-two-remark" :style="{ color: diyComponent.field.remark.color, fontSize: (diyComponent.field.remark.fontSize * 2 ) + 'rpx' }">{{ diyComponent.field.remark.text }}</view>
+			<view class="layout-two-attribute-wrap" v-if="inputAttribute().length">
+				<view v-for="(item,index) in inputAttribute()" :key="index" @click="eventFn(item.type)" class="layout-two-attribute-item">{{item.title}}</view>
+			</view>
+		</view>
+		<view class="calendar-wrap">
+			<u-calendar :show="calendarShow" mode="range" @confirm="confirm" @close="calendarShow=false"  closeOnClickOverlay="true"
+				:defaultDate="defaultDate" startText="开始" endText="结束" confirmDisabledText="禁止选择" color="var(--primary-color)"  ref="calendar" monthNum="2"></u-calendar>
+		</view>
+
+		<!-- 遮罩层，装修使用 -->
+		<view v-if="diyStore.mode == 'decorate'" class="form-item-mask"></view>
+	</view>
+</template>
+
+<script setup lang="ts">
+	// 表单 日期范围组件
+	import { ref, computed, watch,onMounted } from 'vue';
+    import { img,timeTurnTimeStamp } from '@/utils/common';
+	import { t } from '@/locale'
+	import useDiyStore from '@/app/stores/diy';
+
+	const props = defineProps(['component', 'index','global']);
+	const diyStore = useDiyStore();
+	const calendarShow = ref(false);
+
+	const errorInfo:any = ref(null);
+
+	const diyComponent = computed(() => {
+		if (diyStore.mode == 'decorate') {
+			return diyStore.value[props.index];
+		} else {
+			return props.component;
+		}
+	})
+
+	const diyGlobal = computed(() => {
+		return props.global;
+	})
+
+	// input属性
+	const inputAttribute = ()=>{
+		let arr = [];
+		if(diyComponent.value.autofill){
+			let obj = {
+				title: '已自动填充'
+			};
+			arr.push(obj);
+		}
+
+		arr.forEach((item,index,arr)=>{
+			if(index != (arr.length-1)){
+				let obj = {
+					title: '|'
+				};
+				arr.push(obj);
+			}
+		})
+		return arr;
+	}
+
+	const eventFn = (type:any)=>{
+
+	}
+
+	// 开始日期
+	const startDate = computed(() => {
+		let returnDate = '';
+		let date = '';
+		if(diyComponent.value.field.value.start.date){
+			let timestamp = diyComponent.value.field.value.start.timestamp;
+			returnDate = getDateFn(timestamp);
+			date = returnDate;
+		}else{
+			if(diyComponent.value.start.defaultControl){
+				if(diyComponent.value.start.dateWay == 'current'){
+					returnDate = getDateFn();
+				}else if(diyComponent.value.start.dateWay == 'diy'){
+					let timestamp = diyComponent.value.field.default.start.timestamp ? diyComponent.value.field.default.start.timestamp : '';
+					returnDate = getDateFn(timestamp);
+				}
+				date = returnDate;
+			}else{
+				returnDate = diyComponent.value.start.placeholder;
+				date = '';
+			}
+		}
+		diyComponent.value.field.value.start.date = date;
+		diyComponent.value.field.value.start.timestamp = date ? timeTurnTimeStamp(date) : 0;
+		return returnDate;
+	})
+
+	// 结束日期
+	const endDate = computed(() => {
+		let returnDate = '';
+		let date = '';
+		if (diyComponent.value.field.value.end.date) {
+			let timestamp = diyComponent.value.field.value.end.timestamp;
+			returnDate = getDateFn(timestamp);
+			date = returnDate;
+
+			diyComponent.value.field.value.end.date = date;
+			diyComponent.value.field.value.end.timestamp = timeTurnTimeStamp(date);
+		} else {
+			if (diyComponent.value.end.defaultControl) {
+				if (diyComponent.value.end.dateWay == 'current') {
+					returnDate = getDateFn();
+				} else if (diyComponent.value.end.dateWay == 'diy') {
+					returnDate = getDateFn(diyComponent.value.field.default.end.timestamp);
+				}
+				date = returnDate;
+				diyComponent.value.field.value.end.date = date;
+				diyComponent.value.field.value.end.timestamp = timeTurnTimeStamp(date);
+			} else {
+				returnDate = diyComponent.value.end.placeholder;
+			}
+		}
+		return returnDate;
+	})
+
+	// 默认数据
+	const defaultDate = computed(()=>{
+		let arr = [];
+		arr[0] = getDateFn(timeTurnTimeStamp(startDate.value), 'YYYY-MM-DD');
+		arr[1] = getDateFn(timeTurnTimeStamp(endDate.value), 'YYYY-MM-DD');
+		return arr;
+	})
+
+	const warpCss = computed(() => {
+		var style = '';
+        style += 'position:relative;';
+		if (diyComponent.value.componentStartBgColor && diyComponent.value.componentEndBgColor) style += `background:linear-gradient(${diyComponent.value.componentGradientAngle},${diyComponent.value.componentStartBgColor},${diyComponent.value.componentEndBgColor});`;
+		else if (diyComponent.value.componentStartBgColor) style += 'background-color:' + diyComponent.value.componentStartBgColor + ';';
+		else if (diyComponent.value.componentEndBgColor) style += 'background-color:' + diyComponent.value.componentEndBgColor + ';';
+
+        if(diyComponent.value.componentBgUrl) {
+            style += `background-image:url('${ img(diyComponent.value.componentBgUrl) }');`;
+            style += 'background-size: cover;background-repeat: no-repeat;';
+        }
+
+		if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		return style;
+	})
+
+    onMounted(() => {
+        refresh();
+        // 装修模式下刷新
+        if (diyStore.mode == 'decorate') {
+            watch(
+                () => diyComponent.value,
+                (newValue, oldValue) => {
+                    if (newValue && newValue.componentName == 'FormDateScope') {
+                        refresh();
+                    }
+                }
+            )
+        }
+    });
+
+    const refresh = ()=> {
+    	// todo 开始、结束时间给予默认值
+	    // {{ diyComponent.start.defaultControl ? diyComponent.field.value.start.date : diyComponent.start.placeholder }}
+    }
+
+	// 表单组件验证
+	const verify = () => {
+		const res = { code: true, message: '' }
+		if(diyComponent.value.field.required){
+			if (diyComponent.value.field.value.start.date == '' || !diyComponent.value.field.value.start.timestamp) {
+				res.code = false
+				res.message = `请选择${ diyComponent.value.start.placeholder }`;
+			}else if (diyComponent.value.field.value.end.date == '' || !diyComponent.value.field.value.end.timestamp) {
+				res.code = false
+				res.message = `请选择${ diyComponent.value.end.placeholder }`;
+			}
+		}
+
+		errorInfo.value = res;
+		return res;
+	}
+
+	// 重置表单组件数据
+	const reset = () => {
+		diyComponent.value.field.value.start.date = '';
+		diyComponent.value.field.value.start.timestamp = 0;
+		diyComponent.value.field.value.end.date = '';
+		diyComponent.value.field.value.end.timestamp = 0;
+	}
+
+    const openCalendar = () =>{
+    	if(diyStore.mode === 'decorate') return;
+	    calendarShow.value = true;
+    }
+
+	const confirm = (e)=> {
+		diyComponent.value.field.value.start.date = e[0];
+		diyComponent.value.field.value.start.timestamp = timeTurnTimeStamp(e[0]); // todo 需要赋值
+		diyComponent.value.field.value.end.date = e[e.length - 1];
+		diyComponent.value.field.value.end.timestamp = timeTurnTimeStamp(e[e.length - 1]); // todo 需要赋值
+		calendarShow.value = false;
+	}
+
+	const getDateFn = (res:any='', type:any=diyComponent.value.dateFormat)=>{
+		let date = res ? new Date(res*1000) : new Date();
+		let year = date.getFullYear();
+		let month = String(date.getMonth() + 1).padStart(2, '0');
+		let day = String(date.getDate()).padStart(2, '0');
+
+		let str = '';
+		if(type == 'YYYY年M月D日'){
+			str = `${year}年${month}月${day}日`;
+		}else if(type == 'YYYY-MM-DD'){
+			str = `${year}-${month}-${day}`;
+		}else if(type == 'YYYY/MM/DD'){
+			str = `${year}/${month}/${day}`;
+		}
+		return str;
+	}
+
+	defineExpose({
+		verify,
+		reset
+	})
+</script>
+
+<style lang="scss" scoped>
+	@import '@/styles/diy_form.scss';
+	.text-overflow-ellipsis {
+		text-overflow: ellipsis;
+		overflow: hidden;
+	  	white-space: nowrap;
+		display: inline-block;
+	}
+</style>
+<style lang="scss">
+	.calendar-wrap .u-calendar .u-calendar-header__title, .u-calendar-header__subtitle,  .u-calendar-month__title{
+		display: block;
+	}
+</style>
diff --git a/uni-app/src/app/components/diy/form-date/index.vue b/uni-app/src/app/components/diy/form-date/index.vue
new file mode 100644
index 00000000..a6914e23
--- /dev/null
+++ b/uni-app/src/app/components/diy/form-date/index.vue
@@ -0,0 +1,272 @@
+<template>
+	<view v-if="diyComponent.viewFormDetail" class="form-item-frame">
+		<view class="base-layout-one" v-if="diyGlobal.completeLayout == 'style-1'">
+			<view class="detail-one-content">
+				<text class="detail-one-content-label">{{ diyComponent.field.name }}</text>
+				<text class="detail-one-content-value">{{ diyComponent.field.value.date}}</text>
+			</view>
+		</view>
+		<view class="base-layout-two" v-if="diyGlobal.completeLayout == 'style-2'">
+			<view class="detail-two-content">
+				<text class="detail-two-content-label">{{ diyComponent.field.name }}</text>
+				<view class="detail-two-content-value w-[80%]">{{ diyComponent.field.value.date}}</view>
+			</view>
+		</view>
+	</view>
+	<view v-else :style="warpCss" class="form-item-frame">
+		<view class="base-layout-one" v-if="diyGlobal.completeLayout == 'style-1'">
+			<view class="layout-one-label">
+				<text class="name" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx' ,'font-weight': diyComponent.fontWeight}">{{ diyComponent.field.name }}</text>
+				<text class="required">{{ diyComponent.field.required ? '*' : '' }}</text>
+				<text v-if="diyStore.mode == 'decorate' && diyComponent.isHidden" class="is-hidden">{{ t('hidden') }}</text>
+			</view>
+			<view v-if="diyComponent.field.remark.text" class="layout-one-remark" :style="{ color: diyComponent.field.remark.color, fontSize: (diyComponent.field.remark.fontSize * 2 ) + 'rpx' }">{{ diyComponent.field.remark.text }}</view>
+			<view class="layout-one-error-message" v-if="errorInfo && !errorInfo.code">{{errorInfo.message}}</view>
+			
+			<view class="layout-one-content" @click="openCalendar">
+				<view class="nc-iconfont nc-icon-a-riliV6xx-36 !text-[32rpx] text-[#999] mr-[16rpx]"></view>
+				<view class="flex-1 text-overflow-ellipsis flex" :class="{'!text-[#999]' : !diyComponent.field.value.date && !diyComponent.defaultControl}" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx' }">
+					{{ startDate }}
+				</view>
+			</view>
+			<view class="layout-one-attribute-wrap" v-if="inputAttribute().length">
+				<view v-for="(item,index) in inputAttribute()" :key="index" @click="eventFn(item.type)" class="layout-one-attribute-item">{{item.title}}</view>
+			</view>
+		</view>
+		<view class="base-layout-two" v-if="diyGlobal.completeLayout == 'style-2'">
+			<text v-if="diyStore.mode == 'decorate' && diyComponent.isHidden" class="layout-two-is-hidden">{{ t('hidden') }}</text>
+			<view class="layout-two-wrap" :class="{'no-border': !diyGlobal.borderControl}">
+				<view class="layout-two-label" :class="{'justify-start': diyGlobal.completeAlign == 'left', 'justify-end': diyGlobal.completeAlign == 'right'}">
+					<text class="required" v-if="diyComponent.field.required">{{ diyComponent.field.required ? '*' : '' }}</text>
+					<text class="name" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx' ,'font-weight': diyComponent.fontWeight}">{{ diyComponent.field.name }}</text>
+				</view>
+				<view class="layout-two-content" @click="openCalendar">
+					<view class="flex-1 text-overflow-ellipsis flex justify-end" :class="{'!text-[#999]' : !diyComponent.field.value.date && !diyComponent.defaultControl}" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx'}">
+						{{ startDate }}
+					</view>
+					<text class="nc-iconfont !text-[#666] !text-[36rpx] nc-icon-youV6xx -mr-[8rpx]"></text>
+				</view>
+			</view>
+			<view class="layout-two-error-message" v-if="errorInfo && !errorInfo.code">{{errorInfo.message}}</view>
+			<view v-if="diyComponent.field.remark.text" class="layout-two-remark" :style="{ color: diyComponent.field.remark.color, fontSize: (diyComponent.field.remark.fontSize * 2 ) + 'rpx' }">{{ diyComponent.field.remark.text }}</view>
+			<view class="layout-two-attribute-wrap" v-if="inputAttribute().length">
+				<view v-for="(item,index) in inputAttribute()" :key="index" @click="eventFn(item.type)" class="layout-two-attribute-item">{{item.title}}</view>
+			</view>
+		</view>
+		<view class="calendar-wrap">
+			<u-calendar :show="calendarShow" mode="single" @confirm="confirm" @close="calendarShow=false" closeOnClickOverlay="true"
+				:formatter="formatter" confirmDisabledText="禁止选择" color="var(--primary-color)" ref="calendar" :maxDate="maxDate"></u-calendar>
+			<u-datetime-picker :show="show"  v-model="diyComponent.field.value.date" mode="datetime" @cancel="show=false" closeOnClickOverlay="true" @confirm="calendarConfirm"  @close="show=false"  :minDate="minDate"></u-datetime-picker>
+		</view>
+		<!-- 遮罩层，装修使用 -->
+		<view v-if="diyStore.mode == 'decorate'" class="form-item-mask"></view>
+	</view>
+</template>
+
+<script setup lang="ts">
+	// 表单 日期组件
+	import { ref, computed, watch, onMounted } from 'vue';
+    import { img, timeStampTurnTime, timeTurnTimeStamp } from '@/utils/common';
+	import { t } from '@/locale'
+	import useDiyStore from '@/app/stores/diy';
+	let currentDate = new Date(); 
+	currentDate.setFullYear(currentDate.getFullYear()  + 1); 
+	const maxDate = ref(currentDate.getTime());
+	
+	let currentDateTime = new Date();
+	const minDate = ref(currentDateTime.getTime());
+	
+	const props = defineProps(['component', 'index','global']);
+	const diyStore = useDiyStore();
+	const calendarShow = ref(false);
+	const show = ref(false);
+	
+	const errorInfo:any = ref(null);
+
+	const diyComponent = computed(() => {
+		if (diyStore.mode == 'decorate') {
+			return diyStore.value[props.index];
+		} else {
+			return props.component;
+		}
+	})
+	
+	const diyGlobal = computed(() => {
+		return props.global;
+	})
+	
+	// input属性
+	const inputAttribute = ()=>{
+		let arr = [];
+		if(diyComponent.value.autofill){
+			let obj = {
+				title: '已自动填充'
+			};
+			arr.push(obj);
+		}
+		
+		arr.forEach((item,index,arr)=>{
+			if(index != (arr.length-1)){
+				let obj = {
+					title: '|'
+				};
+				arr.push(obj);
+			}
+		})
+		return arr;
+	}
+	
+	const eventFn = (type:any)=>{
+		
+	}
+	
+	// 日期
+	const startDate = computed(() => {
+		var date = '';
+		if(diyComponent.value.field.value.date){
+			let timestamp = diyComponent.value.field.value.timestamp;
+			date = getDateFn(timestamp);
+			
+			diyComponent.value.field.value.date = date;
+			diyComponent.value.field.value.timestamp = timeTurnTimeStamp(date);
+		}else{
+			if(diyComponent.value.defaultControl){
+				if(diyComponent.value.dateWay == 'current'){
+					date = getDateFn();
+				}else if(diyComponent.value.dateWay == 'diy'){
+					let timestamp = diyComponent.value.field.default.timestamp || '';
+					date = getDateFn(timestamp);
+				}
+				
+				diyComponent.value.field.value.date = date;
+				diyComponent.value.field.value.timestamp = timeTurnTimeStamp(date);
+			}else{
+				date = diyComponent.value.placeholder;
+			}
+		}
+		return date;
+	})
+
+	const warpCss = computed(() => {
+		var style = '';
+        style += 'position:relative;';
+		if (diyComponent.value.componentStartBgColor && diyComponent.value.componentEndBgColor) style += `background:linear-gradient(${diyComponent.value.componentGradientAngle},${diyComponent.value.componentStartBgColor},${diyComponent.value.componentEndBgColor});`;
+		else if (diyComponent.value.componentStartBgColor) style += 'background-color:' + diyComponent.value.componentStartBgColor + ';';
+		else if (diyComponent.value.componentEndBgColor) style += 'background-color:' + diyComponent.value.componentEndBgColor + ';';
+
+        if(diyComponent.value.componentBgUrl) {
+            style += `background-image:url('${ img(diyComponent.value.componentBgUrl) }');`;
+            style += 'background-size: cover;background-repeat: no-repeat;';
+        }
+
+		if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		return style;
+	})
+
+    onMounted(() => {
+        refresh();
+        // 装修模式下刷新
+        if (diyStore.mode == 'decorate') {
+            watch(
+                () => diyComponent.value,
+                (newValue, oldValue) => {
+                    if (newValue && newValue.componentName == 'FormDate') {
+                        refresh();
+                    }
+                }
+            )
+        }
+    });
+
+    const refresh = ()=> {
+    	// todo 开始、结束时间给予默认值
+	    // {{ diyComponent.defaultControl ? diyComponent.value.field.value.date : diyComponent.placeholder }}
+    }
+
+	// 表单组件验证
+	const verify = () => {
+		const res = { code: true, message: '' }
+		if (diyComponent.value.field.required && (!diyComponent.value.field.value || !diyComponent.value.field.value.timestamp)) {
+			res.code = false
+			res.message = `请选择${ diyComponent.value.placeholder }`;
+		}
+		errorInfo.value = res;
+		return res;
+	}
+
+	// 重置表单组件数据
+	const reset = () => {
+		diyComponent.value.field.value.date = '';
+		diyComponent.value.field.value.timestamp = '';
+	}
+
+    const openCalendar = () =>{
+    	if(diyStore.mode === 'decorate') return;
+		if(diyComponent.value.dateFormat=='YYYY-MM-DD HH:mm'){
+			show.value = true
+		}else{
+			calendarShow.value = true;
+		}
+    }
+
+	const confirm = (e)=> {
+		diyComponent.value.field.value.date = e[0];
+		diyComponent.value.field.value.timestamp = timeTurnTimeStamp(e[0]); // todo 需要赋值
+		calendarShow.value = false;
+	}
+	const calendarConfirm = (e)=>{
+		diyComponent.value.field.value.date = e.value;
+		diyComponent.value.field.value.timestamp = timeTurnTimeStamp(e.value); // todo 需要赋值
+		show.value = false;
+	}
+
+	const formatter = (day) => {
+		const time = timeStampTurnTime(Date.parse(day.date)/1000,"year_month_day");
+		return day
+	}
+	
+	const getDateFn = (data:any='', type:any=diyComponent.value.dateFormat)=>{
+		let date = data ? new Date(data*1000) : new Date();
+		let year = date.getFullYear();
+		let month = String(date.getMonth() + 1).padStart(2, '0');
+		let day = String(date.getDate()).padStart(2, '0');
+		
+		const hours = String(date.getHours()).padStart(2, '0');  
+		const minutes = String(date.getMinutes()).padStart(2, '0');  
+		
+		let str = '';
+		if(type == 'YYYY年M月D日'){
+			str = `${year}年${month}月${day}日`;
+		}else if(type == 'YYYY-MM-DD'){
+			str = `${year}-${month}-${day}`;
+		}else if(type == 'YYYY/MM/DD'){
+			str = `${year}/${month}/${day}`;
+		}else if(type == 'YYYY-MM-DD HH:mm'){
+			str = `${year}-${month}-${day} ${hours}:${minutes}`;
+		}
+		return str;
+	}
+
+	defineExpose({
+		verify,
+		reset
+	})
+</script>
+
+<style lang="scss" scoped>
+	@import '@/styles/diy_form.scss';
+</style>
+
+<style lang="scss">
+	.form-item-frame .calendar-wrap .u-calendar{
+		:deep(.u-calendar-header__title), :deep(.u-calendar-header__subtitle),  :deep(.u-calendar-month__title){
+			display: block;
+		}
+	}
+	.form-item-frame :deep(.u-picker .u-toolbar__wrapper__cancel), .form-item-frame :deep(.u-picker .u-toolbar__wrapper__confirm){
+		font-size: 28rpx;
+	}
+</style>
diff --git a/uni-app/src/app/components/diy/form-email/index.vue b/uni-app/src/app/components/diy/form-email/index.vue
new file mode 100644
index 00000000..e157e8e6
--- /dev/null
+++ b/uni-app/src/app/components/diy/form-email/index.vue
@@ -0,0 +1,200 @@
+<template>
+	<view v-if="diyComponent.viewFormDetail" class="form-item-frame">
+		<view class="base-layout-one" v-if="diyGlobal.completeLayout == 'style-1'">
+			<view class="detail-one-content">
+				<text class="detail-one-content-label">{{ diyComponent.field.name }}</text>
+				<text class="detail-one-content-value">{{ diyComponent.field.value }}</text>
+			</view>
+		</view>
+		<view class="base-layout-two" v-if="diyGlobal.completeLayout == 'style-2'">
+			<view class="detail-two-content">
+				<view class="">{{ diyComponent.field.name }}</view>
+				<view class="detail-two-content-value w-[80%]">{{ diyComponent.field.value }}</view>
+			</view>	
+		</view>
+	</view>
+	<view v-else :style="warpCss" class="form-item-frame">
+		<view class="base-layout-one" v-if="diyGlobal.completeLayout == 'style-1'">
+			<view class="layout-one-label">
+				<text class="text-overflow-ellipsis" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx' ,'font-weight': diyComponent.fontWeight}">{{ diyComponent.field.name }}</text>
+				<text class="required">{{ diyComponent.field.required ? '*' : '' }}</text>
+				<text v-if="diyStore.mode == 'decorate' && diyComponent.isHidden" class="is-hidden">{{ t('hidden') }}</text>
+			</view>
+			<view v-if="diyComponent.field.remark.text" class="layout-one-remark" :style="{ color: diyComponent.field.remark.color, fontSize: (diyComponent.field.remark.fontSize * 2 ) + 'rpx' }">{{ diyComponent.field.remark.text }}</view>
+			<view class="layout-one-error-message" v-if="errorInfo && !errorInfo.code">{{errorInfo.message}}</view>
+			<input type="email" class="layout-one-content" :placeholder="inputPlaceholder" placeholderClass="layout-one-input-placeholder" :placeholder-style="{'font-size': (diyComponent.fontSize * 2) + 'rpx' }" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx'}" v-model="diyComponent.field.value" :disabled="isDisabled"/>
+			<view class="layout-one-attribute-wrap" v-if="inputAttribute().length">
+				<view v-for="(item,index) in inputAttribute()" :key="index" @click="eventFn(item.type)" class="layout-one-attribute-item">{{item.title}}</view>
+			</view>
+		</view>
+		<view class="base-layout-two" v-if="diyGlobal.completeLayout == 'style-2'">
+			<text v-if="diyStore.mode == 'decorate' && diyComponent.isHidden" class="layout-two-is-hidden">{{ t('hidden') }}</text>
+			<view class="layout-two-wrap" :class="{'no-border': !diyGlobal.borderControl}">
+				<view class="layout-two-label" :class="{'justify-start': diyGlobal.completeAlign == 'left', 'justify-end': diyGlobal.completeAlign == 'right'}">
+					<text class="required" v-if="diyComponent.field.required">{{ diyComponent.field.required ? '*' : '' }}</text>
+					<text class="name" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx' ,'font-weight': diyComponent.fontWeight}">{{ diyComponent.field.name }}</text>
+				</view>
+				<input type="email" class="layout-two-content no-flex" :placeholder="inputPlaceholder" placeholderClass="layout-two-input-placeholder" :placeholder-style="{'font-size': (diyComponent.fontSize * 2) + 'rpx'}" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx' }" v-model="diyComponent.field.value" :disabled="isDisabled" />
+			</view>
+			<view class="layout-two-error-message" v-if="errorInfo && !errorInfo.code">{{errorInfo.message}}</view>
+			<view v-if="diyComponent.field.remark.text" class="layout-two-remark" :style="{ color: diyComponent.field.remark.color, fontSize: (diyComponent.field.remark.fontSize * 2 ) + 'rpx' }">{{ diyComponent.field.remark.text }}</view>
+			<view class="layout-two-attribute-wrap" v-if="inputAttribute().length">
+				<view v-for="(item,index) in inputAttribute()" :key="index" @click="eventFn(item.type)" class="layout-two-attribute-item">{{item.title}}</view>
+			</view>
+		</view>
+		<view v-if="diyStore.mode == 'decorate'" class="form-item-mask"></view>
+		<form-privacy-pop ref="formPrivacyRef" :data="formPrivacyData" />
+	</view>
+</template>
+
+<script setup lang="ts">
+	// 表单 邮箱组件
+	import { ref, computed, watch,onMounted } from 'vue';
+    import { img } from '@/utils/common';
+	import { t } from '@/locale'
+    import formPrivacyPop from './../form-privacy-pop/index.vue';
+	import useDiyStore from '@/app/stores/diy';
+
+	const props = defineProps(['component', 'index', 'global']);
+	const diyStore = useDiyStore();
+	const errorInfo:any = ref(null);
+	const formPrivacyRef: any = ref(null);
+
+	const diyComponent = computed(() => {
+		if (diyStore.mode == 'decorate') {
+			return diyStore.value[props.index];
+		} else {
+			return props.component;
+		}
+	})
+	
+	const diyGlobal = computed(() => {
+		return props.global;
+	})
+	
+	const inputPlaceholder = computed(() => {
+		let str = '';
+		str += diyComponent.value.placeholder
+		return str;
+	})
+	
+	const formPrivacyData = computed(() => {
+		let str = `${diyComponent.value.field.name}已开启隐私保护，提交后会部分打码，只有你自己和管理员才能查看完整信息`;
+		return str;
+	})
+	
+	// input属性
+	const inputAttribute = ()=>{
+		let arr = [];
+		if(diyComponent.value.autofill){
+			let obj = {
+				title: '已自动填充'
+			};
+			arr.push(obj);
+		}
+		if(diyComponent.value.field.privacyProtection){
+			let obj = {
+				title: '已开启隐私保护',
+				type: 'privacy'
+			};
+			arr.push(obj);
+		}
+		
+		arr.forEach((item,index,arr)=>{
+			if(index != (arr.length-1)){
+				let obj = {
+					title: '|'
+				};
+				arr.push(obj);
+			}
+		})
+		return arr;
+	}
+	
+	const eventFn = (type:any)=>{
+		if(type == 'privacy'){
+			// 查看隐私
+			formPrivacyRef.value.open();
+		}
+	}
+
+	const warpCss = computed(() => {
+		var style = '';
+        style += 'position:relative;';
+        if (diyComponent.value.componentStartBgColor && diyComponent.value.componentEndBgColor) style += `background:linear-gradient(${diyComponent.value.componentGradientAngle},${diyComponent.value.componentStartBgColor},${diyComponent.value.componentEndBgColor});`;
+        else if (diyComponent.value.componentStartBgColor) style += 'background-color:' + diyComponent.value.componentStartBgColor + ';';
+        else if (diyComponent.value.componentEndBgColor) style += 'background-color:' + diyComponent.value.componentEndBgColor + ';';
+
+        if(diyComponent.value.componentBgUrl) {
+            style += `background-image:url('${ img(diyComponent.value.componentBgUrl) }');`;
+            style += 'background-size: cover;background-repeat: no-repeat;';
+        }
+
+		if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		return style;
+	})
+
+    onMounted(() => {
+        refresh();
+        // 装修模式下刷新
+        if (diyStore.mode == 'decorate') {
+            watch(
+                () => diyComponent.value,
+                (newValue, oldValue) => {
+                    if (newValue && newValue.componentName == 'FormEmail') {
+                        refresh();
+                    }
+                }
+            )
+        }else{
+		}
+    });
+
+    const refresh = ()=> {
+		// 装修模式下，展示默认值
+		if (diyStore.mode == 'decorate') {
+		   diyComponent.value.field.value = diyComponent.value.field.default;
+		}else {
+		   // 实际展示，优先缓存，其次默认值
+		   if (diyComponent.value.field.value == '' && diyComponent.value.field.default) {
+		      diyComponent.value.field.value = diyComponent.value.field.default;
+		   }
+		}
+    }
+
+	// 表单组件验证
+	const verify = () => {
+		let emailRegex = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/; 
+		const res = { code: true, message: '' }
+		if (diyComponent.value.field.required && diyComponent.value.field.value == '' && diyStore.mode != 'decorate') {
+			res.code = false
+			res.message = `${ inputPlaceholder.value }`;
+		}else if (!emailRegex.test(diyComponent.value.field.value) && diyStore.mode != 'decorate') {
+			res.code = false
+			res.message = `邮箱格式不正确，请重新输入`;
+		}
+		errorInfo.value = res;
+		return res;
+	}
+
+	// 重置表单组件数据
+	const reset = () => {
+		diyComponent.value.field.value = '';
+	}
+
+	const isDisabled = computed(() => {
+		return diyStore.mode == 'decorate';
+	});
+
+	defineExpose({
+		verify,
+		reset
+	})
+</script>
+
+<style lang="scss" scoped>
+	@import '@/styles/diy_form.scss';
+</style>
\ No newline at end of file
diff --git a/uni-app/src/app/components/diy/form-file/index.vue b/uni-app/src/app/components/diy/form-file/index.vue
new file mode 100644
index 00000000..514697ed
--- /dev/null
+++ b/uni-app/src/app/components/diy/form-file/index.vue
@@ -0,0 +1,119 @@
+<template>
+	<view :style="warpCss">
+		<view class="relative">
+			<view class="p-[10rpx] flex items-center ">
+				<view class="w-[27%] mr-[10rpx] flex items-center">
+					<text class="text-overflow-ellipsis" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx' ,'font-weight': diyComponent.fontWeight}">{{ diyComponent.field.name }}</text>
+					<text class="text-[#ec0003]">{{ diyComponent.field.required ? '*' : '' }}</text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup lang="ts">
+	// 表单 文件组件
+	import { ref, computed, watch,onMounted } from 'vue';
+    import { img } from '@/utils/common';
+	import useDiyStore from '@/app/stores/diy';
+    import { uploadImage } from '@/app/api/system'
+
+	const props = defineProps(['component', 'index','global']);
+	const diyStore = useDiyStore();
+	const selectValue = ref([])
+
+	const diyComponent = computed(() => {
+		if (diyStore.mode == 'decorate') {
+			return diyStore.value[props.index];
+		} else {
+			return props.component;
+		}
+	})
+	const warpCss = computed(() => {
+		var style = '';
+        style += 'position:relative;';
+        if(diyComponent.value.componentStartBgColor) {
+            if (diyComponent.value.componentStartBgColor && diyComponent.value.componentEndBgColor) style += `background:linear-gradient(${diyComponent.value.componentGradientAngle},${diyComponent.value.componentStartBgColor},${diyComponent.value.componentEndBgColor});`;
+            else style += 'background-color:' + diyComponent.value.componentStartBgColor + ';';
+        }
+
+        if(diyComponent.value.componentBgUrl) {
+            style += `background-image:url('${ img(diyComponent.value.componentBgUrl) }');`;
+            style += 'background-size: cover;background-repeat: no-repeat;';
+        }
+
+		if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		return style;
+	})
+
+    onMounted(() => {
+        refresh();
+        // 装修模式下刷新
+        if (diyStore.mode == 'decorate') {
+            watch(
+                () => diyComponent.value,
+                (newValue, oldValue) => {
+                    if (newValue && newValue.componentName == 'FormFile') {
+                        refresh();
+                    }
+                }
+            )
+        }
+    });
+
+	const imgListPreview = computed(() => {
+		return selectValue.value.map(item => {
+			return {url: img(item)}
+		})
+	})
+
+	const afterRead = (event) => {
+		event.file.forEach(item => {
+			uploadImage({
+				filePath: item.url,
+				name: 'file'
+			}).then(res => {
+				if (selectValue.value.length < diyComponent.value.limit ) {
+					selectValue.value.push(res.data.url)
+				}
+			}).catch(() => {
+			})
+		})
+	}
+
+	const deletePic = (event)=> {
+		selectValue.value.splice(event.index, 1)
+	}
+
+    const refresh = ()=> {
+    }
+
+	// 表单组件验证
+	const verify = () => {
+		const res = { code: true, message: '' }
+		// todo 验证组件，diyComponent.value.field.value
+		return res;
+	}
+
+	// 重置表单组件数据
+	const reset = () => {
+		// todo 清空组件数据，diyComponent.value.field.value = '';
+	}
+
+	defineExpose({
+		verify,
+		reset
+	})
+</script>
+
+<style lang="scss" scoped>
+	@import '@/styles/diy_form.scss';
+	.text-overflow-ellipsis {
+	  white-space: nowrap;
+	  overflow: hidden;
+	  text-overflow: ellipsis;
+	}
+</style>
diff --git a/uni-app/src/app/components/diy/form-identity-privacy/index.vue b/uni-app/src/app/components/diy/form-identity-privacy/index.vue
new file mode 100644
index 00000000..7954e687
--- /dev/null
+++ b/uni-app/src/app/components/diy/form-identity-privacy/index.vue
@@ -0,0 +1,44 @@
+<template>
+	<view @touchmove.prevent.stop>
+		<u-popup :show="formDetailPrivacyPop" @close="closeFn" zIndex="500" mode="center" :round="8">
+			<view class="w-[570rpx]  popup-common center">
+			    <view class="text-center my-5">
+			        {{ t('tips') }}<br/>{{data}}
+			    </view>
+			    <view class="flex justify-between">
+			        <button class="w-[50%] h-[100rpx] rounded-[0rpx] leading-[100rpx] !bg-[transform] border-solid border-[0] border-t-[2rpx] border-[#e6e6e6] !text-[#333]" @click="copy(data)">{{ t('copy') }}</button>
+			        <button class="w-[50%] h-[100rpx] rounded-[0rpx] border-solid border-[0] border-t-[2rpx]  border-l-[2rpx] bo border-[#e6e6e6] leading-[100rpx] !bg-[transform] !text-[var(--primary-color)]" @click="closeFn">{{ t('know') }}</button>
+			    </view>
+			</view>
+		</u-popup>
+	</view>
+</template>
+
+<script setup lang="ts">
+	import { ref, computed } from 'vue';
+	import { t } from '@/locale'
+	import { copy } from '@/utils/common';
+
+	const props = defineProps(['data']);
+
+	const data = computed(() => {
+		let str = props.data || '已开启隐私保护，提交后会部分打码，只有你自己和管理员才能查看完整信息';
+		return str;
+	})
+
+	const formDetailPrivacyPop = ref(false);
+	const open = ()=>{
+		formDetailPrivacyPop.value = true
+	}
+	const closeFn = ()=>{
+		formDetailPrivacyPop.value = false
+	}
+
+	defineExpose({
+		open
+	})
+</script>
+
+<style lang="scss" scoped>
+	@import '@/styles/diy_form.scss';
+</style>
diff --git a/uni-app/src/app/components/diy/form-identity/index.vue b/uni-app/src/app/components/diy/form-identity/index.vue
new file mode 100644
index 00000000..b186bab1
--- /dev/null
+++ b/uni-app/src/app/components/diy/form-identity/index.vue
@@ -0,0 +1,228 @@
+<template>
+	<view v-if="diyComponent.viewFormDetail" class="form-item-frame">
+		<view class="base-layout-one" v-if="diyGlobal.completeLayout == 'style-1'">
+			<view class="detail-one-content">
+				<text class="detail-one-content-label">{{ diyComponent.field.name }}</text>
+				<view class="detail-one-content-value">
+					<text>{{ formattedIdentity }}</text>
+					<text v-if="diyComponent.field.privacyProtection" class="ml-[20rpx] text-[var(--primary-color)]" @click="viewPrivacy">{{ t('view') }}</text>
+				</view>
+			</view>
+		</view>
+		<view class="base-layout-two" v-if="diyGlobal.completeLayout == 'style-2'">
+			<view class="detail-two-content">
+				<text class="detail-two-content-label">{{ diyComponent.field.name }}</text>
+				<view class="detail-one-content-value">
+					<text>{{ formattedIdentity }}</text>
+					<text v-if="diyComponent.field.privacyProtection" class="ml-[20rpx] text-[var(--primary-color)]" @click="viewPrivacy">{{ t('view') }}</text>
+				</view>
+			</view>
+		</view>
+		<form-identity-privacy ref="formDetailPrivacyRef" :data="diyComponent.field.value" />
+	</view>
+	<view v-else :style="warpCss" class="form-item-frame">
+		<view class="base-layout-one" v-if="diyGlobal.completeLayout == 'style-1'">
+			<view class="layout-one-label">
+				<text class="text-overflow-ellipsis" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx' ,'font-weight': diyComponent.fontWeight}">{{ diyComponent.field.name }}</text>
+				<text class="required">{{ diyComponent.field.required ? '*' : '' }}</text>
+				<text v-if="diyStore.mode == 'decorate' && diyComponent.isHidden" class="is-hidden">{{ t('hidden') }}</text>
+			</view>
+			<view v-if="diyComponent.field.remark.text" class="layout-one-remark" :style="{ color: diyComponent.field.remark.color, fontSize: (diyComponent.field.remark.fontSize * 2 ) + 'rpx' }">{{ diyComponent.field.remark.text }}</view>
+			<view class="layout-one-error-message" v-if="errorInfo && !errorInfo.code">{{errorInfo.message}}</view>
+			<input type="idcard" class="layout-one-content" :placeholder="inputPlaceholder" placeholderClass="layout-one-input-placeholder" :placeholder-style="{'font-size': (diyComponent.fontSize * 2) + 'rpx'}" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx'}" v-model="diyComponent.field.value" :disabled="isDisabled" maxlength="18"/>
+			<view class="layout-one-attribute-wrap" v-if="inputAttribute().length">
+				<view v-for="(item,index) in inputAttribute()" :key="index" @click="eventFn(item.type)" class="layout-one-attribute-item">{{item.title}}</view>
+			</view>
+		</view>
+		<view class="base-layout-two" v-if="diyGlobal.completeLayout == 'style-2'">
+			<text v-if="diyStore.mode == 'decorate' && diyComponent.isHidden" class="layout-two-is-hidden">{{ t('hidden') }}</text>
+			<view class="layout-two-wrap" :class="{'no-border': !diyGlobal.borderControl}">
+				<view class="layout-two-label" :class="{'justify-start': diyGlobal.completeAlign == 'left', 'justify-end': diyGlobal.completeAlign == 'right'}">
+					<text class="required" v-if="diyComponent.field.required">{{ diyComponent.field.required ? '*' : '' }}</text>
+					<text class="name" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx' ,'font-weight': diyComponent.fontWeight}">{{ diyComponent.field.name }}</text>
+				</view>
+				<input type="idcard" class="layout-two-content no-flex" :placeholder="inputPlaceholder" placeholderClass="layout-two-input-placeholder" :placeholder-style="{'font-size': (diyComponent.fontSize * 2) + 'rpx'}" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx'}" v-model="diyComponent.field.value" :disabled="isDisabled" maxlength="18" />
+			</view>
+			<view class="layout-two-error-message" v-if="errorInfo && !errorInfo.code">{{errorInfo.message}}</view>
+			<view v-if="diyComponent.field.remark.text" class="layout-two-remark" :style="{ color: diyComponent.field.remark.color, fontSize: (diyComponent.field.remark.fontSize * 2 ) + 'rpx' }">{{ diyComponent.field.remark.text }}</view>
+			<view class="layout-two-attribute-wrap" v-if="inputAttribute().length">
+				<view v-for="(item,index) in inputAttribute()" :key="index" @click="eventFn(item.type)" class="layout-two-attribute-item">{{item.title}}</view>
+			</view>
+		</view>
+		<view v-if="diyStore.mode == 'decorate'" class="form-item-mask"></view>
+		<form-privacy-pop ref="formPrivacyRef" :data="formPrivacyData" />
+	</view>
+</template>
+
+<script setup lang="ts">
+	// 表单 身份证组件
+	import { ref, computed, watch,onMounted,nextTick } from 'vue';
+    import { img } from '@/utils/common';
+	import { t } from '@/locale'
+    import formPrivacyPop from './../form-privacy-pop/index.vue';
+	import useDiyStore from '@/app/stores/diy';
+	import formIdentityPrivacy from './../form-identity-privacy/index.vue'
+
+	const props = defineProps(['component', 'index', 'global']);
+	const diyStore = useDiyStore();
+	const errorInfo:any = ref(null);
+	const formPrivacyRef: any = ref(null);
+	const formDetailPrivacyRef: any = ref(null);
+
+	const diyComponent = computed(() => {
+		if (diyStore.mode == 'decorate') {
+			return diyStore.value[props.index];
+		} else {
+			return props.component;
+		}
+	})
+
+	const diyGlobal = computed(() => {
+		return props.global;
+	})
+
+	const formattedIdentity = computed(() => {
+		const identity = String(diyComponent.value.field.value);
+		if (diyComponent.value.field.privacyProtection) {
+			return identity.replace(/(\d{3})\d*(\d{4})/, '$1****$2');
+		}
+		return identity;
+	});
+
+	const inputPlaceholder = computed(() => {
+		let str = '';
+		str += diyComponent.value.placeholder
+		return str;
+	})
+
+	const formPrivacyData = computed(() => {
+		let str = `${diyComponent.value.field.name}已开启隐私保护，提交后会部分打码，只有你自己和管理员才能查看完整信息`;
+		return str;
+	})
+
+	// input属性
+	const inputAttribute = ()=>{
+		let arr = [];
+		if(diyComponent.value.autofill){
+			let obj = {
+				title: '已自动填充'
+			};
+			arr.push(obj);
+		}
+		if(diyComponent.value.field.privacyProtection){
+			let obj = {
+				title: '已开启隐私保护',
+				type: 'privacy'
+			};
+			arr.push(obj);
+		}
+
+		arr.forEach((item,index,arr)=>{
+			if(index != (arr.length-1)){
+				let obj = {
+					title: '|'
+				};
+				arr.push(obj);
+			}
+		})
+		return arr;
+	}
+
+	const eventFn = (type:any)=>{
+		if(type == 'privacy'){
+			// 查看隐私
+			formPrivacyRef.value.open();
+		}
+	}
+
+	const viewPrivacy = () => {
+		nextTick(() => {
+		    if (formDetailPrivacyRef.value) {
+		        formDetailPrivacyRef.value.open();
+		    } else {
+		        console.warn('formDetailPrivacyRef is not defined');
+		    }
+		});
+	}
+
+	const warpCss = computed(() => {
+		var style = '';
+        style += 'position:relative;';
+        if (diyComponent.value.componentStartBgColor && diyComponent.value.componentEndBgColor) style += `background:linear-gradient(${diyComponent.value.componentGradientAngle},${diyComponent.value.componentStartBgColor},${diyComponent.value.componentEndBgColor});`;
+        else if (diyComponent.value.componentStartBgColor) style += 'background-color:' + diyComponent.value.componentStartBgColor + ';';
+        else if (diyComponent.value.componentEndBgColor) style += 'background-color:' + diyComponent.value.componentEndBgColor + ';';
+
+        if(diyComponent.value.componentBgUrl) {
+            style += `background-image:url('${ img(diyComponent.value.componentBgUrl) }');`;
+            style += 'background-size: cover;background-repeat: no-repeat;';
+        }
+
+		if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		return style;
+	})
+
+    onMounted(() => {
+        refresh();
+        // 装修模式下刷新
+        if (diyStore.mode == 'decorate') {
+            watch(
+                () => diyComponent.value,
+                (newValue, oldValue) => {
+                    if (newValue && newValue.componentName == 'FormIdentity') {
+                        refresh();
+                    }
+                }
+            )
+        }else{
+		}
+    });
+
+    const refresh = ()=> {
+		// 装修模式下，展示默认值
+		if (diyStore.mode == 'decorate') {
+		   diyComponent.value.field.value = diyComponent.value.field.default;
+		}else {
+		   // 实际展示，优先缓存，其次默认值
+		   if (diyComponent.value.field.value == '' && diyComponent.value.field.default) {
+		      diyComponent.value.field.value = diyComponent.value.field.default;
+		   }
+		}
+    }
+
+	// 表单组件验证
+	const verify = () => {
+		const res = { code: true, message: '' }
+		// 18位身份证号正则表达式
+		let idCardReg = /^[1-9]\d{5}(18|19|20)\d{2}((0[1-9])|(1[0-2]))((0[1-9])|([1-2][0-9])|(3[0-1]))\d{3}[0-9Xx]$/;
+		if (diyComponent.value.field.required && diyComponent.value.field.value == '' && diyStore.mode != 'decorate') {
+			res.code = false
+			res.message = `${ inputPlaceholder.value }`;
+		}else if (!idCardReg.test(diyComponent.value.field.value) && diyStore.mode != 'decorate') {
+			res.code = false
+			res.message = `身份证格式不正确，请重新输入`;
+		}
+		errorInfo.value = res;
+		return res;
+	}
+
+	// 重置表单组件数据
+	const reset = () => {
+		diyComponent.value.field.value = '';
+	}
+
+	const isDisabled = computed(() => {
+		return diyStore.mode == 'decorate';
+	});
+
+	defineExpose({
+		verify,
+		reset
+	})
+</script>
+
+<style lang="scss" scoped>
+	@import '@/styles/diy_form.scss';
+</style>
diff --git a/uni-app/src/app/components/diy/form-image/index.vue b/uni-app/src/app/components/diy/form-image/index.vue
new file mode 100644
index 00000000..525d2a5b
--- /dev/null
+++ b/uni-app/src/app/components/diy/form-image/index.vue
@@ -0,0 +1,315 @@
+<template>
+	<view v-if="diyComponent.viewFormDetail" class="form-item-frame">
+		<view class="base-layout-one" v-if="diyGlobal.completeLayout == 'style-1'">
+			<view class="detail-one-content">
+				<text class="detail-one-content-label">{{ diyComponent.field.name }}</text>
+				<view class="flex flex-wrap">
+					<view class="relative w-[180rpx] !h-[180rpx] mr-[16rpx] mb-[16rpx] " v-for="(item,index) in diyComponent.field.value" :key="index">
+						<image class="w-[100%] h-[100%]" :src="img(item)" @click="handleImg(item,index)" mode="aspectFill"></image>
+					</view>
+				</view>
+
+			</view>
+		</view>
+		<view class="base-layout-two" v-if="diyGlobal.completeLayout == 'style-2'">
+			<view class="detail-two-content">
+				<text class="detail-two-content-label">{{ diyComponent.field.name }}</text>
+				<view class="flex flex-wrap w-[80%] justify-end">
+					<view class="relative w-[180rpx] !h-[180rpx] mr-[16rpx] mb-[16rpx] " v-for="(item,index) in diyComponent.field.value" :key="index">
+						<image class="w-[100%] h-[100%]" :src="img(item)" @click="handleImg(item,index)" mode="aspectFill"></image>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+	<view v-else :style="warpCss" class="form-item-frame">
+		<view class="base-layout-one" v-if="diyGlobal.completeLayout == 'style-1'">
+			<view class="layout-one-label">
+				<text class="text-overflow-ellipsis" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx' ,'font-weight': diyComponent.fontWeight}">{{ diyComponent.field.name }}</text>
+				<text class="required">{{ diyComponent.field.required ? '*' : '' }}</text>
+				<text v-if="diyStore.mode == 'decorate' && diyComponent.isHidden" class="is-hidden">{{ t('hidden') }}</text>
+			</view>
+			<view v-if="diyComponent.field.remark.text" class="layout-one-remark" :style="{ color: diyComponent.field.remark.color, fontSize: (diyComponent.field.remark.fontSize * 2 ) + 'rpx' }">{{ diyComponent.field.remark.text }}</view>
+			<view class="layout-one-error-message" v-if="errorInfo && !errorInfo.code">{{errorInfo.message}}</view>
+			<view class="flex flex-wrap">
+				<view class="relative w-[180rpx] !h-[180rpx] mr-[16rpx] mb-[16rpx] layout-one-content" v-for="(item,index) in diyComponent.field.value" :key="index">
+					<image class="w-[100%] h-[100%]" :src="img(item)" mode="aspectFill"></image>
+					<view class="absolute top-0 right-[0] bg-[#373737] flex justify-end h-[28rpx] w-[28rpx] rounded-bl-[40rpx]" @click="deleteImage(index)">
+					    <text class="nc-iconfont nc-icon-guanbiV6xx !text-[20rpx] mt-[2rpx] mr-[2rpx] text-[#fff]"></text>
+					</view>
+				</view>
+				<view class="flex items-center flex-1" v-if="diyComponent.uploadMode.length > 1 && diyComponent.field.value.length <= 0">
+					<view class="layout-one-content !p-[0] flex-1 !items-stretch !h-[100rpx]">
+						<u-upload accept="image" @afterRead="afterRead" multiple :maxCount="9" capture="camera">
+							<view class="flex items-center h-[100%] w-[100%] pl-[30rpx] box-border">
+								<text class="nc-iconfont nc-icon-xiangjiV6xx"></text>
+								<text class="text-[28rpx] ml-[10rpx]">拍照上传</text>
+							</view>
+						</u-upload>
+					</view>
+					<view class="layout-one-content !p-[0] ml-[20rpx] !items-stretch flex-1 !h-[100rpx]">
+						<u-upload accept="image" @afterRead="afterRead" multiple :maxCount="9" capture="album">
+							<view class="flex items-center h-[100%] w-[100%] pl-[30rpx] box-border">
+								<text class="nc-iconfont nc-icon-tupiandaohangpc"></text>
+								<text class="text-[28rpx] ml-[10rpx]">从相册中选择</text>
+							</view>
+						</u-upload>
+					</view>
+				</view>
+				<view v-else-if="diyComponent.field.value.length < Number(diyComponent.limit)" class="layout-one-content h-[180rpx] w-[180rpx] !px-[0]">
+					<u-upload accept="image" v-if="diyComponent.uploadMode.length == 1" @afterRead="afterRead" multiple :capture="uploadType" :maxCount="Number(diyComponent.limit)">
+						<view class="flex flex-col items-center justify-center w-[180rpx] h-[180rpx] ">
+							<text class="nc-iconfont !text-[36rpx] mb-[16rpx]" :class="{'nc-icon-xiangjiV6xx':diyComponent.uploadMode.indexOf('take_pictures') > -1, 'nc-icon-tupiandaohangpc':diyComponent.uploadMode.indexOf('take_pictures') == -1}"></text>
+							<text class="text-[28rpx] ml-[10rpx] text-[24rpx]">{{diyComponent.uploadMode.indexOf('take_pictures') > -1 ? '拍照上传' : '从相册选择'}}</text>
+						</view>
+					</u-upload>
+					<u-upload accept="image" v-else @afterRead="afterRead" multiple :capture="uploadType" :maxCount="Number(diyComponent.limit)">
+						<view class="flex flex-col items-center justify-center w-[180rpx] h-[180rpx] ">
+							<text class="nc-iconfont !text-[40rpx] mb-[16rpx] nc-icon-jiahaoV6xx"></text>
+							<text class="text-[28rpx] ml-[10rpx] text-[24rpx]"> {{ t('uploadTips') }}</text>
+						</view>
+					</u-upload>
+				</view>
+			</view>
+			<view class="layout-one-attribute-wrap" v-if="inputAttribute().length">
+				<view v-for="(item,index) in inputAttribute()" :key="index" @click="eventFn(item.type)" class="layout-one-attribute-item">{{item.title}}</view>
+			</view>
+		</view>
+		<view class="base-layout-two" v-if="diyGlobal.completeLayout == 'style-2'">
+			<text v-if="diyStore.mode == 'decorate' && diyComponent.isHidden" class="layout-two-is-hidden">{{ t('hidden') }}</text>
+			<view class="layout-two-wrap" :class="{'no-border': !diyGlobal.borderControl}">
+				<view class="layout-two-label" :class="{'justify-start': diyGlobal.completeAlign == 'left', 'justify-end': diyGlobal.completeAlign == 'right'}">
+					<text class="required" v-if="diyComponent.field.required">{{ diyComponent.field.required ? '*' : '' }}</text>
+					<text class="name" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx' ,'font-weight': diyComponent.fontWeight}">{{ diyComponent.field.name }}</text>
+				</view>
+				<view class="layout-two-content flex-wrap">
+					<view class="relative border-box w-[180rpx] !h-[180rpx] ml-[16rpx] mb-[16rpx] border-box border-[2rpx] border-solid border-[#e6e6e6] rounded-[10rpx] flex items-center" v-for="(item,index) in diyComponent.field.value" :key="index">
+						<image class="w-[100%] h-[100%]" :src="img(item)" mode="aspectFill"></image>
+						<view class="absolute top-0 right-[0] bg-[#373737] flex justify-end h-[28rpx] w-[28rpx] rounded-bl-[40rpx]" @click="deleteImage(index)">
+						    <text class="nc-iconfont nc-icon-guanbiV6xx !text-[20rpx] mt-[2rpx] mr-[2rpx] text-[#fff]"></text>
+						</view>
+					</view>
+					<view class="items-start border-box border-[2rpx] ml-[16rpx] mb-[16rpx] border-solid border-[#e6e6e6] rounded-[10rpx]">
+						<u-upload accept="image" v-if="diyComponent.field.value.length < Number(diyComponent.limit)" @afterRead="afterRead" multiple :capture="uploadType" :maxCount="Number(diyComponent.limit)">
+							<view class="flex flex-col items-center justify-center min-w-[180rpx] min-h-[180rpx]">
+								<text class="nc-iconfont !text-[40rpx] mb-[16rpx] nc-icon-jiahaoV6xx"></text>
+								<text class="text-[28rpx] ml-[10rpx] text-[24rpx]"> {{ t('uploadTips') }}</text>
+							</view>
+						</u-upload>
+					</view>
+				</view>
+			</view>
+			<view class="layout-two-error-message" v-if="errorInfo && !errorInfo.code">{{errorInfo.message}}</view>
+			<view v-if="diyComponent.field.remark.text" class="layout-two-remark" :style="{ color: diyComponent.field.remark.color, fontSize: (diyComponent.field.remark.fontSize * 2 ) + 'rpx' }">{{ diyComponent.field.remark.text }}</view>
+			<view class="layout-two-attribute-wrap" v-if="inputAttribute().length">
+				<view v-for="(item,index) in inputAttribute()" :key="index" @click="eventFn(item.type)" class="layout-two-attribute-item">{{item.title}}</view>
+			</view>
+		</view>
+		<view v-if="diyStore.mode == 'decorate'" class="form-item-mask"></view>
+	</view>
+</template>
+
+<script setup lang="ts">
+	// 表单 图片组件
+	import { ref, computed, watch,onMounted } from 'vue';
+    import { img } from '@/utils/common';
+	import { t } from '@/locale'
+	import { onLoad,onShow,onUnload} from '@dcloudio/uni-app';
+	import useDiyStore from '@/app/stores/diy';
+    import { uploadImage } from '@/app/api/system'
+
+	const props = defineProps(['component', 'index','global']);
+	const diyStore = useDiyStore();
+	const selectValue = ref([])
+	const errorInfo:any = ref(null);
+
+	const diyComponent = computed(() => {
+		if (diyStore.mode == 'decorate') {
+			return diyStore.value[props.index];
+		} else {
+			return props.component;
+		}
+	})
+
+	const diyGlobal = computed(() => {
+		return props.global;
+	})
+
+	// 上传方式
+	const uploadType = computed(()=>{
+		let type = [];
+		if(diyComponent.value && diyComponent.value.uploadMode){
+			diyComponent.value.uploadMode.forEach((item,index)=>{
+				if(item == 'take_pictures' && diyComponent.value.uploadMode.indexOf('camera') == -1){
+					type.push('camera');
+				}else if(item == 'select_from_album' && diyComponent.value.uploadMode.indexOf('album') == -1){
+					type.push('album');
+				}
+			})
+		}
+		return type;
+	});
+
+	// input属性
+	const inputAttribute = ()=>{
+		let arr = [];
+		if(diyComponent.value.autofill){
+			let obj = {
+				title: '已自动填充'
+			};
+			arr.push(obj);
+		}
+
+		arr.forEach((item,index,arr)=>{
+			if(index != (arr.length-1)){
+				let obj = {
+					title: '|'
+				};
+				arr.push(obj);
+			}
+		})
+		return arr;
+	}
+
+	const eventFn = (type:any)=>{
+
+	}
+
+	const handleImg = (url: any,index: number) => {
+		let tmp = [];
+		if(diyComponent.value.field.value){
+	       tmp = Object.values(diyComponent.value.field.value).map((item: any) => {
+	           return img(item);
+	       });
+	    }
+		uni.previewImage({
+			current: index,
+			urls: tmp,
+			indicator: "number",
+			loop: true
+		})
+
+	}
+
+	// 关闭预览图片
+	onUnload(()=>{
+	    // #ifdef  H5 || APP
+		try {
+			uni.closePreviewImage()
+		}catch (e) {
+
+		}
+	    // #endif
+	})
+
+	const warpCss = computed(() => {
+		var style = '';
+        style += 'position:relative;';
+        if(diyComponent.value.componentStartBgColor) {
+            if (diyComponent.value.componentStartBgColor && diyComponent.value.componentEndBgColor) style += `background:linear-gradient(${diyComponent.value.componentGradientAngle},${diyComponent.value.componentStartBgColor},${diyComponent.value.componentEndBgColor});`;
+            else style += 'background-color:' + diyComponent.value.componentStartBgColor + ';';
+        }
+
+        if(diyComponent.value.componentBgUrl) {
+            style += `background-image:url('${ img(diyComponent.value.componentBgUrl) }');`;
+            style += 'background-size: cover;background-repeat: no-repeat;';
+        }
+
+		if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		return style;
+	})
+
+    onMounted(() => {
+        refresh();
+        // 装修模式下刷新
+        if (diyStore.mode == 'decorate') {
+            watch(
+                () => diyComponent.value,
+                (newValue, oldValue) => {
+                    if (newValue && newValue.componentName == 'FormImage') {
+                        refresh();
+                    }
+                }
+            )
+        }
+    });
+
+	const isDisabled = computed(() => {
+		return diyStore.mode === 'decorate';
+	});
+
+	const imgListPreview = computed(() => {
+		return diyComponent.value.field.value.map(item => {
+			return {url: img(item)}
+		})
+	})
+
+	const afterRead = (event) => {
+		uni.setStorageSync('sku_form_refresh', true);
+		event.file.forEach(item => {
+			upload(item);
+		})
+	}
+
+	const upload = (data:any) => {
+	    if (diyComponent.value.field.value.length > Number(diyComponent.value.limit) ) {
+	        uni.showToast({ title: `最多允许上传${diyComponent.value.limit}张图片`, icon: 'none' })
+	        return false
+	    }
+
+	    uploadImage({
+	        filePath: data.url,
+	        name: 'file'
+	    }).then(res => {
+	        if (diyComponent.value.field.value.length < Number(diyComponent.value.limit) ) {
+	        	diyComponent.value.field.value.push(res.data.url)
+	        }
+	    }).catch(() => {
+	    })
+	}
+
+	const deleteImage = (event)=> {
+		diyComponent.value.field.value.splice(event.index, 1)
+	}
+
+    const refresh = ()=> {
+    }
+
+	// 表单组件验证
+	const verify = () => {
+		const res = { code: true, message: '' }
+		// todo 验证组件，diyComponent.value.field.value
+		if (diyComponent.value.field.required && (!diyComponent.value.field.value || diyComponent.value.field.value && !diyComponent.value.field.value.length)) {
+			res.code = false
+			res.message = `请上传图片`;
+		}else if (diyComponent.value.field.value && diyComponent.value.field.value.length > Number(diyComponent.value.limit)) {
+			res.code = false
+			res.message = `图片上传数量已超出限制数量`;
+		}
+		errorInfo.value = res;
+		return res;
+	}
+
+	// 重置表单组件数据
+	const reset = () => {
+		// todo 清空组件数据，diyComponent.value.field.value = '';
+		diyComponent.value.field.value = [];
+	}
+
+	defineExpose({
+		verify,
+		reset
+	})
+</script>
+
+<style lang="scss">
+	.layout-one-content .u-upload .u-upload__wrap > uni-view, .layout-one-content .u-upload .u-upload__wrap > view, .layout-one-content .u-upload .u-upload__wrap > div{
+		width: 100%;
+	}
+</style>
+<style lang="scss" scoped>
+	@import '@/styles/diy_form.scss';
+</style>
diff --git a/uni-app/src/app/components/diy/form-input/index.vue b/uni-app/src/app/components/diy/form-input/index.vue
new file mode 100644
index 00000000..2408b15e
--- /dev/null
+++ b/uni-app/src/app/components/diy/form-input/index.vue
@@ -0,0 +1,196 @@
+<template>
+	<view v-if="diyComponent.viewFormDetail" class="form-item-frame">
+		<view class="base-layout-one" v-if="diyGlobal.completeLayout == 'style-1'">
+			<view class="detail-one-content">
+				<text class="detail-one-content-label">{{ diyComponent.field.name }}</text>
+				<text class="detail-one-content-value">{{ diyComponent.field.value }}</text>
+			</view>
+		</view>
+		<view class="base-layout-two" v-if="diyGlobal.completeLayout == 'style-2'">
+			<view class="detail-two-content">
+				<view class="">{{ diyComponent.field.name }}</view>
+				<view class="detail-two-content-value w-[80%]">{{ diyComponent.field.value }}</view>
+			</view>	
+		</view>
+	</view>
+	<view v-else :style="warpCss" class="form-item-frame">
+		<view class="base-layout-one" v-if="diyGlobal.completeLayout == 'style-1'">
+			<view class="layout-one-label">
+				<text class="text-overflow-ellipsis" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx' ,'font-weight': diyComponent.fontWeight}">{{ diyComponent.field.name }}</text>
+				<text class="required">{{ diyComponent.field.required ? '*' : '' }}</text>
+				<text v-if="diyStore.mode == 'decorate' && diyComponent.isHidden" class="is-hidden">{{ t('hidden') }}</text>
+			</view>
+			<view v-if="diyComponent.field.remark.text" class="layout-one-remark" :style="{ color: diyComponent.field.remark.color, fontSize: (diyComponent.field.remark.fontSize * 2 ) + 'rpx' }">{{ diyComponent.field.remark.text }}</view>
+			<view class="layout-one-error-message" v-if="errorInfo && !errorInfo.code">{{errorInfo.message}}</view>
+			<input type="text" class="layout-one-content" :placeholder="inputPlaceholder" placeholderClass="layout-one-input-placeholder" :placeholder-style="{'font-size': (diyComponent.fontSize * 2) + 'rpx' }" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx'}" v-model="diyComponent.field.value" :disabled="isDisabled" />
+			<view class="layout-one-attribute-wrap" v-if="inputAttribute().length">
+				<view v-for="(item,index) in inputAttribute()" :key="index" @click="eventFn(item.type)" class="layout-one-attribute-item">{{item.title}}</view>
+			</view>
+		</view>
+		<view class="base-layout-two" v-if="diyGlobal.completeLayout == 'style-2'">
+			<text v-if="diyStore.mode == 'decorate' && diyComponent.isHidden" class="layout-two-is-hidden">{{ t('hidden') }}</text>
+			<view class="layout-two-wrap" :class="{'no-border': !diyGlobal.borderControl}">
+				<view class="layout-two-label" :class="{'justify-start': diyGlobal.completeAlign == 'left', 'justify-end': diyGlobal.completeAlign == 'right'}">
+					<text class="required" v-if="diyComponent.field.required">{{ diyComponent.field.required ? '*' : '' }}</text>
+					<text class="name" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx' ,'font-weight': diyComponent.fontWeight}">{{ diyComponent.field.name }}</text>
+				</view>
+				<input type="text" class="layout-two-content no-flex" :placeholder="inputPlaceholder" placeholderClass="layout-two-input-placeholder" :placeholder-style="{'font-size': (diyComponent.fontSize * 2) + 'rpx'}" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx'}" v-model="diyComponent.field.value" :disabled="isDisabled" />
+			</view>
+			<view class="layout-two-error-message" v-if="errorInfo && !errorInfo.code">{{errorInfo.message}}</view>
+			<view v-if="diyComponent.field.remark.text" class="layout-two-remark" :style="{ color: diyComponent.field.remark.color, fontSize: (diyComponent.field.remark.fontSize * 2 ) + 'rpx' }">{{ diyComponent.field.remark.text }}</view>
+			<view class="layout-two-attribute-wrap" v-if="inputAttribute().length">
+				<view v-for="(item,index) in inputAttribute()" :key="index" @click="eventFn(item.type)" class="layout-two-attribute-item">{{item.title}}</view>
+			</view>
+		</view>
+		<view v-if="diyStore.mode == 'decorate'" class="form-item-mask"></view>
+		<form-privacy-pop ref="formPrivacyRef" :data="formPrivacyData" />
+	</view>
+</template>
+
+<script setup lang="ts">
+	// 表单 单行文本组件
+	import { ref, computed, watch,onMounted } from 'vue';
+    import { img } from '@/utils/common';
+	import { t } from '@/locale'
+    import formPrivacyPop from './../form-privacy-pop/index.vue';
+	import useDiyStore from '@/app/stores/diy';
+
+	const props = defineProps(['component', 'index', 'global']);
+	const diyStore = useDiyStore();
+	const errorInfo:any = ref(null);
+	const formPrivacyRef: any = ref(null);
+
+	const diyComponent = computed(() => {
+		if (diyStore.mode == 'decorate') {
+			return diyStore.value[props.index];
+		} else {
+			return props.component;
+		}
+	})
+
+	const diyGlobal = computed(() => {
+		return props.global;
+	})
+
+	const inputPlaceholder = computed(() => {
+		let str = '';
+		str += diyComponent.value.placeholder
+		return str;
+	})
+
+	const formPrivacyData = computed(() => {
+		let str = `${diyComponent.value.field.name}已开启隐私保护，提交后会部分打码，只有你自己和管理员才能查看完整信息`;
+		return str;
+	})
+
+	// input属性
+	const inputAttribute = ()=>{
+		let arr = [];
+		if(diyComponent.value.autofill){
+			let obj = {
+				title: '已自动填充'
+			};
+			arr.push(obj);
+		}
+		if(diyComponent.value.field.privacyProtection){
+			let obj = {
+				title: '已开启隐私保护',
+				type: 'privacy'
+			};
+			arr.push(obj);
+		}
+
+		arr.forEach((item,index,arr)=>{
+			if(index != (arr.length-1)){
+				let obj = {
+					title: '|'
+				};
+				arr.push(obj);
+			}
+		})
+		return arr;
+	}
+
+	const eventFn = (type:any)=>{
+		if(type == 'privacy'){
+			// 查看隐私
+			formPrivacyRef.value.open();
+		}
+	}
+
+	const warpCss = computed(() => {
+		var style = '';
+        style += 'position:relative;';
+        if (diyComponent.value.componentStartBgColor && diyComponent.value.componentEndBgColor) style += `background:linear-gradient(${diyComponent.value.componentGradientAngle},${diyComponent.value.componentStartBgColor},${diyComponent.value.componentEndBgColor});`;
+        else if (diyComponent.value.componentStartBgColor) style += 'background-color:' + diyComponent.value.componentStartBgColor + ';';
+        else if (diyComponent.value.componentEndBgColor) style += 'background-color:' + diyComponent.value.componentEndBgColor + ';';
+
+        if(diyComponent.value.componentBgUrl) {
+            style += `background-image:url('${ img(diyComponent.value.componentBgUrl) }');`;
+            style += 'background-size: cover;background-repeat: no-repeat;';
+        }
+
+		if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		return style;
+	})
+
+    onMounted(() => {
+        refresh();
+        // 装修模式下刷新
+        if (diyStore.mode == 'decorate') {
+            watch(
+                () => diyComponent.value,
+                (newValue, oldValue) => {
+                    if (newValue && newValue.componentName == 'FormInput') {
+                        refresh();
+                    }
+                }
+            )
+        }else{
+		}
+    });
+
+    const refresh = ()=> {
+		// 装修模式下，展示默认值
+		if (diyStore.mode == 'decorate') {
+		   diyComponent.value.field.value = diyComponent.value.field.default;
+		}else {
+		   // 实际展示，优先缓存，其次默认值
+		   if (diyComponent.value.field.value == '' && diyComponent.value.field.default) {
+		      diyComponent.value.field.value = diyComponent.value.field.default;
+		   }
+		}
+    }
+
+	// 表单组件验证
+	const verify = () => {
+		const res = { code: true, message: '' }
+		if (diyComponent.value.field.required && diyComponent.value.field.value == '' && diyStore.mode != 'decorate') {
+			res.code = false
+			res.message = `${ inputPlaceholder.value }`;
+		}
+		errorInfo.value = res;
+		return res;
+	}
+
+	// 重置表单组件数据
+	const reset = () => {
+		diyComponent.value.field.value = '';
+	}
+
+	const isDisabled = computed(() => {
+		return diyStore.mode == 'decorate';
+	});
+
+	defineExpose({
+		verify,
+		reset
+	})
+</script>
+
+<style lang="scss" scoped>
+	@import '@/styles/diy_form.scss';
+</style>
diff --git a/uni-app/src/app/components/diy/form-location/index.vue b/uni-app/src/app/components/diy/form-location/index.vue
new file mode 100644
index 00000000..f43abd16
--- /dev/null
+++ b/uni-app/src/app/components/diy/form-location/index.vue
@@ -0,0 +1,96 @@
+<template>
+	<view :style="warpCss">
+		form-location
+		<view class="relative">
+			<view class="p-[10rpx]  flex items-center ">
+				<view class="w-[27%] mr-[10rpx] flex items-center">
+					<text class="text-overflow-ellipsis" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx' ,'font-weight': diyComponent.fontWeight}">{{ diyComponent.field.name }}</text>
+					<text class="text-[#ec0003]">{{ diyComponent.field.required ? '*' : '' }}</text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup lang="ts">
+	// 表单 定位组件
+	import { ref, computed, watch,onMounted } from 'vue';
+    import { img } from '@/utils/common';
+	import useDiyStore from '@/app/stores/diy';
+
+	const props = defineProps(['component', 'index','global']);
+	const diyStore = useDiyStore();
+
+	const diyComponent = computed(() => {
+		if (diyStore.mode == 'decorate') {
+			return diyStore.value[props.index];
+		} else {
+			return props.component;
+		}
+	})
+
+	const warpCss = computed(() => {
+		var style = '';
+        style += 'position:relative;';
+        if(diyComponent.value.componentStartBgColor) {
+            if (diyComponent.value.componentStartBgColor && diyComponent.value.componentEndBgColor) style += `background:linear-gradient(${diyComponent.value.componentGradientAngle},${diyComponent.value.componentStartBgColor},${diyComponent.value.componentEndBgColor});`;
+            else style += 'background-color:' + diyComponent.value.componentStartBgColor + ';';
+        }
+
+        if(diyComponent.value.componentBgUrl) {
+            style += `background-image:url('${ img(diyComponent.value.componentBgUrl) }');`;
+            style += 'background-size: cover;background-repeat: no-repeat;';
+        }
+
+		if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		return style;
+	})
+
+    onMounted(() => {
+        refresh();
+        // 装修模式下刷新
+        if (diyStore.mode == 'decorate') {
+            watch(
+                () => diyComponent.value,
+                (newValue, oldValue) => {
+                    if (newValue && newValue.componentName == 'FormLocation') {
+                        refresh();
+                    }
+                }
+            )
+        }else{
+		}
+    });
+
+    const refresh = ()=> {
+    }
+
+	// 表单组件验证
+	const verify = () => {
+		const res = { code: true, message: '' }
+		// todo 验证组件，diyComponent.value.field.value
+		return res;
+	}
+
+	// 重置表单组件数据
+	const reset = () => {
+		// todo 清空组件数据，diyComponent.value.field.value = '';
+	}
+
+	defineExpose({
+		verify,
+		reset
+	})
+</script>
+
+<style lang="scss" scoped>
+	@import '@/styles/diy_form.scss';
+	.text-overflow-ellipsis {
+	  white-space: nowrap;
+	  overflow: hidden;
+	  text-overflow: ellipsis;
+	}
+</style>
diff --git a/uni-app/src/app/components/diy/form-mobile/index.vue b/uni-app/src/app/components/diy/form-mobile/index.vue
new file mode 100644
index 00000000..b913348b
--- /dev/null
+++ b/uni-app/src/app/components/diy/form-mobile/index.vue
@@ -0,0 +1,227 @@
+<template>
+	<view v-if="diyComponent.viewFormDetail" class="form-item-frame">
+		<view class="base-layout-one" v-if="diyGlobal.completeLayout == 'style-1'">
+			<view class="detail-one-content">
+				<text class="detail-one-content-label">{{ diyComponent.field.name }}</text>
+				<view class="detail-one-content-value">
+					<text>{{ formattedPhoneNumber }}</text>
+					<text v-if="diyComponent.field.privacyProtection" class="ml-[20rpx] text-[var(--primary-color)]" @click="viewPrivacy">{{ t('view') }}</text>
+				</view>
+			</view>
+		</view>
+		<view class="base-layout-two" v-if="diyGlobal.completeLayout == 'style-2'">
+			<view class="detail-two-content">
+				<text class="detail-two-content-label">{{ diyComponent.field.name }}</text>
+				<view class="detail-two-content-value">
+					<text>{{ formattedPhoneNumber }}</text>
+					<text v-if="diyComponent.field.privacyProtection" class="ml-[20rpx] text-[var(--primary-color)]" @click="viewPrivacy">{{ t('view') }}</text>
+				</view>
+
+			</view>
+		</view>
+		<form-privacy ref="formDeatilPrivacyRef" :data="diyComponent.field.value" />
+	</view>
+	<view v-else :style="warpCss" class="form-item-frame">
+		<view class="base-layout-one" v-if="diyGlobal.completeLayout == 'style-1'">
+			<view class="layout-one-label">
+				<text class="text-overflow-ellipsis" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx' ,'font-weight': diyComponent.fontWeight}">{{ diyComponent.field.name }}</text>
+				<text class="required">{{ diyComponent.field.required ? '*' : '' }}</text>
+				<text v-if="diyStore.mode == 'decorate' && diyComponent.isHidden" class="is-hidden">{{ t('hidden') }}</text>
+			</view>
+			<view v-if="diyComponent.field.remark.text" class="layout-one-remark" :style="{ color: diyComponent.field.remark.color, fontSize: (diyComponent.field.remark.fontSize * 2 ) + 'rpx' }">{{ diyComponent.field.remark.text }}</view>
+			<view class="layout-one-error-message" v-if="errorInfo && !errorInfo.code">{{errorInfo.message}}</view>
+			<input type="number" class="layout-one-content" :placeholder="inputPlaceholder" placeholderClass="layout-one-input-placeholder" :placeholder-style="{'font-size': (diyComponent.fontSize * 2) + 'rpx' }" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx'}" v-model="diyComponent.field.value" :disabled="isDisabled" maxlength="11"/>
+			<view class="layout-one-attribute-wrap" v-if="inputAttribute().length">
+				<view v-for="(item,index) in inputAttribute()" :key="index" @click="eventFn(item.type)" class="layout-one-attribute-item">{{item.title}}</view>
+			</view>
+		</view>
+		<view class="base-layout-two" v-if="diyGlobal.completeLayout == 'style-2'">
+			<text v-if="diyStore.mode == 'decorate' && diyComponent.isHidden" class="layout-two-is-hidden">{{ t('hidden') }}</text>
+			<view class="layout-two-wrap" :class="{'no-border': !diyGlobal.borderControl}">
+				<view class="layout-two-label" :class="{'justify-start': diyGlobal.completeAlign == 'left', 'justify-end': diyGlobal.completeAlign == 'right'}">
+					<text class="required" v-if="diyComponent.field.required">{{ diyComponent.field.required ? '*' : '' }}</text>
+					<text class="name" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx' ,'font-weight': diyComponent.fontWeight}">{{ diyComponent.field.name }}</text>
+				</view>
+				<input type="number" class="layout-two-content no-flex" :placeholder="inputPlaceholder" placeholderClass="layout-two-input-placeholder" :placeholder-style="{'font-size': (diyComponent.fontSize * 2) + 'rpx'}" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx'}" v-model="diyComponent.field.value" :disabled="isDisabled" maxlength="11" />
+			</view>
+			<view class="layout-two-error-message" v-if="errorInfo && !errorInfo.code">{{errorInfo.message}}</view>
+			<view v-if="diyComponent.field.remark.text" class="layout-two-remark" :style="{ color: diyComponent.field.remark.color, fontSize: (diyComponent.field.remark.fontSize * 2 ) + 'rpx' }">{{ diyComponent.field.remark.text }}</view>
+			<view class="layout-two-attribute-wrap" v-if="inputAttribute().length">
+				<view v-for="(item,index) in inputAttribute()" :key="index" @click="eventFn(item.type)" class="layout-two-attribute-item">{{item.title}}</view>
+			</view>
+		</view>
+		<view v-if="diyStore.mode == 'decorate'" class="form-item-mask"></view>
+		<form-privacy-pop ref="formPrivacyRef" :data="formPrivacyData" />
+	</view>
+</template>
+
+<script setup lang="ts">
+	// 表单 手机号组件
+	import { ref, computed, watch,onMounted,nextTick } from 'vue';
+    import { img } from '@/utils/common';
+	import { t } from '@/locale'
+    import formPrivacyPop from './../form-privacy-pop/index.vue';
+	import useDiyStore from '@/app/stores/diy';
+    import formPrivacy from './../form-privacy/index.vue'
+	const props = defineProps(['component', 'index', 'global']);
+	const diyStore = useDiyStore();
+	const errorInfo:any = ref(null);
+	const formPrivacyRef: any = ref(null);
+	const formDeatilPrivacyRef: any = ref(null);
+
+	const diyComponent = computed(() => {
+		if (diyStore.mode == 'decorate') {
+			return diyStore.value[props.index];
+		} else {
+			return props.component;
+		}
+	})
+
+	const diyGlobal = computed(() => {
+		return props.global;
+	})
+
+	const formattedPhoneNumber = computed(() => {
+	   const phone = String(diyComponent.value.field.value);
+	  if (diyComponent.value.field.privacyProtection) {
+			return phone.replace(/(\d{3})\d{4}(\d{3})/, '$1****$2');
+	  }
+	  return phone;
+	});
+
+
+	const inputPlaceholder = computed(() => {
+		let str = '';
+		str += diyComponent.value.placeholder
+		return str;
+	})
+
+	const formPrivacyData = computed(() => {
+		let str = `${diyComponent.value.field.name}已开启隐私保护，提交后会部分打码，只有你自己和管理员才能查看完整信息`;
+		return str;
+	})
+
+	// input属性
+	const inputAttribute = ()=>{
+		let arr = [];
+		if(diyComponent.value.autofill){
+			let obj = {
+				title: '已自动填充'
+			};
+			arr.push(obj);
+		}
+		if(diyComponent.value.field.privacyProtection){
+			let obj = {
+				title: '已开启隐私保护',
+				type: 'privacy'
+			};
+			arr.push(obj);
+		}
+
+		arr.forEach((item,index,arr)=>{
+			if(index != (arr.length-1)){
+				let obj = {
+					title: '|'
+				};
+				arr.push(obj);
+			}
+		})
+		return arr;
+	}
+
+	const eventFn = (type:any)=>{
+		if(type == 'privacy'){
+			// 查看隐私
+			formPrivacyRef.value.open();
+		}
+	}
+
+	const viewPrivacy = () => {
+	    nextTick(() => {
+	        if (formDeatilPrivacyRef.value) {
+	            formDeatilPrivacyRef.value.open();
+	        } else {
+	            console.warn('formDeatilPrivacyRef is not defined');
+	        }
+	    });
+	}
+
+	const warpCss = computed(() => {
+		var style = '';
+        style += 'position:relative;';
+        if (diyComponent.value.componentStartBgColor && diyComponent.value.componentEndBgColor) style += `background:linear-gradient(${diyComponent.value.componentGradientAngle},${diyComponent.value.componentStartBgColor},${diyComponent.value.componentEndBgColor});`;
+        else if (diyComponent.value.componentStartBgColor) style += 'background-color:' + diyComponent.value.componentStartBgColor + ';';
+        else if (diyComponent.value.componentEndBgColor) style += 'background-color:' + diyComponent.value.componentEndBgColor + ';';
+
+        if(diyComponent.value.componentBgUrl) {
+            style += `background-image:url('${ img(diyComponent.value.componentBgUrl) }');`;
+            style += 'background-size: cover;background-repeat: no-repeat;';
+        }
+
+		if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		return style;
+	})
+
+    onMounted(() => {
+        refresh();
+        // 装修模式下刷新
+        if (diyStore.mode == 'decorate') {
+            watch(
+                () => diyComponent.value,
+                (newValue, oldValue) => {
+                    if (newValue && newValue.componentName == 'FormMobile') {
+                        refresh();
+                    }
+                }
+            )
+        }else{
+		}
+    });
+
+    const refresh = ()=> {
+		// 装修模式下，展示默认值
+		if (diyStore.mode == 'decorate') {
+		   diyComponent.value.field.value = diyComponent.value.field.default;
+		}else {
+		   // 实际展示，优先缓存，其次默认值
+		   if (diyComponent.value.field.value == '' && diyComponent.value.field.default) {
+		      diyComponent.value.field.value = diyComponent.value.field.default;
+		   }
+		}
+    }
+
+	// 表单组件验证
+	const verify = () => {
+		const res = { code: true, message: '' }
+		if (diyComponent.value.field.required && diyComponent.value.field.value == '' && diyStore.mode != 'decorate') {
+			res.code = false
+			res.message = `${ inputPlaceholder.value }`;
+		}else if (!/^1[3-9]\d{9}$/.test(diyComponent.value.field.value) && diyStore.mode != 'decorate') {
+			res.code = false
+			res.message = `手机号格式不正确，请重新输入`;
+		}
+		errorInfo.value = res;
+		return res;
+	}
+
+	// 重置表单组件数据
+	const reset = () => {
+		diyComponent.value.field.value = '';
+	}
+
+	const isDisabled = computed(() => {
+		return diyStore.mode == 'decorate';
+	});
+
+	defineExpose({
+		verify,
+		reset
+	})
+</script>
+
+<style lang="scss" scoped>
+	@import '@/styles/diy_form.scss';
+</style>
diff --git a/uni-app/src/app/components/diy/form-number/index.vue b/uni-app/src/app/components/diy/form-number/index.vue
new file mode 100644
index 00000000..f3aa8a12
--- /dev/null
+++ b/uni-app/src/app/components/diy/form-number/index.vue
@@ -0,0 +1,202 @@
+<template>
+	<view v-if="diyComponent.viewFormDetail" class="form-item-frame">
+		<view class="base-layout-one" v-if="diyGlobal.completeLayout == 'style-1'">
+			<view class="detail-one-content">
+				<text class="detail-one-content-label">{{ diyComponent.field.name }}</text>
+				<text class="detail-one-content-value">{{ diyComponent.field.value }}</text>
+			</view>
+		</view>
+		<view class="base-layout-two" v-if="diyGlobal.completeLayout == 'style-2'">
+			<view class="detail-two-content">
+				<text class="detail-two-content-label">{{ diyComponent.field.name }}</text>
+				<view class="detail-two-content-value w-[80%]">{{ diyComponent.field.value }}</view>
+			</view>
+		</view>
+	</view>
+	<view v-else :style="warpCss" class="form-item-frame">
+		<view class="base-layout-one" v-if="diyGlobal.completeLayout == 'style-1'">
+			<view class="layout-one-label">
+				<text class="text-overflow-ellipsis" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx' ,'font-weight': diyComponent.fontWeight}">{{ diyComponent.field.name }}</text>
+				<text class="required">{{ diyComponent.field.required ? '*' : '' }}</text>
+				<text v-if="diyStore.mode == 'decorate' && diyComponent.isHidden" class="is-hidden">{{ t('hidden') }}</text>
+			</view>
+			<view v-if="diyComponent.field.remark.text" class="layout-one-remark" :style="{ color: diyComponent.field.remark.color, fontSize: (diyComponent.field.remark.fontSize * 2 ) + 'rpx' }">{{ diyComponent.field.remark.text }}</view>
+			<view class="layout-one-error-message" v-if="errorInfo && !errorInfo.code">{{errorInfo.message}}</view>
+			<view class="layout-one-content flex items-center">
+				<input type="number" class="flex-1" :placeholder="inputPlaceholder" placeholderClass="layout-one-input-placeholder" :placeholder-style="{'font-size': (diyComponent.fontSize * 2) + 'rpx'}" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx'}" v-model="diyComponent.field.value" :disabled="isDisabled" />
+				<text class="text-[#999] text-[28rpx]" v-if="diyComponent.unit">{{diyComponent.unit}}</text>
+			</view>
+			<view class="layout-one-attribute-wrap" v-if="inputAttribute().length">
+				<view v-for="(item,index) in inputAttribute()" :key="index" @click="eventFn(item.type)" class="layout-one-attribute-item">{{item.title}}</view>
+			</view>
+		</view>
+		<view class="base-layout-two" v-if="diyGlobal.completeLayout == 'style-2'">
+			<text v-if="diyStore.mode == 'decorate' && diyComponent.isHidden" class="layout-two-is-hidden">{{ t('hidden') }}</text>
+			<view class="layout-two-wrap" :class="{'no-border': !diyGlobal.borderControl}">
+				<view class="layout-two-label" :class="{'justify-start': diyGlobal.completeAlign == 'left', 'justify-end': diyGlobal.completeAlign == 'right'}">
+					<text class="required" v-if="diyComponent.field.required">{{ diyComponent.field.required ? '*' : '' }}</text>
+					<text class="name" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx' ,'font-weight': diyComponent.fontWeight}">{{ diyComponent.field.name }}</text>
+				</view>
+				<view class="layout-two-content">
+					<input type="number" :placeholder="inputPlaceholder" placeholderClass="layout-two-input-placeholder" :placeholder-style="{'font-size': (diyComponent.fontSize * 2) + 'rpx'}" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx'}" v-model="diyComponent.field.value" :disabled="isDisabled" />
+					<text class="text-[#999] ml-[10rpx] pt-[2rpx] text-[28rpx]" v-if="diyComponent.unit">{{diyComponent.unit}}</text>
+				</view>
+			</view>
+			<view class="layout-two-error-message" v-if="errorInfo && !errorInfo.code">{{errorInfo.message}}</view>
+			<view v-if="diyComponent.field.remark.text" class="layout-two-remark" :style="{ color: diyComponent.field.remark.color, fontSize: (diyComponent.field.remark.fontSize * 2 ) + 'rpx' }">{{ diyComponent.field.remark.text }}</view>
+			<view class="layout-two-attribute-wrap" v-if="inputAttribute().length">
+				<view v-for="(item,index) in inputAttribute()" :key="index" @click="eventFn(item.type)" class="layout-two-attribute-item">{{item.title}}</view>
+			</view>
+		</view>
+		<view v-if="diyStore.mode == 'decorate'" class="form-item-mask"></view>
+		<form-privacy-pop ref="formPrivacyRef" :data="formPrivacyData" />
+	</view>
+</template>
+
+<script setup lang="ts">
+	// 表单 数字组件
+	import { ref, computed, watch,onMounted } from 'vue';
+    import { img } from '@/utils/common';
+	import { t } from '@/locale'
+    import formPrivacyPop from './../form-privacy-pop/index.vue';
+	import useDiyStore from '@/app/stores/diy';
+
+	const props = defineProps(['component', 'index', 'global']);
+	const diyStore = useDiyStore();
+	const errorInfo:any = ref(null);
+	const formPrivacyRef: any = ref(null);
+
+	const diyComponent = computed(() => {
+		if (diyStore.mode == 'decorate') {
+			return diyStore.value[props.index];
+		} else {
+			return props.component;
+		}
+	})
+	
+	const diyGlobal = computed(() => {
+		return props.global;
+	})
+	
+	const inputPlaceholder = computed(() => {
+		let str = '';
+		str += diyComponent.value.placeholder
+		return str;
+	})
+	
+	const formPrivacyData = computed(() => {
+		let str = `${diyComponent.value.field.name}已开启隐私保护，提交后会部分打码，只有你自己和管理员才能查看完整信息`;
+		return str;
+	})
+	
+	// input属性
+	const inputAttribute = ()=>{
+		let arr = [];
+		if(diyComponent.value.autofill){
+			let obj = {
+				title: '已自动填充'
+			};
+			arr.push(obj);
+		}
+		if(diyComponent.value.field.privacyProtection){
+			let obj = {
+				title: '已开启隐私保护',
+				type: 'privacy'
+			};
+			arr.push(obj);
+		}
+		
+		arr.forEach((item,index,arr)=>{
+			if(index != (arr.length-1)){
+				let obj = {
+					title: '|'
+				};
+				arr.push(obj);
+			}
+		})
+		return arr;
+	}
+	
+	const eventFn = (type:any)=>{
+		if(type == 'privacy'){
+			// 查看隐私
+			formPrivacyRef.value.open();
+		}
+	}
+
+	const warpCss = computed(() => {
+		var style = '';
+        style += 'position:relative;';
+        if (diyComponent.value.componentStartBgColor && diyComponent.value.componentEndBgColor) style += `background:linear-gradient(${diyComponent.value.componentGradientAngle},${diyComponent.value.componentStartBgColor},${diyComponent.value.componentEndBgColor});`;
+        else if (diyComponent.value.componentStartBgColor) style += 'background-color:' + diyComponent.value.componentStartBgColor + ';';
+        else if (diyComponent.value.componentEndBgColor) style += 'background-color:' + diyComponent.value.componentEndBgColor + ';';
+
+        if(diyComponent.value.componentBgUrl) {
+            style += `background-image:url('${ img(diyComponent.value.componentBgUrl) }');`;
+            style += 'background-size: cover;background-repeat: no-repeat;';
+        }
+
+		if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		return style;
+	})
+
+    onMounted(() => {
+        refresh();
+        // 装修模式下刷新
+        if (diyStore.mode == 'decorate') {
+            watch(
+                () => diyComponent.value,
+                (newValue, oldValue) => {
+                    if (newValue && newValue.componentName == 'FormNumber') {
+                        refresh();
+                    }
+                }
+            )
+        }else{
+		}
+    });
+
+    const refresh = ()=> {
+		// 装修模式下，展示默认值
+		if (diyStore.mode == 'decorate') {
+		   diyComponent.value.field.value = diyComponent.value.field.default;
+		}else {
+		   // 实际展示，优先缓存，其次默认值
+		   if (diyComponent.value.field.value == '' && diyComponent.value.field.default) {
+		      diyComponent.value.field.value = diyComponent.value.field.default;
+		   }
+		}
+    }
+
+	// 表单组件验证
+	const verify = () => {
+		const res = { code: true, message: '' }
+		if (diyComponent.value.field.required && diyComponent.value.field.value == '' && diyStore.mode != 'decorate') {
+			res.code = false
+			res.message = `${ inputPlaceholder.value }`;
+		}
+		errorInfo.value = res;
+		return res;
+	}
+
+	// 重置表单组件数据
+	const reset = () => {
+		diyComponent.value.field.value = '';
+	}
+
+	const isDisabled = computed(() => {
+		return diyStore.mode == 'decorate';
+	});
+
+	defineExpose({
+		verify,
+		reset
+	})
+</script>
+
+<style lang="scss" scoped>
+	@import '@/styles/diy_form.scss';
+</style>
diff --git a/uni-app/src/app/components/diy/form-privacy-pop/index.vue b/uni-app/src/app/components/diy/form-privacy-pop/index.vue
new file mode 100644
index 00000000..17d2d3ea
--- /dev/null
+++ b/uni-app/src/app/components/diy/form-privacy-pop/index.vue
@@ -0,0 +1,43 @@
+<template>
+	<view @touchmove.prevent.stop>
+		<u-popup :show="formPrivacyPop" @close="closeFn" zIndex="500" mode="center" :round="8">
+			<view class="flex flex-col items-center w-[640rpx] pt-[50rpx]">
+				<view class="text-[32rpx] font-bold">{{ t('prompt') }}</view>
+				<view class="text-center px-[40rpx] py-[30rpx] leading-[1.5] min-h-[90rpx]">
+					{{data}}
+				</view>
+				<view class="flex items-center justify-center border-solid border-[0] border-t-[2rpx] border-[#e6e6e6] w-[100%] h-[90rpx] text-[28rpx]">
+					<text @click="closeFn">{{ t('know') }}</text>
+				</view>
+			</view>
+		</u-popup>
+	</view>
+</template>
+
+<script setup lang="ts">
+	import { ref, computed } from 'vue';
+	import { t } from '@/locale'
+	
+	const props = defineProps(['data']);
+	
+	const data = computed(() => {
+		let str = props.data || '已开启隐私保护，提交后会部分打码，只有你自己和管理员才能查看完整信息';
+		return str;
+	})
+
+	const formPrivacyPop = ref(false);
+	const open = ()=>{
+		formPrivacyPop.value = true
+	}
+	const closeFn = ()=>{
+		formPrivacyPop.value = false
+	}
+	
+	defineExpose({
+		open
+	})
+</script>
+
+<style lang="scss" scoped>
+	@import '@/styles/diy_form.scss';
+</style>
diff --git a/uni-app/src/app/components/diy/form-privacy/index.vue b/uni-app/src/app/components/diy/form-privacy/index.vue
new file mode 100644
index 00000000..6be485ac
--- /dev/null
+++ b/uni-app/src/app/components/diy/form-privacy/index.vue
@@ -0,0 +1,49 @@
+<template>
+	<view @touchmove.prevent.stop>
+		<u-popup :show="formDetailPrivacyPop" @close="closeFn" zIndex="500" mode="center" :round="8">
+			<view class="w-[570rpx]  popup-common center">
+			    <view class="text-center my-5">
+			        {{ t('tips') }}<br/>{{data}}
+			    </view>
+			    <view class="flex justify-between">
+			        <button class="w-[50%] h-[100rpx] rounded-[0rpx] leading-[100rpx] !bg-[transform] border-solid border-[0] border-t-[2rpx] border-[#e6e6e6] !text-[#333]" @click="call"> {{ t('call') }}</button>
+			        <button class="w-[50%] h-[100rpx] rounded-[0rpx] border-solid border-[0] border-t-[2rpx]  border-l-[2rpx] bo border-[#e6e6e6] leading-[100rpx] !bg-[transform] !text-[var(--primary-color)]" @click="closeFn">{{ t('know') }}</button>
+			    </view>
+			</view>
+		</u-popup>
+	</view>
+</template>
+
+<script setup lang="ts">
+	import { ref, computed } from 'vue';
+	import { t } from '@/locale'
+
+	const props = defineProps(['data']);
+
+	const data = computed(() => {
+		let str = props.data || '已开启隐私保护，提交后会部分打码，只有你自己和管理员才能查看完整信息';
+		return str;
+	})
+
+	const formDetailPrivacyPop = ref(false);
+	const open = ()=>{
+		formDetailPrivacyPop.value = true
+	}
+	const closeFn = ()=>{
+		formDetailPrivacyPop.value = false
+	}
+	const call = ()=>{
+		uni.makePhoneCall({
+			phoneNumber: props.data
+		});
+
+	}
+
+	defineExpose({
+		open
+	})
+</script>
+
+<style lang="scss" scoped>
+	@import '@/styles/diy_form.scss';
+</style>
diff --git a/uni-app/src/app/components/diy/form-radio/index.vue b/uni-app/src/app/components/diy/form-radio/index.vue
new file mode 100644
index 00000000..e923a744
--- /dev/null
+++ b/uni-app/src/app/components/diy/form-radio/index.vue
@@ -0,0 +1,331 @@
+<template>
+	<view v-if="diyComponent.viewFormDetail" class="form-item-frame">
+		<view class="base-layout-one" v-if="diyGlobal.completeLayout == 'style-1'">
+			<view class="detail-one-content">
+				<text class="detail-one-content-label">{{ diyComponent.field.name }}</text>
+				<text v-for="(item,index) in diyComponent.field.value" :key="index" >{{ item.text}}</text>
+			</view>
+		</view>
+		<view class="base-layout-two" v-if="diyGlobal.completeLayout == 'style-2'">
+			<view class="detail-two-content">
+				<text class="detail-two-content-label">{{ diyComponent.field.name }}</text>
+				<view class="detail-two-content-value w-[80%]" v-for="(item,index) in diyComponent.field.value" :key="index" >{{ item.text}}</view>
+			</view>
+		</view>
+	</view>
+
+	<view v-else :style="warpCss" class="form-item-frame">
+		<view class="base-layout-one" v-if="diyGlobal.completeLayout == 'style-1'">
+			<view class="layout-one-label">
+				<text class="name" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx' ,'font-weight': diyComponent.fontWeight}">{{ diyComponent.field.name }}</text>
+				<text class="required">{{ diyComponent.field.required ? '*' : '' }}</text>
+				<text v-if="diyStore.mode == 'decorate' && diyComponent.isHidden" class="is-hidden">{{ t('hidden') }}</text>
+			</view>
+			<view v-if="diyComponent.field.remark.text" class="layout-one-remark" :style="{ color: diyComponent.field.remark.color, fontSize: (diyComponent.field.remark.fontSize * 2 ) + 'rpx' }">{{ diyComponent.field.remark.text }}</view>
+			<view class="layout-one-error-message" v-if="errorInfo && !errorInfo.code">{{errorInfo.message}}</view>
+			
+			<view v-if="diyComponent.style == 'style-1'" class="layout-one-content !flex-initial">
+				<u-radio-group v-model="selectedRadioId" @change="groupChange" iconPlacement="left">
+					<view v-for="(item, index) in diyComponent.options" :key="index" class="mr-[40rpx]">
+						<u-radio activeColor="var(--primary-color)" :labelSize="(diyComponent.fontSize * 2) + 'rpx'" :labelColor="diyComponent.textColor" :label="item.text" :name="item.id"></u-radio>
+					</view>
+				</u-radio-group>
+			</view>
+			
+			<u-radio-group v-if="diyComponent.style == 'style-2'" v-model="selectedRadioId" @change="groupChange" iconPlacement="left" placement="column">
+				<view v-for="(item, index) in diyComponent.options" :key="index" @click="selectRadio(item)" class="layout-one-content mb-[16rpx]" :class="{'!mb-[0]': (diyComponent.options.length-1) == index}">
+					<u-radio activeColor="var(--primary-color)" :labelSize="(diyComponent.fontSize * 2) + 'rpx'" :labelColor="diyComponent.textColor" class="mr-[20rpx]" :label="item.text" :name="item.id"></u-radio>
+				</view>
+			</u-radio-group>
+			
+			<view v-if="diyComponent.style == 'style-3'" @click="openPicker" class="layout-one-content justify-between">
+				<view v-if="diyComponent.field.value.length>0">
+					<text class="mr-[10rpx] text-[28rpx]" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx'}">{{getSelectRadioName}}</text>
+				</view>
+				<text v-else class="text-[28rpx] text-[#999]" :style="{'font-size': (diyComponent.fontSize * 2) + 'rpx'}">{{radioPlaceholder}}</text>
+				<text class="nc-iconfont nc-icon-xiaV6xx pull-down-arrow text-[#666]" :class="{'selected': selectShow}" :style="{'font-size': (diyComponent.fontSize * 2+2) + 'rpx !important'}"></text>
+			</view>
+			
+			<view class="layout-one-attribute-wrap" v-if="inputAttribute().length">
+				<view v-for="(item,index) in inputAttribute()" :key="index" @click="eventFn(item.type)" class="layout-one-attribute-item">{{item.title}}</view>
+			</view>
+		</view>
+		<view class="base-layout-two" v-if="diyGlobal.completeLayout == 'style-2'">
+			<text v-if="diyStore.mode == 'decorate' && diyComponent.isHidden" class="layout-two-is-hidden">{{ t('hidden') }}</text>
+			<view class="layout-two-wrap" :class="{'!pb-[20rpx]': ((diyComponent.style == 'style-2' || diyComponent.style == 'style-3') && diyGlobal.borderControl),'no-border': !diyGlobal.borderControl}">
+				<view class="layout-two-label" :class="{'justify-start': diyGlobal.completeAlign == 'left', 'justify-end': diyGlobal.completeAlign == 'right'}">
+					<text class="required">{{ diyComponent.field.required ? '*' : '' }}</text>
+					<text class="name" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx' ,'font-weight': diyComponent.fontWeight}">{{ diyComponent.field.name }}</text>
+				</view>
+				<view class="layout-two-content" v-if= "diyComponent.style == 'style-1'">
+					<view class="justify-end">
+						<u-radio-group v-model="selectedRadioId" @change="groupChange" iconPlacement="left">
+							<view v-for="(item, index) in diyComponent.options" :key="index" class="ml-[30rpx]">
+								<u-radio activeColor="var(--primary-color)" :labelSize="(diyComponent.fontSize * 2) + 'rpx'" :labelColor="diyComponent.textColor" :label="item.text" :name="item.id"></u-radio>
+							</view>
+						</u-radio-group>
+					</view>
+				</view>
+				
+				<view class="layout-two-content" v-if="diyComponent.style == 'style-2'">
+					<view class="justify-end w-full">
+						<u-radio-group v-model="selectedRadioId" @change="groupChange" placement="column" iconPlacement="left">
+							<view v-for="(item, index) in diyComponent.options" :key="index" @click="selectRadio(item)" class="border-solid border-[2rpx] border-[#e6e6e6] rounded-[10rpx] flex items-center h-[80rpx] mb-[16rpx] px-[16rpx] box-border" :class="{'mb-[0]': diyComponent.options.length == (index+1)}" >
+								<u-radio activeColor="var(--primary-color)" :labelSize="(diyComponent.fontSize * 2) + 'rpx'" :labelColor="diyComponent.textColor" class="!m-[0]" :label="item.text" :name="item.id"></u-radio>
+							</view>
+						</u-radio-group>
+					</view>
+				</view>
+				
+				<view class="layout-two-content" v-if= "diyComponent.style == 'style-3'">
+					<view @click="openPicker" class="px-[16rpx] box-border h-[80rpx] flex items-center justify-between border-solid border-[2rpx] border-[#e6e6e6] rounded-[10rpx] w-[100%]">
+						<view v-if="diyComponent.field.value.length>0">
+							<text class="mr-[10rpx] text-[28rpx]" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx'}">{{getSelectRadioName}}</text>
+						</view>
+						<text v-else class="text-[28rpx] text-[#999]" :style="{'font-size': (diyComponent.fontSize * 2) + 'rpx'}">{{radioPlaceholder}}</text>
+						<text class="nc-iconfont nc-icon-xiaV6xx pull-down-arrow text-[#666]" :class="{'selected': selectShow}" :style="{'font-size': (diyComponent.fontSize * 2+2) + 'rpx !important'}"></text>
+					</view>
+				</view>
+			</view>
+			<view class="layout-two-error-message" v-if="errorInfo && !errorInfo.code">{{errorInfo.message}}</view>
+			<view v-if="diyComponent.field.remark.text" class="layout-two-remark" :style="{ color: diyComponent.field.remark.color, fontSize: (diyComponent.field.remark.fontSize * 2 ) + 'rpx' }">{{ diyComponent.field.remark.text }}</view>
+			<view class="layout-two-attribute-wrap" v-if="inputAttribute().length">
+				<view v-for="(item,index) in inputAttribute()" :key="index" @click="eventFn(item.type)" class="layout-two-attribute-item">{{item.title}}</view>
+			</view>
+		</view>
+		<!-- 样式三，下拉弹窗 -->
+		<u-popup :show="selectShow" mode="bottom" @close="selectShow=false" >
+			<view class="p-[15rpx]">
+				<scroll-view scroll-y="true" class="max-h-[450rpx] px-[14rpx] box-border">
+					<u-radio-group v-model="pullDownVal" placement="column" @change="groupChange" iconPlacement="right">
+						<view class="border-solid border-[0] border-b-[2rpx] border-[#e6e6e6] py-[20rpx]" @click.stop="pullDownConfirmFn(item)" v-for="(item, index) in diyComponent.options" :key="index">
+							<u-radio activeColor="var(--primary-color)" :labelSize="(diyComponent.fontSize * 2) + 'rpx'" :labelColor="diyComponent.textColor"  :style="{'width': '100%'}" :label="item.text" :name="item.id"></u-radio>
+						</view>
+					</u-radio-group>
+				</scroll-view>
+			</view>
+		</u-popup>
+		<view v-if="diyStore.mode == 'decorate'" class="form-item-mask"></view>
+		<!-- 隐私弹窗 -->
+		<form-privacy-pop ref="formPrivacyRef" :data="formPrivacyData" />
+	</view>
+</template>
+
+<script setup lang="ts">
+	// 表单 单选项组件
+	import { ref, computed, watch,onMounted } from 'vue';
+    import { img } from '@/utils/common';
+	import { t } from '@/locale'
+	import useDiyStore from '@/app/stores/diy';
+    import formPrivacyPop from './../form-privacy-pop/index.vue';
+
+	const props = defineProps(['component', 'index','global']);
+	const diyStore = useDiyStore();
+	const selectValue = ref([])
+	const selectShow = ref(false);
+	const pullDownVal = ref([])
+	const selectedRadioId = ref('');  // 存储选中的 id
+
+	const errorInfo:any = ref(null);
+	const formPrivacyRef: any = ref(null);
+
+	const diyComponent = computed(() => {
+		if (diyStore.mode == 'decorate') {
+			return diyStore.value[props.index];
+		} else {
+			return props.component;
+		}
+	})
+	
+	const diyGlobal = computed(() => {
+		return props.global;
+	})
+	
+	const formPrivacyData = computed(() => {
+		let str = `${diyComponent.value.field.name}已开启隐私保护，提交后会部分打码，只有你自己和管理员才能查看完整信息`;
+		return str;
+	})
+	
+	// input属性
+	const inputAttribute = ()=>{
+		let arr = [];
+		if(diyComponent.value.autofill){
+			let obj = {
+				title: '已自动填充'
+			};
+			arr.push(obj);
+		}
+		if(diyComponent.value.field.privacyProtection){
+			let obj = {
+				title: '已开启隐私保护',
+				type: 'privacy'
+			};
+			arr.push(obj);
+		}
+		
+		arr.forEach((item,index,arr)=>{
+			if(index != (arr.length-1)){
+				let obj = {
+					title: '|'
+				};
+				arr.push(obj);
+			}
+		})
+		return arr;
+	}
+	
+	const eventFn = (type:any)=>{
+		if(type == 'privacy'){
+			// 查看隐私
+			formPrivacyRef.value.open();
+		}
+	}
+
+	const warpCss = computed(() => {
+		var style = '';
+        style += 'position:relative;';
+        if (diyComponent.value.componentStartBgColor && diyComponent.value.componentEndBgColor) style += `background:linear-gradient(${diyComponent.value.componentGradientAngle},${diyComponent.value.componentStartBgColor},${diyComponent.value.componentEndBgColor});`;
+        else if (diyComponent.value.componentStartBgColor) style += 'background-color:' + diyComponent.value.componentStartBgColor + ';';
+        else if (diyComponent.value.componentEndBgColor) style += 'background-color:' + diyComponent.value.componentEndBgColor + ';';
+
+        if(diyComponent.value.componentBgUrl) {
+            style += `background-image:url('${ img(diyComponent.value.componentBgUrl) }');`;
+            style += 'background-size: cover;background-repeat: no-repeat;';
+        }
+
+		if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		return style;
+	})
+
+    onMounted(() => {
+        refresh();
+        // 装修模式下刷新
+        if (diyStore.mode == 'decorate') {
+            watch(
+                () => diyComponent.value,
+                (newValue, oldValue) => {
+                    if (newValue && newValue.componentName == 'FormRadio') {
+                        refresh();
+                    }
+                }
+            )
+        }
+		
+		// 样式三，初始化下拉数据
+		if(diyComponent.value.style == 'style-3' && diyComponent.value.field.value.length>0){
+			pullDownVal.value = diyComponent.value.field.value[0].id;
+		}
+		if(diyComponent.value.field.value.length>0){
+			selectedRadioId.value = diyComponent.value.field.value[0].id;
+		}
+
+    });
+
+    const refresh = ()=> {
+    	// console.log('diyComponent.value.field.value',diyComponent.value.field.value)
+    }
+	
+	const radioPlaceholder = computed(() => {
+		let str = '';
+		str += `请选择${ diyComponent.value.field.name }`
+		return str;
+	})
+
+    // 表单组件验证
+    const verify = () => {
+        const res = { code: true, message: '' }
+        if (diyComponent.value.field.required && diyComponent.value.field.value.length == '' && diyStore.mode != 'decorate') {
+            res.code = false
+            res.message = radioPlaceholder.value;
+        }
+		errorInfo.value = res;
+        return res;
+    }
+
+	// 重置表单组件数据
+    const reset = () => {
+		selectedRadioId.value='';
+		pullDownVal.value = [];
+	    selectValue.value = [];
+	    diyComponent.value.field.value = [];
+	}
+	 
+	const pullDownCancelFn = ()=>{
+		selectShow.value = false;
+		// pullDownVal.value = diyComponent.value.field.value;
+	}
+
+	const pullDownConfirmFn = (item:any) => {
+		selectShow.value = false;
+		pullDownVal.value = item.id;;
+		diyComponent.value.field.value = [{ id: item.id, text: item.text }];
+		// diyComponent.value.field.value = pullDownVal.value;
+	}
+	
+	// 获取选中的单选项名称
+	const getSelectRadioName = computed(() => {
+		let names = [];
+		diyComponent.value.field.value.forEach((selectedItem) => {
+			const item = diyComponent.value.options.find(option => option.id === selectedItem.id);
+			if (item) {
+				names.push(item.text); 
+			}
+		});
+		return names.join(', '); 
+	});
+
+
+	const isDisabled = computed(() => {
+		return diyStore.mode === 'decorate';
+	});
+
+	const openPicker = () => {
+		if(isDisabled.value){
+			return
+		}
+		selectShow.value = true;
+	}
+
+	const groupChange = (value) => {
+	    selectedRadioId.value = value;
+	    const selectedItem = diyComponent.value.options.find(item => item.id === value);
+	    diyComponent.value.field.value = [{ id: selectedItem.id, text: selectedItem.text }];
+		selectShow.value = false;
+	};
+	const selectRadio = (item) => {
+	    if (isDisabled.value) {
+	        return;
+	    }
+		selectedRadioId.value = item.id;;
+	    diyComponent.value.field.value = [{ id: item.id, text: item.text }];
+	};
+
+
+    defineExpose({
+        verify,
+	    reset
+    })
+</script>
+
+<style lang="scss" scoped>
+	@import '@/styles/diy_form.scss';
+	.pull-down-arrow{
+		transition: all .3s;
+		transform: rotate(0);
+		&.selected{
+			transform: rotate(180deg);
+		}
+	}
+	/* 覆盖 u-radio 样式 */
+	// ::v-deep(.u-radio) {
+	//     border-bottom: 2rpx solid #e6e6e6;
+	// 	height: 90rpx;
+	// }
+	.form-item-frame :deep(.u-radio-group .u-radio__icon-wrap){
+		width: 30rpx !important;
+		height: 30rpx !important;
+	}
+</style>
diff --git a/uni-app/src/app/components/diy/form-submit/index.vue b/uni-app/src/app/components/diy/form-submit/index.vue
new file mode 100644
index 00000000..1a82777d
--- /dev/null
+++ b/uni-app/src/app/components/diy/form-submit/index.vue
@@ -0,0 +1,348 @@
+<template>
+	<view>
+		<view class="overflow-hidden">
+			<view :style="maskLayer"></view>
+			<view class="relative submit-wrap z-10" :style="warpCss">
+				<view class="flex flex-col items-center" :style="boxCss">
+					<view class="w-[100%] h-[86rpx] text-[28rpx] flex items-center justify-center" @click="submit" :style="submitItem">{{ diyComponent.submitBtn.text }}</view>
+					<view v-if="diyComponent.resetBtn.control" class="w-[100%] h-[86rpx] mt-[20rpx] text-[28rpx] flex items-center justify-center" @click="reset" :style="resetItem">{{ diyComponent.resetBtn.text }}</view>
+				</view>
+			</view>
+		</view>
+		<view v-if="diyComponent.btnPosition == 'hover_screen_bottom' && diyStore.mode != 'decorate'" class="w-[100%]" :style="submitFillHeight"></view>
+		<!-- 苹果安全距离，辅助计算 -->
+		<view class="iphone-secure"></view>
+		<!-- 遮罩层，装修使用 -->
+		<view v-if="diyStore.mode == 'decorate'" class="form-item-mask"></view>
+	</view>
+</template>
+
+<script setup lang="ts">
+	// 表单提交组件
+	import { ref, computed, watch,onMounted, nextTick, getCurrentInstance } from 'vue';
+	import useDiyStore from '@/app/stores/diy';
+    import { img, redirect,getValidTime, deepClone } from '@/utils/common';
+	import { addFormRecord } from '@/app/api/diy_form';
+
+	const props = defineProps(['component', 'index', 'global']);
+	const diyStore = useDiyStore();
+	const tabbarInfo = ref();
+
+	const diyComponent = computed(() => {
+		if (diyStore.mode == 'decorate') {
+			return diyStore.value[props.index];
+		} else {
+			return props.component;
+		}
+	})
+
+	const diyGlobal = computed(() => {
+		return props.global;
+	})
+
+	const warpCss = computed(() => {
+		var style = '';
+        style += 'position:relative;';
+		if (diyComponent.value.componentStartBgColor && diyComponent.value.componentEndBgColor) style += `background:linear-gradient(${diyComponent.value.componentGradientAngle},${diyComponent.value.componentStartBgColor},${diyComponent.value.componentEndBgColor});`;
+		else if (diyComponent.value.componentStartBgColor) style += 'background-color:' + diyComponent.value.componentStartBgColor + ';';
+		else if (diyComponent.value.componentEndBgColor) style += 'background-color:' + diyComponent.value.componentEndBgColor + ';';
+
+        if(diyComponent.value.componentBgUrl) {
+            style += `background-image:url('${ img(diyComponent.value.componentBgUrl) }');`;
+            style += 'background-size: cover;background-repeat: no-repeat;';
+        }
+
+		if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+
+		if(diyStore.mode != 'decorate' && diyComponent.value.btnPosition == 'hover_screen_bottom'){
+			style += "position: fixed !important;";
+			var height = tabbarInfo.value ? tabbarInfo.value.height : 0;
+			style += `left: 0;`;
+			style += `right: 0;`;
+			if(height && diyGlobal.value.bottomTabBarSwitch){
+				style += `bottom: ${height}px;`;
+			}else{
+				style += `bottom: 0;`;
+			}
+
+			if (diyComponent.value.pageStartBgColor) {
+			    if (diyComponent.value.pageStartBgColor && diyComponent.value.pageEndBgColor) style += `background:linear-gradient(${ diyComponent.value.pageGradientAngle },${ diyComponent.value.pageStartBgColor },${ diyComponent.value.pageEndBgColor });`;
+			    else if (diyComponent.value.pageStartBgColor) style += `background: ${ diyComponent.value.pageStartBgColor };`;
+				else if (diyComponent.value.pageEndBgColor) style += `background: ${ diyComponent.value.pageEndBgColor };`;
+			}
+
+			if (diyComponent.value.margin) {
+			    if (diyComponent.value.margin.top > 0) {
+			        style += 'padding-top:' + diyComponent.value.margin.top * 2 + 'rpx' + ';';
+			    }
+				if(height && diyGlobal.value.bottomTabBarSwitch){
+					style += 'padding-bottom:' + diyComponent.value.margin.bottom * 2 + 'rpx' + ';';
+				}else{
+					style += `padding-bottom: ${(diyComponent.value.margin.bottom + iphoneSecureVal.value) * 2}rpx;`;
+				}
+
+			    style += 'padding-right:' + diyComponent.value.margin.both * 2 + 'rpx' + ';';
+			    style += 'padding-left:' + diyComponent.value.margin.both * 2 + 'rpx' + ';';
+			}
+		}else {
+			if( diyComponent.value.btnPosition == 'hover_screen_bottom'){
+				style += "position: fixed !important;";
+				style += `left: 0;`;
+				style += `right: 0;`;
+				style += `bottom: 0;`;
+			}
+		}
+		return style;
+	})
+
+	const boxCss = computed(() => {
+		var style = '';
+
+		if(diyComponent.value.btnPosition == 'hover_screen_bottom'){
+			if (diyComponent.value.componentStartBgColor && diyComponent.value.componentEndBgColor) style += `background:linear-gradient(${diyComponent.value.componentGradientAngle},${diyComponent.value.componentStartBgColor},${diyComponent.value.componentEndBgColor});`;
+			else if (diyComponent.value.componentStartBgColor) style += 'background-color:' + diyComponent.value.componentStartBgColor + ';';
+			else if (diyComponent.value.componentEndBgColor) style += 'background-color:' + diyComponent.value.componentEndBgColor + ';';
+		}
+		return style;
+	})
+
+	// 背景图加遮罩层
+	const maskLayer = computed(()=>{
+	    var style = '';
+	    if(diyComponent.value.componentBgUrl) {
+	        style += 'position:absolute;top:0;right:0;left:0;bottom:0;';
+	        style += `background: rgba(0,0,0,${diyComponent.value.componentBgAlpha / 10});`;
+
+	        if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+	        if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+	        if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+	        if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+	    }
+
+		return style;
+	});
+
+	// 重置样式
+	const resetItem = computed(() => {
+		var style = '';
+		style += `color: ${diyComponent.value.resetBtn.color};`;
+		style += `background-color: ${diyComponent.value.resetBtn.bgColor};`;
+		if (diyComponent.value.topElementRounded) style += 'border-top-left-radius:' + diyComponent.value.topElementRounded * 2 + 'rpx;';
+		if (diyComponent.value.topElementRounded) style += 'border-top-right-radius:' + diyComponent.value.topElementRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomElementRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomElementRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomElementRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomElementRounded * 2 + 'rpx;';
+		return style;
+	})
+
+	// 保存样式
+	const submitItem = computed(() => {
+		var style = '';
+		style += `color: ${diyComponent.value.submitBtn.color};`;
+		style += `background-color: ${diyComponent.value.submitBtn.bgColor};`;
+		if (diyComponent.value.topElementRounded) style += 'border-top-left-radius:' + diyComponent.value.topElementRounded * 2 + 'rpx;';
+		if (diyComponent.value.topElementRounded) style += 'border-top-right-radius:' + diyComponent.value.topElementRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomElementRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomElementRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomElementRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomElementRounded * 2 + 'rpx;';
+		return style;
+	})
+
+	// 提交按钮，悬浮时的填充
+	const submitFillHeight = computed(() => {
+		let style = '';
+		style += `padding-bottom: ${submitHeight.value}px;`;
+		return style;
+	})
+
+	const formComponent: any = ref([])
+
+    onMounted(() => {
+	    refresh();
+	    // 装修模式下刷新
+	    if (diyStore.mode == 'decorate') {
+		    watch(
+				    () => diyComponent.value,
+				    (newValue, oldValue) => {
+					    if (newValue && newValue.componentName == 'FormSubmit') {
+						    refresh();
+					    }
+				    }
+		    )
+	    } else {
+		    getFormComponent();
+		    watch(
+				    () => diyStore.value,
+				    (newValue, oldValue) => {
+					    if (newValue) {
+						    let formData = getFormSComponentsData(newValue);
+						    if (formData.components.length) {
+							    uni.setStorageSync('diyFormStorage_' + diyStore.id, formData)
+						    }
+					    }
+				    },
+				    { deep: true }
+		    )
+	    }
+		nextTick(() => {
+			tabbarInfo.value = uni.getStorageSync('tabbarInfo')
+		})
+    });
+
+    const refresh = ()=> {
+    }
+
+    const getFormComponent = () => {
+	    // 需要过滤 组件类型，筛选出来表单
+	    for (let i = 0; i < diyStore.value.length; i++) {
+		    let item = diyStore.value[i];
+		    // 筛选出来表单组件，排除表单提交组件
+		    if (item.componentType == 'diy_form' && item.componentName != 'FormSubmit') {
+			    formComponent.value.push(item);
+		    }
+	    }
+    }
+
+	const repeat = ref(false)
+
+	const submit = () => {
+		if (diyStore.mode === 'decorate') return
+
+		let allPass = true; // 是否全部通过验证
+
+		// 需要过滤 组件类型，筛选出来表单
+		for (let i = 0; i < formComponent.value.length; i++) {
+			let item = formComponent.value[i];
+			if (item.field.required || item.field.value) {
+				let refKey = `diy${ item.componentName }Ref`;
+				let isBreak = false;
+				if (diyStore.componentRefs[refKey]) {
+					for (let k = 0; k < diyStore.componentRefs[refKey].length; k++) {
+						let compRef = diyStore.componentRefs[refKey][k];
+						let verify = compRef.verify(); // 验证表单组件数据
+						if (verify && !verify.code) {
+							isBreak = true;
+							uni.showToast({
+								title: verify.message,
+								icon: 'none'
+							});
+							break;
+						}
+
+					}
+					if (isBreak) {
+						allPass = false;
+						break;
+					}
+				}
+			}
+
+		}
+
+		if (!allPass) return;
+
+		if (repeat.value) return
+		repeat.value = true
+
+		let diyFormStorage = uni.getStorageSync('diyFormStorage_' + diyStore.id)
+		let value = {};
+		if(diyFormStorage){
+			value = diyFormStorage.components
+		}else{
+			value = getFormSComponentsData(formComponent.value).components;
+		}
+
+		const data = {
+			form_id: diyStore.id,
+			value,
+			relate_id: '' // todo 关联业务id，需要考虑如何传入
+		}
+
+		addFormRecord(data).then((res: any) => {
+			uni.removeStorageSync('diyFormStorage_' + diyStore.id)
+			// 跳转到 表单提交结果页面
+			redirect({
+				url: '/app/pages/index/diy_form_result',
+				param: { record_id: res.data, form_id: diyStore.id },
+				mode: 'redirectTo'
+			})
+			repeat.value = false
+		}).catch(() => {
+			repeat.value = false
+		})
+	};
+
+    // 重置表单组件数据
+	const reset = () => {
+		// 需要过滤 组件类型，筛选出来表单
+		for (let i = 0; i < formComponent.value.length; i++) {
+			let item = formComponent.value[i];
+			let refKey = `diy${ item.componentName }Ref`;
+			if (diyStore.componentRefs[refKey]) {
+				diyStore.componentRefs[refKey].forEach((compRef: any) => {
+					if (compRef.reset) compRef.reset(item);
+				})
+			}
+		}
+		return;
+	}
+
+	// 获取表单组件数据
+	const getFormSComponentsData = (data:any)=>{
+		let formData: any = {
+			validTime: getValidTime(5), // 缓存数据有效期为5分钟
+			components: []
+		};
+
+		data.forEach((item: any) => {
+			// 只存表单组件 -- 用于直接保存
+			if (item.componentType == 'diy_form' && item.componentName != 'FormSubmit') {
+				// 只存储表单数据，压缩存储空间
+				let field = deepClone(item.field);
+				// 移除不需要存储的数据
+				delete field.remark; // 字段说明
+				delete field.detailComponent; // 用于详情展示
+				delete field.default; // 默认值
+				formData.components.push({
+					id: item.id,
+					componentName: item.componentName,
+					componentType: item.componentType,
+					componentTitle: item.componentTitle,
+					isHidden: item.isHidden,
+					field: field
+				})
+			}
+		});
+		return formData;
+	}
+
+	let submitHeight = ref(0);
+    const instance = getCurrentInstance();
+	let iphoneSecureVal = ref(0);
+	nextTick(() => {
+		const query = uni.createSelectorQuery().in(instance);
+		query.select('.iphone-secure').boundingClientRect((data: any) => {
+			iphoneSecureVal.value = data ? data.height : 0;
+		}).exec();
+
+		setTimeout(()=>{
+			query.select('.submit-wrap').boundingClientRect((data: any) => {
+				submitHeight.value = data ? data.height : 0;
+			}).exec();
+		},500)
+	})
+</script>
+
+<style lang="scss" scoped>
+	@import '@/styles/diy_form.scss';
+	.iphone-secure{
+		position: absolute;
+		bottom: 0;
+		z-index: -1;
+		padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom);
+		left: 0;
+		right: 0;
+	}
+</style>
diff --git a/uni-app/src/app/components/diy/form-table/index.vue b/uni-app/src/app/components/diy/form-table/index.vue
new file mode 100644
index 00000000..8778d336
--- /dev/null
+++ b/uni-app/src/app/components/diy/form-table/index.vue
@@ -0,0 +1,96 @@
+<template>
+	<view :style="warpCss">
+		// 表单 表格组件
+		<view class="relative">
+			<view class="p-[10rpx]  flex items-center ">
+				<view class="w-[27%] mr-[10rpx] flex items-center">
+					<text class="text-overflow-ellipsis" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx' ,'font-weight': diyComponent.fontWeight}">{{ diyComponent.field.name }}</text>
+					<text class="text-[#ec0003]">{{ diyComponent.field.required ? '*' : '' }}</text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup lang="ts">
+	// 表单 表格组件
+	import { ref, computed, watch,onMounted } from 'vue';
+	import useDiyStore from '@/app/stores/diy';
+    import { img } from '@/utils/common';
+
+	const props = defineProps(['component', 'index','global']);
+	const diyStore = useDiyStore();
+
+	const diyComponent = computed(() => {
+		if (diyStore.mode == 'decorate') {
+			return diyStore.value[props.index];
+		} else {
+			return props.component;
+		}
+	})
+
+	const warpCss = computed(() => {
+		var style = '';
+        style += 'position:relative;';
+        if(diyComponent.value.componentStartBgColor) {
+            if (diyComponent.value.componentStartBgColor && diyComponent.value.componentEndBgColor) style += `background:linear-gradient(${diyComponent.value.componentGradientAngle},${diyComponent.value.componentStartBgColor},${diyComponent.value.componentEndBgColor});`;
+            else style += 'background-color:' + diyComponent.value.componentStartBgColor + ';';
+        }
+
+        if(diyComponent.value.componentBgUrl) {
+            style += `background-image:url('${ img(diyComponent.value.componentBgUrl) }');`;
+            style += 'background-size: cover;background-repeat: no-repeat;';
+        }
+
+		if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		return style;
+	})
+
+    onMounted(() => {
+        refresh();
+        // 装修模式下刷新
+        if (diyStore.mode == 'decorate') {
+            watch(
+                () => diyComponent.value,
+                (newValue, oldValue) => {
+                    if (newValue && newValue.componentName == 'FormTable') {
+                        refresh();
+                    }
+                }
+            )
+        }else{
+		}
+    });
+
+    const refresh = ()=> {
+    }
+
+	// 表单组件验证
+	const verify = () => {
+		const res = { code: true, message: '' }
+		// todo 验证组件，diyComponent.value.field.value
+		return res;
+	}
+
+	// 重置表单组件数据
+	const reset = () => {
+		// todo 清空组件数据，diyComponent.value.field.value = '';
+	}
+
+	defineExpose({
+		verify,
+		reset
+	})
+</script>
+
+<style lang="scss" scoped>
+	@import '@/styles/diy_form.scss';
+	.text-overflow-ellipsis {
+	  white-space: nowrap;
+	  overflow: hidden;
+	  text-overflow: ellipsis;
+	}
+</style>
diff --git a/uni-app/src/app/components/diy/form-textarea/index.vue b/uni-app/src/app/components/diy/form-textarea/index.vue
new file mode 100644
index 00000000..36c5130d
--- /dev/null
+++ b/uni-app/src/app/components/diy/form-textarea/index.vue
@@ -0,0 +1,209 @@
+<template>
+	<view v-if="diyComponent.viewFormDetail" class="form-item-frame">
+		<view class="base-layout-one" v-if="diyGlobal.completeLayout == 'style-1'">
+			<view class="detail-one-content">
+				<text class="detail-one-content-label">{{ diyComponent.field.name }}</text>
+				<text class="detail-one-content-value">{{ diyComponent.field.value }}</text>
+			</view>
+		</view>
+		<view class="base-layout-two" v-if="diyGlobal.completeLayout == 'style-2'">
+			<view class="detail-two-content">
+				<view class="">{{ diyComponent.field.name }}</view>
+				<view class="detail-two-content-value w-[80%]">{{ diyComponent.field.value }}</view>
+			</view>
+		</view>
+	</view>
+	<view v-else :style="warpCss" class="form-item-frame">
+		<view class="base-layout-one" v-if="diyGlobal.completeLayout == 'style-1'">
+			<view class="layout-one-label">
+				<text class="text-overflow-ellipsis" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx' ,'font-weight': diyComponent.fontWeight}">{{ diyComponent.field.name }}</text>
+				<text class="required">{{ diyComponent.field.required ? '*' : '' }}</text>
+				<text v-if="diyStore.mode == 'decorate' && diyComponent.isHidden" class="is-hidden">{{ t('hidden') }}</text>
+			</view>
+			<view v-if="diyComponent.field.remark.text" class="layout-one-remark" :style="{ color: diyComponent.field.remark.color, fontSize: (diyComponent.field.remark.fontSize * 2 ) + 'rpx' }">{{ diyComponent.field.remark.text }}</view>
+			<view class="layout-one-error-message" v-if="errorInfo && !errorInfo.code">{{errorInfo.message}}</view>
+			<view class="layout-one-content !py-[20rpx] !h-[auto]">
+				<textarea class="w-[100%]" :placeholder="inputPlaceholder" placeholderClass="layout-one-input-placeholder" :placeholder-style="{'font-size': (diyComponent.fontSize * 2) + 'rpx'}" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx', 'height': textareaHeight}" v-model="diyComponent.field.value" :disabled="isDisabled" @linechange="linechangeFn" maxlength="500"/>
+			</view>
+			<view class="layout-one-attribute-wrap" v-if="inputAttribute().length">
+				<view v-for="(item,index) in inputAttribute()" :key="index" @click="eventFn(item.type)" class="layout-one-attribute-item">{{item.title}}</view>
+			</view>
+		</view>
+		<view class="base-layout-two" v-if="diyGlobal.completeLayout == 'style-2'">
+			<text v-if="diyStore.mode == 'decorate' && diyComponent.isHidden" class="layout-two-is-hidden">{{ t('hidden') }}</text>
+			<view class="layout-two-wrap" :class="{'no-border': !diyGlobal.borderControl}">
+				<view class="layout-two-label" :class="{'justify-start': diyGlobal.completeAlign == 'left', 'justify-end': diyGlobal.completeAlign == 'right'}">
+					<text class="required" v-if="diyComponent.field.required">{{ diyComponent.field.required ? '*' : '' }}</text>
+					<text class="name" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx' ,'font-weight': diyComponent.fontWeight}">{{ diyComponent.field.name }}</text>
+				</view>
+				<viwe class="layout-two-content">
+					<textarea class="w-[100%]" :placeholder="inputPlaceholder" placeholderClass="layout-one-input-placeholder" :placeholder-style="{'font-size': (diyComponent.fontSize * 2) + 'rpx' }" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx', 'height': textareaHeight}" v-model="diyComponent.field.value" :disabled="isDisabled" @linechange="linechangeFn" maxlength="500"/>
+				</viwe>
+			</view>
+			<view class="layout-two-error-message" v-if="errorInfo && !errorInfo.code">{{errorInfo.message}}</view>
+			<view v-if="diyComponent.field.remark.text" class="layout-two-remark" :style="{ color: diyComponent.field.remark.color, fontSize: (diyComponent.field.remark.fontSize * 2 ) + 'rpx' }">{{ diyComponent.field.remark.text }}</view>
+			<view class="layout-two-attribute-wrap" v-if="inputAttribute().length">
+				<view v-for="(item,index) in inputAttribute()" :key="index" @click="eventFn(item.type)" class="layout-two-attribute-item">{{item.title}}</view>
+			</view>
+		</view>
+		<view v-if="diyStore.mode == 'decorate'" class="form-item-mask"></view>
+		<form-privacy-pop ref="formPrivacyRef" :data="formPrivacyData" />
+	</view>
+</template>
+
+<script setup lang="ts">
+	// 表单 多行文本组件
+	import { ref, computed, watch,onMounted,nextTick } from 'vue';
+    import { img } from '@/utils/common';
+	import { t } from '@/locale'
+    import formPrivacyPop from './../form-privacy-pop/index.vue';
+	import useDiyStore from '@/app/stores/diy';
+
+	const props = defineProps(['component', 'index', 'global']);
+	const diyStore = useDiyStore();
+	const errorInfo:any = ref(null);
+	const formPrivacyRef: any = ref(null);
+
+	const diyComponent = computed(() => {
+		if (diyStore.mode == 'decorate') {
+			return diyStore.value[props.index];
+		} else {
+			return props.component;
+		}
+	})
+	
+	const diyGlobal = computed(() => {
+		return props.global;
+	})
+	
+	const inputPlaceholder = computed(() => {
+		let str = '';
+		str += diyComponent.value.placeholder
+		return str;
+	})
+	
+	const formPrivacyData = computed(() => {
+		let str = `${diyComponent.value.field.name}已开启隐私保护，提交后会部分打码，只有你自己和管理员才能查看完整信息`;
+		return str;
+	})
+	
+	// input属性
+	const inputAttribute = ()=>{
+		let arr = [];
+		if(diyComponent.value.autofill){
+			let obj = {
+				title: '已自动填充'
+			};
+			arr.push(obj);
+		}
+		if(diyComponent.value.field.privacyProtection){
+			let obj = {
+				title: '已开启隐私保护',
+				type: 'privacy'
+			};
+			arr.push(obj);
+		}
+		
+		arr.forEach((item,index,arr)=>{
+			if(index != (arr.length-1)){
+				let obj = {
+					title: '|'
+				};
+				arr.push(obj);
+			}
+		})
+		return arr;
+	}
+	
+	const eventFn = (type:any)=>{
+		if(type == 'privacy'){
+			// 查看隐私
+			formPrivacyRef.value.open();
+		}
+	}
+
+	const warpCss = computed(() => {
+		var style = '';
+        style += 'position:relative;';
+        if (diyComponent.value.componentStartBgColor && diyComponent.value.componentEndBgColor) style += `background:linear-gradient(${diyComponent.value.componentGradientAngle},${diyComponent.value.componentStartBgColor},${diyComponent.value.componentEndBgColor});`;
+        else if (diyComponent.value.componentStartBgColor) style += 'background-color:' + diyComponent.value.componentStartBgColor + ';';
+        else if (diyComponent.value.componentEndBgColor) style += 'background-color:' + diyComponent.value.componentEndBgColor + ';';
+
+        if(diyComponent.value.componentBgUrl) {
+            style += `background-image:url('${ img(diyComponent.value.componentBgUrl) }');`;
+            style += 'background-size: cover;background-repeat: no-repeat;';
+        }
+
+		if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		return style;
+	})
+
+    onMounted(() => {
+        refresh();
+        // 装修模式下刷新
+        if (diyStore.mode == 'decorate') {
+            watch(
+                () => diyComponent.value,
+                (newValue, oldValue) => {
+                    if (newValue && newValue.componentName == 'FormTextarea') {
+                        refresh();
+                    }
+                }
+            )
+        }else{
+		}
+    });
+
+    const refresh = ()=> {
+		// 装修模式下，展示默认值
+		if (diyStore.mode == 'decorate') {
+		   diyComponent.value.field.value = diyComponent.value.field.default;
+		}else {
+		   // 实际展示，优先缓存，其次默认值
+		   if (diyComponent.value.field.value == '' && diyComponent.value.field.default) {
+		      diyComponent.value.field.value = diyComponent.value.field.default;
+		   }
+		}
+    }
+	const textareaHeight = ref('38rpx')
+	const linechangeFn = (e)=>{
+		let height = e.detail.height / e.detail.lineCount;
+		if(diyComponent.value.rowCount > e.detail.lineCount){
+			textareaHeight.value = e.detail.height ? (e.detail.height * 2 + 'rpx') : '38rpx';
+		}else if(diyComponent.value.rowCount <= e.detail.lineCount){
+			textareaHeight.value =  height ? (height * diyComponent.value.rowCount * 2 + 'rpx') : '38rpx';
+		}
+	}
+
+	// 表单组件验证
+	const verify = () => {
+		const res = { code: true, message: '' }
+		if (diyComponent.value.field.required && diyComponent.value.field.value == '' && diyStore.mode != 'decorate') {
+			res.code = false
+			res.message = `${ inputPlaceholder.value }`;
+		}
+		errorInfo.value = res;
+		return res;
+	}
+
+	// 重置表单组件数据
+	const reset = () => {
+		diyComponent.value.field.value = '';
+	}
+
+	const isDisabled = computed(() => {
+		return diyStore.mode == 'decorate';
+	});
+
+	defineExpose({
+		verify,
+		reset
+	})
+</script>
+
+<style lang="scss" scoped>
+	@import '@/styles/diy_form.scss';
+</style>
diff --git a/uni-app/src/app/components/diy/form-time-scope/index.vue b/uni-app/src/app/components/diy/form-time-scope/index.vue
new file mode 100644
index 00000000..cab8012b
--- /dev/null
+++ b/uni-app/src/app/components/diy/form-time-scope/index.vue
@@ -0,0 +1,354 @@
+<template>
+	<view v-if="diyComponent.viewFormDetail" class="form-item-frame">
+		<view class="base-layout-one" v-if="diyGlobal.completeLayout == 'style-1'">
+			<view class="detail-one-content" v-if="diyComponent.field.value.start.date || diyComponent.field.value.end.date">
+				<text class="detail-one-content-label">{{ diyComponent.field.name }}</text>
+				<view class="detail-one-content-value">
+					<text> {{ diyComponent.field.value.start.date }}</text>
+					<text v-if="diyComponent.field.value.start.date && diyComponent.field.value.end.date"> - </text>
+					<text>{{ diyComponent.field.value.end.date }}</text>
+				</view>
+				
+			</view>
+		</view>
+		<view class="base-layout-two" v-if="diyGlobal.completeLayout == 'style-2'">
+			<view class="detail-two-content" v-if="diyComponent.field.value.start.date || diyComponent.field.value.end.date">
+				<text class="detail-two-content-label">{{ diyComponent.field.name }}</text>
+				<view class="detail-two-content-value w-[80%]">
+					<text>{{ diyComponent.field.value.start.date }}</text>
+					<text v-if="diyComponent.field.value.start.date && diyComponent.field.value.end.date"> - </text>
+					<text>{{ diyComponent.field.value.end.date }}</text> 
+				</view>
+			</view>
+		</view>
+	</view>
+	<view v-else :style="warpCss" class="form-item-frame">
+		<view class="base-layout-one" v-if="diyGlobal.completeLayout == 'style-1'">
+			<view class="layout-one-label">
+				<text class="name" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx' ,'font-weight': diyComponent.fontWeight}">{{ diyComponent.field.name }}</text>
+				<text class="required">{{ diyComponent.field.required ? '*' : '' }}</text>
+				<text v-if="diyStore.mode == 'decorate' && diyComponent.isHidden" class="is-hidden">{{ t('hidden') }}</text>
+			</view>
+			<view v-if="diyComponent.field.remark.text" class="layout-one-remark" :style="{ color: diyComponent.field.remark.color, fontSize: (diyComponent.field.remark.fontSize * 2 ) + 'rpx' }">{{ diyComponent.field.remark.text }}</view>
+			<view class="layout-one-error-message" v-if="errorInfo && !errorInfo.code">{{errorInfo.message}}</view>
+
+			<view class="flex items-center">
+				<view class="layout-one-content flex-1" @click="startDatetime = true">
+					<view class="nc-iconfont nc-icon-a-shijianV6xx-36 !text-[32rpx] text-[#999] mr-[16rpx]"></view>
+					<view class="flex-1 text-overflow-ellipsis" :class="{'!text-[#999]' : !diyComponent.defaultControl && !diyComponent.field.value.start.date}" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx'}">
+						{{ startTime }}
+					</view>
+				</view>
+				<view class="mx-[10rpx]" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx'}">-</view>
+				<view class="layout-one-content flex-1"  @click="endDatetime = true">
+					<view class="nc-iconfont nc-icon-a-shijianV6xx-36 !text-[32rpx] text-[#999] mr-[16rpx]"></view>
+					<view class="flex-1 text-overflow-ellipsis" :class="{'!text-[#999]' : !diyComponent.defaultControl && !diyComponent.field.value.end.date}" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx'}">
+						{{ endTime }}
+					</view>
+				</view>
+			</view>
+			<view class="layout-one-attribute-wrap" v-if="inputAttribute().length">
+				<view v-for="(item,index) in inputAttribute()" :key="index" @click="eventFn(item.type)" class="layout-one-attribute-item">{{item.title}}</view>
+			</view>
+		</view>
+		<view class="base-layout-two" v-if="diyGlobal.completeLayout == 'style-2'">
+			<text v-if="diyStore.mode == 'decorate' && diyComponent.isHidden" class="layout-two-is-hidden">{{ t('hidden') }}</text>
+			<view class="layout-two-wrap" :class="{'no-border': !diyGlobal.borderControl}">
+				<view class="layout-two-label" :class="{'justify-start': diyGlobal.completeAlign == 'left', 'justify-end': diyGlobal.completeAlign == 'right'}">
+					<text class="required" v-if="diyComponent.field.required">{{ diyComponent.field.required ? '*' : '' }}</text>
+					<text class="name" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx' ,'font-weight': diyComponent.fontWeight}">{{ diyComponent.field.name }}</text>
+				</view>
+				<view class="layout-two-content" @click="openCalendar">
+					<view class="text-overflow-ellipsis flex justify-center" :class="{'!text-[#999]' : !diyComponent.field.value.start.date && !diyComponent.defaultControl}" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx'}" @click="startDatetime = true">
+						{{ startTime }}
+					</view>
+					<view class="mx-[10rpx]" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx'}">-</view>
+					<view class="text-overflow-ellipsis flex justify-center" :class="{'!text-[#999]' : !diyComponent.field.value.end.date && !diyComponent.defaultControl}" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx'}" @click="endDatetime = true">
+						{{ endTime }}
+					</view>
+					<text class="nc-iconfont !text-[#666] !text-[36rpx] nc-icon-youV6xx -mr-[8rpx]"></text>
+				</view>
+			</view>
+			<view class="layout-two-error-message" v-if="errorInfo && !errorInfo.code">{{errorInfo.message}}</view>
+			<view v-if="diyComponent.field.remark.text" class="layout-two-remark" :style="{ color: diyComponent.field.remark.color, fontSize: (diyComponent.field.remark.fontSize * 2 ) + 'rpx' }">{{ diyComponent.field.remark.text }}</view>
+			<view class="layout-two-attribute-wrap" v-if="inputAttribute().length">
+				<view v-for="(item,index) in inputAttribute()" :key="index" @click="eventFn(item.type)" class="layout-two-attribute-item">{{item.title}}</view>
+			</view>
+		</view>
+		<u-datetime-picker :show="startDatetime" v-model="diyComponent.field.value.start.date" mode="time" @cancel="startDatetime=false" @confirm="startTimeConfirm"  @close="startDatetime=false" closeOnClickOverlay="true"></u-datetime-picker>
+		<u-datetime-picker :show="endDatetime" :minHour="endMinHour" :minMinute="endMinMinute" v-model="diyComponent.field.value.end.date" mode="time" @cancel="endTimeCancel" @confirm="endTimeConfirm" @change="endTimeChange"  @close="startDatetime=false" closeOnClickOverlay="true"></u-datetime-picker>
+		<!-- 遮罩层，装修使用 -->
+		<view v-if="diyStore.mode == 'decorate'" class="form-item-mask"></view>
+	</view>
+</template>
+
+<script setup lang="ts">
+	// 表单 时间范围组件
+	import { ref, computed, watch,onMounted } from 'vue';
+    import { img } from '@/utils/common';
+	import { t } from '@/locale'
+	import useDiyStore from '@/app/stores/diy';
+
+	const props = defineProps(['component', 'index','global']);
+	const diyStore = useDiyStore();
+	const startDatetime = ref(false);
+	const endDatetime = ref(false);
+	const calendarShow = ref(false);
+
+	const errorInfo:any = ref(null);
+
+	const diyComponent = computed(() => {
+		if (diyStore.mode == 'decorate') {
+			return diyStore.value[props.index];
+		} else {
+			return props.component;
+		}
+	})
+
+	const diyGlobal = computed(() => {
+		return props.global;
+	})
+
+	// input属性
+	const inputAttribute = ()=>{
+		let arr = [];
+		if(diyComponent.value.autofill){
+			let obj = {
+				title: '已自动填充'
+			};
+			arr.push(obj);
+		}
+
+		arr.forEach((item,index,arr)=>{
+			if(index != (arr.length-1)){
+				let obj = {
+					title: '|'
+				};
+				arr.push(obj);
+			}
+		})
+		return arr;
+	}
+
+	const eventFn = (type:any)=>{}
+
+	// 开始时间
+	const startTime = computed(() => {
+		let returnTime = '';
+		let time = ''
+		if(diyComponent.value.field.value.start.date){
+			returnTime = diyComponent.value.field.value.start.date;
+			time = diyComponent.value.field.value.start.date;
+		}else{
+			if(diyComponent.value.start.defaultControl){
+				if(diyComponent.value.start.timeWay == 'current'){
+					returnTime = getTimeFn();
+					time = getTimeFn();
+				}else if(diyComponent.value.start.timeWay == 'diy'){
+					returnTime = diyComponent.value.field.default.start.date;
+					time = diyComponent.value.field.default.start.date;
+				}
+			}else{
+				returnTime = diyComponent.value.start.placeholder;
+				time = '';
+			}
+		}
+
+		diyComponent.value.field.value.start.date = time;
+		diyComponent.value.field.value.start.timestamp = time ? timeInvertSecond(time) : 0;
+		return returnTime;
+	})
+
+	// 结束时间
+	const endTime = computed(() => {
+		let returnTime = '';
+		let time = ''
+		if(diyComponent.value.field.value.end.date){
+			returnTime = diyComponent.value.field.value.end.date;
+			time = diyComponent.value.field.value.end.date;
+		}else{
+			if(diyComponent.value.end.defaultControl){
+				if(diyComponent.value.end.timeWay == 'current'){
+					let now = new Date();
+					let tenMinutesLater =new Date(now.getTime()+10 *60* 1000);
+					returnTime = getTimeFn(tenMinutesLater);
+					time = getTimeFn(tenMinutesLater);
+				}else if(diyComponent.value.end.timeWay == 'diy'){
+					returnTime = diyComponent.value.field.default.end.date;
+					time = diyComponent.value.field.default.end.date;
+				}
+			}else{
+				returnTime = diyComponent.value.end.placeholder;
+				time = '';
+			}
+		}
+		diyComponent.value.field.value.end.date = time;
+		diyComponent.value.field.value.end.timestamp = time ? timeInvertSecond(time) : 0;
+		return returnTime;
+	})
+
+	const warpCss = computed(() => {
+		var style = '';
+        style += 'position:relative;';
+		if (diyComponent.value.componentStartBgColor && diyComponent.value.componentEndBgColor) style += `background:linear-gradient(${diyComponent.value.componentGradientAngle},${diyComponent.value.componentStartBgColor},${diyComponent.value.componentEndBgColor});`;
+		else if (diyComponent.value.componentStartBgColor) style += 'background-color:' + diyComponent.value.componentStartBgColor + ';';
+		else if (diyComponent.value.componentEndBgColor) style += 'background-color:' + diyComponent.value.componentEndBgColor + ';';
+
+        if(diyComponent.value.componentBgUrl) {
+            style += `background-image:url('${ img(diyComponent.value.componentBgUrl) }');`;
+            style += 'background-size: cover;background-repeat: no-repeat;';
+        }
+
+		if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		return style;
+	})
+
+    onMounted(() => {
+        refresh();
+        // 装修模式下刷新
+        if (diyStore.mode == 'decorate') {
+            watch(
+                () => diyComponent.value,
+                (newValue, oldValue) => {
+                    if (newValue && newValue.componentName == 'FormTimeScope') {
+                        refresh();
+                    }
+                }
+            )
+        }
+    });
+
+    const refresh = ()=> {
+    	// todo 开始、结束时间给予默认值
+	    // {{ diyComponent.start.defaultControl ? diyComponent.field.value.start : diyComponent.start.placeholder }}
+    }
+
+	// 表单组件验证
+	const verify = () => {
+		const res = { code: true, message: '' }
+		if (diyComponent.value.field.required && diyComponent.value.field.value.start.date == '') {
+			res.code = false
+			res.message = `请选择${ diyComponent.value.start.placeholder }`;
+		}else if (diyComponent.value.field.required && diyComponent.value.field.value.end.date == '') {
+			res.code = false
+			res.message = `请选择${ diyComponent.value.end.placeholder }`;
+		}else if (diyComponent.value.field.value.start.timestamp >= diyComponent.value.field.value.end.timestamp && diyComponent.value.field.value.start.timestamp && diyComponent.value.field.value.end.timestamp) {
+			res.code = false
+			res.message = `开始时间不能大于等于结束时间`;
+		}
+		errorInfo.value = res;
+		return res;
+	}
+
+	// 重置表单组件数据
+	const reset = () => {
+		diyComponent.value.field.value.start.date = '';
+		diyComponent.value.field.value.start.timestamp = 0;
+		diyComponent.value.field.value.end.date = '';
+		diyComponent.value.field.value.end.timestamp = 0;
+	}
+
+    const openCalendar = () =>{
+    	if(diyStore.mode === 'decorate') return;
+	    calendarShow.value = true;
+    }
+
+	const startTimeConfirm = (e) => {
+		diyComponent.value.field.value.start.date = e.value;
+		diyComponent.value.field.value.start.timestamp = timeInvertSecond(e.value);
+
+		let returnTime = e.value;
+		let startTime = new Date(`1970-01-01T${e.value}:00`);
+		startTime.setMinutes(startTime.getMinutes() + 10);
+		returnTime = getTimeFn(startTime);
+		diyComponent.value.field.value.end.date = returnTime;
+		diyComponent.value.field.value.end.timestamp = timeInvertSecond(returnTime);
+
+		startDatetime.value = false;
+	}
+
+	const endTimeConfirm = (e)=>{
+		diyComponent.value.field.value.end.date = e.value;
+		diyComponent.value.field.value.end.timestamp = timeInvertSecond(e.value);
+		endDatetime.value = false;
+	}
+
+	// 辅助设置结束时间可选的最小分钟
+	const endTimeChange = (e)=>{
+		if(!temporaryEndTime.value) temporaryEndTime.value = diyComponent.value.field.value.end.date;
+		diyComponent.value.field.value.end.date = e.value;
+	}
+
+	const endTimeCancel = ()=>{
+		if(temporaryEndTime.value) diyComponent.value.field.value.end.date = temporaryEndTime.value;
+		temporaryEndTime.value = '';
+		endDatetime.value = false;
+	}
+
+	// 设置结束时间的最小小时
+	const endMinHour = computed(() => {
+		let arr = diyComponent.value.field.value.start.date.split(':')
+		return Number(arr[0] ? arr[0] : '0');
+	})
+	// 设置结束时间的最小分钟
+	let temporaryEndTime:any = ref("");
+	const endMinMinute = computed({
+		get: () => {
+			let startArr = diyComponent.value.field.value.start.date.split(':');
+			let endArr = diyComponent.value.field.value.end.date.split(':');
+			let num = startArr[0] == endArr[0] ? startArr[1] : 0;
+			return Number(num ? num : '0');
+		},
+		set: (newValue) => {
+
+		}
+	})
+
+	const confirm = (e)=> {
+		calendarShow.value = false;
+	}
+
+	const getTimeFn = (data:any='')=>{
+		let now = data ? new Date(data) : new Date();
+		const hours = String(now.getHours()).padStart(2, '0');
+		const minutes = String(now.getMinutes()).padStart(2, '0');
+		let str = `${hours}:${minutes}`;
+		return str;
+	}
+
+	// 时间转换为秒
+	const timeInvertSecond = (time:any)=>{
+	    let arr = time.split(":");
+	    let num = 0;
+	    if(arr[0]){
+	        num += arr[0] * 60 * 60;
+	    }
+	    if(arr[1]){
+	        num += arr[1] * 60;
+	    }
+	    if(arr[2]){
+	        num += arr[2];
+	    }
+	    return num;
+	}
+
+	defineExpose({
+		verify,
+		reset
+	})
+</script>
+
+<style lang="scss" scoped>
+	@import '@/styles/diy_form.scss';
+	.text-overflow-ellipsis {
+	  white-space: nowrap;
+	  overflow: hidden;
+	  text-overflow: ellipsis;
+	}
+	.form-item-frame :deep(.u-picker .u-toolbar__wrapper__cancel), .form-item-frame :deep(.u-picker .u-toolbar__wrapper__confirm){
+		font-size: 28rpx;
+	}
+</style>
diff --git a/uni-app/src/app/components/diy/form-time/index.vue b/uni-app/src/app/components/diy/form-time/index.vue
new file mode 100644
index 00000000..074ae529
--- /dev/null
+++ b/uni-app/src/app/components/diy/form-time/index.vue
@@ -0,0 +1,231 @@
+<template>
+	<view v-if="diyComponent.viewFormDetail" class="form-item-frame">
+		<view class="base-layout-one" v-if="diyGlobal.completeLayout == 'style-1'">
+			<view class="detail-one-content">
+				<text class="detail-one-content-label">{{ diyComponent.field.name }}</text>
+				<text class="detail-one-content-value">{{ diyComponent.field.value }}</text>
+			</view>
+		</view>
+		<view class="base-layout-two" v-if="diyGlobal.completeLayout == 'style-2'">
+			<view class="detail-two-content">
+				<text class="detail-two-content-label">{{ diyComponent.field.name }}</text>
+				<view class="detail-two-content-value w-[80%]">{{ diyComponent.field.value }}</view>
+			</view>
+		</view>
+	</view>
+	<view v-else :style="warpCss" class="form-item-frame">
+		<view class="base-layout-one" v-if="diyGlobal.completeLayout == 'style-1'">
+			<view class="layout-one-label">
+				<text class="name" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx' ,'font-weight': diyComponent.fontWeight}">{{ diyComponent.field.name }}</text>
+				<text class="required">{{ diyComponent.field.required ? '*' : '' }}</text>
+				<text v-if="diyStore.mode == 'decorate' && diyComponent.isHidden" class="is-hidden">{{ t('hidden') }}</text>
+			</view>
+			<view v-if="diyComponent.field.remark.text" class="layout-one-remark" :style="{ color: diyComponent.field.remark.color, fontSize: (diyComponent.field.remark.fontSize * 2 ) + 'rpx' }">{{ diyComponent.field.remark.text }}</view>
+			<view class="layout-one-error-message" v-if="errorInfo && !errorInfo.code">{{errorInfo.message}}</view>
+			
+			<view class="layout-one-content">
+				<view class="nc-iconfont nc-icon-a-shijianV6xx-36 !text-[32rpx] text-[#999] mr-[16rpx]"></view>
+				<view class="flex-1 text-overflow-ellipsis flex" :class="{'!text-[#999]' : !diyComponent.field.value && !diyComponent.defaultControl}" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx'}" @click="startDatetime = true">
+					{{ startTime }}
+				</view>
+			</view>
+			<view class="layout-one-attribute-wrap" v-if="inputAttribute().length">
+				<view v-for="(item,index) in inputAttribute()" :key="index" @click="eventFn(item.type)" class="layout-one-attribute-item">{{item.title}}</view>
+			</view>
+		</view>
+		<view class="base-layout-two" v-if="diyGlobal.completeLayout == 'style-2'">
+			<text v-if="diyStore.mode == 'decorate' && diyComponent.isHidden" class="layout-two-is-hidden">{{ t('hidden') }}</text>
+			<view class="layout-two-wrap" :class="{'no-border': !diyGlobal.borderControl}">
+				<view class="layout-two-label" :class="{'justify-start': diyGlobal.completeAlign == 'left', 'justify-end': diyGlobal.completeAlign == 'right'}">
+					<text class="required" v-if="diyComponent.field.required">{{ diyComponent.field.required ? '*' : '' }}</text>
+					<text class="name" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx' ,'font-weight': diyComponent.fontWeight}">{{ diyComponent.field.name }}</text>
+				</view>
+				<view class="layout-two-content" @click="openCalendar">
+					<view class="flex-1 text-overflow-ellipsis flex justify-end " :class="{'!text-[#999]' : !diyComponent.field.value && !diyComponent.defaultControl}" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx'}" @click="startDatetime = true">
+						{{ startTime }}
+					</view>
+					<text class="nc-iconfont !text-[#666] !text-[36rpx] nc-icon-youV6xx -mr-[8rpx]"></text>
+				</view>
+			</view>
+			<view class="layout-two-error-message" v-if="errorInfo && !errorInfo.code">{{errorInfo.message}}</view>
+			<view v-if="diyComponent.field.remark.text" class="layout-two-remark" :style="{ color: diyComponent.field.remark.color, fontSize: (diyComponent.field.remark.fontSize * 2 ) + 'rpx' }">{{ diyComponent.field.remark.text }}</view>
+			<view class="layout-two-attribute-wrap" v-if="inputAttribute().length">
+				<view v-for="(item,index) in inputAttribute()" :key="index" @click="eventFn(item.type)" class="layout-two-attribute-item">{{item.title}}</view>
+			</view>
+		</view>
+		<u-datetime-picker :show="startDatetime" v-model="diyComponent.field.value" mode="time" @cancel="startDatetime=false" @close="startDatetime=false" @confirm="startTimeConfirm" closeOnClickOverlay="true"></u-datetime-picker>
+		<!-- 遮罩层，装修使用 -->
+		<view v-if="diyStore.mode == 'decorate'" class="form-item-mask"></view>
+	</view>
+</template>
+
+<script setup lang="ts">
+	// 表单 时间范围组件
+	import { ref, computed, watch,onMounted } from 'vue';
+    import { img,timeStampTurnTime } from '@/utils/common';
+	import { t } from '@/locale'
+	import useDiyStore from '@/app/stores/diy';
+
+	const props = defineProps(['component', 'index','global']);
+	const diyStore = useDiyStore();
+	const startDatetime = ref(false);
+	const endDatetime = ref(false);
+	const calendarShow = ref(false);
+	
+	const errorInfo:any = ref(null);
+
+	const diyComponent = computed(() => {
+		if (diyStore.mode == 'decorate') {
+			return diyStore.value[props.index];
+		} else {
+			return props.component;
+		}
+	})
+	
+	const diyGlobal = computed(() => {
+		return props.global;
+	})
+	
+	// input属性
+	const inputAttribute = ()=>{
+		let arr = [];
+		if(diyComponent.value.autofill){
+			let obj = {
+				title: '已自动填充'
+			};
+			arr.push(obj);
+		}
+		
+		arr.forEach((item,index,arr)=>{
+			if(index != (arr.length-1)){
+				let obj = {
+					title: '|'
+				};
+				arr.push(obj);
+			}
+		})
+		return arr;
+	}
+	
+	const eventFn = (type:any)=>{
+		
+	}
+	
+	// 开始时间
+	const startTime = computed(() => {
+		var time = '';
+		if(diyComponent.value.field.value){
+			time = diyComponent.value.field.value;
+			diyComponent.value.field.value = time;
+		}else{
+			if(diyComponent.value.defaultControl){
+				if(diyComponent.value.timeWay == 'current'){
+					time = getTimeFn();
+				}else if(diyComponent.value.timeWay == 'diy'){
+					time = diyComponent.value.field.default;
+				}
+				
+				diyComponent.value.field.value = time;
+			}else{
+				time = diyComponent.value.placeholder;
+			}
+		}
+		return time;
+	})
+
+	const warpCss = computed(() => {
+		var style = '';
+        style += 'position:relative;';
+		if (diyComponent.value.componentStartBgColor && diyComponent.value.componentEndBgColor) style += `background:linear-gradient(${diyComponent.value.componentGradientAngle},${diyComponent.value.componentStartBgColor},${diyComponent.value.componentEndBgColor});`;
+		else if (diyComponent.value.componentStartBgColor) style += 'background-color:' + diyComponent.value.componentStartBgColor + ';';
+		else if (diyComponent.value.componentEndBgColor) style += 'background-color:' + diyComponent.value.componentEndBgColor + ';';
+
+        if(diyComponent.value.componentBgUrl) {
+            style += `background-image:url('${ img(diyComponent.value.componentBgUrl) }');`;
+            style += 'background-size: cover;background-repeat: no-repeat;';
+        }
+
+		if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		return style;
+	})
+
+    onMounted(() => {
+        refresh();
+        // 装修模式下刷新
+        if (diyStore.mode == 'decorate') {
+            watch(
+                () => diyComponent.value,
+                (newValue, oldValue) => {
+                    if (newValue && newValue.componentName == 'FormTime') {
+                        refresh();
+                    }
+                }
+            )
+        }
+    });
+
+    const refresh = ()=> {
+    	// todo 开始、结束时间给予默认值
+	    // {{ diyComponent.start.defaultControl ? diyComponent.field.value : diyComponent.start.placeholder }}
+    }
+
+	// 表单组件验证
+	const verify = () => {
+		const res = { code: true, message: '' }
+		if (diyComponent.value.field.required && diyComponent.value.field.value == '') {
+			res.code = false
+			res.message = `请选择${ diyComponent.value.placeholder }`;
+		}
+		errorInfo.value = res;
+		return res;
+	}
+
+	// 重置表单组件数据
+	const reset = () => {
+		diyComponent.value.field.value = '';
+	}
+
+    const openCalendar = () =>{
+    	if(diyStore.mode === 'decorate') return;
+	    calendarShow.value = true;
+    }
+	
+	const startTimeConfirm = (e)=>{
+		diyComponent.value.field.value = e.value;
+		startDatetime.value = false;
+	}
+
+	const confirm = (e)=> {
+		calendarShow.value = false;
+	}
+
+	const getTimeFn = (data:any='')=>{
+		let now = data ? new Date(data) : new Date();
+		
+		let str = '';
+		const hours = String(now.getHours()).padStart(2, '0');  
+		const minutes = String(now.getMinutes()).padStart(2, '0');
+		str = `${hours}:${minutes}`;
+		return str;
+	}
+
+	defineExpose({
+		verify,
+		reset
+	})
+</script>
+
+<style lang="scss" scoped>
+	@import '@/styles/diy_form.scss';
+	.text-overflow-ellipsis {
+	  white-space: nowrap;
+	  overflow: hidden;
+	  text-overflow: ellipsis;
+	}
+	.form-item-frame :deep(.u-picker .u-toolbar__wrapper__cancel), .form-item-frame :deep(.u-picker .u-toolbar__wrapper__confirm){
+		font-size: 28rpx;
+	}
+</style>
diff --git a/uni-app/src/app/components/diy/form-video/index.vue b/uni-app/src/app/components/diy/form-video/index.vue
new file mode 100644
index 00000000..78346bee
--- /dev/null
+++ b/uni-app/src/app/components/diy/form-video/index.vue
@@ -0,0 +1,124 @@
+<template>
+	<view :style="warpCss">
+		form-video
+		<view class="relative">
+			<view class="p-[10rpx] flex items-center ">
+				<view class="w-[25%] flex items-center">
+					<text class="text-overflow-ellipsis" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx' ,'font-weight': diyComponent.fontWeight}">{{ diyComponent.field.name }}</text>
+					<text class="text-[#ec0003]">{{ diyComponent.field.required ? '*' : '' }}</text>
+				</view>
+				<view class="w-[75%] flex justify-center items-center">
+				    <u-upload :fileList="imgListPreview" :disabled="isDisabled" @afterRead="afterRead" @delete="deletePic" multiple :maxCount="diyComponent.limit"/>
+				</view>
+			</view>
+
+		</view>
+	</view>
+</template>
+
+<script setup lang="ts">
+	// 表单 视频组件
+	import { ref, computed, watch,onMounted } from 'vue';
+	import useDiyStore from '@/app/stores/diy';
+    import { img } from '@/utils/common';
+    import { uploadImage } from '@/app/api/system'
+
+	const props = defineProps(['component', 'index','global']);
+	const diyStore = useDiyStore();
+	const selectValue = ref([])
+
+	const diyComponent = computed(() => {
+		if (diyStore.mode == 'decorate') {
+			return diyStore.value[props.index];
+		} else {
+			return props.component;
+		}
+	})
+	const warpCss = computed(() => {
+		var style = '';
+        style += 'position:relative;';
+        if(diyComponent.value.componentStartBgColor) {
+            if (diyComponent.value.componentStartBgColor && diyComponent.value.componentEndBgColor) style += `background:linear-gradient(${diyComponent.value.componentGradientAngle},${diyComponent.value.componentStartBgColor},${diyComponent.value.componentEndBgColor});`;
+            else style += 'background-color:' + diyComponent.value.componentStartBgColor + ';';
+        }
+
+        if(diyComponent.value.componentBgUrl) {
+            style += `background-image:url('${ img(diyComponent.value.componentBgUrl) }');`;
+            style += 'background-size: cover;background-repeat: no-repeat;';
+        }
+
+		if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		return style;
+	})
+
+    onMounted(() => {
+        refresh();
+        // 装修模式下刷新
+        if (diyStore.mode == 'decorate') {
+            watch(
+                () => diyComponent.value,
+                (newValue, oldValue) => {
+                    if (newValue && newValue.componentName == 'FormVideo') {
+                        refresh();
+                    }
+                }
+            )
+        }
+    });
+
+
+	const isDisabled = computed(() => {
+		return diyStore.mode === 'decorate';
+	});
+
+	const imgListPreview = computed(() => {
+		return selectValue.value.map(item => {
+			return {url: img(item)}
+		})
+	})
+
+	const afterRead = (event) => {
+		event.file.forEach(item => {
+			uploadImage({
+				filePath: item.url,
+				name: 'file'
+			}).then(res => {
+				if (selectValue.value.length < diyComponent.value.limit ) {
+					selectValue.value.push(res.data.url)
+				}
+			}).catch(() => {
+			})
+		})
+	}
+
+	const deletePic = (event)=> {
+		selectValue.value.splice(event.index, 1)
+	}
+
+    const refresh = ()=> {
+    }
+
+	// 表单组件验证
+	const verify = () => {
+		const res = { code: true, message: '' }
+		// todo 验证组件，diyComponent.value.field.value
+		return res;
+	}
+
+	// 重置表单组件数据
+	const reset = () => {
+		// todo 清空组件数据，diyComponent.value.field.value = '';
+	}
+
+	defineExpose({
+		verify,
+		reset
+	})
+</script>
+
+<style lang="scss" scoped>
+	@import '@/styles/diy_form.scss';
+</style>
diff --git a/uni-app/src/app/components/diy/form-wechat-name/index.vue b/uni-app/src/app/components/diy/form-wechat-name/index.vue
new file mode 100644
index 00000000..a85338bd
--- /dev/null
+++ b/uni-app/src/app/components/diy/form-wechat-name/index.vue
@@ -0,0 +1,96 @@
+<template>
+	<view :style="warpCss">
+		form-wechat-name
+		<view class="relative">
+			<view class="p-[10rpx]  flex items-center ">
+				<view class="w-[27%] mr-[10rpx] flex items-center">
+					<text class="text-overflow-ellipsis" :style="{'color': diyComponent.textColor,'font-size': (diyComponent.fontSize * 2) + 'rpx' ,'font-weight': diyComponent.fontWeight}">{{ diyComponent.field.name }}</text>
+					<text class="text-[#ec0003]">{{ diyComponent.field.required ? '*' : '' }}</text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup lang="ts">
+	// 表单 微信名组件
+	import { ref, computed, watch,onMounted } from 'vue';
+	import useDiyStore from '@/app/stores/diy';
+    import { img } from '@/utils/common';
+
+	const props = defineProps(['component', 'index','global']);
+	const diyStore = useDiyStore();
+
+	const diyComponent = computed(() => {
+		if (diyStore.mode == 'decorate') {
+			return diyStore.value[props.index];
+		} else {
+			return props.component;
+		}
+	})
+
+	const warpCss = computed(() => {
+		var style = '';
+        style += 'position:relative;';
+        if(diyComponent.value.componentStartBgColor) {
+            if (diyComponent.value.componentStartBgColor && diyComponent.value.componentEndBgColor) style += `background:linear-gradient(${diyComponent.value.componentGradientAngle},${diyComponent.value.componentStartBgColor},${diyComponent.value.componentEndBgColor});`;
+            else style += 'background-color:' + diyComponent.value.componentStartBgColor + ';';
+        }
+
+        if(diyComponent.value.componentBgUrl) {
+            style += `background-image:url('${ img(diyComponent.value.componentBgUrl) }');`;
+            style += 'background-size: cover;background-repeat: no-repeat;';
+        }
+
+		if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		return style;
+	})
+
+    onMounted(() => {
+        refresh();
+        // 装修模式下刷新
+        if (diyStore.mode == 'decorate') {
+            watch(
+                () => diyComponent.value,
+                (newValue, oldValue) => {
+                    if (newValue && newValue.componentName == 'FormWechatName') {
+                        refresh();
+                    }
+                }
+            )
+        }else{
+		}
+    });
+
+    const refresh = ()=> {
+    }
+
+	// 表单组件验证
+	const verify = () => {
+		const res = { code: true, message: '' }
+		// todo 验证组件，diyComponent.value.field.value
+		return res;
+	}
+
+	// 重置表单组件数据
+	const reset = () => {
+		// todo 清空组件数据，diyComponent.value.field.value = '';
+	}
+
+	defineExpose({
+		verify,
+		reset
+	})
+</script>
+
+<style lang="scss" scoped>
+	@import '@/styles/diy_form.scss';
+	.text-overflow-ellipsis {
+	  white-space: nowrap;
+	  overflow: hidden;
+	  text-overflow: ellipsis;
+	}
+</style>
diff --git a/uni-app/src/app/components/diy/graphic-nav/index.vue b/uni-app/src/app/components/diy/graphic-nav/index.vue
new file mode 100644
index 00000000..48573d8a
--- /dev/null
+++ b/uni-app/src/app/components/diy/graphic-nav/index.vue
@@ -0,0 +1,396 @@
+<template>
+	<view :style="warpCss">
+		<view :style="maskLayer"></view>
+		<view class="diy-graphic-nav relative">
+			<view v-if="diyComponent.layout == 'vertical'" class="graphic-nav">
+				<view class="graphic-nav-item" v-for="(item, index) in diyComponent.list" :key="item.id">
+
+					<view @click="diyStore.toRedirect(item.link)" :class="['flex items-center justify-between py-3 px-4', index == 0 ? 'border-t-0':'border-t']">
+
+						<view class="graphic-img relative flex items-center w-10 h-10 mr-[20rpx]"
+							v-if="diyComponent.mode != 'text'"
+							:style="{ width: diyComponent.imageSize * 2 + 'rpx', height: diyComponent.imageSize * 2 + 'rpx' }">
+							<image v-if="item.imageUrl" :src="img(item.imageUrl)" mode="aspectFill"
+								:style="{ maxWidth: diyComponent.imageSize * 2 + 'rpx', maxHeight: diyComponent.imageSize * 2 + 'rpx', borderRadius: diyComponent.aroundRadius * 2 + 'rpx' }"/>
+							<image v-else :src="img('static/resource/images/diy/figure.png')" mode="aspectFill"
+							       :style="{ maxWidth: diyComponent.imageSize * 2 + 'rpx', maxHeight: diyComponent.imageSize * 2 + 'rpx', borderRadius: diyComponent.aroundRadius * 2 + 'rpx' }"/>
+
+							<text v-if="item.label.control"
+								class="tag absolute -top-[10rpx] -right-[24rpx] text-white rounded-[24rpx] rounded-bl-none transform scale-80 py-1 px-2 text-xs"
+								:style="{ color: item.label.textColor, backgroundImage: 'linear-gradient(' + item.label.bgColorStart + ',' + item.label.bgColorEnd + ')' }">
+								{{ item.label.text }}
+							</text>
+						</view>
+
+						<text v-if="diyComponent.mode != 'img'" class="graphic-text w-full truncate leading-normal"
+							:style="{ fontSize: diyComponent.font.size * 2 + 'rpx', fontWeight: diyComponent.font.weight, color: diyComponent.font.color }">
+							{{ item.title }}
+						</text>
+						<u-icon name="arrow-right" color="#999999" size="12"></u-icon>
+
+					</view>
+
+				</view>
+
+			</view>
+
+			<view class="pt-[10rpx]" v-else-if="diyComponent.layout == 'horizontal' && diyComponent.showStyle == 'pageSlide'">
+				<swiper class="graphic-nav swiper relative" :style="{ height: swiperHeight, width: '95%', margin: '0 auto',opacity : swiperHeight ? 1 : 0 }" circular @change="swiperChange">
+					<swiper-item class="graphic-nav-wrap flex flex-wrap" v-for="(numItem, numIndex) in Math.ceil(diyComponent.list.length / (diyComponent.pageCount * diyComponent.rowCount))">
+
+						<template v-for="(item, index) in diyComponent.list">
+
+							<view :class="[diyComponent.mode]" :key="item.id" v-if="swiperCondition(index,numItem)" :style="{ width: 100 / diyComponent.rowCount + '%' }">
+
+								<view @click="diyStore.toRedirect(item.link)" class="graphic-nav-item flex flex-col items-center py-2">
+
+									<view class="graphic-img relative flex items-center justify-center w-10 h-10"
+										v-if="diyComponent.mode != 'text'"
+										:style="{ width: diyComponent.imageSize * 2 + 'rpx', height: diyComponent.imageSize * 2 + 'rpx' }">
+										<image v-if="item.imageUrl" :src="img(item.imageUrl)" mode="aspectFill"
+											:style="{ maxWidth: diyComponent.imageSize * 2 + 'rpx', maxHeight: diyComponent.imageSize * 2 + 'rpx', borderRadius: diyComponent.aroundRadius * 2 + 'rpx' }"/>
+										<image v-else :src="img('static/resource/images/diy/figure.png')" mode="aspectFill"
+										       :style="{ maxWidth: diyComponent.imageSize * 2 + 'rpx', maxHeight: diyComponent.imageSize * 2 + 'rpx', borderRadius: diyComponent.aroundRadius * 2 + 'rpx' }"/>
+
+										<text
+											class="tag absolute -top-[10rpx] -right-[24rpx] text-white rounded-[24rpx] rounded-bl-none transform scale-80 py-1 px-2 text-xs"
+											v-if="item.label.control"
+											:style="{ color: item.label.textColor, backgroundImage: 'linear-gradient(' + item.label.bgColorStart + ',' + item.label.bgColorEnd + ')' }">
+											{{ item.label.text }}
+										</text>
+									</view>
+
+									<text v-if="diyComponent.mode != 'img'"
+										class="graphic-text w-full text-center truncate leading-normal"
+										:class="{ 'pt-[16rpx]' : diyComponent.mode != 'text' }"
+										:style="{ fontSize: diyComponent.font.size * 2 + 'rpx', fontWeight: diyComponent.font.weight, color: diyComponent.font.color }">
+										{{ item.title }}
+									</text>
+								</view>
+
+							</view>
+						</template>
+					</swiper-item>
+				</swiper>
+				<view class="graphic-nav-indicator-dot" v-if="shouldShowIndicator && swiperHeight">
+                    <div class="dots-wrap" :class="[diyComponent.swiper.indicatorAlign]">
+                        <div v-for="(item,index) in Math.ceil(diyComponent.list.length / (diyComponent.pageCount * diyComponent.rowCount))"
+                         :class="['dot',index == swiperIndex ? 'dot-active' : '',diyComponent.swiper.indicatorStyle]"
+                         :style="{ background : index == swiperIndex ? diyComponent.swiper.indicatorActiveColor : diyComponent.swiper.indicatorColor}"></div>
+                    </div>
+				</view>
+			</view>
+
+			<view :style="{width: '98%', margin: '0 auto' }" v-else-if="diyComponent.layout == 'horizontal' && diyComponent.pageCount == 2 && diyComponent.showStyle == 'singleSlide'"  :class="['graphic-nav multiple-lines','graphic-nav-' + diyComponent.showStyle]" class="py-[10rpx]">
+				<!-- #ifdef MP -->
+				<view class="uni-scroll-view-content">
+				<!-- #endif -->
+					<scroll-view class="graphic-nav-wrap whitespace-nowrap" :scroll-x="diyComponent.showStyle == 'singleSlide'" v-for="(numItem, numIndex) in getSlideRowNum()">
+						<template v-for="(item, index) in diyComponent.list" >
+
+							<view v-if="isShowslideTemp(index,numItem)" @click="diyStore.toRedirect(item.link)" :style="horizontalSingleSlideItemStyle(numIndex)" class="graphic-nav-item inline-flex flex-col items-center box-border py-2">
+								<view class="graphic-img relative flex items-center justify-center w-10 h-10"
+									v-if="diyComponent.mode != 'text'"
+									:style="{ width: diyComponent.imageSize * 2 + 'rpx', height: diyComponent.imageSize * 2 + 'rpx' }">
+									<image v-if="item.imageUrl" :src="img(item.imageUrl)" mode="aspectFill"
+										:style="{ maxWidth: diyComponent.imageSize * 2 + 'rpx', maxHeight: diyComponent.imageSize * 2 + 'rpx', borderRadius: diyComponent.aroundRadius * 2 + 'rpx' }"/>
+									<image v-else :src="img('static/resource/images/diy/figure.png')" mode="aspectFill"
+										   :style="{ maxWidth: diyComponent.imageSize * 2 + 'rpx', maxHeight: diyComponent.imageSize * 2 + 'rpx', borderRadius: diyComponent.aroundRadius * 2 + 'rpx' }"/>
+									<text
+										:class="['tag absolute -top-[10rpx] -right-[24rpx] text-white rounded-[24rpx] rounded-bl-none transform scale-80 py-1 px-2 text-xs']"
+										v-if="item.label.control"
+										:style="{ color: item.label.textColor, backgroundImage: 'linear-gradient(' + item.label.bgColorStart + ',' + item.label.bgColorEnd + ')' }">
+										{{ item.label.text }}
+									</text>
+								</view>
+								<text v-if="diyComponent.mode != 'img'"
+									class="graphic-text w-full text-center truncate leading-normal"
+									:class="{ 'pt-[16rpx]' : diyComponent.mode != 'text' }"
+									:style="{ fontSize: diyComponent.font.size * 2 + 'rpx', fontWeight: diyComponent.font.weight, color: diyComponent.font.color }">
+									{{ item.title }}
+								</text>
+							</view>
+						</template>
+					</scroll-view>
+				<!-- #ifdef MP -->
+				</view>
+				<!-- #endif -->
+
+			</view>
+
+			<scroll-view v-else :scroll-x="diyComponent.showStyle == 'singleSlide'" :class="['graphic-nav','graphic-nav-' + diyComponent.showStyle]" class=" py-[10rpx]">
+				<!-- #ifdef MP -->
+				<view class="uni-scroll-view-content">
+				<!-- #endif -->
+
+					<view class="graphic-nav-item" :class="{'flex-shrink-0' : diyComponent.showStyle == 'singleSlide'}"
+						v-for="(item, index) in diyComponent.list" :key="item.id"
+						:style="{ width: 100 / diyComponent.rowCount + '%' }">
+
+						<view @click="diyStore.toRedirect(item.link)" class="flex flex-col items-center box-border py-2">
+							<view class="graphic-img relative flex items-center justify-center w-10 h-10"
+								v-if="diyComponent.mode != 'text'"
+								:style="{ width: diyComponent.imageSize * 2 + 'rpx', height: diyComponent.imageSize * 2 + 'rpx' }">
+								<image v-if="item.imageUrl" :src="img(item.imageUrl)" mode="aspectFill"
+									:style="{ maxWidth: diyComponent.imageSize * 2 + 'rpx', maxHeight: diyComponent.imageSize * 2 + 'rpx', borderRadius: diyComponent.aroundRadius * 2 + 'rpx' }"/>
+								<image v-else :src="img('static/resource/images/diy/figure.png')" mode="aspectFill"
+								       :style="{ maxWidth: diyComponent.imageSize * 2 + 'rpx', maxHeight: diyComponent.imageSize * 2 + 'rpx', borderRadius: diyComponent.aroundRadius * 2 + 'rpx' }"/>
+								<text
+									:class="['tag absolute -top-[10rpx] -right-[24rpx] text-white rounded-[24rpx] rounded-bl-none transform scale-80 py-1 px-2 text-xs']"
+									v-if="item.label.control"
+									:style="{ color: item.label.textColor, backgroundImage: 'linear-gradient(' + item.label.bgColorStart + ',' + item.label.bgColorEnd + ')' }">
+									{{ item.label.text }}
+								</text>
+							</view>
+							<text v-if="diyComponent.mode != 'img'"
+								class="graphic-text w-full text-center truncate leading-normal"
+								:class="{ 'pt-[16rpx]' : diyComponent.mode != 'text' }"
+								:style="{ fontSize: diyComponent.font.size * 2 + 'rpx', fontWeight: diyComponent.font.weight, color: diyComponent.font.color }">
+								{{ item.title }}
+							</text>
+						</view>
+					</view>
+
+				<!-- #ifdef MP -->
+				</view>
+				<!-- #endif -->
+
+			</scroll-view>
+
+		</view>
+	</view>
+</template>
+
+<script lang="ts" setup>
+	// 图文导航
+    import { ref,computed, watch, onMounted, nextTick,getCurrentInstance } from 'vue';
+    import { img } from '@/utils/common';
+	import useDiyStore from '@/app/stores/diy';
+
+	const props = defineProps(['component', 'index']);
+
+	const diyStore = useDiyStore();
+
+	const diyComponent = computed(() => {
+		if (diyStore.mode == 'decorate') {
+			return diyStore.value[props.index];
+		} else {
+			return props.component;
+		}
+	})
+	const shouldShowIndicator = computed(() => {
+	  const totalItems = diyComponent.value.list.length // 总项数
+	  const itemsPerPage = diyComponent.value.pageCount * diyComponent.value.rowCount // 每页可显示的项数
+	  return totalItems > itemsPerPage // 如果总项数大于每页显示的项数，显示指示器
+	})
+	const warpCss = computed(() => {
+		var style = '';
+        style += 'position:relative;';
+        if(diyComponent.value.componentStartBgColor) {
+            if (diyComponent.value.componentStartBgColor && diyComponent.value.componentEndBgColor) style += `background:linear-gradient(${diyComponent.value.componentGradientAngle},${diyComponent.value.componentStartBgColor},${diyComponent.value.componentEndBgColor});`;
+            else style += 'background-color:' + diyComponent.value.componentStartBgColor + ';';
+        }
+
+        if(diyComponent.value.componentBgUrl) {
+            style += `background-image:url('${ img(diyComponent.value.componentBgUrl) }');`;
+            style += 'background-size: cover;background-repeat: no-repeat;';
+        }
+
+		if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		return style;
+	})
+
+    // 背景图加遮罩层
+    const maskLayer = computed(()=>{
+        var style = '';
+        if(diyComponent.value.componentBgUrl) {
+            style += 'position:absolute;top:0;width:100%;';
+            style += `background: rgba(0,0,0,${diyComponent.value.componentBgAlpha / 10});`;
+            style += `height:${height.value}px;`;
+
+            if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+            if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+            if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+            if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+        }
+
+        return style;
+    });
+
+	const horizontalSingleSlideItemStyle = (index: any)=>{
+		let style = {width: ""};
+		style.width = `${100 / diyComponent.value.rowCount}%`;
+		return style;
+	}
+
+	const swiperIndex = ref(0);
+
+	const swiperChange = e => {
+		swiperIndex.value = e.detail.current;
+	};
+
+	const swiperCondition = (index, numItem) => {
+		let count = diyComponent.value.pageCount * diyComponent.value.rowCount;
+		let result = true;
+
+		result = index >= [(numItem - 1) * (count)] && index < [numItem * (count)];
+
+		return result;
+	}
+
+	const storageKey = 'graphic_nav_horizontal_page_slide_swiperheight_' + props.index + '_' + diyComponent.value.list.length;
+	const swiperHeight = ref(uni.getStorageSync(storageKey) || '');
+
+	const handleData = () => {
+		if (diyComponent.value.layout == 'horizontal' && diyComponent.value.showStyle == 'pageSlide') {
+			var height = 0;
+			const query = uni.createSelectorQuery().in(instance);
+			query.select('.graphic-nav-item').boundingClientRect((data: any) => {
+				let len = 1;
+				if (diyComponent.value.pageCount == 2) {
+					len = (diyComponent.value.list.length / diyComponent.value.rowCount) > 1 ? 2 : 1;
+				}
+				height = data.height * len;
+				swiperHeight.value = height + 'px';
+				uni.setStorageSync(storageKey, swiperHeight.value);
+			}).exec();
+		}
+	};
+
+	onMounted(() => {
+		refresh();
+		// 装修模式下刷新
+		if (diyStore.mode == 'decorate') {
+			watch(
+				() => diyComponent.value,
+				(newValue, oldValue) => {
+					if (newValue && newValue.componentName == 'GraphicNav') {
+						refresh();
+					}
+				}
+			)
+		}
+	});
+
+    const instance = getCurrentInstance();
+    const height = ref(0)
+
+	const refresh = () => {
+        nextTick(() => {
+            handleData()
+            const query = uni.createSelectorQuery().in(instance);
+            query.select('.diy-graphic-nav').boundingClientRect((data: any) => {
+                height.value = data.height;
+            }).exec();
+        })
+	}
+	// 获取滑动行数
+	const getSlideRowNum = ()=>{
+		let num = 1;
+		if(diyComponent.value.pageCount == 2){
+			num = diyComponent.value.list.length > diyComponent.value.rowCount ? 2 : 1;
+		}
+		return num;
+	}
+	const isShowslideTemp = (index, numItem) => {
+		let result = true;
+		let indent = index+1;
+		if(diyComponent.value.pageCount == 2){
+			let num = Math.ceil(diyComponent.value.list.length / diyComponent.value.rowCount)
+			for(let i = 1; i <= num; i++){
+				if(numItem == 1 && (i % 2) != 0){
+					if(indent > ((i-1)*diyComponent.value.rowCount) && indent <= (i*diyComponent.value.rowCount)){
+						return true;
+					}
+				}
+				if(numItem == 2 && (i % 2) == 0){
+					if(indent > ((i-1)*diyComponent.value.rowCount) && indent <= (i*diyComponent.value.rowCount)){
+						return true;
+					}
+				}
+			}
+		}
+
+		return false;
+	}
+</script>
+
+<style>
+	/* 固定显示 */
+	.graphic-nav-fixed>>>.uni-scroll-view-content {
+		display: flex;
+		flex-wrap: wrap;
+	}
+	/* 单行滑动 */
+	.graphic-nav-singleSlide>>>.uni-scroll-view-content {
+		display: flex;
+	}
+	/* 多行滑动 */
+	.multiple-lines.graphic-nav-singleSlide>>>.uni-scroll-view-content {
+		display: block;
+	}
+</style>
+<style lang="scss" scoped>
+    .graphic-nav-indicator-dot{
+	    width: 95%;
+	    margin: auto;
+
+	    .dots-wrap{
+		    white-space: nowrap;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+		    &.left{
+			    justify-content: flex-start;
+			    padding-left: 30rpx;
+		    }
+		    &.right {
+				justify-content: flex-end;
+			    padding-right: 30rpx;
+		    }
+		    .dot{
+			    display: inline-block;
+				width: 12rpx;
+				height: 12rpx;
+			    cursor: pointer;
+			    transition-property: background-color;
+			    transition-timing-function: ease;
+			    background: rgba(0, 0, 0, 0.3);
+			    border-radius: 50%;
+			    margin-right: 16rpx;
+			    &:last-child {
+				    margin-right: 0;
+			    }
+
+
+			    // 指示器样式二
+			    &.style-2  {
+				    width: 18rpx;
+				    height: 6rpx;
+				    border-radius: 4rpx;
+			    }
+
+			    &dot-active.style-2 {
+				    width: 36rpx;
+			    }
+
+			    // 指示器样式三
+			    &.style-3{
+				    width: 10rpx;
+				    height: 10rpx !important;
+				    border-radius: 12rpx;
+				    margin-right: 14rpx;
+				    &:last-of-type{
+					    margin-right: 0;
+				    }
+			    }
+			    &.dot-active.style-3{
+				    width: 32rpx;
+			    }
+		    }
+	    }
+    }
+</style>
diff --git a/uni-app/src/app/components/diy/horz-blank/index.vue b/uni-app/src/app/components/diy/horz-blank/index.vue
new file mode 100644
index 00000000..17d4f98b
--- /dev/null
+++ b/uni-app/src/app/components/diy/horz-blank/index.vue
@@ -0,0 +1,38 @@
+<template>
+	<view :style="warpCss"></view>
+</template>
+
+<script setup lang="ts">
+	// 辅助空白
+	import { computed, watch } from 'vue';
+	import useDiyStore from '@/app/stores/diy';
+
+	const props = defineProps(['component', 'index']);
+
+	const diyStore = useDiyStore();
+
+	const diyComponent = computed(() => {
+		if (diyStore.mode == 'decorate') {
+			return diyStore.value[props.index];
+		} else {
+			return props.component;
+		}
+	})
+
+	const warpCss = computed(() => {
+		var style = '';
+		style += 'height:' + diyComponent.value.height * 2 + 'rpx;';
+        if(diyComponent.value.componentStartBgColor) {
+            if (diyComponent.value.componentStartBgColor && diyComponent.value.componentEndBgColor) style += `background:linear-gradient(${diyComponent.value.componentGradientAngle},${diyComponent.value.componentStartBgColor},${diyComponent.value.componentEndBgColor});`;
+            else style += 'background-color:' + diyComponent.value.componentStartBgColor + ';';
+        }
+        if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+        if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+        if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+        if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		return style;
+	})
+
+</script>
+
+<style></style>
diff --git a/uni-app/src/app/components/diy/horz-line/index.vue b/uni-app/src/app/components/diy/horz-line/index.vue
new file mode 100644
index 00000000..f9ecd1b5
--- /dev/null
+++ b/uni-app/src/app/components/diy/horz-line/index.vue
@@ -0,0 +1,34 @@
+<template>
+	<view class="horz-line-wrap">
+		<view v-if="diyStore.mode == 'decorate'" class="h-[30rpx]"></view>
+		<view :style="warpCss"></view>
+		<view v-if="diyStore.mode == 'decorate'" class="h-[30rpx]"></view>
+	</view>
+</template>
+
+<script setup lang="ts">
+	// 辅助线
+	import { computed, watch } from 'vue';
+	import useDiyStore from '@/app/stores/diy';
+
+	const props = defineProps(['component', 'index']);
+
+	const diyStore = useDiyStore();
+
+	const diyComponent = computed(() => {
+		if (diyStore.mode == 'decorate') {
+			return diyStore.value[props.index];
+		} else {
+			return props.component;
+		}
+	})
+
+	const warpCss = computed(() => {
+        var style = '';
+        style += 'border-top:' + (diyComponent.value.borderWidth * 2) + 'rpx ' + diyComponent.value.borderStyle + ' ' + diyComponent.value.borderColor + ';';
+        return style;
+    })
+
+</script>
+
+<style></style>
diff --git a/uni-app/src/app/components/diy/hot-area/index.vue b/uni-app/src/app/components/diy/hot-area/index.vue
new file mode 100644
index 00000000..547c50fe
--- /dev/null
+++ b/uni-app/src/app/components/diy/hot-area/index.vue
@@ -0,0 +1,85 @@
+<template>
+	<view :style="warpCss">
+		<view class="simple-graph-wrap overflow-hidden relative leading-0">
+			<image v-if="diyComponent.imageUrl" :style="itemCss" :src="img(diyComponent.imageUrl)" mode="widthFix" :show-menu-by-longpress="true" class="w-full"/>
+			<image v-else :style="itemCss" :src="img('static/resource/images/diy/figure.png')" mode="widthFix" :show-menu-by-longpress="true" class="w-full"/>
+
+			<template v-if="diyStore.mode != 'decorate'">
+				<!-- 热区功能 -->
+				<view @click="diyStore.toRedirect(mapItem.link)" class="absolute" v-for="(mapItem, mapIndex) in diyComponent.heatMapData"
+					:key="mapIndex" :style="{
+					width: mapItem.width + '%',
+					height: mapItem.height + '%',
+					left: mapItem.left + '%',
+					top: mapItem.top + '%'
+				}"></view>
+
+			</template>
+		</view>
+	</view>
+</template>
+
+<script setup lang="ts">
+	// 热区
+	import { computed, watch, onMounted } from 'vue';
+	import useDiyStore from '@/app/stores/diy';
+    import { img } from '@/utils/common';
+
+	const props = defineProps(['component', 'index']);
+
+	const diyStore = useDiyStore();
+
+	const diyComponent = computed(() => {
+		if (diyStore.mode == 'decorate') {
+			return diyStore.value[props.index];
+		} else {
+			return props.component;
+		}
+	})
+
+	const warpCss = computed(() => {
+		var style = '';
+        if(diyComponent.value.componentStartBgColor) {
+            if (diyComponent.value.componentStartBgColor && diyComponent.value.componentEndBgColor) style += `background:linear-gradient(${diyComponent.value.componentGradientAngle},${diyComponent.value.componentStartBgColor},${diyComponent.value.componentEndBgColor});`;
+            else style += 'background-color:' + diyComponent.value.componentStartBgColor + ';';
+        }
+		return style;
+	})
+
+    const itemCss = computed(() => {
+        var style = '';
+        style += 'height:' + diyComponent.value.imgHeight + ';';
+        if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+        if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+        if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+        if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+        return style;
+    })
+
+	onMounted(() => {
+		refresh();
+		// 装修模式下刷新
+		watch(
+			() => diyComponent.value,
+			(newValue, oldValue) => {
+				if (newValue && newValue.componentName == 'HotArea') {
+					refresh();
+				}
+			}
+		)
+	});
+
+	const refresh = () => {
+		if (diyStore.mode == 'decorate') {
+			// 装修模式下设置默认图
+			if (diyComponent.value.imageUrl == '') {
+				diyComponent.value.imgWidth = 690;
+				diyComponent.value.imgHeight = 330;
+			}
+		}
+	}
+
+</script>
+
+<style lang="scss">
+</style>
diff --git a/uni-app/src/app/components/diy/image-ads/index.vue b/uni-app/src/app/components/diy/image-ads/index.vue
new file mode 100644
index 00000000..9395c501
--- /dev/null
+++ b/uni-app/src/app/components/diy/image-ads/index.vue
@@ -0,0 +1,130 @@
+<template>
+	<view :style="warpCss">
+		<view class="diy-image-ads" :style="imageAdsTempStyle()">
+			<view v-if="diyComponent.list.length == 1" class="leading-0 overflow-hidden" :style="swiperWarpCss">
+				<view @click="diyStore.toRedirect(diyComponent.list[0].link)">
+					<image v-if="diyComponent.list[0].imageUrl" :src="img(diyComponent.list[0].imageUrl)" :style="{height: imgHeight}" mode="heightFix" class="!w-full" :show-menu-by-longpress="true"/>
+					<image v-else :src="img('static/resource/images/diy/figure.png')" :style="{height: imgHeight}" mode="heightFix" class="!w-full" :show-menu-by-longpress="true"/>
+				</view>
+			</view>
+
+			<swiper v-else class="swiper" :style="{ height: imgHeight }" autoplay="true" circular="true" @change="swiperChange">
+				<swiper-item class="swiper-item" v-for="(item) in diyComponent.list" :key="item.id" :style="swiperWarpCss">
+					<view @click="diyStore.toRedirect(item.link)">
+						<view class="item" :style="{height: imgHeight}">
+							<image v-if="item.imageUrl" :src="img(item.imageUrl)" mode="scaleToFill" class="w-full h-full" :show-menu-by-longpress="true"/>
+							<image v-else :src="img('static/resource/images/diy/figure.png')" mode="scaleToFill" class="w-full h-full" :show-menu-by-longpress="true"/>
+						</view>
+					</view>
+				</swiper-item>
+			</swiper>
+		</view>
+	</view>
+</template>
+
+<script lang="ts" setup>
+	// 图片广告
+    import { ref,computed, watch, onMounted, nextTick,getCurrentInstance } from 'vue';
+	import useDiyStore from '@/app/stores/diy';
+    import { img } from '@/utils/common';
+
+	const props = defineProps(['component', 'index']);
+	const systemInfo = uni.getSystemInfoSync();
+
+	const diyStore = useDiyStore();
+
+	const diyComponent = computed(() => {
+		if (diyStore.mode == 'decorate') {
+			return diyStore.value[props.index];
+		} else {
+			return props.component;
+		}
+	})
+
+	// 兼容通屏样式
+	const imageAdsTempStyle = ()=> {
+		let style = "";
+		if(diyComponent.value.isSameScreen && props.index == 0){
+			// #ifdef H5
+			// h5,上移的像素，采取的是平均值
+			if (systemInfo.platform === 'ios') {
+			    style = 'margin-top: -55px;';
+			}else{
+			    style = 'margin-top: -44.5px;';
+			}
+			// #endif
+
+			// #ifdef MP
+			// 图文导航开启沉浸式且导航栏开启时，导航栏不占位
+			uni.setStorageSync('imageAdsSameScreen', true);
+			// #endif
+		}
+	    return style;
+	}
+
+	const warpCss = computed(() => {
+		var style = '';
+        style += 'position:relative;';
+        if(diyComponent.value.componentStartBgColor) {
+            if (diyComponent.value.componentStartBgColor && diyComponent.value.componentEndBgColor) style += `background:linear-gradient(${diyComponent.value.componentGradientAngle},${diyComponent.value.componentStartBgColor},${diyComponent.value.componentEndBgColor});`;
+            else style += 'background-color:' + diyComponent.value.componentStartBgColor + ';';
+        }
+
+        if(diyComponent.value.componentBgUrl) {
+            style += `background-image:url('${ img(diyComponent.value.componentBgUrl) }');`;
+            style += 'background-size: cover;background-repeat: no-repeat;';
+        }
+		return style;
+	})
+
+	const swiperWarpCss = computed(() => {
+		var style = '';
+		if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		return style;
+	})
+
+	const imgHeight = computed(() => {
+		return (diyComponent.value.imageHeight * 2) + 'rpx';
+	})
+
+	const swiperIndex = ref(0);
+
+	const swiperChange = e => {
+		swiperIndex.value = e.detail.current;
+	};
+
+	onMounted(() => {
+		refresh();
+		// 装修模式下刷新
+		if (diyStore.mode == 'decorate') {
+			watch(
+				() => diyComponent.value,
+				(newValue, oldValue) => {
+					if (newValue && newValue.componentName == 'ImageAds') {
+						refresh();
+					}
+				}
+			)
+		}
+	});
+
+	const refresh = () => {
+		// 装修模式下设置默认图
+		if (diyStore.mode == 'decorate') {
+			diyComponent.value.list.forEach((item : any) => {
+				if (item.imageUrl == '') {
+					item.imgWidth = 690;
+					item.imgHeight = 330;
+				}
+			});
+		}else{
+			uni.removeStorageSync('imageAdsSameScreen');
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/uni-app/src/app/components/diy/member-info/index.vue b/uni-app/src/app/components/diy/member-info/index.vue
new file mode 100644
index 00000000..64e84830
--- /dev/null
+++ b/uni-app/src/app/components/diy/member-info/index.vue
@@ -0,0 +1,224 @@
+<template>
+	<view :style="warpCss">
+		<view class="pt-[34rpx] member-info">
+			<!-- #ifdef MP-WEIXIN -->
+			<!-- 解决fixed定位后导航栏塌陷的问题 -->
+			<view :style="navbarInnerStyle"></view>
+			<!-- #endif -->
+			<view v-if="info" class="flex ml-[32rpx] mr-[52rpx]  items-center relative">
+				<!-- 唤起获取微信 -->
+				<u-avatar :src="img(info.headimg)" size="55" leftIcon="none" :default-url="img('static/resource/images/default_headimg.png')" @click="clickAvatar" />
+				<view class="ml-[22rpx]">
+					<view class="text-[#222222] flex pr-[50rpx] flex-wrap items-center">
+						<view class="text-[#222222] truncate max-w-[320rpx] font-bold text-lg mr-[16rpx]" :style="{ color : diyComponent.textColor }">{{ info.nickname }}</view>
+					</view>
+					<view class="text-[#696B70] text-[24rpx] mt-[10rpx]" :style="{ color : diyComponent.textColor }">UID：{{ info.member_no }}</view>
+				</view>
+				<view class="set-icon flex items-center absolute right-0 top-2">
+					<view @click="redirect({ url: '/app/pages/setting/index' })">
+						<text class="nc-iconfont nc-icon-shezhiV6xx-1 text-[40rpx] ml-[10rpx]" :style="{ color : diyComponent.textColor }"></text>
+					</view>
+				</view>
+			</view>
+			<view v-else class="flex ml-[32rpx] mr-[52rpx]  items-center relative">
+				<u-avatar :src="img('static/resource/images/default_headimg.png')" size="55" @click="toLogin" />
+				<view class="ml-[22rpx]" @click="toLogin">
+					<view class="text-[#222222] font-bold text-lg" :style="{ color : diyComponent.textColor }">
+						{{ t('login') }}/{{ t('register') }}
+					</view>
+				</view>
+				<view class="set-icon flex items-center absolute right-0 top-2" @click="redirect({ url: '/app/pages/setting/index' })">
+					<view>
+						<text class="nc-iconfont nc-icon-shezhiV6xx-1 text-[40rpx] ml-[10rpx]" :style="{ color : diyComponent.textColor }"></text>
+					</view>
+				</view>
+			</view>
+
+			<view class="flex m-[30rpx] mb-0 py-[30rpx] items-center">
+				<view class="flex-1 text-center">
+					<view class="font-bold">
+						<view @click="redirect({ url: info ? '/app/pages/member/balance' : '' })" :style="{ color : diyComponent.textColor }">{{ money }}</view>
+					</view>
+					<view class="text-sm mt-[10rpx]">
+						<view @click="redirect({ url: info ? '/app/pages/member/balance' : '' })" :style="{ color : diyComponent.textColor }">{{ t('balance') }}</view>
+					</view>
+				</view>
+				<view class="border-solid border-white border-l border-b-0 border-t-0 border-r-0 h-[60rpx]"></view>
+				<view class="flex-1 text-center">
+					<view class="font-bold">
+						<view @click="redirect({ url: info ? '/app/pages/member/point' : '' })" :style="{ color : diyComponent.textColor }">{{ parseInt(info?.point) || 0 }}</view>
+					</view>
+					<view class="text-sm mt-[10rpx]">
+						<view @click="redirect({ url: info ? '/app/pages/member/point' : '' })" :style="{ color : diyComponent.textColor }">{{ t('point') }}</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- #ifdef MP-WEIXIN -->
+		<information-filling ref="infoFill"></information-filling>
+		<!-- #endif -->
+
+	</view>
+</template>
+
+<script lang="ts" setup>
+	import { computed, ref, watch } from 'vue'
+	import useMemberStore from '@/stores/member'
+	import { useLogin } from '@/hooks/useLogin'
+    import {img, isWeixinBrowser, redirect, urlDeconstruction, moneyFormat, getToken} from '@/utils/common'
+	import { t } from '@/locale'
+	import { wechatSync } from '@/app/api/system'
+	import useDiyStore from '@/app/stores/diy'
+	import useConfigStore from '@/stores/config'
+
+	const props = defineProps(['component', 'index','global']);
+
+	const configStore = useConfigStore()
+	const diyStore = useDiyStore();
+
+	const diyComponent = computed(() => {
+		if (diyStore.mode == 'decorate') {
+			return diyStore.value[props.index];
+		} else {
+			return props.component;
+		}
+	})
+	const warpCss = computed(() => {
+		var style = '';
+        if(diyComponent.value.componentStartBgColor) {
+            if (diyComponent.value.componentStartBgColor && diyComponent.value.componentEndBgColor) style += `background:linear-gradient(${diyComponent.value.componentGradientAngle},${diyComponent.value.componentStartBgColor},${diyComponent.value.componentEndBgColor});`;
+            else style += 'background-color:' + diyComponent.value.componentStartBgColor + ';';
+        }
+		if (diyComponent.value.bgUrl) {
+			style += 'background-image:url(' + img(diyComponent.value.bgUrl) + ');';
+			style += 'background-size: 100%;';
+			style += 'background-repeat: no-repeat;';
+		}
+		if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+
+		return style;
+	})
+
+	const memberStore = useMemberStore()
+
+	// #ifdef H5
+	const { query } = urlDeconstruction(location.href)
+	if (query.code && isWeixinBrowser() && getToken()) {
+		wechatSync({ code: query.code }).then(res => {
+			memberStore.getMemberInfo()
+		})
+	}
+	// #endif
+
+	const info = computed(() => {
+		// 装修模式
+		if (diyStore.mode == 'decorate') {
+			return {
+				headimg: '',
+				nickname: '昵称',
+				balance: 0,
+				point: 0,
+				money: 0,
+				member_no: 'NIU0000021'
+			}
+		} else {
+			return memberStore.info;
+		}
+	})
+
+	const money = computed(() => {
+		if (info.value) {
+			let m = parseFloat(info.value.balance) + parseFloat(info.value.money)
+			return moneyFormat(m.toString());
+		} else {
+			return 0;
+		}
+	})
+
+	const toLogin = () => {
+		let normalLogin = !configStore.login.is_username && !configStore.login.is_mobile && !configStore.login.is_bind_mobile; // 未开启普通登录
+		let authRegisterLogin = !configStore.login.is_auth_register; // 自动注册登录
+
+		// #ifdef H5
+		if (isWeixinBrowser()) {
+			// 微信浏览器
+			if (normalLogin && authRegisterLogin) {
+				uni.showToast({ title: '商家未开启登录注册', icon: 'none' })
+			} else if (configStore.login.is_username || configStore.login.is_mobile || configStore.login.is_bind_mobile) {
+				useLogin().setLoginBack({ url: '/app/pages/member/index' })
+			} else if (normalLogin && configStore.login.is_auth_register && configStore.login.is_force_access_user_info) {
+				// 判断是否开启第三方自动注册登录，并且开启强制获取用户信息
+				useLogin().getAuthCode({ scopes: 'snsapi_userinfo' })
+			} else if (normalLogin && configStore.login.is_auth_register && !configStore.login.is_force_access_user_info) {
+				// 判断是否开启第三方自动注册登录，并且关闭强制获取用户信息
+				useLogin().getAuthCode({ scopes: 'snsapi_base' })
+			}
+		} else {
+			// 普通浏览器
+			if (normalLogin) {
+				uni.showToast({ title: '商家未开启登录注册', icon: 'none' })
+			} else if (configStore.login.is_username || configStore.login.is_mobile || configStore.login.is_bind_mobile) {
+				useLogin().setLoginBack({ url: '/app/pages/member/index' })
+			}
+		}
+		// #endif
+
+		// #ifdef MP
+		if (normalLogin && authRegisterLogin) {
+			uni.showToast({ title: '商家未开启登录注册', icon: 'none' })
+		} else if (configStore.login.is_username || configStore.login.is_mobile || configStore.login.is_bind_mobile) {
+			useLogin().setLoginBack({ url: '/app/pages/member/index' })
+		} else if (normalLogin && configStore.login.is_auth_register && !configStore.login.is_force_access_user_info) {
+			// 判断是否开启第三方自动注册登录
+			useLogin().getAuthCode()
+		} else if (configStore.login.is_auth_register && configStore.login.is_force_access_user_info) {
+			// 开启了第三方自动注册登录，但是需要强制获取昵称
+			useLogin().setLoginBack({ url: '/app/pages/member/index' })
+		} else if (configStore.login.is_auth_register && configStore.login.is_bind_mobile) {
+			// 开启了第三方自动注册登录，但是需要强制获取手机号
+			useLogin().setLoginBack({ url: '/app/pages/member/index' })
+		}
+		// #endif
+
+	}
+
+	const infoFill: any = ref(false)
+	const clickAvatar = () => {
+		// #ifdef MP-WEIXIN
+		infoFill.value.show = true
+		// #endif
+
+		// #ifdef H5
+		if (isWeixinBrowser()) {
+			useLogin().getAuthCode({ scopes : 'snsapi_userinfo' })
+		} else {
+			redirect({ url: '/app/pages/member/personal' })
+		}
+		// #endif
+	}
+	let menuButtonInfo: any = {};
+	// 如果是小程序，获取右上角胶囊的尺寸信息，避免导航栏右侧内容与胶囊重叠(支付宝小程序非本API，尚未兼容)
+	// #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+	menuButtonInfo = uni.getMenuButtonBoundingClientRect();
+	// #endif
+
+	// 导航栏内部盒子的样式
+	const navbarInnerStyle = computed(() => {
+		let style = '';
+		// 导航栏宽度，如果在小程序下，导航栏宽度为胶囊的左边到屏幕左边的距离
+		// #ifdef MP
+        if (props.global.topStatusBar.isShow == false) {
+            style += 'height:' + menuButtonInfo.height + 'px;';
+            style += 'padding-top:' + menuButtonInfo.top + 'px;';
+        }
+		// #endif
+		return style;
+	})
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/uni-app/src/app/components/diy/member-level/index.vue b/uni-app/src/app/components/diy/member-level/index.vue
new file mode 100644
index 00000000..fcd860c6
--- /dev/null
+++ b/uni-app/src/app/components/diy/member-level/index.vue
@@ -0,0 +1,275 @@
+<template>
+	<view :style="warpCss" class="overflow-hidden" v-if="info&&list && list.length">
+		<view v-if="diyComponent.style == 'style-1'" class="flex items-center justify-between style-bg-1 py-[22rpx] px-[30rpx]">
+			<view class="flex items-center">
+				<image :src="img('static/resource/images/diy/member/VIP_02.png')" mode="aspectFit" class="w-[50rpx] h-[36rpx]" />
+				<text class="text-[30rpx] text-[#FFDAA8] ml-[10rpx] font-500 max-w-[440rpx] truncate">{{info.member_level_name}}</text>
+			</view>
+			<view class="flex items-center justify-center rounded-[30rpx] box-border style-btn w-[140rpx] h-[56rpx]" @click="toLink('/app/pages/member/level')">
+				<text class="text-[24rpx] text-[#333]">{{ info.member_level ? (upgradeGrowth > 0 ? '做任务' : '点击查看') : '去解锁' }}</text>
+				<text class="iconfont iconxiayibu1 ml-[4rpx] -mb-[2rpx] !text-[14rpx] text-[#333]"></text>
+			</view>
+		</view>
+		<view v-if="diyComponent.style == 'style-2'" class="flex items-center justify-between style-bg-2 p-[30rpx]">
+			<view class="flex flex-col">
+				<view class="flex items-center">
+					<image :src="img('static/resource/images/diy/member/VIP_01.png')" mode="aspectFit" class="w-[74rpx] h-[30rpx]" />
+					<text class="text-[32rpx] text-[#FFE3B1] leading-[normal] ml-[14rpx] font-500 max-w-[420rpx] truncate">{{info.member_level_name}}</text>
+				</view>
+				<text class="text-[#FFE3B1] opacity-80 text-[24rpx] mt-[10rpx] leading-[32rpx]" v-if="benefits_arr && benefits_arr.length">{{info.member_level_name}}购物享{{benefits_arr[0].title}}</text>
+			</view>
+			<view class="flex items-center justify-center rounded-[30rpx] box-border style-btn w-[140rpx] h-[56rpx]" @click="toLink('/app/pages/member/level')">
+				<text class="text-[24rpx] text-[#333]">{{ info.member_level ? (upgradeGrowth > 0 ? '做任务' : '点击查看') : '去解锁' }}</text>
+				<text class="iconfont iconxiayibu1 ml-[4rpx] -mb-[2rpx] !text-[14rpx] text-[#333]"></text>
+			</view>
+		</view>
+		<view v-if="diyComponent.style == 'style-3'" class="style-bg-3 py-[var(--pad-top-m)] px-[var(--pad-sidebar-m)]">
+			<view class="flex items-center justify-between style-border-3 mb-[30rpx] pb-[40rpx]">
+				<view class="flex flex-col flex-1">
+					<view class="flex items-center justify-between">
+						<view class="flex items-center">
+							<view class="flex font-500 leading-[30rpx] box-border text-[#fff] pl-[50rpx] text-[24rpx] w-[120rpx] h-[30rpx] bg-contain bg-no-repeat" :style="{'backgroundImage': 'url('+img('static/resource/images/diy/member/VIP.png')+')'}">
+								VIP.{{currIndex}}
+							</view>
+							<text class="text-[#733F02] ml-[8rpx] text-[30rpx] font-500 max-w-[380rpx] truncate">{{info.member_level_name}}</text>
+						</view>
+						<view class="flex items-center" @click="toLink('/app/pages/member/level')">
+							<view class="inline-block">
+								<text class="nc-iconfont nc-icon-a-bangzhuV6xx-36 !text-[22rpx] text-[#733F02]"></text>
+								<text class="text-[22rpx] text-[#733F02] ml-[6rpx] leading-[24rpx]">规则</text>
+							</view>
+							<view class="ml-[2rpx] -mb-[4rpx] text-[#733F02] !text-[24rpx] nc-iconfont nc-icon-youV6xx"></view>
+						</view>
+					</view>
+					<text class="text-[24rpx] text-[#794200] mt-[10rpx]">购物或邀请好友可以提升等级</text>
+				</view>
+
+			</view>
+			<view class="flex items-center justify-between">
+				<view class="flex flex-col flex-1 mt-[2rpx]">
+					<view class="overflow-hidden rounded-[20rpx]">
+						<progress :percent="progress()" activeColor="#fff" backgroundColor="rgba(255,5,5,0.1)" stroke-width="4" />
+					</view>
+					<text class="text-[22rpx] ml-[2rpx] leading-[1.4] text-[#794200] mt-[16rpx]" v-if="upgradeGrowth > 0">还差{{upgradeGrowth}}成长值即可升级为{{ list[afterCurrIndex].level_name }}</text>
+					<text class="text-[22rpx] ml-[2rpx] text-[#794200] mt-[16rpx]" v-else>恭喜您升级为最高等级</text>
+				</view>
+				<view class="flex items-center rounded-[30rpx] bg-[rgb(245,230,185)] px-[24rpx] text-[22rpx] text-[#733F02] h-[56rpx] ml-[40rpx] leading-normal" @click="toLink('/app/pages/member/level')">
+					{{info.member_level ? (upgradeGrowth > 0 ? '做任务' : '点击查看') : '去解锁'}}
+				</view>
+			</view>
+		</view>
+		<view v-if="diyComponent.style == 'style-4'" class="flex items-center justify-between style-4 px-[24rpx] py-[20rpx]" :style="{'backgroundImage': 'url('+img('static/resource/images/diy/member/style4_bg.jpg')+')'}">
+			<view class="flex flex-col">
+				<view class="flex items-center">
+					<image :src="img('static/resource/images/diy/member/style4_vip.png')" mode="aspectFit" class="w-[70rpx] h-[32rpx] pt-[1rpx]" />
+					<text class="text-[30rpx] text-[#FFEFB0] leading-[normal] ml-[8rpx] font-500 max-w-[420rpx] truncate">{{info.member_level_name}}</text>
+				</view>
+				<view class="text-[#B0B0B0] text-[24rpx] mt-[10rpx] leading-[32rpx]" v-if="benefits_arr && benefits_arr.length">
+					<text>{{info.member_level_name}}购物享</text>
+					<text class="text-[#FFEFB0]">{{benefits_arr[0].title}}</text>
+				</view>
+			</view>
+			<view class="flex items-center justify-center rounded-[30rpx] box-border style-btn w-[150rpx] h-[50rpx]" @click="toLink('/app/pages/member/level')">
+				<text class="text-[22rpx] text-[#333] mr-[8rpx]">{{ info.member_level ? (upgradeGrowth > 0 ? '做任务' : '点击查看') : '去解锁' }}</text>
+				<image :src="img('static/resource/images/diy/member/style4_arrow.png')" mode="aspectFit" class="w-[26rpx] h-[26rpx] pt-[2rpx]" />
+			</view>
+		</view>
+		<view v-if="diyComponent.style == 'style-5'" class="style-5" :style="{'backgroundImage': 'url('+img('static/resource/images/diy/member/style5_bg.jpg')+')'}">
+			<view class="content-head pt-[16rpx] pb-[10rpx] px-[24rpx] flex items-center justify-between">
+				<view class="flex items-center">
+					<image :src="img('static/resource/images/diy/member/style5_vip.png')" mode="aspectFit" class="w-[40rpx] h-[40rpx]" />
+					<text class="text-[#FFFBE2] ml-[10rpx] text-[30rpx] font-500 max-w-[470rpx] truncate">{{info.member_level_name}}</text>
+				</view>
+				<view class="flex items-center rounded-[30rpx] pl-[16rpx] pr-[12rpx] h-[44rpx] leading-normal style-btn" @click="toLink('/app/pages/member/level')">
+					<text class="text-[22rpx] text-[#333] font-500 pb-[2rpx]">
+						{{info.member_level ? (upgradeGrowth > 0 ? '做任务' : '点击查看') : '去解锁'}}
+					</text>
+					<image :src="img('static/resource/images/diy/member/style5_arrow_01.png')" mode="aspectFit" class="w-[22rpx] h-[22rpx] pb-[1rpx]" />
+				</view>
+			</view>
+			<view class="flex flex-col pt-[28rpx] pb-[30rpx] px-[24rpx]">
+				<view class="flex items-center justify-between pb-[16rpx]">
+					<text class="text-[22rpx] ml-[2rpx] leading-[1.4] text-[#FFFBE2]" v-if="upgradeGrowth > 0">还差{{upgradeGrowth}}成长值即可升级为{{ list[afterCurrIndex].level_name }}</text>
+					<text class="text-[22rpx] ml-[2rpx] text-[#FFFBE2]" v-else>恭喜您升级为最高等级</text>
+					<view class="flex items-center" @click="toLink('/app/pages/member/level')">
+						<text class="nc-iconfont nc-icon-a-bangzhuV6xx-36 !text-[22rpx] text-[#FFFBE2]"></text>
+						<text class="text-[22rpx] text-[#FFFBE2] ml-[6rpx] leading-[24rpx]">规则</text>
+						<view class="ml-[2rpx] -mb-[4rpx] text-[#FFFBE2] !text-[24rpx] nc-iconfont nc-icon-youV6xx"></view>
+					</view>
+				</view>
+				<view class="overflow-hidden rounded-[20rpx]">
+					<progress :percent="progress()" activeColor="#fff" backgroundColor="rgba(255,255,255,0.4)" stroke-width="4" />
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script lang="ts" setup>
+	import { computed, ref, watch } from 'vue'
+	import { img, redirect } from '@/utils/common'
+	import useMemberStore from '@/stores/member'
+	import { t } from '@/locale'
+	import useDiyStore from '@/app/stores/diy'
+
+	const props = defineProps(['component', 'index']);
+	const diyStore = useDiyStore();
+	const memberStore = useMemberStore()
+
+	const diyComponent = computed(() => {
+		if (diyStore.mode == 'decorate') {
+			return diyStore.value[props.index];
+		} else {
+			return props.component;
+		}
+	})
+
+	const warpCss = computed(() => {
+		var style = '';
+		if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		return style;
+	})
+
+    // 获取会员等级列表
+    const upgradeGrowth = ref(0) // 升级下级会员所需的成长值
+    const currIndex = ref(0) //当前会员索引
+    const afterCurrIndex = ref(-1)  // 下一个会员等级索引
+    const benefits_arr:any = ref([]) //当前会员权益
+	const wap_member_info = ref(uni.getStorageSync('wap_member_info'));
+	const info:any = computed(() => {
+		// 装修模式
+		if (diyStore.mode == 'decorate') {
+			upgradeGrowth.value = 0;
+			benefits_arr.value = [{'title': '商品包邮'}];
+			currIndex.value = 1;
+			return {
+				member_level_name: '会员等级',
+				growth: 5
+			}
+		} else {
+			return memberStore.info || {}
+		}
+	})
+
+	const list:any = computed(() => {
+		// 装修模式
+		if (diyStore.mode == 'decorate') {
+			return [{}];
+		}else{
+			getMemberLevelFn(memberStore.levelList)
+			return memberStore.levelList
+		}
+
+	})
+
+	const getMemberLevelFn = (list:any)=> {
+		if (!list || !list.length) return false;
+		let isSet = false;
+		// 刚进来处理会员等级数据
+		if (info.value && info.value.member_level && list && list.length) {
+			list.forEach((item: any, index: any) => {
+				if (item.level_id == info.value.member_level) {
+					currIndex.value = index + 1;
+					// 会员权益
+					if (item.level_benefits) {
+						Object.values(item.level_benefits).forEach((bItem: any) => {
+							if (bItem.content) {
+								benefits_arr.value.push(bItem.content)
+							}
+						})
+					}
+				}
+
+				if (item.growth > info.value.growth && item.level_id != info.value.member_level && !isSet) {
+					afterCurrIndex.value = index;
+					isSet = true;
+				}
+			})
+		}
+
+		if (info.value.member_level) {
+			if (afterCurrIndex.value == -1) {
+				afterCurrIndex.value = list.length - 1;
+			}
+
+			if (list[afterCurrIndex.value] && list[afterCurrIndex.value].growth) {
+				upgradeGrowth.value = list[afterCurrIndex.value].growth - info.value.growth;
+			}
+		} else {
+			// 当前会员没有会员等级，则展示会员等级中的最后一个等级
+			info.value.member_level_name = list[0].level_name;
+			upgradeGrowth.value = list[0].growth - (info.value.growth || 0);
+			afterCurrIndex.value = 0;
+			currIndex.value = 1;
+		}
+	}
+
+	// 进度条值
+	let progress = () => {
+		let num = 100
+		if(list.value[afterCurrIndex.value] && list.value[afterCurrIndex.value].growth) {
+			if(info.value.growth) {
+                num = info.value.growth / list.value[afterCurrIndex.value].growth * 100
+            }else{
+			    num = 0
+			}
+        }
+	    return num
+	}
+
+	// 跳转链接
+	const toLink = (link: string)=>{
+		if (diyStore.mode == 'decorate') return false;
+		redirect({ url: link })
+	}
+</script>
+
+<style lang="scss" scoped>
+	.style-bg-1{
+		background: linear-gradient(to right, #1F1313, #4D4646);
+	}
+	.style-btn{
+		background: linear-gradient(to right, #FFEACB, #FFD195);
+	}
+	.style-bg-2{
+		background: linear-gradient(to right, #484846, #222222);
+		border-bottom-left-radius: 320rpx 16rpx;
+		border-bottom-right-radius: 320rpx 16rpx;
+	}
+	.style-bg-3{
+		background: linear-gradient(to right, #F9D9AC, #E9B46D);
+	}
+	.style-border-3{
+		position: relative;
+		&:after{
+			content: "";
+			position: absolute;
+			background: linear-gradient(to right, #F0D2A9, #DBA051);
+			height: 2rpx;
+			bottom: 0;
+			left: 0;
+			right: 0;
+		}
+	}
+	.style-4{
+		background-size: cover;
+		background-repeat: no-repeat;
+		.style-btn{
+			background: linear-gradient(#FFF3C1, #FFEFB0);
+		}
+	}
+
+	.style-5{
+		background-size: cover;
+		background-repeat: no-repeat;
+		.content-head{
+			background: linear-gradient(to right, rgba(255,255,255,0), rgba(255,255,255,0.14));
+		}
+		.style-btn{
+			background: linear-gradient(#FFFFFF, #FFF8CC);
+		}
+	}
+</style>
diff --git a/uni-app/src/app/components/diy/notice/index.vue b/uni-app/src/app/components/diy/notice/index.vue
new file mode 100644
index 00000000..b8a05f4a
--- /dev/null
+++ b/uni-app/src/app/components/diy/notice/index.vue
@@ -0,0 +1,299 @@
+<template>
+    <view :style="warpCss">
+        <view :style="maskLayer"></view>
+        <view class="diy-notice relative overflow-hidden">
+            <view class="flex items-center pl-[28rpx] p-[22rpx]">
+                <view v-if="diyComponent.noticeType == 'img'" class="min-w-[60rpx] flex items-center">
+                    <template v-if="diyComponent.imgType == 'system'">
+                        <image v-if="diyComponent.systemUrl == 'style_1'" :src="img(`static/resource/images/diy/notice/${diyComponent.systemUrl}.png`)" class="h-[40rpx] w-[auto] mr-[20rpx] flex-shrink-0" mode="heightFix"/>
+                        <image v-else-if="diyComponent.systemUrl == 'style_2'" :src="img(`static/resource/images/diy/notice/${diyComponent.systemUrl}.png`)" class="w-[200rpx] mr-[20rpx] h-[30rpx] flex-shrink-0" mode="heightFix" />
+                    </template>
+                    <image v-else-if="diyComponent.imgType == 'diy'" :src="img(diyComponent.imageUrl || '')" class="w-[200rpx] h-[30rpx] mr-[20rpx] flex-shrink-0" mode="heightFix"/>
+                </view>
+                <view v-if="diyComponent.noticeType == 'text' && diyComponent.noticeTitle" class="max-w-[128rpx] px-[12rpx] text-[26rpx] h-[40rpx] leading-[40rpx] text-[var(--primary-color)] bg-[var(--primary-color-light)] truncate rounded-[8rpx] mr-[20rpx] flex-shrink-0">{{ diyComponent.noticeTitle }}</view>
+                <view class="flex-1 flex overflow-hidden horizontal-body" :id="'horizontal-body-'+diyComponent.id" :class="{'items-center':diyComponent.scrollWay == 'upDown'}">
+                    <!-- 横向滚动 -->
+                    <view class="horizontal-wrap" :style="marqueeStyle" v-if="diyComponent.scrollWay == 'horizontal'">
+						<view class="marquee marquee-one" id="marquee-one">
+							<view class="item flex-shrink-0 !leading-[40rpx] h-[40rpx]" :class="{'ml-[80rpx]':index}" v-for="(item, index) in diyComponent.list" :key="index" @click="toRedirect(item)" :style="{ color: diyComponent.textColor, fontSize: diyComponent.fontSize * 2 + 'rpx',  fontWeight: diyComponent.fontWeight }">{{ item.text }}</view>
+						</view>
+						<view class="marquee" v-if="marqueeBodyWidth < (marqueeOneWidth-30)">
+							<view class="item flex-shrink-0 !leading-[40rpx] h-[40rpx]" :class="{'ml-[80rpx]':index}" v-for="(item, index) in diyComponent.list" :key="index" @click="toRedirect(item)" :style="{ color: diyComponent.textColor, fontSize: diyComponent.fontSize * 2 + 'rpx',  fontWeight: diyComponent.fontWeight }">{{ item.text }}</view>
+						</view>
+                    </view>
+
+                    <!-- 上下滚动 -->
+                    <template v-if="diyComponent.scrollWay == 'upDown'">
+                        <swiper :vertical="true" :duration="500" autoplay="true" circular="true" class="flex-1">
+                            <swiper-item v-for="(item, index) in diyComponent.list" :key="index" @touchmove.prevent.stop>
+                                <text @click="toRedirect(item)" class="beyond-hiding truncate" :style="{ color: diyComponent.textColor, fontSize: diyComponent.fontSize * 2 + 'rpx', fontWeight: diyComponent.fontWeight }">
+                                    {{ item.text }}
+                                </text>
+                            </swiper-item>
+                        </swiper>
+                        <text class="nc-iconfont nc-icon-youV6xx text-[26rpx] -ml-[8rpx] pl-[30rpx]" :style="{'color': '#999', 'fontWeight': diyComponent.fontWeight}"></text>
+
+                    </template>
+                </view>
+
+            </view>
+			<view @touchmove.prevent.stop>
+				<u-popup :show="noticeShow" @close="noticeShow = false"  mode="center" round="var(--rounded-big)" :safeAreaInsetBottom="false">
+					<view class="w-[570rpx] px-[32rpx] popup-common center">
+						<view class="title">公告</view>
+						<scroll-view :scroll-y="true" class="px-[30rpx] box-border h-[260rpx]">
+						<block v-for="(item) in noticeContent.split('\n')">
+						    <view class="text-[28rpx] leading-[40rpx] mb-[20rpx]">{{ item }}</view>
+						</block>
+						</scroll-view>
+						<view class="btn-wrap !pt-[40rpx]">
+						    <button class="primary-btn-bg w-[480rpx] h-[70rpx] text-[26rpx] leading-[70rpx] rounded-[35rpx] !text-[#fff] font-500"  @click="noticeShow = false">我知道了</button>
+						</view>
+					</view>
+				</u-popup>
+			</view>
+        </view>
+    </view>
+</template>
+
+<script setup lang="ts">
+// 公告组件
+import { ref,computed, watch, onMounted, nextTick,getCurrentInstance } from 'vue';
+import { img } from '@/utils/common';
+import useDiyStore from '@/app/stores/diy';
+
+const props = defineProps(['component', 'index']);
+const diyStore = useDiyStore();
+const noticeShow = ref(false);
+const noticeContent = ref('');
+
+const diyComponent = computed(() => {
+    if (diyStore.mode == 'decorate') {
+        return diyStore.value[props.index];
+    } else {
+        return props.component;
+    }
+})
+
+const warpCss = computed(() => {
+    var style = '';
+    style += 'position:relative;';
+    if(diyComponent.value.componentStartBgColor) {
+        if (diyComponent.value.componentStartBgColor && diyComponent.value.componentEndBgColor) style += `background:linear-gradient(${diyComponent.value.componentGradientAngle},${diyComponent.value.componentStartBgColor},${diyComponent.value.componentEndBgColor});`;
+        else style += 'background-color:' + diyComponent.value.componentStartBgColor + ';';
+    }
+
+    if(diyComponent.value.componentBgUrl) {
+        style += `background-image:url('${ img(diyComponent.value.componentBgUrl) }');`;
+        style += 'background-size: cover;background-repeat: no-repeat;';
+    }
+
+    if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+    if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+    if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+    if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+    return style;
+})
+
+// 背景图加遮罩层
+const maskLayer = computed(()=>{
+    var style = '';
+    if(diyComponent.value.componentBgUrl) {
+        style += 'position:absolute;top:0;width:100%;';
+        style += `background: rgba(0,0,0,${diyComponent.value.componentBgAlpha / 10});`;
+        style += `height:${height.value}px;`;
+
+        if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+        if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+        if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+        if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+    }
+
+    return style;
+});
+
+const marqueeBodyWidth = ref(0); // 容器宽度
+const marqueeOneWidth = ref(0); // 内容宽度
+const marqueeStyle = ref(''); // 横向滚动样式
+const time = ref(0); // 滚动完成时间
+const delayTime = ref(800); // 动画延迟时间
+
+// 绑定横向滚动事件
+const bindCrossSlipEvent = ()=> {
+    if (diyComponent.value.scrollWay == 'horizontal') {
+        setTimeout(() => {
+            nextTick(() => {
+                // #ifdef  MP-WEIXIN
+                uni.createSelectorQuery().in(instance).select('#horizontal-body-' + diyComponent.value.id).boundingClientRect(res => {
+                    marqueeBodyWidth.value = res.width;
+                    const query = uni.createSelectorQuery().in(instance);
+                    query.select('#horizontal-body-' + diyComponent.value.id + ' .marquee-one').boundingClientRect((data: any) => {
+                        marqueeOneWidth.value = data.width
+                        time.value = Math.ceil(marqueeOneWidth.value * 14);
+                        if (marqueeBodyWidth.value > (marqueeOneWidth.value-30)) {
+                            marqueeStyle.value = `animation: none;`;
+                        } else {
+                            marqueeStyle.value = `
+                                animation-duration: ${ time.value }ms;
+                                animation-delay: ${ delayTime.value }ms;`;
+                        }
+                    }).exec();
+                }).exec();
+                // #endif
+                // #ifdef  H5
+                let documentObj = window.document.getElementById('horizontal-body-' + diyComponent.value.id);
+                let marqueeOne = window.document.getElementById('marquee-one');
+                if(documentObj && marqueeOne) {
+                    marqueeBodyWidth.value = documentObj.offsetWidth;
+                    marqueeOneWidth.value = marqueeOne.offsetWidth;
+                    time.value = Math.ceil(marqueeOneWidth.value * 14);
+                    if (marqueeBodyWidth.value > (marqueeOneWidth.value-30)) {
+                        marqueeStyle.value = `animation: none;`;
+                    } else {
+                        marqueeStyle.value = `
+                            animation-duration: ${ time.value }ms;
+                            animation-delay: ${ delayTime.value }ms;`;
+                    }
+                }
+                // #endif
+            });
+        });
+    }
+}
+
+onMounted(() => {
+    bindCrossSlipEvent();
+    refresh();
+    // 装修模式下刷新
+    if (diyStore.mode == 'decorate') {
+        watch(
+            () => diyComponent.value,
+            (newValue, oldValue) => {
+                if (newValue && newValue.componentName == 'Notice') {
+                    bindCrossSlipEvent();
+                    refresh();
+                }
+            }
+        )
+    }
+});
+
+const instance = getCurrentInstance();
+const height = ref(0)
+
+const refresh = ()=> {
+    nextTick(() => {
+        const query = uni.createSelectorQuery().in(instance);
+        query.select('.diy-notice').boundingClientRect((data: any) => {
+            height.value = data.height;
+        }).exec();
+    })
+}
+
+const toRedirect = (data: {}) => {
+    if (diyStore.mode == 'decorate') return false;
+    if (diyComponent.value.showType == 'popup') {
+        noticeShow.value = true;
+        noticeContent.value = data.text;
+    } else {
+        diyStore.toRedirect(data.link);
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+    .main-wrap {
+        display: inline-block;
+        width: calc(100% - 100rpx);
+        position: relative;
+    }
+
+    swiper {
+        height: 50rpx;
+    }
+
+    .beyond-hiding {
+        display: inline-block;
+        width: 100%;
+        white-space: nowrap;
+		line-height: 50rpx
+    }
+
+    .notice-popup {
+        padding: 0 30rpx 40rpx;
+        background-color: #fff;
+
+        .head-wrap {
+            font-size: 32rpx;
+            line-height: 100rpx;
+            height: 100rpx;
+            display: block;
+            text-align: center;
+            position: relative;
+            border-bottom: 2rpx solid #eeeeee;
+            margin-bottom: 20rpx;
+
+            .iconfont {
+                position: absolute;
+                float: right;
+                right: 0;
+                font-size: 32rpx;
+            }
+        }
+
+        .content-wrap {
+            max-height: 600rpx;
+            overflow-y: auto;
+        }
+
+        button {
+            margin-top: 40rpx;
+        }
+    }
+
+    .horizontal-wrap {
+        height: 40rpx;
+		display: flex;
+		align-items: center;
+		transform: translateZ(0);
+		animation: marquee 0s 0s linear infinite;
+		transform-style: preserve-3d;
+		backface-visibility: hidden;
+    }
+
+
+
+    .marquee {
+        display: flex;
+        align-items: center;
+        height: 100%;
+        white-space: nowrap;
+		padding-right: 30px;
+
+		// -webkit-perspective: 1000;
+	 //   -moz-perspective: 1000;
+	 //   -ms-perspective: 1000;
+	 //   perspective: 1000;
+    }
+
+    @keyframes marquee {
+        0% {
+            transform: translateX(0);
+        }
+		20%{
+		transform: translateX(-10%);
+		}
+		40%{
+		transform: translateX(-20%);
+		}
+		60%{
+		transform: translateX(-30%);
+		}
+		80%{
+		transform: translateX(-40%);
+		}
+        100% {
+            transform: translateX(-50%);
+        }
+    }
+</style>
diff --git a/uni-app/src/app/components/diy/picture-show/index.vue b/uni-app/src/app/components/diy/picture-show/index.vue
new file mode 100644
index 00000000..58c0ec1f
--- /dev/null
+++ b/uni-app/src/app/components/diy/picture-show/index.vue
@@ -0,0 +1,128 @@
+<template>
+	<view :style="warpCss" class="flex justify-between overflow-hidden">
+		<view class="p-[20rpx] box-border overflow-hidden" :style="moduleOneCss">
+			<view class="flex items-center pb-[30rpx] pt-[6rpx]" v-if="diyComponent.moduleOne.head.textImg || diyComponent.moduleOne.head.subText">
+				<image class="h-[28rpx]" v-if="diyComponent.moduleOne.head.textImg" :src="img(diyComponent.moduleOne.head.textImg)" mode="heightFix"></image>
+				<text class="w-[2rpx] mx-[10rpx] h-[22rpx]" v-if="diyComponent.moduleOne.head.textImg && diyComponent.moduleOne.head.subText" :style="{'backgroundColor': diyComponent.moduleOne.head.subTextColor}"></text>
+				<text class="text-[22rpx] truncate max-w-[164rpx]" v-if="diyComponent.moduleOne.head.subText" :style="{color: diyComponent.moduleOne.head.subTextColor}">{{diyComponent.moduleOne.head.subText}}</text>
+			</view>
+			<view class="flex items-center">
+				<view v-for="(item,index) in diyComponent.moduleOne.list" :key="index" class="flex flex-col items-center" :class="{'mr-[10rpx]': index == 0}" @click="diyStore.toRedirect(item.link)">
+					<view class="bg-[#fff] flex items-center justify-center w-[148rpx] h-[148rpx] rounded-[12rpx] mb-[16rpx]">
+						<image v-if="item.imageUrl" class="w-[102rpx] h-[102rpx]" :src="img(item.imageUrl)" mode="aspectFill"></image>
+						<u-icon v-else name="photo" color="#999" size="50"></u-icon>
+					</view>
+					<view class="w-[132rpx] h-[44rpx] rounded-[30rpx] flex items-center justify-center text-[22rpx]" :style="moduleBtnCss(item)">{{item.btnTitle.text}}</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="p-[20rpx] box-border overflow-hidden" :style="moduleTwoCss">
+			<view class="flex items-center pb-[30rpx] pt-[6rpx]" v-if="diyComponent.moduleTwo.head.textImg || diyComponent.moduleTwo.head.subText">
+				<image class="h-[28rpx] w-[auto]" v-if="diyComponent.moduleTwo.head.textImg" :src="img(diyComponent.moduleTwo.head.textImg)" mode="heightFix"></image>
+				<text class="w-[2rpx] mx-[10rpx] h-[22rpx]" v-if="diyComponent.moduleTwo.head.textImg && diyComponent.moduleTwo.head.subText" :style="{'backgroundColor': diyComponent.moduleTwo.head.subTextColor}"></text>
+				<text class="text-[22rpx] truncate max-w-[164rpx]" v-if="diyComponent.moduleTwo.head.subText" :style="{color: diyComponent.moduleTwo.head.subTextColor}">{{diyComponent.moduleTwo.head.subText}}</text>
+			</view>
+			<view class="flex items-center">
+				<view v-for="(item,index) in diyComponent.moduleTwo.list" :key="index" class="flex flex-col items-center" :class="{'mr-[10rpx]': index == 0}" @click="diyStore.toRedirect(item.link)">
+					<view class="bg-[#fff] flex items-center justify-center w-[148rpx] h-[148rpx] rounded-[12rpx] mb-[16rpx]">
+						<image v-if="item.imageUrl" class="w-[102rpx] h-[102rpx]" :src="img(item.imageUrl)" mode="aspectFill"></image>
+						<u-icon v-else name="photo" color="#999" size="50"></u-icon>
+					</view>
+					<view class="w-[132rpx] h-[44rpx] rounded-[30rpx] flex items-center justify-center text-[22rpx]" :style="moduleBtnCss(item)">{{item.btnTitle.text}}</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup lang="ts">
+	// 图片展播
+	import { ref, reactive, computed, watch, onMounted, nextTick, getCurrentInstance } from 'vue';
+	import { img } from '@/utils/common';
+	import useDiyStore from '@/app/stores/diy';
+
+	const props = defineProps(['component', 'index', 'global', 'scrollBool']);
+	const diyStore = useDiyStore();
+	const diyComponent = computed(() => {
+		if (diyStore.mode == 'decorate') {
+			return diyStore.value[props.index];
+		} else {
+			return props.component;
+		}
+	})
+
+	const warpCss = computed(() => {
+		var style = '';
+        if(diyComponent.value.componentStartBgColor) {
+            if (diyComponent.value.componentStartBgColor && diyComponent.value.componentEndBgColor) style += `background:linear-gradient(${diyComponent.value.componentGradientAngle},${diyComponent.value.componentStartBgColor},${diyComponent.value.componentEndBgColor});`;
+            else style += 'background-color:' + diyComponent.value.componentStartBgColor + ';';
+        }
+		if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		return style;
+	})
+
+	const moduleOneCss = computed(() => {
+		var style = '';
+	    if(diyComponent.value.moduleOne.listFrame) {
+	        if (diyComponent.value.moduleOne.listFrame.startColor && diyComponent.value.moduleOne.listFrame.endColor) style += `background:linear-gradient(${diyComponent.value.moduleOne.listFrame.startColor},${diyComponent.value.moduleOne.listFrame.endColor});`;
+	    }
+
+		if (diyComponent.value.moduleRounded.topRounded) style += 'border-top-left-radius:' + diyComponent.value.moduleRounded.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.moduleRounded.topRounded) style += 'border-top-right-radius:' + diyComponent.value.moduleRounded.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.moduleRounded.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.moduleRounded.bottomRounded * 2 + 'rpx;';
+		if (diyComponent.value.moduleRounded.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.moduleRounded.bottomRounded * 2 + 'rpx;';
+
+		if(diyComponent.value.margin && diyComponent.value.margin.both) style += 'width: calc((100vw - ' + (diyComponent.value.margin.both*4) + 'rpx - 20rpx) / 2);'
+		else style += 'width: calc((100vw - 20rpx) / 2 );'
+		return style;
+	})
+
+	const moduleTwoCss = computed(() => {
+		var style = '';
+	    if(diyComponent.value.moduleTwo.listFrame) {
+	        if (diyComponent.value.moduleTwo.listFrame.startColor && diyComponent.value.moduleTwo.listFrame.endColor) style += `background:linear-gradient(${diyComponent.value.moduleTwo.listFrame.startColor},${diyComponent.value.moduleTwo.listFrame.endColor});`;
+	    }
+		if (diyComponent.value.moduleRounded.topRounded) style += 'border-top-left-radius:' + diyComponent.value.moduleRounded.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.moduleRounded.topRounded) style += 'border-top-right-radius:' + diyComponent.value.moduleRounded.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.moduleRounded.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.moduleRounded.bottomRounded * 2 + 'rpx;';
+		if (diyComponent.value.moduleRounded.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.moduleRounded.bottomRounded * 2 + 'rpx;';
+
+		if(diyComponent.value.margin && diyComponent.value.margin.both) style += 'width: calc((100vw - ' + (diyComponent.value.margin.both*4) + 'rpx - 20rpx) / 2);'
+		else style += 'width: calc((100vw - 20rpx) / 2 );'
+		return style;
+	})
+
+	const moduleBtnCss = (data: any)=>{
+		var style = '';
+	    if(data.btnTitle.color) {
+	        style += 'color:' + data.btnTitle.color + ';';
+	    }
+		if (diyComponent.value.moduleTwo.listFrame.startColor && diyComponent.value.moduleTwo.listFrame.endColor) style += `background:linear-gradient(${data.btnTitle.startColor},${data.btnTitle.endColor});`;
+		return style;
+	}
+
+    onMounted(() => {
+        refresh();
+        // 装修模式下刷新
+        if (diyStore.mode == 'decorate') {
+            watch(
+                () => diyComponent.value,
+                (newValue, oldValue) => {
+                    if (newValue && newValue.componentName == 'PictureShow') {
+                        refresh();
+                    }
+                }
+            )
+        }
+    });
+
+	const refresh = ()=> {
+
+    }
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/uni-app/src/app/components/diy/rich-text/index.vue b/uni-app/src/app/components/diy/rich-text/index.vue
new file mode 100644
index 00000000..d24b48f9
--- /dev/null
+++ b/uni-app/src/app/components/diy/rich-text/index.vue
@@ -0,0 +1,118 @@
+<template>
+	<view :style="warpCss">
+		<view :style="maskLayer"></view>
+		<view class="diy-rich-text relative">
+			<view v-if="diyComponent.html && diyComponent.html != '<p><br></p>'">
+				<u-parse :content="diyComponent.html" :tagStyle="{img: 'vertical-align: top;'}"></u-parse>
+			</view>
+			<template v-else>
+				<view>点此编辑『富文本』内容 ——&gt;</view>
+				<view>
+					<text>你可以对文字进行</text>
+					<text>、</text>
+					<text class="font-bold">加粗</text>
+					<text>、</text>
+					<text class="italic">斜体</text>
+					<text>、</text>
+					<text class="underline">下划线</text>
+					<text>、</text>
+					<text class="line-through">删除线</text>
+					<text>、文字</text>
+					<text style="color: rgb(0, 176, 240);">颜色</text>
+					<text>、</text>
+					<text style="background-color: rgb(255, 192, 0); color: rgb(255, 255, 255);">背景色</text>
+					<text>、以及字号</text>
+					<text class="text-lg">大</text>
+					<text class="text-sm">小</text>
+					<text class="pl-[10rpx]">等简单排版操作。</text>
+				</view>
+				<view>也可在这里插入图片、并对图片加上超级链接，方便用户点击。</view>
+			</template>
+		</view>
+	</view>
+</template>
+
+<script setup lang="ts">
+	// 富文本组件
+    import { ref,computed, watch, onMounted, nextTick,getCurrentInstance } from 'vue';
+	import useDiyStore from '@/app/stores/diy';
+    import { img } from '@/utils/common';
+
+	const props = defineProps(['component', 'index']);
+
+	const diyStore = useDiyStore();
+
+	const diyComponent = computed(() => {
+		if (diyStore.mode == 'decorate') {
+			return diyStore.value[props.index];
+		} else {
+			return props.component;
+		}
+	})
+
+	const warpCss = computed(() => {
+		var style = '';
+        style += 'position:relative;';
+        if(diyComponent.value.componentStartBgColor) {
+            if (diyComponent.value.componentStartBgColor && diyComponent.value.componentEndBgColor) style += `background:linear-gradient(${diyComponent.value.componentGradientAngle},${diyComponent.value.componentStartBgColor},${diyComponent.value.componentEndBgColor});`;
+            else style += 'background-color:' + diyComponent.value.componentStartBgColor + ';';
+        }
+
+        if(diyComponent.value.componentBgUrl) {
+            style += `background-image:url('${ img(diyComponent.value.componentBgUrl) }');`;
+            style += 'background-size: cover;background-repeat: no-repeat;';
+        }
+
+        if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+        if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+        if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+        if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+        return style;
+	})
+
+    // 背景图加遮罩层
+    const maskLayer = computed(()=>{
+        var style = '';
+        if(diyComponent.value.componentBgUrl) {
+            style += 'position:absolute;top:0;width:100%;';
+            style += `background: rgba(0,0,0,${diyComponent.value.componentBgAlpha / 10});`;
+            style += `height:${height.value}px;`;
+
+            if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+            if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+            if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+            if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+        }
+
+        return style;
+    });
+
+    onMounted(() => {
+        refresh();
+        // 装修模式下刷新
+        if (diyStore.mode == 'decorate') {
+            watch(
+                () => diyComponent.value,
+                (newValue, oldValue) => {
+                    if (newValue && newValue.componentName == 'RichText') {
+                        refresh();
+                    }
+                }
+            )
+        }
+    });
+
+    const instance = getCurrentInstance();
+    const height = ref(0)
+
+    const refresh = ()=> {
+        nextTick(() => {
+            const query = uni.createSelectorQuery().in(instance);
+            query.select('.diy-rich-text').boundingClientRect((data: any) => {
+                height.value = data.height;
+            }).exec();
+        })
+    }
+</script>
+
+<style></style>
diff --git a/uni-app/src/app/components/diy/rubik-cube/index.vue b/uni-app/src/app/components/diy/rubik-cube/index.vue
new file mode 100644
index 00000000..f3e3bcbd
--- /dev/null
+++ b/uni-app/src/app/components/diy/rubik-cube/index.vue
@@ -0,0 +1,583 @@
+<template>
+	<view :style="warpCss">
+		<view :style="maskLayer"></view>
+		<view :class="['rubik-cube relative', diyStore.mode]">
+
+			<!-- 1左2右 -->
+			<template v-if="diyComponent.mode == 'row1-lt-of2-rt'">
+				<view class="template-left">
+					<view @click="diyStore.toRedirect(diyComponent.list[0].link)" :class="['item', diyComponent.mode]"
+						:style="{ marginRight: diyComponent.imageGap * 2 + 'rpx', width: diyComponent.list[0].imgWidth, height: diyComponent.list[0].imgHeight + 'px' }">
+						<image v-if="diyComponent.list[0].imageUrl" :src="img(diyComponent.list[0].imageUrl)" mode="scaleToFill" :style="diyComponent.list[0].pageItemStyle" :show-menu-by-longpress="true"/>
+						<image v-else :src="img('static/resource/images/diy/figure.png')" mode="scaleToFill" :style="diyComponent.list[0].pageItemStyle" :show-menu-by-longpress="true"/>
+					</view>
+				</view>
+
+				<view class="template-right">
+					<template v-for="(item, index) in diyComponent.list" :key="index">
+						<template v-if="index > 0">
+							<view @click="diyStore.toRedirect(item.link)" :class="['item', diyComponent.mode]"
+								:style="{ marginBottom: diyComponent.imageGap * 2 + 'rpx', width: item.imgWidth, height: item.imgHeight + 'px' }">
+								<image v-if="item.imageUrl" :src="img(item.imageUrl)" mode="scaleToFill" :style="item.pageItemStyle" :show-menu-by-longpress="true"/>
+								<image v-else :src="img('static/resource/images/diy/figure.png')" mode="scaleToFill" :style="item.pageItemStyle" :show-menu-by-longpress="true"/>
+							</view>
+						</template>
+					</template>
+				</view>
+			</template>
+
+			<!-- 1左3右 -->
+			<template v-else-if="diyComponent.mode == 'row1-lt-of1-tp-of2-bm'">
+				<view class="template-left">
+					<view @click="diyStore.toRedirect(diyComponent.list[0].link)" :class="['item', diyComponent.mode]"
+						:style="{ marginRight: diyComponent.imageGap * 2 + 'rpx', width: diyComponent.list[0].imgWidth, height: diyComponent.list[0].imgHeight + 'px' }">
+						<image v-if="diyComponent.list[0].imageUrl" :src="img(diyComponent.list[0].imageUrl)" mode="scaleToFill" :style="diyComponent.list[0].pageItemStyle" :show-menu-by-longpress="true"/>
+						<image v-else :src="img('static/resource/images/diy/figure.png')" mode="scaleToFill" :style="diyComponent.list[0].pageItemStyle" :show-menu-by-longpress="true"/>
+					</view>
+				</view>
+
+				<view class="template-right">
+					<view @click="diyStore.toRedirect(diyComponent.list[1].link)" :class="['item', diyComponent.mode]"
+						:style="{ marginBottom: diyComponent.imageGap * 2 + 'rpx', width: diyComponent.list[1].imgWidth, height: diyComponent.list[1].imgHeight + 'px' }">
+						<image v-if="diyComponent.list[1].imageUrl" :src="img(diyComponent.list[1].imageUrl)" mode="scaleToFill" :style="diyComponent.list[1].pageItemStyle" :show-menu-by-longpress="true"/>
+						<image v-else :src="img('static/resource/images/diy/figure.png')" mode="scaleToFill" :style="diyComponent.list[1].pageItemStyle" :show-menu-by-longpress="true"/>
+					</view>
+					<view class="template-bottom">
+						<template v-for="(item, index) in diyComponent.list" :key="index">
+							<template v-if="index > 1">
+								<view @click="diyStore.toRedirect(item.link)" :class="['item', diyComponent.mode]" :style="{
+											marginRight: diyComponent.imageGap * 2 + 'rpx',
+											width: item.imgWidth,
+											height: item.imgHeight + 'px'
+										}">
+									<image v-if="item.imageUrl" :src="img(item.imageUrl)" mode="scaleToFill" :style="item.pageItemStyle" :show-menu-by-longpress="true"/>
+									<image v-else :src="img('static/resource/images/diy/figure.png')" mode="scaleToFill" :style="item.pageItemStyle" :show-menu-by-longpress="true"/>
+								</view>
+							</template>
+						</template>
+					</view>
+				</view>
+			</template>
+
+			<template v-else>
+				<view :class="['item', diyComponent.mode]" v-for="(item, index) in diyComponent.list" :key="index"
+	                @click="diyStore.toRedirect(item.link)"
+					:style="{ marginRight: diyComponent.imageGap * 2 + 'rpx', marginBottom: diyComponent.imageGap * 2 + 'rpx', width: item.widthStyle, height: item.imgHeight + 'px' }">
+					<image v-if="item.imageUrl" :src="img(item.imageUrl)" :mode="'scaleToFill'" :style="item.pageItemStyle" :show-menu-by-longpress="true"/>
+					<image v-else :src="img('static/resource/images/diy/figure.png')" :mode="'scaleToFill'" :style="item.pageItemStyle" :show-menu-by-longpress="true"/>
+				</view>
+			</template>
+
+		</view>
+	</view>
+</template>
+
+<script setup lang="ts">
+	// 魔方
+	import { ref,onMounted, computed, watch,nextTick,getCurrentInstance } from 'vue';
+	import useDiyStore from '@/app/stores/diy';
+	import { img } from '@/utils/common';
+
+	const props = defineProps(['component', 'index']);
+
+	const diyStore = useDiyStore();
+
+	const diyComponent = computed(() => {
+		if (diyStore.mode == 'decorate') {
+			return diyStore.value[props.index];
+		} else {
+			return props.component;
+		}
+	})
+
+    /**
+     * 处理rpx渲染之后变成rem存在小数的问题
+     * @param rpx
+     */
+    const upx2px = (rpx: number) => {
+        return uni.upx2px(rpx) + 1
+    }
+
+    const warpCss = computed(() => {
+		var style = '';
+        style += 'position:relative;';
+        if(diyComponent.value.componentStartBgColor) {
+            if (diyComponent.value.componentStartBgColor && diyComponent.value.componentEndBgColor) style += `background:linear-gradient(${diyComponent.value.componentGradientAngle},${diyComponent.value.componentStartBgColor},${diyComponent.value.componentEndBgColor});`;
+            else style += 'background-color:' + diyComponent.value.componentStartBgColor + ';';
+        }
+
+        if(diyComponent.value.componentBgUrl) {
+            style += `background-image:url('${ img(diyComponent.value.componentBgUrl) }');`;
+            style += 'background-size: cover;background-repeat: no-repeat;';
+        }
+
+		if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		return style;
+	})
+
+    // 背景图加遮罩层
+    const maskLayer = computed(()=>{
+        var style = '';
+        if(diyComponent.value.componentBgUrl) {
+            style += 'position:absolute;top:0;width:100%;';
+            style += `background: rgba(0,0,0,${diyComponent.value.componentBgAlpha / 10});`;
+            style += `height:${height.value}px;`;
+
+            if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+            if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+            if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+            if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+        }
+
+        return style;
+    });
+
+	const countBorderRadius = (type: any, index: any) => {
+		var obj = '';
+		if (diyComponent.value.elementAngle == 'right') {
+			return obj;
+		}
+		var defaultData:any = {
+			'row1-lt-of2-rt': [
+				['border-top-right-radius', 'border-bottom-right-radius'],
+				['border-top-left-radius', 'border-bottom-left-radius', 'border-bottom-right-radius'],
+				['border-top-left-radius', 'border-bottom-left-radius', 'border-top-right-radius']
+			],
+			'row1-lt-of1-tp-of2-bm': [
+				['border-top-right-radius', 'border-bottom-right-radius'],
+				['border-top-left-radius', 'border-bottom-left-radius', 'border-bottom-right-radius'],
+				['border-radius'],
+				['border-top-left-radius', 'border-bottom-left-radius', 'border-top-right-radius']
+			],
+			'row1-tp-of2-bm': [
+				['border-bottom-left-radius', 'border-bottom-right-radius'],
+				['border-top-left-radius', 'border-bottom-right-radius', 'border-top-right-radius'],
+				['border-top-left-radius', 'border-bottom-left-radius', 'border-top-right-radius']
+			],
+			'row2-lt-of2-rt': [
+				['border-top-right-radius', 'border-bottom-left-radius', 'border-bottom-right-radius'],
+				['border-top-left-radius', 'border-bottom-right-radius', 'border-bottom-left-radius'],
+				['border-top-left-radius', 'border-bottom-right-radius', 'border-top-right-radius'],
+				['border-top-left-radius', 'border-bottom-left-radius', 'border-top-right-radius']
+			],
+			'row1-of4': [
+				['border-top-right-radius', 'border-bottom-right-radius'],
+				['border-radius'],
+				['border-radius'],
+				['border-top-left-radius', 'border-bottom-left-radius']
+			],
+			'row1-of3': [
+				['border-top-right-radius', 'border-bottom-right-radius'],
+				['border-radius'],
+				['border-top-left-radius', 'border-bottom-left-radius']
+			],
+			'row1-of2': [
+				['border-top-right-radius', 'border-bottom-right-radius'],
+				['border-top-left-radius', 'border-bottom-left-radius']
+			]
+		};
+
+		defaultData[type][index].forEach((item: any, index: any) => {
+			obj += 'border-top-left-radius:' + diyComponent.value.topElementRounded * 2 + 'rpx;';
+			obj += 'border-top-right-radius:' + diyComponent.value.topElementRounded * 2 + 'rpx;';
+			obj += 'border-bottom-left-radius:' + diyComponent.value.bottomElementRounded * 2 + 'rpx;';
+			obj += 'border-bottom-right-radius:' + diyComponent.value.bottomElementRounded * 2 + 'rpx;';
+		});
+		return obj;
+	}
+
+	onMounted(() => {
+		refresh();
+		// 装修模式下刷新
+        if (diyStore.mode == 'decorate') {
+            watch(
+                () => diyComponent.value,
+                (newValue, oldValue) => {
+                    if (newValue && newValue.componentName == 'RubikCube') {
+                        refresh();
+                    }
+                }
+            )
+        }else{
+            watch(
+                () => diyComponent.value,
+                (newValue, oldValue) => {
+                    refresh();
+                }
+            )
+        }
+	});
+
+    const instance = getCurrentInstance();
+    const height = ref(0)
+
+	const refresh = () => {
+		if (diyStore.mode == 'decorate') {
+			diyComponent.value.list.forEach((item : any) => {
+				// 装修模式下设置默认图
+				if (item.imageUrl == '') {
+					item.imgWidth = 690;
+					item.imgHeight = 330;
+				}
+			});
+		}
+		handleData()
+        nextTick(() => {
+            const query = uni.createSelectorQuery().in(instance);
+            query.select('.rubik-cube').boundingClientRect((data: any) => {
+                height.value = data.height;
+            }).exec();
+        })
+	}
+
+	const handleData = () => {
+		var singleRow:any = {
+			'row1-of2': {
+				ratio: 2,
+				width: 'calc((100% - ' + upx2px(diyComponent.value.imageGap * 2) + 'px) / 2)'
+			},
+			'row1-of3': {
+				ratio: 3,
+				width: 'calc((100% - ' + upx2px(diyComponent.value.imageGap * 4) + 'px) / 3)'
+			},
+			'row1-of4': {
+				ratio: 4,
+				width: 'calc((100% - ' + upx2px(diyComponent.value.imageGap * 6) + 'px) / 4)'
+			}
+		};
+
+		diyComponent.value.list.forEach((item: any, index: any) => {
+			item.pageItemStyle = countBorderRadius(diyComponent.value.mode, index);
+		});
+
+		if (singleRow[diyComponent.value.mode]) {
+			calcSingleRow(singleRow[diyComponent.value.mode]);
+		} else if (diyComponent.value.mode == 'row2-lt-of2-rt') {
+			calcFourSquare();
+		} else if (diyComponent.value.mode == 'row1-lt-of2-rt') {
+			calcRowOneLeftOfTwoRight();
+		} else if (diyComponent.value.mode == 'row1-tp-of2-bm') {
+			calcRowOneTopOfTwoBottom();
+		} else if (diyComponent.value.mode == 'row1-lt-of1-tp-of2-bm') {
+			calcRowOneLeftOfOneTopOfTwoBottom();
+		}
+	};
+
+	/**
+	 * 魔方：单行多个，平分宽度
+	 * 公式：
+	 * 宽度：屏幕宽度/2，示例：375/2=187.5
+	 * 比例：原图高/原图宽，示例：322/690=0.46
+	 * 高度：宽度*比例，示例：187.5*0.46=86.25
+	 */
+	const calcSingleRow = (params:any) => {
+		uni.getSystemInfo({
+			success: res => {
+				let maxHeight = 0;
+
+				diyComponent.value.list.forEach((item: any, index: any) => {
+					var ratio = item.imgHeight / item.imgWidth;
+
+					let width = res.windowWidth - upx2px(diyComponent.value.margin.both * 2); // 减去左右间距
+					if (diyComponent.value.imageGap > 0) {
+						width -= upx2px(params.ratio * diyComponent.value.imageGap * 2); // 减去间隙
+					}
+					item.imgWidth = width / params.ratio;
+					item.imgHeight = item.imgWidth * ratio;
+
+					if (maxHeight == 0 || maxHeight < item.imgHeight) maxHeight = item.imgHeight;
+				})
+
+				diyComponent.value.list.forEach((item: any, index: any) => {
+					item.widthStyle = params.width;
+					item.imgHeight = maxHeight;
+				});
+			}
+		})
+	};
+
+	/**
+	 * 魔方：四方型，各占50%
+	 */
+	const calcFourSquare = () => {
+		uni.getSystemInfo({
+			success: res => {
+				let maxHeightFirst = 0;
+				let maxHeightTwo = 0;
+				diyComponent.value.list.forEach((item: any, index: any) => {
+					var ratio = item.imgHeight / item.imgWidth;
+					item.imgWidth = res.windowWidth;
+					item.imgWidth -= upx2px(diyComponent.value.margin.both * 4);
+					if (diyComponent.value.imageGap > 0) {
+						item.imgWidth -= upx2px(diyComponent.value.imageGap * 2);
+					}
+					item.imgWidth = item.imgWidth / 2;
+					item.imgHeight = item.imgWidth * ratio;
+
+					// 获取每行最大高度
+					if (index <= 1) {
+						if (maxHeightFirst == 0 || maxHeightFirst < item.imgHeight) {
+							maxHeightFirst = item.imgHeight;
+						}
+					} else if (index > 1) {
+						if (maxHeightTwo == 0 || maxHeightTwo < item.imgHeight) {
+							maxHeightTwo = item.imgHeight;
+						}
+					}
+				});
+				diyComponent.value.list.forEach((item: any, index: any) => {
+					item.imgWidth = 'calc((100% - ' + upx2px(diyComponent.value.imageGap * 2) + 'px) / 2)';
+					item.widthStyle = item.imgWidth;
+					if (index <= 1) {
+						item.imgHeight = maxHeightFirst;
+					} else if (index > 1) {
+						item.imgHeight = maxHeightTwo;
+					}
+				});
+			}
+		});
+	}
+
+	/**
+	 * 魔方：1左2右
+	 */
+	const calcRowOneLeftOfTwoRight = () => {
+		let rightHeight = 0; // 右侧两图平分高度
+		let divide = 'left'; // 划分规则，left：左，right：右
+		if (diyComponent.value.list[1].imgWidth === diyComponent.value.list[2].imgWidth) divide = 'right';
+		uni.getSystemInfo({
+			success: res => {
+				diyComponent.value.list.forEach((item: any, index: any) => {
+					if (index == 0) {
+						var ratio = item.imgHeight / item.imgWidth; // 获取左图的尺寸比例
+						item.imgWidth = res.windowWidth - upx2px(diyComponent.value.margin.both * 4) - upx2px(diyComponent.value.imageGap * 2);
+						item.imgWidth = item.imgWidth / 2;
+						item.imgHeight = item.imgWidth * ratio;
+						rightHeight = (item.imgHeight - upx2px(diyComponent.value.imageGap * 2)) / 2;
+						item.imgWidth += 'px';
+					} else {
+						item.imgWidth = diyComponent.value.list[0].imgWidth;
+						item.imgHeight = rightHeight;
+					}
+				});
+			}
+		});
+	}
+
+	/**
+	 * 魔方：1上2下
+	 */
+	const calcRowOneTopOfTwoBottom = () => {
+		var maxHeight = 0;
+		uni.getSystemInfo({
+			success: res => {
+				diyComponent.value.list.forEach((item: any, index: any) => {
+
+					var ratio = item.imgHeight / item.imgWidth; // 获取左图的尺寸比例
+					if (index == 0) {
+						item.imgWidth = res.windowWidth - upx2px(diyComponent.value.margin.both * 4);
+					} else if (index > 0) {
+						item.imgWidth = res.windowWidth - upx2px(diyComponent.value.margin.both * 4) - upx2px(diyComponent.value.imageGap * 2);
+						item.imgWidth = item.imgWidth / 2;
+					}
+
+					item.imgHeight = item.imgWidth * ratio;
+
+					// 获取最大高度
+					if (index > 0 && (maxHeight == 0 || maxHeight < item.imgHeight)) maxHeight = item.imgHeight;
+
+				});
+				diyComponent.value.list.forEach((item: any, index: any) => {
+					item.imgWidth += 'px';
+					item.widthStyle = item.imgWidth;
+					if (index > 0) item.imgHeight = maxHeight;
+				});
+			}
+		});
+	}
+
+	/**
+	 * 魔方：1左3右
+	 */
+	const calcRowOneLeftOfOneTopOfTwoBottom = () => {
+		uni.getSystemInfo({
+			success: res => {
+				diyComponent.value.list.forEach((item: any, index: any) => {
+					// 左图
+					if (index == 0) {
+						var ratio = item.imgHeight / item.imgWidth; // 获取左图的尺寸比例
+						item.imgWidth = res.windowWidth - upx2px(diyComponent.value.margin.both * 4) - upx2px(diyComponent.value.imageGap * 2);
+						item.imgWidth = item.imgWidth / 2;
+						item.imgHeight = item.imgWidth * ratio;
+					} else if (index == 1) {
+						item.imgWidth = diyComponent.value.list[0].imgWidth;
+						item.imgHeight = (diyComponent.value.list[0].imgHeight - upx2px(diyComponent.value.imageGap * 2)) / 2;
+					} else if (index > 1) {
+						item.imgWidth = (diyComponent.value.list[0].imgWidth - upx2px(diyComponent.value.imageGap * 2)) / 2;
+						item.imgHeight = diyComponent.value.list[1].imgHeight;
+					}
+				});
+
+				diyComponent.value.list.forEach((item: any, index: any) => {
+					item.imgWidth += 'px';
+				});
+			}
+		});
+	}
+</script>
+
+<style lang="scss">
+	.rubik-cube {
+		overflow: hidden;
+		display: flex;
+		flex-wrap: wrap;
+		justify-content: space-between;
+
+		.item {
+			text-align: center;
+			line-height: 0;
+			overflow: hidden;
+
+			image {
+				width: 100%;
+				max-width: 100%;
+				height: 100%;
+			}
+		}
+	}
+
+	// 一行两个
+	.rubik-cube .item.row1-of2 {
+		box-sizing: border-box;
+		margin-top: 0 !important;
+		margin-bottom: 0 !important;
+	}
+
+	.rubik-cube .item.row1-of2:nth-child(1) {
+		margin-left: 0 !important;
+	}
+
+	.rubik-cube .item.row1-of2:nth-child(2) {
+		margin-right: 0 !important;
+	}
+
+	// 一行三个
+	.rubik-cube .item.row1-of3 {
+		box-sizing: border-box;
+		margin-top: 0 !important;
+		margin-bottom: 0 !important;
+	}
+
+	.rubik-cube .item.row1-of3:nth-child(1) {
+		margin-left: 0 !important;
+	}
+
+	.rubik-cube .item.row1-of3:nth-child(3) {
+		margin-right: 0 !important;
+	}
+
+	// 一行四个
+	.rubik-cube .item.row1-of4 {
+		box-sizing: border-box;
+		margin-top: 0 !important;
+		margin-bottom: 0 !important;
+	}
+
+	.rubik-cube .item.row1-of4:nth-child(1) {
+		margin-left: 0 !important;
+	}
+
+	.rubik-cube .item.row1-of4:nth-child(4) {
+		margin-right: 0 !important;
+	}
+
+	// 两左两右
+	.rubik-cube .item.row2-lt-of2-rt {
+		// width: 50%;
+		display: inline-block;
+		box-sizing: border-box;
+	}
+
+	.rubik-cube .item.row2-lt-of2-rt:nth-child(1) {
+		margin-left: 0 !important;
+		margin-top: 0 !important;
+	}
+
+	.rubik-cube .item.row2-lt-of2-rt:nth-child(2) {
+		margin-right: 0 !important;
+		margin-top: 0 !important;
+	}
+
+	.rubik-cube .item.row2-lt-of2-rt:nth-child(3) {
+		margin-left: 0 !important;
+		margin-bottom: 0 !important;
+	}
+
+	.rubik-cube .item.row2-lt-of2-rt:nth-child(4) {
+		margin-right: 0 !important;
+		margin-bottom: 0 !important;
+	}
+
+	// 一左两右
+	.rubik-cube .template-left,
+	.rubik-cube .template-right {
+		// width: 50%;
+		box-sizing: border-box;
+	}
+
+	.rubik-cube .template-left .item.row1-lt-of2-rt:nth-child(1) {
+		margin-bottom: 0;
+	}
+
+	.rubik-cube .template-right .item.row1-lt-of2-rt:nth-child(2) {
+		margin-bottom: 0 !important;
+	}
+
+	.rubik-cube.row1-lt-of2-rt .template-right {
+		display: flex;
+		flex-direction: column;
+		justify-content: space-between;
+	}
+
+	// 一上两下
+	.rubik-cube .item.row1-tp-of2-bm:nth-child(1) {
+		width: 100%;
+		box-sizing: border-box;
+		margin-top: 0 !important;
+		margin-left: 0 !important;
+		margin-right: 0 !important;
+	}
+
+	.rubik-cube .item.row1-tp-of2-bm:nth-child(2) {
+		// width: 50%;
+		box-sizing: border-box;
+		margin-left: 0 !important;
+		margin-bottom: 0 !important;
+	}
+
+	.rubik-cube .item.row1-tp-of2-bm:nth-child(3) {
+		// width: 50%;
+		box-sizing: border-box;
+		margin-right: 0 !important;
+		margin-bottom: 0 !important;
+	}
+
+	// 一左三右
+	.rubik-cube .template-left .item.row1-lt-of1-tp-of2-bm {
+		width: 100%;
+		box-sizing: border-box;
+	}
+
+	.rubik-cube .template-bottom {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+
+	.rubik-cube .template-bottom .item:nth-child(2) {
+		margin-right: 0 !important;
+	}
+</style>
diff --git a/uni-app/src/app/components/diy/text/index.vue b/uni-app/src/app/components/diy/text/index.vue
new file mode 100644
index 00000000..518e6c87
--- /dev/null
+++ b/uni-app/src/app/components/diy/text/index.vue
@@ -0,0 +1,123 @@
+<template>
+	<view :style="warpCss">
+		<view :style="maskLayer"></view>
+		<view class="diy-text relative">
+			<view v-if="diyComponent.style == 'style-1'" class="px-[var(--pad-sidebar-m)]">
+				<view @click="diyStore.toRedirect(diyComponent.link)">
+					<view class="leading-[1]" :style="{
+							fontSize: diyComponent.fontSize * 2 + 'rpx',
+							color: diyComponent.textColor,
+							fontWeight: (diyComponent.fontWeight == 'normal' ? 500 : diyComponent.fontWeight),
+							textAlign : diyComponent.textAlign
+						}">
+						{{ diyComponent.text }}
+					</view>
+				</view>
+			</view>
+			<view v-if="diyComponent.style == 'style-2'" class=" px-[20rpx] flex items-center">
+				<view @click="diyStore.toRedirect(diyComponent.link)">
+					<view class="max-w-[200rpx] truncate leading-[1]" :style="{
+							fontSize: diyComponent.fontSize * 2 + 'rpx',
+							color: diyComponent.textColor,
+							fontWeight: (diyComponent.fontWeight == 'normal' ? 500 : diyComponent.fontWeight)
+						}">
+						{{ diyComponent.text }}
+					</view>
+				</view>
+				<text v-if="diyComponent.subTitle.text" :style="{background: diyComponent.subTitle.color}" class="mx-[10rpx] w-[2rpx] h-[24rpx] opacity-70"></text>
+				<text class="max-w-[300rpx] truncate" :style="{ color: diyComponent.subTitle.color, fontSize: diyComponent.subTitle.fontSize * 2 + 'rpx', }">{{ diyComponent.subTitle.text }}</text>
+				<view class="ml-auto text-right " v-if="diyComponent.more.isShow" :style="{ color: diyComponent.more.color }">
+					<view @click="diyStore.toRedirect(diyComponent.more.link)" class="flex items-center">
+						<text class="max-w-[200rpx] truncate text-[26rpx]">{{ diyComponent.more.text }}</text>
+						<text class="nc-iconfont nc-icon-youV6xx text-[24rpx]" :style="{ color: diyComponent.more.color }"></text>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup lang="ts">
+	// 标题
+	import { ref, computed, watch,onMounted,nextTick,getCurrentInstance } from 'vue';
+	import useDiyStore from '@/app/stores/diy';
+    import { img } from '@/utils/common';
+
+	const props = defineProps(['component', 'index']);
+	const diyStore = useDiyStore();
+
+	const diyComponent = computed(() => {
+		if (diyStore.mode == 'decorate') {
+			return diyStore.value[props.index];
+		} else {
+			return props.component;
+		}
+	})
+
+	const warpCss = computed(() => {
+		var style = '';
+        style += 'position:relative;';
+        if(diyComponent.value.componentStartBgColor) {
+            if (diyComponent.value.componentStartBgColor && diyComponent.value.componentEndBgColor) style += `background:linear-gradient(${diyComponent.value.componentGradientAngle},${diyComponent.value.componentStartBgColor},${diyComponent.value.componentEndBgColor});`;
+            else style += 'background-color:' + diyComponent.value.componentStartBgColor + ';';
+        }
+
+        if(diyComponent.value.componentBgUrl) {
+            style += `background-image:url('${ img(diyComponent.value.componentBgUrl) }');`;
+            style += 'background-size: cover;background-repeat: no-repeat;';
+        }
+
+		if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+		return style;
+	})
+
+    // 背景图加遮罩层
+    const maskLayer = computed(()=>{
+        var style = '';
+        if(diyComponent.value.componentBgUrl) {
+            style += 'position:absolute;top:0;width:100%;';
+            style += `background: rgba(0,0,0,${diyComponent.value.componentBgAlpha / 10});`;
+            style += `height:${height.value}px;`;
+
+            if (diyComponent.value.topRounded) style += 'border-top-left-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+            if (diyComponent.value.topRounded) style += 'border-top-right-radius:' + diyComponent.value.topRounded * 2 + 'rpx;';
+            if (diyComponent.value.bottomRounded) style += 'border-bottom-left-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+            if (diyComponent.value.bottomRounded) style += 'border-bottom-right-radius:' + diyComponent.value.bottomRounded * 2 + 'rpx;';
+        }
+
+        return style;
+    });
+
+    onMounted(() => {
+        refresh();
+        // 装修模式下刷新
+        if (diyStore.mode == 'decorate') {
+            watch(
+                () => diyComponent.value,
+                (newValue, oldValue) => {
+                    if (newValue && newValue.componentName == 'Text') {
+                        refresh();
+                    }
+                }
+            )
+        }
+    });
+
+    const instance = getCurrentInstance();
+    const height = ref(0)
+
+    const refresh = ()=> {
+        nextTick(() => {
+            const query = uni.createSelectorQuery().in(instance);
+            query.select('.diy-text').boundingClientRect((data: any) => {
+                height.value = data.height;
+            }).exec();
+        })
+    }
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/uni-app/src/app/locale/en/pages.setting.index.json b/uni-app/src/app/locale/en/pages.setting.index.json
new file mode 100644
index 00000000..bde9e263
--- /dev/null
+++ b/uni-app/src/app/locale/en/pages.setting.index.json
@@ -0,0 +1,6 @@
+{
+    "personalSettings": "Personal settings",
+    "switchLang": "Switch language",
+    "version": "Version",
+    "logout": "Log out"
+}
\ No newline at end of file
diff --git a/uni-app/src/app/locale/zh-Hans/pages.article.detail.json b/uni-app/src/app/locale/zh-Hans/pages.article.detail.json
new file mode 100644
index 00000000..ca6b8c2d
--- /dev/null
+++ b/uni-app/src/app/locale/zh-Hans/pages.article.detail.json
@@ -0,0 +1,5 @@
+{
+    "detail": "文章详情",
+	"abstract": "摘要",
+	"loadingText": "正在加载"
+}
diff --git a/uni-app/src/app/locale/zh-Hans/pages.article.list.json b/uni-app/src/app/locale/zh-Hans/pages.article.list.json
new file mode 100644
index 00000000..1770d8c5
--- /dev/null
+++ b/uni-app/src/app/locale/zh-Hans/pages.article.list.json
@@ -0,0 +1,7 @@
+{
+    "list": "文章列表",
+	"noData": "~ 暂无数据 ~",
+	"all": "全部",
+	"end": "-- 到底了 --",
+    "searchPlaceholder": "请输入搜索关键词"
+}
diff --git a/uni-app/src/app/locale/zh-Hans/pages.auth.bind.json b/uni-app/src/app/locale/zh-Hans/pages.auth.bind.json
new file mode 100644
index 00000000..b29922b7
--- /dev/null
+++ b/uni-app/src/app/locale/zh-Hans/pages.auth.bind.json
@@ -0,0 +1,7 @@
+{
+  "bind": "绑定",
+  "bindMobileTip": "输入手机号动态码绑定",
+  "binding": "绑定中",
+  "weixinUserAuth": "一键绑定",
+  "mobileQuickLogin": "手机号快捷登录"
+}
\ No newline at end of file
diff --git a/uni-app/src/app/locale/zh-Hans/pages.auth.index.json b/uni-app/src/app/locale/zh-Hans/pages.auth.index.json
new file mode 100644
index 00000000..e0a80ef2
--- /dev/null
+++ b/uni-app/src/app/locale/zh-Hans/pages.auth.index.json
@@ -0,0 +1,8 @@
+{
+	"quickLoginOrLogout": "快捷登录/注册",
+	"login": "登录",
+	"otherLogin": "其他方式登录",
+	"accountLogin": "账号密码登录",
+	"mobileLogin": "手机号登录",
+	"otherMobileLogin": "其他手机号登录"
+}
\ No newline at end of file
diff --git a/uni-app/src/app/locale/zh-Hans/pages.auth.login.json b/uni-app/src/app/locale/zh-Hans/pages.auth.login.json
new file mode 100644
index 00000000..476c421b
--- /dev/null
+++ b/uni-app/src/app/locale/zh-Hans/pages.auth.login.json
@@ -0,0 +1,18 @@
+{
+    "logining": "登录中",
+    "usernamePlaceholder": "请输入账号",
+    "passwordPlaceholder": "请输入密码",
+    "resetpwd": "忘记密码",
+    "noAccount": "还没有账号",
+    "toRegister": "去注册",
+    "agreeTips": "登录代表您同意",
+    "isAgreeTips": "请先阅读并同意协议",
+    "mobilePlaceholder": "请输入手机号",
+    "oneClicklogin":"快捷登录",
+	"accountLogin":"账号密码登录",
+	"accountLoginTip":"输入账号密码登录",
+	"accountLoginError":"商家未开启账号密码登录",
+	"mobileLogin":"手机号登录",
+	"mobileLoginTip":"输入手机号验证码登录",
+	"mobileLoginError":"商家未开启手机号登录"
+}
\ No newline at end of file
diff --git a/uni-app/src/app/locale/zh-Hans/pages.auth.register.json b/uni-app/src/app/locale/zh-Hans/pages.auth.register.json
new file mode 100644
index 00000000..ecda8ed9
--- /dev/null
+++ b/uni-app/src/app/locale/zh-Hans/pages.auth.register.json
@@ -0,0 +1,18 @@
+{
+    "registering": "注册中",
+	"usernameRegisterTip":"输入账号密码注册",
+	"mobileRegisterTip":"输入手机号验证码注册",
+    "usernamePlaceholder": "请输入账号",
+    "usernameTips":"账号不能是纯数字",
+    "passwordPlaceholder": "请输入密码",
+    "confirmPasswordPlaceholder": "请再次确认密码",
+    "confirmPasswordError": "两次输入的密码不一致",
+    "resetpwd": "忘记密码",
+    "haveAccount": "已有账号",
+    "toLogin": "去登录",
+    "registerAgreeTips": "注册代表您同意",
+    "isAgreeTips": "请先阅读并同意协议",
+    "usernameRegister": "账号注册",
+    "mobileRegister": "手机号注册",
+    "mobilePlaceholder": "请输入手机号"
+}
\ No newline at end of file
diff --git a/uni-app/src/app/locale/zh-Hans/pages.auth.resetpwd.json b/uni-app/src/app/locale/zh-Hans/pages.auth.resetpwd.json
new file mode 100644
index 00000000..faa0b940
--- /dev/null
+++ b/uni-app/src/app/locale/zh-Hans/pages.auth.resetpwd.json
@@ -0,0 +1,7 @@
+{
+  "findPassword": "找回密码",
+  "findPasswordTip": "输入手机号找回密码",
+  "passwordPlaceholder": "请输入密码",
+  "confirmPasswordPlaceholder": "请再次确认密码",
+  "confirmPasswordError": "两次输入的密码不一致"
+}
\ No newline at end of file
diff --git a/uni-app/src/app/locale/zh-Hans/pages.friendspay.money.json b/uni-app/src/app/locale/zh-Hans/pages.friendspay.money.json
new file mode 100644
index 00000000..1be4a785
--- /dev/null
+++ b/uni-app/src/app/locale/zh-Hans/pages.friendspay.money.json
@@ -0,0 +1,11 @@
+{
+    "payMoney":"实付金额",
+    "help":"帮",
+    "pay":"付款",
+    "helpPayInfo":"帮付订单信息",
+    "common": "共",
+    "goods":"种商品",
+    "finish":"该订单已完成",
+    "close":"该订单已关闭",
+    "payGenerously":"找朋友帮忙付"
+}
diff --git a/uni-app/src/app/locale/zh-Hans/pages.friendspay.share.json b/uni-app/src/app/locale/zh-Hans/pages.friendspay.share.json
new file mode 100644
index 00000000..d40e184e
--- /dev/null
+++ b/uni-app/src/app/locale/zh-Hans/pages.friendspay.share.json
@@ -0,0 +1,9 @@
+{
+  "payMoney": "实付金额",
+  "friendPayOrderInfo": "帮付订单信息",
+  "common": "共",
+  "goods": "种商品",
+  "finish": "该订单已完成",
+  "close": "该订单已关闭",
+  "friendPay": "找朋友帮忙付"
+}
diff --git a/uni-app/src/app/locale/zh-Hans/pages.member.account.json b/uni-app/src/app/locale/zh-Hans/pages.member.account.json
new file mode 100644
index 00000000..9a4b374b
--- /dev/null
+++ b/uni-app/src/app/locale/zh-Hans/pages.member.account.json
@@ -0,0 +1,9 @@
+{
+    "alipayAccountNo": "支付宝收款码",
+    "wechatCode":"微信收款码",
+    "addBankCard": "添加银行卡",
+    "addWechatCode":"添加微信收款码",
+    "addAlipayAccount": "添加支付宝收款码",
+    "endNumber": "尾号",
+    "bankCard": "银行卡"
+}
\ No newline at end of file
diff --git a/uni-app/src/app/locale/zh-Hans/pages.member.account_edit.json b/uni-app/src/app/locale/zh-Hans/pages.member.account_edit.json
new file mode 100644
index 00000000..e1a24dc5
--- /dev/null
+++ b/uni-app/src/app/locale/zh-Hans/pages.member.account_edit.json
@@ -0,0 +1,31 @@
+{
+	"addAccountTitle":"添加会员账户",
+	"editAccountTitle":"编辑会员账户",
+    "addBankCard": "添加银行卡",
+    "addBankCardTips": "请添加持卡人本人的银行卡",
+    "editBankCard": "编辑银行卡",
+    "editBankCardTips": "请编辑持卡人本人的银行卡",
+    "addAlipayAccount": "添加支付宝收款码",
+    "addAlipayAccountTips": "请添加已实名的支付宝账号",
+    "editAlipayAccount": "编辑支付宝收款码",
+    "editAlipayAccountTips": "请编辑已实名的支付宝账号",
+    "addWechatCodeAccount": "添加微信收款码",
+    "addWechatCodeAccountTips": "请添加已实名的微信账号",
+	"editWechatCodeAccount": "编辑微信收款码",
+	"editWechatCodeAccountTips": "请编辑已实名的微信账号",
+    "bankRealname": "持卡人姓名",
+    "bankRealnamePlaceholder": "请输入持卡人姓名",
+    "bankName": "银行名称",
+    "bankNamePlaceholder": "请输入银行名称",
+    "bankAccountNo": "银行卡号",
+    "bankAccountNoPlaceholder": "请输入银行卡号",
+    "alipayRealname": "真实姓名",
+    "alipayRealnamePlaceholder": "请输入真实姓名",
+    "alipayAccountNo": "支付宝账号",
+    "alipayAccountNoPlaceholder": "请输入支付宝账号",
+	"wechatCodeAccountNo": "微信账号",
+	"wechatCodeAccountNoPlaceholder": "请输入微信账号",
+    "alipayAccountImgPlaceholder": "请上传支付宝收款码",
+    "wechatCodeAccountImgPlaceholder": "请上传微信收款码",
+    "deleteConfirm": "确定要删除该账号吗？"
+}
\ No newline at end of file
diff --git a/uni-app/src/app/locale/zh-Hans/pages.member.address.json b/uni-app/src/app/locale/zh-Hans/pages.member.address.json
new file mode 100644
index 00000000..cee5bf2c
--- /dev/null
+++ b/uni-app/src/app/locale/zh-Hans/pages.member.address.json
@@ -0,0 +1,6 @@
+{
+    "address": "快递地址",
+    "locationAddress": "同城配送地址",
+    "createAddress": "新建收货地址",
+    "default": "默认"
+}
\ No newline at end of file
diff --git a/uni-app/src/app/locale/zh-Hans/pages.member.address_edit.json b/uni-app/src/app/locale/zh-Hans/pages.member.address_edit.json
new file mode 100644
index 00000000..16563d33
--- /dev/null
+++ b/uni-app/src/app/locale/zh-Hans/pages.member.address_edit.json
@@ -0,0 +1,12 @@
+{
+    "name": "收货人",
+    "namePlaceholder": "请输入收货人姓名",
+    "mobile": "手机号码",
+    "mobilePlaceholder": "请输入手机号码",
+    "selectArea":"选择地区",
+    "selectAreaPlaceholder":"请选择地区",
+    "address": "详细地址",
+    "addressPlaceholder": "请填写详细地址",
+    "defaultAddress": "设为默认地址",
+    "selectAddressPlaceholder":"请选择地址"
+}
\ No newline at end of file
diff --git a/uni-app/src/app/locale/zh-Hans/pages.member.apply_cash_out.json b/uni-app/src/app/locale/zh-Hans/pages.member.apply_cash_out.json
new file mode 100644
index 00000000..86a2a880
--- /dev/null
+++ b/uni-app/src/app/locale/zh-Hans/pages.member.apply_cash_out.json
@@ -0,0 +1,33 @@
+{
+	"cashOutNow": "立即提现",
+	"balanceDetail": "余额明细",
+	"cashOutTo": "提现到",
+	"cashOutTypePlaceholder": "请选择提现方式",
+	"wechatpay": "微信默认钱包",
+	"cashOutMoneyTip": "提现金额",
+	"money": "可提现余额",
+	"allTx": "全部提现",
+	"minWithdrawal": "最小提现金额为",
+	"commissionTo": "手续费为",
+	"cashOutList": "提现记录",
+    "cashOutToWechat": "提现至微信零钱",
+    "cashOutToWechatTips": "提现至微信零钱",
+    "cashOutToAlipay": "提现至支付宝",
+    "cashOutToAlipayTips": "请先添加支付宝账号",
+    "cashOutToBank": "提现至银行卡",
+    "cashOutToBankTips": "请先添加银行卡",
+    "cashOutToWechatCode": "提现至微信",
+    "cashOutToWechatCodeTips": "请先添加微信号",
+    "alipayAccountNo": "支付宝账号",
+    "wechatCodeAccountNo": "微信号",
+    "debitCard": "储蓄卡",
+    "abnormalOperation": "异常操作",
+    "noAvailableCashOutType": "没有可用的提现方式",
+    "applyMoneyPlaceholder": "请输入提现金额",
+    "moneyformatError": "提现金额格式错误",
+    "applyMoneyExceed": "提现金额超出可提现金额",
+    "applyMoneyBelow": "提现金额小于最低提现金额",
+    "replace": "更换",
+    "isOpenApply": "提现设置未开启",
+    "toAdd": "添加"
+}
\ No newline at end of file
diff --git a/uni-app/src/app/locale/zh-Hans/pages.member.balance.json b/uni-app/src/app/locale/zh-Hans/pages.member.balance.json
new file mode 100644
index 00000000..34aab0e3
--- /dev/null
+++ b/uni-app/src/app/locale/zh-Hans/pages.member.balance.json
@@ -0,0 +1,12 @@
+{
+  "balanceInfo": "我的余额",
+  "recharge": "充值",
+  "cashOut": "提现",
+  "balanceDetail": "余额明细",
+  "accountBalance": "账户余额 (元)",
+  "balance": "余额 (元)",
+  "money": "可提现余额 (元)",
+  "availableBalance": "可用余额",
+  "yuan": "元",
+  "rechargeRecord": "充值记录"
+}
diff --git a/uni-app/src/app/locale/zh-Hans/pages.member.cash_out.json b/uni-app/src/app/locale/zh-Hans/pages.member.cash_out.json
new file mode 100644
index 00000000..c3d56f49
--- /dev/null
+++ b/uni-app/src/app/locale/zh-Hans/pages.member.cash_out.json
@@ -0,0 +1,12 @@
+{
+	"applyTime": "申请时间",
+	"toBeReviewed": "官方正在审核，请耐心等待...",
+	"toBeTransfer": "官方正在转账，请耐心等待...",
+	"transfer": "官方已转账，请及时查收",
+	"cancelApply": "申请已取消",
+	"balanceDetail": "余额记录",
+	"commissionDetail": "佣金记录",
+	"emptyTip": "暂无提现记录",
+	"commissemptyTip": "暂无佣金记录",
+	"rechargeType":"提现方式："
+}
diff --git a/uni-app/src/app/locale/zh-Hans/pages.member.cash_out_detail.json b/uni-app/src/app/locale/zh-Hans/pages.member.cash_out_detail.json
new file mode 100644
index 00000000..ab6f690f
--- /dev/null
+++ b/uni-app/src/app/locale/zh-Hans/pages.member.cash_out_detail.json
@@ -0,0 +1,22 @@
+{
+    "statusName": "当前状态",
+    "cashOutNo": "提现单号",
+    "serviceMoney": "手续费",
+    "createTime": "申请时间",
+    "auditTime": "审核时间",
+    "transferBank": "银行名称",
+    "transferAccount": "收款账号",
+    "refuseReason": "拒绝理由",
+    "transferTypeName": "转账方式",
+    "transferTime": "转账时间",
+    "transferVoucher":"付款凭证",
+    "transferRemark":"转账补充说明",
+    "realname":"真实姓名",
+	"bankRealname":"持卡人姓名",
+    "transferCode":"收款码",
+    "proceedsInfo":"收款方信息",
+    "transferInfo":"转账信息",
+    "transferNickname":"收款方昵称",
+    "transferImg":"收款方头像",
+    "transferNo":"转账单号"
+}
\ No newline at end of file
diff --git a/uni-app/src/app/locale/zh-Hans/pages.member.commission.json b/uni-app/src/app/locale/zh-Hans/pages.member.commission.json
new file mode 100644
index 00000000..4cdc95ad
--- /dev/null
+++ b/uni-app/src/app/locale/zh-Hans/pages.member.commission.json
@@ -0,0 +1,12 @@
+{
+  "recharge": "充值",
+  "cashOut": "提现",
+  "transferMoney": "提现",
+  "commissionDetail": "佣金明细",
+  "accountCommission": "当前佣金（元）",
+  "commission": "累计佣金（元）",
+  "money": "提现中佣金（元）",
+  "availableCommission": "可用佣金",
+  "yuan": "元",
+  "commissionInfo": "我的佣金"
+}
diff --git a/uni-app/src/app/locale/zh-Hans/pages.member.detailed_account.json b/uni-app/src/app/locale/zh-Hans/pages.member.detailed_account.json
new file mode 100644
index 00000000..5527d0fc
--- /dev/null
+++ b/uni-app/src/app/locale/zh-Hans/pages.member.detailed_account.json
@@ -0,0 +1,7 @@
+{
+	"balanceDetail": "余额明细",
+	"commissionDetail": "佣金明细",
+	"balanceEmptyTip": "暂无余额明细",
+	"moneyEmptyTip": "暂无提现明细",
+	"commissionEmptyTip": "暂无佣金明细"
+}
\ No newline at end of file
diff --git a/uni-app/src/app/locale/zh-Hans/pages.member.location_address_edit.json b/uni-app/src/app/locale/zh-Hans/pages.member.location_address_edit.json
new file mode 100644
index 00000000..6dbc742a
--- /dev/null
+++ b/uni-app/src/app/locale/zh-Hans/pages.member.location_address_edit.json
@@ -0,0 +1,14 @@
+{
+    "name": "收货人",
+    "namePlaceholder": "请输入收货人姓名",
+    "mobile": "手机号码",
+    "mobilePlaceholder": "请输入手机号码",
+	"deliveryAddress":"收货地址",
+    "selectAddress":"选择地址",
+    "selectAddressPlaceholder":"请选择地址",
+    "address": "楼号门牌",
+    "addressPlaceholder": "详细地址如 1单元101",
+    "addressError": "请填写门牌号",
+    "defaultAddress": "设为默认地址",
+    "update": "修改"
+}
\ No newline at end of file
diff --git a/uni-app/src/app/locale/zh-Hans/pages.member.personal.json b/uni-app/src/app/locale/zh-Hans/pages.member.personal.json
new file mode 100644
index 00000000..f19999bb
--- /dev/null
+++ b/uni-app/src/app/locale/zh-Hans/pages.member.personal.json
@@ -0,0 +1,12 @@
+{
+    "nickname": "昵称",
+    "sex": "性别",
+    "mobile": "手机号",
+    "birthday": "生日",
+    "unknown": "未知",
+    "headimg": "头像",
+    "updateHeadimg": "更换头像",
+    "updateNickname": "修改昵称",
+    "man": "男",
+    "woman": "女"
+}
\ No newline at end of file
diff --git a/uni-app/src/app/locale/zh-Hans/pages.member.recharge_record.json b/uni-app/src/app/locale/zh-Hans/pages.member.recharge_record.json
new file mode 100644
index 00000000..5b3a1d8f
--- /dev/null
+++ b/uni-app/src/app/locale/zh-Hans/pages.member.recharge_record.json
@@ -0,0 +1,4 @@
+{
+	"rechargeRecord": "充值记录",
+	"emptyTip": "暂无充值记录"
+}
\ No newline at end of file
diff --git a/uni-app/src/app/locale/zh-Hans/pages.member.recharge_record_detail.json b/uni-app/src/app/locale/zh-Hans/pages.member.recharge_record_detail.json
new file mode 100644
index 00000000..06460475
--- /dev/null
+++ b/uni-app/src/app/locale/zh-Hans/pages.member.recharge_record_detail.json
@@ -0,0 +1,4 @@
+{
+    "orderNo": "订单编号",
+    "createTime": "创建时间"
+}
\ No newline at end of file
diff --git a/uni-app/src/app/locale/zh-Hans/pages.member.withdrawal_detail.json b/uni-app/src/app/locale/zh-Hans/pages.member.withdrawal_detail.json
new file mode 100644
index 00000000..115ee8a6
--- /dev/null
+++ b/uni-app/src/app/locale/zh-Hans/pages.member.withdrawal_detail.json
@@ -0,0 +1,10 @@
+{
+  "recharge": "充值",
+  "cashOut": "提现",
+  "balanceDetail": "余额明细",
+  "accountBalance": "账户余额（元）",
+  "balance": "余额（元）",
+  "money": "可提现余额（元）",
+  "availableBalance": "可用余额",
+  "yuan": "元"
+}
diff --git a/uni-app/src/app/locale/zh-Hans/pages.setting.index.json b/uni-app/src/app/locale/zh-Hans/pages.setting.index.json
new file mode 100644
index 00000000..fc3ef4b7
--- /dev/null
+++ b/uni-app/src/app/locale/zh-Hans/pages.setting.index.json
@@ -0,0 +1,6 @@
+{
+    "personalSettings": "个人设置",
+    "switchLang": "切换语言",
+    "version": "版本号",
+    "logout": "退出登录"
+}
\ No newline at end of file
diff --git a/uni-app/src/app/pages/auth/agreement.vue b/uni-app/src/app/pages/auth/agreement.vue
new file mode 100644
index 00000000..65fbc931
--- /dev/null
+++ b/uni-app/src/app/pages/auth/agreement.vue
@@ -0,0 +1,45 @@
+<template>
+    <view :style="themeColor()" >
+        <view v-if="agreement && agreement.content" class="py-[var(--top-m)] px-[var(--sidebar-m)]">
+            <u-parse :content="agreement.content" :tagStyle="{img: 'vertical-align: top;'}"></u-parse>
+        </view>
+		
+	   <view  v-else-if="!loading" class="min-h-[100vh] bg-[var(--page-bg-color)] overflow-hidden">
+		   <view class="empty-page">
+			   <image class="img" :src="img('static/resource/images/empty.png')" model="aspectFit" />
+			   <view class="desc">暂无协议</view>
+		   </view>
+	   </view>
+    </view>
+</template>
+<script lang="ts" setup>
+import { ref } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
+import { getAgreementInfo } from '@/app/api/system'
+import { img, goback } from '@/utils/common'
+
+const agreement = ref(null)
+const loading = ref(true)
+onLoad((option: any)=> {
+    if(option.key){
+        getAgreementInfo(option.key).then((res: any) => {
+            agreement.value = res.data
+            loading.value  = false 
+            uni.setNavigationBarTitle({
+                title: res.data.agreement_key_name
+            })
+        }).catch(()=>{
+            loading.value  = false 
+        })
+    }else{
+        let parameter = {
+	        url: '/app/pages/index/index',
+            title: '协议类型不存在',
+            mode: 'reLaunch'
+        };
+        goback(parameter)
+    }
+})
+</script>
+
+<style lang="scss"></style>
diff --git a/uni-app/src/app/pages/auth/bind.vue b/uni-app/src/app/pages/auth/bind.vue
new file mode 100644
index 00000000..334a6eef
--- /dev/null
+++ b/uni-app/src/app/pages/auth/bind.vue
@@ -0,0 +1,178 @@
+<template>
+    <view class="w-screen h-screen flex flex-col" :style="themeColor()">
+		<!-- #ifdef MP-WEIXIN -->
+		<view :style="{'height':headerHeight}">
+			<top-tabbar :data="param" :scrollBool="topTabarObj.getScrollBool()" class="top-header"/>
+		</view>
+		<!-- #endif -->
+		<view class="mx-[60rpx]">
+			<view class="pt-[140rpx] text-[50rpx] text-[#333]">{{t('bindMobile')}}</view>
+			<view class="text-[26rpx] leading-[39rpx] text-[var(--text-color-light6)] mt-[16rpx] mb-[80rpx]">{{t('bindMobileTip')}}</view>
+			<u-form labelPosition="left" :model="formData" errorType='toast' :rules="rules" ref="formRef">
+				<view class="h-[90rpx] flex w-full items-center px-[30rpx] rounded-[var(--goods-rounded-mid)] box-border bg-[#F6F6F6]">
+					<u-form-item label="" prop="mobile" :border-bottom="false">
+					    <u-input v-model="formData.mobile" type="number" maxlength="11" border="none" :placeholder="t('mobilePlaceholder')" class="!bg-transparent" :disabled="real_name_input" fontSize="26rpx" placeholderClass="!text-[var(--text-color-light9)] text-[26rpx]"/>
+					</u-form-item>
+				</view>
+				<view class="h-[90rpx] flex w-full items-center px-[30rpx] rounded-[var(--goods-rounded-mid)] box-border bg-[#F6F6F6] mt-[40rpx]">
+				    <u-form-item label="" prop="mobile_code" :border-bottom="false">
+				        <u-input v-model="formData.mobile_code" type="number" maxlength="4" border="none" :placeholder="t('codePlaceholder')" class="!bg-transparent" :disabled="real_name_input" fontSize="26rpx" placeholderClass="!text-[var(--text-color-light9)]">
+				            <template #suffix>
+				                <sms-code :mobile="formData.mobile" type="bind_mobile" v-model="formData.mobile_key"></sms-code>
+				            </template>
+				        </u-input>
+				    </u-form-item>
+				</view>
+			</u-form>
+			<view class="mt-[100rpx]">
+				<view v-if="config.agreement_show" class="flex items-center mb-[20rpx] py-[10rpx]" @click.stop="agreeChange">
+					<u-checkbox-group @change="agreeChange">
+						<u-checkbox activeColor="var(--primary-color)" :checked="isAgree" shape="circle" size="24rpx" :customStyle="{ 'marginTop': '4rpx' }" />
+					</u-checkbox-group>
+					<view class="text-[24rpx] text-[var(--text-color-light6)] flex items-center flex-wrap">
+						<text>{{ t('agreeTips') }}</text>
+						<text @click.stop="redirect({ url: '/app/pages/auth/agreement?key=privacy' })" class="text-primary">《{{t('privacyAgreement')}}》</text>
+						<text>{{ t('and') }}</text>
+						<text @click.stop="redirect({ url: '/app/pages/auth/agreement?key=service' })" class="text-primary">《{{t('userAgreement')}}》</text>
+					</view>
+				</view>
+				<button class="w-full h-[80rpx] !bg-[var(--primary-color)] text-[26rpx] rounded-[40rpx] leading-[80rpx] font-500 !text-[#fff]" @click="handleBind">{{t('bind')}}</button>
+			</view>
+		</view>
+    </view>
+</template>
+
+<script setup lang="ts">
+    import { ref, reactive, computed, nextTick } from 'vue'
+    import { t } from '@/locale'
+    import { bind } from '@/app/api/auth'
+    import { bindMobile } from '@/app/api/member'
+    import useMemberStore from '@/stores/member'
+    import useConfigStore from '@/stores/config'
+    import { useLogin } from '@/hooks/useLogin'
+    import { redirect,pxToRpx } from '@/utils/common'
+    import { onLoad } from '@dcloudio/uni-app'
+	import { topTabar } from '@/utils/topTabbar'
+
+	let menuButtonInfo: any = {};
+	// 如果是小程序，获取右上角胶囊的尺寸信息，避免导航栏右侧内容与胶囊重叠(支付宝小程序非本API，尚未兼容)
+	// #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+	menuButtonInfo = uni.getMenuButtonBoundingClientRect();
+	// #endif
+	/********* 自定义头部 - start ***********/
+	const topTabarObj = topTabar()
+	let param = topTabarObj.setTopTabbarParam({title:'',topStatusBar:{bgColor: '#fff',textColor: '#333'}})
+	/********* 自定义头部 - end ***********/
+	const headerHeight = computed(()=>{
+		return Object.keys(menuButtonInfo).length ? pxToRpx(Number(menuButtonInfo.height)) + pxToRpx(menuButtonInfo.top) + pxToRpx(8)+'rpx':'auto'
+	})
+
+    const memberStore = useMemberStore()
+    const info = computed(() => memberStore.info)
+
+    const config = computed(() => {
+        return useConfigStore().login
+    })
+
+    const loading = ref(false)
+    const isAgree = ref(false)
+
+    const formData: any = reactive({
+        mobile: '',
+        mobile_code: '',
+        mobile_key: ''
+    })
+
+	const real_name_input = ref(true);
+
+    const wxPrivacyPopupRef:any = ref(null)
+
+    onLoad(() => {
+		// 防止浏览器自动填充
+		setTimeout(()=>{
+			real_name_input.value = false;
+		},800)
+        // #ifdef MP
+        nextTick(()=>{
+            if(wxPrivacyPopupRef.value) wxPrivacyPopupRef.value.proactive();
+        })
+        // #endif
+
+	    uni.getStorageSync('openid') && (Object.assign(formData, { openid: uni.getStorageSync('openid') }))
+	    uni.getStorageSync('pid') && (Object.assign(formData, { pid: uni.getStorageSync('pid') }))
+	    uni.getStorageSync('unionid') && (Object.assign(formData, { unionid: uni.getStorageSync('unionid') }))
+	});
+
+    const rules = {
+        'mobile': [
+            {
+                type: 'string',
+                required: true,
+                message: t('mobilePlaceholder'),
+                trigger: ['blur', 'change'],
+            },
+            {
+                validator(rule: any, value: any, callback: any) {
+                    let mobile = /^1[3-9]\d{9}$/;
+                    if (!mobile.test(value)){
+                        callback(new Error('请输入正确的手机号'))
+                    } else {
+                        callback()
+                    }
+                },
+                message: t('mobileError'),
+                trigger: ['change', 'blur'],
+            }
+        ],
+        'mobile_code': {
+            type: 'string',
+            required: true,
+            message: t('codePlaceholder'),
+            trigger: ['blur', 'change']
+        }
+    }
+
+    const agreeChange = () => {
+        isAgree.value = !isAgree.value
+    }
+
+    const agreeTips = () => {
+	    uni.showToast({ title: t('isAgreeTips'), icon: 'none' })
+    }
+
+    const formRef: any = ref(null)
+
+    const handleBind = () => {
+        formRef.value.validate().then(() => {
+            if (loading.value) return
+            loading.value = true
+
+            const request = info.value ? bindMobile : bind
+
+            request(formData).then((res: any) => {
+                if (info.value) {
+                    memberStore.getMemberInfo()
+                    redirect({ url: '/app/pages/member/personal', mode: 'redirectTo' })
+                } else {
+                    memberStore.setToken(res.data.token)
+                    useLogin().handleLoginBack()
+                }
+            }).catch(() => {
+                loading.value = false
+            })
+        })
+    }
+</script>
+
+<style lang="scss" scoped>
+	:deep(.u-input){
+		background-color: transparent !important;
+	}
+	:deep(.u-form-item){
+		flex:1;
+		.u-line{
+			display:none;
+		}
+	}
+</style>
+
diff --git a/uni-app/src/app/pages/auth/index.vue b/uni-app/src/app/pages/auth/index.vue
new file mode 100644
index 00000000..db3d3233
--- /dev/null
+++ b/uni-app/src/app/pages/auth/index.vue
@@ -0,0 +1,356 @@
+<template>
+	<view class="w-screen h-screen" :style="themeColor()">
+		<view class="w-screen h-screen" :style="warpStyle">
+			<!-- #ifdef MP-WEIXIN -->
+			<view :style="{'height':headerHeight}">
+				<top-tabbar :data="param" :scrollBool="topTabarObj.getScrollBool()" class="top-header"/>
+			</view>
+			<!-- #endif -->
+			<view class="mx-[var(--sidebar-m)] px-[var(--pad-sidebar-m)]">
+				<view class="pt-[154rpx] flex justify-center">
+					<view v-if="systemStore.site?.front_end_logo" class="h-[90rpx] w-[300rpx]">
+						<image class="h-[90rpx] w-[300rpx]" :src="img(systemStore.site?.front_end_logo)" mode="aspectFit"/>
+					</view>
+					<view v-else-if="systemStore.site?.front_end_icon" class="h-[250rpx] w-[250rpx]">
+						<image class="h-[250rpx] w-[250rpx]" :src="img(systemStore.site?.front_end_icon)" mode="aspectFit"/>
+					</view>
+					<view v-else class="h-[90rpx] w-[300rpx]"></view>
+				</view>
+				<view class="text-[var(--text-color-light6)]] text-[28rpx] text-center leading-[34rpx] min-h-[34rpx] mt-[40rpx]">{{ loginConfig.desc }}</view>
+				<view class="mt-[181rpx]">
+
+					<!-- #ifdef H5 -->
+					<!-- 微信公众号快捷登录，开启自动注册的情况下才能使用 -->
+					<view v-if="isWeixinBrowser() && loginConfig.is_auth_register" class="w-full flex items-center justify-center mb-[40rpx]">
+						<button class="w-[630rpx] h-[88rpx] !mx-[0] !bg-[var(--primary-color)] text-[26rpx] rounded-[44rpx] leading-[88rpx] font-500 !text-[#fff]" @click="oneClickLogin()">{{t('quickLoginOrLogout')}}</button>
+					</view>
+					<!-- #endif -->
+
+					<!-- #ifdef MP-WEIXIN -->
+					<!-- 微信小程序快捷登录 -->
+
+					<!-- 优先显示第三方登录/注册 -->
+					<view class="w-full flex items-center justify-center mb-[40rpx]" v-if="loginConfig.is_auth_register">
+
+						<!-- 开启强制绑定手机号或者手机号登录的情况，排除强制获取用户信息的情况（is_force_access_user_info为0） -->
+						<button v-if="!wapMemberMobile && loginConfig.is_bind_mobile && !loginConfig.is_force_access_user_info"
+						class="w-[630rpx] h-[88rpx] !bg-[var(--primary-color)] !mx-[0] text-[26rpx] rounded-[44rpx] leading-[88rpx] font-500 !text-[#fff]"
+						:open-type="openType" @getphonenumber="mobileAuth" @click="checkWxPrivacy">{{t('quickLoginOrLogout')}}</button>
+
+						<!-- 授权登录/注册 -->
+						<button v-else class="w-[630rpx] h-[88rpx] !mx-[0] !bg-[var(--primary-color)] text-[26rpx] rounded-[44rpx] leading-[88rpx] font-500 !text-[#fff]" @click="oneClickLogin()">{{t('quickLoginOrLogout')}}</button>
+
+					</view>
+
+					<!-- 未开启第三方登录/注册，但是开启了手机号登录，则一键手机号登录/注册 -->
+					<view class="w-full flex items-center justify-center mb-[40rpx]" v-else-if="!loginConfig.is_auth_register && loginConfig.is_mobile">
+						<button v-if="!wapMemberMobile" class="w-[630rpx] h-[88rpx] !bg-[var(--primary-color)] !mx-[0] text-[26rpx] rounded-[44rpx] leading-[88rpx] font-500 !text-[#fff]" :open-type="openType" @getphonenumber="mobileAuth" @click="checkWxPrivacy('mobileAuth')">{{t('quickLoginOrLogout')}}</button>
+						<button v-else class="w-[630rpx] h-[88rpx] !bg-[var(--primary-color)] !mx-[0] text-[26rpx] rounded-[44rpx] leading-[88rpx] font-500 !text-[#fff]" @click="oneClickLogin()">{{t('quickLoginOrLogout')}}</button>
+					</view>
+
+					<!-- 小程序隐私协议 -->
+					<wx-privacy-popup ref="wxPrivacyPopupRef"></wx-privacy-popup>
+
+					<!-- #endif -->
+
+					<!-- 手机号登录 -->
+					<view v-if="loginConfig.is_mobile" class="mb-[40rpx] w-full flex items-center justify-center">
+						<!-- #ifdef H5 -->
+						<button class="w-[630rpx] h-[88rpx] !mx-[0] !bg-[#fff] border-[var(--primary-color)] border-solid border-[2rpx] text-[26rpx] rounded-[44rpx] leading-[84rpx] !text-[var(--primary-color)]" @click="redirect({ url: '/app/pages/auth/login',param:{type:'mobile'}})">{{ t('mobileLogin') }}</button>
+						<!-- #endif -->
+
+						<!-- #ifdef MP-WEIXIN -->
+						<button v-if="authRegisterLogin && loginConfig.is_mobile" class="w-[630rpx] h-[88rpx] !mx-[0] !bg-[#fff] border-[var(--primary-color)] border-solid border-[2rpx] text-[26rpx] rounded-[44rpx] leading-[84rpx] !text-[var(--primary-color)]" @click="redirect({ url: '/app/pages/auth/login',param:{type:'mobile'}})">{{ t('otherMobileLogin') }}</button>
+						<button v-else class="w-[630rpx] h-[88rpx] !mx-[0] !bg-[#fff] border-[var(--primary-color)] border-solid border-[2rpx] text-[26rpx] rounded-[44rpx] leading-[84rpx] !text-[var(--primary-color)]" @click="redirect({ url: '/app/pages/auth/login',param:{type:'mobile'}})">{{ t('mobileLogin') }}</button>
+						<!-- #endif -->
+					</view>
+
+					<view v-else-if="!loginConfig.is_mobile && loginConfig.is_username" class="w-full flex items-center justify-center">
+						<button class="w-[630rpx] h-[88rpx] !mx-[0] !bg-[#fff] !border-[var(--primary-color)] border-solid border-[2rpx] text-[26rpx] rounded-[44rpx] leading-[84rpx] !text-[var(--primary-color)]" @click="redirect({ url: '/app/pages/auth/login',param:{type:'username'}})">{{t('accountLogin')}}</button>
+					</view>
+					<view v-if="loginConfig.agreement_show" class="w-full flex items-center justify-center mt-[28rpx]">
+						<view  class="flex items-center justify-center mt-[28rpx] py-[14rpx] px-[50rpx]" @click.stop="agreeChange">
+							<u-checkbox-group @change="agreeChange">
+								<u-checkbox activeColor="var(--primary-color)" :checked="isAgree" shape="circle" size="30rpx"  />
+							</u-checkbox-group>
+							<view class="text-[24rpx] text-[var(--text-color-light6)] flex items-center flex-wrap leading-[30rpx]">
+								<text>{{ t('agreeTips') }}</text>
+								<text @click.stop="redirect({ url: '/app/pages/auth/agreement?key=privacy' })" class="text-primary">《{{t('privacyAgreement')}}》</text>
+								<text>{{ t('and') }}</text>
+								<text @click.stop="redirect({ url: '/app/pages/auth/agreement?key=service' })" class="text-primary">《{{t('userAgreement')}}》</text>
+							</view>
+						</view>
+					</view>
+
+					<view class="footer w-full" v-if="loginConfig.is_mobile && loginConfig.is_username">
+						<view class="text-[26rpx] leading-[36rpx] text-[333] text-center mb-[30rpx] font-400">{{t('otherLogin')}}</view>
+						<view class="flex justify-center">
+							<view class="h-[80rpx] w-[80rpx] text-center leading-[78rpx] border-[2rpx] text-[#FF7100] rounded-[50%] border-solid border-[#ddd] nc-iconfont nc-icon-wodeV6mm3 text-[46rpx] overflow-hidden" @click="redirect({ url: '/app/pages/auth/login',param:{type:'username'}})"></view>
+						</view>
+						<view class="text-[24rpx] leading-[36rpx] text-[var(--text-color-light9)] text-center font-400 mt-[30rpx]">{{t('accountLogin')}}</view>
+					</view>
+
+				</view>
+			</view>
+		</view>
+		<uni-popup ref="popupRef" type="dialog">
+		    <view class="bg-[#fff] flex flex-col justify-between w-[600rpx] min-h-[280rpx] rounded-[var(--rounded-big)] box-border px-[35rpx] pt-[35rpx] pb-[8rpx] relative">
+				<view class="flex justify-center">
+					<text class="text-[33rpx] font-700"> 用户协议及隐私保护</text>
+				</view>
+		        <view class="flex items-center mb-[20rpx] mt-[20rpx] py-[20rpx]" @click.stop="agreeChange">
+					<view class="text-[26rpx] text-[var(--text-color-light6)] flex items-center flex-wrap">
+						<text>{{ t('agreeTips') }}</text>
+						<text @click.stop="redirect({ url: '/app/pages/auth/agreement?key=privacy' })" class="text-primary">《{{t('privacyAgreement')}}》</text>
+						<text>{{ t('and') }}</text>
+						<text @click.stop="redirect({ url: '/app/pages/auth/agreement?key=service' })" class="text-primary">《{{t('userAgreement')}}》</text>
+					</view>
+		        </view>
+				<view class="">
+					<view class="w-[100%] flex justify-center bg-[var(--primary-color)] h-[70rpx] leading-[70rpx] text-[#fff] text-[26rpx] border-[0] font-500 rounded-[50rpx]"  @click="dialogConfirm">同意并登录</view>
+					<view class="w-[100%] flex justify-center h-[70rpx] leading-[70rpx] text-[#999] text-[24rpx] border-[0] font-500 rounded-[50rpx]" @click="dialogClose">不同意</view>
+				</view>
+		    </view>
+		</uni-popup>
+
+		<!-- #ifdef MP-WEIXIN -->
+		<information-filling ref="infoFill"></information-filling>
+		<!-- #endif -->
+
+		<!-- 强制绑定手机号 -->
+		<bind-mobile ref="bindMobileRef" />
+	</view>
+</template>
+
+<script setup lang="ts">
+	import { ref, computed,nextTick } from 'vue'
+	import { img,isWeixinBrowser,getToken,redirect,pxToRpx } from '@/utils/common'
+	import { t } from '@/locale'
+	import { useLogin } from '@/hooks/useLogin'
+	import useConfigStore from '@/stores/config'
+	import useMemberStore from '@/stores/member'
+	import { onLoad,onShow } from '@dcloudio/uni-app'
+	import { topTabar } from '@/utils/topTabbar'
+	import useSystemStore from '@/stores/system'
+	import { getMobile } from '@/app/api/member'
+
+	let menuButtonInfo: any = {};
+	// 如果是小程序，获取右上角胶囊的尺寸信息，避免导航栏右侧内容与胶囊重叠(支付宝小程序非本API，尚未兼容)
+	// #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+	menuButtonInfo = uni.getMenuButtonBoundingClientRect();
+	// #endif
+	/********* 自定义头部 - start ***********/
+	const topTabarObj = topTabar()
+	let param = topTabarObj.setTopTabbarParam({title:'',topStatusBar:{textColor: '#333'}})
+	/********* 自定义头部 - end ***********/
+	const headerHeight = computed(()=>{
+		return Object.keys(menuButtonInfo).length ? pxToRpx(Number(menuButtonInfo.height)) + pxToRpx(menuButtonInfo.top) + pxToRpx(8)+'rpx':'auto'
+	})
+	const wapMemberMobile = ref('');
+	const isAgree = ref(false)
+
+	const configStore = useConfigStore()
+	const loginConfig = computed(() => {
+		return configStore.login
+	})
+	const login = useLogin()
+
+	const memberStore = useMemberStore()
+	const memberInfo: any = computed(()=>{
+		return useMemberStore().info;
+	})
+	const systemStore =useSystemStore()
+	const openType: any = computed(()=>{
+		if (!isAgree.value && configStore.login.agreement_show) return '';
+		return 'getPhoneNumber';
+	})
+
+	const wxPrivacyPopupRef:any = ref(null)
+	const authRegisterLogin: any = computed(()=> {
+		return !configStore.login.is_auth_register;
+	});
+	const loginLoading = ref(false)
+
+	const infoFill: any = ref(false)
+
+	const popupRef = ref()
+
+	const dialogClose =()=>{
+		popupRef.value.close();
+	}
+
+	const dialogConfirm =()=> {
+		isAgree.value = true
+		popupRef.value.close();
+		oneClickLogin()
+	}
+
+	// 强制绑定手机号
+	const bindMobileRef: any = ref(null)
+	const bindMobileFn = () =>{
+		bindMobileRef.value.open()
+	}
+
+	onLoad(async ()=> {
+		await systemStore.getSiteInfoFn()
+		await configStore.getLoginConfig()
+		let normalLogin = !configStore.login.is_username && !configStore.login.is_mobile && !configStore.login.is_bind_mobile; // 未开启普通登录
+
+		// #ifdef H5
+		if (isWeixinBrowser()) {
+			// 微信浏览器
+			if (!getToken() && normalLogin && authRegisterLogin.value) {
+				uni.showToast({ title: '商家未开启登录注册', icon: 'none' })
+				setTimeout(() => {
+					redirect({ url: '/app/pages/index/index', mode: 'reLaunch' })
+				}, 100)
+			}
+		} else {
+			// 普通浏览器
+			if (!getToken() && normalLogin) {
+				uni.showToast({ title: '商家未开启登录注册', icon: 'none' })
+				setTimeout(() => {
+					redirect({ url: '/app/pages/index/index', mode: 'reLaunch' })
+				}, 100)
+			}
+		}
+		// #endif
+
+		// #ifdef MP
+		if (!getToken() && normalLogin && authRegisterLogin.value) {
+			uni.showToast({ title: '商家未开启登录注册', icon: 'none' })
+			setTimeout(() => {
+				redirect({ url: '/app/pages/index/index', mode: 'reLaunch' })
+			}, 100)
+			return;
+		}
+		wapMemberMobile.value = uni.getStorageSync('wap_member_mobile');
+		nextTick(() => {
+			if (wxPrivacyPopupRef.value) wxPrivacyPopupRef.value.proactive();
+		})
+
+		// #endif
+	})
+
+	onShow(()=> {
+		loginLoading.value = false;
+	})
+
+	const warpStyle = computed(()=>{
+		var style = '';
+		if(configStore.login.bg_url){
+			style += 'background-image:url(' + img(configStore.login.bg_url) + ');';
+			style += 'background-size: 100%;';
+			style += 'background-position: top;';
+			style += 'background-repeat: no-repeat;';
+		}
+		return style
+	})
+
+	// 检测是否同意小程序隐私协议和登录政策协议
+	const checkWxPrivacy = (status: any = '')=> {
+		if (!isAgree.value && configStore.login.agreement_show) {
+			// 针对微信小程序获取手机号特殊处理
+			if (status) {
+				uni.showToast({ title: t('isAgreeTips'), icon: 'none' })
+			} else {
+				popupRef.value.open();
+			}
+			return true;
+		}
+		return false;
+	}
+
+	// 一键登录
+	const oneClickLogin = (callback:any = null,data:any = null)=> {
+		if (checkWxPrivacy()) return;
+
+		if (loginLoading.value) return
+		loginLoading.value = true
+
+		if (!callback) {
+			callback = () => {
+				loginLoading.value = false
+			}
+		}
+
+		// #ifdef H5
+		wechatLogin();
+		// #endif
+
+		// 第三方平台自动登录
+		// #ifdef MP
+		weappLogin(callback, data)
+		// #endif
+	}
+
+	// 微信公众登录
+	const wechatLogin = ()=> {
+		if (isWeixinBrowser()) {
+			let loginConfig = uni.getStorageSync('login_config')
+			if (loginConfig.is_auth_register) {
+				// 开启强制绑定手机号，必须填写才能注册
+				if (loginConfig.is_bind_mobile) {
+					bindMobileFn();
+				} else if (loginConfig.is_force_access_user_info) {
+					// 开启强制获取用户信息
+					login.getAuthCode({ scopes: 'snsapi_userinfo' }) // 强制获取用户信息
+				} else if (!loginConfig.is_force_access_user_info) {
+					// 关闭强制获取用户信息，昵称随机生成
+					login.getAuthCode({ scopes: 'snsapi_base' }) // 静默获取
+				}
+			}
+			loginLoading.value = false
+		}
+	}
+
+	// 微信小程序登录
+	const weappLogin = (successCallback: any,data: any)=> {
+		let loginConfig = uni.getStorageSync('login_config')
+		let member_exist = uni.getStorageSync('member_exist')
+		if(loginConfig.is_auth_register && loginConfig.is_force_access_user_info && !member_exist) {
+			infoFill.value.show = true
+			loginLoading.value = false
+		}else {
+			data = data || {};
+			login.getAuthCode({ backFlag: true, successCallback, ...data })
+		}
+	}
+
+	const agreeChange = () => {
+		isAgree.value = !isAgree.value
+	}
+
+	const mobileAuth = (e: any) => {
+		if (e.detail.errMsg == 'getPhoneNumber:ok') {
+			oneClickLogin((data: any) => {
+				if (!data.mobile) {
+					memberStore.bindMobile(e);
+				} else {
+					uni.setStorageSync('wap_member_mobile', memberInfo.value.mobile) // 存储会员手机号，防止重复请求微信获取手机号接口
+				}
+				loginLoading.value = false
+			}, { mobile_code: e.detail.code });
+		}
+
+		if (e.detail.errno == 104) {
+			let msg = '用户未授权隐私权限';
+			uni.showToast({ title: msg, icon: 'none' })
+		}
+		if (e.detail.errMsg == "getPhoneNumber:fail user deny") {
+			let msg = '用户拒绝获取手机号码';
+			uni.showToast({ title: msg, icon: 'none' })
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.footer{
+		margin-top:200rpx;
+		padding-bottom:calc(151rpx + constant(safe-area-inset-bottom));
+		padding-bottom:calc(151rpx + env(safe-area-inset-bottom));
+	}
+	:deep(.u-checkbox){
+		margin:0 !important;
+	}
+</style>
diff --git a/uni-app/src/app/pages/auth/login.vue b/uni-app/src/app/pages/auth/login.vue
new file mode 100644
index 00000000..87eff81c
--- /dev/null
+++ b/uni-app/src/app/pages/auth/login.vue
@@ -0,0 +1,328 @@
+<template>
+    <view class="w-screen h-screen flex flex-col" :style="themeColor()" v-if="type">
+		<!-- #ifdef MP-WEIXIN -->
+		<view :style="{'height':headerHeight}">
+			<top-tabbar :data="param" :scrollBool="topTabarObj.getScrollBool()" class="top-header"/>
+		</view>
+		<!-- #endif -->
+		<view class="mx-[60rpx]">
+			<view class="pt-[140rpx] text-[44rpx] font-500 text-[#333]">{{ type == 'username' ? t('accountLogin') : t('mobileLogin') }}</view>
+			<view class="text-[26rpx] leading-[39rpx] text-[var(--text-color-light6)] mt-[16rpx] mb-[80rpx]">{{ type == 'username' ? t('accountLoginTip') : t('mobileLoginTip') }}</view>
+			<u-form labelPosition="left" :model="formData" errorType='toast' :rules="rules" ref="formRef">
+				<template v-if="type == 'username'">
+					<view class="h-[88rpx] flex w-full items-center px-[30rpx] rounded-[var(--goods-rounded-mid)] box-border bg-[#F6F6F6]">
+					<u-form-item label="" prop="username" :border-bottom="false">
+					    <u-input v-model="formData.username" border="none" maxlength="40" :placeholder="t('usernamePlaceholder')" autocomplete="off" class="!bg-transparent" :disabled="real_name_input" fontSize="26rpx" placeholderClass="!text-[var(--text-color-light9)] text-[26rpx]"/>
+					</u-form-item>
+					</view>
+					<view class="h-[88rpx] flex w-full items-center px-[30rpx] rounded-[var(--goods-rounded-mid)] box-border bg-[#F6F6F6] mt-[40rpx]">
+					    <u-form-item label="" prop="password" :border-bottom="false">
+					        <u-input v-model="formData.password" border="none" :password="isPassword" maxlength="40" :placeholder="t('passwordPlaceholder')" autocomplete="new-password" class="!bg-transparent" :disabled="real_name_input" fontSize="26rpx" placeholderClass="!text-[var(--text-color-light9)] text-[26rpx]">
+								<template #suffix>
+									<view class="" @click="changePassword"  v-if="formData.password">
+										<u-icon :name="isPassword?'eye-off':'eye-fill'" color="#b9b9b9" size="20"></u-icon>
+									</view>
+								</template>
+							</u-input>
+					    </u-form-item>
+					</view>
+				</template>
+				<template v-if="type == 'mobile'">
+					<view class="h-[88rpx] flex w-full items-center px-[30rpx] rounded-[var(--goods-rounded-mid)] box-border bg-[#F6F6F6]">
+						<u-form-item label="" prop="mobile" :border-bottom="false">
+							<u-input v-model="formData.mobile" type="number" maxlength="11" border="none" :placeholder="t('mobilePlaceholder')" autocomplete="off" class="!bg-transparent" :disabled="real_name_input" fontSize="26rpx"  placeholderClass="!text-[var(--text-color-light9)] text-[26rpx]"/>
+						</u-form-item>
+					</view>
+					<view class="h-[88rpx] flex w-full items-center px-[30rpx] rounded-[var(--goods-rounded-mid)] box-border bg-[#F6F6F6] mt-[40rpx] text-[26rpx]">
+					    <u-form-item label="" prop="mobile_code" :border-bottom="false">
+					        <u-input v-model="formData.mobile_code" type="number" maxlength="4" border="none" class="!bg-transparent" fontSize="26rpx" :disabled="real_name_input" :placeholder="t('codePlaceholder')" placeholderClass="!text-[var(--text-color-light9)] text-[26rpx]">
+					            <template #suffix>
+					                <sms-code v-if="configStore.login.agreement_show" :mobile="formData.mobile" type="login" v-model="formData.mobile_key" :isAgree="isAgree"></sms-code>
+									<sms-code v-else :mobile="formData.mobile" type="login" v-model="formData.mobile_key"></sms-code>
+					            </template>
+					        </u-input>
+					    </u-form-item>
+					</view>
+				</template>
+			</u-form>
+			<view v-if="type == 'username'" class="text-right text-[24rpx] text-[var(--text-color-light9)] leading-[34rpx] mt-[20rpx]" @click="redirect({ url: '/app/pages/auth/resetpwd' })">{{t('resetpwd')}}</view>
+			<view :class="{'mt-[160rpx]':type != 'username','mt-[106rpx]':type == 'username'}">
+				<view v-if="configStore.login.agreement_show" class="flex items-center mb-[20rpx] py-[14rpx]" @click.stop="agreeChange">
+					<u-checkbox-group @change="agreeChange">
+						<u-checkbox activeColor="var(--primary-color)" :checked="isAgree" shape="circle" size="30rpx"/>
+					</u-checkbox-group>
+					<view class="text-[24rpx] text-[var(--text-color-light6)] flex items-center flex-wrap leading-[30rpx]">
+						<text>{{ t('agreeTips') }}</text>
+						<text @click.stop="redirect({ url: '/app/pages/auth/agreement?key=privacy' })" class="text-primary">《{{t('privacyAgreement')}}》</text>
+						<text>{{ t('and') }}</text>
+						<text @click.stop="redirect({ url: '/app/pages/auth/agreement?key=service' })" class="text-primary">《{{t('userAgreement')}}》</text>
+					</view>
+				</view>
+				<button class="w-full h-[80rpx] !bg-[var(--primary-color)] text-[26rpx] rounded-[40rpx] leading-[80rpx] font-500 !text-[#fff] !mx-[0]" :loadingText="t('logining')" @click="handleLogin">{{t('login')}}</button>
+				<view class="flex items-center justify-between mt-[30rpx]">
+					<view class="text-[26rpx] text-[var(--text-color-light6)] leading-[34rpx]" @click="setType" v-if="(type == 'username' && configStore.login.is_mobile) || (type == 'mobile' && configStore.login.is_username )">
+					{{ type == 'username' ? t('mobileLogin') : t('accountLogin') }}
+					</view>
+					<view class="text-[26rpx] text-[#333] leading-[34rpx]" @click="redirect({ url: '/app/pages/auth/register',param:{type} })">
+						<text>{{ t('noAccount') }},</text>
+						<text class="text-primary">{{ t('toRegister') }}</text>
+					</view>
+				</view>
+			</view>
+		</view>
+		<uni-popup ref="popupRef" type="dialog">
+		    <view class="bg-[#fff] flex flex-col justify-between w-[600rpx] min-h-[280rpx] rounded-[var(--rounded-big)] box-border px-[35rpx] pt-[35rpx] pb-[8rpx] relative">
+				<view class="flex justify-center">
+					<text class="text-[33rpx] font-700"> 用户协议及隐私保护</text>
+				</view>
+		        <view class="flex items-center mb-[20rpx] mt-[20rpx] py-[20rpx]" @click.stop="agreeChange">
+		          <view class="text-[26rpx] text-[var(--text-color-light6)] flex items-center flex-wrap">
+		            <text>{{ t('agreeTips') }}</text>
+		            <text @click.stop="redirect({ url: '/app/pages/auth/agreement?key=privacy' })" class="text-primary">《{{t('privacyAgreement')}}》</text>
+		            <text>{{ t('and') }}</text>
+		            <text @click.stop="redirect({ url: '/app/pages/auth/agreement?key=service' })" class="text-primary">《{{t('userAgreement')}}》</text>
+		          </view>
+		        </view>
+				<view class="">
+					<view class="w-[100%] flex justify-center bg-[var(--primary-color)] h-[70rpx] leading-[70rpx] text-[#fff] text-[26rpx] border-[0] font-500 rounded-[50rpx]"  @click="dialogConfirm">同意并登录</view>
+					<view class="w-[100%] flex justify-center h-[70rpx] leading-[70rpx] text-[#999] text-[24rpx] border-[0] font-500 rounded-[50rpx]" @click="dialogClose">不同意</view>
+				</view>
+		    </view>
+		</uni-popup>
+		<view class="footer w-full" v-if="isShowQuickLogin">
+			<view class="text-[26rpx] leading-[36rpx] text-[#333] text-center mb-[30rpx] font-400">{{t('oneClicklogin')}}</view>
+			<view class="flex justify-center">
+				<button class="h-[80rpx] w-[80rpx] text-[46rpx] !text-[#1AAB37] text-center !p-0 !bg-transparent leading-[79rpx] border-[2rpx] rounded-[50%] border-solid border-[#ddd] nc-iconfont nc-icon-weixinV6mm overflow-hidden" @click="toLink"></button>
+			</view>
+		</view>
+	</view>
+</template>
+<script setup lang="ts">
+	import { ref, reactive, computed, onMounted } from 'vue'
+	import { usernameLogin, mobileLogin } from '@/app/api/auth'
+	import useMemberStore from '@/stores/member'
+	import useConfigStore from '@/stores/config'
+	import { useLogin } from '@/hooks/useLogin'
+	import { t } from '@/locale'
+	import { redirect,getToken,pxToRpx,isWeixinBrowser } from '@/utils/common'
+	import { onLoad } from '@dcloudio/uni-app';
+	import { topTabar } from '@/utils/topTabbar'
+
+	let menuButtonInfo: any = {};
+	// 如果是小程序，获取右上角胶囊的尺寸信息，避免导航栏右侧内容与胶囊重叠(支付宝小程序非本API，尚未兼容)
+	// #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+	menuButtonInfo = uni.getMenuButtonBoundingClientRect();
+	// #endif
+	/********* 自定义头部 - start ***********/
+	const topTabarObj = topTabar()
+	const param = topTabarObj.setTopTabbarParam({title:'',topStatusBar:{bgColor: '#fff',textColor: '#333'}})
+	/********* 自定义头部 - end ***********/
+	const headerHeight = computed(()=>{
+		return Object.keys(menuButtonInfo).length ? pxToRpx(Number(menuButtonInfo.height)) + pxToRpx(menuButtonInfo.top) + pxToRpx(8)+'rpx':'auto'
+	})
+	const real_name_input = ref(true);
+	const memberStore = useMemberStore()
+	const configStore = useConfigStore()
+	const type = ref('')
+	const isAgree = ref(false)
+	const isShowQuickLogin = ref(false) // 是否显示快捷登录
+	const popupRef = ref()
+	const isPassword = ref(true)
+
+	const changePassword =()=>{
+		isPassword.value = !isPassword.value
+	}
+
+	const dialogClose =()=>{
+		popupRef.value.close();
+	}
+
+	const dialogConfirm =()=>{
+		isAgree.value=true
+		popupRef.value.close();
+		handleLogin()
+	}
+
+	onLoad(async (option: any)=> {
+		await configStore.getLoginConfig()
+		if (!getToken() && !configStore.login.is_username && !configStore.login.is_mobile) {
+			uni.showToast({ title: '商家未开启普通账号登录', icon: 'none' })
+			setTimeout(() => {
+				redirect({ url: '/app/pages/index/index', mode: 'reLaunch' })
+			}, 100)
+		}
+		if (option.type) {
+			if (option.type == 'mobile') {
+				if (configStore.login.is_mobile) {
+					type.value = option.type
+					uni.getStorageSync('pid') && (Object.assign(formData, { pid: uni.getStorageSync('pid') }))
+				}
+			} else if (option.type == 'username' && configStore.login.is_username) {
+				type.value = option.type
+			}
+		} else {
+			if (configStore.login.is_username) {
+				type.value = 'username'
+			} else if (configStore.login.is_mobile) {
+				type.value = 'mobile'
+			}
+
+		}
+
+		// 如果只开启了账号密码登录，那么就不需要跳转到登录中间页了
+
+		// #ifdef MP-WEIXIN
+		if (configStore.login.is_username && !configStore.login.is_mobile && !configStore.login.is_auth_register) {
+			isShowQuickLogin.value = false;
+		} else {
+			isShowQuickLogin.value = true;
+		}
+		// #endif
+
+		// #ifdef H5
+		if (isWeixinBrowser()) {
+			// 微信浏览器
+			if (configStore.login.is_username && !configStore.login.is_mobile && !configStore.login.is_auth_register) {
+				isShowQuickLogin.value = false;
+			} else {
+				isShowQuickLogin.value = true;
+			}
+		} else {
+			// 普通浏览器
+			if (configStore.login.is_username && !configStore.login.is_mobile) {
+				isShowQuickLogin.value = false;
+			} else {
+				isShowQuickLogin.value = true;
+			}
+		}
+		// #endif
+	})
+
+	const formData = reactive({
+	    username: '',
+	    password: '',
+	    mobile: '',
+	    mobile_code: '',
+	    mobile_key: ''
+	})
+
+	onMounted(() => {
+		// 防止浏览器自动填充
+		setTimeout(()=>{
+			real_name_input.value = false;
+		},800)
+	});
+
+	const agreeChange = () => {
+		isAgree.value = !isAgree.value
+	}
+
+	const setType = ()=> {
+		type.value = type.value == 'username' ? 'mobile' : 'username'
+	}
+
+	const loading = ref(false)
+
+	const rules = computed(() => {
+	    return {
+	        'username': {
+	            type: 'string',
+	            required: type.value == 'username',
+	            message: t('usernamePlaceholder'),
+	            trigger: ['blur', 'change'],
+	        },
+	        'password': {
+	            type: 'string',
+	            required: type.value == 'username',
+	            message: t('passwordPlaceholder'),
+	            trigger: ['blur', 'change']
+	        },
+	        'mobile': [
+	            {
+	                type: 'string',
+	                required: type.value == 'mobile',
+	                message: t('mobilePlaceholder'),
+	                trigger: ['blur', 'change'],
+	            },
+	            {
+	                validator(rule: any, value: any) {
+	                    if (type.value != 'mobile') return true
+	                    else return uni.$u.test.mobile(value)
+	                },
+	                message: t('mobileError'),
+	                trigger: ['change', 'blur'],
+	            }
+	        ],
+	        'mobile_code': {
+	            type: 'string',
+	            required: type.value == 'mobile',
+	            message: t('codePlaceholder'),
+	            trigger: ['blur', 'change']
+	        }
+	    }
+	})
+
+	const formRef: any = ref(null)
+
+	const handleLogin = () => {
+	    formRef.value.validate().then(() => {
+	        if (configStore.login.agreement_show && !isAgree.value) {
+				popupRef.value.open();
+	            // uni.showToast({ title: t('isAgreeTips'), icon: 'none' });
+	            return false;
+	        }
+
+	        if (loading.value) return
+	        loading.value = true
+
+	        const login = type.value == 'username' ? usernameLogin : mobileLogin
+
+	        login(formData).then((res: any) => {
+	            memberStore.setToken(res.data.token)
+	            if(configStore.login.is_bind_mobile && !res.data.mobile){
+	                uni.setStorageSync('isbindmobile', true)
+	            }
+	            useLogin().handleLoginBack()
+	        }).catch(() => {
+	            loading.value = false
+	        })
+	    })
+	}
+
+	const toLink = ()=> {
+		const pages = getCurrentPages(); // 获取页面栈
+		if (pages.length > 1) {
+			const currentPage = pages[pages.length - 2].route;
+			if (currentPage == 'app/pages/auth/index') {
+				// 返回上一页
+				uni.navigateBack({
+					delta: 1 // 默认值是1，表示返回的页面层数
+				});
+			}else{
+				redirect({ url: '/app/pages/auth/index',mode:'redirectTo' })
+			}
+		}else{
+			redirect({ url: '/app/pages/auth/index',mode:'redirectTo' })
+		}
+
+	}
+</script>
+<style lang="scss" scoped>
+	:deep(.u-input){
+		background-color: transparent !important;
+	}
+	:deep(.u-checkbox){
+		margin: 0 !important;
+	}
+	:deep(.u-form-item){
+		flex:1;
+		.u-line{
+			display:none;
+		}
+	}
+	.footer{
+		margin-top:200rpx;
+		padding-bottom:calc(151rpx + constant(safe-area-inset-bottom));
+		padding-bottom:calc(151rpx + env(safe-area-inset-bottom));
+	}
+</style>
diff --git a/uni-app/src/app/pages/auth/register.vue b/uni-app/src/app/pages/auth/register.vue
new file mode 100644
index 00000000..b0d46c01
--- /dev/null
+++ b/uni-app/src/app/pages/auth/register.vue
@@ -0,0 +1,342 @@
+<template>
+    <view class="w-screen h-screen flex flex-col" :style="themeColor()" v-if="type">
+		<!-- #ifdef MP-WEIXIN -->
+		<view :style="{'height':headerHeight}">
+			<top-tabbar :data="param" :scrollBool="topTabarObj.getScrollBool()" class="top-header"/>
+		</view>
+		<!-- #endif -->
+		<view class="mx-[60rpx]">
+			<view class="pt-[140rpx] text-[44rpx] font-500 text-[#333]">{{ type == 'username' ? t('usernameRegister') : t('mobileRegister') }}</view>
+			<view class="text-[26rpx] leading-[39rpx] text-[var(--text-color-light6)] mt-[16rpx] mb-[80rpx]">{{ type == 'username' ? t('usernameRegisterTip') : t('mobileRegisterTip') }}</view>
+			<u-form labelPosition="left" :model="formData" errorType='toast' :rules="rules" ref="formRef">
+				<template v-if="type == 'username'">
+					<view class="h-[88rpx] flex w-full items-center px-[30rpx] rounded-[var(--goods-rounded-mid)] box-border bg-[#F6F6F6]">
+						<u-form-item label="" prop="username" :border-bottom="false">
+							<u-input v-model="formData.username" border="none" maxlength="40" :placeholder="t('usernamePlaceholder')" class="!bg-transparent" :disabled="real_name_input" fontSize="26rpx" placeholderClass="!text-[var(--text-color-light9)] text-[26rpx]"/>
+						</u-form-item>
+					</view>
+					<view class="h-[88rpx] flex w-full items-center px-[30rpx] rounded-[var(--goods-rounded-mid)] box-border bg-[#F6F6F6] mt-[40rpx]">
+						<u-form-item label="" prop="password" :border-bottom="false">
+							<u-input v-model="formData.password" border="none" :password="isPassword" maxlength="40" :placeholder="t('passwordPlaceholder')" class="!bg-transparent" :disabled="real_name_input" fontSize="26rpx" placeholderClass="!text-[var(--text-color-light9)] text-[26rpx]">
+								<template #suffix>
+									<view class="" @click="changePassword" v-if="formData.password">
+										<u-icon :name="isPassword?'eye-off':'eye-fill'" color="#b9b9b9" size="20"></u-icon>
+									</view>
+								</template>
+							</u-input>
+						</u-form-item>
+					</view>
+					<view class="h-[88rpx] flex w-full items-center px-[30rpx] rounded-[var(--goods-rounded-mid)] box-border bg-[#F6F6F6] mt-[40rpx]">
+						<u-form-item label="" prop="confirm_password" :border-bottom="false">
+							<u-input v-model="formData.confirm_password" border="none" :password="isConfirmPassword" maxlength="40" :placeholder="t('confirmPasswordPlaceholder')" class="!bg-transparent" :disabled="real_name_input" fontSize="26rpx" placeholderClass="!text-[var(--text-color-light9)] text-[26rpx]">
+								<template #suffix>
+									<view class="" @click="changeConfirmPassword" v-if="formData.confirm_password">
+										<u-icon :name="isConfirmPassword?'eye-off':'eye-fill'" color="#b9b9b9" size="20"></u-icon>
+									</view>
+								</template>
+							</u-input>
+						</u-form-item>
+					</view>
+				</template>
+				<template v-if="type == 'mobile' || configStore.login.is_bind_mobile">
+					<view class="h-[88rpx] flex w-full items-center px-[30rpx] rounded-[var(--goods-rounded-mid)] box-border bg-[#F6F6F6] mt-[40rpx]">
+						<u-form-item label="" prop="mobile" :border-bottom="false">
+							<u-input v-model="formData.mobile" border="none" maxlength="11" :placeholder="t('mobilePlaceholder')" class="!bg-transparent" :disabled="real_name_input" fontSize="26rpx" placeholderClass="!text-[var(--text-color-light9)] text-[26rpx]"/>
+						</u-form-item>
+					</view>
+					<view class="h-[88rpx] flex w-full items-center px-[30rpx] rounded-[var(--goods-rounded-mid)] box-border bg-[#F6F6F6] mt-[40rpx]">
+						<u-form-item label="" prop="mobile_code" :border-bottom="false">
+							<u-input v-model="formData.mobile_code" border="none" maxlength="4" :placeholder="t('codePlaceholder')" class="!bg-transparent" :disabled="real_name_input" fontSize="26rpx" placeholderClass="!text-[var(--text-color-light9)] text-[26rpx]">
+								<template #suffix>
+									<sms-code v-if="configStore.login.agreement_show" :mobile="formData.mobile" type="login" v-model="formData.mobile_key" :isAgree="isAgree"></sms-code>
+									<sms-code v-else :mobile="formData.mobile" type="login" v-model="formData.mobile_key"></sms-code>
+								</template>
+							</u-input>
+						</u-form-item>
+					</view>
+				</template>
+				<template v-if="type == 'username'">
+					<view class="h-[88rpx] flex w-full items-center px-[30rpx] rounded-[var(--goods-rounded-mid)] box-border bg-[#F6F6F6] mt-[40rpx]">
+						<u-form-item label="" prop="captcha_code" :border-bottom="false">
+							<u-input v-model="formData.captcha_code" border="none" :placeholder="t('captchaPlaceholder')" class="!bg-transparent" :disabled="real_name_input" fontSize="26rpx" placeholderClass="!text-[var(--text-color-light9)] text-[26rpx]">
+								<template #suffix>
+									<image :src="captcha.image.value" class="h-[48rpx] w-[60rpx] ml-[20rpx]" mode="heightFix" @click="captcha.refresh()"></image>
+								</template>
+							</u-input>
+						</u-form-item>
+					</view>
+				</template>
+			</u-form>
+			<view class="mt-[160rpx]">
+				<view v-if="configStore.login.agreement_show" class="flex items-center mb-[20rpx] py-[14rpx]" @click.stop="agreeChange">
+					<u-checkbox-group @change="agreeChange">
+						<u-checkbox activeColor="var(--primary-color)" :checked="isAgree" shape="circle" size="30rpx" />
+					</u-checkbox-group>
+					<view class="text-[24rpx] text-[var(--text-color-light6)] flex items-center flex-wrap leading-[30rpx]">
+						<text>{{ t('agreeTips') }}</text>
+						<text @click.stop="redirect({ url: '/app/pages/auth/agreement?key=privacy' })" class="text-primary">《{{t('privacyAgreement')}}》</text>
+						<text>{{ t('and') }}</text>
+						<text @click.stop="redirect({ url: '/app/pages/auth/agreement?key=service' })" class="text-primary">《{{t('userAgreement')}}》</text>
+					</view>
+				</view>
+				<button class="w-full h-[80rpx] !bg-[var(--primary-color)] text-[26rpx] rounded-[40rpx] leading-[80rpx] font-500 !text-[#fff]" @click="handleRegister">{{t('register')}}</button>
+				<view class="flex items-center justify-between mt-[30rpx]">
+					<view class="text-[26rpx] text-[var(--text-color-light6)] leading-[34rpx]" v-if="registerType.length > 1" @click="type = type == 'username' ? 'mobile' : 'username' ">{{ type == 'username' ? t('mobileRegister') : t('usernameRegister') }}</view>
+					<view class="text-[26rpx] text-[#333] leading-[34rpx]" @click="toLink">
+						<text>{{ t('haveAccount') }},</text>
+						<text class="text-primary">{{ t('toLogin') }}</text>
+					</view>
+				</view>
+			</view>
+		</view>
+		<uni-popup ref="popupRef" type="dialog">
+		    <view class="bg-[#fff] flex flex-col justify-between w-[600rpx] min-h-[280rpx] rounded-[var(--rounded-big)] box-border px-[35rpx] pt-[35rpx] pb-[8rpx] relative">
+				<view class="flex justify-center">
+					<text class="text-[33rpx] font-700"> 用户协议及隐私保护</text>
+				</view>
+		        <view class="flex items-center mb-[20rpx] mt-[20rpx] py-[20rpx]" @click.stop="agreeChange">
+					<view class="text-[26rpx] text-[var(--text-color-light6)] flex items-center flex-wrap">
+						<text>{{ t('agreeTips') }}</text>
+						<text @click.stop="redirect({ url: '/app/pages/auth/agreement?key=privacy' })" class="text-primary">《{{t('privacyAgreement')}}》</text>
+						<text>{{ t('and') }}</text>
+						<text @click.stop="redirect({ url: '/app/pages/auth/agreement?key=service' })" class="text-primary">《{{t('userAgreement')}}》</text>
+					</view>
+		        </view>
+				<view class="">
+					<view class="w-[100%] flex justify-center bg-[var(--primary-color)] h-[70rpx] leading-[70rpx] text-[#fff] text-[26rpx] border-[0] font-500 rounded-[50rpx]"  @click="dialogConfirm">同意并注册</view>
+					<view class="w-[100%] flex justify-center h-[70rpx] leading-[70rpx] text-[#999] text-[24rpx] border-[0] font-500 rounded-[50rpx]" @click="dialogClose">不同意</view>
+				</view>
+		    </view>
+		</uni-popup>
+    </view>
+</template>
+
+<script setup lang="ts">
+    import { ref, reactive, computed, onMounted } from 'vue'
+    import { usernameRegister, mobileRegister } from '@/app/api/auth'
+    import useMemberStore from '@/stores/member'
+    import useConfigStore from '@/stores/config'
+    import { useLogin } from '@/hooks/useLogin'
+    import { useCaptcha } from '@/hooks/useCaptcha'
+    import { t } from '@/locale'
+    import { redirect, getToken,pxToRpx } from '@/utils/common'
+    import { onLoad } from '@dcloudio/uni-app';
+	import { topTabar } from '@/utils/topTabbar'
+
+	let menuButtonInfo: any = {};
+	// 如果是小程序，获取右上角胶囊的尺寸信息，避免导航栏右侧内容与胶囊重叠(支付宝小程序非本API，尚未兼容)
+	// #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+	menuButtonInfo = uni.getMenuButtonBoundingClientRect();
+	// #endif
+	/********* 自定义头部 - start ***********/
+	const topTabarObj = topTabar()
+	let param = topTabarObj.setTopTabbarParam({title:'',topStatusBar:{bgColor: '#fff',textColor: '#333'}})
+	/********* 自定义头部 - end ***********/
+	const headerHeight = computed(()=>{
+		return Object.keys(menuButtonInfo).length ? pxToRpx(Number(menuButtonInfo.height)) + pxToRpx(menuButtonInfo.top) + pxToRpx(8)+'rpx':'auto'
+	})
+    const formData = reactive({
+        username: '',
+        password: '',
+        confirm_password: '',
+        mobile: '',
+        mobile_code: '',
+        mobile_key: '',
+        captcha_key: '',
+        captcha_code: ''
+    })
+	const popupRef = ref()
+	const dialogClose =()=>{
+		popupRef.value.close();
+	}
+	const dialogConfirm =()=>{
+		isAgree.value=true
+		popupRef.value.close();
+		handleRegister()
+	}
+	const real_name_input = ref(true);
+	onMounted(() => {
+		// 防止浏览器自动填充
+		setTimeout(()=>{
+			real_name_input.value = false;
+		},800)
+	});
+	const isPassword = ref(true)
+	const isConfirmPassword = ref(true)
+	const changePassword =()=>{
+		isPassword.value = !isPassword.value
+	}
+
+	const changeConfirmPassword =()=>{
+		isConfirmPassword.value = !isConfirmPassword.value
+	}
+
+    const memberStore = useMemberStore()
+    const configStore = useConfigStore()
+	const loginType=ref('')
+
+    onLoad(async (option: any) => {
+	    await configStore.getLoginConfig()
+	    if (!getToken() && !configStore.login.is_username && !configStore.login.is_mobile && !configStore.login.is_bind_mobile) {
+		    uni.showToast({ title: '商家未开启普通账号注册', icon: 'none' })
+		    setTimeout(() => {
+			    redirect({ url: '/app/pages/index/index', mode: 'reLaunch' })
+		    }, 100)
+	    }
+	    uni.getStorageSync('openid') && (Object.assign(formData, { openid: uni.getStorageSync('openid') }))
+	    uni.getStorageSync('pid') && (Object.assign(formData, { pid: uni.getStorageSync('pid') }))
+
+	    if (configStore.login.is_username) {
+		    type.value = 'username'
+	    } else if ((configStore.login.is_mobile || configStore.login.is_bind_mobile)) {
+		    type.value = 'mobile'
+	    }
+	    loginType.value = option.type
+    })
+
+    const captcha = useCaptcha(formData)
+    captcha.refresh()
+
+    const loading = ref(false)
+
+    const type = ref('')
+	const agreeChange = () => {
+		isAgree.value = !isAgree.value
+	}
+    const registerType = computed(()=> {
+        const value = []
+        configStore.login.is_username && (value.push({ type: 'username', title: t('usernameRegister') }))
+        configStore.login.is_mobile && !configStore.login.is_bind_mobile && (value.push({ type: 'mobile', title: t('mobileRegister') }))
+        return value
+    })
+
+    const rules = computed(()=>{
+        return {
+            'username': [
+				{
+					type: 'string',
+					required: type.value == 'username',
+					message: t('usernamePlaceholder'),
+					trigger: ['blur', 'change'],
+				},
+				{
+                    validator(rule: any, value: any){
+                        return  !uni.$u.test.number(value)
+                    },
+                    message: t('usernameTips'),
+                    trigger: ['change','blur'],
+                }
+			],
+            'password': {
+                type: 'string',
+                required: type.value == 'username',
+                message: t('passwordPlaceholder'),
+                trigger: ['blur', 'change']
+            },
+            'confirm_password': [
+                {
+                    type: 'string',
+                    required: type.value == 'username',
+                    message: t('confirmPasswordPlaceholder'),
+                    trigger: ['blur', 'change']
+                },
+                {
+                    validator(rule: any, value: any){
+                        return value == formData.password
+                    },
+                    message: t('confirmPasswordError'),
+                    trigger: ['change','blur'],
+                }
+            ],
+            'mobile': [
+                {
+                    type: 'string',
+                    required: type.value == 'mobile' || configStore.login.is_bind_mobile,
+                    message: t('mobilePlaceholder'),
+                    trigger: ['blur', 'change'],
+                },
+                {
+                    validator(rule: any, value: any){
+                        if (type.value != 'mobile' && !configStore.login.is_bind_mobile) return true
+                        else return uni.$u.test.mobile(value)
+                    },
+                    message: t('mobileError'),
+                    trigger: ['change','blur'],
+                }
+            ],
+            'mobile_code': {
+                type: 'string',
+                required: type.value == 'mobile' || configStore.login.is_bind_mobile,
+                message: t('codePlaceholder'),
+                trigger: ['blur', 'change']
+            },
+            'captcha_code': {
+                type: 'string',
+                required: type.value == 'username',
+                message: t('captchaPlaceholder'),
+                trigger: ['blur', 'change'],
+            }
+        }
+    })
+
+    const isAgree = ref(false)
+
+    const formRef: any = ref(null)
+
+    const handleRegister = () => {
+        formRef.value.validate().then(() => {
+            if (configStore.login.agreement_show && !isAgree.value) {
+				popupRef.value.open();
+                return false;
+            }
+            if (loading.value) return
+            loading.value = true
+
+            const register = type.value == 'username' ? usernameRegister : mobileRegister
+
+            register(formData).then((res: any) => {
+                memberStore.setToken(res.data.token)
+                useLogin().handleLoginBack()
+            }).catch(() => {
+                loading.value = false
+                captcha.refresh()
+            })
+        })
+    }
+	const toLink = ()=> {
+		const pages = getCurrentPages(); // 获取页面栈
+		if (pages.length > 1) {
+			const currentPage = pages[pages.length - 2].route;
+			if (currentPage == 'app/pages/auth/login') {
+				// 返回上一页
+				uni.navigateBack({
+					delta: 1 // 默认值是1，表示返回的页面层数
+				});
+			}else{
+				redirect({ url: '/app/pages/auth/login',mode:'redirectTo' })
+			}
+		}else{
+			redirect({ url: '/app/pages/auth/login',mode:'redirectTo' })
+		}
+
+	}
+</script>
+
+<style lang="scss" scoped>
+	:deep(.u-input){
+		background-color: transparent !important;
+	}
+	:deep(.u-form-item){
+		flex:1;
+		.u-line{
+			display:none;
+		}
+		.u-input__content__subfix-icon{
+			display: flex;
+			align-items: center;
+		}
+	}
+	:deep(.u-checkbox){
+		margin: 0 !important;
+	}
+</style>
diff --git a/uni-app/src/app/pages/auth/resetpwd.vue b/uni-app/src/app/pages/auth/resetpwd.vue
new file mode 100644
index 00000000..f23fd94a
--- /dev/null
+++ b/uni-app/src/app/pages/auth/resetpwd.vue
@@ -0,0 +1,175 @@
+<template>
+    <view class="w-screen h-screen flex flex-col" :style="themeColor()">
+		<!-- #ifdef MP-WEIXIN -->
+		<view :style="{'height':headerHeight}">
+			<top-tabbar :data="param" :scrollBool="topTabarObj.getScrollBool()" class="top-header"/>
+		</view>
+		<!-- #endif -->
+		<view class="mx-[60rpx]">
+			<view class="pt-[140rpx] text-[44rpx] font-500 text-[#333]">{{t('findPassword')}}</view>
+			<view class="text-[26rpx] leading-[39rpx] text-[var(--text-color-light6)] mt-[16rpx] mb-[80rpx]">{{t('findPasswordTip')}}</view>
+			<u-form labelPosition="left" :model="formData" errorType='toast' :rules="rules" ref="formRef">
+				<view class="h-[88rpx] flex w-full items-center px-[30rpx] rounded-[var(--goods-rounded-mid)] box-border bg-[#F6F6F6]">
+				    <u-form-item label="" prop="mobile" :border-bottom="false">
+				        <u-input v-model="formData.mobile" type="number" maxlength="11" border="none" :placeholder="t('mobilePlaceholder')" class="!bg-transparent" :disabled="real_name_input" fontSize="26rpx" placeholderClass="!text-[var(--text-color-light9)] text-[26rpx]"/>
+				    </u-form-item>
+				</view>
+				<view class="h-[88rpx] flex w-full items-center px-[30rpx] rounded-[var(--goods-rounded-mid)] box-border bg-[#F6F6F6] mt-[40rpx]">
+				    <u-form-item label="" prop="code" :border-bottom="false">
+				        <u-input v-model="formData.mobile_code" type="number" maxlength="4" border="none" :placeholder="t('codePlaceholder')" class="!bg-transparent" :disabled="real_name_input" fontSize="26rpx" placeholderClass="!text-[var(--text-color-light9)] text-[26rpx]">
+				            <template #suffix>
+				                <sms-code :mobile="formData.mobile" type="find_pass" v-model="formData.mobile_key"></sms-code>
+				            </template>
+				        </u-input>
+				    </u-form-item>
+				</view>
+				<view class="h-[88rpx] flex w-full items-center px-[30rpx] rounded-[var(--goods-rounded-mid)] box-border bg-[#F6F6F6] mt-[40rpx]">
+				    <u-form-item label="" prop="password" :border-bottom="false">
+				        <u-input v-model="formData.password" border="none" :password="isPassword" maxlength="40" :placeholder="t('passwordPlaceholder')" class="!bg-transparent" :disabled="real_name_input" fontSize="26rpx" placeholderClass="!text-[var(--text-color-light9)] text-[26rpx]">
+							<template #suffix>
+								<view class="" @click="changePassword" v-if="formData.password">
+									<u-icon :name="isPassword?'eye-off':'eye-fill'" color="#b9b9b9" size="20"></u-icon>
+								</view>							
+							</template>
+						</u-input>
+				    </u-form-item>
+				</view>
+				<view class="h-[88rpx] flex w-full items-center px-[30rpx] rounded-[var(--goods-rounded-mid)] box-border bg-[#F6F6F6] mt-[40rpx]">
+				    <u-form-item label="" prop="confirm_password" :border-bottom="false">
+				        <u-input v-model="formData.confirm_password" border="none" :password="isConfirmPassword" maxlength="40" :placeholder="t('confirmPasswordPlaceholder')" class="!bg-transparent" :disabled="real_name_input" fontSize="26rpx" placeholderClass="!text-[var(--text-color-light9)] text-[26rpx]">
+							<template #suffix>
+								<view class="" @click="changeConfirmPassword" v-if="formData.confirm_password">
+									<u-icon :name="isConfirmPassword?'eye-off':'eye-fill'" color="#b9b9b9" size="20"></u-icon>
+								</view>							
+							</template>
+						</u-input>
+				    </u-form-item>
+				</view>
+			</u-form>
+			<view class="mt-[160rpx]">
+				<button class="w-full h-[80rpx] !bg-[var(--primary-color)] text-[26rpx] rounded-[40rpx] leading-[80rpx] font-500 !text-[#fff]" @click="handleConfirm">{{t('confirm')}}</button>
+			</view>
+		</view>
+    </view>
+</template>
+
+<script setup lang="ts">
+    import { ref, reactive,computed, onMounted } from 'vue'
+    import { t } from '@/locale'
+    import { resetPassword } from '@/app/api/system'
+    import { redirect,pxToRpx } from '@/utils/common'
+	import { topTabar } from '@/utils/topTabbar'
+
+	let menuButtonInfo: any = {};
+	// 如果是小程序，获取右上角胶囊的尺寸信息，避免导航栏右侧内容与胶囊重叠(支付宝小程序非本API，尚未兼容)
+	// #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+	menuButtonInfo = uni.getMenuButtonBoundingClientRect();
+	// #endif
+	/********* 自定义头部 - start ***********/
+	const topTabarObj = topTabar()
+	let param = topTabarObj.setTopTabbarParam({title:'',topStatusBar:{bgColor: '#fff',textColor: '#333'}})
+	/********* 自定义头部 - end ***********/
+	const headerHeight = computed(()=>{
+		return Object.keys(menuButtonInfo).length ? pxToRpx(Number(menuButtonInfo.height)) + pxToRpx(menuButtonInfo.top) + pxToRpx(8)+'rpx':'auto'
+	})
+    const formData = reactive({
+        mobile: '',
+        mobile_code: '',
+        mobile_key: '',
+        password: '',
+        confirm_password: ''
+    })
+
+	const real_name_input = ref(true);
+	onMounted(() => {
+		// 防止浏览器自动填充
+		setTimeout(()=>{
+			real_name_input.value = false;
+		},800)
+	});
+	
+    const loading = ref(false)
+    const formRef: any = ref(null)
+	const isPassword = ref(true)
+	const isConfirmPassword = ref(true)
+	const changePassword =()=>{
+		isPassword.value = !isPassword.value
+	}
+	
+	const changeConfirmPassword =()=>{
+		isConfirmPassword.value = !isConfirmPassword.value
+	}
+
+    const rules = {
+        'password': {
+            type: 'string',
+            required: true,
+            message: t('passwordPlaceholder'),
+            trigger: ['blur', 'change']
+        },
+        'confirm_password': [
+            {
+                type: 'string',
+                required: true,
+                message: t('confirmPasswordPlaceholder'),
+                trigger: ['blur', 'change']
+            },
+            {
+                validator(rule: any, value: any) {
+                    return value == formData.password
+                },
+                message: t('confirmPasswordError'),
+                trigger: ['change', 'blur'],
+            }
+        ],
+        'mobile': [
+            {
+                type: 'string',
+                required: true,
+                message: t('mobilePlaceholder'),
+                trigger: ['blur', 'change'],
+            },
+            {
+                validator(rule: any, value: any) {
+                    return uni.$u.test.mobile(value)
+                },
+                message: t('mobileError'),
+                trigger: ['change', 'blur'],
+            }
+        ],
+        'mobile_code': {
+            type: 'string',
+            required: true,
+            message: t('codePlaceholder'),
+            trigger: ['blur', 'change']
+        }
+    }
+
+    const handleConfirm = () => {
+        formRef.value.validate().then(() => {
+            if (loading.value) return
+            loading.value = true
+
+            resetPassword(formData).then((res : any) => {
+                redirect({ url: '/app/pages/auth/login', mode: 'redirectTo' })
+            }).catch(() => {
+                loading.value = false
+            })
+        })
+    }
+</script>
+
+<style lang="scss" scoped>
+	:deep(.u-input){
+		background-color: transparent !important;
+	}
+	:deep(.u-checkbox){
+		margin: 0 !important;
+	}
+	:deep(.u-form-item){
+		flex:1;
+		.u-line{
+			display:none;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/uni-app/src/app/pages/friendspay/components/message.vue b/uni-app/src/app/pages/friendspay/components/message.vue
new file mode 100644
index 00000000..df6f1c50
--- /dev/null
+++ b/uni-app/src/app/pages/friendspay/components/message.vue
@@ -0,0 +1,39 @@
+<template>
+    <view @touchmove.prevent.stop>
+        <u-popup :show="messagePopup" @close="closeFn" mode="center" round="var(--rounded-big)">
+            <view class="w-[570rpx] px-[32rpx] popup-common center" v-if="Object.keys(configInfo).length">
+                <view class="title">{{ configInfo.pay_explain_title }}</view>
+                <scroll-view :scroll-y="true" class="px-[30rpx] box-border max-h-[260rpx]" v-if="configInfo.pay_explain_content">
+                    <block v-for="(item) in configInfo.pay_explain_content.split('\n')">
+                        <view class="text-[28rpx] leading-[40rpx] mb-[20rpx]">{{ item }}</view>
+                    </block>
+                </scroll-view>
+                <view class="btn-wrap !pt-[40rpx]">
+                    <button class="primary-btn-bg w-[480rpx] h-[70rpx] text-[26rpx] leading-[70rpx] rounded-[35rpx] !text-[#fff] font-500"  @click="closeFn">我知道了</button>
+                </view>
+            </view>
+        </u-popup>
+    </view>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue';
+
+const messagePopup = ref(false)
+const configInfo = ref<any>({})
+const closeFn = () =>{
+	messagePopup.value = false
+}
+const open = (data: any) => {
+    configInfo.value = data
+    messagePopup.value = true;
+}
+
+defineExpose({
+    open
+})
+</script>
+
+<style lang="scss" scoped>
+
+</style>
diff --git a/uni-app/src/app/pages/friendspay/money.vue b/uni-app/src/app/pages/friendspay/money.vue
new file mode 100644
index 00000000..0c64cd9f
--- /dev/null
+++ b/uni-app/src/app/pages/friendspay/money.vue
@@ -0,0 +1,220 @@
+<template>
+    <view :style="themeColor()">
+        <view class="bg-[var(--page-bg-color)] min-h-screen overflow-hidden" v-if="Object.keys(friendsInfo).length && !loading">
+            <view :style="{background: 'url(' + img('static/resource/images/app/friendpay_money.png') + ') left bottom / cover no-repeat'}" class="pb-[194rpx] overflow-hidden">
+                <!-- #ifdef MP-WEIXIN -->
+                <view class="sticky top-0 left-0 right-0 z-100">
+                    <top-tabbar :data="topTabbarData" :scrollBool="topTabarObj.getScrollBool()" />
+                </view>
+                <!-- #endif -->
+                <view class="mt-[20rpx] flex flex-col items-center">
+                    <u-avatar :src="img(friendsInfo.member.headimg)" size="50" leftIcon="none" :default-url="img('static/resource/images/default_headimg.png')"  />
+                    <view class="flex items-center mt-[20rpx] text-[#fff] text-[26rpx] leading-[36rpx]">
+                        <text class="font-bold mr-[10rpx] max-w-[250rpx] truncate">{{ friendsInfo.member.nickname }}</text>
+                        <text>请您帮忙付款~</text>
+                    </view>
+                    <view class="message  bg-[#fe0708] relative max-w-[520rpx] px-[20rpx] py-[12rpx] rounded-[12rpx] border-solid border-[1rpx] border-color  text-[24rpx] text-[#fff] leading-[30rpx] box-border text-center mt-[20rpx] mx-[114rpx]" v-if="friendsInfo.config.pay_leave_message">{{ friendsInfo.config.pay_leave_message }}</view>
+                 </view>
+            </view>
+            <view class="-mt-[154rpx] card-template sidebar-margin mb-[var(--top-m)]">
+                <view class="text-[24rpx] text-center mb-[10rpx]">{{ t('payMoney') }}</view>
+                <view class="text-center mb-[50rpx]">
+                    <text class="text-[32rpx] font-500 price-font text-[#FF4142]">￥</text>
+                    <text class="text-[56rpx] font-bold price-font text-[#FF4142]">{{ parseFloat(friendsInfo.money).toFixed(2).split('.')[0] }}</text>
+                    <text class="text-[32rpx] font-500 price-font text-[#FF4142]">.{{ parseFloat(friendsInfo.money).toFixed(2).split('.')[1] }}</text>
+                </view>
+                <view class="px-[20rpx] box-border">
+                    <button class="bg-[#FFB4B1] !text-[#fff] h-[80rpx] leading-[80rpx] rounded-[100rpx] text-[26rpx] font-500" hover-class="none" v-if="friendsInfo.status == 2 ">{{ t('finish') }}</button>
+                    <button class="bg-[#FFB4B1] !text-[#fff] h-[80rpx] leading-[80rpx] rounded-[100rpx] text-[26rpx] font-500" hover-class="none" v-else-if="friendsInfo.status == -1">{{ t('close') }}</button>
+                    <button class="botton-color !text-[#fff] h-[80rpx] leading-[80rpx] rounded-[100rpx] text-[26rpx] font-500" hover-class="none" v-else :loading="operateLoading" @click="save">{{ friendsInfo.config.pay_button_name ?  friendsInfo.config.pay_button_name : t('payGenerously') }}</button>
+                </view>
+                <view class="mt-[20rpx] flex items-baseline justify-center text-[var(--text-color-light9)]" @click="redirect({url: '/app/pages/index/index'})">
+                    <text class="text-[24rpx] mr-[6rpx]">返回首页</text>
+                </view>
+            </view>
+            <view class="card-template sidebar-margin mb-[var(--top-m)]" v-if="friendsInfo.config.pay_info_switch">
+                <template v-if="JSON.stringify(friendsInfo.trade_info) !== '[]' && friendsInfo.trade_info.item_list.length">
+                    <view class="flex justify-between items-center  mb-[30rpx]">
+                        <view class="text-[30rpx] text-[#333] font-500">{{ t('helpPayInfo') }}</view>
+                        <view class="flex-shrink-0" @click="handleMessage" v-if="friendsInfo.config.pay_explain_switch">
+                            <text class="mr-[8rpx] text-[24rpx]">{{ friendsInfo.config.pay_explain_title }}</text>
+                            <text class="nc-iconfont nc-icon-jichuxinxiV6xx text-[26rpx]"></text>
+                        </view>
+                    </view>
+                    <view class="border-0 border-solid border-b-[1rpx] border-[#f6f6f6] mb-[20rpx]">
+                        <view v-for="(item, index) in friendsInfo.trade_info.item_list" class="flex justify-between" :class="{' mb-[34rpx]': (index + 1) != friendsInfo.trade_info.length }">
+                            <view class="w-[170rpx] h-[170rpx] rounded-[var(--goods-rounded-big)] overflow-hidden flex-shrink-0">
+                                <u--image class="overflow-hidden" radius="var(--goods-rounded-big)" width="170rpx" height="170rpx"  :src="img(item.item_image ? item.item_image : '')" model="aspectFill">
+                                    <template #error>
+                                        <image class="w-[170rpx] h-[170rpx] rounded-[var(--goods-rounded-big)] overflow-hidden" :src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill" />
+                                    </template>
+                                </u--image>
+                            </view>
+                            <view class="ml-[20rpx] flex flex-1 flex-col justify-between">
+                                <view>
+                                    <view class="text-[28rpx] using-hidden leading-[40rpx] text-[#333]">{{ item.item_name }}</view>
+                                    <view class="text-[24rpx] mt-[14rpx] text-[var(--text-color-light9)] using-hidden leading-[28rpx]" v-if="item.item_sub_name ">{{ item.item_sub_name }}</view>
+                                </view>
+                                <view class="flex justify-between items-baseline">
+                                    <view class="price-font text-[#FF4142]">
+                                        <text class="text-[24rpx]">￥</text>
+                                        <text class="text-[40rpx] font-500">{{ parseFloat(item.item_price).toFixed(2).split('.')[0] }}</text>
+                                        <text class="text-[24rpx] font-500">.{{ parseFloat(item.item_price).toFixed(2).split('.')[1] }}</text>
+                                    </view>
+                                    <text class="text-right text-[26rpx]">x{{ item.item_num }}</text>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                    <view class="text-[26rpx] text-right">{{ friendsInfo.trade_info.item_total }}</view>
+                </template>
+                <template v-else>
+                    <view class="text-[28rpx]  leading-[40rpx] text-[#333]">{{ friendsInfo.body }}</view>
+                </template>
+            </view>
+        </view>
+        <!-- 帮付说明 -->
+        <message ref="messageRef"></message>
+        <!-- 支付 -->
+        <pay ref="payRef" />
+        <loading-page :loading="loading"></loading-page>
+    </view>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue';
+import { t } from '@/locale'
+import { img, redirect, getToken,handleOnloadParams,goback } from '@/utils/common';
+import { onLoad, onShow,onHide,onUnload } from '@dcloudio/uni-app'
+import { topTabar } from '@/utils/topTabbar';
+import { getFriendspayInfo } from '@/app/api/friendspay'
+import Message from '@/app/pages/friendspay/components/message.vue'
+import { useLogin } from '@/hooks/useLogin'
+import { onPageScroll } from '@dcloudio/uni-app';
+
+/********* 自定义头部 - start ***********/
+const topTabarObj = topTabar()
+let topTabbarData = topTabarObj.setTopTabbarParam({ title: '' })
+/********* 自定义头部 - end ***********/
+
+const loading = ref<boolean>(true);
+const tradeId = ref<number>(0);
+const tradeType = ref<string>('');
+const friendsInfo = ref<any>({})
+const operateLoading = ref(false)
+
+const firstCall = ref<boolean>(true)
+
+const timeOut: any = ref(null)
+
+onLoad((option: any) =>{
+    // #ifdef MP-WEIXIN
+    // 处理小程序场景值参数
+    option = handleOnloadParams(option);
+    // #endif
+    tradeId.value = option.id || 0;
+    tradeType.value = option.type || '';
+})
+
+onShow(()=>{
+    if(tradeId.value && tradeType.value){
+        getFriendspayInfoFn(tradeType.value, tradeId.value)
+    }
+})
+
+onHide(()=>{
+    if(timeOut.value) {
+        clearTimeout(timeOut.value);
+        timeOut.value = null;
+    }
+})
+
+onUnload(()=>{
+    if(timeOut.value) {
+        clearTimeout(timeOut.value);
+        timeOut.value = null;
+    }
+})
+
+const getFriendspayInfoFn = (tradeType : string, tradeId : number) => {
+    if (firstCall.value) { // 检查是否是第一次调用
+        loading.value = true;
+        firstCall.value = false; // 将标志变量设置为 false
+    }
+    getFriendspayInfo(tradeType, tradeId).then((res: any) => {
+        friendsInfo.value = res.data
+        uni.setNavigationBarTitle({
+			title: friendsInfo.value.config.pay_page_name
+		})
+        topTabbarData = topTabarObj.setTopTabbarParam({ title: friendsInfo.value.config.pay_page_name })
+        loading.value = false
+
+        if( friendsInfo.value.status != 2 && friendsInfo.value.status != 1  && friendsInfo.value.status != -1){
+            // 每隔3秒查询一次支付结果
+            timeOut.value = setTimeout(() => {
+                getFriendspayInfoFn(tradeType, tradeId)
+            }, 1000 * 3)
+        }else{
+            clearTimeout(timeOut.value);
+            timeOut.value = null;
+        }
+
+    }).catch(()=>{
+        if(timeOut.value) {
+            clearTimeout(timeOut.value);
+            timeOut.value = null;
+        }
+        loading.value = false
+        let parameter = {
+            title: '未找到帮付订单信息',
+            url: '/app/pages/index/index',
+            mode: 'reLaunch'
+        };
+        goback(parameter)
+    })
+}
+
+// 弹框
+const messageRef = ref<any>(null);
+const handleMessage = () => {
+    messageRef.value.open(friendsInfo.value.config)
+}
+
+const payRef = ref()
+const save = () =>{
+    if(getToken()){
+        payRef.value?.open(friendsInfo.value.trade_type, friendsInfo.value.trade_id, '/app/pages/index/index', 'friendspay')
+    } else {
+        useLogin().setLoginBack({
+			url: '/app/pages/friendspay/money',
+			param: { id: friendsInfo.value.trade_id, type: friendsInfo.value.trade_type }
+		})
+    }
+}
+
+</script>
+
+<style lang="scss" scoped>
+.border-color{
+    border-color: rgba(255, 255, 255, 0.7);
+}
+.message{
+    &::after{
+        content: '';
+        width: 16rpx;
+        height: 16rpx;
+        background-color: #fe0708;
+        border: solid 1rpx transparent;
+        border-top-color: #fff;
+        border-left-color: #fff;
+        border-top-left-radius:4rpx;
+        position: absolute;
+        left: 50%;
+        top: 0;
+        transform: translateX(-50%) translateY(-50%)  rotate(45deg);
+    }
+}
+.botton-color{
+	background: linear-gradient( 94deg, #FB7939 0%, #FE120E 99%), #EF000C;
+}
+</style>
diff --git a/uni-app/src/app/pages/friendspay/share.vue b/uni-app/src/app/pages/friendspay/share.vue
new file mode 100644
index 00000000..b555f7e1
--- /dev/null
+++ b/uni-app/src/app/pages/friendspay/share.vue
@@ -0,0 +1,276 @@
+<template>
+    <view  :style="themeColor()">
+        <view class="bg-[var(--page-bg-color)] min-h-screen overflow-hidden" v-if="Object.keys(friendsInfo).length && !loading">
+            <view :style="{background: 'url(' + img('static/resource/images/app/friendpay_bg.png') + ') left bottom /100% no-repeat'}" class="pb-[168rpx] overflow-hidden">
+                <!-- #ifdef MP-WEIXIN -->
+                <view class="sticky top-0 left-0 right-0 z-100">
+                    <top-tabbar :data="topTabbarData" :scrollBool="topTabarObj.getScrollBool()" />
+                </view>
+                <!-- #endif -->
+                 <view class="mt-[20rpx] flex flex-col items-center">
+                    <u-avatar :src="img(friendsInfo.member.headimg)" size="50" leftIcon="none" :default-url="img('static/resource/images/default_headimg.png')"  />
+                    <view class="flex items-center mt-[20rpx] text-[#fff] text-[26rpx] leading-[36rpx]">
+                        <text class="font-bold mr-[10rpx] max-w-[250rpx] truncate">{{ friendsInfo.member.nickname }}</text>
+                        <text>发起了订单帮付请求~</text>
+                    </view>
+                 </view>
+            </view>
+            <view class="mt-[-128rpx] card-template sidebar-margin  mb-[var(--top-m)]">
+                <view class="text-[24rpx] text-center text-[#333] mb-[10rpx]">{{ t('payMoney') }}</view>
+                <view class="text-center mb-[50rpx]">
+                    <text class="text-[32rpx] font-500 price-font text-[#FF4142]">￥</text>
+                    <text class="text-[56rpx] font-bold price-font text-[#FF4142]">{{ parseFloat(friendsInfo.money).toFixed(2).split('.')[0] }}</text>
+                    <text class="text-[32rpx] font-500 price-font text-[#FF4142]">.{{ parseFloat(friendsInfo.money).toFixed(2).split('.')[1] }}</text>
+                </view>
+                <view class="px-[20rpx] box-border">
+                    <button class="bg-[#FFB4B1] !text-[#fff] h-[80rpx] leading-[80rpx] rounded-[100rpx] text-[26rpx] font-500" hover-class="none" v-if="friendsInfo.status == 2">{{ t('finish') }}</button>
+                    <button class="bg-[#FFB4B1] !text-[#fff] h-[80rpx] leading-[80rpx] rounded-[100rpx] text-[26rpx] font-500" hover-class="none" v-else-if="friendsInfo.status == -1">{{ t('close') }}</button>
+                    <button class="botton-color !text-[#fff] h-[80rpx] leading-[80rpx] rounded-[100rpx] text-[26rpx] font-500" hover-class="none" v-else :loading="operateLoading" @click="openShareFn">{{ friendsInfo.config.pay_type_name ?  friendsInfo.config.pay_type_name : t('friendPay') }}</button>
+                </view>
+                <view class="mt-[20rpx] flex items-baseline justify-center text-[var(--text-color-light9)]" v-if="friendsInfo.status == 2 && JSON.stringify(friendsInfo.trade_info) !== '[]' && friendsInfo.trade_info.detail_url" @click="redirect({url: friendsInfo.trade_info.detail_url })">
+                    <text class="text-[24rpx] mr-[6rpx]">查看订单</text>
+                    <text class="nc-iconfont nc-icon-youV6xx text-[26rpx]"></text>
+                </view>
+            </view>
+            <view class="card-template sidebar-margin  mb-[var(--top-m)]">
+                <view class="flex justify-between items-center mb-[30rpx]">
+                    <view class="text-[30rpx] text-[#333] font-500">{{ t('friendPayOrderInfo') }}</view>
+                    <view class="text-[#666] leading-[1]" @click="handleMessage" v-if="friendsInfo.config.pay_explain_switch">
+                        <text class="mr-[8rpx] text-[24rpx]">{{ friendsInfo.config.pay_explain_title  }}</text>
+                        <text class="nc-iconfont nc-icon-jichuxinxiV6xx text-[26rpx]"></text>
+                    </view>
+                </view>
+                <template v-if="JSON.stringify(friendsInfo.trade_info) !== '[]'">
+                    <template v-if="friendsInfo.trade_info.item_list.length">
+                        <view class="border-0 border-solid border-b-[1rpx] border-[#f6f6f6] mb-[20rpx]">
+                            <view v-for="(item, index) in friendsInfo.trade_info.item_list" class="flex justify-between mb-[30rpx]">
+                                <view class="w-[170rpx] h-[170rpx] rounded-[var(--goods-rounded-big)] overflow-hidden flex-shrink-0">
+                                    <u--image class="overflow-hidden" radius="var(--goods-rounded-big)" width="170rpx" height="170rpx"  :src="img(item.item_image ? item.item_image : '')" model="aspectFill">
+                                        <template #error>
+                                            <image class="w-[170rpx] h-[170rpx] rounded-[var(--goods-rounded-big)] overflow-hidden" :src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill" />
+                                        </template>
+                                    </u--image>
+                                </view>
+                                <view class="ml-[20rpx] flex flex-1 flex-col justify-between">
+                                    <view>
+                                        <view class="text-[28rpx] using-hidden leading-[40rpx] text-[#333]">{{ item.item_name }}</view>
+                                        <view class="text-[24rpx] mt-[14rpx] text-[var(--text-color-light9)] using-hidden leading-[28rpx]" v-if="item.item_sub_name"> {{ item.item_sub_name }} </view>
+                                    </view>
+                                    <view class="flex justify-between items-baseline">
+                                        <view class="price-font text-[#FF4142]">
+                                            <text class="text-[24rpx]">￥</text>
+                                            <text class="text-[40rpx] font-500">{{ parseFloat(item.item_price).toFixed(2).split('.')[0] }}</text>
+                                            <text class="text-[24rpx] font-500">.{{ parseFloat(item.item_price).toFixed(2).split('.')[1] }}</text>
+                                        </view>
+                                        <text class="text-right text-[26rpx]">x{{ item.item_num }}</text>
+                                    </view>
+                                </view>
+                            </view>
+                        </view>
+                        <view class="text-[26rpx] text-right">{{ friendsInfo.trade_info.item_total }}</view>
+                    </template>
+                </template>
+                <template v-else>
+                    <view class="text-[28rpx]  leading-[40rpx] text-[#333]">{{ friendsInfo.body }}</view>
+                </template>
+            </view>
+
+            <share-poster ref="sharePosterRef" posterType="friendspay" :posterId="friendsInfo.poster_id" :posterParam="posterParam" :copyUrl="copyUrl" :copyUrlParam="copyUrlParam" />
+            <!-- 帮付说明 -->
+            <message ref="messageRef"></message>
+        </view>
+
+        <loading-page :loading="loading"></loading-page>
+    </view>
+</template>
+
+<script lang="ts" setup>
+import { ref, computed, nextTick } from 'vue';
+import { t } from '@/locale'
+import { img, redirect, goback} from '@/utils/common';
+import { onLoad, onShow, onHide, onUnload } from '@dcloudio/uni-app'
+import { getFriendspayInfo } from '@/app/api/friendspay'
+import { useShare }from '@/hooks/useShare'
+import useMemberStore from '@/stores/member'
+import { topTabar } from '@/utils/topTabbar';
+import sharePoster from '@/components/share-poster/share-poster.vue'
+import Message from '@/app/pages/friendspay/components/message.vue'
+import { onPageScroll } from '@dcloudio/uni-app';
+
+/********* 自定义头部 - start ***********/
+const topTabarObj = topTabar()
+let topTabbarData = topTabarObj.setTopTabbarParam({ title: '' })
+/********* 自定义头部 - end ***********/
+
+const loading = ref<boolean>(true);
+const operateLoading = ref(false)
+const tradeId = ref<number>(0);
+const tradeType = ref<string>('');
+const friendsInfo = ref<any>({})
+
+const firstCall = ref<boolean>(true)
+const timeOut: any = ref(null)
+
+// 分享
+const{setShare} = useShare()
+
+// 会员信息
+const memberStore = useMemberStore()
+const userInfo = computed(() => memberStore.info)
+
+onLoad((option: any) =>{
+    tradeId.value = option.id || 0;
+    tradeType.value = option.type || '';
+})
+onShow(()=>{
+    if(tradeId.value && tradeType.value){
+        getFriendspayInfoFn(tradeType.value, tradeId.value)
+    }
+})
+
+onHide(()=>{
+    if(timeOut.value) {
+        clearTimeout(timeOut.value);
+        timeOut.value = null;
+    }
+})
+
+onUnload(()=>{
+    if(timeOut.value) {
+        clearTimeout(timeOut.value);
+        timeOut.value = null;
+    }
+})
+
+
+const getFriendspayInfoFn = (tradeType : string, tradeId : number) => {
+    if (firstCall.value) { // 检查是否是第一次调用
+        loading.value = true;
+        firstCall.value = false; // 将标志变量设置为 false
+    }
+    getFriendspayInfo(tradeType, tradeId).then((res: any) => {
+        friendsInfo.value = res.data
+        loading.value = false
+        uni.setNavigationBarTitle({
+			title: friendsInfo.value.config.pay_page_name
+		})
+        topTabbarData = topTabarObj.setTopTabbarParam({ title: friendsInfo.value.config.pay_page_name })
+
+       // 分享 - start
+       let link = '';
+
+        // #ifdef H5
+        let pathName = location.pathname;
+		let packageArr: any = ['/app/', '/addon/'];
+		for (let i = 0; i < packageArr.length; i++) {
+			if (pathName.indexOf(packageArr[i]) != -1) {
+				pathName = pathName.substr(0, pathName.indexOf(packageArr[i]));
+			}
+		}
+
+        link = location.origin + pathName + `/app/pages/friendspay/money?id=${friendsInfo.value.trade_id}&type=${friendsInfo.value.trade_type}`;
+        // #endif
+
+		let share: any = {
+            desc: friendsInfo.value.config.pay_leave_message,
+            path: `/app/pages/friendspay/money?id=${friendsInfo.value.trade_id}&type=${friendsInfo.value.trade_type}`,
+            link
+        }
+        if(friendsInfo.value.member){
+            let name = friendsInfo.value.member.nickname
+            name = name.length > 15 ? name = name.substring(0, 15) + '...' : name
+            share.title = `${name}希望你帮他付${friendsInfo.value.money}元`
+        }
+        if(JSON.stringify(friendsInfo.value.trade_info) !== '[]' && friendsInfo.value.trade_info.item_list.length){
+            // #ifdef H5
+            share.url = friendsInfo.value.trade_info.item_list[0].item_image ? friendsInfo.value.trade_info.item_list[0].item_image : friendsInfo.value.config.pay_wechat_share_image
+            // #endif
+            // #ifdef MP-WEIXIN
+            share.url = friendsInfo.value.trade_info.item_list[0].item_image ? friendsInfo.value.trade_info.item_list[0].item_image :  friendsInfo.value.config.pay_weapp_share_image
+            // #endif
+        }else{
+            // #ifdef H5
+            share.url = friendsInfo.value.config.pay_wechat_share_image
+            // #endif
+            // #ifdef MP-WEIXIN
+            share.url = friendsInfo.value.config.pay_weapp_share_image
+            // #endif
+        }
+		setShare({
+			wechat: {
+				...share
+			},
+			weapp: {
+				...share
+			}
+		});
+		// 分享 - end
+        copyUrlFn();
+        nextTick(() => {
+            setTimeout(() => {
+                if(sharePosterRef.value) {
+                    posterParam.id = friendsInfo.value.trade_id;
+                    posterParam.type = friendsInfo.value.trade_type;
+                    if (userInfo.value && userInfo.value.member_id) posterParam.member_id = userInfo.value.member_id;
+                    sharePosterRef.value.loadPoster();
+                }
+            }, 400)
+        })
+
+        if( friendsInfo.value.status != 2 && friendsInfo.value.status != 1  && friendsInfo.value.status != -1){
+            // 每隔3秒查询一次支付结果
+            timeOut.value = setTimeout(() => {
+                getFriendspayInfoFn(tradeType, tradeId)
+            }, 1000 * 3)
+        }else{
+            clearTimeout(timeOut.value);
+            timeOut.value = null;
+        }
+
+    }).catch((err: any) => {
+        if(timeOut.value) {
+            clearTimeout(timeOut.value);
+            timeOut.value = null;
+        }
+        loading.value = false
+        let parameter = {
+            title: '未找到帮付订单信息',
+            url: '/app/pages/index/index',
+            mode: 'reLaunch'
+        };
+        goback(parameter)
+    });
+}
+
+// 弹框
+const messageRef = ref<any>(null);
+const handleMessage = () => {
+    messageRef.value.open(friendsInfo.value.config)
+}
+
+/************* 分享海报-start **************/
+const sharePosterRef: any = ref(null);
+const copyUrl = ref('/app/pages/friendspay/money')
+const copyUrlParam = ref('');
+let posterParam: any = {};
+
+// 分享海报链接
+const copyUrlFn = ()=>{
+	copyUrlParam.value = '?id='+ friendsInfo.value.trade_id;
+    copyUrlParam.value += '&type=' + friendsInfo.value.trade_type;
+}
+
+const openShareFn = ()=>{
+    posterParam.id = friendsInfo.value.trade_id;
+    posterParam.type = friendsInfo.value.trade_type;
+    if (userInfo.value && userInfo.value.member_id) posterParam.member_id = userInfo.value.member_id;
+	sharePosterRef.value.openShare()
+}
+/************* 分享海报-end **************/
+</script>
+
+<style lang="scss" scoped>
+	.botton-color{
+		background: linear-gradient( 94deg, #FB7939 0%, #FE120E 99%), #EF000C;
+	}
+</style>
diff --git a/uni-app/src/app/pages/index/close.vue b/uni-app/src/app/pages/index/close.vue
new file mode 100644
index 00000000..8827fc89
--- /dev/null
+++ b/uni-app/src/app/pages/index/close.vue
@@ -0,0 +1,27 @@
+<template>
+    <view class="min-h-[100vh] bg-[var(--page-bg-color)] overflow-hidden" :style="themeColor()">
+		<view class="empty-page">
+		    <image class="img" :src="img('static/resource/images/site/close.png')" model="aspectFit" />
+		    <view class="desc">{{t('siteClose')}}</view>
+		</view>
+    </view>
+</template>
+
+<script setup lang="ts">
+import { watch } from 'vue'
+import { img,redirect } from '@/utils/common'
+import { t } from '@/locale'
+import useSystemStore from '@/stores/system'
+
+const systemStore = useSystemStore()
+
+watch(
+    () => systemStore.site,
+    (newValue, oldValue) => {
+        if(newValue && newValue.status == 1){
+            redirect({ url: '/app/pages/index/index', mode: 'reLaunch' })
+        }
+    })
+</script>
+
+<style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/uni-app/src/app/pages/index/diy.vue b/uni-app/src/app/pages/index/diy.vue
new file mode 100644
index 00000000..3c7be9f9
--- /dev/null
+++ b/uni-app/src/app/pages/index/diy.vue
@@ -0,0 +1,78 @@
+<template>
+	<view :style="themeColor()">
+
+		<loading-page :loading="diy.getLoading()"></loading-page>
+
+		<view v-show="!diy.getLoading()">
+
+			<!-- 自定义模板渲染 -->
+			<view class="diy-template-wrap bg-index" :style="diy.pageStyle()">
+
+				<diy-group ref="diyGroupRef" :data="diy.data" />
+
+			</view>
+
+		</view>
+
+		<!-- #ifdef MP-WEIXIN -->
+		<!-- 小程序隐私协议 -->
+		<wx-privacy-popup ref="wxPrivacyPopupRef"></wx-privacy-popup>
+		<!-- #endif -->
+
+	</view>
+</template>
+
+<script setup lang="ts">
+    import {ref,nextTick} from 'vue';
+    import {useDiy} from '@/hooks/useDiy'
+    import {useShare} from '@/hooks/useShare'
+    import diyGroup from '@/addon/components/diy/group/index.vue'
+
+    const {setShare} = useShare()
+
+    const diy = useDiy({})
+
+    const diyGroupRef = ref(null)
+
+    const wxPrivacyPopupRef:any = ref(null)
+
+    // 监听页面加载
+    diy.onLoad();
+
+    // 监听页面显示
+    diy.onShow((data: any) => {
+        let share = data.share ? JSON.parse(data.share) : null;
+        setShare(share);
+        diyGroupRef.value?.refresh();
+	    // #ifdef MP
+	    nextTick(()=>{
+		    if(wxPrivacyPopupRef.value) wxPrivacyPopupRef.value.proactive();
+	    })
+	    // #endif
+    });
+
+    // 监听页面隐藏
+    diy.onHide();
+
+	// 监听页面卸载
+	diy.onUnload();
+
+    // 监听滚动事件
+    diy.onPageScroll()
+</script>
+<style lang="scss" scoped>
+	@import '@/styles/diy.scss';
+</style>
+<style lang="scss">
+.diy-template-wrap {
+  /* #ifdef MP */
+  .child-diy-template-wrap {
+    ::v-deep .diy-group {
+      > .draggable-element.top-fixed-diy {
+        display: block !important;
+      }
+    }
+  }
+  /* #endif */
+}
+</style>
diff --git a/uni-app/src/app/pages/index/diy_form.vue b/uni-app/src/app/pages/index/diy_form.vue
new file mode 100644
index 00000000..9992886c
--- /dev/null
+++ b/uni-app/src/app/pages/index/diy_form.vue
@@ -0,0 +1,119 @@
+<template>
+	<view :style="themeColor()">
+
+		<loading-page :loading="diy.getLoading()"></loading-page>
+
+		<view v-show="requestData.status == 1 && requestData.error && requestData.error.length === 0 && !diy.getLoading()">
+
+			<!-- 自定义模板渲染 -->
+			<view class="diy-template-wrap bg-index" :style="diy.pageStyle()">
+
+				<diy-group ref="diyGroupRef" :data="diy.data" />
+
+			</view>
+
+		</view>
+		<view class="w-screen h-screen flex flex-col " v-if="requestData.error && requestData.error.length > 0">
+		    <view class="flex-1 flex flex-col items-center pt-[180rpx] px-[60rpx]" v-for="(item, index) in requestData.error.slice(0, 1)" :key="index">
+				<text class="nc-iconfont nc-icon-tanhaoV6mm text-[#ccc] mb-[30rpx] !text-[100rpx]"></text>
+				<view class="text-[38rpx] font-bold mt-3">{{item.title}}</view>
+		        <view class="p-[30rpx] mt-10 w-full ">
+		        	<view class="flex w-full">
+		        		<view class="w-[30%] text-[#999] text-left">{{item.type}}</view>
+		        		<view class="w-[70%] text-left">{{item.desc}}</view>
+		        	</view>
+		        </view>
+		    </view>
+			<view class="pb-[260rpx]" >
+				<button class="w-[380rpx] !border-0 h-[80rpx] text-[28rpx] text-[#333] !bg-[#f2f2f2] flex-center font-500 rounded-[20rpx]" :plain="true" @click="finishFn">{{ t('close') }}</button>
+			</view>
+		</view>
+
+		<!-- #ifdef MP-WEIXIN -->
+		<!-- 小程序隐私协议 -->
+		<wx-privacy-popup ref="wxPrivacyPopupRef"></wx-privacy-popup>
+		<!-- #endif -->
+
+	</view>
+</template>
+
+<script setup lang="ts">
+    import {ref,nextTick,computed} from 'vue';
+    import {useDiyForm} from '@/hooks/useDiyForm'
+    import {useShare} from '@/hooks/useShare'
+	import { img,redirect} from '@/utils/common';
+	import { t } from '@/locale'
+    import diyGroup from '@/addon/components/diy/group/index.vue'
+    import MescrollEmpty from '@/components/mescroll/mescroll-empty/mescroll-empty.vue';
+
+    const {setShare} = useShare()
+
+    const diy = useDiyForm({
+	    needLogin: true // 检测登录
+    })
+
+    const diyGroupRef = ref(null)
+
+    const wxPrivacyPopupRef:any = ref(null)
+
+    const requestData = computed(()=>{
+    	return diy.requestData;
+    })
+
+	const finishFn = () => {
+		redirect({
+			url: '/app/pages/index/index',
+			mode: 'reLaunch'
+		});
+	}
+
+    diy.onLoad((data:any)=>{
+	    let share = data.share ? data.share : null;
+	    setShare(share);
+	    diyGroupRef.value?.refresh();
+	    // #ifdef MP
+	    nextTick(()=>{
+		    if(wxPrivacyPopupRef.value) wxPrivacyPopupRef.value.proactive();
+	    })
+	    // #endif
+    });
+
+    // 监听页面显示
+    diy.onShow((data: any) => {
+	    let share = data.share ? data.share : null;
+	    if(share) {
+		    setShare(share);
+	    }
+	    diyGroupRef.value?.refresh();
+	    // #ifdef MP
+	    nextTick(()=>{
+		    if(wxPrivacyPopupRef.value) wxPrivacyPopupRef.value.proactive();
+	    })
+	    // #endif
+    });
+
+    // 监听页面隐藏
+    diy.onHide();
+
+	// 监听页面卸载
+	diy.onUnload();
+
+    // 监听滚动事件
+    diy.onPageScroll()
+</script>
+<style lang="scss" scoped>
+	@import '@/styles/diy.scss';
+</style>
+<style lang="scss">
+    .diy-template-wrap {
+        /* #ifdef MP */
+        .child-diy-template-wrap {
+            ::v-deep .diy-group {
+                > .draggable-element.top-fixed-diy {
+                    display: block !important;
+                }
+            }
+        }
+        /* #endif */
+    }
+</style>
diff --git a/uni-app/src/app/pages/index/diy_form_detail.vue b/uni-app/src/app/pages/index/diy_form_detail.vue
new file mode 100644
index 00000000..06bffe0f
--- /dev/null
+++ b/uni-app/src/app/pages/index/diy_form_detail.vue
@@ -0,0 +1,28 @@
+<template>
+    <view :style="themeColor()">
+        <view class="w-screen h-screen bg-[var(--page-bg-color)] min-h-[100vh]">
+            <view class="bg-white p-3">
+                <view class="text-[30rpx] font-500 leading-[45rpx]">{{ t('detailInformation') }}</view>
+                <u-divider text=""></u-divider>
+                <!-- 动态渲染表单组件详情 -->
+                <diy-form-detail :record_id="recordId" completeLayout="style-1" />
+            </view>
+
+        </view>
+
+    </view>
+</template>
+
+<script setup lang="ts">
+    import { ref } from 'vue'
+    import { onLoad } from '@dcloudio/uni-app'
+    import { t } from '@/locale'
+    import diyFormDetail from '@/addon/components/diy-form-detail/index.vue'
+
+    const recordId = ref(0)
+    onLoad((data : any) => {
+        recordId.value = data.record_id
+    })
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/uni-app/src/app/pages/index/diy_form_result.vue b/uni-app/src/app/pages/index/diy_form_result.vue
new file mode 100644
index 00000000..b8e94618
--- /dev/null
+++ b/uni-app/src/app/pages/index/diy_form_result.vue
@@ -0,0 +1,83 @@
+<template>
+    <view :style="themeColor()">
+        <view class="w-screen h-screen flex flex-col items-center" v-if="recordInfo">
+			<top-tabbar ref="topTabbarRef" :data="topTabbarParam" />
+            <view class="flex-1 flex flex-col items-center w-full pt-[180rpx]">
+				<text class="nc-iconfont nc-icon-duihaoV6mm text-[#06ae56] mb-[30rpx] !text-[65rpx]"></text>
+				<view class="px-[30rpx] text-center leading-[1.3] text-[42rpx] font-bold mb-[30rpx]">
+					{{ recordInfo.submitConfig.tips_type=='default' ? '填写成功' : recordInfo.submitConfig.tips_text }}
+				</view>
+                <view class="text-[32rpx] mt-[32rpx] text-[#576b95]" @click="toDetail()">{{ t('viewFillingDetails') }}</view>
+            </view>
+			<view class="pb-[260rpx] action-wrap">
+				<template v-if="recordInfo.submitConfig.success_after_action.finish">
+					<button class="w-[380rpx] !border-0 h-[80rpx] text-[28rpx] !text-[#ffffff] !bg-[#20bf64] flex-center font-500 rounded-[6rpx]" :plain="true" @click="finishFn">{{ t('complete') }}</button>
+				</template>
+				<template v-if="recordInfo.submitConfig.success_after_action.goback">
+					<button class="w-[380rpx] !border-0 h-[80rpx] text-[28rpx] text-[#333] !bg-[#f2f2f2] flex-center font-500 rounded-[6rpx]" :plain="true" @click="goback">{{ t('back') }}</button>
+				</template>
+			</view>
+        </view>
+    </view>
+</template>
+
+<script setup lang="ts">
+    import { ref } from 'vue'
+    import { onLoad } from '@dcloudio/uni-app'
+    import { getFormResultInfo } from '@/app/api/diy_form';
+    import { t } from '@/locale'
+    import { redirect } from '@/utils/common'
+	import { topTabar } from '@/utils/topTabbar'
+
+    const recordInfo = ref<AnyObject | null>(null)
+    const recordId = ref(0)
+    const formId = ref(0)
+
+	/********* 自定义头部 - start ***********/
+	const topTabarObj = topTabar()
+	let topTabbarParam = topTabarObj.setTopTabbarParam({title:'',isBack:false})
+	/********* 自定义头部 - end ***********/
+
+    onLoad((data : any) => {
+	    recordId.value = data.record_id || 0;
+	    formId.value = data.form_id || 0;
+	    getInfo()
+    })
+
+    /**
+     * 获取表单填写信息
+     */
+    const getInfo = () => {
+        getFormResultInfo({
+            record_id: recordId.value
+        }).then((res: any) => {
+            recordInfo.value = res.data
+        })
+    }
+
+	const toDetail = ()=>{
+		redirect({ url: '/app/pages/index/diy_form_detail',param: { record_id: recordId.value }, mode: 'redirectTo' })
+	}
+
+    const finishFn = () => {
+		redirect({
+			url: '/app/pages/index/index',
+			mode: 'reLaunch'
+		});
+    }
+
+    const goback = ()=>{
+	    redirect({ url: '/app/pages/index/diy_form',param: { form_id: formId.value }, mode: 'redirectTo' })
+    }
+</script>
+
+<style lang="scss" scoped>
+	.action-wrap{
+		button{
+			margin-bottom: 30rpx;
+			&:last-child{
+				margin-bottom: 0;
+			}
+		}
+	}
+</style>
diff --git a/uni-app/src/app/pages/index/index.vue b/uni-app/src/app/pages/index/index.vue
new file mode 100644
index 00000000..43640bc0
--- /dev/null
+++ b/uni-app/src/app/pages/index/index.vue
@@ -0,0 +1,86 @@
+<template>
+	<view :style="themeColor()">
+
+		<loading-page :loading="diy.getLoading()"></loading-page>
+
+		<view v-show="!diy.getLoading()">
+
+			<!-- 自定义模板渲染 -->
+			<view class="diy-template-wrap bg-index" :style="diy.pageStyle()">
+
+				<diy-group ref="diyGroupRef" :data="diy.data" />
+
+			</view>
+
+		</view>
+
+		<!-- #ifdef MP-WEIXIN -->
+		<!-- 小程序隐私协议 -->
+		<wx-privacy-popup ref="wxPrivacyPopupRef"></wx-privacy-popup>
+		<!-- #endif -->
+
+	</view>
+</template>
+
+<script setup lang="ts">
+    import {ref,nextTick} from 'vue';
+    import {useDiy} from '@/hooks/useDiy'
+    import {redirect} from '@/utils/common';
+    import diyGroup from '@/addon/components/diy/group/index.vue'
+
+    uni.hideTabBar() // 隐藏tabbar
+
+    const diy = useDiy({
+        name: 'DIY_INDEX'
+    })
+
+    const diyGroupRef = ref(null)
+
+    const wxPrivacyPopupRef:any = ref(null)
+
+    // 监听页面加载
+    diy.onLoad();
+
+    // 监听页面显示
+    diy.onShow((data: any) => {
+        if (data.value) {
+            // uni.setNavigationBarTitle({
+            // 	title: diyData.title
+            // })
+        } else if (data.page) {
+            // 跳转到设置的启动页
+            redirect({url: data.page, mode: 'reLaunch'})
+        }
+        diyGroupRef.value?.refresh();
+	    // #ifdef MP
+	    nextTick(()=>{
+		    if(wxPrivacyPopupRef.value) wxPrivacyPopupRef.value.proactive();
+	    })
+	    // #endif
+    });
+
+    // 监听页面隐藏
+    diy.onHide();
+
+	// 监听页面卸载
+	diy.onUnload();
+
+    // 监听滚动事件
+    diy.onPageScroll()
+</script>
+<style lang="scss" scoped>
+	@import '@/styles/diy.scss';
+</style>
+<style lang="scss">
+.diy-template-wrap {
+  /* #ifdef MP */
+  .child-diy-template-wrap {
+    ::v-deep .diy-group {
+      > .draggable-element.top-fixed-diy {
+        display: block !important;
+      }
+    }
+  }
+  /* #endif */
+}
+</style>
diff --git a/uni-app/src/app/pages/index/nosite.vue b/uni-app/src/app/pages/index/nosite.vue
new file mode 100644
index 00000000..66abccfb
--- /dev/null
+++ b/uni-app/src/app/pages/index/nosite.vue
@@ -0,0 +1,29 @@
+<template>
+    <view class="min-h-[100vh] bg-[var(--page-bg-color)] overflow-hidden" :style="themeColor()">
+        <view class="empty-page">
+            <image class="img" :src="img('static/resource/images/site/close.png')" model="aspectFit" />
+            <view class="desc">{{t('noSite')}}</view>
+        </view>
+    </view>
+</template>
+
+<script setup lang="ts">
+    import { watch } from 'vue'
+    import { img, redirect } from '@/utils/common'
+    import { t } from '@/locale'
+    import useSystemStore from '@/stores/system'
+
+    uni.hideTabBar() // 隐藏tabbar
+
+    const systemStore = useSystemStore()
+
+    watch(
+        () => systemStore.site,
+        (newValue, oldValue) => {
+            if (newValue && newValue.status == 1) {
+                redirect({ url: '/app/pages/index/index', mode: 'reLaunch' })
+            }
+        })
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/uni-app/src/app/pages/member/account.vue b/uni-app/src/app/pages/member/account.vue
new file mode 100644
index 00000000..544efbb6
--- /dev/null
+++ b/uni-app/src/app/pages/member/account.vue
@@ -0,0 +1,112 @@
+<template>
+    <view class="w-screen h-screen bg-[var(--page-bg-color)]" :style="themeColor()">
+        <mescroll-body ref="mescrollRef" @init="mescrollInit" :down="{ use: false }" @up="getCashoutAccountListFn">
+			<!-- 多嵌套一层是为了微信小程序兼容 -->
+			<view class="sidebar-margin my-[var(--top-m)] rounded-[var(--rounded-big)] overflow-hidden" v-for="(item, index) in accountList" :key="index">
+				<u-swipe-action-item :options="accountOptions" @click="swipeClick(index)">
+					<view class="card-template flex justify-between" >
+						<view class="flex items-center">
+							<view class="w-[80rpx] h-[80rpx] flex items-center justify-center" @click="handleClick(item)">
+								<image class="w-[80rpx] h-[52rpx] align-middle" :src="img('static/resource/images/member/apply_withdrawal/bank-icon.png')" mode="widthFix" v-if="item.account_type == 'bank'" />
+								<image class="w-[80rpx] h-[52rpx] align-middle" :src="img('static/resource/images/member/apply_withdrawal/wechat_code.png')" mode="widthFix" v-else-if="item.account_type == 'wechat_code'" />
+								<image class="h-[78rpx] w-[78rpx] align-middle" v-else :src="img('static/resource/images/member/apply_withdrawal/alipay-icon.png')" mode="widthFix" />
+							</view>
+							<view class="flex flex-col ml-[20rpx]" @click="handleClick(item)">
+								<view class="text-[#333] text-[28rpx]">{{ item.account_type == 'bank' ? item.bank_name : item.account_type == 'wechat_code'?t('wechatCode')  : t('alipayAccountNo') }}</view>
+								<view v-if="item.account_type == 'bank'" class="text-[var(--text-color-light9)] text-[24rpx] mt-[12rpx]">{{ t('endNumber') }} {{ item.account_no.substring(item.account_no.length - 4) }}{{ t('bankCard') }}</view>
+								<view v-else class="text-[var(--text-color-light9)] text-[24rpx] mt-[12rpx]">{{ item.account_no }}</view>
+							</view>
+						</view>
+						
+						<text class="flex items-center nc-iconfont nc-icon-xiugaiV6xx flex-shrink-0 text-[28rpx] p-[20rpx] pr-0" @click="editAccount(item)"></text>
+					</view>
+				</u-swipe-action-item>
+			</view>
+			<view class="card-template sidebar-margin my-[var(--top-m)] flex items-center" @click="redirect({ url: '/app/pages/member/account_edit', param: { type: accountType, mode } })">
+				<text class="nc-iconfont nc-icon-jiahaoV6xx text-[30rpx]"></text>
+				<text class="text-[28rpx] ml-[10rpx] flex-1">{{ accountType == 'bank' ? t('addBankCard') : accountType == 'wechat_code' ? t('addWechatCode') : t('addAlipayAccount') }}</text>
+				<text class="nc-iconfont nc-icon-youV6xx text-[24rpx] text-[var(--text-color-light6)]"></text>
+			</view>
+        </mescroll-body>
+    </view>
+</template>
+
+<script setup lang="ts">
+    import { ref } from 'vue'
+    import { redirect,img } from '@/utils/common'
+    import { getCashoutAccountList, deleteCashoutAccount } from '@/app/api/member'
+    import MescrollBody from '@/components/mescroll/mescroll-body/mescroll-body.vue'
+    import useMescroll from '@/components/mescroll/hooks/useMescroll.js'
+    import { onPageScroll, onReachBottom, onLoad } from '@dcloudio/uni-app'
+    import { t } from '@/locale'
+
+    const { mescrollInit, downCallback, getMescroll } = useMescroll(onPageScroll, onReachBottom)
+    const accountList = ref<Array<any>>([])
+    const loading = ref(false)
+    const accountType = ref('bank')
+    const mescrollRef = ref(null)
+    const mode = ref('get')
+
+    onLoad((data: any) => {
+        data.type && (accountType.value = data.type)
+        data.mode && (mode.value = data.mode)
+    })
+
+    const getCashoutAccountListFn = (mescroll : any) => {
+    	loading.value = false;
+    	let data : object = {
+    		page: mescroll.num,
+    		limit: mescroll.size,
+            account_type: accountType.value
+    	};
+
+    	getCashoutAccountList(data).then((res: any) => {
+    		const newArr = (res.data.data as Array<Object>);
+    		//设置列表数据
+    		if (mescroll.num == 1) {
+    			accountList.value = []; //如果是第一页需手动制空列表
+    		}
+    		accountList.value = accountList.value.concat(newArr);
+    		mescroll.endSuccess(newArr.length);
+    		loading.value = true;
+    	}).catch(() => {
+    		loading.value = true;
+    		mescroll.endErr(); // 请求失败, 结束加载
+    	})
+    }
+	
+	const editAccount = (item: any)=> {
+	    const url = `/app/pages/member/account_edit`
+	    redirect({ url, param: { id : item.account_id, type : item.account_type, mode:mode.value} })
+	}
+	
+	const accountOptions = ref([
+	    {
+	        text: t('delete'),
+	        style: {
+	            backgroundColor: '#F56C6C'
+	        }
+	    }
+	])
+	
+	const swipeClick = (index: any) => {
+	    const data = accountList.value[index]
+	    deleteCashoutAccount(data.account_id).then(() => {
+	        accountList.value.splice(index, 1)
+	    }).catch()
+	}
+
+    const handleClick = (data: AnyObject) => {
+        if (mode.value == 'get') redirect({ url: '/app/pages/member/account_edit', param: { id: data.account_id, type: accountType.value, mode: mode.value }, mode: 'redirectTo' })
+        else redirect({ url: '/app/pages/member/apply_cash_out', param: { account_id: data.account_id, type: accountType.value }, mode: 'redirectTo'})
+    }
+</script>
+
+<style lang="scss" scoped>
+:deep(.u-swipe-action-item__right__button__wrapper){
+    padding:0 10rpx !important;
+}
+:deep(.u-swipe-action-item__right__button__wrapper__text){
+    font-size:24rpx !important;
+}
+</style>
\ No newline at end of file
diff --git a/uni-app/src/app/pages/member/account_edit.vue b/uni-app/src/app/pages/member/account_edit.vue
new file mode 100644
index 00000000..60749f49
--- /dev/null
+++ b/uni-app/src/app/pages/member/account_edit.vue
@@ -0,0 +1,231 @@
+<template>
+    <view  class="w-screen h-screen bg-[var(--page-bg-color)] overflow-hidden" :style="themeColor()">
+        <scroll-view scroll-y="true" >
+            <view class="sidebar-margin card-template top-mar account pb-[20rpx]">
+                <block v-if="formData.account_type == 'bank'">
+                    <view class="text-center text-[32rpx] font-500 mt-[10rpx] text-[#333] leading-[42rpx]">{{ formData.account_id ? t('editBankCard') : t('addBankCard') }}</view>
+                    <view class="text-center text-[24rpx] mt-[16rpx] text-[var(--text-color-light9)]">{{ formData.account_id ? t('editBankCardTips') : t('addBankCardTips') }}</view>
+                    <view class="mt-[70rpx] px-[10rpx]">
+                        <u-form labelPosition="left" :model="formData" errorType='toast' :rules="rules" ref="formRef">
+                            <view>
+                                <u-form-item :label="t('bankRealname')" prop="realname" labelWidth="200rpx">
+                                    <u-input v-model.trim="formData.realname" fontSize="28rpx" maxlength="30" border="none" clearable :placeholder="t('bankRealnamePlaceholder')"/>
+                                </u-form-item>
+                            </view>
+                            <view class="mt-[16rpx]">
+                                <u-form-item :label="t('bankName')" prop="bank_name" labelWidth="200rpx">
+                                    <u-input v-model.trim="formData.bank_name" fontSize="28rpx" maxlength="30" border="none" clearable :placeholder="t('bankNamePlaceholder')"/>
+                                </u-form-item>
+                            </view>
+                            <view class="mt-[16rpx]">
+                                <u-form-item :label="t('bankAccountNo')" prop="account_no" labelWidth="200rpx">
+                                    <u-input v-model.trim="formData.account_no" fontSize="28rpx" maxlength="30" border="none" clearable :placeholder="t('bankAccountNoPlaceholder')"/>
+                                </u-form-item>
+                            </view>
+                        </u-form>
+                    </view>
+                </block>
+
+                <block v-if="formData.account_type == 'alipay'">
+                    <view class="text-center text-[32rpx] font-500 mt-[20rpx] text-[#333] leading-[42rpx]">{{ formData.account_id ? t('editAlipayAccount') : t('addAlipayAccount') }}</view>
+                    <!-- <view class="text-center text-[28rpx] mt-[16rpx] text-[var(--text-color-light9)] leading-[36rpx]">{{ formData.account_id ? t('editAlipayAccountTips') : t('addAlipayAccountTips') }}</view> -->
+
+                    <view class="mt-[70rpx] px-[10rpx]">
+                        <u-form labelPosition="left" :model="formData"  labelWidth="200rpx" errorType='toast' :rules="rules" ref="formRef">
+                            <view>
+                                <u-form-item :label="t('alipayRealname')" prop="realname">
+                                    <u-input v-model.trim="formData.realname" maxlength="30" border="none" fontSize="28rpx" clearable :placeholder="t('alipayRealnamePlaceholder')"/>
+                                </u-form-item>
+                            </view>
+                            <view class="mt-[16rpx]">
+                                <u-form-item :label="t('alipayAccountNo')" prop="account_no">
+                                    <u-input v-model.trim="formData.account_no" border="none" maxlength="30" fontSize="28rpx" clearable :placeholder="t('alipayAccountNoPlaceholder')"/>
+                                </u-form-item>
+                            </view>
+							<view class="mt-[16rpx]">
+							    <u-form-item label="收款码" prop="transfer_payment_code">
+                                    <view class="relative w-[160rpx] h-[160rpx]" v-if="formData.transfer_payment_code">
+                                        <image  class="w-[160rpx] h-[160rpx]" :src="img(formData.transfer_payment_code)" mode="aspectFill" @click="previewImageFn(img(formData.transfer_payment_code))"></image>
+                                        <view class="absolute top-0 right-0 bg-[#373737] flex justify-end h-[28rpx] w-[28rpx] rounded-bl-[40rpx]" @click="collectionCodeDeleteFn">
+                                            <text class="nc-iconfont nc-icon-guanbiV6xx !text-[20rpx] mt-[2rpx] mr-[2rpx] text-[#fff]"></text>
+                                        </view>
+                                    </view>
+									<u-upload v-else @afterRead="collectionCodeAfterRead" @delete="collectionCodeDeleteFn" :maxCount="1"></u-upload>
+							    </u-form-item>
+							</view>
+                        </u-form>
+                    </view>
+                </block>
+				
+				<block v-if="formData.account_type == 'wechat_code'">
+				    <view class="text-center text-[32rpx] font-500 mt-[20rpx] text-[#333] leading-[42rpx]">{{ formData.account_id ? t('editWechatCodeAccount'): t('addWechatCodeAccount')  }}</view>
+				    <!-- <view class="text-center text-[28rpx] mt-[16rpx] text-[var(--text-color-light9)] leading-[36rpx]">{{ formData.account_id ? t('editWechatCodeAccountTips') : t('addWechatCodeAccountTips') }}</view> -->
+				
+				    <view class="mt-[70rpx] px-[10rpx]">
+				        <u-form labelPosition="left" :model="formData"  labelWidth="200rpx" errorType='toast' :rules="rules" ref="formRef">
+                            <view>
+				                <u-form-item :label="t('alipayRealname')" prop="realname">
+				                    <u-input v-model.trim="formData.realname" maxlength="30" border="none" fontSize="28rpx" clearable :placeholder="t('alipayRealnamePlaceholder')"/>
+				                </u-form-item>
+				            </view>
+				            <view class="mt-[16rpx]">
+				                <u-form-item :label="t('wechatCodeAccountNo')" prop="account_no">
+				                    <u-input v-model.trim="formData.account_no" border="none" maxlength="30" fontSize="28rpx" clearable :placeholder="t('wechatCodeAccountNoPlaceholder')"/>
+				                </u-form-item>
+				            </view>
+							<view class="mt-[16rpx]">
+							    <u-form-item label="收款码" prop="transfer_payment_code">
+                                    <view class="relative w-[160rpx] h-[160rpx]" v-if="formData.transfer_payment_code">
+                                        <image  class="w-[160rpx] h-[160rpx]" :src="img(formData.transfer_payment_code)" mode="aspectFill" @click="previewImageFn(img(formData.transfer_payment_code))"></image>
+                                        <view class="absolute top-0 right-0 bg-[#373737] flex justify-end h-[28rpx] w-[28rpx] rounded-bl-[40rpx]" @click="collectionCodeDeleteFn">
+                                            <text class="nc-iconfont nc-icon-guanbiV6xx !text-[20rpx] mt-[2rpx] mr-[2rpx] text-[#fff]"></text>
+                                        </view>
+                                    </view>
+									<u-upload v-else @afterRead="collectionCodeAfterRead" @delete="collectionCodeDeleteFn" :maxCount="1"></u-upload>
+							    </u-form-item>
+							</view>
+				        </u-form>
+				    </view>
+				</block>
+            </view>
+			<view class="common-tab-bar-placeholder"></view>
+			<view class="common-tab-bar fixed left-[var(--sidebar-m)] right-[var(--sidebar-m)] bottom-[0]">
+				<button :loading="loading" class="primary-btn-bg text-[#fff] h-[80rpx] leading-[80rpx] rounded-[100rpx] text-[26rpx] font-500" @click="handleSave">{{t('save')}}</button>
+			</view>
+        </scroll-view>
+
+        <u-modal :show="deleteConfirm" :content="t('deleteConfirm')" :confirmText="t('confirm')" :cancelText="t('cancel')" :showCancelButton="true" @confirm="handleDelete" @cancel="deleteConfirm = false" confirmColor="var(--primary-color)"></u-modal>
+    </view>
+</template>
+
+<script setup lang="ts">
+    import { ref, computed, reactive } from 'vue'
+    import { onLoad } from '@dcloudio/uni-app'
+    import { getCashoutAccountInfo, addCashoutAccount, editCashoutAccount, deleteCashoutAccount } from '@/app/api/member'
+    import { t } from '@/locale'
+	import { uploadImage } from '@/app/api/system'
+    import { redirect, img } from '@/utils/common'
+
+    const loading = ref(false)
+    const formRef: any = ref(null)
+    const mode = ref('get')
+    const deleteConfirm = ref(false)
+    const formData = reactive<AnyObject>({
+        account_id: 0,
+        account_type: 'bank',
+        bank_name: '',
+        realname: '',
+        account_no: '',
+		transfer_payment_code: ''
+    })
+
+    const rules = computed(() => {
+        return {
+            'realname': {
+                type: 'string',
+                required: true,
+                message: formData.account_type == 'bank' ? t('bankRealnamePlaceholder') : t('alipayRealnamePlaceholder'),
+                trigger: ['blur', 'change'],
+            },
+            'bank_name': {
+                type: 'string',
+                required: formData.account_type == 'bank',
+                message: t('bankNamePlaceholder'),
+                trigger: ['blur', 'change'],
+            },
+            'transfer_payment_code': {
+				validator(rule, value, callback) {
+					if (!value || !value.length){
+						let tips = formData.account_type == 'alipay' ? t('alipayAccountImgPlaceholder') : t('wechatCodeAccountImgPlaceholder');
+						callback(new Error(tips))
+					} else {
+						callback()
+					}
+				}
+			}
+        }
+    })
+
+    onLoad((data: any) => {
+        data.type && (formData.account_type = data.type)
+        data.mode && (mode.value = data.mode)
+        if (data.id) {
+            formData.account_id = data.id || ''
+			if(formData.account_id){
+				uni.setNavigationBarTitle({
+				    title:t('editAccountTitle')
+				})
+			}else{
+				uni.setNavigationBarTitle({
+				    title: t('addAccountTitle')
+				})
+			}
+
+            getCashoutAccountInfo({ account_id: data.id }).then((res : any) => {
+                if (res.data) {
+                    Object.keys(formData).forEach((key : string) => {
+                        if (res.data[key] != undefined) formData[key] = res.data[key]
+                    })
+                }
+            })
+        }
+    })
+
+    const handleSave = () => {
+        const save = formData.account_id ? editCashoutAccount : addCashoutAccount
+
+        formRef.value.validate().then(() => {
+            if (loading.value) return
+            loading.value = true
+
+            save(formData).then((res) => {
+                if (mode.value == 'get') redirect({ url: '/app/pages/member/account', param: { type: formData.account_type, mode: mode.value } })
+                else redirect({ url: '/app/pages/member/apply_cash_out', param: { account_id: formData.account_id ? formData.account_id : res.data.id, type: formData.account_type } , mode: 'redirectTo'})
+            }).catch(() => {
+                loading.value = false
+            })
+        })
+    }
+	
+	const collectionCodeAfterRead = (e)=>{
+		uploadImage({
+			filePath: e.file.url,
+			name: 'file'
+		}).then(res => {
+			if(res.data){
+				formData.transfer_payment_code = '';
+				formData.transfer_payment_code = res.data.url;
+			}
+		}).catch(() => {
+		})
+	}
+	
+	// 删除图片
+	const collectionCodeDeleteFn = (e) =>{
+		formData.transfer_payment_code = '';
+	}
+
+    const handleDelete = () => {
+        deleteCashoutAccount(formData.account_id).then(() => {
+            redirect({ url: '/app/pages/member/account', mode: 'redirectTo' })
+        })
+    }
+	
+	// 预览
+	const previewImageFn = (url:any) => {
+		uni.previewImage({
+			current: 0,
+			urls: [url]
+		});
+	}
+</script>
+
+<style lang="scss" scoped>
+:deep(.account .u-form-item .u-form-item__body){
+    padding: 20rpx 0;
+}
+.account :deep(.u-form-item__body__left__content__label){
+		font-size: 28rpx !important;
+		color:#333;
+	}
+</style>
diff --git a/uni-app/src/app/pages/member/address.vue b/uni-app/src/app/pages/member/address.vue
new file mode 100644
index 00000000..71726566
--- /dev/null
+++ b/uni-app/src/app/pages/member/address.vue
@@ -0,0 +1,158 @@
+<template>
+    <view class="address bg-[var(--page-bg-color)] min-h-[100vh]" v-if="!loading" :style="themeColor()">
+        <scroll-view scroll-y="true">
+			<view class="sidebar-margin pt-[var(--top-m)]" v-if="addressList.length">
+                <view class="mb-[var(--top-m)] rounded-[var(--rounded-big)] overflow-hidden" v-for="(item, index) in addressList">
+                    <view class="flex flex-col card-template">
+                        <view class="flex-1 line-feed mr-[20rpx]" @click="selectAddress(item)">
+                            <view class="flex items-center">
+                                <view class="text-[#333] text-[30rpx] leading-[34rpx] font-500">{{ item.name }}</view>
+                                <text class="text-[#333] text-[30rpx] ml-[10rpx]">{{ mobileHide(item.mobile) }}</text>
+                            </view>
+                            <view class="mt-[16rpx] text-[26rpx] line-feed text-[var(--text-color-light9)] leading-[1.4]">{{ item.full_address }}</view>
+                        </view>
+                        <view class="flex justify-between pt-[26rpx]">
+                            <view class="flex items-center text-[26rpx] leading-none" @click.stop="setDefault(index)">
+                                <text class="iconfont !text-[26rpx] mr-[10rpx]" :class="{ 'iconduigou text-primary': item.is_default, 'iconcheckbox_nol': !item.is_default }"></text>
+                                设为默认
+                            </view>
+                            <view class="flex">
+                                <view class="text-[26rpx]" @click.stop="editAddressFn(item.id)"><text class="nc-iconfont nc-icon-xiugaiV6xx shrink-0 text-[26rpx] mr-[4rpx]"></text>编辑</view>
+                                <view @click.stop="deleteAddressFn(index)" class="ml-[40rpx] text-[26rpx]"><text class="nc-iconfont nc-icon-shanchu-yuangaizhiV6xx shrink-0 text-[26rpx] mr-[4rpx]"></text>删除</view>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+			</view>
+			<mescroll-empty v-if="!addressList.length" :option="{tip : '暂无收货地址'}"></mescroll-empty>
+			<view class="w-full footer">
+				<view class="py-[var(--top-m)] px-[var(--sidebar-m)] footer w-full fixed bottom-0 left-0 right-0 box-border">
+					<button hover-class="none" class="primary-btn-bg text-[#fff] h-[80rpx] leading-[80rpx] rounded-[100rpx] text-[26rpx] font-500" @click="addAddress">{{t('createAddress')}}</button>
+				</view>
+			</view>
+        </scroll-view>
+    </view>
+</template>
+
+<script setup lang="ts">
+    import { ref } from 'vue'
+    import { onLoad,onShow } from '@dcloudio/uni-app'
+    import { redirect, img, mobileHide } from '@/utils/common'
+    import { getAddressList, deleteAddress, editAddress } from '@/app/api/member'
+    import { t } from '@/locale'
+    import MescrollEmpty from '@/components/mescroll/mescroll-empty/mescroll-empty.vue';
+
+    const loading = ref(true)
+    const current = ref(0)
+    const addressList = ref<object[]>([])
+    const locationAddressList = ref<object[]>([])
+    const type = ref('')
+    const source = ref('')
+
+    onLoad((data: any) => {
+        type.value = data.type || ''
+        source.value = data.source || ''
+        if (data.type) current.value = data.type == 'address' ? 0 : 1
+		// 清空缓存，防止受待支付界面影响
+		if(uni.getStorageSync('selectAddressCallback')){uni.removeStorage({ key: 'selectAddressCallback' })}
+    })
+
+    const getAddressListFn = () => {
+        getAddressList({}).then(({ data }) => {
+            const address: any = [], locationAddress: any = []
+            data.forEach((item: any) => {
+                item.type == 'address' ? address.push(item) : locationAddress.push(item)
+            })
+            if(!source.value){ //地址管理使用
+                addressList.value = data;
+            }else{ // 区分同城配送地址和快递地址
+                addressList.value = current.value == 0 ? address : locationAddress;
+            }
+            loading.value = false
+        }).catch(() => {
+            loading.value = false
+        })
+    }
+
+    onShow(()=>{
+        getAddressListFn()
+    })
+
+    const addAddress = ()=> {
+        const url = `/app/pages/member/address_edit`
+        redirect({ url, param: { source : source.value } })
+    }
+
+    const editAddressFn = (id: number)=> {
+        const url = `/app/pages/member/address_edit`
+        redirect({ url, param: { id, source : source.value} })
+    }
+
+    const addressOptions = ref([
+        {
+            text: t('delete'),
+            style: {
+                backgroundColor: '#F56C6C'
+            }
+        }
+    ])
+
+    const selectAddress = (data: any) => {
+        const selectAddress = uni.getStorageSync('selectAddressCallback')
+        if (selectAddress) {
+            selectAddress.address_id = data.id
+
+            uni.setStorage({
+                key: 'selectAddressCallback',
+                data: selectAddress,
+                success() {
+                    redirect({url: selectAddress.back, mode: 'redirectTo'})
+                }
+            })
+        }
+    }
+
+    const deleteAddressFn = (index: any) => {
+        const data: any = addressList.value[index]
+
+        deleteAddress(data.id).then(() => {
+            addressList.value.splice(index, 1)
+        }).catch()
+    }
+
+    const setDefault = (index: any) => {
+        const data: any = addressList.value[index]
+        if (data.is_default) return
+
+        data.is_default = 1;
+        editAddress(data).then(() => {
+            addressList.value.forEach((item, itemIndex) => {
+                item.is_default && (item.is_default = 0)
+                itemIndex == index && (item.is_default = 1)
+            })
+        }).catch()
+    }
+
+</script>
+
+<style lang="scss" scoped>
+    :deep(.u-tabs__wrapper__nav__line) {
+        bottom: 0;
+        background: var(--primary-color) !important;
+    }
+    .line-feed{
+        word-wrap:break-word;
+        word-break: break-all;
+    }
+	:deep(.u-swipe-action-item__right__button__wrapper__text.u-line-1){
+		font-size: 24rpx !important;
+
+	}
+	:deep(.u-swipe-action-item__right__button__wrapper){
+	    padding:0 10rpx !important;
+	}
+	.footer{
+		height: calc(80rpx + var(--top-m) + var(--top-m) + constant(safe-area-inset-bottom)) !important;
+		height: calc(80rpx + var(--top-m) + var(--top-m) + env(safe-area-inset-bottom)) !important;
+	}
+</style>
diff --git a/uni-app/src/app/pages/member/address_edit.vue b/uni-app/src/app/pages/member/address_edit.vue
new file mode 100644
index 00000000..6ef4cfd8
--- /dev/null
+++ b/uni-app/src/app/pages/member/address_edit.vue
@@ -0,0 +1,332 @@
+<template>
+    <view class="bg-[var(--page-bg-color)] min-h-[100vh] overflow-hidden address-edit" :style="themeColor()">
+		<u-form labelPosition="left" :model="formData" errorType='toast' :rules="rules" ref="formRef">
+			<view class="sidebar-margin card-template mt-[var(--top-m)] py-[20rpx]">
+				<view class="">
+					<u-form-item :label="t('name')" prop="name" labelWidth="200rpx">
+						<u-input  fontSize="28rpx" v-model.trim="formData.name" border="none" clearable maxlength="25"  placeholderStyle="color: #888" :placeholder="t('namePlaceholder')"/>
+					</u-form-item>
+				</view>
+				<view class="mt-[16rpx]">
+					<u-form-item :label="t('mobile')" prop="mobile" labelWidth="200rpx">
+						<u-input fontSize="28rpx" v-model.trim="formData.mobile" maxlength="11" border="none" clearable :placeholder="t('mobilePlaceholder')" placeholderStyle="color: #888"/>
+					</u-form-item>
+				</view>
+				<view class="mt-[16rpx]">
+					<u-form-item :label="t('selectArea')" prop="area" labelWidth="200rpx">
+						<view class="flex w-full items-center h-[52rpx]" v-if="addressType == 'address' && isSelectMap != 1" @click="selectArea">
+							<view v-if="!formData.area" class="text-[#888] text-[28rpx] flex-1">{{ t('selectAreaPlaceholder') }}</view>
+							<view v-else class="text-[28rpx] flex-1 leading-[1.4]">{{ formData.area }}</view>
+							<view @click.stop="chooseLocation" class="flex items-center">
+								<text class="nc-iconfont nc-icon-dizhiguanliV6xx mr-[4rpx] text-[32rpx] text-[var(--primary-color)]"></text>
+								<text class="text-[24rpx] whitespace-nowrap text-[var(--primary-color)]">定位</text>
+							</view>
+						</view>
+						<view v-else class="flex justify-between items-center flex-1 h-[52rpx]" @click="chooseLocation">
+							<view  class="text-[28rpx] text-[#303133] leading-[1.4]" v-if="formData.area || formData.address_name">{{formData.area || formData.address_name}}</view>
+							<view  class="text-[#888] text-[28rpx]" v-else>{{t('selectAddressPlaceholder')}}</view>
+							<view class="flex items-center">
+								<text class="nc-iconfont nc-icon-dizhiguanliV6xx text-[32rpx] mr-[4rpx] text-[var(--primary-color)]"></text>
+								<text class="text-[24rpx] whitespace-nowrap text-[var(--primary-color)]">定位</text>
+							</view>
+						</view>
+					</u-form-item>
+				</view>
+				<view class="mt-[16rpx]">
+					<u-form-item :label="t('address')" prop="address" labelWidth="200rpx">
+						<u-input fontSize="28rpx" v-model="formData.address" border="none" clearable maxlength="120" :placeholder="t('addressPlaceholder')" placeholderStyle="color: #888"/>
+					</u-form-item>
+				</view>
+			</view>
+			<view class="sidebar-margin card-template mt-[var(--top-m)] py-[10rpx]">
+				<u-form-item :label="t('defaultAddress')" prop="name" :border-bottom="false" labelWidth="200rpx">
+					<u-switch v-model="formData.is_default" size="20" :activeValue="1" :inactiveValue="0" activeColor="var(--primary-color)" inactiveColor="var(--temp-bg)"/>
+				</u-form-item>
+			</view>
+		</u-form>
+		<view class="w-full footer">
+			<view class="py-[var(--top-m)] px-[var(--sidebar-m)] footer w-full fixed bottom-0 left-0 right-0 box-border">
+				<button hover-class="none" class="primary-btn-bg !text-[#fff] h-[80rpx] leading-[80rpx] rounded-[100rpx] text-[26rpx] font-500" 
+				@click="save" :disabled="btnDisabled" :loading="operateLoading" :class="{'opacity-50': btnDisabled}">{{t('save')}}</button>
+			</view>
+		</view>
+        <area-select ref="areaRef" @complete="areaSelectComplete" :area-id="formData.district_id"/>
+		<!-- #ifdef MP-WEIXIN -->
+		<!-- 小程序隐私协议 -->
+		<wx-privacy-popup ref="wxPrivacyPopupRef"></wx-privacy-popup>
+		<!-- #endif -->
+    </view>
+
+</template>
+
+<script setup lang="ts">
+    import { ref, computed,nextTick } from 'vue'
+    import { onLoad } from '@dcloudio/uni-app'
+    import { redirect } from '@/utils/common'
+    import { t } from '@/locale'
+    import { addAddress, editAddress, getAddressInfo } from '@/app/api/member'
+	import manifestJson from '@/manifest.json'
+	import { getAddressByLatlng } from '@/app/api/system'
+    
+    const formData: any = ref({
+        id: 0,
+        name: '',
+        mobile: '',
+        province_id: 0,
+        city_id: 0,
+        district_id: 0,
+        lat: '',
+        lng: '',
+        address: '',
+        address_name: '',
+        full_address: '',
+        is_default: 0,
+        area: ''
+    })
+    const areaRef = ref()
+    const formRef: any = ref(null)
+    const source = ref('')
+    const btnDisabled = ref(false)
+	const isSelectAddress = ref(false)
+	const addressType = ref('address');
+	const isSelectMap = ref(2) // 值为1，该地址需要有经纬度，反之不需要
+
+    const wxPrivacyPopupRef:any = ref(null)
+    
+    onLoad((data: any) => {
+	    isSelectMap.value = data.isSelectMap || '';
+	    const selectAddress = uni.getStorageSync('selectAddressCallback')
+	    if (data.id) {
+		    getAddressInfo(data.id).then((res: any) => {
+			    res.data && Object.assign(formData.value, res.data)
+			    // 兼容待支付页面编辑地址
+			    if (selectAddress) {
+				    addressType.value = selectAddress.delivery == 'express' ? 'address' : 'locationAddress';
+			    }
+		    })
+
+	    } else if (data.name) {
+		    if (uni.getStorageSync('addressInfo')) {
+			    Object.assign(formData.value, uni.getStorageSync('addressInfo'))
+		    }
+		    formData.value.address = data.name;
+		    getAddress(data.latng);
+		    var tempArr = getQueryVariable('latng').split(',');
+		    formData.value.lat = tempArr[0];
+		    formData.value.lng = tempArr[1];
+	    }
+	    source.value = data.source || ''
+	    if (selectAddress) {
+		    addressType.value = selectAddress.delivery == 'express' ? 'address' : 'locationAddress';
+	    }
+	    // #ifdef MP
+	    nextTick(() => {
+		    if (wxPrivacyPopupRef.value) wxPrivacyPopupRef.value.proactive();
+	    })
+	    // #endif
+    })
+    
+    const rules = computed(() => {
+        return {
+            'name': {
+                type: 'string',
+                required: true,
+                message: t('namePlaceholder'),
+                trigger: ['blur', 'change'],
+            },
+            'mobile': [
+                {
+                    type: 'string',
+                    required: true,
+                    message: t('mobilePlaceholder'),
+                    trigger: ['blur', 'change'],
+                },
+                {
+                    validator(rule: any, value: any, callback: any) {
+                        let mobile = /^1[3-9]\d{9}$/;
+                        if (!mobile.test(value)){
+                            callback(new Error(t('mobileError')))
+                        } else {
+                            callback()
+                        }
+                    }
+                }
+            ],
+            'area': {
+                validator() {
+					let bool = true;
+					if(uni.$u.test.isEmpty(formData.value.area) && uni.$u.test.isEmpty(formData.value.address_name)){
+						bool = false;
+					}
+                    return bool
+                },
+                message: t('selectAreaPlaceholder')
+            },
+            'address': {
+                type: 'string',
+                required: true,
+                message: t('addressPlaceholder'),
+                trigger: ['blur', 'change']
+            }
+        }
+    })
+
+    const selectArea = () => {
+		isSelectAddress.value = true
+        areaRef.value.open()
+    }
+    
+    const areaSelectComplete = (event: any) => {
+		if(isSelectAddress.value && (formData.value.province_id == event.province.id || formData.value.city_id != event.city.id || formData.value.district_id != event.district.id)){
+			formData.value.lat = '';
+			formData.value.lng = '';
+		}
+        formData.value.province_id = event.province.id || 0
+        formData.value.city_id = event.city.id || 0
+        formData.value.district_id = event.district.id || 0
+        formData.value.area = `${event.province.name || ''}${event.city.name || ''}${event.district.name || ''}`
+		isSelectAddress.value = false;
+    }
+    
+    const operateLoading = ref(false)
+    const save = ()=> {
+        const save = formData.value.id ? editAddress : addAddress
+        formRef.value.validate().then(() => {
+            if (operateLoading.value) return
+            operateLoading.value = true
+
+            btnDisabled.value = true
+
+            formData.value.full_address = formData.value.area + formData.value.address
+			
+			if(isSelectMap.value == 1 && !formData.value.lat && !formData.value.lng){
+				uni.showToast({
+					title: '缺少经纬度，请在地图上重新选点',
+					icon: 'none'
+				});
+				operateLoading.value = false;
+				btnDisabled.value = false
+				return false;
+			}
+
+            save(formData.value).then((res: any) => {
+                operateLoading.value = false
+                setTimeout(() => {
+                    btnDisabled.value = false
+					if(source.value == 'shop_order_payment'){
+						const selectAddress = uni.getStorageSync('selectAddressCallback')
+						if (selectAddress) {
+						    selectAddress.address_id = res.data.id || formData.value.id
+						    uni.setStorage({
+						        key: 'selectAddressCallback',
+						        data: selectAddress,
+						        success() {
+						            redirect({url: selectAddress.back, mode: 'redirectTo'})
+						        }
+						    })
+						}
+					}else{
+						redirect({
+						    url: '/app/pages/member/address',
+						    mode: 'redirectTo',
+						    param: {source: source.value}
+						})
+					}
+                }, 1000)
+            }).catch(() => {
+                operateLoading.value = false
+                btnDisabled.value = false
+            })
+        })
+    }
+	
+	// 选择地址
+	const chooseLocation = ()=> {
+	    // #ifdef MP
+	    uni.chooseLocation({
+	    	success: (res) => {
+			    res.latitude && (formData.value.lat = res.latitude)
+			    res.longitude && (formData.value.lng = res.longitude)
+			    res.address && (formData.value.area = res.address)
+			    res.name && (formData.value.address_name = res.address)
+			    res.name && (formData.value.address = res.name)
+			    if (res.latitude && res.longitude) {
+				    let latng = res.latitude + ',' + res.longitude;
+				    getAddress(latng);
+			    }
+		    },
+	        fail: (res)=>{
+	            // 在隐私协议中没有声明chooseLocation:fail api作用域
+	            if(res.errMsg && res.errno) {
+	                if(res.errno == 104){
+	                    let msg = '用户未授权隐私权限，选择位置失败';
+	                    uni.showToast({title: msg, icon: 'none'})
+	                }else if(res.errno == 112){
+	                    let msg = '隐私协议中未声明，打开地图选择位置失败';
+	                    uni.showToast({title: msg, icon: 'none'})
+	                }else {
+	                    uni.showToast({title: res.errMsg, icon: 'none'})
+	                }
+	            }
+	        }
+	    });
+	    // #endif
+	
+	    // #ifdef H5
+	    var urlencode = formData.value;
+	    uni.setStorageSync('addressInfo', urlencode);
+	    let backurl = location.origin +  location.pathname + '?source=' + source.value;
+		if(isSelectMap.value){
+			backurl = backurl + '&isSelectMap=' + isSelectMap.value
+		}
+	    window.location.href = 'https://apis.map.qq.com/tools/locpicker?search=1&type=0&backurl=' + encodeURIComponent(backurl) + '&key=' + manifestJson.h5.sdkConfigs.maps.qqmap.key + '&referer=myapp';
+	    // #endif
+	}
+
+	//获取详细地址
+	const getAddress = (latlng:any)=> {
+	    getAddressByLatlng({latlng}).then((res: any) => {
+	        if (res.data) {
+	            formData.value.full_address = '';
+	            formData.value.full_address += res.data.province != undefined ? res.data.province : '';
+	            formData.value.full_address += res.data.city != undefined ? '' + res.data.city : '';
+	            formData.value.full_address += res.data.district != undefined ? '' + res.data.district : '';
+	
+	            formData.value.address_name = formData.value.full_address.replace(/-/g,'');
+	            formData.value.area = (res.data.province + res.data.city + res.data.district) || res.data.full_address;
+	
+	            formData.value.province_id = res.data.province_id != undefined ? res.data.province_id : 0;
+	            formData.value.city_id = res.data.city_id != undefined ? res.data.city_id : 0;
+	            formData.value.district_id = res.data.district_id != undefined ? res.data.district_id : 0;
+	        } else {
+	            uni.showToast({title: res.msg, icon: 'none'})
+	        }
+	    })
+	
+	}
+	
+	const getQueryVariable = (variable:any)=> {
+	    var query = window.location.search.substring(1);
+	    var vars = query.split('&');
+	    for (var i = 0; i < vars.length; i++) {
+	        var pair = vars[i].split('=');
+	        if (pair[0] == variable) {
+	            return pair[1];
+	        }
+	    }
+	    return false;
+	}
+</script>
+
+<style lang="scss" scoped>
+	.address-edit :deep(.u-form-item__body__left__content__label){
+		font-size: 28rpx !important;
+	}
+	.address-edit :deep(.u-form-item__body__right){
+		display:flex;
+	}
+	.footer{
+		height: calc(100rpx + var(--top-m) + var(--top-m) + constant(safe-area-inset-bottom)) !important;
+		height: calc(100rpx + var(--top-m) + var(--top-m) + env(safe-area-inset-bottom)) !important;
+	}
+</style>
\ No newline at end of file
diff --git a/uni-app/src/app/pages/member/apply_cash_out.vue b/uni-app/src/app/pages/member/apply_cash_out.vue
new file mode 100644
index 00000000..4fafa908
--- /dev/null
+++ b/uni-app/src/app/pages/member/apply_cash_out.vue
@@ -0,0 +1,426 @@
+<template>
+    <view :style="themeColor()">
+		<scroll-view :scroll-y="true" class="w-screen h-screen bg-[var(--page-bg-color)]" v-if="!pageLoading && config.is_open == 1">
+			<view class="sidebar-margin pt-[var(--top-m)]">
+				<view class="card-template">
+					<view class="font-500 text-[30rpx] text-[#333] leading-[42rpx]">{{t('cashOutMoneyTip')}}</view>
+					<view class="flex pt-[30rpx] pb-[8rpx] items-center border-0 border-b-[2rpx] border-solid border-[#F1F2F5]">
+						<text class="pt-[4rpx] text-[44rpx] text-[#333] iconfont iconrenminbiV6xx price-font "></text>
+						<input type="digit" class="h-[76rpx] leading-[76rpx] pl-[10rpx] flex-1 font-500 text-[54rpx] bg-[#fff]" v-model="applyData.apply_money" maxlength="7" :placeholder="applyData.apply_money?'':(t('minWithdrawal') + t('currency') + moneyFormat(config.min))" placeholder-class="apply-price" :adjust-position="false"/>
+                        <text v-if="Number(serviceMoney)" class="text-[24rpx] text-[var(--text-color-light6)] mr-[20rpx]">手续费{{ serviceMoney }}</text>
+						<text @click="clearMoney" v-if="applyData.apply_money" class="nc-iconfont nc-icon-cuohaoV6xx1 !text-[32rpx] text-[var(--text-color-light9)]"></text>
+					</view>
+					<view class="pt-[16rpx] flex items-center justify-between px-[4rpx]">
+						<view class="text-[24rpx] text-[var(--text-color-light6)] leading-[36rpx]">
+                            <text>{{t('money')}}：{{ t('currency') }}{{ moneyFormat(cashOutMoney) }}</text>
+                            <text>，{{t('commissionTo')}}{{ config.rate + '%' }}</text>
+                        </view>
+						<view class="text-[24rpx] text-primary leading-[36rpx]" @click="allMoney">{{t('allTx')}}</view>
+					</view>
+				</view>
+
+				<view class="mt-[20rpx] card-template">
+                    <view class="font-500 text-[30rpx] text-[#333] leading-[42rpx] mb-[30rpx]">到账方式</view>
+					<!-- 提现到微信 -->
+					<view class="p-[20rpx] mb-[20rpx] flex items-center rounded-[var(--rounded-mid)] border-[1rpx] border-solid border-[#eee]" v-if="config.transfer_type.includes('wechatpay') && memberStore.info && (memberStore.info.wx_openid || memberStore.info.weapp_openid)" :class="{'border-[#00C800] bg-[#ECF9EF]': applyData.transfer_type == 'wechatpay'}"  @click="transferWeixin">
+						<view>
+                            <image class="h-[60rpx] w-[60rpx]" :src="img('static/resource/images/member/apply_withdrawal/wechat.png')" mode="widthFix" />
+                        </view>
+						<view class="flex-1 px-[20rpx]">
+							<view class="text-[28rpx] text-[#333] leading-[40rpx] mb-[6rpx]">{{ t('cashOutToWechat') }}</view>
+							<view class="text-[var(--text-color-light9)] text-[24rpx] leading-[34rpx]">{{ t('cashOutToWechatTips') }}</view>
+						</view>
+					</view>
+					
+					<!-- 提现到微信收款码 -->
+					<view class="p-[20rpx] mb-[20rpx] flex items-center rounded-[var(--rounded-mid)] border-[1rpx] border-solid border-[#eee]"  v-if="config.transfer_type.includes('wechat_code')" :class="{'border-[#00C800] bg-[#ECF9EF]': applyData.transfer_type == 'wechat_code' && wechatCodeInfo}" >
+						<view @click="transferWechatCode" >
+					        <image class="h-[60rpx] w-[60rpx] align-middle" :src="img('static/resource/images/member/apply_withdrawal/wechat_code.png')" mode="widthFix" />
+					    </view>
+						<view class="flex-1 px-[22rpx]"  @click="transferWechatCode" >
+							<view class="text-[28rpx] text-[#333] leading-[40rpx] mb-[6rpx]">{{ t('cashOutToWechatCode') }}</view>
+							<view class="text-[var(--text-color-light9)] text-[24rpx] leading-[34rpx]">
+								<view  v-if="wechatCodeInfo" class="truncate max-w-[440rpx]">
+					                <text>{{ t('cashOutTo') }}{{ t('wechatCodeAccountNo') }}</text>
+					                <text class="text-[#333]">{{ wechatCodeInfo.account_no }}</text> 
+								</view>
+								<view v-else>{{ t('cashOutToWechatCodeTips') }}</view>
+							</view>
+						</view>
+						<view class="flex items-center">
+							<button v-if="!wechatCodeInfo && !wechatCodeLoading" hover-class="none" class="w-[110rpx] h-[54rpx] flex-center rounded-full p-[0] text-[var(--primary-color)] bg-transparent border-[2rpx] border-solid border-[var(--primary-color)] text-[22rpx]" @click="redirect({ url: '/app/pages/member/account', param: { type: 'wechat_code', mode: 'select' } , mode: 'redirectTo'})">{{t('toAdd')}}</button>
+					        <text v-else class="nc-iconfont nc-icon-youV6xx text-[28rpx] text-[var(--text-color-light9)] p-[10rpx]" @click.stop="redirect({ url: '/app/pages/member/account', param: { type: 'wechat_code', mode: 'select' } , mode: 'redirectTo'})"></text>
+						</view>
+					</view>
+
+					<!-- 提现到支付宝 -->
+					<view class="p-[20rpx] mb-[20rpx] flex items-center rounded-[var(--rounded-mid)] border-[1rpx] border-solid border-[#eee]"  v-if="config.transfer_type.includes('alipay')" :class="{'border-[#009FE8] bg-[#EEF8FC]': applyData.transfer_type == 'alipay' && alipayAccountInfo}" >
+						<view  @click="transferAlipay" >
+                            <image class="h-[60rpx] w-[60rpx] align-middle" :src="img('static/resource/images/member/apply_withdrawal/alipay-icon.png')" mode="widthFix" />
+                        </view>
+						<view class="flex-1 px-[22rpx]"  @click="transferAlipay" >
+							<view class="text-[28rpx] text-[#333] leading-[40rpx] mb-[6rpx]">{{ t('cashOutToAlipay') }}</view>
+							<view class="text-[var(--text-color-light9)] text-[24rpx] leading-[34rpx]">
+								<view  v-if="alipayAccountInfo" class="truncate max-w-[440rpx]">
+                                    <text>{{ t('cashOutTo') }}{{ t('alipayAccountNo') }}</text>
+                                    <text class="text-[#333]">{{ alipayAccountInfo.account_no }}</text> 
+								</view>
+								<view v-else>{{ t('cashOutToAlipayTips') }}</view>
+							</view>
+						</view>
+						<view class="flex items-center">
+							<button v-if="!alipayAccountInfo && !alipayLoading" hover-class="none" class="w-[110rpx] h-[54rpx] flex-center rounded-full p-[0] text-[var(--primary-color)] bg-transparent border-[2rpx] border-solid border-[var(--primary-color)] text-[22rpx]" @click="redirect({ url: '/app/pages/member/account', param: { type: 'alipay', mode: 'select' } , mode: 'redirectTo'})">{{t('toAdd')}}</button>
+                            <text  v-else class="nc-iconfont nc-icon-youV6xx text-[28rpx] text-[var(--text-color-light9)] p-[10rpx]" @click.stop="redirect({ url: '/app/pages/member/account', param: { type: 'alipay', mode: 'select' } , mode: 'redirectTo'})"></text>
+						</view>
+					</view>
+
+					<!-- 提现到银行卡 -->
+					<view class="p-[20rpx] flex items-center rounded-[var(--rounded-mid)] border-[1rpx] border-solid border-[#eee]" v-if="config.transfer_type.includes('bank')" :class="{'border-[#089C98] bg-[#F6FFFF]': applyData.transfer_type == 'bank' && bankAccountInfo}">
+						<view @click="transferBank" >
+                            <image class="h-[42rpx] w-[60rpx] align-middle" :src="img('static/resource/images/member/apply_withdrawal/bank-icon.png')" mode="widthFix" />
+						</view>
+						<view class="flex-1 px-[20rpx]" @click="transferBank" >
+							<view class="text-[28rpx] text-[#333] leading-[40rpx] mb-[6rpx]">{{ t('cashOutToBank') }}</view>
+							<view class="text-[var(--text-color-light9)] text-[24rpx] leading-[34rpx]">
+								<view v-if="bankAccountInfo" class="truncate max-w-[440rpx]">
+                                    <text>{{ t('cashOutTo') }}{{ bankAccountInfo.bank_name }}{{ t('debitCard') }}</text>
+									<text class="text-[#333]">{{ bankAccountInfo.account_no.substring(bankAccountInfo.account_no.length - 4) }} </text>
+								</view>
+								<view v-else>
+									{{ t('cashOutToBankTips') }}
+								</view>
+							</view>
+						</view>
+						<view class="flex items-center">
+							<button hover-class="none" class="h-[54rpx] flex-center rounded-full p-[0] w-[110rpx] text-[var(--primary-color)] bg-transparent border-[2rpx] border-solid border-[var(--primary-color)] text-[22rpx]" v-if="!bankAccountInfo && !bankLoading" @click="redirect({ url: '/app/pages/member/account', param: { type: 'bank', mode: 'select' }, mode: 'redirectTo' })">{{t('toAdd')}}</button>
+							<text v-else class="nc-iconfont nc-icon-youV6xx text-[28rpx] text-[var(--text-color-light9)] p-[10rpx]" @click.stop="redirect({ url: '/app/pages/member/account', param: { type: 'bank', mode: 'select' }, mode: 'redirectTo' })"></text>
+						</view>
+					</view>
+				</view>
+				
+				<view class="tab-bar-placeholder"></view>
+				<view class="fixed bottom-[0] tab-bar left-0 right-0 px-[var(--sidebar-m)] bg-[var(--page-bg-color)]">
+					<button class="h-[80rpx] !text-[#fff] leading-[80rpx] primary-btn-bg rounded-[50rpx] text-[26rpx]" :disabled="applyData.apply_money == '' || applyData.apply_money == 0" :loading="loading" @click="cashOut">{{t('cashOutNow')}}</button>
+					<view class="mt-[30rpx] text-center text-[26rpx] text-primary" @click.stop="redirect({ url: '/app/pages/member/cash_out'})">
+						{{t('cashOutList')}}
+					</view>
+				</view>
+				
+			</view>
+		</scroll-view>
+        <view class="h-[100vh] w-[100vw] bg-[var(--page-bg-color)] overflow-hidden" v-if="config.is_open == 0 && !pageLoading">
+            <view  class="empty-page">
+                <image class="img" :src="img('addon/shop/cart-empty.png')" model="aspectFit" />
+                <view class="desc">{{ t('isOpenApply') }}</view>
+            </view>
+		</view>
+		<loading-page :loading="pageLoading"></loading-page>
+    </view>
+</template>
+
+<script lang="ts" setup>
+    import { ref, reactive, watch, computed } from 'vue'
+    import { t } from '@/locale'
+    import { moneyFormat, redirect, getToken ,img, deepClone, getWinxinOpenId } from '@/utils/common'
+    import useMemberStore from '@/stores/member'
+    import { cashOutConfig, cashOutApply, getFirstCashoutAccountInfo, getCashoutAccountInfo } from '@/app/api/member'
+    import { onLoad } from '@dcloudio/uni-app'
+
+    const pageLoading = ref(true)
+    const loading = ref(false)
+    const memberStore = useMemberStore()
+	
+    // 申请提现数据
+    const applyData = reactive({
+        apply_money: '',
+        transfer_type: '',
+        account_type: 'money',
+        account_id: 0,
+		transfer_payee:{
+			open_id: '',
+			channel: ''
+		}
+    })
+
+    // 可提现金额
+    const cashOutMoney = computed(() => {
+        return memberStore.info ? memberStore.info[ applyData.account_type ] : 0
+    })
+
+    watch(() => applyData.transfer_type, (nval) => {
+        switch (nval) {
+            case 'bank':
+                applyData.account_id = bankAccountInfo.value ? bankAccountInfo.value.account_id : 0
+                break;
+            case 'alipay':
+                applyData.account_id = alipayAccountInfo.value ? alipayAccountInfo.value.account_id : 0
+                break;
+            case 'wechat_code':
+                applyData.account_id = wechatCodeInfo.value ? wechatCodeInfo.value.account_id : 0
+                break;
+            default:
+                applyData.account_id = 0
+        }
+    }, { immediate: true })
+
+    const config = reactive<AnyObject>({
+        is_auto_transfer: 0, // 是否自动转账
+        is_auto_verify: 0, // 是否自动审核
+        is_open: 0, // 是否启用提现
+        min: 0, // 最低提现金额
+        rate: 0, // 手续费比率
+        transfer_type: [] // 提现方式
+    })
+
+    let query:any = {}
+
+    onLoad(async (data) => {
+        query = data
+
+        uni.getStorageSync('cashOutAccountType') && (applyData.account_type = uni.getStorageSync('cashOutAccountType'))
+		
+		if(getToken()){
+			memberStore.getMemberInfo()
+		}
+
+        if (!['money', 'commission'].includes(applyData.account_type)) {
+            uni.showToast({
+                title: t('abnormalOperation'),
+                icon: 'none',
+                success() {
+                    setTimeout(() => { 
+                        if(getCurrentPages().length > 1){
+                            uni.navigateBack({
+                                delta: 1
+                            });
+                        }else{
+                            redirect({
+                                url: '/app/pages/member/index',
+                                mode: 'reLaunch'
+                            });
+                        }
+                    }, 1500)
+                }
+            })
+            return
+        }
+
+        // 提现配置
+        await cashOutConfig().then((res : any) => {
+            for (let key in deepClone(res.data)) {
+            	config[key] = deepClone(res.data[key]);
+            }
+            if (config.transfer_type.includes('wechatpay') && memberStore.info && (!memberStore.info.wx_openid && !memberStore.info.weapp_openid)){
+                config.transfer_type.splice(config.transfer_type.indexOf('wechatpay'),1)
+            } else{
+                config.transfer_type.includes('wechatpay') && transferWeixin()
+            } 
+            config.transfer_type.includes('bank') && getBankAccountInfo()
+            config.transfer_type.includes('alipay') && getAlipayAccountInfo()
+            config.transfer_type.includes('wechat_code') && getWechatCodeInfo()
+            applyData.transfer_type = config.transfer_type[0]
+			if(query.type){
+                applyData.transfer_type = query.type
+            }
+            pageLoading.value = false
+        })
+    })
+
+    // 手续费
+    const serviceMoney = computed(() => {
+        let money = 0
+        if(applyData.apply_money && Number(config.rate)){
+            money = Number(applyData.apply_money) * Number(config.rate) / 100
+        }
+        return money.toFixed(2);
+    })
+
+    //全部提现
+    const allMoney = () => {
+        if(parseFloat(cashOutMoney.value)) applyData.apply_money = moneyFormat(cashOutMoney.value)
+    }
+
+    // 清空提现金额
+    const clearMoney = () => {
+        applyData.apply_money = '';
+    }
+
+    const verify = () => {
+        if (!applyData.transfer_type) {
+            uni.showToast({ title: t('noAvailableCashOutType'),  icon: 'none' })
+            return false
+        }
+        if (uni.$u.test.isEmpty(applyData.apply_money)) {
+            uni.showToast({ title: t('applyMoneyPlaceholder'), icon: 'none' })
+            return false
+        }
+        if (!uni.$u.test.amount(applyData.apply_money)) {
+            uni.showToast({ title: t('moneyformatError'), icon: 'none' })
+            return false
+        }
+        if (parseFloat(applyData.apply_money) > parseFloat(cashOutMoney.value)) {
+            uni.showToast({ title: t('applyMoneyExceed'), icon: 'none' })
+            return false
+        }
+        if (parseFloat(applyData.apply_money) < parseFloat(config.min)) {
+            uni.showToast({ title: t('applyMoneyBelow'),  icon: 'none' })
+            return false
+        }
+        return true;
+    }
+
+    /**
+     * 获取支付宝提现账号信息
+     */
+    const alipayLoading = ref(false)
+    const alipayAccountInfo:any = ref(null)
+    const getAlipayAccountInfo =  () => {
+        const data = { account_type: 'alipay', account_id: 0 }
+        let request = getFirstCashoutAccountInfo
+
+        if (query.type && query.type == 'alipay' && query.account_id) {
+            request = getCashoutAccountInfo
+            data.account_id = query.account_id
+        }
+        alipayLoading.value = true
+        request(data).then((res: any) => {
+            if (res.data && res.data.account_id) {
+                alipayAccountInfo.value = res.data
+                // 初始化赋值
+                if(applyData.transfer_type == 'alipay' && !applyData.account_id){
+                    applyData.account_id = alipayAccountInfo.value.account_id;
+                }
+            }
+            alipayLoading.value = false
+        })
+    }
+
+    /**
+     * 获取银行卡提现账号信息
+     */
+    const bankLoading = ref(false)
+    const bankAccountInfo: any = ref(null)
+    const getBankAccountInfo = () => {
+        const data = { account_type: 'bank', account_id: 0 }
+        let request = getFirstCashoutAccountInfo
+
+        if (query.type && query.type == 'bank' && query.account_id) {
+            request = getCashoutAccountInfo
+            data.account_id = query.account_id
+        }
+        bankLoading.value = true
+        request(data).then((res: any) => {
+            if (res.data && res.data.account_id) {
+                bankAccountInfo.value = res.data
+	            // 初始化赋值
+                if(applyData.transfer_type == 'bank' && !applyData.account_id){
+                    applyData.account_id = bankAccountInfo.value.account_id;
+                }
+            }
+            bankLoading.value = false
+        })
+    }
+	
+	
+	/**
+	 * 获取微信收款码提现账号信息
+	 */
+	const wechatCodeLoading = ref(false)
+	const wechatCodeInfo: any = ref(null)
+	const getWechatCodeInfo = () => {
+	    const data = { account_type: 'wechat_code', account_id: 0 }
+	    let request = getFirstCashoutAccountInfo
+	
+	    if (query.type && query.type == 'wechat_code' && query.account_id) {
+	        request = getCashoutAccountInfo
+	        data.account_id = query.account_id
+	    }
+	    wechatCodeLoading.value = true
+	    request(data).then((res: any) => {
+	        if (res.data && res.data.account_id) {
+	            wechatCodeInfo.value = res.data
+	            // 初始化赋值
+	            if(applyData.transfer_type == 'wechat_code' && !applyData.account_id){
+	                applyData.account_id = wechatCodeInfo.value.account_id;
+	            }
+	        }
+	        wechatCodeLoading.value = false
+	    })
+	}
+
+    /**
+     * 申请提现
+     */
+    const cashOut = ()=> {
+        if (verify()) {
+            if (loading.value) return
+            loading.value = true
+			
+            cashOutApply(applyData).then((res: any) => {
+                loading.value = false
+				memberStore.getMemberInfo(()=>{
+                    if(applyData.transfer_type == 'wechatpay'){
+                        redirect({ url: '/app/pages/member/cash_out_detail', param: { id: res.data} })
+                    }else{
+                        redirect({ url: '/app/pages/member/cash_out' })
+                    }
+                })
+                
+            }).catch(() => {
+                loading.value = false
+            })
+        }
+    }
+
+    // 选中提现到支付宝
+    const transferAlipay = () => {
+        if(!alipayAccountInfo.value){
+            uni.showToast({ title: t('cashOutToAlipayTips'), icon: 'none' })
+            return false
+        }
+        applyData.transfer_type = 'alipay'
+    }
+    // 选中提现到银行卡
+    const transferBank = () => {
+        if(!bankAccountInfo.value){
+            uni.showToast({ title: t('cashOutToBankTips'), icon: 'none' })
+            return false
+        }
+        applyData.transfer_type = 'bank'
+    }
+	// 选中提现到微信
+	const transferWeixin = ()=>{
+		let data = getWinxinOpenId();
+		
+		applyData.transfer_payee.open_id = data.wechat ? data.wechat : data.weapp;
+		applyData.transfer_payee.channel = data.wechat ? 'wechat' : 'weapp';
+		
+		applyData.transfer_type = 'wechatpay'
+	}
+	
+	// 选中提现到微信收款码
+	const transferWechatCode = ()=>{
+		if(!wechatCodeInfo.value){
+		    uni.showToast({ title: t('cashOutToWechatCodeTips'), icon: 'none' })
+		    return false
+		}
+		applyData.transfer_type = 'wechat_code'
+	}
+</script>
+
+<style lang="scss" scoped>
+:deep(.apply-price){
+    color: var(--text-color-light9);
+    font-size: 26rpx;
+    font-weight: normal;
+    line-height: 76rpx;
+}
+.tab-bar-placeholder {
+	padding-bottom: calc(constant(safe-area-inset-bottom) + 166rpx);
+	padding-bottom: calc(env(safe-area-inset-bottom) + 166rpx);
+}
+.tab-bar {
+	padding-bottom: calc(constant(safe-area-inset-bottom) + 30rpx);
+	padding-bottom: calc(env(safe-area-inset-bottom) + 30rpx);
+}
+</style>
diff --git a/uni-app/src/app/pages/member/balance.vue b/uni-app/src/app/pages/member/balance.vue
new file mode 100644
index 00000000..0ff066ad
--- /dev/null
+++ b/uni-app/src/app/pages/member/balance.vue
@@ -0,0 +1,255 @@
+<template>
+    <view class="min-h-[100vh] !bg-[var(--page-bg-color)]" :style="themeColor()" v-if="memberStore.info">
+			<view class="fixed w-full z-2  !bg-[var(--page-bg-color)]">
+				<view class="pb-[190rpx] text-[#fff] w-full" :style="headerStyle">
+					<!-- #ifdef MP-WEIXIN -->
+					<top-tabbar :data="param" class="top-header"/>
+					<!-- #endif -->
+				    <view class="leading-[38rpx] text-[28rpx] pl-[60rpx] pt-[100rpx]">{{t('accountBalance')}}</view>
+					<view class="flex items-baseline pl-[60rpx]" >
+						<text class="text-[36rpx] leading-[52rpx] mr-[6rpx] price-font">￥</text>
+						<text class="text-[56rpx] leading-[72rpx] price-font">{{ memberStore.info ?  moneyFormat((parseFloat(memberStore.info.balance) + parseFloat(memberStore.info.money)).toString()).split('.')[0] : '0' }}.</text>
+						<text class="text-[36rpx] leading-[56rpx] price-font">{{ memberStore.info ? moneyFormat((parseFloat(memberStore.info.balance) + parseFloat(memberStore.info.money)).toString()).split('.')[1] : '00'  }}</text>
+					</view>
+				</view>
+				<view class="sidebar-margin pt-[50rpx] pb-[40rpx] bg-[#fff] rounded-[var(--rounded-big)] px-[40rpx] box-border mt-[-112rpx]">
+					<view class="flex flex-col items-center w-full" @click="redirect({ url: '/app/pages/member/detailed_account', param: { type : 'money' } })"  :class="{'pt-[12rpx]': !Object.keys(cashOutConfigObj).length || (Object.keys(cashOutConfigObj).length && !systemStore.siteAddons.includes('recharge') && cashOutConfigObj.is_open != 1)}">
+						<view class=" text-[var(--text-color-light9)] text-[26rpx] leading-[34rpx] mb-[12rpx]">{{t('money')}}</view>
+						<view class="text-[#333] inline-block">
+							<text class="text-[36rpx] mr-[6rpx] price-font">￥</text>
+							<text class="text-[56rpx] font-500 price-font">{{ moneyFormat(memberStore.info?.money).split('.')[0] }}.</text>
+							<text class="text-[36rpx] font-500 price-font">{{ moneyFormat(memberStore.info?.money).split('.')[1] }}</text>
+						</view>
+					</view>
+					<view class="mt-[60rpx] flex justify-around" v-if="Object.keys(cashOutConfigObj).length && (systemStore.siteAddons.includes('recharge') || cashOutConfigObj.is_open == 1 || rechargeConfigObj.is_use == 1)">
+						<block v-if="systemStore.siteAddons.includes('recharge')">
+							<button v-if="rechargeConfigObj.is_use == 1" class="w-[250rpx] h-[70rpx] rounded-[40rpx] text-[26rpx] font-500 !bg-[#fff] !text-[var(--primary-color)] flex-center !m-0 border-[2rpx] border-[var(--primary-color)] border-solid box-border"  hover-class="none" shape="circle" @click="redirect({url: '/addon/recharge/pages/recharge'})">充值</button>
+						</block>
+						<view v-if="cashOutConfigObj.is_open == 1" :class="{'!w-[340rpx]': !systemStore.siteAddons.includes('recharge')}" class="text-center w-[250rpx] h-[70rpx] rounded-[40rpx] text-[26rpx] !text-[#fff] flex-center font-500 !m-0"
+						style="background: linear-gradient( 94deg, #FB7939 0%, #FE120E 99%), #EF000C;" @click="applyCashOut">{{t('cashOut')}}</view>
+					</view>
+				</view>
+				<view class="mt-[30rpx] bg-[var(--page-bg-color)] tab-style-1">
+					<view class="tab-left">
+						<view class="tab-left-item" :class="{ 'class-select': fromType === item.key}" @click="fromTypeFn(item.key,index)" v-for="(item, index) in accountTypeList">{{ item.name }}</view>
+					</view>
+					<view class="tab-right" @click="handleSelect">
+						<view class="tab-right-date">日期</view>
+						<view class="nc-iconfont nc-icon-a-riliV6xx-36 tab-right-icon"></view>
+					</view>
+				</view>
+			</view>
+            <mescroll-body ref="mescrollRef" @init="mescrollInit" :down="{ use: false }" height="auto" @up="getListFn" :top="mescrollTop">
+            	<view class="sidebar-margin pt-[10rpx] body-bottom" v-if="list.length">
+					<view  v-for="(item,index) in list" :key="item.id" class="w-full h-[140rpx] flex justify-between items-center box-border card-template" :class="{'mt-[var(--top-m)]':index>0}">
+						<view class="flex items-center">
+							<view class="w-[80rpx] h-[80rpx] text-center rounded-[40rpx] text-[40rpx] font-500 leading-[80rpx] text-[#fff]"
+							:class="{'bg-[#EF000C]' :item.account_data > 0&&item.account_type!='money', 'bg-[#03B521]':item.account_data <= 0&&item.account_type!='money','bg-[#1379FF]':item.account_type=='money'}">
+								{{item.account_type=='money'?'提':item.account_data > 0?'收':'支'}}
+							</view>
+							<view class="flex flex-col ml-[20rpx]">
+								<view class="text-[#333] text-[28rpx] leading-[36rpx]">{{item.from_type_name}}</view>
+								<view class="text-[var(--text-color-light9)] text-[24rpx] mt-[12rpx]">{{item.create_time}}</view>
+							</view>
+						</view>
+						<view class="text-right">
+							<view class="text-[36rpx] leading-[40rpx] price-font"
+							:class="{'text-[#EF000C]' :item.account_data > 0&&item.account_type!='money', 'text-[#03B521]':item.account_data <= 0&&item.account_type!='money'}">{{ item.account_data > 0 ? '+' + item.account_data : item.account_data }}</view>
+						</view>
+					</view>
+				</view>
+				<mescroll-empty v-if="!list.length && !loading &&!listLoading"></mescroll-empty>
+
+            </mescroll-body>
+		    <loading-page :loading="loading"></loading-page>
+			<!-- <pay ref="payRef" @close="rechargeLoading = false"></pay> -->
+			<!-- 时间选择 -->
+			<select-date ref="selectDateRef" @confirm="confirmFn" />
+    </view>
+</template>
+
+<script setup lang="ts">
+	import { ref, reactive,computed ,watch} from 'vue'
+	import { t } from '@/locale'
+	import { moneyFormat, redirect, img,pxToRpx } from '@/utils/common';
+	import { cashOutConfig,getBalanceListAll,rechargeConfig} from '@/app/api/member';
+	import MescrollBody from '@/components/mescroll/mescroll-body/mescroll-body.vue';
+	import MescrollEmpty from '@/components/mescroll/mescroll-empty/mescroll-empty.vue';
+	import useMescroll from '@/components/mescroll/hooks/useMescroll.js';
+	import { onShow, onPageScroll, onReachBottom } from '@dcloudio/uni-app';
+	import useMemberStore from '@/stores/member'
+    import useSystemStore from '@/stores/system'
+    import { topTabar } from '@/utils/topTabbar'
+	import selectDate from '@/components/select-date/select-date.vue';
+
+	const { downCallback,mescrollInit, getMescroll } = useMescroll(onPageScroll, onReachBottom);
+	const memberStore = useMemberStore()
+    const systemStore = useSystemStore()
+
+    /********* 自定义头部 - start ***********/
+    const topTabarObj = topTabar()
+    let param = topTabarObj.setTopTabbarParam({title:'我的余额'})
+    /********* 自定义头部 - end ***********/
+
+	const cashOutConfigObj: any = reactive({})
+	const rechargeConfigObj: any = reactive({})
+
+	// 监听 siteAddons 变化
+	watch(
+	  () => systemStore.siteAddons,
+	  (newAddons, oldAddons) => {
+	    if (newAddons !== oldAddons) {
+	      systemStore.siteAddons = newAddons
+		  if(systemStore.siteAddons.includes('recharge')) {
+		  	rechargeConfig().then((res: any) => {
+		  		for (let key in res.data) {
+		  			rechargeConfigObj[key] = res.data[key];
+		  		}
+		  	})
+		  }
+	    }
+	  }
+	);
+
+	onShow(() => {
+        cashOutConfig().then((res: any) => {
+            for (let key in res.data) {
+                cashOutConfigObj[key] = res.data[key];
+            }
+
+        })
+		if(systemStore.siteAddons.includes('recharge')) {
+			rechargeConfig().then((res: any) => {
+				for (let key in res.data) {
+					rechargeConfigObj[key] = res.data[key];
+				}
+			})
+		}
+    })
+
+
+	// 获取系统状态栏的高度
+	let menuButtonInfo: any = {};
+	// 如果是小程序，获取右上角胶囊的尺寸信息，避免导航栏右侧内容与胶囊重叠(支付宝小程序非本API，尚未兼容)
+	// #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+	menuButtonInfo = uni.getMenuButtonBoundingClientRect();
+	// #endif
+	const headerStyle = computed(()=>{
+		return {
+			backgroundImage: 'url(' + img('static/resource/images/member/balance_bg.png') + ') ',
+			backgroundSize: 'cover',
+			backgroundRepeat: 'no-repeat',
+			backgroundPosition: 'bottom',
+		}
+	})
+
+	const mescrollTop = computed(()=>{
+		if((cashOutConfigObj.is_open == 1 || rechargeConfigObj.is_use == 1)){
+			if(Object.keys(menuButtonInfo).length){
+				return (pxToRpx(Number(menuButtonInfo.height)) + pxToRpx(menuButtonInfo.top) +pxToRpx(8)+700)+'rpx'
+			}else{
+				return '718rpx'
+			}
+		}else {
+			if(Object.keys(menuButtonInfo).length){
+				return (pxToRpx(Number(menuButtonInfo.height)) + pxToRpx(menuButtonInfo.top) +pxToRpx(8)+632)+'rpx'
+			}else{
+				return '650rpx'
+			}
+		}
+	})
+
+	//获取数据来源类型
+	const accountTypeList = ref([
+		{name:'全部',key:''},
+		{name:'收入',key:'income'},
+		{name:'支出',key:'disburse'},
+		{name:'提现',key:'cash_out'},
+	])
+	const fromType = ref('')
+	const create_time = ref([])
+	//来源类型
+	const subActive = ref(0)
+	const fromTypeFn = (key: any,index: any)=>{
+		fromType.value = key
+		subActive.value = index
+		getMescroll().resetUpScroll();
+	}
+
+	const applyCashOut = () => {
+		uni.setStorageSync('cashOutAccountType', 'money')
+		redirect({ url: '/app/pages/member/apply_cash_out' })
+	}
+
+	const list = ref<Array<any>>([]),
+		loading = ref<boolean>(true),
+		listLoading = ref<boolean>(true),
+		mescrollRef = ref(null);
+
+	interface mescrollStructure {
+		num : number,
+		size : number,
+		endSuccess : Function,
+		[propName : string] : any
+	}
+
+	const getListFn = (mescroll : mescrollStructure) => {
+		listLoading.value = true;
+		let data : Object = {
+			page: mescroll.num,
+			limit: mescroll.size,
+			trade_type:fromType.value,
+			create_time: create_time.value
+		};
+		interface acceptingDataStructure {
+			data : acceptingDataItemStructure,
+			msg : string,
+			code : number
+		}
+		interface acceptingDataItemStructure {
+			data : [],
+			[propName : string] : number | string | object
+		}
+
+		getBalanceListAll(data).then((res : any) => {
+			let newArr = res.data.data;
+			mescroll.endSuccess(newArr.length);
+			//设置列表数据
+			if (mescroll.num == 1) {
+				list.value = []; //如果是第一页需手动制空列表
+			}
+			list.value = list.value.concat(newArr);
+			listLoading.value = false;
+			loading.value = false;
+		}).catch(() => {
+			listLoading.value = false;
+			loading.value = false;
+			mescroll.endErr(); // 请求失败, 结束加载
+		})
+	}
+	//日期筛选
+	const selectDateRef = ref()
+	const handleSelect = () =>{
+		selectDateRef.value.show = true
+	}
+	// 确定时间筛选
+	const confirmFn = (data: any) =>{
+		create_time.value = data;
+		list.value = []
+		getMescroll().resetUpScroll();
+	}
+</script>
+
+<style lang="scss" scoped>
+	:deep(.uni-scroll-view){
+		overflow: auto hidden !important;
+	}
+	.body-bottom{
+		padding-bottom:  calc(20rpx + constant(safe-area-inset-bottom));
+		padding-bottom:  calc(20rpx + env(safe-area-inset-bottom));
+	}
+	.pl-20rpx{
+		padding-left: 20rpx;
+	}
+
+</style>
diff --git a/uni-app/src/app/pages/member/cash_out.vue b/uni-app/src/app/pages/member/cash_out.vue
new file mode 100644
index 00000000..25c193c2
--- /dev/null
+++ b/uni-app/src/app/pages/member/cash_out.vue
@@ -0,0 +1,76 @@
+<template>
+	<view class="min-h-[100vh] bg-[var(--page-bg-color)] overflow-hidden" :style="themeColor()">
+		<mescroll-body ref="mescrollRef" @init="mescrollInit" :down="{ use: false }" @up="getCashOutListFn">
+			<view v-for="(item,index) in cashOutList" :key="item.id" class="sidebar-margin card-template mt-[var(--top-m)]" @click="toDetailFn(item)">
+				<view class="flex items-center justify-between  mb-[20rpx]">
+					<view class="text-[36rpx] font-500 price-font" :class="item.apply_money > 0 ? 'text-active' : ''">{{ item.apply_money }}</view>
+					<view class="leading-[38rpx] text-[26rpx] ">{{ item.status_name }}</view>
+				</view>
+				<view class="text-[24rpx] text-[var(--text-color-light6)] mb-[10rpx] leading-[34rpx]">{{ t('rechargeType') }} {{item.transfer_type_name}}</view>
+				<view class="text-[24rpx] text-[var(--text-color-light6)] mb-[10rpx] leading-[34rpx]">{{t('applyTime')}}: {{item.create_time}}</view>
+				<view class="text-[24rpx] text-[var(--text-color-light9)]  leading-[34rpx]">{{ item.status != -1 ? currentStatusDesc(item.status) : item.refuse_reason}}</view>
+			</view>
+			<mescroll-empty v-if="!cashOutList.length && loading" :option="{tip : t('emptyTip')}"></mescroll-empty>
+		</mescroll-body>
+	</view>
+</template>
+
+<script setup lang="ts">
+import { reactive, ref } from 'vue'
+import { t } from '@/locale'
+import { redirect, img } from '@/utils/common';
+import { getCashOutList } from '@/app/api/member';
+import MescrollBody from '@/components/mescroll/mescroll-body/mescroll-body.vue';
+import MescrollEmpty from '@/components/mescroll/mescroll-empty/mescroll-empty.vue';
+import useMescroll from '@/components/mescroll/hooks/useMescroll.js';
+import { onPageScroll, onReachBottom } from '@dcloudio/uni-app';
+
+const { mescrollInit, downCallback, getMescroll } = useMescroll(onPageScroll, onReachBottom);
+const cashOutList = ref<Array<any>>([]);
+const mescrollRef = ref(null);
+const loading = ref<boolean>(false);
+let account_type = uni.getStorageSync('cashOutAccountType')
+const currentStatusDesc = (status: any) =>{
+	switch(status){
+		case 1:
+			return t('toBeReviewed')
+		case 2:
+			return t('toBeTransfer')
+		case 3:
+			return t('transfer')
+		case -2:
+			return t('cancelApply')
+	}
+}
+
+const getCashOutListFn = (mescroll: any)=>{
+	let data:any = {}
+	loading.value = false;
+	data.page = mescroll.num;
+	data.page_size = mescroll.size;
+	data.account_type = account_type;
+	getCashOutList(data).then((res: any) => {
+		let newArr = res.data.data;
+		mescroll.endSuccess(newArr.length);
+		//设置列表数据
+		if (mescroll.num == 1){
+			cashOutList.value = []; //如果是第一页需手动制空列表
+		}
+		cashOutList.value = cashOutList.value.concat(newArr);
+		loading.value = true;
+	}).catch(()=>{
+		loading.value = true;
+		mescroll.endErr(); // 请求失败, 结束加载
+	})
+}
+
+const toDetailFn = (data: any)=>{
+	redirect({ url: '/app/pages/member/cash_out_detail', param: { id: data.id }});
+}
+</script>
+
+<style lang="scss">
+	.text-active{
+		color: #FF0D3E;
+	}
+</style>
diff --git a/uni-app/src/app/pages/member/cash_out_detail.vue b/uni-app/src/app/pages/member/cash_out_detail.vue
new file mode 100644
index 00000000..735fc643
--- /dev/null
+++ b/uni-app/src/app/pages/member/cash_out_detail.vue
@@ -0,0 +1,188 @@
+<template>
+	<view class="min-h-[100vh] bg-[var(--page-bg-color)] overflow-hidden" :style="themeColor()">
+		<block v-if="!loading">
+			<view  class="sidebar-margin card-template mt-[20rpx] !pt-[60rpx] !pb-[40rpx]">
+				<view class="flex flex-col justify-center items-center mb-[44rpx]" v-if="cashOutInfo.status == 4 && cashOutInfo.transfer_type == 'wechatpay'">
+					<image class="h-[70rpx] w-[70rpx] mb-[24rpx]" :src="img('static/resource/images/member/apply_withdrawal/transfer.png')" mode="widthFix" />
+					<view class="text-[28rpx] text-[#333]">处理中，预计2小时内到账</view>
+				</view>
+				<view class="flex items-center flex-col mb-[80rpx]">
+					<text class="text-[60rpx] font-bold price-font mb-[16rpx]">{{ cashOutInfo.apply_money }}</text>
+					<text class="text-[28rpx] text-[#333]" :class="{'text-primary': cashOutInfo.status == 1, 'text-[#999]': cashOutInfo.status == 4 }">{{ cashOutInfo.status_name }}</text>
+				</view>
+				<!-- 状态1.待审核2.待转账 3.已转账 4.转账中 -1拒绝' -->
+				<view>
+					<view class="flex justify-between text-[28rpx] mt-[34rpx] leading-[32rpx]">
+						<text class="text-[#333] w-[200rpx]">{{t('cashOutNo')}}</text>
+						<text class="text-[#333]">{{ cashOutInfo.cash_out_no }}</text>
+					</view>
+					<view class="flex justify-between text-[28rpx] mt-[34rpx] leading-[32rpx]" v-if="Number(cashOutInfo.service_money)">
+						<text class="text-[#333] w-[200rpx]">{{t('serviceMoney')}}</text>
+						<text class="text-[#333]">￥{{ cashOutInfo.service_money }}</text>
+					</view>
+					<view class="flex justify-between text-[28rpx] mt-[34rpx] leading-[32rpx]">
+						<text class="text-[#333] w-[200rpx]">{{t('createTime')}}</text>
+						<text class="text-[#333]">{{ cashOutInfo.create_time }}</text>
+					</view>
+					<view class="flex justify-between text-[28rpx] mt-[34rpx] leading-[32rpx]" v-if="cashOutInfo.status && cashOutInfo.audit_time">
+						<text class="text-[#333] w-[200rpx]">{{t('auditTime')}}</text>
+						<text class="text-[#333]">{{ cashOutInfo.audit_time  }}</text>
+					</view>
+					<view class="flex justify-between text-[28rpx] mt-[34rpx] leading-[32rpx]" v-if="cashOutInfo.status == -1 && cashOutInfo.refuse_reason">
+						<text class="text-[#333] w-[200rpx]  flex-shrink-0">{{t('refuseReason')}}</text>
+						<text class="text-[#333] ml-[20rpx]">{{ cashOutInfo.refuse_reason }}</text>
+					</view>
+					<view class="flex justify-between text-[28rpx] mt-[34rpx] leading-[32rpx]" v-if="cashOutInfo.status == 3">
+						<text class="text-[#333] w-[200rpx]">{{t('transferTypeName')}}</text>
+						<text class="text-[#333] truncate">{{ cashOutInfo.transfer_type_name }}</text>
+					</view>
+				</view>
+			</view>
+			<view class="sidebar-margin card-template mt-[20rpx]" v-if="cashOutInfo.transfer_type == 'wechatpay' && (cashOutInfo.status == 2 || cashOutInfo.status == 3 || cashOutInfo.status == 4)">
+				<u-steps :current="current"  direction="column" activeColor="var(--primary-color)" activeIcon="checkmark-circle-fill" inactiveIcon="checkmark-circle-fill">
+					<u-steps-item title="提现申请" :desc="cashOutInfo.create_time" ></u-steps-item>
+					<u-steps-item title="处理中" :desc="cashOutInfo.audit_time ? cashOutInfo.audit_time : '-'"></u-steps-item>
+					<u-steps-item title="提现成功" :desc="cashOutInfo.transfer_time ? cashOutInfo.transfer_time : '-' "></u-steps-item>
+				</u-steps>
+			</view>
+			<view  class="sidebar-margin card-template mt-[20rpx]">
+				<view class="title">{{  t('proceedsInfo') }}</view>
+				<view class="flex justify-between text-[28rpx] mt-[34rpx] leading-[32rpx]">
+					<text class="text-[#333] w-[200rpx]">{{t('transferAccount')}}</text>
+					<text class="text-[#333] truncate">{{ cashOutInfo.transfer_type == 'wechatpay' ? '微信零钱' : cashOutInfo.transfer_account }}</text>
+				</view>
+				<template v-if="cashOutInfo.transfer_type == 'wechatpay'">
+					<view class="flex justify-between text-[28rpx] mt-[34rpx] leading-[32rpx]">
+						<text class="text-[#333] w-[200rpx]">{{ t('transferNickname') }}</text>
+						<text class="text-[#333]">{{ cashOutInfo.nickname }}</text>
+					</view>
+					<view class="flex justify-between text-[28rpx] mt-[34rpx] leading-[32rpx]">
+						<text class="text-[#333] w-[200rpx]">{{ t('transferImg') }}</text>
+						<u-avatar :src="img(cashOutInfo.headimg)" size="30" leftIcon="none" :default-url="img('static/resource/images/default_headimg.png')"  />
+					</view>
+				</template>
+				<template v-if="cashOutInfo.transfer_type !== 'wechatpay'">
+					<view class="flex justify-between text-[28rpx] mt-[34rpx] leading-[32rpx]">
+						<text class="text-[#333] w-[200rpx]">{{cashOutInfo.transfer_type == 'bank' ? t('bankRealname') : t('realname')}}</text>
+						<text class="text-[#333]">{{ cashOutInfo.transfer_realname }}</text>
+					</view>
+					<view class="flex justify-between text-[28rpx] mt-[34rpx] leading-[32rpx]" v-if="cashOutInfo.transfer_bank">
+						<text class="text-[#333] w-[200rpx]">{{t('transferBank')}}</text>
+						<text class="text-[#333] truncate">{{ cashOutInfo.transfer_bank }}</text>
+					</view>
+					<view class="flex justify-between text-[28rpx] mt-[34rpx] leading-[32rpx]" v-if="cashOutInfo.transfer_type == 'wechat_code' || cashOutInfo.transfer_type == 'alipay'">
+						<text class="text-[#333] w-[200rpx]">{{t('transferCode')}}</text>
+						<view class="flex items-center"  @click="previewImg()">
+							<image :src="img(cashOutInfo.transfer_payment_code)" class="w-[140rpx] h-[140rpx] rounded-[var(--rounded-small)]"></image>
+						</view>
+					</view>
+				</template>
+			</view>
+			<view  class="sidebar-margin card-template my-[20rpx]"  v-if="cashOutInfo.status == 3">
+				<view class="title">{{  t('transferInfo') }}</view>
+				<view class="flex justify-between text-[28rpx] leading-[32rpx]" v-if="cashOutInfo.transfer_time">
+					<text class="text-[#333] w-[200rpx]">{{t('transferTime')}}</text>
+					<text class="text-[#333] truncate">{{ cashOutInfo.transfer_time }}</text>
+				</view>
+				<view class="flex justify-between text-[28rpx] mt-[34rpx] leading-[32rpx]" v-if="cashOutInfo.transfer_no">
+					<text class="text-[#333] w-[200rpx]">{{ t('transferNo') }}</text>
+					<text class="text-[#333] truncate">{{ cashOutInfo.transfer.transfer_no }}</text>
+				</view>
+				<view class="flex justify-between text-[28rpx] mt-[34rpx] leading-[32rpx]" v-if="cashOutInfo.transfer && cashOutInfo.transfer.transfer_remark">
+					<text class="text-[#333] w-[200rpx] flex-shrink-0">{{t('transferRemark')}}</text>
+					<text class="text-[#333] ml-[20rpx]">{{ cashOutInfo.transfer.transfer_remark }}</text>
+				</view>
+				<view class="flex justify-between text-[28rpx] mt-[34rpx] leading-[32rpx]" v-if="cashOutInfo.transfer && cashOutInfo.transfer.transfer_voucher">
+					<text class="text-[#333] w-[200rpx]">{{t('transferVoucher')}}</text>
+					<view class="flex items-center"  @click="handleImg()">
+						<image :src="img(cashOutInfo.transfer.transfer_voucher)" class="w-[140rpx] h-[140rpx] rounded-[var(--rounded-small)]"></image>
+					</view>
+				</view>
+			</view>
+		</block>
+		<loading-page :loading="loading"></loading-page>
+	</view>
+</template>
+
+<script lang="ts" setup>
+import { reactive, ref } from 'vue'
+import { onLoad, onUnload } from '@dcloudio/uni-app'
+import { t } from '@/locale'
+import { redirect, img, goback } from '@/utils/common';
+import { getCashOutDetail } from '@/app/api/member';
+
+const cashOutInfo = ref<any>({});
+const current = ref(0);
+const loading = ref<boolean>(true);
+onLoad((option: any) => {
+    let id = option.id || "";
+    if(id){
+	    getCashoutAccountListFn(id)
+    }else{
+        let parameter = {
+            url:'/app/pages/member/cash_out',
+            title: '提现详情不存在',
+            mode: 'reLaunch'
+        };
+        goback(parameter);
+    }
+})
+
+const getCashoutAccountListFn = (id: any) => {
+	loading.value = true;
+
+	getCashOutDetail(id).then((res: any) => {
+		cashOutInfo.value = res.data;
+		if(cashOutInfo.value.transfer_type == 'wechatpay'){
+			if(cashOutInfo.value.status == 1){
+				current.value = 0;
+
+			}else if(cashOutInfo.value.status == 2 || cashOutInfo.value.status == 4){
+				current.value = 1;
+			}else if(cashOutInfo.value.status == 3){
+				current.value = 2;
+			}
+		}
+		loading.value = false;
+	}).catch(() => {
+		loading.value = false;
+	})
+}
+const previewImg = () =>{
+	uni.previewImage({
+		urls: [img(cashOutInfo.value.transfer_payment_code)],
+		indicator: "number",
+		loop: true
+	})
+}
+const handleImg = () => {
+	uni.previewImage({
+		urls: [img(cashOutInfo.value.transfer.transfer_voucher)],
+		indicator: "number",
+		loop: true
+	})
+
+}
+
+// 关闭预览图片
+onUnload(()=>{
+    // #ifdef  H5 || APP
+	try {
+		uni.closePreviewImage()
+	}catch (e) {
+
+	}
+    // #endif
+})
+</script>
+
+<style lang="scss" scoped>
+:deep(.u-text__value--main){
+	font-size: 24rpx !important;
+	color: #606266;
+}
+:deep(.u-text__value){
+	font-size: 24rpx !important;
+	color: #606266;
+}
+</style>
diff --git a/uni-app/src/app/pages/member/commission.vue b/uni-app/src/app/pages/member/commission.vue
new file mode 100644
index 00000000..058ef5ba
--- /dev/null
+++ b/uni-app/src/app/pages/member/commission.vue
@@ -0,0 +1,186 @@
+<template>
+	<view class="bg-[var(--page-bg-color)] min-h-[100vh] w-full" :style="themeColor()" v-if="memberStore.info">
+		<view class="fixed w-full z-2 !bg-[var(--page-bg-color)]">
+			<view class="pb-[272rpx]" :style="headerStyle">
+				<!-- #ifdef MP-WEIXIN -->
+				<top-tabbar :data="param" class="top-header"/>
+				<!-- #endif -->
+			</view>
+			<view class="mt-[-232rpx] sidebar-margin rounded-[var(--rounded-big)]" :style="{ backgroundImage: 'url(' + img('static/resource/images/member/commission/account_bg.png') + ')',backgroundRepeat:'no-repeat',backgroundSize:'100% 100%'}">
+				<view class="pt-[40rpx]">
+					<view class="flex items-center justify-between px-[30rpx]">
+						<view>
+							<view class="text-[26rpx] font-400 text-[#fff] mb-[20rpx]">{{t('accountCommission')}}</view>
+							<view class="font-bold text-[56rpx] price-font text-[#fff] flex items-baseline">
+								{{ memberStore.info ? moneyFormat(memberStore.info.commission) : '0.00' }}
+							</view>
+						</view>
+						<button @click="applyCashOut" hover-class="none" class="bg-[#fff] rounded-[100rpx] w-[160rpx] h-[70rpx] flex-center text-[#EF000C] m-[0] border-[0] text-[26rpx]">{{t('transferMoney')}}</button>
+					</view>
+					<view class="flex items-center mt-[60rpx] px-[30rpx] pb-[10rpx] border-[0] border-t-[2rpx] border-solid border-[rgba(255,255,255,.1)] h-[126rpx]">
+						<view class="flex-1">
+							<view class="font-bold text-[#fff] text-[40rpx] mb-[10rpx] price-font">
+								{{ moneyFormat(memberStore.info?.commission_get)|| '0.00' }}
+							</view>
+							<view class="text-[24rpx] text-[#fff]">{{ t('commission') }}</view>
+						</view>
+						<view class="flex-1">
+							<view class="font-bold text-[#fff] text-[40rpx] mb-[10rpx] price-font">
+								{{ moneyFormat(memberStore.info?.commission_cash_outing)|| '0.00' }}
+							</view>
+							<view class="text-[24rpx] text-[#fff]">{{ t('money') }}</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="mt-[30rpx] tab-style-1">
+				<view class="tab-left">
+					<view class="tab-left-item" :class="{ 'class-select': fromType.from_type === item.from_type && fromType.account_data_gt === item.account_data_gt }" @click="fromTypeFn(item,index)" v-for="(item, index) in accountTypeList">{{ item.name }}</view>
+				</view>
+				<view class="tab-right" @click="handleSelect">
+                    <view class="tab-right-date">日期</view>
+                    <view class="nc-iconfont nc-icon-a-riliV6xx-36 tab-right-icon"></view>
+                </view>
+			</view>
+		</view>
+		<mescroll-body ref="mescrollRef" @init="mescrollInit" :down="{ use: false }" @up="geCommissionListFn" :top="mescrollTop">
+            <view class="px-[var(--sidebar-m)] pt-[10rpx] body-bottom" v-if="list.length">
+				<view v-for="(item,index) in list" :key="item.id" class="w-full h-[140rpx] flex justify-between items-center card-template" :class="{'mt-[var(--top-m)]':index}">
+					<view class="flex items-center">
+						<view class="w-[80rpx] h-[80rpx] rounded-[40rpx] text-[40rpx] font-500  text-[#fff] flex items-center justify-center" :class="{'bg-[#EF000C]' :item.account_data > 0, 'bg-[#1379FF]':item.account_data <= 0 }">
+							{{item.account_data > 0?'收':'提'}}
+						</view>
+						<view class="flex flex-col ml-[20rpx]">
+							<view class="text-[#333] text-[28rpx] leading-[36rpx]">{{item.from_type_name}}</view>
+							<view class="text-[var(--text-color-light9)] text-[24rpx] mt-[12rpx]">{{item.create_time}}</view>
+						</view>
+					</view>
+					<view class="text-[36rpx] leading-[50rpx] price-font" :class="{'text-[#EF000C]' :item.account_data > 0, 'text-[#1379FF]':item.account_data <= 0 }">{{ item.account_data > 0 ? '+' + item.account_data : item.account_data }}</view>
+				</view>
+			</view>
+			<mescroll-empty v-if="!list.length && !loading &&!listLoading"></mescroll-empty>
+        </mescroll-body>
+	    <loading-page :loading="loading"></loading-page>
+		<!-- 时间选择 -->
+		<select-date ref="selectDateRef" @confirm="confirmFn" />
+	</view>
+</template>
+
+<script setup lang="ts">
+	import { computed, ref, reactive } from 'vue'
+	import { t } from '@/locale'
+	import { moneyFormat, redirect, img } from '@/utils/common';
+	import useMemberStore from '@/stores/member'
+	import { getMemberCommission } from '@/app/api/member';
+	import MescrollBody from '@/components/mescroll/mescroll-body/mescroll-body.vue';
+	import MescrollEmpty from '@/components/mescroll/mescroll-empty/mescroll-empty.vue';
+	import useMescroll from '@/components/mescroll/hooks/useMescroll.js';
+	import { onPageScroll, onReachBottom } from '@dcloudio/uni-app';
+    import { topTabar } from '@/utils/topTabbar'
+	import selectDate from '@/components/select-date/select-date.vue';
+
+	const { downCallback,mescrollInit, getMescroll } = useMescroll(onPageScroll, onReachBottom);
+	const memberStore = useMemberStore();
+	const info = computed(() => memberStore.info)
+	// 提现
+	const applyCashOut = ()=> {
+	    uni.setStorageSync('cashOutAccountType', 'commission')
+	    redirect({ url: '/app/pages/member/apply_cash_out' })
+    }
+
+    /********* 自定义头部 - start ***********/
+    const topTabarObj = topTabar()
+    let param = topTabarObj.setTopTabbarParam({title:'我的佣金',topStatusBar:{bgColor: '#fff',textColor: '#333'}})
+    /********* 自定义头部 - end ***********/
+
+	// 获取系统状态栏的高度
+	let menuButtonInfo: any = {};
+	// 如果是小程序，获取右上角胶囊的尺寸信息，避免导航栏右侧内容与胶囊重叠(支付宝小程序非本API，尚未兼容)
+	// #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+	menuButtonInfo = uni.getMenuButtonBoundingClientRect();
+	// #endif
+	const headerStyle = computed(()=>{
+		return {
+			backgroundImage: 'url(' + img('static/resource/images/member/commission/commission_bg.png') + ') ',
+			backgroundSize: 'cover',
+			backgroundRepeat: 'no-repeat',
+			backgroundPosition: 'bottom',
+		}
+	})
+	//  16为自定头部的padding-bottom
+	const mescrollTop = computed(()=>{
+		return Object.keys(menuButtonInfo).length? (Number(menuButtonInfo.height) * 2 + menuButtonInfo.top * 2  + 470 + 16)+'rpx':'470rpx'
+	})
+
+	//来源类型
+	const fromType = ref({
+		from_type:'',
+		account_data_gt:''
+	})
+	const accountTypeList = ref([
+		{name:'全部',from_type:'',account_data_gt: ''},
+		{name:'佣金',from_type:'',account_data_gt: 0},
+		{name:'提现',from_type:'cash_out',account_data_gt: ''},
+	])
+	const create_time = ref([])
+	const list = ref<Array<any>>([])
+	const loading = ref<boolean>(true)
+	const listLoading = ref<boolean>(true)
+	const mescrollRef = ref(null);
+
+	const fromTypeFn = (data : any ,index : number)=>{
+		fromType.value.from_type = data.from_type
+		fromType.value.account_data_gt = data.account_data_gt
+		getMescroll().resetUpScroll();
+	}
+	const geCommissionListFn = (mescroll: any) => {
+		listLoading.value = true;
+		let data : Object = {
+			page: mescroll.num,
+			limit: mescroll.size,
+			from_type:fromType.value.from_type,
+			account_data_gt: fromType.value.account_data_gt,
+			create_time:create_time.value
+		}
+		getMemberCommission(data).then((res:any) => {
+			let newArr = res.data.data;
+			mescroll.endSuccess(newArr.length);
+			//设置列表数据
+			if (mescroll.num == 1) {
+				list.value = []; //如果是第一页需手动制空列表
+			}
+			list.value = list.value.concat(newArr);
+			listLoading.value = false;
+			loading.value = false;
+		}).catch(() => {
+			listLoading.value = false;
+			loading.value = false;
+			mescroll.endErr(); // 请求失败, 结束加载
+		})
+	}
+//日期筛选
+const selectDateRef = ref()
+const handleSelect = () =>{
+	selectDateRef.value.show = true
+}
+// 确定时间筛选
+const confirmFn = (data: any) =>{
+	create_time.value = data;
+	list.value = []
+	getMescroll().resetUpScroll();
+}
+</script>
+
+<style lang="scss">
+	.member-level{
+		background: linear-gradient( 360deg, #F23621 11%, #FF7F71 100%), #D9D9D9;
+		border-radius: 0rpx 20rpx 20rpx 0rpx;
+	}
+	:deep(.uni-scroll-view){
+		overflow: auto hidden !important;
+	}
+	.body-bottom{
+		padding-bottom:  calc(20rpx + constant(safe-area-inset-bottom));
+		padding-bottom:  calc(20rpx + env(safe-area-inset-bottom));
+	}
+</style>
diff --git a/uni-app/src/app/pages/member/components/select-date.vue b/uni-app/src/app/pages/member/components/select-date.vue
new file mode 100644
index 00000000..8480d73b
--- /dev/null
+++ b/uni-app/src/app/pages/member/components/select-date.vue
@@ -0,0 +1,192 @@
+<template>
+    <u-popup :show="show" @close="show = false" mode="bottom" :round="10" >
+        <view>
+            <view class="py-[30rpx] px-[40rpx] flex items-center justify-between">
+                <view class="text-center flex-1">选择时间</view>
+                <view class="nc-iconfont nc-icon-guanbiV6xx text-[36rpx] text-primary" @click="show = false"></view>
+            </view>
+            <view class="px-[30rpx] mb-[20rpx]">
+                <view class="flex items-center justify-between mb-[30rpx]">
+                    <view class="w-[160rpx] h-[60rpx] leading-[60rpx] rounded-[30rpx] bg-[#F4F6FA] text-center text-[26rpx] text-[var(--text-color-light6)] border-[2rpx] border-solid border-[#F4F6FA]"  v-for="(item,index) in curselectDate" :key="'a'+index" :class="{'text-primary !border-[var(--primary-color)] !bg-[rgba(239,0,12,0.04)]': currentValue.type == item.type}"  @click="loadDateFn(item)">{{item.name}}</view>
+                </view>
+                <view class="flex items-center justify-between">
+                    <view class="w-[316rpx] h-[60rpx] leading-[60rpx] rounded-[30rpx] bg-[#F4F6FA] text-center text-[26rpx] text-[var(--text-color-light6)] border-[2rpx] border-solid border-[#F4F6FA]" :class="{'text-primary !border-[var(--primary-color)] !bg-[rgba(239,0,12,0.04)]': currentValue.type == 'first'}" @click="currentValue.type = 'first'">{{dateList.nowDate[0]}}</view>
+                    <view class="nc-iconfont nc-icon-jianV6xx"></view>
+                    <view class="w-[316rpx] h-[60rpx] leading-[60rpx] rounded-[30rpx] bg-[#F4F6FA] text-center text-[26rpx] text-[var(--text-color-light6)] border-[2rpx] border-solid border-[#F4F6FA]" :class="{'text-primary !border-[var(--primary-color)] !bg-[rgba(239,0,12,0.04)]': currentValue.type == 'second'}" @click="currentValue.type = 'second'">{{dateList.nowDate[1]}}</view>
+                </view>
+            </view>
+            <view class="h-[396rpx]">
+                <picker-view  :indicator-style="{height:'70rpx',backgroundColor:'#F4F6FA'}" :value="dateList.curIndex" @change="bindChange" class="px-[60rpx] h-full">
+                    <picker-view-column>
+                        <view class="text-center leading-[70rpx] !h-[70rpx] text-[28rpx]" v-for="(item,index) in dateList.years" :key="index">{{item}}年</view>
+                    </picker-view-column>
+                    <picker-view-column>
+                        <view class="text-center leading-[70rpx] !h-[70rpx] text-[28rpx]" v-for="(item,index) in dateList.months" :key="index">{{item}}月</view>
+                    </picker-view-column>
+                    <picker-view-column>
+                        <view class="text-center leading-[70rpx] !h-[70rpx] text-[28rpx]" v-for="(item,index) in dateList.days" :key="index">{{item}}日</view>
+                    </picker-view-column>
+                </picker-view>
+            </view>
+            <view class="px-[30rpx] pb-[30rpx] pt-[20rpx] flex justify-between">
+                <button class="w-[330rpx] h-[80rpx] font-500 text-[var(--primary-color)] text-[26rpx] leading-[76rpx] border-[2rpx] border-solid border-[var(--primary-color)] rounded-[100rpx] bg-transparent" @click="reset">重置</button>
+                <button class="w-[330rpx] h-[80rpx] font-500 text-[#fff] text-[26rpx] leading-[80rpx] border-[0] rounded-[100rpx] primary-btn-bg" shape="circle" @click="save">确定</button>
+            </view>
+        </view>
+    </u-popup>
+</template>
+
+<script setup lang="ts">
+import { ref,reactive } from 'vue'
+
+const emits = defineEmits(['confirm'])
+// 弹框时间选择
+const show = ref(false)
+const create_time: any = ref([])
+// 日期
+const init = () =>{
+    const date = new Date();
+    const years = []
+    const months = []
+    const days = []
+    const year = date.getFullYear()
+    const month = date.getMonth();
+    const day = date.getDate()
+
+    for (let i = 1990; i <= date.getFullYear()+2; i++) {
+        years.push(i)
+    }
+    for (let i = 1; i <= 12; i++) {
+        months.push(i)
+    }
+    let dayCount = getDaysInMonth(year, month+1)
+    for (let i = 1; i <= dayCount; i++) {
+        days.push(i)
+    }
+    let yearIndex = years.indexOf(year)
+    let curIndex = [yearIndex, month, day-1]
+    let nowDate = `${year}-${month + 1 < 10 ? '0' + (month + 1) :(month + 1) }-${day < 10 ? '0' + day :day }`
+    let lastMonthDate = new Date(date.getFullYear(),month - 1,date.getDate())
+    let lastThreeMonthDate = new Date(date.getFullYear(),month - 3,date.getDate())
+    let halfYear = new Date(date.getFullYear(), month - 6, date.getDate())
+    let lastYear =new Date(date.getFullYear() - 1, month, date.getDate())
+    const formatDate = (dateTime:any) => {
+        const yearTime = dateTime.getFullYear()
+        const monthTime = dateTime.getMonth() + 1
+        const dayTime = dateTime.getDate()
+        return `${yearTime}-${monthTime < 10 ? '0' + monthTime : monthTime}-${dayTime < 10 ? '0' + dayTime :dayTime }`
+    }
+    return {
+        years,
+        months,
+        days,
+        curIndex,
+        nowDate,
+        lastMonth: formatDate(lastMonthDate),
+        lastThreeMonth: formatDate(lastThreeMonthDate),
+        halfYear: formatDate(halfYear),
+        lastYear: formatDate(lastYear)
+    }
+}
+const getDaysInMonth = (year: any, month: any) => {
+    let date = new Date(year, month, 0).getDate()
+    return date
+}
+const getDaysCount = (year: any, month: any) =>{
+    let count = getDaysInMonth(year, month)
+    let days = []
+    for (let i = 1; i <= count; i++) {
+        days.push(i)
+    }
+    return days
+}
+const dateList = reactive({
+    years: init().years,
+    months: init().months,
+    days: init().days,
+    curIndex:init().curIndex, //当前选中下标
+    nowDate:[init().nowDate,init().nowDate] //当前选中日期
+})
+ 
+const bindChange = (e: any) =>{
+    const val = e.detail.value
+    let year = dateList.years[val[0]]
+    let month= dateList.months[val[1]]
+    let day = dateList.days[val[2]]
+    // 根据年份,月份判断天数
+    dateList.days = getDaysCount(year, month)
+    if(currentValue.value.type == 'first'){
+        dateList.nowDate[0] = `${year}-${month < 10 ? '0' + month :month }-${day < 10 ? '0' + day :day }`
+    }else if(currentValue.value.type == 'second'){
+        dateList.nowDate[1] = `${year}-${month < 10 ? '0' + month :month }-${day < 10 ? '0' + day :day }`
+    }
+}
+const curselectDate = reactive([
+    {
+        time:[init().lastMonth,init().nowDate],
+        type:'lastMonth',
+        name:'近1个月'
+    },
+    {
+        time:[init().lastThreeMonth,init().nowDate],
+        type:'lastThreeMonth',
+        name:'近3个月'
+    },
+    {
+        time:[init().halfYear,init().nowDate],
+        type:'halfYear',
+        name:'近半年'
+    },
+    {
+        time:[init().lastYear,init().nowDate],
+        type:'lastYear',
+        name:'近一年'
+    }
+])
+// 时间搜索
+const currentValue = ref({
+    type: 'first',
+    time: []
+})
+const loadDateFn = (data: any) =>{
+    currentValue.value.type = data.type
+    currentValue.value.time = data.time
+}
+
+const save = () =>{
+    if(currentValue.value.type == 'first' ||currentValue.value.type == 'second'){
+        create_time.value = dateList.nowDate
+        let start = new Date(create_time.value[0]).getTime()
+        let end = new Date(create_time.value[1]).getTime()
+        if( start > end){
+            uni.showToast({ title: '开始时间不能大于结束时间', icon: 'none' })
+            return
+        }
+    }else{
+        create_time.value = currentValue.value.time
+    }
+    emits('confirm',create_time.value)
+    show.value = false
+}
+const reset = () =>{
+    currentValue.value.type = 'first'
+    dateList.curIndex = init().curIndex
+    dateList.nowDate = [init().nowDate,init().nowDate]
+}
+
+defineExpose({
+    show
+})
+</script>
+
+<style scoped>
+:deep(.uni-picker-view-content){
+    z-index: 10;
+}
+:deep(.uni-picker-view-indicator::before){
+    border: none !important;
+}
+:deep(.uni-picker-view-indicator::after){
+    border: none !important;
+}
+</style>
\ No newline at end of file
diff --git a/uni-app/src/app/pages/member/contact.vue b/uni-app/src/app/pages/member/contact.vue
new file mode 100644
index 00000000..d36b6415
--- /dev/null
+++ b/uni-app/src/app/pages/member/contact.vue
@@ -0,0 +1,47 @@
+<template>
+	<view class="min-h-[100vh]" :style="themeColor()">
+		<view class="contact-wrap pt-[22%]">
+			<image :src="img('static/resource/images/member/contact_service.png')" mode="widthFix" />
+			<view class="mt-[40rpx] text-[28rpx]">欢迎您联系我们，提供您宝贵的意见！</view>
+			<nc-contact
+					:send-message-title="sendMessageTitle"
+					:send-message-path="sendMessagePath"
+					:send-message-img="sendMessageImg">
+				<button type="primary" class="btn-wrap font-500 primary-btn-bg">{{ t('customerService') }}</button>
+			</nc-contact>
+		</view>
+	</view>
+</template>
+
+<script setup lang="ts">
+    import { t } from '@/locale'
+    import { img } from '@/utils/common';
+    import { ref } from 'vue';
+
+    const sendMessageTitle = ref('')
+    const sendMessagePath = ref('')
+    const sendMessageImg = ref('')
+
+    sendMessageImg.value = img('static/resource/images/member/contact_service.png')
+</script>
+
+<style lang="scss" scoped>
+	.contact-wrap {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		image {
+			width: 674rpx;
+		}
+
+		.btn-wrap {
+			margin-top: 100rpx;
+			width: 500rpx;
+			height: 80rpx;
+			font-size: 26rpx;
+			border-radius: 100rpx;
+			line-height: 80rpx;
+		}
+	}
+</style>
diff --git a/uni-app/src/app/pages/member/detailed_account.vue b/uni-app/src/app/pages/member/detailed_account.vue
new file mode 100644
index 00000000..dd4e8447
--- /dev/null
+++ b/uni-app/src/app/pages/member/detailed_account.vue
@@ -0,0 +1,163 @@
+<template>
+	<view class="min-h-[100vh] bg-[var(--page-bg-color)]  overflow-hidden" :style="themeColor()">
+		<view class="fixed left-0 right-0 top-0 z-99">
+            <view class="bg-[#fff] px-[var(--sidebar-m)] py-[14rpx] flex items-center">
+                <view class="search-input">
+					<text class="nc-iconfont nc-icon-sousuo-duanV6xx1 btn" @click="searchTypeFn()"></text>
+					<input class="input" maxlength="50" type="text" v-model="keyword"  placeholder="请输入搜索关键词" placeholderClass="text-[var(--text-color-light9)] text-[24rpx]" confirm-type="search"  @confirm="searchTypeFn()">
+					<text v-if="keyword" class="nc-iconfont nc-icon-cuohaoV6xx1 clear" @click="keyword=''"></text>
+                </view>
+            </view>
+            <view class="tab-style-1 pt-[4rpx] bg-[#fff]">
+                <view class="tab-left">
+                    <view class="tab-left-item" :class="{'!text-primary class-select':fromType.from_type === item.from_type && fromType.account_data_gt === item.account_data_gt}" v-for="(item,index) in accountTypeList" :key="index" @click="fromTypeFn(item,index)">{{ item.name }}</view>
+                </view>
+                <view class="tab-right" @click="handleSelect">
+					<view class="tab-right-date">日期</view>
+					<view class="nc-iconfont nc-icon-a-riliV6xx-36 tab-right-icon"></view>
+				</view>
+			</view>
+        </view>
+		<mescroll-body ref="mescrollRef" @init="mescrollInit" :down="{ use: false }" @up="getListFn" top="152rpx">
+			<view class="pt-[var(--top-m)] body-bottom" v-if="list.length">
+				<view v-for="(item,index) in list" :key="item.id" class="sidebar-margin mb-[var(--top-m)] card-template relative">
+					<view class="flex items-center justify-between mb-[20rpx]">
+						<view class="text-[28rpx] font-500 text-[#333] leading-[40rpx]">{{item.from_type_name}}</view>
+						<view class="absolute right-[30rpx] top-[30rpx] text-[36rpx] font-500 text-[#03B521] leading-[50rpx] price-font" :class="{'!text-[var(--price-text-color)]':item.account_data > 0}">{{ item.account_data > 0 ? '+' + item.account_data : item.account_data }}</view>
+					</view>
+					<view  class="text-[24rpx] text-[var(--text-color-light6)] mb-[14rpx]" v-if="item.memo">{{item.memo}}</view>
+					<view class="text-[24rpx] text-[var(--text-color-light6)]">{{item.create_time}}</view>
+				</view>
+			</view>
+			<mescroll-empty  :option="{tip : tip}" v-if="!list.length && loading"></mescroll-empty>
+		</mescroll-body>
+        <!-- 时间选择 -->
+		<select-date ref="selectDateRef" @confirm="confirmFn" />
+	</view>
+</template>
+
+<script setup lang="ts">
+	import { ref,nextTick, reactive } from 'vue'
+	import { t } from '@/locale'
+	import MescrollBody from '@/components/mescroll/mescroll-body/mescroll-body.vue';
+	import MescrollEmpty from '@/components/mescroll/mescroll-empty/mescroll-empty.vue';
+	import useMescroll from '@/components/mescroll/hooks/useMescroll.js';
+	import { getBalanceList, getMoneyList, getCommissionList} from '@/app/api/member';
+	import { onPageScroll, onReachBottom, onLoad, onShow } from '@dcloudio/uni-app';
+    import selectDate from '@/components/select-date/select-date.vue';
+
+	const { mescrollInit, downCallback, getMescroll } = useMescroll(onPageScroll, onReachBottom);
+
+	const type = ref('')
+	const tip = ref('')
+
+	onLoad((options: any) => {
+		type.value = options.type || 'balance';
+        nextTick(()=>{
+            setTimeout(()=>{
+                if(type.value == 'balance'){
+                    tip.value = t('balanceEmptyTip')
+                }else if(type.value == 'money'){
+                    tip.value = t('moneyEmptyTip')
+                }else if(type.value == 'commission'){
+                    tip.value = t('commissionEmptyTip')
+                }
+            },100);
+        })
+	});
+
+	const keyword = ref<string>('')
+	const create_time = ref([])
+	//来源类型
+	const fromType = ref({
+		from_type:'',
+		account_data_gt:''
+	})
+	const accountTypeList = ref([
+		{name:'全部',from_type:'',account_data_gt: ''},
+		{name:'佣金',from_type:'',account_data_gt: 0},
+		{name:'提现',from_type:'cash_out',account_data_gt: ''},
+	])
+	const list = ref<Array<any>>([]),
+		loading = ref<boolean>(false),
+		mescrollRef = ref(null);
+
+	interface mescrollStructure {
+		num : number,
+		size : number,
+		endSuccess : Function,
+		[propName : string] : any
+	}
+
+	const getListFn = (mescroll : mescrollStructure) => {
+		loading.value = false;
+		let data : Object = {
+			page: mescroll.num,
+			page_size: mescroll.size,
+			keyword:keyword.value,
+			create_time:create_time.value,
+			from_type:fromType.value.from_type,
+			account_data_gt: fromType.value.account_data_gt
+		};
+		interface acceptingDataStructure {
+			data : acceptingDataItemStructure,
+			msg : string,
+			code : number
+		}
+		interface acceptingDataItemStructure {
+			data : object,
+			[propName : string] : number | string | object
+		}
+
+		let fnList:any = (params : any) => { };
+		if (type.value == 'balance') fnList = getBalanceList;
+		else if (type.value == 'money') fnList = getMoneyList;
+		else if (type.value == 'commission') fnList = getCommissionList;
+
+		fnList(data).then((res : any) => {
+			let newArr = res.data.data;
+			mescroll.endSuccess(newArr.length);
+			//设置列表数据
+			if (mescroll.num == 1) {
+				list.value = []; //如果是第一页需手动制空列表
+			}
+			list.value = list.value.concat(newArr);
+			loading.value = true;
+		}).catch(() => {
+			loading.value = true;
+			mescroll.endErr(); // 请求失败, 结束加载
+		})
+	}
+
+// 关键词搜索条件搜索
+const searchTypeFn = () =>{
+	list.value = [];
+    getMescroll().resetUpScroll();
+}
+// 类型搜索
+const fromTypeFn = (data : any ,index : number)=>{
+	fromType.value.from_type = data.from_type
+	fromType.value.account_data_gt = data.account_data_gt
+	list.value = []
+	getMescroll().resetUpScroll();
+}
+
+//日期筛选
+const selectDateRef = ref()
+const handleSelect = () =>{
+	selectDateRef.value.show = true
+}
+// 确定时间筛选
+const confirmFn = (data: any) =>{
+	create_time.value = data;
+	list.value = []
+	getMescroll().resetUpScroll();
+}
+</script>
+
+<style lang="scss">
+ .body-bottom{
+	padding-bottom:  calc(20rpx + constant(safe-area-inset-bottom));
+	padding-bottom:  calc(20rpx + env(safe-area-inset-bottom));
+}
+</style>
diff --git a/uni-app/src/app/pages/member/index.vue b/uni-app/src/app/pages/member/index.vue
new file mode 100644
index 00000000..d607c29f
--- /dev/null
+++ b/uni-app/src/app/pages/member/index.vue
@@ -0,0 +1,91 @@
+<template>
+	<view :style="themeColor()">
+		<loading-page :loading="diy.getLoading()"></loading-page>
+
+		<view v-show="!diy.getLoading()">
+
+			<!-- 自定义模板渲染 -->
+			<view class="diy-template-wrap bg-index" :style="diy.pageStyle()">
+
+				<diy-group ref="diyGroupRef" :data="diy.data" />
+
+			</view>
+
+		</view>
+
+		<!-- #ifdef MP-WEIXIN -->
+		<!-- 小程序隐私协议 -->
+		<wx-privacy-popup ref="wxPrivacyPopupRef"></wx-privacy-popup>
+		<!-- #endif -->
+
+	</view>
+</template>
+
+<script setup lang="ts">
+    import {ref, computed,nextTick} from 'vue';
+    import {useDiy} from '@/hooks/useDiy'
+    import {redirect} from '@/utils/common';
+    import diyGroup from '@/addon/components/diy/group/index.vue'
+    import useMemberStore from '@/stores/member'
+
+    // 会员信息
+    const memberStore = useMemberStore()
+    const userInfo = computed(() => memberStore.info)
+
+    const diy = useDiy({
+        name: 'DIY_MEMBER_INDEX'
+    })
+
+    const diyGroupRef = ref(null)
+
+    const wxPrivacyPopupRef:any = ref(null)
+
+    // 监听页面加载
+    diy.onLoad();
+
+    // 监听页面显示
+    diy.onShow((data: any) => {
+        if (data.value) {
+            // uni.setNavigationBarTitle({
+            // 	title: diyData.title
+            // })
+        } else if (data.page) {
+            // 跳转到设置的启动页
+            redirect({url: data.page, mode: 'reLaunch'})
+        }
+        diyGroupRef.value?.refresh();
+        if (userInfo.value) {
+          useMemberStore().getMemberInfo()
+        }
+	    // #ifdef MP
+	    nextTick(()=>{
+		    if(wxPrivacyPopupRef.value) wxPrivacyPopupRef.value.proactive();
+	    })
+	    // #endif
+    });
+
+    // 监听页面隐藏
+    diy.onHide();
+
+	// 监听页面卸载
+	diy.onUnload();
+
+    // 监听滚动事件
+    diy.onPageScroll()
+</script>
+<style lang="scss" scoped>
+	@import '@/styles/diy.scss';
+</style>
+<style lang="scss">
+.diy-template-wrap {
+  /* #ifdef MP */
+  .child-diy-template-wrap {
+    ::v-deep .diy-group {
+      > .draggable-element.top-fixed-diy {
+        display: block !important;
+      }
+    }
+  }
+  /* #endif */
+}
+</style>
diff --git a/uni-app/src/app/pages/member/level.vue b/uni-app/src/app/pages/member/level.vue
new file mode 100644
index 00000000..acb5810d
--- /dev/null
+++ b/uni-app/src/app/pages/member/level.vue
@@ -0,0 +1,325 @@
+<template>
+	<view :style="themeColor()" class="bg-[var(--page-bg-color)] min-h-[100vh] overflow-hidden">
+		<loading-page :loading="loading && memberInfo"></loading-page>
+		<view v-if="!loading && memberInfo && list && list.length" class="min-h-[100vh] overflow-hidden flex flex-col" :style="{backgroundColor: currLevelInfo.level_style.bg_color }">
+			<!-- #ifdef MP -->
+			<top-tabbar :data="topTabbarData" :scrollBool="topTabarObj.getScrollBool()"/>
+			<!-- #endif -->
+			<view>
+				<view class="pt-[40rpx] mb-[40rpx]">
+					<!-- 轮播图 -->
+					<view class="relative">
+						<swiper class="swiper ns-indicator-dots relative" :style="{ height: '300rpx' }" @change="swiperChange" :current = "swiperIndex" previous-margin="30rpx" next-margin="30rpx">
+							<swiper-item class="swiper-item" v-for="(item,index) in list" :key="item.id">
+								<view class="h-[300rpx] relative">
+									<view v-if="memberInfo.member_level == item.level_id && swiperIndex == index" class="text-[24rpx] absolute top-0 left-0 z-10 h-[66rpx] !bg-contain w-[150rpx] flex pt-[12rpx] pl-[16rpx]  box-border" :style="{ background: 'url(' + img(currLevelInfo.level_tag) + ') no-repeat',color: currLevelInfo.level_style.level_color}">
+										当前等级
+									</view>
+									<view class="absolute top-0 left-0 right-0 bottom-0 z-20 px-[30rpx] pt-[68rpx] box-border" :class="{'px-[50rpx]': swiperIndex != index}">
+										<view class="flex items-center leading-[50rpx] mb-[90rpx]">
+											<image class="h-[32rpx] w-[34rpx] align-middle" :src="img(item.level_icon ? item.level_icon : '')" mode="aspectFill" />
+											<view class="text-[36rpx]  font-bold ml-[10rpx] max-w-[340rpx] truncate" :style="{color:currLevelInfo.level_style.level_color}">{{item.level_name}}</view>
+										</view>
+										<view class="flex items-baseline" :style="{color: currLevelInfo.level_style.level_color}">
+											<view class="text-[30rpx] font-500 leading-[38rpx]">{{ memberInfo.growth }}</view>
+											<view class="text-[24rpx] leading-[34rpx]">/{{list[index].growth}}成长值</view>
+										</view>
+										<view class="flex justify-between items-center mt-[10rpx]">
+											<view class="flex flex-col flex-1">
+												<view>
+													<progress :percent="progress(index)" :border-radius="100" :activeColor="currLevelInfo.level_style.level_color" backgroundColor="#fff" stroke-width="4" />
+												</view>
+											</view>
+										</view>
+									</view>
+									<view class="relatvie h-full w-full">
+										<image class="h-full w-full" :src="img(item.level_bg)" :class="{'swiper-animation': swiperIndex != index}" :show-menu-by-longpress="true"/>
+									</view>
+								</view>
+							</swiper-item>
+						</swiper>
+					</view>
+				</view>
+				<view class="mb-[30rpx] relative">
+					<view class="bg-[#fff] opacity-15 h-[2rpx] w-full absolute top-[15rpx]"></view>
+					<view :style="lineStyle" class="bg-[#fff] opacity-60 h-[2rpx]  absolute top-[15rpx] z-4 left-[50%]"></view>
+					<view class="mx-[86rpx]">
+						<scroll-view :scroll-x="true" scroll-with-animation :scroll-into-view="'id' + ( levelIndex  ? levelIndex - 1 : 0)">
+							<view class="flex flex-nowrap py-[10rpx]">
+								<block v-for="(item,index) in list" :key="item.id">
+									<view :style="levelStyle" class=" flex-shrink-0 flex flex-col items-center justify-center" @click="changeLevel(index)" :id="'id' + index">
+										<view class="w-[14rpx] h-[14rpx] level-class" :class="{'level-select': levelIndex == (index)}"></view>
+										<view :style="maxWidth" class="text-[22rpx] text-[#aaa] mt-[16rpx] truncate" :class="{'!text-[#fff]': levelIndex == (index)}">{{item.level_name}}</view>
+									</view>
+								</block>
+							</view>
+						</scroll-view>
+					</view>
+				</view>
+				<view class="flex mx-[var(--sidebar-m)] pt-[30rpx]  pb-[46rpx]  items-center flex-col level_benefits" v-if="currLevelInfo.benefits_arr && currLevelInfo.benefits_arr.length" :style="{ backgroundImage: 'url(' + img(currLevelInfo.member_bg) + ')'}">
+					<view class="flex items-center justify-center">
+						<text class="text-[#fff] text-[30rpx] font-500 leading-[44rpx]">会员权益</text>
+					</view>
+					<view class="flex flex-wrap w-[690rpx] mt-[40rpx] justify-between">
+						<view class="flex flex-col w-[25%] items-center" v-for="(item,index) in currLevelInfo.benefits_arr" :key="index">
+							<image class="h-[88rpx] w-[88rpx]" :src="img(item.icon)" mode="heightFix" />
+							<text class="text-[rgba(255,255,255,0.9)] mt-[16rpx] text-[24rpx] leading-[34rpx]">{{item.title}}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+			
+			<view class="flex-1 rounded-t-[40rpx] px-[30rpx] pt-[var(--pad-top-m)] mt-[-10rpx]  relative tab-bar" :style="{background: `linear-gradient( 180deg, ${currLevelInfo.level_style.gift} 0%, #FFFFFF 20%)`}">
+				<!-- 升级礼包 -->
+				<view v-if="currLevelInfo.gifts_arr && currLevelInfo.gifts_arr.length">
+					<view class="pb-[30rpx] flex items-center">
+						<text class="text-[30rpx] text-[#333] font-500 leading-[44rpx]">升级礼包</text>
+					</view>
+					<view class="flex flex-wrap">
+						<view  v-for="(item,index) in currLevelInfo.gifts_arr" :key="index" class="mb-[20rpx]"  :class="{'mr-[21rpx]': (index+1) % 3 != 0}">
+							<view class="relative box-border mb-[16rpx] w-[216rpx] h-[180rpx] !bg-contain"  :style="{ background: 'url(' + img(item.background) + ') no-repeat'}"></view>
+							<view class="text-center font-500 text-[#333] text-[28rpx] truncate leading-[40rpx] max-w-[216rpx]">{{item.text}}</view>
+						</view>
+					</view>
+				</view>
+				
+				<!-- 升级技巧 -->
+				<view v-if="upgradeSkills && upgradeSkills.length">
+					<view class="pt-[30rpx] pb-[30rpx] flex items-center">
+						<text class="text-[30rpx] text-[#333] font-500 leading-[44rpx]">升级技巧</text>
+					</view>
+					<view class="pb-[30rpx]">
+						<view class="flex items-center mb-[34rpx]" v-for="(item,index) in upgradeSkills" :key="index">
+							<image class="h-[100rpx] w-[100rpx] mr-[20rpx]" :src="img(item.icon)" mode="heightFix" />
+							<view class="flex flex-col">
+								<view class="text-[28rpx] leading-[38rpx] mb-[8rpx]">{{item.title}}</view>
+								<view class="text-[24rpx] text-[var(--text-color-light9)] leading-[34rpx]">{{item.desc}}</view>
+							</view>
+							<text class="skill-btn" @click="redirect({ url: item.button.wap_redirect, param: {} , mode: 'redirectTo'})">{{item.button.text}}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="empty-page" v-if="!loading && (!list || !list.length)">
+			<image class="img" :src="img('static/resource/images/empty.png')" mode="aspectFill"></image>
+			<text class="desc">暂无会员等级</text>
+		</view>
+	</view>
+</template>
+
+<script setup lang="ts">
+	import { ref, reactive, computed } from 'vue'
+	import { onShow } from '@dcloudio/uni-app'
+	import { getMemberLevel, getTaskGrowth } from '@/app/api/member';
+	import { img,redirect, deepClone, getToken } from '@/utils/common';
+    import useMemberStore from '@/stores/member'
+    import { topTabar } from '@/utils/topTabbar'
+
+	const memberStore = useMemberStore()
+	
+	const loading = ref(false)
+	const list = ref([]) // 会员等级
+	const upgradeSkills = ref([]) // 升级技巧
+	const swiperIndex = ref(0); //当前滑块的索引
+	const levelIndex = ref(0); //当前等级的索引
+    
+    /********* 自定义头部 - start ***********/
+    const topTabarObj = topTabar()
+    let topTabbarData = topTabarObj.setTopTabbarParam({title:'会员等级'})
+    /********* 自定义头部 - end ***********/
+	
+	onShow(() => {
+		// 判断是否已登录
+		if (getToken()) {
+			getTaskGrowthFn();
+			getMemberLevelFn();
+		}
+	})
+	
+	// 会员信息
+	const memberInfo = computed(() => {
+	    return memberStore.info
+	})
+	
+	// 进度条值
+	const progress = (index:any) => {
+		let indent = index;
+		let num = 100
+		if(list.value[indent] && list.value[indent].growth) {
+            num = memberInfo.value.growth / list.value[indent].growth * 100
+        }
+	    return num
+	}
+
+	// 所需的成长值
+	const upgradeGrowth = (index:any) => {
+		let indent = index;
+		let num = 0;
+		if(list.value[indent] && list.value[indent].growth) {
+            num = list.value[indent].growth - memberInfo.value.growth;
+        }
+	    return num
+	}
+	const levelStyle = ref(''); // 等级样式
+	const maxWidth = ref(''); // 等级样式
+	const lineStyle = ref(''); // 线样式
+	const getMemberLevelFn = ()=>{
+		loading.value = true;
+		
+		getMemberLevel().then((res: any) => {
+			list.value = res.data || [];
+			
+			// 初始化会员等级数据
+			let bool = true;
+			if(memberInfo.value && list.value && list.value.length){
+				list.value.forEach((item: any,index)=>{
+					if(item.level_id == memberInfo.value.member_level){
+						bool = false;
+						swiperIndex.value = index;
+						levelIndex.value = swiperIndex.value;
+						infoStructureFn(index);
+					}
+				})
+			}
+			if(bool) infoStructureFn(0);
+			if(list.value && list.value.length >= 5){
+				levelStyle.value ='width:115rpx;'
+				maxWidth.value = 'max-width:115rpx;'
+				lineStyle.value = `width:460rpx;transform: translateX(-235rpx);`
+			}else if(list.value && list.value.length == 4){
+				levelStyle.value ='width:144rpx;'
+				maxWidth.value = 'max-width:144rpx;'
+				lineStyle.value = `width:436rpx;transform: translateX(-218rpx);`
+			}else if(list.value && list.value.length == 3){
+				levelStyle.value ='width:192rpx;'
+				maxWidth.value = 'max-width:192rpx;'
+				lineStyle.value = `width:388rpx;transform: translateX(-194rpx);`
+			}else if(list.value && list.value.length == 2){
+				levelStyle.value ='width:289rpx;'
+				maxWidth.value = 'max-width:289rpx;'
+				lineStyle.value = `width:289rpx;transform: translateX(-144rpx);`
+			}else{
+				maxWidth.value = 'max-width:578rpx;'
+				levelStyle.value ='width:100%;'
+			}
+			loading.value = false;
+		}).catch(()=>{
+			loading.value = false;
+		})
+	}
+	
+	const getTaskGrowthFn = ()=>{
+		getTaskGrowth().then((res: any) => {
+			upgradeSkills.value = res.data
+		})
+	}
+	
+	const swiperChange = (e: any) => {
+	    swiperIndex.value = e.detail.current;
+		levelIndex.value = swiperIndex.value
+		infoStructureFn(e.detail.current);
+	};
+	
+	// 当前的会员等级信息
+	const currLevelInfo = ref<any>({});
+	const infoStructureFn = (index:number)=>{
+		let data:any = deepClone(list.value[index]);
+		// 会员权益
+		if(data && data.level_benefits){
+			data.benefits_arr = [];
+			Object.values(data.level_benefits).forEach((item: any,index,Array)=>{
+				if(item.content){
+					data.benefits_arr.push(item.content)
+				}
+			})
+		}
+		
+		// 升级礼包
+		if(data && data.level_gifts){
+			data.gifts_arr = [];
+			for(let key in data.level_gifts){
+				if(data.level_gifts[key].content){
+					// 增加类型
+					data.level_gifts[key].content.forEach((item: any,index: any,Array: any)=>{
+						Array[index].type = key
+					})
+					data.gifts_arr = data.gifts_arr.concat(data.level_gifts[key].content);
+				}
+			}
+		}
+		currLevelInfo.value = data;
+	}
+	// 改变会员等级
+	const changeLevel = (index : any) =>{
+		levelIndex.value = index;
+		swiperIndex.value = index;
+		infoStructureFn(index);
+	}
+</script>
+
+<style lang="scss" scoped>
+	.skill-btn{
+		width: 120rpx;
+		height: 54rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		color: #333;
+		background: linear-gradient( 180deg, #FEE8AC 0%, #F5D36E 85%);
+		border-radius: 100rpx;
+		margin-left: auto;
+		font-size: 22rpx;
+	}
+	.swiper-animation{
+		transform: scale(0.95, 0.95);
+		transition-duration: 0.3s;
+		transition-timing-function: ease;
+	}
+	:deep(.uni-progress) .uni-progress-bar, :deep(.uni-progress) .uni-progress-inner-bar{
+		border-radius: 10rpx;
+	}
+	.tab-bar {
+		padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+	
+	.level-class{
+		position: relative;
+		&::before {
+			content: "";
+			position: absolute;
+			width: 14rpx;
+			height: 14rpx;
+			background-color: #bbb;
+			border-radius: 14rpx;
+			top:50%;
+			left: 50%;
+			transform: translate(-50%,-50%);
+			z-index: 10;
+		}
+	}
+	.level-select{
+		position: relative;
+		&::after {
+			content: "";
+			position: absolute;
+			width: 26rpx;
+			height: 26rpx;
+			background-color: #fff;
+			opacity: 0.6;
+			border-radius: 26rpx;
+			top:50%;
+			left: 50%;
+			transform: translate(-50%,-50%);
+			z-index: 1;
+		}
+		&::before{
+			background-color: #fff !important;
+		}
+	}
+	.level_benefits{
+		background-repeat: no-repeat;
+		background-size:  100% 100%;
+	}
+</style>
diff --git a/uni-app/src/app/pages/member/personal.vue b/uni-app/src/app/pages/member/personal.vue
new file mode 100644
index 00000000..9599b1b0
--- /dev/null
+++ b/uni-app/src/app/pages/member/personal.vue
@@ -0,0 +1,255 @@
+<template>
+    <view class="w-full h-screen bg-page personal-wrap overflow-hidden" v-if="info" :style="themeColor()">
+
+        <view class="my-[var(--top-m)] sidebar-margin overflow-hidden card-template py-[20rpx]">
+            <u-cell-group :border="false" class="cell-group">
+				<u-cell :title="t('headimg')" :titleStyle="{'font-size': '28rpx'}" :is-link="true">
+				    <template #value>
+				        <!-- #ifdef MP-WEIXIN -->
+				        <button open-type="chooseAvatar" @chooseavatar="onChooseAvatar" :plain="true" class="border-0" @click="checkWxPrivacy">
+				            <u-avatar :src="img(info.headimg)" :default-url="img('static/resource/images/default_headimg.png')" size="40" leftIcon="none" />
+				        </button>
+				        <!-- #endif -->
+				        <!-- #ifndef MP-WEIXIN -->
+				        <u-upload @afterRead="afterRead" :maxCount="1">
+				            <u-avatar :src="img(info.headimg)" :default-url="img('static/resource/images/default_headimg.png')" size="40" leftIcon="none" />
+				        </u-upload>
+				        <!-- #endif -->
+				    </template>
+				</u-cell>
+                <u-cell :title="t('nickname')" :titleStyle="{'font-size': '28rpx'}" :is-link="true" :value="info.nickname" @click="updateNickname.modal = true"></u-cell>
+                <u-cell :title="t('sex')" :titleStyle="{'font-size': '28rpx'}" :is-link="true" :value="info.sex_name || t('unknown')" @click="sexSheetShow = true"></u-cell>
+                <u-cell :title="t('mobile')" :titleStyle="{'font-size': '28rpx'}">
+                    <template #value>
+                        <view v-if="info.mobile" class="mr-[10rpx]">{{ mobileConceal(info.mobile) }}</view>
+                        <view v-else>
+							
+							<!-- #ifdef H5 -->
+                            <button @click="redirect({ url: '/app/pages/auth/bind' })" class="bg-transparent w-[170rpx] p-[0] rounded-[100rpx] text-[var(--primary-color)] !border-[2rpx] !border-solid border-[var(--primary-color)] text-[24rpx] h-[54rpx] flex-center">{{t('bindMobile')}}</button>
+							<!-- #endif -->
+							
+							<!-- #ifdef MP-WEIXIN -->
+							<button class="bg-transparent w-[170rpx] p-[0] rounded-[100rpx] text-[var(--primary-color)] !border-[2rpx] !border-solid border-[var(--primary-color)] text-[24rpx] h-[54rpx] flex-center" open-type="getPhoneNumber" @getphonenumber="memberStore.bindMobile">{{t('bindMobile')}}</button>
+							<!-- #endif -->
+							
+                        </view>
+                    </template>
+                </u-cell>
+                <u-cell :title="t('birthday')" :titleStyle="{'font-size': '28rpx'}" :is-link="true" :value="formatDate(info.birthday) || t('unknown')" @click="birthdayPicker = true"></u-cell>
+            </u-cell-group>
+        </view>
+		
+		<!-- 修改昵称 -->
+		<u-popup class="popup-type" :safeAreaInsetBottom="false" round="var(--rounded-big)" :show="updateNickname.modal"  mode="center" @close="updateNickname.modal = false">
+			<view class="w-[620rpx] popup-common pb-[40rpx]" @touchmove.prevent.stop>
+				<view class="title !pt-[50rpx] !pb-[60rpx]">{{t('updateNickname')}}</view>
+				<view class="mx-[50rpx] border-0 border-b border-[#eee] border-solid">
+					<input type="nickname" class="h-[88rpx] text-[26rpx]" v-model="updateNickname.value" :placeholder="t('nicknamePlaceholder')" placeholderClass="text-[26rpx] h-[88rpx] flex items-center" @blur="bindNickname">
+				</view>
+				<view class="px-[60rpx] pt-[70rpx]">
+					<button hover-class="none" class="primary-btn-bg text-[#fff] h-[80rpx] font-500 leading-[80rpx] rounded-[100rpx] text-[26rpx]" @click="updateNicknameConfirm">{{t('confirm')}}</button>
+				</view>
+			</view>
+		</u-popup>
+		
+		<!-- 修改性别 -->
+        <u-action-sheet class="" :actions="sexList" :show="sexSheetShow" :closeOnClickOverlay="true"
+            :safeAreaInsetBottom="true"
+            @close="sexSheetShow = false" @select="updateSex"></u-action-sheet>
+		
+		<!-- 修改生日 -->
+        <u-datetime-picker v-model="info.birthday" :show="birthdayPicker" mode="date" :confirm-text="t('confirm')"
+            :maxDate="new Date().valueOf()" :minDate="0"
+            :cancel-text="t('cancel')" @cancel="birthdayPicker = false" @confirm="updateBirthday"></u-datetime-picker>
+
+        <!-- #ifdef MP-WEIXIN -->
+        <!-- 小程序隐私协议 -->
+        <wx-privacy-popup ref="wxPrivacyPopupRef"></wx-privacy-popup>
+        <!-- #endif -->
+    </view>
+</template>
+
+<script setup lang="ts">
+    import { ref, computed, reactive,nextTick } from 'vue'
+    import { t } from '@/locale'
+    import useMemberStore from '@/stores/member'
+    import { img, redirect,mobileConceal } from '@/utils/common'
+    import { modifyMember } from '@/app/api/member'
+    import { fetchBase64Image, uploadImage } from '@/app/api/system'
+    import { onLoad } from '@dcloudio/uni-app'
+
+    const memberStore = useMemberStore()
+    const info = computed(() => memberStore.info)
+
+    const wxPrivacyPopupRef:any = ref(null)
+
+    onLoad(()=>{
+        // #ifdef MP
+        nextTick(()=>{
+            if(wxPrivacyPopupRef.value) wxPrivacyPopupRef.value.proactive();
+        })
+        // #endif
+    })
+
+    /**
+     * 修改昵称
+     */
+    const updateNickname = reactive({
+        modal: false,
+        value: info.nickname || ''
+    })
+
+    const bindNickname = (e: any) => {
+        updateNickname.value = e.detail.value
+    }
+
+    const updateNicknameConfirm = () => {
+        if (uni.$u.test.isEmpty(updateNickname.value)) { uni.showToast({ title: t('nicknamePlaceholder'), icon: 'none' }); return }
+
+        modifyMember({
+            field: 'nickname',
+            value: updateNickname.value
+        }).then(res => {
+            memberStore.info.nickname = updateNickname.value
+            updateNickname.modal = false
+        })
+    }
+
+    /**
+     * 修改性别
+     */
+    const sexSheetShow = ref(false)
+    const sexList = computed(() => {
+        return [
+            { name: t('man'), value: 1 },
+            { name: t('woman'), value: 2 }
+        ]
+    })
+    const updateSex = (e: any) => {
+        modifyMember({
+            field: 'sex',
+            value: e.value
+        }).then(res => {
+            memberStore.info.sex_name = e.name
+        })
+    }
+
+    /**
+     * 修改用户头像
+     */
+    const onChooseAvatar = (e: any) => {
+        uni.getFileSystemManager().readFile({
+            filePath: e.detail.avatarUrl, //选择图片返回的相对路径
+            encoding: 'base64', //编码格式
+            success: res => {
+                fetchBase64Image({ content: res.data }).then((uploadRes: any) => {
+                    modifyMember({
+                        field: 'headimg',
+                        value: uploadRes.data.url
+                    }).then(res => {
+                        memberStore.info.headimg = uploadRes.data.url
+                    })
+                })
+            }
+        })
+    }
+
+    const afterRead = (event: any) => {
+        uploadImage({
+            filePath: event.file.url,
+            name: 'file'
+        }).then((res: any) => {
+            modifyMember({
+                field: 'headimg',
+                value: res.data.url
+            }).then(() => {
+                memberStore.info.headimg = res.data.url
+            })
+        }).catch(() => {
+        })
+    }
+
+    /**
+     * 编辑生日
+     */
+    const birthdayPicker = ref(false)
+    const updateBirthday = (e: any) => {
+        modifyMember({
+            field: 'birthday',
+            value: uni.$u.date(e.value, 'yyyy-mm-dd')
+        }).then(() => {
+            memberStore.info.birthday = uni.$u.date(e.value || e.value + 1, 'yyyy-mm-dd')
+            birthdayPicker.value = false
+        })
+    }
+	const formatDate=(date:any)=>{
+		return date ?  uni.$u.date(new Date(date), 'yyyy-mm-dd') : ''
+	}
+</script>
+
+<style lang="scss" scoped>
+    page {
+        background: var(--page-bg-color);
+    }
+	:deep(.u-upload ){
+		flex: none;
+	}
+    :deep(.cell-group), :deep(.u-cell-group){
+    	.u-cell{
+    		.u-cell__body{
+    			padding: 0;
+    			height: 90rpx;
+    			margin-top: 16rpx;
+    		}
+    		&:first-of-type .u-cell__body{
+    			margin-top: 0;
+    		}
+    		.u-cell__title-text{
+    			font-size:28rpx;
+    			line-height: 40rpx;
+    		}
+    		.u-icon__icon{
+    			font-size: 24rpx !important;
+    		}
+    		.u-cell__value{
+    			line-height: 1;
+    			font-size:28rpx;
+				color: #333 !important;
+    		}
+    		.u-line{
+    			display: none;
+    		}
+    	}
+    }
+
+    :deep(button, button:after) {
+        border: none;
+    }
+	
+	// 修改性别
+	:deep(.u-action-sheet){
+		.u-line{
+			margin: 0 30rpx !important;
+			width: auto !important;
+			border-color: #ddd !important;
+		}
+		.u-action-sheet__cancel{
+			padding: 0;
+			
+		}
+		.u-action-sheet__item-wrap__item__name{
+			font-size: 30rpx !important;
+		}
+	}
+	:deep(.u-picker) .u-toolbar{
+		font-size: 32rpx !important;
+		padding: 26rpx 10rpx;
+		height: auto !important;
+		font-weight: 500;
+	}
+</style>
+<style lang="scss">
+    .personal-wrap .u-cell--clickable{
+        background-color: transparent !important;
+    }
+</style>
diff --git a/uni-app/src/app/pages/member/point.vue b/uni-app/src/app/pages/member/point.vue
new file mode 100644
index 00000000..c3022250
--- /dev/null
+++ b/uni-app/src/app/pages/member/point.vue
@@ -0,0 +1,158 @@
+<template>
+	<view class="bg-[var(--page-bg-color)] min-h-[100vh]" :style="themeColor()">
+		<template v-if="!loading">
+		<view class="w-full bg-[var(--page-bg-color)]">
+			<view class="pb-[210rpx] relative" :style="headerStyle">
+				<!-- #ifdef MP-WEIXIN -->
+					<top-tabbar :data="param" :scrollBool="topTabarObj.getScrollBool()" class="top-header"/>
+				<!-- #endif -->
+				<view class="text-[70rpx] leading-[90rpx] text-[#fff] pl-[60rpx] font-500 pt-[77rpx] price-font">{{pointInfo.point||0}}</view>
+				<view class="flex items-center pl-[60rpx]">
+					<image class="h-[36rpx] w-[36rpx] -mb-[4rpx]" :src="img('static/resource/images/member/point/icon.png')" mode="heightFix" />
+					<view class="text-[26rpx] leading-[36rpx] text-[#fff] ml-[10rpx]">我的积分</view>
+				</view>
+				<view class="side-tab" :style="{top: topStyle}" @click="toLink('/app/pages/member/point_detail')">
+				    <text class="nc-iconfont nc-icon-jifenduihuanV6xx1 icon"></text>
+				    <text class="desc">积分明细</text>
+				</view>
+			</view>
+			<view class="sidebar-margin flex flex-col mt-[-178rpx] relative">
+				<view class="w-[322rpx] h-[80rpx] text-[30rpx] text-[#333] font-500 box-border pl-[30rpx] pt-[var(--pad-top-m)] rounded-tl-[var(--rounded-big)] overflow-hidden mb-[-2rpx]" 
+				:style="{backgroundImage: 'url(' + img('static/resource/images/member/point/top_bg.png') + ') ',backgroundSize: '100% 100%',backgroundRepeat: 'no-repeat'}">
+					<text class="leading-[42rpx]">积分详情</text>
+				</view>
+				<view class="flex items-center px-[30rpx] rounded-[var(--rounded-big)] !rounded-tl-none bg-[#fff] h-[173rpx] box-border">
+					<view class="w-[196rpx] flex-shrink-0 text-center">
+						<view class="text-[#333] text-[42rpx] leading-[54rpx] price-font">{{pointInfo.point_get||0}}</view>
+						<view class="mt-[8rpx] text-[var(--text-color-light6)] text-[26rpx] leading-[36rpx] font-400">累计积分</view>
+					</view>
+					<view class="w-[1rpx] h-[50rpx] flex-shrink-0 bg-[var(--temp-bg)] mx-[10rpx]"></view>
+					<view class="w-[196rpx] flex-shrink-0 text-center">
+						<view class="text-[#333] text-[42rpx] leading-[54rpx] price-font">{{pointInfo.use||0}}</view>
+						<view class="mt-[8rpx] text-[var(--text-color-light6)] text-[26rpx] leading-[36rpx] font-400">累计消费</view>
+					</view>
+					<view class="w-[1rpx] h-[50rpx] flex-shrink-0 bg-[var(--temp-bg)] mx-[10rpx]"></view>
+					<view class="w-[196rpx] min-w-[209.33rpx] flex-shrink-0 text-center">
+						<view class="text-[#333] text-[42rpx] leading-[54rpx] price-font">{{pointInfo.point||0}}</view>
+						<view class="mt-[8rpx] text-[var(--text-color-light6)] text-[26rpx] leading-[36rpx] font-400">可用积分</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="mt-[var(--top-m)] sidebar-margin card-template">
+			<view class="title">热门活动</view>
+			<view class="mt-[60rpx] flex justify-between">
+				<view class="w-[200rpx] h-[253rpx] box-border pt-[69rpx] relative text-center" 
+				:style="{backgroundImage: 'url(' + img('static/resource/images/member/point/activity_1.png') + ') ',
+				backgroundSize: '100% 100%',
+				backgroundRepeat: 'no-repeat'}">
+					<image class="h-[78rpx] w-[78rpx] absolute left-[65rpx] top-[-21rpx]" :src="img('static/resource/images/member/point/activity_icon_1.png')" mode="heightFix" />
+					<view class="text-[28rpx] leading-[39rpx] text-[#333]">每日赚积分</view>
+					<view class="mt-[10rpx] text-[24rpx] leading-[34rpx] text-[var(--text-color-light6)]">每日签到</view>
+					<view class="w-full flex justify-center mt-[20rpx]">
+						<button class="h-[54rpx] !m-0 rounded-[100rpx] text-[24rpx] flex-center !text-[#fff]" shape="circle" 
+						:style="{background: 'linear-gradient( 94deg, #FB7939 0%, #FE120E 99%), #EF000C'}" @click="toLink('/app/pages/member/sign_in')">去签到</button>
+					</view>
+				</view>
+				<view class="w-[200rpx] h-[253rpx] box-border pt-[69rpx] relative text-center"
+				:style="{backgroundImage: 'url(' + img('static/resource/images/member/point/activity_2.png') + ') ',
+				backgroundSize: '100% 100%',
+				backgroundRepeat: 'no-repeat'}">
+					<image class="h-[78rpx] w-[78rpx] absolute left-[65rpx] top-[-21rpx]" :src="img('static/resource/images/member/point/activity_icon_2.png')" mode="heightFix" />
+					<view class="text-[28rpx] leading-[39rpx] text-[#333]">积分当钱花</view>
+					<view class="mt-[10rpx] text-[24rpx] leading-[34rpx] text-[var(--text-color-light6)]">抵扣部分费用</view>
+					<view class="w-full flex justify-center mt-[20rpx]">
+						<button class="h-[54rpx] !m-0 rounded-[100rpx] text-[24rpx] flex-center !text-[#fff]" shape="circle" 
+						:style="{background: 'linear-gradient( 94deg, #FB7939 0%, #FE120E 99%), #EF000C'}" @click="toLink('/addon/shop/pages/point/index')">去兑换</button>
+					</view>
+				</view>
+				<view class="w-[200rpx] h-[253rpx] box-border pt-[69rpx] relative text-center"
+				:style="{backgroundImage: 'url(' + img('static/resource/images/member/point/activity_3.png') + ') ',
+				backgroundSize: '100% 100%',
+				backgroundRepeat: 'no-repeat'}">
+					<image class="h-[78rpx] w-[78rpx] absolute left-[65rpx] top-[-21rpx]" :src="img('static/resource/images/member/point/icon.png')" mode="heightFix" />
+					<view class="text-[28rpx] leading-[39rpx] text-[#333]">购物返积分</view>
+					<view class="mt-[10rpx] text-[24rpx] leading-[34rpx] text-[var(--text-color-light6)]">下单得积分</view>
+					<view class="w-full flex justify-center mt-[20rpx]">
+						<button class="h-[54rpx] !m-0 rounded-[100rpx] text-[24rpx] flex-center !text-[#fff]" shape="circle" 
+						:style="{background: 'linear-gradient( 94deg, #FB7939 0%, #FE120E 99%), #EF000C'}" @click="toLink('/addon/shop/pages/goods/list')">去逛逛</button>
+					</view>
+				</view>
+			</view>
+		</view>	
+		
+		<view class="mt-[var(--top-m)] sidebar-margin card-template" v-if="pointList.length">
+			<view class="title">做任务领积分</view>
+			<block v-for="(item,index) in pointList">
+				<view class="flex items-center justify-between mt-[30rpx]">
+					<view class="flex items-center flex-1">
+						<image class="h-[80rpx] w-[80rpx]" :src="img(item.icon||'')" mode="heightFix" />
+						<view class="flex flex-col ml-[20rpx]">
+							<text class="text-[28rpx]">{{item.title}}</text>
+							<view class="mt-[14rpx] text-[var(--text-color-light6)] text-[24rpx] font-400">{{item.desc}}</view>
+						</view>
+					</view>
+					<button v-if="item.button" class="h-[54rpx] !m-0 rounded-[40rpx] text-[24rpx] flex-center !text-[#fff] primary-btn-bg" shape="circle" @click="toLink(item.button.wap_redirect)">{{item.button.text}}</button>
+				</view>
+			</block>
+		</view>
+		</template>
+		<loading-page :loading="loading"></loading-page>
+	</view>
+</template>
+
+<script setup lang="ts">
+import { computed, ref } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
+import { t } from '@/locale'
+import { redirect, img,pxToRpx } from '@/utils/common';
+import { getMemberAccountPointcount,getTaskPoint } from '@/app/api/member';
+import { topTabar } from '@/utils/topTabbar'
+
+/********* 自定义头部 - start ***********/
+const topTabarObj = topTabar()
+let param = topTabarObj.setTopTabbarParam({title:'我的积分'})
+/********* 自定义头部 - end ***********/
+
+// 获取系统状态栏的高度
+let menuButtonInfo: any = {};
+// 如果是小程序，获取右上角胶囊的尺寸信息，避免导航栏右侧内容与胶囊重叠(支付宝小程序非本API，尚未兼容)
+// #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+menuButtonInfo = uni.getMenuButtonBoundingClientRect();
+// #endif
+const headerStyle = computed(()=>{
+	return { 
+		backgroundImage: 'url(' + img('static/resource/images/member/point/point_bg.png') + ') ',
+		backgroundSize: 'cover',
+		backgroundRepeat: 'no-repeat',
+		backgroundPosition: 'bottom',
+		// paddingTop:Object.keys(menuButtonInfo).length?(Number(menuButtonInfo.height) * 2 + menuButtonInfo.top * 2 + 77)+'rpx':'77rpx',
+	}
+})
+const topStyle = computed(() => {
+	let style = Object.keys(menuButtonInfo).length?(pxToRpx(Number(menuButtonInfo.height)) + pxToRpx(menuButtonInfo.top) +  50) + 'rpx;':'50rpx'
+	return style
+})
+
+//个人积分信息
+const pointInfo = ref({});
+//积分任务
+const pointList = ref([]);
+const loading = ref(true)
+onLoad(async()=>{
+	let pointInfoRes :any = await getMemberAccountPointcount()
+	let pointListRes :any = await getTaskPoint()
+	pointInfo.value = pointInfoRes.data
+	pointList.value = pointListRes.data
+	loading.value = false
+})
+const toLink=(url='',param={})=>{
+	redirect({ url, param })
+}
+</script>
+
+<style lang="scss" scoped>
+	.bg-color{
+	    background-color: rgba(102,102,102,0.4);
+	}
+</style>
diff --git a/uni-app/src/app/pages/member/point_detail.vue b/uni-app/src/app/pages/member/point_detail.vue
new file mode 100644
index 00000000..3fa30873
--- /dev/null
+++ b/uni-app/src/app/pages/member/point_detail.vue
@@ -0,0 +1,161 @@
+<template>
+	<view class="bg-[var(--page-bg-color)] min-h-[100vh]" :style="themeColor()">
+        <view class="fixed left-0 right-0 top-0 z-10085">
+            <view class="bg-[#fff] px-[30rpx] h-[88rpx] flex-center relative z-10084">
+                <view class="search-input">
+                    <view class="flex-1 text-[24rpx] leading-[60rpx] text-[var(--text-color-light9)]" :class="{'!text-[#333]':from_type}" @click="typePopup = true">{{from_type_name || '请选择来源用途'}}</view>
+                    <text class="nc-iconfont nc-icon-shangV6xx-1 !text-[26rpx] ml-[18rpx] !text-[var(--text-color-light6)]" v-if="typePopup" @click="typePopup = false"></text>
+                    <text class="nc-iconfont nc-icon-xiaV6xx !text-[26rpx] ml-[18rpx] !text-[var(--text-color-light6)]" v-else @click="typePopup = true"></text>
+                </view>
+            </view>
+            <view class="type-class">
+				<u-popup :show="typePopup" mode="top" @close="typePopup = false">
+					<view @touchmove.prevent.stop class="py-[22rpx]">
+						<view class="leading-[80rpx] text-[26rpx] text-[#333] px-[50rpx]" :class="{'bg-[var(--primary-color-light)] !text-primary font-500' : from_type == ''}" @click="searchTypeFn()">全部</view>
+						<view class="leading-[80rpx] text-[26rpx] text-[#333] px-[50rpx]" :class="{'bg-[var(--primary-color-light)] !text-primary font-500' : from_type == index}" v-for="(item,index) in pointType" @click="searchTypeFn(index,item)">{{ item.name }}</view>
+					</view>
+				</u-popup>
+			</view>
+            <view class="px-[var(--sidebar-m)] py-[30rpx] flex items-center justify-between">
+                <view class="flex items-center">
+                    <view class="px-[30rpx]  bg-[#fff] rounded-[30rpx] text-[24rpx] leading-[54rpx] mr-[20rpx] text-[#333]" :class="{'!text-[var(--primary-color)] font-500':amount_type == item.status}" v-for="(item,index) in typeList" :key="index" @click="loadTypeFn(item.status)">{{ item.name }}</view>
+                </view>
+                <view class="flex items-center" @click="handleSelect">
+                    <view class="text-[26rpx] text-[#333] mr-[10rpx]">日期</view>
+                    <view class="nc-iconfont nc-icon-a-riliV6xx-36 !text-[28rpx] leading-[36rpx]"></view>
+                </view>
+            </view>
+        </view>
+		<mescroll-body ref="mescrollRef" @init="mescrollInit" :down="{ use: false }" @up="getPointListFn" top="202rpx">
+			<view v-for="(item,index) in pointList" :key="index" class="sidebar-margin card-template  mb-[var(--top-m)]">
+                <view class="flex justify-between items-center">
+                    <view class="text-[#333]">
+                        <text class="text-[26rpx]">{{item.month_info.year}}年</text>
+                        <text class="text-[36rpx] font-500 ml-[10rpx] mr-[4rpx]">{{item.month_info.month}}</text>
+                        <text class="text-[26rpx]">月</text>
+                    </view>
+                    <view>
+                        <text class="nc-iconfont nc-icon-xiaV6xx !text-[26rpx] text-[var(--text-color-light6)]" v-if="item.flag" @click="item.flag = false"></text>
+                        <text class="nc-iconfont nc-icon-shangV6xx-1 !text-[26rpx] text-[var(--text-color-light6)]" v-else @click="item.flag = true"></text>
+                    </view>
+                </view>
+				<view v-show="item.flag">
+                    <block v-for="(subItem,subIndex) in item.month_data" :key="subItem.id">
+                        <view class="flex items-center ">
+                            <view class="w-[60rpx] h-[60rpx]">
+                                <image v-if="subItem.account_data > 0" :src="img('static/resource/images/member/point/detail/point_add.png')" class="w-[60rpx] h-[60rpx]"></image>
+                                <image v-else :src="img('static/resource/images/member/point/detail/point_min.png')" class="w-[60rpx] h-[60rpx]"></image>
+                            </view>
+                            <view class="flex-1  flex items-center ml-[20rpx]  box-border py-[30rpx] border-0" :class="{'border-solid border-t-[2rpx]  border-[#F0F2F8]' : subIndex}">
+                                <view class="flex-1">
+                                    <view class="text-[26rpx] text-[#333]">{{subItem.from_type_name}}</view>
+                                    <view class="text-[24rpx] text-[var(--text-color-light9)] mt-[16rpx]">{{subItem.create_time}}</view>
+                                </view>
+                                <view class="text-[36rpx] font-500 text-[#03B521] price-font" :class="{ '!text-primary' : subItem.account_data > 0 }">{{subItem.account_data > 0 ? '+' + subItem.account_data : subItem.account_data}}</view>
+                            </view>
+                        </view>
+                    </block>
+                </view>
+			</view>
+            <mescroll-empty  :option="{tip : '暂无积分明细'}" v-if="!pointList.length && loading"></mescroll-empty>
+		</mescroll-body>
+        <!-- 时间选择 -->
+         <select-date ref="selectDateRef" @confirm="confirmFn" />
+	</view>
+</template>
+
+<script setup lang="ts">
+import { reactive, ref } from 'vue'
+import { t } from '@/locale'
+import { redirect, img } from '@/utils/common';
+import { getPointList, getPointType } from '@/app/api/member';
+import MescrollBody from '@/components/mescroll/mescroll-body/mescroll-body.vue';
+import MescrollEmpty from '@/components/mescroll/mescroll-empty/mescroll-empty.vue';
+import useMescroll from '@/components/mescroll/hooks/useMescroll.js';
+import { onPageScroll, onReachBottom } from '@dcloudio/uni-app';
+import selectDate from '@/components/select-date/select-date.vue';
+
+const { mescrollInit, downCallback, getMescroll } = useMescroll(onPageScroll, onReachBottom);
+
+const from_type = ref('');
+const from_type_name = ref('')
+const amount_type = ref('all');
+const create_time = ref([])
+const pointList = ref<Array<any>>([]);
+const mescrollRef = ref(null);
+const loading = ref<boolean>(false);
+const typeList = ref([
+    {name:'全部',status:'all'},
+    {name:'收入',status:'income'},
+    {name:'支出',status:'disburse'}
+])
+
+const getPointListFn = (mescroll: any)=> {
+    let data = {
+        page: mescroll.num,
+        page_size: mescroll.size,
+        from_type:from_type.value,
+        amount_type:amount_type.value,
+        create_time: create_time.value
+    };
+    loading.value = false;
+    getPointList(data).then((res: any) => {
+        let newArr = res.data.data;
+        mescroll.endSuccess(newArr.length);
+        //设置列表数据
+        if (mescroll.num == 1) {
+            pointList.value = []; //如果是第一页需手动制空列表
+        }
+        pointList.value = pointList.value.concat(newArr);
+        pointList.value = pointList.value.map(item =>{
+            item.flag = true
+            return item
+        })
+        loading.value = true;
+    }).catch(() => {
+        loading.value = true;
+        mescroll.endErr(); // 请求失败, 结束加载
+    })
+}
+
+const pointType = ref({})
+const getPointTypeFn = () =>{
+    getPointType('point').then((res: any) =>{
+        pointType.value = res.data
+    })
+}
+getPointTypeFn()
+// 关键词搜索条件搜索
+const typePopup = ref(false)
+const searchTypeFn = (index:string = '',item:any = {}) =>{
+    from_type.value = index
+    from_type_name.value = item.name
+    typePopup.value = false
+    pointList.value = [];
+    getMescroll().resetUpScroll();
+}
+// 类型搜索
+const loadTypeFn = (type:string) =>{
+    amount_type.value = type;
+    pointList.value = [];
+    getMescroll().resetUpScroll();
+}
+
+//日期筛选
+const selectDateRef = ref()
+const handleSelect = () =>{
+    selectDateRef.value.show = true
+}
+// 确定时间筛选
+const confirmFn = (data:any) =>{
+    create_time.value = data;
+    pointList.value = []
+    getMescroll().resetUpScroll();
+}
+</script>
+
+<style lang="scss" scoped>
+:deep(.type-class .u-popup .u-transition){
+	top: 86rpx !important;
+}
+</style>
diff --git a/uni-app/src/app/pages/member/sign_in.vue b/uni-app/src/app/pages/member/sign_in.vue
new file mode 100644
index 00000000..a8ab988e
--- /dev/null
+++ b/uni-app/src/app/pages/member/sign_in.vue
@@ -0,0 +1,488 @@
+<template>
+    <view  :style="themeColor()">
+        <view class="min-h-screen overflow-hidden" v-if="Object.values(info).length" :class="{ 'bg-[#F6F6F6]' : info && info.is_use }">
+            <view v-if="info.is_use">
+                <view class="sigin-header">
+                <!-- #ifdef MP-WEIXIN -->
+                    <view v-if="info.rule_explain" class="side-tab" :style="{top: topStyle}"  @click="signPopup = true">
+                         <text class="nc-iconfont nc-icon-a-meiriqiandaoV6xx-36  icon"></text>
+                        <text class="desc">签到规则</text>
+					</view>
+                    <view  :style="{height: headStyle, backgroundImage: 'url(' + img('static/resource/images/app/sigin_uniapp.png') + ')',backgroundSize: '100% 100%', backgroundRepeat: 'no-repeat'}">
+                        <top-tabbar :data="topTabbarData" :scrollBool="topTabarObj.getScrollBool()" class="top-header" />
+                    </view>
+                    <!-- #endif -->
+                    <!-- #ifdef H5 -->
+                    <view v-if="info.rule_explain" class="side-tab" @click="signPopup = true">
+                        <text class="nc-iconfont nc-icon-a-meiriqiandaoV6xx-36 icon"></text>
+                        <text class="desc">签到规则</text>
+					</view>
+                    <view  class="h-[382rpx]" :style="{ backgroundImage: 'url(' + img('static/resource/images/app/sigin_h5.png') + ')',backgroundSize: '100%', backgroundRepeat: 'no-repeat'}">
+                    </view>
+                    <!-- #endif -->
+                </view>
+                <view>
+                    <view class="sidebar-margin bg-[#fff] rounded-[16rpx] -mt-[85rpx]">
+                        <view class="card-template">
+                            <view class="mb-[30rpx] flex justify-between items-center" v-if="flag">
+                                <view class="flex items-center">
+                                    <text class="iconfont iconshangyibu text-[#303133] text-[20rpx]"  @click="changeMonth('prev')"></text>
+                                    <view class="mx-[24rpx] text-[30rpx] font-500 text-[#303133] leading-[45rpx]">{{ state.curYear }}年{{ state.curMonth+1 }}月</view>
+                                    <text class="iconfont iconxiayibu1 text-[#303133] text-[20rpx]"  @click="changeMonth('next')"></text>
+                                </view>
+                                <view class="flex items-center">
+                                    <text class="nc-iconfont nc-icon-shangV6xx-1 text-[var(--text-color-light9)] pt-[4rpx] px-[6rpx] text-[24rpx]" @click="handleChange"></text>
+                                </view>
+                            </view>
+                            <view class="mb-[30rpx] flex justify-between items-center" v-else>
+								<view class="font-500 text-[30rpx]">已连续签到<text class="text-[#EF000C] mx-[4rpx]">{{ info.days }}</text>天</view>
+                                <text class="nc-iconfont nc-icon-xiaV6xx pt-[4rpx] px-[6rpx] text-[var(--text-color-light9)] text-[24rpx]" v-if="!flag" @click="flag = !flag"></text>
+                            </view>
+                            <view class="relative z-9 bg-[#fff] rounded-[18rpx]">
+                                <view>
+                                    <view class="flex items-center justify-between text-[var(--text-color-light9)] text-[24rpx] mb-[16rpx]">
+                                        <text class="w-[14.28%] leading-[36rpx] text-center">周一</text>
+                                        <text class="w-[14.28%] leading-[36rpx] text-center">周二</text>
+                                        <text class="w-[14.28%] leading-[36rpx] text-center">周三</text>
+                                        <text class="w-[14.28%] leading-[36rpx] text-center">周四</text>
+                                        <text class="w-[14.28%] leading-[36rpx] text-center">周五</text>
+                                        <text class="w-[14.28%] leading-[36rpx] text-center">周六</text>
+                                        <text class="w-[14.28%] leading-[36rpx] text-center">周日</text>
+                                    </view>
+                                    <view class="flex flex-wrap items-center justify-start" v-if="!flag">
+                                        <block v-for="(item,index) in state.weekCount" :key="index">
+                                            <view  class="w-[14.28%] flex flex-col justify-center items-center">
+                                                <view v-if="filteredDate(item)" class="w-[74rpx] h-[92rpx] bg-[#f4f4f4] text-[var(--text-color-light6)] box-border py-[10rpx] rounded-[8rpx] flex flex-col  items-center" :class="{'sigin-bg !text-[#fff]': isVerDate(item),'!bg-[#f9f9f9] border-[1rpx] !text-[var(--text-color-light9)] border-[#f5f5f5] border-solid': !isVerDate(item) && item < state.curDate && (state.curMonth + 1) == (new Date().getMonth() + 1) ,'mb-[20rpx]':isCurrentDate(item),'mb-[30rpx]':!isCurrentDate(item)}" @click="getDayPackFn(item)">
+                                                    <text class="text-[24rpx] leading-[28rpx] mb-[6rpx]">{{ filteredDate(item) }}</text>
+                                                    <view v-if="filteredDate(item)" class="flex items-center justufy-center">
+                                                        <image  v-if="isPackDate(item)" :src="img('static/resource/images/app/package.png')" class="w-[40rpx] h-[40rpx]"></image>
+                                                        <image v-else-if="isVerDate(item)" :src="img('static/resource/images/app/hassigin.png')" class="w-[34rpx] h-[34rpx]"></image>
+                                                        <template  v-else>
+                                                            <image v-if="!isVerDate(item) && item < state.curDate && (state.curMonth + 1) == (new Date().getMonth() + 1)" :src="img('static/resource/images/app/nosigin.png')" class="w-[34rpx] h-[34rpx]"></image>
+                                                            <image  v-else :src="img('static/resource/images/app/nosigin1.png')" class="w-[34rpx] h-[34rpx]"></image>
+                                                        </template>
+                                                    </view>
+                                                </view>
+                                                <view class="w-[10rpx] h-[10rpx] rounded-[50%] bg-[var(--primary-color)]" v-if="isCurrentDate(item)"></view>
+                                            </view>
+                                        </block>
+                                    </view>
+                                    <view class="flex flex-wrap items-center justify-start" v-else>
+                                        <block v-for="(item,index) in state.dataCount">
+                                            <view  class="w-[14.28%] flex flex-col justify-center items-center mb-[30rpx]">
+                                                <view v-if="filteredDate(item)" class="w-[74rpx] h-[92rpx] bg-[#F6FAFF] text-[var(--text-color-light6)] box-border py-[10rpx] rounded-[8rpx] flex flex-col  items-center" :class="{'sigin-bg !text-[#fff]': isVerDate(item) && active ,'!bg-[#FDFDFD] border-[1rpx] border-[#F0F4FA] border-solid': !isVerDate(item) && item < state.curDate && (state.curMonth + 1) == (new Date().getMonth() + 1) && state.curYear == new Date().getFullYear() ,'mb-[20rpx]':isCurrentDate(item),'mb-[30rpx]':!isCurrentDate(item)}" @click="getDayPackFn(item)">
+                                                    <text class="text-[24rpx] leading-[28rpx] mb-[6rpx]">{{ filteredDate(item) }}</text>
+                                                    <view v-if="filteredDate(item)" class="flex items-center justufy-center">
+                                                        <image  v-if="isPackDate(item)" :src="img('static/resource/images/app/package.png')" class="w-[40rpx] h-[40rpx]"></image>
+                                                        <image v-else-if="isVerDate(item) && active " :src="img('static/resource/images/app/hassigin.png')" class="w-[34rpx] h-[34rpx]"></image>
+                                                        <template v-else>
+                                                            <image  v-if="!isVerDate(item) && item < state.curDate && (state.curMonth + 1) == (new Date().getMonth() + 1)" :src="img('static/resource/images/app/nosigin.png')" class="w-[34rpx] h-[34rpx]"></image>
+                                                            <image  v-else :src="img('static/resource/images/app/nosigin1.png')" class="w-[34rpx] h-[34rpx]"></image>
+                                                        </template>
+                                                    </view>
+                                                </view>
+                                                <view class="w-[10rpx] h-[10rpx] rounded-[50%] bg-[var(--primary-color)]" v-if="isCurrentDate(item)"></view>
+                                            </view>
+                                        </block>
+                                    </view>
+                                    <view class="mt-[40rpx] flex justify-center"  v-if="state.curMonth + 1 == (new Date().getMonth() + 1) && state.curYear == new Date().getFullYear() ">
+                                        <button v-if="!info.is_sign" class="rounded-[40rpx] flex-center !bg-transparent text-[26rpx] font-500" :style="{width:'490rpx',height:'80rpx',border:'none', color:'#fff',backgroundImage: `url(${img('static/resource/images/app/button_bg2.png')})`,backgroundSize: '100%', backgroundRepeat: 'no-repeat'}" shape="circle" @click="setSignFn">
+											<text class="nc-iconfont nc-icon-a-meiriqiandaoV6xx-36 text-[26rpx] text-[#fff] mr-[8rpx]"></text>
+											<text>立即签到</text>
+										</button>
+										<button v-else class="rounded-[40rpx] flex-center !bg-transparent text-[26rpx] font-500" :style="{width:'490rpx',height:'80rpx',border:'none',color:'#fff', backgroundImage: `url(${img('static/resource/images/app/button_bg1.png')})`,backgroundSize: '100%', backgroundRepeat: 'no-repeat'}" shape="circle">
+											<text class="nc-iconfont nc-icon-a-meiriqiandaoV6xx-36 text-[26rpx] text-[#fff] mr-[8rpx]"></text>
+											<text>已签到</text>
+										</button>
+                                    </view>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+
+                    <view class="mt-[20rpx] mb-[30rpx] sidebar-margin card-template" v-if="info && info.continue_award && Object.keys(info.continue_award).length">
+                        <view class="mb-[30rpx] flex items-center">
+                            <view class="font-500 text-[30rpx] text-[#303133]">签到奖励</view>
+                            <!-- <view class="text-[var(--text-color-light6)] text-[26rpx] leading-[30rpx]">
+                                <text>签到记录</text>
+                                <image :src="img('static/resource/images/app/more.png')" class="w-[12rpx] h-[18rpx] ml-[8rpx]"></image>
+                            </view> -->
+                        </view>
+                        <view>
+                            <view v-for="(item,index) in info.continue_award" :key="index" class="flex items-center border-box" :class="{'mt-[40rpx]':index}">
+                                <view class="w-[90rpx] h-[90rpx] rounded-[50%] bg-[#E7F6FF] flex items-center justify-center  flex-shrink-0" v-if="(index + 1) % 4 == 1">
+                                    <image :src="img('static/resource/images/app/icon_02.png')" class="w-[40rpx] h-[40rpx]"></image>
+                                </view>
+                                <view class="w-[90rpx] h-[90rpx] rounded-[50%] bg-[#ffefef] flex items-center justify-center flex-shrink-0" v-else-if="(index + 1) % 4 == 2">
+                                    <image :src="img('static/resource/images/app/icon_03.png')" class="w-[40rpx] h-[40rpx]"></image>
+                                </view>
+                                <view class="w-[90rpx] h-[90rpx] rounded-[50%] bg-[#d3feeb] flex items-center justify-center flex-shrink-0" v-else-if="(index + 1) % 4 == 3">
+                                    <image :src="img('static/resource/images/app/icon_04.png')" class="w-[40rpx] h-[40rpx]"></image>
+                                </view>
+                                <view class="w-[90rpx] h-[90rpx] rounded-[50%] bg-[#ffeddd] flex items-center justify-center flex-shrink-0" v-else-if="(index + 1) % 4 == 0">
+                                    <image :src="img('static/resource/images/app/icon_05.png')" class="w-[40rpx] h-[40rpx]"></image>
+                                </view>
+                                <view class="flex-1 mx-[20rpx]">
+                                    <view class="font-400 text-[28rpx] text-[#303133] leading-[38rpx] mb-[10rpx]">连续签到{{item.continue_sign}}天</view>
+                                    <view class="flex flex-wrap" v-if="item.gift">
+                                        <view  class="flex">
+                                            <image :src="img(item.gift.total.icon)" class="w-[30rpx] h-[30rpx] flex-shrink-0"></image>
+                                            <view class="text-[24rpx] ml-[8rpx] text-[#FF9000] leading-[34rpx] max-w-[330rpx]">{{item.gift.total.text}}</view>
+                                         </view>
+                                    </view>
+                                </view>
+                                <view class="flex-shrink-0">
+                                    <view v-if="Number(info.days) < Number(item.continue_sign) " class="w-[130rpx] h-[54rpx] text-center bg-primary-light rounded-[28rpx] text-[22rpx] text-[var(--primary-color)] flex-center font-500">待完成</view>
+                                    <view v-else class="primary-btn-bg w-[130rpx] h-[54rpx] text-center rounded-[27rpx] text-[22rpx] text-[#fff] flex-center font-500">已完成</view>
+                                </view>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+            <view class="h-[100vh] w-[100vw] flex justify-center items-center" v-else>
+                <!-- #ifdef MP-WEIXIN -->
+                <top-tabbar :data="topTabbarData" :scrollBool="topTabarObj.getScrollBool()" class="top-header"/>
+                <!-- #endif -->
+                <u-empty text="签到未开启" width="347rpx" height="265rpx" :icon="img('static/resource/images/system/empty.png')"/>
+            </view>
+            <!-- 签到规则-->
+            <u-popup :show="signPopup" :round="16" mode="bottom" @close="signPopup = false">
+                <view class="popup-common">
+                    <view class="title">签到规则</view>
+                    <scroll-view :scroll-y="true" class="px-[30rpx] box-border h-[360rpx] overflow-auto">
+                        <block v-for="(item) in info.rule_explain.split('\n')">
+                            <view class="text-[28rpx] leading-[40rpx] mb-[20rpx]">{{ item }}</view>
+                        </block>
+                    </scroll-view>
+                    <view class="btn-wrap">
+                        <button class="primary-btn-bg btn"  @click="signPopup = false">知道了</button>
+                    </view>
+                </view>
+            </u-popup>
+            <!-- 签到奖励 -->
+            <u-popup :show="awardShow" class="award-popup overflow-hidden" :customStyle="{backgroundColor:'transparent'}" @close="awardShow = false"  mode="center" round="var(--rounded-big)" :safeAreaInsetBottom="false" >
+                <view  class="w-[550rpx] -mt-[124rpx]"  v-if="Object.values(signAward).length">
+                    <view class="flex justify-center">
+                        <image :src="img('static/resource/images/app/award.png')" class="w-[484rpx] h-[480rpx] z-10"  mode="aspectFill"></image>
+                    </view>
+                    <view class="-mt-[265rpx] bg-award rounded-[40rpx] pt-[100rpx] pb-[50rpx] mb-[50rpx] relative">
+                        <view class="px-[32rpx]">
+                            <view class="text-[36rpx] text-[#EF000C] font-500 mb-[10rpx] text-center">{{ signAward.title }}</view>
+                            <view class="text-[24rpx] text-[#333] leading-[34rpx] text-center mb-[60rpx]" v-if="signAward.info">{{ signAward.info }}</view>
+                            <view class="px-[68rpx] mb-[100rpx]">
+                                <block v-for="(item,index) in signAward.awards">
+                                    <template v-if="item.content" v-for="(subItem,subIndex) in item.content">
+                                        <view class="flex items-center mb-[30rpx]" >
+                                            <image :src="img(subItem.icon)" class="w-[42rpx] h-[42rpx]"></image>
+                                            <view class="ml-[20rpx] text-[28rpx] text-[#303133] leading-[38rpx]">{{subItem.text }}</view>
+                                        </view>
+                                    </template>
+                                </block>
+                            </view>
+                            <view class="flex justify-center relative z-30">
+								<view class="w-[370rpx] h-[80rpx] primary-btn-bg font-500 rounded-[100rpx] text-[#ffffff] text-center leading-[80rpx] text-[26rpx]"  @click="awardShow = false">我知道了</view>
+                            </view>
+                        </view>
+                    </view>
+                    <view class="flex justify-center">
+                        <text class="nc-iconfont nc-icon-cuohaoV6xx1 text-[#fff] text-[50rpx]" @click="awardShow = false"></text>
+                    </view>
+                </view>
+            </u-popup>
+            <!-- 查看当日或连续签到奖励 -->
+            <u-popup :show="packShow" class="award-popup overflow-hidden" :customStyle="{backgroundColor:'transparent'}" @close="packShow = false"  mode="center" round="var(--rounded-big)" :safeAreaInsetBottom="false">
+                <view class="w-[550rpx] -mt-[124rpx]" v-if="Object.values(packInfo).length">
+                    <view class="flex justify-center">
+                        <image :src="img('static/resource/images/app/award.png')" class="w-[484rpx] h-[480rpx] z-10" mode="aspectFill"></image>
+                    </view>
+                    <view class="-mt-[265rpx] bg-award rounded-[40rpx] pt-[100rpx] pb-[50rpx] mb-[50rpx] relative">
+                        <view class="px-[32rpx]">
+                            <view class="text-[36rpx] text-[#303133] font-500 mb-[10rpx] text-center relative z-20">
+                                {{ packInfo.title }}
+                            </view>
+                            <view class="text-[24rpx] text-[#333] leading-[34rpx] text-center mb-[60rpx]">{{  packInfo.info }}</view>
+                            <view class="px-[68rpx] mb-[100rpx]">
+                                <block v-for="(item,index) in packInfo.awards">
+                                    <template v-if="item.content">
+                                        <view class="flex items-center mb-[32rpx]" v-for="(subItem,subIndex)  in item.content" :key="subIndex">
+                                            <image :src="img(subItem.icon)" class="w-[42rpx] h-[42rpx]"></image>
+                                            <view class="ml-[20rpx] text-[28rpx] text-[#303133] leading-[38rpx]">{{ subItem.text  }}</view>
+                                        </view>
+                                    </template>
+                                </block>
+                            </view>
+                            <view class="flex justify-center  relative z-30">
+								<view class="w-[370rpx] h-[80rpx] border-[2rpx] text-[var(--primary-color)] border-solid rounded-[40rpx] border-[var(--primary-color)] text-center flex-center text-[26rpx] box-border"  @click="packShow = false">我知道了</view>
+                            </view>
+                        </view>
+                    </view>
+                    <view class="flex justify-center">
+                        <text class="nc-iconfont nc-icon-cuohaoV6xx1 text-[#fff] text-[50rpx]" @click="packShow = false"></text>
+                    </view>
+                </view>
+            </u-popup>
+        </view>
+		<loading-page :loading="loading"></loading-page>
+    </view>
+</template>
+
+<script setup lang="ts">
+import { reactive, ref, toRefs, toRaw, computed } from 'vue'
+import { redirect, img,pxToRpx } from '@/utils/common'
+import { onLoad } from '@dcloudio/uni-app'
+import { getSignInfo,getSignConfig, setSign,getDayPack } from '@/app/api/member'
+import useMemberStore from '@/stores/member'
+import { topTabar } from '@/utils/topTabbar'
+
+const state = reactive({
+    dataCount:[], //当月所有天数
+    weekCount:[], //如果签到周期是7天
+    curYear:0, // 当前年
+    curMonth:0, //当前月
+    curDate:0, //当前日
+    curWeek:0, //当前星期
+    signInList:[], // 签到列表
+    packList:[] //每个小周期内的礼包
+})
+const week = reactive({
+    weekDay:0, //当前天
+    week:0 //当前星期
+})
+const loading = ref(false)
+const flag = ref(false)
+const info: any = ref({}) //签到配置
+const signPopup = ref(false)//签到规则弹框
+const signAward: any = ref({}) //当日签到奖励
+const awardShow = ref(false) // 每日签到弹框
+const packShow =  ref(false) //查看每天礼包
+const packInfo = ref({}) //礼包奖励
+const active = ref(false)
+let currentYear: any = null
+let currentMonth: any = null
+onLoad(() =>{
+    let date=new Date()
+    state.curYear=date.getFullYear()
+    state.curMonth=date.getMonth()
+    state.curDate=date.getDate()
+    state.curWeek=date.getDay()
+    if(state.curWeek==0) state.curWeek = 7
+
+    currentYear=toRaw(state.curYear)
+    currentMonth=toRaw(state.curMonth)
+
+    //初始化执行
+    getDayCounts()
+    getWeekCounts()
+    getSignInfoFn({year:state.curYear,month:state.curMonth+1})
+    getSignConfigFn()
+})
+
+// 获取签到配置
+const getSignConfigFn = () =>{
+    loading.value = true
+    getSignConfig().then((res:any) =>{
+        info.value = res.data
+        if(!info.value.is_use){
+            topTabbarData = topTabarObj.setTopTabbarParam({title:'我的签到',topStatusBar:{textColor:'#303133',bgColor:'#fff'}})
+        }
+        loading.value = false
+    })
+}
+
+// 每个周期签到日期
+const getSignInfoFn =  (data:any) =>{
+    getSignInfo(data).then((res:any) =>{
+        state.signInList = []
+        state.packList = []
+        state.packList = res.data.period
+        if(res.data.length){
+            state.signInList = res.data.days.map((el:any) =>{
+                return Number(el)
+            })
+        }
+        
+        active.value = true
+    })
+}
+
+//获取当月总天数
+const getDayCounts = () => {
+    let counts = new Date(state.curYear,state.curMonth+1,0).getDate()
+    //获取当前第一天是星期几
+    let firstWeekDay = new Date(state.curYear,state.curMonth,1).getDay()
+    state.dataCount = []
+    for(let i=1;i<counts+firstWeekDay;i++){
+        let val=i-firstWeekDay+ 1
+        state.dataCount.push(val)
+    }
+}
+// 获取7天的日期签到
+const getWeekCounts = () =>{
+    let now = `${state.curYear}-${state.curMonth+1 > 9 ? state.curMonth+1 : '0'+(state.curMonth+1)}-${state.curDate > 9 ? state.curDate : '0'+state.curDate }`
+    for (let i = state.curWeek - 1; i >= 0; i --) {
+        const day = new Date(now).getDate() - i
+        state.weekCount.push(day)
+    }
+    for (let i = 1; i <= 7 - state.curWeek; i++) {
+        const day = new Date(now).getDate() + i
+        state.weekCount.push(day)
+    }
+}
+
+//控制状态
+const handleChange = () =>{
+    let nowDate = new Date().getMonth()
+
+    if(state.curMonth == nowDate){
+        flag.value = !flag.value
+    }else{
+        state.curMonth = new Date().getMonth()
+        state.curYear =  new Date().getFullYear()
+        getSignInfoFn({year:state.curYear,month:state.curMonth+1})
+        flag.value = !flag.value
+    }
+}
+
+//更改月份
+const changeMonth=(type: string)=>{
+ state.dataCount=[]
+ if(type == 'prev'){
+    state.curMonth--
+    if(state.curMonth < 0){
+        state.curMonth = 11
+        state.curYear--
+    }
+    week.weekDay = 1
+    active.value = false
+ }else{
+    state.curMonth++
+    if(state.curMonth > 11){
+        state.curMonth = 0
+        state.curYear++
+    }
+    week.weekDay = 1
+    active.value = false
+ }
+ let data = {year:state.curYear,month:state.curMonth + 1}
+ getSignInfoFn(data)
+ getDayCounts()
+}
+
+const memberStore = useMemberStore()
+
+// 点击签到
+const setSignFn = () =>{
+    setSign().then((res: any) =>{
+        if(Object.values(res.data).length){
+            signAward.value = res.data
+			// 如果没有奖励内容则不展示描述信息
+			let isShowInfo = 0
+			Object.values(signAward.value.awards).forEach((item: any,index)=>{
+				if(!item.content){
+					isShowInfo++;
+				}
+			})
+			if(isShowInfo == Object.values(signAward.value.awards).length){
+				signAward.value.info = "";
+			}
+            getSignInfoFn({year:state.curYear,month:state.curMonth+1})
+            getSignConfigFn()
+            memberStore.getMemberInfo()
+            awardShow.value = true
+        }
+    })
+}
+// 查看每日礼包
+const curPickDay: any = ref(null)
+const getDayPackFn = (date:number) =>{
+    let {curYear,curMonth}=toRefs(state)
+    let itemDate=`${curYear.value}-${(curMonth.value+1) < 10 ? '0' + (curMonth.value+1) : (curMonth.value+1)}-${date < 10 ? '0'+date : date}`
+    let flag = state.packList.some(el =>{
+        return el.day == itemDate
+    })
+    if(!flag) return
+    curPickDay.value = date
+    let obj = {
+        year: state.curYear,
+        month:state.curMonth + 1,
+        day: date
+    }
+    getDayPack(obj).then((res:any) => {
+        if(JSON.stringify(res.data) != '[]'){
+            packInfo.value = res.data
+            packShow.value = true
+        }
+    })
+}
+
+// 判断是否签到
+const isVerDate = (val:any) => {
+    return state.signInList.includes(val)
+}
+
+//判断是否是当前日期
+const isCurrentDate=(date: any)=>{
+    if(date> 0 && date <= state.dataCount.length){
+        if(date == state.curDate && currentYear == state.curYear && currentMonth == state.curMonth){
+            return true
+        }
+    }else{
+        return false
+    }
+}
+
+const isPackDate = (date:any) =>{
+    let {curYear,curMonth}=toRefs(state)
+    let itemDate=`${curYear.value}-${(curMonth.value+1) < 10 ? '0' + (curMonth.value+1) : (curMonth.value+1)}-${date < 10 ? '0'+date : date}`
+    let flag = state.packList.some((el:any) =>{
+        return el.day == itemDate && el.award
+    })
+    return flag
+}
+
+// 过滤日期
+const filteredDate=(date :any)=>{
+    return date > 0 ? date : ''
+}
+
+// 获取系统状态栏的高度
+let menuButtonInfo: any = {};
+// 如果是小程序，获取右上角胶囊的尺寸信息，避免导航栏右侧内容与胶囊重叠(支付宝小程序非本API，尚未兼容)
+// #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+menuButtonInfo = uni.getMenuButtonBoundingClientRect();
+// #endif
+/********* 自定义头部 - start ***********/
+const topTabarObj = topTabar()
+let topTabbarData = topTabarObj.setTopTabbarParam({title:'我的签到'})
+/********* 自定义头部 - end ***********/
+
+const headStyle = computed(() => {
+	let style = pxToRpx(Number(menuButtonInfo.height) + menuButtonInfo.top + 8)+  382 + 'rpx;'
+	return style
+})
+const topStyle = computed(() => {
+	let style = pxToRpx(Number(menuButtonInfo.height) + menuButtonInfo.top + 8)+ 50 + 'rpx;'
+	return style
+})
+</script>
+
+<style lang="scss" scoped>
+.bg-color{
+    background-color: rgba(102,102,102,0.4);
+}
+.sigin-bg{
+    background: linear-gradient( 90deg, #FFA359 0%, #FF5426 100%), #F2F2F2;
+}
+:deep(.award-popup .u-popup__content){
+    background-color: transparent;
+}
+.bg-award{
+    background: linear-gradient( 51deg, #FFFBFC 0%, #FFFCF9 59%, #FFE7E7 100%);
+}
+
+.bg-button{
+    background: linear-gradient( 180deg, #FFEAE1 0%, #FFCDD0 34%, #E0052C 100%);
+    border-radius: 40rpx;
+}
+</style>
\ No newline at end of file
diff --git a/uni-app/src/app/pages/pay/browser.vue b/uni-app/src/app/pages/pay/browser.vue
new file mode 100644
index 00000000..6e31ee98
--- /dev/null
+++ b/uni-app/src/app/pages/pay/browser.vue
@@ -0,0 +1,20 @@
+<template>
+    <view class="w-screen h-screen bg-[#424040] text-right" :style="themeColor()">
+        <image :src="img('static/resource/images/pay/invite_friends_share.png')" mode="heightFix" class="pt-[30rpx] pr-[30rpx] h-[200rpx] w-[auto]"/>
+        <view class="text-white font-bold pt-[30rpx] pr-[30rpx]">点击右上角跳转到浏览器打开</view>
+    </view>
+</template>
+
+<script setup lang="ts">
+    import { img, isWeixinBrowser } from '@/utils/common'
+    import { onLoad } from '@dcloudio/uni-app'
+
+    onLoad((data : any) => {
+        if (!isWeixinBrowser() && data.alipay) {
+            uni.setStorageSync('paymenting', { trade_type: data.trade_type, trade_id: data.trade_id })
+            location.href = data.alipay
+        }
+    })
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/uni-app/src/app/pages/pay/result.vue b/uni-app/src/app/pages/pay/result.vue
new file mode 100644
index 00000000..9460aa0b
--- /dev/null
+++ b/uni-app/src/app/pages/pay/result.vue
@@ -0,0 +1,86 @@
+<template>
+    <view :style="themeColor()">
+        <view class="w-screen h-screen flex flex-col items-center" v-if="payInfo">
+			<top-tabbar ref="topTabbarRef" :data="topTabbarParam" />
+            <view class="flex-1 flex flex-col items-center w-full pt-[180rpx]">
+                <view class="flex items-baseline"  :class="{'text-[#06c05d]': payInfo.status==2, 'text-red': payInfo.status!=2}">
+					<text class="nc-iconfont -mb-[4rpx] !text-[32rpx]" :class="{'nc-icon-duihaoV6mm': payInfo.status==2, 'nc-icon-tanhaoV6mm': payInfo.status!=2}"></text>
+					<text class="text-[36rpx] ml-[16rpx] font-500">{{ payInfo.status == 2 ? '支付成功' : '支付失败' }}</text>
+				</view>
+				
+				<view class="text-[56rpx] font-500 mt-[60rpx] price-font">
+                    <text class="text-[36rpx] mr-[6rpx]">{{ t('currency') }}</text>
+                    <text>{{ moneyFormat(payInfo.money) }}</text>
+                </view>
+            </view>
+			<view class="pb-[260rpx]">
+				<button class="w-[380rpx] !border-0 h-[80rpx] text-[28rpx] text-[#333] !bg-[#f2f2f2] flex-center font-500 rounded-[20rpx]" :plain="true" @click="complete">
+					{{payInfo.status == 2 ? t('complete') : t('close')}}
+				</button>
+			</view>
+        </view>
+        <u-modal :show="loading" :showCancelButton="true" :confirmText="t('pay.completePay')" :cancelText="t('pay.incompletePay')" @cancel="complete" confirmColor="var(--primary-color)">
+            <view class="py-[20rpx]">
+                <u-loading-icon :text="t('pay.getting')" textSize="16" mode="circle" :vertical="true"></u-loading-icon>
+            </view>
+        </u-modal>
+    </view>
+</template>
+
+<script setup lang="ts">
+    import { ref } from 'vue'
+    import { onLoad } from '@dcloudio/uni-app'
+    import { getPayInfo as getPayInfoApi } from '@/app/api/pay'
+    import { t } from '@/locale'
+    import { redirect, moneyFormat } from '@/utils/common'
+    import { getFirstPage } from '@/utils/pages'
+	import { topTabar } from '@/utils/topTabbar'
+
+    const payInfo = ref<AnyObject | null>(null)
+    const loading = ref(false)
+    let tradeType = ''
+    let tradeId = 0
+    let requestNum = 0
+	
+	/********* 自定义头部 - start ***********/
+	const topTabarObj = topTabar()
+	let topTabbarParam = topTabarObj.setTopTabbarParam({title:'',isBack:false})
+	/********* 自定义头部 - end ***********/
+
+    onLoad((data : any) => {
+        tradeType = data.trade_type
+        tradeId = data.trade_id
+        getPayInfo()
+    })
+
+    /**
+     * 获取支付信息
+     */
+    const getPayInfo = () => {
+        getPayInfoApi(tradeType, tradeId).then((res: any) => {
+            if (!uni.$u.test.isEmpty(res.data)) {
+                if (res.data.status == 1 && requestNum < 5) {
+                    loading.value = true
+                    requestNum++
+                    setTimeout(() => {
+                        getPayInfo()
+                    }, 1000)
+                    return
+                }
+                payInfo.value = res.data
+                loading.value = false
+                // uni.setNavigationBarTitle({
+                //     title: payInfo.value.status == 2 ? t('pay.paySuccess') : t('pay.payFail')
+                // })
+            }
+        })
+    }
+
+    const complete = () => {
+        const payReturn = decodeURIComponent(uni.getStorageSync('payReturn'))
+        if (payReturn) redirect({ url: payReturn, mode: 'reLaunch' })
+        else redirect({ url: getFirstPage(), param: { code: payInfo.value?.out_trade_no }, mode: 'reLaunch' })
+    }
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/uni-app/src/app/pages/setting/index.vue b/uni-app/src/app/pages/setting/index.vue
new file mode 100644
index 00000000..77c6a54a
--- /dev/null
+++ b/uni-app/src/app/pages/setting/index.vue
@@ -0,0 +1,106 @@
+<template>
+    <view class="w-full h-screen box-border pt-[var(--top-m)] bg-[var(--page-bg-color)] setting-wrap" :style="themeColor()">
+        <view class="mb-[var(--top-m)] sidebar-margin card-template !py-[20rpx]">
+            <u-cell-group :border="false" class="cell-group">
+                <u-cell :title="t('personalSettings')" :is-link="true" url="/app/pages/member/personal"></u-cell>
+                <u-cell :title="t('switchLang')" :is-link="true" :value="lang" @click="langSheetShow = true"></u-cell>
+                <u-cell :title="t('version')" :value="version"></u-cell>
+            </u-cell-group>
+        </view>
+        <view class="mb-[var(--top-m)] sidebar-margin card-template !py-[20rpx]">
+            <u-cell-group :border="false" class="cell-group">
+                <u-cell :title="t('userAgreement')" :is-link="true" url="/app/pages/auth/agreement?key=service"></u-cell>
+                <u-cell :title="t('privacyAgreement')" :is-link="true" url="/app/pages/auth/agreement?key=privacy"></u-cell>
+            </u-cell-group>
+        </view>
+
+		<view class="h-[88rpx] flex-center bg-[#fff] mx-[var(--sidebar-m)] rounded-[var(--rounded-big)] text-[28rpx]" @click="memberStore.logout(true)">{{ t('logout') }}</view>
+
+        <u-action-sheet :actions="langList" :show="langSheetShow" :closeOnClickOverlay="true"
+            :safeAreaInsetBottom="true"
+            @close="langSheetShow = false" @select="switchLang"></u-action-sheet>
+    </view>
+</template>
+
+<script setup lang="ts">
+    import { ref, reactive, computed } from 'vue'
+    import useMemberStore from '@/stores/member'
+    import { t, language } from '@/locale'
+
+    const memberStore = useMemberStore()
+
+    const version = ref(import.meta.env.VITE_APP_VERSION)
+
+    /**
+     * 支持的语言列表
+     */
+    const langList = reactive({
+        'zh-Hans': { name: '简体中文', fontSize: '14', value: 'zh-Hans' },
+        'en': { name: 'English', fontSize: '14', value: 'en' }
+    })
+    const langSheetShow = ref(false)
+
+    // 当前语言
+    const lang = computed(() => {
+        const lang = uni.getLocale()
+        return langList[lang].name
+    })
+
+    /**
+     * 切换语言
+     */
+    const switchLang = (lang) => {
+        language.loadAllLocaleMessages('app', lang.value)
+    }
+</script>
+
+<style lang="scss" scoped>
+    page {
+        background: var(--page-bg-color);
+    }
+	:deep(.cell-group), :deep(.u-cell-group){
+		.u-cell{
+			.u-cell__body{
+				padding: 0;
+				height: 90rpx;
+				margin-top: 16rpx;
+			}
+			&:first-of-type .u-cell__body{
+				margin-top: 0;
+			}
+			.u-cell__title-text{
+				font-size:28rpx;
+				line-height: 40rpx;
+			}
+			.u-icon__icon{
+				font-size: 24rpx !important;
+			}
+			.u-cell__value{
+				line-height: 1;
+				font-size:28rpx;
+			}
+			.u-line{
+				display: none;
+			}
+		}
+	}
+	:deep(.u-action-sheet){
+		.u-line{
+			margin: 0 30rpx !important;
+			width: auto !important;
+			border-color: #ddd !important;
+		}
+		.u-action-sheet__cancel{
+			padding: 0;
+			
+		}
+		.u-action-sheet__item-wrap__item__name{
+			font-size: 30rpx !important;
+		}
+	}
+</style>
+<style>
+    .setting-wrap .u-cell--clickable{
+        background-color: transparent !important;
+    }
+</style>
diff --git a/uni-app/src/app/pages/verify/detail.vue b/uni-app/src/app/pages/verify/detail.vue
new file mode 100644
index 00000000..7a5da3b6
--- /dev/null
+++ b/uni-app/src/app/pages/verify/detail.vue
@@ -0,0 +1,84 @@
+<template>
+    <view :style="themeColor()" class="bg-[var(--page-bg-color)] min-h-[100vh] overflow-hidden">
+        <block v-if="!loading">
+			<view class="pt-[20rpx] sidebar-margin">
+				<view class="flex flex-col card-template">
+					<view class="flex" :class="{'mb-[20rpx]': verifyInfo.value.list.length-1 != index}" v-for="(item,index) in verifyInfo.value.list" :key="index">
+						<image class="w-[150rpx] h-[150rpx] rounded-[var(--goods-rounded-big)]" mode="aspectFill" v-if="item.cover" :src="img(item.cover)"></image>
+						<image class="w-[150rpx] h-[150rpx] rounded-[var(--goods-rounded-big)]" mode="aspectFill" v-else :src="img('addon/tourism/tourism/member/hotel.png')"></image>
+						<view class="flex flex-col flex-1 ml-[20rpx] py-[4rpx]">
+							<view class="leading-[40rpx] truncate max-w-[490rpx] text-[28rpx]">{{item.name}}</view>
+							<view class="mt-[14rpx] truncate text-[24rpx] text-[var(--text-color-light9)] leading-[28rpx] max-w-[490rpx] " v-if="item.sub_name">
+							{{ item.sub_name }}
+							</view>
+							<view class="text-[var(--text-color-light6)] text-[26rpx] mt-[20rpx]">x1</view>
+						</view>
+					</view>
+				</view>
+				
+				<view class="flex flex-col card-template mt-[20rpx] text-[28rpx]">
+					<view class="title">核销信息</view>
+					<view class="card-template-item justify-between">
+						<text class="text-[28rpx] text-[#333]">核销类型</text>
+						<view class="text-[28rpx] text-[#333]">{{verifyInfo.type_name}}</view>
+					</view>
+					<view class="card-template-item justify-between">
+						<text class="text-[28rpx] text-[#333]">核销状态</text>
+						<view class="text-[28rpx] text-[#333]">已核销</view>
+					</view>
+					<view class="card-template-item justify-between">
+						<text class="text-[28rpx] text-[#333]">核销时间</text>
+						<view class="text-[#333333] text-[28rpx]">{{verifyInfo.create_time}}</view>
+					</view>
+					<view class="card-template-item justify-between">
+						<text class="text-[28rpx] text-[#333]">核销人员</text>
+						<view class="text-[#333333] text-[28rpx]">{{verifyInfo.member ? verifyInfo.member.nickname : '--'}}</view>
+					</view>
+					<view class="card-template-item justify-between" v-for="(item,index) in verifyInfo.value.content.fixed">
+						<text class="text-[28rpx] text-[#333]">{{item.title}}</text>
+						<view class="text-[28rpx] text-[#333]">{{item.value}}</view>
+					</view>
+				</view>
+				
+				<view v-for="(item,index) in verifyInfo.value.content.diy" :key="index" class="card-template top-mar">
+					<view class="title">{{item.title}}</view>
+					<view class="card-template-item justify-between" v-for="(subItem,subIndex) in item.list" :key="subIndex" :class="{'mt-30rpx' : subIndex == '0'}">
+						<text class="text-[28rpx] text-[#333]">{{subItem.title}}</text>
+						<view class="text-[28rpx] text-[#333]">{{subItem.value}}</view>
+					</view>
+				</view>
+			</view>
+
+        </block>
+		<loading-page :loading="loading"></loading-page>
+    </view>
+</template>
+
+<script setup lang="ts">
+    import { ref } from 'vue';
+    import { onLoad,onShow } from '@dcloudio/uni-app'
+	import { img,redirect, getToken } from '@/utils/common';
+    import { getVerifyDetail } from '@/app/api/verify'
+    import { t } from '@/locale'
+
+    const loading = ref(true)
+	const code = ref('');
+    onLoad((option:any)=> {
+	    if (option.code) code.value = option.code;
+    })
+	
+	onShow(() => {
+		if(getToken()){
+			getVerifyDetailFn();
+		}
+	})
+	
+	const verifyInfo = ref({})
+	const getVerifyDetailFn = ()=>{
+		loading.value = true;
+		getVerifyDetail(code.value).then((res:any) =>{
+			verifyInfo.value = res.data;
+			loading.value = false;
+		})
+	}
+</script>
diff --git a/uni-app/src/app/pages/verify/index.vue b/uni-app/src/app/pages/verify/index.vue
new file mode 100644
index 00000000..2ab87111
--- /dev/null
+++ b/uni-app/src/app/pages/verify/index.vue
@@ -0,0 +1,222 @@
+<template>
+    <view :style="themeColor()">
+		<view class="w-[100vw] min-h-[100vh] bg-[#f8f8f8]" v-if="!loading && isVerify">
+			<view class="w-full bg-[#fff] verify-box h-[760rpx]">
+				<view class="text-[var(--primary-color)] fixed top-[40rpx] right-[30rpx] flex items-center" @click="redirect({url:'/app/pages/verify/record'})">
+					<text class="nc-iconfont nc-icon-lishijiluV6xx !text-[28rpx] -mb-[2rpx]"></text>
+					<text class="text-[26rpx] ml-[8rpx]">核销记录</text>
+				</view>
+				<view v-show="operationType == 'sweepCode'" class="flex flex-col items-center justify-center">
+					<view class="sweep-code flex items-center justify-center" @click="scanCode">
+						<image class="w-[354rpx] h-[354rpx]" :src="img('static/resource/images/verify/saoma.png')"/>
+					</view>
+					<view class="mt-[40rpx] text-[30rpx]">点击扫描二维码</view>
+					<view class="mt-[20rpx] text-[var(--text-color-light9)] text-[26rpx] font-400 pb-[142rpx]">扫描二维码进行核销</view>
+				</view>
+
+				<view v-show="operationType == 'manualInput'">
+					<view class="flex pt-[126rpx] items-center justify-center">
+						<view class="flex justify-center items-center flex-col pr-[30rpx] min-w-[130rpx]">
+							<image class="w-[100rpx] h-[100rpx]" :src="img('static/resource/images/verify/shuruhexiaoma.png')"/>
+							<view class="text-[26rpx] h-[36rpx] leading-[36rpx] mt-[14rpx]">验证核销码</view>
+						</view>
+						<image class="w-[74rpx] h-[12rpx] mb-[50rpx]" :src="img('static/resource/images/verify/youjiantou.png')"/>
+						<view class="flex justify-center items-center flex-col pl-[30rpx] min-w-[130rpx]">
+							<image class="w-[100rpx] h-[100rpx]" :src="img('static/resource/images/verify/hexiao1.png')"/>
+							<view class="text-[26rpx] h-[36rpx] leading-[36rpx] mt-[14rpx]">核销</view>
+						</view>
+					</view>
+					<view class="mt-[50rpx]">
+						<view class="h-[90rpx] border-[2rpx] border-solid border-[#eee] rounded-[16rpx] box-border p-[20rpx] mx-[60rpx] flex items-center" >
+							<text class="nc-iconfont nc-icon-saotiaoxingmaV6xx text-[44rpx] text-[#EF000C]"></text>
+							<input type="text" placeholder="请输入核销码" class="h-[90rpx] border-none text-start ml-[30rpx] text-[28rpx] flex-1" placeholder-class="_placeholder" v-model="verify_code" :focus="isFocus" ref="input"/>
+						</view>
+						<view class="h-[80rpx] primary-btn-bg min-w-[630rpx] text-[#fff] flex-center !text-[26rpx] save-btn rounded-[100rpx] h-[80rpx] font-500 mx-[60rpx] mt-[146rpx] relative z-1" @click="confirm">核销</view>
+					</view>
+				</view>
+			</view>
+
+			<view class="w-[630rpx] h-[100rpx] bg-[#fff] mx-[auto] mt-[220rpx] rounded-[90rpx] flex relative action-type-wrap">
+				<view class="relative w-[51%] pr-[50rpx] box-border rounded-[50rpx] z-0 flex flex-col items-center justify-center" @click="changeOperationType('sweepCode')"  :class="{'xuanZhong1': operationType == 'sweepCode'}">
+					<text class="nc-iconfont nc-icon-saoyisaoV6xx !text-[40rpx]"></text>
+					<view class="text-[24rpx] leading-[1] mt-[10rpx]">扫码核销</view>
+				</view>
+				<view class="flex flex-col items-center flex-col w-[120rpx] h-[120rpx] bg-[#FF7354] rounded-[50%] absolute top-[-10rpx] left-[255rpx] heXiao text-white z-10 shrink-0">
+					<view class="nc-iconfont nc-icon-saotiaoxingmaV6xx ns-gradient-otherpages-member-balance-balance-rechange !text-[44rpx] mt-[19rpx]"></view>
+					<view class="text-[24rpx] mt-[8rpx] leading-[34rpx] h-[34rpx]">核销台</view>
+				</view>
+				<view class="relative w-[51%] pl-[50rpx] box-border rounded-[50rpx] z-0 flex flex-col items-center justify-center" :class="{'xuanZhong': operationType == 'manualInput'}"  @click="changeOperationType('manualInput')">
+					<text class="iconfont iconVector-77 !text-[40rpx]"></text>
+					<view class="ml-[20rpx] text-[24rpx] leading-[1] mt-[10rpx]" @click="focus">手动输入</view>
+				</view>
+			</view>
+
+			<!-- #ifdef MP-WEIXIN -->
+			<!-- 小程序隐私协议 -->
+			<privacy-popup ref="privacyPopup"></privacy-popup>
+			<!-- #endif -->
+		</view>
+		<view  class="w-[100vw] min-h-[100vh] bg-[#f8f8f8] overflow-hidden" v-if="!loading && !isVerify">
+			<view class="empty-page">
+                <image class="img" :src="img('static/resource/images/system/empty.png')" mode="aspectFit" />
+                <view class="desc">非核销员无此权限</view>
+            </view>
+		</view>
+		<loading-page :loading="loading"></loading-page>
+    </view>
+</template>
+
+<script setup lang="ts">
+    import { ref } from 'vue'
+	import { img,redirect, isWeixinBrowser, getToken } from '@/utils/common';
+    import {onShow} from '@dcloudio/uni-app'
+    import { getVerifierInfo, getCheckVerifier } from '@/app/api/verify'
+    import { t } from '@/locale'
+	import wechat from '@/utils/wechat'
+
+	const operationType = ref('manualInput'); //类型
+	// #ifdef H5
+	operationType.value = 'manualInput';
+	// #endif
+	// #ifndef H5
+	operationType.value = 'sweepCode';
+	// #endif
+
+	const isFocus = ref(false)
+	const verify_code = ref('');
+	const loading = ref(true)
+	const isVerify = ref(false)
+	onShow(() => {
+		if(getToken()) checkIsVerifier();
+	})
+
+	// 检测是否是核销员
+	const checkIsVerifier = () => {
+		getCheckVerifier().then((res:any) =>{
+			if(!res.data){
+				isVerify.value = false
+				loading.value = false;
+				// uni.showToast({
+				// 	title: '非核销员无此权限',
+				// 	icon: 'none'
+				// });
+				// setTimeout(() => {
+				// 	if(getCurrentPages().length > 1){
+                //         uni.navigateBack({
+                //             delta: 1
+                //         });
+                //     }else{
+                //         redirect({
+                //             url: '/app/pages/member/index',
+                //             mode: 'reLaunch'
+                //         });
+                //     }
+				// }, 1000);
+			}else{
+				isVerify.value = true
+				loading.value = false;
+			}
+		})
+	}
+
+	const scanCode = () => {
+		// #ifdef MP
+		uni.scanCode({
+			onlyFromCamera: true,
+			success: res => {
+				if (res.errMsg == 'scanCode:ok') {
+					let code = res.result;
+					redirect({ url: '/app/pages/verify/verify', param: { code} })
+				} else {
+					uni.showToast({
+						title: res.errorMsg,
+						icon: 'none'
+					});
+				}
+			}
+		});
+		// #endif
+
+		// #ifdef H5
+		if (isWeixinBrowser()) {
+			wechat.init();
+			wechat.scanQRCode(res => {
+				if (res.resultStr) {
+					let code = res.resultStr;
+					redirect({ url: '/app/pages/verify/verify', param: { code} })
+				}
+			});
+		}
+		// #endif
+	}
+
+	let isLoading = false;
+	const confirm = () => {
+		var reg = /[\S]+/;
+		if (!reg.test(verify_code.value)) {
+			uni.showToast({
+				title: '请输入核销码',
+				icon: 'none'
+			});
+			return false;
+		}
+
+		if(isLoading) return false;
+		isLoading = true;
+
+		getVerifierInfo({ code : verify_code.value }).then((res:any) =>{
+			isLoading = false;
+			redirect({ url: '/app/pages/verify/verify', param: { code: verify_code.value} })
+		}).catch(() => {
+            isLoading = false;
+        })
+	}
+
+	const focus = () => {
+		isFocus.value = !isFocus.value;
+	}
+
+	const changeOperationType = (type: string) => {
+		// #ifdef H5
+		if (type == 'sweepCode' && !isWeixinBrowser()) {
+			uni.showToast({
+				title: 'H5端不支持扫码核销',
+				icon: 'none'
+			});
+			return;
+		}
+		// #endif
+		operationType.value = type;
+	}
+</script>
+<style lang="scss" scoped>
+	.action-type-wrap {
+		box-shadow: 0 6px 6px 0 rgba(0, 0, 0, 0.03), 0 4px 2px 0 rgba(0, 0, 0, 0.04);
+	}
+	.heXiao{
+		background: linear-gradient( 180deg, #FF7354 0%, #FF020F 100%), #EF000C;
+	}
+	.xuanZhong{
+		background: linear-gradient( 270deg, #FFD1D1 0%, rgba(255,209,209,0.1) 100%), #FFFFFF;
+		color:#EF000C;
+	}
+	.xuanZhong1{
+		background: linear-gradient( 90deg, #FFD1D1 0%, rgba(255,209,209,0.1) 100%), #FFFFFF;
+		color:#EF000C;
+	}
+	.sweep-code {
+		width: 354rpx;
+		height: 354rpx;
+		box-shadow: 0 8px 8px 0 rgba(0, 0, 0, 0.03), 0 6px 3px 0 rgba(0, 0, 0, 0.02);
+		border-radius: 50%;
+		margin-top: 146rpx;
+	}
+	.verify-box {
+		border-bottom-left-radius: 400rpx 60rpx;
+		border-bottom-right-radius: 400rpx 60rpx;
+	}
+	._placeholder{
+		color: var(--text-color-light9);
+		font-size: 28rpx;
+	}
+</style>
diff --git a/uni-app/src/app/pages/verify/record.vue b/uni-app/src/app/pages/verify/record.vue
new file mode 100644
index 00000000..b11637da
--- /dev/null
+++ b/uni-app/src/app/pages/verify/record.vue
@@ -0,0 +1,144 @@
+<template>
+    <view class="bg-[var(--page-bg-color)] min-h-screen overflow-hidden" :style="themeColor()">
+		<view class="fixed left-0 right-0 top-0 z-99 bg-[#fff]">
+			<view class="py-[14rpx] flex items-center justify-between px-[20rpx]">
+				<view class="flex-1 search-input mr-[20rpx]">
+					<text @click.stop="searchTypeFn()" class="nc-iconfont nc-icon-sousuo-duanV6xx1 btn"></text>
+					<input class="input" maxlength="50" type="text" v-model="keyword"  placeholder="请输入搜索关键词" placeholderClass="text-[var(--text-color-light9)] text-[24rpx]" confirm-type="search" @confirm="searchTypeFn()">
+					<text v-if="keyword" class="nc-iconfont nc-icon-cuohaoV6xx1 clear" @click="keyword=''"></text>
+				</view>
+				<view class="nc-iconfont nc-icon-a-riliV6xx-36 !text-[30rpx] leading-[36rpx] text-[var(--text-color-light6)]" @click="handleSelect"></view>
+			</view>
+		</view>
+        <mescroll-body ref="mescrollRef" top="88rpx" @init="mescrollInit" :down="{ use: false }" @up="geVerifyRecordFn">
+        	<view class="sidebar-margin pt-[var(--top-m)]" v-if="list.length">
+        		<block v-for="(item,index) in list"	:key="item.id">
+        			<view class="w-full flex flex-col mb-[var(--top-m)] card-template" @click="toLink(item)">
+        				<view class="flex items-center mb-[30rpx] leading-[1] text-[26rpx]">
+							<view class="nc-iconfont nc-icon-hexiaotaiV6xx !text-[26rpx] pr-[10rpx]"></view>
+        					<text class="truncate text-[#303133] text-[26rpx]">核销码:</text>
+							<text class="ml-[10rpx] max-w-[494rpx]">{{ item.code }}</text>
+							<text class="text-[#303133] text-[26rpx] font-400 nc-iconfont nc-icon-fuzhiV6xx1 ml-[11rpx]" @click.stop="copy(item.code)"></text>
+        				</view>
+							<view class="flex flex-1" v-for="(dataItem,dataIndex) in item.value.list" :key="dataIndex">
+								<u--image width="130rpx" height="130rpx" :radius="'var(--goods-rounded-big)'" :src="img(dataItem.cover ? dataItem.cover : '')" mode="aspectFill">
+									<template #error>
+										<image class="w-[130rpx] h-[130rpx] rounded-[var(--goods-rounded-big)] overflow-hidden" :src="img('static/resource/images/diy/shop_default.jpg')" mode="aspectFill"></image>
+									</template>
+								</u--image>
+								<view class="flex flex-col flex-1 ml-[20rpx] py-[4rpx]" >
+									<view class="max-w-[490rpx] leading-[1.3] truncate text-[28rpx] text-[#303133]">{{dataItem.name}}</view>
+									<view class="mt-[14rpx] truncate text-[24rpx] text-[var(--text-color-light9)] max-w-[490rpx] " v-if="item.sub_name">
+									{{ item.sub_name }}
+									</view>
+									<view class="text-[24rpx] mt-[10rpx] text-[var(--text-color-light9)]">x1</view>
+									
+								</view>
+							</view>
+							<view class="flex bg-[var(--temp-bg)] py-[20rpx] px-[20rpx] rounded-[12rpx] mt-[20rpx]">
+								<view class="flex-1">
+									<view class="text-[22rpx] text-[var(--text-color-light9)] mb-[10rpx] leading-[30rpx]">核销时间</view>
+									<view class="text-[26rpx] text-[#303133] leading-[36rpx]">{{ item.create_time }}</view>
+								</view>
+								<view class="flex-1">
+									<view class="text-[22rpx] text-[var(--text-color-light9)] mb-[10rpx] leading-[30rpx]">核销员</view>
+									<view  class="text-[26rpx] text-[#303133] leading-[36rpx]">{{ item.member ? item.member.nickname : '--' }}</view>
+								</view>
+							</view>
+        			</view>
+        		</block>
+        	</view>
+			<mescroll-empty v-if="!list.length && loading" :option="{tip : '暂无核销记录'}"></mescroll-empty>
+        </mescroll-body>
+        <!-- 时间选择 -->
+        <select-date ref="selectDateRef" @confirm="confirmFn" />
+		<!-- #ifdef MP-WEIXIN -->
+		<!-- 小程序隐私协议 -->
+		<wx-privacy-popup ref="wxPrivacyPopupRef"></wx-privacy-popup>
+		<!-- #endif -->
+    </view>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive, computed,nextTick } from 'vue'
+import MescrollBody from '@/components/mescroll/mescroll-body/mescroll-body.vue'
+import MescrollEmpty from '@/components/mescroll/mescroll-empty/mescroll-empty.vue'
+import useMescroll from '@/components/mescroll/hooks/useMescroll.js'
+import { onPageScroll, onReachBottom,onLoad } from '@dcloudio/uni-app'
+import { getVerifyRecords } from '@/app/api/verify'
+import { img, redirect,copy } from '@/utils/common'
+import selectDate from '@/components/select-date/select-date.vue';
+
+const keyword = ref<string>('')
+const create_time = ref([])
+const list = ref<Array<Object>>([])
+const loading = ref<boolean>(false)
+const { mescrollInit, downCallback, getMescroll } = useMescroll(onPageScroll, onReachBottom)
+const wxPrivacyPopupRef:any = ref(null)
+onLoad(() => {
+	// #ifdef MP
+	nextTick(()=>{
+		if(wxPrivacyPopupRef.value) wxPrivacyPopupRef.value.proactive();
+	})
+	// #endif
+});
+const geVerifyRecordFn = (mescroll: any) => {
+    loading.value = false;
+    let data : object = {
+        page: mescroll.num,
+        limit: mescroll.size,
+		keyword:keyword.value,
+		create_time: create_time.value
+    };
+
+    getVerifyRecords(data).then((res: any) => {
+        let newArr = (res.data.data as Array<Object>);
+        //设置列表数据
+        if (mescroll.num == 1) {
+            list.value = []; //如果是第一页需手动制空列表
+        }
+        list.value = list.value.concat(newArr);
+        mescroll.endSuccess(newArr.length);
+        loading.value = true;
+    }).catch(() => {
+        loading.value = true;
+        mescroll.endErr(); // 请求失败, 结束加载
+    })
+}
+
+const toLink = (data: AnyObject)=> {
+    redirect({ url: '/app/pages/verify/detail', param: { code: data.code } })
+}
+
+// 关键词搜索条件搜索
+const searchTypeFn = () =>{
+    getMescroll().resetUpScroll();
+}
+
+//日期筛选
+const selectDateRef = ref()
+const handleSelect = () =>{
+    selectDateRef.value.show = true
+}
+
+// 确定时间筛选
+const confirmFn = (data: any) =>{
+    create_time.value = data;
+    list.value = []
+    getMescroll().resetUpScroll();
+}
+
+</script>
+
+<style lang="scss" scoped>
+:deep(.uni-picker-view-content){
+    z-index: 10;
+}
+:deep(.uni-picker-view-indicator::before){
+    border: none !important;
+}
+:deep(.uni-picker-view-indicator::after){
+    border: none !important;
+}
+</style>
+
diff --git a/uni-app/src/app/pages/verify/verify.vue b/uni-app/src/app/pages/verify/verify.vue
new file mode 100644
index 00000000..893de25a
--- /dev/null
+++ b/uni-app/src/app/pages/verify/verify.vue
@@ -0,0 +1,152 @@
+<template>
+    <view :style="themeColor()" class="bg-[var(--page-bg-color)] min-h-[100vh] overflow-hidden">
+        <block v-if="!loading && verifyInfo && verifyInfo.value">
+			<view class="p-[30rpx] bg-[#fff]">
+				<view class="text-[var(--primary-color)] fixed top-[40rpx] right-[30rpx] flex items-center" @click="redirect({url:'/app/pages/verify/record'})">
+					<text class="nc-iconfont nc-icon-lishijiluV6xx !text-[28rpx] -mb-[2rpx]"></text>
+					<text class="text-[26rpx] ml-[8rpx]">核销记录</text>
+				</view>
+				<view class="flex items-center mt-[60rpx] justify-center">
+					<view class="flex justify-center items-center flex-col pr-[30rpx]">
+						<image class="w-[100rpx] h-[100rpx]" :src="img('static/resource/images/verify/yanzhenghexiaoma.png')"/>
+						<view class="text-[26rpx] mt-[14rpx] h-[36rpx] leading-[36rpx] flex-shrink-0">验证核销码</view>
+					</view>
+					<image class="w-[74rpx] h-[12rpx] mb-[50rpx]" :src="img('static/resource/images/verify/youjiantou.png')"/>
+					<view class="flex justify-center items-center flex-col pl-[30rpx]">
+						<image class="w-[100rpx] h-[100rpx]" :src="img('static/resource/images/verify/hexiao.png')"/>
+						<view class="text-[26rpx] mt-[14rpx] h-[36rpx] leading-[36rpx] flex-shrink-0">确定核销</view>
+					</view>
+				</view>
+			</view>
+			<view class="card-template mt-[var(--top-m)] sidebar-margin">
+				<view class="flex" :class="{'mb-[var(--top-m)]': (verifyInfo.value.list.length - 1 != index)}" v-for="(item,index) in verifyInfo.value.list" :key="index">
+					<image class="w-[150rpx] h-[150rpx] rounded-[var(--goods-rounded-big)]" mode="aspectFill" v-if="item.cover" :src="img(item.cover)"></image>
+					<image class="w-[150rpx] h-[150rpx] rounded-[var(--goods-rounded-big)]" mode="aspectFill" v-else :src="img('addon/tourism/tourism/member/hotel.png')"></image>
+					<view class="flex flex-col flex-1 ml-[20rpx] py-[4rpx]">
+						<view class="leading-[1]">
+							<view class="leading-[40rpx] truncate max-w-[490rpx] text-[28rpx]">{{item.name}}</view>
+							<view class="mt-[14rpx] truncate text-[24rpx] text-[var(--text-color-light9)] leading-[28rpx] max-w-[490rpx]" v-if="item.sub_name">
+								{{ item.sub_name }}
+                            </view>
+						</view>
+						<view class="text-[var(--text-color-light6)] text-[28rpx] mt-[20rpx]">x1</view>
+					</view>
+				</view>
+			</view>
+
+			<view class="card-template mt-[var(--top-m)] sidebar-margin">
+				<view class="title">核销信息</view>
+				<view class="card-template-item justify-between">
+					<text class="text-[28rpx] text-[#333]">核销类型</text>
+					<view class="text-[28rpx] text-[#333]">{{verifyInfo.type_name}}</view>
+				</view>
+				<view class="card-template-item justify-between" v-for="(item,index) in verifyInfo.value.content.fixed">
+					<text class="text-[28rpx] text-[#333]">{{item.title}}</text>
+					<view class="text-[28rpx] text-[#333]">{{item.value}}</view>
+				</view>
+			</view>
+
+			<view v-for="(item,index) in verifyInfo.value.content.diy" :key="index" class="card-template mt-[var(--top-m)] sidebar-margin">
+				<view class="title">{{item.title}}</view>
+				<view class="card-template-item justify-between"  v-for="(subItem,subIndex) in item.list" :key="subIndex">
+					<text class="text-[28rpx] text-[#333]">{{subItem.title}}</text>
+					<text class="text-[28rpx] text-[#333]">{{ subItem.value }}</text>
+				</view>
+			</view>
+
+			<view class="fixed bottom-[30rpx] primary-btn-bg text-[#fff] flex-center !text-[26rpx] rounded-[50rpx] h-[80rpx] left-[20rpx] right-[20rpx] font-500" @click="verifyFn">确定</view>
+        </block>
+		<loading-page :loading="loading"></loading-page>
+    </view>
+</template>
+
+<script setup lang="ts">
+    import { ref } from 'vue';
+    import { onLoad ,onShow} from '@dcloudio/uni-app'
+	import { img,redirect, getToken } from '@/utils/common';
+    import { getVerifierInfo, getCheckVerifier, verify } from '@/app/api/verify'
+    import { t } from '@/locale'
+
+    const loading = ref(true)
+	const code = ref('');
+    onLoad((option:any)=> {
+	    if (option.code) code.value = option.code;
+	    // 小程序扫码进入
+	    if (option.scene) {
+		    let sceneParams: any = decodeURIComponent(option.scene).split('&');
+		    if (sceneParams.length) {
+			    sceneParams.forEach((item: any) => {
+				    if (item.indexOf('code') != -1) code.value = item.split('-')[1];
+			    });
+		    }
+	    }
+    })
+
+	onShow(() => {
+		if(getToken()){
+			checkIsVerifier();
+			getVerifierInfoFn();
+		}
+	})
+
+	// 检测是否是核销员
+	const checkIsVerifier = () => {
+		getCheckVerifier().then((res:any) =>{
+			if(!res.data){
+				uni.showToast({
+					title: '非核销员无此权限',
+					icon: 'none'
+				});
+				setTimeout(() => {
+					if(getCurrentPages().length > 1){
+                        uni.navigateBack({
+                            delta: 1
+                        });
+                    }else{
+                        redirect({
+                            url: '/app/pages/member/index',
+                            mode: 'reLaunch'
+                        });
+                    }
+				}, 1000);
+			}else{
+				loading.value = false;
+			}
+		})
+	}
+
+	const verifyInfo = ref({})
+	const getVerifierInfoFn = ()=>{
+		loading.value = true;
+		getVerifierInfo({ code : code.value }).then((res:any) =>{
+			verifyInfo.value = res.data;
+			loading.value = false;
+		}).catch(() => {
+            setTimeout(() => {
+            	loading.value = false;
+            	redirect({ url: '/app/pages/verify/index', param: {}, mode: 'redirectTo' })
+            }, 1000);
+        })
+	}
+	let isLoading = false;
+	const verifyFn = ()=>{
+		if(isLoading) return false;
+		isLoading = true;
+
+		verify(code.value).then((res:any) =>{
+			uni.showToast({
+				title: '核销成功',
+				icon: 'none'
+			});
+			setTimeout(() => {
+				isLoading = false;
+				redirect({ url: '/app/pages/verify/index', param: {}, mode: 'redirectTo' })
+			}, 1000);
+		}).catch(() => {
+            isLoading = false;
+        })
+	}
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/uni-app/src/app/pages/weapp/order_shipping.vue b/uni-app/src/app/pages/weapp/order_shipping.vue
new file mode 100644
index 00000000..339afd23
--- /dev/null
+++ b/uni-app/src/app/pages/weapp/order_shipping.vue
@@ -0,0 +1,37 @@
+<template>
+	<view :style="themeColor()">
+		<view class="error-msg">{{errorMsg}}</view>
+	</view>
+</template>
+
+<script setup lang="ts">
+    import {ref} from 'vue';
+    import {redirect} from '@/utils/common';
+    import {onLoad} from '@dcloudio/uni-app'
+    import {getMsgJumpPath} from '@/app/api/system'
+
+    const outTradeNo = ref('')
+    const errorMsg = ref('')
+
+    onLoad((options: any) => {
+        if (options.merchant_trade_no) {
+            outTradeNo.value = options.merchant_trade_no;
+            getMsgJumpPathFn();
+        } else {
+            errorMsg.value = '缺少merchant_trade_no参数';
+        }
+    });
+
+    const getMsgJumpPathFn = () => {
+        getMsgJumpPath({
+            out_trade_no: outTradeNo.value,
+        }).then((res: any) => {
+            if(res.data && res.data.path){
+                // 跳转到设置的页面
+                redirect({url: '/' + res.data.path, mode: 'reLaunch'})
+            }
+        });
+    }
+</script>
+<style lang="scss" scoped>
+</style>
\ No newline at end of file
diff --git a/uni-app/src/app/pages/webview/index.vue b/uni-app/src/app/pages/webview/index.vue
new file mode 100644
index 00000000..75438808
--- /dev/null
+++ b/uni-app/src/app/pages/webview/index.vue
@@ -0,0 +1,41 @@
+<template>
+	<view :style="themeColor()">
+		<u-icon name="arrow-left" class="navigate-back" @click="navigateBack"></u-icon>
+		<web-view :src="src"></web-view>
+	</view>
+</template>
+
+<script setup lang="ts">
+	import { onLoad } from '@dcloudio/uni-app';
+	import { ref } from 'vue';
+	import { redirect } from '@/utils/common';
+
+	const src = ref('')
+
+	onLoad((option : any) => {
+		src.value = option.src ? decodeURIComponent(option.src) : '';
+	})
+
+	const navigateBack = () => {
+		if(getCurrentPages().length > 1){
+            uni.navigateBack({
+                delta: 1
+            });
+        }else{
+            redirect({
+	            url: '/app/pages/index/index',
+                mode: 'reLaunch'
+            });
+        }
+	}
+</script>
+
+<style lang="scss" scoped>
+	.navigate-back {
+		position: absolute;
+		top: 34rpx;
+		left: 34rpx;
+		z-index: 999;
+		font-size: 16px;
+	}
+</style>
\ No newline at end of file
diff --git a/uni-app/src/app/stores/diy.ts b/uni-app/src/app/stores/diy.ts
new file mode 100644
index 00000000..19401a76
--- /dev/null
+++ b/uni-app/src/app/stores/diy.ts
@@ -0,0 +1,142 @@
+import { defineStore } from 'pinia'
+import { toRaw } from 'vue'
+import { diyRedirect, currRoute, getToken } from '@/utils/common';
+import { useLogin } from '@/hooks/useLogin';
+
+interface Diy {
+    mode: string, // 模式：decorate 装修，为空表示正常
+    id: any,
+    pageMode: string, // 页面展示模式，diy：自定义，fixed：固定
+    currentIndex: number,
+    global: {
+        title: string,
+        pageStartBgColor: string, // 页面背景颜色（开始）
+        pageEndBgColor: string, // 页面背景颜色（结束）
+        bottomTabBarSwitch: boolean, // 底部导航开关
+        bgUrl: string
+    },
+    // 组件集合
+    value: any[],
+    topFixedStatus: string, // 置顶组件的状态
+    scrollTop: number,
+    topTabarHeight: number,
+    componentRefs: any
+}
+
+const useDiyStore = defineStore('diy', {
+    state: (): Diy => {
+        return {
+            mode: '',
+            id: 0,
+            pageMode: 'diy',
+            currentIndex: -99,
+            global: {
+                title: "",
+                pageStartBgColor: '', // 页面背景颜色（开始）
+                pageEndBgColor: '', // 页面背景颜色（结束）
+                bottomTabBarSwitch: true,
+                bgUrl: ''
+            },
+            value: [], // 组件集合
+            topFixedStatus: 'home', // 顶部 置顶组件状态，home：展示首页数据、diy：展示置顶组件定义的子页面
+            scrollTop: 0, // 滚动位置
+            topTabarHeight: 0,
+            componentRefs: null
+        }
+    },
+    getters: {},
+    actions: {
+        // 初始化
+        init() {
+            // #ifdef H5
+            var data = JSON.stringify({
+                type: 'init',
+                load: true
+            });
+            // 传输给后台数据
+            window.parent.postMessage(data, '*');
+
+            // 监听父页面发来的消息
+            window.addEventListener('message', event => {
+                try {
+                    let data = JSON.parse(event.data);
+                    this.currentIndex = data.currentIndex;
+                    this.pageMode = data.pageMode;
+                    if (data.global) this.global = data.global;
+                    if (data.value) this.value = data.value;
+
+                    if (this.value) {
+                        this.value.forEach((item, index) => {
+                            item.pageStyle = '';
+                            if (item.pageStartBgColor) {
+                                if (item.pageStartBgColor && item.pageEndBgColor) item.pageStyle += `background:linear-gradient(${ item.pageGradientAngle },${ item.pageStartBgColor },${ item.pageEndBgColor });`;
+                                else item.pageStyle += 'background-color:' + item.pageStartBgColor + ';';
+                            }
+
+                            if (item.margin) {
+                                if (item.margin.top > 0) {
+                                    item.pageStyle += 'padding-top:' + item.margin.top * 2 + 'rpx' + ';';
+                                } else {
+                                    item.pageStyle += 'padding-top:2rpx' + ';'; // 装修实时预览需要设置
+                                }
+                                item.pageStyle += 'padding-bottom:' + item.margin.bottom * 2 + 'rpx' + ';';
+                                item.pageStyle += 'padding-right:' + item.margin.both * 2 + 'rpx' + ';';
+                                item.pageStyle += 'padding-left:' + item.margin.both * 2 + 'rpx' + ';';
+                            }
+                        });
+                    }
+                    // console.log('uniapp 接受后台装修返回的组件数据', data);
+                } catch (e) {
+                    console.log('uni-app diy 接受数据错误', e)
+                }
+            }, false);
+            // #endif
+        },
+        // 将数据传输给后台
+        postMessage(index: any, component: any) {
+            // #ifdef H5
+            this.currentIndex = index;
+            if (component)
+                var data: any = JSON.stringify({
+                    type: 'data',
+                    index: this.currentIndex,
+                    global: toRaw(this.global),
+                    value: toRaw(this.value),
+                    component: toRaw(component)
+                });
+            // 传输给后台数据
+            window.parent.postMessage(data, '*');
+            // #endif
+        },
+        // 选中正在编辑的组件
+        changeCurrentIndex(index: number, component: any = null) {
+            // #ifdef H5
+
+            // 实际展示禁止编辑
+            if (this.mode == '') return;
+
+            // 减少重复请求
+            if (this.currentIndex == index) return;
+            this.currentIndex = index;
+            var data = JSON.stringify({
+                type: 'change',
+                index,
+                component: toRaw(component)
+            });
+            window.parent.postMessage(data, '*');
+            // #endif
+        },
+        toRedirect(data: any) {
+            if (Object.keys(data).length) {
+                if (!data.name) return;
+                if (currRoute() == 'app/pages/member/index' && !getToken()) {
+                    useLogin().setLoginBack({ url: data.url })
+                    return;
+                }
+                diyRedirect(data);
+            }
+        },
+    }
+})
+
+export default useDiyStore
diff --git a/uni-app/src/components/area-select/area-select.vue b/uni-app/src/components/area-select/area-select.vue
new file mode 100644
index 00000000..675f727a
--- /dev/null
+++ b/uni-app/src/components/area-select/area-select.vue
@@ -0,0 +1,154 @@
+<template>
+    <u-popup :show="show" @close="show = false" mode="bottom" :round="10">
+        <view @touchmove.prevent.stop class="popup-common">
+        <view class="title">请选择地区</view>
+            <view class="flex p-[30rpx] pt-[0] text-sm font-500">
+                <view v-if="areaList.province.length" class="flex-1 pr-[10rpx]" :class="{'text-[var(--primary-color)]': currSelect == 'province'}" @click="currSelect = 'province'">
+                    <view v-if="selected.province">{{ selected.province.name }}</view>
+                    <view v-else>请选择</view>
+                </view>
+                <view v-if="areaList.city.length" class="flex-1 pr-[10rpx]" :class="{'text-[var(--primary-color)]': currSelect == 'city' }" @click="currSelect = 'city'">
+                    <view v-if="selected.city">{{ selected.city.name }}</view>
+                    <view v-else>请选择</view>
+                </view>
+                <view v-if="areaList.district.length" class="flex-1 pr-[10rpx]" :class="{'text-[var(--primary-color)]': currSelect == 'district' }" @click="currSelect = 'district'">
+                    <view v-if="selected.district">{{ selected.district.name }}</view>
+                    <view v-else>请选择</view>
+                </view>
+            </view>
+            <scroll-view scroll-y="true" class="h-[50vh]">
+                <view class="flex p-[30rpx] pt-0 text-sm">
+                    <view v-if="areaList.province.length" v-show="currSelect == 'province'">
+                        <view v-for="item in areaList.province" class="h-[80rpx] flex items-center" :class="{'text-[var(--primary-color)]': selected.province && selected.province.id == item.id }"
+                            @click="selected.province = item" >{{ item.name }}</view>
+                    </view>
+                    <view v-if="areaList.city.length" v-show="currSelect == 'city'">
+                        <view v-for="item in areaList.city" class="h-[80rpx] flex items-center" :class="{'text-[var(--primary-color)]': selected.city && selected.city.id == item.id }"
+                            @click="selected.city = item">{{ item.name }}</view>
+                    </view>
+                    <view v-if="areaList.district.length" v-show="currSelect == 'district'">
+                        <view v-for="item in areaList.district" class="h-[80rpx] flex items-center " :class="{'text-[var(--primary-color)]': selected.district && selected.district.id == item.id }"
+                            @click="selected.district = item">{{ item.name }}</view>
+                    </view>
+                </view>
+            </scroll-view>
+        </view>
+    </u-popup>
+</template>
+
+<script setup lang="ts">
+    import { ref, reactive, watch } from 'vue'
+    import { getAreaListByPid, getAreaByCode } from '@/app/api/system'
+
+    const prop = defineProps({
+        areaId: {
+            type: Number,
+            default: 0
+        }
+    })
+
+    const show = ref(false)
+    const areaList = reactive({
+        province: [],
+        city: [],
+        district: []
+    })
+    const currSelect = ref('province')
+
+    const selected = reactive({
+        province: null,
+        city: null,
+        district: null
+    })
+
+    getAreaListByPid(0).then(({ data }) => {
+        areaList.province = data
+    }).catch()
+
+    watch(() => prop.areaId, (nval, oval)=> {
+        if (nval && !oval) {
+            getAreaByCode(nval).then(({ data }) => {
+                data.province && (selected.province = data.province)
+                data.city && (selected.city = data.city)
+                data.district && (selected.district = data.district)
+            })
+        }
+    },{
+		immediate:true
+	})
+
+    /**
+     * 监听省变更
+     */
+    watch(() => selected.province, ()=> {
+        getAreaListByPid(selected.province.id).then(({ data }) => {
+            areaList.city = data
+            currSelect.value = 'city'
+
+            if (selected.city) {
+                let isExist = false
+                for (let i = 0; i < data.length; i++) {
+                    if (selected.city.id == data[i].id) {
+                        isExist = true
+                        break
+                    }
+                }
+                if (!isExist) {
+                    selected.city = null
+                }
+            }
+        }).catch()
+    }, { deep: true })
+
+    /**
+     * 监听市变更
+     */
+    watch(() => selected.city, (nval)=> {
+        if (nval) {
+            getAreaListByPid(selected.city.id).then(({ data }) => {
+                areaList.district = data
+                currSelect.value = 'district'
+
+                if (selected.district) {
+                    let isExist = false
+                    for (let i = 0; i < data.length; i++) {
+                        if (selected.district.id == data[i].id) {
+                            isExist = true
+                            break
+                        }
+                    }
+                    if (!isExist) {
+                        selected.district = null
+                    }
+                }
+            }).catch()
+        } else {
+            areaList.district = []
+            selected.district = null
+        }
+
+    }, { deep: true })
+
+    const emits = defineEmits(['complete'])
+
+    /**
+     * 监听区县变更
+     */
+    watch(() => selected.district, (nval)=> {
+        if (nval) {
+            currSelect.value = 'district'
+            emits('complete', selected)
+            show.value = false
+        }
+    }, { deep: true })
+
+    const open = ()=> {
+        show.value = true
+    }
+
+    defineExpose({
+    	open
+    })
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/uni-app/src/components/bind-mobile/bind-mobile.vue b/uni-app/src/components/bind-mobile/bind-mobile.vue
new file mode 100644
index 00000000..2335e4e4
--- /dev/null
+++ b/uni-app/src/components/bind-mobile/bind-mobile.vue
@@ -0,0 +1,161 @@
+<template>
+    <u-popup :show="show" @close="show = false" mode="center" :round="10" :closeable="true" :safeAreaInsetBottom="false" zIndex="10086">
+        <view @touchmove.prevent.stop class="max-w-[600rpx] w-[600rpx] box-border">
+            <view class="text-center py-[var(--pad-top-m)] text-[32rpx] font-500 leading-[46rpx]">{{t('bindMobile')}}</view>
+            <view class="px-[var(--pad-sidebar-m)] pb-[var(--pad-top-m)]">
+                <u-form labelPosition="left" :model="formData" errorType='toast' :rules="rules" ref="formRef">
+                    <u-form-item label="" prop="mobile" :borderBottom="true">
+                        <input v-model="formData.mobile" type="number" maxlength="11" :placeholder="t('mobilePlaceholder')" class="w-full h-[50rpx] leading-[50rpx] !bg-transparent !px-[20rpx] text-[26rpx] text-[#333]" :disabled="real_name_input" placeholder-class="bind-mobile" />
+                    </u-form-item>
+                    <view class="mt-[20rpx]">
+                        <u-form-item label="" prop="mobile_code"  :borderBottom="true">
+                            <input v-model="formData.mobile_code" type="number" maxlength="6" :placeholder="t('codePlaceholder')" class="box-border w-full h-[50rpx] leading-[50rpx] !bg-transparent !px-[20rpx] text-[26rpx] text-[#333]" :disabled="real_name_input" placeholder-class="bind-mobile" />
+                            <template #right>
+								<sms-code v-if="config.agreement_show" :mobile="formData.mobile" type="login" v-model="formData.mobile_key" :isAgree="isAgree"></sms-code>
+								<sms-code v-else :mobile="formData.mobile" type="login" v-model="formData.mobile_key"></sms-code>
+                            </template>
+                        </u-form-item>
+                    </view>
+					<view v-if="config.agreement_show" class="flex items-center mt-[30rpx] pl-[10rpx] py-[10rpx]" @click.stop="agreeChange">
+						<u-checkbox-group @change="agreeChange">
+							<u-checkbox activeColor="var(--primary-color)" :checked="isAgree" shape="circle" size="28rpx"/>
+						</u-checkbox-group>
+						<view class="text-[24rpx] text-[var(--text-color-light6)] flex items-center flex-wrap">
+							<text>{{ t('agreeTips') }}</text>
+							<text @click.stop="redirect({ url: '/app/pages/auth/agreement?key=privacy' })" class="text-primary">《{{t('privacyAgreement')}}》</text>
+							<text>{{ t('and') }}</text>
+							<text @click.stop="redirect({ url: '/app/pages/auth/agreement?key=service' })" class="text-primary">《{{t('userAgreement')}}》</text>
+						</view>
+					</view>
+                    <view class="mt-[100rpx]">
+                        <button class="primary-btn-bg text-[26rpx] !text-[#fff] !h-[80rpx] leading-[80rpx] rounded-full font-500"
+						   :class="{'opacity-50': loading}"  :disabled="loading" @click="handleBind">{{t('bind')}}</button>
+                    </view>
+                </u-form>
+            </view>
+        </view>
+    </u-popup>
+</template>
+
+<script setup lang="ts">
+    import { ref, reactive, computed, onMounted } from 'vue'
+    import { t } from '@/locale'
+    import { bindMobile } from '@/app/api/member'
+    import { mobileLogin } from '@/app/api/auth'
+    import useMemberStore from '@/stores/member'
+    import useConfigStore from '@/stores/config'
+    import { redirect } from '@/utils/common'
+    import { useLogin } from '@/hooks/useLogin'
+
+    const show = ref(false)
+    const memberStore = useMemberStore()
+    const info = computed(() => memberStore.info)
+
+    const config = computed(() => {
+        return useConfigStore().login
+    })
+
+    const loading = ref(false)
+    const isAgree = ref(false)
+
+    const formData = reactive({
+        mobile: '',
+        mobile_code: '',
+        mobile_key: ''
+    })
+
+    const real_name_input = ref(true);
+	onMounted(() => {
+        // 防止浏览器自动填充
+        setTimeout(() => {
+            real_name_input.value = false;
+        }, 800)
+
+        uni.getStorageSync('pid') && (Object.assign(formData, { pid: uni.getStorageSync('pid') }))
+        uni.getStorageSync('openid') && (Object.assign(formData, { openid: uni.getStorageSync('openid') }))
+        uni.getStorageSync('unionid') && (Object.assign(formData, { unionid: uni.getStorageSync('unionid') }))
+        uni.getStorageSync('nickname') && (Object.assign(formData, { nickname: uni.getStorageSync('nickname') }))
+        uni.getStorageSync('avatar') && (Object.assign(formData, { headimg: uni.getStorageSync('avatar') }))
+    });
+
+    const rules = {
+        'mobile': [
+            {
+                type: 'string',
+                required: true,
+                message: t('mobilePlaceholder'),
+                trigger: ['blur', 'change'],
+            },
+            {
+                validator(rule: any, value: any, callback: any) {
+                    if (!uni.$u.test.mobile(value)){
+                        callback(new Error('请输入正确的手机号'))
+                    } else {
+                        callback()
+                    }
+                },
+                message: t('mobileError'),
+                trigger: ['change', 'blur'],
+            }
+        ],
+        'mobile_code': {
+            type: 'string',
+            required: true,
+            message: t('codePlaceholder'),
+            trigger: ['blur', 'change']
+        }
+    }
+
+    const agreeChange = () => {
+        isAgree.value = !isAgree.value
+    }
+
+    const formRef: any = ref(null)
+
+    const handleBind = () => {
+        formRef.value.validate().then(() => {
+            if (!isAgree.value && config.value.agreement_show) {
+                uni.showToast({ title: t('isAgreeTips'), icon: 'none' })
+                return
+            }
+
+            if (loading.value) return
+            loading.value = true
+
+            const request = info.value ? bindMobile : mobileLogin;
+
+            request(formData).then((res: any) => {
+                if (info.value) {
+                    memberStore.getMemberInfo()
+                    if (info.value.mobile) {
+                        uni.removeStorageSync('isbindmobile');
+                    }
+                } else {
+                    memberStore.setToken(res.data.token)
+                    useLogin().handleLoginBack()
+                }
+                show.value = false
+            }).catch(() => {
+                loading.value = false
+            })
+        })
+    }
+
+    const open = ()=> {
+        show.value = true
+    }
+
+    defineExpose({
+    	open
+    })
+</script>
+
+<style lang="scss" scoped>
+:deep(.bind-mobile){
+    color:var(--text-color-light9);
+    font-size: 26rpx;
+}
+:deep(.u-checkbox){
+	margin:0 !important;
+}
+</style>
diff --git a/uni-app/src/components/information-filling/information-filling.vue b/uni-app/src/components/information-filling/information-filling.vue
new file mode 100644
index 00000000..2d96ee1c
--- /dev/null
+++ b/uni-app/src/components/information-filling/information-filling.vue
@@ -0,0 +1,202 @@
+<template>
+	<u-popup :show="show" :round="10" @close="show = false">
+		<view class="information-filling">
+		    <view class="relative">
+		        <view class="mx-[30rpx] pb-[20rpx] pt-[36rpx] border-t">
+                    <view class="text-[30rpx]">{{ t('getAvatarNickname') }}</view>
+                    <view class="text-[24rpx] mt-[18rpx] leading-[1.4] text-gray-400">{{ t('getAvatarNicknameTips') }}</view>
+                </view>
+                <text class="nc-iconfont nc-icon-guanbiV6xx2 !text-[40rpx] absolute top-[28rpx] right-[30rpx]" @click="show = false"></text>
+           </view>
+            <u-form labelPosition="left" :model="formData" errorType='toast' :rules="rules" ref="formRef" labelWidth="65">
+                <view class="mx-[30rpx]">
+                    <view class="mt-[20rpx]">
+                        <u-form-item :label="t('headimg')" prop="headimg" :border-bottom="true">
+                            <button class="m-0 p-0 w-[120rpx] h-[120rpx]" open-type="chooseAvatar" @chooseavatar="onChooseAvatar">
+                                <view class="w-full h-full flex items-center justify-center overflow-hidden">
+                                    <u-image :src="img(formData.headimg)" width="120rpx" height="120rpx" v-if="formData.headimg" mode="aspectFill"></u-image>
+                                    <u-icon name="plus" v-else></u-icon>
+                                </view>
+                            </button>
+                        </u-form-item>
+                        <u-form-item :label=" t('nickname')" prop="nickname" :border-bottom="true">
+                            <input type="nickname" v-model="formData.nickname" :placeholder="t('nicknamePlaceholder')" placeholderClass="text-[28rpx]" class="text-[28rpx]"  @blur="bindNickname">
+                        </u-form-item>
+                        <u-form-item :label="t('mobile')" prop="mobile" :border-bottom="true" v-if="isBindMobile">
+                            <input type="mobile" v-model="formData.mobile" :disabled="true" v-if="formData.mobile">
+                            <template v-else>
+                                <u-button v-if="info" :customStyle="{border:'none',color: 'var(--primary-color)',width:'140rpx', textAlign:'left',margin:'0rpx'}" :text="t('getMobile')" open-type="getPhoneNumber" @getphonenumber="memberStore.bindMobile"></u-button>
+                                <u-button v-else :customStyle="{border:'none',color: 'var(--primary-color)',width:'140rpx', textAlign:'left',margin:'0rpx'}" :text="t('getMobile')" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber"></u-button>
+                            </template>
+                        </u-form-item>
+                    </view>
+                </view>
+                <view class="p-[30rpx] mt-[20rpx]">
+                    <button :loading="loading" class="bg-[var(--primary-color)] text-[#fff] h-[80rpx] leading-[80rpx] rounded-[100rpx] text-[28rpx]" @click="confirm">{{t('confirm')}}</button>
+                </view>
+            </u-form>
+        </view>
+		<!-- #ifdef MP-WEIXIN -->
+		<!-- 小程序隐私协议 -->
+		<wx-privacy-popup ref="wxPrivacyPopupRef"></wx-privacy-popup>
+		<!-- #endif -->
+	</u-popup>
+</template>
+
+<script setup lang="ts">
+	import { ref, reactive, computed, watch,onMounted,nextTick } from 'vue'
+	import { t } from '@/locale'
+	import useMemberStore from '@/stores/member'
+	import { img } from '@/utils/common'
+	import { modifyMember,getMobile } from '@/app/api/member'
+	import { fetchBase64Image } from '@/app/api/system'
+	import { useLogin } from '@/hooks/useLogin'
+	import useConfigStore from '@/stores/config'
+
+	const show = ref(false)
+	const loading = ref(false)
+	const memberStore = useMemberStore()
+	const info = computed(() => memberStore.info)
+	const config = useConfigStore()
+
+	const formData = reactive({
+		nickname: '',
+		headimg: '',
+		mobile: '',
+	})
+
+	watch(() => info.value, () => {
+		if (info.value) {
+			formData.nickname = info.value.nickname
+			formData.headimg = info.value.headimg
+			formData.mobile = info.value.mobile
+		}
+	}, { immediate: true })
+
+	const isBindMobile = ref(null)
+
+	const wxPrivacyPopupRef:any = ref(null)
+
+	onMounted(()=>{
+		uni.getStorageSync('openid') && (Object.assign(formData, { openid: uni.getStorageSync('openid') }))
+    	uni.getStorageSync('pid') && (Object.assign(formData, { pid: uni.getStorageSync('pid') }))
+    	uni.getStorageSync('unionid') && (Object.assign(formData, { unionid: uni.getStorageSync('unionid') }))
+		isBindMobile.value = uni.getStorageSync('isbindmobile');
+		// #ifdef MP
+		nextTick(()=>{
+			if(wxPrivacyPopupRef.value) wxPrivacyPopupRef.value.proactive();
+		})
+		// #endif
+	})
+
+	const onChooseAvatar = (e) => {
+		uni.getFileSystemManager().readFile({
+			filePath: e.detail.avatarUrl, //选择图片返回的相对路径
+			encoding: 'base64', //编码格式
+			success: res => {
+				fetchBase64Image({ content: res.data }).then(uploadRes => {
+					formData.headimg = uploadRes.data.url
+				})
+			}
+		})
+	}
+
+	const bindNickname = (e) => {
+		formData.nickname = e.detail.value
+	}
+
+	const rules = {
+		'headimg': {
+			type: 'string',
+			required: true,
+			message: t('headimgPlaceholder'),
+			trigger: ['blur', 'change'],
+		},
+		'nickname': {
+			type: 'string',
+			required: true,
+			message: t('nicknamePlaceholder'),
+			trigger: ['blur', 'change'],
+		},
+		'mobile': {
+			type: 'string',
+			required: config.login.is_bind_mobile ? true : false,
+			message: t('mobileTips'),
+			trigger: ['blur', 'change'],
+		}
+	}
+
+	const formRef: any = ref(null)
+
+	// 获取手机号
+	const getPhoneNumber = (e:any)=> {
+		if (e.detail.errMsg == 'getPhoneNumber:ok') {
+			uni.showLoading({ title: '' })
+			getMobile({
+				mobile_code: e.detail.code
+			}).then((res: any) => {
+				formData.mobile = res.data.mobile
+				uni.hideLoading()
+			}).catch(() => {
+				setTimeout(() => {
+					uni.hideLoading()
+				}, 2000);
+			})
+		}
+
+		if (e.detail.errno == 104) {
+			let msg = '用户未授权隐私权限';
+			uni.showToast({ title: msg, icon: 'none' })
+		}
+		if (e.detail.errMsg == "getPhoneNumber:fail user deny") {
+			let msg = '用户拒绝获取手机号码';
+			uni.showToast({ title: msg, icon: 'none' })
+		}
+	}
+
+	const confirm = async () => {
+		formRef.value.validate().then(async() => {
+			if (loading.value) return
+			loading.value = true
+
+			if (info.value) {
+				// 修改头像
+				await modifyMember({ field: 'headimg', value: formData.headimg }).then(() => {
+					memberStore.info.headimg = formData.headimg
+				}).catch(() => {
+					loading.value = false
+				})
+				if (!loading.value) return
+
+				// 修改昵称
+				modifyMember({ field: 'nickname', value: formData.nickname }).then(() => {
+					memberStore.info.nickname = formData.nickname
+					loading.value = false
+					show.value = false
+				}).catch(() => {
+					loading.value = false
+				})
+
+				// #ifdef MP-WEIXIN
+				const login = useLogin()
+				if (info.value && !info.value.weapp_openid) {
+					login.getAuthCode({ updateFlag: true }) // 更新oppenid
+				}
+				// #endif
+			} else {
+				// todo 如果没有登录过，则注册
+				// #ifdef MP-WEIXIN
+				const login = useLogin()
+				login.getAuthCode({ backFlag: true, ...formData }) // 注册
+				// #endif
+			}
+
+		})
+	}
+
+	defineExpose({
+		show
+	})
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/uni-app/src/components/loading-page/loading-page.vue b/uni-app/src/components/loading-page/loading-page.vue
new file mode 100644
index 00000000..a55e3b65
--- /dev/null
+++ b/uni-app/src/components/loading-page/loading-page.vue
@@ -0,0 +1,27 @@
+<template>
+	<view>
+		<u-loading-page class="" bg-color="props.bgColor" icon-size="props.iconSize" :loading="props.loading" loadingText=""></u-loading-page>
+	</view>
+</template>
+
+<script setup lang="ts">
+import { reactive, ref } from 'vue'
+
+const props = defineProps({
+	loading: {
+		type: Boolean,
+		default: false
+	},
+	iconSize: {
+		type: String || Number,
+		default: 30
+	},
+	bgColor: {
+		type: String,
+		default: "rgb(248,248,248)"
+	}
+});
+</script>
+
+<style lang="scss" scoped>
+</style>
\ No newline at end of file
diff --git a/uni-app/src/components/mescroll/hooks/useMescroll.js b/uni-app/src/components/mescroll/hooks/useMescroll.js
new file mode 100644
index 00000000..28fbac44
--- /dev/null
+++ b/uni-app/src/components/mescroll/hooks/useMescroll.js
@@ -0,0 +1,66 @@
+// 小程序无法在hook中使用页面级别生命周期,需单独传入: https://ask.dcloud.net.cn/question/161173
+// import { onPageScroll, onReachBottom, onPullDownRefresh} from '@dcloudio/uni-app';
+
+/**
+ * 初始化mescroll, 相当于vue2的mescroll-mixins.js文件 (mescroll-body 和 mescroll-uni 通用)
+ * mescroll-body需传入onPageScroll, onReachBottom
+ * mescroll-uni无需传onPageScroll, onReachBottom
+ * 当down.native为true时,需传入onPullDownRefresh
+ */
+function useMescroll(onPageScroll, onReachBottom, onPullDownRefresh) {
+    // mescroll实例对象
+    let mescroll = null;
+
+    // mescroll组件初始化的回调,可获取到mescroll对象
+    const mescrollInit = (e) => {
+        mescroll = e;
+    }
+
+    // 获取mescroll对象, mescrollInit执行之后会有值, 生命周期created中会有值
+    const getMescroll = () => {
+        return mescroll
+    }
+
+    // 下拉刷新的回调 (mixin默认resetUpScroll)
+    const downCallback = () => {
+        if (mescroll.optUp.use) {
+            mescroll.resetUpScroll()
+        } else {
+            setTimeout(() => {
+                mescroll.endSuccess();
+            }, 500)
+        }
+    }
+
+    // 上拉加载的回调
+    const upCallback = () => {
+        // mixin默认延时500自动结束加载
+        setTimeout(() => {
+            mescroll.endErr();
+        }, 500)
+    }
+
+    // 注册系统自带的下拉刷新 (配置down.native为true时生效, 还需在pages配置enablePullDownRefresh:true;详请参考mescroll-native的案例)
+    onPullDownRefresh && onPullDownRefresh(() => {
+        mescroll && mescroll.onPullDownRefresh();
+    })
+
+    // 注册列表滚动事件,用于判定在顶部可下拉刷新,在指定位置可显示隐藏回到顶部按钮 (此方法为页面生命周期,无法在子组件中触发, 仅在mescroll-body生效)
+    onPageScroll && onPageScroll(e => {
+        mescroll && mescroll.onPageScroll(e);
+    })
+
+    // 注册滚动到底部的事件,用于上拉加载 (此方法为页面生命周期,无法在子组件中触发, 仅在mescroll-body生效)
+    onReachBottom && onReachBottom(() => {
+        mescroll && mescroll.onReachBottom();
+    })
+
+    return {
+        getMescroll,
+        mescrollInit,
+        downCallback,
+        upCallback
+    }
+}
+
+export default useMescroll
\ No newline at end of file
diff --git a/uni-app/src/components/mescroll/mescroll-body/mescroll-body.css b/uni-app/src/components/mescroll/mescroll-body/mescroll-body.css
new file mode 100644
index 00000000..42868947
--- /dev/null
+++ b/uni-app/src/components/mescroll/mescroll-body/mescroll-body.css
@@ -0,0 +1,19 @@
+.mescroll-body {
+    position: relative; /* 下拉刷新区域相对自身定位 */
+    height: auto; /* 不可固定高度,否则overflow:hidden导致无法滑动; 同时使设置的最小高生效,实现列表不满屏仍可下拉*/
+    overflow: hidden; /* 当有元素写在mescroll-body标签前面时,可遮住下拉刷新区域 */
+    box-sizing: border-box; /* 避免设置padding出现双滚动条的问题 */
+}
+
+/* 使sticky生效: 父元素不能overflow:hidden或者overflow:auto属性 */
+.mescroll-body.mescorll-sticky {
+    overflow: unset !important
+}
+
+/* 适配 iPhoneX */
+@supports (bottom: constant(safe-area-inset-bottom)) or (bottom: env(safe-area-inset-bottom)) {
+    .mescroll-safearea {
+        padding-bottom: constant(safe-area-inset-bottom);
+        padding-bottom: env(safe-area-inset-bottom);
+    }
+}
\ No newline at end of file
diff --git a/uni-app/src/components/mescroll/mescroll-body/mescroll-body.vue b/uni-app/src/components/mescroll/mescroll-body/mescroll-body.vue
new file mode 100644
index 00000000..ef01f2d5
--- /dev/null
+++ b/uni-app/src/components/mescroll/mescroll-body/mescroll-body.vue
@@ -0,0 +1,400 @@
+<template>
+	<view 
+	class="mescroll-body mescroll-render-touch" 
+	:class="{'mescorll-sticky': sticky}"
+	:style="{'minHeight':minHeight, 'padding-top': padTop, 'padding-bottom': padBottom}" 
+	@touchstart="wxsBiz.touchstartEvent" 
+	@touchmove="wxsBiz.touchmoveEvent" 
+	@touchend="wxsBiz.touchendEvent" 
+	@touchcancel="wxsBiz.touchendEvent"
+	:change:prop="wxsBiz.propObserver"
+	:prop="wxsProp"
+	>
+		<!-- 状态栏 -->
+		<view v-if="topbar&&statusBarHeight" class="mescroll-topbar" :style="{height: statusBarHeight+'px', background: topbar}"></view>
+		
+		<view class="mescroll-body-content mescroll-wxs-content" :style="{ transform: translateY, transition: transition }" :change:prop="wxsBiz.callObserver" :prop="callProp">
+			<!-- 下拉加载区域 (支付宝小程序子组件传参给子子组件仍报单项数据流的异常,暂时不通过mescroll-down组件实现)-->
+			<!-- <mescroll-down :option="mescroll.optDown" :type="downLoadType" :rate="downRate"></mescroll-down> -->
+			<view v-if="mescroll.optDown.use" class="mescroll-downwarp" :style="{'background':mescroll.optDown.bgColor,'color':mescroll.optDown.textColor}">
+				<view class="downwarp-content">
+					<view class="downwarp-progress mescroll-wxs-progress" :class="{'mescroll-rotate': isDownLoading}" :style="{'border-color':mescroll.optDown.textColor, 'transform': downRotate}"></view>
+					<view class="downwarp-tip">{{downText}}</view>
+				</view>
+			</view>
+	
+			<!-- 列表内容 -->
+			<slot></slot>
+
+			<!-- 空布局 -->
+			<mescroll-empty v-if="isShowEmpty" :option="mescroll.optUp.empty" @emptyclick="emptyClick"></mescroll-empty>
+
+			<!-- 上拉加载区域 (下拉刷新时不显示, 支付宝小程序子组件传参给子子组件仍报单项数据流的异常,暂时不通过mescroll-up组件实现)-->
+			<!-- <mescroll-up v-if="mescroll.optUp.use && !isDownLoading && upLoadType!==3" :option="mescroll.optUp" :type="upLoadType"></mescroll-up> -->
+			<view v-if="mescroll.optUp.use && !isDownLoading && upLoadType!==3" class="mescroll-upwarp" :style="{'background':mescroll.optUp.bgColor,'color':mescroll.optUp.textColor}">
+				<!-- 加载中 (此处不能用v-if,否则android小程序快速上拉可能会不断触发上拉回调) -->
+				<view v-show="upLoadType===1">
+					<view class="upwarp-progress mescroll-rotate" :style="{'border-color':mescroll.optUp.textColor}"></view>
+					<view class="upwarp-tip">{{ mescroll.optUp.textLoading }}</view>
+				</view>
+				<!-- 无数据 -->
+				<view v-if="upLoadType===2" class="upwarp-nodata">{{ mescroll.optUp.textNoMore }}</view>
+			</view>
+		</view>
+		
+		<!-- 底部是否偏移TabBar的高度(默认仅在H5端的tab页生效) -->
+		<!-- #ifdef H5 -->
+		<view v-if="bottombar && windowBottom>0" class="mescroll-bottombar" :style="{height: windowBottom+'px'}"></view>
+		<!-- #endif -->
+		
+		<!-- 适配iPhoneX -->
+		<view v-if="safearea" class="mescroll-safearea"></view>
+		
+		<!-- 回到顶部按钮 (fixed元素需写在transform外面,防止降级为absolute)-->
+		<mescroll-top v-model="isShowToTop" :option="mescroll.optUp.toTop" @click="toTopClick"></mescroll-top>
+		
+		<!-- #ifdef MP-WEIXIN || MP-QQ || APP-PLUS || H5 -->
+		<!-- renderjs的数据载体,不可写在mescroll-downwarp内部,避免use为false时,载体丢失,无法更新数据 -->
+		<view :change:prop="renderBiz.propObserver" :prop="wxsProp"></view>
+		<!-- #endif -->
+	</view>
+</template>
+
+<!-- 微信小程序, QQ小程序, app, h5使用wxs -->
+<!-- #ifdef MP-WEIXIN || MP-QQ || APP-PLUS || H5 -->
+<script src="../mescroll-uni/wxs/wxs.wxs" module="wxsBiz" lang="wxs"></script>
+<!-- #endif -->
+
+<!-- app, h5使用renderjs -->
+<!-- #ifdef APP-PLUS || H5 -->
+<script module="renderBiz" lang="renderjs">
+	import renderBiz from "../mescroll-uni/wxs/renderjs.js";
+	export default {
+		mixins: [renderBiz]
+	}
+</script>
+<!-- #endif -->
+
+<script>
+	// 引入mescroll-uni.js,处理核心逻辑
+	import MeScroll from "../mescroll-uni/mescroll-uni.js";
+	// 引入全局配置
+	import GlobalOption from "../mescroll-uni/mescroll-uni-option.js";
+	// 引入国际化工具类
+	import mescrollI18n from '../mescroll-uni/mescroll-i18n.js';
+	// 引入回到顶部组件
+	import MescrollTop from "../mescroll-uni/components/mescroll-top.vue";
+	// 引入兼容wxs(含renderjs)写法的mixins
+	import WxsMixin from "../mescroll-uni/wxs/mixins.js";
+	
+	/**
+	 * mescroll-body 基于page滚动的下拉刷新和上拉加载组件, 支持嵌套原生组件, 性能好
+	 * @property {Object} down 下拉刷新的参数配置
+	 * @property {Object} up 上拉加载的参数配置
+	 * @property {Object} i18n 国际化的参数配置
+	 * @property {String, Number} top 下拉布局往下的偏移量 (支持20, "20rpx", "20px", "20%"格式的值, 其中纯数字则默认单位rpx, 百分比则相对于windowHeight)
+	 * @property {Boolean, String} topbar 偏移量top是否加上状态栏高度, 默认false (使用场景:取消原生导航栏时,配置此项可留出状态栏的占位, 支持传入字符串背景,如色值,背景图,渐变)
+	 * @property {String, Number} bottom 上拉布局往上的偏移量 (支持20, "20rpx", "20px", "20%"格式的值, 其中纯数字则默认单位rpx, 百分比则相对于windowHeight)
+	 * @property {Boolean} safearea 偏移量bottom是否加上底部安全区的距离, 默认false (需要适配iPhoneX时使用)
+	 * @property {Boolean} fixed 是否通过fixed固定mescroll的高度, 默认true
+	 * @property {String, Number} height 指定mescroll最小高度,默认windowHeight,使列表不满屏仍可下拉
+	 * @property {Boolean} bottombar 底部是否偏移TabBar的高度 (仅在H5端的tab页生效)
+	 * @property {Boolean} sticky 是否支持sticky,默认false; 当值配置true时,需避免在mescroll-body标签前面加非定位的元素,否则下拉区域无法隐藏
+	 * @event {Function} init 初始化完成的回调 
+	 * @event {Function} down 下拉刷新的回调
+	 * @event {Function} up 上拉加载的回调 
+	 * @event {Function} emptyclick 点击empty配置的btnText按钮回调
+	 * @event {Function} topclick 点击回到顶部的按钮回调
+	 * @event {Function} scroll 滚动监听 (需在 up 配置 onScroll:true 才生效)
+	 * @example <mescroll-body ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"> ... </mescroll-body>
+	 */
+	export default {
+		name: 'mescroll-body',
+		mixins: [WxsMixin],
+		components: {
+			MescrollTop
+		},
+		props: {
+			down: Object,
+			up: Object,
+			i18n: Object,
+			top: [String, Number],
+			topbar: [Boolean, String],
+			bottom: [String, Number],
+			safearea: Boolean,
+			height: [String, Number],
+			bottombar:{
+				type: Boolean,
+				default: true
+			},
+			sticky: Boolean
+		},
+		data() {
+			return {
+				mescroll: {optDown:{},optUp:{}}, // mescroll实例
+				downHight: 0, //下拉刷新: 容器高度
+				downRate: 0, // 下拉比率(inOffset: rate<1; outOffset: rate>=1)
+				downLoadType: 0, // 下拉刷新状态: 0(loading前), 1(inOffset), 2(outOffset), 3(showLoading), 4(endDownScroll)
+				upLoadType: 0, // 上拉加载状态：0（loading前），1（loading中），2（没有更多了,显示END文本提示），3（没有更多了,不显示END文本提示）
+				isShowEmpty: false, // 是否显示空布局
+				isShowToTop: false, // 是否显示回到顶部按钮
+				windowHeight: 0, // 可使用窗口的高度
+				windowBottom: 0, // 可使用窗口的底部位置
+				statusBarHeight: 0 // 状态栏高度
+			};
+		},
+		computed: {
+			// mescroll最小高度,默认windowHeight,使列表不满屏仍可下拉
+			minHeight(){
+				return this.toPx(this.height || '100%') + 'px'
+			},
+			// 下拉布局往下偏移的距离 (px)
+			numTop() {
+				return this.toPx(this.top)
+			},
+			padTop() {
+				return this.numTop + 'px';
+			},
+			// 上拉布局往上偏移 (px)
+			numBottom() {
+				return this.toPx(this.bottom);
+			},
+			padBottom() {
+				return this.numBottom + 'px';
+			},
+			// 是否为重置下拉的状态
+			isDownReset() {
+				return this.downLoadType === 3 || this.downLoadType === 4;
+			},
+			// 过渡
+			transition() {
+				return this.isDownReset ? 'transform 300ms' : '';
+			},
+			translateY() {
+				return this.downHight > 0 ? 'translateY(' + this.downHight + 'px)' : ''; // transform会使fixed失效,需注意把fixed元素写在mescroll之外
+			},
+			// 是否在加载中
+			isDownLoading(){
+				return this.downLoadType === 3
+			},
+			// 旋转的角度
+			downRotate(){
+				return 'rotate(' + 360 * this.downRate + 'deg)'
+			},
+			// 文本提示
+			downText(){
+				if(!this.mescroll) return ""; // 避免头条小程序初始化时报错
+				switch (this.downLoadType){
+					case 1: return this.mescroll.optDown.textInOffset;
+					case 2: return this.mescroll.optDown.textOutOffset;
+					case 3: return this.mescroll.optDown.textLoading;
+					case 4: return this.mescroll.isDownEndSuccess ? this.mescroll.optDown.textSuccess : this.mescroll.isDownEndSuccess==false ? this.mescroll.optDown.textErr : this.mescroll.optDown.textInOffset;
+					default: return this.mescroll.optDown.textInOffset;
+				}
+			}
+		},
+		methods: {
+			//number,rpx,upx,px,% --> px的数值
+			toPx(num) {
+				if (typeof num === 'string') {
+					if (num.indexOf('px') !== -1) {
+						if (num.indexOf('rpx') !== -1) {
+							// "10rpx"
+							num = num.replace('rpx', '');
+						} else if (num.indexOf('upx') !== -1) {
+							// "10upx"
+							num = num.replace('upx', '');
+						} else {
+							// "10px"
+							return Number(num.replace('px', ''));
+						}
+					} else if (num.indexOf('%') !== -1) {
+						// 传百分比,则相对于windowHeight,传"10%"则等于windowHeight的10%
+						let rate = Number(num.replace('%', '')) / 100;
+						return this.windowHeight * rate;
+					}
+				}
+				return num ? uni.upx2px(Number(num)) : 0;
+			},
+			// 点击空布局的按钮回调
+			emptyClick() {
+				this.$emit('emptyclick', this.mescroll);
+			},
+			// 点击回到顶部的按钮回调
+			toTopClick() {
+				this.mescroll.scrollTo(0, this.mescroll.optUp.toTop.duration); // 执行回到顶部
+				this.$emit('topclick', this.mescroll); // 派发点击回到顶部按钮的回调
+			}
+		},
+		// 使用created初始化mescroll对象; 如果用mounted部分css样式编译到H5会失效
+		created() {
+			let vm = this;
+
+			let diyOption = {
+				// 下拉刷新的配置
+				down: {
+					inOffset() {
+						vm.downLoadType = 1; // 下拉的距离进入offset范围内那一刻的回调 (自定义mescroll组件时,此行不可删)
+					},
+					outOffset() {
+						vm.downLoadType = 2; // 下拉的距离大于offset那一刻的回调 (自定义mescroll组件时,此行不可删)
+					},
+					onMoving(mescroll, rate, downHight) {
+						// 下拉过程中的回调,滑动过程一直在执行;
+						vm.downHight = downHight; // 设置下拉区域的高度 (自定义mescroll组件时,此行不可删)
+						vm.downRate = rate; //下拉比率 (inOffset: rate<1; outOffset: rate>=1)
+					},
+					showLoading(mescroll, downHight) {
+						vm.downLoadType = 3; // 显示下拉刷新进度的回调 (自定义mescroll组件时,此行不可删)
+						vm.downHight = downHight; // 设置下拉区域的高度 (自定义mescroll组件时,此行不可删)
+					},
+					beforeEndDownScroll(mescroll){
+						vm.downLoadType = 4; 
+						return mescroll.optDown.beforeEndDelay // 延时结束的时长
+					},
+					endDownScroll() {
+						vm.downLoadType = 4; // 结束下拉 (自定义mescroll组件时,此行不可删)
+						vm.downHight = 0; // 设置下拉区域的高度 (自定义mescroll组件时,此行不可删)
+						if(vm.downResetTimer) {clearTimeout(vm.downResetTimer); vm.downResetTimer = null} // 移除重置倒计时
+						vm.downResetTimer = setTimeout(()=>{ // 过渡动画执行完毕后,需重置为0的状态,避免下次inOffset不及时显示textInOffset
+							if(vm.downLoadType === 4) vm.downLoadType = 0
+						},300)
+					},
+					// 派发下拉刷新的回调
+					callback: function(mescroll) {
+						vm.$emit('down', mescroll);
+					}
+				},
+				// 上拉加载的配置
+				up: {
+					// 显示加载中的回调
+					showLoading() {
+						vm.upLoadType = 1;
+					},
+					// 显示无更多数据的回调
+					showNoMore() {
+						vm.upLoadType = 2;
+					},
+					// 隐藏上拉加载的回调
+					hideUpScroll(mescroll) {
+						vm.upLoadType = mescroll.optUp.hasNext ? 0 : 3;
+					},
+					// 空布局
+					empty: {
+						onShow(isShow) {
+							// 显示隐藏的回调
+							vm.isShowEmpty = isShow;
+						}
+					},
+					// 回到顶部
+					toTop: {
+						onShow(isShow) {
+							// 显示隐藏的回调
+							vm.isShowToTop = isShow;
+						}
+					},
+					// 派发上拉加载的回调
+					callback: function(mescroll) {
+						vm.$emit('up', mescroll);
+					}
+				}
+			};
+			
+			let i18nType = mescrollI18n.getType() // 当前语言类型
+			let i18nOption = {type: i18nType} // 国际化配置
+			MeScroll.extend(i18nOption, vm.i18n) // 具体页面的国际化配置
+			MeScroll.extend(i18nOption, GlobalOption.i18n) // 全局的国际化配置
+			MeScroll.extend(diyOption, i18nOption[i18nType]); // 混入国际化配置
+			MeScroll.extend(diyOption, {down:GlobalOption.down, up:GlobalOption.up}); // 混入全局的配置
+			let myOption = JSON.parse(JSON.stringify({down: vm.down,up: vm.up})); // 深拷贝,避免对props的影响
+			MeScroll.extend(myOption, diyOption); // 混入具体界面的配置
+
+			// 初始化MeScroll对象
+			vm.mescroll = new MeScroll(myOption, true); // 传入true,标记body为滚动区域
+			// 挂载语言包
+			vm.mescroll.i18n = i18nOption;
+			// init回调mescroll对象
+			vm.$emit('init', vm.mescroll);
+
+			// 设置高度
+			const sys = uni.getSystemInfoSync();
+			if (sys.windowHeight) vm.windowHeight = sys.windowHeight;
+			if (sys.windowBottom) vm.windowBottom = sys.windowBottom;
+			if (sys.statusBarHeight) vm.statusBarHeight = sys.statusBarHeight;
+			// 使down的bottomOffset生效
+			vm.mescroll.setBodyHeight(sys.windowHeight);
+
+			// 因为使用的是page的scroll,这里需自定义scrollTo
+			vm.mescroll.resetScrollTo((y, t) => {
+				if(typeof y === 'string'){
+					// 滚动到指定view (y为css选择器)
+					setTimeout(()=>{ // 延时确保view已渲染; 不使用$nextTick
+						let selector;
+						if(y.indexOf('#')==-1 && y.indexOf('.')==-1){
+							selector = '#'+y // 不带#和. 则默认为id选择器
+						}else{
+							selector = y
+							// #ifdef APP-PLUS || H5 || MP-ALIPAY || MP-DINGTALK
+							if(y.indexOf('>>>')!=-1){ // 不支持跨自定义组件的后代选择器 (转为普通的选择器即可跨组件查询)
+								selector = y.split('>>>')[1].trim()
+							}
+							// #endif
+						}
+						uni.createSelectorQuery().select(selector).boundingClientRect(function(rect){
+							if (rect) {
+								let top = rect.top
+								top += vm.mescroll.getScrollTop()
+								uni.pageScrollTo({
+									scrollTop: top,
+									duration: t
+								})
+							} else{
+								console.error(selector + ' does not exist');
+							}
+						}).exec()
+					},30)
+				} else{
+					// 滚动到指定位置 (y必须为数字)
+					uni.pageScrollTo({
+						scrollTop: y,
+						duration: t
+					})
+				}
+			});
+
+			// 具体的界面如果不配置up.toTop.safearea,则取本vue的safearea值
+			if (vm.up && vm.up.toTop && vm.up.toTop.safearea != null) {} else {
+				vm.mescroll.optUp.toTop.safearea = vm.safearea;
+			}
+			
+			// 全局配置监听
+			uni.$on("setMescrollGlobalOption", options=>{
+				if(!options) return;
+				let i18nType = options.i18n ? options.i18n.type : null
+				if(i18nType && vm.mescroll.i18n.type != i18nType){
+					vm.mescroll.i18n.type = i18nType
+					mescrollI18n.setType(i18nType)
+					MeScroll.extend(options, vm.mescroll.i18n[i18nType])
+				}
+				if(options.down){
+					let down = MeScroll.extend({}, options.down)
+					vm.mescroll.optDown = MeScroll.extend(down, vm.mescroll.optDown)
+				}
+				if(options.up){
+					let up = MeScroll.extend({}, options.up)
+					vm.mescroll.optUp = MeScroll.extend(up, vm.mescroll.optUp)
+				}
+			})
+		},
+		destroyed() {
+			// 注销全局配置监听
+			uni.$off("setMescrollGlobalOption")
+		}
+	};
+</script>
+
+<style>
+	@import "../mescroll-body/mescroll-body.css";
+	@import "../mescroll-uni/components/mescroll-down.css";
+	@import "../mescroll-uni/components/mescroll-up.css";
+</style>
\ No newline at end of file
diff --git a/uni-app/src/components/mescroll/mescroll-empty/mescroll-empty.vue b/uni-app/src/components/mescroll/mescroll-empty/mescroll-empty.vue
new file mode 100644
index 00000000..8dcc793b
--- /dev/null
+++ b/uni-app/src/components/mescroll/mescroll-empty/mescroll-empty.vue
@@ -0,0 +1,109 @@
+<!--空布局:
+遵循easycom规范, 可作为独立的组件, 不使用mescroll的页面也能使用:
+<mescroll-empty v-if="isShowEmpty" :option="optEmpty" @emptyclick="emptyClick"></mescroll-empty>
+-->
+<template>
+	<view class="mescroll-empty empty-page" :class="{ 'empty-fixed': option.fixed }" :style="{ 'z-index': option.zIndex, top: option.top }">
+		<view> <image v-if="icon" class="img" :src="icon" mode="aspectFit" /> </view>
+		<view v-if="tip" class="desc">{{ tip }}</view>
+		<view v-if="btnText" class="btn" @click="emptyClick">{{ btnText }}</view>
+	</view>
+</template>
+
+<script>
+// 引入全局配置
+import GlobalOption from '../mescroll-uni/mescroll-uni-option.js';
+// 引入国际化工具类
+import mescrollI18n from '../mescroll-uni/mescroll-i18n.js';
+export default {
+	props: {
+		// empty的配置项: 默认为GlobalOption.up.empty
+		option: {
+			type: Object,
+			default() {
+				return {};
+			}
+		}
+	},
+	// 使用computed获取配置,用于支持option的动态配置
+	computed: {
+		// 图标
+		icon() {
+			if (this.option.icon != null) { // 此处不使用短路求值, 用于支持传空串不显示图标
+				return this.option.icon
+			} else{
+				let i18nType = mescrollI18n.getType() // 国际化配置
+				if (this.option.i18n) {
+					return this.option.i18n[i18nType].icon
+				} else{
+					return GlobalOption.i18n[i18nType].up.empty.icon || GlobalOption.up.empty.icon
+				}
+			}
+		},
+		// 文本提示
+		tip() {
+			if (this.option.tip != null) { // 支持传空串不显示文本提示
+				return this.option.tip
+			} else{
+				let i18nType = mescrollI18n.getType() // 国际化配置
+				if (this.option.i18n) {
+					return this.option.i18n[i18nType].tip
+				} else{
+					return GlobalOption.i18n[i18nType].up.empty.tip || GlobalOption.up.empty.tip
+				}
+			}
+		},
+		// 按钮文本
+		btnText() {
+			if (this.option.i18n) {
+				let i18nType = mescrollI18n.getType() // 国际化配置
+				return this.option.i18n[i18nType].btnText
+			} else{
+				return this.option.btnText
+			}
+		}
+	},
+	methods: {
+		// 点击按钮
+		emptyClick() {
+			this.$emit('emptyclick');
+		}
+	}
+};
+</script>
+
+<style>
+/* 无任何数据的空布局 */
+.mescroll-empty.empty-fixed {
+	z-index: 99;
+	position: absolute; /*transform会使fixed失效,最终会降级为absolute */
+	top: 100rpx;
+	left: 0;
+}
+
+.mescroll-empty .empty-icon {
+	width: 400rpx;
+	height: 300rpx;
+}
+
+.mescroll-empty .empty-tip {
+	font-size: 26rpx;
+	color: var(--text-color-light9);
+}
+
+.mescroll-empty .empty-btn {
+	margin-top: 36rpx;
+	display: inline-block;
+	min-width: 220rpx;
+	height: 66rpx;
+	line-height: 66rpx;
+	font-size: 24rpx;
+	border: 1rpx solid var(--primary-color);
+	border-radius: 100rpx;
+	color: var(--primary-color);
+}
+
+.mescroll-empty .empty-btn:active {
+	opacity: 0.75;
+}
+</style>
diff --git a/uni-app/src/components/mescroll/mescroll-uni/components/mescroll-down.css b/uni-app/src/components/mescroll/mescroll-uni/components/mescroll-down.css
new file mode 100644
index 00000000..72bf106c
--- /dev/null
+++ b/uni-app/src/components/mescroll/mescroll-uni/components/mescroll-down.css
@@ -0,0 +1,55 @@
+/* 下拉刷新区域 */
+.mescroll-downwarp {
+	position: absolute;
+	top: -100%;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	text-align: center;
+}
+
+/* 下拉刷新--内容区,定位于区域底部 */
+.mescroll-downwarp .downwarp-content {
+	position: absolute;
+	left: 0;
+	bottom: 0;
+	width: 100%;
+	min-height: 60rpx;
+	padding: 20rpx 0;
+	text-align: center;
+}
+
+/* 下拉刷新--提示文本 */
+.mescroll-downwarp .downwarp-tip {
+	display: inline-block;
+	font-size: 28rpx;
+	vertical-align: middle;
+	margin-left: 16rpx;
+	/* color: gray; 已在style设置color,此处删去*/
+}
+
+/* 下拉刷新--旋转进度条 */
+.mescroll-downwarp .downwarp-progress {
+	display: inline-block;
+	width: 32rpx;
+	height: 32rpx;
+	border-radius: 50%;
+	border: 2rpx solid gray;
+	border-bottom-color: transparent !important; /*已在style设置border-color,此处需加 !important*/
+	vertical-align: middle;
+}
+
+/* 旋转动画 */
+.mescroll-downwarp .mescroll-rotate {
+	animation: mescrollDownRotate 0.6s linear infinite;
+}
+
+@keyframes mescrollDownRotate {
+	0% {
+		transform: rotate(0deg);
+	}
+
+	100% {
+		transform: rotate(360deg);
+	}
+}
\ No newline at end of file
diff --git a/uni-app/src/components/mescroll/mescroll-uni/components/mescroll-top.vue b/uni-app/src/components/mescroll/mescroll-uni/components/mescroll-top.vue
new file mode 100644
index 00000000..5115fd8d
--- /dev/null
+++ b/uni-app/src/components/mescroll/mescroll-uni/components/mescroll-top.vue
@@ -0,0 +1,83 @@
+<!-- 回到顶部的按钮 -->
+<template>
+	<image
+		v-if="mOption.src"
+		class="mescroll-totop"
+		:class="[value ? 'mescroll-totop-in' : 'mescroll-totop-out', {'mescroll-totop-safearea': mOption.safearea}]"
+		:style="{'z-index':mOption.zIndex, 'left': left, 'right': right, 'bottom':addUnit(mOption.bottom), 'width':addUnit(mOption.width), 'border-radius':addUnit(mOption.radius)}"
+		:src="mOption.src"
+		mode="widthFix"
+		@click="toTopClick"
+	/>
+</template>
+
+<script>
+export default {
+	props: {
+		// up.toTop的配置项
+		option: Object,
+		// 是否显示
+		value: false
+	},
+	computed: {
+		// 支付宝小程序需写成计算属性,prop定义default仍报错
+		mOption(){
+			return this.option || {}
+		},
+		// 优先显示左边
+		left(){
+			return this.mOption.left ? this.addUnit(this.mOption.left) : 'auto';
+		},
+		// 右边距离 (优先显示左边)
+		right() {
+			return this.mOption.left ? 'auto' : this.addUnit(this.mOption.right);
+		}
+	},
+	methods: {
+		addUnit(num){
+			if(!num) return 0;
+			if(typeof num === 'number') return num + 'rpx';
+			return num
+		},
+		toTopClick() {
+			this.$emit('input', false); // 使v-model生效
+			this.$emit('click'); // 派发点击事件
+		}
+	}
+};
+</script>
+
+<style>
+/* 回到顶部的按钮 */
+.mescroll-totop {
+	z-index: 9990;
+	position: fixed !important; /* 加上important避免编译到H5,在多mescroll中定位失效 */
+	right: 20rpx;
+	bottom: 120rpx;
+	width: 72rpx;
+	height: auto;
+	border-radius: 50%;
+	opacity: 0;
+	transition: opacity 0.5s; /* 过渡 */
+	margin-bottom: var(--window-bottom); /* css变量 */
+}
+
+/* 适配 iPhoneX */
+@supports (bottom: constant(safe-area-inset-bottom)) or (bottom: env(safe-area-inset-bottom)) {
+	.mescroll-totop-safearea {
+		margin-bottom: calc(var(--window-bottom) + constant(safe-area-inset-bottom)); /* window-bottom + 适配 iPhoneX */
+		margin-bottom: calc(var(--window-bottom) + env(safe-area-inset-bottom));
+	}
+}
+
+/* 显示 -- 淡入 */
+.mescroll-totop-in {
+	opacity: 1;
+}
+
+/* 隐藏 -- 淡出且不接收事件*/
+.mescroll-totop-out {
+	opacity: 0;
+	pointer-events: none;
+}
+</style>
diff --git a/uni-app/src/components/mescroll/mescroll-uni/components/mescroll-up.css b/uni-app/src/components/mescroll/mescroll-uni/components/mescroll-up.css
new file mode 100644
index 00000000..cbf48cd2
--- /dev/null
+++ b/uni-app/src/components/mescroll/mescroll-uni/components/mescroll-up.css
@@ -0,0 +1,47 @@
+/* 上拉加载区域 */
+.mescroll-upwarp {
+	box-sizing: border-box;
+	min-height: 110rpx;
+	padding: 30rpx 0;
+	text-align: center;
+	clear: both;
+}
+
+/*提示文本 */
+.mescroll-upwarp .upwarp-tip,
+.mescroll-upwarp .upwarp-nodata {
+	display: inline-block;
+	font-size: 28rpx;
+	vertical-align: middle;
+	/* color: gray; 已在style设置color,此处删去*/
+}
+
+.mescroll-upwarp .upwarp-tip {
+	margin-left: 16rpx;
+}
+
+/*旋转进度条 */
+.mescroll-upwarp .upwarp-progress {
+	display: inline-block;
+	width: 32rpx;
+	height: 32rpx;
+	border-radius: 50%;
+	border: 2rpx solid gray;
+	border-bottom-color: transparent !important; /*已在style设置border-color,此处需加 !important*/
+	vertical-align: middle;
+}
+
+/* 旋转动画 */
+.mescroll-upwarp .mescroll-rotate {
+	animation: mescrollUpRotate 0.6s linear infinite;
+}
+
+@keyframes mescrollUpRotate {
+	0% {
+		transform: rotate(0deg);
+	}
+
+	100% {
+		transform: rotate(360deg);
+	}
+}
\ No newline at end of file
diff --git a/uni-app/src/components/mescroll/mescroll-uni/mescroll-i18n.js b/uni-app/src/components/mescroll/mescroll-uni/mescroll-i18n.js
new file mode 100644
index 00000000..2b6a50f0
--- /dev/null
+++ b/uni-app/src/components/mescroll/mescroll-uni/mescroll-i18n.js
@@ -0,0 +1,15 @@
+// 国际化工具类
+const mescrollI18n = {
+	// 默认语言
+	def: "zh",
+	// 获取当前语言类型
+	getType(){
+		return uni.getStorageSync("mescroll-i18n") || this.def
+	},
+	// 设置当前语言类型
+	setType(type){
+		uni.setStorageSync("mescroll-i18n", type)
+	}
+}
+
+export default mescrollI18n
diff --git a/uni-app/src/components/mescroll/mescroll-uni/mescroll-mixins.js b/uni-app/src/components/mescroll/mescroll-uni/mescroll-mixins.js
new file mode 100644
index 00000000..bf3714a2
--- /dev/null
+++ b/uni-app/src/components/mescroll/mescroll-uni/mescroll-mixins.js
@@ -0,0 +1,57 @@
+// mescroll-body 和 mescroll-uni 通用
+const MescrollMixin = {
+	data() {
+		return {
+			mescroll: null //mescroll实例对象
+		}
+	},
+	// 注册系统自带的下拉刷新 (配置down.native为true时生效, 还需在pages配置enablePullDownRefresh:true;详请参考mescroll-native的案例)
+	onPullDownRefresh(){
+		this.mescroll && this.mescroll.onPullDownRefresh();
+	},
+	// 注册列表滚动事件,用于判定在顶部可下拉刷新,在指定位置可显示隐藏回到顶部按钮 (此方法为页面生命周期,无法在子组件中触发, 仅在mescroll-body生效)
+	onPageScroll(e) {
+		this.mescroll && this.mescroll.onPageScroll(e);
+	},
+	// 注册滚动到底部的事件,用于上拉加载 (此方法为页面生命周期,无法在子组件中触发, 仅在mescroll-body生效)
+	onReachBottom() {
+		this.mescroll && this.mescroll.onReachBottom();
+	},
+	methods: {
+		// mescroll组件初始化的回调,可获取到mescroll对象
+		mescrollInit(mescroll) {
+			this.mescroll = mescroll;
+			this.mescrollInitByRef(); // 兼容字节跳动小程序
+		},
+		// 以ref的方式初始化mescroll对象 (兼容字节跳动小程序)
+		mescrollInitByRef() {
+			if(!this.mescroll || !this.mescroll.resetUpScroll){
+				let mescrollRef = this.$refs.mescrollRef;
+				if(mescrollRef) this.mescroll = mescrollRef.mescroll
+			}
+		},
+		// 下拉刷新的回调 (mixin默认resetUpScroll)
+		downCallback() {
+			if(this.mescroll.optUp.use){
+				this.mescroll.resetUpScroll()
+			}else{
+				setTimeout(()=>{
+					this.mescroll.endSuccess();
+				}, 500)
+			}
+		},
+		// 上拉加载的回调
+		upCallback() {
+			// mixin默认延时500自动结束加载
+			setTimeout(()=>{
+				this.mescroll.endErr();
+			}, 500)
+		}
+	},
+	mounted() {
+		this.mescrollInitByRef(); // 兼容字节跳动小程序, 避免未设置@init或@init此时未能取到ref的情况
+	}
+	
+}
+
+export default MescrollMixin;
diff --git a/uni-app/src/components/mescroll/mescroll-uni/mescroll-uni-option.js b/uni-app/src/components/mescroll/mescroll-uni/mescroll-uni-option.js
new file mode 100644
index 00000000..47e8fae1
--- /dev/null
+++ b/uni-app/src/components/mescroll/mescroll-uni/mescroll-uni-option.js
@@ -0,0 +1,66 @@
+import { img } from '@/utils/common';
+
+// 全局配置
+// mescroll-body 和 mescroll-uni 通用
+const GlobalOption = {
+	down: {
+		// 其他down的配置参数也可以写,这里只展示了常用的配置:
+		offset: 80, // 在列表顶部,下拉大于80px,松手即可触发下拉刷新的回调
+		native: false // 是否使用系统自带的下拉刷新; 默认false; 仅在mescroll-body生效 (值为true时,还需在pages配置enablePullDownRefresh:true;详请参考mescroll-native的案例)
+	},
+	up: {
+		// 其他up的配置参数也可以写,这里只展示了常用的配置:
+		offset: 150, // 距底部多远时,触发upCallback,仅mescroll-uni生效 ( mescroll-body配置的是pages.json的 onReachBottomDistance )
+		toTop: {
+			// 回到顶部按钮,需配置src才显示
+			src: "https://www.mescroll.com/img/mescroll-totop.png", // 图片路径 (建议放入static目录, 如 /static/img/mescroll-totop.png )
+			offset: 1000, // 列表滚动多少距离才显示回到顶部按钮,默认1000px
+			right: 20, // 到右边的距离, 默认20 (支持"20rpx", "20px", "20%"格式的值, 纯数字则默认单位rpx)
+			bottom: 120, // 到底部的距离, 默认120 (支持"20rpx", "20px", "20%"格式的值, 纯数字则默认单位rpx)
+			width: 72 // 回到顶部图标的宽度, 默认72 (支持"20rpx", "20px", "20%"格式的值, 纯数字则默认单位rpx)
+		},
+		empty: {
+			use: true, // 是否显示空布局
+			icon: img("static/resource/images/system/empty.png") // 图标路径 (建议放入static目录, 如 /static/img/mescroll-empty.png )
+		}
+	},
+	// 国际化配置
+	i18n: {
+		// 中文
+		zh: {
+			down: {
+				textInOffset: '下拉刷新', // 下拉的距离在offset范围内的提示文本
+				textOutOffset: '释放更新', // 下拉的距离大于offset范围的提示文本
+				textLoading: '加载中 ...', // 加载中的提示文本
+				textSuccess: '加载成功', // 加载成功的文本
+				textErr: '加载失败', // 加载失败的文本
+			},
+			up: {
+				textLoading: '加载中 ...', // 加载中的提示文本
+				textNoMore: '', // 没有更多数据的提示文本
+				empty: {
+					tip: '暂无相关数据' // 空提示
+				}
+			}
+		},
+		// 英文
+		en: {
+			down: {
+				textInOffset: 'drop down refresh',
+				textOutOffset: 'release updates',
+				textLoading: 'loading ...',
+				textSuccess: 'loaded successfully',
+				textErr: 'loading failed'
+			},
+			up: {
+				textLoading: 'loading ...',
+				textNoMore: '',
+				empty: {
+					tip: '~ absolutely empty ~'
+				}
+			}
+		}
+	}
+}
+
+export default GlobalOption
diff --git a/uni-app/src/components/mescroll/mescroll-uni/mescroll-uni.css b/uni-app/src/components/mescroll/mescroll-uni/mescroll-uni.css
new file mode 100644
index 00000000..39438cdf
--- /dev/null
+++ b/uni-app/src/components/mescroll/mescroll-uni/mescroll-uni.css
@@ -0,0 +1,36 @@
+.mescroll-uni-warp{
+	height: 100%;
+}
+
+.mescroll-uni-content{
+	height: 100%;
+}
+
+.mescroll-uni {
+	position: relative;
+	width: 100%;
+	height: 100%;
+	min-height: 200rpx;
+	overflow-y: auto;
+	box-sizing: border-box; /* 避免设置padding出现双滚动条的问题 */
+}
+
+/* 定位的方式固定高度 */
+.mescroll-uni-fixed{
+	z-index: 1;
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	width: auto; /* 使right生效 */
+	height: auto; /* 使bottom生效 */
+}
+
+/* 适配 iPhoneX */
+@supports (bottom: constant(safe-area-inset-bottom)) or (bottom: env(safe-area-inset-bottom)) {
+	.mescroll-safearea {
+		padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+}
diff --git a/uni-app/src/components/mescroll/mescroll-uni/mescroll-uni.js b/uni-app/src/components/mescroll/mescroll-uni/mescroll-uni.js
new file mode 100644
index 00000000..2020a4f1
--- /dev/null
+++ b/uni-app/src/components/mescroll/mescroll-uni/mescroll-uni.js
@@ -0,0 +1,799 @@
+/* mescroll
+ * version 1.3.7
+ * 2021-04-12 wenju
+ * https://www.mescroll.com
+ */
+
+export default function MeScroll(options, isScrollBody) {
+	let me = this;
+	me.version = '1.3.7'; // mescroll版本号
+	me.options = options || {}; // 配置
+	me.isScrollBody = isScrollBody || false; // 滚动区域是否为原生页面滚动; 默认为scroll-view
+
+	me.isDownScrolling = false; // 是否在执行下拉刷新的回调
+	me.isUpScrolling = false; // 是否在执行上拉加载的回调
+	let hasDownCallback = me.options.down && me.options.down.callback; // 是否配置了down的callback
+
+	// 初始化下拉刷新
+	me.initDownScroll();
+	// 初始化上拉加载,则初始化
+	me.initUpScroll();
+
+	// 自动加载
+	setTimeout(function() { // 待主线程执行完毕再执行,避免new MeScroll未初始化,在回调获取不到mescroll的实例
+		// 自动触发下拉刷新 (只有配置了down的callback才自动触发下拉刷新)
+		if ((me.optDown.use || me.optDown.native) && me.optDown.auto && hasDownCallback) {
+			if (me.optDown.autoShowLoading) {
+				me.triggerDownScroll(); // 显示下拉进度,执行下拉回调
+			} else {
+				me.optDown.callback && me.optDown.callback(me); // 不显示下拉进度,直接执行下拉回调
+			}
+		}
+		// 自动触发上拉加载
+		if(!me.isUpAutoLoad){ // 部分小程序(头条小程序)emit是异步, 会导致isUpAutoLoad判断有误, 先延时确保先执行down的callback,再执行up的callback
+			setTimeout(function(){
+				me.optUp.use && me.optUp.auto && !me.isUpAutoLoad && me.triggerUpScroll();
+			},100)
+		}
+	}, 30); // 需让me.optDown.inited和me.optUp.inited先执行
+}
+
+/* 配置参数:下拉刷新 */
+MeScroll.prototype.extendDownScroll = function(optDown) {
+	// 下拉刷新的配置
+	MeScroll.extend(optDown, {
+		use: true, // 是否启用下拉刷新; 默认true
+		auto: true, // 是否在初始化完毕之后自动执行下拉刷新的回调; 默认true
+		native: false, // 是否使用系统自带的下拉刷新; 默认false; 仅mescroll-body生效 (值为true时,还需在pages配置enablePullDownRefresh:true;详请参考mescroll-native的案例)
+		autoShowLoading: false, // 如果设置auto=true(在初始化完毕之后自动执行下拉刷新的回调),那么是否显示下拉刷新的进度; 默认false
+		isLock: false, // 是否锁定下拉刷新,默认false;
+		offset: 80, // 在列表顶部,下拉大于80px,松手即可触发下拉刷新的回调
+		startTop: 100, // scroll-view快速滚动到顶部时,此时的scroll-top可能大于0, 此值用于控制最大的误差
+		inOffsetRate: 1, // 在列表顶部,下拉的距离小于offset时,改变下拉区域高度比例;值小于1且越接近0,高度变化越小,表现为越往下越难拉
+		outOffsetRate: 0.2, // 在列表顶部,下拉的距离大于offset时,改变下拉区域高度比例;值小于1且越接近0,高度变化越小,表现为越往下越难拉
+		bottomOffset: 20, // 当手指touchmove位置在距离body底部20px范围内的时候结束上拉刷新,避免Webview嵌套导致touchend事件不执行
+		minAngle: 45, // 向下滑动最少偏移的角度,取值区间  [0,90];默认45度,即向下滑动的角度大于45度则触发下拉;而小于45度,将不触发下拉,避免与左右滑动的轮播等组件冲突;
+		textInOffset: '下拉刷新', // 下拉的距离在offset范围内的提示文本
+		textOutOffset: '释放更新', // 下拉的距离大于offset范围的提示文本
+		textLoading: '加载中 ...', // 加载中的提示文本
+		textSuccess: '加载成功', // 加载成功的文本
+		textErr: '加载失败', // 加载失败的文本
+		beforeEndDelay: 0, // 延时结束的时长 (显示加载成功/失败的时长, android小程序设置此项结束下拉会卡顿, 配置后请注意测试)
+		bgColor: "transparent", // 背景颜色 (建议在pages.json中再设置一下backgroundColorTop)
+		textColor: "gray", // 文本颜色 (当bgColor配置了颜色,而textColor未配置时,则textColor会默认为白色)
+		inited: null, // 下拉刷新初始化完毕的回调
+		inOffset: null, // 下拉的距离进入offset范围内那一刻的回调
+		outOffset: null, // 下拉的距离大于offset那一刻的回调
+		onMoving: null, // 下拉过程中的回调,滑动过程一直在执行; rate下拉区域当前高度与指定距离的比值(inOffset: rate<1; outOffset: rate>=1); downHight当前下拉区域的高度
+		beforeLoading: null, // 准备触发下拉刷新的回调: 如果return true,将不触发showLoading和callback回调; 常用来完全自定义下拉刷新, 参考案例【淘宝 v6.8.0】
+		showLoading: null, // 显示下拉刷新进度的回调
+		afterLoading: null, // 显示下拉刷新进度的回调之后,马上要执行的代码 (如: 在wxs中使用)
+		beforeEndDownScroll: null, // 准备结束下拉的回调. 返回结束下拉的延时执行时间,默认0ms; 常用于结束下拉之前再显示另外一小段动画,才去隐藏下拉刷新的场景, 参考案例【dotJump】
+		endDownScroll: null, // 结束下拉刷新的回调
+		afterEndDownScroll: null, // 结束下拉刷新的回调,马上要执行的代码 (如: 在wxs中使用)
+		callback: function(mescroll) {
+			// 下拉刷新的回调;默认重置上拉加载列表为第一页
+			mescroll.resetUpScroll();
+		}
+	})
+}
+
+/* 配置参数:上拉加载 */
+MeScroll.prototype.extendUpScroll = function(optUp) {
+	// 上拉加载的配置
+	MeScroll.extend(optUp, {
+		use: true, // 是否启用上拉加载; 默认true
+		auto: true, // 是否在初始化完毕之后自动执行上拉加载的回调; 默认true
+		isLock: false, // 是否锁定上拉加载,默认false;
+		isBoth: true, // 上拉加载时,如果滑动到列表顶部是否可以同时触发下拉刷新;默认true,两者可同时触发;
+		callback: null, // 上拉加载的回调;function(page,mescroll){ }
+		page: {
+			num: 0, // 当前页码,默认0,回调之前会加1,即callback(page)会从1开始
+			size: 10, // 每页数据的数量
+			time: null // 加载第一页数据服务器返回的时间; 防止用户翻页时,后台新增了数据从而导致下一页数据重复;
+		},
+		noMoreSize: 5, // 如果列表已无数据,可设置列表的总数量要大于等于5条才显示无更多数据;避免列表数据过少(比如只有一条数据),显示无更多数据会不好看
+		offset: 150, // 距底部多远时,触发upCallback,仅mescroll-uni生效 ( mescroll-body配置的是pages.json的 onReachBottomDistance )
+		textLoading: '加载中 ...', // 加载中的提示文本
+		textNoMore: '', // 没有更多数据的提示文本，-- END --
+		bgColor: "transparent", // 背景颜色 (建议在pages.json中再设置一下backgroundColorBottom)
+		textColor: "gray", // 文本颜色 (当bgColor配置了颜色,而textColor未配置时,则textColor会默认为白色)
+		inited: null, // 初始化完毕的回调
+		showLoading: null, // 显示加载中的回调
+		showNoMore: null, // 显示无更多数据的回调
+		hideUpScroll: null, // 隐藏上拉加载的回调
+		errDistance: 60, // endErr的时候需往上滑动一段距离,使其往下滑动时再次触发onReachBottom,仅mescroll-body生效
+		toTop: {
+			// 回到顶部按钮,需配置src才显示
+			src: null, // 图片路径,默认null (绝对路径或网络图)
+			offset: 1000, // 列表滚动多少距离才显示回到顶部按钮,默认1000
+			duration: 300, // 回到顶部的动画时长,默认300ms (当值为0或300则使用系统自带回到顶部,更流畅; 其他值则通过step模拟,部分机型可能不够流畅,所以非特殊情况不建议修改此项)
+			btnClick: null, // 点击按钮的回调
+			onShow: null, // 是否显示的回调
+			zIndex: 9990, // fixed定位z-index值
+			left: null, // 到左边的距离, 默认null. 此项有值时,right不生效. (支持20, "20rpx", "20px", "20%"格式的值, 其中纯数字则默认单位rpx)
+			right: 20, // 到右边的距离, 默认20 (支持20, "20rpx", "20px", "20%"格式的值, 其中纯数字则默认单位rpx)
+			bottom: 120, // 到底部的距离, 默认120 (支持20, "20rpx", "20px", "20%"格式的值, 其中纯数字则默认单位rpx)
+			safearea: false, // bottom的偏移量是否加上底部安全区的距离, 默认false, 需要适配iPhoneX时使用 (具体的界面如果不配置此项,则取本vue的safearea值)
+			width: 72, // 回到顶部图标的宽度, 默认72 (支持20, "20rpx", "20px", "20%"格式的值, 其中纯数字则默认单位rpx)
+			radius: "50%" // 圆角, 默认"50%" (支持20, "20rpx", "20px", "20%"格式的值, 其中纯数字则默认单位rpx)
+		},
+		empty: {
+			use: true, // 是否显示空布局
+			icon: null, // 图标路径
+			tip: '~ 暂无相关数据 ~', // 提示
+			btnText: '', // 按钮
+			btnClick: null, // 点击按钮的回调
+			onShow: null, // 是否显示的回调
+			fixed: false, // 是否使用fixed定位,默认false; 配置fixed为true,以下的top和zIndex才生效 (transform会使fixed失效,最终会降级为absolute)
+			top: "100rpx", // fixed定位的top值 (完整的单位值,如 "10%"; "100rpx")
+			zIndex: 99 // fixed定位z-index值
+		},
+		onScroll: false // 是否监听滚动事件
+	})
+}
+
+/* 配置参数 */
+MeScroll.extend = function(userOption, defaultOption) {
+	if (!userOption) return defaultOption;
+	for (let key in defaultOption) {
+		if (userOption[key] == null) {
+			let def = defaultOption[key];
+			if (def != null && typeof def === 'object') {
+				userOption[key] = MeScroll.extend({}, def); // 深度匹配
+			} else {
+				userOption[key] = def;
+			}
+		} else if (typeof userOption[key] === 'object') {
+			MeScroll.extend(userOption[key], defaultOption[key]); // 深度匹配
+		}
+	}
+	return userOption;
+}
+
+/* 简单判断是否配置了颜色 (非透明,非白色) */
+MeScroll.prototype.hasColor = function(color) {
+	if(!color) return false;
+	let c = color.toLowerCase();
+	return c != "#fff" && c != "#ffffff" && c != "transparent" && c != "white"
+}
+
+/* -------初始化下拉刷新------- */
+MeScroll.prototype.initDownScroll = function() {
+	let me = this;
+	// 配置参数
+	me.optDown = me.options.down || {};
+	if(!me.optDown.textColor && me.hasColor(me.optDown.bgColor)) me.optDown.textColor = "#fff"; // 当bgColor有值且textColor未设置,则textColor默认白色
+	me.extendDownScroll(me.optDown);
+	
+	// 如果是mescroll-body且配置了native,则禁止自定义的下拉刷新
+	if(me.isScrollBody && me.optDown.native){
+		me.optDown.use = false
+	}else{
+		me.optDown.native = false // 仅mescroll-body支持,mescroll-uni不支持
+	}
+	
+	me.downHight = 0; // 下拉区域的高度
+
+	// 在页面中加入下拉布局
+	if (me.optDown.use && me.optDown.inited) {
+		// 初始化完毕的回调
+		setTimeout(function() { // 待主线程执行完毕再执行,避免new MeScroll未初始化,在回调获取不到mescroll的实例
+			me.optDown.inited(me);
+		}, 0)
+	}
+}
+
+/* 列表touchstart事件 */
+MeScroll.prototype.touchstartEvent = function(e) {
+	if (!this.optDown.use) return;
+
+	this.startPoint = this.getPoint(e); // 记录起点
+	this.startTop = this.getScrollTop(); // 记录此时的滚动条位置
+	this.startAngle = 0; // 初始角度
+	this.lastPoint = this.startPoint; // 重置上次move的点
+	this.maxTouchmoveY = this.getBodyHeight() - this.optDown.bottomOffset; // 手指触摸的最大范围(写在touchstart避免body获取高度为0的情况)
+	this.inTouchend = false; // 标记不是touchend
+}
+
+/* 列表touchmove事件 */
+MeScroll.prototype.touchmoveEvent = function(e) {
+	if (!this.optDown.use) return;
+	let me = this;
+
+	let scrollTop = me.getScrollTop(); // 当前滚动条的距离
+	let curPoint = me.getPoint(e); // 当前点
+
+	let moveY = curPoint.y - me.startPoint.y; // 和起点比,移动的距离,大于0向下拉,小于0向上拉
+
+	// 向下拉 && 在顶部
+	// mescroll-body,直接判定在顶部即可
+	// scroll-view在滚动时不会触发touchmove,当触顶/底/左/右时,才会触发touchmove
+	// scroll-view滚动到顶部时,scrollTop不一定为0,也有可能大于0; 在iOS的APP中scrollTop可能为负数,不一定和startTop相等
+	if (moveY > 0 && (
+			(me.isScrollBody && scrollTop <= 0)
+			||
+			(!me.isScrollBody && (scrollTop <= 0 || (scrollTop <= me.optDown.startTop && scrollTop === me.startTop)) )
+		)) {
+		// 可下拉的条件
+		if (!me.inTouchend && !me.isDownScrolling && !me.optDown.isLock && (!me.isUpScrolling || (me.isUpScrolling &&
+				me.optUp.isBoth))) {
+
+			// 下拉的初始角度是否在配置的范围内
+			if(!me.startAngle) me.startAngle = me.getAngle(me.lastPoint, curPoint); // 两点之间的角度,区间 [0,90]
+			if (me.startAngle < me.optDown.minAngle) return; // 如果小于配置的角度,则不往下执行下拉刷新
+
+			// 如果手指的位置超过配置的距离,则提前结束下拉,避免Webview嵌套导致touchend无法触发
+			if (me.maxTouchmoveY > 0 && curPoint.y >= me.maxTouchmoveY) {
+				me.inTouchend = true; // 标记执行touchend
+				me.touchendEvent(); // 提前触发touchend
+				return;
+			}
+			
+			me.preventDefault(e); // 阻止默认事件
+
+			let diff = curPoint.y - me.lastPoint.y; // 和上次比,移动的距离 (大于0向下,小于0向上)
+
+			// 下拉距离  < 指定距离
+			if (me.downHight < me.optDown.offset) {
+				if (me.movetype !== 1) {
+					me.movetype = 1; // 加入标记,保证只执行一次
+					me.isDownEndSuccess = null; // 重置是否加载成功的状态 (wxs执行的是wxs.wxs)
+					me.optDown.inOffset && me.optDown.inOffset(me); // 进入指定距离范围内那一刻的回调,只执行一次
+					me.isMoveDown = true; // 标记下拉区域高度改变,在touchend重置回来
+				}
+				me.downHight += diff * me.optDown.inOffsetRate; // 越往下,高度变化越小
+
+				// 指定距离  <= 下拉距离
+			} else {
+				if (me.movetype !== 2) {
+					me.movetype = 2; // 加入标记,保证只执行一次
+					me.optDown.outOffset && me.optDown.outOffset(me); // 下拉超过指定距离那一刻的回调,只执行一次
+					me.isMoveDown = true; // 标记下拉区域高度改变,在touchend重置回来
+				}
+				if (diff > 0) { // 向下拉
+					me.downHight += diff * me.optDown.outOffsetRate; // 越往下,高度变化越小
+				} else { // 向上收
+					me.downHight += diff; // 向上收回高度,则向上滑多少收多少高度
+				}
+			}
+			
+			me.downHight = Math.round(me.downHight) // 取整
+			let rate = me.downHight / me.optDown.offset; // 下拉区域当前高度与指定距离的比值
+			me.optDown.onMoving && me.optDown.onMoving(me, rate, me.downHight); // 下拉过程中的回调,一直在执行
+		}
+	}
+
+	me.lastPoint = curPoint; // 记录本次移动的点
+}
+
+/* 列表touchend事件 */
+MeScroll.prototype.touchendEvent = function(e) {
+	if (!this.optDown.use) return;
+	// 如果下拉区域高度已改变,则需重置回来
+	if (this.isMoveDown) {
+		if (this.downHight >= this.optDown.offset) {
+			// 符合触发刷新的条件
+			this.triggerDownScroll();
+		} else {
+			// 不符合的话 则重置
+			this.downHight = 0;
+			this.endDownScrollCall(this);
+		}
+		this.movetype = 0;
+		this.isMoveDown = false;
+	} else if (!this.isScrollBody && this.getScrollTop() === this.startTop) { // scroll-view到顶/左/右/底的滑动事件
+		let isScrollUp = this.getPoint(e).y - this.startPoint.y < 0; // 和起点比,移动的距离,大于0向下拉,小于0向上拉
+		// 上滑
+		if (isScrollUp) {
+			// 需检查滑动的角度
+			let angle = this.getAngle(this.getPoint(e), this.startPoint); // 两点之间的角度,区间 [0,90]
+			if (angle > 80) {
+				// 检查并触发上拉
+				this.triggerUpScroll(true);
+			}
+		}
+	}
+}
+
+/* 根据点击滑动事件获取第一个手指的坐标 */
+MeScroll.prototype.getPoint = function(e) {
+	if (!e) {
+		return {
+			x: 0,
+			y: 0
+		}
+	}
+	if (e.touches && e.touches[0]) {
+		return {
+			x: e.touches[0].pageX,
+			y: e.touches[0].pageY
+		}
+	} else if (e.changedTouches && e.changedTouches[0]) {
+		return {
+			x: e.changedTouches[0].pageX,
+			y: e.changedTouches[0].pageY
+		}
+	} else {
+		return {
+			x: e.clientX,
+			y: e.clientY
+		}
+	}
+}
+
+/* 计算两点之间的角度: 区间 [0,90]*/
+MeScroll.prototype.getAngle = function(p1, p2) {
+	let x = Math.abs(p1.x - p2.x);
+	let y = Math.abs(p1.y - p2.y);
+	let z = Math.sqrt(x * x + y * y);
+	let angle = 0;
+	if (z !== 0) {
+		angle = Math.asin(y / z) / Math.PI * 180;
+	}
+	return angle
+}
+
+/* 触发下拉刷新 */
+MeScroll.prototype.triggerDownScroll = function() {
+	if (this.optDown.beforeLoading && this.optDown.beforeLoading(this)) {
+		//return true则处于完全自定义状态
+	} else {
+		this.showDownScroll(); // 下拉刷新中...
+		!this.optDown.native && this.optDown.callback && this.optDown.callback(this); // 执行回调,联网加载数据
+	}
+}
+
+/* 显示下拉进度布局 */
+MeScroll.prototype.showDownScroll = function() {
+	this.isDownScrolling = true; // 标记下拉中
+	if (this.optDown.native) {
+		uni.startPullDownRefresh(); // 系统自带的下拉刷新
+		this.showDownLoadingCall(0); // 仍触发showLoading,因为上拉加载用到
+	} else{
+		this.downHight = this.optDown.offset; // 更新下拉区域高度
+		this.showDownLoadingCall(this.downHight); // 下拉刷新中...
+	}
+}
+
+MeScroll.prototype.showDownLoadingCall = function(downHight) {
+	this.optDown.showLoading && this.optDown.showLoading(this, downHight); // 下拉刷新中...
+	this.optDown.afterLoading && this.optDown.afterLoading(this, downHight); // 下拉刷新中...触发之后马上要执行的代码
+}
+
+/* 显示系统自带的下拉刷新时需要处理的业务 */
+MeScroll.prototype.onPullDownRefresh = function() {
+	this.isDownScrolling = true; // 标记下拉中
+	this.showDownLoadingCall(0); // 仍触发showLoading,因为上拉加载用到
+	this.optDown.callback && this.optDown.callback(this); // 执行回调,联网加载数据
+}
+
+/* 结束下拉刷新 */
+MeScroll.prototype.endDownScroll = function() {
+	if (this.optDown.native) { // 结束原生下拉刷新
+		this.isDownScrolling = false;
+		this.endDownScrollCall(this);
+		uni.stopPullDownRefresh();
+		return
+	}
+	let me = this;
+	// 结束下拉刷新的方法
+	let endScroll = function() {
+		me.downHight = 0;
+		me.isDownScrolling = false;
+		me.endDownScrollCall(me);
+		if(!me.isScrollBody){
+			me.setScrollHeight(0) // scroll-view重置滚动区域,使数据不满屏时仍可检查触发翻页
+			me.scrollTo(0,0) // scroll-view需重置滚动条到顶部,避免startTop大于0时,对下拉刷新的影响
+		}
+	}
+	// 结束下拉刷新时的回调
+	let delay = 0;
+	if (me.optDown.beforeEndDownScroll) {
+		delay = me.optDown.beforeEndDownScroll(me); // 结束下拉刷新的延时,单位ms
+		if(me.isDownEndSuccess == null) delay = 0; // 没有执行加载中,则不延时
+	}
+	if (typeof delay === 'number' && delay > 0) {
+		setTimeout(endScroll, delay);
+	} else {
+		endScroll();
+	}
+}
+
+MeScroll.prototype.endDownScrollCall = function() {
+	this.optDown.endDownScroll && this.optDown.endDownScroll(this);
+	this.optDown.afterEndDownScroll && this.optDown.afterEndDownScroll(this);
+}
+
+/* 锁定下拉刷新:isLock=ture,null锁定;isLock=false解锁 */
+MeScroll.prototype.lockDownScroll = function(isLock) {
+	if (isLock == null) isLock = true;
+	this.optDown.isLock = isLock;
+}
+
+/* 锁定上拉加载:isLock=ture,null锁定;isLock=false解锁 */
+MeScroll.prototype.lockUpScroll = function(isLock) {
+	if (isLock == null) isLock = true;
+	this.optUp.isLock = isLock;
+}
+
+/* -------初始化上拉加载------- */
+MeScroll.prototype.initUpScroll = function() {
+	let me = this;
+	// 配置参数
+	me.optUp = me.options.up || {use: false}
+	if(!me.optUp.textColor && me.hasColor(me.optUp.bgColor)) me.optUp.textColor = "#fff"; // 当bgColor有值且textColor未设置,则textColor默认白色
+	me.extendUpScroll(me.optUp);
+
+	if (me.optUp.use === false) return; // 配置不使用上拉加载时,则不初始化上拉布局
+	me.optUp.hasNext = true; // 如果使用上拉,则默认有下一页
+	me.startNum = me.optUp.page.num + 1; // 记录page开始的页码
+
+	// 初始化完毕的回调
+	if (me.optUp.inited) {
+		setTimeout(function() { // 待主线程执行完毕再执行,避免new MeScroll未初始化,在回调获取不到mescroll的实例
+			me.optUp.inited(me);
+		}, 0)
+	}
+}
+
+/*滚动到底部的事件 (仅mescroll-body生效)*/
+MeScroll.prototype.onReachBottom = function() {
+	if (this.isScrollBody && !this.isUpScrolling) { // 只能支持下拉刷新的时候同时可以触发上拉加载,否则滚动到底部就需要上滑一点才能触发onReachBottom
+		if (!this.optUp.isLock && this.optUp.hasNext) {
+			this.triggerUpScroll();
+		}
+	}
+}
+
+/*列表滚动事件 (仅mescroll-body生效)*/
+MeScroll.prototype.onPageScroll = function(e) {
+	if (!this.isScrollBody) return;
+	
+	// 更新滚动条的位置 (主要用于判断下拉刷新时,滚动条是否在顶部)
+	this.setScrollTop(e.scrollTop);
+
+	// 顶部按钮的显示隐藏
+	if (e.scrollTop >= this.optUp.toTop.offset) {
+		this.showTopBtn();
+	} else {
+		this.hideTopBtn();
+	}
+}
+
+/*列表滚动事件*/
+MeScroll.prototype.scroll = function(e, onScroll) {
+	// 更新滚动条的位置
+	this.setScrollTop(e.scrollTop);
+	// 更新滚动内容高度
+	this.setScrollHeight(e.scrollHeight);
+
+	// 向上滑还是向下滑动
+	if (this.preScrollY == null) this.preScrollY = 0;
+	this.isScrollUp = e.scrollTop - this.preScrollY > 0;
+	this.preScrollY = e.scrollTop;
+
+	// 上滑 && 检查并触发上拉
+	this.isScrollUp && this.triggerUpScroll(true);
+
+	// 顶部按钮的显示隐藏
+	if (e.scrollTop >= this.optUp.toTop.offset) {
+		this.showTopBtn();
+	} else {
+		this.hideTopBtn();
+	}
+
+	// 滑动监听
+	this.optUp.onScroll && onScroll && onScroll()
+}
+
+/* 触发上拉加载 */
+MeScroll.prototype.triggerUpScroll = function(isCheck) {
+	if (!this.isUpScrolling && this.optUp.use && this.optUp.callback) {
+		// 是否校验在底部; 默认不校验
+		if (isCheck === true) {
+			let canUp = false;
+			// 还有下一页 && 没有锁定 && 不在下拉中
+			if (this.optUp.hasNext && !this.optUp.isLock && !this.isDownScrolling) {
+				if (this.getScrollBottom() <= this.optUp.offset) { // 到底部
+					canUp = true; // 标记可上拉
+				}
+			}
+			if (canUp === false) return;
+		}
+		this.showUpScroll(); // 上拉加载中...
+		this.optUp.page.num++; // 预先加一页,如果失败则减回
+		this.isUpAutoLoad = true; // 标记上拉已经自动执行过,避免初始化时多次触发上拉回调
+		this.num = this.optUp.page.num; // 把最新的页数赋值在mescroll上,避免对page的影响
+		this.size = this.optUp.page.size; // 把最新的页码赋值在mescroll上,避免对page的影响
+		this.time = this.optUp.page.time; // 把最新的页码赋值在mescroll上,避免对page的影响
+		this.optUp.callback(this); // 执行回调,联网加载数据
+	}
+}
+
+/* 显示上拉加载中 */
+MeScroll.prototype.showUpScroll = function() {
+	this.isUpScrolling = true; // 标记上拉加载中
+	this.optUp.showLoading && this.optUp.showLoading(this); // 回调
+}
+
+/* 显示上拉无更多数据 */
+MeScroll.prototype.showNoMore = function() {
+	this.optUp.hasNext = false; // 标记无更多数据
+	this.optUp.showNoMore && this.optUp.showNoMore(this); // 回调
+}
+
+/* 隐藏上拉区域**/
+MeScroll.prototype.hideUpScroll = function() {
+	this.optUp.hideUpScroll && this.optUp.hideUpScroll(this); // 回调
+}
+
+/* 结束上拉加载 */
+MeScroll.prototype.endUpScroll = function(isShowNoMore) {
+	if (isShowNoMore != null) { // isShowNoMore=null,不处理下拉状态,下拉刷新的时候调用
+		if (isShowNoMore) {
+			this.showNoMore(); // isShowNoMore=true,显示无更多数据
+		} else {
+			this.hideUpScroll(); // isShowNoMore=false,隐藏上拉加载
+		}
+	}
+	this.isUpScrolling = false; // 标记结束上拉加载
+}
+
+/* 重置上拉加载列表为第一页
+ *isShowLoading 是否显示进度布局;
+ * 1.默认null,不传参,则显示上拉加载的进度布局
+ * 2.传参true, 则显示下拉刷新的进度布局
+ * 3.传参false,则不显示上拉和下拉的进度 (常用于静默更新列表数据)
+ */
+MeScroll.prototype.resetUpScroll = function(isShowLoading) {
+	if (this.optUp && this.optUp.use) {
+		let page = this.optUp.page;
+		this.prePageNum = page.num; // 缓存重置前的页码,加载失败可退回
+		this.prePageTime = page.time; // 缓存重置前的时间,加载失败可退回
+		page.num = this.startNum; // 重置为第一页
+		page.time = null; // 重置时间为空
+		if (!this.isDownScrolling && isShowLoading !== false) { // 如果不是下拉刷新触发的resetUpScroll并且不配置列表静默更新,则显示进度;
+			if (isShowLoading == null) {
+				this.removeEmpty(); // 移除空布局
+				this.showUpScroll(); // 不传参,默认显示上拉加载的进度布局
+			} else {
+				this.showDownScroll(); // 传true,显示下拉刷新的进度布局,不清空列表
+			}
+		}
+		this.isUpAutoLoad = true; // 标记上拉已经自动执行过,避免初始化时多次触发上拉回调
+		this.num = page.num; // 把最新的页数赋值在mescroll上,避免对page的影响
+		this.size = page.size; // 把最新的页码赋值在mescroll上,避免对page的影响
+		this.time = page.time; // 把最新的页码赋值在mescroll上,避免对page的影响
+		this.optUp.callback && this.optUp.callback(this); // 执行上拉回调
+	}
+}
+
+/* 设置page.num的值 */
+MeScroll.prototype.setPageNum = function(num) {
+	this.optUp.page.num = num - 1;
+}
+
+/* 设置page.size的值 */
+MeScroll.prototype.setPageSize = function(size) {
+	this.optUp.page.size = size;
+}
+
+/* 联网回调成功,结束下拉刷新和上拉加载
+ * dataSize: 当前页的数据量(必传)
+ * totalPage: 总页数(必传)
+ * systime: 服务器时间 (可空)
+ */
+MeScroll.prototype.endByPage = function(dataSize, totalPage, systime) {
+	let hasNext;
+	if (this.optUp.use && totalPage != null) hasNext = this.optUp.page.num < totalPage; // 是否还有下一页
+	this.endSuccess(dataSize, hasNext, systime);
+}
+
+/* 联网回调成功,结束下拉刷新和上拉加载
+ * dataSize: 当前页的数据量(必传)
+ * totalSize: 列表所有数据总数量(必传)
+ * systime: 服务器时间 (可空)
+ */
+MeScroll.prototype.endBySize = function(dataSize, totalSize, systime) {
+	let hasNext;
+	if (this.optUp.use && totalSize != null) {
+		let loadSize = (this.optUp.page.num - 1) * this.optUp.page.size + dataSize; // 已加载的数据总数
+		hasNext = loadSize < totalSize; // 是否还有下一页
+	}
+	this.endSuccess(dataSize, hasNext, systime);
+}
+
+/* 联网回调成功,结束下拉刷新和上拉加载
+ * dataSize: 当前页的数据个数(不是所有页的数据总和),用于上拉加载判断是否还有下一页.如果不传,则会判断还有下一页
+ * hasNext: 是否还有下一页,布尔类型;用来解决这个小问题:比如列表共有20条数据,每页加载10条,共2页.如果只根据dataSize判断,则需翻到第三页才会知道无更多数据,如果传了hasNext,则翻到第二页即可显示无更多数据.
+ * systime: 服务器时间(可空);用来解决这个小问题:当准备翻下一页时,数据库新增了几条记录,此时翻下一页,前面的几条数据会和上一页的重复;这里传入了systime,那么upCallback的page.time就会有值,把page.time传给服务器,让后台过滤新加入的那几条记录
+ */
+MeScroll.prototype.endSuccess = function(dataSize, hasNext, systime) {
+	let me = this;
+	// 结束下拉刷新
+	if (me.isDownScrolling) {
+		me.isDownEndSuccess = true
+		me.endDownScroll();
+	}
+
+	// 结束上拉加载
+	if (me.optUp.use) {
+		let isShowNoMore; // 是否已无更多数据
+		if (dataSize != null) {
+			let pageNum = me.optUp.page.num; // 当前页码
+			let pageSize = me.optUp.page.size; // 每页长度
+			// 如果是第一页
+			if (pageNum === 1) {
+				if (systime) me.optUp.page.time = systime; // 设置加载列表数据第一页的时间
+			}
+			if (dataSize < pageSize || hasNext === false) {
+				// 返回的数据不满一页时,则说明已无更多数据
+				me.optUp.hasNext = false;
+				if (dataSize === 0 && pageNum === 1) {
+					// 如果第一页无任何数据且配置了空布局
+					isShowNoMore = false;
+					me.showEmpty();
+				} else {
+					// 总列表数少于配置的数量,则不显示无更多数据
+					let allDataSize = (pageNum - 1) * pageSize + dataSize;
+					if (allDataSize < me.optUp.noMoreSize) {
+						isShowNoMore = false;
+					} else {
+						isShowNoMore = true;
+					}
+					me.removeEmpty(); // 移除空布局
+				}
+			} else {
+				// 还有下一页
+				isShowNoMore = false;
+				me.optUp.hasNext = true;
+				me.removeEmpty(); // 移除空布局
+			}
+		}
+
+		// 隐藏上拉
+		me.endUpScroll(isShowNoMore);
+	}
+}
+
+/* 回调失败,结束下拉刷新和上拉加载 */
+MeScroll.prototype.endErr = function(errDistance) {
+	// 结束下拉,回调失败重置回原来的页码和时间
+	if (this.isDownScrolling) {
+		this.isDownEndSuccess = false
+		let page = this.optUp.page;
+		if (page && this.prePageNum) {
+			page.num = this.prePageNum;
+			page.time = this.prePageTime;
+		}
+		this.endDownScroll();
+	}
+	// 结束上拉,回调失败重置回原来的页码
+	if (this.isUpScrolling) {
+		this.optUp.page.num--;
+		this.endUpScroll(false);
+		// 如果是mescroll-body,则需往回滚一定距离
+		if(this.isScrollBody && errDistance !== 0){ // 不处理0
+			if(!errDistance) errDistance = this.optUp.errDistance; // 不传,则取默认
+			this.scrollTo(this.getScrollTop() - errDistance, 0) // 往上回滚的距离
+		}
+	}
+}
+
+/* 显示空布局 */
+MeScroll.prototype.showEmpty = function() {
+	this.optUp.empty.use && this.optUp.empty.onShow && this.optUp.empty.onShow(true)
+}
+
+/* 移除空布局 */
+MeScroll.prototype.removeEmpty = function() {
+	this.optUp.empty.use && this.optUp.empty.onShow && this.optUp.empty.onShow(false)
+}
+
+/* 显示回到顶部的按钮 */
+MeScroll.prototype.showTopBtn = function() {
+	if (!this.topBtnShow) {
+		this.topBtnShow = true;
+		this.optUp.toTop.onShow && this.optUp.toTop.onShow(true);
+	}
+}
+
+/* 隐藏回到顶部的按钮 */
+MeScroll.prototype.hideTopBtn = function() {
+	if (this.topBtnShow) {
+		this.topBtnShow = false;
+		this.optUp.toTop.onShow && this.optUp.toTop.onShow(false);
+	}
+}
+
+/* 获取滚动条的位置 */
+MeScroll.prototype.getScrollTop = function() {
+	return this.scrollTop || 0
+}
+
+/* 记录滚动条的位置 */
+MeScroll.prototype.setScrollTop = function(y) {
+	this.scrollTop = y;
+}
+
+/* 滚动到指定位置 */
+MeScroll.prototype.scrollTo = function(y, t) {
+	this.myScrollTo && this.myScrollTo(y, t) // scrollview需自定义回到顶部方法
+}
+
+/* 自定义scrollTo */
+MeScroll.prototype.resetScrollTo = function(myScrollTo) {
+	this.myScrollTo = myScrollTo
+}
+
+/* 滚动条到底部的距离 */
+MeScroll.prototype.getScrollBottom = function() {
+	return this.getScrollHeight() - this.getClientHeight() - this.getScrollTop()
+}
+
+/* 计步器
+ star: 开始值
+ end: 结束值
+ callback(step,timer): 回调step值,计步器timer,可自行通过window.clearInterval(timer)结束计步器;
+ t: 计步时长,传0则直接回调end值;不传则默认300ms
+ rate: 周期;不传则默认30ms计步一次
+ * */
+MeScroll.prototype.getStep = function(star, end, callback, t, rate) {
+	let diff = end - star; // 差值
+	if (t === 0 || diff === 0) {
+		callback && callback(end);
+		return;
+	}
+	t = t || 300; // 时长 300ms
+	rate = rate || 30; // 周期 30ms
+	let count = t / rate; // 次数
+	let step = diff / count; // 步长
+	let i = 0; // 计数
+	let timer = setInterval(function() {
+		if (i < count - 1) {
+			star += step;
+			callback && callback(star, timer);
+			i++;
+		} else {
+			callback && callback(end, timer); // 最后一次直接设置end,避免计算误差
+			clearInterval(timer);
+		}
+	}, rate);
+}
+
+/* 滚动容器的高度 */
+MeScroll.prototype.getClientHeight = function(isReal) {
+	let h = this.clientHeight || 0
+	if (h === 0 && isReal !== true) { // 未获取到容器的高度,可临时取body的高度 (可能会有误差)
+		h = this.getBodyHeight()
+	}
+	return h
+}
+MeScroll.prototype.setClientHeight = function(h) {
+	this.clientHeight = h;
+}
+
+/* 滚动内容的高度 */
+MeScroll.prototype.getScrollHeight = function() {
+	return this.scrollHeight || 0;
+}
+MeScroll.prototype.setScrollHeight = function(h) {
+	this.scrollHeight = h;
+}
+
+/* body的高度 */
+MeScroll.prototype.getBodyHeight = function() {
+	return this.bodyHeight || 0;
+}
+MeScroll.prototype.setBodyHeight = function(h) {
+	this.bodyHeight = h;
+}
+
+/* 阻止浏览器默认滚动事件 */
+MeScroll.prototype.preventDefault = function(e) {
+	// 小程序不支持e.preventDefault, 已在wxs中禁止
+	// app的bounce只能通过配置pages.json的style.app-plus.bounce为"none"来禁止, 或使用renderjs禁止
+	// cancelable:是否可以被禁用; defaultPrevented:是否已经被禁用
+	if (e && e.cancelable && !e.defaultPrevented) e.preventDefault()
+}
\ No newline at end of file
diff --git a/uni-app/src/components/mescroll/mescroll-uni/mescroll-uni.vue b/uni-app/src/components/mescroll/mescroll-uni/mescroll-uni.vue
new file mode 100644
index 00000000..f72f099d
--- /dev/null
+++ b/uni-app/src/components/mescroll/mescroll-uni/mescroll-uni.vue
@@ -0,0 +1,477 @@
+<template>
+	<view class="mescroll-uni-warp">
+		<scroll-view :id="viewId" class="mescroll-uni" :class="{'mescroll-uni-fixed':isFixed}" :style="{'height':scrollHeight,'padding-top':padTop,'padding-bottom':padBottom,'top':fixedTop,'bottom':fixedBottom}" :scroll-top="scrollTop" :scroll-with-animation="scrollAnim" @scroll="scroll" :scroll-y='scrollable' :enable-back-to-top="true" :throttle="false">
+			<view class="mescroll-uni-content mescroll-render-touch"
+			@touchstart="wxsBiz.touchstartEvent" 
+			@touchmove="wxsBiz.touchmoveEvent" 
+			@touchend="wxsBiz.touchendEvent" 
+			@touchcancel="wxsBiz.touchendEvent"
+			:change:prop="wxsBiz.propObserver"
+			:prop="wxsProp">
+				<!-- 状态栏 -->
+				<view v-if="topbar&&statusBarHeight" class="mescroll-topbar" :style="{height: statusBarHeight+'px', background: topbar}"></view>
+		
+				<view class="mescroll-wxs-content" :style="{'transform': translateY, 'transition': transition}" :change:prop="wxsBiz.callObserver" :prop="callProp">
+					<!-- 下拉加载区域 (支付宝小程序子组件传参给子子组件仍报单项数据流的异常,暂时不通过mescroll-down组件实现)-->
+					<!-- <mescroll-down :option="mescroll.optDown" :type="downLoadType" :rate="downRate"></mescroll-down> -->
+					<view v-if="mescroll.optDown.use" class="mescroll-downwarp" :style="{'background':mescroll.optDown.bgColor,'color':mescroll.optDown.textColor}">
+						<view class="downwarp-content">
+							<view class="downwarp-progress mescroll-wxs-progress" :class="{'mescroll-rotate': isDownLoading}" :style="{'border-color':mescroll.optDown.textColor, 'transform': downRotate}"></view>
+							<view class="downwarp-tip">{{downText}}</view>
+						</view>
+					</view>
+
+					<!-- 列表内容 -->
+					<slot></slot>
+
+					<!-- 空布局 -->
+					<mescroll-empty v-if="isShowEmpty" :option="mescroll.optUp.empty" @emptyclick="emptyClick"></mescroll-empty>
+
+					<!-- 上拉加载区域 (下拉刷新时不显示, 支付宝小程序子组件传参给子子组件仍报单项数据流的异常,暂时不通过mescroll-up组件实现)-->
+					<!-- <mescroll-up v-if="mescroll.optUp.use && !isDownLoading && upLoadType!==3" :option="mescroll.optUp" :type="upLoadType"></mescroll-up> -->
+					<view v-if="mescroll.optUp.use && !isDownLoading && upLoadType!==3" class="mescroll-upwarp" :style="{'background':mescroll.optUp.bgColor,'color':mescroll.optUp.textColor}">
+						<!-- 加载中 (此处不能用v-if,否则android小程序快速上拉可能会不断触发上拉回调) -->
+						<view v-show="upLoadType===1">
+							<view class="upwarp-progress mescroll-rotate" :style="{'border-color':mescroll.optUp.textColor}"></view>
+							<view class="upwarp-tip">{{ mescroll.optUp.textLoading }}</view>
+						</view>
+						<!-- 无数据 -->
+						<view v-if="upLoadType===2" class="upwarp-nodata">{{ mescroll.optUp.textNoMore }}</view>
+					</view>
+				</view>
+			
+				<!-- 底部是否偏移TabBar的高度(默认仅在H5端的tab页生效) -->
+				<!-- #ifdef H5 -->
+				<view v-if="bottombar && windowBottom>0" class="mescroll-bottombar" :style="{height: windowBottom+'px'}"></view>
+				<!-- #endif -->
+				
+				<!-- 适配iPhoneX -->
+				<view v-if="safearea" class="mescroll-safearea"></view>
+			</view>
+		</scroll-view>
+
+		<!-- 回到顶部按钮 (fixed元素,需写在scroll-view外面,防止滚动的时候抖动)-->
+		<mescroll-top v-model="isShowToTop" :option="mescroll.optUp.toTop" @click="toTopClick"></mescroll-top>
+		
+		<!-- #ifdef MP-WEIXIN || MP-QQ || APP-PLUS || H5 -->
+		<!-- renderjs的数据载体,不可写在mescroll-downwarp内部,避免use为false时,载体丢失,无法更新数据 -->
+		<view :change:prop="renderBiz.propObserver" :prop="wxsProp"></view>
+		<!-- #endif -->
+	</view>
+</template>
+
+<!-- 微信小程序, QQ小程序, app, h5使用wxs -->
+<!-- #ifdef MP-WEIXIN || MP-QQ || APP-PLUS || H5 -->
+<script src="./wxs/wxs.wxs" module="wxsBiz" lang="wxs"></script>
+<!-- #endif -->
+
+<!-- app, h5使用renderjs -->
+<!-- #ifdef APP-PLUS || H5 -->
+<script module="renderBiz" lang="renderjs">
+	import renderBiz from './wxs/renderjs.js';
+	export default {
+		mixins:[renderBiz]
+	}
+</script>
+<!-- #endif -->
+
+<script>
+	// 引入mescroll-uni.js,处理核心逻辑
+	import MeScroll from './mescroll-uni.js';
+	// 引入全局配置
+	import GlobalOption from './mescroll-uni-option.js';
+	// 引入国际化工具类
+	import mescrollI18n from './mescroll-i18n.js';
+	// 引入回到顶部组件
+	import MescrollTop from './components/mescroll-top.vue';
+	// 引入兼容wxs(含renderjs)写法的mixins
+	import WxsMixin from './wxs/mixins.js';
+	
+	/**
+	 * mescroll-uni 嵌在页面某个区域的下拉刷新和上拉加载组件, 如嵌在弹窗,浮层,swiper中...
+	 * @property {Object} down 下拉刷新的参数配置
+	 * @property {Object} up 上拉加载的参数配置
+	 * @property {Object} i18n 国际化的参数配置
+	 * @property {String, Number} top 下拉布局往下的偏移量 (支持20, "20rpx", "20px", "20%"格式的值, 其中纯数字则默认单位rpx, 百分比则相对于windowHeight)
+	 * @property {Boolean, String} topbar 偏移量top是否加上状态栏高度, 默认false (使用场景:取消原生导航栏时,配置此项可留出状态栏的占位, 支持传入字符串背景,如色值,背景图,渐变)
+	 * @property {String, Number} bottom 上拉布局往上的偏移量 (支持20, "20rpx", "20px", "20%"格式的值, 其中纯数字则默认单位rpx, 百分比则相对于windowHeight)
+	 * @property {Boolean} safearea 偏移量bottom是否加上底部安全区的距离, 默认false (需要适配iPhoneX时使用)
+	 * @property {Boolean} fixed 是否通过fixed固定mescroll的高度, 默认true
+	 * @property {String, Number} height 指定mescroll的高度, 此项有值,则不使用fixed. (支持20, "20rpx", "20px", "20%"格式的值, 其中纯数字则默认单位rpx, 百分比则相对于windowHeight)
+	 * @property {Boolean} bottombar 底部是否偏移TabBar的高度 (仅在H5端的tab页生效)
+	 * @property {Boolean} disableScroll 是否禁止滚动, 默认false
+	 * @event {Function} init 初始化完成的回调 
+	 * @event {Function} down 下拉刷新的回调
+	 * @event {Function} up 上拉加载的回调 
+	 * @event {Function} emptyclick 点击empty配置的btnText按钮回调
+	 * @event {Function} topclick 点击回到顶部的按钮回调
+	 * @event {Function} scroll 滚动监听 (需在 up 配置 onScroll:true 才生效)
+	 * @example <mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"> ... </mescroll-uni>
+	 */
+	export default {
+		name: 'mescroll-uni',
+		mixins: [WxsMixin],
+		components: {
+			MescrollTop
+		},
+		props: {
+			down: Object,
+			up: Object,
+			i18n: Object,
+			top: [String, Number],
+			topbar: [Boolean, String],
+			bottom: [String, Number],
+			safearea: Boolean,
+			fixed: {
+				type: Boolean,
+				default: true
+			},
+			height: [String, Number],
+			bottombar:{
+				type: Boolean,
+				default: true
+			},
+			disableScroll: Boolean
+		},
+		data() {
+			return {
+				mescroll: {optDown:{},optUp:{}}, // mescroll实例
+				viewId: 'id_' + Math.random().toString(36).substr(2,16), // 随机生成mescroll的id(不能数字开头,否则找不到元素)
+				downHight: 0, //下拉刷新: 容器高度
+				downRate: 0, // 下拉比率(inOffset: rate<1; outOffset: rate>=1)
+				downLoadType: 0, // 下拉刷新状态: 0(loading前), 1(inOffset), 2(outOffset), 3(showLoading), 4(endDownScroll)
+				upLoadType: 0, // 上拉加载状态: 0(loading前), 1loading中, 2没有更多了,显示END文本提示, 3(没有更多了,不显示END文本提示)
+				isShowEmpty: false, // 是否显示空布局
+				isShowToTop: false, // 是否显示回到顶部按钮
+				scrollTop: 0, // 滚动条的位置
+				scrollAnim: false, // 是否开启滚动动画
+				windowTop: 0, // 可使用窗口的顶部位置
+				windowBottom: 0, // 可使用窗口的底部位置
+				windowHeight: 0, // 可使用窗口的高度
+				statusBarHeight: 0 // 状态栏高度
+			}
+		},
+		computed: {
+			// 是否使用fixed定位 (当height有值,则不使用)
+			isFixed(){
+				return !this.height && this.fixed
+			},
+			// mescroll的高度
+			scrollHeight(){
+				if (this.isFixed) {
+					return "auto"
+				} else if(this.height){
+					return this.toPx(this.height) + 'px'
+				}else{
+					return "100%"
+				}
+			},
+			// 下拉布局往下偏移的距离 (px)
+			numTop() {
+				return this.toPx(this.top)
+			},
+			fixedTop() {
+				return this.isFixed ? (this.numTop + this.windowTop) + 'px' : 0
+			},
+			padTop() {
+				return !this.isFixed ? this.numTop + 'px' : 0
+			},
+			// 上拉布局往上偏移 (px)
+			numBottom() {
+				return this.toPx(this.bottom)
+			},
+			fixedBottom() {
+				return this.isFixed ? (this.numBottom + this.windowBottom) + 'px' : 0
+			},
+			padBottom() {
+				return !this.isFixed ? this.numBottom + 'px' : 0
+			},
+			// 是否为重置下拉的状态
+			isDownReset(){
+				return this.downLoadType===3 || this.downLoadType===4
+			},
+			// 过渡
+			transition() {
+				return this.isDownReset ? 'transform 300ms' : '';
+			},
+			translateY() {
+				return this.downHight > 0 ? 'translateY(' + this.downHight + 'px)' : ''; // transform会使fixed失效,需注意把fixed元素写在mescroll之外
+			},
+			// 列表是否可滑动
+			scrollable(){
+				if(this.disableScroll) return false
+				return this.downLoadType===0 || this.isDownReset
+			},
+			// 是否在加载中
+			isDownLoading(){
+				return this.downLoadType === 3
+			},
+			// 旋转的角度
+			downRotate(){
+				return 'rotate(' + 360 * this.downRate + 'deg)'
+			},
+			// 文本提示
+			downText(){
+				if(!this.mescroll) return ""; // 避免头条小程序初始化时报错
+				switch (this.downLoadType){
+					case 1: return this.mescroll.optDown.textInOffset;
+					case 2: return this.mescroll.optDown.textOutOffset;
+					case 3: return this.mescroll.optDown.textLoading;
+					case 4: return this.mescroll.isDownEndSuccess ? this.mescroll.optDown.textSuccess : this.mescroll.isDownEndSuccess==false ? this.mescroll.optDown.textErr : this.mescroll.optDown.textInOffset;
+					default: return this.mescroll.optDown.textInOffset;
+				}
+			}
+		},
+		methods: {
+			//number,rpx,upx,px,% --> px的数值
+			toPx(num){
+				if(typeof num === "string"){
+					if (num.indexOf('px') !== -1) {
+						if(num.indexOf('rpx') !== -1) { // "10rpx"
+							num = num.replace('rpx', '');
+						} else if(num.indexOf('upx') !== -1) { // "10upx"
+							num = num.replace('upx', '');
+						} else { // "10px"
+							return Number(num.replace('px', ''))
+						}
+					}else if (num.indexOf('%') !== -1){
+						// 传百分比,则相对于windowHeight,传"10%"则等于windowHeight的10%
+						let rate = Number(num.replace("%","")) / 100
+						return this.windowHeight * rate
+					}
+				}
+				return num ? uni.upx2px(Number(num)) : 0
+			},
+			//注册列表滚动事件,用于下拉刷新和上拉加载
+			scroll(e) {
+				this.mescroll.scroll(e.detail, () => {
+					this.$emit('scroll', this.mescroll) // 此时可直接通过 this.mescroll.scrollTop获取滚动条位置; this.mescroll.isScrollUp获取是否向上滑动
+				})
+			},
+			// 点击空布局的按钮回调
+			emptyClick() {
+				this.$emit('emptyclick', this.mescroll)
+			},
+			// 点击回到顶部的按钮回调
+			toTopClick() {
+				this.mescroll.scrollTo(0, this.mescroll.optUp.toTop.duration); // 执行回到顶部
+				this.$emit('topclick', this.mescroll); // 派发点击回到顶部按钮的回调
+			},
+			// 更新滚动区域的高度 (使内容不满屏和到底,都可继续翻页)
+			setClientHeight() {
+				if (this.mescroll.getClientHeight(true) === 0 && !this.isExec) {
+					this.isExec = true; // 避免多次获取
+					this.$nextTick(() => { // 确保dom已渲染
+						this.getClientInfo(data=>{
+							this.isExec = false;
+							if (data) {
+								this.mescroll.setClientHeight(data.height);
+							} else if (this.clientNum != 3) { // 极少部分情况,可能dom还未渲染完毕,递归获取,最多重试3次
+								this.clientNum = this.clientNum == null ? 1 : this.clientNum + 1;
+								setTimeout(() => {
+									this.setClientHeight()
+								}, this.clientNum * 100)
+							}
+						})
+					})
+				}
+			},
+			// 获取滚动区域的信息
+			getClientInfo(success){
+				let query = uni.createSelectorQuery();
+				// #ifndef MP-ALIPAY || MP-DINGTALK
+				query = query.in(this) // 支付宝小程序不支持in(this),而字节跳动小程序必须写in(this), 否则都取不到值
+				// #endif
+				let view = query.select('#' + this.viewId);
+				view.boundingClientRect(data => {
+					success(data)
+				}).exec();
+			}
+		},
+		// 使用created初始化mescroll对象; 如果用mounted部分css样式编译到H5会失效
+		created() {
+			let vm = this;
+
+			let diyOption = {
+				// 下拉刷新的配置
+				down: {
+					inOffset() {
+						vm.downLoadType = 1; // 下拉的距离进入offset范围内那一刻的回调 (自定义mescroll组件时,此行不可删)
+					},
+					outOffset() {
+						vm.downLoadType = 2; // 下拉的距离大于offset那一刻的回调 (自定义mescroll组件时,此行不可删)
+					},
+					onMoving(mescroll, rate, downHight) {
+						// 下拉过程中的回调,滑动过程一直在执行;
+						vm.downHight = downHight; // 设置下拉区域的高度 (自定义mescroll组件时,此行不可删)
+						vm.downRate = rate; //下拉比率 (inOffset: rate<1; outOffset: rate>=1)
+					},
+					showLoading(mescroll, downHight) {
+						vm.downLoadType = 3; // 显示下拉刷新进度的回调 (自定义mescroll组件时,此行不可删)
+						vm.downHight = downHight; // 设置下拉区域的高度 (自定义mescroll组件时,此行不可删)
+					},
+					beforeEndDownScroll(mescroll){
+						vm.downLoadType = 4; 
+						return mescroll.optDown.beforeEndDelay // 延时结束的时长
+					},
+					endDownScroll() {
+						vm.downLoadType = 4; // 结束下拉 (自定义mescroll组件时,此行不可删)
+						vm.downHight = 0; // 设置下拉区域的高度 (自定义mescroll组件时,此行不可删)
+						vm.downResetTimer && clearTimeout(vm.downResetTimer)
+						vm.downResetTimer = setTimeout(()=>{ // 过渡动画执行完毕后,需重置为0的状态,以便置空this.transition,避免iOS小程序列表渲染不完整
+							if(vm.downLoadType===4) vm.downLoadType = 0
+						},300)
+					},
+					// 派发下拉刷新的回调
+					callback: function(mescroll) {
+						vm.$emit('down', mescroll)
+					}
+				},
+				// 上拉加载的配置
+				up: {
+					// 显示加载中的回调
+					showLoading() {
+						vm.upLoadType = 1;
+					},
+					// 显示无更多数据的回调
+					showNoMore() {
+						vm.upLoadType = 2;
+					},
+					// 隐藏上拉加载的回调
+					hideUpScroll(mescroll) {
+						vm.upLoadType = mescroll.optUp.hasNext ? 0 : 3;
+					},
+					// 空布局
+					empty: {
+						onShow(isShow) { // 显示隐藏的回调
+							vm.isShowEmpty = isShow;
+						}
+					},
+					// 回到顶部
+					toTop: {
+						onShow(isShow) { // 显示隐藏的回调
+							vm.isShowToTop = isShow;
+						}
+					},
+					// 派发上拉加载的回调
+					callback: function(mescroll) {
+						vm.$emit('up', mescroll);
+						// 更新容器的高度 (多mescroll的情况)
+						vm.setClientHeight()
+					}
+				}
+			}
+
+			let i18nType = mescrollI18n.getType() // 当前语言类型
+			let i18nOption = {type: i18nType} // 国际化配置
+			MeScroll.extend(i18nOption, vm.i18n) // 具体页面的国际化配置
+			MeScroll.extend(i18nOption, GlobalOption.i18n) // 全局的国际化配置
+			MeScroll.extend(diyOption, i18nOption[i18nType]); // 混入国际化配置
+			MeScroll.extend(diyOption, {down:GlobalOption.down, up:GlobalOption.up}); // 混入全局的配置
+			let myOption = JSON.parse(JSON.stringify({'down': vm.down,'up': vm.up})) // 深拷贝,避免对props的影响
+			MeScroll.extend(myOption, diyOption); // 混入具体界面的配置
+
+			// 初始化MeScroll对象
+			vm.mescroll = new MeScroll(myOption);
+			vm.mescroll.viewId = vm.viewId; // 附带id
+			vm.mescroll.i18n = i18nOption; // 挂载语言包
+			// init回调mescroll对象
+			vm.$emit('init', vm.mescroll);
+			
+			// 设置高度
+			const sys = uni.getSystemInfoSync();
+			if(sys.windowTop) vm.windowTop = sys.windowTop;
+			if(sys.windowBottom) vm.windowBottom = sys.windowBottom;
+			if(sys.windowHeight) vm.windowHeight = sys.windowHeight;
+			if(sys.statusBarHeight) vm.statusBarHeight = sys.statusBarHeight;
+			// 使down的bottomOffset生效
+			vm.mescroll.setBodyHeight(sys.windowHeight);
+
+			// 因为使用的是scrollview,这里需自定义scrollTo
+			vm.mescroll.resetScrollTo((y, t) => {
+				vm.scrollAnim = (t !== 0); // t为0,则不使用动画过渡
+				if(typeof y === 'string'){
+					// 小程序不支持slot里面的scroll-into-view, 统一使用计算的方式实现
+					vm.getClientInfo(function(rect){
+						let mescrollTop = rect.top // mescroll到顶部的距离
+						let selector;
+						if(y.indexOf('#')==-1 && y.indexOf('.')==-1){
+							selector = '#'+y // 不带#和. 则默认为id选择器
+						}else{
+							selector = y
+							// #ifdef APP-PLUS || H5 || MP-ALIPAY || MP-DINGTALK
+							if(y.indexOf('>>>')!=-1){ // 不支持跨自定义组件的后代选择器 (转为普通的选择器即可跨组件查询)
+								selector = y.split('>>>')[1].trim()
+							}
+							// #endif
+						}
+						uni.createSelectorQuery().select(selector).boundingClientRect(function(rect){
+							if (rect) {
+								let curY = vm.mescroll.getScrollTop()
+								let top = rect.top - mescrollTop
+								top += curY
+								if(!vm.isFixed) top -= vm.numTop
+								vm.scrollTop = curY;
+								vm.$nextTick(function() {
+									vm.scrollTop = top
+								})
+							} else{
+								console.error(selector + ' does not exist');
+							}
+						}).exec()
+					})
+					return;
+				}
+				let curY = vm.mescroll.getScrollTop()
+				if (t === 0 || t === 300) { // 当t使用默认配置的300时,则使用系统自带的动画过渡
+					vm.scrollTop = curY;
+					vm.$nextTick(function() {
+						vm.scrollTop = y
+					})
+				} else {
+					vm.mescroll.getStep(curY, y, step => { // 此写法可支持配置t
+						vm.scrollTop = step
+					}, t)
+				}
+			})
+			
+			// 具体的界面如果不配置up.toTop.safearea,则取本vue的safearea值
+			if (vm.up && vm.up.toTop && vm.up.toTop.safearea != null) {} else {
+				vm.mescroll.optUp.toTop.safearea = vm.safearea;
+			}
+			
+			// 全局配置监听
+			uni.$on("setMescrollGlobalOption", options=>{
+				if(!options) return;
+				let i18nType = options.i18n ? options.i18n.type : null
+				if(i18nType && vm.mescroll.i18n.type != i18nType){
+					vm.mescroll.i18n.type = i18nType
+					mescrollI18n.setType(i18nType)
+					MeScroll.extend(options, vm.mescroll.i18n[i18nType])
+				}
+				if(options.down){
+					let down = MeScroll.extend({}, options.down)
+					vm.mescroll.optDown = MeScroll.extend(down, vm.mescroll.optDown)
+				}
+				if(options.up){
+					let up = MeScroll.extend({}, options.up)
+					vm.mescroll.optUp = MeScroll.extend(up, vm.mescroll.optUp)
+				}
+			})
+		},
+		mounted() {
+			// 设置容器的高度
+			this.setClientHeight()
+		},
+		destroyed() {
+			// 注销全局配置监听
+			uni.$off("setMescrollGlobalOption")
+		}
+	}
+</script>
+
+<style>
+	@import "./mescroll-uni.css";
+	@import "./components/mescroll-down.css";
+	@import './components/mescroll-up.css';
+</style>
diff --git a/uni-app/src/components/mescroll/mescroll-uni/wxs/mixins.js b/uni-app/src/components/mescroll/mescroll-uni/wxs/mixins.js
new file mode 100644
index 00000000..34ffa3c2
--- /dev/null
+++ b/uni-app/src/components/mescroll/mescroll-uni/wxs/mixins.js
@@ -0,0 +1,109 @@
+// 定义在wxs (含renderjs) 逻辑层的数据和方法, 与视图层相互通信
+const WxsMixin = {
+	data() {
+		return {
+			// 传入wxs视图层的数据 (响应式)
+			wxsProp: {
+				optDown:{}, // 下拉刷新的配置
+				scrollTop:0, // 滚动条的距离
+				bodyHeight:0, // body的高度
+				isDownScrolling:false, // 是否正在下拉刷新中
+				isUpScrolling:false, // 是否正在上拉加载中
+				isScrollBody:true, // 是否为mescroll-body滚动
+				isUpBoth:true, // 上拉加载时,是否同时可以下拉刷新
+				t: 0 // 数据更新的标记 (只有数据更新了,才会触发wxs的Observer)
+			},
+			
+			// 标记调用wxs视图层的方法
+			callProp: {
+				callType: '', // 方法名
+				t: 0 // 数据更新的标记 (只有数据更新了,才会触发wxs的Observer)
+			},
+			
+			// 不用wxs的平台使用此处的wxsBiz对象,抹平wxs的写法 (微信小程序和APP使用的wxsBiz对象是./wxs/wxs.wxs)
+			// #ifndef MP-WEIXIN || MP-QQ || APP-PLUS || H5
+			wxsBiz: {
+				//注册列表touchstart事件,用于下拉刷新
+				touchstartEvent: e=> {
+					this.mescroll.touchstartEvent(e);
+				},
+				//注册列表touchmove事件,用于下拉刷新
+				touchmoveEvent: e=> {
+					this.mescroll.touchmoveEvent(e);
+				},
+				//注册列表touchend事件,用于下拉刷新
+				touchendEvent: e=> {
+					this.mescroll.touchendEvent(e);
+				},
+				propObserver(){}, // 抹平wxs的写法
+				callObserver(){} // 抹平wxs的写法
+			},
+			// #endif
+			
+			// 不用renderjs的平台使用此处的renderBiz对象,抹平renderjs的写法 (app 和 h5 使用的renderBiz对象是./wxs/renderjs.js)
+			// #ifndef APP-PLUS || H5
+			renderBiz: {
+				propObserver(){} // 抹平renderjs的写法
+			}
+			// #endif
+		}
+	},
+	methods: {
+		// wxs视图层调用逻辑层的回调
+		wxsCall(msg){
+			if(msg.type === 'setWxsProp'){
+				// 更新wxsProp数据 (值改变才触发更新)
+				this.wxsProp = {
+					optDown: this.mescroll.optDown,
+					scrollTop: this.mescroll.getScrollTop(),
+					bodyHeight: this.mescroll.getBodyHeight(),
+					isDownScrolling: this.mescroll.isDownScrolling,
+					isUpScrolling: this.mescroll.isUpScrolling,
+					isUpBoth: this.mescroll.optUp.isBoth,
+					isScrollBody:this.mescroll.isScrollBody,
+					t: Date.now()
+				}
+			}else if(msg.type === 'setLoadType'){
+				// 设置inOffset,outOffset的状态
+				this.downLoadType = msg.downLoadType
+				// 状态挂载到mescroll对象, 以便在其他组件中使用, 比如<me-video>中
+				this.$set(this.mescroll, 'downLoadType', this.downLoadType)
+				// 重置是否加载成功的状态
+				this.$set(this.mescroll, 'isDownEndSuccess', null)
+			}else if(msg.type === 'triggerDownScroll'){
+				// 主动触发下拉刷新
+				this.mescroll.triggerDownScroll();
+			}else if(msg.type === 'endDownScroll'){
+				// 结束下拉刷新
+				this.mescroll.endDownScroll();
+			}else if(msg.type === 'triggerUpScroll'){
+				// 主动触发上拉加载
+				this.mescroll.triggerUpScroll(true);
+			}
+		}
+	},
+	mounted() {
+		// #ifdef MP-WEIXIN || MP-QQ || APP-PLUS || H5
+		// 配置主动触发wxs显示加载进度的回调
+		this.mescroll.optDown.afterLoading = ()=>{
+			this.callProp = {callType: "showLoading", t: Date.now()} // 触发wxs的方法 (值改变才触发更新)
+		}
+		// 配置主动触发wxs隐藏加载进度的回调
+		this.mescroll.optDown.afterEndDownScroll = ()=>{
+			this.callProp = {callType: "endDownScroll", t: Date.now()} // 触发wxs的方法 (值改变才触发更新)
+			let delay = 300 + (this.mescroll.optDown.beforeEndDelay || 0)
+			setTimeout(()=>{
+				if(this.downLoadType === 4 || this.downLoadType === 0){
+					this.callProp = {callType: "clearTransform", t: Date.now()} // 触发wxs的方法 (值改变才触发更新)
+				}
+				// 状态挂载到mescroll对象, 以便在其他组件中使用, 比如<me-video>中
+				this.$set(this.mescroll, 'downLoadType', this.downLoadType)
+			}, delay)
+		}
+		// 初始化wxs的数据
+		this.wxsCall({type: 'setWxsProp'})
+		// #endif
+	}
+}
+
+export default WxsMixin;
diff --git a/uni-app/src/components/mescroll/mescroll-uni/wxs/renderjs.js b/uni-app/src/components/mescroll/mescroll-uni/wxs/renderjs.js
new file mode 100644
index 00000000..207f3885
--- /dev/null
+++ b/uni-app/src/components/mescroll/mescroll-uni/wxs/renderjs.js
@@ -0,0 +1,92 @@
+// 使用renderjs直接操作window对象,实现动态控制app和h5的bounce
+// bounce: iOS橡皮筋,Android半月弧,h5浏览器下拉背景等效果 (下拉刷新时禁止)
+// https://uniapp.dcloud.io/frame?id=renderjs
+
+// 与wxs的me实例一致
+var me = {}
+
+// 初始化window对象的touch事件 (仅初始化一次)
+if(window && !window.$mescrollRenderInit){
+	window.$mescrollRenderInit = true
+	
+	
+	window.addEventListener('touchstart', function(e){
+		if (me.disabled()) return;
+		me.startPoint = me.getPoint(e); // 记录起点
+	}, {passive: true})
+	
+	
+	window.addEventListener('touchmove', function(e){
+		if (me.disabled()) return;
+		if (me.getScrollTop() > 0) return; // 需在顶部下拉,才禁止bounce
+		
+		var curPoint = me.getPoint(e); // 当前点
+		var moveY = curPoint.y - me.startPoint.y; // 和起点比,移动的距离,大于0向下拉,小于0向上拉
+		// 向下拉
+		if (moveY > 0) {
+			// 可下拉的条件
+			if (!me.isDownScrolling && !me.optDown.isLock && (!me.isUpScrolling || (me.isUpScrolling && me.isUpBoth))) {
+				
+				// 只有touch在mescroll的view上面,才禁止bounce
+				var el = e.target;
+				var isMescrollTouch = false;
+				while (el && el.tagName && el.tagName !== 'UNI-PAGE-BODY' && el.tagName != "BODY") {
+					var cls = el.classList;
+					if (cls && cls.contains('mescroll-render-touch')) {
+						isMescrollTouch = true
+						break;
+					}
+					el = el.parentNode; // 继续检查其父元素
+				}
+				// 禁止bounce (不会对swiper和iOS侧滑返回造成影响)
+				if (isMescrollTouch && e.cancelable && !e.defaultPrevented) e.preventDefault();
+			}
+		}
+	}, {passive: false})
+}
+
+/* 获取滚动条的位置 */
+me.getScrollTop = function() {
+	return me.scrollTop || 0
+}
+
+/* 是否禁用下拉刷新 */
+me.disabled = function(){
+	return !me.optDown || !me.optDown.use || me.optDown.native
+}
+
+/* 根据点击滑动事件获取第一个手指的坐标 */
+me.getPoint = function(e) {
+	if (!e) {
+		return {x: 0,y: 0}
+	}
+	if (e.touches && e.touches[0]) {
+		return {x: e.touches[0].pageX,y: e.touches[0].pageY}
+	} else if (e.changedTouches && e.changedTouches[0]) {
+		return {x: e.changedTouches[0].pageX,y: e.changedTouches[0].pageY}
+	} else {
+		return {x: e.clientX,y: e.clientY}
+	}
+}
+
+/**
+ * 监听逻辑层数据的变化 (实时更新数据)
+ */
+function propObserver(wxsProp) {
+	me.optDown = wxsProp.optDown
+	me.scrollTop = wxsProp.scrollTop
+	me.isDownScrolling = wxsProp.isDownScrolling
+	me.isUpScrolling = wxsProp.isUpScrolling
+	me.isUpBoth = wxsProp.isUpBoth
+}
+
+/* 导出模块 */
+const renderBiz = {
+	data() {
+		return {
+			propObserver: propObserver,
+		}
+	}
+}
+
+export default renderBiz;
\ No newline at end of file
diff --git a/uni-app/src/components/mescroll/mescroll-uni/wxs/wxs.wxs b/uni-app/src/components/mescroll/mescroll-uni/wxs/wxs.wxs
new file mode 100644
index 00000000..3fb4ad9f
--- /dev/null
+++ b/uni-app/src/components/mescroll/mescroll-uni/wxs/wxs.wxs
@@ -0,0 +1,268 @@
+// 使用wxs处理交互动画, 提高性能, 同时避免小程序bounce对下拉刷新的影响
+// https://uniapp.dcloud.io/frame?id=wxs
+// https://developers.weixin.qq.com/miniprogram/dev/framework/view/interactive-animation.html 
+
+// 模拟mescroll实例, 与mescroll.js的写法尽量保持一致
+var me = {}
+
+// ------ 自定义下拉刷新动画 start ------
+
+/* 下拉过程中的回调,滑动过程一直在执行 (rate<1为inOffset; rate>1为outOffset) */
+me.onMoving = function (ins, rate, downHight){
+	ins.requestAnimationFrame(function () {
+		ins.selectComponent('.mescroll-wxs-content').setStyle({
+			'will-change': 'transform', // 可解决下拉过程中, image和swiper脱离文档流的问题
+			'transform': 'translateY(' + downHight + 'px)',
+			'transition': ''
+		})
+		// 环形进度条
+		var progress = ins.selectComponent('.mescroll-wxs-progress')
+		progress && progress.setStyle({transform: 'rotate(' + 360 * rate + 'deg)'})
+	})
+}
+
+/* 显示下拉刷新进度 */
+me.showLoading = function (ins){
+	me.downHight = me.optDown.offset
+	ins.requestAnimationFrame(function () {
+		ins.selectComponent('.mescroll-wxs-content').setStyle({
+			'will-change': 'auto',
+			'transform': 'translateY(' + me.downHight + 'px)',
+			'transition': 'transform 300ms'
+		})
+	})
+}
+
+/* 结束下拉 */
+me.endDownScroll = function (ins){
+	me.downHight = 0;
+	me.isDownScrolling = false;
+	ins.requestAnimationFrame(function () {
+		ins.selectComponent('.mescroll-wxs-content').setStyle({
+			'will-change': 'auto',
+			'transform': 'translateY(0)', // 不可以写空串,否则scroll-view渲染不完整 (延时350ms会调clearTransform置空)
+			'transition': 'transform 300ms'
+		})
+	})
+}
+
+/* 结束下拉动画执行完毕后, 清除transform和transition, 避免对列表内容样式造成影响, 如: h5的list-msg示例下拉进度条漏出来等 */
+me.clearTransform = function (ins){
+	ins.requestAnimationFrame(function () {
+		ins.selectComponent('.mescroll-wxs-content').setStyle({
+			'will-change': '',
+			'transform': '',
+			'transition': ''
+		})
+	})
+}
+
+// ------ 自定义下拉刷新动画 end ------
+
+/**
+ * 监听逻辑层数据的变化 (实时更新数据)
+ */
+function propObserver(wxsProp) {
+	me.optDown = wxsProp.optDown
+	me.scrollTop = wxsProp.scrollTop
+	me.bodyHeight = wxsProp.bodyHeight
+	me.isDownScrolling = wxsProp.isDownScrolling
+	me.isUpScrolling = wxsProp.isUpScrolling
+	me.isUpBoth = wxsProp.isUpBoth
+	me.isScrollBody = wxsProp.isScrollBody
+	me.startTop = wxsProp.scrollTop // 及时更新touchstart触发的startTop, 避免scroll-view快速惯性滚动到顶部取值不准确
+}
+
+/**
+ * 监听逻辑层数据的变化 (调用wxs的方法)
+ */
+function callObserver(callProp, oldValue, ins) {
+	if (me.disabled()) return;
+	if(callProp.callType){
+		// 逻辑层（App Service）的style已失效,需在视图层（Webview）设置style
+		if(callProp.callType === 'showLoading'){
+			me.showLoading(ins)
+		}else if(callProp.callType === 'endDownScroll'){
+			me.endDownScroll(ins)
+		}else if(callProp.callType === 'clearTransform'){
+			me.clearTransform(ins)
+		}
+	}
+}
+
+/**
+ * touch事件
+ */
+function touchstartEvent(e, ins) {
+	me.downHight = 0; // 下拉的距离
+	me.startPoint = me.getPoint(e); // 记录起点
+	me.startTop = me.getScrollTop(); // 记录此时的滚动条位置
+	me.startAngle = 0; // 初始角度
+	me.lastPoint = me.startPoint; // 重置上次move的点
+	me.maxTouchmoveY = me.getBodyHeight() - me.optDown.bottomOffset; // 手指触摸的最大范围(写在touchstart避免body获取高度为0的情况)
+	me.inTouchend = false; // 标记不是touchend
+	
+	me.callMethod(ins, {type: 'setWxsProp'}) // 同步更新wxsProp的数据 (小程序是异步的,可能touchmove先执行,才到propObserver; h5和app是同步)
+}
+
+function touchmoveEvent(e, ins) {
+	var isPrevent = true // false表示不往上冒泡，相当于调用了同时调用了stopPropagation和preventDefault (对小程序生效, h5和app无效)
+	
+	if (me.disabled()) return isPrevent;
+	
+	var scrollTop = me.getScrollTop(); // 当前滚动条的距离
+	var curPoint = me.getPoint(e); // 当前点
+	
+	var moveY = curPoint.y - me.startPoint.y; // 和起点比,移动的距离,大于0向下拉,小于0向上拉
+	
+	// 向下拉 && 在顶部
+	// mescroll-body,直接判定在顶部即可
+	// scroll-view在滚动时不会触发touchmove,当触顶/底/左/右时,才会触发touchmove
+	// scroll-view滚动到顶部时,scrollTop不一定为0,也有可能大于0; 在iOS的APP中scrollTop可能为负数,不一定和startTop相等
+	if (moveY > 0 && (
+			(me.isScrollBody && scrollTop <= 0)
+			||
+			(!me.isScrollBody && (scrollTop <= 0 || (scrollTop <= me.optDown.startTop && scrollTop === me.startTop)) )
+		)) {
+		// 可下拉的条件
+		if (!me.inTouchend && !me.isDownScrolling && !me.optDown.isLock && (!me.isUpScrolling || (me.isUpScrolling &&
+				me.isUpBoth))) {
+	
+			// 下拉的角度是否在配置的范围内
+			if(!me.startAngle) me.startAngle = me.getAngle(me.lastPoint, curPoint); // 两点之间的角度,区间 [0,90]
+			if (me.startAngle < me.optDown.minAngle) return isPrevent; // 如果小于配置的角度,则不往下执行下拉刷新
+	
+			// 如果手指的位置超过配置的距离,则提前结束下拉,避免Webview嵌套导致touchend无法触发
+			if (me.maxTouchmoveY > 0 && curPoint.y >= me.maxTouchmoveY) {
+				me.inTouchend = true; // 标记执行touchend
+				touchendEvent(e, ins); // 提前触发touchend
+				return isPrevent;
+			}
+			
+			isPrevent = false // 小程序是return false
+	
+			var diff = curPoint.y - me.lastPoint.y; // 和上次比,移动的距离 (大于0向下,小于0向上)
+	
+			// 下拉距离  < 指定距离
+			if (me.downHight < me.optDown.offset) {
+				if (me.movetype !== 1) {
+					me.movetype = 1; // 加入标记,保证只执行一次
+					// me.optDown.inOffset && me.optDown.inOffset(me); // 进入指定距离范围内那一刻的回调,只执行一次
+					me.callMethod(ins, {type: 'setLoadType', downLoadType: 1})
+					me.isMoveDown = true; // 标记下拉区域高度改变,在touchend重置回来
+				}
+				me.downHight += diff * me.optDown.inOffsetRate; // 越往下,高度变化越小
+	
+				// 指定距离  <= 下拉距离
+			} else {
+				if (me.movetype !== 2) {
+					me.movetype = 2; // 加入标记,保证只执行一次
+					// me.optDown.outOffset && me.optDown.outOffset(me); // 下拉超过指定距离那一刻的回调,只执行一次
+					me.callMethod(ins, {type: 'setLoadType', downLoadType: 2})
+					me.isMoveDown = true; // 标记下拉区域高度改变,在touchend重置回来
+				}
+				if (diff > 0) { // 向下拉
+					me.downHight += diff * me.optDown.outOffsetRate; // 越往下,高度变化越小
+				} else { // 向上收
+					me.downHight += diff; // 向上收回高度,则向上滑多少收多少高度
+				}
+			}
+			
+			me.downHight = Math.round(me.downHight) // 取整
+			var rate = me.downHight / me.optDown.offset; // 下拉区域当前高度与指定距离的比值
+			// me.optDown.onMoving && me.optDown.onMoving(me, rate, me.downHight); // 下拉过程中的回调,一直在执行
+			me.onMoving(ins, rate, me.downHight)
+		}
+	}
+	
+	me.lastPoint = curPoint; // 记录本次移动的点
+	
+	return isPrevent // false表示不往上冒泡，相当于调用了同时调用了stopPropagation和preventDefault (对小程序生效, h5和app无效)
+}
+
+function touchendEvent(e, ins) {
+	// 如果下拉区域高度已改变,则需重置回来
+	if (me.isMoveDown) {
+		if (me.downHight >= me.optDown.offset) {
+			// 符合触发刷新的条件
+			me.downHight = me.optDown.offset; // 更新下拉区域高度
+			// me.triggerDownScroll();
+			me.callMethod(ins, {type: 'triggerDownScroll'})
+		} else {
+			// 不符合的话 则重置
+			me.downHight = 0;
+			// me.optDown.endDownScroll && me.optDown.endDownScroll(me);
+			me.callMethod(ins, {type: 'endDownScroll'})
+		}
+		me.movetype = 0;
+		me.isMoveDown = false;
+	} else if (!me.isScrollBody && me.getScrollTop() === me.startTop) { // scroll-view到顶/左/右/底的滑动事件
+		var isScrollUp = me.getPoint(e).y - me.startPoint.y < 0; // 和起点比,移动的距离,大于0向下拉,小于0向上拉
+		// 上滑
+		if (isScrollUp) {
+			// 需检查滑动的角度
+			var angle = me.getAngle(me.getPoint(e), me.startPoint); // 两点之间的角度,区间 [0,90]
+			if (angle > 80) {
+				// 检查并触发上拉
+				// me.triggerUpScroll(true);
+				me.callMethod(ins, {type: 'triggerUpScroll'})
+			}
+		}
+	}
+	me.callMethod(ins, {type: 'setWxsProp'}) // 同步更新wxsProp的数据 (小程序是异步的,可能touchmove先执行,才到propObserver; h5和app是同步)
+}
+
+/* 是否禁用下拉刷新 */
+me.disabled = function(){
+	return !me.optDown || !me.optDown.use || me.optDown.native
+}
+
+/* 根据点击滑动事件获取第一个手指的坐标 */
+me.getPoint = function(e) {
+	if (!e) {
+		return {x: 0,y: 0}
+	}
+	if (e.touches && e.touches[0]) {
+		return {x: e.touches[0].pageX,y: e.touches[0].pageY}
+	} else if (e.changedTouches && e.changedTouches[0]) {
+		return {x: e.changedTouches[0].pageX,y: e.changedTouches[0].pageY}
+	} else {
+		return {x: e.clientX,y: e.clientY}
+	}
+}
+
+/* 计算两点之间的角度: 区间 [0,90]*/
+me.getAngle = function (p1, p2) {
+	var x = Math.abs(p1.x - p2.x);
+	var y = Math.abs(p1.y - p2.y);
+	var z = Math.sqrt(x * x + y * y);
+	var angle = 0;
+	if (z !== 0) {
+		angle = Math.asin(y / z) / Math.PI * 180;
+	}
+	return angle
+}
+
+/* 获取滚动条的位置 */
+me.getScrollTop = function() {
+	return me.scrollTop || 0
+}
+
+/* 获取body的高度 */
+me.getBodyHeight = function() {
+	return me.bodyHeight || 0;
+}
+
+/* 调用逻辑层的方法 */
+me.callMethod = function(ins, param) {
+	if(ins) ins.callMethod('wxsCall', param)
+}
+
+/* 导出模块 */
+module.exports = {
+	propObserver: propObserver,
+	callObserver: callObserver,
+	touchstartEvent: touchstartEvent,
+	touchmoveEvent: touchmoveEvent,
+	touchendEvent: touchendEvent
+}
\ No newline at end of file
diff --git a/uni-app/src/components/nc-contact/nc-contact.vue b/uni-app/src/components/nc-contact/nc-contact.vue
new file mode 100644
index 00000000..67f5d898
--- /dev/null
+++ b/uni-app/src/components/nc-contact/nc-contact.vue
@@ -0,0 +1,97 @@
+<template>
+	<view class="contact-wrap">
+		<slot></slot>
+		<button
+				type="default"
+				hover-class="none"
+				open-type="contact"
+				class="contact-button"
+				@click="contactService"
+				:send-message-title="props.sendMessageTitle"
+				:send-message-path="props.sendMessagePath"
+				:send-message-img="props.sendMessageImg"
+				:show-message-card="true">
+		</button>
+
+		<u-popup :show="popupShow" @close="popupShow = false" mode="center" :round="5" :safeAreaInsetBottom="false">
+			<view @touchmove.prevent.stop>
+				<view class="py-[25rpx] text-sm leading-none border-0 border-solid border-b-[2rpx] border-[#eee] flex items-center justify-between">
+					<text class="ml-[30rpx]">联系客服</text>
+					<text class="mr-[20rpx] nc-iconfont nc-icon-guanbiV6xx text-[35rpx]" @click="popupShow = false"></text>
+				</view>
+				<view class="px-6 py-3 w-[480rpx] h-[100rpx] text-sm" v-if="siteInfo && siteInfo.phone">
+					<view class="mb-[10rpx]">客服电话</view>
+					<view @click="callPhone" class="text-primary truncate">{{ siteInfo.phone }}</view>
+				</view>
+				<view class="px-6 py-3 w-[480rpx] h-[100rpx] leading-[100rpx] text-sm" v-else>抱歉，商家暂无客服，请线下联系</view>
+				<button @click="popupShow = false" class="!mx-[30rpx] !mb-[40rpx] !w-auto !h-[70rpx] text-[24rpx] leading-[70rpx] rounded-full text-white !bg-[#ff4500] !text-[#fff]">
+					我知道了
+				</button>
+			</view>
+		</u-popup>
+	</view>
+</template>
+
+<script setup lang="ts">
+    import { ref, computed } from 'vue'
+    import useSystemStore from '@/stores/system'
+
+    const props = defineProps({
+        sendMessageTitle: {
+            type: String,
+            default: ''
+        },
+        sendMessagePath: {
+            type: String,
+            default: ''
+        },
+        sendMessageImg: {
+            type: String,
+            default: ''
+        }
+    })
+
+    const systemStore = useSystemStore()
+
+    const siteInfo:any = computed(() => {
+        return systemStore.site;
+    })
+
+    const popupShow = ref(false);
+
+    const contactService = () => {
+        // #ifdef H5
+        popupShow.value = true;
+        // #endif
+    }
+
+    // 联系客服电话
+    const callPhone = () => {
+        uni.makePhoneCall({
+            phoneNumber: siteInfo.value.phone
+        });
+    }
+
+    defineExpose({})
+</script>
+
+<style lang="scss" scoped>
+	.contact-wrap {
+		width: 100%;
+		height: 100%;
+		position: relative;
+
+		.contact-button {
+			width: 100%;
+			height: 100%;
+			position: absolute;
+			left: 0;
+			top: 0;
+			z-index: 5;
+			padding: 0;
+			margin: 0;
+			opacity: 0;
+			overflow: hidden;
+		}
+	}
+</style>
diff --git a/uni-app/src/components/pay/pay.vue b/uni-app/src/components/pay/pay.vue
new file mode 100644
index 00000000..94a957df
--- /dev/null
+++ b/uni-app/src/components/pay/pay.vue
@@ -0,0 +1,231 @@
+<template>
+	<u-popup :show="show" :round="10" @close="handleClose" :closeable="true" bgColor="#fff" zIndex="10081" :closeOnClickOverlay="false">
+		<view class="flex flex-col h-[65vh] popup-common" v-if="payInfo" @touchmove.prevent.stop>
+			<view class="head">
+				<view class="title">
+					{{ t('pay.payTitle') }}
+				</view>
+				<view class="flex items-end justify-center w-full text-xl font-bold py-[20rpx] price-font">
+					<view class="text-base mr-[4rpx]">{{ t('currency') }}</view>
+					{{ moneyFormat(payInfo.money) }}
+				</view>
+			</view>
+			<scroll-view scroll-y="true" class="flex-1 pt-[20rpx]">
+				<view class="flex text-[28rpx] px-[36rpx] py-[20rpx] mb-[10rpx]">
+					<view class="text-[var(--text-color-light6)]">{{ t('pay.orderInfo') }}</view>
+					<view class="text-right flex-1 pl-[30rpx] truncate">{{ payInfo.body }}</view>
+				</view>
+				<view class="mx-[var(--popup-sidebar-m)] px-[30rpx] bg-white rounded-[20rpx] bg-[var(--temp-bg)]">
+                    <block v-if="payInfo.pay_type_list.length">
+                        <view class="pay-item py-[30rpx] flex items-center border-0 border-b border-solid border-[#eee]" v-for="(item, index) in payInfo.pay_type_list" :key="index" @click="type = item.key">
+                            <u-image :src="img(item.icon)" width="50rpx" height="50rpx"></u-image>
+                            <view class="flex-1 px-[20rpx] text-[28rpx] font-500">{{ item.name }}</view>
+                            <u-icon name="checkbox-mark" color="var(--primary-color)" v-if="item.key == type"></u-icon>
+                        </view>
+                    </block>
+                    <view class="py-[30rpx] text-center text-[24rpx] text-gray-subtitle" v-else>{{ t('pay.notHavePayType') }}</view>
+				</view>
+			</scroll-view>
+			<view class="btn-wrap">
+                <button class="primary-btn-bg btn" hover-class="none" :loading="loading" @click="confirmPay">{{t('pay.confirmPay')}}</button>
+			</view>
+		</view>
+	</u-popup>
+</template>
+
+<script setup lang="ts">
+	import { ref } from 'vue'
+	import { t } from '@/locale'
+	import { getPayInfo, pay } from '@/app/api/pay'
+	import { img, redirect, isWeixinBrowser, moneyFormat } from '@/utils/common'
+	import wechat from '@/utils/wechat'
+
+	// #ifdef H5
+	if (isWeixinBrowser()) wechat.init();
+	// #endif
+
+	const show = ref(false)
+	const loading = ref(false)
+
+	const payInfo = ref<AnyObject | null>(null)
+	const type = ref('')
+
+	/**
+	 * 确认支付
+	 */
+	const confirmPay = () => {
+		if (uni.$u.test.isEmpty(type.value)) {
+			uni.showToast({ title: t('pay.notHavePayType'), icon: 'none' })
+			return
+		}
+		if(type.value == 'friendspay'){
+			redirect({
+				url: '/app/pages/friendspay/share',
+				param: {
+					id: payInfo.value?.trade_id,
+					type: payInfo.value?.trade_type,
+				},
+				mode: 'redirectTo'
+			})
+			return false
+		}
+		if (loading.value) return
+		loading.value = true
+
+		pay({
+			trade_type: payInfo.value?.trade_type,
+			trade_id: payInfo.value?.trade_id,
+			type: type.value,
+			openid: uni.getStorageSync('openid') || ''
+		}).then((res: any) => {
+			switch (type.value) {
+				case 'wechatpay':
+					// #ifndef H5
+					uni.requestPayment({
+						provider: 'wxpay',
+						...res.data,
+						success: (res: any) => {
+							toPayResult()
+						},
+						fail: (res: any) => {
+							loading.value = false
+						}
+					})
+					// #endif
+					// #ifdef H5
+					if (isWeixinBrowser()) {
+						res.data.timestamp = res.data.timeStamp
+						delete res.data.timeStamp
+						wechat.pay({
+							...res.data,
+							success: () => {
+								toPayResult()
+							},
+							cancel: () => {
+								loading.value = false
+							}
+						})
+					} else {
+						uni.setStorageSync('paymenting', {
+							trade_type: payInfo.value?.trade_type,
+							trade_id: payInfo.value?.trade_id
+						})
+						location.href = res.data.h5_url
+					}
+					// #endif
+					break;
+				case 'alipay':
+					// #ifdef H5
+					if (isWeixinBrowser()) {
+						redirect({
+							url: '/app/pages/pay/browser',
+							param: {
+								trade_type: payInfo.value?.trade_type,
+								trade_id: payInfo.value?.trade_id,
+								alipay: encodeURIComponent(res.data.url)
+							},
+							mode: 'redirectTo'
+						})
+					} else {
+						uni.setStorageSync('paymenting', {
+							trade_type: payInfo.value?.trade_type,
+							trade_id: payInfo.value?.trade_id
+						})
+						location.href = res.data.url
+					}
+					// #endif
+					break;
+				default:
+					if (res.data.url) {
+						redirect({
+							url: res.data.url,
+							param: res.data.param || {},
+							mode: 'redirectTo'
+						})
+						return
+					}
+					toPayResult()
+			}
+		}).catch(() => {
+			loading.value = false
+		})
+	}
+
+	/**
+	 * 检测是否是支付后返回
+	 */
+	uni.$on('checkIsReturnAfterPayment', () => {
+        const data = uni.getStorageSync('paymenting')
+		if (uni.getStorageSync('paymenting')) {
+			redirect({
+				url: '/app/pages/pay/result',
+				param: {
+                    trade_type: data.trade_type,
+                    trade_id: data.trade_id
+                },
+				mode: 'redirectTo',
+				success() {
+					uni.removeStorageSync('paymenting')
+				}
+			})
+		}
+	})
+	const repeat = ref(false)
+	const open = (tradeType : string, tradeId : number, payReturn: string = '', scene: string = '') => {
+
+		if (repeat.value) return
+		repeat.value = true
+
+		// 设置支付后跳转页面
+		uni.setStorageSync('payReturn', encodeURIComponent(payReturn))
+
+		// 帮人付款时过滤帮付选项
+		const obj: any = {}
+		if(scene){
+			obj.scene = scene
+		}
+		getPayInfo(tradeType, tradeId, obj).then((res: any) => {
+
+			let { data } = res
+			payInfo.value = data
+
+			if (uni.$u.test.isEmpty(data)) {
+				uni.showToast({ title: t('pay.notObtainedInfo'), icon: 'none' })
+				return
+			}
+			if (data.money == 0) {
+				toPayResult()
+				return
+			}
+			type.value = data.pay_type_list[0] ? data.pay_type_list[0].key : ''
+			show.value = true
+			repeat.value = false
+
+		}).catch(() => {
+			repeat.value = false
+		})
+	}
+
+	const emits = defineEmits(['close','confirm'])
+    const toPayResult = ()=> {
+		emits('confirm')
+        redirect({ url: '/app/pages/pay/result', param: { trade_type: payInfo.value?.trade_type, trade_id: payInfo.value?.trade_id }, mode: 'redirectTo' })
+    }
+
+
+	const handleClose = () => {
+		uni.removeStorageSync('paymenting')
+		show.value = false
+		emits('close')
+	}
+
+	defineExpose({
+		open
+	})
+</script>
+
+<style lang="scss" scoped>
+	.pay-item:last-child {
+		border: none;
+	}
+</style>
diff --git a/uni-app/src/components/select-date/select-date.vue b/uni-app/src/components/select-date/select-date.vue
new file mode 100644
index 00000000..bb6c13c5
--- /dev/null
+++ b/uni-app/src/components/select-date/select-date.vue
@@ -0,0 +1,226 @@
+<template>
+    <u-popup :show="show" @close="show = false" mode="bottom" :round="10"  zIndex="10090">
+        <view class="popup-common relative">
+			<view class="title">选择时间</view>
+            <view class="absolute  top-[36rpx] right-[36rpx] text-[24rpx] text-[var(--text-color-light6)] leading-[30rpx] z-10" @click="clearDate">清除</view>
+            <view class="px-[var(--popup-sidebar-m)] mb-[20rpx] mt-[10rpx]">
+                <view class="flex items-center justify-between mb-[30rpx]">
+                    <view class="w-[160rpx] h-[66rpx] box-border flex-center rounded-[33rpx] bg-[var(--temp-bg)] text-center text-[26rpx] text-[var(--text-color-light6)] border-[2rpx] border-solid border-[var(--temp-bg)]"  v-for="(item,index) in curselectDate" :key="'a'+index" :class="{'text-primary !border-[var(--primary-color)] !bg-[var(--primary-color-light)]': currentValue.type == item.type}"  @click="loadDateFn(item)">{{item.name}}</view> 
+                </view>
+                <view class="flex items-center justify-between">
+                    <view class="w-[316rpx] h-[66rpx] box-border leading-[62rpx] rounded-[33rpx] bg-[var(--temp-bg)] text-center text-[26rpx] text-[var(--text-color-light6)] border-[2rpx] border-solid border-[var(--temp-bg)]" :class="{'text-primary !border-[var(--primary-color)] !bg-[var(--primary-color-light)]': currentValue.type == 'first'}" @click="currentValue.type = 'first'">{{dateList.nowDate[0].substr(0,10)}}</view>
+                    <view class="nc-iconfont nc-icon-jianV6xx"></view>
+                    <view class="w-[316rpx] h-[66rpx] box-border leading-[62rpx] rounded-[33rpx] bg-[var(--temp-bg)] text-center text-[26rpx] text-[var(--text-color-light6)] border-[2rpx] border-solid border-[var(--temp-bg)]" :class="{'text-primary !border-[var(--primary-color)] !bg-[var(--primary-color-light)]': currentValue.type == 'second'}" @click="currentValue.type = 'second'">{{dateList.nowDate[1].substr(0,10)}}</view>
+                </view>
+            </view>
+            <view class="gradation-picker">
+                <picker-view indicator-class="!h-[80rpx] !bg-[var(--temp-bg)]" :value="dateList.curIndex" @change="bindChange" class="w-[750rpx] px-[60rpx] h-[396rpx] box-border">
+                    <picker-view-column>
+						<view class="text-center leading-[80rpx] text-[28rpx]" v-for="(item,index) in dateList.years" :key="index">{{item}}年</view>
+                    </picker-view-column>
+                    <picker-view-column>
+                        <view class="text-center leading-[80rpx] text-[28rpx]" v-for="(item,index) in dateList.months" :key="index">{{item}}月</view>
+                    </picker-view-column>
+                    <picker-view-column>
+                        <view class="text-center leading-[80rpx] text-[28rpx]" v-for="(item,index) in dateList.days" :key="index">{{item}}日</view>
+                    </picker-view-column>
+                </picker-view>
+            </view>
+            <view class="btn-wrap flex justify-between items-center !pt-[30rpx]">
+                <button class="btn flex-1 !leading-[76rpx] mr-[20rpx] !text-[var(--primary-color)] border-[2rpx] border-solid border-[var(--primary-color)] rounded-[100rpx] bg-transparent box-border" hover-class="none" @click="reset">重置</button>
+                <button class="btn flex-1 border-[0] rounded-[100rpx] primary-btn-bg" shape="circle" hover-class="none" @click="save">确定</button>
+            </view>
+        </view>
+    </u-popup>
+</template>
+
+<script setup lang="ts">
+import { ref,reactive } from 'vue'
+
+const emits = defineEmits(['confirm'])
+// 弹框时间选择
+const show = ref(false)
+const create_time: any = ref([])
+// 日期
+const init = () =>{
+    const date = new Date();
+    const years = []
+    const months = []
+    const days = []
+    const year = date.getFullYear()
+    const month = date.getMonth();
+    const day = date.getDate()
+
+    for (let i = 1990; i <= date.getFullYear()+2; i++) {
+        years.push(i)
+    }
+    for (let i = 1; i <= 12; i++) {
+        months.push(i)
+    }
+    let dayCount = getDaysInMonth(year, month+1)
+    for (let i = 1; i <= dayCount; i++) {
+        days.push(i)
+    }
+    let yearIndex = years.indexOf(year)
+    let curIndex = [yearIndex, month, day-1]
+    let nowDate = `${year}-${month + 1 < 10 ? '0' + (month + 1) :(month + 1) }-${day < 10 ? '0' + day :day }`
+    let nowDateStart = `${year}-${month + 1 < 10 ? '0' + (month + 1) :(month + 1) }-${day < 10 ? '0' + day :day } 00:00:00`
+    let nowDateEnd = `${year}-${month + 1 < 10 ? '0' + (month + 1) :(month + 1) }-${day < 10 ? '0' + day :day } 23:59:59`
+    let lastMonthDate = new Date(date.getFullYear(),month - 1,date.getDate())
+    let lastThreeMonthDate = new Date(date.getFullYear(),month - 3,date.getDate())
+    let halfYear = new Date(date.getFullYear(), month - 6, date.getDate())
+    let lastYear =new Date(date.getFullYear() - 1, month, date.getDate())
+    const formatDate = (dateTime:any) => {
+        const yearTime = dateTime.getFullYear()
+        const monthTime = dateTime.getMonth() + 1
+        const dayTime = dateTime.getDate()
+        return `${yearTime}-${monthTime < 10 ? '0' + monthTime : monthTime}-${dayTime < 10 ? '0' + dayTime :dayTime } 00:00:00`
+    }
+    return {
+        years,
+        months,
+        days,
+        curIndex,
+        nowDate,
+        nowDateStart,
+        nowDateEnd,
+        lastMonth: formatDate(lastMonthDate),
+        lastThreeMonth: formatDate(lastThreeMonthDate),
+        halfYear: formatDate(halfYear),
+        lastYear: formatDate(lastYear)
+    }
+}
+const getDaysInMonth = (year: any, month: any) => {
+    let  date = new Date(year, month, 0).getDate()
+    return date
+}
+const getDaysCount = (year: any, month: any) =>{
+    let count = getDaysInMonth(year, month)
+    let days = []
+    for (let i = 1; i <= count; i++) {
+        days.push(i)
+    }
+    return days
+}
+const dateList = reactive({
+    years: init().years,
+    months: init().months,
+    days: init().days,
+    curIndex:init().curIndex, //当前选中下标
+    nowDate:[init().nowDateStart,init().nowDateEnd] //当前选中日期
+})
+ 
+const bindChange = (e: any) =>{
+    const val = e.detail.value
+    let year = dateList.years[val[0]]
+    let month= dateList.months[val[1]]
+    let day = dateList.days[val[2]]
+    // 根据年份,月份判断天数
+    dateList.days = getDaysCount(year, month)
+    if(currentValue.value.type == 'first'){
+        dateList.nowDate[0] = `${year}-${month < 10 ? '0' + month :month }-${day < 10 ? '0' + day :day } 00:00:00`
+    }else if(currentValue.value.type == 'second'){
+        dateList.nowDate[1] = `${year}-${month < 10 ? '0' + month :month }-${day < 10 ? '0' + day :day } 23:59:59`
+    }
+}
+const curselectDate = reactive([
+    {
+        time:[init().lastMonth,init().nowDateEnd],
+        type:'lastMonth',
+        name:'近1个月'
+    },
+    {
+        time:[init().lastThreeMonth,init().nowDateEnd],
+        type:'lastThreeMonth',
+        name:'近3个月'
+    },
+    {
+        time:[init().halfYear,init().nowDateEnd],
+        type:'halfYear',
+        name:'近半年'
+    },
+    {
+        time:[init().lastYear,init().nowDateEnd],
+        type:'lastYear',
+        name:'近一年'
+    }
+])
+// 时间搜索
+const currentValue = ref({
+    type: 'first',
+    time: []
+})
+const loadDateFn = (data: any) =>{
+    currentValue.value.type = data.type
+    currentValue.value.time = data.time
+    dateList.nowDate[0] = currentValue.value.time[0]
+    dateList.nowDate[1] = currentValue.value.time[1]
+}
+
+const save = () =>{
+    if(currentValue.value.type == 'first' ||currentValue.value.type == 'second'){
+        create_time.value = dateList.nowDate
+        let start = new Date(create_time.value[0]).getTime()
+        let end = new Date(create_time.value[1]).getTime()
+        if( start > end){
+            uni.showToast({ title: '开始时间不能大于结束时间', icon: 'none' })
+            return
+        }
+    }else{
+        create_time.value = currentValue.value.time
+    }
+    emits('confirm',create_time.value)
+    show.value = false
+}
+const reset = () =>{
+    currentValue.value.type = 'first'
+    dateList.curIndex = init().curIndex
+    dateList.nowDate = [init().nowDateStart,init().nowDateEnd]
+}
+
+const clearDate = () =>{
+    emits('confirm',[])
+    show.value = false
+}
+defineExpose({
+    show
+})
+</script>
+
+<style scoped>
+:deep(.uni-picker-view-content){
+    z-index: 10;
+}
+
+:deep(.uni-picker-view-indicator::before){
+    border: none !important;
+}
+:deep(.uni-picker-view-indicator::after){
+    border: none !important;
+}
+</style>
+<style lang="scss">
+	.gradation-picker{
+		position: relative;
+		&::after{
+			content: "";
+			position: absolute;
+			left: 0;
+			right: 0;
+			top: 0;
+			height: 70rpx;
+			background: linear-gradient(#fff, rgba(255,255,255,.5));
+			z-index: 10;
+		}
+		&::before{
+			content: "";
+			position: absolute;
+			left: 0;
+			right: 0;
+			bottom: 0;
+			height: 70rpx;
+			background: linear-gradient(#fff, rgba(255,255,255,.5));
+			z-index: 12;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/uni-app/src/components/share-popup/share-popup.vue b/uni-app/src/components/share-popup/share-popup.vue
new file mode 100644
index 00000000..4a2c2af1
--- /dev/null
+++ b/uni-app/src/components/share-popup/share-popup.vue
@@ -0,0 +1,237 @@
+<template>
+	<!-- 分享弹窗 -->
+	<view @touchmove.prevent.stop class="share-popup">
+	    <u-popup :show="sharePopupShow" type="bottom" @close="sharePopupClose" overlayOpacity="0.8">
+	        <view @touchmove.prevent.stop>
+				<view class="share-content">
+					<!-- #ifdef MP || APP-PLUS  -->
+					<view class="share-box">
+						<button class="share-btn" :plain="true" open-type="share">
+							<view class="text-[#07c160] iconfont iconweixin11"></view>
+							<text>分享给好友</text>
+						</button>
+					</view>
+					<!-- #endif -->
+
+					<!-- #ifdef H5 -->
+					<view class="share-box" @click="copyUrl">
+						<button class="share-btn" :plain="true">
+							<view class="text-[#07c160] iconfont iconfuzhilianjie"></view>
+							<text>复制链接</text>
+						</button>
+					</view>
+					<!-- #endif -->
+				</view>
+				<view class="share-footer" @click="sharePopupClose"><text>取消分享</text></view>
+	        </view>
+	    </u-popup>
+		<u-popup :show="show" mode="center" :round="10" :closeable="true"  @close="show = false" :safe-area-inset-bottom="false">
+			<view class="dialog-popup">
+				<view class="title">提示</view>
+				<view class="message">您拒绝了保存图片到相册的授权请求，无法保存图片到相册，如需正常使用，请授权之后再进行操作。</view>
+				<view class="action-wrap">
+					<view @click="closeDialog">取消</view>
+					<view>
+						<button type="default" class="authorization-btn" open-type="openSetting" @opensetting="closeDialog" hover-class="none">立即授权</button>
+					</view>
+				</view>
+			</view>
+		</u-popup>
+	</view>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue';
+import { img, copy } from '@/utils/common';
+
+const props = defineProps({
+	copyUrl: { // 例 "/wap/addon/shop_fenxiao/pages/goods"
+	    type: String,
+	    default: ''
+	},
+	copyUrlParam: {
+        type: String,
+        default: ''
+    }
+})
+
+const emits = defineEmits(['close'])
+
+const sharePopupShow = ref(false);
+
+// 复制
+const copyUrl = () => {
+	let data = ''
+	if (props.copyUrl) {
+		let pathName = location.pathname;
+		let packageArr: any = ['/app/', '/addon/'];
+		for (let i = 0; i < packageArr.length; i++) {
+			if (pathName.indexOf(packageArr[i]) != -1) {
+				pathName = pathName.substr(0, pathName.indexOf(packageArr[i]));
+			}
+		}
+		data = location.origin + pathName + props.copyUrl + props.copyUrlParam;
+	} else {
+		data = location.origin + location.pathname + props.copyUrlParam;
+	}
+	copy(data, () => {
+		sharePopupShow.value = false;
+	});
+}
+
+const openShare = ()=>{
+	sharePopupShow.value = true
+
+}
+
+
+const show = ref(false);
+
+const closeDialog = ()=> {
+	show.value = false;
+}
+
+
+
+const shareTop: any = ref(0)
+/************ 获取微信头部-start ****************/
+// 获取系统状态栏的高度
+let menuButtonInfo: any = {};
+// 如果是小程序，获取右上角胶囊的尺寸信息，避免导航栏右侧内容与胶囊重叠(支付宝小程序非本API，尚未兼容)
+// #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+menuButtonInfo = uni.getMenuButtonBoundingClientRect();
+shareTop.value = menuButtonInfo.top + menuButtonInfo.height + 'px';
+// #endif
+/************ 获取微信头部-end ****************/
+
+const sharePopupClose = ()=>{
+	sharePopupShow.value = false;
+	emits('close');
+}
+
+defineExpose({
+    openShare
+})
+</script>
+<style lang="scss" scoped>
+.share-popup {
+	:deep(.u-transition), :deep(.u-popup__content){
+		background-color: transparent;
+	}
+	.share-content {
+		border-top-left-radius: 40rpx;
+		border-top-right-radius: 40rpx;
+		overflow: hidden;
+		display: flex;
+		display: -webkit-flex;
+		-webkit-flex-wrap: wrap;
+		-moz-flex-wrap: wrap;
+		-ms-flex-wrap: wrap;
+		-o-flex-wrap: wrap;
+		flex-wrap: wrap;
+		padding: 40rpx 15rpx ;
+		background-color: #fff;
+
+		.share-box {
+			flex: 1;
+			text-align: center;
+
+			.share-btn {
+				margin: 0;
+				padding: 0;
+				border: none;
+				line-height: 1;
+				height: auto;
+				background: none;
+
+				text {
+					margin-top: 20rpx;
+					font-size: 24rpx;
+					display: block;
+					color: #333;
+				}
+			}
+
+			.iconfont {
+				font-size: 80rpx;
+				line-height: initial;
+			}
+			.icon-fuzhilianjie,
+			.icon-pengyouquan,
+			.icon-haowuquan,
+			.icon-share-friend {
+				color: #07c160;
+			}
+		}
+	}
+
+	.share-footer {
+		background-color: #fff;
+		height: 90rpx;
+		line-height: 90rpx;
+		border-top: 2rpx solid #eee;
+		text-align: center;
+		font-size: 26rpx;
+	}
+
+}
+
+
+
+.dialog-popup {
+	width: 580rpx;
+	background: #fff;
+	box-sizing: border-box;
+	border-radius: 10rpx;
+	overflow: hidden;
+	height: initial;
+
+	.title {
+		padding: 30rpx 30rpx 0 30rpx;
+		text-align: center;
+		font-size: 32rpx;
+		font-weight: bold;
+	}
+
+	.message {
+		padding: 0 30rpx;
+		color: #666;
+		text-align: center;
+		line-height: 1.3;
+		margin-top: 30rpx;
+	}
+
+	.action-wrap {
+		margin-top: 50rpx;
+		height: 80rpx;
+		display: flex;
+		border-top: 2rpx solid #eee;
+
+		&>view {
+			flex: 1;
+			text-align: center;
+			line-height: 80rpx;
+
+			&:first-child {
+				border-right: 2rpx solid #eee;
+				color: #999;
+			}
+
+			button {
+				border: none;
+				line-height: 80rpx;
+				padding: 0;
+				margin: 0;
+				width: 100%;
+				height: 100%;
+			}
+		}
+	}
+	.authorization-btn{
+		background-color: #07c160;
+		color: #fff;
+		font-size: 28rpx;
+		border-radius: 0;
+	}
+}
+</style>
diff --git a/uni-app/src/components/share-poster/share-poster.vue b/uni-app/src/components/share-poster/share-poster.vue
new file mode 100644
index 00000000..a64e1386
--- /dev/null
+++ b/uni-app/src/components/share-poster/share-poster.vue
@@ -0,0 +1,361 @@
+<template>
+	<!-- 分享弹窗 -->
+	<view @touchmove.prevent.stop class="share-popup">
+	    <u-popup :show="sharePopupShow" type="bottom" @close="sharePopupClose" overlayOpacity="0.8">
+	        <view @touchmove.prevent.stop>
+				<view class="poster-img-wrap" :style="{'top': shareTop}">
+					<image v-if="isPosterAnimation" class="poster-animation" :src="img('addon/shop/poster_animation.gif')" mode="aspectFit"></image>
+					<image v-if="isPosterImg" class="poster-img" :src="img(poster)" mode="aspectFit" :show-menu-by-longpress="true"></image>
+				</view>
+				<view class="share-content">
+					<!-- #ifdef MP || APP-PLUS  -->
+					<view class="share-box">
+						<button class="share-btn" :plain="true" open-type="share">
+							<view class="text-[#07c160] iconfont iconweixin11"></view>
+							<text>分享给好友</text>
+						</button>
+					</view>
+
+					<view class="share-box">
+						<button class="share-btn" :plain="true" @click="savePoster()">
+							<view class="text-[#07c160] iconfont iconpengyouquan"></view>
+							<text>保存海报</text>
+						</button>
+					</view>
+					<!-- #endif -->
+
+					<!-- #ifdef H5 -->
+					<view class="share-box" @click="copyUrl">
+						<button class="share-btn" :plain="true">
+							<view class="text-[#07c160] iconfont iconfuzhilianjie"></view>
+							<text>复制链接</text>
+						</button>
+					</view>
+					<!-- #endif -->
+				</view>
+				<view class="share-footer" @click="sharePopupClose"><text>取消分享</text></view>
+	        </view>
+	    </u-popup>
+		<u-popup :show="show" mode="center" :round="10" :closeable="true"  @close="show = false" :safe-area-inset-bottom="false">
+			<view class="dialog-popup">
+				<view class="title">提示</view>
+				<view class="message">您拒绝了保存图片到相册的授权请求，无法保存图片到相册，如需正常使用，请授权之后再进行操作。</view>
+				<view class="action-wrap">
+					<view @click="closeDialog">取消</view>
+					<view>
+						<button type="default" class="authorization-btn" open-type="openSetting" @opensetting="closeDialog" hover-class="none">立即授权</button>
+					</view>
+				</view>
+			</view>
+		</u-popup>
+	</view>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue';
+import { img, copy } from '@/utils/common';
+import { getPoster } from '@/app/api/system'
+
+const props = defineProps({
+    posterId: {
+        type: String || Number,
+        default: 0
+    },
+    posterType: {
+        type: String,
+        default: ''
+    },
+    posterParam: {
+        type: Object,
+        default: {}
+    },
+	copyUrl: { // 例 "/wap/addon/shop_fenxiao/pages/goods"
+	    type: String,
+	    default: ''
+	},
+	copyUrlParam: {
+        type: String,
+        default: ''
+    }
+})
+
+const emits = defineEmits(['close'])
+
+const sharePopupShow = ref(false);
+
+// 复制
+const copyUrl = () => {
+	let data = ''
+	if (props.copyUrl) {
+		let pathName = location.pathname;
+		let packageArr: any = ['/app/', '/addon/'];
+		for (let i = 0; i < packageArr.length; i++) {
+			if (pathName.indexOf(packageArr[i]) != -1) {
+				pathName = pathName.substr(0, pathName.indexOf(packageArr[i]));
+			}
+		}
+		data = location.origin + pathName + props.copyUrl + props.copyUrlParam;
+	} else {
+		data = location.origin + location.pathname + props.copyUrlParam;
+	}
+	copy(data, () => {
+		sharePopupShow.value = false;
+	});
+}
+
+const openShare = ()=>{
+	sharePopupShow.value = true
+	loadPoster();
+}
+
+//生成海报
+const isPosterAnimation = ref(false)
+const isPosterImg = ref(false)
+// 获取分享海报
+const poster = ref('');
+const loadPoster = () => {
+	if(poster.value){
+		// 预加载
+		isPosterAnimation.value = false;
+		isPosterImg.value = true;
+	}else {
+		isPosterAnimation.value = true;
+		isPosterImg.value = false;
+		let obj = {
+			id: props.posterId,
+			type: props.posterType,
+			param: props.posterParam
+		}
+		let startTime = Date.parse(new Date());
+		getPoster(obj).then((res: any) => {
+			poster.value = res.data && img(res.data) || '';
+
+			let endTime = Date.parse(new Date());
+			let time = endTime - startTime;
+			let periodTime = 2200;
+			if (time < periodTime) {
+				setTimeout(() => {
+					isPosterAnimation.value = false;
+					isPosterImg.value = true;
+				}, (periodTime - time))
+			} else {
+				isPosterAnimation.value = false;
+				isPosterImg.value = true;
+			}
+		}).catch(() => {
+			sharePopupClose();
+		})
+	}
+}
+const show = ref(false);
+
+const closeDialog = ()=> {
+	show.value = false;
+}
+
+// #ifdef MP || APP-PLUS
+//小程序中保存海报
+const savePoster = () => {
+	let url = img(poster.value);
+	uni.downloadFile({
+		url: url,
+		success: (res) => {
+			if (res.errMsg == "downloadFile:ok") {
+				uni.saveImageToPhotosAlbum({
+					filePath: res.tempFilePath,
+					success: () => {
+						uni.showToast({
+							title: '保存成功',
+							icon: 'none'
+						});
+					},
+					fail: (err) => {
+						if (err.errno == 104) {
+							let msg = '用户未授权隐私权限，将图像保存到相册失败';
+							uni.showToast({ title: msg, icon: 'none' })
+						} else if (err.errMsg == "saveImageToPhotosAlbum:fail auth deny" ||
+								err.errMsg == "saveImageToPhotosAlbum:fail:auth denied") {
+							show.value = true;
+						} else if (err.errMsg == "saveImageToPhotosAlbum:fail cancel") {
+							let msg = '用户取消将图片保存到相册';
+							uni.showToast({ title: msg, icon: 'none' })
+						} else {
+							uni.showToast({ title: err.errMsg, icon: 'none' })
+						}
+					}
+				});
+			}
+		},
+		fail: (err) => {
+			uni.showToast({
+				title: err.errMsg,
+				icon: 'none'
+			});
+		}
+	});
+}
+// #endif
+
+const shareTop: any = ref(0)
+/************ 获取微信头部-start ****************/
+// 获取系统状态栏的高度
+let menuButtonInfo: any = {};
+// 如果是小程序，获取右上角胶囊的尺寸信息，避免导航栏右侧内容与胶囊重叠(支付宝小程序非本API，尚未兼容)
+// #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+menuButtonInfo = uni.getMenuButtonBoundingClientRect();
+shareTop.value = menuButtonInfo.top + menuButtonInfo.height + 'px';
+// #endif
+/************ 获取微信头部-end ****************/
+
+const sharePopupClose = ()=>{
+	sharePopupShow.value = false;
+	isPosterAnimation.value = false;
+	isPosterImg.value = false;
+	emits('close');
+}
+
+defineExpose({
+    openShare,
+	loadPoster
+})
+</script>
+<style lang="scss" scoped>
+.share-popup {
+	:deep(.u-transition), :deep(.u-popup__content){
+		background-color: transparent;
+	}
+	.share-content {
+		border-top-left-radius: 40rpx;
+		border-top-right-radius: 40rpx;
+		overflow: hidden;
+		display: flex;
+		display: -webkit-flex;
+		-webkit-flex-wrap: wrap;
+		-moz-flex-wrap: wrap;
+		-ms-flex-wrap: wrap;
+		-o-flex-wrap: wrap;
+		flex-wrap: wrap;
+		padding: 40rpx 15rpx ;
+		background-color: #fff;
+
+		.share-box {
+			flex: 1;
+			text-align: center;
+
+			.share-btn {
+				margin: 0;
+				padding: 0;
+				border: none;
+				line-height: 1;
+				height: auto;
+				background: none;
+
+				text {
+					margin-top: 20rpx;
+					font-size: 24rpx;
+					display: block;
+					color: #333;
+				}
+			}
+
+			.iconfont {
+				font-size: 80rpx;
+				line-height: initial;
+			}
+			.icon-fuzhilianjie,
+			.icon-pengyouquan,
+			.icon-haowuquan,
+			.icon-share-friend {
+				color: #07c160;
+			}
+		}
+	}
+
+	.share-footer {
+		background-color: #fff;
+		height: 90rpx;
+		line-height: 90rpx;
+		border-top: 2rpx solid #eee;
+		text-align: center;
+		font-size: 26rpx;
+	}
+
+}
+
+.poster-img-wrap{
+	position: fixed;
+	top: 0;
+	left: 0;
+	bottom: calc(constant(safe-area-inset-bottom) + 300rpx); //300是海报弹窗下面高度的问题
+	bottom: calc(env(safe-area-inset-bottom) + 300rpx);
+	right: 0;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	.poster-img{
+		width: 80%;
+		height: 80%;
+	}
+	.poster-animation{
+		width: 60%;
+		height: 65%;
+	}
+}
+
+.dialog-popup {
+	width: 580rpx;
+	background: #fff;
+	box-sizing: border-box;
+	border-radius: 10rpx;
+	overflow: hidden;
+	height: initial;
+
+	.title {
+		padding: 30rpx 30rpx 0 30rpx;
+		text-align: center;
+		font-size: 32rpx;
+		font-weight: bold;
+	}
+
+	.message {
+		padding: 0 30rpx;
+		color: #666;
+		text-align: center;
+		line-height: 1.3;
+		margin-top: 30rpx;
+	}
+
+	.action-wrap {
+		margin-top: 50rpx;
+		height: 80rpx;
+		display: flex;
+		border-top: 2rpx solid #eee;
+
+		&>view {
+			flex: 1;
+			text-align: center;
+			line-height: 80rpx;
+
+			&:first-child {
+				border-right: 2rpx solid #eee;
+				color: #999;
+			}
+
+			button {
+				border: none;
+				line-height: 80rpx;
+				padding: 0;
+				margin: 0;
+				width: 100%;
+				height: 100%;
+			}
+		}
+	}
+	.authorization-btn{
+		background-color: #07c160;
+		color: #fff;
+		font-size: 28rpx;
+		border-radius: 0;
+	}
+}
+</style>
diff --git a/uni-app/src/components/sms-code/sms-code.vue b/uni-app/src/components/sms-code/sms-code.vue
new file mode 100644
index 00000000..7aa91321
--- /dev/null
+++ b/uni-app/src/components/sms-code/sms-code.vue
@@ -0,0 +1,89 @@
+<template>
+    <view class="text-[26rpx]"  :class="{'text-primary': sendSms.canGetCode.value, 'text-gray-300': !sendSms.canGetCode.value}" @click="handleSend">{{ sendSms.tips.value }}</view>
+    <u-code :seconds="sendSms.seconds" :change-text="sendSms.changeText" ref="smsRef" @change="sendSms.codeChange"></u-code>
+    <u-modal :show="show" :title="t('captchaTitle')" :confirm-text="t('confirm')" :cancel-text="t('cancel')" :show-cancel-button="true" @cancel="show = false" @confirm="handleConfirm" confirmColor="var(--primary-color)">
+        <view class="flex mt-[20rpx]">
+            <u-input :placeholder="t('captchaPlaceholder')" border="surround" v-model="formData.captcha_code"></u-input>
+            <image :src="captcha.image.value" class="h-[76rpx] w-[auto] ml-[20rpx]" mode="heightFix" @click="captcha.refresh()"></image>
+        </view>
+    </u-modal>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed } from 'vue'
+import { useSendSms } from '@/hooks/useSendSms'
+import { useCaptcha } from '@/hooks/useCaptcha'
+import { t } from '@/locale'
+
+const prop = defineProps({
+    mobile: String,
+    type: String,
+	isAgree:{
+		type:Boolean,
+		default:true
+	},
+    modelValue: {
+        type: String,
+        default: ''
+    }
+})
+
+const emit = defineEmits(['update:modelValue'])
+const value = computed({
+    get() {
+        return prop.modelValue
+    },
+    set(value) {
+        emit('update:modelValue', value)
+    }
+})
+
+const smsRef: any = ref(null)
+const sendSms = useSendSms(smsRef)
+const show = ref(false)
+
+const formData:any = reactive({
+    mobile: '',
+    captcha_code: '',
+    captcha_key: '',
+    type: prop.type
+})
+
+const captcha = useCaptcha(formData)
+
+const handleSend = async()=> {
+    if (smsRef.value.canGetCode) {
+        formData.mobile = prop.mobile
+        if (!prop.isAgree) {
+            uni.showToast({ title: t('isAgreeTips'), icon: 'none' });
+            return
+        }
+        if (uni.$u.test.isEmpty(formData.mobile)) {
+            uni.showToast({ title: t('mobilePlaceholder'), icon: 'none' });
+            return
+        }
+        if (!uni.$u.test.mobile(formData.mobile)) {
+            uni.showToast({ title: t('mobileError'), icon: 'none' });
+            return
+        }
+
+        await captcha.refresh()
+        show.value = true
+    }
+}
+
+const handleConfirm = async()=> {
+    if (uni.$u.test.isEmpty(formData.captcha_code)) { uni.showToast({ title: t('captchaPlaceholder'), icon:'none' }); return }
+    const sendRes = await sendSms.send(formData)
+    
+    if (sendRes) {
+        value.value = sendRes
+        show.value = false
+    } else if (sendRes === false) {
+        captcha.refresh()
+    }
+}
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/uni-app/src/components/sow-show/sow-show.vue b/uni-app/src/components/sow-show/sow-show.vue
new file mode 100644
index 00000000..d37dc888
--- /dev/null
+++ b/uni-app/src/components/sow-show/sow-show.vue
@@ -0,0 +1,59 @@
+<template>
+	<view class="card-template mt-[var(--top-m)]" v-if="items.list && items.list.length>0">
+		<view class="flex justify-between items-center" @click="toLink">
+			<view class="text-[30rpx]">
+				<text>种草秀</text>
+				<text class="ml-[6rpx] text-[24rpx] text-[var(--text-color-light9)]" v-if="items.count">({{items.count}})</text>
+			</view>
+			<text class="nc-iconfont nc-icon-youV6xx text-[26rpx] text-[var(--text-color-light6)] ml-[8rpx]"></text>
+		</view>
+
+		<view class="grid grid-cols-3 gap-2 mt-[20rpx]">
+			<view class="w-[210rpx] h-[210rpx]" v-for="(item, index) in items.list" :key="index" @click="handleClick(item)">
+				<image :src="img(item.content_cover)" mode="aspectFill" class="w-[210rpx] h-[210rpx] rounded-[20rpx]" />
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup lang="ts">
+import { ref,onMounted} from 'vue';
+import { img,redirect } from '@/utils/common';
+
+const props = defineProps({
+	items: {
+		type: Object,
+		required: true,
+		default: () => ({}),
+	}
+});
+
+const treasureId = ref(null);
+
+function extractTreasureId(url) {
+	const match = url.match(/treasure_id=(\d+)/);
+	return match ? match[1] : null;
+}
+
+onMounted(() => {
+	if (props.items && props.items.url) {
+		treasureId.value = extractTreasureId(props.items.url);
+	}
+});
+
+const toLink = () => {
+	redirect({ url: '/addon/sow_community/pages/sow_show', param: { treasure_id: treasureId.value }})
+}
+
+const handleClick = (item:any) => {
+	if(item.content_type == 1){
+	    redirect({url: '/addon/sow_community/pages/image/detail', param: { content_id: item.content_id }})
+	}else{
+	    redirect({url: '/addon/sow_community/pages/video/detail', param: { content_id: item.content_id }})
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>
diff --git a/uni-app/src/components/tabbar/tabbar.vue b/uni-app/src/components/tabbar/tabbar.vue
new file mode 100644
index 00000000..12f0488f
--- /dev/null
+++ b/uni-app/src/components/tabbar/tabbar.vue
@@ -0,0 +1,187 @@
+<template>
+	<template v-if="tabbar && Object.keys(tabbar).length">
+		<u-tabbar :value="value" zIndex="9999" :fixed="true" :placeholder="true" :safeAreaInsetBottom="true" :inactive-color="tabbar.value.textColor" :active-color="tabbar.value.textHoverColor" :border="props.border">
+			<block v-for="item in tabbar.value.list">
+				<u-tabbar-item class="py-[5rpx]" :custom-style="{'background-color': tabbar.value.backgroundColor}" :text="item.text"
+					:icon="img(value == item.link.url ? item.iconSelectPath : item.iconPath)" :name="item.link.url"
+					v-if="tabbar.value.type == 1" @click="itemBtn(item.link.url)"></u-tabbar-item>
+				<u-tabbar-item class="py-[5rpx]" :custom-style="{'background-color': tabbar.value.backgroundColor}"
+					:icon="img(value == item.link.url ? item.iconSelectPath : item.iconPath)" :name="item.link.url"
+					v-if="tabbar.value.type == 2" @click="itemBtn(item.link.url)"></u-tabbar-item>
+				<u-tabbar-item class="py-[5rpx]" :custom-style="{'background-color': tabbar.value.backgroundColor}" :text="item.text" :name="item.link.url"
+					v-if="tabbar.value.type == 3" @click="itemBtn(item.link.url)"></u-tabbar-item>
+			</block>
+		</u-tabbar>
+		<view class="tab-bar-placeholder"></view>
+	</template>
+</template>
+
+<script setup lang="ts">
+	import { reactive, computed, watch, nextTick, getCurrentInstance } from 'vue'
+	import { redirect, currRoute,currShareRoute, img } from '@/utils/common'
+	import useConfigStore from '@/stores/config'
+	import { cloneDeep } from 'lodash-es'
+
+    const props = defineProps({
+	    addon: {
+		    type: String,
+		    default: ''
+	    },
+	    color: {
+		    type: Object,
+		    default: () => {
+			    return {
+				    backgroundColor: '', // 背景色
+				    textColor: '', // 文字颜色
+				    textHoverColor: '', // 文字选中颜色
+			    };
+		    }
+	    },
+	    border: {
+		    type: Boolean,
+		    default: true
+	    }
+    })
+
+	let addon: any = props.addon;
+
+    const configStore = useConfigStore()
+	if(!addon && configStore.addon) {
+		addon = configStore.addon;
+	}
+
+    const tabbar: any = reactive({})
+
+    const setTabbar = ()=> {
+	    let list = cloneDeep(useConfigStore().tabbarList);
+	    if (list.length == 1) {
+		    Object.assign(tabbar, list[0]);
+	    } else {
+		    let isExist = false;
+		    for (let i = 0; i < list.length; i++) {
+			    if (list[i].key == addon) {
+				    Object.assign(tabbar, list[i]);
+				    isExist = true;
+				    break;
+			    }
+		    }
+
+		    if (!isExist) {
+
+			    // 检测是否单应用
+			    let count = 0;
+			    let singleTabbar = {}
+			    try {
+				    if (list) {
+					    list.forEach((item: any) => {
+						    if (item.info.type == 'app') {
+							    count++;
+							    singleTabbar = item;
+						    }
+					    })
+				    }
+
+				    if (count == 1) {
+					    Object.assign(tabbar, singleTabbar);
+				    }
+
+			    } catch (e) {
+			    }
+		    }
+
+	    }
+	    if (props.color) {
+		    for (let key in props.color) {
+			    if (props.color[key] && tabbar.value[key]) {
+				    tabbar.value[key] = props.color[key];
+			    }
+		    }
+	    }
+    }
+
+    setTabbar()
+
+    watch(
+        () => props.addon,
+        (newValue, oldValue) => {
+            if(newValue && oldValue && newValue != oldValue) {
+                setTabbar()
+            }
+        }
+        , { immediate: true }
+    )
+
+	watch(
+        () => props.color,
+        (newValue, oldValue) => {
+            if(newValue && oldValue && newValue != oldValue) {
+                setTabbar()
+            }
+        }
+        , { immediate: true,deep: true }
+	)
+
+    if(!props.addon) {
+        watch(
+            () => useConfigStore().tabbarList,
+            (newValue, oldValue) => {
+                if (newValue) {
+                    setTabbar()
+                }
+            }
+            , { deep: true, immediate: true }
+        )
+    }
+
+	const value = computed(() => {
+        let query:any = currShareRoute().params;
+        let str = [];
+        for (let key in query) {
+            str.push(key + '=' + query[key]);
+        }
+		return '/' + currRoute() + (str.length > 0 ? '?' + str.join('&') : '')
+	})
+
+	const itemBtn = (url: any)=> {
+		if (url.indexOf('http') != -1 || url.indexOf('http') != -1) {
+
+			// #ifdef H5
+			window.location.href = url;
+			// #endif
+
+			// #ifdef MP
+			redirect({
+				url: '/app/pages/webview/index',
+				param: { src: encodeURIComponent(url) }
+			});
+			// #endif
+		} else {
+			let query: any = currShareRoute().params;
+			let str = [];
+			for (let key in query) {
+				str.push(key + '=' + query[key]);
+			}
+			if (url == ('/' + currRoute()) && !str.length) return
+			redirect({ url, mode: 'reLaunch' })
+		}
+	}
+
+    const instance = getCurrentInstance();
+	nextTick(() => {
+		const query = uni.createSelectorQuery().in(instance);
+		query.select('.tab-bar-placeholder').boundingClientRect((data: any) => {
+			let height = data ? data.height : 0;
+			let tabbarInfo = {
+				height: height
+			};
+			uni.setStorageSync('tabbarInfo', tabbarInfo);
+		}).exec();
+	})
+</script>
+
+<style lang="scss" scoped>
+	.tab-bar-placeholder {
+		padding-bottom: calc(constant(safe-area-inset-bottom) + 50px);
+		padding-bottom: calc(env(safe-area-inset-bottom) + 50px);
+	}
+</style>
diff --git a/uni-app/src/components/top-tabbar/top-tabbar.vue b/uni-app/src/components/top-tabbar/top-tabbar.vue
new file mode 100644
index 00000000..895007d6
--- /dev/null
+++ b/uni-app/src/components/top-tabbar/top-tabbar.vue
@@ -0,0 +1,461 @@
+<template>
+	<view class="ns-navbar-wrap" v-if="diyStore.mode !='decorate' && topStatusBarData" :class="topStatusBarData.style">
+		<view class="u-navbar" :class="{'fixed': props.scrollBool != -1, 'absolute': props.scrollBool == -1}" :style="{ backgroundColor: bgColor}">
+			<view class="navbar-inner" :style="{ width: '100%', height: placeholderHeight + 'px' }">
+				<view v-if="topStatusBarData.style == 'style-1'" class="content-wrap" :class="[topStatusBarData.textAlign]" :style="navbarInnerStyle">
+					<view v-if="isBack" class="back-wrap -ml-[16rpx] text-[26px] nc-iconfont nc-icon-zuoV6xx" :style="{ color: titleTextColor }" @tap="goBack"></view>
+					<view class="title-wrap" :style="styleOneFontSize">
+						{{ data.title }}
+					</view>
+				</view>
+				<view v-if="topStatusBarData.style == 'style-2'" class="content-wrap"  :style="navbarInnerStyle" @click="diyStore.toRedirect(topStatusBarData.link)">
+					<view v-if="isBack" class="back-wrap -ml-[16rpx] text-[26px] nc-iconfont nc-icon-zuoV6xx" :style="{ color: titleTextColor }" @tap="goBack"></view>
+					<view class="title-wrap" :style="{ color: topStatusBarData.textColor }">
+						<view>
+							<image :src="img(topStatusBarData.imgUrl)" mode="heightFix"></image>
+						</view>
+						<view :style="{ color: topStatusBarData.textColor }">{{ data.title }}</view>
+					</view>
+				</view>
+
+				<view v-if="topStatusBarData.style == 'style-3'" :style="navbarInnerStyle" class="content-wrap">
+					<view v-if="isBack" class="back-wrap -ml-[16rpx] text-[26px] nc-iconfont nc-icon-zuoV6xx" :style="{ color: titleTextColor }" @tap="goBack"></view>
+					<view class="title-wrap" @click="diyStore.toRedirect(topStatusBarData.link)">
+						<image :src="img(topStatusBarData.imgUrl)" mode="heightFix"></image>
+					</view>
+					<view class="search" @click="diyStore.toRedirect(topStatusBarData.link)" :style="{ height: systemStore.menuButtonInfo.height - 2 + 'px', lineHeight: systemStore.menuButtonInfo.height - 2 + 'px' }">
+						<text class="nc-iconfont nc-icon-sousuo-duanV6xx1 text-[24rpx] absolute left-[20rpx]"></text>
+						<text class="text-[24rpx]">{{topStatusBarData.inputPlaceholder}}</text>
+					</view>
+					<view :style="{ 'width': capsuleWidth }"></view>
+				</view>
+
+				<view v-if="topStatusBarData.style == 'style-4'" :style="navbarInnerStyle" class="content-wrap">
+					<view v-if="isBack" class="back-wrap -ml-[16rpx] text-[26px] nc-iconfont nc-icon-zuoV6xx" :style="{ color: titleTextColor }" @tap="goBack"></view>
+					<text class="nc-iconfont nc-icon-dizhiguanliV6xx text-[28rpx]" :style="{ color: topStatusBarData.textColor }"></text>
+					<view class="title-wrap"  @click.stop="locationVal.reposition()" :style="{ color: topStatusBarData.textColor }" v-if="systemStore.diyAddressInfo">{{ systemStore.diyAddressInfo.community }}</view>
+					<view class="title-wrap"  @click.stop="locationVal.reposition()" :style="{ color: topStatusBarData.textColor }" v-else>{{ systemStore.defaultPositionAddress }}</view>
+					<text class="nc-iconfont nc-icon-youV6xx text-[26rpx]" @click.stop="locationVal.reposition()" :style="{ color: topStatusBarData.textColor }"></text>
+				</view>
+			</view>
+		</view>
+
+		<!-- 解决fixed定位后导航栏塌陷的问题 -->
+		<view v-if="isFill" class="u-navbar-placeholder" :style="{ width: '100%', paddingTop: placeholderHeight + 'px' }"></view>
+	</view>
+</template>
+
+<script setup lang="ts">
+import { ref, computed, onMounted, getCurrentInstance, nextTick } from 'vue';
+import { redirect, img } from '@/utils/common';
+import useSystemStore from '@/stores/system';
+import useDiyStore from '@/app/stores/diy';
+import {useLocation} from '@/hooks/useLocation'
+
+// 获取系统状态栏的高度
+let systemInfo = uni.getSystemInfoSync();
+let platform = systemInfo.platform;
+const systemStore = useSystemStore();
+
+const diyStore = useDiyStore();
+
+const props = defineProps({
+    data: {
+        type: Object,
+        default: {}
+    },
+    // 标题的颜色
+    titleColor: {
+    	type: String,
+    	default: '#606266'
+    },
+    // 自定义返回逻辑
+    customBack: {
+    	type: Function,
+    	default: null
+    },
+    scrollBool: {
+    	type: [String, Number],
+    	default: -1
+    },
+    // 是否显示导航栏左边返回图标和辅助文字
+    isBack: {
+    	type: Boolean,
+    	default: true
+    },
+	isFill: {
+    	type: Boolean,
+    	default: true
+    }
+})
+
+// 控制-定位后是否对导航栏进行填充
+const isFill = computed(() => {
+	let bool = true;
+	if(imageAdsSameScreen.value) {
+		bool = false;
+	}else {
+		bool = props.isFill;
+	}
+	return bool;
+});
+
+const data = computed(() => {
+	return props.data;
+});
+
+const topStatusBarData = computed(() => {
+	if(props.data && props.data.topStatusBar)
+		return props.data.topStatusBar;
+});
+
+// 导航栏内部盒子的样式
+const navbarInnerStyle = computed(() => {
+	let style = '';
+
+	if(props.isBack){
+		style += 'padding-left: 30rpx;';//30=>右边留边 44=>箭头宽度 10=>箭头的右maring
+		if(topStatusBarData.value.style == 'style-1') //样式一需要居中需要有右边padding辅助
+			style += 'padding-right:' + (40+30+10) + 'rpx;'; //30=>左边留边 44=>箭头宽度 10=>箭头的右maring
+	}else{
+		if(topStatusBarData.value.style == 'style-1') //样式一需要居中需要有右边padding辅助
+			style += 'padding-right: 30rpx;'; //右边留边
+		style += 'padding-left: 30rpx;'; //左边留边
+	}
+	// #ifdef MP
+	// 导航栏宽度，如果在小程序下，导航栏宽度为胶囊的左边到屏幕左边的距离
+	style += 'height:' + systemStore.menuButtonInfo.height + 'px;';
+	style += 'padding-top:' + systemStore.menuButtonInfo.top + 'px;';
+	style += 'padding-bottom: 8px;';
+	// #endif
+	return style;
+})
+
+// 样式一的字体大小
+const styleOneFontSize = computed(() => {
+	let style = '';
+
+	// #ifdef H5
+	style += 'font-size: 28rpx;';
+	// #endif
+	// #ifdef MP
+	style += 'font-size: 32rpx;';
+	if (platform === 'ios') {
+		// 苹果(iOS)设备
+		style += 'font-weight: 500;';
+	} else if (platform === 'android') {
+	  // 安卓(Android)设备
+		style += 'font-size: 36rpx;';
+		style += 'font-weight: 500;';
+	}
+	// #endif
+	style += `color: ${titleTextColor.value};`;
+	if(topStatusBarData.value.style == 'style-1'){
+		style += `text-align: ${topStatusBarData.value.textAlign};`;
+	}
+	return style;
+})
+
+const titleTextColor = computed(()=>{
+	let color = '';
+	if (props.scrollBool == 1) {
+		color = topStatusBarData.value.rollTextColor;
+	} else {
+		color = topStatusBarData.value.textColor;
+	}
+	return color;
+})
+
+const bgColor  = computed(() => {
+	let color = '';
+	if (props.scrollBool == 1) {
+		color = topStatusBarData.value.rollBgColor;
+	} else {
+		color = topStatusBarData.value.bgColor;
+	}
+	return color;
+})
+
+/******************************* 存储滚动值-start ***********************/
+// 键名和组件名一致即可
+let componentsScrollVal = uni.getStorageSync('componentsScrollValGroup')
+if(componentsScrollVal){
+	componentsScrollVal.TopTabbar = 0
+	uni.setStorageSync('componentsScrollValGroup', componentsScrollVal);
+}else{
+	let obj = {
+		TopTabbar: 0
+	}
+	uni.setStorageSync('componentsScrollValGroup', obj);
+}
+/******************************* 存储滚动值-end ***********************/
+
+/******************************* 返回按钮-start ***********************/
+// const isBackShow = ref(false);
+let pages = getCurrentPages();
+
+// 返回按钮的函数
+const goBack = () => {
+	// 兼容小程序，未登录状态下点击某个功能跳转到登录页，不登录无法返回的情况
+	if (pages.length === 1) {
+		if (pages[0].route === 'app/pages/auth/index') {
+				uni.getStorage({
+					key: 'loginBack',
+					success: (res: any) => {
+					    res ? redirect(
+					        {
+					            ...res.data,
+					            mode: 'redirectTo'
+					        }
+					    ) : redirect({ url: '/app/pages/index/index', mode: 'switchTab' })
+					},
+					fail: (res) => {
+					    redirect({ url: '/app/pages/index/index', mode: 'switchTab' })
+					}
+			});
+		} else if (typeof props.customBack === 'function') {
+            props.customBack();
+        }else{
+            redirect({ url: '/app/pages/index/index', mode: 'switchTab' });
+        }
+	}else{
+		// 如果自定义了点击返回按钮的函数，则执行，否则执行返回逻辑
+		if (typeof props.customBack === 'function') {
+			props.customBack();
+		} else {
+			uni.navigateBack();
+		}
+	}
+}
+/******************************* 返回按钮-end ***********************/
+
+// 微信胶囊宽度+right
+const capsuleWidth = computed(() => {
+	let width = `calc(100vw - ${systemStore.menuButtonInfo.right}px + ${systemStore.menuButtonInfo.width}px + 10px)`;
+	return width;
+})
+
+// 导航栏塌陷的高度
+const placeholderHeight = ref(0);
+const instance = getCurrentInstance();
+// #ifdef MP
+let statusBarHeight = systemStore.menuButtonInfo.height + systemStore.menuButtonInfo.top + 8;
+placeholderHeight.value = statusBarHeight || 0;
+// #endif
+const navbarPlaceholderHeight = () => {
+    nextTick(() => {
+		const query = uni.createSelectorQuery().in(instance);
+		query.select('.ns-navbar-wrap .u-navbar .content-wrap').boundingClientRect(data => {
+			placeholderHeight.value = data ? data.height : 0;
+			diyStore.topTabarHeight = placeholderHeight.value;
+		}).exec();
+	})
+}
+
+/************** 定位-start ****************/
+	let isOpenLocation = false;
+	if(topStatusBarData.value && topStatusBarData.value.style == 'style-4') {
+		isOpenLocation = true;
+	}
+
+	const locationVal = useLocation(isOpenLocation);
+	locationVal.onLoad();
+	locationVal.init();
+/************** 定位-end ****************/
+let imageAdsSameScreen = ref(false);
+onMounted(() => {
+	navbarPlaceholderHeight();
+	// if (pages.length > 1) {
+	// 	isBackShow.value = true;
+	// 	// 兼容小程序，未登录状态下点击某个功能跳转到登录页，不登录无法返回的情况
+	// }else if(pages.length ==  1 && pages[0].route == 'app/pages/auth/index'){
+	// 	isBackShow.value = true;
+	// }
+	// 刷新定位
+	locationVal.refresh();
+	
+	// 图文导航开启沉浸式且导航栏开启时，导航栏不占位
+	imageAdsSameScreen.value = uni.getStorageSync('imageAdsSameScreen') || false;
+});
+
+// 页面onShow调用时，也会触发改方法
+const refresh = ()=>{
+	// 刷新定位
+	locationVal.refresh();
+}
+
+defineExpose({
+	refresh
+})
+</script>
+
+<style scoped lang="scss">
+/* #ifdef H5 */
+.style-1,
+.style-2,
+.style-3 {
+	display: none;
+}
+/* #endif */
+
+.u-navbar {
+	width: 100%;
+	transition: background 0.3s;
+	left: 0;
+	right: 0;
+	top: 0;
+	z-index: 991;
+}
+
+.navbar-inner {
+	display: flex;
+	justify-content: space-between;
+	position: relative;
+	align-items: center;
+	// padding-bottom: 20rpx;
+	// /* #ifdef H5 */
+	// padding-bottom: 40rpx;
+	// /* #endif */
+}
+
+.back-wrap {
+	padding-right: 10rpx;
+	line-height: 1;
+	.iconfont {
+		font-size: 40rpx;
+	}
+}
+
+.content-wrap {
+	display: flex;
+	align-items: center;
+	justify-content: flex-start;
+	flex: 1;
+	position: absolute;
+	left: 0;
+	right: 0;
+	top: 0;
+	height: 60rpx;
+	text-align: center;
+	flex-shrink: 0;
+}
+
+.title-wrap {
+	line-height: 1;
+	flex: 1;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	font-size: 32rpx;
+	color: #000000;
+}
+
+.ns-navbar-wrap {
+
+	&.style-2 {
+		.content-wrap {
+			.title-wrap {
+				display: flex;
+				align-items: center;
+				text-align: left;
+
+				>view {
+					height: 56rpx;
+					line-height: 56rpx;
+					max-width: 300rpx;
+					font-size: 28rpx;
+
+					image {
+						width: 100%;
+						height: 100%;
+						margin-right: 20rpx;
+					}
+
+					&:last-child {
+						max-width: 300rpx;
+						overflow: hidden; //超出的文本隐藏
+						text-overflow: ellipsis; //用省略号显示
+						white-space: nowrap; //不换行
+						flex: 1;
+					}
+				}
+			}
+		}
+	}
+
+	&.style-3 {
+		.content-wrap {
+			.title-wrap {
+				height: 60rpx;
+				max-width: 170rpx;
+				flex: initial;
+				text-align: center;
+				margin-right: 10rpx;
+
+				image {
+					height: 100%;
+					width: 100%;
+				}
+			}
+
+			.search {
+				flex: 1;
+				padding-right: 20rpx;
+				padding-left: 62rpx;
+                position: relative;
+				background-color: #fff;
+				text-align: left;
+				border-radius: 60rpx;
+				height: 60rpx;
+				line-height: 60rpx;
+				border: 1px solid #eeeeee;
+				color: rgb(102, 102, 102);
+				display: flex;
+				align-items: center;
+				margin-right: 10rpx;
+				overflow: hidden;
+				box-sizing: border-box;
+				text{
+                    overflow: hidden; //超出的文本隐藏
+                    text-overflow: ellipsis; //用省略号显示
+                    white-space: nowrap; //不换行
+                }
+				.iconfont {
+					color: #909399;
+					font-size: 32rpx;
+					margin-right: 10rpx;
+				}
+			}
+		}
+	}
+
+	&.style-4 {
+		.content-wrap {
+			top: 0;
+			text-align: left;
+			padding-left: 30rpx;
+			/* #ifdef H5 */
+			padding-top: 10rpx;
+			padding-bottom: 10rpx;
+			/* #endif */
+
+			.title-wrap {
+				flex: none;
+				margin: 0 10rpx;
+				max-width: 360rpx;
+				font-size: 27rpx;
+				line-height: normal;
+			}
+
+			.nearby-store-name {
+				margin: 0 10rpx;
+				background: rgba(0, 0, 0, .2);
+				font-size: 22rpx;
+				border-radius: 40rpx;
+				padding: 10rpx 20rpx;
+				line-height: 1;
+			}
+		}
+	}
+}
+</style>
diff --git a/uni-app/src/components/wx-privacy-popup/wx-privacy-popup.vue b/uni-app/src/components/wx-privacy-popup/wx-privacy-popup.vue
new file mode 100644
index 00000000..7944cccb
--- /dev/null
+++ b/uni-app/src/components/wx-privacy-popup/wx-privacy-popup.vue
@@ -0,0 +1,241 @@
+<template>
+	<view v-if="showPop">
+		<view class="privacy-mask">
+			<view class="privacy-wrap">
+				<view class="privacy-title">用户隐私保护提示</view>
+				<view class="privacy-desc">
+					感谢您使用本小程序，在使用前您应当阅读并同意
+					<text class="privacy-link" @tap="openPrivacyContract">{{privacyContractName}}</text>，
+					当点击同意并继续时，即表示您已理解并同意该条款内容，该条款将对您产生法律约束力；如您不同意，将无法继续使用小程序相关功能。
+				</view>
+				<view class="privacy-button-flex">
+					<button class="privacy-button-btn bg-disagree" @tap="handleDisagree">不同意</button>
+					<button id="agree-btn" class="privacy-button-btn bg-agree" open-type="agreePrivacyAuthorization" @agreeprivacyauthorization="handleAgree">同意并继续</button>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup lang="ts">
+    import { ref, onMounted } from 'vue'
+    import useConfigStore from "@/stores/config";
+
+    const agree = ref(false)
+    const showPop = ref(false)
+    const privacyAuthorization: any = ref(null)
+
+    const privacyResolves = new Set()
+    const closeOtherPagePopUpHooks = new Set()
+
+    const privacyContractName = ref('用户隐私保护指引')
+
+    const emits = defineEmits(['agree','disagree'])
+
+    // 监听何时需要提示用户阅读隐私政策
+    const init = ()=> {
+        if (wx.onNeedPrivacyAuthorization) {
+            wx.onNeedPrivacyAuthorization((resolve: any) => {
+                if (typeof privacyAuthorization.value === 'function') {
+                    privacyAuthorization.value(resolve)
+                }
+            })
+        }
+    }
+
+    //初始化监听程序
+    const curPageShow = ()=> {
+        privacyAuthorization.value = (resolve: any) => {
+            privacyResolves.add(resolve)
+            //打开弹窗
+            popUp()
+            // 额外逻辑：当前页面的隐私弹窗弹起的时候，关掉其他页面的隐私弹窗
+            closeOtherPagePopUp(disPopUp)
+        }
+        closeOtherPagePopUpHooks.add(disPopUp)
+    }
+
+    onMounted(()=>{
+        // 查询微信侧记录的用户是否有待同意的隐私政策信息
+        try {
+            wx.getPrivacySetting({
+                success(res:any) {
+                    // console.log('隐私政策信息', res);
+                    // console.log(res.privacyContractName);
+                    privacyContractName.value = res.privacyContractName
+                }
+            });
+            init();
+            curPageShow()
+        } catch (e) {
+            // console.log("=========低版本基础库==========")
+        }
+    });
+
+    // 打开隐私协议
+    const openPrivacyContract = ()=> {
+        wx.openPrivacyContract({
+            success(res) {
+                // console.log('打开隐私协议', res);
+            },
+            fail(err) {
+                // console.error('打开隐私协议失败', err)
+            }
+        });
+    }
+
+    // 额外逻辑：当前页面的隐私弹窗弹起的时候，关掉其他页面的隐私弹窗
+    const closeOtherPagePopUp = (closePopUp:any)=> {
+        closeOtherPagePopUpHooks.forEach((hook:any) => {
+            if (closePopUp !== hook) {
+                hook()
+            }
+        })
+    }
+
+    // 不同意
+    const handleDisagree = ()=> {
+        privacyResolves.forEach((resolve: any) => {
+            resolve({
+                event: 'disagree',
+            })
+        })
+        privacyResolves.clear()
+        // 关闭弹窗
+        disPopUp()
+        // 退出小程序
+        uni.showModal({
+            content: '未同意隐私协议，无法使用相关功能',
+            confirmColor: useConfigStore().themeColor['--primary-color'],
+            success: () => {
+                emits('disagree')
+            }
+        })
+    }
+
+    // 同意并继续
+    const handleAgree = ()=> {
+        privacyResolves.forEach((resolve: any) => {
+            resolve({
+                event: 'agree',
+                buttonId: 'agree-btn'
+            })
+        })
+        privacyResolves.clear()
+        //关闭弹窗
+        disPopUp()
+        emits('agree')
+    }
+
+    // 打开弹窗
+    const popUp = ()=> {
+        if (showPop.value === false) {
+            showPop.value = true
+        }
+    }
+
+    // 关闭弹窗
+    const disPopUp = ()=> {
+        if (showPop.value === true) {
+            showPop.value = false
+        }
+    }
+
+    // 主动打开协议弹出框（如果已经同意，则不会弹出）
+    const proactive =()=> {
+        if (wx.getPrivacySetting) {
+            wx.getPrivacySetting({
+                success: (res: any) => {
+                    if (res.needAuthorization) {
+                        popUp()
+                        // 额外逻辑：当前页面的隐私弹窗弹起的时候，关掉其他页面的隐私弹窗
+                        closeOtherPagePopUp(disPopUp)
+                    } else {
+                        emits('agree')
+                    }
+                },
+            });
+        } else {
+            emits('agree')
+        }
+    }
+
+    defineExpose({
+	    proactive
+    })
+</script>
+
+<style lang="scss" scoped>
+	.privacy-mask {
+		position: fixed;
+		z-index: 20000;
+		top: 0;
+		right: 0;
+		left: 0;
+		bottom: 0;
+		background: rgba(0, 0, 0, 0.2);
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.privacy-wrap {
+		width: 632rpx;
+		padding: 48rpx 30rpx;
+		box-sizing: border-box;
+		background: #fff;
+		border-radius: 16rpx;
+	}
+
+	.privacy-title {
+		padding: 0rpx 30rpx 40rpx 30rpx;
+		font-weight: 700;
+		font-size: 36rpx;
+		text-align: center;
+	}
+
+	.privacy-desc {
+		font-size: 30rpx;
+		color: #555;
+		line-height: 2;
+		text-align: left;
+		padding: 0 40rpx;
+	}
+
+	.privacy-link {
+		color: #2f80ed;
+	}
+
+	.privacy-button-flex {
+		display: flex;
+		padding: 20rpx 40rpx;
+	}
+
+	.privacy-button-btn {
+		color: #FFF;
+		font-size: 30rpx;
+		font-weight: 500;
+		line-height: 100rpx;
+		text-align: center;
+		height: 100rpx;
+		border-radius: 20rpx;
+		border: none;
+		background: #07c160;
+		flex: 1;
+		margin-right: 30rpx;
+		justify-content: center;
+	}
+
+	.privacy-button-btn::after {
+		border: none;
+	}
+
+	.bg-disagree {
+		color: #07c160;
+		background: #f2f2f2;
+	}
+
+	.bg-agree {
+		margin-right: 0rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/uni-app/src/components/x-skeleton/config.js b/uni-app/src/components/x-skeleton/config.js
new file mode 100644
index 00000000..fe359d6d
--- /dev/null
+++ b/uni-app/src/components/x-skeleton/config.js
@@ -0,0 +1,150 @@
+
+// banner 轮播图
+export function bannerConfig(config) {
+	return {
+		padding: '20rpx',
+		gridRows: 1,
+		gridColumns: 1,
+		gridRowsGap: '40rpx',
+		gridColumnsGap: '24rpx',
+		itemDirection: 'row',
+		itemGap: '30rpx',
+		itemAlign: 'center',
+		headShow: true,
+		headWidth: '100%',
+		headHeight: '300rpx',
+		headBorderRadius: '20rpx',
+		textShow: false,
+		textRows: 3,
+		textRowsGap: '20rpx',
+		textWidth: '100%',
+		textHeight: '30rpx',
+		textBorderRadius: '6rpx',
+		...config
+	}
+}
+
+// info 个人信息
+export function infoConfig(config) {
+	return {
+		padding: '20rpx',
+		gridRows: 1,
+		gridColumns: 1,
+		gridRowsGap: '50rpx',
+		gridColumnsGap: '24rpx',
+		itemDirection: 'row',
+		itemGap: '30rpx',
+		itemAlign: 'flex-start',
+		headShow: true,
+		headWidth: '100rpx',
+		headHeight: '100rpx',
+		headBorderRadius: '50%',
+		textShow: true,
+		textRows: 4,
+		textRowsGap: '30rpx',
+		textWidth: ['50%', '100%', '100%', '80%'],
+		textHeight: ['40rpx', '24rpx', '24rpx', '24rpx'],
+		textBorderRadius: '6rpx',
+		...config
+	}
+}
+
+// text 段落
+export function textConfig(config) {
+	return {
+		padding: '20rpx',
+		gridRows: 1,
+		gridColumns: 1,
+		gridRowsGap: '50rpx',
+		gridColumnsGap: '24rpx',
+		itemDirection: 'row',
+		itemGap: '30rpx',
+		itemAlign: 'flex-start',
+		headShow: false,
+		headWidth: '100rpx',
+		headHeight: '100rpx',
+		headBorderRadius: '50%',
+		textShow: true,
+		textRows: 4,
+		textRowsGap: '30rpx',
+		textWidth: ['50%', '100%', '100%', '80%'],
+		textHeight: '30rpx',
+		textBorderRadius: '6rpx',
+		...config
+	}
+}
+
+// menu 菜单
+export function menuConfig(config) {
+	return {
+		padding: '20rpx',
+		gridRows: 2,
+		gridColumns: 5,
+		gridRowsGap: '40rpx',
+		gridColumnsGap: '40rpx',
+		itemDirection: 'column',
+		itemGap: '16rpx',
+		itemAlign: 'center',
+		headShow: true,
+		headWidth: '100rpx',
+		headHeight: '100rpx',
+		headBorderRadius: '50%',
+		textShow: true,
+		textRows: 1,
+		textRowsGap: '0rpx',
+		textWidth: '100%',
+		textHeight: '24rpx',
+		textBorderRadius: '6rpx',
+		...config
+	}
+}
+
+// list 列表
+export function listConfig(config) {
+	return {
+		padding: '20rpx',
+		gridRows: 2,
+		gridColumns: 1,
+		gridRowsGap: '50rpx',
+		gridColumnsGap: '24rpx',
+		itemDirection: 'row',
+		itemGap: '30rpx',
+		itemAlign: 'flex-start',
+		headShow: true,
+		headWidth: '200rpx',
+		headHeight: '200rpx',
+		headBorderRadius: '16rpx',
+		textShow: true,
+		textRows: 4,
+		textRowsGap: '30rpx',
+		textWidth: ['50%', '100%', '100%', '80%'],
+		textHeight: ['38rpx', '24rpx', '24rpx', '24rpx'],
+		textBorderRadius: '6rpx',
+		...config
+	}
+}
+
+// waterfall 瀑布流
+export function waterfallConfig(config) {
+	return {
+		padding: '20rpx',
+		gridRows: 2,
+		gridColumns: 2,
+		gridRowsGap: '40rpx',
+		gridColumnsGap: '24rpx',
+		itemDirection: 'column',
+		itemGap: '16rpx',
+		itemAlign: 'center',
+		headShow: true,
+		headWidth: '100%',
+		headHeight: '400rpx',
+		headBorderRadius: '12rpx',
+		textShow: true,
+		textRows: 3,
+		textRowsGap: '12rpx',
+		textWidth: ['40%', '85%', '60%'],
+		textHeight: ['30rpx', '20rpx', '20rpx'],
+		textBorderRadius: '6rpx',
+		...config
+	}
+}
\ No newline at end of file
diff --git a/uni-app/src/components/x-skeleton/x-skeleton.vue b/uni-app/src/components/x-skeleton/x-skeleton.vue
new file mode 100644
index 00000000..b2361f7e
--- /dev/null
+++ b/uni-app/src/components/x-skeleton/x-skeleton.vue
@@ -0,0 +1,319 @@
+<template>
+	<view class="x-skeleton" :style="variableStr">
+		<!-- 骨架屏 -->
+		<view
+			v-if="skeletonLoading"
+			class="x-skeleton__wrapper"
+			:class="[ startFadeOut && 'fade-out' ]"
+			:style="{ padding: skeletonConfig.padding }"
+		>
+			<view
+				v-for="(row, rowIndex) in gridRowsArr" :key="rowIndex"
+				class="x-skeleton__wrapper__rows"
+				:style="{ marginBottom: rowIndex < gridRowsArr.length - 1 ? skeletonConfig.gridRowsGap : 0 }"
+			>
+				<view
+					v-for="(column, columnIndex) in gridColumnsArr" :key="columnIndex"
+					class="x-skeleton__wrapper__columns"
+					:style="{
+						flexDirection: skeletonConfig.itemDirection,
+						alignItems: skeletonConfig.itemAlign,
+						marginRight: columnIndex < gridColumnsArr.length - 1 ? skeletonConfig.gridColumnsGap : 0,
+					}"
+				>
+					<view
+						v-if="skeletonConfig.headShow"
+						class="x-skeleton__wrapper__head"
+						:class="[ animate && 'animate' ]"
+						:style="{
+							width: skeletonConfig.headWidth,
+							height: skeletonConfig.headHeight,
+							borderRadius: skeletonConfig.headBorderRadius,
+							marginRight: (skeletonConfig.itemDirection == 'row' && skeletonConfig.textShow) ? skeletonConfig.itemGap : 0,
+							marginBottom: (skeletonConfig.itemDirection == 'column' && skeletonConfig.textShow) ? skeletonConfig.itemGap : 0
+						}"
+					></view>
+					<view v-if="skeletonConfig.textShow" class="x-skeleton__wrapper__text">
+						<view
+							v-for="(text, textIndex) in textRowsArr" :key="textIndex"
+							class="x-skeleton__wrapper__text__row"
+							:class="[animate && 'animate']"
+							:style="{
+								width: text.width, 
+								height: text.height, 
+								borderRadius: skeletonConfig.textBorderRadius,
+								marginBottom: textIndex < textRowsArr.length - 1 ? skeletonConfig.textRowsGap : 0
+							}"
+						></view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 插槽 -->
+		<view v-else>
+			<slot></slot>
+		</view>
+	</view>
+</template>
+
+<script setup lang="ts">
+    import { ref,computed,watch } from 'vue'
+    import { bannerConfig,infoConfig,textConfig,menuConfig,listConfig,waterfallConfig } from './config.js'
+
+    const props = defineProps({
+        // 骨架屏类型
+        type: {
+            type: String,
+            default: '', //banner 轮播图、info 个人信息、text 段落、menu 菜单、list 列表、waterfall 瀑布流
+            required: true
+        },
+        // 是否展示骨架组件
+        loading: {
+            type: Boolean,
+            default: true
+        },
+        // 是否开启动画效果
+        animate: {
+            type: Boolean,
+            default: true
+        },
+        // 动画效果持续时间，单位秒
+        animateTime: {
+            type: Number,
+            default: 1.8
+        },
+        // 是否开启淡出动画
+        fadeOut: {
+            type: Boolean,
+            default: true
+        },
+        // 淡出效果持续时间，单位秒
+        fadeOutTime: {
+            type: Number,
+            default: 0.5
+        },
+        // 骨架的背景色
+        bgColor: {
+            type: String,
+            default: '' // #EAEDF5
+        },
+        // 骨架的动画高亮背景色
+        highlightBgColor: {
+            type: String,
+            default: '' // #F9FAFF
+        },
+        // 自定义配置
+        config: {
+            type: Object,
+            default: () => {
+                return {
+                    // padding: '30rpx',		   				  //内边距
+
+                    // gridRows: 3, 			 	   			  //行数
+                    // gridColumns: 2,	  		  	   			  //列数
+                    // gridRowsGap: '40rpx',		   			  //行间隔
+                    // gridColumnsGap: '24rpx',	   			  	  //竖间距
+
+                    // itemDirection: 'column',   				  //head与text之间的排列方向（row、column）
+                    // itemGap: '16rpx', 				  		  //head与text之间的间隔
+                    // itemAlign: 'center',  	   				  //head与text之间的纵轴对齐方式（center、flex-start、flex-end、baseline）
+
+                    // headShow: true,		 	   				  //head是否展示
+                    // headWidth: '100%',	  	   				  //head宽度，支持百分比
+                    // headHeight: '400rpx',	   				  //head高度
+                    // headBorderRadius: '12rpx', 				  //head圆角，支持百分比
+
+                    // textShow: true,		   				      //文本是否展示
+                    // textRows: 3,		 	   				  	  //文本的行数
+                    // textRowsGap: '12rpx',		   			  //文本间距
+                    // textWidth: ['40%', '85%', '60%'], 		  //文本的宽度，可以为百分比，数值，带单位字符串等，可通过数组传入指定每个段落行的宽度
+                    // textHeight: ['30rpx', '20rpx', '20rpx'],   //文本的高度，可以为数值，带单位字符串等，可通过数组传入指定每个段落行的高度
+                    // textBorderRadius: '6rpx',  			      //文本的圆角，支持百分比
+                }
+            }
+        }
+    });
+
+    const skeletonConfig = ref(props.config || {});
+    const skeletonLoading = ref(props.loading);
+    const startFadeOut = ref(false);
+    const width = ref(0);
+
+    const gridRowsArr = computed(()=> {
+        return new Array(Number(skeletonConfig.value?.gridRows || []));
+    })
+
+    const gridColumnsArr = computed(()=> {
+        return new Array(Number(skeletonConfig.value?.gridColumns || []));
+    })
+
+    const textRowsArr = computed(()=> {
+        if (!skeletonConfig.value?.textShow) return [];
+        if (/%$/.test(skeletonConfig.value.textHeight)) {
+            console.error('x-skeleton: textHeight参数不支持百分比单位');
+        }
+        const rows = []
+        for (let i = 0; i < skeletonConfig.value.textRows; i++) {
+            const {gridRows, textWidth, textHeight} = skeletonConfig.value;
+            let item: any = {},
+                // 需要预防超出数组边界的情况
+                rowWidth = isArray(textWidth) ? (textWidth[i] || (i === gridRows - 1 ? '70%' : '100%')) : i === gridRows - 1 ? '70%' : textWidth,
+                rowHeight = isArray(textHeight) ? (textHeight[i] || '30rpx') : textHeight
+            // 非百分比的宽度时，调整像素单位
+            if (/%$/.test(rowWidth)) {
+                item.width = rowWidth;
+            } else {
+                item.width = addUnit(rowWidth)
+            }
+            item.height = addUnit(rowHeight)
+            rows.push(item)
+        }
+        return rows
+    })
+
+    const variableStr = computed(()=> {
+        let keys = ['animateTime', 'fadeOutTime', 'bgColor', 'highlightBgColor'];
+        let str = keys.map(item => {
+            if (item.indexOf('Time') > -1) {
+                return `--${item}:${props[item]}s`
+            } else {
+                return `--${item}:${props[item]}`
+            }
+        }).join(";");
+        return str;
+    })
+
+    watch(
+	    () => props.loading,
+	    (value) =>{
+            if (value) {
+                skeletonLoading.value = true;
+            } else {
+                if (props.fadeOut) {
+                    startFadeOut.value = true;
+                    setTimeout(() => {
+                        skeletonLoading.value = false;
+                        startFadeOut.value = false;
+                    }, props.fadeOutTime * 1000);
+                } else {
+                    skeletonLoading.value = false;
+                }
+            }
+	    },
+	    {immediate: true}
+    )
+
+    watch(
+        () => props.type,
+        (value) =>{
+            if (value === 'banner') {
+                skeletonConfig.value = bannerConfig(props.config);
+            } else if (value === 'info') {
+                skeletonConfig.value = infoConfig(props.config);
+            } else if (value === 'text') {
+                skeletonConfig.value = textConfig(props.config);
+            } else if (value === 'menu') {
+                skeletonConfig.value = menuConfig(props.config);
+            } else if (value === 'list') {
+                skeletonConfig.value = listConfig(props.config);
+            } else if (value === 'waterfall') {
+                skeletonConfig.value = waterfallConfig(props.config);
+            } else {
+                skeletonConfig.value = props.config || {};
+            }
+        },
+	    {immediate: true}
+    )
+
+    /**
+     * @param {object} value 需要判断的对象
+     */
+    const isArray = (value:any) => {
+        if (typeof Array.isArray === 'function') {
+            return Array.isArray(value)
+        }
+        return Object.prototype.toString.call(value) === '[object Array]'
+    }
+
+    /**
+     * @description 添加单位，如果有rpx，upx，%，px等单位结尾或者值为auto，直接返回，否则加上px单位结尾
+     * @param {string|number} value 需要添加单位的值
+     * @param {string} unit 添加的单位名 比如px
+     */
+    const addUnit = (value = 'auto', unit = 'px')=> {
+        value = String(value);
+        // 用uView内置验证规则中的number判断是否为数值
+        return /^[\+-]?(\d+\.?\d*|\.\d+|\d\.\d+e\+\d+)$/.test(value) ? `${value}${unit}` : value;
+    }
+
+</script>
+
+<style lang="scss" scoped>
+	@mixin background {
+		background: linear-gradient(90deg, var(--bgColor) 25%, var(--highlightBgColor) 37%, var(--bgColor) 50%);
+		background-size: 400% 100%;
+	}
+
+	.x-skeleton {
+		width: 100%;
+		box-sizing: border-box;
+
+		.x-skeleton__wrapper {
+			display: flex;
+			flex-direction: column;
+
+			&__rows {
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+			}
+
+			&__columns {
+				display: flex;
+				align-items: center;
+				flex: 1;
+			}
+
+			&__head {
+				width: 100%;
+				@include background;
+			}
+
+			&__text {
+				flex: 1;
+				width: 100%;
+				&__row {
+					@include background;
+				}
+			}
+		}
+
+		.fade-out {
+			opacity: 0;
+			animation: fadeOutAnim var(--fadeOutTime);
+		}
+
+		@keyframes fadeOutAnim {
+			from {
+				opacity: 1;
+			}
+			to {
+				opacity: 0;
+			}
+		}
+
+		.animate {
+			animation: skeletonAnim var(--animateTime) ease infinite;
+		}
+
+		@keyframes skeletonAnim {
+			0% {
+				background-position: 100% 50%;
+			}
+
+			100% {
+				background-position: 0 50%;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/uni-app/src/hooks/useCaptcha.ts b/uni-app/src/hooks/useCaptcha.ts
new file mode 100644
index 00000000..71cb53be
--- /dev/null
+++ b/uni-app/src/hooks/useCaptcha.ts
@@ -0,0 +1,26 @@
+import { getCaptcha } from '@/app/api/system'
+import { ref } from 'vue'
+
+interface formData {
+    captcha_code: string,
+    captcha_key: string
+}
+
+export function useCaptcha(formData: formData) {
+    const image = ref('')
+    
+    const refresh = async ()=> {
+        try {
+            const res:any = await getCaptcha()
+            formData.captcha_key = res.data.captcha_key
+            formData.captcha_code = ''
+            image.value = res.data.img.replace(/\r\n/g, '')
+        } catch (e) {
+        }
+    }
+    
+    return {
+        image,
+        refresh
+    }
+}
diff --git a/uni-app/src/hooks/useDiy.ts b/uni-app/src/hooks/useDiy.ts
new file mode 100644
index 00000000..456ecced
--- /dev/null
+++ b/uni-app/src/hooks/useDiy.ts
@@ -0,0 +1,213 @@
+import { ref, reactive, computed } from 'vue';
+import { onLoad, onShow, onHide, onPageScroll, onUnload } from '@dcloudio/uni-app';
+import { img, handleOnloadParams } from '@/utils/common';
+import { getDiyInfo } from '@/app/api/diy';
+import useDiyStore from '@/app/stores/diy';
+
+export function useDiy(params: any = {}) {
+
+    const loading = ref(true);
+    const diyStore = useDiyStore();
+
+    const id = ref(0)
+    const name = ref(params.name || '')
+    const template = ref('')
+    const currRoute = ref('') //当前路由
+    const requestData: any = reactive({});
+
+    // 自定义页面 数据
+    const diyData = reactive({
+        pageMode: 'diy',
+        title: '',
+        global: {},
+        value: []
+    })
+
+    const getLoading = () => {
+        return loading.value;
+    }
+
+    const data: any = computed(() => {
+        if (diyStore.mode == 'decorate') {
+            return diyStore;
+        } else {
+            return diyData;
+        }
+    })
+
+    const isShowTopTabbar = ref(false);
+
+    const pageStyle = () => {
+        var style = '';
+        if (data.value.global.pageStartBgColor) {
+            if (data.value.global.pageStartBgColor && data.value.global.pageEndBgColor) style += `background:linear-gradient(${ data.value.global.pageGradientAngle },${ data.value.global.pageStartBgColor },${ data.value.global.pageEndBgColor });`;
+            else style += 'background-color:' + data.value.global.pageStartBgColor + ';';
+        }
+        if (data.value.global.bottomTabBarSwitch) {
+            style += 'min-height:calc(100vh - 50px);';
+        } else {
+            style += 'min-height:calc(100vh);';
+        }
+        if (data.value.global.bgUrl) {
+            style += `background-image:url('${ img(data.value.global.bgUrl) }');`;
+        }
+
+        if (data.value.global.bgHeightScale) {
+            style += `background-size: 100% ${ data.value.global.bgHeightScale }%;`;
+        }
+
+        return style;
+    };
+
+    // 监听页面加载
+    const onLoadLifeCycle = () => {
+        onLoad((option: any) => {
+            // #ifdef MP-WEIXIN
+            // 处理小程序场景值参数
+            option = handleOnloadParams(option);
+            // #endif
+
+            // #ifdef H5
+            // 装修模式
+            diyStore.mode = option.mode || '';
+            if (diyStore.mode == 'decorate') {
+                loading.value = false;
+            }
+            // #endif
+
+            id.value = option.id || '';
+            if (name.value == '') name.value = option.name || '';
+            template.value = option.template || '';
+        });
+    }
+
+    // 监听页面显示
+    const onShowLifeCycle = (callback: any = null) => {
+        onShow(() => {
+            /******** 解决跳转自定义页面空白问题-第二步-start **********/
+            let curPage: any = getCurrentPages();
+            currRoute.value = curPage[curPage.length - 1] ? curPage[curPage.length - 1].route : ''; //获取当前页面的路由
+            let urlArr = []
+            if (uni.getStorageSync('diyPageBlank')) {
+                urlArr = uni.getStorageSync('diyPageBlank');
+            }
+            if (!urlArr.length || urlArr.length && urlArr.indexOf(currRoute.value) == -1) {
+                diyStore.topFixedStatus = 'home'
+            } else if (urlArr.length && urlArr.indexOf(currRoute.value) != -1) {
+                diyStore.topFixedStatus = 'diy'
+            }
+            /******** 解决跳转自定义页面空白问题-第二步-end **********/
+
+            // 装修模式
+            if (diyStore.mode == 'decorate') {
+                diyStore.init();
+            } else {
+                getDiyInfo({
+                    id: id.value,
+                    name: name.value,
+                    template: template.value
+                }).then((res: any) => {
+                    Object.assign(requestData, res.data);
+                    if (requestData.value) {
+                        diyData.pageMode = requestData.mode;
+                        diyData.title = requestData.title;
+
+                        let sources = JSON.parse(requestData.value); // todo diy的结构应该后台处理好，前端就不需要再转换了
+
+                        diyData.global = sources.global;
+                        diyData.value = sources.value;
+                        diyData.value.forEach((item: any, index) => {
+                            item.pageStyle = '';
+                            if (item.pageStartBgColor) {
+                                if (item.pageStartBgColor && item.pageEndBgColor) item.pageStyle += `background:linear-gradient(${ item.pageGradientAngle },${ item.pageStartBgColor },${ item.pageEndBgColor });`;
+                                else item.pageStyle += 'background-color:' + item.pageStartBgColor + ';';
+                            }
+
+                            if (item.margin) {
+                                if (item.margin.top > 0) {
+                                    item.pageStyle += 'padding-top:' + item.margin.top * 2 + 'rpx' + ';';
+                                }
+                                item.pageStyle += 'padding-bottom:' + item.margin.bottom * 2 + 'rpx' + ';';
+                                item.pageStyle += 'padding-right:' + item.margin.both * 2 + 'rpx' + ';';
+                                item.pageStyle += 'padding-left:' + item.margin.both * 2 + 'rpx' + ';';
+                            }
+                        });
+
+                        // 控制自定义头部是否出现 | 微信小程序
+                        isShowTopTabbar.value = diyData.value.some((item: any) => {
+                            return item && item.position && item.position == 'top_fixed'
+                        });
+
+                        uni.setNavigationBarTitle({
+                            title: diyData.title
+                        });
+
+                    }
+
+                    loading.value = false;
+
+                    if (callback) callback(requestData)
+
+                });
+            }
+        })
+    }
+
+    // 监听页面隐藏
+    const onHideLifeCycle = (callback: any = null) => {
+        onHide(() => {
+            /******** 解决跳转自定义页面空白问题-第一步 -start **********/
+            let url = [];
+            if (uni.getStorageSync('diyPageBlank')) {
+                url = uni.getStorageSync('diyPageBlank');
+            }
+
+            // 清空重复、与当前页面路径一致的url
+            if (url.length) {
+                url = Array.from(new Set(url))
+                url.forEach((item, index, arr) => {
+                    if (item == currRoute.value) {
+                        arr.splice(index, 1);
+                    }
+                })
+            }
+
+            // 当diyStore.topFixedStatus == "diy"时,存储到diyPageBlank缓存中
+            if (diyStore.topFixedStatus == "diy") {
+                url.push(currRoute.value);
+            }
+            uni.setStorageSync('diyPageBlank', url);
+            /******** 解决跳转自定义页面空白问题-第一步 -end **********/
+
+            if (callback) callback()
+        })
+    }
+
+    // 监听页面卸载
+    const onUnloadLifeCycle = () => {
+        onUnload(() => {
+
+        })
+    }
+
+    // 监听滚动事件
+    const onPageScrollLifeCycle = () => {
+        onPageScroll((e) => {
+            if (e.scrollTop > 0) {
+                diyStore.scrollTop = e.scrollTop;
+            }
+        })
+    }
+
+    return {
+        getLoading,
+        data: data.value,
+        isShowTopTabbar,
+        pageStyle,
+        onLoad: onLoadLifeCycle,
+        onShow: onShowLifeCycle,
+        onHide: onHideLifeCycle,
+        onUnload: onUnloadLifeCycle,
+        onPageScroll: onPageScrollLifeCycle,
+    }
+}
diff --git a/uni-app/src/hooks/useDiyForm.ts b/uni-app/src/hooks/useDiyForm.ts
new file mode 100644
index 00000000..de04cbb5
--- /dev/null
+++ b/uni-app/src/hooks/useDiyForm.ts
@@ -0,0 +1,277 @@
+import { ref, reactive, computed } from 'vue';
+import { onLoad, onShow, onHide, onPageScroll, onUnload } from '@dcloudio/uni-app';
+import { img, handleOnloadParams, getToken, deepClone } from '@/utils/common';
+import { getDiyFormInfo } from '@/app/api/diy_form';
+import useDiyStore from '@/app/stores/diy';
+import { useLogin } from '@/hooks/useLogin';
+
+export function useDiyForm(params: any = {}) {
+
+    const loading = ref(true);
+    const diyStore = useDiyStore();
+
+    const form_id = ref(params.form_id || 0)
+    const name = ref(params.name || '')
+    const template = ref('')
+    const currRoute = ref('') //当前路由
+    const requestData: any = reactive({});
+    const needLogin = ref(params.needLogin || false) // 是否检测登录
+
+    // 自定义页面 数据
+    const diyData = reactive({
+        pageMode: 'diy',
+        title: '',
+        global: {},
+        value: [],
+        status: 0
+    })
+
+    const getLoading = () => {
+        return loading.value;
+    }
+
+    const data: any = computed(() => {
+        if (diyStore.mode == 'decorate') {
+            return diyStore;
+        } else {
+            return diyData;
+        }
+    })
+
+    const isShowTopTabbar = ref(false);
+
+    const pageStyle = () => {
+        var style = '';
+        if (data.value.global.pageStartBgColor) {
+            if (data.value.global.pageStartBgColor && data.value.global.pageEndBgColor) style += `background:linear-gradient(${ data.value.global.pageGradientAngle },${ data.value.global.pageStartBgColor },${ data.value.global.pageEndBgColor });`;
+            else style += 'background-color:' + data.value.global.pageStartBgColor + ';';
+        }
+        if (data.value.global.bottomTabBarSwitch) {
+            style += 'min-height:calc(100vh - 50px);';
+        } else {
+            style += 'min-height:calc(100vh);';
+        }
+        if (data.value.global.bgUrl) {
+            style += `background-image:url('${ img(data.value.global.bgUrl) }');`;
+        }
+
+        if (data.value.global.bgHeightScale) {
+            style += `background-size: 100% ${ data.value.global.bgHeightScale }%;`;
+        }
+
+        return style;
+    };
+
+    // 监听页面加载
+    const onLoadLifeCycle = (callback: any = null) => {
+        onLoad((option: any) => {
+            // #ifdef MP-WEIXIN
+            // 处理小程序场景值参数
+            option = handleOnloadParams(option);
+            // #endif
+
+            // #ifdef H5
+            // 装修模式
+            diyStore.mode = option.mode || '';
+            if (diyStore.mode == 'decorate') {
+                requestData.status = 1;
+                requestData.error = [];
+                loading.value = false;
+            }
+            // #endif
+
+            form_id.value = option.form_id || '';
+            // if (name.value == '') name.value = option.name || '';
+            // template.value = option.template || '';
+            getData(callback)
+        });
+    }
+
+    // 监听页面显示
+    const onShowLifeCycle = (callback: any = null) => {
+        onShow(() => {
+            if (callback) callback(requestData)
+        })
+    }
+
+    const getData = (callback: any = null) => {
+        /******** 解决跳转自定义页面空白问题-第二步-start **********/
+        let curPage: any = getCurrentPages();
+        currRoute.value = curPage[curPage.length - 1] ? curPage[curPage.length - 1].route : ''; //获取当前页面的路由
+        let urlArr = []
+        if (uni.getStorageSync('diyPageBlank')) {
+            urlArr = uni.getStorageSync('diyPageBlank');
+        }
+        if (!urlArr.length || urlArr.length && urlArr.indexOf(currRoute.value) == -1) {
+            diyStore.topFixedStatus = 'home'
+        } else if (urlArr.length && urlArr.indexOf(currRoute.value) != -1) {
+            diyStore.topFixedStatus = 'diy'
+        }
+        /******** 解决跳转自定义页面空白问题-第二步-end **********/
+
+        // 装修模式
+        if (diyStore.mode == 'decorate') {
+            diyStore.init();
+        } else {
+
+            if (!form_id.value) return; // 空值情况下不调用接口
+
+            //  填写万能表单需要检测登录
+            if (needLogin.value && !getToken()) {
+                useLogin().setLoginBack({
+                    url: '/app/pages/index/diy_form',
+                    param: {
+                        form_id: form_id.value
+                    }
+                })
+                return;
+            }
+
+            getDiyFormInfo({
+                form_id: form_id.value,
+                // name: name.value, todo 暂时没用
+                // template: template.value // todo 暂时没用
+            }).then((res: any) => {
+                Object.assign(requestData, res.data);
+                diyData.status = res.data.status;
+                if (requestData.value) {
+                    diyData.pageMode = requestData.mode;
+                    diyData.title = requestData.title;
+
+                    diyStore.id = requestData.form_id;
+                    let sources = requestData.value;
+                    // 匹配缓存，赋值
+                    let diyFormStorage = uni.getStorageSync('diyFormStorage_' + diyStore.id)
+                    if (diyFormStorage) {
+                        var date = new Date();
+                        let currentTime: any = parseInt(date.getTime() / 1000); // 定位信息 5分钟内有效，过期后将重新获取定位信息
+                        if (diyFormStorage.validTime > currentTime) {
+                            if (diyFormStorage.components) {
+                                diyFormStorage.components.forEach((item: any) => {
+                                    for (let i = 0; i < sources.value.length; i++) {
+                                        if (sources.value[i].componentType == 'diy_form' && item.id == sources.value[i].id) {
+                                            let comp = deepClone(item);
+                                            let field = deepClone(comp.field);
+                                            delete comp.field;
+                                            // 移除不需要的数据
+                                            delete field.required; // 是否必填
+                                            delete field.unique; // 内容不可重复提交
+                                            delete field.autofill; // 自动填充上次填写的内容
+                                            delete field.privacyProtection; // 隐私保护
+                                            Object.assign(sources.value[i], comp)
+                                            Object.assign(sources.value[i].field, field)
+                                            break;
+                                        }
+                                    }
+                                })
+                            }
+                        } else {
+                            uni.removeStorageSync('diyFormStorage_' + diyStore.id) // 清除过期的表单缓存数据
+                        }
+                    }
+                    diyStore.value = sources.value; // 用于 万能表单 收集数据，组件之间的数据通讯
+                    diyData.global = sources.global;
+                    diyData.value = sources.value;
+                    diyData.value.forEach((item: any, index) => {
+                        if (item.isHidden) {
+                            // 隐藏组件
+                            diyData.value.splice(index, 1)
+                            // 过滤表单-提交组件且按钮悬空的情况下不设置样式
+                        } else {
+                            item.pageStyle = '';
+                            if (item.componentName != 'FormSubmit' || item.componentName == 'FormSubmit' && item.btnPosition != 'hover_screen_bottom') {
+                                if (item.pageStartBgColor) {
+                                    if (item.pageStartBgColor && item.pageEndBgColor) item.pageStyle += `background:linear-gradient(${ item.pageGradientAngle },${ item.pageStartBgColor },${ item.pageEndBgColor });`;
+                                    else item.pageStyle += 'background-color:' + item.pageStartBgColor + ';';
+                                }
+
+                                if (item.margin) {
+                                    if (item.margin.top > 0) {
+                                        item.pageStyle += 'padding-top:' + item.margin.top * 2 + 'rpx' + ';';
+                                    }
+                                    item.pageStyle += 'padding-bottom:' + item.margin.bottom * 2 + 'rpx' + ';';
+                                    item.pageStyle += 'padding-right:' + item.margin.both * 2 + 'rpx' + ';';
+                                    item.pageStyle += 'padding-left:' + item.margin.both * 2 + 'rpx' + ';';
+                                }
+                            }
+                        }
+                    });
+
+                    // 控制自定义头部是否出现 | 微信小程序
+                    isShowTopTabbar.value = diyData.value.some((item: any) => {
+                        return item && item.position && item.position == 'top_fixed'
+                    });
+
+                    uni.setNavigationBarTitle({
+                        title: diyData.title
+                    });
+
+                }
+
+                loading.value = false;
+
+                if (callback) callback(requestData)
+
+            });
+        }
+    }
+
+    // 监听页面隐藏
+    const onHideLifeCycle = (callback: any = null) => {
+        onHide(() => {
+            /******** 解决跳转自定义页面空白问题-第一步 -start **********/
+            let url = [];
+            if (uni.getStorageSync('diyPageBlank')) {
+                url = uni.getStorageSync('diyPageBlank');
+            }
+
+            // 清空重复、与当前页面路径一致的url
+            if (url.length) {
+                url = Array.from(new Set(url))
+                url.forEach((item, index, arr) => {
+                    if (item == currRoute.value) {
+                        arr.splice(index, 1);
+                    }
+                })
+            }
+
+            // 当diyStore.topFixedStatus == "diy"时,存储到diyPageBlank缓存中
+            if (diyStore.topFixedStatus == "diy") {
+                url.push(currRoute.value);
+            }
+            uni.setStorageSync('diyPageBlank', url);
+            /******** 解决跳转自定义页面空白问题-第一步 -end **********/
+
+            if (callback) callback()
+        })
+    }
+
+    // 监听页面卸载
+    const onUnloadLifeCycle = () => {
+        onUnload(() => {
+        })
+    }
+
+    // 监听滚动事件
+    const onPageScrollLifeCycle = () => {
+        onPageScroll((e) => {
+            if (e.scrollTop > 0) {
+                diyStore.scrollTop = e.scrollTop;
+            }
+        })
+    }
+
+    return {
+        getLoading,
+        requestData,
+        data: data.value,
+        isShowTopTabbar,
+        pageStyle,
+        onLoad: onLoadLifeCycle,
+        onShow: onShowLifeCycle,
+        onHide: onHideLifeCycle,
+        onUnload: onUnloadLifeCycle,
+        onPageScroll: onPageScrollLifeCycle,
+        getData
+    }
+}
diff --git a/uni-app/src/hooks/useLocation.ts b/uni-app/src/hooks/useLocation.ts
new file mode 100644
index 00000000..c4d20a12
--- /dev/null
+++ b/uni-app/src/hooks/useLocation.ts
@@ -0,0 +1,207 @@
+import { onLoad } from '@dcloudio/uni-app';
+import { isWeixinBrowser } from '@/utils/common';
+import { getAddressByLatlng } from '@/app/api/system';
+import manifestJson from '@/manifest.json';
+import wechat from '@/utils/wechat'
+import useSystemStore from '@/stores/system';
+
+export function useLocation(isOpenLocation: any) {
+    const systemStore = useSystemStore();
+
+    // 表示，定位是否开启
+    let isOpen = isOpenLocation;
+    if (systemStore.mapConfig.is_open != 1) {
+        isOpen = false;
+    }
+
+    // 监听页面加载
+    const onLoadLifeCycle = (callback: any = '') => {
+        onLoad((option: any) => {
+            if (option && option.latng) {
+                getAddressByLatlngFn(option.latng)
+            }
+
+            uni.removeStorageSync('manually_select_location_from_map');
+            typeof callback == 'function' && callback(option);
+        });
+    }
+
+    const init = () => {
+        if (!isOpen) return false;
+        // 排除手动地图选择位置的情况
+        if (!uni.getStorageSync('manually_select_location_from_map')) {
+            // #ifdef H5
+            if (isWeixinBrowser() && systemStore.mapConfig.is_open && !uni.getStorageSync('location_address')) {
+                wechat.init(()=>{
+					wechat.getLocation(res => {
+					    let latlng = res.latitude + ',' + res.longitude; // 纬度（浮点数，范围为90 ~ -90），经度（浮点数，范围为180 ~ -180）
+					    getAddressByLatlngFn(latlng)
+					})
+				});
+
+            }
+            // #endif
+
+            // #ifdef MP
+            if (systemStore.mapConfig.is_open && !uni.getStorageSync('location_address')) {
+                uni.getLocation({
+                    type: 'gcj02',
+                    success: res => {
+                        let latlng = res.latitude + ',' + res.longitude; // 纬度（浮点数，范围为90 ~ -90），经度（浮点数，范围为180 ~ -180）
+                        getAddressByLatlngFn(latlng);
+                    },
+                    fail: (res) => {
+                        systemStore.defaultPositionAddress = '定位失败';
+                        if (res.errno) {
+                            if (res.errno == 104) {
+                                let msg = '用户未授权隐私权限，获取位置失败';
+                                uni.showToast({ title: msg, icon: 'none' })
+                            } else if (res.errno == 112) {
+                                let msg = '隐私协议中未声明，获取位置失败';
+                                uni.showToast({ title: msg, icon: 'none' })
+                            }
+                        }
+                        if (res.errMsg) {
+                            if (res.errMsg.indexOf('getLocation:fail') != -1 || res.errMsg.indexOf('deny') != -1 || res.errMsg.indexOf('denied') != -1) {
+                                let msg = '用户未授权获取位置权限，将无法提供服务';
+                                uni.showToast({ title: msg, icon: 'none' })
+                            } else {
+                                uni.showToast({ title: res.errMsg, icon: 'none' })
+                            }
+                        }
+                    }
+                });
+            }
+            // #endif
+        }
+    }
+
+    // 刷新页面时需要调用的
+    const refreshLocation = () => {
+        if (!isOpen) return false;
+        if (!uni.getStorageSync('manually_select_location_from_map') && uni.getStorageSync('location_address')) {
+			if(locationStorage() && !locationStorage().is_expired){
+				systemStore.setAddressInfo(uni.getStorageSync('location_address'))
+			}else{
+				uni.removeStorageSync('location_address');
+			}
+
+        }
+
+        // 定位信息过期后，重新获取定位
+        if (!uni.getStorageSync('manually_select_location_from_map') && locationStorage() && locationStorage().is_expired) {
+            init();
+        }
+    }
+
+    // 通过经纬度获取地址信息
+    const getAddressByLatlngFn = (latlng: any = '') => {
+        if (!isOpen) return false;
+        let data = { latlng: '' };
+        if (latlng) {
+            data.latlng = latlng;
+        } else {
+            data.latlng = systemStore.diyAddressInfo.latitude + ',' + systemStore.diyAddressInfo.longitude;
+        }
+        getAddressByLatlng(data).then((res: any) => {
+            if (res.data && Object.keys(res.data).length) {
+                let obj: any = {};
+				
+				let latlngArr = data.latlng.split(',');
+
+                obj.latitude = latlngArr[0];
+                obj.longitude = latlngArr[1];
+                obj.full_address = res.data.province != undefined ? res.data.province : '';
+                obj.full_address += res.data.city != undefined ? res.data.city : '';
+                obj.full_address += res.data.district != undefined ? res.data.district : '';
+                obj.full_address += res.data.community != undefined ? res.data.community : '';
+
+                obj.province_id = res.data.province_id;
+                obj.province = res.data.province;
+                obj.city_id = res.data.city_id;
+                obj.city = res.data.city;
+                obj.district_id = res.data.district_id;
+                obj.district = res.data.district;
+                obj.community = res.data.community;
+                obj.formatted_addresses = res.data.formatted_addresses;
+                systemStore.setAddressInfo(obj)
+            } else {
+                systemStore.setAddressInfo()
+            }
+
+            // 手动选择地图位置后，清除标识
+            setTimeout(() => {
+                // 由于异步请求速度影响，需要延迟删除
+                uni.removeStorageSync('manually_select_location_from_map');
+            }, 500);
+        })
+    }
+
+
+    // 打开地图重新选择位置
+    const reposition = () => {
+        if (!isOpen) return false;
+
+        let latitude = systemStore.diyAddressInfo ? systemStore.diyAddressInfo.latitude : '';
+        let longitude = systemStore.diyAddressInfo ? systemStore.diyAddressInfo.longitude : '';
+
+        // #ifdef MP
+        uni.chooseLocation({
+            latitude,
+            longitude,
+            success: (res) => {
+                uni.setStorageSync('manually_select_location_from_map', true)
+				let latng = res.latitude + ',' + res.longitude;
+				getAddressByLatlngFn(latng)
+            },
+            fail: (res) => {
+                // 在隐私协议中没有声明chooseLocation:fail api作用域
+                if (res.errMsg && res.errno) {
+                    if (res.errno == 104) {
+                        let msg = '用户未授权隐私权限，选择位置失败';
+                        uni.showToast({ title: msg, icon: 'none' })
+                    } else if (res.errno == 112) {
+                        let msg = '隐私协议中未声明，打开地图选择位置失败';
+                        uni.showToast({ title: msg, icon: 'none' })
+                    } else {
+                        uni.showToast({ title: res.errMsg, icon: 'none' })
+                    }
+                }
+            }
+        });
+        // #endif
+
+        // #ifdef H5
+        uni.setStorageSync('manually_select_location_from_map', true)
+        let backurl = location.origin + location.pathname;
+        window.location.href = 'https://apis.map.qq.com/tools/locpicker?search=1&type=0&backurl=' + encodeURIComponent(backurl) + '&key=' + manifestJson.h5.sdkConfigs.maps.qqmap.key + '&referer=myapp';
+        // #endif
+    }
+
+    /**
+     * 定位信息（缓存）
+     */
+    const locationStorage = () => {
+        let data = uni.getStorageSync('location_address');
+        if (data) {
+            var date = new Date();
+            if (systemStore.mapConfig.valid_time > 0) {
+                data.is_expired = (date.getTime() / 1000) > data.valid_time; // 是否过期
+            } else {
+                data.is_expired = false;
+            }
+        }else{
+			data = {
+				is_expired : false
+			};
+		}
+        return data;
+    }
+
+    return {
+        init: init,
+        onLoad: onLoadLifeCycle,
+        refresh: refreshLocation,
+        reposition: reposition
+    }
+}
diff --git a/uni-app/src/hooks/useLogin.ts b/uni-app/src/hooks/useLogin.ts
new file mode 100644
index 00000000..2d2b74aa
--- /dev/null
+++ b/uni-app/src/hooks/useLogin.ts
@@ -0,0 +1,302 @@
+import { redirect, isWeixinBrowser, urlDeconstruction, currRoute } from '@/utils/common'
+import {
+    weappLogin,
+    updateWeappOpenid,
+    updateWechatOpenid,
+    wechatUser,
+    wechatUserLogin
+} from '@/app/api/auth'
+import { getWechatAuthCode } from '@/app/api/system'
+import useMemberStore from '@/stores/member'
+import useConfigStore from '@/stores/config'
+import useSystemStore from '@/stores/system'
+
+export function useLogin() {
+    /**
+     * 设置登录返回页
+     */
+    const setLoginBack = (data: redirectOptions) => {
+        uni.setStorage({ key: 'loginBack', data })
+        setTimeout(() => {
+            const config = useConfigStore()
+            const systemStore = useSystemStore()
+
+            // #ifdef MP-WEIXIN
+            if (!uni.getStorageSync('autoLoginLock') && uni.getStorageSync('openid') && config.login.is_bind_mobile) {
+                uni.setStorageSync('isbindmobile', true) // 强制绑定手机号标识
+            }
+            // #endif
+
+            // #ifdef H5
+            if (!uni.getStorageSync('autoLoginLock') && isWeixinBrowser() && uni.getStorageSync('openid') && config.login.is_bind_mobile) {
+                uni.setStorageSync('isbindmobile', true) // 强制绑定手机号标识
+            }
+            // #endif
+
+            // 如果只开启了账号密码登录，就不需要跳转到登录中间页了，直接进入普通账号密码登录页面
+
+            // #ifdef MP-WEIXIN
+            if (config.login.is_username && !config.login.is_mobile && !config.login.is_auth_register) {
+                redirect({ url: '/app/pages/auth/login', param: { type: 'username' }, mode: 'redirectTo' })
+            } else if (systemStore.initStatus == 'finish' && !config.login.is_username && !config.login.is_mobile && !config.login.is_auth_register) {
+                uni.showToast({ title: '商家未开启登录注册', icon: 'none' })
+            } else {
+                redirect({ url: '/app/pages/auth/index', mode: 'redirectTo' })
+            }
+            // #endif
+
+            // #ifdef H5
+            if (isWeixinBrowser()) {
+                // 微信浏览器
+                if (config.login.is_username && !config.login.is_mobile && !config.login.is_auth_register) {
+                    redirect({ url: '/app/pages/auth/login', param: { type: 'username' }, mode: 'redirectTo' })
+                } else if (systemStore.initStatus == 'finish' && !config.login.is_username && !config.login.is_mobile && !config.login.is_auth_register) {
+                    uni.showToast({ title: '商家未开启登录注册', icon: 'none' })
+                } else {
+                    redirect({ url: '/app/pages/auth/index', mode: 'redirectTo' })
+                }
+            } else {
+                // 普通浏览器
+                if (config.login.is_username && !config.login.is_mobile) {
+                    redirect({ url: '/app/pages/auth/login', param: { type: 'username' }, mode: 'redirectTo' })
+                } else if (systemStore.initStatus == 'finish' && !config.login.is_username && !config.login.is_mobile) {
+                    uni.showToast({ title: '商家未开启登录注册', icon: 'none' })
+                } else {
+                    redirect({ url: '/app/pages/auth/index', mode: 'redirectTo' })
+                }
+            }
+            // #endif
+        })
+    }
+
+    /**
+     * 执行登录后跳转
+     */
+    const handleLoginBack = () => {
+        uni.removeStorageSync('autoLoginLock')
+        uni.getStorage({
+            key: 'loginBack',
+            success: (res: any) => {
+                res ? redirect(
+                    {
+                        ...res.data,
+                        mode: 'redirectTo'
+                    }
+                ) : redirect({ url: '/app/pages/index/index', mode: 'switchTab' })
+            },
+            fail: (res) => {
+                redirect({ url: '/app/pages/index/index', mode: 'switchTab' })
+            }
+        })
+    }
+
+    /**
+     * 授权登录
+     * @param params { code, backFlag, successCallback }
+     */
+    const authLogin = (params: any) => {
+        let obj: any = {
+            code: params.code,
+            nickname: params.nickname,
+            headimg: params.headimg,
+            mobile: params.mobile,
+            mobile_code: params.mobile_code
+        };
+
+        // #ifdef MP-WEIXIN
+        uni.getStorageSync('pid') && (Object.assign(obj, { pid: uni.getStorageSync('pid') }))
+        weappLogin(obj).then((res: any) => {
+            if (res.data.token) {
+                useMemberStore().setToken(res.data.token, () => {
+                    const config = useConfigStore()
+                    const memberInfo: any = useMemberStore().info
+                    if (memberInfo) {
+                        memberInfo.weapp_openid && uni.setStorageSync('openid', memberInfo.weapp_openid)
+                        memberInfo.mobile && uni.setStorageSync('wap_member_mobile', memberInfo.mobile) // 存储会员手机号，防止重复请求微信获取手机号接口
+                    }
+
+                    // 开启绑定手机号标识
+                    if (uni.getStorageSync('isbindmobile')) {
+                        uni.removeStorageSync('isbindmobile');
+                    }
+
+                    if (config.login.is_bind_mobile && memberInfo && !memberInfo.mobile) {
+                        uni.setStorageSync('isbindmobile', true)
+                    }
+
+                    if (params.successCallback) params.successCallback(res.data)
+
+                    if (params.backFlag) handleLoginBack() // 一键登录返回
+                })
+            } else {
+                // 强制获取昵称和头像，先存储起来
+                uni.setStorageSync('openid', res.data.openid)
+                uni.setStorageSync('unionid', res.data.unionid)
+            }
+        }).catch((err) => {
+            uni.showToast({ title: err.msg, icon: 'none' })
+            if (params.successCallback) params.successCallback()
+        })
+        // #endif
+
+        // #ifdef H5
+        uni.getStorageSync('pid') && (Object.assign(obj, { pid: uni.getStorageSync('pid') }))
+        wechatUser(obj).then((user_res: any) => {
+            if (user_res.data) {
+                wechatUserLogin(user_res.data).then((res: any) => {
+                    if (res.data.token) {
+                        useMemberStore().setToken(res.data.token, () => {
+                            const config = useConfigStore()
+                            const memberInfo = useMemberStore().info
+                            memberInfo && memberInfo.wx_openid && uni.setStorageSync('openid', memberInfo.wx_openid)
+                            // 开启绑定手机号标识
+                            if (uni.getStorageSync('isbindmobile')) {
+                                uni.removeStorageSync('isbindmobile');
+                            }
+                            if (config.login.is_bind_mobile && memberInfo && !memberInfo.mobile) {
+                                uni.setStorageSync('isbindmobile', true)
+                            }
+
+                            let loginBack = uni.getStorageSync('loginBack');
+                            if (loginBack && loginBack.url && currRoute() == 'app/pages/auth/index') {
+                                handleLoginBack(); // 跳转到上一个页面
+                            }
+                        })
+                    } else {
+                        // 强制获取昵称和头像，先存储起来
+                        uni.setStorageSync('openid', res.data.openid)
+                        uni.setStorageSync('unionid', res.data.unionid)
+                        if(res.data.nickname) uni.setStorageSync('nickname', res.data.nickname)
+                        if(res.data.avatar) uni.setStorageSync('avatar', res.data.avatar)
+                    }
+                })
+            }
+        }).catch((err) => {
+            if (err.msg == -1) {
+                getAuthCode({ scopes: 'snsapi_userinfo' })
+            } else {
+                uni.showToast({ title: err.msg, icon: 'none' })
+            }
+        })
+        // #endif
+    }
+    /**
+     * 登录普通账号后修改openid
+     * @param code
+     * @param callback
+     */
+    const updateOpenid = (code: string | null, callback: any = null) => {
+        let obj: any = {
+            code
+        };
+
+        // #ifdef MP-WEIXIN
+        updateWeappOpenid(obj).then((res) => {
+            useMemberStore().getMemberInfo(() => {
+                const memberInfo = useMemberStore().info
+                memberInfo && memberInfo.weapp_openid && uni.setStorageSync('openid', memberInfo.weapp_openid)
+            })
+        })
+        // #endif
+
+        // #ifdef H5
+        updateWechatOpenid(obj).then((res) => {
+            useMemberStore().getMemberInfo(() => {
+                const memberInfo = useMemberStore().info
+                memberInfo && memberInfo.wx_openid && uni.setStorageSync('openid', memberInfo.wx_openid)
+                if (callback) callback();
+            })
+        })
+        // #endif
+    }
+    /**
+     * 获取授权码
+     * @param params { scopes, updateFlag, backFlag, successCallback }
+     */
+    const getAuthCode = (params: any = {}) => {
+        params.scopes = params.scopes || 'snsapi_base'; // 公众号用
+
+        // 微信小程序用
+        params.updateFlag = params.updateFlag || false; // updateFlag：更新oppenid
+        params.backFlag = params.backFlag || false; // backFlag 控制一键登录返回
+        params.successCallback = params.successCallback || null;
+        params.nickname = params.nickname || '';
+        params.headimg = params.headimg || '';
+        params.mobile = params.mobile || '';
+        params.mobile_code = params.mobile_code || '';
+
+        // #ifdef MP-WEIXIN
+        wx.login({
+            success(res: any) {
+                if (res.code) {
+                    params.updateFlag ? updateOpenid(res.code) : authLogin({
+                        code: res.code,
+                        nickname: params.nickname,
+                        headimg: params.headimg,
+                        mobile: params.mobile,
+                        mobile_code: params.mobile_code,
+                        backFlag: params.backFlag,
+                        successCallback: params.successCallback
+                    })
+                } else {
+                    console.log('登录失败！' + res.errMsg)
+                }
+            }
+        })
+        // #endif
+
+        // #ifdef H5
+
+        let url = `${ location.origin }${ location.pathname }`
+
+        // 如果当前在登录中间页，那么要跳转到首页
+        if (url.indexOf('app/pages/auth/index') != -1) {
+            let loginBack = uni.getStorageSync('loginBack');
+            if (loginBack) {
+                url = url.replace('app/pages/auth/index', loginBack.url.substr(1))
+                if (loginBack.param) {
+                    if (url.indexOf('?') != -1) {
+                        for (let key in loginBack.param) {
+                            url += `&${ key }=${ loginBack.param[key] }`;
+                        }
+                    } else {
+                        let count = 0;
+                        for (let key in loginBack.param) {
+                            if (count == 0) {
+                                url += `?${ key }=${ loginBack.param[key] }`;
+                            } else {
+                                url += `&${ key }=${ loginBack.param[key] }`;
+                            }
+                            count++;
+                        }
+                    }
+                }
+            } else {
+                url = url.replace('app/pages/auth/index', 'app/pages/index/index')
+            }
+
+        } else {
+            let query: any = urlDeconstruction(location.href).query
+            query.code && (delete query.code)
+            Object.keys(query).length && (url += uni.$u.queryParams(query))
+        }
+
+        getWechatAuthCode({
+            url,
+            scopes: params.scopes
+        }).then((res: any) => {
+            uni.setStorageSync('wechat_login_back', true) // 微信公众号手动授权登录回调标识
+            location.href = res.data.url
+        })
+
+        // #endif
+    }
+
+    return {
+        setLoginBack,
+        handleLoginBack,
+        authLogin,
+        updateOpenid,
+        getAuthCode
+    }
+}
diff --git a/uni-app/src/hooks/useSendSms.ts b/uni-app/src/hooks/useSendSms.ts
new file mode 100644
index 00000000..ac84dc71
--- /dev/null
+++ b/uni-app/src/hooks/useSendSms.ts
@@ -0,0 +1,49 @@
+import { ref, computed } from 'vue'
+import { t } from '@/locale'
+import { sendSms } from '@/app/api/system'
+
+export function useSendSms(smsRef: any) {
+    const tips = ref(t('getSmsCode'))
+    const seconds = 90
+    const changeText = 'X' + t('smsCodeChangeText')
+
+    const canGetCode = computed(() => {
+        return smsRef.value ? smsRef.value.canGetCode : true
+    })
+
+    /**
+     * 发送短信
+     */
+    const send = async(param: requestMobileParam) => {
+        if (!canGetCode.value) return
+
+        smsRef.value.start()
+
+        let result: string | boolean = false
+        await sendSms(param).then((res: any) => {
+            if (res.code == 1) {
+                result = res.data.key
+            } else {
+                smsRef.value.reset()
+                result = false
+            }
+        }).catch(err => {
+            result = false
+            smsRef.value.reset()
+        })
+        return result
+    }
+
+    const codeChange = (text: string) => {
+        tips.value = text
+    }
+
+    return {
+        tips: tips,
+        seconds,
+        canGetCode,
+        send,
+        codeChange,
+        changeText
+    }
+}
diff --git a/uni-app/src/hooks/useShare.ts b/uni-app/src/hooks/useShare.ts
new file mode 100644
index 00000000..1efe1c49
--- /dev/null
+++ b/uni-app/src/hooks/useShare.ts
@@ -0,0 +1,158 @@
+import { img, isWeixinBrowser, currRoute, currShareRoute } from '@/utils/common'
+import { onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app'
+import { getShareInfo } from '@/app/api/diy';
+import useSystemStore from '@/stores/system';
+
+// #ifdef H5
+import wechat from '@/utils/wechat'
+// #endif
+
+export const useShare = () => {
+    var wechatOptions: any = {};
+    var weappOptions: any = {};
+
+    const wechatInit = () => {
+        if (!isWeixinBrowser()) return;
+        // 初始化sdk
+        wechat.init();
+    }
+
+    // 微信公众号分享
+    const wechatShare = () => {
+        if (!isWeixinBrowser()) return;
+        wechat.share(wechatOptions);
+    }
+
+    const getQuery = () => {
+        let query: any = currShareRoute().params;
+        let wap_member_id = uni.getStorageSync('wap_member_id');
+        if (wap_member_id) {
+            query.mid = wap_member_id;
+        }
+
+        let queryStr = [];
+        for (let key in query) {
+            queryStr.push(key + '=' + query[key]);
+        }
+
+        return queryStr
+
+    }
+
+    const setShare = (options: any = {}) => {
+        if (currRoute() == '' || currRoute().indexOf('app/pages/index/close') != -1 || currRoute().indexOf('app/pages/index/nosite') != -1) return;
+
+        let queryStr = getQuery();
+
+        // #ifdef H5
+
+        let h5Link = location.origin + location.pathname + (queryStr.length > 0 ? '?' + queryStr.join('&') : '');
+
+        wechatOptions = {
+            link: h5Link
+        }
+
+        // #endif
+
+        // #ifdef MP-WEIXIN
+        weappOptions = {
+            path: '/' + currRoute() + (queryStr.length > 0 ? '?' + queryStr.join('&') : ''),
+            query: queryStr.join('&'),
+        }
+        // #endif
+
+        if (options && Object.keys(options).length) {
+
+            if (options.wechat) {
+
+                // #ifdef H5
+                wechatOptions.title = options.wechat.title || ''
+                wechatOptions.link = options.wechat.link || h5Link
+                wechatOptions.desc = options.wechat.desc || ''
+                wechatOptions.imgUrl = options.wechat.url ? img(options.wechat.url) : ''
+                // wechatOptions.success = options.wechat.callback || null;
+                // useSystemStore().shareCallback = options.wechat.callback || null;
+                wechatShare()
+                // #endif
+            }
+
+            if (options.weapp) {
+
+                // #ifdef MP-WEIXIN
+                weappOptions.title = options.weapp.title || ''
+                if (options.weapp.path) weappOptions.path = options.weapp.path
+                weappOptions.imageUrl = options.weapp.url ? img(options.weapp.url) : ''
+                useSystemStore().shareCallback = options.weapp.callback || null;
+                uni.setStorageSync('weappOptions', weappOptions)
+                // #endif
+
+            }
+
+        } else {
+            getShareInfo({
+                route: '/' + currRoute(),
+                params: JSON.stringify(currShareRoute().params)
+            }).then((res: any) => {
+
+                let data = res.data;
+
+                // #ifdef H5
+                let wechat = data.wechat;
+                if (wechat) {
+                    wechatOptions.title = wechat.title
+                    wechatOptions.desc = wechat.desc
+                    wechatOptions.imgUrl = wechat.url ? img(wechat.url) : ''
+                } else {
+                    wechatOptions.title = document.title;
+                    wechatOptions.desc = ''
+                }
+                wechatShare()
+                // #endif
+
+                // #ifdef MP-WEIXIN
+                let weapp = data.weapp;
+                if (weapp) {
+                    weappOptions.title = weapp.title
+                    weappOptions.imageUrl = weapp.url ? img(weapp.url) : ''
+                }
+                // #endif
+
+                uni.setStorageSync('weappOptions', weappOptions)
+            })
+        }
+    }
+
+    // 小程序分享，分享给好友
+    const shareApp = (options = {}) => {
+        return onShareAppMessage(() => {
+            let config: any = uni.getStorageSync('weappOptions')
+            if (!config) config = {}
+            if (useSystemStore().shareCallback) useSystemStore().shareCallback();
+            return {
+                ...config,
+                ...options
+            }
+        })
+
+    }
+
+    // 小程序分享，分享到朋友圈
+    const shareTime = (options = {}) => {
+        return onShareTimeline(() => {
+            let config: any = uni.getStorageSync('weappOptions')
+            if (!config) config = {}
+            if (useSystemStore().shareCallback) useSystemStore().shareCallback();
+            return {
+                ...config,
+                ...options
+            }
+        })
+    }
+
+    return {
+        wechatInit: wechatInit,
+        setShare: setShare,
+        onShareAppMessage: shareApp,
+        onShareTimeline: shareTime,
+    }
+}
diff --git a/uni-app/src/hooks/useSubscribeMessage.ts b/uni-app/src/hooks/useSubscribeMessage.ts
new file mode 100644
index 00000000..2bb0bf8e
--- /dev/null
+++ b/uni-app/src/hooks/useSubscribeMessage.ts
@@ -0,0 +1,30 @@
+import { getWeappTemplateId } from '@/app/api/system'
+
+/**
+ * 小程序订阅消息
+ */
+export const useSubscribeMessage = () => {
+    const request = (keys: string) => {
+        // #ifdef MP-WEIXIN
+        const method = getWeappTemplateId
+        // #endif
+
+        // #ifdef MP
+        method(keys).then(({ data }) => {
+            uni.requestSubscribeMessage({
+                tmplIds: data,
+                success: (res) => {
+                    console.log("requestSubscribeMessage:success", res)
+                },
+                fail: (res) => {
+                    console.log('requestSubscribeMessage:fail', res)
+                }
+            })
+        }).catch()
+        // #endif
+    }
+
+    return {
+        request
+    }
+}
diff --git a/uni-app/src/locale/en.json b/uni-app/src/locale/en.json
new file mode 100644
index 00000000..b71d7cfd
--- /dev/null
+++ b/uni-app/src/locale/en.json
@@ -0,0 +1,11 @@
+{
+    "pages.index.index": "Index",
+    "pages.article.list": "Information Center",
+    "pages.article.detail": "Information detail",
+    "pages.member.index": "My",
+    "pages.auth.login": "Login",
+    "pages.auth.register": "Register",
+    "pages.auth.resetpwd": "Retrieve password",
+    "pages.setting.index": "Settings",
+    "pages.auth.bind": "Bind Mobile"
+}
\ No newline at end of file
diff --git a/uni-app/src/locale/en/common.json b/uni-app/src/locale/en/common.json
new file mode 100644
index 00000000..a3ae7f93
--- /dev/null
+++ b/uni-app/src/locale/en/common.json
@@ -0,0 +1,3 @@
+{
+    "index": "Index"
+}
diff --git a/uni-app/src/locale/i18n.ts b/uni-app/src/locale/i18n.ts
new file mode 100644
index 00000000..ce1a0836
--- /dev/null
+++ b/uni-app/src/locale/i18n.ts
@@ -0,0 +1,22 @@
+import { createI18n } from 'vue-i18n'
+
+import Language from './language'
+import zhHans from './zh-Hans/common.json'
+import en from './en/common.json'
+
+//创建实例
+let i18n = createI18n({
+    locale: uni.getLocale(),
+    globalInjection: true, //是否全局注入
+    silentFallbackWarn: true,
+    silentTranslationWarn: true,
+    messages: {
+        'zh-Hans': zhHans,
+        en
+    }
+})
+
+const language = new Language(i18n)
+
+export { language }
+export default i18n
diff --git a/uni-app/src/locale/index.ts b/uni-app/src/locale/index.ts
new file mode 100644
index 00000000..f5b399e8
--- /dev/null
+++ b/uni-app/src/locale/index.ts
@@ -0,0 +1,26 @@
+import i18n, { language } from "./i18n"
+import useSystemStore from '@/stores/system'
+import { getCurrentInstance } from 'vue'
+
+const t = (message: string) => {
+    let route = '/' + useSystemStore().currRoute
+    // #ifdef H5
+    route = getCurrentInstance()?.appContext.config.globalProperties.$route.path || ('/' + useSystemStore().currRoute)
+    // #endif
+    // #ifdef MP
+    route = '/' + (getCurrentInstance()?.root.ctx.$scope.__route__ || useSystemStore().currRoute)
+    // #endif
+    const file = language.getFileKey(route)
+    const key = `${ file.fileKey }.${ message }`
+    if (i18n.global.t(message) != message) return i18n.global.t(message)
+    return i18n.global.t(key) != key ? i18n.global.t(key) : ''
+}
+
+export { language, t }
+
+export default {
+    install(app: any) {
+        //注册i18n
+        app.use(i18n);
+    }
+};
diff --git a/uni-app/src/locale/language.ts b/uni-app/src/locale/language.ts
new file mode 100644
index 00000000..92d69321
--- /dev/null
+++ b/uni-app/src/locale/language.ts
@@ -0,0 +1,86 @@
+import { nextTick } from 'vue'
+import { getAppPages, getSubPackagesPages} from "@/utils/pages"
+
+class Language {
+    private i18n: any
+    private loadLocale: Array<string> = [] //已加载的语言
+
+    public path = ''
+
+    constructor(i18n: any) {
+        this.i18n = i18n
+    }
+
+    /**
+     *
+     * @param locale 设置语言
+     */
+    public setI18nLanguage(locale: string, path: string = '') {
+        if (this.i18n.global.locale == locale) return
+        this.i18n.global.locale = locale
+        path && (this.path = path)
+        uni.setLocale(locale)
+    }
+
+    public loadAllLocaleMessages(app: string, locale: string) {
+        const pages = app == 'app' ? getAppPages() : getSubPackagesPages()
+        pages.forEach((path: string) => {
+            this.loadLocaleMessages(path, locale)
+        })
+    }
+
+    /**
+     * 加载语言包
+     * @param path
+     * @param locale
+     * @returns
+     */
+    public async loadLocaleMessages(path: string, locale: string) {
+        try {
+            const { route, file, fileKey } = this.getFileKey(path)
+
+            // 是否已加载
+            if (this.loadLocale.includes(`${fileKey}.${locale}`)) {
+                this.setI18nLanguage(locale, file)
+                return nextTick()
+            }
+            this.loadLocale.push(`${fileKey}.${locale}`)
+
+            // 引入语言包文件
+            const messages = await import(route == 'app' ? `../${route}/locale/${locale}/${file}.json` : `../addon/${route}/locale/${locale}/${file}.json`)
+            let data: Record<string, string> = {}
+            Object.keys(messages.default).forEach(key => {
+                data[`${fileKey}.${key}`] = messages.default[key]
+            })
+
+            this.i18n.global.mergeLocaleMessage(locale, data)
+            this.setI18nLanguage(locale, file)
+
+            return nextTick()
+        } catch (e) {
+            // console.log(e)
+            this.setI18nLanguage(locale)
+            return nextTick()
+        }
+    }
+
+    public getFileKey = (path: string) => {
+        const pathArr = path.split('/')
+        let route = pathArr[1] == 'app' ? pathArr[1] : pathArr[2];
+
+        let file = path == '/' ? 'pages.index.index' : path.replace('/', '').replaceAll('/', '.')
+
+        // 如果是系统页面，则移除“app.”
+        let fileKey = ''
+        if (route == 'app') {
+            fileKey = file.replace('app.', '')
+            file = file.replace('app.', '')
+        } else {
+            fileKey = file.replace(`addon.`, '')
+            file = file.replace(`addon.${route}.`, '')
+        }
+        return { file, fileKey, route }
+    }
+}
+
+export default Language
diff --git a/uni-app/src/locale/zh-Hans.json b/uni-app/src/locale/zh-Hans.json
new file mode 100644
index 00000000..c627090c
--- /dev/null
+++ b/uni-app/src/locale/zh-Hans.json
@@ -0,0 +1,139 @@
+{
+    "pages.index.index": "",
+    "pages.index.close": "站点已关闭",
+    "pages.index.nosite": "站点不存在",
+    "pages.index.develop": "开发环境配置",
+    "pages.index.diy": "",
+    "pages.index.diy_form": "",
+    "pages.index.diy_form_result": "",
+    "pages.index.diy_form_detail": "表单详情",
+    "pages.article.list": "资讯中心",
+    "pages.article.detail": "文章详情",
+    "pages.auth.index": "登录",
+    "pages.auth.agreement": "协议",
+    "pages.auth.bind": "绑定手机号",
+    "pages.auth.login": "登录",
+    "pages.auth.register": "注册",
+    "pages.auth.resetpwd": "找回密码",
+    "pages.member.account": "会员账户",
+    "pages.member.account_edit": "",
+    "pages.member.address": "收货地址",
+    "pages.member.address_edit": "编辑收货地址",
+    "pages.member.apply_cash_out": "申请提现",
+    "pages.member.balance": "我的余额",
+    "pages.member.point": "我的积分",
+    "pages.member.point_detail": "积分明细",
+    "pages.member.level": "会员等级",
+    "pages.member.sign_in": "我的签到",
+    "pages.member.cash_out": "提现记录",
+    "pages.member.cash_out_detail": "提现详情",
+    "pages.member.commission": "我的佣金",
+    "pages.member.detailed_account": "流水明细",
+    "pages.member.index": "",
+    "pages.member.personal": "个人资料",
+    "pages.member.contact": "客服",
+    "pages.pay.browser": "支付",
+    "pages.pay.result": "",
+    "pages.setting.index": "设置",
+    "pages.verify.index": "核销台",
+    "pages.verify.verify": "核销",
+    "pages.verify.detail": "核销详情",
+    "pages.verify.record": "核销记录",
+    "pages.friendspay.share": "找朋友帮忙付",
+    "pages.friendspay.money": "",
+    "pages.webview.index": "",
+    "tourism.pages.way.list": "线路列表",
+    "tourism.pages.way.detail": "线路详情",
+    "tourism.pages.way.order": "线路订单",
+    "tourism.pages.hotel.list": "酒店列表",
+    "tourism.pages.hotel.detail": "酒店详情",
+    "tourism.pages.hotel.order": "酒店订单",
+    "tourism.pages.scenic.list": "景点列表",
+    "tourism.pages.scenic.detail": "景点详情",
+    "tourism.pages.scenic.order": "景点订单",
+    "tourism.pages.order.list": "旅游订单",
+    "tourism.pages.order.detail": "订单详情",
+    "tourism.pages.verify.index": "核销",
+    "tourism.pages.verify.record": "核销记录",
+    "tourism.pages.verify.detail": "核销详情",
+    "vipcard.pages.verify.index": "核销",
+    "vipcard.pages.verify.record": "核销记录",
+    "vipcard.pages.verify.detail": "核销详情",
+    "vipcard.pages.order.payment": "订单结算",
+    "vipcard.pages.order.list": "订单列表",
+    "vipcard.pages.order.my_reserved": "我的预约",
+    "vipcard.pages.order.my_reserved_detail": "我的预约详情",
+    "vipcard.pages.order.my_card": "我的卡项",
+    "vipcard.pages.order.detail": "订单详情",
+    "vipcard.pages.service.list": "项目列表",
+    "vipcard.pages.card.list": "卡项列表",
+    "vipcard.pages.card.detail": "卡项详情",
+    "recharge.pages.recharge": "充值",
+    "recharge.pages.recharge_record": "充值记录",
+    "recharge.pages.recharge_record_detail": "充值记录详情",
+    "cms.pages.list": "资讯中心",
+    "cms.pages.detail": "文章详情",
+    "o2o.pages.address.edit": "编辑地址",
+    "o2o.pages.address.index": "地址",
+    "o2o.pages.goods.category": "项目分类",
+    "o2o.pages.goods.detail": "项目详情",
+    "o2o.pages.goods.list": "项目列表",
+    "o2o.pages.index": "首页",
+    "o2o.pages.master.statistics.index": "技师中心",
+    "o2o.pages.master.task.add": "师傅报单",
+    "o2o.pages.master.task.detail": "任务详情",
+    "o2o.pages.master.task.list": "任务列表",
+    "o2o.pages.master.task.refund": "查看退款",
+    "o2o.pages.master.task.show": "报单详情",
+    "o2o.pages.member.index": "个人中心",
+    "o2o.pages.order.detail": "订单详情",
+    "o2o.pages.order.list": "订单列表",
+    "o2o.pages.order.payment": "订单结算",
+    "o2o.pages.refund.apply": "申请退款",
+    "o2o.pages.refund.detail": "退款详情",
+    "o2o.pages.refund.list": "退款列表",
+    "o2o.pages.refund.log": "协商记录",
+    "o2o.pages.technician.detail": "技师详情",
+    "o2o.pages.technician.list": "技师列表",
+    "sow_community.pages.index": "种草社区",
+    "sow_community.pages.search": "搜索结果",
+    "sow_community.pages.image.detail": "内容详情",
+    "sow_community.pages.video.detail": "内容详情",
+    "sow_community.pages.member": "个人主页",
+    "sow_community.pages.create": "发布内容",
+    "sow_community.pages.follow": "关注列表",
+    "sow_community.pages.sow_show": "种草秀",
+    "sow_community.pages.topic_list": "话题列表",
+    "shop.pages.goods.search": "搜索",
+    "shop.pages.goods.cart": "购物车",
+    "shop.pages.goods.collect": "商品收藏",
+    "shop.pages.goods.browse": "我的足迹",
+    "shop.pages.goods.category": "商品分类",
+    "shop.pages.goods.detail": "商品详情",
+    "shop.pages.goods.list": "商品列表",
+    "shop.pages.goods.rank": "排行榜",
+    "shop.pages.member.index": "个人中心",
+    "shop.pages.member.my_coupon": "我的优惠券",
+    "shop.pages.order.list": "订单列表",
+    "shop.pages.order.detail": "订单详情",
+    "shop.pages.order.payment": "待付款订单",
+    "shop.pages.evaluate.order_evaluate": "商品评价",
+    "shop.pages.evaluate.order_evaluate_view": "商品评价",
+    "shop.pages.evaluate.list": "评价列表",
+    "shop.pages.coupon.list": "优惠券列表",
+    "shop.pages.coupon.detail": "优惠券详情",
+    "shop.pages.discount.list": "限时折扣",
+    "shop.pages.refund.list": "退款列表",
+    "shop.pages.refund.detail": "退款详情",
+    "shop.pages.refund.apply": "申请退款",
+    "shop.pages.refund.edit_apply": "编辑退款信息",
+    "shop.pages.refund.log": "协商记录",
+    "shop.pages.point.index": "积分商城",
+    "shop.pages.point.list": "积分商品列表",
+    "shop.pages.point.detail": "积分商品详情",
+    "shop.pages.point.payment": "待付款订单",
+    "shop.pages.point.order_list": "积分兑换记录",
+    "shop.pages.newcomer.list": "新人专享",
+    "shop.pages.pay.index": "待支付",
+    "shop.pages.pay.result": ""
+}
\ No newline at end of file
diff --git a/uni-app/src/locale/zh-Hans/common.json b/uni-app/src/locale/zh-Hans/common.json
new file mode 100644
index 00000000..d3aa0b7a
--- /dev/null
+++ b/uni-app/src/locale/zh-Hans/common.json
@@ -0,0 +1,144 @@
+{
+    "requestFail": "请求失败",
+    "notInDomainList": "不在request 合法域名列表中",
+    "baseUrlError": " 接口请求错误,请检查VITE_APP_BASE_URL参数配置或者伪静态配置",
+    "currency": "￥",
+    "getSmsCode": "获取验证码",
+    "smsCodeChangeText": "秒后重新获取",
+    "captchaTitle": "请完成验证",
+    "confirm": "确认",
+    "cancel": "取消",
+    "save": "保存",
+    "delete": "删除",
+    "captchaPlaceholder": "请输入验证码",
+    "mobilePlaceholder": "请输入手机号码",
+    "mobileError": "请输入正确的手机号",
+    "codePlaceholder": "请输入手机验证码",
+    "memberCenter": "个人中心",
+    "userAgreement": "用户协议",
+    "and": "和",
+    "privacyAgreement": "隐私协议",
+    "isAgreeTips": "请先阅读并同意协议",
+    "nickname": "昵称",
+    "nicknamePlaceholder": "请输入昵称",
+    "headimg": "头像",
+    "headimgPlaceholder": "请设置头像",
+    "getAvatarNickname": "获取您的昵称头像",
+    "getAvatarNicknameTips": "获取用户头像、昵称完善个人资料，主要用于向用户提供具有辨识度的用户中心界面",
+    "mobile": "手机号",
+    "getMobile": "获取手机号",
+    "mobileTips": "请获取手机号",
+    "point": "积分",
+    "balance": "余额",
+    "login": "登录",
+    "bind": "绑定",
+    "binding": "绑定中",
+    "bindMobile": "绑定手机号",
+    "agreeTips": "我已阅读并同意",
+    "pleaseAgree": "请勾选已阅读并同意",
+    "weixinUserAuth": "一键绑定",
+    "mobileQuickLogin": "手机号快捷登录",
+    "register": "注册",
+    "complete": "完成",
+    "close": "关闭",
+    "back": "返回",
+    "hidden": "已隐藏",
+    "view": "查看",
+    "know": "我知道了",
+    "prompt": "提示",
+    "call": "拨打",
+    "copy": "复制号码",
+    "uploadTips": "请上传图片",
+    "tips": "仅限本人和管理员能查看完整号码：",
+    "viewFillingDetails": "查看填写详情",
+    "detailInformation": "详细信息",
+    "pay": {
+        "orderInfo": "订单信息",
+        "confirmPay": "确认支付",
+        "payTitle": "确认付款",
+        "notHavePayType": "没有可用的支付方式",
+        "notObtainedInfo": "未获取到支付信息",
+        "paymentDocuments": "该支付单据",
+        "paySuccess": "支付成功",
+        "payFail": "支付失败",
+        "completePay": "已完成支付",
+        "incompletePay": "未完成支付",
+        "getting": "获取支付结果中"
+    },
+    "myBalance": "我的余额",
+    "myPoint": "我的积分",
+    "customerService": "联系客服",
+    "siteClose": "站点已关闭",
+    "noSite": "站点不存在",
+    "scenic": "景点",
+    "seeMore": "查看更多",
+    "way": "线路",
+    "hotel": "酒店",
+    "rise": "起",
+    "cardReserve": "项目预约",
+    "card": "办理次卡",
+    "memberName": "会员名称",
+    "memberCode": "会员码",
+    "reserve": "预约",
+    "reserveSuccess": "预约成功",
+    "cardLink": "次卡",
+    "myLink": "我的",
+    "reserveBtn": "去抢购",
+    "cardBtn": "办理",
+    "soldOut": "已售",
+    "unpaidOrder": "待支付",
+    "waitingOrder": "待使用",
+    "remainOrder": "已完成",
+    "allOrder": "全部订单",
+    "myOrder": "我的订单",
+    "orderNo": "订单号",
+    "actualPayment": "实付款",
+    "orderClose": "关闭订单",
+    "orderFinish": "确认收货",
+    "orderDetail": "详情",
+    "wxPrivacyPopup": {
+        "title": "用户隐私保护提示",
+        "descBefore": "感谢您使用本小程序，在使用前您应当阅读并同意",
+        "descAfter": "当点击同意并继续时，即表示您已理解并同意该条款内容，该条款将对您产生法律约束力；如您不同意，将无法继续使用小程序相关功能。",
+        "disagree": "不同意",
+        "agree": "同意并继续",
+        "contractName": "用户隐私保护指引",
+        "disagreeDesc": "未同意隐私协议，无法使用相关功能"
+    },
+    "starLevel": "星级",
+    "star": "星",
+    "emptyAddress": "暂无收货地址，请先创建地址",
+    "addAddress": "新增收货地址",
+    "selectAddress": "选择地址",
+    "coupon": "优惠劵",
+    "tourism.orderNo": "订单号",
+    "tourism.rise": "起",
+    "tourism.starLevel": "星级",
+    "tourism.star": "星",
+    "vipcard.cardReserve": "项目预约",
+    "vipcard.card": "办理次卡",
+    "vipcard.reserveSuccess": "预约成功",
+    "vipcard.reserve": "预约",
+    "vipcard.cardLink": "次卡",
+    "vipcard.reserveBtn": "去抢购",
+    "vipcard.cardBtn": "办理",
+    "vipcard.soldOut": "已售",
+    "vipcard.orderNo": "订单号",
+    "vipcard.myLink": "我的",
+    "vipcard.memberCode": "会员码",
+    "recharge.orderNo": "订单号",
+    "o2o.way": "线路",
+    "o2o.hotel": "酒店",
+    "o2o.scenic": "景点",
+    "o2o.reserveBtn": "去抢购",
+    "o2o.noHomeAddress": "没有更多内容啦~",
+    "o2o.soldOut": "已售",
+    "o2o.orderNo": "订单号",
+    "o2o.actualPayment": "实付款",
+    "o2o.orderDetail": "详情",
+    "shop.orderNo": "订单号",
+    "shop.actualPayment": "实付款",
+    "shop.orderClose": "关闭订单",
+    "shop.orderFinish": "确认收货",
+    "shop.coupon": "优惠劵"
+}
\ No newline at end of file
diff --git a/uni-app/src/main.js b/uni-app/src/main.js
new file mode 100644
index 00000000..5838fa17
--- /dev/null
+++ b/uni-app/src/main.js
@@ -0,0 +1,23 @@
+import App from './App'
+
+import { createSSRApp } from 'vue'
+import * as Pinia from 'pinia'
+import locale from './locale'
+import uviewPlus from 'uview-plus'
+import '@/styles/index.scss'
+import 'virtual:windi.css'
+import { uniStorage } from './utils/storage'
+import mixin from './utils/mixin'
+
+export function createApp() {
+    const app = createSSRApp(App)
+    app.use(Pinia.createPinia())
+    app.use(locale)
+    app.use(uviewPlus)
+    app.use(mixin)
+    uniStorage()
+    return {
+        app,
+        Pinia
+    }
+}
diff --git a/uni-app/src/manifest.json b/uni-app/src/manifest.json
new file mode 100644
index 00000000..06325719
--- /dev/null
+++ b/uni-app/src/manifest.json
@@ -0,0 +1,94 @@
+{
+    "name" : "",
+    "appid" : "__UNI__149BA20",
+    "description" : "",
+    "versionName" : "1.0.0",
+    "versionCode" : "100",
+    "transformPx" : false,
+    "app-plus" : {
+        "usingComponents" : true,
+        "nvueStyleCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        "modules" : {},
+        "distribute" : {
+            "android" : {
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ]
+            },
+            "ios" : {},
+            "sdkConfigs" : {}
+        }
+    },
+    "quickapp" : {},
+    "mp-weixin" : {
+        "appid" : "",
+        "setting" : {
+            "urlCheck" : false
+        },
+        "usingComponents" : true,
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "为了更好地为您提供服务"
+            },
+            "scope.writePhotosAlbum" : {
+                "desc" : "为了更好地为您提供服务"
+            }
+        },
+        "requiredPrivateInfos" : [ "chooseLocation", "getLocation", "chooseAddress" ],
+        "__usePrivacyCheck__" : true
+    },
+    "mp-alipay" : {
+        "usingComponents" : true
+    },
+    "mp-baidu" : {
+        "usingComponents" : true
+    },
+    "mp-toutiao" : {
+        "usingComponents" : true
+    },
+    "uniStatistics" : {
+        "enable" : false
+    },
+    "vueVersion" : "3",
+    "h5" : {
+        "router" : {
+            "mode" : "history",
+            "base" : "/wap/"
+        },
+        "sdkConfigs" : {
+            "maps" : {
+                "qqmap" : {
+                    "key" : ""
+                }
+            }
+        },
+        "async" : {
+            "loading" : "",
+            "error" : "",
+            "delay" : 0,
+            "timeout" : 3000
+        }
+    },
+    "fallbackLocale" : "zh-Hans"
+}
diff --git a/uni-app/src/pages.json b/uni-app/src/pages.json
new file mode 100644
index 00000000..3dbf28ea
--- /dev/null
+++ b/uni-app/src/pages.json
@@ -0,0 +1,638 @@
+{
+    "pages": [
+        // pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+        {
+            "path": "app/pages/index/index",
+            "style": {
+                // #ifndef H5
+                "navigationStyle": "custom",
+                // #endif
+                "navigationBarTitleText": "%pages.index.index%",
+                "usingComponents": {
+                    "diy-group": "../../../../addon/components/diy/group/index"
+                },
+                "componentPlaceholder": {
+                    "diy-group": "view"
+                }
+            }
+        },
+        {
+            "path": "app/pages/auth/index",
+            "style": {
+                // #ifndef H5
+                "navigationStyle": "custom",
+                // #endif
+                "navigationBarTitleText": "%pages.auth.index%"
+            }
+        },
+        {
+            "path": "app/pages/auth/agreement",
+            "style": {
+                "navigationBarTitleText": "%pages.auth.agreement%"
+            }
+        },
+        {
+            "path": "app/pages/auth/bind",
+            "style": {
+                // #ifndef H5
+                "navigationStyle": "custom",
+                // #endif
+                "navigationBarTitleText": "%pages.auth.bind%"
+            }
+        },
+        {
+            "path": "app/pages/auth/login",
+            "style": {
+                // #ifndef H5
+                "navigationStyle": "custom",
+                // #endif
+                "navigationBarTitleText": "%pages.auth.login%"
+            }
+        },
+        {
+            "path": "app/pages/auth/register",
+            "style": {
+                // #ifndef H5
+                "navigationStyle": "custom",
+                // #endif
+                "navigationBarTitleText": "%pages.auth.register%"
+            }
+        },
+        {
+            "path": "app/pages/auth/resetpwd",
+            "style": {
+                // #ifndef H5
+                "navigationStyle": "custom",
+                // #endif
+                "navigationBarTitleText": "%pages.auth.resetpwd%"
+            }
+        },
+        {
+            "path": "app/pages/index/diy",
+            "style": {
+                // #ifndef H5
+                "navigationStyle": "custom",
+                // #endif
+                "navigationBarTitleText": "%pages.index.diy%",
+                "usingComponents": {
+                    "diy-group": "../../../../addon/components/diy/group/index"
+                },
+                "componentPlaceholder": {
+                    "diy-group": "view"
+                }
+            }
+        },
+        {
+            "path": "app/pages/index/diy_form",
+            "style": {
+                // #ifndef H5
+                "navigationStyle": "custom",
+                // #endif
+                "navigationBarTitleText": "%pages.index.diy_form%",
+                "usingComponents": {
+                    "diy-group": "../../../../addon/components/diy/group/index"
+                },
+                "componentPlaceholder": {
+                    "diy-group": "view"
+                }
+            }
+        },
+        {
+            "path": "app/pages/index/diy_form_result",
+            "style": {
+                // #ifndef H5
+                "navigationStyle": "custom",
+                // #endif
+                "navigationBarTitleText": "%pages.index.diy_form_result%"
+            },
+            "needLogin": true
+        },
+        {
+            "path": "app/pages/index/diy_form_detail",
+            "style": {
+                "navigationBarTitleText": "%pages.index.diy_form_detail%"
+            },
+            "needLogin": true
+        },
+        {
+            "path": "app/pages/index/close",
+            "style": {
+                "navigationBarTitleText": "%pages.index.close%"
+            }
+        },
+        {
+            "path": "app/pages/index/nosite",
+            "style": {
+                "navigationBarTitleText": "%pages.index.nosite%"
+            }
+        },
+        {
+            "path": "app/pages/pay/browser",
+            "style": {
+                "navigationBarTitleText": "%pages.pay.browser%"
+            }
+        },
+        {
+            "path": "app/pages/pay/result",
+            "style": {
+                // #ifndef H5
+                "navigationStyle": "custom",
+                // #endif
+                "navigationBarTitleText": "%pages.pay.result%"
+            }
+        },
+        {
+            "path": "app/pages/setting/index",
+            "style": {
+                "navigationBarTitleText": "%pages.setting.index%"
+            },
+            "needLogin": true
+        },
+        {
+            "path": "app/pages/webview/index",
+            "style": {
+                "navigationBarTitleText": "%pages.webview.index%"
+            }
+        },
+        {
+            "path": "app/pages/verify/index",
+            "style": {
+                "navigationBarTitleText": "%pages.verify.index%"
+            },
+            "needLogin": true
+        },
+        {
+            "path": "app/pages/verify/verify",
+            "style": {
+                "navigationBarTitleText": "%pages.verify.verify%"
+            },
+            "needLogin": true
+        },
+        {
+            "path": "app/pages/verify/detail",
+            "style": {
+                "navigationBarTitleText": "%pages.verify.detail%"
+            },
+            "needLogin": true
+        },
+        {
+            "path": "app/pages/verify/record",
+            "style": {
+                "navigationBarTitleText": "%pages.verify.record%"
+            },
+            "needLogin": true
+        },
+        {
+            "path": "app/pages/weapp/order_shipping",
+            "style": {
+                "navigationBarTitleText": "%pages.weapp.order_shipping%"
+            }
+        },
+        {
+            "path": "app/pages/friendspay/share",
+            "style": {
+                // #ifndef H5
+                "navigationStyle": "custom",
+                // #endif
+                "navigationBarTitleText": "%pages.friendspay.share%"
+            },
+            "needLogin": true
+        },
+        {
+            "path": "app/pages/friendspay/money",
+            "style": {
+                // #ifndef H5
+                "navigationStyle": "custom",
+                // #endif
+                "navigationBarTitleText": "%pages.friendspay.money%"
+            }
+        }
+    ],
+    "subPackages": [
+        // {{ PAGE_BEGAIN }}
+            // ZHJW_PAGE_BEGIN
+            // *********************************** zhjw ***********************************
+            {
+                "root": "addon/zhjw",
+                "pages": [
+                    {
+                        "path": "pages/hello_world/index",
+                        "style": {
+                            "navigationBarTitleText": "%zhjw.pages.hello_world.index%"
+                        }
+                    }
+                ]
+            },
+            // ZHJW_PAGE_END
+        // SHOP_PAGE_BEGIN
+        {
+            "root": "addon/shop",
+            "pages": [
+                // *********************************** 商城 ***********************************
+                {
+                    "path": "pages/index",
+                    "style": {
+                        // #ifndef H5
+                        "navigationStyle": "custom",
+                        // #endif
+                        "navigationBarTitleText": "%shop.pages.index%"
+                    }
+                },
+                {
+                    "path": "pages/coupon/list",
+                    "style": {
+                        // #ifndef H5
+                        "navigationStyle": "custom",
+                        // #endif
+                        "navigationBarTitleText": "%shop.pages.coupon.list%"
+                    }
+                },
+                {
+                    "path": "pages/coupon/detail",
+                    "style": {
+                        // #ifndef H5
+                        "navigationStyle": "custom",
+                        // #endif
+                        "navigationBarTitleText": "%shop.pages.coupon.detail%"
+                    }
+                },
+                {
+                    "path": "pages/discount/list",
+                    "style": {
+                        // #ifndef H5
+                        "navigationStyle": "custom",
+                        // #endif
+                        "navigationBarTitleText": "%shop.pages.discount.list%"
+                    }
+                },
+                {
+                    "path": "pages/evaluate/list",
+                    "style": {
+                        "navigationBarTitleText": "%shop.pages.evaluate.list%"
+                    }
+                },
+                {
+                    "path": "pages/evaluate/order_evaluate",
+                    "style": {
+                        "navigationBarTitleText": "%shop.pages.evaluate.order_evaluate%"
+                    }
+                },
+                {
+                    "path": "pages/evaluate/order_evaluate_view",
+                    "style": {
+                        "navigationBarTitleText": "%shop.pages.evaluate.order_evaluate_view%"
+                    }
+                },
+                {
+                    "path": "pages/member/my_coupon",
+                    "style": {
+                        "navigationBarTitleText": "%shop.pages.member.my_coupon%"
+                    },
+                    "needLogin": true
+                },
+                {
+                    "path": "pages/member/index",
+                    "style": {
+                        // #ifndef H5
+                        "navigationStyle": "custom",
+                        // #endif
+                        "navigationBarTitleText": "%shop.pages.member.index%"
+                    }
+                },
+                {
+                    "path": "pages/goods/search",
+                    "style": {
+                        "navigationBarTitleText": "%shop.pages.goods.search%"
+                    }
+                },
+                {
+                    "path": "pages/goods/list",
+                    "style": {
+                        "navigationBarTitleText": "%shop.pages.goods.list%"
+                    }
+                },
+                {
+                    "path": "pages/goods/rank",
+                    "style": {
+                        // #ifndef H5
+                        "navigationStyle": "custom",
+                        // #endif
+                        "navigationBarTitleText": "%shop.pages.goods.rank%"
+                    }
+                },
+                {
+                    "path": "pages/newcomer/list",
+                    "style": {
+                        // #ifndef H5
+                        "navigationStyle": "custom",
+                        // #endif
+                        "navigationBarTitleText": "%shop.pages.newcomer.list%"
+                    }
+                },
+                {
+                    "path": "pages/goods/detail",
+                    "style": {
+                        "navigationBarTitleText": "%shop.pages.goods.detail%",
+                        "navigationStyle": "custom"
+                    }
+                },
+                {
+                    "path": "pages/goods/cart",
+                    "style": {
+                        "navigationBarTitleText": "%shop.pages.goods.cart%"
+                    }
+                },
+                {
+                    "path": "pages/goods/collect",
+                    "style": {
+                        "navigationBarTitleText": "%shop.pages.goods.collect%"
+                    }
+                },
+                {
+                    "path": "pages/goods/browse",
+                    "style": {
+                        "navigationBarTitleText": "%shop.pages.goods.browse%"
+                    }
+                },
+                {
+                    "path": "pages/goods/category",
+                    "style": {
+                        "navigationBarTitleText": "%shop.pages.goods.category%"
+                    }
+                },
+                {
+                    "path": "pages/order/detail",
+                    "style": {
+                        // #ifndef H5
+                        "navigationStyle": "custom",
+                        // #endif
+                        "navigationBarTitleText": "%shop.pages.order.detail%"
+                    },
+                    "needLogin": true
+                },
+                {
+                    "path": "pages/order/list",
+                    "style": {
+                        "navigationBarTitleText": "%shop.pages.order.list%"
+                    },
+                    "needLogin": true
+                },
+                {
+                    "path": "pages/order/payment",
+                    "style": {
+                        "navigationBarTitleText": "%shop.pages.order.payment%"
+                    },
+                    "needLogin": true
+                },
+                {
+                    "path": "pages/refund/apply",
+                    "style": {
+                        "navigationBarTitleText": "%shop.pages.refund.apply%"
+                    },
+                    "needLogin": true
+                },
+                {
+                    "path": "pages/refund/edit_apply",
+                    "style": {
+                        "navigationBarTitleText": "%shop.pages.refund.edit_apply%"
+                    },
+                    "needLogin": true
+                },
+                {
+                    "path": "pages/refund/list",
+                    "style": {
+                        "navigationBarTitleText": "%shop.pages.refund.list%"
+                    },
+                    "needLogin": true
+                },
+                {
+                    "path": "pages/refund/detail",
+                    "style": {
+                        // #ifndef H5
+                        "navigationStyle": "custom",
+                        // #endif
+                        "navigationBarTitleText": "%shop.pages.refund.detail%"
+                    },
+                    "needLogin": true
+                },
+                {
+                    "path": "pages/refund/log",
+                    "style": {
+                        "navigationBarTitleText": "%shop.pages.refund.log%"
+                    },
+                    "needLogin": true
+                },
+                {
+                    "path": "pages/point/index",
+                    "style": {
+                        // #ifndef H5
+                        "navigationStyle": "custom",
+                        // #endif
+                        "navigationBarTitleText": "%shop.pages.point.index%"
+                    }
+                },
+                {
+                    "path": "pages/point/list",
+                    "style": {
+                        "navigationBarTitleText": "%shop.pages.point.list%"
+                    }
+                },
+                {
+                    "path": "pages/point/detail",
+                    "style": {
+                        "navigationStyle": "custom",
+                        "navigationBarTitleText": "%shop.pages.point.detail%"
+                    }
+                },
+                {
+                    "path": "pages/point/payment",
+                    "style": {
+                        "navigationBarTitleText": "%shop.pages.point.payment%"
+                    }
+                },
+                {
+                    "path": "pages/point/order_list",
+                    "style": {
+                        "navigationBarTitleText": "%shop.pages.point.order_list%"
+                    }
+                }
+            ]
+        },
+        // SHOP_PAGE_END
+// {{ PAGE_END }}
+        {
+            "root": "app/components",
+            "pages": []
+        },
+        {
+            "root": "app/pages/member",
+            "pages": [
+                {
+                    "path": "apply_cash_out",
+                    "style": {
+                        "navigationBarTitleText": "%pages.member.apply_cash_out%"
+                    },
+                    "needLogin": true
+                },
+                {
+                    "path": "commission",
+                    "style": {
+                        // #ifndef H5
+                        "navigationStyle": "custom",
+                        // #endif
+                        "navigationBarTitleText": "%pages.member.commission%"
+                    },
+                    "needLogin": true
+                },
+                {
+                    "path": "balance",
+                    "style": {
+                        // #ifndef H5
+                        "navigationStyle": "custom",
+                        // #endif
+                        "navigationBarTitleText": "%pages.member.balance%"
+                    },
+                    "needLogin": true
+                },
+                {
+                    "path": "level",
+                    "style": {
+                        // #ifndef H5
+                        "navigationStyle": "custom",
+                        // #endif
+                        "navigationBarTitleText": "%pages.member.level%"
+                    },
+                    "needLogin": true
+                },
+                {
+                    "path": "detailed_account",
+                    "style": {
+                        "navigationBarTitleText": "%pages.member.detailed_account%"
+                    }
+                },
+                {
+                    "path": "cash_out",
+                    "style": {
+                        "navigationBarTitleText": "%pages.member.cash_out%"
+                    }
+                },
+                {
+                    "path": "cash_out_detail",
+                    "style": {
+                        "navigationBarTitleText": "%pages.member.cash_out_detail%"
+                    }
+                },
+                {
+                    "path": "index",
+                    "style": {
+                        // #ifndef H5
+                        "navigationStyle": "custom",
+                        // #endif
+                        "navigationBarTitleText": "%pages.member.index%",
+                        "usingComponents": {
+                            "diy-group": "../../../../addon/components/diy/group/index"
+                        },
+                        "componentPlaceholder": {
+                            "diy-group": "view"
+                        }
+                    }
+                },
+                {
+                    "path": "personal",
+                    "style": {
+                        "navigationBarTitleText": "%pages.member.personal%"
+                    },
+                    "needLogin": true
+                },
+                {
+                    "path": "point",
+                    "style": {
+                        // #ifndef H5
+                        "navigationStyle": "custom",
+                        // #endif
+                        "navigationBarTitleText": "%pages.member.point%"
+                    },
+                    "needLogin": true
+                },
+                {
+                    "path": "point_detail",
+                    "style": {
+                        "navigationBarTitleText": "%pages.member.point_detail%"
+                    },
+                    "needLogin": true
+                },
+                {
+                    "path": "account",
+                    "style": {
+                        "navigationBarTitleText": "%pages.member.account%"
+                    },
+                    "needLogin": true
+                },
+                {
+                    "path": "account_edit",
+                    "style": {
+                        "navigationBarTitleText": "%pages.member.account_edit%"
+                    },
+                    "needLogin": true
+                },
+                {
+                    "path": "address",
+                    "style": {
+                        "navigationBarTitleText": "%pages.member.address%"
+                    },
+                    "needLogin": true
+                },
+                {
+                    "path": "address_edit",
+                    "style": {
+                        "navigationBarTitleText": "%pages.member.address_edit%"
+                    },
+                    "needLogin": true
+                },
+                {
+                    "path": "sign_in",
+                    "style": {
+                        // #ifndef H5
+                        "navigationStyle": "custom",
+                        // #endif
+                        "navigationBarTitleText": "%pages.member.sign_in%"
+                    },
+                    "needLogin": true
+                },
+                {
+                    "path": "contact",
+                    "style": {
+                        "navigationBarTitleText": "%pages.member.contact%"
+                    }
+                }
+            ]
+        }
+    ],
+    "globalStyle": {
+        "navigationBarTextStyle": "black",
+        "navigationBarTitleText": "",
+        "navigationBarBackgroundColor": "#ffffff",
+        "backgroundColor": "#F6F6F6",
+        "backgroundColorTop": "#F6F6F6",
+        "backgroundColorBottom": "#F6F6F6"
+    },
+    "tabBar": {
+        "list": [{
+                "pagePath": "app/pages/index/index"
+            },
+            {
+                "pagePath": "app/pages/index/nosite"
+            }
+        ]
+    },
+    "uniIdRouter": {},
+    "easycom": {
+        "custom": {
+            "diy-group": "@/addon/components/diy/group/index.vue",
+            "^u-(.*)": "uview-plus/components/u-$1/u-$1.vue",
+            "^up-(.*)": "uview-plus/components/u-$1/u-$1.vue",
+            "^u-([^-].*)": "uview-plus/components/u-$1/u-$1.vue",
+            "diy-(\W.*)": "@/app/components/diy/$1/index.vue"
+        }
+    }
+}
diff --git a/uni-app/src/stores/config.ts b/uni-app/src/stores/config.ts
new file mode 100644
index 00000000..3243e737
--- /dev/null
+++ b/uni-app/src/stores/config.ts
@@ -0,0 +1,91 @@
+import { defineStore } from 'pinia'
+import { getConfig } from '@/app/api/auth'
+import { isWeixinBrowser } from "@/utils/common";
+
+interface loginConfig {
+    is_username: number | boolean,
+    is_mobile: number | boolean,
+    is_auth_register: number | boolean,
+    is_force_access_user_info: number | boolean,
+    is_bind_mobile: number | boolean,
+    agreement_show: number | boolean,
+    bg_url: string,
+    logo: string,
+    desc: string
+}
+
+interface tabbarConfig {
+    backgroundColor: string,
+    textColor: string,
+    textHoverColor: string,
+    list: AnyObject[]
+}
+
+interface Config {
+    login: loginConfig,
+    tabbarList: any,
+    tabbar: tabbarConfig | null,
+    addon: String,
+    themeColor: any
+}
+
+const useConfigStore = defineStore('config', {
+    state: (): Config => {
+        return {
+            login: {
+                is_username: 0,
+                is_mobile: 0,
+                is_auth_register: 0,
+                is_force_access_user_info: 0,
+                is_bind_mobile: 0,
+                agreement_show: 0,
+                bg_url: '',
+                logo: '',
+                desc: ''
+            },
+            tabbarList: {},
+            tabbar: null,
+            addon: '',
+            themeColor: ''
+        }
+    },
+    actions: {
+        async getLoginConfig() {
+
+            let url = '';
+            // #ifdef H5
+            if (isWeixinBrowser()) {
+                url = uni.getSystemInfoSync().platform == 'ios' ? uni.getStorageSync('initUrl') : location.href
+            }
+            // #endif
+            await getConfig({ url }).then((res: any) => {
+                this.login.is_username = res.data.is_username
+                this.login.is_mobile = res.data.is_mobile
+                this.login.is_auth_register = parseInt(res.data.is_auth_register)
+                this.login.is_force_access_user_info = parseInt(res.data.is_force_access_user_info)
+                this.login.is_bind_mobile = parseInt(res.data.is_bind_mobile)
+                this.login.agreement_show = parseInt(res.data.agreement_show)
+                this.login.bg_url = res.data.bg_url // 背景图
+                this.login.logo = res.data.logo //logo
+                this.login.desc = res.data.desc // 描述
+            })
+        },
+        // 获取主色调
+        getThemeColor() {
+            let themeColorStorage = uni.getStorageSync('current_theme_color');
+            if (!this.themeColor && themeColorStorage) {
+                this.themeColor = JSON.parse(themeColorStorage);
+            }
+            if (this.themeColor) {
+                let style = '';
+                for (let k in this.themeColor) {
+                    style += `${ k }:${ this.themeColor[k] };`;
+                }
+                return style;
+            }
+            return '';
+        }
+    }
+})
+
+export default useConfigStore
diff --git a/uni-app/src/stores/member.ts b/uni-app/src/stores/member.ts
new file mode 100644
index 00000000..b96fee2b
--- /dev/null
+++ b/uni-app/src/stores/member.ts
@@ -0,0 +1,112 @@
+import { defineStore } from 'pinia'
+import { setToken, removeToken, redirect } from '@/utils/common'
+import { getMemberInfo as getMemberInfoApi, bindMobile as bindMobileApi } from '@/app/api/member'
+import { logout } from '@/app/api/auth'
+import useConfigStore from '@/stores/config'
+import { useLogin } from '@/hooks/useLogin'
+
+interface Member {
+    token: string | null
+    info: any | null
+    levelList: Array<any> | null
+}
+
+const useMemberStore = defineStore('member', {
+    state: (): Member => {
+        return {
+            token: uni.getStorageSync(import.meta.env.VITE_REQUEST_STORAGE_TOKEN_KEY),
+            info: null,
+            levelList: null
+        }
+    },
+    actions: {
+        setToken(token: string, callback: any = null) {
+            this.token = token
+            setToken(token)
+            this.getMemberInfo(callback)
+        },
+        getMemberInfo(callback: any = null) {
+            if (!this.token) return
+            getMemberInfoApi().then((res: any) => {
+                this.info = res.data;
+                uni.setStorageSync('wap_member_info', this.info)
+                uni.setStorageSync('wap_member_id', res.data.member_id)
+                if (this.info.mobile) {
+                    uni.removeStorageSync('isbindmobile')
+                    uni.setStorageSync('wap_member_mobile', this.info.mobile) // 存储会员手机号，防止重复请求微信获取手机号接口
+                }
+
+                // #ifdef MP-WEIXIN
+                if (this.info && this.info.weapp_openid) {
+                    uni.setStorageSync('openid', this.info.weapp_openid)
+                } else {
+                    const login = useLogin()
+                    login.getAuthCode({ updateFlag: true }) // 更新oppenid
+                }
+                // #endif
+
+                if (callback) callback();
+            }).catch(() => {
+                this.logout()
+                uni.removeStorageSync('wap_member_mobile');
+                uni.removeStorageSync('wap_member_id');
+            })
+        },
+        logout(isRedirect: boolean = false) {
+            if (!this.token) return
+            this.token = ''
+            this.info = null
+            if (useConfigStore().login.is_auth_register) {
+                uni.setStorageSync('autoLoginLock', true) // todo 普通账号退出登录,在进行三方账号登录不会自动登录
+            }
+            logout().then(() => {
+                removeToken()
+                uni.removeStorageSync('wap_member_info');
+                // uni.removeStorageSync('openid');
+                uni.removeStorageSync('unionid');
+                uni.removeStorageSync('isbindmobile');
+                uni.removeStorageSync('nickname');
+                uni.removeStorageSync('avatar');
+                isRedirect && redirect({ url: '/app/pages/index/index', mode: 'switchTab' })
+            }).catch(() => {
+                removeToken()
+                uni.removeStorageSync('wap_member_info');
+                // uni.removeStorageSync('openid');
+                uni.removeStorageSync('unionid');
+                uni.removeStorageSync('isbindmobile');
+                uni.removeStorageSync('nickname');
+                uni.removeStorageSync('avatar');
+                isRedirect && redirect({ url: '/app/pages/index/index', mode: 'switchTab' })
+            })
+        },
+        // 一键绑定手机号
+        bindMobile(e: any) {
+            if (e.detail.errMsg == 'getPhoneNumber:ok') {
+                uni.showLoading({ title: '' })
+                bindMobileApi({
+                    mobile_code: e.detail.code
+                }).then((res: any) => {
+                    uni.hideLoading()
+                    this.getMemberInfo()
+                }).catch(() => {
+                    setTimeout(() => {
+                        uni.hideLoading()
+                    }, 2000);
+                })
+
+            }
+
+            if (e.detail.errno == 104) {
+                let msg = '用户未授权隐私权限';
+                uni.showToast({ title: msg, icon: 'none' })
+            }
+            if (e.detail.errMsg == "getPhoneNumber:fail user deny") {
+                let msg = '用户拒绝获取手机号码';
+                uni.showToast({ title: msg, icon: 'none' })
+            }
+
+        }
+    }
+})
+
+export default useMemberStore
diff --git a/uni-app/src/stores/system.ts b/uni-app/src/stores/system.ts
new file mode 100644
index 00000000..7c0414b0
--- /dev/null
+++ b/uni-app/src/stores/system.ts
@@ -0,0 +1,152 @@
+import { defineStore } from 'pinia'
+import { getInitInfo, getSiteInfo } from '@/app/api/system'
+import useConfigStore from '@/stores/config'
+import useMemberStore from '@/stores/member'
+import { isWeixinBrowser } from '@/utils/common'
+import { cloneDeep } from 'lodash-es';
+
+interface System {
+    site: AnyObject | null,
+    siteApps: string[],
+    siteAddons: string[],
+    currRoute: string,
+    mapConfig: any,
+    initStatus: any, // 初始化状态
+    menuButtonInfo: any, // 如果是小程序，获取右上角胶囊的尺寸信息
+    shareCallback: any, // 分享回调
+    defaultPositionAddress:any,
+	diyAddressInfo: any  // 定位信息
+}
+
+const useSystemStore = defineStore('system', {
+    state: (): System => {
+        return {
+            site: null,
+            siteApps: [],
+            siteAddons: [],
+            currRoute: '',
+            mapConfig: {
+                is_open: 1,
+                valid_time: 0
+            },
+            initStatus: 'wait',
+            menuButtonInfo: {
+                height: '',
+                top: '',
+                right: '',
+                width: ''
+            },
+            shareCallback: null,
+            defaultPositionAddress:'定位中',
+			diyAddressInfo: null
+        }
+    },
+    actions: {
+        // 获取初始化数据信息
+        getInitFn(callback: any) {
+
+            let url = '';
+            // #ifdef H5
+            if (isWeixinBrowser()) {
+                url = uni.getSystemInfoSync().platform == 'ios' ? uni.getStorageSync('initUrl') : location.href
+            }
+            // #endif
+
+            getInitInfo({
+                url,
+                openid: uni.getStorageSync('openid')
+            }).then((res: any) => {
+                if (res.data) {
+                    let data = res.data;
+
+                    // 底部导航
+                    const configStore = useConfigStore()
+                    configStore.tabbarList = data.tabbar_list;
+
+                    // 地图配置
+                    this.mapConfig.is_open = data.map_config.is_open;
+                    this.mapConfig.valid_time = data.map_config.valid_time;
+                    uni.setStorageSync('mapConfig', this.mapConfig);
+					
+					// 主题色
+					uni.setStorageSync('theme_color_list', data.theme_list);
+
+                    // 站点信息
+                    this.site = data.site_info
+                    const apps: any = [], addons: any = []
+                    Object.keys(data.site_info.site_addons).forEach((key: string) => {
+                        const item = data.site_info.site_addons[key]
+                        item.type == 'app' ? apps.push(key) : addons.push(key)
+                    })
+                    this.siteApps = apps
+                    this.siteAddons = addons
+
+                    // 会员等级
+                    const memberStore = useMemberStore();
+                    memberStore.levelList = data.member_level;
+
+                    // 登录注册配置
+                    configStore.login.is_username = data.login_config.is_username
+                    configStore.login.is_mobile = data.login_config.is_mobile
+                    configStore.login.is_auth_register = parseInt(data.login_config.is_auth_register)
+                    configStore.login.is_force_access_user_info = parseInt(data.login_config.is_force_access_user_info)
+                    configStore.login.is_bind_mobile = parseInt(data.login_config.is_bind_mobile)
+                    configStore.login.agreement_show = parseInt(data.login_config.agreement_show)
+                    configStore.login.bg_url = data.login_config.bg_url // 背景图
+                    configStore.login.logo = data.login_config.logo //logo
+                    configStore.login.desc = data.login_config.desc // 描述
+                    uni.setStorageSync('login_config', configStore.login)
+
+                    // 如果会员已存在则小程序端快捷登录时不再弹出授权弹框
+                    uni.setStorageSync('member_exist',data.member_exist)
+
+                    this.initStatus = 'finish'; // 初始化完成
+                    if (callback) callback()
+                }
+            })
+
+            this.getMenuButtonInfoFn();
+        },
+        getMenuButtonInfoFn() {
+            // 如果是小程序，获取右上角胶囊的尺寸信息，避免导航栏右侧内容与胶囊重叠(支付宝小程序非本API，尚未兼容)
+            // #ifdef MP-WEIXIN || MP-BAIDU || MP-TOUTIAO || MP-QQ
+            this.menuButtonInfo = uni.getMenuButtonBoundingClientRect();
+            // #endif
+        },
+        async getSiteInfoFn() {
+            await getSiteInfo().then((res: any) => {
+                this.site = res.data
+                const apps: any = [], addons: any = []
+                Object.keys(res.data.site_addons).forEach((key: string) => {
+                    const item = res.data.site_addons[key]
+                    item.type == 'app' ? apps.push(key) : addons.push(key)
+                })
+                this.siteApps = apps
+                this.siteAddons = addons
+            }).catch((err) => {
+            })
+        },
+		// 当前选择的收货地址信息[经纬度，当前定位地址，定位过期时间]
+		setAddressInfo(data:any = {}) {
+			let addressInfo = cloneDeep(data);
+			// 过期时间
+			var date = new Date();
+			date.setSeconds(60 * this.mapConfig.valid_time);
+			addressInfo.valid_time = date.getTime() / 1000; // 定位信息 5分钟内有效，过期后将重新获取定位信息
+
+			if(this.diyAddressInfo){
+				this.diyAddressInfo = Object.assign(this.diyAddressInfo, addressInfo);
+			}else{
+				this.diyAddressInfo = addressInfo;
+			}
+
+			if(Object.keys(data).length){
+				uni.setStorageSync('location_address', addressInfo);
+			}else{
+				uni.removeStorageSync('location_address');
+			}
+		}
+    }
+})
+
+export default useSystemStore
diff --git a/uni-app/src/styles/account_info.scss b/uni-app/src/styles/account_info.scss
new file mode 100644
index 00000000..111ee033
--- /dev/null
+++ b/uni-app/src/styles/account_info.scss
@@ -0,0 +1,41 @@
+.account-info-wrap{
+	@apply bg-[#F5F6FA] min-h-[100vh];
+	.account-info-head{
+		@apply relative h-40;
+		.name{
+			@apply ml-4 pt-7 text-white text-lg mb-3;
+		}
+		.content{
+			@apply absolute bg-white left-3 right-3 rounded-lg p-5;
+			.money{
+				@apply text-xl font-bold;
+			}
+			.text{
+				@apply text-xs text-slate-500 mt-2;
+			}
+			.money-wrap{
+				@apply mt-5 flex;
+				.money-item{
+					@apply flex-1;
+				}
+				.money{
+					@apply text-lg;
+				}
+				.text{
+					@apply mt-1;
+				}
+			}
+		}
+	}
+	.account-info-btn{
+		@apply flex mt-24 ml-3 mr-3;
+		.btn{
+			&:first-of-type{
+				@apply mr-1 rounded;
+			}
+			&:last-of-type{
+				@apply ml-1 rounded;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/uni-app/src/styles/common.scss b/uni-app/src/styles/common.scss
new file mode 100644
index 00000000..d369caa6
--- /dev/null
+++ b/uni-app/src/styles/common.scss
@@ -0,0 +1,554 @@
+:root, page {
+    --primary-color: #007aff;
+    --primary-color-dark: #398ade;
+    --primary-color-disabled: #9acafc;
+    --primary-color-light: #ecf5ff;
+    --page-bg-color: #f6f6f6;
+	--text-color-light6: #666;
+	--text-color-light9: #999;
+	// 模块背景
+	--temp-bg: #f6f6f6; //#F8F9FD
+	// 外边距
+	--sidebar-m: 20rpx;  // 侧边栏间距
+	--top-m: 20rpx; // 上下模块之间到的距离
+	--popup-sidebar-m: 30rpx;  // 弹窗的左右间距
+	// 内边距
+	--pad-sidebar-m: 24rpx;  // 左右间距
+	--pad-top-m: 30rpx; // 上下间距
+	// 卡片圆角大小
+	--rounded-big: 24rpx;
+	--rounded-mid: 20rpx;
+	--rounded-small: 16rpx;
+	// 商品图片圆角大小
+	--goods-rounded-big: 20rpx;
+	--goods-rounded-mid: 16rpx;
+	--goods-rounded-small: 12rpx;
+	// 箭头大小
+	--arrow-size-big: 26rpx;
+	--arrow-size-mid: 24rpx;
+}
+// 价格字体设置
+@font-face {
+    font-family: 'myFont';
+	src: url('data:font/ttf;charset=utf-8;base64,AAEAAAASAQAABAAgRkZUTYSyVP0AAGgEAAAAHEdERUYAKQCDAABgmAAAAB5HUE9Tg0t29QAAYSQAAAbeR1NVQhiAGGYAAGC4AAAAbE9TLzJcilgVAAABqAAAAGBjbWFwrDH/QQAAA/wAAAIqY3Z0IAPFDZcAABQwAAAAQmZwZ205Go58AAAGKAAADW1nYXNwAAAAEAAAYJAAAAAIZ2x5ZtRkHFYAABVwAABFtGhlYWQc+XHLAAABLAAAADZoaGVhEvEOjAAAAWQAAAAkaG10eDmLHf8AAAIIAAAB9GxvY2G3+cqkAAAUdAAAAPxtYXhwAfYC9gAAAYgAAAAgbmFtZfcEydMAAFskAAADpnBvc3Qsx6QuAABezAAAAcRwcmVwLTGHHAAAE5gAAACYAAEAAAABAACJjp8zXw889QAfBEwAAAAA1tEjvgAAAADYPQo2/+//Gw7JA3MAAAAIAAIAAAAAAAAAAQAABDb/DgAADwv/7//1DskAAQAAAAAAAAAAAAAAAAAAAH0AAQAAAH0AhwAIAAAAAAACADIARACLAAAAswIpAAAAAAADAm0BkAAFAAACywKUAAAAUgLLApQAAAGBADIBSgAAAAAIAAAAAAAAAAAAAAEAAAAAAAAAAAAAAABCSkpEAEAAIP/lA4b/DgCwBDYA8gAAAAEAAAAAAiYDAgAAACAAAgI8AAAAAAAAAW4AAAFgAAABHABBAasALAMwACMC3QA6A2AAQgLFACwBbABlATYAQgE2ACwCFwAOAd8AIQEJACwCIQBCAR4AQgKCAEICRQAsAd8AWAJFACwCWQAjAlwAHwJqAD0CWQA3AjIAIQJjADMCXwAsATQATQE0AE0CoABYAiEAQgKgAEIDoAAWAtoABwKrAEICugAhAsoASAJ0AEgCXgBIAwEAMgLhAEgBHgBTAkUACwKzAEICaQBIA1wAPQLfAEgDCwA3AqsASAM1AEICxQBCApMADgKjABYCrAA3Au0ABgPOABICmwALAooAAAKTACcBYABCAWAALAIhAEICWAAsAl8AQgJAACwCXwAsAlEAIQFGAAYCdQAsAlwAQgEYAEQBVP/vAlIAQgEYAE8DjwBCAlwAQgJfACwCXwBCAl8ALAGXAEICIAAhAXgAEQJcAEICRgAHAwsABwIwAAcCLQAHAiEAHAFKAG4CUgBCAucAQgLdAD0DowBCA6MAQgEeAEICEABYAykAhALCAIQDAwCEAp0A3AKdAEIDEwCEA2MAQgRRAEIC+ABuAsUAhANjAEIDXACEAucASAOnACwDOQDcAzkAQgJSANwCUgBCAn4A3AJ+AEICOwAaAosA3AKLAEIC5wBCAu0APQNPADcPCwBCAAAAAwAAAAMAAAAcAAEAAAAAASQAAwABAAAAHAAEAQgAAAA+ACAABAAeAD4AWwBdAF8AegB8AH4AowClAKkArgC3AUIBkgQxDj8gHSCkIKYgqSCtILEgvSEiMA//H/9b/13/4f/l//8AAAAgAEAAXQBfAGEAfAB+AKMApQCpAK4AtwFCAZIEMQ4/IBwgpCCmIKkgqyCxIL0hIjAK/x//W/9d/+H/5f///+P/4v/h/+D/3//e/93/uf+4/7X/sf+p/x/+0Pwy8iXgSd/D38LfwN+/37zfsd9N0GYBVwEcARsAmACVAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQYAAAEAAAAAAAAAAQIAAAACAAAAAAAAAAAAAAAAAAAAAQAAAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gIQAiIyQlJicoKSorLC0uLzAxMjM0NTY3ODk6Ozw9AD4APwBAQUJDREVGR0hJSktMTU5PUFFSU1RVVldYWQBaAFsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcAAAAAF9ebwAAAAAAAAAAAF0AAAAAAAAAAAAAAAAAAABiAAAAAAAAAAAAAAAAAGVmAAAAAAAAAGsAAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALAALCCwAFVYRVkgIEu4AA5RS7AGU1pYsDQbsChZYGYgilVYsAIlYbkIAAgAY2MjYhshIbAAWbAAQyNEsgABAENgQi2wASywIGBmLbACLCBkILDAULAEJlqyKAELQ0VjRbAGRVghsAMlWVJbWCEjIRuKWCCwUFBYIbBAWRsgsDhQWCGwOFlZILEBC0NFY0VhZLAoUFghsQELQ0VjRSCwMFBYIbAwWRsgsMBQWCBmIIqKYSCwClBYYBsgsCBQWCGwCmAbILA2UFghsDZgG2BZWVkbsAIlsApDY7AAUliwAEuwClBYIbAKQxtLsB5QWCGwHkthuBAAY7AKQ2O4BQBiWVlkYVmwAStZWSOwAFBYZVlZLbADLCBFILAEJWFkILAFQ1BYsAUjQrAGI0IbISFZsAFgLbAELCMhIyEgZLEFYkIgsAYjQrAGRVgbsQELQ0VjsQELQ7ACYEVjsAMqISCwBkMgiiCKsAErsTAFJbAEJlFYYFAbYVJZWCNZIVkgsEBTWLABKxshsEBZI7AAUFhlWS2wBSywB0MrsgACAENgQi2wBiywByNCIyCwACNCYbACYmawAWOwAWCwBSotsAcsICBFILAMQ2O4BABiILAAUFiwQGBZZrABY2BEsAFgLbAILLIHDABDRUIqIbIAAQBDYEItsAkssABDI0SyAAEAQ2BCLbAKLCAgRSCwASsjsABDsAQlYCBFiiNhIGQgsCBQWCGwABuwMFBYsCAbsEBZWSOwAFBYZVmwAyUjYUREsAFgLbALLCAgRSCwASsjsABDsAQlYCBFiiNhIGSwJFBYsAAbsEBZI7AAUFhlWbADJSNhRESwAWAtsAwsILAAI0KyCwoDRVghGyMhWSohLbANLLECAkWwZGFELbAOLLABYCAgsA1DSrAAUFggsA0jQlmwDkNKsABSWCCwDiNCWS2wDywgsBBiZrABYyC4BABjiiNhsA9DYCCKYCCwDyNCIy2wECxLVFixBGREWSSwDWUjeC2wESxLUVhLU1ixBGREWRshWSSwE2UjeC2wEiyxABBDVVixEBBDsAFhQrAPK1mwAEOwAiVCsQ0CJUKxDgIlQrABFiMgsAMlUFixAQBDYLAEJUKKiiCKI2GwDiohI7ABYSCKI2GwDiohG7EBAENgsAIlQrACJWGwDiohWbANQ0ewDkNHYLACYiCwAFBYsEBgWWawAWMgsAxDY7gEAGIgsABQWLBAYFlmsAFjYLEAABMjRLABQ7AAPrIBAQFDYEItsBMsALEAAkVUWLAQI0IgRbAMI0KwCyOwAmBCIGCwAWG1EhIBAA8AQkKKYLESBiuwiSsbIlktsBQssQATKy2wFSyxARMrLbAWLLECEystsBcssQMTKy2wGCyxBBMrLbAZLLEFEystsBossQYTKy2wGyyxBxMrLbAcLLEIEystsB0ssQkTKy2wKSwjILAQYmawAWOwBmBLVFgjIC6wAV0bISFZLbAqLCMgsBBiZrABY7AWYEtUWCMgLrABcRshIVktsCssIyCwEGJmsAFjsCZgS1RYIyAusAFyGyEhWS2wHiwAsA0rsQACRVRYsBAjQiBFsAwjQrALI7ACYEIgYLABYbUSEgEADwBCQopgsRIGK7CJKxsiWS2wHyyxAB4rLbAgLLEBHistsCEssQIeKy2wIiyxAx4rLbAjLLEEHistsCQssQUeKy2wJSyxBh4rLbAmLLEHHistsCcssQgeKy2wKCyxCR4rLbAsLCA8sAFgLbAtLCBgsBJgIEMjsAFgQ7ACJWGwAWCwLCohLbAuLLAtK7AtKi2wLywgIEcgILAMQ2O4BABiILAAUFiwQGBZZrABY2AjYTgjIIpVWCBHICCwDENjuAQAYiCwAFBYsEBgWWawAWNgI2E4GyFZLbAwLACxAAJFVFixDAhFQrABFrAvKrEFARVFWDBZGyJZLbAxLACwDSuxAAJFVFixDAhFQrABFrAvKrEFARVFWDBZGyJZLbAyLCA1sAFgLbAzLACxDAhFQrABRWO4BABiILAAUFiwQGBZZrABY7ABK7AMQ2O4BABiILAAUFiwQGBZZrABY7ABK7AAFrQAAAAAAEQ+IzixMgEVKiEtsDQsIDwgRyCwDENjuAQAYiCwAFBYsEBgWWawAWNgsABDYTgtsDUsLhc8LbA2LCA8IEcgsAxDY7gEAGIgsABQWLBAYFlmsAFjYLAAQ2GwAUNjOC2wNyyxAgAWJSAuIEewACNCsAIlSYqKRyNHI2EgWGIbIVmwASNCsjYBARUUKi2wOCywABawESNCsAQlsAQlRyNHI2GxCgBCsAlDK2WKLiMgIDyKOC2wOSywABawESNCsAQlsAQlIC5HI0cjYSCwBCNCsQoAQrAJQysgsGBQWCCwQFFYswIgAyAbswImAxpZQkIjILAIQyCKI0cjRyNhI0ZgsARDsAJiILAAUFiwQGBZZrABY2AgsAErIIqKYSCwAkNgZCOwA0NhZFBYsAJDYRuwA0NgWbADJbACYiCwAFBYsEBgWWawAWNhIyAgsAQmI0ZhOBsjsAhDRrACJbAIQ0cjRyNhYCCwBEOwAmIgsABQWLBAYFlmsAFjYCMgsAErI7AEQ2CwASuwBSVhsAUlsAJiILAAUFiwQGBZZrABY7AEJmEgsAQlYGQjsAMlYGRQWCEbIyFZIyAgsAQmI0ZhOFktsDossAAWsBEjQiAgILAFJiAuRyNHI2EjPDgtsDsssAAWsBEjQiCwCCNCICAgRiNHsAErI2E4LbA8LLAAFrARI0KwAyWwAiVHI0cjYbAAVFguIDwjIRuwAiWwAiVHI0cjYSCwBSWwBCVHI0cjYbAGJbAFJUmwAiVhuQgACABjYyMgWGIbIVljuAQAYiCwAFBYsEBgWWawAWNgIy4jICA8ijgjIVktsD0ssAAWsBEjQiCwCEMgLkcjRyNhIGCwIGBmsAJiILAAUFiwQGBZZrABYyMgIDyKOC2wPiwjIC5GsAIlRrARQ1hQG1JZWCA8WS6xLgEUKy2wPywjIC5GsAIlRrARQ1hSG1BZWCA8WS6xLgEUKy2wQCwjIC5GsAIlRrARQ1hQG1JZWCA8WSMgLkawAiVGsBFDWFIbUFlYIDxZLrEuARQrLbBBLLA4KyMgLkawAiVGsBFDWFAbUllYIDxZLrEuARQrLbBCLLA5K4ogIDywBCNCijgjIC5GsAIlRrARQ1hQG1JZWCA8WS6xLgEUK7AEQy6wListsEMssAAWsAQlsAQmICAgRiNHYbAKI0IuRyNHI2GwCUMrIyA8IC4jOLEuARQrLbBELLEIBCVCsAAWsAQlsAQlIC5HI0cjYSCwBCNCsQoAQrAJQysgsGBQWCCwQFFYswIgAyAbswImAxpZQkIjIEewBEOwAmIgsABQWLBAYFlmsAFjYCCwASsgiophILACQ2BkI7ADQ2FkUFiwAkNhG7ADQ2BZsAMlsAJiILAAUFiwQGBZZrABY2GwAiVGYTgjIDwjOBshICBGI0ewASsjYTghWbEuARQrLbBFLLEAOCsusS4BFCstsEYssQA5KyEjICA8sAQjQiM4sS4BFCuwBEMusC4rLbBHLLAAFSBHsAAjQrIAAQEVFBMusDQqLbBILLAAFSBHsAAjQrIAAQEVFBMusDQqLbBJLLEAARQTsDUqLbBKLLA3Ki2wSyywABZFIyAuIEaKI2E4sS4BFCstsEwssAgjQrBLKy2wTSyyAABEKy2wTiyyAAFEKy2wTyyyAQBEKy2wUCyyAQFEKy2wUSyyAABFKy2wUiyyAAFFKy2wUyyyAQBFKy2wVCyyAQFFKy2wVSyzAAAAQSstsFYsswABAEErLbBXLLMBAABBKy2wWCyzAQEAQSstsFksswAAAUErLbBaLLMAAQFBKy2wWyyzAQABQSstsFwsswEBAUErLbBdLLIAAEMrLbBeLLIAAUMrLbBfLLIBAEMrLbBgLLIBAUMrLbBhLLIAAEYrLbBiLLIAAUYrLbBjLLIBAEYrLbBkLLIBAUYrLbBlLLMAAABCKy2wZiyzAAEAQistsGcsswEAAEIrLbBoLLMBAQBCKy2waSyzAAABQistsGosswABAUIrLbBrLLMBAAFCKy2wbCyzAQEBQistsG0ssQA6Ky6xLgEUKy2wbiyxADorsD4rLbBvLLEAOiuwPystsHAssAAWsQA6K7BAKy2wcSyxATorsD4rLbByLLEBOiuwPystsHMssAAWsQE6K7BAKy2wdCyxADsrLrEuARQrLbB1LLEAOyuwPistsHYssQA7K7A/Ky2wdyyxADsrsEArLbB4LLEBOyuwPistsHkssQE7K7A/Ky2weiyxATsrsEArLbB7LLEAPCsusS4BFCstsHwssQA8K7A+Ky2wfSyxADwrsD8rLbB+LLEAPCuwQCstsH8ssQE8K7A+Ky2wgCyxATwrsD8rLbCBLLEBPCuwQCstsIIssQA9Ky6xLgEUKy2wgyyxAD0rsD4rLbCELLEAPSuwPystsIUssQA9K7BAKy2whiyxAT0rsD4rLbCHLLEBPSuwPystsIgssQE9K7BAKy2wiSyzCQQCA0VYIRsjIVlCK7AIZbADJFB4sQUBFUVYMFktAAAAAEu4AMhSWLEBAY5ZsAG5CAAIAGNwsQAHQrMAGgIAKrEAB0K1HwIPCAIIKrEAB0K1IQAXBgIIKrEACUK7CAAEAAACAAkqsQALQrsAQABAAAIACSqxAwBEsSQBiFFYsECIWLEDZESxJgGIUVi6CIAAAQRAiGNUWLEDAERZWVlZtSEAEQYCDCq4Af+FsASNsQIARLMFZAYAREQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB5AHkAcgByAxAAAAMvAjMAAP8mAxX/9QMvAjz/9f8bABoAGgAaABoAAAAAAAAAAAAAAAAANABSAKgBEgGyAlYCcgKWAroC/AMoA0gDYgOEA5wD5gQgBHQEyAT8BVQFqAXIBjYGjAbEBwoHIAdUB2oIJAhUCKYI5gkYCUgJcgm+CeoKAApCCmwKigq2CuALJAteC7YL/gxaDHwMsAzQDQINLg1aDYQNpg3GDeQOXg7iDyIPng/sEEAQ3hEWEVwRuhH2EgwSbhK4EvwTYBPQFBoUbhSqFPQVGBVIFXYVshXeFfgWOBasFvYXnBg6GGAYihkOGXgaFho+Gl4a4hsuG5AcMhy0HPIdYh20HgAeLh5cHn4eoB7QHv4fXh+uH/4gdiDAIP4i2gACAEH//QDbAxEAAwAPACxAKQAAAAFdBAEBARFLAAICA18FAQMDEgNMBAQAAAQPBA4KCAADAAMRBgcVKxsBMxMCNjU0JiMiBhUUFjNLDG4MIiwsISEsLCEDEf3iAh787CwgIS0tISAsAAIALAJKAWkDEAADAAcAF0AUAwEBAQBdAgEAABEBTBERERAEBxgrEzMHIzczByNCcjdRynM3UgMQxsbGAAIAIwAAAxoDDQAbAB8AR0BEDAoCCA4QDQMHAAgHZg8GAgAFAwIBAgABZQsBCQkRSwQBAgISAkwAAB8eHRwAGwAbGhkYFxYVFBMRERERERERERERBx0rAQczByMHIzcjByM3IzczNyM3MzczBzM3MwczByEjBzMCWCSuFa4jeSNcInkirhWuJK8VriN5I1wjeSOuFf7aXCRcAea/brm5uLhuv265ubi4br8AAAABADr/uwJWA14ANQA1QDIhHgIDAiUkDQoEAQMGAwIAAQNKAAIAAwECA2cAAQAAAVcAAQEAXQAAAQBNJx4qFAQHGCskDgEHFSM1LgInNj8BHgEzMjY3NC4BJy4CNTQ2NzUzFR4BFwcuASMiDgEVFBceARceAhUCVjhlQlhDYzgHHQRTC0pFOVUDKDw3Sl5DbV9YT3EWcA5ERB86JAUNS0lKW0GjYkEIPT0KSVspBwEUNUw9MyAsGhMZLltJV3sMQkIKXlkdOjkbMiEOEiIqHBwwVEAAAAUAQgAAAx8DDQADABcAJwA8AE0AXUBaAAACAIMAAQgHCAEHfgAECgEDBgQDZwAGDQEJCAYJZwsBBQUCXwACAhFLAAgIB18MAQcHEgdMPT0oKBgYBAQ9TT1MRkQoPCg7MzEYJxgmIB4EFwQWKREQDgcXKwEzASMSNz4BPQE0LgEjIgcOAR0BFB4BMzYWHQEUBwYjIiY9ATQ3NjMANz4BPQE0JicmIyIOAR0BFBYXFjM2FxYdARQHBiMiJyY9ATQ2MwI7c/52c18tFBYnRCg4LxUWJ0QnFR0QChgTHQ4OFAH1KxQXFxQuOihDJxYUKj4WDA8PDBYWDA8dFAMN/PQBtSsUNh0yJ0QnLBM2HTIoQyf0HBQyExANHRMyFA4O/VYrFDccMR02FSsoQygxHTYUK/QODxQxFA8NDQ8UMRQdAAAAAwAs//UCqwMfACIALgA3AJ5LsBhQWEATJxsKAwIEMTAhHAQFAgEBAAUDShtAEycbCgMCBDEwIRwEBQIBAQMFA0pZS7AYUFhAJQcBBAQBXwABARdLAAICAF8GAwIAABhLCAEFBQBfBgMCAAAYAEwbQCIHAQQEAV8AAQEXSwACAgNdBgEDAxJLCAEFBQBfAAAAGABMWUAYLy8jIwAALzcvNiMuIy0AIgAiGy0iCQcXKyEnBiMiLgE1NDY3Jy4BNTQ+ATMyHgEVFAcOAQcXNjUzFAcXAAYVFBc2NzY1NCYjEjcnDgEVHgEzAhYlTHFVdzxRSQEpKDFaPT5bMRQSSTWPGmg3b/5uND1EHhk6JDwxpzQ3A1hGLzo+aEBKWycCLmEuNFQxMlIwKiosQh+rPU2GXoUCsTAoPEclJCMhIyv9sCTTHjknNkMAAAEAZQHtAP4C/wAIAA9ADAgBAEgAAAB0EgEHFSsSBgcjNhI9ATP9RgROAR95Avb/CgQBBQgBAAAAAQBC/8IBCgM5AA0AE0AQAAEBAF0AAAATAUwWFQIHFis2JjU0NjczDgEVFBYXI2ooKCd5LC4tLHgd5np651tZ5nx651sAAAAAAQAs/8IA9QM5AA0AE0AQAAEBAF0AAAATAUwWFQIHFis+ATU0JiczHgEVFAYHI1ktLix5JykpJ3gd53p85llb5nt55lwAAAAAAQAOAPICDwMCABEAQUASERAPDAsKCQgHBgMCAQ0AAQFKS7AoUFhACwAAAAFdAAEBEQBMG0AQAAEAAAFVAAEBAF0AAAEATVm0GBQCBxYrARcHJxUjNQcnNyc3FzUzFTcXAX2SN5JukzeTkzeTbpI3AfpVXlOoqFNeVVVeU6ioU14AAAAAAQAhALEBvwJPAAsALEApAAMCAANVBAECBgUCAQACAWUAAwMAXQAAAwBNAAAACwALEREREREHBxkrARUjNSM1MzUzFTMVASdumJhumAFJmJhumJhuAAAAAAEALP94AMUAigAIABhAFQABAAABVQABAQBdAAABAE0UEgIHFis2BgcjNhI9ATPERgROAR95gf8KBAEECAIAAAABAEIBSQHgAbcAAwAYQBUAAQAAAVUAAQEAXQAAAQBNERACBxYrASE1IQHg/mIBngFJbgAAAQBC//UA3ACPAAsAGUAWAAAAAV8CAQEBGAFMAAAACwAKJAMHFSsWNjU0JiMiBhUUFjOvLS0gIC0uHwstICAtLSAfLgABAEIAAQI/Aw4AAwATQBAAAAARSwABARIBTBEQAgcWKwEzASMBzHP+dXIDDvzzAAACACz/9QIZAxgAEQAhACdAJAACAgFfBAEBARdLAAMDAF8AAAAYAEwAAB4cFRMAEQAQJwUHFSsAHgEVERQOASMiLgE1ETQ+ATMWJiMiDgEVERQeATMyNjURAWVyQkJyQ0NxQkJxQ3xINCE5IiI5ITRIAxhCcUP+yUNxQkJxQwE3Q3FCuEkiOSH+syE5IkkzAU0AAAAAAQBYAAABWwMCAAoASLUIAQIBAUpLsChQWEAUAwECAQABAgB+AAEBEUsAAAASAEwbQBQDAQIBAAECAH4AAQEAXQAAABIATFlACwAAAAoACRETBAcWKxIWFREzESMGBxUz3AZ5WDB7dAI6FRz99wMCahJMAAABACwAAAIOAxgAKAAuQCsCAQAEAUoAAgEEAQIEfgABAQNfAAMDF0sABAQAXQAAABIATB40EysQBQcZKykBNTc+ATc+AjU0JiMiBh0BIzU0PgE7ATIWFxYVFA4BBwYHDgEPASECDv4eBD9zEUI8HjYuNUR6O2pEAV55DgQeMC83IhIuCRcBOWEGUY4VUU07GSQ6RjYVFUJqPVtIExYlSEY7RS8ZOwsdAAABACP/9QIjAw0AIwA7QDgeAQQFHxkCAwQCSgADBAEEAwF+AAECBAECfAAEBAVdAAUFEUsAAgIAXwAAABgATBESGCUTIgYHGiskDgEjIi4BNRcUFhceATMyPgE1NCYnLgEjNTchNSEVBx4CFQIjRXVFRnZFfQMBDEctJD0jHh0aR0il/tYByKo3WzSvdUVGdkQBEREEKjUkPiUiPBYSCW6rb22zC0lqOwABAB8AAAI9Aw0ADgAzQDAHAQAEAUoHBgIEAgEAAQQAZgADAxFLAAUFAV0AAQESAUwAAAAOAA4RERIREREIBxorJRUjFSM1ITUBMwMzNTMVAj1LfP6pAQiH/sZ89W+GhlkCLv3o2NgAAAEAPf/1AjkDDQAhAEZAQx4BAwcBSgAEAwEDBAF+AAECAwECfAgBBwADBAcDZwAGBgVdAAUFEUsAAgIAXwAAABgATAAAACEAIBEREiQiEyYJBxsrAB4BFRQOASMiLgEnMx4BMz4BNTQmIyIGByMTIRUhBz4BMwGNczk9c05OcTwDegRGQUA9QkIpNxV7VwFy/vIjDC0fAgJKdkJGektDdEhAUARbPT5UHRoBsm6yBw4AAgA3//UCMwMNABUAIwA2QDMSAQMCAUoFAQIAAwQCA2gAAQERSwYBBAQAXwAAABgATBYWAAAWIxYiHBoAFQAUGCYHBxYrAB4BFRQOASMiLgE1ND4BPwIDMjYzEjY1NCYjIg4BFRQeATMBjWs7QnNJSXNCJktYM42rAR0WK0Q/Rik7Hh48KgIDRndGU3k/P3lTOW6Ej1IB/vMD/mFcPjpbK0QmJ0csAAAAAQAhAAACAwMNAAYAH0AcBgEAAQFKAAEBAl0AAgIRSwAAABIATBEREAMHFyszIwEhNSEV3YMBJ/6gAeICnm9wAAMAM//1Ai8DGAAZACUANQA9QDoZCwIEAgFKAAIABAUCBGcGAQMDAV8AAQEXSwcBBQUAXwAAABgATCYmGhomNSY0LiwaJRokKyskCAcXKwAVFA4BIyIuATU0Ny4BNTQ+ATMyHgEVFAYHAgYVFBYzMjY1NCYjEj4BNTQuASMiDgEVFB4BMwIvQHRKSnRAYCMkO2lBQWk7JSPOOT4sLD05MCg8ICQ9IyQ9IyA8KAFVc0BtQEBtQHNIHks2PWU6OmU9NUsfAQtDKS0/Py0pQ/29JToeIjkiIjkiHjolAAACACwAAAIoAxgAFgAlADZAMxMBAgMBSgADBQECAQMCZwYBBAQAXwAAABdLAAEBEgFMFxcAABclFyQeHAAWABUZJgcHFisSLgE1ND4BMzIeARUUDgEHBg8BEzAGIwIOARUUFjMyPgE1NC4BI9JrO0JzSUlzQiVJVRYjjq4TIxY8HkBGKTseHjwqAQpGd0ZTeT8/eVM5bIGKIjoBAQ4EAZ8sRyc6WytEJidHLAAAAgBNAI4A5wJyAAsAFwAiQB8AAQAAAwEAZwADAgIDVwADAwJfAAIDAk8kJCQhBAcYKxIWMzI2NTQmIyIGFRAWMzI2NTQmIyIGFU0tICAtLSAgLS0gIC0tICAtAgUtLSAgLS0g/pYtLSAgLS0gAAAAAAIATQAwAOsCcAALAA8AU0uwCVBYQBwAAAEAgwQBAQICAW4AAgMDAlUAAgIDXgADAgNOG0AbAAABAIMEAQECAYMAAgMDAlUAAgIDXgADAgNOWUAOAAAPDg0MAAsACiQFBxUrEjY1NCYjIgYVFBYzBzMHJ7otLSAgLS4fN4hCXAHWLSAgLS0gHy6p/QMAAQBYAGMCXgKaAAYABrMDAAEwKy0BNSUVDQECXv36Agb+hgF6Y99534GamwACAEIA2wHgAiUAAwAHAD5LsChQWEASAAMAAgMCYQAAAAFdAAEBFABMG0AYAAEAAAMBAGUAAwICA1UAAwMCXQACAwJNWbYREREQBAcYKwEhNSERITUhAeD+YgGe/mIBngG3bv62bgAAAAEAQgBjAkgCmgAGAAazBQIBMCsBJTUFFQU1Abz+hgIG/foBf5qB33nfgQAAAgAW/5QDiQMXAEMAVQCFQBNDAQkIMgEFADMBBgUDSggBCQFJS7AgUFhAKwAJAwAJVwADAQEABQMAZwAFAAYFBmMABAQHXwAHBxdLAAgIAl8AAgIaCEwbQCkAAgAICQIIZwAJAwAJVwADAQEABQMAZwAFAAYFBmMABAQHXwAHBxcETFlADlNRKyYkJiYpJyYiCgcdKwAOASMiJjU0Nw4BIyIuATU0Nz4BMzIXFhUUBwYVFBYzMj4BNTQuASMiDgEVFB4BMzI2NxcGIyIuATU0PgEzMh4BFRQHBDY1NCcmIyIGBwYVFBYzMjY3A4RNbTMqNQQdZ0AySSYXJZlQHRl6JAsaFRs4J1mWV2ClYlSRWDhKHiVkZ3O8a37VfHLBcQH+oCUcFhgtXxoZNScbOBkBCnA6KiYQDytEOl41PS9UYAYmez9cGxgZGy1aP1qXWWarYluZWRYPUzJxwnR93INywnISCS5WJCwPCzsqLCgrNR0eAAAAAgAHAAAC0wMOAAcACgArQCgJAQQCAUoFAQQAAAEEAGYAAgIRSwMBAQESAUwICAgKCAoREREQBgcYKyUhByMBMwEjCwICEf62QIABKXkBKoFteXmiogMO/PIBEAEw/tAAAwBCAAACfwMNAA4AGAAiADVAMg4BBAIBSgACAAQFAgRlAAMDAV0AAQERSwYBBQUAXQAAABIATBkZGSIZISYlJiEkBwcZKwAVFA4BIyERITIWFRQGByUzMj4BNTQmKwEANjU0LgErARUzAn83ZEH+nwFJZ3YsMP6vxR4zHj4xxQEPPBoyIt3dAXSYQWQ3Aw1taSRUGikfMRktO/3PNDogPSfyAAABACH/9QKjAxUAGwAnQCQbDw4DAwIBSgACAgFfAAEBF0sAAwMAXwAAABgATCQlJiIEBxgrJQ4BIyIuATU0PgEzMhYXBy4BIyIGFRQWMzI2NwKjHKR0Z5dQUJdndKQcdw5iTWVnZ2VNYg7XZ3tktXd3tWR8ZihHVZiKiphVRwAAAAIASAAAApoDDQAHABAAJ0AkAAICAF0AAAARSwADAwFdBAEBARIBTAAAEA4KCAAHAAYjBQcVKyA2NRAhIxEzAzMyFhUUBisBAfGp/pXn525uimhrh27VsgGG/PMCn5KGgpcAAAABAEgAAAJeAxAACwAvQCwAAAABAgABZQYBBQUEXQAEBBFLAAICA10AAwMSA0wAAAALAAsREREREQcHGSsTFSEVIRUhFSERIRXBAXH+jwGd/eoCDQKi3G7qbgMQbgAAAAABAEgAAAJIAw0ACQApQCYAAAABAgABZQUBBAQDXQADAxFLAAICEgJMAAAACQAJEREREQYHGCsTFSEVIREjESEVwQFm/pp5AgACn+Ru/rMDDW4AAAABADL/9QLAAxUAHwA2QDMREAIFAgFKBgEFAAQDBQRlAAICAV8AAQEXSwADAwBfAAAAGABMAAAAHwAfEyMlJiQHBxkrARUUDgEjIi4BNTQ+ATMyFhcHLgEjIgYVEDMyNj0BIzUCwEaHXXGhUlCXZ3OlHHgOYkxmZ+NRa54BqdI3aUJjtXh3tWR9ZShHVZiK/t5RZiNsAAAAAAEASAAAApoDDQALACdAJAAEAAEABAFlBgUCAwMRSwIBAAASAEwAAAALAAsREREREQcHGSsBESMRIREjETMRIRECmnn+oHl5AWADDfzzAUr+tgMN/qsBVQABAFMAAADMAwsAAwATQBAAAAARSwABARIBTBEQAgcWKxMjETPMeXkDC/z1AAEAC//1AgMDAgARAEO2CgkCAQIBSkuwKFBYQBEDAQICEUsAAQEAXwAAABgATBtAEQMBAgECgwABAQBfAAAAGABMWUALAAAAEQARJiQEBxYrAREUDgEjIi4BJzceATMyNjURAgNCcUY+bUoKdgc6SDlHAwL91klmNC5VNyknTjo7AioAAAEAQgAAAr4DDQALAB9AHAkGAQMAAQFKAgEBARFLAwEAABIATBISERIEBxgrAQcVIxEzEQEzCQEjAQVKeXkBP6H+uwFooQE/VeoDDf6VAWv+jf5mAAEASAAAAlMDDAAFABlAFgABARFLAAAAAl4AAgISAkwRERADBxcrJSERIxEhAlP+bnkCC24Cnvz0AAAAAAEAPQAAAyADDQAMACFAHgoFAgMAAwFKBAEDAxFLAgECAAASAEwSERISEAUHGSshIxEDIwMRIxEzGwEzAyB5unu8eZTe3pMB2P4oAd/+IQMN/bwCRAAAAAABAEgAAAKXAw0ACQAkQCEIAwIAAgFKBAMCAgIRSwEBAAASAEwAAAAJAAkREhEFBxcrAREjAREjETMBEQKXef6jeXkBXQMN/PMCG/3lAw392gImAAACADf/9QLUAxUADwAbACxAKQACAgFfBAEBARdLBQEDAwBfAAAAGABMEBAAABAbEBoWFAAPAA4mBgcVKwAeARUUDgEjIi4BNTQ+ATMSNjU0JiMiBhUUFjMB6JhUVJhjY5dUVJdjYWxsYWFra2EDFWC1e3u1YGC1e3u1YP1OlY2NlZWNjZUAAAAAAgBIAAAChQMNAA0AFwAjQCAABAAAAQQAZQADAwJdAAICEUsAAQESAUwhJSERMgUHGSsADgErAhEjESEyHgEVLgErAREzMj4BNQKFOmA33xR5AWFBZDd5PjDd3SEzGgHfdEL+1wMNPGlCOz7++C1CIAAAAAACAEL/ygL0AxUAFAAlADhANRoZGBYSBQMCAQEAAwJKFAEARwACAgFfAAEBF0sEAQMDAF8AAAAYAEwVFRUlFSQgHiYiBQcWKwUnBiMiLgE1ND4BMzIeARUUBgcWFyQ3Jic3FzY1NCYjIgYVFBYzAo9MTWZjl1RUl2NjmFQrKCo+/tgsQhNpLyJsYWFra2E2XjNgtXt7tWBgtXtXjTQzTXYdTRElNUdwjZWVjY2VAAAAAAIAQgAAAq4DDQAPABkAOEA1DgEABAFKBwEEAAABBABlAAUFAl0AAgIRSwYDAgEBEgFMERAAABgWEBkRGQAPAA8hESEIBxcrIQMrAREjESEyHgEVFAYHEwEyPgE1NCYrARECI6ynFXkBYUFkN0o7tP7qIjIaPTHdASn+1wMNPGlCUn4c/sYBly1CIDw9/vgAAAEADv/1Am4DHwAvAChAJSEgCgcEAQMBSgADAwJfAAICF0sAAQEAXwAAABgATCQtKSIEBxgrJA4BIyIuASc2PwEeAjMyNjc0LgEnLgI1ND4BMzIWFwcmIyIGFRQXHgEXHgIVAmxGglZcjFAIHQRTBzBVOkhcAzNMQVFlR0KCXGadGXAclEZeBAxUTlZsTpxpPkhmLAcBFB87Jzw0KTMdERUrVEZAZjtgZB1zPjMQDSEmFRguXEoAAAABABYAAAKMAxAABwAhQB4CAQAAA10EAQMDEUsAAQESAUwAAAAHAAcREREFBxcrARUjESMRIzUCjP95/gMQbv1eAqJuAAEAN//1AnUDDgAUACFAHgQDAgEBEUsAAgIAXwAAABgATAAAABQAFCQUJAUHFysBERQOASMiLgE1ETMRFB4BMzI2NRECdViFQkKFWHk2TCRIXgMO/fBYeDk5eFgCEP3nMTwaPkkCGQAAAQAGAAAC6AMOAAYAG0AYBAEAAQFKAgEBARFLAAAAEgBMEhEQAwcXKyEzASMLASMBOnkBNYHx8IADDv2kAlwAAAEAEgAAA7sDDQAMACdAJAsIAwMAAgFKBQQDAwICEUsBAQAAEgBMAAAADAAMEhESEQYHGCsBAyMLASMDMxsBMxsBA7u5tWdmtrh5m4R5hZoDDfzzAeH+HwMN/YUCe/2FAnsAAAABAAsAAAKRAw4ACwAfQBwJBgMDAAIBSgMBAgIRSwEBAAASAEwSEhIRBAcYKwETIwsBIxMDMxsBMwGU/Yy3t4z9/Yy3t4wBh/55ARv+5QGHAYf+5QEbAAAAAQAAAAACigMPAAgAI0AgBwQBAwABAUoDAgIBARFLAAAAEgBMAAAACAAIEhIEBxYrCQEDIxMBFxsBAor+9gF5Af75gcLGAw7+HP7WASoB5QH+iQF3AAAAAAEAJwAAAnIDDQAJAClAJgkBAgMEAQEAAkoAAgIDXQADAxFLAAAAAV0AAQESAUwREhEQBAcYKzchFSE1ASE1IRXBAbH9tQGv/lECS25uYwI8bmAAAAEAQv/CATQDOQAHACJAHwQBAwACAwJhAAAAAV0AAQETAEwAAAAHAAcREREFBxcrNxEzNSMRMzW8ePLyMgKYb/yJcAAAAQAs/8IBHgM5AAcAHEAZAAIAAwIDYQABAQBdAAAAEwFMEREREAQHGCsBIxUzESMVMwEe8nh48gM5b/1ocAAAAAEAQv+SAeAAAAADACCxBmREQBUAAQAAAVUAAQEAXQAAAQBNERACBxYrsQYARAUhNSEB4P5iAZ5ubgAAAAIALP/2AhcCQQAhAC4Aa0ARGRgSAwIDLgEGBQMAAgAGA0pLsBpQWEAeAAIABQYCBWcAAwMEXwAEBBpLAAYGAF8BAQAAEgBMG0AiAAIABQYCBWcAAwMEXwAEBBpLAAAAEksABgYBXwABARgBTFlACiQmJiUmIxEHBxsrJRcjJw4BIyIuATU0PgEzMhYXNTQmIyIGByc+AjMyHgEVBy4BIyIGFRQWMzI2NQIQB3cKFE44PF81RWQwTz8DPzgyMRFzESphS09sNXkWRB41RD8kNFpJSTkaKS1RM0BTJh0BKS88JxwnITUxNls5nQ8TLSgoKTlHAAACAEL/9QIzAzsAEAAdAKlLsBZQWEAKDQEEAwgBAAUCShtACg0BBAMIAQEFAkpZS7AWUFhAHQACAhNLAAQEA18GAQMDGksHAQUFAF8BAQAAGABMG0uwLVBYQCEAAgITSwAEBANfBgEDAxpLAAEBEksHAQUFAF8AAAAYAEwbQCEABAQDXwYBAwMaSwACAgFdAAEBEksHAQUFAF8AAAAYAExZWUAUEREAABEdERwVEwAQAA8REyQIBxcrABYVFAYjIiYnByMRMxE+ATMSNTQjIgcGHQEUFxYzAa+EhHQhRhkEdXkaRiB/ijYmGRwjNgI8m4iJmxcVIAM6/tcTF/4yq6okGySOJxojAAABACz/9QIdAjwAGwAnQCQbDw4DAwIBSgACAgFfAAEBGksAAwMAXwAAABgATCQlJiIEBxgrJQ4BIyIuATU0PgEzMhYXBy4BIyIGFRQWMzI2NwIdHn5RSXZFRXZJUX4echBBKj1OTj0qQRCZTlZHhFlZhEZWTiYrLV1UVV0tKwAAAAIALP/1Ah0DOwAQAB4AlkAKAgEEAwcBAQUCSkuwFlBYQB0AAAATSwAEBANfBgEDAxpLBwEFBQFfAgEBARIBTBtLsC1QWEAhAAAAE0sABAQDXwYBAwMaSwABARJLBwEFBQJfAAICGAJMG0AhAAQEA18GAQMDGksAAAABXQABARJLBwEFBQJfAAICGAJMWVlAFBERAAARHhEdGhgAEAAPIxETCAcXKwAWFxEzESMnDgEjIiY1NDYzEjc2PQE0JyYjIgYVFDMBREYaeXQFGUYgdIWFdEEjGxkkN0RHiwI8FxMBKfzGIBUXm4mIm/4yIxsmjiQbJFRWqwAAAgAh//UCMAI8ABcAHgA1QDIXAQMCAUoABAACAwQCZQYBBQUBXwABARpLAAMDAF8AAAAYAEwYGBgeGB0VIhQmIgcHGSslDgEjIi4BNTQ+ATMyFhcWFSEeATMyNjcCBgchLgEjAjAfi1BJf01FdklLfCEb/nQHWjkpUBPPSAsBCgxHMpFJU0eFWFmERkxEN4hDSS8mARQ/Ozs/AAAAAQAGAAABRwNGABYAYUAKDwEFBBABAwUCSkuwGFBYQB0ABQUEXwAEBBNLAgEAAANdBwYCAwMUSwABARIBTBtAGwAEAAUDBAVnAgEAAANdBwYCAwMUSwABARIBTFlADwAAABYAFiMkEREREQgHGisBFSMRIxEjNTM1ND4BMzIXByYjIgYdAQEkeXksLDJWMzAqIxodISECMm7+PAHEblozVTIWXgYtH1oAAgAs/xsCMwI+AB0AKwC6S7AWUFhADxwBBQMQAQIGCQgCAQIDShtADxwBBQQQAQIGCQgCAQIDSllLsBZQWEAhAAUFA18HBAIDAxpLAAYGAl8AAgISSwABAQBfAAAAHABMG0uwMVBYQCUHAQQEFEsABQUDXwADAxpLAAYGAl8AAgISSwABAQBfAAAAHABMG0AjAAYAAgEGAmcHAQQEFEsABQUDXwADAxpLAAEBAF8AAAAcAExZWUARAAApJyMhAB0AHSUlJiMIBxgrAREUBiMiLgEnNx4BMzI2PQEOASMiJjU0PgEzMhc3BzQuASMiBhUUFjMyNjUCM490RWxBC14STj8+TAxSLHqKPnNNXjICAiQ+I0ZKSkY6SwIy/dl8dDFCGz8ePD8/NxQkl4NVf0U9MfomQSZXSUpXQTYAAAEAQgAAAhoDOQATAC1AKhABAQQBSgADAxNLAAEBBF8FAQQEGksCAQAAEgBMAAAAEwASERMjEwYHGCsAFhURIxE0JiMiBhURIxEzET4BMwG6YHk+NDY+eXkYTDECPXly/rABUDtCQjv+rgM5/rkjKAACAEQAAADTAyMACwAPAE9LsA5QWEAYAAABAIMEAQECAgFuAAICFEsFAQMDEgNMG0AXAAABAIMEAQECAYMAAgIUSwUBAwMSA0xZQBIMDAAADA8MDw4NAAsACiQGBxUrEiY1NDYzMhYVFAYjExEjEW4qKh4dKiodQnkClCoeHSoqHR4q/WwCMf3PAAAAAAL/7/8bARADJAALABoAZEAKFAEDBBMBAgMCSkuwMVBYQBwFAQEBAF8AAAATSwYBBAQUSwADAwJfAAICHAJMG0AaAAAFAQEEAAFnBgEEBBRLAAMDAl8AAgIcAkxZQBQMDAAADBoMGhcVEhAACwAKJAcHFSsSJjU0NjMyFhUUBiMXERQOASMiJzcWMzI2NRGrKiodHioqHj0yVjMxKiQaHSEhApUqHh0qKh0eKmP9ozJWMhZfBy4eAl0AAAAAAQBCAAACUgM6AAsARbcJBgEDAAIBSkuwMVBYQBEAAQETSwACAhRLAwEAABIATBtAFwABAQBdAwEAABJLAAICFEsDAQAAEgBMWbYSEhESBAcYKzcHFSMRMxE3MwMBI+4zeXnSovABE6PQOJgDOv4S5/73/tYAAAAAAQBPAAAAyAM3AAMAE0AQAAAAE0sAAQESAUwREAIHFisTIxEzyHl5Azf8yQABAEIAAANNAj0AIwBWtiAZAgEFAUpLsBZQWEAWAwEBAQVfCAcGAwUFFEsEAgIAABIATBtAGgAFBRRLAwEBAQZfCAcCBgYaSwQCAgAAEgBMWUAQAAAAIwAiJBETIxMjEwkHGysAFhURIxE0JiMiBhURIxE0JiMiBhURIxEzFxU+ATMyFhc+ATMC7WB5KTQ1PnkqMjY+eWwNGEwxPFAUFlY8Aj14c/6wAVBFOEI7/rABUD8+Qjv+rgIxPgEjKDg1MTwAAAAAAQBCAAACGgI9ABUATLURAQEDAUpLsBZQWEATAAEBA18FBAIDAxRLAgEAABIATBtAFwADAxRLAAEBBF8FAQQEGksCAQAAEgBMWUANAAAAFQAUERMjFAYHGCsAHgEVESMRNCYjIgYVESMRMxcVPgEzAYxXN3k4LzdIeWwNG1IzAj0walH+rgFSPEFDOv6uAjE+ByUsAAIALP/1AjMCPAAPABsALEApAAICAV8EAQEBGksFAQMDAF8AAAAYAEwQEAAAEBsQGhYUAA8ADiYGBxUrAB4BFRQOASMiLgE1ND4BMxI2NTQmIyIGFRQWMwF4d0REdklJdkVFdkk9TU09PU5OPQI8RoRZWYRHR4RZWYRG/itdVVRdXVRVXQAAAAACAEL/JgIzAjwAEAAdAGxACgcBBQECAQMEAkpLsBZQWEAdBwEFBQFfAgEBARRLAAQEA18GAQMDGEsAAAAWAEwbQCEAAQEUSwcBBQUCXwACAhpLAAQEA18GAQMDGEsAAAAWAExZQBQREQAAER0RHBoYABAADyMREwgHFysEJicVIxEzFz4BMzIWFRQGIwIHBh0BFBcWMzI1NCMBHEcaeXUEGUYhdISEdEEjHBkmNoqKCxcT+QMKIBUXm4iJmwHOIxonjiQbJKuqAAIALP8mAh0CPAAQAB4Af0uwFlBYQAoIAQUADQEDBAJKG0AKCAEFAQ0BAwQCSllLsBZQWEAdBwEFBQBfAQEAABpLAAQEA18GAQMDGEsAAgIWAkwbQCEAAQEUSwcBBQUAXwAAABpLAAQEA18GAQMDGEsAAgIWAkxZQBQREQAAER4RHRYUABAADxETJAgHFysWJjU0NjMyFhc3MxEjNQ4BIwIGFRQzMjc2PQE0JyYjsYWFdCBGGQV0eRpGHzlHizckGRsjNgubiYibFxUg/Pb5ExcBzlRWqyQbJI4mGyMAAAAAAQBCAAABkgI9AA8AWUuwFlBYQAoKAQACAUoPAQJIG0AKDwECAwoBAAICSllLsBZQWEARAAAAAl8DAQICFEsAAQESAUwbQBUAAgIUSwAAAANfAAMDGksAAQESAUxZtiMREyEEBxgrASYjIgYVESMRMxc+ATMyFwFqGBU9RXluCxZWMxoeAcQGU0H+ygIxNCAgBQAAAAEAIf/1Af4CPAAqAChAJR0cBwYEAQMBSgADAwJfAAICGksAAQEAXwAAABgATCYrJiIEBxgrJA4BIyImJzceAjMyNjU0JicuAjU0NjMyHgEXBy4BIyIGFRQWFx4CFQH+O2M7YpASbQkVOTUrQDg/QlY+f2cwX0YLagk0OzI5Oz9CVD1wUSpbTiYdJR8oHRkXDg4eQTdUXiJGNCQbNykbGBsQESE9MAAAAAEAEf/1AV0C1wAWADNAMAQBAAIFAQEAAkoABAMEgwYBAgIDXQUBAwMUSwAAAAFfAAEBGAFMERERERQjIQcHGys2FjMyNxcGIyIuATURIzUzNTMVMxUjEcEhIR0aIyowM1YyNzd5bm6RLgdfFjJWMgEWbqSkbv7qAAEAQv/1AiUCMgAUAEy1AwEAAwFKS7AWUFhAEwUEAgICFEsAAwMAYAEBAAASAEwbQBcFBAICAhRLAAAAEksAAwMBYAABARgBTFlADQAAABQAFCMTJBEGBxgrAREjJzUOASMiJjURMxEUFjMyNjURAiV3AhpPMWRseUM1NkMCMv3PPgQkKnxvAVD+sDtCQjsBUgAAAAABAAcAAAI9AjIABgAhQB4FAQABAUoDAgIBARRLAAAAEgBMAAAABgAGEREEBxYrAQMjAzMbAQI933negJqbAjL9zgIy/mUBmwABAAcAAAMEAjIADAAnQCQLBgMDAwABSgIBAgAAFEsFBAIDAxIDTAAAAAwADBESEhEGBxgrIRMjCwEjCwEjEzMbAQJbqYRiX3NfYoSpeVxdAjL+iQF3/okBd/3OAUn+twABAAcAAAIpAi4ACwAmQCMKBwQBBAABAUoCAQEBFEsEAwIAABIATAAAAAsACxISEgUHFyshJwcjEwMzFzczAxMBnoaGi8vIjIKCjMjLubkBGQEVtLT+6/7nAAAAAAEAB/8bAicCMgAWACdAJBMQCQMBAggBAAECSgMBAgIUSwABAQBgAAAAHABMExUjJQQHGCshDwEOAiMiJzcWMzI+AT8BAzMTNxMzAVMQBxckQjgwKiMaHRIYDAwR04CPC4WBKxM8QSoWXwcVGB8sAjH+cR4BcQAAAAEAHAAAAfoCMwAJAClAJgIBAgEHAQMAAkoAAgIBXQABARRLAAAAA10AAwMSA0wSERIQBAcYKyUhATUhFSEBFSEB+v7QAS/+JAEr/tQB3m4Bc1Ju/o5TAAABAG7/wgDcAzkAAwAZQBYAAAABXQIBAQETAEwAAAADAAMRAwcVKxMRMxFubgM5/IkDdwAAAQBCAS4CEAHQABUANrEGZERAKxULAgMCCgACAAECSgADAQADVwACAAEAAgFnAAMDAF8AAAMATyQjJCEEBxgrsQYARAEGIyImJy4BIyIHNTYzMhYXHgEzMjcCEDU7ID4oLzMcLysxNx47Jiw2HTcxAUkbDQwMCxVuGQ0MDQwZAAABAEIAAAKQAyAAKQBstAYBAAFJS7AxUFhAJwAFBgMGBQN+BwEDCAECAAMCZQAGBgRfAAQEF0sAAAABXQABARIBTBtAJQAFBgMGBQN+AAQABgUEBmcHAQMIAQIAAwJlAAAAAV0AAQESAUxZQAwRFyITKREUERIJBx0rAAYHIRUhNT4BJyM1MyYnJicmNTQ+ATMyHgEVIzQmIyIGFRQfARYXMxUjAUYrOAGm/c5HNwSPegMICw4IRnVDTXVAfEBGOEkFChQExrcBF3I3bm5GbjNYChQcLBgeOWM7QHZQTUpBLxQPIEEQWAAAAQA9AAACrAMNABkARUBCDgMCAQABSgYBAAEHAFYFAQEEAQIDAQJlCgEICBFLDAsJAwcHA14AAwMSA0wAAAAZABkYFxYVERESERERERIRDQcdKwEVIwcVMxUjFSM1IzUzNScjNTMDMxMzEzMDApTZCL+/fMDACtiZsYWpE6mFsQH8Ww5YXN/fXFgOWwER/u8BEf7vAAMAQv/1A2IDFQAPAC8AUQBYsQZkREBNTUs7OQQEBwFKCAEBAAIGAQJnAAYJAQcEBgdnAAQABQMEBWcAAwAAA1cAAwMAXwAAAwBPMDAAADBRMFBIRkA+NzUsKhwaAA8ADiYKBxUrsQYARAAeARUUDgEjIi4BNTQ+ATMANzY1NCcmJyYnJiMiBwYHBgcGFRQXFhcWFxYzMjc2NwAHBhUUFjMyNj8BFwcOASMiJyY1NDc2MzIXFh8BBycuASMCP7hra7htbbdsbLdtAQgYGBgYLCg7OUBAOTspKhgZGRgqKjo5QEA5Oin++xsYOSojMQcBSAEQWDtTLy8vLlQ9LSkQAUgBBzEjAxVsuGxtt2xst21suGz9vzc7P0A5OCsqGhgYGykqOTs+PT03LCgbGBgaKQFrJSRFUD8oIwcYBjdAOzhfYDc6IR82BhgHIycABABC//UDYgMVAA8ALwBAAEsAXbEGZERAUjEBBQgBSgYBBAUDBQQDfgoBAQACBwECZwAHAAkIBwllAAgABQQIBWUAAwAAA1cAAwMAXwAAAwBPAABLSUNBOjg3NjU0MzIsKhwaAA8ADiYLBxUrsQYARAAeARUUDgEjIi4BNTQ+ATMANzY1NCcmJyYnJiMiBwYHBgcGFRQXFhcWFxYzMjc2NyYHFyMnIxUjETMyFx4BFRQHJzMyNjc2NTQmKwECPrhsbLhtbbdra7dtAQkWGhoWLCg8N0I/OjkqLBcYGBcsKzg6P0I3PChhHWBVWVlKvDQjEBEV1W0MEQkNGhltAxVsuGxtt2xst21suGz9vzc8Pj86OSopGxgYGiosNzlAPzs2LSkaGBgbKMsPopaWAZgjES0aLCEJDAoXFxoeAAEAQgEzANwBzQALAB5AGwAAAQEAVwAAAAFfAgEBAAFPAAAACwAKJAMHFSsSNjU0JiMiBhUUFjOvLS0gIC0uHwEzLSAgLS0gHy4AAAABAFgAAAG4AwsACwAgQB0LCgcGBQQBAAgAAQFKAAEBEUsAAAASAEwVEgIHFisBBxEjEQc1NxEzETcBuHN5dHR5cwGbK/6QAUMsWCwBcP69KwAAAAABAIQAAAMIA0YAIgCbQBIBAQAHAgEBABQBBAITAQMEBEpLsBhQWEAiAAAAB18IAQcHE0sFAQICAV0GAQEBFEsABAQDXwADAxIDTBtLsC1QWEAgCAEHAAABBwBnBQECAgFdBgEBARRLAAQEA18AAwMSA0wbQB4IAQcAAAEHAGcGAQEFAQIEAQJlAAQEA18AAwMSA0xZWUAQAAAAIgAhERQjJBEUIwkHGysAFwcmIyIGDwIzFSMPAQ4BIyInNxYzMjY/ARMjNTM3PgEzAuUjPRkdIS4IGANvhTIVGG9mMCU+Fh4hLQkGQnGHGhhwZwNGFl4GLR9ZDFjHTlZkFl8HLh4VAQBYZVZkAAACAIT/9QKAAw4AHwAtAEhARRMBAgEbAQQDAkoSAQFIAAEAAgMBAmcGAQMABAUDBGcHAQUAAAVXBwEFBQBfAAAFAE8gIAAAIC0gLCYkAB8AHjUmJggIFysAHgEVFA4BIyIuATU0PgEzPgE3FQ4BIyciDgEHMD4BMxI2NTQmIyIOARUUHgEzAdprO0JzSUlzQlh7ZERPHRxFLTwsPCkHDkk2K0Q/Rik7Hh48KgIDRndGU3k/P3lT3tEwAQ8fbBwTARVEQxUW/mFcPjpbK0QmJ0csAAAAAAMAhP+7AsEDXgAWACAAKgC9tRYBCAYBSkuwEVBYQDAABAMDBG4AAQAAAW8FAQMABwYDB2YABgAICQYIZQoBCQAACVUKAQkJAF8CAQAJAE8bS7AUUFhALwAEAwSDAAEAAAFvBQEDAAcGAwdmAAYACAkGCGUKAQkAAAlVCgEJCQBfAgEACQBPG0AuAAQDBIMAAQABhAUBAwAHBgMHZgAGAAgJBghlCgEJAAAJVQoBCQkAXwIBAAkAT1lZQBIhISEqISkmJSYhERERESQLCB0rABUUDgErARUjNSMRMzUzFTMyFhUUBgclMzI+ATU0JisBADY1NC4BKwEVMwLBN2RBLFjd3VgUZ3YsMP6vxR4zHj4xxQEPPBoyIt3dAXSYQWQ3RUUDDVFRbWkkVBopHzEZLTv9zzQ6ID0n8gAAAAACANwB/QJbAxAAAwAHACRAIQUDBAMBAQBdAgEAABEBTAQEAAAEBwQHBgUAAwADEQYHFSsBAzMTMwMzEwFVeXJYY3lzWAH9ARP+7QET/u0AAAIAQgH9AcEDEAADAAcAF0AUAwEBAQBdAgEAABEBTBERERAEBxgrEzMDIwEzAyOacnlRAQxzeVIDEP7tARP+7QABAIQAAALSAyAALQCItAUBAAFJS7AxUFhAMQAHCAUIBwV+CQEFCgEEAwUEZQsBAwwBAgADAmUACAgGXwAGBhdLAAAAAV0AAQESAUwbQC8ABwgFCAcFfgAGAAgHBghnCQEFCgEEAwUEZQsBAwwBAgADAmUAAAABXQABARIBTFlAFC0sKyooJyYlIhMmERIRExERDQcdKyQHIRUhNTY3IzUzJicjNTMnJjU0PgEzMh4BFSM0JiMiBhUUFxYXMxUjFhczFSMBd1IBpv3OYxOLigQIfV0ICEZ1Q011QHxARjhJBQgD3sQGA7q5vlBubmFPWBQYWBkYHjljO0B2UE1KQS8UDxgMWBcVWAADAEIAAAMhAw0AEwAWABkAP0A8FQEFBhkBAQACSgwKCQcEBQsEAgMAAQUAZQgBBgYRSwMBAQESAUwUFBgXFBYUFhMSEREREREREREQDQcdKwEjESMDIxEjESM1MxEzEzMRMxEzIScVBSMXAyFIeeF8eUhIedyBeUj+JUMBXUpKAVv+pQFb/qUBW1gBWv6mAVr+pmhoWHQAAAQAQgAABA4DDQAXABoAHQAgAElARhkBBQYgHQIBAAJKDwwLCQcFBQ4NBAIEAAEFAGYKCAIGBhFLAwEBARIBTBgYHx4cGxgaGBoXFhUUExIRERERERERERAQBx0rASMDIwMjAyMDIzUzAzMTNxMzEzcTMwMzBScHFyMXJSMXBA54UrVKOkm2UXlkUnlVgkh5SYJUeVJj/iQKCv1bKv6oWzEBW/6lAVr+pgFZWAFc/qQBAVv+pQEBWv6mAS8vWMjIyAAAAAADAG4AAAKgAzsAGAAmACoAxUAKEAEIAwQBAQkCSkuwFlBYQDAAAwAICQMIZwAJAQEJVwIBAQEGXQAGBhNLBAEAAAVdBwEFBRNLAAoKC10ACwsSC0wbS7AtUFhAMQADAAgJAwhnAAkAAgoJAmcEAQAABV0HAQUFE0sAAQEGXQAGBhNLAAoKC10ACwsSC0wbQC8AAwAICQMIZwAGAAECBgFlAAkAAgoJAmcEAQAABV0HAQUFE0sACgoLXQALCxILTFlZQBIqKSgnIyEkEREREyQjERAMBx0rASMRIycOASMiJjU0NjMyFhc1IzUzNTMVMwM0JyYjIgYVFDMyNzY1BSEVIQKgQXQFGUYgdIWFdB9GGqameUG6GSQ3REeLNiMb/qoBzv4yAuP9lyAVF5uJiJsXE1hCFhb+tCQbJFRWqyMbJvNYAAABAIQAAAKCAyAAKQCKQBIWAQYFFwEEBgEBCwECAQALBEpLsDFQWEAqBwEECAEDAgQDZQkBAgoBAQsCAWUABgYFXwAFBRdLDAELCwBfAAAAEgBMG0AoAAUABgQFBmcHAQQIAQMCBANlCQECCgEBCwIBZQwBCwsAXwAAABIATFlAFgAAACkAKCYlJCMREiMiERQREiMNBx0rJDcXBiMiJicjNTMmNTQ3IzUzPgEzMhcHJiMiBgchFSEGFRQXIRUhHgEzAi4tJz5KfKocNCkBASk0HKt7Sj4mLDZJYxMBAf7zAgIBDf7/E2NJbhhqHJODWAsXFgtYhJMcbBpWU1gLFhcLWFNVAAEAQgAAAwsDDQATAC5AKwUEAgEAAUoIBgIEAwEAAQQAZgcBBQURSwIBAQESAUwRERERERETERAJBx0rASEBIwEHFSMRIzUzETMRMwEzASEDC/7PATGh/uhKeU1NeQ8BMKH+0QFSAVv+pQE/VeoBW1gBWv6mAVr+pgAAAAAEAIQAAAMaAw0AHAAiACgALQBZQFYLCgIIEQ0HAwABCABlDgYCAQ8FAgIQAQJlEgEQAAMEEANlAAwMCV0ACQkRSwAEBBIETCkpJCMpLSksKyomJSMoJCgiIB4dHBsZFxERERERMhETEBMHHSsBIxUUBzMVIw4BKwIRIxEjNTM1IzUzNSEyFhczKQEuASsBBSEVITY1BjchFTMDGi0CLj0ZaT7eFXksLCsrAWFObxU3/g8BOA8vHd0BS/61AUcEPx7+1t0CLwkNFkJFU/7XAcFCLEKcVUcXF3AsEBOPKioAAAIASAAAAsEDDQAaACQAPUA6CQEGCwgCBQAGBWUEAQADAQECAAFlAAoKB10ABwcRSwACAhICTAAAJCIdGwAaABchEREREREREQwHHCsTFSEVIRUjNSM1MzUjNTMRITIeARUUDgErAiczMj4BNTQmKwH9AQP+/Xk8PDw8AWFBZDc6YDfKFRTdITMaPjDdASlRWICAWFFuAXY8aUJHdEJuLUIgOz4AAgAsAUsDZQMDAAcAFwBGQEMTDwkDAQABSgcGBQMBAAGECggECQQDAAADVQoIBAkEAwMAXQIBAAMATQgIAAAIFwgXFhUSEQ4NDAsABwAHERERCwgXKwEVIxEjESM1IRMzEzMRIxEjAyMDIxEjEQF+el17AeJ0BXNrWgNhR18EWwMDUv6aAWZS/sIBPv5IARX+6wEV/usBuAACANz/kgL3A3MABgANABxAGQoDAgEAAUoCAQABAIMDAQEBdBITEhEECBgrGwEzAxMjAyUTMwMTIwPcmn2bm3ybAQSafZubfJsBgwHw/hD+DwHwAQHw/hD+DwHwAAIAQv+SAl0DcwAGAA0AHkAbDAkFAgQAAQFKAwEBAAGDAgEAAHQSExIQBAgYKxcjEwMzExUTIxMDMxMVvnybm32aaXybm32abgHxAfD+EAH+EAHxAfD+EAEAAAAAAQDcAP0CEAM5AAUAJEAhAAECAYQAAAICAFUAAAACXQMBAgACTQAAAAUABRERBAgWKwE1IREzEQIQ/sx6Aspv/cQBzQABAEL/wgF2Af4ABQAlQCIAAQIBgwMBAgAAAlUDAQICAF0AAAIATQAAAAUABRERBAgWKzcVIREjEUIBNHoycAI8/jQAAAIA3ADRAjwDOQAFAAsALEApAAEAAwQBA2UABAAABQQAZQAFAgIFVQAFBQJdAAIFAk0RERERERAGCBorATM1IREzAyEVIxEjAYK6/qCmegEIuk4Cnpv9mAI8Q/4zAAAAAAIAQv/CAaICKgAFAAsALEApAAIABQACBWUAAAAEAwAEZQADAQEDVQADAwFdAAEDAU0RERERERAGCBorNyMVIREjEyE1MxEz/LoBYKZ6/vi6Tl6cAmj9xEQBzAAAAgAa/+8CEwMfACAALAA4QDUJCAICAAFKAAIAAwACA34AAQAAAgEAZwADBAQDVwADAwRfBQEEAwRPISEhLCErLBslJAYIGCsANTQuASMiBgcnPgEzMh4BFRQOAQcOAhUnND4BNz4BNwImNTQ2MzIWFRQGIwGcJTkfPUoOcBmHYkxwOxwoIiEoHH4kMygkIweoLS0gIC0tIAI1DiEyGzs4HWZeO2c/KD0rHR0qPScBOlM1Hx0lGf3MLiAgLS0gIC4AAQDc/5ICSQNwACYAMkAvBAECAwFKAAQABQMEBWUAAwACAAMCZwAAAQEAVQAAAAFdAAEAAU0hJhEWISsGCBorARQOAQceAhUHFBY7ARUjIi4BPQE0JiM1MjY9ATQ+ATsBFSMiBhUBwAYSExMSBgEdFFlZLk4uMTk7Ly5OLllZFB0CMDg6JxYVKTs4nRYdbi5PL9QjG2MaI9QvTy5uHhUAAAEAQv+SAa8DcAAmADJALyEBAwIBSgABAAACAQBlAAIAAwUCA2cABQQEBVUABQUEXQAEBQRNISYRFiEhBggaKxImKwE1MzIeAR0BFBYzFSIGHQEUDgErATUzMjY1JzQ+ATcuAjU3zR0VWVkuTy4uOzgxLk8uWVkVHQEGERMTEQYBAuQebi5PL9QjGmMbI9QvTy5uHRafNzopFRYnOTehAAABAEIAAAKQAyAALQBstAgBAAFJS7AxUFhAJwAFBgMGBQN+BwEDCAECAAMCZQAGBgRfAAQEF0sAAAABXQABARIBTBtAJQAFBgMGBQN+AAQABgUEBmcHAQMIAQIAAwJlAAAAAV0AAQESAUxZQAwRFyITKRElERQJBx0rABUUBgchFSE1PgE1NCcjNTMmJyYnJjU0PgEzMh4BFSM0JiMiBhUUHwEWFzMVIwFDLDQBpv3OQzcBjnoDCAsOCEZ1Q011QHxARjhJBQoUBMa4AVYUOWkybm5CaDAQCE0KFBwsGB45YztAdlBNSkEvFA8gQRBNAAABAD0AAAKsAw0AGQBFQEIOAwIBAAFKBgEAAQcAVgUBAQQBAgMBAmUKAQgIEUsMCwkDBwcDXgADAxIDTAAAABkAGRgXFhURERIREREREhENBx0rARUjBxUzFSMVIzUjNTM1JyM1MwMzEzMTMwMClNkIv798wMAK2JmxhakTqYWxAfxbDlhc399cWA5bARH+7wER/u8AAQA3AAACDwI9ABQANkAzEAEBAwFKAAMEAQQDAX4CAQABAIQFAQQDAQRXBQEEBAFfAAEEAU8AAAAUABMREyMTBggYKwAWFREjETQmIyIGFREjETMXFT4BMwGpZnk+NDY+eXcCGEwxAj17cP6wAVA7QkI7/q4CMT4BIygAAAgAQgAADskDDgAPADEARABRAF0AbQB6AIYCKUuwCVBYQBchAQQNXFdVIhAFFAQRARMIA0pWARMBSRtLsApQWEAXIQEEDVxXVSIQBRQEEQETBQNKVgETAUkbQBchAQQNXFdVIhAFFAQRARMIA0pWARMBSVlZS7AJUFhATBYOAg0GBAYNBH4MAQsTABMLAH4DFQIBBgQBVwoBBhEPAgQUBgRnFxACBQgABVcSAQgTAAhXGAEUABMLFBNnEgEICABfCQcCAwAIAE8bS7AKUFhARRYOAg0BBAENBH4MAQsTABMLAH4KBgMVBAERDwIEFAEEZxIXEAgEBRMABVcYARQAEwsUE2cSFxAIBAUFAF8JBwIDAAUATxtLsAxQWEBHFg4CDQEEAQ0EfgwBCxMAEwsAfgoGAxUEAREPAgQUAQRnFxACBQgABVcSAQgTAAhXGAEUABMLFBNnEgEICABfCQcCAwAIAE8bS7ANUFhATBYOAg0GBAYNBH4MAQsTABMLAH4DFQIBBgQBVwoBBhEPAgQUBgRnFxACBQgABVcSAQgTAAhXGAEUABMLFBNnEgEICABfCQcCAwAIAE8bQEcWDgINAQQBDQR+DAELEwATCwB+CgYDFQQBEQ8CBBQBBGcXEAIFCAAFVxIBCBMACFcYARQAEwsUE2cSAQgIAF8JBwIDAAgAT1lZWVlAPHt7Xl5SUgAAe4Z7hYF/eXd2dF5tXmxmZFJdUl1bWllYVFNQTk1LPTs6NzMyLy0nJR4cFhQADwAOJhkIFSsAHgEVFA4BIyIuATU0PgEzARcHDgEjIi4BNTQ+ATMyFh8BBycuASMiDgEVFB4BMzI2NwEzERQHBisCNTM2NzY3Njc2NQAWFRQGBwYrAREzMhclESMRCQERIxEzCQEAPgE1NC4BIyIOARUUHgEzJDY1NCYnJisBETMyNwQWFRQGIyImNTQ2Mwo9s2lps2pqtGlptGr+J1IKNYhJabNpabNpSYg1ClIJJl0ySn1JSX1KMl0m+St+UU+lBwwNNygoGxcJCwMBOTk3cNOlpdNwCuN2/vH+73V6AQwBCvvPfUlJfUpKfklJfkr54iYmJEuUOTmWSQGWKywfHywsHwMOabNqarRqarRqarNp/bVTCjE0abNqarNpNDEKUwgiI0p9Skp9SiMiAk/+CotERHABCgsUEhwdTwFDlF9elDBiAwliUP0VAfn+FAHs/gcC6/4NAfP9fkp+Skp+Skp+Skp+SmFqREVqIUP92UUGKyAeLS0eHywAAAAAABgBJgABAAAAAAAAADIAZgABAAAAAAABAAkArQABAAAAAAACAAcAxwABAAAAAAADABwBCQABAAAAAAAEABEBSgABAAAAAAAFAA0BeAABAAAAAAAGABEBqgABAAAAAAAIABAB3gABAAAAAAAJAAwCCQABAAAAAAALAAoCLAABAAAAAAAMAA4CVQADAAEECQAAAGQAAAADAAEECQABABIAmQADAAEECQACAA4AtwADAAEECQADADgAzwADAAEECQAEACIBJgADAAEECQAFABoBXAADAAEECQAGACIBhgADAAEECQAIACABvAADAAEECQAJABgB7wADAAEECQALABQCFgADAAEECQAMABwCNwADAAEIBAABAAoCZAADAAEIBAACAA4CcABDAG8AcAB5AHIAaQBnAGgAdAAoAGMAKQAgACAAQgBFAEkASgBJAE4ARwAgAEoASQBOAEcARABPAE4ARwAgAFQARQBDAEgATgBPAEwATwBHAFkAIABDAE8ALgAsACAATABUAEQAAENvcHlyaWdodChjKSAgQkVJSklORyBKSU5HRE9ORyBURUNITk9MT0dZIENPLiwgTFREAABKAEQAWgBoAGUAbgBnAEgAVAAASkRaaGVuZ0hUAABSAGUAZwB1AGwAYQByAABSZWd1bGFyAAAxAC4AMAAwADAAOwBCAEoASgBEADsASgBEAFoAaABlAG4AZwBIAFQALQBSAGUAZwB1AGwAYQByAAAxLjAwMDtCSkpEO0pEWmhlbmdIVC1SZWd1bGFyAABKAEQAWgBoAGUAbgBnAEgAVAAgAFIAZQBnAHUAbABhAHIAAEpEWmhlbmdIVCBSZWd1bGFyAABWAGUAcgBzAGkAbwBuACAAMQAuADAAMAAwAABWZXJzaW9uIDEuMDAwAABKAEQAWgBoAGUAbgBnAEgAVAAtAFIAZQBnAHUAbABhAHIAAEpEWmhlbmdIVC1SZWd1bGFyAABKAEQAIABDAGUAbgB0AGUAcgAgAEQAZQBzAGkAZwBuAABKRCBDZW50ZXIgRGVzaWduAABMAG8AbgBnAHoAaABlAG4AZwBrAHUAbgAATG9uZ3poZW5na3VuAAB3AHcAdwAuAGoAZAAuAGMAbwBtAAB3d3cuamQuY29tAABqAGQAYwAuAGQAZQBzAGkAZwBuAC4AYwBvAG0AAGpkYy5kZXNpZ24uY29tAE6sThxrY57RT1MAAABSAGUAZwB1AGwAYQByAAAAAAACAAAAAAAA/4MAMgAAAAAAAAAAAAAAAAAAAAAAAAAAAH0AAAABAAIAAwAEAAUABgAHAAgACQAKAAsADAANAA4ADwAQABEAEgATABQAFQAWABcAGAAZABoAGwAcAB0AHgAfACAAIQAjACQAJQAmACcAKAApACoAKwAsAC0ALgAvADAAMQAyADMANAA1ADYANwA4ADkAOgA7ADwAPQA+AEAAQgBEAEUARgBHAEgASQBKAEsATABNAE4ATwBQAFEAUgBTAFQAVQBWAFcAWABZAFoAWwBcAF0AXwBhAIUAlgCLAIoAwwDjAKYBAgEDALQAtQEEAQUBBgEHAQgBCQEKAQsAjAEMAQ0BDgEPARABEQESARMBFAEVARYBFwEYB3VuaTA0MzEHdW5pMEUzRgRsaXJhB3VuaTIwQTYHdW5pMjBBOQRkb25nBEV1cm8HdW5pMjBBRAd1bmkyMEIxB3VuaTIwQkQHdW5pMzAwQQd1bmkzMDBCB3VuaTMwMEMHdW5pMzAwRAd1bmkzMDBFB3VuaTMwMEYHdW5pRkYxRgd1bmlGRjVCB3VuaUZGNUQHdW5pRkZFMQd1bmlGRkU1BW0uMDAxAkpEAAEAAf//AA8AAQAAAAwAAAAWAAAAAgABAAMAfAABAAQAAAACAAAAAAABAAAACgAgADoAAURGTFQACAAEAAAAAP//AAIAAAABAAJhYWx0AA5md2lkABQAAAABAAAAAAABAAEAAgAGAA4AAQAAAAEAEAABAAAAAQAWAAEABgAdAAEAAgBcAF0AAQAGAB0AAQACAFwAXQABAAAACgAgADwAAURGTFQACAAEAAAAAP//AAIAAAABAAJjcHNwAA5rZXJuABQAAAABAAAAAAACAAEAAgADAAgAEAAYAAEAAAABABgAAgAIAAEAJAACAAgAAQEKAAEACgAFAAUACgACAAEAIwA8AAAAAQDeAAQAAAAJABwAIgA0AEoAXAB6AIwAsgDAAAEAGv/9AAQAF//zABj/9QAZ/+8AHP/6AAUAFP/6ABX/+gAZ//oAGv/1ABz/7wAEABT/3wAY//kAGv/sABz/3wAHABT/4wAV//UAFv/6ABj/+gAZ//oAGv/WABz/6gAEABT/4wAV//oAGv/uABz/6gAJABP/6AAV/+oAFv/qABf/yQAY/98AGf++ABr/9wAb/98AHP/1AAMAFP/qABr/8wAc//UABwAV//cAFv/zABf/6gAY/+8AGf/kABr/7gAb//cAAgACABMAEwAAABUAHAABAAEFOgAEAAAAJQBUAJ4ArACyAMwBAgE8AU4BYAFmAaABTgHaAewCCgJEAlYCZALaAuADIgNQA2YD6AQmBDAEQgRMBGIEfAQwBI4EuATCBOQE/gUgABIAKf/1ADH/9QAz//UANv++ADf/9wA4/9kAOf/qADv/rQBM/+oATf/qAE7/+QBP/+QAU//3AFT/+QBV/+QAVv/cAFj/5ABZAAkAAwA2//IAOP/zADv/4QABADb/7wAGACP/9QA2/9QAOP/1ADr/9QA7/+oAPP/1AA0AJQAAADYACwBC//UAQ//1AET/9QBF//UARv/1AE7/9QBQ//UAVP/2AFX/8QBW//UAWP/yAA4AI/+dACz/jgA2AAsAQP/uAEL/9QBD//UARP/1AEb/9QBO//UAUP/1AFH/9QBU//UAVf/zAFj/8wAEACMACwA2/+8AOgALADv/8QAEACMACwA2/+8AOgAKADv/8QABACP/8wAOACX/7wAp/+8AMf/vADP/7wBC//IAQ//yAET/8gBG//IATv/yAFD/8gBU//UAVf/qAFb/4QBY/+oADgAjAAsAJf/dACn/3QAx/90AM//dADb/kAA3//MAOP+PADn/ywA7/2YAVP/zAFX/vABW/+MAWP+8AAQAIwALADb/8QA6AAsAO//xAAcAI//1ADb/0gA4//UAOv/1ADv/6gA8//UAQv/fAA4AI/+fACz/mwA6/+QAPP/sAED/+QBC//kAQ//5AET/+QBG//kATv/5AFD/+QBTAAkAVQAJAFgACQAEADb/7gA4//EAOf/1ADv/7AADADb/5gA4//UAO//mAB0AI/++ACX/8QAp//EALP+JADH/8QAz//EANf/3ADYACQA4AAkAOQAJADsACQBA/6QAQv/QAEP/0ABE/9AARv/QAEz/0ABN/9AATv+OAE//0ABQ/9AAUf/dAFL/1gBU/90AVf/UAFb/5wBX/9YAWP/UAFn/3wABACP/9QAQACP/1gAl//kAKf/5ADH/+QAz//kAQP/nAEL/6ABD/+gARP/oAEb/6ABO/+cAUP/oAFH/7wBU//EAVf/5AFj/+QALACP/6AA2AAgAQP/uAEL/7gBD/+4ARP/uAEb/7gBO/+4AUP/uAFH/9QBU//UABQAl//MAKf/zADH/8wAz//MAOAANACAAI/+tACX/7wAp/+8ALP/LADH/7wAz/+8ANf/3ADYACgA3/8sAOAAKADkACgA6AAcAOwAKAED/3QBC/90AQ//dAET/3QBF//QARv/dAEz/6gBN/+oATv/dAE//6gBQ/90AUf/qAFL/3wBT//UAVP/sAFUACwBX//UAWP/1AFn/7wAPACMACAAl//IAKf/yADH/8gAz//IAQv/1AEP/9QBE//UARv/1AE7/9QBQ//UAVP/1AFX/8gBW//IAWP/yAAIAVf/3AFj/9wAEAFX/+gBX//gAWP/6AFn/+AACAFX/9QBY//kABQBC//MAQ//zAET/8wBG//MAUP/zAAYAQv/1AEP/9QBE//UARv/1AEj/9QBQ//UABABV//gAV//1AFj/+ABZ//cACgBA/+QAQv/kAEP/6gBE/+QARQALAEb/6gBO/+EAUP/qAFMAHABYAAoAAgBE//UATv/uAAgAQP/4AEL/+ABD//gARP/1AEUACABG//gATv/4AFD/+AAGAEL/9QBD//UARP/1AEb/9QBO/+oAUP/1AAgAQP/4AEL/+ABD//gARP/4AEUACABG//gATv/vAFD/+AAGAEL/9wBD//cARP/3AEb/9wBO//cAUP/3AAIACwAjACgAAAAqADQABgA2ADwAEQBAAEEAGABEAEUAGgBKAEoAHABOAE8AHQBRAFEAHwBTAFMAIABVAFUAIQBXAFkAIgAAAAAAAQAAAADVpCcIAAAAANbRI74AAAAA2D0KNg==') format('truetype');
+	font-weight: 600;
+	font-style: normal;
+	font-display: swap;
+}
+.price-font{
+    font-family: 'myFont','-apple-system', 'BlinkMacSystemFont', 'Helvetica Neue', 'Helvetica', 'Segoe UI', 'Arial', 'Roboto', 'PingFang SC', 'Hiragino Sans GB', 'Microsoft Yahei','sans-serif';
+} 
+
+// 全局基础样式
+uni-page-body {
+	line-height: 1.8;
+	font-family: PingFang SC;
+	font-size: 28rpx;
+	color: #333;
+}
+page {
+	font-family: PingFang SC;
+}
+input, .uni-input {
+	font-size: 28rpx;
+}
+button{ 
+	font-size: 28rpx;
+	border-radius: 10rpx;
+	line-height: 2.8;
+}
+button:after,uni-button:after {
+	border: none !important;
+}
+button[type='primary'],uni-button[type='primary']{
+	background-color: var(--primary-color) !important;
+}
+
+// 提交按钮背景颜色
+.primary-btn-bg{
+	// background: linear-gradient( 94deg, #FB7939 0%, #FE120E 99%), #EF000C;
+	background: linear-gradient( 94deg, var(--primary-help-color) 0%, var(--primary-color) 99%), var(--primary-color);
+}
+// 侧边栏宽度
+.sidebar-margin{
+	margin-left: var(--sidebar-m) !important;
+	margin-right: var(--sidebar-m) !important;
+}
+// 上边距高度
+.top-mar{
+	margin-top: var(--top-m) !important;
+}
+// 圆角
+.rounded-angle{
+	border-radius: var(--rounded-big);
+}
+// 卡片模块
+.card-template{
+	padding: var(--pad-top-m) var(--pad-sidebar-m);
+	border-radius: var(--rounded-big);
+	background-color: #fff;
+	box-sizing: border-box;
+	.title{
+		font-size: 30rpx;
+		font-weight: 500;
+		color: #333;
+		height: 40rpx;
+		line-height: 40rpx;
+		margin-bottom: 30rpx;
+	}
+	.card-template-item{
+		display: flex;
+		align-items: center;
+		min-height: 40rpx;
+		margin-bottom: 34rpx;
+		&:last-of-type{
+			margin-bottom: 0;
+		}
+	}
+}
+// 标签
+.tag-item{
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	box-sizing: border-box;
+	font-size: 20rpx;
+	border-radius: 8rpx;
+}
+
+// 放到右侧边的tab, 参考页面我的积分，任务奖励详情
+.side-tab{
+	@apply flex items-center absolute right-0;
+	top: 50rpx;
+	z-index: 10;
+	padding: 0 14rpx;
+	height: 48rpx;
+	background-color: rgba(51,51,51,.2);
+	border-top-left-radius: 35rpx;
+	border-bottom-left-radius: 35rpx;
+	.icon{
+		font-size: 24rpx;
+		color: #fff;
+		margin-right: 8rpx;
+	}
+	.desc{
+		font-size: 24rpx;
+		color: #fff;
+	}
+	
+}
+
+// 空页面
+.empty-page{
+	padding-top: 120rpx;
+	margin: var(--top-m) auto 0;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	border-radius: var(--rounded-big);
+	width: 710rpx;
+	height: 710rpx;
+	background-color: #fff; 
+	box-sizing: border-box;
+	.img{
+		width: 400rpx;
+		height: 300rpx;
+	}
+	.desc{
+		font-size: 26rpx;
+		color: var(--text-color-light9);
+	}
+	.btn{
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		min-width: 260rpx;
+		height: 66rpx;
+		font-size: 26rpx;
+		margin-top: 40rpx;
+		color: var(--primary-color);
+		border: 2rpx solid var(--primary-color);
+		border-radius: 100rpx;
+	}
+}
+// 空页面
+.empty-page-popup{
+	margin: var(--top-m) auto 0;
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	align-items: center;
+	border-radius: var(--rounded-big);
+	height: 340rpx;
+	background-color: #fff; 
+	box-sizing: border-box;
+	.img{
+		width: 320rpx;
+		height: 240rpx;
+	}
+	.desc{
+		font-size: 26rpx;
+		color: var(--text-color-light9);
+	}
+	.btn{
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		min-width: 260rpx;
+		height: 66rpx;
+		font-size: 26rpx;
+		margin-top: 40rpx;
+		color: var(--primary-color);
+		border: 2rpx solid var(--primary-color);
+		border-radius: 100rpx;
+	}
+}
+// 搜索input
+.search-input{
+	@apply flex-1 flex items-center;
+	height: 60rpx;
+	background-color: #f6f6f6; //#F8F9FD
+	padding-left: 30rpx;
+	padding-right: 30rpx;
+	border-radius: 100rpx;
+	.input{
+		@apply flex-1;
+		font-size: 24rpx;
+		padding-right: 32rpx;
+		height: 100%;
+	}
+	.clear{
+		font-size: 24rpx;
+		color: #999;
+		line-height: 1;
+	}
+	.btn{
+		margin-bottom: -2rpx;
+		margin-right: 18rpx;
+		font-size: 24rpx;
+		color: #333;
+	}
+}
+
+
+// 适用于左边tab切换，右边是日期；参考页面如：我的佣金、销售奖励
+.tab-style-1{
+	@apply box-border flex items-center justify-between;
+	padding: 0 30rpx 20rpx;
+	.tab-left{
+		@apply flex whitespace-nowrap;
+		.tab-left-item{
+			@apply font-400;
+			margin-left: 0;
+			margin-right: 40rpx;
+			color: #333;
+			line-height: 40rpx;
+			font-size: 28rpx;
+			&.class-select{
+				position: relative;
+				font-weight: 500;
+				color: var(--primary-color);
+				&::before {
+					content: "";
+					position: absolute;
+					bottom: -14rpx;
+					height: 6rpx;
+					border-radius: 100rpx;
+					background-color: var(--primary-color);
+					width: 40rpx;
+					left: 50%;
+					transform: translateX(-50%);
+				}
+			}
+		}
+	}
+	.tab-right{
+		@apply flex items-baseline;
+		height: 34rpx;
+		line-height: 1;
+		.tab-right-date{
+			font-size: 28rpx !important;
+			color: #333;
+			margin-right: 10rpx;
+		}
+		.tab-right-icon{
+			font-size: 28rpx !important;
+		}
+	}
+}
+//普通tab切换样式
+.tab-style-2{
+	@apply box-border bg-white;
+	padding: 0 30rpx;
+	.tab-content{
+		@apply flex whitespace-nowrap justify-between;
+		height: 88rpx;
+		.tab-items{
+			line-height: 88rpx;
+			font-weight: 400;
+			font-size: 28rpx;
+			&.class-select{
+				position: relative;
+				font-weight: 500;
+				color: var(--primary-color);
+				&::before{
+					content: "";
+					position: absolute;
+					bottom: 10rpx;
+					width: 40rpx;
+					height:6rpx;
+					border-radius: 4rpx;
+					background-color: var(--primary-color);
+					left: 50%;
+					transform: translateX(-50%);
+				}
+			}
+		}
+	}
+}
+//两个tab选项卡样式
+.tab-style-3{
+	@apply flex whitespace-nowrap justify-around box-border bg-white;
+	height: 88rpx;
+	
+	.tab-items{
+		@apply flex-1;
+		line-height: 88rpx;
+		font-weight: 400;
+		font-size: 28rpx;
+		text-align: center;
+		margin:0 var(--sidebar-m);
+		&.class-select{
+			position: relative;
+			font-weight: 500;
+			color: var(--primary-color);
+			&::before{
+				content: "";
+				position: absolute;
+				bottom: 10rpx;
+				width: 40rpx;
+				height:6rpx;
+				border-radius: 4rpx;
+				background-color: var(--primary-color);
+				left: 50%;
+				transform: translateX(-50%);
+			}
+		}
+	}
+	
+}
+// 弹窗
+.popup-common{
+	.title{
+		font-weight: 500;
+		text-align: center;
+		font-size: 32rpx;
+		padding-top: 36rpx;
+		line-height: 1;
+		padding-bottom: 56rpx;
+	}
+	.btn-wrap{
+		padding: 20rpx 20rpx 30rpx;
+		.btn{
+			color: #fff;
+			height: 80rpx;
+			line-height: 80rpx;
+			border-radius: 100rpx;
+			font-size: 26rpx;
+			font-weight: 500;
+		}
+	}
+}
+
+// 公共表单
+.common-form{
+	.common-form-item{
+		display: flex;
+		align-items: center;
+		height: 90rpx;
+		margin-top: 16rpx;
+		&:first-of-type{
+			margin-top: 0;
+		}
+		.label{
+			width: 200rpx;
+			font-size: 28rpx;
+		}
+		.val{
+			flex: 1;
+			font-size: 28rpx;
+		}
+		.switch{
+			.uni-switch-input{
+				width: 84rpx;
+				height: 42rpx;
+				&::after{
+					width: 42rpx;
+					height: 42rpx;
+					top: -2rpx;
+				}
+				&::before{
+					width: 84rpx;
+					height: 42rpx;
+					top: -2rpx;
+					background-color: var(--temp-bg);
+					border-color: var(--temp-bg);
+				}
+			}
+			.uni-switch-input-checked{
+				background-color: var(--primary-color);
+				border-color: var(--primary-color);
+			}
+		}
+	}
+}
+
+/*********** 底部按钮 - start ，适用于按钮定位到底部||同屏按钮||苹果兼容，实例：添加地址，编辑会员账号 **************/
+.common-tab-bar-placeholder {
+	padding-bottom: calc(constant(safe-area-inset-bottom) + 110rpx);
+	padding-bottom: calc(env(safe-area-inset-bottom) + 110rpx);
+}
+
+.common-tab-bar {
+	padding-bottom: calc(constant(safe-area-inset-bottom) + 30rpx);
+	padding-bottom: calc(env(safe-area-inset-bottom) + 30rpx);
+}
+/*********** 底部按钮 - end ，适用于按钮定位到底部||同屏按钮||苹果兼容，实例：添加地址，编辑会员账号 **************/
+
+
+// tab
+.u-tabbar .u-border-top{
+	border-color: #f6f6f6 !important;
+}
+
+.flex-center{
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+.flex-between-center{
+	display: flex;
+	align-items: center;
+	justify-content: space-between;;
+}
+
+/* 单行超出隐藏 */
+.using-hidden {
+  word-break: break-all;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  display: -webkit-box;
+  -webkit-line-clamp: 1;
+  -webkit-box-orient: vertical;
+  white-space: break-spaces;
+}
+
+/* 多行超出隐藏 */
+.multi-hidden {
+  word-break: break-all;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+}
+
+.mb-ios{
+  margin-bottom:constant(safe-area-inset-bottom);
+  margin-bottom:env(safe-area-inset-bottom);
+}
+
+.pb-ios{
+  padding-bottom:constant(safe-area-inset-bottom);
+  padding-bottom:env(safe-area-inset-bottom);
+}
+
+// 防止穿透
+.u-popup .u-transition {
+	touch-action: none;
+}
+
+// 去掉uveiew 点击时变灰【针对于微信小程序处理，官方提供的方法，在小程序中不起作用】
+.u-button.u-button--active:before{
+	opacity: 0 !important;
+}
+
+/****************** 弹窗-start *********************/
+// 弹窗圆角[从下往上弹窗]
+.u-popup[type="bottom"] .u-popup__content, .u-popup .u-slide-up-enter-to .u-popup__content{
+	border-top-left-radius: 16rpx;
+	border-top-right-radius: 16rpx;
+	overflow: hidden;
+}
+// 防止覆盖住图片放大
+.u-popup :deep(.u-transition){
+	z-index: 999 !important;
+}
+/****************** 弹窗-end *********************/
+
+/****************** u-cell-start *********************/
+.u-cell-group .u-cell__body__content{
+	line-height: 1;
+}
+.u-cell-group .u-cell__right-icon-wrap .uicon-arrow-right{
+	font-size: 28rpx !important;
+	color: #999;
+}
+/****************** u-cell-end *********************/
+
+/******************** u-toolbar__wrapper__confirm start **********************/
+.u-toolbar__wrapper__confirm{
+	color: var(--primary-color) !important;
+}
+/******************** u-toolbar__wrapper__confirm end **********************/
+/******************** 物流 state **********************/
+.u-steps-item__line.u-steps-item__line--column{
+	height:100% !important;
+}
+/******************** 物流 state **********************/
+
+/******************** mescroll state **********************/
+.mescroll-upwarp{
+	opacity: 0;
+}
+/******************** mescroll end **********************/
+
+/******************** u-switch state **********************/
+// 解决u-switch在小程序上点击会出现高亮的情况
+/* #ifdef MP */
+.u-switch{
+	cursor: inherit !important;
+}
+/* #endif */
+/******************** u-switch end **********************/
+
+/******************** 表单组件兼容性 start **********************/
+/* #ifdef MP */
+.form-item-frame .u-checkbox .u-checkbox__icon-wrap{
+	width: 30rpx !important;
+	height: 30rpx !important;
+}
+.form-item-frame .u-radio-group .u-radio__icon-wrap{
+	width: 30rpx !important;
+	height: 30rpx !important;
+}
+.form-item-frame .u-picker .u-toolbar__wrapper__cancel, .form-item-frame .u-picker .u-toolbar__wrapper__confirm{
+	font-size: 28rpx !important;
+}
+/* #endif */
+
+.form-item-frame .calendar-wrap .u-calendar ::v-deep .u-calendar-header__title, .form-item-frame .calendar-wrap .u-calendar ::v-deep .u-calendar-header__subtitle,  .form-item-frame .calendar-wrap .u-calendar ::v-deep .u-calendar-month__title{
+	display: block;
+}
+.form-item-frame .calendar-wrap .u-calendar .u-calendar-header__title, .u-calendar-header__subtitle, .u-calendar-month__title{
+	display: block;
+}
+/******************** 表单组件兼容性 end **********************/
+
+
+.information-filling .u-form .u-form-item__body__left__content__label{
+	font-size: 28rpx !important;
+}
+.information-filling .u-line{
+	border-color: #dddddd !important;
+}
\ No newline at end of file
diff --git a/uni-app/src/styles/custom.ttf b/uni-app/src/styles/custom.ttf
new file mode 100644
index 00000000..6483758e
Binary files /dev/null and b/uni-app/src/styles/custom.ttf differ
diff --git a/uni-app/src/styles/diy.scss b/uni-app/src/styles/diy.scss
new file mode 100644
index 00000000..3d309215
--- /dev/null
+++ b/uni-app/src/styles/diy.scss
@@ -0,0 +1,28 @@
+.bg-index {
+  width: 100%;
+  height: 100%;
+  box-sizing: border-box;
+  background-size: 100%;
+  background-repeat: no-repeat !important;
+}
+
+:deep(.u-tabbar__placeholder) {
+  display: none !important;
+}
+
+.diy-template-wrap {
+  ::v-deep .diy-group {
+    > .draggable-element.top-fixed-diy {
+      display: none;
+    }
+  }
+
+  /* #ifdef H5 */
+  :deep(.child-diy-template-wrap) {
+    .diy-group .draggable-element.top-fixed-diy {
+      display: block;
+    }
+  }
+
+  /* #endif */
+}
\ No newline at end of file
diff --git a/uni-app/src/styles/diy_form.scss b/uni-app/src/styles/diy_form.scss
new file mode 100644
index 00000000..b8f271fe
--- /dev/null
+++ b/uni-app/src/styles/diy_form.scss
@@ -0,0 +1,174 @@
+.form-item-frame{
+	@apply overflow-hidden relative;
+	.base-layout-one{
+		@apply relative flex flex-col;
+		.layout-one-label{
+			@apply flex items-center;
+			line-height: 1.3;
+			margin-bottom: 16rpx;
+			.is-hidden{
+				@apply border-solid;
+				font-size: 20rpx;
+				line-height: 20rpx;
+				border-width: 2rpx;
+				border-color: #999;
+				padding: 4rpx;
+				border-radius: 6rpx;
+				margin-left: 6rpx;
+				color: #999;
+			}
+			.required{
+				color: #ec0003;
+				padding-top: 4rpx;
+				margin-left: 4rpx;
+			}
+			.name{
+				@apply overflow-ellipsis;
+			}
+		}
+		.layout-one-remark{
+			margin-bottom: 16rpx;
+			line-height: 1.2;
+		}
+		.layout-one-error-message{
+			font-size: 28rpx;
+			color: red;
+			margin-bottom: 16rpx;
+		}
+		.layout-one-content{
+			display: flex;
+			align-items: center;
+			min-height: 80rpx;
+			padding: 0 16rpx;
+			border: 2rpx solid #F2F2F2;
+			border-radius: 16rpx;
+			box-sizing: border-box;
+		}
+		.layout-one-input-placeholder{
+			color: var(--text-color-light9);
+		}
+		.layout-one-attribute-wrap{
+			@apply flex items-center;
+			margin-top: 16rpx;
+			.layout-one-attribute-item{
+				font-size: 24rpx;
+				color: #999;
+				margin-right: 6rpx;
+			}
+		}
+		.detail-one-content{
+			padding: 5rpx 10rpx;
+			display: flex;
+			margin-bottom: 34rpx;
+			flex-direction: column;
+			.detail-one-content-label{
+				color: #999;
+				font-size: 26rpx;
+				margin-bottom: 16rpx;
+				line-height: 1;
+			}
+			.detail-one-content-value{
+				font-size: 28rpx;
+				margin-top: 5rpx;
+				line-height: 1.4;
+				word-wrap: break-word;
+			}
+		}
+	}
+	.base-layout-two{
+		@apply relative;
+		.layout-two-is-hidden{
+			font-size: 20rpx;
+			border: 2rpx solid #999;
+			padding: 4rpx;
+			border-radius: 6rpx;
+			margin-left: 6rpx;
+			color: #999;
+		}
+		.layout-two-wrap{
+			@apply flex items-center border-solid box-border;
+			border-width: 0;
+			border-bottom-width: 2rpx;
+			border-color: #F2F2F2;
+			padding: 0 16rpx;
+			.layout-two-label{
+				@apply flex items-center;
+				width: 27%;
+				padding-right: 20rpx;
+				.required{
+					color: #ec0003;
+					padding-top: 4rpx;
+					margin-right: 6rpx;
+				}
+				.name{
+					@apply overflow-ellipsis;
+				}
+			}
+			.layout-two-content{
+				width: 73%;
+				min-height: 90rpx;
+				text-align: right;
+				display: flex;
+				align-items: center;
+				justify-content: flex-end;
+				&.no-flex{
+					display: block;
+				}
+			}
+			.layout-two-input-placeholder{
+				color: var(--text-color-light9);
+			}
+			&.no-border{
+				padding: 0;
+				border-width: 0;
+				.layout-two-content{
+					min-height: 72rpx;
+				}
+			}
+		}
+		.layout-two-remark{
+			margin-top: 16rpx;
+			line-height: 1.2;
+		}
+		.layout-two-error-message{
+			font-size: 28rpx;
+			color: red;
+			margin-bottom: 16rpx;
+		}
+		.layout-two-attribute-wrap{
+			@apply flex items-center;
+			margin-top: 16rpx;
+			.layout-two-attribute-item{
+				font-size: 24rpx;
+				color: #999;
+				margin-right: 6rpx;
+			}
+		}
+		.detail-two-content{
+			padding: 0rpx 10rpx; 
+			font-size: 28rpx;
+			margin-bottom: 34rpx;
+			display: flex;
+			justify-content: space-between;
+			.detail-two-content-label{
+				
+			}
+			.detail-two-content-value {
+				line-height: 1.4;
+			    word-wrap: break-word; 
+			    word-break: break-word; 
+			    white-space: pre-wrap;
+			    text-align: right;
+			}
+		
+		}
+	}
+	.form-item-mask{
+		@apply absolute;
+		top: 0;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		z-index: 10;
+	}
+}
\ No newline at end of file
diff --git a/uni-app/src/styles/iconfont.css b/uni-app/src/styles/iconfont.css
new file mode 100644
index 00000000..63720c29
--- /dev/null
+++ b/uni-app/src/styles/iconfont.css
@@ -0,0 +1,1142 @@
+@font-face {
+  font-family: "iconfont"; /* Project id 3952239 */
+  src: url('//at.alicdn.com/t/c/font_3952239_w9mu2hnz4eg.woff2?t=1731396621845') format('woff2'),
+  url('//at.alicdn.com/t/c/font_3952239_w9mu2hnz4eg.woff?t=1731396621845') format('woff'),
+  url('//at.alicdn.com/t/c/font_3952239_w9mu2hnz4eg.ttf?t=1731396621845') format('truetype');
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icona-paihangbangpc30:before {
+  content: "\e83a";
+}
+
+.iconbiaoqianV6xx2:before {
+  content: "\e824";
+}
+
+.iconxinrenV6xx:before {
+  content: "\e821";
+}
+
+.iconhuodongV6xx:before {
+  content: "\e820";
+}
+
+.iconxuanzhongde-miaobian:before {
+  content: "\e81e";
+}
+
+.iconshengyinpc:before {
+  content: "\e7d1";
+}
+
+.iconkabao:before {
+  content: "\e7ec";
+}
+
+.iconchuzhikaV6mm:before {
+  content: "\e7ea";
+}
+
+.iconkabaoV6mm:before {
+  content: "\e7e9";
+}
+
+.iconduihuankaV6mm-1:before {
+  content: "\e7e8";
+}
+
+.iconduihuankaV6mm:before {
+  content: "\e7e7";
+}
+
+.iconshouyeV6mm1:before {
+  content: "\e7e5";
+}
+
+.iconshouyeV6xx1:before {
+  content: "\e7bb";
+}
+
+.icona-yingyongzhongxinV6xx-32:before {
+  content: "\e7e4";
+}
+
+.icona-yingyongliebiaoV6xx-32:before {
+  content: "\e7e3";
+}
+
+.icona-guanbi-34V6mm:before {
+  content: "\e7ae";
+}
+
+.icona-cuohaoV6mm-36:before {
+  content: "\e7b4";
+}
+
+.iconpaihangbangV6xx1:before {
+  content: "\e7e2";
+}
+
+.icona-guanbi-34V6xx:before {
+  content: "\e7ad";
+}
+
+.icona-shaixuan-36V6xx-36:before {
+  content: "\e7b3";
+}
+
+.icona-shaixuanV6xx-34:before {
+  content: "\e7a5";
+}
+
+.iconUnion:before {
+  content: "\e7b1";
+}
+
+.iconqiang:before {
+  content: "\e7b2";
+}
+
+.iconyanjing:before {
+  content: "\e8bf";
+}
+
+.iconyouV6xx:before {
+  content: "\e648";
+}
+
+.iconguanzhuV6xx:before {
+  content: "\e79b";
+}
+
+.iconxihuanV6mm:before {
+  content: "\e691";
+}
+
+.iconfapiao:before {
+  content: "\e86b";
+}
+
+.iconlishijiluV6xx:before {
+  content: "\e6f6";
+}
+
+.iconchaochangyoujiantouV6xx:before {
+  content: "\e6fc";
+}
+
+.iconyuanhu:before {
+  content: "\e644";
+}
+
+.iconzhuanyuanhu:before {
+  content: "\e736";
+}
+
+.iconsaotiaoxingmaV6xx:before {
+  content: "\e792";
+}
+
+.iconsaoyisaoV6xx:before {
+  content: "\e79a";
+}
+
+.iconshangV6xx-1:before {
+  content: "\e641";
+}
+
+.iconxiaV6xx:before {
+  content: "\e643";
+}
+
+.iconmeiriqiandaoV6xx:before {
+  content: "\e77a";
+}
+
+.iconrenminbiV6xx:before {
+  content: "\e680";
+}
+
+.iconxiaolian-1:before {
+  content: "\e653";
+}
+
+.iconxiaolian-2:before {
+  content: "\e654";
+}
+
+.iconwodezixun:before {
+  content: "\e645";
+}
+
+.iconwode-xian:before {
+  content: "\e60f";
+}
+
+.iconbalance:before {
+  content: "\e73b";
+}
+
+.iconweixinzhifu2:before {
+  content: "\e640";
+}
+
+.iconalipay:before {
+  content: "\e618";
+}
+
+.icona-shejianchangguan:before {
+  content: "\e647";
+}
+
+.icondunpai:before {
+  content: "\e80b";
+}
+
+.iconxiazai:before {
+  content: "\e69c";
+}
+
+.iconhuiyuanjiage:before {
+  content: "\e611";
+}
+
+.iconshuaxin:before {
+  content: "\e63e";
+}
+
+.iconyinlian:before {
+  content: "\e68b";
+}
+
+.iconkefu:before {
+  content: "\e612";
+}
+
+.icondianzan:before {
+  content: "\ec7f";
+}
+
+.icondache:before {
+  content: "\e615";
+}
+
+.iconjiantouarrow492:before {
+  content: "\e6b0";
+}
+
+.iconxuanze:before {
+  content: "\e63d";
+}
+
+.iconlianjie-tianchong:before {
+  content: "\e658";
+}
+
+.iconmendian:before {
+  content: "\e60a";
+}
+
+.iconico_yuyueguanli_yuyuebiangeng:before {
+  content: "\e94a";
+}
+
+.iconxinyongqia:before {
+  content: "\e785";
+}
+
+.iconquanbudingdan:before {
+  content: "\e601";
+}
+
+.iconico:before {
+  content: "\e646";
+}
+
+.iconkefu1:before {
+  content: "\e88f";
+}
+
+.iconWechat-Moments:before {
+  content: "\e7a8";
+}
+
+.iconlink-filling:before {
+  content: "\e898";
+}
+
+.icondaohang:before {
+  content: "\e6bd";
+}
+
+.iconkaidian:before {
+  content: "\e6fb";
+}
+
+.iconxiajiantou:before {
+  content: "\e602";
+}
+
+.iconyongjin:before {
+  content: "\e6e3";
+}
+
+.iconshangjiantou:before {
+  content: "\e604";
+}
+
+.iconshimingrenzheng-xian:before {
+  content: "\e89c";
+}
+
+.icondasuozi:before {
+  content: "\e608";
+}
+
+.iconfenxiao:before {
+  content: "\e61b";
+}
+
+.iconfenxiang2:before {
+  content: "\e635";
+}
+
+.iconxiangqing:before {
+  content: "\e61f";
+}
+
+.iconjiantouloukong-you:before {
+  content: "\e631";
+}
+
+.iconpinglun:before {
+  content: "\e60b";
+}
+
+.icongouwuche2:before {
+  content: "\e73d";
+}
+
+.iconshangjiadingdan:before {
+  content: "\ee00";
+}
+
+.iconzhankai:before {
+  content: "\e62c";
+}
+
+.iconshouqi:before {
+  content: "\e62d";
+}
+
+.icongouwuche-shangpin:before {
+  content: "\e637";
+}
+
+.iconguanzhu-weidianji:before {
+  content: "\e638";
+}
+
+.icondianpu-xiayibu:before {
+  content: "\e639";
+}
+
+.iconguanzhu-dianji:before {
+  content: "\e63c";
+}
+
+.iconshoucang1:before {
+  content: "\e621";
+}
+
+.iconfenxiang:before {
+  content: "\e610";
+}
+
+.icongouwuche:before {
+  content: "\e699";
+}
+
+.iconfenxiang3:before {
+  content: "\e655";
+}
+
+.icongouwuche3:before {
+  content: "\e63f";
+}
+
+.iconfenxiang1:before {
+  content: "\e64d";
+}
+
+.iconshezhi:before {
+  content: "\e600";
+}
+
+.iconjiahao1:before {
+  content: "\e84f";
+}
+
+.iconjianhao:before {
+  content: "\e850";
+}
+
+.iconshezhi1:before {
+  content: "\e8b7";
+}
+
+.iconshijian:before {
+  content: "\e6c8";
+}
+
+.iconxiangxiajiantou:before {
+  content: "\e65e";
+}
+
+.iconxiangxia:before {
+  content: "\e62f";
+}
+
+.iconxiangshang:before {
+  content: "\e630";
+}
+
+.iconxialajiantouxiao:before {
+  content: "\e87e";
+}
+
+.iconanniu-jiantouxiangyou_o:before {
+  content: "\eb8c";
+}
+
+.iconxiazai19:before {
+  content: "\e614";
+}
+
+.iconjiantou3:before {
+  content: "\e605";
+}
+
+.iconxiangyoujiantou:before {
+  content: "\e620";
+}
+
+.iconjiantoushang:before {
+  content: "\e619";
+}
+
+.iconxiazai17:before {
+  content: "\e613";
+}
+
+.iconguanbi:before {
+  content: "\e609";
+}
+
+.iconsousuo:before {
+  content: "\e8b9";
+}
+
+.iconbianji:before {
+  content: "\e6ee";
+}
+
+.iconshurutianxiebi:before {
+  content: "\e69f";
+}
+
+.iconshaixuan:before {
+  content: "\e888";
+}
+
+.iconshangpinliebiao:before {
+  content: "\e61c";
+}
+
+.iconfuzhi:before {
+  content: "\e62b";
+}
+
+.iconshuru:before {
+  content: "\e625";
+}
+
+.iconicon7:before {
+  content: "\e667";
+}
+
+.iconguanbi1:before {
+  content: "\e634";
+}
+
+.iconarrow-right:before {
+  content: "\e622";
+}
+
+.iconfanhui1:before {
+  content: "\e629";
+}
+
+.iconVector-104:before {
+  content: "\e724";
+}
+
+.iconVector-105:before {
+  content: "\e725";
+}
+
+.iconVector-108:before {
+  content: "\e726";
+}
+
+.iconVector-107:before {
+  content: "\e727";
+}
+
+.iconVector-106:before {
+  content: "\e729";
+}
+
+.iconVector-97:before {
+  content: "\e72a";
+}
+
+.iconVector-102:before {
+  content: "\e72b";
+}
+
+.iconVector-103:before {
+  content: "\e72c";
+}
+
+.iconVector-101:before {
+  content: "\e72d";
+}
+
+.iconVector-92:before {
+  content: "\e72e";
+}
+
+.iconVector-90:before {
+  content: "\e730";
+}
+
+.iconVector-98:before {
+  content: "\e731";
+}
+
+.iconVector-99:before {
+  content: "\e732";
+}
+
+.iconVector-100:before {
+  content: "\e733";
+}
+
+.iconVector-95:before {
+  content: "\e734";
+}
+
+.iconVector-96:before {
+  content: "\e735";
+}
+
+.iconVector-91:before {
+  content: "\e737";
+}
+
+.iconVector-93:before {
+  content: "\e738";
+}
+
+.iconVector-89:before {
+  content: "\e739";
+}
+
+.iconVector-84:before {
+  content: "\e73a";
+}
+
+.iconVector-83:before {
+  content: "\e73c";
+}
+
+.iconVector-88:before {
+  content: "\e73e";
+}
+
+.iconVector-82:before {
+  content: "\e73f";
+}
+
+.iconVector-86:before {
+  content: "\e740";
+}
+
+.iconVector-74:before {
+  content: "\e741";
+}
+
+.iconVector-81:before {
+  content: "\e743";
+}
+
+.iconVector-85:before {
+  content: "\e744";
+}
+
+.iconVector-87:before {
+  content: "\e745";
+}
+
+.iconVector-77:before {
+  content: "\e746";
+}
+
+.iconVector-79:before {
+  content: "\e747";
+}
+
+.iconVector-80:before {
+  content: "\e748";
+}
+
+.iconVector-75:before {
+  content: "\e749";
+}
+
+.iconVector-72:before {
+  content: "\e74a";
+}
+
+.iconVector-71:before {
+  content: "\e74b";
+}
+
+.iconVector-76:before {
+  content: "\e74c";
+}
+
+.iconVector-73:before {
+  content: "\e74d";
+}
+
+.iconVector-78:before {
+  content: "\e74e";
+}
+
+.iconVector-67:before {
+  content: "\e74f";
+}
+
+.iconVector-59:before {
+  content: "\e750";
+}
+
+.iconVector-60:before {
+  content: "\e751";
+}
+
+.iconVector-69:before {
+  content: "\e752";
+}
+
+.iconVector-58:before {
+  content: "\e753";
+}
+
+.iconVector-70:before {
+  content: "\e754";
+}
+
+.iconVector-54:before {
+  content: "\e755";
+}
+
+.iconVector-68:before {
+  content: "\e756";
+}
+
+.iconVector-65:before {
+  content: "\e757";
+}
+
+.iconVector-57:before {
+  content: "\e758";
+}
+
+.iconVector-64:before {
+  content: "\e759";
+}
+
+.iconVector-61:before {
+  content: "\e75a";
+}
+
+.iconVector-63:before {
+  content: "\e75b";
+}
+
+.iconVector-38:before {
+  content: "\e75c";
+}
+
+.iconVector-49:before {
+  content: "\e75d";
+}
+
+.iconVector-66:before {
+  content: "\e75e";
+}
+
+.iconVector-53:before {
+  content: "\e75f";
+}
+
+.iconVector-62:before {
+  content: "\e760";
+}
+
+.iconVector-46:before {
+  content: "\e761";
+}
+
+.iconVector-55:before {
+  content: "\e762";
+}
+
+.iconVector-56:before {
+  content: "\e763";
+}
+
+.iconVector-37:before {
+  content: "\e764";
+}
+
+.iconVector-51:before {
+  content: "\e765";
+}
+
+.iconVector-52:before {
+  content: "\e766";
+}
+
+.iconVector-50:before {
+  content: "\e767";
+}
+
+.iconVector-29:before {
+  content: "\e769";
+}
+
+.iconVector-47:before {
+  content: "\e76a";
+}
+
+.iconVector-48:before {
+  content: "\e76b";
+}
+
+.iconVector-45:before {
+  content: "\e76c";
+}
+
+.iconVector-39:before {
+  content: "\e76d";
+}
+
+.iconVector-32:before {
+  content: "\e76e";
+}
+
+.iconVector-44:before {
+  content: "\e76f";
+}
+
+.iconVector-41:before {
+  content: "\e770";
+}
+
+.iconVector-40:before {
+  content: "\e771";
+}
+
+.iconVector-33:before {
+  content: "\e772";
+}
+
+.iconVector-43:before {
+  content: "\e773";
+}
+
+.iconVector-22:before {
+  content: "\e774";
+}
+
+.iconVector-30:before {
+  content: "\e775";
+}
+
+.iconVector-36:before {
+  content: "\e776";
+}
+
+.iconVector-42:before {
+  content: "\e777";
+}
+
+.iconVector-35:before {
+  content: "\e778";
+}
+
+.iconVector-20:before {
+  content: "\e779";
+}
+
+.iconVector-31:before {
+  content: "\e77b";
+}
+
+.iconVector-28:before {
+  content: "\e77c";
+}
+
+.iconVector-34:before {
+  content: "\e77d";
+}
+
+.iconVector-24:before {
+  content: "\e77e";
+}
+
+.iconVector-17:before {
+  content: "\e77f";
+}
+
+.iconVector-27:before {
+  content: "\e780";
+}
+
+.iconVector-6:before {
+  content: "\e781";
+}
+
+.iconVector-26:before {
+  content: "\e783";
+}
+
+.iconVector-15:before {
+  content: "\e784";
+}
+
+.iconVector-21:before {
+  content: "\e786";
+}
+
+.iconVector-11:before {
+  content: "\e787";
+}
+
+.iconVector-5:before {
+  content: "\e788";
+}
+
+.iconVector-19:before {
+  content: "\e789";
+}
+
+.iconVector-23:before {
+  content: "\e78a";
+}
+
+.iconVector-16:before {
+  content: "\e78b";
+}
+
+.iconVector-14:before {
+  content: "\e78c";
+}
+
+.iconVector-8:before {
+  content: "\e78d";
+}
+
+.iconVector-13:before {
+  content: "\e78e";
+}
+
+.iconVector-12:before {
+  content: "\e78f";
+}
+
+.iconVector-18:before {
+  content: "\e790";
+}
+
+.icona-9:before {
+  content: "\e791";
+}
+
+.iconVector-1:before {
+  content: "\e793";
+}
+
+.iconVector-7:before {
+  content: "\e794";
+}
+
+.iconVector-2:before {
+  content: "\e795";
+}
+
+.iconVector-9:before {
+  content: "\e796";
+}
+
+.iconVector1:before {
+  content: "\e797";
+}
+
+.iconVector-10:before {
+  content: "\e798";
+}
+
+.iconVector-3:before {
+  content: "\e799";
+}
+
+.iconVector-4:before {
+  content: "\e79c";
+}
+
+.icona-Vector1Stroke:before {
+  content: "\e79f";
+}
+
+.iconq96:before {
+  content: "\e7aa";
+}
+
+.icona-Vector3Stroke-copy-copy:before {
+  content: "\e7ab";
+}
+
+.iconVector-25:before {
+  content: "\e70b";
+}
+
+.iconVector-94:before {
+  content: "\e6d4";
+}
+
+.iconqiandao:before {
+  content: "\e636";
+}
+
+.iconshangyibu:before {
+  content: "\e62a";
+}
+
+.iconxiayibu1:before {
+  content: "\e628";
+}
+
+.iconhexiao:before {
+  content: "\e64f";
+}
+
+.iconjiang-copy:before {
+  content: "\e624";
+}
+
+.icontiaoxingmasaomiao:before {
+  content: "\e63a";
+}
+
+.iconsaoma:before {
+  content: "\e69a";
+}
+
+.iconjilu:before {
+  content: "\e627";
+}
+
+.iconzhekou:before {
+  content: "\e623";
+}
+
+.iconxiayibu:before {
+  content: "\e60e";
+}
+
+.iconweixin11:before {
+  content: "\e63b";
+}
+
+.iconpengyouquan:before {
+  content: "\e66e";
+}
+
+.iconfuzhilianjie:before {
+  content: "\e65c";
+}
+
+.iconshouye1:before {
+  content: "\e62e";
+}
+
+.iconshangxiajiantouheise:before {
+  content: "\e809";
+}
+
+.iconjia:before {
+  content: "\e633";
+}
+
+.iconjian:before {
+  content: "\e64e";
+}
+
+.iconjiantou-you-cuxiantiao-fill:before {
+  content: "\e6ae";
+}
+
+.iconxuanzhongduigou:before {
+  content: "\e652";
+}
+
+.iconshuaxin1:before {
+  content: "\e782";
+}
+
+.icon24gl-questionCircle:before {
+  content: "\e97f";
+}
+
+.icondianhua:before {
+  content: "\e6be";
+}
+
+.iconzanwuwuliuxinxi:before {
+  content: "\e674";
+}
+
+.iconzhaoxiangji:before {
+  content: "\e664";
+}
+
+.icongouwuche1:before {
+  content: "\e682";
+}
+
+.iconshoucang_shoucang:before {
+  content: "\e607";
+}
+
+.icona-shoucang-weishoucang:before {
+  content: "\e6f2";
+}
+
+.iconjiahao2fill:before {
+  content: "\e728";
+}
+
+.iconliebiaoxingshi:before {
+  content: "\e742";
+}
+
+.iconqiuzhirenyuan:before {
+  content: "\e66d";
+}
+
+.icondianhua-xianxingyuankuang:before {
+  content: "\e8bc";
+}
+
+.iconshuangxiang:before {
+  content: "\e669";
+}
+
+.iconchuang1:before {
+  content: "\e61a";
+}
+
+.iconfangzi:before {
+  content: "\e8ff";
+}
+
+.iconpeople:before {
+  content: "\e617";
+}
+
+.iconlouceng:before {
+  content: "\e642";
+}
+
+.iconshuliang:before {
+  content: "\e61e";
+}
+
+.iconxingxing:before {
+  content: "\e60d";
+}
+
+.iconrili:before {
+  content: "\e696";
+}
+
+.iconzhixiang:before {
+  content: "\e72f";
+}
+
+.iconzuobiaofill:before {
+  content: "\e768";
+}
+
+.iconxuanze1:before {
+  content: "\e616";
+}
+
+.iconyuandianfengefu:before {
+  content: "\e603";
+}
+
+.iconshouye:before {
+  content: "\e606";
+}
+
+.iconjiantouxia:before {
+  content: "\e67e";
+}
+
+.iconcheckbox_nol:before {
+  content: "\e626";
+}
+
+.iconweixin1:before {
+  content: "\e878";
+}
+
+.iconzhifubaoxuanzhong:before {
+  content: "\e802";
+}
+
+.iconduigou:before {
+  content: "\e632";
+}
+
+.iconzhifushibai:before {
+  content: "\e663";
+}
+
+.iconshouye-zhihui:before {
+  content: "\e61d";
+}
diff --git a/uni-app/src/styles/index.scss b/uni-app/src/styles/index.scss
new file mode 100644
index 00000000..302dd2ad
--- /dev/null
+++ b/uni-app/src/styles/index.scss
@@ -0,0 +1,5 @@
+@import 'uview-plus/index.scss';
+@import 'common.scss';
+@import 'iconfont.css';
+@import 'official-iconfont.css';
+
diff --git a/uni-app/src/styles/member_record_detail.scss b/uni-app/src/styles/member_record_detail.scss
new file mode 100644
index 00000000..56682a3a
--- /dev/null
+++ b/uni-app/src/styles/member_record_detail.scss
@@ -0,0 +1,25 @@
+page{
+	background-color: #f5f6fa;
+	@apply pt-4;
+}
+.member-record-detail{
+	@apply m-4 mt-0 bg-white rounded-md px-4 py-6;
+	.money-wrap{
+		@apply flex items-center flex-col mb-6;
+		text:first-of-type{
+			@apply text-3xl font-bold mt-1;
+		}
+		text:last-of-type{
+			@apply text-sm mt-3;
+		}
+	}
+	.line-wrap{
+		@apply flex justify-between text-sm mt-3;
+		.label{
+			@apply text-[#878787];
+		}
+		.value{
+			@apply text-[#222];
+		}
+	}
+}
\ No newline at end of file
diff --git a/uni-app/src/styles/member_record_list.scss b/uni-app/src/styles/member_record_list.scss
new file mode 100644
index 00000000..f8977612
--- /dev/null
+++ b/uni-app/src/styles/member_record_list.scss
@@ -0,0 +1,21 @@
+.member-record-list{
+	@apply min-h-[100vh];
+	.member-record-item{
+		@apply relative sidebar-margin border-solid border-t-0 border-l-0 border-r-0 border-b-1 border-[#ECEBEC] py-3 mx-[var(--sidebar-m)];
+		.name{
+			@apply text-sm;
+		}
+		.desc{
+			@apply text-xs text-[#8D8C8D] mt-1;
+		}
+		.text-active{
+			color: #FF0D3E;
+		}
+		.money{
+			@apply absolute right-0 top-4 text-base font-bold;
+		}
+		.state{
+			@apply absolute right-0 top-11 text-[#8D8C8D] text-xs;
+		}
+	}
+}
\ No newline at end of file
diff --git a/uni-app/src/styles/official-iconfont.css b/uni-app/src/styles/official-iconfont.css
new file mode 100644
index 00000000..3130f6b6
--- /dev/null
+++ b/uni-app/src/styles/official-iconfont.css
@@ -0,0 +1,1534 @@
+@font-face {
+  font-family: "nc-iconfont"; /* Project id 4567203 */
+  src: url('//at.alicdn.com/t/c/font_4567203_50vcy2zhvll.woff2?t=1739764873517') format('woff2'),
+       url('//at.alicdn.com/t/c/font_4567203_50vcy2zhvll.woff?t=1739764873517') format('woff'),
+       url('//at.alicdn.com/t/c/font_4567203_50vcy2zhvll.ttf?t=1739764873517') format('truetype');
+}
+
+.nc-iconfont {
+  font-family: "nc-iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.nc-icon-cuohaoV6mm1:before {
+  content: "\e85a";
+}
+
+.nc-icon-cuohao-3V6mm:before {
+  content: "\e859";
+}
+
+.nc-icon-a-xiangyouV6mm:before {
+  content: "\e849";
+}
+
+.nc-icon-a-xiangyouV6xx1:before {
+  content: "\e797";
+}
+
+.nc-icon-xiaoxiV6mm1:before {
+  content: "\e83c";
+}
+
+.nc-icon-guanbiV6xx2:before {
+  content: "\e857";
+}
+
+.nc-icon-guanbiV6xx-1:before {
+  content: "\e856";
+}
+
+.nc-icon-fenxiangV6mm2:before {
+  content: "\e854";
+}
+
+.nc-icon-fenxiangV6xx4:before {
+  content: "\e853";
+}
+
+.nc-icon-a-sousuoV6xx-34:before {
+  content: "\e855";
+}
+
+.nc-icon-sousuoV6xx11:before {
+  content: "\e851";
+}
+
+.nc-icon-a-shipinV6xx-28-1:before {
+  content: "\e850";
+}
+
+.nc-icon-a-gengduoV6xx-28:before {
+  content: "\e84f";
+}
+
+.nc-icon-fenxiangV6mm1:before {
+  content: "\e847";
+}
+
+.nc-icon-tupiandaohangpc:before {
+  content: "\e7dc";
+}
+
+.nc-icon-shequfenleiV6xx-1:before {
+  content: "\e84a";
+}
+
+.nc-icon-gouwuV6xx1:before {
+  content: "\e844";
+}
+
+.nc-icon-a-xiangyouV6xx2:before {
+  content: "\e848";
+}
+
+.nc-icon-dianxinxiV6xx1:before {
+  content: "\e842";
+}
+
+.nc-icon-a-dianzanV6xx-36:before {
+  content: "\e7df";
+}
+
+.nc-icon-fenxiangV6xx3:before {
+  content: "\e846";
+}
+
+.nc-icon-xiaoxiV6xx1:before {
+  content: "\e83d";
+}
+
+.nc-icon-liebiaoV6xx1:before {
+  content: "\e841";
+}
+
+.nc-icon-daifujineV6xx:before {
+  content: "\e83b";
+}
+
+.nc-icon-daifuliuyanV6xx:before {
+  content: "\e83a";
+}
+
+.nc-icon-jichuxinxiV6xx:before {
+  content: "\e838";
+}
+
+.nc-icon-dianpuzhandianV6xx:before {
+  content: "\e836";
+}
+
+.nc-icon-gouwucheV6xx6:before {
+  content: "\e835";
+}
+
+.nc-icon-gouwucheV6xx-11:before {
+  content: "\e770";
+}
+
+.nc-icon-a-zuji34:before {
+  content: "\e803";
+}
+
+.nc-icon-zhifujianshu:before {
+  content: "\e831";
+}
+
+.nc-icon-tuikuanjianshu:before {
+  content: "\e830";
+}
+
+.nc-icon-xiadanjianshu:before {
+  content: "\e82f";
+}
+
+.nc-icon-zhifuzhuanhuashuai:before {
+  content: "\e82e";
+}
+
+.nc-icon-chengbenjine:before {
+  content: "\e834";
+}
+
+.nc-icon-tuikuanjine:before {
+  content: "\e833";
+}
+
+.nc-icon-zhifujine:before {
+  content: "\e832";
+}
+
+.nc-icon-gouwuche1:before {
+  content: "\e76e";
+}
+
+.nc-icon-gouwuche:before {
+  content: "\e6ea";
+}
+
+.nc-icon-kabao:before {
+  content: "\e7ec";
+}
+
+.nc-icon-shouyeV6mm1:before {
+  content: "\e7e5";
+}
+
+.nc-icon-shouyeV6xx11:before {
+  content: "\e7bb";
+}
+
+.nc-icon-a-naozhongV6xx-36:before {
+  content: "\e7c4";
+}
+
+.nc-icon-a-shijianV6xx-36:before {
+  content: "\e7c3";
+}
+
+.nc-icon-a-yingyongzhongxinV6xx-36:before {
+  content: "\e7bf";
+}
+
+.nc-icon-a-bangzhuV6xx-36:before {
+  content: "\e7bc";
+}
+
+.nc-icon-a-riliV6xx-36:before {
+  content: "\e7c7";
+}
+
+.nc-icon-a-meiriqiandaoV6xx-36:before {
+  content: "\e7c6";
+}
+
+.nc-icon-a-yingyongliebiaoV6xx-36:before {
+  content: "\e7c5";
+}
+
+.nc-icon-a-shanchu-fanggai2V6xx-36:before {
+  content: "\e7be";
+}
+
+.nc-icon-cuohaoV6xx1:before {
+  content: "\e7cb";
+}
+
+.nc-icon-a-zhanghaoV6xx-36:before {
+  content: "\e7b9";
+}
+
+.nc-icon-a-wodeV6xx-36:before {
+  content: "\e7b8";
+}
+
+.nc-icon-wodeV6mm3:before {
+  content: "\e7b7";
+}
+
+.nc-icon-a-shaixuan-36V6xx-36:before {
+  content: "\e7b3";
+}
+
+.nc-icon-lishijiluV6xx:before {
+  content: "\e6f6";
+}
+
+.nc-icon-paihangbangV6xx:before {
+  content: "\e79d";
+}
+
+.nc-icon-a-xiangshangV6xx1:before {
+  content: "\e799";
+}
+
+.nc-icon-a-xiangxiaV6xx1:before {
+  content: "\e796";
+}
+
+.nc-icon-fuzhiV6xx1:before {
+  content: "\e76c";
+}
+
+.nc-icon-kefuV6xx1:before {
+  content: "\e76a";
+}
+
+.nc-icon-huiyuandengjiV6xx1:before {
+  content: "\e761";
+}
+
+.nc-icon-gerenzhongxinV6xx:before {
+  content: "\e762";
+}
+
+.nc-icon-gerenzhongxinV6mm1:before {
+  content: "\e763";
+}
+
+.nc-icon-chuangV6xx:before {
+  content: "\e764";
+}
+
+.nc-icon-zujiV6xx:before {
+  content: "\e765";
+}
+
+.nc-icon-gouwucheV6xx2:before {
+  content: "\e766";
+}
+
+.nc-icon-dianzanV6mm:before {
+  content: "\e767";
+}
+
+.nc-icon-pintuanV6xx:before {
+  content: "\e768";
+}
+
+.nc-icon-pintuanV6mm:before {
+  content: "\e769";
+}
+
+.nc-icon-zujiV6mm1:before {
+  content: "\e76b";
+}
+
+.nc-icon-dingweiV6mm:before {
+  content: "\e76f";
+}
+
+.nc-icon-dingweiV6mm-2:before {
+  content: "\e76d";
+}
+
+.nc-icon-xiaolian-2:before {
+  content: "\e6e8";
+}
+
+.nc-icon-xiaolian-1:before {
+  content: "\e6e9";
+}
+
+.nc-icon-sousuo-duanV6xx1:before {
+  content: "\e6f1";
+}
+
+.nc-icon-shanchu-yuangaizhiV6xx:before {
+  content: "\e6e7";
+}
+
+.nc-icon-dingweiV6xx1:before {
+  content: "\e6f0";
+}
+
+.nc-icon-dingweiV6xx-1:before {
+  content: "\e6ef";
+}
+
+.nc-icon-sousuoV6xx1:before {
+  content: "\e6e5";
+}
+
+.nc-icon-sousuo-duanV6xx:before {
+  content: "\e6e4";
+}
+
+.nc-icon-gouwucheV6mm1:before {
+  content: "\e6e3";
+}
+
+.nc-icon-gouwucheV6xx1:before {
+  content: "\e6e2";
+}
+
+.nc-icon-dingweiV6xx:before {
+  content: "\e6e6";
+}
+
+.nc-icon-yueV6xx1:before {
+  content: "\e641";
+}
+
+.nc-icon-youhuiV6xx1:before {
+  content: "\e642";
+}
+
+.nc-icon-shezhi-1V6xx:before {
+  content: "\e643";
+}
+
+.nc-icon-youhuiquanV6xx1:before {
+  content: "\e644";
+}
+
+.nc-icon-youhuiquanV6xx-11:before {
+  content: "\e645";
+}
+
+.nc-icon-wodeshoucangV6xx1:before {
+  content: "\e646";
+}
+
+.nc-icon-shoucangV6xx-11:before {
+  content: "\e647";
+}
+
+.nc-icon-bianjiV6xx:before {
+  content: "\e648";
+}
+
+.nc-icon-tuikuanV6xx1:before {
+  content: "\e649";
+}
+
+.nc-icon-wendangV6xx1:before {
+  content: "\e64a";
+}
+
+.nc-icon-shaixuanV6xx1:before {
+  content: "\e64b";
+}
+
+.nc-icon-jifenduihuanV6xx1:before {
+  content: "\e64c";
+}
+
+.nc-icon-fenxiangV6xx1:before {
+  content: "\e64d";
+}
+
+.nc-icon-shoucangV6xx1:before {
+  content: "\e64e";
+}
+
+.nc-icon-lianjieV6xx1:before {
+  content: "\e64f";
+}
+
+.nc-icon-shezhiV6xx1:before {
+  content: "\e650";
+}
+
+.nc-icon-fenxiaoV6xx1:before {
+  content: "\e651";
+}
+
+.nc-icon-chakanV6xx:before {
+  content: "\e653";
+}
+
+.nc-icon-wodedengjiV6xx1:before {
+  content: "\e652";
+}
+
+.nc-icon-duanxinV6xx1:before {
+  content: "\e654";
+}
+
+.nc-icon-liebiaoV6xx:before {
+  content: "\e655";
+}
+
+.nc-icon-biaoqianV6xx1:before {
+  content: "\e656";
+}
+
+.nc-icon-ruzhurenV6xx:before {
+  content: "\e657";
+}
+
+.nc-icon-xiugaiV6xx:before {
+  content: "\e658";
+}
+
+.nc-icon-bianjiV6xx1:before {
+  content: "\e659";
+}
+
+.nc-icon-shouyeV6xx1:before {
+  content: "\e65a";
+}
+
+.nc-icon-bangzhuV6mm:before {
+  content: "\e65b";
+}
+
+.nc-icon-tanhaoV6mm-1:before {
+  content: "\e65c";
+}
+
+.nc-icon-bangzhuV6mm-1:before {
+  content: "\e65d";
+}
+
+.nc-icon-tanhaoV6mm:before {
+  content: "\e65e";
+}
+
+.nc-icon-zhuyiV6mm:before {
+  content: "\e65f";
+}
+
+.nc-icon-tianjiaV6mm:before {
+  content: "\e660";
+}
+
+.nc-icon-duihaoV6mm:before {
+  content: "\e661";
+}
+
+.nc-icon-jianshaoV6mm:before {
+  content: "\e662";
+}
+
+.nc-icon-cuohaoV6mm:before {
+  content: "\e663";
+}
+
+.nc-icon-gouwucheV6mm-1:before {
+  content: "\e664";
+}
+
+.nc-icon-lishijiluV6mm:before {
+  content: "\e665";
+}
+
+.nc-icon-jiamengV6mm:before {
+  content: "\e666";
+}
+
+.nc-icon-hexiaotaiV6mm:before {
+  content: "\e667";
+}
+
+.nc-icon-yingyongzhongxinV6mm:before {
+  content: "\e668";
+}
+
+.nc-icon-jiaohuanV6mm:before {
+  content: "\e669";
+}
+
+.nc-icon-gouwucheV6mm:before {
+  content: "\e66a";
+}
+
+.nc-icon-yingyongzhongxinV6mm-1:before {
+  content: "\e66b";
+}
+
+.nc-icon-fenleiV6mm:before {
+  content: "\e66c";
+}
+
+.nc-icon-liebiaoV6mm:before {
+  content: "\e66d";
+}
+
+.nc-icon-yingyongV6mm:before {
+  content: "\e66e";
+}
+
+.nc-icon-yingyongliebiaoV6mm:before {
+  content: "\e66f";
+}
+
+.nc-icon-xiangyouV6mm:before {
+  content: "\e670";
+}
+
+.nc-icon-xiangzuoV6mm:before {
+  content: "\e671";
+}
+
+.nc-icon-ruzhurenV6mm:before {
+  content: "\e672";
+}
+
+.nc-icon-xiangxiaV6mm:before {
+  content: "\e673";
+}
+
+.nc-icon-xiangshangV6mm:before {
+  content: "\e674";
+}
+
+.nc-icon-shouyeV6mm:before {
+  content: "\e675";
+}
+
+.nc-icon-shezhiV6mm-2:before {
+  content: "\e676";
+}
+
+.nc-icon-youjianV6mm:before {
+  content: "\e677";
+}
+
+.nc-icon-xiaoxiV6mm:before {
+  content: "\e678";
+}
+
+.nc-icon-xinxiV6mm:before {
+  content: "\e679";
+}
+
+.nc-icon-woV6mm:before {
+  content: "\e67a";
+}
+
+.nc-icon-shezhiV6mm:before {
+  content: "\e67b";
+}
+
+.nc-icon-wodeV6mm:before {
+  content: "\e67c";
+}
+
+.nc-icon-shezhiV6mm-1:before {
+  content: "\e67d";
+}
+
+.nc-icon-kefuV6mm-1:before {
+  content: "\e67e";
+}
+
+.nc-icon-kefu-huatongV6mm:before {
+  content: "\e67f";
+}
+
+.nc-icon-qiuzhirenyuanV6mm:before {
+  content: "\e680";
+}
+
+.nc-icon-piaoxinxiV6mm:before {
+  content: "\e681";
+}
+
+.nc-icon-lianxikefuV6mm:before {
+  content: "\e682";
+}
+
+.nc-icon-kefu-erjiV6mm:before {
+  content: "\e683";
+}
+
+.nc-icon-dianxinxiV6mm:before {
+  content: "\e684";
+}
+
+.nc-icon-kefuV6mm-2:before {
+  content: "\e685";
+}
+
+.nc-icon-duanxinV6mm-1:before {
+  content: "\e686";
+}
+
+.nc-icon-gerenzhongxinV6mm:before {
+  content: "\e687";
+}
+
+.nc-icon-kefuV6mm:before {
+  content: "\e688";
+}
+
+.nc-icon-fenxiangV6mm:before {
+  content: "\e689";
+}
+
+.nc-icon-duanxinV6mm:before {
+  content: "\e68a";
+}
+
+.nc-icon-xiangjiV6mm-1:before {
+  content: "\e68b";
+}
+
+.nc-icon-wodeV6mm1:before {
+  content: "\e68c";
+}
+
+.nc-icon-shuaxinV6mm:before {
+  content: "\e68d";
+}
+
+.nc-icon-xiangjiV6mm:before {
+  content: "\e68e";
+}
+
+.nc-icon-sousuoV6mm:before {
+  content: "\e68f";
+}
+
+.nc-icon-shoucangV6mm-1:before {
+  content: "\e690";
+}
+
+.nc-icon-xihuanV6mm:before {
+  content: "\e691";
+}
+
+.nc-icon-wodeshoucangV6mm:before {
+  content: "\e692";
+}
+
+.nc-icon-shizhongV6mm:before {
+  content: "\e693";
+}
+
+.nc-icon-shoucangV6mm:before {
+  content: "\e694";
+}
+
+.nc-icon-naolingV6mm:before {
+  content: "\e695";
+}
+
+.nc-icon-shijianV6mm:before {
+  content: "\e696";
+}
+
+.nc-icon-naozhongV6mm:before {
+  content: "\e697";
+}
+
+.nc-icon-biaoqianV6mm:before {
+  content: "\e698";
+}
+
+.nc-icon-lingdangV6mm:before {
+  content: "\e699";
+}
+
+.nc-icon-biaoqianV6mm-1:before {
+  content: "\e69a";
+}
+
+.nc-icon-lishijiluV6mm1:before {
+  content: "\e69b";
+}
+
+.nc-icon-daifahuoV6mm:before {
+  content: "\e69c";
+}
+
+.nc-icon-jishibenV6mm:before {
+  content: "\e69d";
+}
+
+.nc-icon-bianqianV6mm:before {
+  content: "\e69e";
+}
+
+.nc-icon-bianjiV6mm:before {
+  content: "\e69f";
+}
+
+.nc-icon-bijiV6mm:before {
+  content: "\e6a0";
+}
+
+.nc-icon-bijiV6mm-1:before {
+  content: "\e6a1";
+}
+
+.nc-icon-youhuiquanV6mm:before {
+  content: "\e6a2";
+}
+
+.nc-icon-youhuiV6mm:before {
+  content: "\e6a3";
+}
+
+.nc-icon-shangchengV6mm:before {
+  content: "\e6a4";
+}
+
+.nc-icon-zhekouquanV6mm:before {
+  content: "\e6a5";
+}
+
+.nc-icon-youhuiquanV6mm-1:before {
+  content: "\e6a6";
+}
+
+.nc-icon-yueV6mm:before {
+  content: "\e6a7";
+}
+
+.nc-icon-qianbaoyueV6mm:before {
+  content: "\e6a8";
+}
+
+.nc-icon-qianbaoV6mm:before {
+  content: "\e6a9";
+}
+
+.nc-icon-liwuV6mm:before {
+  content: "\e6aa";
+}
+
+.nc-icon-jifenduihuanV6mm:before {
+  content: "\e6ab";
+}
+
+.nc-icon-biaoqianV6mm1:before {
+  content: "\e6ac";
+}
+
+.nc-icon-libaoV6mm:before {
+  content: "\e6ad";
+}
+
+.nc-icon-jinrongV6mm:before {
+  content: "\e6ae";
+}
+
+.nc-icon-wodetuiguangV6mm:before {
+  content: "\e6af";
+}
+
+.nc-icon-wodedengjiV6mm:before {
+  content: "\e6b0";
+}
+
+.nc-icon-tuiguangV6mm:before {
+  content: "\e6b1";
+}
+
+.nc-icon-yinhangkaV6mm:before {
+  content: "\e6b2";
+}
+
+.nc-icon-huiyuandengjiV6mm:before {
+  content: "\e6b3";
+}
+
+.nc-icon-meiriqiandaoV6mm:before {
+  content: "\e6b4";
+}
+
+.nc-icon-daifahuoV6mm1:before {
+  content: "\e6b5";
+}
+
+.nc-icon-riliV6mm:before {
+  content: "\e6b6";
+}
+
+.nc-icon-daifahuoV6mm-1:before {
+  content: "\e6b7";
+}
+
+.nc-icon-fenxiaoV6mm:before {
+  content: "\e6b8";
+}
+
+.nc-icon-daishouhuoV6mm:before {
+  content: "\e6b9";
+}
+
+.nc-icon-dizhiV6mm:before {
+  content: "\e6ba";
+}
+
+.nc-icon-lianjieV6mm:before {
+  content: "\e6bb";
+}
+
+.nc-icon-dianhuaV6mm:before {
+  content: "\e6bc";
+}
+
+.nc-icon-jifenV6mm:before {
+  content: "\e6bd";
+}
+
+.nc-icon-hexiaotaiV6mm1:before {
+  content: "\e6be";
+}
+
+.nc-icon-saomaV6mm:before {
+  content: "\e6bf";
+}
+
+.nc-icon-jiaohuanV6mm1:before {
+  content: "\e6c0";
+}
+
+.nc-icon-kuozhanV6mm:before {
+  content: "\e6c1";
+}
+
+.nc-icon-loucengV6mm:before {
+  content: "\e6c2";
+}
+
+.nc-icon-erweimaV6mm-1:before {
+  content: "\e6c3";
+}
+
+.nc-icon-fuzhiV6mm:before {
+  content: "\e6c4";
+}
+
+.nc-icon-erweimaV6mm:before {
+  content: "\e6c5";
+}
+
+.nc-icon-changjiantouV6mm:before {
+  content: "\e6c6";
+}
+
+.nc-icon-zujiV6mm:before {
+  content: "\e6c7";
+}
+
+.nc-icon-chakanV6mm:before {
+  content: "\e6c8";
+}
+
+.nc-icon-meiriqiandaoV6mm1:before {
+  content: "\e6c9";
+}
+
+.nc-icon-bijiV6mm1:before {
+  content: "\e6ca";
+}
+
+.nc-icon-shangxiajiantouV6mm:before {
+  content: "\e6cb";
+}
+
+.nc-icon-tiaoxingmaV6mm:before {
+  content: "\e6cc";
+}
+
+.nc-icon-xiayibuV6xx:before {
+  content: "\e6cd";
+}
+
+.nc-icon-duiV6mm:before {
+  content: "\e6ce";
+}
+
+.nc-icon-shangyibuV6xx:before {
+  content: "\e6cf";
+}
+
+.nc-icon-lianxidianhuaV6mm:before {
+  content: "\e6d0";
+}
+
+.nc-icon-lianxidianhuaV6xx:before {
+  content: "\e6d1";
+}
+
+.nc-icon-duiV6xx:before {
+  content: "\e6d2";
+}
+
+.nc-icon-pengyouquanV6mm-1:before {
+  content: "\e6d3";
+}
+
+.nc-icon-zhifubao-yuanV6mm:before {
+  content: "\e6d4";
+}
+
+.nc-icon-weixinV6mm-1:before {
+  content: "\e6d5";
+}
+
+.nc-icon-weixinV6mm:before {
+  content: "\e6d6";
+}
+
+.nc-icon-zhifubaoV6mm:before {
+  content: "\e6d7";
+}
+
+.nc-icon-zhifubao-fangV6mm:before {
+  content: "\e6d8";
+}
+
+.nc-icon-pengyouquanV6mm:before {
+  content: "\e6d9";
+}
+
+.nc-icon-shouye-xiaolianV6xx:before {
+  content: "\e6da";
+}
+
+.nc-icon-hexiaoV6xx:before {
+  content: "\e6db";
+}
+
+.nc-icon-hexiaoV6mm:before {
+  content: "\e6dc";
+}
+
+.nc-icon-kaifazhelianmengV6xx:before {
+  content: "\e6dd";
+}
+
+.nc-icon-kaifazhelianmengV6xx-1:before {
+  content: "\e6de";
+}
+
+.nc-icon-gerenziliaoV6xx:before {
+  content: "\e6df";
+}
+
+.nc-icon-gerenziliaoV6mm:before {
+  content: "\e6e0";
+}
+
+.nc-icon-fangziV6xx:before {
+  content: "\e6e1";
+}
+
+.nc-icon-guanbiV6xx:before {
+  content: "\e621";
+}
+
+.nc-icon-duihaoV6xx-1:before {
+  content: "\e622";
+}
+
+.nc-icon-bangzhuV6xx:before {
+  content: "\e623";
+}
+
+.nc-icon-duihaoV6xx:before {
+  content: "\e624";
+}
+
+.nc-icon-cuohaoV6xx:before {
+  content: "\e625";
+}
+
+.nc-icon-jiahaoV6xx:before {
+  content: "\e626";
+}
+
+.nc-icon-zhuyiV6xx:before {
+  content: "\e627";
+}
+
+.nc-icon-jianshaoV6xx:before {
+  content: "\e628";
+}
+
+.nc-icon-jianV6xx:before {
+  content: "\e629";
+}
+
+.nc-icon-zhixiang-youjiantouV6xx:before {
+  content: "\e62a";
+}
+
+.nc-icon-zuoV6xx:before {
+  content: "\e62b";
+}
+
+.nc-icon-zuoV6xx-1:before {
+  content: "\e62c";
+}
+
+.nc-icon-changjiantouV6xx:before {
+  content: "\e62d";
+}
+
+.nc-icon-xiangxiaV6xx-1:before {
+  content: "\e62e";
+}
+
+.nc-icon-xiangzuoV6xx:before {
+  content: "\e62f";
+}
+
+.nc-icon-xiangzuoV6xx-1:before {
+  content: "\e630";
+}
+
+.nc-icon-youV6xx:before {
+  content: "\e631";
+}
+
+.nc-icon-xiangyouV6xx-1:before {
+  content: "\e632";
+}
+
+.nc-icon-xiangyouV6xx:before {
+  content: "\e633";
+}
+
+.nc-icon-xiangyouV6xx-2:before {
+  content: "\e634";
+}
+
+.nc-icon-xiaV6xx-1:before {
+  content: "\e635";
+}
+
+.nc-icon-xiangxiaV6xx:before {
+  content: "\e636";
+}
+
+.nc-icon-tianjiaV6xx:before {
+  content: "\e637";
+}
+
+.nc-icon-tanhaoV6xx:before {
+  content: "\e638";
+}
+
+.nc-icon-xiangshangV6xx:before {
+  content: "\e639";
+}
+
+.nc-icon-xiangshangV6xx-1:before {
+  content: "\e63a";
+}
+
+.nc-icon-xiaV6xx:before {
+  content: "\e63b";
+}
+
+.nc-icon-tanhaoV6xx-1:before {
+  content: "\e63c";
+}
+
+.nc-icon-shangV6xx:before {
+  content: "\e63d";
+}
+
+.nc-icon-shangxiaxuanzeV6xx:before {
+  content: "\e63e";
+}
+
+.nc-icon-shangV6xx-1:before {
+  content: "\e63f";
+}
+
+.nc-icon-shangxiajiantouV6xx:before {
+  content: "\e640";
+}
+
+.nc-icon-jiamengV6xx:before {
+  content: "\e6f9";
+}
+
+.nc-icon-yingyongzhongxinV6xx-1:before {
+  content: "\e6f5";
+}
+
+.nc-icon-yingyongzhongxinV6xx:before {
+  content: "\e6fd";
+}
+
+.nc-icon-yingyongV6xx:before {
+  content: "\e6f4";
+}
+
+.nc-icon-gouwucheV6xx-2:before {
+  content: "\e6fe";
+}
+
+.nc-icon-shouyeV6xx:before {
+  content: "\e6ff";
+}
+
+.nc-icon-yingyongliebiaoV6xx:before {
+  content: "\e700";
+}
+
+.nc-icon-gouwucheV6xx-1:before {
+  content: "\e701";
+}
+
+.nc-icon-gouwucheV6xx:before {
+  content: "\e702";
+}
+
+.nc-icon-fenleiV6xx:before {
+  content: "\e703";
+}
+
+.nc-icon-jiamengV6xx1:before {
+  content: "\e704";
+}
+
+.nc-icon-wodeV6xx1:before {
+  content: "\e705";
+}
+
+.nc-icon-wodeV6xx-11:before {
+  content: "\e706";
+}
+
+.nc-icon-qiuzhirenyuanV6xx1:before {
+  content: "\e707";
+}
+
+.nc-icon-gerenzhongxinV6xx2:before {
+  content: "\e708";
+}
+
+.nc-icon-woV6xx1:before {
+  content: "\e709";
+}
+
+.nc-icon-ruzhurenV6xx1:before {
+  content: "\e70a";
+}
+
+.nc-icon-xiangjiV6xx:before {
+  content: "\e70b";
+}
+
+.nc-icon-shezhiV6xx-1:before {
+  content: "\e70c";
+}
+
+.nc-icon-sousuoV6xx:before {
+  content: "\e70d";
+}
+
+.nc-icon-xiangjiV6xx-1:before {
+  content: "\e70e";
+}
+
+.nc-icon-shuaxinV6xx:before {
+  content: "\e70f";
+}
+
+.nc-icon-shezhiV6xx-2:before {
+  content: "\e710";
+}
+
+.nc-icon-shaixuanV6xx:before {
+  content: "\e711";
+}
+
+.nc-icon-shezhiV6xx:before {
+  content: "\e712";
+}
+
+.nc-icon-fenxiangV6xx-1:before {
+  content: "\e713";
+}
+
+.nc-icon-fenxiangV6xx-2:before {
+  content: "\e714";
+}
+
+.nc-icon-fenxiangV6xx:before {
+  content: "\e715";
+}
+
+.nc-icon-xiaoxiV6xx:before {
+  content: "\e716";
+}
+
+.nc-icon-duanxinV6xx-1:before {
+  content: "\e717";
+}
+
+.nc-icon-xinxiV6xx:before {
+  content: "\e718";
+}
+
+.nc-icon-kefuV6xx:before {
+  content: "\e719";
+}
+
+.nc-icon-lianxikefuV6xx:before {
+  content: "\e71a";
+}
+
+.nc-icon-piaoxinxiV6xx:before {
+  content: "\e71b";
+}
+
+.nc-icon-kefuV6xx-4:before {
+  content: "\e71c";
+}
+
+.nc-icon-kefuV6xx-2:before {
+  content: "\e71d";
+}
+
+.nc-icon-kefuV6xx-1:before {
+  content: "\e71e";
+}
+
+.nc-icon-dakaixinxiV6xx:before {
+  content: "\e71f";
+}
+
+.nc-icon-dianxinxiV6xx:before {
+  content: "\e720";
+}
+
+.nc-icon-kefuV6xx-3:before {
+  content: "\e721";
+}
+
+.nc-icon-duanxinV6xx:before {
+  content: "\e722";
+}
+
+.nc-icon-wodeshoucangV6xx:before {
+  content: "\e723";
+}
+
+.nc-icon-naolingV6xx:before {
+  content: "\e724";
+}
+
+.nc-icon-shoucangV6xx:before {
+  content: "\e725";
+}
+
+.nc-icon-shoucangV6xx-1:before {
+  content: "\e726";
+}
+
+.nc-icon-shijianV6xx:before {
+  content: "\e727";
+}
+
+.nc-icon-lingdangV6xx:before {
+  content: "\e728";
+}
+
+.nc-icon-shizhongV6xx:before {
+  content: "\e729";
+}
+
+.nc-icon-guanzhuV6xx:before {
+  content: "\e72a";
+}
+
+.nc-icon-naozhongV6xx:before {
+  content: "\e72b";
+}
+
+.nc-icon-daifahuoV6xx:before {
+  content: "\e72c";
+}
+
+.nc-icon-shangchengV6xx:before {
+  content: "\e72d";
+}
+
+.nc-icon-youhuiV6xx:before {
+  content: "\e72e";
+}
+
+.nc-icon-zongjifenV6xx:before {
+  content: "\e72f";
+}
+
+.nc-icon-zhekouquanV6xx:before {
+  content: "\e730";
+}
+
+.nc-icon-jifenV6xx:before {
+  content: "\e731";
+}
+
+.nc-icon-youhuiquanV6xx-2:before {
+  content: "\e732";
+}
+
+.nc-icon-youhuiquanV6xx-1:before {
+  content: "\e733";
+}
+
+.nc-icon-jifenduihuanV6xx:before {
+  content: "\e734";
+}
+
+.nc-icon-youhuiquanV6xx:before {
+  content: "\e735";
+}
+
+.nc-icon-libaoV6xx:before {
+  content: "\e736";
+}
+
+.nc-icon-liwuV6xx:before {
+  content: "\e737";
+}
+
+.nc-icon-biaoqianV6xx:before {
+  content: "\e738";
+}
+
+.nc-icon-qianbaoyueV6xx:before {
+  content: "\e739";
+}
+
+.nc-icon-tuikuanV6xx:before {
+  content: "\e73a";
+}
+
+.nc-icon-qianbaoV6xx:before {
+  content: "\e73b";
+}
+
+.nc-icon-yueV6xx:before {
+  content: "\e73c";
+}
+
+.nc-icon-jinrongV6xx:before {
+  content: "\e73d";
+}
+
+.nc-icon-riliV6xx:before {
+  content: "\e73e";
+}
+
+.nc-icon-wodedengjiV6xx:before {
+  content: "\e73f";
+}
+
+.nc-icon-tuiguangV6xx:before {
+  content: "\e740";
+}
+
+.nc-icon-huiyuandengjiV6xx:before {
+  content: "\e741";
+}
+
+.nc-icon-wodetuiguangV6xx:before {
+  content: "\e742";
+}
+
+.nc-icon-fenxiaoV6xx:before {
+  content: "\e743";
+}
+
+.nc-icon-meiriqiandaoV6xx:before {
+  content: "\e744";
+}
+
+.nc-icon-dizhiguanliV6xx:before {
+  content: "\e745";
+}
+
+.nc-icon-daishouhuoV6xx:before {
+  content: "\e746";
+}
+
+.nc-icon-daishouhuoV6xx-3:before {
+  content: "\e747";
+}
+
+.nc-icon-daifahuoV6xx-2:before {
+  content: "\e748";
+}
+
+.nc-icon-yinhangkaV6xx:before {
+  content: "\e749";
+}
+
+.nc-icon-daifahuoV6xx-1:before {
+  content: "\e74a";
+}
+
+.nc-icon-daifahuoV6xx-3:before {
+  content: "\e74b";
+}
+
+.nc-icon-zhankai-yousuojinV6xx:before {
+  content: "\e74c";
+}
+
+.nc-icon-shouqi-zuosuojinV6xx:before {
+  content: "\e74d";
+}
+
+.nc-icon-wendangV6xx:before {
+  content: "\e74e";
+}
+
+.nc-icon-xiaolianV6xx:before {
+  content: "\e74f";
+}
+
+.nc-icon-jiaohuanV6xx:before {
+  content: "\e750";
+}
+
+.nc-icon-yuanquanV6xx:before {
+  content: "\e751";
+}
+
+.nc-icon-a-Group840V6xx:before {
+  content: "\e752";
+}
+
+.nc-icon-loucengV6xx:before {
+  content: "\e753";
+}
+
+.nc-icon-kuozhanV6xx:before {
+  content: "\e754";
+}
+
+.nc-icon-saoyisaoV6xx:before {
+  content: "\e755";
+}
+
+.nc-icon-saotiaoxingmaV6xx:before {
+  content: "\e756";
+}
+
+.nc-icon-saotiaoxingmaV6xx-1:before {
+  content: "\e757";
+}
+
+.nc-icon-erweimaV6xx-1:before {
+  content: "\e758";
+}
+
+.nc-icon-fuzhiV6xx:before {
+  content: "\e759";
+}
+
+.nc-icon-lianjieV6xx:before {
+  content: "\e75a";
+}
+
+.nc-icon-dianhuaV6xx:before {
+  content: "\e75b";
+}
+
+.nc-icon-hexiaotaiV6xx:before {
+  content: "\e75c";
+}
+
+.nc-icon-fengefuV6xx:before {
+  content: "\e75d";
+}
+
+.nc-icon-fangdaV6xx:before {
+  content: "\e75e";
+}
+
+.nc-icon-erweimaV6xx:before {
+  content: "\e75f";
+}
+
+.nc-icon-daifahuoV6xx-4:before {
+  content: "\e760";
+}
diff --git a/uni-app/src/styles/uview-theme.scss b/uni-app/src/styles/uview-theme.scss
new file mode 100644
index 00000000..c6572897
--- /dev/null
+++ b/uni-app/src/styles/uview-theme.scss
@@ -0,0 +1,40 @@
+$u-main-color: #303133;
+$u-content-color: #606266;
+$u-tips-color: #909193;
+$u-light-color: #c0c4cc;
+$u-border-color: #dadbde;
+$u-bg-color: #f3f4f6;
+$u-disabled-color: #c8c9cc;
+
+$u-primary: var(--primary-color);
+$u-primary-dark: var(--primary-color-dark);
+$u-primary-disabled: var(--primary-color-disabled);
+$u-primary-light: var(--primary-color-light);
+
+$u-warning: #f9ae3d;
+$u-warning-dark: #f1a532;
+$u-warning-disabled: #f9d39b;
+$u-warning-light: #fdf6ec;
+
+$u-success: #5ac725;
+$u-success-dark: #53c21d;
+$u-success-disabled: #a9e08f;
+$u-success-light: #f5fff0;
+
+$u-error: #f56c6c;
+$u-error-dark: #e45656;
+$u-error-disabled: #f7b2b2;
+$u-error-light: #fef0f0;
+
+$u-info: #909399;
+$u-info-dark: #767a82;
+$u-info-disabled: #c4c6c9;
+$u-info-light: #f4f4f5;
+
+// scss混入，为了少写几行#ifndef
+@mixin flex($direction: row) {
+    /* #ifndef APP-NVUE */
+    display: flex;
+    /* #endif */
+    flex-direction: $direction;
+}
diff --git a/uni-app/src/types/global.d.ts b/uni-app/src/types/global.d.ts
new file mode 100644
index 00000000..ef732327
--- /dev/null
+++ b/uni-app/src/types/global.d.ts
@@ -0,0 +1,21 @@
+declare interface redirectOptions {
+    url : string
+    mode ?: 'switchTab' | 'navigateTo' | 'reLaunch' | 'redirectTo'
+    param ?: AnyObject
+    success ?: () => {}
+    fail ?: () => {}
+    complete ?: () => {}
+}
+
+declare interface requestMobileParam {
+    mobile : string,
+    captcha_code : string,
+    captcha_key : string,
+    type : string
+}
+
+declare interface responseResult {
+    code : number,
+    data : any,
+    msg : string
+}
\ No newline at end of file
diff --git a/uni-app/src/types/weixin-js-sdk.d.ts b/uni-app/src/types/weixin-js-sdk.d.ts
new file mode 100644
index 00000000..b90ee8d2
--- /dev/null
+++ b/uni-app/src/types/weixin-js-sdk.d.ts
@@ -0,0 +1,769 @@
+declare namespace WeixinJsSdk {
+    /** **************************************************************************
+     * Type definations
+     ****************************************************************************/
+    type JSApis =
+        | 'onMenuShareTimeline'
+        | 'onMenuShareAppMessage'
+        | 'onMenuShareQQ'
+        | 'onMenuShareWeibo'
+        | 'onMenuShareQZone'
+        | 'startRecord'
+        | 'stopRecord'
+        | 'onVoiceRecordEnd'
+        | 'playVoice'
+        | 'pauseVoice'
+        | 'stopVoice'
+        | 'onVoicePlayEnd'
+        | 'uploadVoice'
+        | 'downloadVoice'
+        | 'chooseImage'
+        | 'previewImage'
+        | 'uploadImage'
+        | 'downloadImage'
+        | 'translateVoice'
+        | 'getNetworkType'
+        | 'openLocation'
+        | 'getLocation'
+        | 'hideOptionMenu'
+        | 'showOptionMenu'
+        | 'hideMenuItems'
+        | 'showMenuItems'
+        | 'hideAllNonBaseMenuItem'
+        | 'showAllNonBaseMenuItem'
+        | 'closeWindow'
+        | 'scanQRCode'
+        | 'chooseWXPay'
+        | 'openProductSpecificView'
+        | 'addCard'
+        | 'chooseCard'
+        | 'openCard'
+        | 'checkJsApi'
+        | 'onRecordEnd'
+        | 'openWXDeviceLib'
+        | 'closeWXDeviceLib'
+        | 'configWXDeviceWiFi'
+        | 'getWXDeviceInfos'
+        | 'sendDataToWXDevice'
+        | 'startScanWXDevice'
+        | 'stopScanWXDevice'
+        | 'connectWXDevice'
+        | 'disconnectWXDevice'
+        | 'getWXDeviceTicket'
+        | 'WeixinJSBridgeReady'
+        | 'onWXDeviceBindStateChange'
+        | 'onWXDeviceStateChange'
+        | 'onScanWXDeviceResult'
+        | 'onReceiveDataFromWXDevice'
+        | 'onWXDeviceBluetoothStateChange'
+        | 'updateAppMessageShareData'
+        | 'updateTimelineShareData'
+
+    type Menus =
+        | 'menuItem:exposeArticle' // 举报
+        | 'menuItem:setFont' // 调整字体
+        | 'menuItem:dayMode' // 日间模式
+        | 'menuItem:nightMode' // 夜间模式
+        | 'menuItem:refresh' // 刷新
+        | 'menuItem:profile' // 查看公众号（已添加）
+        | 'menuItem:addContact' // 查看公众号（未添加）
+        | 'menuItem:share:appMessage' // 发送给朋友
+        | 'menuItem:share:timeline' // 分享到朋友圈
+        | 'menuItem:share:qq' // 分享到 QQ
+        | 'menuItem:share:weiboApp' // 分享到 Weibo
+        | 'menuItem:favorite' // 收藏
+        | 'menuItem:share:facebook' // 分享到 Facebook
+        | 'menuItem:share:QZone' // 分享到 QQ 空间
+        | 'menuItem:editTag' // 编辑标签
+        | 'menuItem:delete' // 删除
+        | 'menuItem:copyUrl' // 复制链接
+        | 'menuItem:originPage' // 原网页
+        | 'menuItem:readMode' // 阅读模式
+        | 'menuItem:openWithQQBrowser' // 在QQ浏览器中打开
+        | 'menuItem:openWithSafari' // 在Safari中打开
+        | 'menuItem:share:email' // 邮件
+        | 'menuItem:share:brand' // 一些特殊公众号
+
+    type scanTypes =
+        | 'qrCode' // 二维码
+        | 'barCode' // 一维码
+
+    type ImageSize = 'original' | 'compressed'
+    type SourceType = 'album' | 'camera'
+
+    /** **************************************************************************
+     * Interface definations
+     ****************************************************************************/
+
+    interface ConfigOptions {
+        /**
+         * 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，
+         * 可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
+         */
+        debug ?: boolean
+
+        /**
+         * 公众号的唯一标识
+         */
+        appId : string
+
+        /**
+         * 生成签名的时间戳
+         */
+        timestamp : string | number
+
+        /**
+         * 生成签名的随机串
+         */
+        nonceStr : string
+
+        /**
+         * 签名
+         */
+        signature : string
+
+        /**
+         * 需要使用的JS接口列表
+         */
+        jsApiList : JSApis[]
+        /* beta */
+        // beta: boolean
+        [x : string] : any
+    }
+
+    /**
+     * 所有接口通过wx对象(也可使用jWeixin对象)来调用，参数是一个对象，
+     * 除了每个接口本身需要传的参数之外，还有以下通用参数
+     */
+    interface Callbacks {
+        /**
+         * 接口调用成功时执行的回调函数。
+         */
+        success ?: (res : any) => void
+
+        /**
+         * 接口调用失败时执行的回调函数。
+         */
+        fail ?: (res : any) => void
+
+        /**
+         * 接口调用完成时执行的回调函数，无论成功或失败都会执行。
+         */
+        complete ?: (res : any) => void
+
+        /**
+         * 用户点击取消时的回调函数，仅部分有用户取消操作的api才会用到。
+         */
+        cancel ?: (res : any) => void
+    }
+
+    interface MenuCallbacks extends Callbacks {
+        /**
+         * 监听Menu中的按钮点击时触发的方法，该方法仅支持Menu中的相关接口。
+         */
+        trigger ?: (res : any) => void
+    }
+
+    interface CheckJsApiOptions extends Callbacks {
+        /**
+         * 需要检测的JS接口列表
+         */
+        jsApiList : JSApis[]
+    }
+
+    interface OnMenuShareTimelineOptions extends MenuCallbacks {
+        /**
+         * 分享标题
+         */
+        title : string
+
+        /**
+         * 分享链接，该链接域名或路径必须与当前页面对应的公众号JS安全域名一致
+         */
+        link : string
+
+        /**
+         * 分享图标
+         */
+        imgUrl ?: string
+    }
+
+    interface OnMenuShareAppMessageOptions extends OnMenuShareTimelineOptions {
+        /**
+         * 分享描述
+         */
+        desc ?: string
+
+        /**
+         * 分享类型,music、video或link，不填默认为link
+         */
+        type ?: 'music' | 'video' | 'link'
+
+        /**
+         * 如果type是music或video，则要提供数据链接，默认为空
+         */
+        dataUrl ?: string
+    }
+
+    interface OnMenuShareQQ extends OnMenuShareTimelineOptions {
+        /**
+         * 分享描述
+         */
+        desc ?: string
+    }
+
+    interface OnMenuShareWeibo extends OnMenuShareTimelineOptions {
+        /**
+         * 分享描述
+         */
+        desc ?: string
+    }
+
+    interface OnMenuShareQZone extends OnMenuShareTimelineOptions {
+        /**
+         * 分享描述
+         */
+        desc ?: string
+    }
+
+    interface ChooseImageOptions extends Callbacks {
+        /**
+         * 一次可选择图片数量
+         *
+         * 默认为 9
+         */
+        count ?: number
+
+        /**
+         * 可以指定是原图还是压缩图，默认二者都有
+         */
+        sizeType ?: ImageSize[]
+
+        /**
+         * 可以指定来源是相册还是相机，默认二者都有
+         */
+        sourceType ?: SourceType[]
+    }
+
+    interface PreviewImageOptions extends Callbacks {
+        /**
+         * 当前显示图片的 http 链接
+         */
+        current : string
+
+        /**
+         * 需要预览的图片 http 链接列表
+         */
+        urls : string[]
+    }
+
+    interface UploadImageOptions extends Callbacks {
+        /**
+         * 需要上传的图片的本地ID，由chooseImage接口获得
+         */
+        localId : string
+
+        /**
+         * 显示进度提示
+         */
+        isShowProgressTips ?: boolean
+    }
+
+    interface DownloadImageOptions extends Callbacks {
+        /**
+         * 需要下载的图片的服务器端ID，由uploadImage接口获得
+         */
+        serverId : string
+
+        /**
+         * 显示进度提示
+         */
+        isShowProgressTips ?: boolean
+    }
+
+    interface GetLocalImgDataOptions extends Callbacks {
+        /**
+         * 图片的localID
+         */
+        localId : string
+    }
+
+    interface LocalVoiceOptions extends Callbacks {
+        /**
+         * 本地ID，由 stopRecord 接口获得
+         */
+        localId : string
+    }
+
+    interface UploadVoiceOptions extends LocalVoiceOptions {
+        /**
+         * 显示进度提示
+         */
+        isShowProgressTips ?: boolean
+    }
+
+    interface DownloadVoiceOptions extends Callbacks {
+        /**
+         * 需要下载的音频的服务器端ID，由uploadVoice接口获得
+         */
+        serverId : string
+
+        /**
+         * 显示进度提示
+         */
+        isShowProgressTips ?: boolean
+    }
+
+    interface OpenLocationOptions extends Callbacks {
+        /**
+         * 纬度，浮点数，范围为90 ~ -90
+         */
+        latitude : number
+
+        /**
+         * 经度，浮点数，范围为180 ~ -180。
+         */
+        longitude : number
+
+        /**
+         * 位置名
+         */
+        name : string
+
+        /**
+         * 地址详情说明
+         */
+        address : string
+
+        /**
+         * 地图缩放级别,整形值,范围从1~28。默认为最大
+         */
+        scale ?: number
+
+        /**
+         * 在查看位置界面底部显示的超链接,可点击跳转
+         */
+        infoUrl ?: string
+    }
+
+    interface GetLocationOptions extends Callbacks {
+        /**
+         * 默认为wgs84的gps坐标，如果要返回直接给openLocation用的火星坐标，可传入'gcj02'
+         */
+        type : 'wgs84' | 'gcj02'
+    }
+
+    interface StartSearchBeacons {
+        /**
+         * 摇周边的业务ticket, 系统自动添加在摇出来的页面链接后面
+         */
+        ticket : string
+    }
+
+    interface MenuOptions {
+        menuList : Menus[]
+    }
+
+    interface ScanQRCodeOptions extends Callbacks {
+        /**
+         * 默认为0，扫描结果由微信处理，1则直接返回扫描结果
+         */
+        needResult ?: 0 | 1
+
+        /**
+         * 可以指定扫二维码还是一维码，默认二者都有
+         */
+        scanType ?: scanTypes[]
+    }
+
+    interface OpenProductSpecificViewOptions {
+        /**
+         * 商品id
+         */
+        productId : string
+
+        /**
+         *  0.默认值，普通商品详情页
+         *  1.扫一扫商品详情页
+         *  2.小店商品详情页
+         */
+        viewType : 0 | 1 | 2
+    }
+
+    interface ChooseCardOptions extends Callbacks {
+        /**
+         * 门店Id
+         */
+        shopId ?: string
+
+        /**
+         * 卡券类型
+         */
+        cardType ?: string
+
+        /**
+         * 卡券Id
+         */
+        cardId ?: string
+
+        /**
+         * 卡券签名时间戳
+         */
+        timestamp : number
+
+        /**
+         * 卡券签名随机串
+         */
+        nonceStr : string
+
+        /**
+         * 签名方式，默认'SHA1'
+         */
+        signType : 'SHA1'
+
+        /**
+         * 卡券签名
+         */
+        cardSign : string
+    }
+
+    interface AddCard {
+        cardId : string
+        cardExt : string
+    }
+
+    interface AddCardOptions extends Callbacks {
+        cardList : AddCard[]
+    }
+
+    interface OpenCard {
+        cardId : string
+        code : string
+    }
+
+    interface OpenCardOptions extends Callbacks {
+        cardList : OpenCard[]
+    }
+
+    interface ChooseWXPayOptions extends Callbacks {
+        /**
+         * 支付签名时间戳，注意微信jssdk中的所有使用timestamp字段均为小写。
+         * 但最新版的支付后台生成签名使用的timeStamp字段名需大写其中的S字符
+         */
+        timestamp : string
+
+        /**
+         * 支付签名随机串，不长于 32 位
+         */
+        nonceStr : string
+
+        /**
+         * 统一支付接口返回的prepay_id参数值，提交格式如：prepay_id=***）
+         */
+        package : string
+
+        /**
+         * 签名方式，默认为'SHA1'，使用新版支付需传入'MD5'
+         */
+        signType : 'SHA1' | 'MD5'
+
+        /**
+         * 支付签名
+         */
+        paySign : string
+    }
+
+    /** **************************************************************************
+     * 配置方法
+     ****************************************************************************/
+
+    /**
+     * 注入权限验证配置
+     * 所有需要使用 JS-SDK 的页面必须先注入配置信息，否则将无法调用。
+     * （同一个 url 仅需调用一次，对于变化 url 的 SPA 的 web app 可在每次url变化时进行调用,
+     * 目前 Android 微信客户端不支持 pushState 的 H5 新特性，
+     * 所以使用 pushState 来实现 web app 的页面会导致签名失败，
+     * 此问题会在 Android6.2中修复。）
+     */
+    function config(options : ConfigOptions) : void
+
+    /**
+     * 处理成功验证
+     *
+     * config信息验证后会执行ready方法，所有接口调用都必须在config接口获得结果之后，
+     * config是一个客户端的异步操作，所以如果需要在页面加载时就调用相关接口，
+     * 则须把相关接口放在ready函数中调用来确保正确执行。对于用户触发时才调用的接口，
+     * 则可以直接调用，不需要放在ready函数中。
+     */
+    function ready(callback : () => void) : void
+
+    /**
+     * 处理失败验证
+     *
+     * config信息验证失败会执行error函数，如签名过期导致验证失败，
+     * 具体错误信息可以打开config的debug模式查看，也可以在返回的res参数中查看，
+     * 对于SPA可以在这里更新签名。
+     */
+    function error(callback : (res : any) => void) : void
+
+    /**
+     * 判断当前客户端版本是否支持指定JS接口
+     *
+     * 备注：checkJsApi接口是客户端6.0.2新引入的一个预留接口，
+     * 第一期开放的接口均可不使用checkJsApi来检测。
+     */
+    function checkJsApi(options : CheckJsApiOptions) : void
+
+    /** **************************************************************************
+     * 分享接口
+     ****************************************************************************/
+
+    /**
+     * 获取“分享到朋友圈”按钮点击状态及自定义分享内容接口
+     */
+    function onMenuShareTimeline(options : OnMenuShareTimelineOptions) : void
+
+    /**
+     * 获取“分享给朋友”按钮点击状态及自定义分享内容接口
+     */
+    function onMenuShareAppMessage(options : OnMenuShareAppMessageOptions) : void
+
+    /**
+     * 获取“分享到QQ”按钮点击状态及自定义分享内容接口
+     */
+    function onMenuShareQQ(options : OnMenuShareQQ) : void
+
+    /**
+     * 获取“分享到腾讯微博”按钮点击状态及自定义分享内容接口
+     */
+    function onMenuShareWeibo(options : OnMenuShareWeibo) : void
+
+    /**
+     * 获取“分享到QQ空间”按钮点击状态及自定义分享内容接口
+     */
+    function onMenuShareQZone(options : OnMenuShareQZone) : void
+
+    /** **************************************************************************
+     * 图像接口
+     ****************************************************************************/
+
+    /**
+     * 拍照或从手机相册中选图接口
+     */
+    function chooseImage(options : ChooseImageOptions) : void
+
+    /**
+     * 预览图片接口
+     */
+    function previewImage(options : PreviewImageOptions) : void
+
+    /**
+     * 上传图片接口
+     *
+     * 备注：上传图片有效期3天，可用微信多媒体接口下载图片到自己的服务器，此处获得的 serverId 即 media_id。
+     */
+    function uploadImage(options : UploadImageOptions) : void
+
+    /**
+     * 下载图片接口
+     */
+    function downloadImage(options : DownloadImageOptions) : void
+
+    /**
+     * 获取本地图片接口
+     */
+    function getLocalImgData(options : GetLocalImgDataOptions) : void
+
+    /** **************************************************************************
+     * 音频接口
+     ****************************************************************************/
+
+    /**
+     * 开始录音接口
+     */
+    function startRecord() : void
+
+    /**
+     * 停止录音接口
+     */
+    function stopRecord(options : Callbacks) : void
+
+    /**
+     * 监听录音自动停止接口
+     */
+    function onVoiceRecordEnd(options : Callbacks) : void
+
+    /**
+     * 播放语音接口
+     */
+    function playVoice(options : LocalVoiceOptions) : void
+
+    /**
+     * 暂停播放接口
+     */
+    function pauseVoice(options : LocalVoiceOptions) : void
+
+    /**
+     * 停止播放接口
+     */
+    function stopVoice(options : LocalVoiceOptions) : void
+
+    /**
+     * 监听语音播放完毕接口
+     */
+    function onVoicePlayEnd(options : Callbacks) : void
+
+    /**
+     * 上传语音接口
+     */
+    function uploadVoice(options : UploadVoiceOptions) : void
+
+    /**
+     * 下载语音接口
+     */
+    function downloadVoice(options : DownloadVoiceOptions) : void
+
+    /** **************************************************************************
+     * 智能接口
+     ****************************************************************************/
+
+    /**
+     * 识别音频并返回识别结果接口
+     */
+    function translateVoice(options : UploadVoiceOptions) : void
+
+    /** **************************************************************************
+     * 设备信息
+     ****************************************************************************/
+
+    /**
+     * 获取网络状态接口
+     */
+    function getNetworkType(options : Callbacks) : void
+
+    /** **************************************************************************
+     * 地理信息
+     ****************************************************************************/
+
+    /**
+     * 使用微信内置地图查看位置接口
+     */
+    function openLocation(options : OpenLocationOptions) : void
+
+    /**
+     * 获取地理位置接口
+     */
+    function getLocation(options : GetLocationOptions) : void
+
+    /** **************************************************************************
+     * 摇一摇周边
+     ****************************************************************************/
+
+    /**
+     * 开启查找周边ibeacon设备接口
+     */
+    function startSearchBeacons(options : StartSearchBeacons) : void
+
+    /**
+     * 关闭查找周边ibeacon设备接口
+     */
+    function stopSearchBeacons(options : Callbacks) : void
+
+    /**
+     * 监听周边ibeacon设备接口
+     *
+     * 备注：上述摇一摇周边接口使用注意事项及更多返回结果说明，请参考：摇一摇周边获取设备信息
+     */
+    function onSearchBeacons(options : Callbacks) : void
+
+    /** **************************************************************************
+     * 界面操作
+     ****************************************************************************/
+
+    /**
+     * 关闭当前网页窗口接口
+     */
+    function closeWindow() : void
+
+    /**
+     * 批量隐藏功能按钮接口
+     */
+    function hideMenuItems(options : MenuOptions) : void
+
+    /**
+     * 批量显示功能按钮接口
+     */
+    function showMenuItems(options : MenuOptions) : void
+
+    /**
+     * 隐藏所有非基础按钮接口
+     */
+    function hideAllNonBaseMenuItem() : void
+
+    /**
+     * 显示所有功能按钮接口
+     */
+    function showAllNonBaseMenuItem() : void
+
+    /** **************************************************************************
+     * 微信扫一扫
+     ****************************************************************************/
+
+    /**
+     * 调起微信扫一扫接口
+     */
+    function scanQRCode(options : ScanQRCodeOptions) : void
+
+    /** **************************************************************************
+     * 微信小店
+     ****************************************************************************/
+
+    /**
+     * 跳转微信商品页接口
+     */
+    function openProductSpecificView(
+        options : OpenProductSpecificViewOptions
+    ) : void
+
+    /** **************************************************************************
+     * 微信卡券
+     ****************************************************************************/
+
+    /**
+     * 拉取适用卡券列表并获取用户选择信息
+     */
+    function chooseCard(options : ChooseCardOptions) : void
+
+    /**
+     * 批量添加卡券接口
+     */
+    function addCard(options : AddCardOptions) : void
+
+    /**
+     * 查看微信卡包中的卡券接口
+     */
+    function openCard(options : OpenCardOptions) : void
+
+    /** **************************************************************************
+     * 微信支付
+     ****************************************************************************/
+
+    /**
+     * 发起一个微信支付请求
+     */
+    function chooseWXPay(options : ChooseWXPayOptions) : void
+
+    /**
+     * 分享给朋友
+     */
+    function updateAppMessageShareData(options : OnMenuShareAppMessageOptions) : void
+
+    /**
+     * 分享到朋友圈
+     */
+    function updateTimelineShareData(options : OnMenuShareAppMessageOptions) : void
+}
+
+declare module 'weixin-js-sdk' {
+    export = WeixinJsSdk
+}
\ No newline at end of file
diff --git a/uni-app/src/uni.scss b/uni-app/src/uni.scss
new file mode 100644
index 00000000..d0d5e698
--- /dev/null
+++ b/uni-app/src/uni.scss
@@ -0,0 +1,78 @@
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+
+/* 颜色变量 */
+
+/* 行为相关颜色 */
+$uni-color-primary: var(--primary-color);
+$uni-color-success: #4cd964;
+$uni-color-warning: #f0ad4e;
+$uni-color-error: #dd524d;
+
+/* 文字基本颜色 */
+$uni-text-color: #333; //基本色
+$uni-text-color-inverse: #fff; //反色
+$uni-text-color-grey: #999; //辅助灰色，如加载更多的提示信息
+$uni-text-color-placeholder: #808080;
+$uni-text-color-disable: #c0c0c0;
+
+/* 背景颜色 */
+$uni-bg-color: #ffffff;
+$uni-bg-color-grey: #f8f8f8;
+$uni-bg-color-hover: #f1f1f1; //点击状态颜色
+$uni-bg-color-mask: rgba(0, 0, 0, 0.4); //遮罩颜色
+
+/* 边框颜色 */
+$uni-border-color: #c8c7cc;
+
+/* 尺寸变量 */
+
+/* 文字尺寸 */
+$uni-font-size-sm: 12px;
+$uni-font-size-base: 14px;
+$uni-font-size-lg: 16;
+
+/* 图片尺寸 */
+$uni-img-size-sm: 20px;
+$uni-img-size-base: 26px;
+$uni-img-size-lg: 40px;
+
+/* Border Radius */
+$uni-border-radius-sm: 2px;
+$uni-border-radius-base: 3px;
+$uni-border-radius-lg: 6px;
+$uni-border-radius-circle: 50%;
+
+/* 水平间距 */
+$uni-spacing-row-sm: 5px;
+$uni-spacing-row-base: 10px;
+$uni-spacing-row-lg: 15px;
+
+/* 垂直间距 */
+$uni-spacing-col-sm: 4px;
+$uni-spacing-col-base: 8px;
+$uni-spacing-col-lg: 12px;
+
+/* 透明度 */
+$uni-opacity-disabled: 0.3; // 组件禁用态的透明度
+
+/* 文章场景相关 */
+$uni-color-title: #2c405a; // 文章标题颜色
+$uni-font-size-title: 20px;
+$uni-color-subtitle: #555555; // 二级标题颜色
+$uni-font-size-subtitle: 26px;
+$uni-color-paragraph: #3f536e; // 文章段落颜色
+$uni-font-size-paragraph: 15px;
+
+@import '@/styles/uview-theme.scss';
diff --git a/uni-app/src/uni_modules/uni-popup/components/uni-popup/keypress.js b/uni-app/src/uni_modules/uni-popup/components/uni-popup/keypress.js
new file mode 100644
index 00000000..62dda461
--- /dev/null
+++ b/uni-app/src/uni_modules/uni-popup/components/uni-popup/keypress.js
@@ -0,0 +1,45 @@
+// #ifdef H5
+export default {
+  name: 'Keypress',
+  props: {
+    disable: {
+      type: Boolean,
+      default: false
+    }
+  },
+  mounted () {
+    const keyNames = {
+      esc: ['Esc', 'Escape'],
+      tab: 'Tab',
+      enter: 'Enter',
+      space: [' ', 'Spacebar'],
+      up: ['Up', 'ArrowUp'],
+      left: ['Left', 'ArrowLeft'],
+      right: ['Right', 'ArrowRight'],
+      down: ['Down', 'ArrowDown'],
+      delete: ['Backspace', 'Delete', 'Del']
+    }
+    const listener = ($event) => {
+      if (this.disable) {
+        return
+      }
+      const keyName = Object.keys(keyNames).find(key => {
+        const keyName = $event.key
+        const value = keyNames[key]
+        return value === keyName || (Array.isArray(value) && value.includes(keyName))
+      })
+      if (keyName) {
+        // 避免和其他按键事件冲突
+        setTimeout(() => {
+          this.$emit(keyName, {})
+        }, 0)
+      }
+    }
+    document.addEventListener('keyup', listener)
+    // this.$once('hook:beforeDestroy', () => {
+    //   document.removeEventListener('keyup', listener)
+    // })
+  },
+	render: () => {}
+}
+// #endif
diff --git a/uni-app/src/uni_modules/uni-popup/components/uni-popup/popup.js b/uni-app/src/uni_modules/uni-popup/components/uni-popup/popup.js
new file mode 100644
index 00000000..e1db1816
--- /dev/null
+++ b/uni-app/src/uni_modules/uni-popup/components/uni-popup/popup.js
@@ -0,0 +1,25 @@
+export default {
+	data() {
+		return {
+			
+		}
+	},
+	created(){
+		this.popup = this.getParent()
+	},
+	methods:{
+		/**
+		 * 获取父元素实例
+		 */
+		getParent(name = 'uniPopup') {
+			let parent = this.$parent;
+			let parentName = parent.$options.name;
+			while (parentName !== name) {
+				parent = parent.$parent;
+				if (!parent) return false
+				parentName = parent.$options.name;
+			}
+			return parent;
+		},
+	}
+}
diff --git a/uni-app/src/uni_modules/uni-popup/components/uni-popup/uni-popup.uvue b/uni-app/src/uni_modules/uni-popup/components/uni-popup/uni-popup.uvue
new file mode 100644
index 00000000..5eb8d5be
--- /dev/null
+++ b/uni-app/src/uni_modules/uni-popup/components/uni-popup/uni-popup.uvue
@@ -0,0 +1,90 @@
+<template>
+  <view class="popup-root" v-if="isOpen" v-show="isShow" @click="clickMask">
+    <view @click.stop>
+      <slot></slot>
+    </view>
+  </view>
+</template>
+
+<script>
+  type CloseCallBack = ()=> void;
+  let closeCallBack:CloseCallBack = () :void => {};
+  export default {
+    emits:["close","clickMask"],
+    data() {
+      return {
+        isShow:false,
+        isOpen:false
+      }
+    },
+    props: {
+      maskClick: {
+        type: Boolean,
+        default: true
+      },
+    },
+    watch: {
+      // 设置show = true 时，如果没有 open 需要设置为 open
+      isShow:{
+        handler(isShow) {
+          // console.log("isShow",isShow)
+          if(isShow && this.isOpen == false){
+            this.isOpen = true
+          }
+        },
+        immediate:true
+      },
+      // 设置isOpen = true 时，如果没有 isShow 需要设置为 isShow
+      isOpen:{
+        handler(isOpen) {
+          // console.log("isOpen",isOpen)
+          if(isOpen && this.isShow == false){
+            this.isShow = true
+          }
+        },
+        immediate:true
+      }
+    },
+    methods:{
+      open(){
+        // ...funs : CloseCallBack[]
+        // if(funs.length > 0){
+        //   closeCallBack = funs[0]
+        // }
+        this.isOpen = true;
+      },
+      clickMask(){
+        if(this.maskClick == true){
+          this.$emit('clickMask')
+          this.close()
+        }
+      },
+      close(): void{
+        this.isOpen = false;
+        this.$emit('close')
+        closeCallBack()
+      },
+      hiden(){
+        this.isShow = false
+      },
+      show(){
+        this.isShow = true
+      }
+    }
+  }
+</script>
+
+<style>
+.popup-root {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 750rpx;
+  height: 100%;
+  flex: 1;
+  background-color: rgba(0, 0, 0, 0.3);
+  justify-content: center;
+  align-items: center;
+  z-index: 99;
+}
+</style>
\ No newline at end of file
diff --git a/uni-app/src/uni_modules/uni-popup/components/uni-popup/uni-popup.vue b/uni-app/src/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
new file mode 100644
index 00000000..e48701f5
--- /dev/null
+++ b/uni-app/src/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
@@ -0,0 +1,501 @@
+<template>
+	<view v-if="showPopup" class="uni-popup" :class="[popupstyle, isDesktop ? 'fixforpc-z-index' : '']">
+		<view @touchstart="touchstart">
+			<uni-transition key="1" v-if="maskShow" name="mask" mode-class="fade" :styles="maskClass" :duration="duration" :show="showTrans" @click="onTap" />
+			<uni-transition key="2" :mode-class="ani" name="content" :styles="transClass" :duration="duration" :show="showTrans" @click="onTap">
+				<view class="uni-popup__wrapper" :style="getStyles" :class="[popupstyle]" @click="clear">
+					<slot />
+				</view>
+			</uni-transition>
+		</view>
+		<!-- #ifdef H5 -->
+		<keypress v-if="maskShow" @esc="onTap" />
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	// #ifdef H5
+	import keypress from './keypress.js'
+	// #endif
+
+	/**
+	 * PopUp 弹出层
+	 * @description 弹出层组件，为了解决遮罩弹层的问题
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=329
+	 * @property {String} type = [top|center|bottom|left|right|message|dialog|share] 弹出方式
+	 * 	@value top 顶部弹出
+	 * 	@value center 中间弹出
+	 * 	@value bottom 底部弹出
+	 * 	@value left		左侧弹出
+	 * 	@value right  右侧弹出
+	 * 	@value message 消息提示
+	 * 	@value dialog 对话框
+	 * 	@value share 底部分享示例
+	 * @property {Boolean} animation = [true|false] 是否开启动画
+	 * @property {Boolean} maskClick = [true|false] 蒙版点击是否关闭弹窗(废弃)
+	 * @property {Boolean} isMaskClick = [true|false] 蒙版点击是否关闭弹窗
+	 * @property {String}  backgroundColor 主窗口背景色
+	 * @property {String}  maskBackgroundColor 蒙版颜色
+	 * @property {String}  borderRadius 设置圆角(左上、右上、右下和左下) 示例:"10px 10px 10px 10px"
+	 * @property {Boolean} safeArea		   是否适配底部安全区
+	 * @event {Function} change 打开关闭弹窗触发，e={show: false}
+	 * @event {Function} maskClick 点击遮罩触发
+	 */
+
+	export default {
+		name: 'uniPopup',
+		components: {
+			// #ifdef H5
+			keypress
+			// #endif
+		},
+		emits: ['change', 'maskClick'],
+		props: {
+			// 开启动画
+			animation: {
+				type: Boolean,
+				default: true
+			},
+			// 弹出层类型，可选值，top: 顶部弹出层；bottom：底部弹出层；center：全屏弹出层
+			// message: 消息提示 ; dialog : 对话框
+			type: {
+				type: String,
+				default: 'center'
+			},
+			// maskClick
+			isMaskClick: {
+				type: Boolean,
+				default: null
+			},
+			// TODO 2 个版本后废弃属性 ，使用 isMaskClick
+			maskClick: {
+				type: Boolean,
+				default: null
+			},
+			backgroundColor: {
+				type: String,
+				default: 'none'
+			},
+			safeArea: {
+				type: Boolean,
+				default: true
+			},
+			maskBackgroundColor: {
+				type: String,
+				default: 'rgba(0, 0, 0, 0.4)'
+			},
+			borderRadius:{
+				type: String,
+			}
+		},
+
+		watch: {
+			/**
+			 * 监听type类型
+			 */
+			type: {
+				handler: function(type) {
+					if (!this.config[type]) return
+					this[this.config[type]](true)
+				},
+				immediate: true
+			},
+			isDesktop: {
+				handler: function(newVal) {
+					if (!this.config[newVal]) return
+					this[this.config[this.type]](true)
+				},
+				immediate: true
+			},
+			/**
+			 * 监听遮罩是否可点击
+			 * @param {Object} val
+			 */
+			maskClick: {
+				handler: function(val) {
+					this.mkclick = val
+				},
+				immediate: true
+			},
+			isMaskClick: {
+				handler: function(val) {
+					this.mkclick = val
+				},
+				immediate: true
+			},
+			// H5 下禁止底部滚动
+			showPopup(show) {
+				// #ifdef H5
+				// fix by mehaotian 处理 h5 滚动穿透的问题
+				document.getElementsByTagName('body')[0].style.overflow = show ? 'hidden' : 'visible'
+				// #endif
+			}
+		},
+		data() {
+			return {
+				duration: 300,
+				ani: [],
+				showPopup: false,
+				showTrans: false,
+				popupWidth: 0,
+				popupHeight: 0,
+				config: {
+					top: 'top',
+					bottom: 'bottom',
+					center: 'center',
+					left: 'left',
+					right: 'right',
+					message: 'top',
+					dialog: 'center',
+					share: 'bottom'
+				},
+				maskClass: {
+					position: 'fixed',
+					bottom: 0,
+					top: 0,
+					left: 0,
+					right: 0,
+					backgroundColor: 'rgba(0, 0, 0, 0.4)'
+				},
+				transClass: {
+					backgroundColor: 'transparent',
+					borderRadius: this.borderRadius || "0",
+					position: 'fixed',
+					left: 0,
+					right: 0
+				},
+				maskShow: true,
+				mkclick: true,
+				popupstyle: 'top'
+			}
+		},
+		computed: {
+			getStyles() {
+				let res = { backgroundColor: this.bg };
+				if (this.borderRadius || "0") {
+					res = Object.assign(res, { borderRadius: this.borderRadius })
+				}
+				return res;
+			},
+			isDesktop() {
+				return this.popupWidth >= 500 && this.popupHeight >= 500
+			},
+			bg() {
+				if (this.backgroundColor === '' || this.backgroundColor === 'none') {
+					return 'transparent'
+				}
+				return this.backgroundColor
+			}
+		},
+		mounted() {
+			const fixSize = () => {
+				const {
+					windowWidth,
+					windowHeight,
+					windowTop,
+					safeArea,
+					screenHeight,
+					safeAreaInsets
+				} = uni.getSystemInfoSync()
+				this.popupWidth = windowWidth
+				this.popupHeight = windowHeight + (windowTop || 0)
+				// TODO fix by mehaotian 是否适配底部安全区 ,目前微信ios 、和 app ios 计算有差异，需要框架修复
+				if (safeArea && this.safeArea) {
+					// #ifdef MP-WEIXIN
+					this.safeAreaInsets = screenHeight - safeArea.bottom
+					// #endif
+					// #ifndef MP-WEIXIN
+					this.safeAreaInsets = safeAreaInsets.bottom
+					// #endif
+				} else {
+					this.safeAreaInsets = 0
+				}
+			}
+			fixSize()
+			// #ifdef H5
+			// window.addEventListener('resize', fixSize)
+			// this.$once('hook:beforeDestroy', () => {
+			// 	window.removeEventListener('resize', fixSize)
+			// })
+			// #endif
+		},
+		// #ifndef VUE3
+		// TODO vue2
+		destroyed() {
+			this.setH5Visible()
+		},
+		// #endif
+		// #ifdef VUE3
+		// TODO vue3
+		unmounted() {
+			this.setH5Visible()
+		},
+		// #endif
+		activated() {
+   	  this.setH5Visible(!this.showPopup);
+    },
+    deactivated() {
+      this.setH5Visible(true);
+    },
+		created() {
+			// this.mkclick =  this.isMaskClick || this.maskClick
+			if (this.isMaskClick === null && this.maskClick === null) {
+				this.mkclick = true
+			} else {
+				this.mkclick = this.isMaskClick !== null ? this.isMaskClick : this.maskClick
+			}
+			if (this.animation) {
+				this.duration = 300
+			} else {
+				this.duration = 0
+			}
+			// TODO 处理 message 组件生命周期异常的问题
+			this.messageChild = null
+			// TODO 解决头条冒泡的问题
+			this.clearPropagation = false
+			this.maskClass.backgroundColor = this.maskBackgroundColor
+		},
+		methods: {
+			setH5Visible(visible = true) {
+				// #ifdef H5
+				// fix by mehaotian 处理 h5 滚动穿透的问题
+				document.getElementsByTagName('body')[0].style.overflow =  visible ? "visible" : "hidden";
+				// #endif
+			},
+			/**
+			 * 公用方法，不显示遮罩层
+			 */
+			closeMask() {
+				this.maskShow = false
+			},
+			/**
+			 * 公用方法，遮罩层禁止点击
+			 */
+			disableMask() {
+				this.mkclick = false
+			},
+			// TODO nvue 取消冒泡
+			clear(e) {
+				// #ifndef APP-NVUE
+				e.stopPropagation()
+				// #endif
+				this.clearPropagation = true
+			},
+
+			open(direction) {
+				// fix by mehaotian 处理快速打开关闭的情况
+				if (this.showPopup) {
+					return
+				}
+				let innerType = ['top', 'center', 'bottom', 'left', 'right', 'message', 'dialog', 'share']
+				if (!(direction && innerType.indexOf(direction) !== -1)) {
+					direction = this.type
+				}
+				if (!this.config[direction]) {
+					console.error('缺少类型：', direction)
+					return
+				}
+				this[this.config[direction]]()
+				this.$emit('change', {
+					show: true,
+					type: direction
+				})
+			},
+			close(type) {
+				this.showTrans = false
+				this.$emit('change', {
+					show: false,
+					type: this.type
+				})
+				clearTimeout(this.timer)
+				// // 自定义关闭事件
+				// this.customOpen && this.customClose()
+				this.timer = setTimeout(() => {
+					this.showPopup = false
+				}, 300)
+			},
+			// TODO 处理冒泡事件，头条的冒泡事件有问题 ，先这样兼容
+			touchstart() {
+				this.clearPropagation = false
+			},
+
+			onTap() {
+				if (this.clearPropagation) {
+					// fix by mehaotian 兼容 nvue
+					this.clearPropagation = false
+					return
+				}
+				this.$emit('maskClick')
+				if (!this.mkclick) return
+				this.close()
+			},
+			/**
+			 * 顶部弹出样式处理
+			 */
+			top(type) {
+				this.popupstyle = this.isDesktop ? 'fixforpc-top' : 'top'
+				this.ani = ['slide-top']
+				this.transClass = {
+					position: 'fixed',
+					left: 0,
+					right: 0,
+					backgroundColor: this.bg,
+					borderRadius:this.borderRadius || "0"
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPopup = true
+				this.showTrans = true
+				this.$nextTick(() => {
+					if (this.messageChild && this.type === 'message') {
+						this.messageChild.timerClose()
+					}
+				})
+			},
+			/**
+			 * 底部弹出样式处理
+			 */
+			bottom(type) {
+				this.popupstyle = 'bottom'
+				this.ani = ['slide-bottom']
+				this.transClass = {
+					position: 'fixed',
+					left: 0,
+					right: 0,
+					bottom: 0,
+					paddingBottom: this.safeAreaInsets + 'px',
+					backgroundColor: this.bg,
+					borderRadius:this.borderRadius || "0",
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPopup = true
+				this.showTrans = true
+			},
+			/**
+			 * 中间弹出样式处理
+			 */
+			center(type) {
+				this.popupstyle = 'center'
+				//微信小程序下，组合动画会出现文字向上闪动问题，再此做特殊处理
+				// #ifdef MP-WEIXIN
+					this.ani = ['fade']
+				// #endif
+				// #ifndef MP-WEIXIN
+					this.ani = ['zoom-out', 'fade']
+				// #endif
+				this.transClass = {
+					position: 'fixed',
+					/* #ifndef APP-NVUE */
+					display: 'flex',
+					flexDirection: 'column',
+					/* #endif */
+					bottom: 0,
+					left: 0,
+					right: 0,
+					top: 0,
+					justifyContent: 'center',
+					alignItems: 'center',
+					borderRadius:this.borderRadius || "0"
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPopup = true
+				this.showTrans = true
+			},
+			left(type) {
+				this.popupstyle = 'left'
+				this.ani = ['slide-left']
+				this.transClass = {
+					position: 'fixed',
+					left: 0,
+					bottom: 0,
+					top: 0,
+					backgroundColor: this.bg,
+					borderRadius:this.borderRadius || "0",
+					/* #ifndef APP-NVUE */
+					display: 'flex',
+					flexDirection: 'column'
+					/* #endif */
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPopup = true
+				this.showTrans = true
+			},
+			right(type) {
+				this.popupstyle = 'right'
+				this.ani = ['slide-right']
+				this.transClass = {
+					position: 'fixed',
+					bottom: 0,
+					right: 0,
+					top: 0,
+					backgroundColor: this.bg,
+					borderRadius:this.borderRadius || "0",
+					/* #ifndef APP-NVUE */
+					display: 'flex',
+					flexDirection: 'column'
+					/* #endif */
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPopup = true
+				this.showTrans = true
+			}
+		}
+	}
+</script>
+<style lang="scss">
+	.uni-popup {
+		position: fixed;
+		/* #ifndef APP-NVUE */
+		z-index: 99;
+
+		/* #endif */
+		&.top,
+		&.left,
+		&.right {
+			/* #ifdef H5 */
+			top: var(--window-top);
+			/* #endif */
+			/* #ifndef H5 */
+			top: 0;
+			/* #endif */
+		}
+
+		.uni-popup__wrapper {
+			/* #ifndef APP-NVUE */
+			display: block;
+			/* #endif */
+			position: relative;
+
+			/* iphonex 等安全区设置，底部安全区适配 */
+			/* #ifndef APP-NVUE */
+			// padding-bottom: constant(safe-area-inset-bottom);
+			// padding-bottom: env(safe-area-inset-bottom);
+			/* #endif */
+			&.left,
+			&.right {
+				/* #ifdef H5 */
+				padding-top: var(--window-top);
+				/* #endif */
+				/* #ifndef H5 */
+				padding-top: 0;
+				/* #endif */
+				flex: 1;
+			}
+		}
+	}
+
+	.fixforpc-z-index {
+		/* #ifndef APP-NVUE */
+		z-index: 999;
+		/* #endif */
+	}
+
+	.fixforpc-top {
+		top: 0;
+	}
+</style>
diff --git a/uni-app/src/uni_modules/uni-popup/package.json b/uni-app/src/uni_modules/uni-popup/package.json
new file mode 100644
index 00000000..3cfa3844
--- /dev/null
+++ b/uni-app/src/uni_modules/uni-popup/package.json
@@ -0,0 +1,88 @@
+{
+	"id": "uni-popup",
+	"displayName": "uni-popup 弹出层",
+	"version": "1.9.1",
+	"description": " Popup 组件，提供常用的弹层",
+	"keywords": [
+        "uni-ui",
+        "弹出层",
+        "弹窗",
+        "popup",
+        "弹框"
+    ],
+	"repository": "https://github.com/dcloudio/uni-ui",
+	"engines": {
+		"HBuilderX": ""
+	},
+	"directories": {
+		"example": "../../temps/example_temps"
+	},
+    "dcloudext": {
+        "sale": {
+			"regular": {
+				"price": "0.00"
+			},
+			"sourcecode": {
+				"price": "0.00"
+			}
+		},
+		"contact": {
+			"qq": ""
+		},
+		"declaration": {
+			"ads": "无",
+			"data": "无",
+			"permissions": "无"
+		},
+        "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+        "type": "component-vue"
+	},
+	"uni_modules": {
+		"dependencies": [
+			"uni-scss",
+			"uni-transition"
+		],
+		"encrypt": [],
+		"platforms": {
+			"cloud": {
+				"tcb": "y",
+                "aliyun": "y",
+                "alipay": "n"
+			},
+			"client": {
+				"App": {
+					"app-vue": "y",
+					"app-nvue": "y"
+				},
+				"H5-mobile": {
+					"Safari": "y",
+					"Android Browser": "y",
+					"微信浏览器(Android)": "y",
+					"QQ浏览器(Android)": "y"
+				},
+				"H5-pc": {
+					"Chrome": "y",
+					"IE": "y",
+					"Edge": "y",
+					"Firefox": "y",
+					"Safari": "y"
+				},
+				"小程序": {
+					"微信": "y",
+					"阿里": "y",
+					"百度": "y",
+					"字节跳动": "y",
+					"QQ": "y"
+				},
+				"快应用": {
+					"华为": "u",
+					"联盟": "u"
+                },
+                "Vue": {
+                    "vue2": "y",
+                    "vue3": "y"
+                }
+			}
+		}
+	}
+}
diff --git a/uni-app/src/uni_modules/uni-scss/changelog.md b/uni-app/src/uni_modules/uni-scss/changelog.md
new file mode 100644
index 00000000..b863bb0f
--- /dev/null
+++ b/uni-app/src/uni_modules/uni-scss/changelog.md
@@ -0,0 +1,8 @@
+## 1.0.3（2022-01-21）
+- 优化 组件示例
+## 1.0.2（2021-11-22）
+- 修复 / 符号在 vue 不同版本兼容问题引起的报错问题
+## 1.0.1（2021-11-22）
+- 修复 vue3中scss语法兼容问题
+## 1.0.0（2021-11-18）
+- init
diff --git a/uni-app/src/uni_modules/uni-scss/index.scss b/uni-app/src/uni_modules/uni-scss/index.scss
new file mode 100644
index 00000000..1744a5f9
--- /dev/null
+++ b/uni-app/src/uni_modules/uni-scss/index.scss
@@ -0,0 +1 @@
+@import './styles/index.scss';
diff --git a/uni-app/src/uni_modules/uni-scss/package.json b/uni-app/src/uni_modules/uni-scss/package.json
new file mode 100644
index 00000000..7cc0ccb7
--- /dev/null
+++ b/uni-app/src/uni_modules/uni-scss/package.json
@@ -0,0 +1,82 @@
+{
+  "id": "uni-scss",
+  "displayName": "uni-scss 辅助样式",
+  "version": "1.0.3",
+  "description": "uni-sass是uni-ui提供的一套全局样式 ，通过一些简单的类名和sass变量，实现简单的页面布局操作，比如颜色、边距、圆角等。",
+  "keywords": [
+    "uni-scss",
+    "uni-ui",
+    "辅助样式"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+  "dcloudext": {
+    "category": [
+        "JS SDK",
+        "通用 SDK"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "u"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "n",
+          "联盟": "n"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
diff --git a/uni-app/src/uni_modules/uni-scss/readme.md b/uni-app/src/uni_modules/uni-scss/readme.md
new file mode 100644
index 00000000..b7d1c25f
--- /dev/null
+++ b/uni-app/src/uni_modules/uni-scss/readme.md
@@ -0,0 +1,4 @@
+`uni-sass` 是 `uni-ui`提供的一套全局样式 ，通过一些简单的类名和`sass`变量，实现简单的页面布局操作，比如颜色、边距、圆角等。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-sass)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni-app/src/uni_modules/uni-scss/styles/index.scss b/uni-app/src/uni_modules/uni-scss/styles/index.scss
new file mode 100644
index 00000000..ffac4fec
--- /dev/null
+++ b/uni-app/src/uni_modules/uni-scss/styles/index.scss
@@ -0,0 +1,7 @@
+@import './setting/_variables.scss';
+@import './setting/_border.scss';
+@import './setting/_color.scss';
+@import './setting/_space.scss';
+@import './setting/_radius.scss';
+@import './setting/_text.scss';
+@import './setting/_styles.scss';
diff --git a/uni-app/src/uni_modules/uni-scss/styles/setting/_border.scss b/uni-app/src/uni_modules/uni-scss/styles/setting/_border.scss
new file mode 100644
index 00000000..12a11c32
--- /dev/null
+++ b/uni-app/src/uni_modules/uni-scss/styles/setting/_border.scss
@@ -0,0 +1,3 @@
+.uni-border {
+	border: 1px $uni-border-1 solid;
+}
\ No newline at end of file
diff --git a/uni-app/src/uni_modules/uni-scss/styles/setting/_color.scss b/uni-app/src/uni_modules/uni-scss/styles/setting/_color.scss
new file mode 100644
index 00000000..1ededd94
--- /dev/null
+++ b/uni-app/src/uni_modules/uni-scss/styles/setting/_color.scss
@@ -0,0 +1,66 @@
+
+// TODO 暂时不需要 class ，需要用户使用变量实现 ，如果使用类名其实并不推荐
+// @mixin get-styles($k,$c) {
+// 	@if $k == size or $k == weight{
+// 		font-#{$k}:#{$c}
+// 	}@else{
+// 		#{$k}:#{$c}
+// 	}
+// }
+$uni-ui-color:(
+	// 主色
+	primary: $uni-primary,
+	primary-disable: $uni-primary-disable,
+	primary-light: $uni-primary-light,
+	// 辅助色
+	success: $uni-success,
+	success-disable: $uni-success-disable,
+	success-light: $uni-success-light,
+	warning: $uni-warning,
+	warning-disable: $uni-warning-disable,
+	warning-light: $uni-warning-light,
+	error: $uni-error,
+	error-disable: $uni-error-disable,
+	error-light: $uni-error-light,
+	info: $uni-info,
+	info-disable: $uni-info-disable,
+	info-light: $uni-info-light,
+	// 中性色
+	main-color: $uni-main-color,
+	base-color: $uni-base-color,
+	secondary-color: $uni-secondary-color,
+	extra-color: $uni-extra-color,
+	// 背景色
+	bg-color: $uni-bg-color,
+	// 边框颜色
+	border-1: $uni-border-1,
+	border-2: $uni-border-2,
+	border-3: $uni-border-3,
+	border-4: $uni-border-4,
+	// 黑色
+	black:$uni-black,
+	// 白色
+	white:$uni-white,
+	// 透明
+	transparent:$uni-transparent
+) !default;
+@each $key, $child in $uni-ui-color {
+	.uni-#{"" + $key} {
+		color: $child;
+	}
+	.uni-#{"" + $key}-bg {
+		background-color: $child;
+	}
+}
+.uni-shadow-sm {
+	box-shadow: $uni-shadow-sm;
+}
+.uni-shadow-base {
+	box-shadow: $uni-shadow-base;
+}
+.uni-shadow-lg {
+	box-shadow: $uni-shadow-lg;
+}
+.uni-mask {
+	background-color:$uni-mask;
+}
diff --git a/uni-app/src/uni_modules/uni-scss/styles/setting/_radius.scss b/uni-app/src/uni_modules/uni-scss/styles/setting/_radius.scss
new file mode 100644
index 00000000..9a0428bb
--- /dev/null
+++ b/uni-app/src/uni_modules/uni-scss/styles/setting/_radius.scss
@@ -0,0 +1,55 @@
+@mixin radius($r,$d:null ,$important: false){
+  $radius-value:map-get($uni-radius, $r) if($important, !important, null);
+  // Key exists within the $uni-radius variable
+  @if (map-has-key($uni-radius, $r) and  $d){
+		@if $d == t {
+				border-top-left-radius:$radius-value;
+				border-top-right-radius:$radius-value;
+		}@else if $d == r {
+				border-top-right-radius:$radius-value;
+				border-bottom-right-radius:$radius-value;
+		}@else if $d == b {
+				border-bottom-left-radius:$radius-value;
+				border-bottom-right-radius:$radius-value;
+		}@else if $d == l {
+				border-top-left-radius:$radius-value;
+				border-bottom-left-radius:$radius-value;
+		}@else if $d == tl {
+				border-top-left-radius:$radius-value;
+		}@else if $d == tr {
+				border-top-right-radius:$radius-value;
+		}@else if $d == br {
+				border-bottom-right-radius:$radius-value;
+		}@else if $d == bl {
+				border-bottom-left-radius:$radius-value;
+		}
+  }@else{
+		border-radius:$radius-value;
+  }
+}
+
+@each $key, $child in $uni-radius {
+	@if($key){
+		.uni-radius-#{"" + $key} {
+				@include radius($key)
+		}
+	}@else{
+		.uni-radius {
+				@include radius($key)
+		}
+	}
+}
+
+@each $direction in t, r, b, l,tl, tr, br, bl {
+	@each $key, $child in $uni-radius {
+		@if($key){
+			.uni-radius-#{"" + $direction}-#{"" + $key} {
+				@include radius($key,$direction,false)
+			}
+		}@else{
+			.uni-radius-#{$direction} {
+				@include radius($key,$direction,false)
+			}
+		}
+	}
+}
diff --git a/uni-app/src/uni_modules/uni-scss/styles/setting/_space.scss b/uni-app/src/uni_modules/uni-scss/styles/setting/_space.scss
new file mode 100644
index 00000000..3c895289
--- /dev/null
+++ b/uni-app/src/uni_modules/uni-scss/styles/setting/_space.scss
@@ -0,0 +1,56 @@
+
+@mixin fn($space,$direction,$size,$n) {
+	@if $n {
+		#{$space}-#{$direction}: #{$size*$uni-space-root}px
+	} @else {
+		 #{$space}-#{$direction}: #{-$size*$uni-space-root}px
+	}
+}
+@mixin get-styles($direction,$i,$space,$n){
+	@if $direction == t {
+		@include fn($space, top,$i,$n);
+	} 
+	@if $direction == r {
+		@include fn($space, right,$i,$n);
+	} 
+	@if $direction == b {
+		@include fn($space, bottom,$i,$n);
+	} 
+	@if $direction == l {
+	 @include fn($space, left,$i,$n);
+	} 
+	@if $direction == x {
+		@include fn($space, left,$i,$n);
+		@include fn($space, right,$i,$n);
+	} 
+	@if $direction == y {
+		@include fn($space, top,$i,$n);
+		@include fn($space, bottom,$i,$n);
+	} 
+	@if $direction == a {
+		@if $n {
+			#{$space}:#{$i*$uni-space-root}px;
+		} @else {
+			#{$space}:#{-$i*$uni-space-root}px;
+		}
+	} 
+}
+
+@each $orientation in m,p {
+	$space: margin;
+	@if $orientation == m {
+		$space: margin;
+	} @else {
+		$space: padding;
+	}
+	@for $i from 0 through 16 {
+		@each $direction in t, r, b, l, x, y, a {
+			.uni-#{$orientation}#{$direction}-#{$i} { 
+				@include  get-styles($direction,$i,$space,true);
+			} 
+			.uni-#{$orientation}#{$direction}-n#{$i} { 
+				@include  get-styles($direction,$i,$space,false);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/uni-app/src/uni_modules/uni-scss/styles/setting/_styles.scss b/uni-app/src/uni_modules/uni-scss/styles/setting/_styles.scss
new file mode 100644
index 00000000..689afec6
--- /dev/null
+++ b/uni-app/src/uni_modules/uni-scss/styles/setting/_styles.scss
@@ -0,0 +1,167 @@
+/* #ifndef APP-NVUE */
+
+$-color-white:#fff;
+$-color-black:#000;
+@mixin base-style($color) {
+	color: #fff;
+	background-color: $color;
+	border-color: mix($-color-black, $color, 8%);
+	&:not([hover-class]):active {
+		background: mix($-color-black, $color, 10%);
+		border-color: mix($-color-black, $color, 20%);
+		color: $-color-white;
+		outline: none;
+	}
+}
+@mixin is-color($color) {
+	@include base-style($color);
+	&[loading] {
+		@include base-style($color);
+		&::before {
+			margin-right:5px;
+		}
+	}
+	&[disabled] {
+	  &,
+		&[loading],
+	  &:not([hover-class]):active {
+	    color: $-color-white;
+			border-color: mix(darken($color,10%), $-color-white);
+	    background-color: mix($color, $-color-white);
+	  }
+	}
+
+}
+@mixin base-plain-style($color) {
+	color:$color;
+	background-color: mix($-color-white, $color, 90%);
+	border-color: mix($-color-white, $color, 70%);
+	&:not([hover-class]):active {
+	  background: mix($-color-white, $color, 80%);
+	  color: $color;
+	  outline: none;
+		border-color: mix($-color-white, $color, 50%);
+	}
+}
+@mixin is-plain($color){
+	&[plain] {
+		@include base-plain-style($color);
+		&[loading] {
+			@include base-plain-style($color);
+			&::before {
+				margin-right:5px;
+			}
+		}
+		&[disabled] {
+		  &,
+		  &:active {
+		    color: mix($-color-white, $color, 40%);
+		    background-color: mix($-color-white, $color, 90%);
+				border-color: mix($-color-white, $color, 80%);
+		  }
+		}
+	}
+}
+
+
+.uni-btn {
+	margin: 5px;
+	color: #393939;
+	border:1px solid #ccc;
+	font-size: 16px;
+	font-weight: 200;
+	background-color: #F9F9F9;
+	// TODO 暂时处理边框隐藏一边的问题
+	overflow: visible;
+	&::after{
+		border: none;
+	}
+
+	&:not([type]),&[type=default] {
+		color: #999;
+		&[loading] {
+			background: none;
+			&::before {
+				margin-right:5px;
+			}
+		}
+
+
+
+		&[disabled]{
+			color: mix($-color-white, #999, 60%);
+		  &,
+			&[loading],
+		  &:active {
+				color: mix($-color-white, #999, 60%);
+		    background-color: mix($-color-white,$-color-black , 98%);
+				border-color: mix($-color-white,  #999, 85%);
+		  }
+		}
+
+		&[plain] {
+			color: #999;
+			background: none;
+			border-color: $uni-border-1;
+			&:not([hover-class]):active {
+				background: none;
+			  color: mix($-color-white, $-color-black, 80%);
+				border-color: mix($-color-white, $-color-black, 90%);
+			  outline: none;
+			}
+			&[disabled]{
+			  &,
+				&[loading],
+			  &:active {
+			    background: none;
+					color: mix($-color-white, #999, 60%);
+					border-color: mix($-color-white,  #999, 85%);
+			  }
+			}
+		}
+	}
+
+	&:not([hover-class]):active {
+	  color: mix($-color-white, $-color-black, 50%);
+	}
+
+	&[size=mini] {
+		font-size: 16px;
+		font-weight: 200;
+		border-radius: 8px;
+	}
+
+
+
+	&.uni-btn-small {
+		font-size: 14px;
+	}
+	&.uni-btn-mini {
+		font-size: 12px;
+	}
+
+	&.uni-btn-radius {
+		border-radius: 999px;
+	}
+	&[type=primary] {
+		@include is-color($uni-primary);
+		@include is-plain($uni-primary)
+	}
+	&[type=success] {
+		@include is-color($uni-success);
+		@include is-plain($uni-success)
+	}
+	&[type=error] {
+		@include is-color($uni-error);
+		@include is-plain($uni-error)
+	}
+	&[type=warning] {
+		@include is-color($uni-warning);
+		@include is-plain($uni-warning)
+	}
+	&[type=info] {
+		@include is-color($uni-info);
+		@include is-plain($uni-info)
+	}
+}
+/* #endif */
diff --git a/uni-app/src/uni_modules/uni-scss/styles/setting/_text.scss b/uni-app/src/uni_modules/uni-scss/styles/setting/_text.scss
new file mode 100644
index 00000000..a34d08f3
--- /dev/null
+++ b/uni-app/src/uni_modules/uni-scss/styles/setting/_text.scss
@@ -0,0 +1,24 @@
+@mixin get-styles($k,$c) {
+	@if $k == size or $k == weight{
+		font-#{$k}:#{$c}
+	}@else{
+		#{$k}:#{$c}
+	}
+}
+
+@each $key, $child in $uni-headings {
+	/* #ifndef APP-NVUE */
+	.uni-#{$key} {
+		@each $k, $c in $child {
+			@include get-styles($k,$c)
+		}
+	}
+	/* #endif */
+	/* #ifdef APP-NVUE */
+	.container .uni-#{$key} {
+		@each $k, $c in $child {
+			@include get-styles($k,$c)
+		}
+	}
+	/* #endif */
+}
diff --git a/uni-app/src/uni_modules/uni-scss/styles/setting/_variables.scss b/uni-app/src/uni_modules/uni-scss/styles/setting/_variables.scss
new file mode 100644
index 00000000..557d3d7c
--- /dev/null
+++ b/uni-app/src/uni_modules/uni-scss/styles/setting/_variables.scss
@@ -0,0 +1,146 @@
+// @use "sass:math";
+@import  '../tools/functions.scss';
+// 间距基础倍数
+$uni-space-root: 2 !default;
+// 边框半径默认值
+$uni-radius-root:5px !default;
+$uni-radius: () !default;
+// 边框半径断点
+$uni-radius: map-deep-merge(
+  (
+    0: 0,
+		// TODO 当前版本暂时不支持 sm 属性
+    // 'sm': math.div($uni-radius-root, 2),
+    null: $uni-radius-root,
+    'lg': $uni-radius-root * 2,
+    'xl': $uni-radius-root * 6,
+    'pill': 9999px,
+    'circle': 50%
+  ),
+  $uni-radius
+);
+// 字体家族
+$body-font-family: 'Roboto', sans-serif !default;
+// 文本
+$heading-font-family: $body-font-family !default;
+$uni-headings: () !default;
+$letterSpacing: -0.01562em;
+$uni-headings: map-deep-merge(
+  (
+    'h1': (
+      size: 32px,
+			weight: 300,
+			line-height: 50px,
+			// letter-spacing:-0.01562em
+    ),
+    'h2': (
+      size: 28px,
+      weight: 300,
+      line-height: 40px,
+      // letter-spacing: -0.00833em
+    ),
+    'h3': (
+      size: 24px,
+      weight: 400,
+      line-height: 32px,
+      // letter-spacing: normal
+    ),
+    'h4': (
+      size: 20px,
+      weight: 400,
+      line-height: 30px,
+      // letter-spacing: 0.00735em
+    ),
+    'h5': (
+      size: 16px,
+      weight: 400,
+      line-height: 24px,
+      // letter-spacing: normal
+    ),
+    'h6': (
+      size: 14px,
+      weight: 500,
+      line-height: 18px,
+      // letter-spacing: 0.0125em
+    ),
+    'subtitle': (
+      size: 12px,
+      weight: 400,
+      line-height: 20px,
+      // letter-spacing: 0.00937em
+    ),
+    'body': (
+      font-size: 14px,
+			font-weight: 400,
+			line-height: 22px,
+			// letter-spacing: 0.03125em
+    ),
+    'caption': (
+      'size': 12px,
+      'weight': 400,
+      'line-height': 20px,
+      // 'letter-spacing': 0.03333em,
+      // 'text-transform': false
+    )
+  ),
+  $uni-headings
+);
+
+
+
+// 主色
+$uni-primary: #2979ff !default;
+$uni-primary-disable:lighten($uni-primary,20%) !default;
+$uni-primary-light: lighten($uni-primary,25%) !default;
+
+// 辅助色
+// 除了主色外的场景色，需要在不同的场景中使用（例如危险色表示危险的操作）。
+$uni-success: #18bc37 !default;
+$uni-success-disable:lighten($uni-success,20%) !default;
+$uni-success-light: lighten($uni-success,25%) !default;
+
+$uni-warning: #f3a73f !default;
+$uni-warning-disable:lighten($uni-warning,20%) !default;
+$uni-warning-light: lighten($uni-warning,25%) !default;
+
+$uni-error: #e43d33 !default;
+$uni-error-disable:lighten($uni-error,20%) !default;
+$uni-error-light: lighten($uni-error,25%) !default;
+
+$uni-info: #8f939c !default;
+$uni-info-disable:lighten($uni-info,20%) !default;
+$uni-info-light: lighten($uni-info,25%) !default;
+
+// 中性色
+// 中性色用于文本、背景和边框颜色。通过运用不同的中性色，来表现层次结构。
+$uni-main-color: #3a3a3a !default; 			// 主要文字
+$uni-base-color: #6a6a6a !default;			// 常规文字
+$uni-secondary-color: #909399 !default;	// 次要文字
+$uni-extra-color: #c7c7c7 !default;			// 辅助说明
+
+// 边框颜色
+$uni-border-1: #F0F0F0 !default;
+$uni-border-2: #EDEDED !default;
+$uni-border-3: #DCDCDC !default;
+$uni-border-4: #B9B9B9 !default;
+
+// 常规色
+$uni-black: #000000 !default;
+$uni-white: #ffffff !default;
+$uni-transparent: rgba($color: #000000, $alpha: 0) !default;
+
+// 背景色
+$uni-bg-color: #f7f7f7 !default;
+
+/* 水平间距 */
+$uni-spacing-sm: 8px !default;
+$uni-spacing-base: 15px !default;
+$uni-spacing-lg: 30px !default;
+
+// 阴影
+$uni-shadow-sm:0 0 5px rgba($color: #d8d8d8, $alpha: 0.5) !default;
+$uni-shadow-base:0 1px 8px 1px rgba($color: #a5a5a5, $alpha: 0.2) !default;
+$uni-shadow-lg:0px 1px 10px 2px rgba($color: #a5a4a4, $alpha: 0.5) !default;
+
+// 蒙版
+$uni-mask: rgba($color: #000000, $alpha: 0.4) !default;
diff --git a/uni-app/src/uni_modules/uni-scss/styles/tools/functions.scss b/uni-app/src/uni_modules/uni-scss/styles/tools/functions.scss
new file mode 100644
index 00000000..ac6f63e5
--- /dev/null
+++ b/uni-app/src/uni_modules/uni-scss/styles/tools/functions.scss
@@ -0,0 +1,19 @@
+// 合并 map
+@function map-deep-merge($parent-map, $child-map){
+	$result: $parent-map;
+	@each $key, $child in $child-map {
+		$parent-has-key: map-has-key($result, $key);
+		$parent-value: map-get($result, $key);
+		$parent-type: type-of($parent-value);
+		$child-type: type-of($child);
+		$parent-is-map: $parent-type == map;
+		$child-is-map: $child-type == map;
+			
+		@if (not $parent-has-key) or ($parent-type != $child-type) or (not ($parent-is-map and $child-is-map)){
+			$result: map-merge($result, ( $key: $child ));
+		}@else {
+			$result: map-merge($result, ( $key: map-deep-merge($parent-value, $child) ));
+		}
+	}
+	@return $result;
+};
diff --git a/uni-app/src/uni_modules/uni-scss/theme.scss b/uni-app/src/uni_modules/uni-scss/theme.scss
new file mode 100644
index 00000000..80ee62f7
--- /dev/null
+++ b/uni-app/src/uni_modules/uni-scss/theme.scss
@@ -0,0 +1,31 @@
+// 间距基础倍数
+$uni-space-root: 2;
+// 边框半径默认值
+$uni-radius-root:5px;
+// 主色
+$uni-primary: #2979ff;
+// 辅助色
+$uni-success: #4cd964;
+// 警告色
+$uni-warning: #f0ad4e;
+// 错误色
+$uni-error: #dd524d;
+// 描述色
+$uni-info: #909399;
+// 中性色
+$uni-main-color: #303133;
+$uni-base-color: #606266;
+$uni-secondary-color: #909399;
+$uni-extra-color: #C0C4CC;
+// 背景色
+$uni-bg-color: #f5f5f5;
+// 边框颜色
+$uni-border-1: #DCDFE6;
+$uni-border-2: #E4E7ED;
+$uni-border-3: #EBEEF5;
+$uni-border-4: #F2F6FC;
+
+// 常规色
+$uni-black: #000000;
+$uni-white: #ffffff;
+$uni-transparent: rgba($color: #000000, $alpha: 0);
diff --git a/uni-app/src/uni_modules/uni-scss/variables.scss b/uni-app/src/uni_modules/uni-scss/variables.scss
new file mode 100644
index 00000000..1c062d42
--- /dev/null
+++ b/uni-app/src/uni_modules/uni-scss/variables.scss
@@ -0,0 +1,62 @@
+@import './styles/setting/_variables.scss';
+// 间距基础倍数
+$uni-space-root: 2;
+// 边框半径默认值
+$uni-radius-root:5px;
+
+// 主色
+$uni-primary: #2979ff;
+$uni-primary-disable:mix(#fff,$uni-primary,50%);
+$uni-primary-light: mix(#fff,$uni-primary,80%);
+
+// 辅助色
+// 除了主色外的场景色，需要在不同的场景中使用（例如危险色表示危险的操作）。
+$uni-success: #18bc37;
+$uni-success-disable:mix(#fff,$uni-success,50%);
+$uni-success-light: mix(#fff,$uni-success,80%);
+
+$uni-warning: #f3a73f;
+$uni-warning-disable:mix(#fff,$uni-warning,50%);
+$uni-warning-light: mix(#fff,$uni-warning,80%);
+
+$uni-error: #e43d33;
+$uni-error-disable:mix(#fff,$uni-error,50%);
+$uni-error-light: mix(#fff,$uni-error,80%);
+
+$uni-info: #8f939c;
+$uni-info-disable:mix(#fff,$uni-info,50%);
+$uni-info-light: mix(#fff,$uni-info,80%);
+
+// 中性色
+// 中性色用于文本、背景和边框颜色。通过运用不同的中性色，来表现层次结构。
+$uni-main-color: #3a3a3a; 			// 主要文字
+$uni-base-color: #6a6a6a;			// 常规文字
+$uni-secondary-color: #909399;	// 次要文字
+$uni-extra-color: #c7c7c7;			// 辅助说明
+
+// 边框颜色
+$uni-border-1: #F0F0F0;
+$uni-border-2: #EDEDED;
+$uni-border-3: #DCDCDC;
+$uni-border-4: #B9B9B9;
+
+// 常规色
+$uni-black: #000000;
+$uni-white: #ffffff;
+$uni-transparent: rgba($color: #000000, $alpha: 0);
+
+// 背景色
+$uni-bg-color: #f7f7f7;
+
+/* 水平间距 */
+$uni-spacing-sm: 8px;
+$uni-spacing-base: 15px;
+$uni-spacing-lg: 30px;
+
+// 阴影
+$uni-shadow-sm:0 0 5px rgba($color: #d8d8d8, $alpha: 0.5);
+$uni-shadow-base:0 1px 8px 1px rgba($color: #a5a5a5, $alpha: 0.2);
+$uni-shadow-lg:0px 1px 10px 2px rgba($color: #a5a4a4, $alpha: 0.5);
+
+// 蒙版
+$uni-mask: rgba($color: #000000, $alpha: 0.4);
diff --git a/uni-app/src/uni_modules/uni-transition/changelog.md b/uni-app/src/uni_modules/uni-transition/changelog.md
new file mode 100644
index 00000000..faaf3363
--- /dev/null
+++ b/uni-app/src/uni_modules/uni-transition/changelog.md
@@ -0,0 +1,24 @@
+## 1.3.3（2024-04-23）
+- 修复 当元素会受变量影响自动隐藏的bug
+## 1.3.2（2023-05-04）
+- 修复 NVUE 平台报错的问题
+## 1.3.1（2021-11-23）
+- 修复 init 方法初始化问题
+## 1.3.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-transition](https://uniapp.dcloud.io/component/uniui/uni-transition)
+## 1.2.1（2021-09-27）
+- 修复 init 方法不生效的 Bug
+## 1.2.0（2021-07-30）
+- 组件兼容 vue3，如何创建 vue3 项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.1（2021-05-12）
+- 新增 示例地址
+- 修复 示例项目缺少组件的 Bug
+## 1.1.0（2021-04-22）
+- 新增 通过方法自定义动画
+- 新增 custom-class 非 NVUE 平台支持自定义 class 定制样式
+- 优化 动画触发逻辑，使动画更流畅
+- 优化 支持单独的动画类型
+- 优化 文档示例
+## 1.0.2（2021-02-05）
+- 调整为 uni_modules 目录规范
diff --git a/uni-app/src/uni_modules/uni-transition/components/uni-transition/createAnimation.js b/uni-app/src/uni_modules/uni-transition/components/uni-transition/createAnimation.js
new file mode 100644
index 00000000..8f89b185
--- /dev/null
+++ b/uni-app/src/uni_modules/uni-transition/components/uni-transition/createAnimation.js
@@ -0,0 +1,131 @@
+// const defaultOption = {
+// 	duration: 300,
+// 	timingFunction: 'linear',
+// 	delay: 0,
+// 	transformOrigin: '50% 50% 0'
+// }
+// #ifdef APP-NVUE
+const nvueAnimation = uni.requireNativePlugin('animation')
+// #endif
+class MPAnimation {
+	constructor(options, _this) {
+		this.options = options
+		// 在iOS10+QQ小程序平台下，传给原生的对象一定是个普通对象而不是Proxy对象，否则会报parameter should be Object instead of ProxyObject的错误
+		this.animation = uni.createAnimation({
+			...options
+		})
+		this.currentStepAnimates = {}
+		this.next = 0
+		this.$ = _this
+
+	}
+
+	_nvuePushAnimates(type, args) {
+		let aniObj = this.currentStepAnimates[this.next]
+		let styles = {}
+		if (!aniObj) {
+			styles = {
+				styles: {},
+				config: {}
+			}
+		} else {
+			styles = aniObj
+		}
+		if (animateTypes1.includes(type)) {
+			if (!styles.styles.transform) {
+				styles.styles.transform = ''
+			}
+			let unit = ''
+			if(type === 'rotate'){
+				unit = 'deg'
+			}
+			styles.styles.transform += `${type}(${args+unit}) `
+		} else {
+			styles.styles[type] = `${args}`
+		}
+		this.currentStepAnimates[this.next] = styles
+	}
+	_animateRun(styles = {}, config = {}) {
+		let ref = this.$.$refs['ani'].ref
+		if (!ref) return
+		return new Promise((resolve, reject) => {
+			nvueAnimation.transition(ref, {
+				styles,
+				...config
+			}, res => {
+				resolve()
+			})
+		})
+	}
+
+	_nvueNextAnimate(animates, step = 0, fn) {
+		let obj = animates[step]
+		if (obj) {
+			let {
+				styles,
+				config
+			} = obj
+			this._animateRun(styles, config).then(() => {
+				step += 1
+				this._nvueNextAnimate(animates, step, fn)
+			})
+		} else {
+			this.currentStepAnimates = {}
+			typeof fn === 'function' && fn()
+			this.isEnd = true
+		}
+	}
+
+	step(config = {}) {
+		// #ifndef APP-NVUE
+		this.animation.step(config)
+		// #endif
+		// #ifdef APP-NVUE
+		this.currentStepAnimates[this.next].config = Object.assign({}, this.options, config)
+		this.currentStepAnimates[this.next].styles.transformOrigin = this.currentStepAnimates[this.next].config.transformOrigin
+		this.next++
+		// #endif
+		return this
+	}
+
+	run(fn) {
+		// #ifndef APP-NVUE
+		this.$.animationData = this.animation.export()
+		this.$.timer = setTimeout(() => {
+			typeof fn === 'function' && fn()
+		}, this.$.durationTime)
+		// #endif
+		// #ifdef APP-NVUE
+		this.isEnd = false
+		let ref = this.$.$refs['ani'] && this.$.$refs['ani'].ref
+		if(!ref) return
+		this._nvueNextAnimate(this.currentStepAnimates, 0, fn)
+		this.next = 0
+		// #endif
+	}
+}
+
+
+const animateTypes1 = ['matrix', 'matrix3d', 'rotate', 'rotate3d', 'rotateX', 'rotateY', 'rotateZ', 'scale', 'scale3d',
+	'scaleX', 'scaleY', 'scaleZ', 'skew', 'skewX', 'skewY', 'translate', 'translate3d', 'translateX', 'translateY',
+	'translateZ'
+]
+const animateTypes2 = ['opacity', 'backgroundColor']
+const animateTypes3 = ['width', 'height', 'left', 'right', 'top', 'bottom']
+animateTypes1.concat(animateTypes2, animateTypes3).forEach(type => {
+	MPAnimation.prototype[type] = function(...args) {
+		// #ifndef APP-NVUE
+		this.animation[type](...args)
+		// #endif
+		// #ifdef APP-NVUE
+		this._nvuePushAnimates(type, args)
+		// #endif
+		return this
+	}
+})
+
+export function createAnimation(option, _this) {
+	if(!_this) return
+	clearTimeout(_this.timer)
+	return new MPAnimation(option, _this)
+}
diff --git a/uni-app/src/uni_modules/uni-transition/components/uni-transition/uni-transition.vue b/uni-app/src/uni_modules/uni-transition/components/uni-transition/uni-transition.vue
new file mode 100644
index 00000000..f3ddd1f3
--- /dev/null
+++ b/uni-app/src/uni_modules/uni-transition/components/uni-transition/uni-transition.vue
@@ -0,0 +1,286 @@
+<template>
+  <!-- #ifndef APP-NVUE -->
+  <view v-show="isShow" ref="ani" :animation="animationData" :class="customClass" :style="transformStyles" @click="onClick"><slot></slot></view>
+  <!-- #endif -->
+  <!-- #ifdef APP-NVUE -->
+  <view v-if="isShow" ref="ani" :animation="animationData" :class="customClass" :style="transformStyles" @click="onClick"><slot></slot></view>
+  <!-- #endif -->
+</template>
+
+<script>
+import { createAnimation } from './createAnimation'
+
+/**
+ * Transition 过渡动画
+ * @description 简单过渡动画组件
+ * @tutorial https://ext.dcloud.net.cn/plugin?id=985
+ * @property {Boolean} show = [false|true] 控制组件显示或隐藏
+ * @property {Array|String} modeClass = [fade|slide-top|slide-right|slide-bottom|slide-left|zoom-in|zoom-out] 过渡动画类型
+ *  @value fade 渐隐渐出过渡
+ *  @value slide-top 由上至下过渡
+ *  @value slide-right 由右至左过渡
+ *  @value slide-bottom 由下至上过渡
+ *  @value slide-left 由左至右过渡
+ *  @value zoom-in 由小到大过渡
+ *  @value zoom-out 由大到小过渡
+ * @property {Number} duration 过渡动画持续时间
+ * @property {Object} styles 组件样式，同 css 样式，注意带’-‘连接符的属性需要使用小驼峰写法如：`backgroundColor:red`
+ */
+export default {
+	name: 'uniTransition',
+	emits:['click','change'],
+	props: {
+		show: {
+			type: Boolean,
+			default: false
+		},
+		modeClass: {
+			type: [Array, String],
+			default() {
+				return 'fade'
+			}
+		},
+		duration: {
+			type: Number,
+			default: 300
+		},
+		styles: {
+			type: Object,
+			default() {
+				return {}
+			}
+		},
+		customClass:{
+			type: String,
+			default: ''
+		},
+		onceRender:{
+			type:Boolean,
+			default:false
+		},
+	},
+	data() {
+		return {
+			isShow: false,
+			transform: '',
+			opacity: 1,
+			animationData: {},
+			durationTime: 300,
+			config: {}
+		}
+	},
+	watch: {
+		show: {
+			handler(newVal) {
+				if (newVal) {
+					this.open()
+				} else {
+					// 避免上来就执行 close,导致动画错乱
+					if (this.isShow) {
+						this.close()
+					}
+				}
+			},
+			immediate: true
+		}
+	},
+	computed: {
+		// 生成样式数据
+		stylesObject() {
+			let styles = {
+				...this.styles,
+				'transition-duration': this.duration / 1000 + 's'
+			}
+			let transform = ''
+			for (let i in styles) {
+				let line = this.toLine(i)
+				transform += line + ':' + styles[i] + ';'
+			}
+			return transform
+		},
+		// 初始化动画条件
+		transformStyles() {
+			return 'transform:' + this.transform + ';' + 'opacity:' + this.opacity + ';' + this.stylesObject
+		}
+	},
+	created() {
+		// 动画默认配置
+		this.config = {
+			duration: this.duration,
+			timingFunction: 'ease',
+			transformOrigin: '50% 50%',
+			delay: 0
+		}
+		this.durationTime = this.duration
+	},
+	methods: {
+		/**
+		 *  ref 触发 初始化动画
+		 */
+		init(obj = {}) {
+			if (obj.duration) {
+				this.durationTime = obj.duration
+			}
+			this.animation = createAnimation(Object.assign(this.config, obj),this)
+		},
+		/**
+		 * 点击组件触发回调
+		 */
+		onClick() {
+			this.$emit('click', {
+				detail: this.isShow
+			})
+		},
+		/**
+		 * ref 触发 动画分组
+		 * @param {Object} obj
+		 */
+		step(obj, config = {}) {
+			if (!this.animation) return
+			for (let i in obj) {
+				try {
+					if(typeof obj[i] === 'object'){
+						this.animation[i](...obj[i])
+					}else{
+						this.animation[i](obj[i])
+					}
+				} catch (e) {
+					console.error(`方法 ${i} 不存在`)
+				}
+			}
+			this.animation.step(config)
+			return this
+		},
+		/**
+		 *  ref 触发 执行动画
+		 */
+		run(fn) {
+			if (!this.animation) return
+			this.animation.run(fn)
+		},
+		// 开始过度动画
+		open() {
+			clearTimeout(this.timer)
+			this.transform = ''
+			this.isShow = true
+			let { opacity, transform } = this.styleInit(false)
+			if (typeof opacity !== 'undefined') {
+				this.opacity = opacity
+			}
+			this.transform = transform
+			// 确保动态样式已经生效后，执行动画，如果不加 nextTick ，会导致 wx 动画执行异常
+			this.$nextTick(() => {
+				// TODO 定时器保证动画完全执行，目前有些问题，后面会取消定时器
+				this.timer = setTimeout(() => {
+					this.animation = createAnimation(this.config, this)
+					this.tranfromInit(false).step()
+					this.animation.run()
+					this.$emit('change', {
+						detail: this.isShow
+					})
+				}, 20)
+			})
+		},
+		// 关闭过度动画
+		close(type) {
+			if (!this.animation) return
+			this.tranfromInit(true)
+				.step()
+				.run(() => {
+					this.isShow = false
+					this.animationData = null
+					this.animation = null
+					let { opacity, transform } = this.styleInit(false)
+					this.opacity = opacity || 1
+					this.transform = transform
+					this.$emit('change', {
+						detail: this.isShow
+					})
+				})
+		},
+		// 处理动画开始前的默认样式
+		styleInit(type) {
+			let styles = {
+				transform: ''
+			}
+			let buildStyle = (type, mode) => {
+				if (mode === 'fade') {
+					styles.opacity = this.animationType(type)[mode]
+				} else {
+					styles.transform += this.animationType(type)[mode] + ' '
+				}
+			}
+			if (typeof this.modeClass === 'string') {
+				buildStyle(type, this.modeClass)
+			} else {
+				this.modeClass.forEach(mode => {
+					buildStyle(type, mode)
+				})
+			}
+			return styles
+		},
+		// 处理内置组合动画
+		tranfromInit(type) {
+			let buildTranfrom = (type, mode) => {
+				let aniNum = null
+				if (mode === 'fade') {
+					aniNum = type ? 0 : 1
+				} else {
+					aniNum = type ? '-100%' : '0'
+					if (mode === 'zoom-in') {
+						aniNum = type ? 0.8 : 1
+					}
+					if (mode === 'zoom-out') {
+						aniNum = type ? 1.2 : 1
+					}
+					if (mode === 'slide-right') {
+						aniNum = type ? '100%' : '0'
+					}
+					if (mode === 'slide-bottom') {
+						aniNum = type ? '100%' : '0'
+					}
+				}
+				this.animation[this.animationMode()[mode]](aniNum)
+			}
+			if (typeof this.modeClass === 'string') {
+				buildTranfrom(type, this.modeClass)
+			} else {
+				this.modeClass.forEach(mode => {
+					buildTranfrom(type, mode)
+				})
+			}
+
+			return this.animation
+		},
+		animationType(type) {
+			return {
+				fade: type ? 0 : 1,
+				'slide-top': `translateY(${type ? '0' : '-100%'})`,
+				'slide-right': `translateX(${type ? '0' : '100%'})`,
+				'slide-bottom': `translateY(${type ? '0' : '100%'})`,
+				'slide-left': `translateX(${type ? '0' : '-100%'})`,
+				'zoom-in': `scaleX(${type ? 1 : 0.8}) scaleY(${type ? 1 : 0.8})`,
+				'zoom-out': `scaleX(${type ? 1 : 1.2}) scaleY(${type ? 1 : 1.2})`
+			}
+		},
+		// 内置动画类型与实际动画对应字典
+		animationMode() {
+			return {
+				fade: 'opacity',
+				'slide-top': 'translateY',
+				'slide-right': 'translateX',
+				'slide-bottom': 'translateY',
+				'slide-left': 'translateX',
+				'zoom-in': 'scale',
+				'zoom-out': 'scale'
+			}
+		},
+		// 驼峰转中横线
+		toLine(name) {
+			return name.replace(/([A-Z])/g, '-$1').toLowerCase()
+		}
+	}
+}
+</script>
+
+<style></style>
diff --git a/uni-app/src/uni_modules/uni-transition/package.json b/uni-app/src/uni_modules/uni-transition/package.json
new file mode 100644
index 00000000..d5c20e1f
--- /dev/null
+++ b/uni-app/src/uni_modules/uni-transition/package.json
@@ -0,0 +1,85 @@
+{
+  "id": "uni-transition",
+  "displayName": "uni-transition 过渡动画",
+  "version": "1.3.3",
+  "description": "元素的简单过渡动画",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "动画",
+    "过渡",
+    "过渡动画"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y",
+        "alipay": "n"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni-app/src/uni_modules/uni-transition/readme.md b/uni-app/src/uni_modules/uni-transition/readme.md
new file mode 100644
index 00000000..2f8a77e1
--- /dev/null
+++ b/uni-app/src/uni_modules/uni-transition/readme.md
@@ -0,0 +1,11 @@
+
+
+## Transition 过渡动画
+> **组件名：uni-transition**
+> 代码块： `uTransition`
+
+
+元素过渡动画
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-transition)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni-app/src/utils/auth.ts b/uni-app/src/utils/auth.ts
new file mode 100644
index 00000000..f68a92dd
--- /dev/null
+++ b/uni-app/src/utils/auth.ts
@@ -0,0 +1,18 @@
+import { useLogin } from '@/hooks/useLogin'
+import { getToken } from '@/utils/common'
+import { getNeedLoginPages } from '@/utils/pages'
+
+const loginBack = useLogin()
+
+/**
+ * 检测是否需要登录
+ */
+export function checkNeedLogin(route: AnyObject) {
+    const pages = getNeedLoginPages()
+
+    if (pages.includes(route.path) && !getToken()) {
+        setTimeout(() => {
+            loginBack.setLoginBack({ url: route.path, param: route.query || {} })
+        }, 100)
+    }
+}
diff --git a/uni-app/src/utils/common.ts b/uni-app/src/utils/common.ts
new file mode 100644
index 00000000..814a933b
--- /dev/null
+++ b/uni-app/src/utils/common.ts
@@ -0,0 +1,658 @@
+import { getTabbarPages } from './pages'
+import useDiyStore from '@/app/stores/diy'
+import useMemberStore from '@/stores/member'
+import useSystemStore from '@/stores/system'
+import useConfigStore from '@/stores/config'
+import { getNeedLoginPages } from '@/utils/pages'
+
+/**
+ * 跳转页面
+ */
+export const redirect = (redirect: any) => {
+    // 装修模式禁止跳转
+    if (useDiyStore().mode == 'decorate') return
+
+    let { url, mode, param, success, fail, complete } = redirect
+    let originalUrl = url; // 原始地址
+    let newLogin = false; // 是否需要登录
+
+    // 如果未开启普通账号登录注册，则不展示登录注册页面，如果只开启了账号密码登录，就不需要跳转到登录中间页了，直接进入普通账号密码登录页面
+    if (!getToken() && getNeedLoginPages().indexOf(url) != -1) {
+
+        const config = useConfigStore()
+        const systemStore = useSystemStore()
+
+        // #ifdef MP-WEIXIN
+        if (config.login.is_username && !config.login.is_mobile && !config.login.is_auth_register) {
+            url = '/app/pages/auth/login'
+            param = { type: 'username' }
+            mode = 'redirectTo'
+            newLogin = true
+        } else if (systemStore.initStatus == 'finish' && !config.login.is_username && !config.login.is_mobile && !config.login.is_auth_register) {
+            uni.showToast({ title: '商家未开启登录注册', icon: 'none' })
+            return;
+        } else {
+            url = '/app/pages/auth/index'
+            mode = 'redirectTo'
+            newLogin = true
+        }
+        // #endif
+
+        // #ifdef H5
+        if (isWeixinBrowser()) {
+            // 微信浏览器
+            if (config.login.is_username && !config.login.is_mobile && !config.login.is_auth_register) {
+                url = '/app/pages/auth/login'
+                param = { type: 'username' }
+                mode = 'redirectTo'
+                newLogin = true
+            } else if (systemStore.initStatus == 'finish' && !config.login.is_username && !config.login.is_mobile && !config.login.is_auth_register) {
+                uni.showToast({ title: '商家未开启登录注册', icon: 'none' })
+                return;
+            } else {
+                url = '/app/pages/auth/index'
+                mode = 'redirectTo'
+                newLogin = true
+            }
+        } else {
+            // 普通浏览器
+            if (config.login.is_username && !config.login.is_mobile) {
+                url = '/app/pages/auth/login'
+                param = { type: 'username' }
+                mode = 'redirectTo'
+                newLogin = true
+            } else if (systemStore.initStatus == 'finish' && !config.login.is_username && !config.login.is_mobile) {
+                uni.showToast({ title: '商家未开启登录注册', icon: 'none' })
+                return;
+            } else {
+                url = '/app/pages/auth/index'
+                mode = 'redirectTo'
+                newLogin = true
+            }
+        }
+        // #endif
+    }
+
+    mode = mode || 'navigateTo'
+    const tabBar = getTabbarPages()
+    tabBar.includes(url) && (mode = 'switchTab')
+
+    mode != 'switchTab' && param && Object.keys(param).length && (url += uni.$u.queryParams(param))
+
+    if (newLogin) {
+        uni.setStorage({ key: 'loginBack', data: { url: originalUrl } });
+    }
+
+    switch (mode) {
+        case 'switchTab':
+            uni.switchTab({
+                url,
+                success: () => {
+                    success && success()
+                },
+                fail: () => {
+                    fail && fail()
+                },
+                complete: () => {
+                    complete && complete()
+                }
+            })
+            break;
+        case 'navigateTo':
+            uni.navigateTo({
+                url,
+                success: () => {
+                    success && success()
+                },
+                fail: () => {
+                    fail && fail()
+                },
+                complete: () => {
+                    complete && complete()
+                }
+            })
+            break;
+        case 'reLaunch':
+            uni.reLaunch({
+                url,
+                success: () => {
+                    success && success()
+                },
+                fail: () => {
+                    fail && fail()
+                },
+                complete: () => {
+                    complete && complete()
+                }
+            })
+            break;
+        case 'redirectTo':
+            uni.redirectTo({
+                url,
+                success: () => {
+                    success && success()
+                },
+                fail: () => {
+                    fail && fail()
+                },
+                complete: () => {
+                    complete && complete()
+                }
+            })
+            break;
+    }
+}
+
+/**
+ * 自定义跳转链接
+ * @param {Object} link
+ */
+export const diyRedirect = (link: any) => {
+    const diyStore = useDiyStore();
+    // 装修模式禁止跳转
+    if (diyStore.mode == 'decorate') return;
+
+    if (link == null || Object.keys(link).length == 1) return;
+
+    // 外部链接
+    if (link.url && (link.url.indexOf('https') != -1 || link.url.indexOf('http') != -1)) {
+
+        // #ifdef H5
+        window.location.href = link.url;
+        // #endif
+
+        // #ifdef MP
+        redirect({
+            url: '/app/pages/webview/index',
+            param: { src: encodeURIComponent(link.url) }
+        });
+        // #endif
+    } else if (link.appid) {
+        // 跳转其他小程序
+
+        // #ifdef MP
+        uni.navigateToMiniProgram({
+            appId: link.appid,
+            path: link.page
+        })
+        // #endif
+    } else if (link.name == 'DIY_MAKE_PHONE_CALL' && link.mobile) {
+        // 拨打电话
+
+        uni.makePhoneCall({
+            phoneNumber: link.mobile,
+            success: (res) => {
+            },
+            fail: (res) => {
+            }
+        });
+
+    } else {
+        redirect({ url: link.url });
+    }
+}
+
+/**
+ * 获取当前路由
+ */
+export const currRoute = () => {
+    const pages = getCurrentPages()
+    const route = pages[pages.length - 1]
+    return route ? route.route : ''
+}
+
+// 获取分享路由
+export const currShareRoute = () => {
+    const pages: any = getCurrentPages()
+    if (pages.length == 0) {
+        return {
+            path: '/',
+            params: {}
+        }
+    }
+    let currentRoute = pages[pages.length - 1].route //获取当前页面路由
+
+    // #ifdef H5
+    let currentParam: any = pages[pages.length - 1].$page.options; //获取路由参数
+    // #endif
+
+    // #ifdef MP
+    let currentParam: any = pages[pages.length - 1].options || {}; //获取路由参数
+    // #endif
+
+    // 拼接参数
+    let params: any = {};
+    for (let key in currentParam) {
+        params[key] = currentParam[key]
+    }
+    let currentPath = '/' + currentRoute;
+
+    return {
+        path: currentPath,
+        params
+    }
+}
+
+/**
+ * 获取token
+ * @returns
+ */
+export function getToken(): null | string {
+    return useMemberStore().token
+}
+
+/**
+ * 设置token
+ * @param token
+ * @returns
+ */
+export function setToken(token: string): void {
+    uni.setStorageSync(import.meta.env.VITE_REQUEST_STORAGE_TOKEN_KEY, token)
+}
+
+/**
+ * 移除token
+ * @returns
+ */
+export function removeToken(): void {
+    uni.removeStorageSync(import.meta.env.VITE_REQUEST_STORAGE_TOKEN_KEY)
+}
+
+/**
+ * 将url 解构为 { path: ***, query: {} }
+ */
+export function urlDeconstruction(url: string) {
+    const query: any = {}
+    const [path, param] = url.split('?')
+
+    param && param.split('&').forEach((str: string) => {
+        let [name, value] = str.split('=')
+        query[name] = value
+    })
+
+    return { path, query }
+}
+
+/**
+ * 判断是否是url
+ * @param str
+ * @returns
+ */
+export function isUrl(str: string): boolean {
+    return str && (str.indexOf('http://') != -1 || str.indexOf('https://') != -1) || false
+}
+
+/**
+ * 图片输出
+ * @param path
+ * @returns
+ */
+export function img(path: string): string {
+    // #ifdef H5
+    return isUrl(path) ? path : `${ import.meta.env.VITE_IMG_DOMAIN || location.origin }/${ path }`
+    // #endif
+
+    // #ifndef H5
+    return isUrl(path) ? path : `${ import.meta.env.VITE_IMG_DOMAIN }/${ path }`
+    // #endif
+}
+
+/**
+ * 手机号隐藏
+ */
+export function mobileHide(mobile: string) {
+    return mobile.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2')
+}
+
+/**
+ * 判断是否是微信浏览器
+ */
+export function isWeixinBrowser(): boolean {
+    // #ifndef H5
+    return false
+    // #endif
+    let ua = navigator.userAgent.toLowerCase()
+    return /micromessenger/.test(ua) ? true : false
+}
+
+/**
+ * 获取应用场景值
+ */
+export function getAppChannel(): string {
+    // #ifdef APP-PLUS
+    return 'app'
+    // #endif
+    // #ifdef MP-WEIXIN
+    return 'weapp'
+    // #endif
+    // #ifdef H5
+    return isWeixinBrowser() ? 'wechat' : 'h5'
+    // #endif
+}
+
+/**
+ * 金额格式化
+ */
+export function moneyFormat(money: string): string {
+    return isNaN(parseFloat(money)) ? money : parseFloat(money).toFixed(2)
+}
+
+/**
+ * 手机号隐藏
+ */
+export function mobileConceal(mobile: string): string {
+    return mobile.substring(0, 3) + "****" + mobile.substr(mobile.length - 4);
+}
+
+/**
+ * 时间戳转日期格式
+ * @param timeStamp
+ * @param type
+ */
+export function timeStampTurnTime(timeStamp: any, type = "") {
+    if (timeStamp != undefined && timeStamp != "" && timeStamp > 0) {
+        var date = new Date();
+        date.setTime(timeStamp * 1000);
+        var y = date.getFullYear();
+        var m: any = date.getMonth() + 1;
+        m = m < 10 ? ('0' + m) : m;
+        var d: any = date.getDate();
+        d = d < 10 ? ('0' + d) : d;
+        var h: any = date.getHours();
+        h = h < 10 ? ('0' + h) : h;
+        var minute: any = date.getMinutes();
+        var second: any = date.getSeconds();
+        minute = minute < 10 ? ('0' + minute) : minute;
+        second = second < 10 ? ('0' + second) : second;
+        if (type) {
+            if (type == 'yearMonthDay') {
+                return y + '年' + m + '月' + d + '日';
+            }
+            return y + '-' + m + '-' + d;
+        } else {
+            return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + second;
+        }
+
+    } else {
+        return "";
+    }
+}
+
+/**
+ * 日期格式转时间戳
+ * @param {Object} date
+ */
+export function timeTurnTimeStamp(dateStr: string) {
+    let timestamp;
+    let date;
+
+    // 尝试解析 'YYYY年M月D日'
+    try {
+        let dateStr1 = dateStr.replace('年', '-').replace('月', '-').replace('日', '');
+        date = new Date(dateStr1);
+        timestamp = date.getTime();
+    } catch (e) {
+        // 尝试解析 'YYYY-MM-DD'
+        try {
+            date = new Date(dateStr);
+            timestamp = date.getTime();
+        } catch (e) {
+            // 尝试解析 'YYYY/MM/DD'
+            try {
+                date = new Date(dateStr.replace(/\//g, "-"));
+                timestamp = date.getTime();
+            } catch (e) {
+                // 尝试解析 'YYYY年M月D日 HH时mm分'
+                try {
+                    let dateStr1 = dateStr.replace('年', '-').replace('月', '-').replace('日', ' ').replace('时', ':').replace('分', '');
+                    date = new Date(dateStr1);
+                    timestamp = date.getTime();
+                } catch (e) {
+                    // 尝试解析 'YYYY-MM-DD HH:mm'
+                    try {
+                        date = new Date(dateStr);
+                        timestamp = date.getTime();
+                    } catch (e) {
+                        // 尝试解析 'YYYY/MM/DD HH:mm'
+                        try {
+                            date = new Date(dateStr.replace(/\//g, "-"));
+                            timestamp = date.getTime();
+                        } catch (e) {
+                            // 如果所有格式都失败，返回null
+                            console.error("无法解析日期字符串:", dateStr);
+                            return null;
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return (timestamp / 1000);
+}
+
+/**
+ * 复制
+ * @param {Object} value
+ * @param {Object} callback
+ */
+export function copy(value: any, callback: any) {
+    // #ifdef H5
+    var oInput = document.createElement('input'); //创建一个隐藏input（重要！）
+    oInput.value = value; //赋值
+    oInput.setAttribute("readonly", "readonly");
+    document.body.appendChild(oInput);
+    oInput.select(); // 选择对象
+    document.execCommand("Copy"); // 执行浏览器复制命令
+    oInput.className = 'oInput';
+    oInput.style.display = 'none';
+    uni.hideKeyboard();
+    uni.showToast({
+        title: '复制成功',
+        icon: 'none'
+    });
+
+    typeof callback == 'function' && callback();
+    // #endif
+
+    // #ifdef MP || APP-PLUS
+    uni.setClipboardData({
+        data: value,
+        success: () => {
+            typeof callback == 'function' && callback();
+        },
+        fail: (res) => {
+            // 在隐私协议中没有声明chooseLocation:fail api作用域
+            if (res.errMsg && res.errno) {
+                if (res.errno == 104) {
+                    let msg = '用户未授权隐私权限，设置剪贴板数据失败';
+                    uni.showToast({ title: msg, icon: 'none' })
+                } else if (res.errno == 112) {
+                    let msg = '隐私协议中未声明，设置剪贴板数据失败';
+                    uni.showToast({ title: msg, icon: 'none' })
+                } else {
+                    uni.showToast({ title: res.errMsg, icon: 'none' })
+                }
+            }
+        }
+    });
+    // #endif
+}
+
+/**
+ * 处理onLoad传递的参数
+ * @param option
+ */
+export function handleOnloadParams(option: any) {
+    let params: any = {};
+
+    // 处理小程序扫码进入的场景值参数
+    if (option.scene) {
+        var sceneParams = decodeURIComponent(option.scene).split('&');
+        if (sceneParams.length) {
+            sceneParams.forEach(item => {
+                let arr = item.split('-');
+                params[arr[0]] = arr[1];
+                if (arr[0] == 'mid') {
+                    uni.setStorageSync('pid', arr[1])
+                }
+            });
+        }
+    } else {
+        params = option;
+    }
+    return params;
+}
+
+
+/**
+ * @description 深度克隆
+ * @param {object} obj 需要深度克隆的对象
+ * @returns {*} 克隆后的对象或者原值（不是对象）
+ */
+export function deepClone(obj: any) {
+    // 对常见的“非”值，直接返回原来值
+    if ([null, undefined, NaN, false].includes(obj)) return obj
+    if (typeof obj !== 'object' && typeof obj !== 'function') {
+        // 原始类型直接返回
+        return obj
+    }
+    const o = isArray(obj) ? [] : {}
+    for (const i in obj) {
+        if (obj.hasOwnProperty(i)) {
+            o[i] = typeof obj[i] === 'object' ? deepClone(obj[i]) : obj[i]
+        }
+    }
+    return o
+}
+
+/**
+ * 防抖函数
+ * @param fn
+ * @param delay
+ * @returns
+ */
+export function debounce(fn: (args?: any) => any, delay: number = 300) {
+    let timer: null | number = null
+    return function (...args) {
+        if (timer != null) {
+            clearTimeout(timer)
+            timer = null
+        }
+        timer = setTimeout(() => {
+            fn.call(this, ...args)
+        }, delay);
+    }
+}
+
+const isArray = (value: any) => {
+    if (typeof Array.isArray === 'function') {
+        return Array.isArray(value)
+    }
+    return Object.prototype.toString.call(value) === '[object Array]'
+}
+
+// px转rpx
+export function pxToRpx(px: any) {
+    const screenWidth = uni.getSystemInfoSync().screenWidth;
+    return (750 * Number.parseInt(px)) / screenWidth;
+}
+
+// 返回上一页
+export function goback(data: any) {
+    let { url, mode, param, title } = data
+    uni.showToast({
+        title: title,
+        icon: 'none'
+    });
+    setTimeout(() => {
+        if (getCurrentPages().length > 1) {
+            uni.navigateBack({
+                delta: 1
+            });
+        } else {
+            redirect({
+                url: url,
+                param: param || {},
+                mode: mode || 'redirectTo'
+            });
+        }
+    }, 600);
+}
+
+
+// 获取微信OpenId、微信公众号OpenId
+export function getWinxinOpenId() {
+    const memberStore = useMemberStore();
+    const memberInfo = memberStore.info;
+
+    let obj = {
+        weapp: '',
+        wechat: ''
+    }
+
+    if (memberInfo) {
+        obj.weapp = memberInfo.weapp_openid;
+        obj.wechat = memberInfo.wx_openid;
+    }
+    return obj;
+}
+
+// 获取有效期
+export function getValidTime(minutes: any = 1) {
+    var date = new Date();
+    date.setSeconds(60 * minutes);
+    let validTime: any = parseInt(date.getTime() / 1000); // 定位信息 5分钟内有效，过期后将重新获取定位信息
+    return validTime;
+}
+
+/**
+ * 检测当前访问的是系统（app）还是插件
+ * 设置插件的底部导航
+ * 设置插件应用的主色调
+ * @param path
+ */
+export function setThemeColor (path: string) {
+    let pathArr = path.split('/')
+	let index = !pathArr[0] ? 1 : 0;
+    let route = pathArr[index] == 'addon' ? pathArr[(index+1)] : 'app';
+
+    // 设置底部导航
+    const configStore = useConfigStore()
+    if (configStore.addon != route) {
+        configStore.addon = route;
+    }
+	
+    // 设置插件应用的主色调，排除系统
+	const theme_color_list = uni.getStorageSync('theme_color_list');
+	const current_theme_color = uni.getStorageSync('current_theme_color');
+	let theme = '';
+    if (route != 'app') {
+        try {
+			theme = theme_color_list[route];
+			if(theme && theme.value){
+				configStore.themeColor = theme.value
+				uni.setStorageSync('current_theme_color', JSON.stringify(theme.value));
+			}else if( !theme && current_theme_color){
+				configStore.themeColor = ''
+			}else{
+				theme = theme_color_list.app || Object.values(theme_color_list)[0];
+				configStore.themeColor = theme.value
+				uni.setStorageSync('current_theme_color', JSON.stringify(theme.value));
+			}
+        } catch (e) {
+            // 设置插件应用的主色调发生错误，若不存在则使用最后有效的主色调
+			if(!current_theme_color && theme_color_list){
+				theme = theme_color_list.app || Object.values(theme_color_list)[0];
+				configStore.themeColor = theme.value
+				uni.setStorageSync('current_theme_color', JSON.stringify(theme.value));
+			}else{
+				configStore.themeColor = '';
+			}
+        }
+
+    }else if(!current_theme_color && theme_color_list){
+		theme = theme_color_list.app || Object.values(theme_color_list)[0];
+		configStore.themeColor = theme.value
+		uni.setStorageSync('current_theme_color', JSON.stringify(theme.value));
+	}
+}
diff --git a/uni-app/src/utils/interceptor.ts b/uni-app/src/utils/interceptor.ts
new file mode 100644
index 00000000..2ca2294a
--- /dev/null
+++ b/uni-app/src/utils/interceptor.ts
@@ -0,0 +1,86 @@
+import { language } from '@/locale'
+import { checkNeedLogin } from '@/utils/auth'
+import { getToken, currRoute, setThemeColor } from '@/utils/common'
+import { memberLog } from '@/app/api/auth'
+import { useShare } from '@/hooks/useShare'
+
+/**
+ * 页面跳转拦截器
+ */
+export const redirectInterceptor = (route: { path: string, query: object }) => {
+    route.path = `/${ route.path }`
+
+    // 检测当前访问的是系统（app）还是插件
+    setThemeColor(route.path)
+
+    // #ifdef MP
+    route.path.indexOf('addon') != -1 && language.loadAllLocaleMessages('addon', uni.getLocale())
+    // #endif
+
+    // 校验是否需要登录
+    checkNeedLogin(route)
+
+    loadShare()
+
+    // 添加会员访问日志
+    if (getToken()) memberLog({
+        route: route.path,
+        params: JSON.stringify(route.query),
+        pre_route: getCurrentPages()[0]?.route
+    })
+}
+
+/**
+ * 应用初始化拦截器
+ */
+export const launchInterceptor = () => {
+    const launch = uni.getLaunchOptionsSync()
+    launch.path = `/${ launch.path }`
+
+    // 检测当前访问的是系统（app）还是插件
+    setThemeColor(launch.path);
+
+    // 加载语言包
+    language.loadAllLocaleMessages('app', uni.getLocale())
+
+    // #ifdef H5
+    language.loadAllLocaleMessages('addon', uni.getLocale())
+    // #endif
+
+    // 校验是否需要登录
+    checkNeedLogin(launch)
+
+    // 存储分享会员id
+    if (launch.query && launch.query.mid) {
+        uni.setStorageSync('pid', launch.query.mid)
+    }
+
+    loadShare()
+
+    // 添加会员访问日志
+    if (getToken()) memberLog({ route: launch.path, params: JSON.stringify(launch.query || {}), pre_route: '' })
+}
+
+
+// 加载分享
+const loadShare = () => {
+    const { setShare } = useShare()
+    // 分享其它页面时，需要设置当前页面为白名单
+    const shareWhiteList = [
+        'addon/cms/pages/detail',
+        'addon/shop/pages/goods/detail',
+        'addon/shop/pages/point/detail',
+        'addon/shop_fenxiao/pages/promote_code',
+        'addon/shop_fenxiao/pages/goods',
+        'addon/shop_fenxiao/pages/zone',
+        'addon/shop_giftcard/pages/detail',
+        'addon/shop_giftcard/pages/give',
+        'app/pages/index/diy',
+        'app/pages/index/diy_form',
+        'app/pages/friendspay/share',
+        'app/pages/friendspay/money'
+    ]
+    if (currRoute()) {
+        if (!shareWhiteList.includes(currRoute() || '')) setShare()
+    }
+}
diff --git a/uni-app/src/utils/mixin.ts b/uni-app/src/utils/mixin.ts
new file mode 100644
index 00000000..6ec5af7b
--- /dev/null
+++ b/uni-app/src/utils/mixin.ts
@@ -0,0 +1,55 @@
+import { currRoute } from './common'
+import { redirectInterceptor } from './interceptor'
+import useConfigStore from "@/stores/config";
+import useSystemStore from '@/stores/system'
+import { useShare } from '@/hooks/useShare'
+
+export default {
+    install(vue) {
+        vue.mixin({
+            data() {
+                return {
+                    query: {}
+                }
+            },
+            onLoad: (data: object) => {
+                const route = currRoute() || ''
+
+                this.query = data
+
+                useSystemStore().$patch((state) => {
+                    state.currRoute = route
+                })
+            },
+            onShow: () => {
+                const route = currRoute() || ''
+
+                useSystemStore().$patch((state) => {
+                    state.currRoute = route
+                })
+
+                let loginBack = uni.getStorageSync('loginBack');
+                if (loginBack && loginBack.url == '/' + route) {
+                    this.query = loginBack.param
+                }
+
+                redirectInterceptor({
+                    path: route,
+                    query: this.query
+                })
+            },
+            onShareAppMessage() {
+                return useShare().onShareAppMessage()
+            },
+            onShareTimeline() {
+                return useShare().onShareTimeline()
+            },
+            methods: {
+                themeColor() {
+                    const configStore = useConfigStore()
+                    return configStore.getThemeColor();
+                }
+            }
+        });
+    },
+};
diff --git a/uni-app/src/utils/pages.ts b/uni-app/src/utils/pages.ts
new file mode 100644
index 00000000..0396d6f5
--- /dev/null
+++ b/uni-app/src/utils/pages.ts
@@ -0,0 +1,62 @@
+import pagesJson from '@/pages.json'
+
+/**
+ * 获取需要登录的页面
+ */
+export function getNeedLoginPages() {
+    const pages: any = []
+    // 获取主包中需要登录的页面
+    pagesJson.pages.forEach(item => {
+        if (item.needLogin) pages.push(`/${ item.path }`)
+    })
+    // 获取分包中需要登录的页面
+    if (pagesJson.subPackages) {
+        pagesJson.subPackages.forEach(subPackages => {
+            subPackages.pages.forEach(item => {
+                if (item.needLogin) pages.push(`/${ subPackages.root }/${ item.path }`)
+            })
+        })
+    }
+    return pages
+}
+
+/**
+ * 获取所有页面
+ */
+export function getAppPages() {
+    const pages: any = []
+    // 获取主包中需要登录的页面
+    pagesJson.pages.forEach(item => {
+        pages.push(`/${ item.path }`)
+    })
+    return pages
+}
+
+export function getSubPackagesPages() {
+    const pages: any = []
+    // 获取分包中需要登录的页面
+    if (pagesJson.subPackages) {
+        pagesJson.subPackages.forEach(subPackages => {
+            subPackages.pages.forEach(item => {
+                pages.push(`/${ subPackages.root }/${ item.path }`)
+            })
+        })
+    }
+    return pages
+}
+
+/**
+ * 获取tabbar
+ */
+export function getTabbarPages() {
+    return pagesJson.tabBar.list.map(item => {
+        return `/${ item.pagePath }`
+    })
+}
+
+/**
+ * 获取首页路径
+ */
+export function getFirstPage() {
+    return '/' + pagesJson.pages[0].path
+}
diff --git a/uni-app/src/utils/request.ts b/uni-app/src/utils/request.ts
new file mode 100644
index 00000000..f74f3fb7
--- /dev/null
+++ b/uni-app/src/utils/request.ts
@@ -0,0 +1,184 @@
+import useMemberStore from '@/stores/member'
+import { t } from '@/locale'
+import { getToken, getAppChannel, redirect, currRoute, isUrl } from './common'
+import qs from 'qs'
+
+interface RequestConfig {
+    showErrorMessage?: boolean
+    showSuccessMessage?: boolean
+}
+
+interface RequestOptions extends UniNamespace.RequestOptions, RequestOptions {
+}
+
+class Request {
+    private baseUrl: string
+
+    private config: RequestOptions = {
+        url: '',
+        header: {}
+    }
+
+    constructor() {
+        // #ifdef H5
+        this.baseUrl = import.meta.env.VITE_APP_BASE_URL || `${ location.origin }/api/`
+        // #endif
+        // #ifndef H5
+        this.baseUrl = import.meta.env.VITE_APP_BASE_URL
+        // #endif
+        this.baseUrl.substr(-1) != '/' && (this.baseUrl += '/')
+
+        try {
+            this.config.header[import.meta.env.VITE_REQUEST_HEADER_CHANNEL_KEY] = getAppChannel()
+        } catch (e) {
+        }
+
+    }
+
+    /**
+     * 请求拦截器
+     */
+    private requestInterceptors() {
+        // 携带token
+        try {
+            getToken() && (this.config.header[import.meta.env.VITE_REQUEST_HEADER_TOKEN_KEY] = getToken())
+            this.config.header[import.meta.env.VITE_REQUEST_HEADER_CHANNEL_KEY] = getAppChannel()
+        } catch (e) {
+        }
+    }
+
+    public get(url: string, data: AnyObject = {}, config: RequestConfig = {}) {
+        return this.request('GET', url, data, config)
+    }
+
+    public post(url: string, data: AnyObject = {}, config: RequestConfig = {}) {
+        return this.request('POST', url, data, config)
+    }
+
+    public put(url: string, data: AnyObject = {}, config: RequestConfig = {}) {
+        return this.request('PUT', url, data, config)
+    }
+
+    public delete(url: string, data: AnyObject = {}, config: RequestConfig = {}) {
+        return this.request('DELETE', url, data, config)
+    }
+    /**
+     * 发送上传请求
+     */
+    public upload(url: string, data: AnyObject = {}, config: RequestConfig = {}) {
+        this.requestInterceptors()
+
+        const params = Object.assign(uni.$u.deepClone(this.config), config, {
+            url: this.baseUrl + url,
+            ...data
+        })
+
+        return new Promise((resolve, reject) => {
+            uni.uploadFile({
+                ...params,
+                success: res => {
+                    const data = JSON.parse(res.data)
+                    if (data.code == 1) {
+                        this.config.showSuccessMessage && uni.showToast({ title: data.msg, icon: 'none' })
+                        resolve(data)
+                    } else {
+                        if (data.code == 0 || data.code == 400) {
+                            if (this.config.showErrorMessage !== false) uni.showToast({ title: data.msg, icon: 'none' })
+                        } else {
+                            this.handleAuthError(data.code)
+                        }
+                        reject(data)
+                    }
+                },
+                fail: res => {
+                    reject(res)
+                }
+            })
+        })
+    }
+
+    /**
+     * 发送请求
+     */
+    private request(method: string, url: string, data ?: AnyObject, config: RequestConfig = {}) {
+        this.requestInterceptors()
+
+        const params = Object.assign(uni.$u.deepClone(this.config), config, {
+            url: this.baseUrl + url,
+            method
+        })
+
+        if (params.method.toUpperCase() == 'GET' || params.method.toUpperCase() == 'DELETE') {
+            params.url += '?' + qs.stringify(data);
+        } else {
+            params.data = data;
+        }
+
+        return new Promise((resolve, reject) => {
+            uni.request({
+                ...params,
+                success: res => {
+                    const data = res.data
+                    if (data.code == 1) {
+                        config.showSuccessMessage && uni.showToast({ title: data.msg, icon: 'none' })
+                        resolve(data)
+                    } else {
+                        if (data.code == 0 || data.code == 400) {
+                            if (config.showErrorMessage !== false) uni.showToast({ title: data.msg, icon: 'none' })
+                        } else {
+                            this.handleAuthError(data.code)
+                        }
+                        reject(data)
+                    }
+                },
+                fail: res => {
+                    reject(res)
+                },
+                complete: (res) => {
+                    this.handleRequestFail(res)
+                }
+            })
+        })
+    }
+
+    private handleAuthError(code: number) {
+        switch (code) {
+            case 401:
+                useMemberStore().logout()
+                break;
+            case 402:
+                if (currRoute().indexOf('app/pages/index/close') != -1) return;
+                redirect({ url: '/app/pages/index/close', mode: 'reLaunch' })
+                break;
+            case 403:
+                if (currRoute().indexOf('app/pages/index/nosite') != -1) return;
+                redirect({ url: '/app/pages/index/nosite', mode: 'switchTab' })
+                break;
+        }
+    }
+
+    private handleRequestFail(res) {
+        if (res.errMsg && res.errMsg == "request:ok") {
+            if (typeof res.data == 'string') {
+                // #ifdef H5
+                const err = (isUrl(this.baseUrl) ? this.baseUrl : location.origin + this.baseUrl) + t('baseUrlError')
+                // #endif
+                // #ifndef H5
+                const err = this.baseUrl + t('baseUrlError')
+                // #endif
+                uni.showToast({ icon: 'none', title: err })
+                return
+            }
+        }
+        if (res.errMsg == 'request:fail') {
+            uni.showToast({ icon: 'none', title: this.baseUrl + t('requestFail') })
+            return
+        }
+        if (res.errMsg && res.errMsg == 'request:fail url not in domain list') {
+            uni.showToast({ icon: 'none', title: this.baseUrl + t('notInDomainList') });
+            return
+        }
+    }
+}
+
+export default new Request()
diff --git a/uni-app/src/utils/storage.ts b/uni-app/src/utils/storage.ts
new file mode 100644
index 00000000..43bab1ee
--- /dev/null
+++ b/uni-app/src/utils/storage.ts
@@ -0,0 +1,40 @@
+
+const handleKey = (key: string): string => {
+    return key
+}
+
+export function uniStorage() {
+    const setStorageSync = uni.setStorageSync
+    const setStorage = uni.setStorage
+    const getStorage = uni.getStorage
+    const getStorageSync = uni.getStorageSync
+    const removeStorage = uni.removeStorage
+    const removeStorageSync = uni.removeStorageSync
+
+    uni.setStorage = (options: UniNamespace.SetStorageOptions) => {
+        options.key = handleKey(options.key)
+        setStorage(options)
+    }
+
+    uni.setStorageSync = (key: string, data: any) => {
+        setStorageSync(handleKey(key), data)
+    }
+
+    uni.getStorage = (options: UniNamespace.GetStorageOptions) => {
+        options.key = handleKey(options.key)
+        getStorage(options)
+    }
+
+    uni.getStorageSync = (key: string) => {
+        return getStorageSync(handleKey(key))
+    }
+
+    uni.removeStorage = (options: UniNamespace.RemoveStorageOptions) => {
+        options.key = handleKey(options.key)
+        removeStorage(options)
+    }
+
+    uni.removeStorageSync = (key: string) => {
+        return removeStorageSync(handleKey(key))
+    }
+}
\ No newline at end of file
diff --git a/uni-app/src/utils/topTabbar.ts b/uni-app/src/utils/topTabbar.ts
new file mode 100644
index 00000000..f73cb80e
--- /dev/null
+++ b/uni-app/src/utils/topTabbar.ts
@@ -0,0 +1,59 @@
+import { ref } from 'vue';
+import { onPageScroll } from '@dcloudio/uni-app';
+import { deepClone } from '@/utils/common';
+
+export function topTabar() {
+
+    const param: any = ref({
+        title: '',
+        topStatusBar: {
+            style: 'style-1',
+            bgColor: 'transparent',
+            rollBgColor: '#fff',
+            textColor: '#fff',
+            rollTextColor: '#333'
+        }
+    })
+
+    const scrollVal = ref(1); // 默认的传入滚动值
+    const scrollBool = ref(-1);
+
+    // 设置初始数据
+    const setTopTabbarParam = (data: any = {}) => {
+        if (data && typeof data != 'object') return param
+        for (let key in data) {
+            if (key == 'title') {
+                param.value.title = data.title || '';
+            } else if (key == 'topStatusBar' && data.topStatusBar) {
+                for (let subKey in data.topStatusBar) {
+                    param.value.topStatusBar[subKey] = data.topStatusBar[subKey]
+                }
+            } else {
+                param.value[key] = data[key]
+            }
+        }
+        return deepClone(param.value);
+    }
+
+    onPageScroll((e) => {
+        if (e.scrollTop <= 0) {
+            // -1 表示页面滚动值小于零，头部组件随页面下拉而下来
+            scrollBool.value = -1;
+        } else if (e.scrollTop > scrollVal.value) {
+            // 1 表示页面滚动值大于传入滚动值，头部组件随页面上拉背景、文字颜色采用滚动后的变量
+            scrollBool.value = 1
+        } else {
+            // 2 表示页面滚动值小于传入滚动值，头部组件随页面下拉背景、文字颜色采用滚动前的变量
+            scrollBool.value = 2
+        }
+    })
+
+    const getScrollBool = () => {
+        return scrollBool.value;
+    }
+
+    return {
+        getScrollBool,
+        setTopTabbarParam
+    }
+}
diff --git a/uni-app/src/utils/wechat.ts b/uni-app/src/utils/wechat.ts
new file mode 100644
index 00000000..26600974
--- /dev/null
+++ b/uni-app/src/utils/wechat.ts
@@ -0,0 +1,84 @@
+// #ifdef H5
+import wx from 'weixin-js-sdk'
+// #endif
+import { getWechatSdkConfig } from '@/app/api/system'
+import { isWeixinBrowser } from '@/utils/common'
+
+class Wechat {
+    constructor() {
+        // #ifdef H5
+        // isWeixinBrowser() && this.init()
+        // #endif
+    }
+
+    public init(callback:any = null) {
+        getWechatSdkConfig({
+            url: uni.getSystemInfoSync().platform == 'ios' ? uni.getStorageSync('initUrl') : location.href
+        }).then((res: any) => {
+            const { data } = res
+            wx.config({
+                debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
+                appId: data.appId, // 必填，公众号的唯一标识
+                timestamp: data.timestamp, // 必填，生成签名的时间戳
+                nonceStr: data.nonceStr, // 必填，生成签名的随机串
+                signature: data.signature,// 必填，签名
+                jsApiList: ['chooseWXPay', 'updateAppMessageShareData', 'updateTimelineShareData', 'scanQRCode', 'getLocation'] // 必填，需要使用的JS接口列表
+            });
+			if(callback) callback();
+        })
+    }
+
+    /**
+     * 发起支付
+     */
+    public pay(options: WeixinJsSdk.ChooseWXPayOptions) {
+        wx.ready(() => {
+            wx.chooseWXPay(options)
+        })
+    }
+
+    /**
+     * 分享设置
+     */
+    public share(options: WeixinJsSdk.OnMenuShareAppMessageOptions) {
+        wx.ready(() => {
+            // 分享给朋友
+            wx.updateAppMessageShareData(options)
+            // 分享到朋友圈
+            wx.updateTimelineShareData(options)
+        })
+    }
+
+    /**
+     * 扫一扫
+     * @param {Object} callback
+     */
+    public scanQRCode(callback: any) {
+        wx.ready(() => {
+            wx.scanQRCode({
+                needResult: 1,
+                scanType: ["qrCode"],
+                success: function (res) {
+                    typeof callback == 'function' && callback(res);
+                }
+            });
+        })
+    }
+
+	/**
+	 * 获取地理位置接口
+	 * @param {Object} callback
+	 */
+	public getLocation(callback: any) {
+		wx.ready(function() {
+			wx.getLocation({
+				type: 'gcj02',
+				success: function(res) {
+					typeof callback == 'function' && callback(res);
+				}
+			});
+		})
+	}
+}
+
+export default new Wechat()
diff --git a/uni-app/tsconfig.json b/uni-app/tsconfig.json
new file mode 100644
index 00000000..11fffd2d
--- /dev/null
+++ b/uni-app/tsconfig.json
@@ -0,0 +1,13 @@
+{
+  "extends": "@vue/tsconfig/tsconfig.json",
+  "compilerOptions": {
+    "sourceMap": true,
+    "baseUrl": ".",
+    "paths": {
+      "@/*": ["./src/*"]
+    },
+    "lib": ["esnext", "dom"],
+    "types": ["@dcloudio/types"]
+  },
+  "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue"]
+}
diff --git a/uni-app/vite.config.ts b/uni-app/vite.config.ts
new file mode 100644
index 00000000..54912ee9
--- /dev/null
+++ b/uni-app/vite.config.ts
@@ -0,0 +1,28 @@
+import {defineConfig} from 'vite'
+import uni from '@dcloudio/vite-plugin-uni'
+import WindiCSS from 'vite-plugin-windicss'
+import MiniProgramTailwind from '@dcasia/mini-program-tailwind-webpack-plugin/rollup'
+
+const plugins = [
+    uni(),
+    WindiCSS({
+        scan: {
+            dirs: ['.'], // 当前目录下所有文件
+            fileExtensions: ['vue', 'js', 'ts'] // 同时启用扫描vue/js/ts
+        }
+    })
+]
+
+process.env.UNI_PLATFORM == 'mp-weixin' && plugins.push(MiniProgramTailwind())
+
+export default defineConfig({
+    server: {
+        host: '0.0.0.0',
+        // port: 6666,
+        // open:true // vite项目启动时自动打开浏览器
+    },
+    plugins,
+    optimizeDeps: {
+        include: ['dayjs']
+    }
+})
diff --git a/uni-app/windi.config.ts b/uni-app/windi.config.ts
new file mode 100644
index 00000000..497da316
--- /dev/null
+++ b/uni-app/windi.config.ts
@@ -0,0 +1,77 @@
+import { defineConfig } from 'windicss/helpers'
+
+export default defineConfig({
+    prefixer: false,
+    preflight: false,
+    extract: {
+        exclude: ['node_modules', '.git', 'dist']
+    },
+    theme: {
+        extend: {
+            fontSize: {
+                xs: ['0.75rem', '1rem'], // 12px
+                sm: ['0.875rem', '1.25rem'], // 14px
+                base: ['1rem', '1.5rem'], // 16px
+                lg: ['1.125rem', '1.75rem'], // 18px
+                xl: ['1.66rem', '1.75rem'], // 20px
+                '2xl': ['1.75rem', '2.25rem'] // 28px
+            },
+            colors: {
+                primary: {
+                    DEFAULT: 'var(--primary-color)',
+                    dark: 'var(--primary-color-dark)',
+                    light: 'var(--primary-color-light)'
+                },
+                red: {
+                    DEFAULT: '#ED1B26',
+                    dark: '#94171D'
+                },
+                blue: '#276EF1',
+                brown: '#99644C',
+                green: {
+                    DEFAULT: '#219653',
+                    dark: '#21531C'
+                },
+                orange: '#FB6939',
+                purple: '#7356BF',
+                yellow: '#EEAB27',
+                black: {
+                    DEFAULT: '#161616',
+                    light: '#363636',
+                    pure: '#000000'
+                },
+                gray: {
+                    DEFAULT: '#222222',
+                    pressed: '#2b2b2b',
+                    subtitle: '#757575',
+                    description: '#AFAFAF',
+                    skeleton: '#2c2c2c',
+                    indicator: '#353535',
+                    placeholder: '#c0c4cc'
+                },
+                white: '#FFFFFF',
+                background: '#282828',
+                border: 'rgba(117, 117, 117, 0.1)',
+                page: 'var(--page-bg-color)',
+                price: '#fc5227'
+            },
+            spacing: {
+                half: '50%',
+                '7.5': '1.875rem',
+                '22': '5.375rem'
+            },
+            borderRadius: {
+                none: '0',
+                sm: '0.125rem',
+                DEFAULT: '0.25rem',
+                md: '0.375rem',
+                lg: '0.5rem',
+                full: '9999px',
+                large: '12px'
+            }
+        }
+    },
+    corePlugins: {
+        container: false
+    }
+})
diff --git a/web/.gitignore b/web/.gitignore
new file mode 100644
index 00000000..152d35c0
--- /dev/null
+++ b/web/.gitignore
@@ -0,0 +1,8 @@
+node_modules
+.nuxt
+.nitro
+.cache
+.output
+.env
+dist
+.DS_Store
diff --git a/web/.npmrc b/web/.npmrc
new file mode 100644
index 00000000..cf040424
--- /dev/null
+++ b/web/.npmrc
@@ -0,0 +1,2 @@
+shamefully-hoist=true
+strict-peer-dependencies=false
diff --git a/web/README.md b/web/README.md
new file mode 100644
index 00000000..c699c96c
--- /dev/null
+++ b/web/README.md
@@ -0,0 +1,42 @@
+# Nuxt 3 Minimal Starter
+
+Look at the [Nuxt 3 documentation](https://nuxt.com/docs/getting-started/introduction) to learn more.
+
+## Setup
+
+Make sure to install the dependencies:
+
+```bash
+# yarn
+yarn install
+
+# npm
+npm install
+
+# pnpm
+pnpm install
+```
+
+## Development Server
+
+Start the development server on http://localhost:3000
+
+```bash
+npm run dev
+```
+
+## Production
+
+Build the application for production:
+
+```bash
+npm run build
+```
+
+Locally preview production build:
+
+```bash
+npm run preview
+```
+
+Check out the [deployment documentation](https://nuxt.com/docs/getting-started/deployment) for more information.
diff --git a/web/addon/.gitignore b/web/addon/.gitignore
new file mode 100644
index 00000000..e69de29b
diff --git a/web/addon/zhjw/api/hello_world.ts b/web/addon/zhjw/api/hello_world.ts
new file mode 100644
index 00000000..ee46c94e
--- /dev/null
+++ b/web/addon/zhjw/api/hello_world.ts
@@ -0,0 +1,8 @@
+
+/**
+ * hello world
+ */
+export function getHelloWorld() {
+    return request.get('zhjw/hello_world')
+}
+
diff --git a/web/addon/zhjw/lang/zh-cn/hello_world.index.json b/web/addon/zhjw/lang/zh-cn/hello_world.index.json
new file mode 100644
index 00000000..9e26dfee
--- /dev/null
+++ b/web/addon/zhjw/lang/zh-cn/hello_world.index.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/web/addon/zhjw/lang/zh-cn/pages.json b/web/addon/zhjw/lang/zh-cn/pages.json
new file mode 100644
index 00000000..91446311
--- /dev/null
+++ b/web/addon/zhjw/lang/zh-cn/pages.json
@@ -0,0 +1,9 @@
+{
+    "pages": {
+        "zhjw": {
+            "hello_world": {
+                "index": "hello_world"
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/web/addon/zhjw/pages/hello_world/index.vue b/web/addon/zhjw/pages/hello_world/index.vue
new file mode 100644
index 00000000..7f7c8e5b
--- /dev/null
+++ b/web/addon/zhjw/pages/hello_world/index.vue
@@ -0,0 +1,15 @@
+<template>
+		<span class="text-[24px]">{{hello_world_text}}</span>
+</template>
+
+<script lang="ts" setup>
+import { ref } from 'vue'
+import { getHelloWorld } from '@/addon/zhjw/api/hello_world'
+
+const hello_world_text = ref('');
+
+getHelloWorld().then(res => {
+    hello_world_text.value = res.data;
+})
+</script>
+<style lang="scss" scoped></style>
diff --git a/web/addon/zhjw/pages/routes.ts b/web/addon/zhjw/pages/routes.ts
new file mode 100644
index 00000000..70657d57
--- /dev/null
+++ b/web/addon/zhjw/pages/routes.ts
@@ -0,0 +1,6 @@
+export default [
+    {
+        path: "/zhjw/hello_world/index",
+        component: () => import('~/addon/zhjw/pages/hello_world/index.vue')
+    }
+]
diff --git a/web/app.vue b/web/app.vue
new file mode 100644
index 00000000..be895ec1
--- /dev/null
+++ b/web/app.vue
@@ -0,0 +1,70 @@
+<template>
+	<el-config-provider :locale="locale">
+		<NuxtLayout>
+			<NuxtLoadingIndicator />
+			<NuxtPage />
+		</NuxtLayout>
+	</el-config-provider>
+</template>
+
+<script lang="ts" setup>
+import { reactive, ref,computed,watch } from 'vue'
+import useConfigStore from '@/stores/config'
+import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
+import en from 'element-plus/dist/locale/en.mjs'
+import useSystemStore from '@/stores/system'
+import useAppStore from '@/stores/app'
+import useMemberStore from '@/stores/member'
+// 引入全局样式
+import '@/assets/styles/index.scss'
+import { useRoute, useRouter } from 'vue-router'
+
+const router = useRouter()
+// 初始化设置语言
+const systemStore = useSystemStore()
+const locale = computed(() => (systemStore.lang === 'zh-cn' ? zhCn : en))
+
+// 初始化查询一些配置
+const configStore = useConfigStore()
+configStore.getLoginConfig(router)
+
+// 如果已登录
+getToken() && useMemberStore().setToken(getToken())
+
+const route = useRoute()
+watch(route, (nval, oval) => {
+	useAppStore().$patch(state => {
+		state.route = route.path
+	})
+
+	// 设置页面title
+	let path = route.path == '/' ? '/index' : route.path
+	// 处理部署后不知道为什么url会自动拼接上 / 的问题
+	if (path.slice(-1) == '/') path = path.slice(0, -1)
+	path = !path.lastIndexOf('/') ? `${path}/index` : path
+	let key = path.replace('/', '').replaceAll('/', '.')
+
+	setTimeout(() => {
+		useHead({
+			title: t(`pages.${key}`)
+		})
+	}, !oval ? 500 : 0)
+}, { immediate: true })
+
+watch(() => systemStore.site, () => {
+    useHead({
+        titleTemplate: (title) => {
+            const siteTitle = systemStore.site.front_end_name || systemStore.site.site_name
+	        if(title){
+	        	if(siteTitle){
+			        return `${title} - ${siteTitle}`;
+		        }else {
+			        return title;
+		        }
+	        }else{
+	        	return siteTitle;
+	        }
+        }
+    })
+}, { deep: true, immediate: true })
+</script>
diff --git a/web/app/api/auth.ts b/web/app/api/auth.ts
new file mode 100644
index 00000000..7a01baee
--- /dev/null
+++ b/web/app/api/auth.ts
@@ -0,0 +1,89 @@
+/**
+ * 用户名登录
+ */
+export function usernameLogin(data: AnyObject) {
+    return request.get('login', data)
+}
+
+/**
+ * 手机验证码登录
+ */
+export function mobileLogin(data: AnyObject) {
+    return request.post('login/mobile', data)
+}
+
+/**
+ * 获取登录配置
+ */
+export function getConfig() {
+    return request.get('login/config')
+}
+
+/**
+ * 退出登录
+ */
+export function logout() {
+    return request.put('auth/logout')
+}
+
+/**
+ * 用户名注册
+ */
+export function usernameRegister(data: AnyObject) {
+    let url = 'register'
+    data.pid && (url += `?pid=${ data.pid }`)
+    return request.post(url, data)
+}
+
+/**
+ * 手机号注册
+ */
+export function mobileRegister(data: AnyObject) {
+    let url = 'register/mobile'
+    data.pid && (url += `?pid=${ data.pid }`)
+    return request.post(url, data)
+}
+
+/**
+ * 微信公众号授权登录
+ */
+export function wechatLogin(data: AnyObject) {
+    return request.post('wechat/login', data)
+}
+
+/**
+ * 微信公众号授权登录
+ */
+export function weappLogin(data: AnyObject) {
+    return request.post('weapp/login', data)
+}
+
+/**
+ * 绑定手机号
+ */
+export function bind(data: AnyObject) {
+    let url = 'bind'
+    data.pid && (url += `?pid=${ data.pid }`)
+    return request.post(url, data)
+}
+
+/**
+ * 扫码登录
+ */
+export function scanlogin() {
+    return request.post('wechat/scanlogin')
+}
+
+/**
+ * 校验扫码信息
+ */
+export function checkscan(data: AnyObject) {
+    return request.get('checkscan', data)
+}
+
+/**
+ * 校验扫码信息
+ */
+export function wechatCheck() {
+    return request.get('wechat/check')
+}
diff --git a/web/app/api/member.ts b/web/app/api/member.ts
new file mode 100644
index 00000000..41d9c52c
--- /dev/null
+++ b/web/app/api/member.ts
@@ -0,0 +1,52 @@
+export function getMemberInfo() {
+    return request.get('member/member')
+}
+
+/**
+ * 会员信息修改
+ */
+export function modifyMember(data: AnyObject) {
+    return request.put(`member/modify/${ data.field }`, data)
+}
+
+/**
+ * 获取积分流水
+ */
+export function getPointList(data: AnyObject) {
+    return request.get('member/account/point', data)
+}
+
+/**
+ * 获取个人积分
+ */
+export function getMemberAccountPointcount() {
+    return request.get(`member/account/pointcount`)
+}
+
+/**
+ * 获取余额流水
+ */
+export function getBalanceList(data: AnyObject) {
+    return request.get('member/account/balance', data)
+}
+
+/**
+ * 获取余额流水
+ */
+export function getBalanceListAll(data: AnyObject) {
+    return request.get('member/account/balance_list', data)
+}
+
+/**
+ * 登录会员绑定手机号
+ */
+export function bindMobile(data: AnyObject) {
+    return request.put('member/mobile', data)
+}
+
+/**
+ * 获取会员等级
+ */
+export function getMemberLevel() {
+    return request.get(`member/level`);
+}
diff --git a/web/app/api/system.ts b/web/app/api/system.ts
new file mode 100644
index 00000000..ca32fddf
--- /dev/null
+++ b/web/app/api/system.ts
@@ -0,0 +1,96 @@
+/**
+ * 获取验证码
+ */
+export function getCaptcha() {
+    return request.get('captcha', { time: (new Date().getTime()) })
+}
+
+/**
+ * 获取微信公众号授权码
+ */
+export function getWechatAuthCode(data: AnyObject) {
+    return request.get('wechat/codeurl', data)
+}
+
+/**
+ * 同步微信信息
+ */
+export function wechatSync(data: AnyObject) {
+    return request.get('wechat/sync', data)
+}
+
+/**
+ * 获取协议信息
+ */
+export function getAgreementInfo(key: string) {
+    return request.get(`agreement/${ key }`)
+}
+
+/**
+ * 重置密码
+ */
+export function resetPassword(data: AnyObject) {
+    return request.post(`password/reset`, data)
+}
+
+/**
+ * 发送短信验证码
+ */
+export function sendSms(data: AnyObject) {
+    return request.post(`send/mobile/${ data.type }`, data)
+}
+
+/**
+ * 获取微信jssdk config
+ */
+export function getWechatSkdConfig(data: AnyObject) {
+    return request.get('wechat/jssdkconfig', data)
+}
+
+/**
+ * 拉取图片
+ */
+export function fetchImage(data: AnyObject) {
+    return request.post('file/image/fetch', data)
+}
+
+/**
+ * 拉取base64图片
+ */
+export function fetchBase64Image(data: AnyObject) {
+    return request.post('file/image/base64', data)
+}
+
+/**
+ * 获取版权信息
+ */
+export function getCopyRight() {
+    return request.get('copyright')
+}
+
+/**
+ * 获取站点信息
+ */
+export function getSiteInfo() {
+    return request.get('site')
+}
+/**
+ * 获取广告位
+ */
+export function getAdvInfo(params: Record<string, any>) {
+    return request.get(`web/adv`, params, { showErrorMessage: false })
+}
+
+/**
+ * 获取导航列表
+ */
+export function getNavList() {
+    return request.get(`web/nav`)
+}
+
+/**
+ * 获取友情链接
+ */
+export function getFriendlyLink() {
+    return request.get(`web/friendly_link`)
+}
diff --git a/web/app/api/verify.ts b/web/app/api/verify.ts
new file mode 100644
index 00000000..80d7f9a7
--- /dev/null
+++ b/web/app/api/verify.ts
@@ -0,0 +1,43 @@
+import request from '@/utils/request'
+
+/**
+ * 获取核销信息
+ */
+export function getVerifyCode(type: string, params: AnyObject) {
+    return request.get('verify', { type, data: params })
+}
+
+/**
+ * 获取核销记录
+ */
+export function getVerifyRecords(params: Record<string, any>) {
+    return request.get('verify_records', params)
+}
+
+/**
+ * 判断是否是核销员
+ */
+export function getCheckVerifier() {
+    return request.get('check_verifier')
+}
+
+/**
+ * 获取核销信息
+ */
+export function getVerifierInfo(code: string) {
+    return request.get(`get_verify_by_code/${ code }`)
+}
+
+/**
+ * 核销
+ */
+export function verify(code: string) {
+    return request.post(`verify/${ code }`, {}, { showSuccessMessage: true, showErrorMessage: true })
+}
+
+/**
+ * 获取核销详情
+ */
+export function getVerifyDetail(code: string) {
+    return request.get(`verify_detail/${ code }`, {}, { showErrorMessage: true })
+}
diff --git a/web/app/assets/images/default-logo.png b/web/app/assets/images/default-logo.png
new file mode 100644
index 00000000..11f4e633
Binary files /dev/null and b/web/app/assets/images/default-logo.png differ
diff --git a/web/app/assets/images/default_headimg.png b/web/app/assets/images/default_headimg.png
new file mode 100644
index 00000000..f4f8cb31
Binary files /dev/null and b/web/app/assets/images/default_headimg.png differ
diff --git a/web/app/assets/images/index_carousel.png b/web/app/assets/images/index_carousel.png
new file mode 100644
index 00000000..38515e1f
Binary files /dev/null and b/web/app/assets/images/index_carousel.png differ
diff --git a/web/app/assets/images/word/api.jpg b/web/app/assets/images/word/api.jpg
new file mode 100644
index 00000000..8e7f7084
Binary files /dev/null and b/web/app/assets/images/word/api.jpg differ
diff --git a/web/app/assets/images/word/community.jpg b/web/app/assets/images/word/community.jpg
new file mode 100644
index 00000000..2e327b28
Binary files /dev/null and b/web/app/assets/images/word/community.jpg differ
diff --git a/web/app/assets/images/word/course.jpg b/web/app/assets/images/word/course.jpg
new file mode 100644
index 00000000..35176fb5
Binary files /dev/null and b/web/app/assets/images/word/course.jpg differ
diff --git a/web/app/assets/images/word/word-back.jpg b/web/app/assets/images/word/word-back.jpg
new file mode 100644
index 00000000..6d146619
Binary files /dev/null and b/web/app/assets/images/word/word-back.jpg differ
diff --git a/web/app/assets/images/word/wx.jpg b/web/app/assets/images/word/wx.jpg
new file mode 100644
index 00000000..de5f7d25
Binary files /dev/null and b/web/app/assets/images/word/wx.jpg differ
diff --git a/web/app/lang/en/common.json b/web/app/lang/en/common.json
new file mode 100644
index 00000000..7a73a41b
--- /dev/null
+++ b/web/app/lang/en/common.json
@@ -0,0 +1,2 @@
+{
+}
\ No newline at end of file
diff --git a/web/app/lang/en/index.json b/web/app/lang/en/index.json
new file mode 100644
index 00000000..dbe39e3f
--- /dev/null
+++ b/web/app/lang/en/index.json
@@ -0,0 +1,3 @@
+{
+    "title": "Home"
+}
\ No newline at end of file
diff --git a/web/app/lang/en/pages.json b/web/app/lang/en/pages.json
new file mode 100644
index 00000000..bb26e925
--- /dev/null
+++ b/web/app/lang/en/pages.json
@@ -0,0 +1,8 @@
+{
+    "pages": {
+        "index": "Index",
+        "code": {
+            "code": "Code"
+        }
+    }
+}
\ No newline at end of file
diff --git a/web/app/lang/zh-cn/app.member.balance.json b/web/app/lang/zh-cn/app.member.balance.json
new file mode 100644
index 00000000..00998773
--- /dev/null
+++ b/web/app/lang/zh-cn/app.member.balance.json
@@ -0,0 +1,8 @@
+{
+    "myBalance": "我的余额",
+    "accountType": "账户类型",
+    "changeInAmount": "金额变化",
+    "modeOfOccurrence": "发生方式",
+    "remark": "备注",
+    "occurrenceTime": "发生时间"
+}
\ No newline at end of file
diff --git a/web/app/lang/zh-cn/app.member.center.json b/web/app/lang/zh-cn/app.member.center.json
new file mode 100644
index 00000000..d8890518
--- /dev/null
+++ b/web/app/lang/zh-cn/app.member.center.json
@@ -0,0 +1,15 @@
+{
+    "personageInfo": "个人信息",
+    "memberHeadimg": "会员头像",
+    "edit": "修改",
+    "nickname": "会员昵称",
+    "username":"用户名",
+    "mobile":"手机号",
+    "updateMobile":"修改手机号",
+    "mobilePlaceholder": "请输入手机号",
+    "mobileTips":"请输入正确的手机号",
+    "mobileError": "请输入正确的手机号",
+    "codePlaceholder": "请输入手机验证码",
+    "cancel": "取消",
+    "confirm": "确定"
+}
\ No newline at end of file
diff --git a/web/app/lang/zh-cn/app.member.point.json b/web/app/lang/zh-cn/app.member.point.json
new file mode 100644
index 00000000..2adbb845
--- /dev/null
+++ b/web/app/lang/zh-cn/app.member.point.json
@@ -0,0 +1,8 @@
+{
+    "myPoint": "我的积分",
+    "accountType": "账户类型",
+    "changeInAmount": "金额变化",
+    "modeOfOccurrence": "发生方式",
+    "remark": "备注",
+    "occurrenceTime": "发生时间"
+}
\ No newline at end of file
diff --git a/web/app/lang/zh-cn/article.detail.json b/web/app/lang/zh-cn/article.detail.json
new file mode 100644
index 00000000..96fc010c
--- /dev/null
+++ b/web/app/lang/zh-cn/article.detail.json
@@ -0,0 +1,3 @@
+{
+    "title": "文章"
+}
\ No newline at end of file
diff --git a/web/app/lang/zh-cn/article.list.json b/web/app/lang/zh-cn/article.list.json
new file mode 100644
index 00000000..96fc010c
--- /dev/null
+++ b/web/app/lang/zh-cn/article.list.json
@@ -0,0 +1,3 @@
+{
+    "title": "文章"
+}
\ No newline at end of file
diff --git a/web/app/lang/zh-cn/auth.bind.json b/web/app/lang/zh-cn/auth.bind.json
new file mode 100644
index 00000000..e2fdaff3
--- /dev/null
+++ b/web/app/lang/zh-cn/auth.bind.json
@@ -0,0 +1,18 @@
+{
+    "bind": "绑定",
+    "binding": "绑定中",
+    "usernamePlaceholder": "请输入账号",
+    "passwordPlaceholder": "请输入密码",
+    "confirmPasswordPlaceholder": "请再次确认密码",
+    "confirmPasswordError": "两次输入的密码不一致",
+    "resetpwd": "忘记密码",
+    "haveAccount": "已有账号",
+    "toLogin": "去登录",
+    "and": "和",
+    "bindAgreeTips": "绑定代表您同意",
+    "usernameRegister": "账号绑定",
+    "mobileRegister": "手机号绑定",
+    "mobilePlaceholder": "请输入手机号",
+    "mobileBind": "手机号绑定"
+    
+}
\ No newline at end of file
diff --git a/web/app/lang/zh-cn/auth.login.json b/web/app/lang/zh-cn/auth.login.json
new file mode 100644
index 00000000..7c3ae248
--- /dev/null
+++ b/web/app/lang/zh-cn/auth.login.json
@@ -0,0 +1,13 @@
+{
+    "logining": "登录中",
+    "usernamePlaceholder": "请输入账号",
+    "passwordPlaceholder": "请输入密码",
+    "resetpwd": "忘记密码",
+    "noAccount": "还没有账号",
+    "toRegister": "去注册",
+    "and": "和",
+    "agreeTips": "登录代表您同意",
+    "usernameLogin": "密码登录",
+    "mobileLogin": "验证码登录",
+    "mobilePlaceholder": "请输入手机号"
+}
\ No newline at end of file
diff --git a/web/app/lang/zh-cn/auth.register.json b/web/app/lang/zh-cn/auth.register.json
new file mode 100644
index 00000000..6f6b1126
--- /dev/null
+++ b/web/app/lang/zh-cn/auth.register.json
@@ -0,0 +1,15 @@
+{
+    "registering": "注册中",
+    "usernamePlaceholder": "请输入账号",
+    "passwordPlaceholder": "请输入密码",
+    "confirmPasswordPlaceholder": "请再次确认密码",
+    "confirmPasswordError": "两次输入的密码不一致",
+    "resetpwd": "忘记密码",
+    "haveAccount": "已有账号",
+    "toLogin": "去登录",
+    "and": "和",
+    "registerAgreeTips": "注册代表您同意",
+    "usernameRegister": "账号注册",
+    "mobileRegister": "手机号注册",
+    "mobilePlaceholder": "请输入手机号"
+}
\ No newline at end of file
diff --git a/web/app/lang/zh-cn/common.json b/web/app/lang/zh-cn/common.json
new file mode 100644
index 00000000..6c50f441
--- /dev/null
+++ b/web/app/lang/zh-cn/common.json
@@ -0,0 +1,35 @@
+{
+    "login": "登录",
+    "register": "注册",
+    "getSmsCode": "获取短信验证码",
+    "smsCodeChangeText": "秒后重新获取",
+    "captchaTitle": "请先完成安全验证",
+    "confirm": "确认",
+    "cancel": "取消",
+    "captchaPlaceholder": "请输入验证码",
+    "mobilePlaceholder": "请输入手机号码",
+    "mobileError": "请输入正确的手机号",
+    "codePlaceholder": "请输入手机验证码",
+    "userAgreement": "用户协议",
+    "privacyAgreement": "隐私协议",
+    "protocolNotConfigured": "未配置协议",
+    "siteClose": "站点已关闭",
+
+    "request": {
+        "unknownError": "未知错误",
+        "400": "错误的请求",
+        "401": "请重新登录",
+        "403": "拒绝访问",
+        "404": "请求错误",
+        "405": "请求方法未允许",
+        "408": "请求超时",
+        "409": "请求跨域",
+        "500": "服务器端出错，错误原因：",
+        "501": "网络未实现",
+        "502": "网络错误",
+        "503": "服务不可用",
+        "504": "网络超时",
+        "505": "http版本不支持该请求",
+        "timeout": "网络请求超时！"
+    }
+}
diff --git a/web/app/lang/zh-cn/index.json b/web/app/lang/zh-cn/index.json
new file mode 100644
index 00000000..c1309c8a
--- /dev/null
+++ b/web/app/lang/zh-cn/index.json
@@ -0,0 +1,3 @@
+{
+    "title": "首页"
+}
\ No newline at end of file
diff --git a/web/app/lang/zh-cn/member.balance.json b/web/app/lang/zh-cn/member.balance.json
new file mode 100644
index 00000000..00998773
--- /dev/null
+++ b/web/app/lang/zh-cn/member.balance.json
@@ -0,0 +1,8 @@
+{
+    "myBalance": "我的余额",
+    "accountType": "账户类型",
+    "changeInAmount": "金额变化",
+    "modeOfOccurrence": "发生方式",
+    "remark": "备注",
+    "occurrenceTime": "发生时间"
+}
\ No newline at end of file
diff --git a/web/app/lang/zh-cn/member.center.json b/web/app/lang/zh-cn/member.center.json
new file mode 100644
index 00000000..d8890518
--- /dev/null
+++ b/web/app/lang/zh-cn/member.center.json
@@ -0,0 +1,15 @@
+{
+    "personageInfo": "个人信息",
+    "memberHeadimg": "会员头像",
+    "edit": "修改",
+    "nickname": "会员昵称",
+    "username":"用户名",
+    "mobile":"手机号",
+    "updateMobile":"修改手机号",
+    "mobilePlaceholder": "请输入手机号",
+    "mobileTips":"请输入正确的手机号",
+    "mobileError": "请输入正确的手机号",
+    "codePlaceholder": "请输入手机验证码",
+    "cancel": "取消",
+    "confirm": "确定"
+}
\ No newline at end of file
diff --git a/web/app/lang/zh-cn/member.json b/web/app/lang/zh-cn/member.json
new file mode 100644
index 00000000..85afbb25
--- /dev/null
+++ b/web/app/lang/zh-cn/member.json
@@ -0,0 +1,10 @@
+{
+    "welcomePage": "欢迎页",
+    "mobile": "手机号",
+    "registrationTime": "注册时间",
+    "point": "积分",
+    "balance": "余额",
+    "looseChange": "零钱",
+    "notBound": "未绑定",
+    "coupon":"优惠劵"
+}
\ No newline at end of file
diff --git a/web/app/lang/zh-cn/member.point.json b/web/app/lang/zh-cn/member.point.json
new file mode 100644
index 00000000..2adbb845
--- /dev/null
+++ b/web/app/lang/zh-cn/member.point.json
@@ -0,0 +1,8 @@
+{
+    "myPoint": "我的积分",
+    "accountType": "账户类型",
+    "changeInAmount": "金额变化",
+    "modeOfOccurrence": "发生方式",
+    "remark": "备注",
+    "occurrenceTime": "发生时间"
+}
\ No newline at end of file
diff --git a/web/app/lang/zh-cn/pages.json b/web/app/lang/zh-cn/pages.json
new file mode 100644
index 00000000..a781442e
--- /dev/null
+++ b/web/app/lang/zh-cn/pages.json
@@ -0,0 +1,34 @@
+{
+  "pages": {
+    "article": {
+      "list": "文章资讯",
+      "detail": "文章详情"
+    },
+    "index": {
+      "index": "首页"
+    },
+    "app":{
+      "index": "首页",
+      "member":{
+        "center": "个人中心",
+        "point": "我的积分",
+        "balance": "我的余额"
+      }
+    },
+    "auth": {
+      "agreement": "协议",
+      "login": "登录",
+      "register": "注册",
+      "bind": "手机号绑定"
+    },
+    "member": {
+      "index": "欢迎页",
+      "center": "个人中心",
+      "point": "我的积分",
+      "balance": "我的余额"
+    },
+    "site": {
+      "close": "站点已关闭"
+    }
+  }
+}
\ No newline at end of file
diff --git a/web/app/pages/auth/agreement.vue b/web/app/pages/auth/agreement.vue
new file mode 100644
index 00000000..2b3d7348
--- /dev/null
+++ b/web/app/pages/auth/agreement.vue
@@ -0,0 +1,46 @@
+<template>
+    <div class="ml-[20px] min-h-[70vh] px-[20px] py-[30px] w-[1000px] bg-[#fff] rounded-[var(--rounded-big)]">
+        <div>
+            <div>
+                <template v-if="agreement">
+                    <div v-if="agreement.title && agreement.content">
+                        <h2 class="text-center">{{ agreement.title }}</h2>
+                        <div v-html="agreement.content"></div>
+                    </div>
+                    <el-empty :description="t('protocolNotConfigured')"  :image-size="200" :image="img('static/resource/images/system/empty.png')" v-else />
+                </template>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, watch } from 'vue'
+import { getAgreementInfo } from '@/app/api/system'
+import { useRoute } from 'vue-router';
+
+const agreement = ref<any | null>(null)
+const route = useRoute()
+watch(() => route.query.key, (newVal, oldVal) => {
+    if(route.query.key){
+        getAgreementInfo(route.query.key).then(({ data }) => {
+            agreement.value = data
+
+            if(data.title){
+                useHead({
+                    title: data.title
+                })
+            }else {
+                useHead({
+                    title: route.query.key == 'service' ? '用户协议' : '隐私协议'
+                })
+            }
+
+        }).catch(err => {
+        })
+    }
+},{immediate: true})
+
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/web/app/pages/auth/bind.vue b/web/app/pages/auth/bind.vue
new file mode 100644
index 00000000..998b4779
--- /dev/null
+++ b/web/app/pages/auth/bind.vue
@@ -0,0 +1,140 @@
+<template>
+    <div class="w-full h-full bg-page flex items-center justify-center">
+        <div class="flex bg-white">
+
+            <div class="bg-white w-[380px] p-[30px]">
+                <div class="flex items-end mb-[30px] mt-[15px]">
+                    <div class="mr-[20px] text-base cursor-pointer leading-none font-bold">{{t('mobileBind')}}</div>
+                </div>
+                <el-form :model="formData" ref="formRef" :rules="formRules" :validate-on-rule-change="false">
+                    <div>
+                        <el-form-item prop="mobile">
+                            <el-input v-model="formData.mobile" :placeholder="t('mobilePlaceholder')" clearable>
+                            </el-input>
+                        </el-form-item>
+                        <el-form-item prop="mobile_code">
+                            <el-input v-model="formData.mobile_code" :placeholder="t('codePlaceholder')">
+                                <template #suffix>
+                                    <sms-code :mobile="formData.mobile" type="login" v-model="formData.mobile_key" @click="sendSmsCode" ref="smsCodeRef"></sms-code>
+                                </template>
+                            </el-input>
+                        </el-form-item>
+                    </div>
+
+                    <el-form-item>
+                        <el-button type="primary" class="mt-[20px] w-full" size="large" @click="handleRegister" :loading="loading">{{ loading ? t('binding') : t('bind') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed } from 'vue'
+import { bind } from '@/app/api/auth'
+import { bindMobile } from '@/app/api/member'
+import useMemberStore from '@/stores/member'
+import { FormInstance } from 'element-plus'
+import { useRouter } from 'vue-router'
+
+definePageMeta({
+    layout: "container"
+});
+let router = useRouter()
+const memberStore = useMemberStore()
+const info = computed(() => memberStore.info)
+const loading = ref(false)
+const formData = reactive({
+    mobile: '',
+    mobile_code: '',
+    mobile_key: '',
+    openid: useCookie('openId').value
+})
+
+const formRules = computed(() => {
+    return {
+        'mobile': [
+            {
+                type: 'string',
+                required: true,
+                message: t('mobilePlaceholder'),
+                trigger: ['blur', 'change'],
+            },
+            {
+                validator(rule: any, value: string, callback: any) {
+                     return test.mobile(value)
+                },
+                message: t('mobileError'),
+                trigger: ['change', 'blur'],
+            }
+        ],
+        'mobile_code': {
+            type: 'string',
+            required: true,
+            message: t('codePlaceholder'),
+            trigger: ['blur', 'change']
+        }
+    }
+})
+
+const formRef = ref<FormInstance>()
+
+const handleRegister = async () => {
+    await formRef.value?.validate(async (valid, fields) => {
+        if (valid) {
+            if (loading.value) return
+            loading.value = true
+
+            const request = info.value ? bindMobile : bind
+
+            request(formData).then((res: responseResult) => {
+                memberStore.setToken(res.data.token)
+                router.push({ path: '/' })
+            }).catch(() => {
+                loading.value = false
+                captcha.refresh()
+            })
+        }
+    })
+}
+
+// 验证码
+const captcha = useCaptcha(formData)
+captcha.refresh()
+
+// 获取手机验证码
+const smsCodeRef = ref<AnyObject | null>(null)
+const sendSmsCode = async () => {
+    await formRef.value?.validateField('mobile', async (valid, fields) => {
+        if (valid) {
+            smsCodeRef.value?.send()
+        }
+    })
+}
+</script>
+
+<style lang="scss" scoped>
+:deep(.el-form-item) {
+    .el-input__wrapper {
+        box-shadow: unset !important;
+        border-radius: 0;
+        border-bottom: 1px solid var(--el-input-border-color);
+        padding: 8px 0;
+
+        &.is-focus {
+            border-bottom: 1px solid var(--el-input-focus-border-color);
+        }
+    }
+
+    &.is-error {
+        .el-input__wrapper {
+            border-bottom: 1px solid var(--el-color-danger);
+        }
+    }
+}
+
+:deep(.el-form-item__error) {
+    padding-top: 5px;
+}
+</style>
diff --git a/web/app/pages/auth/login.vue b/web/app/pages/auth/login.vue
new file mode 100644
index 00000000..a50ef742
--- /dev/null
+++ b/web/app/pages/auth/login.vue
@@ -0,0 +1,280 @@
+<template>
+    <div class="w-full h-full bg-page flex items-center justify-center">
+        <div class="bg-white" v-if="loginType.length" >
+            <div class="bg-white w-[380px] p-[30px] h-[424px]" v-if="active">
+                <div class="flex items-end my-[30px]">
+                    <div class="mr-[20px] text-base cursor-pointer leading-none" :class="{ 'font-bold': type == item.type }" v-for="item in loginType" @click="type = item.type">{{item.title }}</div>
+                </div>
+                <el-form :model="formData" ref="formRef" :rules="formRules" :validate-on-rule-change="false">
+                    <div v-show="type == 'username'">
+                        <el-form-item prop="username">
+                            <el-input v-model="formData.username" :placeholder="t('usernamePlaceholder')" clearable :inline-message="true">
+                            </el-input>
+                        </el-form-item>
+                        <el-form-item prop="password">
+                            <el-input v-model="formData.password" :placeholder="t('passwordPlaceholder')" type="password" clearable :show-password="true">
+                            </el-input>
+                        </el-form-item>
+                    </div>
+                    <div v-show="type == 'mobile'">
+                        <el-form-item prop="mobile">
+                            <el-input v-model="formData.mobile" :placeholder="t('mobilePlaceholder')" clearable>
+                            </el-input>
+                        </el-form-item>
+                        <el-form-item prop="mobile_code">
+                            <el-input v-model="formData.mobile_code" :placeholder="t('codePlaceholder')">
+                                <template #suffix>
+                                    <sms-code :mobile="formData.mobile" type="login" v-model="formData.mobile_key" @click="sendSmsCode" ref="smsCodeRef"></sms-code>
+                                </template>
+                            </el-input>
+                        </el-form-item>
+                    </div>
+
+                    <div class="flex justify-between leading-none">
+                        <NuxtLink to="/auth/register">
+                            <el-button type="primary" link>{{ t('noAccount') }}，{{ t('toRegister') }}</el-button>
+                        </NuxtLink>
+                        <!-- <NuxtLink to="/auth/resetpwd">
+                            <el-button type="primary" link>{{ t('resetpwd') }}</el-button>
+                        </NuxtLink> -->
+                    </div>
+
+                    <el-form-item>
+                        <el-button type="primary" class="mt-[20px] w-full" size="large" @click="handleLogin" :loading="loading">{{ loading ? t('logining') : t('login') }}</el-button>
+                    </el-form-item>
+
+                    <div class="text-xs py-[50rpx] flex justify-center w-full" v-if="configStore.login.agreement_show">
+                        {{ t('agreeTips') }}
+                        <NuxtLink to="/auth/agreement?key=service">
+                            <span class="text-primary">{{ t('userAgreement') }}</span>
+                        </NuxtLink>
+                        {{ t('and') }}
+                        <NuxtLink to="/auth/agreement?key=privacy">
+                            <span class="text-primary">{{ t('privacyAgreement') }}</span>
+                        </NuxtLink>
+                    </div>
+                    <div class="mt-[20px] flex justify-center" v-if="show">
+                        <span class="iconfont icon-weixin1 text-[#1AAD19] !text-[24px] cursor-pointer" @click="handleChange"></span>
+                    </div>
+                </el-form>
+            </div>
+            <div class="flex flex-col items-center w-[380px] py-[60px] h-[424px]" v-else>
+                <div class="title font-bold text-xl">打开手机微信</div>
+                <div class="tips text-sm mt-[5px]">点击右上角打开扫一扫</div>
+                <div class="qrcode p-[10px] mt-[30px] border h-[120px] leading-none box-content">
+                    <div class="relative">
+                        <el-image :src="weixinCode.url" class="w-[120px]" />
+                        <div class="flex flex-col justify-center items-center absolute inset-0 bg-gray-50" v-if="weixinCode.pastDue">
+                            <span class="text-xs text-gray-600">{{ weixinCode.pastDueContent }}</span>
+                            <span @click="scanLoginFn()" class="text-xs cursor-pointer text-color mt-2">点击刷新</span>
+                        </div>
+                    </div>
+                </div>
+                <div class="mt-[60px] text-base cursor-pointer leading-none" @click="handleChange">账号登录</div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { ref,reactive,watch,computed } from 'vue'
+import { FormInstance } from 'element-plus'
+import { usernameLogin, mobileLogin, scanlogin, checkscan, wechatCheck } from '@/app/api/auth'
+import { useRouter } from 'vue-router'
+import useMemberStore from '@/stores/member'
+import useConfigStore from '@/stores/config'
+import QRCode from "qrcode";
+
+let router = useRouter()
+let active = ref(true)
+let timer:any = null
+const handleChange = () => {
+    active.value = !active.value
+    if(!active.value){
+        scanLoginFn();
+    }else{
+        clearTimeout(timer)
+    }
+}
+watch(
+	() => router.currentRoute.value.path,
+	(toPath) => {
+		if (toPath != '/auth/login') {
+			clearTimeout(timer)
+		}
+	}, { immediate: true, deep: true }
+)
+// 校验二维码
+const checkScanFn = (key) => {
+    let parameter = { key };
+
+    checkscan(parameter).then((res) => {
+        let data = res.data;
+        switch (data.status) {
+            case 'wait':
+                timer = setTimeout(() => {
+                    checkScanFn(weixinCode.value.key);
+                }, 1000);
+                break;
+            case 'success':
+                if (!data.login_data.token) {
+                    useCookie('openId').value = data.login_data.openid
+                    navigateTo(`/auth/bind`)
+                } else {
+                    memberStore.setToken(data.login_data.token)
+                    router.push({ path: '/' })
+                }
+                break;
+            case 'fail':
+                weixinCode.value.pastDueContent = data.fail_reason
+                weixinCode.value.pastDue = true;
+                break;
+        }
+    }).catch((res) => {
+        weixinCode.value.pastDue = true;
+        weixinCode.value.pastDueContent = res.msg;
+    })
+}
+
+// 扫码登录,微信二维码
+const weixinCode = ref({
+    url: '',
+    key: '',
+    pastDue: false,
+    pastDueContent: '二维码生成失败'
+})
+
+const scanLoginFn = async () => {
+    let data = await (await scanlogin()).data;
+    weixinCode.value.key = data.key
+    QRCode.toDataURL(data.url, { errorCorrectionLevel: 'L', margin: 0, width: 100 }).then(url => {
+        weixinCode.value.url = url
+    });
+    weixinCode.value.pastDue = false;
+
+    setTimeout(() => {
+        checkScanFn(weixinCode.value.key);
+    }, 1000);
+}
+
+let show = ref(false)
+const wechatCheckFn = () =>{
+    wechatCheck().then((res:any) =>{
+        show.value = res.data
+    })
+}
+wechatCheckFn()
+
+const memberStore = useMemberStore()
+
+const configStore = useConfigStore()
+configStore.getLoginConfig()
+
+const loginType = computed(() => {
+    const value = []
+    configStore.login.is_username && (value.push({ type: 'username', title: t('usernameLogin') }))
+    configStore.login.is_mobile && (value.push({ type: 'mobile', title: t('mobileLogin') }))
+    type.value = value[0] ? value[0].type : ''
+    return value
+})
+const loading = ref(false)
+const type = ref('')
+const formData = reactive({
+    username: '',
+    password: '',
+    mobile: '',
+    mobile_code: '',
+    mobile_key: ''
+})
+const formRef = ref<FormInstance>()
+const formRules = computed(() => {
+    return {
+        'username': {
+            required: type.value == 'username',
+            message: t('usernamePlaceholder'),
+            trigger: ['blur', 'change'],
+        },
+        'password': {
+            required: type.value == 'username',
+            message: t('passwordPlaceholder'),
+            trigger: ['blur', 'change']
+        },
+        'mobile': [
+            {
+                required: type.value == 'mobile',
+                message: t('mobilePlaceholder'),
+                trigger: ['blur', 'change'],
+            },
+            {
+                validator(rule: any, value: string, callback: any) {
+                    if (type.value != 'mobile') return true
+                    else return test.mobile(value)
+                },
+                message: t('mobileError'),
+                trigger: ['blur'],
+            }
+        ],
+        'mobile_code': {
+            required: type.value == 'mobile',
+            message: t('codePlaceholder'),
+            trigger: ['change']
+        }
+    }
+})
+
+const handleLogin = async () => {
+    await formRef.value?.validate(async (valid, fields) => {
+        if (valid) {
+            if (loading.value) return
+            loading.value = true
+
+            const login = type.value == 'username' ? usernameLogin : mobileLogin
+
+            login(formData).then(async (res) => {
+                await memberStore.setToken(res.data.token)
+                router.push({ path: '/app/index' })
+            }).catch(() => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+const smsCodeRef = ref<AnyObject | null>(null)
+const sendSmsCode = async () => {
+    await formRef.value?.validateField('mobile', async (valid, fields) => {
+        if (valid) {
+            smsCodeRef.value?.send()
+        }
+    })
+}
+</script>
+
+<style lang="scss" scoped>
+:deep(.el-form-item) {
+    .el-input__wrapper {
+        box-shadow: unset !important;
+        border-radius: 0;
+        border-bottom: 1px solid var(--el-input-border-color);
+        padding: 8px 0;
+
+        &.is-focus {
+            border-bottom: 1px solid var(--el-input-focus-border-color);
+        }
+    }
+
+    &.is-error {
+        .el-input__wrapper {
+            border-bottom: 1px solid var(--el-color-danger);
+        }
+    }
+}
+
+:deep(.el-form-item__error) {
+    padding-top: 5px;
+}
+
+.text-color {
+    color: var(--el-color-primary);
+}
+</style>
diff --git a/web/app/pages/auth/register.vue b/web/app/pages/auth/register.vue
new file mode 100644
index 00000000..74c0e467
--- /dev/null
+++ b/web/app/pages/auth/register.vue
@@ -0,0 +1,257 @@
+<template>
+    <div class="w-full h-full bg-page flex items-center justify-center">
+        <div class="flex bg-white">
+            <div class="bg-white w-[380px] p-[30px] h-[686px]" v-if="active">
+                <div class="flex items-end my-[30px]">
+                    <div class="mr-[20px] text-base cursor-pointer leading-none" :class="{ 'font-bold': type == item.type }" v-for="item in registerType" @click="type = item.type">{{item.title }}</div>
+                </div>
+                <el-form :model="formData" ref="formRef" :rules="formRules" :validate-on-rule-change="false">
+                    <div v-show="type == 'username'">
+                        <el-form-item prop="username">
+                            <el-input v-model="formData.username" :placeholder="t('usernamePlaceholder')" clearable :inline-message="true" :readonly="real_name_input" @click="real_name_input = false" @blur="real_name_input = true">
+                            </el-input>
+                        </el-form-item>
+                        <el-form-item prop="password">
+                            <el-input v-model="formData.password" :placeholder="t('passwordPlaceholder')" type="password" clearable :show-password="true" :readonly="password_input" @click="password_input = false" @blur="password_input = true">
+                            </el-input>
+                        </el-form-item>
+                        <el-form-item prop="confirm_password">
+                            <el-input v-model="formData.confirm_password" :placeholder="t('confirmPasswordPlaceholder')" type="password" clearable :show-password="true" :readonly="confirm_password_input" @click="confirm_password_input = false" @blur="confirm_password_input = true">
+                            </el-input>
+                        </el-form-item>
+                    </div>
+                    <div v-show="type == 'mobile' || configStore.login.is_bind_mobile">
+                        <el-form-item prop="mobile">
+                            <el-input v-model="formData.mobile" :placeholder="t('mobilePlaceholder')" clearable>
+                            </el-input>
+                        </el-form-item>
+                        <el-form-item prop="mobile_code">
+                            <el-input v-model="formData.mobile_code" :placeholder="t('codePlaceholder')">
+                                <template #suffix>
+                                    <sms-code :mobile="formData.mobile" type="login" v-model="formData.mobile_key" @click="sendSmsCode" ref="smsCodeRef"></sms-code>
+                                </template>
+                            </el-input>
+                        </el-form-item>
+                    </div>
+                    <div v-show="type == 'username'">
+                        <el-form-item prop="captcha_code">
+                            <el-input v-model="formData.captcha_code" :placeholder="t('captchaPlaceholder')">
+                                <template #suffix>
+                                    <div class="py-0 leading-none">
+                                        <el-image :src="captcha.image.value" class="h-[30px] cursor-pointer" @click="captcha.refresh()"></el-image>
+                                    </div>
+                                </template>
+                            </el-input>
+                        </el-form-item>
+                    </div>
+
+                    <div class="flex justify-end leading-none">
+                        <NuxtLink to="/auth/login">
+                            <el-button type="primary" link>{{ t('haveAccount') }}，{{ t('toLogin') }}</el-button>
+                        </NuxtLink>
+                    </div>
+
+                    <el-form-item>
+                        <el-button type="primary" class="mt-[20px] w-full" size="large" @click="handleRegister" :loading="loading">{{ loading ? t('registering') : t('register') }}</el-button>
+                    </el-form-item>
+
+                    <div class="text-xs py-[50rpx] flex justify-center w-full" v-if="configStore.login.agreement_show">
+                        {{ t('registerAgreeTips') }}
+                        <NuxtLink to="/auth/agreement?key=service">
+                            <span class="text-primary">{{ t('userAgreement') }}</span>
+                        </NuxtLink>
+                        {{ t('and') }}
+                        <NuxtLink to="/auth/agreement?key=privacy">
+                            <span class="text-primary">{{ t('privacyAgreement') }}</span>
+                        </NuxtLink>
+                    </div>
+                    <div class="mt-[20px] flex justify-center" v-if="show">
+                        <span class="iconfont icon-weixin1 text-[#1AAD19] !text-[24px]" @click="active = !active"></span>
+                    </div>
+                </el-form>
+            </div>
+            <div class="flex flex-col items-center w-[380px] py-[100px] h-[556px]" v-else>
+                <div class="title font-bold text-xl">打开手机微信</div>
+                <div class="tips text-sm mt-[5px]">点击右上角打开扫一扫</div>
+                <div class="qrcode mt-[30px] border leading-none">
+                    <el-image :src="img('https://mp.weixin.qq.com/cgi-bin/showqrcode?ticket=gQHU7zwAAAAAAAAAAS5odHRwOi8vd2VpeGluLnFxLmNvbS9xLzAySlJSbU1Sb0hiMlQxOEcwSGhBY1AAAgTSfStkAwRYAgAA')" class="w-[120px]"></el-image>
+                </div>
+                <div class="mt-[60px] text-base cursor-pointer leading-none" @click="active = !active">账号注册</div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { ref,reactive,computed } from 'vue'
+import { usernameRegister, mobileRegister, wechatCheck } from '@/app/api/auth'
+import useMemberStore from '@/stores/member'
+import useConfigStore from '@/stores/config'
+import { FormInstance } from 'element-plus'
+import { useRouter } from 'vue-router'
+
+definePageMeta({
+    layout: "container"
+});
+
+let router = useRouter()
+const memberStore = useMemberStore()
+
+const configStore = useConfigStore()
+configStore.getLoginConfig()
+
+const type = ref('')
+const registerType = computed(() => {
+    const value = []
+    configStore.login.is_username && (value.push({ type: 'username', title: t('usernameRegister') }))
+    configStore.login.is_mobile && !configStore.login.is_bind_mobile && (value.push({ type: 'mobile', title: t('mobileRegister') }))
+    type.value = value[0] ? value[0].type : ''
+    return value
+})
+
+const loading = ref(false)
+let active = ref(true)
+const formData = reactive({
+    username: '',
+    password: '',
+    confirm_password: '',
+    mobile: '',
+    mobile_code: '',
+    mobile_key: '',
+    captcha_key: '',
+    captcha_code: ''
+})
+
+const formRules = computed(() => {
+    return {
+        'username': {
+            type: 'string',
+            required: type.value == 'username',
+            message: t('usernamePlaceholder'),
+            trigger: ['blur', 'change'],
+        },
+        'password': {
+            type: 'string',
+            required: type.value == 'username',
+            message: t('passwordPlaceholder'),
+            trigger: ['blur', 'change']
+        },
+        'confirm_password': [
+            {
+                type: 'string',
+                required: type.value == 'username',
+                message: t('confirmPasswordPlaceholder'),
+                trigger: ['blur', 'change']
+            },
+            {
+                validator(rule: any, value: string, callback: any) {
+                    return value == formData.password
+                },
+                message: t('confirmPasswordError'),
+                trigger: ['change', 'blur'],
+            }
+        ],
+        'mobile': [
+            {
+                type: 'string',
+                required: type.value == 'mobile' || configStore.login.is_bind_mobile,
+                message: t('mobilePlaceholder'),
+                trigger: ['blur', 'change'],
+            },
+            {
+                validator(rule: any, value: string, callback: any) {
+                    if (type.value != 'mobile' && !configStore.login.is_bind_mobile) return true
+                    else return test.mobile(value)
+                },
+                message: t('mobileError'),
+                trigger: ['change', 'blur'],
+            }
+        ],
+        'mobile_code': {
+            type: 'string',
+            required: type.value == 'mobile' || configStore.login.is_bind_mobile,
+            message: t('codePlaceholder'),
+            trigger: ['blur', 'change']
+        },
+        'captcha_code': {
+            type: 'string',
+            required: type.value == 'username',
+            message: t('captchaPlaceholder'),
+            trigger: ['blur', 'change'],
+        }
+    }
+})
+
+const formRef = ref<FormInstance>()
+
+const handleRegister = async () => {
+    await formRef.value?.validate(async (valid, fields) => {
+        if (valid) {
+            if (loading.value) return
+            loading.value = true
+
+            const register = type.value == 'username' ? usernameRegister : mobileRegister
+
+            register(formData).then((res: responseResult) => {
+                memberStore.setToken(res.data.token)
+                router.push({ path: '/' })
+            }).catch(() => {
+                loading.value = false
+                captcha.refresh()
+            })
+        }
+    })
+}
+
+let show = ref(false)
+const wechatCheckFn = () =>{
+    wechatCheck().then((res:any) =>{
+        show.value = res.data
+    })
+}
+wechatCheckFn()
+
+// 验证码
+const captcha = useCaptcha(formData)
+captcha.refresh()
+
+// 获取手机验证码
+const smsCodeRef = ref<AnyObject | null>(null)
+const sendSmsCode = async () => {
+    await formRef.value?.validateField('mobile', async (valid, fields) => {
+        if (valid) {
+            smsCodeRef.value?.send()
+        }
+    })
+}
+
+const real_name_input = ref(true)
+const password_input = ref(true)
+const confirm_password_input = ref(true)
+
+</script>
+
+<style lang="scss" scoped>
+:deep(.el-form-item) {
+    .el-input__wrapper {
+        box-shadow: unset !important;
+        border-radius: 0;
+        border-bottom: 1px solid var(--el-input-border-color);
+        padding: 8px 0;
+
+        &.is-focus {
+            border-bottom: 1px solid var(--el-input-focus-border-color);
+        }
+    }
+
+    &.is-error {
+        .el-input__wrapper {
+            border-bottom: 1px solid var(--el-color-danger);
+        }
+    }
+}
+
+:deep(.el-form-item__error) {
+    padding-top: 5px;
+}
+</style>
diff --git a/web/app/pages/index.vue b/web/app/pages/index.vue
new file mode 100644
index 00000000..1c4059c3
--- /dev/null
+++ b/web/app/pages/index.vue
@@ -0,0 +1,82 @@
+<template>
+    <div class="w-full bg-[#fff]">
+        <el-carousel height="500px" arrow="never">
+            <el-carousel-item>
+                <div class="h-full index-carousel"></div>
+            </el-carousel-item>
+        </el-carousel>
+        <div class="word main-container pb-[200px] pt-[60px]">
+			<div class="word-title">
+				<p class="text-[40px] text-[#666] font-bold text-center mb-[20px]">Niucloud文档管理</p>
+				<p class="text-[16px] text-[#666] text-center">无论是快速上手，还是深入了解NIUCLOUD，这里都是最好的地点</p>
+			</div>
+			<div class="flex justify-between mt-[100px]">
+				<div class="w-[280px]">
+					<div class="flex items-center">
+						<div class="w-[30px] h-[30px] mr-[10px]"><img src="@/assets/images/word/course.jpg" /></div>
+						<p class="text-[20px] text-[#666] font-bold">官方教程</p>
+					</div>
+					<p class="text-[14px] w-[280px] h-[100px] text-[#666666] leading-[22px] mt-[30px] mb-[20px]">详尽细致的逐步官方教程，帮助您系统全面的接触NIUCLOUD，建议在使用前阅读。</p>
+					<NuxtLink to="https://doc.niucloud.com/v6" target="_blank">
+						<div class="flex justify-between items-center w-[280px] h-[40px] leading-[40px] rounded-[5px] border-[1px] border-[solid] border-[#508BFE]">
+							<span class="block ml-[20px] text-[14px] text-[#333]">前往教程</span>
+							<span class="block mr-[20px] text-[24px] text-[#333]">→</span>
+						</div>
+					</NuxtLink>
+				</div>
+				<div class="w-[280px]">
+					<div class="flex items-center">
+						<div class="w-[30px] h-[30px] mr-[10px]"><img src="@/assets/images/word/api.jpg" /></div>
+						<p class="text-[20px] text-[#666] font-bold">API文档</p>
+					</div>
+					<p class="text-[14px] w-[280px] h-[100px] text-[#666666] leading-[22px] mt-[30px] mb-[20px]">您可以通过API文档了解niucloud的正确使用方法，也可以更加深入地理解niucloud的运行逻辑。</p>
+<!--					<NuxtLink to="https://www.niucloud.com/apidoc.html" target="_blank">-->
+						<div class="flex justify-between items-center w-[280px] h-[40px] leading-[40px] rounded-[5px] border-[1px] border-[solid] border-[#508BFE]">
+							<span class="block ml-[20px] text-[14px] text-[#333]">前往API文档</span>
+							<span class="block mr-[20px] text-[24px] text-[#333]">→</span>
+						</div>
+<!--					</NuxtLink>-->
+				</div>
+				<div class="w-[280px]">
+					<div class="flex items-center">
+						<div class="w-[30px] h-[30px] mr-[10px]"><img src="@/assets/images/word/community.jpg" /></div>
+						<p class="text-[20px] text-[#666] font-bold">问答社区</p>
+					</div>
+					<p class="text-[14px] w-[280px] h-[100px] text-[#666666] leading-[22px] mt-[30px] mb-[20px]">便捷地浏览其它用户关于niucloud的问题，并从解答中获取niucloud的使用方法，当然您可以进行提问。</p>
+					<NuxtLink to="https://www.niushop.com/bbs.html" target="_blank">
+						<div class="flex justify-between items-center w-[280px] h-[40px] leading-[40px] rounded-[5px] border-[1px] border-[solid] border-[#508BFE]">
+							<span class="block ml-[20px] text-[14px] text-[#333]">前往问答社区</span>
+							<span class="block mr-[20px] text-[24px] text-[#333]">→</span>
+						</div>
+					</NuxtLink>
+				</div>
+				<div class="w-[280px]">
+					<div class="flex items-center">
+						<div class="w-[30px] h-[30px] mr-[10px]"><img src="@/assets/images/word/wx.jpg"></div>
+						<p class="text-[20px] text-[#666] font-bold">关注公众号</p>
+					</div>
+					<p class="text-[14px] w-[280px] h-[100px] text-[#666666] leading-[22px] mt-[30px] mb-[20px]">您可以扫描页面底部的二维码来关注我们的官方公众号，获得一手咨询及使用技巧。</p>
+				</div>
+
+			</div>
+		</div>
+	</div>
+</template>
+
+<script lang="ts" setup>
+</script>
+
+<style lang="scss" scoped>
+.index-carousel {
+	background-image: url('@/assets/images/index_carousel.png');
+	background-position: center center;
+	background-repeat: no-repeat;
+	background-size: cover;
+}
+
+.word {
+	background-image: url(@/assets/images/word/word-back.jpg);
+	background-size: 100%;
+	background-repeat: no-repeat;
+}
+</style>
diff --git a/web/app/pages/member/balance.vue b/web/app/pages/member/balance.vue
new file mode 100644
index 00000000..e7d655f4
--- /dev/null
+++ b/web/app/pages/member/balance.vue
@@ -0,0 +1,108 @@
+<template>
+    <div class="ml-[20px] min-h-[70vh] px-[20px] py-[30px] w-[1000px] bg-[#fff] rounded-[var(--rounded-big)]">
+        <div  class="h-full" v-loading="balanceTableData.loading">
+            <div>
+                <div class="text-[18px] text-[#333] mb-[30px]">{{t('myBalance')}}</div>
+                <div class="text-center mb-[40px]">
+                    <div class="text-[32px] text-[#333] font-600 mb-[10px]">{{ memberStore.info ? moneyFormat((parseFloat(memberStore.info.balance) + parseFloat(memberStore.info.money)).toString()) : '0.00'  }}</div>
+                    <div class="text-[#999] text-[14px]">账户余额(元)</div>
+                </div>
+                <div class="flex flex-wrap">
+                    <div v-for="(item,index) in accountTypeList" :key="index" class="cursor-pointer relative text-[16px] mr-[50px] text-[#666] flex items-center justify-center" :class="{'class-select': item.key == balanceTableData.params.trade_type}" @click="fromTypeFn(item.key)">{{item.name}}</div>
+                </div>
+                <div v-if="balanceTableData.data.length && !balanceTableData.loading">
+                    <div class="pt-[20px] px-[20px]  rounded-[12px] min-h-[63%] mt-[30px] bg-[#fafafa]"  >
+                        <div >
+                            <div class="flex items-center justify-between mb-[20px] border-b-[1px] border-dashed border-[#eee]" v-for="(item,index) in balanceTableData.data" :key="index">
+                                <div>
+                                    <div class="font-[16px] mb-[14px] text-[#333]">{{ item.from_type_name }}</div>
+                                    <div class="text-[14px] text-[#999] mb-[20px]">{{ item.create_time }}</div>
+                                </div>
+                                <div class="text-right">
+                                    <div class="mb-[14px] text-[18px] price-font"  :class="{'text-[#EF000C]' :item.account_data > 0, 'text-[#03B521]':item.account_data <= 0}">{{ item.account_data > 0 ? '+' + item.account_data : item.account_data }}</div>
+                                    <div class="text-[14px] text-[#999] mb-[20px]">余额 {{item.account_sum}}</div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="mt-[30px] flex justify-center">
+                        <el-pagination v-model:current-page="balanceTableData.page" v-model:page-size="balanceTableData.limit" layout="prev, pager, next" background hide-on-single-page :total="balanceTableData.total" @size-change="loadBalanceList()" @current-change="loadBalanceList" />
+                    </div>
+                </div>
+                <div v-if="!balanceTableData.data.length && !balanceTableData.loading">
+                    <el-empty description="暂无数据" :image-size="200" :image="img('static/resource/images/system/empty.png')"/>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { reactive, ref } from 'vue'
+import useMemberStore from '@/stores/member'
+import { moneyFormat }  from '@/utils/common'
+import { getBalanceListAll } from '@/app/api/member'
+
+const memberStore = useMemberStore()
+
+//获取数据来源类型
+const accountTypeList = ref([
+	{name:'全部',key:''},
+	{name:'收入',key:'income'},
+	{name:'支出',key:'disburse'},
+	{name:'提现',key:'cash_out'},
+])
+
+// 获取会员列表
+const balanceTableData = reactive<any>({
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    params:{
+        trade_type:''
+    }
+})
+const loadBalanceList = (page: number = 1) => {
+    balanceTableData.loading = true
+    balanceTableData.page = page
+
+    getBalanceListAll({
+        page: balanceTableData.page,
+        limit: balanceTableData.limit,
+        ...balanceTableData.params
+    }).then((res: any) => {
+        balanceTableData.loading = false
+        balanceTableData.data = res.data.data
+        balanceTableData.total = res.data.total
+    }).catch(() => {
+        balanceTableData.loading = false
+    })
+}
+loadBalanceList()
+
+// 分类点击
+const fromTypeFn = (key: string)=>{
+    balanceTableData.params.trade_type = key
+	loadBalanceList()
+}
+
+</script>
+
+<style lang="scss" scoped>
+.text-color{
+    color: var(--jjext-color-brand);
+}
+.class-select{
+    color: var( --el-color-primary);
+    &::after{
+        background: #e93323;
+        content: "";
+        height: 2px;
+        position: absolute;
+        top: 31px;
+        width: 22px;
+    }
+}
+</style>
diff --git a/web/app/pages/member/center.vue b/web/app/pages/member/center.vue
new file mode 100644
index 00000000..96eabb15
--- /dev/null
+++ b/web/app/pages/member/center.vue
@@ -0,0 +1,248 @@
+<template>
+    <div class="ml-[20px] min-h-[70vh] px-[20px] py-[30px] w-[1000px] bg-[#fff] rounded-[var(--rounded-big)]">
+        <div class="h-full"  v-loading="loading">
+            <div>
+                <div class="text-[18px] text-[#333] mb-[50px]">我的信息</div>
+                <div v-if="info">
+                    <el-form :model="info" class="form-wrap" label-width="120px" label-position="left">
+                        <el-form-item :label="t('memberHeadimg')" class="pb-[20px] border-b-[1px] border-dashed border-[#ddd]">
+                            <div class="w-full flex justify-between content-center items-center">
+                                <img v-if="!info.headimg" class="w-[80px] h-[80px]" src="@/assets/images/default_headimg.png" alt="">
+                                <img v-else :src="img(info.headimg)" class="w-[80px] h-[80px]" alt="">
+                                <el-upload class="avatar-uploader" :show-file-list="false" v-bind="upload" ref="uploadRef">
+                                    <span class="cursor-pointer text-primary">{{ t('edit') }}</span>
+                                </el-upload>
+                            </div>
+                        </el-form-item>
+                        <el-form-item :label="t('username')" class="pb-[20px] border-b-[1px] border-dashed border-[#ddd]">
+                            <div class="w-full flex justify-between content-center">
+                                <span>{{ info.username }}</span>
+                            </div>
+                        </el-form-item>
+                        <el-form-item :label="t('nickname')" class="pb-[20px] border-b-[1px] border-dashed border-[#ddd]">
+                            <div class="w-full flex justify-between content-center">
+                                <div>
+                                    <span>{{ updateNickname.value }}</span>
+                                    <span v-if="currentLevel">(当前等级:{{currentLevel}})</span>
+                                </div>
+                                <span class="cursor-pointer text-primary" @click="updateNickname.modal = true">{{ t('edit')}}</span>
+                            </div>
+                        </el-form-item>
+                        <el-form-item :label="t('mobile')" class="pb-[20px] border-b-[1px] border-dashed border-[#ddd]">
+                            <div class="w-full flex justify-between content-center">
+                                <span>{{ info.mobile }}</span>
+                                <span  v-if="!info.mobile" class="cursor-pointer text-primary" @click="updateMobileDialog = true">{{ t('edit')}}</span>
+                            </div>
+                        </el-form-item>
+                    </el-form>
+                    <div class="flex justify-end mt-[38px]">
+                        <span class="cursor-pointer w-[130px] h-[40px] leading-[40px]  text-center rounded-[4px] bg-[var(--el-color-primary)] text-white text-[14px]" @click="logoutFn">退出</span>
+                    </div>
+                </div>
+            </div>
+            <!-- 更改昵称 -->
+            <el-dialog v-model="updateNickname.modal" :title="t('nickname')" width="380">
+                <el-form :model="info">
+                    <el-form-item>
+                        <el-input v-model="updateNickname.value" autocomplete="off" />
+                    </el-form-item>
+                </el-form>
+                <template #footer>
+                    <span class="dialog-footer">
+                        <el-button @click="updateNickname.modal = false">{{ t('cancel') }}</el-button>
+                        <el-button type="primary" @click="updateNicknameConfirm">{{ t('confirm') }}</el-button>
+                    </span>
+                </template>
+            </el-dialog>
+              <!-- 更改手机号码 -->
+              <el-dialog v-model="updateMobileDialog" :title="t('updateMobile')" width="420">
+                <el-form :model="formData" ref="formRef" :rules="formRules" :validate-on-rule-change="false">
+                    <el-form-item prop="mobile">
+                            <el-input v-model="formData.mobile" :placeholder="t('mobilePlaceholder')" clearable>
+                            </el-input>
+                    </el-form-item>
+                    <el-form-item prop="mobile_code">
+                        <el-input v-model="formData.mobile_code" :placeholder="t('codePlaceholder')">
+                            <template #suffix>
+                                <sms-code :mobile="formData.mobile" type="login" v-model="formData.mobile_key" @click="sendSmsCode" ref="smsCodeRef"></sms-code>
+                            </template>
+                        </el-input>
+                    </el-form-item>
+                </el-form>
+                <template #footer>
+                    <span class="dialog-footer">
+                        <el-button @click="updateMobileDialog = false">{{ t('cancel') }}</el-button>
+                        <el-button type="primary" :loading="mobileLoading" @click="updateMobileConfirm">{{ t('confirm') }}</el-button>
+                    </span>
+                </template>
+            </el-dialog>
+        </div>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { reactive, ref, computed } from 'vue'
+import useMemberStore from '@/stores/member'
+import useAppStore from '@/stores/app'
+import { modifyMember, bindMobile, getMemberLevel} from '@/app/api/member'
+import { ElMessage, ElMessageBox, UploadFile, UploadFiles, FormInstance } from 'element-plus'
+import request from '@/utils/request'
+import storage from '@/utils/storage'
+import { getToken } from '@/utils/common'
+
+const memberStore = useMemberStore()
+const loading = ref(true)
+
+//会员昵称
+const updateNickname = reactive({
+    modal: false,
+    value: ''
+})
+
+const info:any = computed(() => {
+    updateNickname.value = memberStore.info?.nickname;
+    if (memberStore.info) loading.value = false;
+    return memberStore.info;
+})
+const appStore = useAppStore()
+
+// 获取会员等级
+let currentLevel = ref('')
+const getMemberLevelFn = () =>{
+    getMemberLevel().then((res:any) =>{
+        if(info.value && res.data && res.data.length){
+            res.data.forEach((item:any,index:number)=>{
+				if(item.level_id == info.value.member_level){
+                    currentLevel.value = item.level_name
+				}
+			})
+		}
+    })
+}
+getMemberLevelFn()
+const uploadRef = ref<any>(null)
+const upload = computed(() => {
+    const headers: Record<string, any> = {}
+    headers.token = getToken()
+    return {
+        action: `${request.options.baseURL}/file/image`,
+        limit: 1,
+        headers,
+        onSuccess: (response: any, uploadFile: UploadFile, uploadFiles: UploadFiles) => {
+            let img = uploadFile?.response?.data?.url;
+            if (response.code == 200 || response.code == 1) {
+                modifyMember({
+                    field: 'headimg',
+                    value: img
+                }).then(() => {
+                    memberStore.info.headimg = img
+                    uploadRef.value.clearFiles()
+                })
+            } else {
+                uploadFile.status = 'fail'
+                ElMessage({ message: response.msg, type: 'error' })
+            }
+        }
+    }
+})
+
+// 修改会员名称
+const updateNicknameConfirm = () => {
+    if (!updateNickname.value) { ElMessage.error('会员昵称不能为空'); return }
+
+    modifyMember({
+        field: 'nickname',
+        value: updateNickname.value
+    }).then(res => {
+        updateNickname.modal = false
+    })
+}
+
+// 手机号
+const updateMobileDialog = ref(false)
+const formData = reactive({
+    mobile: '',
+    mobile_code: '',
+    mobile_key: ''
+})
+const mobileLoading = ref(false)
+const formRef = ref<FormInstance>()
+const formRules = computed(() => {
+    return {
+        'mobile': [
+            {
+                required: true,
+                message: t('mobilePlaceholder'),
+                trigger: ['blur', 'change'],
+            },
+            {
+                validator(rule: any, value: string, callback: any) {
+                    const phonePattern = /^1[3456789]\d{9}$/
+                    if (!phonePattern.test(value)) {
+                        return callback(new Error(t('mobileTips')))
+                    } else {
+                        return callback()
+                    }
+                },
+                message: t('mobileError'),
+                trigger: ['blur'],
+            }
+        ],
+        'mobile_code': {
+            required: true,
+            message: t('codePlaceholder'),
+            trigger: ['change']
+        }
+    }
+})
+
+const smsCodeRef = ref<AnyObject | null>(null)
+const sendSmsCode = async () => {
+    await formRef.value?.validateField('mobile', async (valid, fields) => {
+        if (valid) {
+            smsCodeRef.value?.send()
+        }
+    })
+}
+const updateMobileConfirm = async () => {
+    await formRef.value?.validate(async (valid, fields) => {
+        if (valid) {
+            if (mobileLoading.value) return
+            mobileLoading.value = true
+            bindMobile(formData).then((res) => {
+                memberStore.getMemberInfo()
+                mobileLoading.value = false
+                updateMobileDialog.value = false
+            }).catch(() => {
+                mobileLoading.value = false
+            })
+        }
+    })
+}
+
+// 退出登录
+const logoutFn = () => {
+    ElMessageBox.confirm('您确定要退出账号吗？', '提示',
+        {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            confirmButtonClass:'!bg-[var(--el-color-primary)] !border-[var(--el-color-primary)]',
+            cancelButtonClass:'!border-[#dcdfe6]',
+            type: 'warning'
+        }
+    ).then(() => {
+        memberStore.logout()
+        navigateTo(`/`)
+    })
+}
+</script>
+
+<style lang="scss" scoped>
+.box-card {
+    border: none !important;
+}
+
+::v-deep .form-wrap .el-form-item {
+    align-items: center;
+}
+</style>
diff --git a/web/app/pages/member/index.vue b/web/app/pages/member/index.vue
new file mode 100644
index 00000000..360f2269
--- /dev/null
+++ b/web/app/pages/member/index.vue
@@ -0,0 +1,65 @@
+<template>
+    <div class="w-full h-full bg-page pt-6">
+        <div class="main-container flex justify-between">
+            <sidebar></sidebar>
+            <el-card class="box-card flex-1 ml-4" v-loading="loading" shadow="never">
+                <template #header>
+                    <div class="card-header">
+                        <span>{{t('welcomePage')}}</span>
+                    </div>
+                </template>
+                <div class="px-10 py-5" v-if="info">
+                    <div class="flex items-center border-gray-300 border-b-1 pb-5 px-5">
+                        <img v-if="!info.headimg" class="w-[65px] h-[65px] rounded-full" src="@/assets/images/default_headimg.png" alt="">
+                        <img v-else :src="img(info.headimg)" class="w-[65px] h-[65px] rounded-full" alt="">
+                        <div class="ml-4">
+                            <div>
+                                <span class="text-base font-bold">{{info.nickname}}</span>
+                                <span class="text-xs">（{{t('mobile')}}：{{info.mobile ? info.mobile : t('notBound') }}）</span>
+                            </div>
+                            <p class="text-xs text-gray-400 mt-1">{{t('registrationTime')}}：{{info.create_time}}</p>
+                        </div>
+                    </div>
+                    <div class="flex justify-between mt-8 statistic-wrap px-8">
+                        <NuxtLink to="/member/point">
+                            <el-statistic :title="t('point')" :value="info.point" />
+                        </NuxtLink>
+                        <NuxtLink to="/member/balance">
+                            <el-statistic :title="t('balance')" :value="info.balance" />
+                        </NuxtLink>
+                        <el-statistic :title="t('looseChange')" :value="info.money" />
+                    </div>
+                </div>
+            </el-card>
+        </div>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { reactive, ref, computed } from 'vue'
+import useMemberStore from '@/stores/member'
+import useAppStore from '@/stores/app'
+import type { UploadProps } from 'element-plus'
+
+const memberStore = useMemberStore()
+const loading = ref(true)
+const info = computed(() =>{
+    if(memberStore.info) loading.value = false;
+    return memberStore.info;
+})
+const appStore = useAppStore()
+</script>
+
+<style lang="scss" scoped>
+::v-deep .box-card{
+    border: none !important;
+    .el-card__header{
+        border-color: #F1F1F1;
+    }
+}
+::v-deep .statistic-wrap{
+    .el-statistic__head, .el-statistic__content{
+        text-align: center;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/web/app/pages/member/point.vue b/web/app/pages/member/point.vue
new file mode 100644
index 00000000..ef0f4228
--- /dev/null
+++ b/web/app/pages/member/point.vue
@@ -0,0 +1,96 @@
+<template>
+    <div class="ml-[20px] min-h-[70vh] px-[20px] py-[30px] w-[1000px] bg-[#fff] rounded-[var(--rounded-big)]">
+        <div class="h-full" v-loading="pointTableData.loading">
+            <div>
+                <div class="text-[18px] text-[#333] mb-[30px]">{{t('myPoint')}}</div>
+                <div class="flex justify-center mb-[40px]">
+                    <div class="mr-[160px] text-center">
+                        <div class="text-[32px] text-primary font-600 mb-[10px]">{{ pointInfo.point||0  }}</div>
+                        <div class="text-[#999] text-[14px]">当前积分</div>
+                    </div>
+                    <div class="mr-[160px] text-center">
+                        <div class="text-[32px] text-[#333] font-600 mb-[10px]">{{ pointInfo.point_get||0 }}</div>
+                        <div class="text-[#999] text-[14px]">累计积分</div>
+                    </div>
+                    <div class="mr-[160px] text-center">
+                        <div class="text-[32px] text-[#333] font-600 mb-[10px]">{{ pointInfo.use||0  }}</div>
+                        <div class="text-[#999] text-[14px]">累计消费</div>
+                    </div>
+                    <div class="text-center">
+                        <div class="text-[32px] text-[#333] font-600 mb-[10px]">{{ pointInfo.point||0 }}</div>
+                        <div class="text-[#999] text-[14px]">可用积分</div>
+                    </div>
+                </div>
+                <div v-if="pointTableData.data.length && !pointTableData.loading">
+                    <div class="pt-[20px] px-[20px]  rounded-[12px] min-h-[70%] mt-[30px] bg-[#fafafa]">
+                        <div>
+                            <template v-for="(item,index) in pointTableData.data" :key="index">
+                                <div class="flex items-center justify-between mb-[20px] border-b-[1px] border-dashed border-[#eee]" v-for="(subItem,subIndex) in item.month_data" :key="subIndex">
+                                    <div>
+                                        <div class="font-[16px] mb-[14px] text-[#333]">{{ subItem.from_type_name }}</div>
+                                        <div class="text-[14px] text-[#999] mb-[20px]">{{ subItem.create_time }}</div>
+                                    </div>
+                                    <div class="mb-[14px] text-[18px] price-font" :class="{'text-[#EF000C]' : subItem.account_data > 0, 'text-[#03B521]':subItem.account_data <= 0}">{{ subItem.account_data > 0 ? '+' + subItem.account_data : subItem.account_data }}</div>
+                                </div>
+                            </template>
+                        </div>
+                    </div>
+                    <div class="mt-[16px] flex justify-end">
+                        <el-pagination v-model:current-page="pointTableData.page" v-model:page-size="pointTableData.limit" layout="prev, pager, next"  background hide-on-single-page :total="pointTableData.total" @size-change="loadPointList()" @current-change="loadPointList" />
+                    </div>
+                </div>
+                <div v-if="!pointTableData.data.length && !pointTableData.loading">
+                    <el-empty description="暂无数据" :image-size="200" :image="img('static/resource/images/system/empty.png')"/>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { reactive, ref } from 'vue'
+import { getPointList, getMemberAccountPointcount } from '@/app/api/member'
+
+//个人积分信息
+const pointInfo = ref({});
+const  getMemberAccountPointcountFn = () =>{
+    getMemberAccountPointcount().then((res: any) =>{
+        pointInfo.value = res.data
+    })
+}
+getMemberAccountPointcountFn()
+// 获取会员列表
+const pointTableData = reactive({
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: []
+})
+const loadPointList = (page: number = 1) => {
+    pointTableData.loading = true
+    pointTableData.page = page
+
+    getPointList({
+        page: pointTableData.page,
+        limit: pointTableData.limit,
+    }).then((res: any) => {
+        pointTableData.loading = false
+        pointTableData.data = res.data.data
+        pointTableData.total = res.data.total
+    }).catch(() => {
+        pointTableData.loading = false
+    })
+}
+loadPointList()
+
+</script>
+
+<style lang="scss" scoped>
+.box-card{
+    border: none !important;
+}
+.text-color{
+    color: var(--jjext-color-brand);
+}
+</style>
diff --git a/web/app/pages/routes.ts b/web/app/pages/routes.ts
new file mode 100644
index 00000000..fae0aa0f
--- /dev/null
+++ b/web/app/pages/routes.ts
@@ -0,0 +1,76 @@
+export default [
+    {
+        path: "/",
+        component: () => import('~/app/pages/index.vue')
+    },
+    {
+        path: "/app/index",
+        component: () => import('~/app/pages/index.vue')
+    },
+    {
+        path: "/auth/login",
+        component: () => import('~/app/pages/auth/login.vue'),
+        meta: {
+            layout: "container"
+        }
+    },
+    {
+        path: "/auth/register",
+        component: () => import('~/app/pages/auth/register.vue'),
+        meta: {
+            layout: "container"
+        }
+    },
+    {
+        path: "/auth/bind",
+        component: () => import('~/app/pages/auth/bind.vue'),
+        meta: {
+            layout: "container"
+        }
+    },
+    {
+        path: "/auth/agreement",
+        component: () => import('~/app/pages/auth/agreement.vue'),
+        meta: {
+            layout: "member"
+        }
+    },
+    {
+        path: "/app/auth/agreement",
+        component: () => import('~/app/pages/auth/agreement.vue'),
+        meta: {
+            layout: "member"
+        }
+    },
+    {
+        path: "/app/member/center",
+        component: () => import('~/app/pages/member/center.vue'),
+        meta: {
+            middleware: ["auth"],
+            layout: "member"
+        }
+    },
+    {
+        path: "/app/member/balance",
+        component: () => import('~/app/pages/member/balance.vue'),
+        meta: {
+            middleware: ["auth"],
+            layout: "member"
+        }
+    },
+    {
+        path: "/app/member/point",
+        component: () => import('~/app/pages/member/point.vue'),
+        meta: {
+            middleware: ["auth"],
+            layout: "member"
+        }
+    },
+    {
+        path: "/site/close",
+        component: () => import('~/app/pages/site/close.vue'),
+        meta: {
+            layout: "container"
+        }
+    }
+]
diff --git a/web/app/pages/site/close.vue b/web/app/pages/site/close.vue
new file mode 100644
index 00000000..3f15d732
--- /dev/null
+++ b/web/app/pages/site/close.vue
@@ -0,0 +1,14 @@
+<template>
+    <div class="w-screen h-screen bg-[#fff] flex flex-col items-center justify-center">
+        <el-empty :description="t('siteClose')" :image="img('static/resource/images/site/close.png')" image-size="200px" />
+    </div>
+</template>
+
+<script lang="ts" setup>
+definePageMeta({
+    layout: "container"
+});
+
+</script>
+
+<style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/web/app/router.options.ts b/web/app/router.options.ts
new file mode 100644
index 00000000..6db69b6c
--- /dev/null
+++ b/web/app/router.options.ts
@@ -0,0 +1,19 @@
+import type { RouterConfig } from '@nuxt/schema'
+import routes from '@/app/pages/routes'
+
+const addonRoutes = import.meta.globEager('@/addon/**/pages/routes.ts')
+
+for (const key in addonRoutes) {
+    const addon = key.split('/')[2]
+    // 先加载插件路由后加载app路由
+    routes.unshift(...addonRoutes[key].default.map((item) => {
+        item.meta = item.meta ? Object.assign(item.meta, { addon }) : { addon }
+        return item
+    }))
+}
+
+// https://router.vuejs.org/api/interfaces/routeroptions.html
+export default <RouterConfig>{
+    routes: (_routes) => routes,
+    strict: false
+}
diff --git a/web/assets/images/camera.png b/web/assets/images/camera.png
new file mode 100644
index 00000000..41b03e0f
Binary files /dev/null and b/web/assets/images/camera.png differ
diff --git a/web/assets/images/default_headimg.png b/web/assets/images/default_headimg.png
new file mode 100644
index 00000000..3c487601
Binary files /dev/null and b/web/assets/images/default_headimg.png differ
diff --git a/web/assets/images/fiexd/cart.png b/web/assets/images/fiexd/cart.png
new file mode 100644
index 00000000..5c86b0bc
Binary files /dev/null and b/web/assets/images/fiexd/cart.png differ
diff --git a/web/assets/images/fiexd/customer.png b/web/assets/images/fiexd/customer.png
new file mode 100644
index 00000000..8b844bd4
Binary files /dev/null and b/web/assets/images/fiexd/customer.png differ
diff --git a/web/assets/images/fiexd/member.png b/web/assets/images/fiexd/member.png
new file mode 100644
index 00000000..0e46224f
Binary files /dev/null and b/web/assets/images/fiexd/member.png differ
diff --git a/web/assets/images/fiexd/mobile.png b/web/assets/images/fiexd/mobile.png
new file mode 100644
index 00000000..949020b7
Binary files /dev/null and b/web/assets/images/fiexd/mobile.png differ
diff --git a/web/assets/images/fiexd/top.png b/web/assets/images/fiexd/top.png
new file mode 100644
index 00000000..d971a00e
Binary files /dev/null and b/web/assets/images/fiexd/top.png differ
diff --git a/web/assets/images/index/logo.jpg b/web/assets/images/index/logo.jpg
new file mode 100644
index 00000000..ec17c5ea
Binary files /dev/null and b/web/assets/images/index/logo.jpg differ
diff --git a/web/assets/images/index_carousel.png b/web/assets/images/index_carousel.png
new file mode 100644
index 00000000..38515e1f
Binary files /dev/null and b/web/assets/images/index_carousel.png differ
diff --git a/web/assets/images/pay/pay.png b/web/assets/images/pay/pay.png
new file mode 100644
index 00000000..5bff3e0d
Binary files /dev/null and b/web/assets/images/pay/pay.png differ
diff --git a/web/assets/images/user.png b/web/assets/images/user.png
new file mode 100644
index 00000000..bb09f5ec
Binary files /dev/null and b/web/assets/images/user.png differ
diff --git a/web/assets/images/word/api.jpg b/web/assets/images/word/api.jpg
new file mode 100644
index 00000000..8e7f7084
Binary files /dev/null and b/web/assets/images/word/api.jpg differ
diff --git a/web/assets/images/word/community.jpg b/web/assets/images/word/community.jpg
new file mode 100644
index 00000000..2e327b28
Binary files /dev/null and b/web/assets/images/word/community.jpg differ
diff --git a/web/assets/images/word/course.jpg b/web/assets/images/word/course.jpg
new file mode 100644
index 00000000..35176fb5
Binary files /dev/null and b/web/assets/images/word/course.jpg differ
diff --git a/web/assets/images/word/word-back.jpg b/web/assets/images/word/word-back.jpg
new file mode 100644
index 00000000..6d146619
Binary files /dev/null and b/web/assets/images/word/word-back.jpg differ
diff --git a/web/assets/images/word/wx.jpg b/web/assets/images/word/wx.jpg
new file mode 100644
index 00000000..de5f7d25
Binary files /dev/null and b/web/assets/images/word/wx.jpg differ
diff --git a/web/assets/styles/OPPOSans-M.ttf b/web/assets/styles/OPPOSans-M.ttf
new file mode 100644
index 00000000..e13e81f9
Binary files /dev/null and b/web/assets/styles/OPPOSans-M.ttf differ
diff --git a/web/assets/styles/OPPOSans-R.ttf b/web/assets/styles/OPPOSans-R.ttf
new file mode 100644
index 00000000..ddadfba6
Binary files /dev/null and b/web/assets/styles/OPPOSans-R.ttf differ
diff --git a/web/assets/styles/common.scss b/web/assets/styles/common.scss
new file mode 100644
index 00000000..bee14817
--- /dev/null
+++ b/web/assets/styles/common.scss
@@ -0,0 +1,64 @@
+@font-face {
+  font-family: 'oppoSans-M';
+  src: url('@/assets/styles/OPPOSans-M.ttf') format('truetype');
+}
+@font-face {
+  font-family: 'oppoSans-R';
+  src: url('@/assets/styles/OPPOSans-R.ttf') format('truetype');
+}
+@font-face {
+  font-family: 'myFont';
+  src: url('@/assets/styles/custom.ttf') format('truetype');
+}
+
+.oppoSans-M{
+  font-family:  'oppoSans-M';
+  font-weight:  500;
+}
+.oppoSans-R{
+  font-family:  'oppoSans-R';
+}
+.price-font{
+  font-family: 'myFont';
+}
+body{
+  font-family:  'oppoSans-M';
+  background-color: #f5f5f5;
+  color: #303133;
+}
+div{
+  box-sizing: border-box;
+}
+// 标签
+.tag-item{
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	box-sizing: border-box;
+	font-size: 12px;
+	border-radius: 6px;
+}
+.flex-center {
+  align-items: center;
+  display: flex;
+  justify-content: center;
+}
+.main-container {
+    width: 1200px;
+    margin: 0 auto;
+}
+
+/* 多行超出隐藏 */
+.multi-hidden {
+    word-break: break-all;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+}
+
+
+.el-button:focus-visible{
+  outline: none !important;
+}
diff --git a/web/assets/styles/custom.ttf b/web/assets/styles/custom.ttf
new file mode 100644
index 00000000..6483758e
Binary files /dev/null and b/web/assets/styles/custom.ttf differ
diff --git a/web/assets/styles/iconfont.css b/web/assets/styles/iconfont.css
new file mode 100644
index 00000000..7226b41a
--- /dev/null
+++ b/web/assets/styles/iconfont.css
@@ -0,0 +1,455 @@
+@font-face {
+    font-family: "iconfont"; /* Project id 4174881 */
+    src: url('//at.alicdn.com/t/c/font_4174881_kzu1qah5r4j.woff2?t=1733801795296') format('woff2'),
+         url('//at.alicdn.com/t/c/font_4174881_kzu1qah5r4j.woff?t=1733801795296') format('woff'),
+         url('//at.alicdn.com/t/c/font_4174881_kzu1qah5r4j.ttf?t=1733801795296') format('truetype');
+  }
+  
+  .iconfont {
+    font-family: "iconfont" !important;
+    font-size: 16px;
+    font-style: normal;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+  }
+  
+  .icon-gouwucheV6xx6:before {
+    content: "\e835";
+  }
+  
+  .icon-zuoV6xx:before {
+    content: "\e630";
+  }
+  
+  .icon-a-guanbi34:before {
+    content: "\e82b";
+  }
+  
+  .icon-zujiV6xx:before {
+    content: "\e765";
+  }
+  
+  .icon-gouwucheV6xx-2:before {
+    content: "\e6fe";
+  }
+  
+  .icon-woV6xx1:before {
+    content: "\e709";
+  }
+  
+  .icon-mima:before {
+    content: "\e65e";
+  }
+  
+  .icon-shoujiV6xx:before {
+    content: "\e7a1";
+  }
+  
+  .icon-tubiaoV6-3:before {
+    content: "\e664";
+  }
+  
+  .icon-youV6xx:before {
+    content: "\e631";
+  }
+  
+  .icon-riliV6xx:before {
+    content: "\e73e";
+  }
+  
+  .icon-xiugaiV6xx:before {
+    content: "\e659";
+  }
+  
+  .icon-shanchu-yuangaizhiV6xx:before {
+    content: "\e6e7";
+  }
+  
+  .icon-shenhezhong:before {
+    content: "\e6cb";
+  }
+  
+  .icon-jishibenV6xx:before {
+    content: "\e6fb";
+  }
+  
+  .icon-fapiao:before {
+    content: "\e658";
+  }
+  
+  .icon-checkbox_nol:before {
+    content: "\e62d";
+  }
+  
+  .icon-shangV6xx-1:before {
+    content: "\e641";
+  }
+  
+  .icon-xiaV6xx:before {
+    content: "\e643";
+  }
+  
+  .icon-aixin1:before {
+    content: "\e663";
+  }
+  
+  .icon-fujian:before {
+    content: "\e611";
+  }
+  
+  .icon-group-num:before {
+    content: "\e603";
+  }
+  
+  .icon-zhaopian:before {
+    content: "\e618";
+  }
+  
+  .icon-duanxinV6xx1:before {
+    content: "\e654";
+  }
+  
+  .icon-aixin:before {
+    content: "\e62a";
+  }
+  
+  .icon-paixujiantoushang:before {
+    content: "\e60d";
+  }
+  
+  .icon-paixujiantouxia:before {
+    content: "\e60e";
+  }
+  
+  .icon-xuanze1:before {
+    content: "\e616";
+  }
+  
+  .icon-weixinzhifu:before {
+    content: "\e650";
+  }
+  
+  .icon-zhifubaozhifu:before {
+    content: "\e627";
+  }
+  
+  .icon-yuezhifu:before {
+    content: "\e629";
+  }
+  
+  .icon-shijian_o:before {
+    content: "\ebb1";
+  }
+  
+  .icon-shangjiantou:before {
+    content: "\e79d";
+  }
+  
+  .icon-xiajiantou1:before {
+    content: "\e79e";
+  }
+  
+  .icon-shouye:before {
+    content: "\e626";
+  }
+  
+  .icon-Vector-25:before {
+    content: "\e70b";
+  }
+  
+  .icon-youhuiquan:before {
+    content: "\e623";
+  }
+  
+  .icon-ruzhushenqing:before {
+    content: "\e624";
+  }
+  
+  .icon-dizhiguanli:before {
+    content: "\e625";
+  }
+  
+  .icon-shoucang1:before {
+    content: "\e620";
+  }
+  
+  .icon-shoucang2:before {
+    content: "\e621";
+  }
+  
+  .icon-fanhui:before {
+    content: "\e61c";
+  }
+  
+  .icon-sousuo:before {
+    content: "\e61e";
+  }
+  
+  .icon-gouwuche1:before {
+    content: "\e61f";
+  }
+  
+  .icon-yanjing_kai:before {
+    content: "\e61b";
+  }
+  
+  .icon-shijian:before {
+    content: "\e619";
+  }
+  
+  .icon-bofang:before {
+    content: "\e606";
+  }
+  
+  .icon-weixin1:before {
+    content: "\e6ea";
+  }
+  
+  .icon-gengduo-lan:before {
+    content: "\e615";
+  }
+  
+  .icon-shoucang01:before {
+    content: "\ea33";
+  }
+  
+  .icon-a-dingdan2:before {
+    content: "\eba3";
+  }
+  
+  .icon-a-qian2:before {
+    content: "\eb44";
+  }
+  
+  .icon-caigou6:before {
+    content: "\eba1";
+  }
+  
+  .icon-a-zhibao5:before {
+    content: "\ebc9";
+  }
+  
+  .icon-shizhong:before {
+    content: "\e74f";
+  }
+  
+  .icon-zhanghaodenglu:before {
+    content: "\e698";
+  }
+  
+  .icon-mianxing_denglu_erweimadenglu:before {
+    content: "\e6fd";
+  }
+  
+  .icon-yishoucang:before {
+    content: "\e60c";
+  }
+  
+  .icon-dizhi-tianjia:before {
+    content: "\e622";
+  }
+  
+  .icon-xuanzhong4:before {
+    content: "\e9ec";
+  }
+  
+  .icon-jiageshaixuanshang:before {
+    content: "\e612";
+  }
+  
+  .icon-shangjiashijian:before {
+    content: "\e684";
+  }
+  
+  .icon-kefu:before {
+    content: "\e657";
+  }
+  
+  .icon-xiangshangjiantou:before {
+    content: "\e65d";
+  }
+  
+  .icon-dijia:before {
+    content: "\e601";
+  }
+  
+  .icon-zhifa:before {
+    content: "\e648";
+  }
+  
+  .icon-hanghuo:before {
+    content: "\e61a";
+  }
+  
+  .icon-pinzhong:before {
+    content: "\e62b";
+  }
+  
+  .icon-gouwuche:before {
+    content: "\e652";
+  }
+  
+  .icon-shoucang:before {
+    content: "\e600";
+  }
+  
+  .icon-geren:before {
+    content: "\e610";
+  }
+  
+  .icon-c:before {
+    content: "\e683";
+  }
+  
+  .icon-wenhao:before {
+    content: "\e628";
+  }
+  
+  .icon-jiahao:before {
+    content: "\e602";
+  }
+  
+  .icon-biaoqian:before {
+    content: "\e63d";
+  }
+  
+  .icon-xiajiantou:before {
+    content: "\e63c";
+  }
+  
+  .icon-rili1:before {
+    content: "\e62f";
+  }
+  
+  .icon-huangguan:before {
+    content: "\e6bb";
+  }
+  
+  .icon-05_success:before {
+    content: "\e6b2";
+  }
+  
+  .icon-huojian1:before {
+    content: "\e6c0";
+  }
+  
+  .icon-shouquanliebiao:before {
+    content: "\e696";
+  }
+  
+  .icon-icon_huojian:before {
+    content: "\e694";
+  }
+  
+  .icon-xiaoxi1:before {
+    content: "\e695";
+  }
+  
+  .icon-huojian:before {
+    content: "\e693";
+  }
+  
+  .icon-tishi2:before {
+    content: "\e6fc";
+  }
+  
+  .icon-kaifazhe:before {
+    content: "\e692";
+  }
+  
+  .icon-xiaoxi:before {
+    content: "\e690";
+  }
+  
+  .icon--_shengchengyanshi:before {
+    content: "\e68f";
+  }
+  
+  .icon-tishi1:before {
+    content: "\e691";
+  }
+  
+  .icon-dian:before {
+    content: "\ec1e";
+  }
+  
+  .icon-huanyingye:before {
+    content: "\e68e";
+  }
+  
+  .icon-gerenxinxi:before {
+    content: "\e6f4";
+  }
+  
+  .icon-shimingrenzheng:before {
+    content: "\e6f9";
+  }
+  
+  .icon-kaifashangzhongxin:before {
+    content: "\e6fa";
+  }
+  
+  .icon-wodezhanghu:before {
+    content: "\e6f8";
+  }
+  
+  .icon-wodeshouquan:before {
+    content: "\e6f6";
+  }
+  
+  .icon-wodezhandian:before {
+    content: "\e6f5";
+  }
+  
+  .icon-wodedingdan:before {
+    content: "\e6f2";
+  }
+  
+  .icon-lingdang-xianxing:before {
+    content: "\e8c0";
+  }
+  
+  .icon-weixin:before {
+    content: "\e62c";
+  }
+  
+  .icon-fenxiang:before {
+    content: "\e86e";
+  }
+  
+  .icon-erweima:before {
+    content: "\e680";
+  }
+  
+  .icon-shoujihao:before {
+    content: "\e62e";
+  }
+  
+  .icon-tishi:before {
+    content: "\e613";
+  }
+  
+  .icon-shimingrenzheng-xian:before {
+    content: "\e89c";
+  }
+  
+  .icon-icon-selected:before {
+    content: "\e61d";
+  }
+  
+  .icon-yangshi_icon_tongyong_shield:before {
+    content: "\e668";
+  }
+  
+  .icon-xiangyoujiantou:before {
+    content: "\e65f";
+  }
+  
+  .icon-xiangzuojiantou:before {
+    content: "\e660";
+  }
+  
+  .icon-qiye:before {
+    content: "\e60f";
+  }
+  
\ No newline at end of file
diff --git a/web/assets/styles/index.scss b/web/assets/styles/index.scss
new file mode 100644
index 00000000..c43765b1
--- /dev/null
+++ b/web/assets/styles/index.scss
@@ -0,0 +1,21 @@
+@import 'iconfont.css';
+@import 'common.scss';
+
+// 主色调修改
+:root{
+    --el-color-primary: #EF000C;
+    --el-color-primary-light-3: #EF000C;
+    --el-color-primary-light-5: #f49991;
+    --el-color-primary-light-7: #f8c2bd;
+    --el-color-primary-light-8: #fbd6d3;
+    --el-color-primary-light-9: #fff;
+    --el-color-primary-dark-2: #EF000C;
+    --el-price:#E4221C;
+    // 圆角大小
+    --rounded-xl: 100px;
+    --rounded-big: 16px;
+    --rounded-mid: 12px;
+    --rounded-med: 8px;
+    --rounded-small: 6px;
+}
+
diff --git a/web/components/icon/index.vue b/web/components/icon/index.vue
new file mode 100644
index 00000000..f3113d06
--- /dev/null
+++ b/web/components/icon/index.vue
@@ -0,0 +1,42 @@
+<script lang="ts">
+import { createVNode, resolveComponent, defineComponent } from 'vue'
+
+export default defineComponent({
+    name: 'Icon',
+    props: {
+        name: {
+            type: String,
+            required: true
+        },
+        color: {
+            type: String,
+            default: 'var(--color)'
+        },
+        class: {
+            type: [String, Object],
+            default: ''
+        },
+        size: {
+            type: String,
+            default: '16px'
+        },
+    },
+    setup(props) {
+        let [type, name] = props.name.split(/-(.*)/)
+
+        let style = {
+            color: props.color,
+            fontSize: props.size
+        }
+
+        switch (type) {
+            case 'element':
+                return () => createVNode('el-icon', { class: ['icon el-icon', props.class], style: style }, [createVNode(resolveComponent(name))])
+                break;
+            case 'iconfont':
+                return () => createVNode('i', { class: [name, 'iconfont', props.class], style: style })
+                break;
+        }
+    }
+})
+</script>
diff --git a/web/components/login-dialog/index.vue b/web/components/login-dialog/index.vue
new file mode 100644
index 00000000..1a1260e9
--- /dev/null
+++ b/web/components/login-dialog/index.vue
@@ -0,0 +1,76 @@
+<template>
+<div class="loginPopup">
+    <el-dialog v-model="dialogVisible" align-center width="430"  :before-close="beforeClose"  custom-class="login !rounded-[var(--rounded-big)]" :show-close="false" append-to-body>
+        <div class="relative">
+            <span class="iconfont icon-tubiaoV6-3 absolute top-[-33px] right-[-33px] text-[#fff] !text-[24px]" @click="handleClose"></span>
+            <login v-if="type === 'login' && dialogVisible" @typeChange="typeChange"/>
+            <register v-if="type === 'register' && dialogVisible" @typeChange="typeChange" />
+        </div>
+    </el-dialog>
+</div>
+</template>
+<script lang="ts" setup>
+import { ref,computed,watch } from 'vue'
+import login from './login.vue'
+import register from './register.vue'
+import useMemberStore from '@/stores/member'
+
+const memberStore = useMemberStore()
+//弹框状态
+const dialogVisible = computed(()=>{
+    return memberStore.loginPopup
+})
+//弹框关闭
+const beforeClose = (next)=>{
+    memberStore.logClose()
+    type.value = 'login'
+    next()
+}
+const handleClose = ()=>{
+    memberStore.logClose()
+     type.value = 'login'
+}
+//判断当前是登录还是注册
+let type = ref('login')
+const typeChange = (val:any)=>{
+    type.value = val
+}
+</script>
+<style>
+.login .el-dialog__header{
+    padding: 0 !important;
+}
+
+.login .el-dialog__body{
+    padding: 0 !important;
+}
+.login .el-dialog__headerbtn{
+    z-index: 99;
+}
+</style>
+<style lang="scss" scoped>
+:deep(.el-form-item) {
+    .el-input__wrapper {
+        box-shadow: unset !important;
+        border-radius: 0;
+        &.is-focus {
+            border: none;
+        }
+    }
+
+    &.is-error {
+        .el-input__wrapper {
+            border: none;
+        }
+    }
+}
+
+:deep(.el-form-item__error) {
+    padding-top: 5px;
+}
+
+.text-color {
+    color: var(--el-color-primary);
+}
+
+</style>
diff --git a/web/components/login-dialog/login.vue b/web/components/login-dialog/login.vue
new file mode 100644
index 00000000..bb0dd7b7
--- /dev/null
+++ b/web/components/login-dialog/login.vue
@@ -0,0 +1,278 @@
+<template>
+    <div>
+         <span v-if="active" class="iconfont icon-mianxing_denglu_erweimadenglu !text-[#333] !text-[50px] absolute top-0 right-0 cursor-pointer" @click="handleChange"></span>
+        <span v-else class="iconfont icon-zhanghaodenglu !text-[#333] !text-[50px] absolute top-0 right-0 cursor-pointer" @click="handleChange"></span>
+        <div  v-if="active" class="bg-white w-full py-[60px] px-[30px] !rounded-[var(--rounded-big)]">
+            <div class="flex items-end justify-center mb-[30px]">
+                <div class="text-[18px] cursor-pointer text-[#999] leading-[24px] oppoSans-R" :class="{ '!text-[#333] font-600': type == item.type,'mr-[70px]': (index+1) != loginType.length }" v-for="(item,index) in loginType" @click="type = item.type">{{item.title }}</div>
+            </div>
+            <el-form :model="formData" ref="formRef" :rules="formRules" :validate-on-rule-change="false">
+                <div v-show="type == 'username'">
+                    <el-form-item prop="username">
+                        <div class="flex-1 h-[50px] border-[1px] border-solid border-[#ccc] rounded-[8px] flex items-center">
+                            <el-input v-model="formData.username" :placeholder="t('usernamePlaceholder')" clearable :inline-message="true" :readonly="real_name_input" @click="real_name_input = false" @blur="real_name_input = true">
+                                <template #prefix>
+                                    <span class="iconfont icon-woV6xx1 !mr-[14px]"></span>
+                                </template>
+                            </el-input>
+                        </div>
+                    </el-form-item>
+                    <el-form-item prop="password">
+                        <div class="flex-1 h-[50px] border-[1px] border-solid border-[#ccc] rounded-[8px] flex items-center">
+                            <el-input v-model="formData.password" :placeholder="t('passwordPlaceholder')" type="password" clearable show-password >
+                                <template #prefix>
+                                    <span class="iconfont icon-mima !mr-[14px]"></span>
+                                </template>
+                            </el-input>
+                        </div>
+                    </el-form-item>
+                </div>
+                <div v-show="type == 'mobile'">
+                    <el-form-item prop="mobile">
+                        <div class="flex-1 h-[50px] border-[1px] border-solid border-[#ccc] rounded-[8px] flex items-center">
+                            <el-input v-model="formData.mobile" :placeholder="t('mobilePlaceholder')" clearable>
+                                <template #prefix>
+                                    <span class="iconfont icon-shoujiV6xx !mr-[14px]"></span>
+                                </template>
+                            </el-input>
+                        </div>
+                    </el-form-item>
+                    <el-form-item prop="mobile_code">
+                        <div class="flex-1 h-[50px] border-[1px] border-solid border-[#ccc] rounded-[8px] flex items-center">
+                            <el-input v-model="formData.mobile_code" :placeholder="t('codePlaceholder')">
+                                <template #prefix>
+                                    <span class="iconfont icon-a-zhibao5 !mr-[14px]"></span>
+                                </template>
+                                <template #suffix>
+                                    <sms-code :mobile="formData.mobile" type="login" v-model="formData.mobile_key" @click="sendSmsCode" ref="smsCodeRef"></sms-code>
+                                </template>
+                            </el-input>
+                        </div>
+                    </el-form-item>
+                </div>
+                <div class="flex justify-between">
+                    <el-button type="primary" link @click="typeChange" class="!text-[12px]">{{ t('noAccount') }}，{{ t('toRegister') }}</el-button>
+                </div>
+                <div class="mt-[20px]">
+                    <el-button type="primary" class="w-full !h-[50px] !rounded-[8px] oppoSans-M" size="large" @click="handleLogin" :loading="loading">{{ loading ? t('logining') : t('login') }}</el-button>
+                </div>
+                <div class="text-[12px] leading-[24px] flex items-center w-full mt-[20px]" v-if="configStore.login.agreement_show">
+                    <span class="iconfont text-primary mr-[5px]" :class="isAgree ? 'icon-xuanze1' : 'icon-checkbox_nol'" @click="isAgree = !isAgree"></span>
+                    {{ t('agreeTips') }}
+                    <NuxtLink :to="service" target="_blank">
+                        <span class="text-primary mx-[4px]">{{ t('userAgreement') }}</span>
+                    </NuxtLink>
+                    {{ t('and') }}
+                    <NuxtLink :to="privacy" target="_blank">
+                        <span class="text-primary mx-[4px]">{{ t('privacyAgreement') }}</span>
+                    </NuxtLink>
+                </div>
+            </el-form>
+        </div>
+        <div v-else class="flex flex-col items-center py-[60px]  px-[30px]">
+            <div class="text-[18px] cursor-pointer text-[#999] leading-[24px] oppoSans-R !text-[#333] font-600">微信扫码登录</div>
+            <div class="qrcode p-[20px] mt-[30px] border leading-none box-content rounded-[var(--rounded-small)]">
+                <div class="relative">
+                    <el-image v-if="weixinCode.url" :src="weixinCode.url" class="w-[200px] h-[200px]"/>
+                    <div v-else class="w-[202px] h-[202px]"></div>
+                    <div class="flex flex-col justify-center items-center absolute inset-0 bg-gray-50" v-if="weixinCode.pastDue">
+                        <span class="text-xs text-gray-600">{{ weixinCode.pastDueContent }}</span>
+                        <span @click="scanLoginFn()" class="text-xs cursor-pointer text-color mt-2">点击刷新</span>
+                    </div>
+                </div>
+                <div class="mt-[22px] flex items-center justify-center">
+                    <span class="iconfont icon-weixin1 text-[#00c22c]"></span>
+                    <span class="text-[14px] text-[#999] ml-[4px]">微信扫一扫</span>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script lang="ts" setup>
+import { ref,reactive,computed,onUnmounted } from 'vue'
+import { FormInstance } from 'element-plus'
+import { usernameLogin, mobileLogin, scanlogin, checkscan } from '@/app/api/auth'
+import useMemberStore from '@/stores/member'
+import useConfigStore from '@/stores/config'
+import QRCode from "qrcode";
+
+const memberStore = useMemberStore()
+const configStore = useConfigStore()
+
+// 跳转
+const service = ref('')
+const privacy = ref('')
+if(location.pathname.indexOf('web') != -1){
+    service.value = '/web/auth/agreement?key=service'
+    privacy.value = '/web/auth/agreement?key=privacy'
+}else{
+    service.value = '/auth/agreement?key=service'
+    privacy.value = '/auth/agreement?key=privacy'
+}
+
+//当前为二维码还是账户登录
+let active = ref(true)
+let timer:any = null
+const handleChange = () => {
+    active.value = !active.value
+    if(!active.value){
+        scanLoginFn();
+    }else{
+        clearTimeout(timer)
+    }
+}
+onUnmounted(() => {
+    clearTimeout(timer)
+});
+// 校验二维码
+const checkScanFn = (key) => {
+    let parameter = { key };
+
+    checkscan(parameter).then((res) => {
+        let data = res.data;
+        switch (data.status) {
+            case 'wait':
+                timer = setTimeout(() => {
+                    checkScanFn(weixinCode.value.key);
+                }, 1000);
+                break;
+            case 'success':
+                if (!data.login_data.token) {
+                    useCookie('openId').value = data.login_data.openid
+                    navigateTo(`/auth/bind`)
+                } else {
+                    memberStore.setToken(data.login_data.token)
+                    memberStore.logClose()
+                }
+                break;
+            case 'fail':
+                weixinCode.value.pastDueContent = data.fail_reason
+                weixinCode.value.pastDue = true;
+                break;
+        }
+    }).catch((res) => {
+        weixinCode.value.pastDue = true;
+        weixinCode.value.pastDueContent = res.msg;
+    })
+}
+
+// 扫码登录,微信二维码
+const weixinCode = ref({
+    url: '',
+    key: '',
+    pastDue: false,
+    pastDueContent: '二维码生成失败'
+})
+
+const scanLoginFn = async () => {
+    let data = await (await scanlogin()).data;
+    weixinCode.value.key = data.key
+    if(data.url) {
+        QRCode.toDataURL(data.url, { errorCorrectionLevel: 'L', margin: 0, width: 100 }).then(url => {
+            weixinCode.value.url = url
+        });
+        weixinCode.value.pastDue = false;
+        setTimeout(() => {
+            checkScanFn(weixinCode.value.key);
+        }, 1000);
+    }
+}
+
+configStore.getLoginConfig()
+
+const loginType = computed(() => {
+    const value = []
+    configStore.login.is_username && (value.push({ type: 'username', title: t('usernameLogin') }))
+    configStore.login.is_mobile && (value.push({ type: 'mobile', title: t('mobileLogin') }))
+    type.value = value[0] ? value[0].type : ''
+    return value
+})
+
+const loading = ref(false)
+const type = ref('')
+const formData = reactive({
+    username: '',
+    password: '',
+    mobile: '',
+    mobile_code: '',
+    mobile_key: ''
+})
+const formRef = ref<FormInstance>()
+const formRules = computed(() => {
+    return {
+        'username': {
+            required: type.value == 'username',
+            message: t('usernamePlaceholder'),
+            trigger: ['blur', 'change'],
+        },
+        'password': {
+            required: type.value == 'username',
+            message: t('passwordPlaceholder'),
+            trigger: ['blur', 'change']
+        },
+        'mobile': [
+            {
+                required: type.value == 'mobile',
+                message: t('mobilePlaceholder'),
+                trigger: ['blur', 'change'],
+            },
+            {
+                validator(rule: any, value: string, callback: any) {
+                    if (type.value != 'mobile') return true
+                    else return test.mobile(value)
+                },
+                message: t('mobileError'),
+                trigger: ['blur'],
+            }
+        ],
+        'mobile_code': {
+            required: type.value == 'mobile',
+            message: t('codePlaceholder'),
+            trigger: ['change']
+        }
+    }
+})
+const isAgree = ref(false)
+const handleLogin = async () => {
+    await formRef.value?.validate(async (valid, fields) => {
+        if (valid) {
+            if (configStore.login.agreement_show && !isAgree.value) {
+                ElMessage.error(t('isAgreeTips'))
+                return false;
+            }
+            if (loading.value) return
+            loading.value = true
+
+            const login = type.value == 'username' ? usernameLogin : mobileLogin
+
+            login(formData).then(async (res) => {
+                await memberStore.setToken(res.data.token)
+                memberStore.logClose()
+            }).catch(() => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+const smsCodeRef = ref<AnyObject | null>(null)
+const sendSmsCode = async () => {
+    await formRef.value?.validateField('mobile', async (valid, fields) => {
+        if (valid) {
+            smsCodeRef.value?.send()
+        }
+    })
+}
+//去注册
+const emit = defineEmits(['typeChange'])
+const typeChange = ()=>{
+    emit('typeChange','register')
+}
+
+const real_name_input = ref(true)
+const password_input = ref(true)
+</script>
+
+<style lang="scss" scoped>
+
+</style>
diff --git a/web/components/login-dialog/register.vue b/web/components/login-dialog/register.vue
new file mode 100644
index 00000000..fcb4e175
--- /dev/null
+++ b/web/components/login-dialog/register.vue
@@ -0,0 +1,271 @@
+<template>
+    <div>
+        <div class="bg-white w-full py-[60px] px-[30px] !rounded-[var(--rounded-big)]">
+            <div class="flex items-end justify-center mb-[30px]">
+                <div class="text-[18px] cursor-pointer text-[#999] leading-[24px] oppoSans-R" :class="{ '!text-[#333] font-600': type == item.type,'mr-[70px]': (index+1) != registerType.length }" v-for="(item,index) in registerType" @click="type = item.type">{{item.title }}</div>
+            </div>
+            <el-form :model="formData" ref="formRef" :rules="formRules" :validate-on-rule-change="false">
+                <div v-show="type == 'username'">
+                    <el-form-item prop="username">
+                        <div class="flex-1 h-[50px] border-[1px] border-solid border-[#ccc] rounded-[8px] flex items-center">
+                            <el-input v-model="formData.username" :placeholder="t('usernamePlaceholder')" clearable :inline-message="true" :readonly="real_name_input" @click="real_name_input = false" @blur="real_name_input = true">
+                                <template #prefix>
+                                    <span class="iconfont icon-woV6xx1 !mr-[14px]"></span>
+                                </template>
+                            </el-input>
+                        </div>
+                    </el-form-item>
+                    <el-form-item prop="password">
+                        <div class="flex-1 h-[50px] border-[1px] border-solid border-[#ccc] rounded-[8px] flex items-center">
+                            <el-input v-model="formData.password" :placeholder="t('passwordPlaceholder')" type="password" clearable :show-password="true" >
+                                <template #prefix>
+                                    <span class="iconfont icon-mima !mr-[14px]"></span>
+                                </template>
+                            </el-input>
+                        </div>
+                    </el-form-item>
+                    <el-form-item prop="confirm_password">
+                        <div class="flex-1 h-[50px] border-[1px] border-solid border-[#ccc] rounded-[8px] flex items-center">
+                            <el-input v-model="formData.confirm_password" :placeholder="t('confirmPasswordPlaceholder')" type="password" clearable :show-password="true" >
+                                <template #prefix>
+                                    <span class="iconfont icon-mima !mr-[14px]"></span>
+                                </template>
+                            </el-input>
+                        </div>
+                    </el-form-item>
+                </div>
+                <div v-show="type == 'mobile' || configStore.login.is_bind_mobile">
+                    <el-form-item prop="mobile">
+                        <div class="flex-1 h-[50px] border-[1px] border-solid border-[#ccc] rounded-[8px] flex items-center">
+                            <el-input v-model="formData.mobile" :placeholder="t('mobilePlaceholder')" clearable>
+                                <template #prefix>
+                                    <span class="iconfont icon-shoujiV6xx !mr-[14px]"></span>
+                                </template>
+                            </el-input>
+                        </div>
+                    </el-form-item>
+                    <el-form-item prop="mobile_code">
+                        <div class="flex-1 h-[50px] border-[1px] border-solid border-[#ccc] rounded-[8px] flex items-center">
+                            <el-input v-model="formData.mobile_code" :placeholder="t('codePlaceholder')">
+                                <template #prefix>
+                                    <span class="iconfont icon-a-zhibao5 !mr-[14px]"></span>
+                                </template>
+                                <template #suffix>
+                                    <sms-code :mobile="formData.mobile" type="login" v-model="formData.mobile_key" @click="sendSmsCode" ref="smsCodeRef"></sms-code>
+                                </template>
+                            </el-input>
+                        </div>
+                    </el-form-item>
+                </div>
+                <div v-show="type == 'username'">
+                    <el-form-item prop="captcha_code">
+                        <div class="flex-1 h-[50px] border-[1px] border-solid border-[#ccc] rounded-[8px] flex items-center">
+                            <el-input v-model="formData.captcha_code" :placeholder="t('captchaPlaceholder')">
+                                <template #prefix>
+                                    <span class="iconfont icon-a-zhibao5 !mr-[14px]"></span>
+                                </template>
+                                <template #suffix>
+                                    <div class="py-0 leading-none">
+                                        <el-image :src="captcha.image.value" class="h-[30px] cursor-pointer" @click="captcha.refresh()"></el-image>
+                                    </div>
+                                </template>
+                            </el-input>
+                        </div>
+                    </el-form-item>
+                </div>
+
+                <div class="flex justify-end">
+                    <el-button type="primary" link @click="typeChange" class="!text-[12px]">{{ t('haveAccount') }}，{{ t('toLogin') }}</el-button>
+                </div>
+
+                <div class="mt-[20px]">
+                    <el-button type="primary" class="w-full !h-[50px] !rounded-[8px] oppoSans-M" size="large" @click="handleRegister" :loading="loading">{{ loading ? t('registering') : t('register') }}</el-button>
+                </div>
+
+                <div class="text-[12px] leading-[24px] flex items-center w-full mt-[20px]" v-if="configStore.login.agreement_show">
+                    <span class="iconfont text-primary mr-[5px]" :class="isAgree ? 'icon-xuanze1' : 'icon-checkbox_nol'" @click="isAgree = !isAgree"></span>
+                    {{ t('registerAgreeTips') }}
+                    <NuxtLink :to="service" target="_blank">
+                            <span class="text-primary mx-[4px]">{{ t('userAgreement') }}</span>
+                    </NuxtLink>
+                        {{ t('and') }}
+                    <NuxtLink :to="privacy" target="_blank">
+                            <span class="text-primary mx-[4px]">{{ t('privacyAgreement') }}</span>
+                     </NuxtLink>
+                 </div>
+            </el-form>
+        </div>
+    </div>
+</template>
+<script lang="ts" setup>
+import { ref,reactive,computed } from 'vue'
+import { usernameRegister, mobileRegister, wechatCheck } from '@/app/api/auth'
+import useMemberStore from '@/stores/member'
+import useConfigStore from '@/stores/config'
+import { FormInstance } from 'element-plus'
+
+definePageMeta({
+    layout: "container"
+});
+
+const memberStore = useMemberStore()
+const configStore = useConfigStore()
+configStore.getLoginConfig()
+
+// 跳转
+const service = ref('')
+const privacy = ref('')
+if(location.pathname.indexOf('web') != -1){
+    service.value = '/web/auth/agreement?key=service'
+    privacy.value = '/web/auth/agreement?key=privacy'
+}else{
+    service.value = '/auth/agreement?key=service'
+    privacy.value = '/auth/agreement?key=privacy'
+}
+
+
+const type = ref('')
+const registerType = computed(() => {
+    const value = []
+    configStore.login.is_username && (value.push({ type: 'username', title: t('usernameRegister') }))
+    configStore.login.is_mobile && !configStore.login.is_bind_mobile && (value.push({ type: 'mobile', title: t('mobileRegister') }))
+    type.value = value[0] ? value[0].type : ''
+    return value
+})
+
+const loading = ref(false)
+const formData = reactive({
+    username: '',
+    password: '',
+    confirm_password: '',
+    mobile: '',
+    mobile_code: '',
+    mobile_key: '',
+    captcha_key: '',
+    captcha_code: ''
+})
+
+const formRules = computed(() => {
+    return {
+        'username': {
+            type: 'string',
+            required: type.value == 'username',
+            message: t('usernamePlaceholder'),
+            trigger: ['blur', 'change'],
+        },
+        'password': {
+            type: 'string',
+            required: type.value == 'username',
+            message: t('passwordPlaceholder'),
+            trigger: ['blur', 'change']
+        },
+        'confirm_password': [
+            {
+                type: 'string',
+                required: type.value == 'username',
+                message: t('confirmPasswordPlaceholder'),
+                trigger: ['blur', 'change']
+            },
+            {
+                validator(rule: any, value: string, callback: any) {
+                    return value == formData.password
+                },
+                message: t('confirmPasswordError'),
+                trigger: ['change', 'blur'],
+            }
+        ],
+        'mobile': [
+            {
+                type: 'string',
+                required: type.value == 'mobile' || configStore.login.is_bind_mobile,
+                message: t('mobilePlaceholder'),
+                trigger: ['blur', 'change'],
+            },
+            {
+                validator(rule: any, value: string, callback: any) {
+                    if (type.value != 'mobile' && !configStore.login.is_bind_mobile) return true
+                    else return test.mobile(value)
+                },
+                message: t('mobileError'),
+                trigger: ['change', 'blur'],
+            }
+        ],
+        'mobile_code': {
+            type: 'string',
+            required: type.value == 'mobile' || configStore.login.is_bind_mobile,
+            message: t('codePlaceholder'),
+            trigger: ['blur', 'change']
+        },
+        'captcha_code': {
+            type: 'string',
+            required: type.value == 'username',
+            message: t('captchaPlaceholder'),
+            trigger: ['blur', 'change'],
+        }
+    }
+})
+
+const isAgree = ref(false)
+const formRef = ref<FormInstance>()
+
+const handleRegister = async () => {
+    await formRef.value?.validate(async (valid, fields) => {
+        if (valid) {
+            if (configStore.login.agreement_show && !isAgree.value) {
+                ElMessage.error(t('isAgreeTips'))
+                return false;
+            }
+
+            if (loading.value) return
+            loading.value = true
+
+            const register = type.value == 'username' ? usernameRegister : mobileRegister
+
+            register(formData).then((res: any) => {
+                memberStore.setToken(res.data.token)
+                memberStore.logClose()
+            }).catch(() => {
+                loading.value = false
+                captcha.refresh()
+            })
+        }
+    })
+}
+let show = ref(false)
+const wechatCheckFn = () =>{
+    wechatCheck().then((res:any) =>{
+        show.value = res.data
+    })
+}
+wechatCheckFn()
+
+// 验证码
+const captcha = useCaptcha(formData)
+captcha.refresh()
+
+// 获取手机验证码
+const smsCodeRef = ref<AnyObject | null>(null)
+const sendSmsCode = async () => {
+    await formRef.value?.validateField('mobile', async (valid, fields) => {
+        if (valid) {
+            smsCodeRef.value?.send()
+        }
+    })
+}
+//去登录
+const emit = defineEmits(['typeChange'])
+const typeChange = ()=>{
+    emit('typeChange','login')
+}
+
+const real_name_input = ref(true)
+const password_input = ref(true)
+const confirm_password_input = ref(true)
+</script>
+
+<style lang="scss" scoped>
+:deep(.el-checkbox.el-checkbox--large){
+    height: 0px;
+    margin-right: 5px;
+}
+</style>
diff --git a/web/components/sidebar/index.vue b/web/components/sidebar/index.vue
new file mode 100644
index 00000000..876360ed
--- /dev/null
+++ b/web/components/sidebar/index.vue
@@ -0,0 +1,64 @@
+<template>
+    <div class="w-[180px] flex-shrink-0">
+        <div class="bg-[#fff] pt-[30px] pr-[30px] pb-[21px] pl-[45px] rounded-[var(--rounded-big)]">
+            <el-collapse v-model="activeNames">
+                <el-collapse-item name="1" class="!mb-[24px]">
+                    <template #title>
+                        <div class="flex items-center">
+                            <span class="text-[16px]">账户设置</span>
+                        </div>
+                    </template>
+                    <div class="text-[14px] leading-[24px] cursor-pointer text-[#666]" :class="{'!text-primary': appStore.route == '/app/member/center'}"  @click="router.push('/app/member/center')">个人资料</div>
+                </el-collapse-item>
+                <el-collapse-item name="2" class="!mb-[24px]">
+                    <template #title>
+                        <div class="flex items-center">
+                            <span class="text-[16px]">我的账户</span>
+                        </div>
+                    </template>
+                    <div class="text-[14px] leading-[24px] cursor-pointer text-[#666] mb-[24px]" :class="{'!text-primary': appStore.route == '/app/member/point'}"  @click="router.push('/app/member/point')">我的积分</div>
+                    <div class="text-[14px] leading-[24px] cursor-pointer text-[#666]" :class="{'!text-primary': appStore.route == '/app/member/balance'}" @click="router.push('/app/member/balance')">我的余额</div>
+                </el-collapse-item>
+                <el-collapse-item name="7" class="!mb-[24px]">
+                    <template #title>
+                        <div class="flex items-center">
+                            <span class="text-[16px] oppoSans-M">规则协议</span>
+                        </div>
+                    </template>
+                    <div class="text-[14px] leading-[24px] cursor-pointer text-[#666] mb-[24px]" :class="{'!text-primary': appStore.route == '/app/auth/agreement' && route.query.key == 'service'}" @click="router.push({path:'/app/auth/agreement',query:{key:'service'}})">用户协议</div>
+                    <div class="text-[14px] leading-[24px] cursor-pointer text-[#666]" :class="{'!text-primary': appStore.route == '/app/auth/agreement' && route.query.key == 'privacy'}" @click="router.push({path:'/app/auth/agreement',query:{key:'privacy'}})">隐私协议</div>
+                </el-collapse-item>
+            </el-collapse>
+        </div>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { ref } from 'vue'
+import useAppStore from '@/stores/app'
+import { useRouter, useRoute} from 'vue-router'
+
+const appStore = useAppStore()
+const router = useRouter()
+const route = useRoute()
+const activeNames = ref(['1','2','3','4','5','6','7'])
+</script>
+
+<style lang="scss" scoped>
+:deep(.el-collapse){
+    border:none !important;
+}
+:deep(.el-collapse-item__wrap){
+    border:none !important;
+}
+:deep(.el-collapse-item__header){
+    --el-collapse-header-height: auto !important;
+    --el-collapse-header-font-size: 16px;
+    border:none !important;
+    margin-bottom: 24px;
+}
+:deep(.el-collapse-item__content){
+    padding-bottom:0 !important;
+}
+
+</style>
\ No newline at end of file
diff --git a/web/components/sms-code/index.vue b/web/components/sms-code/index.vue
new file mode 100644
index 00000000..20db93d8
--- /dev/null
+++ b/web/components/sms-code/index.vue
@@ -0,0 +1,109 @@
+<template>
+    <div class="h-[30px] leading-[28px]">
+        <el-button type="primary" link class="!text-[12px]" :disabled="!sendSms.canGetCode.value" @click="handleClick">{{ sendSms.text.value }}</el-button>
+    </div>
+
+    <el-dialog v-model="captchaDialog" :title="t('captchaTitle')" width="350px" :append-to-body="true" :align-center="true">
+        <el-form :model="formData" ref="formRef" :rules="formRules">
+            <el-form-item prop="captcha_code" style="margin-bottom: 0;">
+                <el-input v-model="formData.captcha_code" :placeholder="t('captchaPlaceholder')">
+                    <template #suffix>
+                        <div class="py-[5px] leading-none">
+                            <el-image :src="captcha.image.value" class="h-[30px] cursor-pointer" @click="captcha.refresh()"></el-image>
+                        </div>
+                    </template>
+                </el-input>
+            </el-form-item>
+        </el-form>
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="captchaDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm">{{ t('confirm') }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+const prop = defineProps({
+    mobile: String,
+    type: {
+        type: String,
+        default: ''
+    },
+    modelValue: {
+        type: String,
+        default: ''
+    }
+})
+
+const emits = defineEmits(['update:modelValue', 'click'])
+
+const value = computed({
+    get() {
+        return prop.modelValue
+    },
+    set(value) {
+        emits('update:modelValue', value)
+    }
+})
+
+const loading = ref(false)
+const formData = reactive<requestMobileParam>({
+    mobile: '',
+    captcha_code: '',
+    captcha_key: '',
+    type: prop.type
+})
+const formRules = reactive({
+    captcha_code: {
+        required: true,
+        message: t('captchaPlaceholder'),
+        trigger: ['blur']
+    }
+})
+const formRef = ref<AnyObject | null>(null)
+
+const captchaDialog = ref(false)
+const captcha = useCaptcha(formData)
+captcha.refresh()
+
+const sendSms = useSendSms()
+
+const send = () => {
+    formData.mobile = prop.mobile
+    if (sendSms.canGetCode.value) {
+        captchaDialog.value = true
+    }
+}
+
+const confirm = async () => {
+    await formRef.value?.validate(async (valid, fields) => {
+        if (valid) {
+            loading.value = true
+
+            const sendRes = await sendSms.send(formData)
+            if (sendRes) {
+                value.value = sendRes
+                captchaDialog.value = false
+                captcha.refresh()
+                formData.captcha_code = ''
+                loading.value = false
+            } else if (sendRes === false) {
+                captcha.refresh()
+                loading.value = false
+            }
+        }
+    })
+}
+
+const handleClick = () => {
+    emits('click')
+}
+
+defineExpose({
+    send
+})
+</script>
+
+<style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/web/components/upload-file/index.vue b/web/components/upload-file/index.vue
new file mode 100644
index 00000000..bc0b6a4c
--- /dev/null
+++ b/web/components/upload-file/index.vue
@@ -0,0 +1,184 @@
+<template>
+    <div class="flex flex-wrap">
+        <template v-if="limit == 1">
+            <div class="rounded cursor-pointer overflow-hidden relative border border-solid border-color  mr-[10px]" :style="style">
+                <div class="w-full h-full relative image-wrap" v-if="images.data.length">
+                    <div class="w-full h-full flex items-center justify-center">
+                        <el-image :src="img(images.data[0])" fit="contain"></el-image>
+                    </div>
+                    <div class="absolute z-[1] inset-0 image-mask  hidden">
+                        <div class="flex items-center justify-center w-full h-full bg-black bg-opacity-60 operation">
+                            <icon name="element-ZoomIn" color="#fff" size="18px" class="mr-[10px]" @click="previewImage()" />
+                            <icon name="element-Delete" color="#fff" size="18px" v-if="status" @click="removeImage" />
+                        </div>
+                    </div>
+                </div>
+                <el-upload v-bind="upload" class="upload-file w-full h-full" :show-file-list="false" >
+                    <div class="w-full h-full flex items-center justify-center flex-col">
+                        <icon name="element-Plus" size="20px" color="var(--el-text-color-secondary)" />
+                        <div class="leading-none text-xs mt-[10px] text-secondary">{{ imageText  }}</div>
+                    </div>
+                </el-upload>
+            </div>
+        </template>
+        <template v-else>
+            <div class="rounded cursor-pointer overflow-hidden relative border border-solid border-color mr-[10px] mb-[10px]" :style="style" v-for="(item, index) in images.data" :key="index">
+                <div class="w-full h-full relative image-wrap">
+                    <div class="w-full h-full flex items-center justify-center">
+                        <el-image :src="img(item)" fit="contain"></el-image>
+                    </div>
+                    <div class="absolute z-[1] inset-0 image-mask  hidden">
+                        <div class=" flex items-center justify-center w-full h-full  bg-black bg-opacity-60 operation">
+                            <icon name="element-ZoomIn" color="#fff" size="18px" class="mr-[10px]" @click="previewImage(index)" />
+                            <icon name="element-Delete" color="#fff" size="18px" v-if="status" @click="removeImage(index)" />
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="rounded-[6px] cursor-pointer overflow-hidden relative border border-dashed border-color bg-[#fafafa] hover:border-primary" :style="style" v-if="images.data.length < limit && status">
+                <el-upload v-bind="upload" class="upload-file w-full h-full" :show-file-list="false" :multiple="true" :limit="limit">
+                    <div class="w-full h-full flex items-center justify-center">
+                        <icon name="element-Plus" size="28px" color="var(--el-text-color-secondary)" />
+                        <div class="leading-none text-xs mt-[10px] text-secondary">{{ imageText  }}</div>
+                    </div>
+                </el-upload>
+            </div>
+        </template>
+    </div>
+    <el-image-viewer :url-list="previewImageList" v-if="imageViewer.show" @close="imageViewer.show = false"
+        :initial-index="imageViewer.index" :zoom-rate="1" :hide-on-click-modal="true" />
+</template>
+
+<script lang="ts" setup>
+import { reactive,computed,watch,toRaw } from 'vue'
+import { getToken,img } from '@/utils/common'
+import { UploadFile, ElMessage, UploadFiles } from 'element-plus'
+
+const prop = defineProps({
+    modelValue: {
+        type: String,
+        default: ''
+    },
+    data: {
+        type: Array,
+        default: []
+    },
+    width: {
+        type: String,
+        default: '100px'
+    },
+    height: {
+        type: String,
+        default: '100px'
+    },
+    // 上传图片的文字
+    imageText: {
+        type: String
+    },
+    // 限制图片的数量
+    limit: {
+        type: Number,
+        default: 1
+    },
+    // 控制删除按钮的展示
+    status:{
+        type:Boolean,
+        default:true
+    }
+})
+
+const emit = defineEmits(['update:modelValue','success'])
+
+const value = computed({
+    get() {
+        return prop.modelValue
+    },
+    set(value) {
+        emit('update:modelValue', value)
+    }
+})
+
+const images: Record<string, any> = reactive({
+    data: []
+})
+
+let previewImageList: string[] = reactive([])
+
+const setValue = () => {
+    value.value = toRaw(images.data).toString()
+    previewImageList = toRaw(images.data).map((url: string) => { return img(url) })
+}
+
+watch(() => value.value, () => {
+    images.data = [
+        ...value.value.split(',').filter((item: string) => { return item })
+    ]
+    setValue()
+}, { immediate: true })
+
+const style = computed(() => {
+    return {
+        width: prop.width,
+        height: prop.height
+    }
+})
+
+const headers: Record<string, any> = {}
+headers.token = getToken()
+
+const runtimeConfig = useRuntimeConfig()
+
+let url = runtimeConfig.public.VITE_APP_BASE_URL || `${location.origin}/api/`
+const upload: Record<string, any> = {
+    action: `${url}/file/image`,
+    headers,
+    accept: '.png,.jpg,.jpeg',
+    // 检查是否超过数量限制
+    beforeUpload: (file: File) => {
+        if (images.data.length >= prop.limit) {
+            ElMessage.error(`最多只能上传 ${prop.limit} 张图片`);
+            return false;
+        }
+        return true; // 允许上传
+    },
+    onSuccess: (response: any) => {
+        images.data.push(response.data.url);
+        setValue();
+    },
+    onExceed: () => {
+        ElMessage.error(`最多只能上传 ${prop.limit} 张图片`);
+    },
+};
+
+/**
+ * 删除图片
+ * @param index
+ */
+ const removeImage = (index: number = 0) => {
+    images.data.splice(index, 1)
+    setValue()
+}
+
+/**
+ * 查看图片
+ */
+const imageViewer = reactive({
+    show: false,
+    index: 0
+})
+
+const previewImage = (index: number = 0) => {
+    imageViewer.show = true
+    imageViewer.index = index
+}
+</script>
+
+<style lang="scss">
+.upload-file .el-upload {
+    width: 100%;
+    height: 100%;
+}
+.image-wrap:hover .image-mask {
+    display: block;
+}
+</style>
diff --git a/web/composables/useCaptcha.ts b/web/composables/useCaptcha.ts
new file mode 100644
index 00000000..bb9a4321
--- /dev/null
+++ b/web/composables/useCaptcha.ts
@@ -0,0 +1,29 @@
+import { ref } from 'vue'
+import { getCaptcha } from '@/app/api/system'
+
+interface formData {
+    captcha_code: string,
+    captcha_key: string
+}
+
+export function useCaptcha(formData: formData) {
+    const image = ref('')
+
+    const refresh = async () => {
+        try {
+            await getCaptcha().then((res: any) => {
+                if (res.code == 1) {
+                    formData.captcha_key = res.data.captcha_key
+                    formData.captcha_code = ''
+                    image.value = res.data.img.replace(/\r\n/g, '')
+                }
+            })
+        } catch (e) {
+        }
+    }
+
+    return {
+        image,
+        refresh
+    }
+}
diff --git a/web/composables/useLang.ts b/web/composables/useLang.ts
new file mode 100644
index 00000000..a66bcf08
--- /dev/null
+++ b/web/composables/useLang.ts
@@ -0,0 +1,10 @@
+import { useRoute } from 'vue-router'
+import Language from '~~/utils/language'
+
+export function t(message: string) {
+    const i18n = useNuxtApp().$getI18n()
+    const route = useRoute()
+    const file = new Language(i18n).getFileKey((route?.meta.addon || 'app'), route?.path || '')
+    const key = `${file}.${message}`
+    return i18n.global.t(key) != key ? i18n.global.t(key) : i18n.global.t(message)
+}
diff --git a/web/composables/useLogin.ts b/web/composables/useLogin.ts
new file mode 100644
index 00000000..e2ceef73
--- /dev/null
+++ b/web/composables/useLogin.ts
@@ -0,0 +1,29 @@
+import type { LocationQueryRaw } from 'vue-router'
+import storage from '@/utils/storage'
+
+export function useLogin() {
+    /**
+     * 设置登录返回页
+     */
+    const setLoginBack = (route: LocationQueryRaw) => {
+        storage.set({
+            key: 'loginBack',
+            data: {
+                path: route.path,
+                query: route.query
+            }
+        })
+    }
+
+    /**
+     * 执行登录后跳转
+     */
+    const handleLoginBack = (callbak:any) => {
+        if(callbak) callbak()
+    }
+
+    return {
+        setLoginBack,
+        handleLoginBack
+    }
+}
diff --git a/web/composables/useSendSms.ts b/web/composables/useSendSms.ts
new file mode 100644
index 00000000..a827304c
--- /dev/null
+++ b/web/composables/useSendSms.ts
@@ -0,0 +1,60 @@
+import { reactive, ref } from 'vue'
+import { sendSms } from '@/app/api/system'
+
+export function useSendSms() {
+    const canGetCode = ref(true),
+        text = ref(t('getSmsCode')),
+        seconds = ref(90);
+
+    let timer: number | undefined = undefined;
+
+    const send = async (param: requestMobileParam) => {
+        if (!canGetCode.value) return
+        canGetCode.value = false
+
+        let result: string | boolean = false
+        await sendSms(param).then((res: responseResult) => {
+            if (res.code == 1) {
+                start()
+                result = res.data.key
+            } else {
+                reset()
+                result = false
+            }
+        }).catch(() => {
+            result = false
+            reset()
+        })
+        return result
+    }
+
+    /**
+     * 开始
+     */
+    const start = () => {
+        timer = setInterval(() => {
+            if (seconds.value > 0) {
+                seconds.value -= 1
+                text.value = `${seconds.value}${t('smsCodeChangeText')}`
+            } else {
+                reset()
+            }
+        }, 1000)
+    }
+
+    /**
+     * 重置
+     */
+    const reset = () => {
+        clearInterval(timer)
+        seconds.value = 90
+        canGetCode.value = true
+        text.value = t('getSmsCode')
+    }
+
+    return {
+        send,
+        text,
+        canGetCode
+    }
+}
diff --git a/web/env/.env.dev b/web/env/.env.dev
new file mode 100644
index 00000000..b6f37edf
--- /dev/null
+++ b/web/env/.env.dev
@@ -0,0 +1,14 @@
+# api请求地址
+VITE_APP_BASE_URL=''
+
+# 图片服务器地址
+VITE_IMG_DOMAIN=''
+
+# 本地存储时token的参数名
+VITE_REQUEST_STORAGE_TOKEN_KEY='webToken'
+
+# 请求时header中token的参数名
+VITE_REQUEST_HEADER_TOKEN_KEY='token'
+
+# 请求时header中来源场景的参数名
+VITE_REQUEST_HEADER_CHANNEL_KEY='channel'
diff --git a/web/env/.env.product b/web/env/.env.product
new file mode 100644
index 00000000..b6f37edf
--- /dev/null
+++ b/web/env/.env.product
@@ -0,0 +1,14 @@
+# api请求地址
+VITE_APP_BASE_URL=''
+
+# 图片服务器地址
+VITE_IMG_DOMAIN=''
+
+# 本地存储时token的参数名
+VITE_REQUEST_STORAGE_TOKEN_KEY='webToken'
+
+# 请求时header中token的参数名
+VITE_REQUEST_HEADER_TOKEN_KEY='token'
+
+# 请求时header中来源场景的参数名
+VITE_REQUEST_HEADER_CHANNEL_KEY='channel'
diff --git a/web/lang/en/common.json b/web/lang/en/common.json
new file mode 100644
index 00000000..7a73a41b
--- /dev/null
+++ b/web/lang/en/common.json
@@ -0,0 +1,2 @@
+{
+}
\ No newline at end of file
diff --git a/web/lang/zh-cn/common.json b/web/lang/zh-cn/common.json
new file mode 100644
index 00000000..9d372634
--- /dev/null
+++ b/web/lang/zh-cn/common.json
@@ -0,0 +1,53 @@
+{
+    "login": "登录",
+    "register": "注册",
+    "getSmsCode": "获取短信验证码",
+    "smsCodeChangeText": "秒后重新获取",
+    "captchaTitle": "请先完成安全验证",
+    "logining": "登录中",
+    "usernamePlaceholder": "请输入账号",
+    "passwordPlaceholder": "请输入密码",
+    "resetpwd": "忘记密码",
+    "noAccount": "还没有账号",
+    "toRegister": "去注册",
+    "registering": "注册中",
+    "confirmPasswordPlaceholder": "请再次确认密码",
+    "confirmPasswordError": "两次输入的密码不一致",
+    "haveAccount": "已有账号",
+    "toLogin": "去登录",
+    "and": "和",
+    "registerAgreeTips": "注册代表您同意",
+    "usernameRegister": "账号注册",
+    "mobileRegister": "手机号注册",
+    "agreeTips": "请阅读并同意",
+    "isAgreeTips":"请先阅读并同意协议",
+    "usernameLogin": "密码登录",
+    "mobileLogin": "验证码登录",
+    "confirm": "确认",
+    "cancel": "取消",
+    "captchaPlaceholder": "请输入验证码",
+    "mobilePlaceholder": "请输入手机号码",
+    "mobileError": "请输入正确的手机号",
+    "codePlaceholder": "请输入手机验证码",
+    "userAgreement": "用户协议",
+    "privacyAgreement": "隐私协议",
+    "protocolNotConfigured": "未配置协议",
+    "siteClose": "站点已关闭",
+    "request": {
+        "unknownError": "未知错误",
+        "400": "错误的请求",
+        "401": "请重新登录",
+        "403": "拒绝访问",
+        "404": "请求错误",
+        "405": "请求方法未允许",
+        "408": "请求超时",
+        "409": "请求跨域",
+        "500": "服务器端出错，错误原因：",
+        "501": "网络未实现",
+        "502": "网络错误",
+        "503": "服务不可用",
+        "504": "网络超时",
+        "505": "http版本不支持该请求",
+        "timeout": "网络请求超时！"
+    }
+}
\ No newline at end of file
diff --git a/web/layouts/container.vue b/web/layouts/container.vue
new file mode 100644
index 00000000..4e45b546
--- /dev/null
+++ b/web/layouts/container.vue
@@ -0,0 +1,10 @@
+<template>
+    <el-container class="w-screen h-screen">
+        <slot />
+    </el-container>
+</template>
+
+<script lang="ts" setup>
+</script>
+
+<style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/web/layouts/default.vue b/web/layouts/default.vue
new file mode 100644
index 00000000..8c4f4d9b
--- /dev/null
+++ b/web/layouts/default.vue
@@ -0,0 +1,26 @@
+<template>
+    <el-container class="w-screen h-screen">
+        <el-header class="shadow z-1">
+            <layout-header />
+        </el-header>
+        <el-main class="p-0 min-w-[1200px]">
+            <slot></slot>
+            <layout-footer />
+        </el-main>
+    </el-container>
+</template>
+
+<script lang="ts" setup>
+import layoutHeader from './default/components/header/index.vue'
+import layoutFooter from './default/components/footer/index.vue'
+</script>
+
+<style lang="scss" scoped>
+.el-header {
+    --el-header-padding: 0;
+}
+
+.el-main {
+    --el-main-padding: 0;
+}
+</style>
diff --git a/web/layouts/default/components/error/index.vue b/web/layouts/default/components/error/index.vue
new file mode 100644
index 00000000..644d2268
--- /dev/null
+++ b/web/layouts/default/components/error/index.vue
@@ -0,0 +1,22 @@
+<template>
+    <div class="ml-[20px] min-h-[70vh] w-[1000px]  flex">
+        <div class="m-auto">
+            <div class="text-[#333] text-center text-[24px] mt-[35px] mb-[26px] ">请登录查看</div>
+            <div class="w-[100px] h-[40px] leading-[40px] border-[1px] border-solid border-[#ccc] rounded-full text-center text-[14px] mx-auto cursor-pointer" @click="handleLogin">登录</div>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+import {ref, computed,watch} from 'vue'
+import useMemberStore from '@/stores/member'
+
+const memberStore = useMemberStore()
+const handleLogin = ()=>{
+    memberStore.logOpen()
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/web/layouts/default/components/footer/index.vue b/web/layouts/default/components/footer/index.vue
new file mode 100644
index 00000000..ebf921aa
--- /dev/null
+++ b/web/layouts/default/components/footer/index.vue
@@ -0,0 +1,54 @@
+<template>
+    <div class="flex h-[220px] min-w-[1200px] bg-[#3F4045]">
+		<div class="mt-[70px] w-full">
+            <p class="text-center text-[#999]" v-if="friendlyLink.length">
+				<span>友情链接：</span>
+				<template v-for="(item,index) in friendlyLink" :key="index">
+					<NuxtLink :to="item.link_url" target="_blank">
+						<span>{{item.link_title}}</span>
+						<span class="mx-[10px] text-[#D9D9D9]"  v-if="(index + 1) != friendlyLink.length">|</span>
+					</NuxtLink>
+				</template>
+			</p>
+            <p class="text-center mt-[20px] text-[#999]" v-if="copyright">
+                <NuxtLink :to="copyright.gov_url" v-if="copyright.gov_record">
+                    <span class="mr-2">公安备案号:{{ copyright.gov_record }}</span>
+                </NuxtLink>
+				<NuxtLink to="https://beian.miit.gov.cn/" v-if="copyright.icp">
+					<span class="mr-2">备案号:{{ copyright.icp }}</span>
+				</NuxtLink>
+                <NuxtLink :to="copyright.copyright_link">
+                    <span class="mr-2" v-if="copyright.company_name">{{ copyright.company_name }}</span>
+                    <span class="mr-2" v-if="copyright.copyright_desc">©{{ copyright.copyright_desc }}</span>
+                </NuxtLink>
+			</p>
+        </div>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { getCopyRight } from '@/app/api/system';
+import { reactive, ref } from 'vue'
+import { getFriendlyLink } from '@/app/api/system'
+
+const copyright = ref(null);
+const getCopy = () => {
+    getCopyRight().then(({ data }) => {
+        copyright.value = data
+    })
+}
+getCopy()
+
+const friendlyLink = ref([]) // 格式：{ link_title: '', link_url: '' }
+
+const getFriendlyLinkFn = () =>{
+	getFriendlyLink().then((res:any) =>{
+		friendlyLink.value = res.data
+	})
+}
+getFriendlyLinkFn()
+</script>
+
+<style lang="scss" scoped>
+
+</style>
diff --git a/web/layouts/default/components/header/index.vue b/web/layouts/default/components/header/index.vue
new file mode 100644
index 00000000..7a7f0557
--- /dev/null
+++ b/web/layouts/default/components/header/index.vue
@@ -0,0 +1,109 @@
+<template>
+    <div class="flex h-full min-w-[1200px] bg-[#fff]">
+        <div class="flex items-center ml-[20px]">
+            <NuxtLink to="/">
+                <div class="w-[132px] mr-[10px]"><img src="@/assets/images/index/logo.jpg" /></div>
+            </NuxtLink>
+            <div class="hidden text-[14px] text-[#A6B0C8] xl:block">|<span class="ml-[10px]">一款快速开发多应用管理系统后台框架</span>
+            </div>
+        </div>
+
+        <div class="mx-auto flex-shrink">
+            <el-menu :default-active="appStore.route" class="h-full" mode="horizontal" :ellipsis="false" :router="true">
+                <el-menu-item index="/" route="/app/index">
+                    <span class="text-base mx-4">首页</span>
+                    <span></span>
+                </el-menu-item>
+                <el-menu-item index="bbs">
+                    <span class="text-base mx-4" @click.stop="openBbs">社区</span>
+                    <span></span>
+                </el-menu-item>
+            </el-menu>
+        </div>
+
+        <div class="flex items-center justify-end mr-[20px] ml-auto whitespace-pre-wrap">
+            <div v-if="info">
+                <NuxtLink to="/app/member/center">
+                    <span class="cursor-pointer">{{ info.nickname }}</span>
+                </NuxtLink>
+                <span class="mx-2">|</span>
+                <span class="cursor-pointer" @click="logoutFn">退出</span>
+            </div>
+            <el-button type="primary" link v-else @click="toLogin">{{ t('login') }} / {{ t('register') }}</el-button>
+        </div>
+        <LoadingDialog/>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import {  getToken } from '@/utils/common'
+import useMemberStore from '@/stores/member'
+import useAppStore from '@/stores/app'
+import useConfigStore from '@/stores/config'
+import LoadingDialog from '@/components/login-dialog/index.vue'
+
+const configStore = useConfigStore()
+const memberStore = useMemberStore()
+const info = computed(() => memberStore.info)
+
+const toLogin = () => {
+    if(!getToken() && !configStore.login.is_username && !configStore.login.is_mobile && !configStore.login.is_bind_mobile){
+        ElMessage.error('商家未开启普通账号登录注册')
+        return false
+    }
+    memberStore.logOpen()
+}
+const logoutFn = () => {
+    memberStore.logout()
+    navigateTo(`/app/index`)
+}
+
+const openBbs = () => {
+    window.open('https://www.niushop.com/bbs.html')
+}
+const appStore = useAppStore()
+</script>
+
+<style lang="scss" scoped>
+:deep(.el-menu--horizontal) {
+    border-bottom: none;
+}
+
+.el-menu-item {
+    padding-left: 0;
+    border: none !important;
+    color: #000 !important;
+
+    &.is-active {
+        border: none !important;
+        color: #000 !important;
+
+        span {
+            &:first-of-type {
+                position: relative;
+                z-index: 1;
+            }
+
+            &:last-of-type {
+                position: absolute;
+                width: 16px;
+                height: 16px;
+                background-image: linear-gradient(to bottom right, #FFFFFF, var(--el-color-primary));
+                border-radius: 100px;
+                bottom: 15px;
+                right: 27px;
+                z-index: 0;
+            }
+        }
+    }
+
+    &:hover {
+        background-color: transparent !important;
+        color: var(--el-menu-hover-text-color) !important;
+    }
+
+    &:focus {
+        background-color: transparent !important;
+    }
+}
+</style>
diff --git a/web/layouts/member.vue b/web/layouts/member.vue
new file mode 100644
index 00000000..4772d095
--- /dev/null
+++ b/web/layouts/member.vue
@@ -0,0 +1,44 @@
+<template>
+    <el-container class="w-screen h-screen">
+        <el-header>
+            <layout-header />
+        </el-header>
+        <el-main class="p-0 min-w-[1200px]">
+            <div class="bg-page pt-6 pb-6">
+                <div class="main-container flex justify-between">
+                    <sidebar></sidebar>
+                    <div v-if="agreeShow"><slot></slot></div>
+                    <div v-else><layout-error ></layout-error></div>
+                </div>
+            </div>
+        </el-main>
+    </el-container>
+</template>
+
+<script lang="ts" setup>
+import layoutHeader from './default/components/header/index.vue'
+import layoutError from './default/components/error/index.vue'
+import sidebar from '@/components/sidebar/index.vue'
+import { getToken } from '@/utils/common'
+import { useRouter } from 'vue-router'
+
+const router = useRouter()
+let agreeShow = ref(false)
+watch(()=> router.currentRoute.value.path ,(newValue)=>{
+    if(router.currentRoute.value.path == '/auth/agreement' || router.currentRoute.value.path == '/app/auth/agreement' || getToken() ){
+        agreeShow.value = true
+    }else{
+        agreeShow.value = false
+    }
+},{immediate:true,deep: true})
+</script>
+
+<style lang="scss" scoped>
+.el-header {
+    --el-header-padding: 0;
+}
+
+.el-main {
+    --el-main-padding: 0;
+}
+</style>
diff --git a/web/middleware/auth.ts b/web/middleware/auth.ts
new file mode 100644
index 00000000..7113fd65
--- /dev/null
+++ b/web/middleware/auth.ts
@@ -0,0 +1,12 @@
+
+import useAppStore from '@/stores/app'
+
+export default defineNuxtRouteMiddleware((to, from) => {
+    if (!getToken()) {
+        useAppStore().$patch(state => {
+            state.route = to.path
+        })
+        // useLogin().setLoginBack(to)
+        // return navigateTo('/auth/login')
+    }
+})
\ No newline at end of file
diff --git a/web/middleware/lang-load.global.ts b/web/middleware/lang-load.global.ts
new file mode 100644
index 00000000..5146bc1a
--- /dev/null
+++ b/web/middleware/lang-load.global.ts
@@ -0,0 +1,7 @@
+import useSystemStore from '~/stores/system'
+import Language from '~~/utils/language'
+
+export default defineNuxtRouteMiddleware((to, from) => {
+    const language = new Language(useNuxtApp().$getI18n())
+    language.loadLocaleMessages(to.meta.addon || 'app', to.path, useSystemStore().lang)
+})
diff --git a/web/nuxt.config.ts b/web/nuxt.config.ts
new file mode 100644
index 00000000..a8627959
--- /dev/null
+++ b/web/nuxt.config.ts
@@ -0,0 +1,31 @@
+// https://nuxt.com/docs/api/configuration/nuxt-config
+import { loadEnv } from 'vite'
+import topLevelAwait from 'vite-plugin-top-level-await'
+
+const envName = (process.env as any).npm_lifecycle_event == 'dev' ? 'dev' : 'product'
+const envData = loadEnv(envName, 'env')
+
+export default defineNuxtConfig({
+    app: {
+        baseURL: '/web/'
+    },
+    modules: [
+        '@element-plus/nuxt',
+        'nuxt-windicss'
+    ],
+    runtimeConfig: {
+        public: envData
+    },
+    vite: {
+        envDir: '~/env',
+        plugins: [
+            topLevelAwait({
+                // The export name of top-level await promise for each chunk module
+                promiseExportName: '__tla',
+                // The function to generate import names of top-level await promise in each chunk module
+                promiseImportName: i => `__tla_${i}`
+            }),
+        ]
+    },
+    ssr: false
+})
diff --git a/web/package-lock.json b/web/package-lock.json
new file mode 100644
index 00000000..aac0be1e
--- /dev/null
+++ b/web/package-lock.json
@@ -0,0 +1,8819 @@
+{
+    "name": "web",
+    "version": "1.0.0",
+    "lockfileVersion": 3,
+    "requires": true,
+    "packages": {
+        "": {
+            "name": "web",
+            "version": "1.0.0",
+            "hasInstallScript": true,
+            "dependencies": {
+                "@vueuse/core": "^9.13.0",
+                "aos": "^2.3.4",
+                "element-plus": "^2.3.2",
+                "pinia": "^2.0.33",
+                "qrcode": "^1.5.1",
+                "qs": "6.7.0",
+                "sass": "^1.60.0",
+                "swiper": "^11.1.15"
+            },
+            "devDependencies": {
+                "@element-plus/nuxt": "^1.0.4",
+                "@types/qrcode": "^1.5.0",
+                "nuxt": "^3.4.1",
+                "nuxt-windicss": "^2.6.0",
+                "sass": "^1.60.0",
+                "vite-plugin-top-level-await": "^1.3.1",
+                "vue-i18n": "^9.2.2"
+            }
+        },
+        "node_modules/@ampproject/remapping": {
+            "version": "2.2.0",
+            "resolved": "https://registry.npmmirror.com/@ampproject/remapping/-/remapping-2.2.0.tgz",
+            "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==",
+            "dev": true,
+            "dependencies": {
+                "@jridgewell/gen-mapping": "^0.1.0",
+                "@jridgewell/trace-mapping": "^0.3.9"
+            },
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
+        "node_modules/@antfu/utils": {
+            "version": "0.7.2",
+            "resolved": "https://registry.npmmirror.com/@antfu/utils/-/utils-0.7.2.tgz",
+            "integrity": "sha512-vy9fM3pIxZmX07dL+VX1aZe7ynZ+YyB0jY+jE6r3hOK6GNY2t6W8rzpFC4tgpbXUYABkFQwgJq2XYXlxbXAI0g==",
+            "dev": true
+        },
+        "node_modules/@babel/code-frame": {
+            "version": "7.21.4",
+            "resolved": "https://registry.npmmirror.com/@babel/code-frame/-/code-frame-7.21.4.tgz",
+            "integrity": "sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==",
+            "dev": true,
+            "dependencies": {
+                "@babel/highlight": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/compat-data": {
+            "version": "7.21.4",
+            "resolved": "https://registry.npmmirror.com/@babel/compat-data/-/compat-data-7.21.4.tgz",
+            "integrity": "sha512-/DYyDpeCfaVinT40FPGdkkb+lYSKvsVuMjDAG7jPOWWiM1ibOaB9CXJAlc4d1QpP/U2q2P9jbrSlClKSErd55g==",
+            "dev": true,
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/core": {
+            "version": "7.21.4",
+            "resolved": "https://registry.npmmirror.com/@babel/core/-/core-7.21.4.tgz",
+            "integrity": "sha512-qt/YV149Jman/6AfmlxJ04LMIu8bMoyl3RB91yTFrxQmgbrSvQMy7cI8Q62FHx1t8wJ8B5fu0UDoLwHAhUo1QA==",
+            "dev": true,
+            "dependencies": {
+                "@ampproject/remapping": "^2.2.0",
+                "@babel/code-frame": "^7.21.4",
+                "@babel/generator": "^7.21.4",
+                "@babel/helper-compilation-targets": "^7.21.4",
+                "@babel/helper-module-transforms": "^7.21.2",
+                "@babel/helpers": "^7.21.0",
+                "@babel/parser": "^7.21.4",
+                "@babel/template": "^7.20.7",
+                "@babel/traverse": "^7.21.4",
+                "@babel/types": "^7.21.4",
+                "convert-source-map": "^1.7.0",
+                "debug": "^4.1.0",
+                "gensync": "^1.0.0-beta.2",
+                "json5": "^2.2.2",
+                "semver": "^6.3.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/core/node_modules/semver": {
+            "version": "6.3.0",
+            "resolved": "https://registry.npmmirror.com/semver/-/semver-6.3.0.tgz",
+            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+            "dev": true,
+            "bin": {
+                "semver": "bin/semver.js"
+            }
+        },
+        "node_modules/@babel/generator": {
+            "version": "7.21.4",
+            "resolved": "https://registry.npmmirror.com/@babel/generator/-/generator-7.21.4.tgz",
+            "integrity": "sha512-NieM3pVIYW2SwGzKoqfPrQsf4xGs9M9AIG3ThppsSRmO+m7eQhmI6amajKMUeIO37wFfsvnvcxQFx6x6iqxDnA==",
+            "dev": true,
+            "dependencies": {
+                "@babel/types": "^7.21.4",
+                "@jridgewell/gen-mapping": "^0.3.2",
+                "@jridgewell/trace-mapping": "^0.3.17",
+                "jsesc": "^2.5.1"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/generator/node_modules/@jridgewell/gen-mapping": {
+            "version": "0.3.2",
+            "resolved": "https://registry.npmmirror.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
+            "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
+            "dev": true,
+            "dependencies": {
+                "@jridgewell/set-array": "^1.0.1",
+                "@jridgewell/sourcemap-codec": "^1.4.10",
+                "@jridgewell/trace-mapping": "^0.3.9"
+            },
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
+        "node_modules/@babel/helper-annotate-as-pure": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz",
+            "integrity": "sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==",
+            "dev": true,
+            "dependencies": {
+                "@babel/types": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-compilation-targets": {
+            "version": "7.21.4",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.21.4.tgz",
+            "integrity": "sha512-Fa0tTuOXZ1iL8IeDFUWCzjZcn+sJGd9RZdH9esYVjEejGmzf+FFYQpMi/kZUk2kPy/q1H3/GPw7np8qar/stfg==",
+            "dev": true,
+            "dependencies": {
+                "@babel/compat-data": "^7.21.4",
+                "@babel/helper-validator-option": "^7.21.0",
+                "browserslist": "^4.21.3",
+                "lru-cache": "^5.1.1",
+                "semver": "^6.3.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0"
+            }
+        },
+        "node_modules/@babel/helper-compilation-targets/node_modules/semver": {
+            "version": "6.3.0",
+            "resolved": "https://registry.npmmirror.com/semver/-/semver-6.3.0.tgz",
+            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+            "dev": true,
+            "bin": {
+                "semver": "bin/semver.js"
+            }
+        },
+        "node_modules/@babel/helper-create-class-features-plugin": {
+            "version": "7.21.4",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.21.4.tgz",
+            "integrity": "sha512-46QrX2CQlaFRF4TkwfTt6nJD7IHq8539cCL7SDpqWSDeJKY1xylKKY5F/33mJhLZ3mFvKv2gGrVS6NkyF6qs+Q==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-annotate-as-pure": "^7.18.6",
+                "@babel/helper-environment-visitor": "^7.18.9",
+                "@babel/helper-function-name": "^7.21.0",
+                "@babel/helper-member-expression-to-functions": "^7.21.0",
+                "@babel/helper-optimise-call-expression": "^7.18.6",
+                "@babel/helper-replace-supers": "^7.20.7",
+                "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0",
+                "@babel/helper-split-export-declaration": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0"
+            }
+        },
+        "node_modules/@babel/helper-environment-visitor": {
+            "version": "7.18.9",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz",
+            "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==",
+            "dev": true,
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-function-name": {
+            "version": "7.21.0",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz",
+            "integrity": "sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==",
+            "dev": true,
+            "dependencies": {
+                "@babel/template": "^7.20.7",
+                "@babel/types": "^7.21.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-hoist-variables": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz",
+            "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==",
+            "dev": true,
+            "dependencies": {
+                "@babel/types": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-member-expression-to-functions": {
+            "version": "7.21.0",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.21.0.tgz",
+            "integrity": "sha512-Muu8cdZwNN6mRRNG6lAYErJ5X3bRevgYR2O8wN0yn7jJSnGDu6eG59RfT29JHxGUovyfrh6Pj0XzmR7drNVL3Q==",
+            "dev": true,
+            "dependencies": {
+                "@babel/types": "^7.21.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-module-imports": {
+            "version": "7.21.4",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-module-imports/-/helper-module-imports-7.21.4.tgz",
+            "integrity": "sha512-orajc5T2PsRYUN3ZryCEFeMDYwyw09c/pZeaQEZPH0MpKzSvn3e0uXsDBu3k03VI+9DBiRo+l22BfKTpKwa/Wg==",
+            "dev": true,
+            "dependencies": {
+                "@babel/types": "^7.21.4"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-module-transforms": {
+            "version": "7.21.2",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz",
+            "integrity": "sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-environment-visitor": "^7.18.9",
+                "@babel/helper-module-imports": "^7.18.6",
+                "@babel/helper-simple-access": "^7.20.2",
+                "@babel/helper-split-export-declaration": "^7.18.6",
+                "@babel/helper-validator-identifier": "^7.19.1",
+                "@babel/template": "^7.20.7",
+                "@babel/traverse": "^7.21.2",
+                "@babel/types": "^7.21.2"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-optimise-call-expression": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz",
+            "integrity": "sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==",
+            "dev": true,
+            "dependencies": {
+                "@babel/types": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-plugin-utils": {
+            "version": "7.20.2",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz",
+            "integrity": "sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==",
+            "dev": true,
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-replace-supers": {
+            "version": "7.20.7",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-replace-supers/-/helper-replace-supers-7.20.7.tgz",
+            "integrity": "sha512-vujDMtB6LVfNW13jhlCrp48QNslK6JXi7lQG736HVbHz/mbf4Dc7tIRh1Xf5C0rF7BP8iiSxGMCmY6Ci1ven3A==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-environment-visitor": "^7.18.9",
+                "@babel/helper-member-expression-to-functions": "^7.20.7",
+                "@babel/helper-optimise-call-expression": "^7.18.6",
+                "@babel/template": "^7.20.7",
+                "@babel/traverse": "^7.20.7",
+                "@babel/types": "^7.20.7"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-simple-access": {
+            "version": "7.20.2",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz",
+            "integrity": "sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==",
+            "dev": true,
+            "dependencies": {
+                "@babel/types": "^7.20.2"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
+            "version": "7.20.0",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz",
+            "integrity": "sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg==",
+            "dev": true,
+            "dependencies": {
+                "@babel/types": "^7.20.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-split-export-declaration": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz",
+            "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==",
+            "dev": true,
+            "dependencies": {
+                "@babel/types": "^7.18.6"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-string-parser": {
+            "version": "7.19.4",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz",
+            "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==",
+            "dev": true,
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-validator-identifier": {
+            "version": "7.19.1",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
+            "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==",
+            "dev": true,
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helper-validator-option": {
+            "version": "7.21.0",
+            "resolved": "https://registry.npmmirror.com/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz",
+            "integrity": "sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ==",
+            "dev": true,
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/helpers": {
+            "version": "7.21.0",
+            "resolved": "https://registry.npmmirror.com/@babel/helpers/-/helpers-7.21.0.tgz",
+            "integrity": "sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA==",
+            "dev": true,
+            "dependencies": {
+                "@babel/template": "^7.20.7",
+                "@babel/traverse": "^7.21.0",
+                "@babel/types": "^7.21.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/highlight": {
+            "version": "7.18.6",
+            "resolved": "https://registry.npmmirror.com/@babel/highlight/-/highlight-7.18.6.tgz",
+            "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-validator-identifier": "^7.18.6",
+                "chalk": "^2.0.0",
+                "js-tokens": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/highlight/node_modules/ansi-styles": {
+            "version": "3.2.1",
+            "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-3.2.1.tgz",
+            "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+            "dev": true,
+            "dependencies": {
+                "color-convert": "^1.9.0"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/@babel/highlight/node_modules/chalk": {
+            "version": "2.4.2",
+            "resolved": "https://registry.npmmirror.com/chalk/-/chalk-2.4.2.tgz",
+            "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+            "dev": true,
+            "dependencies": {
+                "ansi-styles": "^3.2.1",
+                "escape-string-regexp": "^1.0.5",
+                "supports-color": "^5.3.0"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/@babel/highlight/node_modules/escape-string-regexp": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmmirror.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+            "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.8.0"
+            }
+        },
+        "node_modules/@babel/parser": {
+            "version": "7.21.4",
+            "resolved": "https://registry.npmmirror.com/@babel/parser/-/parser-7.21.4.tgz",
+            "integrity": "sha512-alVJj7k7zIxqBZ7BTRhz0IqJFxW1VJbm6N8JbcYhQ186df9ZBPbZBmWSqAMXwHGsCJdYks7z/voa3ibiS5bCIw==",
+            "bin": {
+                "parser": "bin/babel-parser.js"
+            },
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-jsx": {
+            "version": "7.21.4",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.21.4.tgz",
+            "integrity": "sha512-5hewiLct5OKyh6PLKEYaFclcqtIgCb6bmELouxjF6up5q3Sov7rOayW4RwhbaBL0dit8rA80GNfY+UuDp2mBbQ==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.20.2"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-syntax-typescript": {
+            "version": "7.21.4",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.21.4.tgz",
+            "integrity": "sha512-xz0D39NvhQn4t4RNsHmDnnsaQizIlUkdtYvLs8La1BlfjQ6JEwxkJGeqJMW2tAXx+q6H+WFuUTXNdYVpEya0YA==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.20.2"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-typescript": {
+            "version": "7.21.3",
+            "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.21.3.tgz",
+            "integrity": "sha512-RQxPz6Iqt8T0uw/WsJNReuBpWpBqs/n7mNo18sKLoTbMp+UrEekhH+pKSVC7gWz+DNjo9gryfV8YzCiT45RgMw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-annotate-as-pure": "^7.18.6",
+                "@babel/helper-create-class-features-plugin": "^7.21.0",
+                "@babel/helper-plugin-utils": "^7.20.2",
+                "@babel/plugin-syntax-typescript": "^7.20.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/standalone": {
+            "version": "7.21.3",
+            "resolved": "https://registry.npmmirror.com/@babel/standalone/-/standalone-7.21.3.tgz",
+            "integrity": "sha512-c8feJERTAHlBEvihQUWrnUMLg2GzrwSnE76WDyN3fRJWju10pHeRy8r3wniIq0q7zPLhHd71PQtFVsn1H+Qscw==",
+            "dev": true,
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/template": {
+            "version": "7.20.7",
+            "resolved": "https://registry.npmmirror.com/@babel/template/-/template-7.20.7.tgz",
+            "integrity": "sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/code-frame": "^7.18.6",
+                "@babel/parser": "^7.20.7",
+                "@babel/types": "^7.20.7"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/traverse": {
+            "version": "7.21.4",
+            "resolved": "https://registry.npmmirror.com/@babel/traverse/-/traverse-7.21.4.tgz",
+            "integrity": "sha512-eyKrRHKdyZxqDm+fV1iqL9UAHMoIg0nDaGqfIOd8rKH17m5snv7Gn4qgjBoFfLz9APvjFU/ICT00NVCv1Epp8Q==",
+            "dev": true,
+            "dependencies": {
+                "@babel/code-frame": "^7.21.4",
+                "@babel/generator": "^7.21.4",
+                "@babel/helper-environment-visitor": "^7.18.9",
+                "@babel/helper-function-name": "^7.21.0",
+                "@babel/helper-hoist-variables": "^7.18.6",
+                "@babel/helper-split-export-declaration": "^7.18.6",
+                "@babel/parser": "^7.21.4",
+                "@babel/types": "^7.21.4",
+                "debug": "^4.1.0",
+                "globals": "^11.1.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@babel/types": {
+            "version": "7.21.4",
+            "resolved": "https://registry.npmmirror.com/@babel/types/-/types-7.21.4.tgz",
+            "integrity": "sha512-rU2oY501qDxE8Pyo7i/Orqma4ziCOrby0/9mvbDUGEfvZjb279Nk9k19e2fiCxHbRRpY2ZyrgW1eq22mvmOIzA==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-string-parser": "^7.19.4",
+                "@babel/helper-validator-identifier": "^7.19.1",
+                "to-fast-properties": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/@cloudflare/kv-asset-handler": {
+            "version": "0.3.0",
+            "resolved": "https://registry.npmmirror.com/@cloudflare/kv-asset-handler/-/kv-asset-handler-0.3.0.tgz",
+            "integrity": "sha512-9CB/MKf/wdvbfkUdfrj+OkEwZ5b7rws0eogJ4293h+7b6KX5toPwym+VQKmILafNB9YiehqY0DlNrDcDhdWHSQ==",
+            "dev": true,
+            "dependencies": {
+                "mime": "^3.0.0"
+            }
+        },
+        "node_modules/@ctrl/tinycolor": {
+            "version": "3.6.0",
+            "resolved": "https://registry.npmmirror.com/@ctrl/tinycolor/-/tinycolor-3.6.0.tgz",
+            "integrity": "sha512-/Z3l6pXthq0JvMYdUFyX9j0MaCltlIn6mfh9jLyQwg5aPKxkyNa0PTHtU1AlFXLNk55ZuAeJRcpvq+tmLfKmaQ==",
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/@element-plus/icons-vue": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmmirror.com/@element-plus/icons-vue/-/icons-vue-2.1.0.tgz",
+            "integrity": "sha512-PSBn3elNoanENc1vnCfh+3WA9fimRC7n+fWkf3rE5jvv+aBohNHABC/KAR5KWPecxWxDTVT1ERpRbOMRcOV/vA==",
+            "peerDependencies": {
+                "vue": "^3.2.0"
+            }
+        },
+        "node_modules/@element-plus/nuxt": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmmirror.com/@element-plus/nuxt/-/nuxt-1.0.4.tgz",
+            "integrity": "sha512-GZICzxTJirJkoIqPXX9IvTi9iSL3KD6CHNljPQ6qLwV6Kn/jwPufyv/P3PXOyoeyTfmQoV2rqnR7froypLwM2Q==",
+            "dev": true,
+            "dependencies": {
+                "@nuxt/kit": "^3.0.0",
+                "magic-string": "^0.27.0",
+                "unplugin": "^1.0.1"
+            },
+            "peerDependencies": {
+                "@element-plus/icons-vue": ">=0.2.6",
+                "element-plus": ">=2"
+            }
+        },
+        "node_modules/@element-plus/nuxt/node_modules/magic-string": {
+            "version": "0.27.0",
+            "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.27.0.tgz",
+            "integrity": "sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==",
+            "dev": true,
+            "dependencies": {
+                "@jridgewell/sourcemap-codec": "^1.4.13"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/android-arm": {
+            "version": "0.17.17",
+            "resolved": "https://registry.npmmirror.com/@esbuild/android-arm/-/android-arm-0.17.17.tgz",
+            "integrity": "sha512-E6VAZwN7diCa3labs0GYvhEPL2M94WLF8A+czO8hfjREXxba8Ng7nM5VxV+9ihNXIY1iQO1XxUU4P7hbqbICxg==",
+            "cpu": [
+                "arm"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "android"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/android-arm64": {
+            "version": "0.17.17",
+            "resolved": "https://registry.npmmirror.com/@esbuild/android-arm64/-/android-arm64-0.17.17.tgz",
+            "integrity": "sha512-jaJ5IlmaDLFPNttv0ofcwy/cfeY4bh/n705Tgh+eLObbGtQBK3EPAu+CzL95JVE4nFAliyrnEu0d32Q5foavqg==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "android"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/android-x64": {
+            "version": "0.17.17",
+            "resolved": "https://registry.npmmirror.com/@esbuild/android-x64/-/android-x64-0.17.17.tgz",
+            "integrity": "sha512-446zpfJ3nioMC7ASvJB1pszHVskkw4u/9Eu8s5yvvsSDTzYh4p4ZIRj0DznSl3FBF0Z/mZfrKXTtt0QCoFmoHA==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "android"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/darwin-arm64": {
+            "version": "0.17.17",
+            "resolved": "https://registry.npmmirror.com/@esbuild/darwin-arm64/-/darwin-arm64-0.17.17.tgz",
+            "integrity": "sha512-m/gwyiBwH3jqfUabtq3GH31otL/0sE0l34XKpSIqR7NjQ/XHQ3lpmQHLHbG8AHTGCw8Ao059GvV08MS0bhFIJQ==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/darwin-x64": {
+            "version": "0.17.17",
+            "resolved": "https://registry.npmmirror.com/@esbuild/darwin-x64/-/darwin-x64-0.17.17.tgz",
+            "integrity": "sha512-4utIrsX9IykrqYaXR8ob9Ha2hAY2qLc6ohJ8c0CN1DR8yWeMrTgYFjgdeQ9LIoTOfLetXjuCu5TRPHT9yKYJVg==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/freebsd-arm64": {
+            "version": "0.17.17",
+            "resolved": "https://registry.npmmirror.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.17.tgz",
+            "integrity": "sha512-4PxjQII/9ppOrpEwzQ1b0pXCsFLqy77i0GaHodrmzH9zq2/NEhHMAMJkJ635Ns4fyJPFOlHMz4AsklIyRqFZWA==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "freebsd"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/freebsd-x64": {
+            "version": "0.17.17",
+            "resolved": "https://registry.npmmirror.com/@esbuild/freebsd-x64/-/freebsd-x64-0.17.17.tgz",
+            "integrity": "sha512-lQRS+4sW5S3P1sv0z2Ym807qMDfkmdhUYX30GRBURtLTrJOPDpoU0kI6pVz1hz3U0+YQ0tXGS9YWveQjUewAJw==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "freebsd"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/linux-arm": {
+            "version": "0.17.17",
+            "resolved": "https://registry.npmmirror.com/@esbuild/linux-arm/-/linux-arm-0.17.17.tgz",
+            "integrity": "sha512-biDs7bjGdOdcmIk6xU426VgdRUpGg39Yz6sT9Xp23aq+IEHDb/u5cbmu/pAANpDB4rZpY/2USPhCA+w9t3roQg==",
+            "cpu": [
+                "arm"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/linux-arm64": {
+            "version": "0.17.17",
+            "resolved": "https://registry.npmmirror.com/@esbuild/linux-arm64/-/linux-arm64-0.17.17.tgz",
+            "integrity": "sha512-2+pwLx0whKY1/Vqt8lyzStyda1v0qjJ5INWIe+d8+1onqQxHLLi3yr5bAa4gvbzhZqBztifYEu8hh1La5+7sUw==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/linux-ia32": {
+            "version": "0.17.17",
+            "resolved": "https://registry.npmmirror.com/@esbuild/linux-ia32/-/linux-ia32-0.17.17.tgz",
+            "integrity": "sha512-IBTTv8X60dYo6P2t23sSUYym8fGfMAiuv7PzJ+0LcdAndZRzvke+wTVxJeCq4WgjppkOpndL04gMZIFvwoU34Q==",
+            "cpu": [
+                "ia32"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/linux-loong64": {
+            "version": "0.17.17",
+            "resolved": "https://registry.npmmirror.com/@esbuild/linux-loong64/-/linux-loong64-0.17.17.tgz",
+            "integrity": "sha512-WVMBtcDpATjaGfWfp6u9dANIqmU9r37SY8wgAivuKmgKHE+bWSuv0qXEFt/p3qXQYxJIGXQQv6hHcm7iWhWjiw==",
+            "cpu": [
+                "loong64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/linux-mips64el": {
+            "version": "0.17.17",
+            "resolved": "https://registry.npmmirror.com/@esbuild/linux-mips64el/-/linux-mips64el-0.17.17.tgz",
+            "integrity": "sha512-2kYCGh8589ZYnY031FgMLy0kmE4VoGdvfJkxLdxP4HJvWNXpyLhjOvxVsYjYZ6awqY4bgLR9tpdYyStgZZhi2A==",
+            "cpu": [
+                "mips64el"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/linux-ppc64": {
+            "version": "0.17.17",
+            "resolved": "https://registry.npmmirror.com/@esbuild/linux-ppc64/-/linux-ppc64-0.17.17.tgz",
+            "integrity": "sha512-KIdG5jdAEeAKogfyMTcszRxy3OPbZhq0PPsW4iKKcdlbk3YE4miKznxV2YOSmiK/hfOZ+lqHri3v8eecT2ATwQ==",
+            "cpu": [
+                "ppc64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/linux-riscv64": {
+            "version": "0.17.17",
+            "resolved": "https://registry.npmmirror.com/@esbuild/linux-riscv64/-/linux-riscv64-0.17.17.tgz",
+            "integrity": "sha512-Cj6uWLBR5LWhcD/2Lkfg2NrkVsNb2sFM5aVEfumKB2vYetkA/9Uyc1jVoxLZ0a38sUhFk4JOVKH0aVdPbjZQeA==",
+            "cpu": [
+                "riscv64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/linux-s390x": {
+            "version": "0.17.17",
+            "resolved": "https://registry.npmmirror.com/@esbuild/linux-s390x/-/linux-s390x-0.17.17.tgz",
+            "integrity": "sha512-lK+SffWIr0XsFf7E0srBjhpkdFVJf3HEgXCwzkm69kNbRar8MhezFpkIwpk0qo2IOQL4JE4mJPJI8AbRPLbuOQ==",
+            "cpu": [
+                "s390x"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/linux-x64": {
+            "version": "0.17.17",
+            "resolved": "https://registry.npmmirror.com/@esbuild/linux-x64/-/linux-x64-0.17.17.tgz",
+            "integrity": "sha512-XcSGTQcWFQS2jx3lZtQi7cQmDYLrpLRyz1Ns1DzZCtn898cWfm5Icx/DEWNcTU+T+tyPV89RQtDnI7qL2PObPg==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/netbsd-x64": {
+            "version": "0.17.17",
+            "resolved": "https://registry.npmmirror.com/@esbuild/netbsd-x64/-/netbsd-x64-0.17.17.tgz",
+            "integrity": "sha512-RNLCDmLP5kCWAJR+ItLM3cHxzXRTe4N00TQyQiimq+lyqVqZWGPAvcyfUBM0isE79eEZhIuGN09rAz8EL5KdLA==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "netbsd"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/openbsd-x64": {
+            "version": "0.17.17",
+            "resolved": "https://registry.npmmirror.com/@esbuild/openbsd-x64/-/openbsd-x64-0.17.17.tgz",
+            "integrity": "sha512-PAXswI5+cQq3Pann7FNdcpSUrhrql3wKjj3gVkmuz6OHhqqYxKvi6GgRBoaHjaG22HV/ZZEgF9TlS+9ftHVigA==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "openbsd"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/sunos-x64": {
+            "version": "0.17.17",
+            "resolved": "https://registry.npmmirror.com/@esbuild/sunos-x64/-/sunos-x64-0.17.17.tgz",
+            "integrity": "sha512-V63egsWKnx/4V0FMYkr9NXWrKTB5qFftKGKuZKFIrAkO/7EWLFnbBZNM1CvJ6Sis+XBdPws2YQSHF1Gqf1oj/Q==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "sunos"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/win32-arm64": {
+            "version": "0.17.17",
+            "resolved": "https://registry.npmmirror.com/@esbuild/win32-arm64/-/win32-arm64-0.17.17.tgz",
+            "integrity": "sha512-YtUXLdVnd6YBSYlZODjWzH+KzbaubV0YVd6UxSfoFfa5PtNJNaW+1i+Hcmjpg2nEe0YXUCNF5bkKy1NnBv1y7Q==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/win32-ia32": {
+            "version": "0.17.17",
+            "resolved": "https://registry.npmmirror.com/@esbuild/win32-ia32/-/win32-ia32-0.17.17.tgz",
+            "integrity": "sha512-yczSLRbDdReCO74Yfc5tKG0izzm+lPMYyO1fFTcn0QNwnKmc3K+HdxZWLGKg4pZVte7XVgcFku7TIZNbWEJdeQ==",
+            "cpu": [
+                "ia32"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@esbuild/win32-x64": {
+            "version": "0.17.17",
+            "resolved": "https://registry.npmmirror.com/@esbuild/win32-x64/-/win32-x64-0.17.17.tgz",
+            "integrity": "sha512-FNZw7H3aqhF9OyRQbDDnzUApDXfC1N6fgBhkqEO2jvYCJ+DxMTfZVqg3AX0R1khg1wHTBRD5SdcibSJ+XF6bFg==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@floating-ui/core": {
+            "version": "1.2.5",
+            "resolved": "https://registry.npmmirror.com/@floating-ui/core/-/core-1.2.5.tgz",
+            "integrity": "sha512-qrcbyfnRVziRlB6IYwjCopYhO7Vud750JlJyuljruIXcPxr22y8zdckcJGsuOdnQ639uVD1tTXddrcH3t3QYIQ=="
+        },
+        "node_modules/@floating-ui/dom": {
+            "version": "1.2.5",
+            "resolved": "https://registry.npmmirror.com/@floating-ui/dom/-/dom-1.2.5.tgz",
+            "integrity": "sha512-+sAUfpQ3Frz+VCbPCqj+cZzvEESy3fjSeT/pDWkYCWOBXYNNKZfuVsHuv8/JO2zze8+Eb/Q7a6hZVgzS81fLbQ==",
+            "dependencies": {
+                "@floating-ui/core": "^1.2.4"
+            }
+        },
+        "node_modules/@intlify/core-base": {
+            "version": "9.2.2",
+            "resolved": "https://registry.npmmirror.com/@intlify/core-base/-/core-base-9.2.2.tgz",
+            "integrity": "sha512-JjUpQtNfn+joMbrXvpR4hTF8iJQ2sEFzzK3KIESOx+f+uwIjgw20igOyaIdhfsVVBCds8ZM64MoeNSx+PHQMkA==",
+            "dev": true,
+            "dependencies": {
+                "@intlify/devtools-if": "9.2.2",
+                "@intlify/message-compiler": "9.2.2",
+                "@intlify/shared": "9.2.2",
+                "@intlify/vue-devtools": "9.2.2"
+            },
+            "engines": {
+                "node": ">= 14"
+            }
+        },
+        "node_modules/@intlify/devtools-if": {
+            "version": "9.2.2",
+            "resolved": "https://registry.npmmirror.com/@intlify/devtools-if/-/devtools-if-9.2.2.tgz",
+            "integrity": "sha512-4ttr/FNO29w+kBbU7HZ/U0Lzuh2cRDhP8UlWOtV9ERcjHzuyXVZmjyleESK6eVP60tGC9QtQW9yZE+JeRhDHkg==",
+            "dev": true,
+            "dependencies": {
+                "@intlify/shared": "9.2.2"
+            },
+            "engines": {
+                "node": ">= 14"
+            }
+        },
+        "node_modules/@intlify/message-compiler": {
+            "version": "9.2.2",
+            "resolved": "https://registry.npmmirror.com/@intlify/message-compiler/-/message-compiler-9.2.2.tgz",
+            "integrity": "sha512-IUrQW7byAKN2fMBe8z6sK6riG1pue95e5jfokn8hA5Q3Bqy4MBJ5lJAofUsawQJYHeoPJ7svMDyBaVJ4d0GTtA==",
+            "dev": true,
+            "dependencies": {
+                "@intlify/shared": "9.2.2",
+                "source-map": "0.6.1"
+            },
+            "engines": {
+                "node": ">= 14"
+            }
+        },
+        "node_modules/@intlify/message-compiler/node_modules/source-map": {
+            "version": "0.6.1",
+            "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz",
+            "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/@intlify/shared": {
+            "version": "9.2.2",
+            "resolved": "https://registry.npmmirror.com/@intlify/shared/-/shared-9.2.2.tgz",
+            "integrity": "sha512-wRwTpsslgZS5HNyM7uDQYZtxnbI12aGiBZURX3BTR9RFIKKRWpllTsgzHWvj3HKm3Y2Sh5LPC1r0PDCKEhVn9Q==",
+            "dev": true,
+            "engines": {
+                "node": ">= 14"
+            }
+        },
+        "node_modules/@intlify/vue-devtools": {
+            "version": "9.2.2",
+            "resolved": "https://registry.npmmirror.com/@intlify/vue-devtools/-/vue-devtools-9.2.2.tgz",
+            "integrity": "sha512-+dUyqyCHWHb/UcvY1MlIpO87munedm3Gn6E9WWYdWrMuYLcoIoOEVDWSS8xSwtlPU+kA+MEQTP6Q1iI/ocusJg==",
+            "dev": true,
+            "dependencies": {
+                "@intlify/core-base": "9.2.2",
+                "@intlify/shared": "9.2.2"
+            },
+            "engines": {
+                "node": ">= 14"
+            }
+        },
+        "node_modules/@ioredis/commands": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmmirror.com/@ioredis/commands/-/commands-1.2.0.tgz",
+            "integrity": "sha512-Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg==",
+            "dev": true
+        },
+        "node_modules/@jridgewell/gen-mapping": {
+            "version": "0.1.1",
+            "resolved": "https://registry.npmmirror.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz",
+            "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==",
+            "dev": true,
+            "dependencies": {
+                "@jridgewell/set-array": "^1.0.0",
+                "@jridgewell/sourcemap-codec": "^1.4.10"
+            },
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
+        "node_modules/@jridgewell/resolve-uri": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmmirror.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
+            "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
+            "dev": true,
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
+        "node_modules/@jridgewell/set-array": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmmirror.com/@jridgewell/set-array/-/set-array-1.1.2.tgz",
+            "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
+            "dev": true,
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
+        "node_modules/@jridgewell/source-map": {
+            "version": "0.3.2",
+            "resolved": "https://registry.npmmirror.com/@jridgewell/source-map/-/source-map-0.3.2.tgz",
+            "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==",
+            "dev": true,
+            "dependencies": {
+                "@jridgewell/gen-mapping": "^0.3.0",
+                "@jridgewell/trace-mapping": "^0.3.9"
+            }
+        },
+        "node_modules/@jridgewell/source-map/node_modules/@jridgewell/gen-mapping": {
+            "version": "0.3.2",
+            "resolved": "https://registry.npmmirror.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
+            "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
+            "dev": true,
+            "dependencies": {
+                "@jridgewell/set-array": "^1.0.1",
+                "@jridgewell/sourcemap-codec": "^1.4.10",
+                "@jridgewell/trace-mapping": "^0.3.9"
+            },
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
+        "node_modules/@jridgewell/sourcemap-codec": {
+            "version": "1.4.14",
+            "resolved": "https://registry.npmmirror.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
+            "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
+            "dev": true
+        },
+        "node_modules/@jridgewell/trace-mapping": {
+            "version": "0.3.17",
+            "resolved": "https://registry.npmmirror.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz",
+            "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==",
+            "dev": true,
+            "dependencies": {
+                "@jridgewell/resolve-uri": "3.1.0",
+                "@jridgewell/sourcemap-codec": "1.4.14"
+            }
+        },
+        "node_modules/@mapbox/node-pre-gyp": {
+            "version": "1.0.10",
+            "resolved": "https://registry.npmmirror.com/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.10.tgz",
+            "integrity": "sha512-4ySo4CjzStuprMwk35H5pPbkymjv1SF3jGLj6rAHp/xT/RF7TL7bd9CTm1xDY49K2qF7jmR/g7k+SkLETP6opA==",
+            "dev": true,
+            "dependencies": {
+                "detect-libc": "^2.0.0",
+                "https-proxy-agent": "^5.0.0",
+                "make-dir": "^3.1.0",
+                "node-fetch": "^2.6.7",
+                "nopt": "^5.0.0",
+                "npmlog": "^5.0.1",
+                "rimraf": "^3.0.2",
+                "semver": "^7.3.5",
+                "tar": "^6.1.11"
+            },
+            "bin": {
+                "node-pre-gyp": "bin/node-pre-gyp"
+            }
+        },
+        "node_modules/@mapbox/node-pre-gyp/node_modules/node-fetch": {
+            "version": "2.6.9",
+            "resolved": "https://registry.npmmirror.com/node-fetch/-/node-fetch-2.6.9.tgz",
+            "integrity": "sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==",
+            "dev": true,
+            "dependencies": {
+                "whatwg-url": "^5.0.0"
+            },
+            "engines": {
+                "node": "4.x || >=6.0.0"
+            },
+            "peerDependencies": {
+                "encoding": "^0.1.0"
+            },
+            "peerDependenciesMeta": {
+                "encoding": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@netlify/functions": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmmirror.com/@netlify/functions/-/functions-1.4.0.tgz",
+            "integrity": "sha512-gy7ULTIRroc2/jyFVGx1djCmmBMVisIwrvkqggq5B6iDcInRSy2Tpkm+V5C63hKJVkNRskKWtLQKm9ecCaQTjA==",
+            "dev": true,
+            "dependencies": {
+                "is-promise": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8.3.0"
+            }
+        },
+        "node_modules/@nodelib/fs.scandir": {
+            "version": "2.1.5",
+            "resolved": "https://registry.npmmirror.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+            "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+            "dev": true,
+            "dependencies": {
+                "@nodelib/fs.stat": "2.0.5",
+                "run-parallel": "^1.1.9"
+            },
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/@nodelib/fs.stat": {
+            "version": "2.0.5",
+            "resolved": "https://registry.npmmirror.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+            "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+            "dev": true,
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/@nodelib/fs.walk": {
+            "version": "1.2.8",
+            "resolved": "https://registry.npmmirror.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+            "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+            "dev": true,
+            "dependencies": {
+                "@nodelib/fs.scandir": "2.1.5",
+                "fastq": "^1.6.0"
+            },
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/@nuxt/devalue": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/@nuxt/devalue/-/devalue-2.0.0.tgz",
+            "integrity": "sha512-YBI/6o2EBz02tdEJRBK8xkt3zvOFOWlLBf7WKYGBsSYSRtjjgrqPe2skp6VLLmKx5WbHHDNcW+6oACaurxGzeA==",
+            "dev": true
+        },
+        "node_modules/@nuxt/kit": {
+            "version": "3.4.1",
+            "resolved": "https://registry.npmmirror.com/@nuxt/kit/-/kit-3.4.1.tgz",
+            "integrity": "sha512-VeH26umZW6Rf4F1QX9nTIuTBp6HeL/MgmKY3+FgQiLD07afgFTLUJZohVE5xU7hb66zCnYvwKxa3JpjXFJZrhQ==",
+            "dev": true,
+            "dependencies": {
+                "@nuxt/schema": "3.4.1",
+                "c12": "^1.2.0",
+                "consola": "^3.0.1",
+                "defu": "^6.1.2",
+                "globby": "^13.1.4",
+                "hash-sum": "^2.0.0",
+                "ignore": "^5.2.4",
+                "jiti": "^1.18.2",
+                "knitwork": "^1.0.0",
+                "lodash.template": "^4.5.0",
+                "mlly": "^1.2.0",
+                "pathe": "^1.1.0",
+                "pkg-types": "^1.0.2",
+                "scule": "^1.0.0",
+                "semver": "^7.4.0",
+                "unctx": "^2.2.0",
+                "unimport": "^3.0.6",
+                "untyped": "^1.3.2"
+            },
+            "engines": {
+                "node": "^14.18.0 || ^16.10.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+            }
+        },
+        "node_modules/@nuxt/kit/node_modules/consola": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmmirror.com/consola/-/consola-3.0.2.tgz",
+            "integrity": "sha512-o/Wau2FmZKiQgyp3c3IULgN6J5yc0lwYMnoyiZdEpdGxKGBtt2ACbkulBZ6BUsHy1HlSJqoP4YOyPIJLgRJyKQ==",
+            "dev": true
+        },
+        "node_modules/@nuxt/schema": {
+            "version": "3.4.1",
+            "resolved": "https://registry.npmmirror.com/@nuxt/schema/-/schema-3.4.1.tgz",
+            "integrity": "sha512-xhPh9JfVKXRQVfdUT6BKieDTCljBjbIGgGCQnxplVi4FUTWRKUXR7MFwsobr5D9AJpeE0mg5/kRRh5gUX37vAQ==",
+            "dev": true,
+            "dependencies": {
+                "c12": "^1.2.0",
+                "create-require": "^1.1.1",
+                "defu": "^6.1.2",
+                "hookable": "^5.5.3",
+                "jiti": "^1.18.2",
+                "pathe": "^1.1.0",
+                "pkg-types": "^1.0.2",
+                "postcss-import-resolver": "^2.0.0",
+                "scule": "^1.0.0",
+                "std-env": "^3.3.2",
+                "ufo": "^1.1.1",
+                "unimport": "^3.0.6",
+                "untyped": "^1.3.2"
+            },
+            "engines": {
+                "node": "^14.18.0 || ^16.10.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+            }
+        },
+        "node_modules/@nuxt/telemetry": {
+            "version": "2.2.0",
+            "resolved": "https://registry.npmmirror.com/@nuxt/telemetry/-/telemetry-2.2.0.tgz",
+            "integrity": "sha512-Z2UmPkBy5WjxvHKuUcl1X6vKWnIyWSP+9UGde1F+MzzZxYgAQybFud1uL2B3KCowxZdoqT1hd2WklV7EtyCwrQ==",
+            "dev": true,
+            "dependencies": {
+                "@nuxt/kit": "^3.3.3",
+                "chalk": "^5.2.0",
+                "ci-info": "^3.8.0",
+                "consola": "^3.0.1",
+                "create-require": "^1.1.1",
+                "defu": "^6.1.2",
+                "destr": "^1.2.2",
+                "dotenv": "^16.0.3",
+                "fs-extra": "^10.1.0",
+                "git-url-parse": "^13.1.0",
+                "inquirer": "^9.1.5",
+                "is-docker": "^3.0.0",
+                "jiti": "^1.18.2",
+                "mri": "^1.2.0",
+                "nanoid": "^4.0.2",
+                "node-fetch": "^3.3.1",
+                "ofetch": "^1.0.1",
+                "parse-git-config": "^3.0.0",
+                "rc9": "^2.1.0",
+                "std-env": "^3.3.2"
+            },
+            "bin": {
+                "nuxt-telemetry": "bin/nuxt-telemetry.mjs"
+            }
+        },
+        "node_modules/@nuxt/telemetry/node_modules/consola": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmmirror.com/consola/-/consola-3.0.2.tgz",
+            "integrity": "sha512-o/Wau2FmZKiQgyp3c3IULgN6J5yc0lwYMnoyiZdEpdGxKGBtt2ACbkulBZ6BUsHy1HlSJqoP4YOyPIJLgRJyKQ==",
+            "dev": true
+        },
+        "node_modules/@nuxt/telemetry/node_modules/fs-extra": {
+            "version": "10.1.0",
+            "resolved": "https://registry.npmmirror.com/fs-extra/-/fs-extra-10.1.0.tgz",
+            "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+            "dev": true,
+            "dependencies": {
+                "graceful-fs": "^4.2.0",
+                "jsonfile": "^6.0.1",
+                "universalify": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@nuxt/ui-templates": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmmirror.com/@nuxt/ui-templates/-/ui-templates-1.1.1.tgz",
+            "integrity": "sha512-PjVETP7+iZXAs5Q8O4ivl4t6qjWZMZqwiTVogUXHoHGZZcw7GZW3u3tzfYfE1HbzyYJfr236IXqQ02MeR8Fz2w==",
+            "dev": true
+        },
+        "node_modules/@nuxt/vite-builder": {
+            "version": "3.4.1",
+            "resolved": "https://registry.npmmirror.com/@nuxt/vite-builder/-/vite-builder-3.4.1.tgz",
+            "integrity": "sha512-qqS+hUv91z58vLNEorP4xfyvo/uoteTCYaMouyRZzqnJhrE/G82x2SqdzfADEhKpNHUkGWhpc37uuejrM+y6qw==",
+            "dev": true,
+            "dependencies": {
+                "@nuxt/kit": "3.4.1",
+                "@rollup/plugin-replace": "^5.0.2",
+                "@vitejs/plugin-vue": "^4.1.0",
+                "@vitejs/plugin-vue-jsx": "^3.0.1",
+                "autoprefixer": "^10.4.14",
+                "chokidar": "^3.5.3",
+                "clear": "^0.1.0",
+                "cssnano": "^6.0.0",
+                "defu": "^6.1.2",
+                "esbuild": "^0.17.16",
+                "escape-string-regexp": "^5.0.0",
+                "estree-walker": "^3.0.3",
+                "externality": "^1.0.0",
+                "fs-extra": "^11.1.1",
+                "get-port-please": "^3.0.1",
+                "h3": "^1.6.4",
+                "knitwork": "^1.0.0",
+                "magic-string": "^0.30.0",
+                "mlly": "^1.2.0",
+                "ohash": "^1.0.0",
+                "pathe": "^1.1.0",
+                "perfect-debounce": "^0.1.3",
+                "pkg-types": "^1.0.2",
+                "postcss": "^8.4.21",
+                "postcss-import": "^15.1.0",
+                "postcss-url": "^10.1.3",
+                "rollup-plugin-visualizer": "^5.9.0",
+                "std-env": "^3.3.2",
+                "strip-literal": "^1.0.1",
+                "ufo": "^1.1.1",
+                "unplugin": "^1.3.1",
+                "vite": "~4.2.1",
+                "vite-node": "^0.30.1",
+                "vite-plugin-checker": "^0.5.6",
+                "vue-bundle-renderer": "^1.0.3"
+            },
+            "engines": {
+                "node": "^14.18.0 || ^16.10.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+            },
+            "peerDependencies": {
+                "vue": "^3.2.47"
+            }
+        },
+        "node_modules/@polka/url": {
+            "version": "1.0.0-next.21",
+            "resolved": "https://registry.npmmirror.com/@polka/url/-/url-1.0.0-next.21.tgz",
+            "integrity": "sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==",
+            "dev": true
+        },
+        "node_modules/@popperjs/core": {
+            "name": "@sxzz/popperjs-es",
+            "version": "2.11.7",
+            "resolved": "https://registry.npmmirror.com/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz",
+            "integrity": "sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ=="
+        },
+        "node_modules/@rollup/plugin-alias": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmmirror.com/@rollup/plugin-alias/-/plugin-alias-5.0.0.tgz",
+            "integrity": "sha512-l9hY5chSCjuFRPsnRm16twWBiSApl2uYFLsepQYwtBuAxNMQ/1dJqADld40P0Jkqm65GRTLy/AC6hnpVebtLsA==",
+            "dev": true,
+            "dependencies": {
+                "slash": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            },
+            "peerDependencies": {
+                "rollup": "^1.20.0||^2.0.0||^3.0.0"
+            },
+            "peerDependenciesMeta": {
+                "rollup": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@rollup/plugin-commonjs": {
+            "version": "24.1.0",
+            "resolved": "https://registry.npmmirror.com/@rollup/plugin-commonjs/-/plugin-commonjs-24.1.0.tgz",
+            "integrity": "sha512-eSL45hjhCWI0jCCXcNtLVqM5N1JlBGvlFfY0m6oOYnLCJ6N0qEXoZql4sY2MOUArzhH4SA/qBpTxvvZp2Sc+DQ==",
+            "dev": true,
+            "dependencies": {
+                "@rollup/pluginutils": "^5.0.1",
+                "commondir": "^1.0.1",
+                "estree-walker": "^2.0.2",
+                "glob": "^8.0.3",
+                "is-reference": "1.2.1",
+                "magic-string": "^0.27.0"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            },
+            "peerDependencies": {
+                "rollup": "^2.68.0||^3.0.0"
+            },
+            "peerDependenciesMeta": {
+                "rollup": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@rollup/plugin-commonjs/node_modules/estree-walker": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmmirror.com/estree-walker/-/estree-walker-2.0.2.tgz",
+            "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
+            "dev": true
+        },
+        "node_modules/@rollup/plugin-commonjs/node_modules/magic-string": {
+            "version": "0.27.0",
+            "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.27.0.tgz",
+            "integrity": "sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==",
+            "dev": true,
+            "dependencies": {
+                "@jridgewell/sourcemap-codec": "^1.4.13"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@rollup/plugin-inject": {
+            "version": "5.0.3",
+            "resolved": "https://registry.npmmirror.com/@rollup/plugin-inject/-/plugin-inject-5.0.3.tgz",
+            "integrity": "sha512-411QlbL+z2yXpRWFXSmw/teQRMkXcAAC8aYTemc15gwJRpvEVDQwoe+N/HTFD8RFG8+88Bme9DK2V9CVm7hJdA==",
+            "dev": true,
+            "dependencies": {
+                "@rollup/pluginutils": "^5.0.1",
+                "estree-walker": "^2.0.2",
+                "magic-string": "^0.27.0"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            },
+            "peerDependencies": {
+                "rollup": "^1.20.0||^2.0.0||^3.0.0"
+            },
+            "peerDependenciesMeta": {
+                "rollup": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@rollup/plugin-inject/node_modules/estree-walker": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmmirror.com/estree-walker/-/estree-walker-2.0.2.tgz",
+            "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
+            "dev": true
+        },
+        "node_modules/@rollup/plugin-inject/node_modules/magic-string": {
+            "version": "0.27.0",
+            "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.27.0.tgz",
+            "integrity": "sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==",
+            "dev": true,
+            "dependencies": {
+                "@jridgewell/sourcemap-codec": "^1.4.13"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@rollup/plugin-json": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmmirror.com/@rollup/plugin-json/-/plugin-json-6.0.0.tgz",
+            "integrity": "sha512-i/4C5Jrdr1XUarRhVu27EEwjt4GObltD7c+MkCIpO2QIbojw8MUs+CCTqOphQi3Qtg1FLmYt+l+6YeoIf51J7w==",
+            "dev": true,
+            "dependencies": {
+                "@rollup/pluginutils": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            },
+            "peerDependencies": {
+                "rollup": "^1.20.0||^2.0.0||^3.0.0"
+            },
+            "peerDependenciesMeta": {
+                "rollup": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@rollup/plugin-node-resolve": {
+            "version": "15.0.2",
+            "resolved": "https://registry.npmmirror.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.0.2.tgz",
+            "integrity": "sha512-Y35fRGUjC3FaurG722uhUuG8YHOJRJQbI6/CkbRkdPotSpDj9NtIN85z1zrcyDcCQIW4qp5mgG72U+gJ0TAFEg==",
+            "dev": true,
+            "dependencies": {
+                "@rollup/pluginutils": "^5.0.1",
+                "@types/resolve": "1.20.2",
+                "deepmerge": "^4.2.2",
+                "is-builtin-module": "^3.2.1",
+                "is-module": "^1.0.0",
+                "resolve": "^1.22.1"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            },
+            "peerDependencies": {
+                "rollup": "^2.78.0||^3.0.0"
+            },
+            "peerDependenciesMeta": {
+                "rollup": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@rollup/plugin-replace": {
+            "version": "5.0.2",
+            "resolved": "https://registry.npmmirror.com/@rollup/plugin-replace/-/plugin-replace-5.0.2.tgz",
+            "integrity": "sha512-M9YXNekv/C/iHHK+cvORzfRYfPbq0RDD8r0G+bMiTXjNGKulPnCT9O3Ss46WfhI6ZOCgApOP7xAdmCQJ+U2LAA==",
+            "dev": true,
+            "dependencies": {
+                "@rollup/pluginutils": "^5.0.1",
+                "magic-string": "^0.27.0"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            },
+            "peerDependencies": {
+                "rollup": "^1.20.0||^2.0.0||^3.0.0"
+            },
+            "peerDependenciesMeta": {
+                "rollup": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@rollup/plugin-replace/node_modules/magic-string": {
+            "version": "0.27.0",
+            "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.27.0.tgz",
+            "integrity": "sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==",
+            "dev": true,
+            "dependencies": {
+                "@jridgewell/sourcemap-codec": "^1.4.13"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@rollup/plugin-terser": {
+            "version": "0.4.1",
+            "resolved": "https://registry.npmmirror.com/@rollup/plugin-terser/-/plugin-terser-0.4.1.tgz",
+            "integrity": "sha512-aKS32sw5a7hy+fEXVy+5T95aDIwjpGHCTv833HXVtyKMDoVS7pBr5K3L9hEQoNqbJFjfANPrNpIXlTQ7is00eA==",
+            "dev": true,
+            "dependencies": {
+                "serialize-javascript": "^6.0.0",
+                "smob": "^0.0.6",
+                "terser": "^5.15.1"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            },
+            "peerDependencies": {
+                "rollup": "^2.x || ^3.x"
+            },
+            "peerDependenciesMeta": {
+                "rollup": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@rollup/plugin-virtual": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmmirror.com/@rollup/plugin-virtual/-/plugin-virtual-3.0.2.tgz",
+            "integrity": "sha512-10monEYsBp3scM4/ND4LNH5Rxvh3e/cVeL3jWTgZ2SrQ+BmUoQcopVQvnaMcOnykb1VkxUFuDAN+0FnpTFRy2A==",
+            "dev": true,
+            "engines": {
+                "node": ">=14.0.0"
+            },
+            "peerDependencies": {
+                "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0"
+            },
+            "peerDependenciesMeta": {
+                "rollup": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@rollup/plugin-wasm": {
+            "version": "6.1.2",
+            "resolved": "https://registry.npmmirror.com/@rollup/plugin-wasm/-/plugin-wasm-6.1.2.tgz",
+            "integrity": "sha512-YdrQ7zfnZ54Y+6raCev3tR1PrhQGxYKSTajGylhyP0oBacouuNo6KcNCk+pYKw9M98jxRWLFFca/udi76IDXzg==",
+            "dev": true,
+            "engines": {
+                "node": ">=14.0.0"
+            },
+            "peerDependencies": {
+                "rollup": "^1.20.0||^2.0.0||^3.0.0"
+            },
+            "peerDependenciesMeta": {
+                "rollup": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@rollup/pluginutils": {
+            "version": "5.0.2",
+            "resolved": "https://registry.npmmirror.com/@rollup/pluginutils/-/pluginutils-5.0.2.tgz",
+            "integrity": "sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA==",
+            "dev": true,
+            "dependencies": {
+                "@types/estree": "^1.0.0",
+                "estree-walker": "^2.0.2",
+                "picomatch": "^2.3.1"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            },
+            "peerDependencies": {
+                "rollup": "^1.20.0||^2.0.0||^3.0.0"
+            },
+            "peerDependenciesMeta": {
+                "rollup": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@rollup/pluginutils/node_modules/estree-walker": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmmirror.com/estree-walker/-/estree-walker-2.0.2.tgz",
+            "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
+            "dev": true
+        },
+        "node_modules/@swc/core": {
+            "version": "1.3.105",
+            "resolved": "https://registry.npmmirror.com/@swc/core/-/core-1.3.105.tgz",
+            "integrity": "sha512-me2VZyr3OjqRpFrYQJJYy7x/zbFSl9nt+MAGnIcBtjDsN00iTVqEaKxBjPBFQV9BDAgPz2SRWes/DhhVm5SmMw==",
+            "dev": true,
+            "hasInstallScript": true,
+            "dependencies": {
+                "@swc/counter": "^0.1.1",
+                "@swc/types": "^0.1.5"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "optionalDependencies": {
+                "@swc/core-darwin-arm64": "1.3.105",
+                "@swc/core-darwin-x64": "1.3.105",
+                "@swc/core-linux-arm-gnueabihf": "1.3.105",
+                "@swc/core-linux-arm64-gnu": "1.3.105",
+                "@swc/core-linux-arm64-musl": "1.3.105",
+                "@swc/core-linux-x64-gnu": "1.3.105",
+                "@swc/core-linux-x64-musl": "1.3.105",
+                "@swc/core-win32-arm64-msvc": "1.3.105",
+                "@swc/core-win32-ia32-msvc": "1.3.105",
+                "@swc/core-win32-x64-msvc": "1.3.105"
+            },
+            "peerDependencies": {
+                "@swc/helpers": "^0.5.0"
+            },
+            "peerDependenciesMeta": {
+                "@swc/helpers": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@swc/core-darwin-arm64": {
+            "version": "1.3.105",
+            "resolved": "https://registry.npmmirror.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.105.tgz",
+            "integrity": "sha512-buWeweLVDXXmcnfIemH4PGnpjwsDTUGitnPchdftb0u1FU8zSSP/lw/pUCBDG/XvWAp7c/aFxgN4CyG0j7eayA==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/@swc/core-darwin-x64": {
+            "version": "1.3.105",
+            "resolved": "https://registry.npmmirror.com/@swc/core-darwin-x64/-/core-darwin-x64-1.3.105.tgz",
+            "integrity": "sha512-hFmXPApqjA/8sy/9NpljHVaKi1OvL9QkJ2MbbTCCbJERuHMpMUeMBUWipHRfepGHFhU+9B9zkEup/qJaJR4XIg==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/@swc/core-linux-arm-gnueabihf": {
+            "version": "1.3.105",
+            "resolved": "https://registry.npmmirror.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.105.tgz",
+            "integrity": "sha512-mwXyMC41oMKkKrPpL8uJpOxw7fyfQoVtIw3Y5p0Blabk+espNYqix0E8VymHdRKuLmM//z5wVmMsuHdGBHvZeg==",
+            "cpu": [
+                "arm"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/@swc/core-linux-arm64-gnu": {
+            "version": "1.3.105",
+            "resolved": "https://registry.npmmirror.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.105.tgz",
+            "integrity": "sha512-H7yEIVydnUtqBSUxwmO6vpIQn7j+Rr0DF6ZOORPyd/SFzQJK9cJRtmJQ3ZMzlJ1Bb+1gr3MvjgLEnmyCYEm2Hg==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/@swc/core-linux-arm64-musl": {
+            "version": "1.3.105",
+            "resolved": "https://registry.npmmirror.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.105.tgz",
+            "integrity": "sha512-Jg7RTFT3pGFdGt5elPV6oDkinRy7q9cXpenjXnJnM2uvx3jOwnsAhexPyCDHom8SHL0j+9kaLLC66T3Gz1E4UA==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/@swc/core-linux-x64-gnu": {
+            "version": "1.3.105",
+            "resolved": "https://registry.npmmirror.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.105.tgz",
+            "integrity": "sha512-DJghplpyusAmp1X5pW/y93MmS/u83Sx5GrpJxI6KLPa82+NItTgMcl8KBQmW5GYAJpVKZyaIvBanS5TdR8aN2w==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/@swc/core-linux-x64-musl": {
+            "version": "1.3.105",
+            "resolved": "https://registry.npmmirror.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.105.tgz",
+            "integrity": "sha512-wD5jL2dZH/5nPNssBo6jhOvkI0lmWnVR4vnOXWjuXgjq1S0AJpO5jdre/6pYLmf26hft3M42bteDnjR4AAZ38w==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/@swc/core-win32-arm64-msvc": {
+            "version": "1.3.105",
+            "resolved": "https://registry.npmmirror.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.105.tgz",
+            "integrity": "sha512-UqJtwILUHRw2+3UTPnRkZrzM/bGdQtbR4UFdp79mZQYfryeOUVNg7aJj/bWUTkKtLiZ3o+FBNrM/x2X1mJX5bA==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/@swc/core-win32-ia32-msvc": {
+            "version": "1.3.105",
+            "resolved": "https://registry.npmmirror.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.105.tgz",
+            "integrity": "sha512-Z95C6vZgBEJ1snidYyjVKnVWiy/ZpPiIFIXGWkDr4ZyBgL3eZX12M6LzZ+NApHKffrbO4enbFyFomueBQgS2oA==",
+            "cpu": [
+                "ia32"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/@swc/core-win32-x64-msvc": {
+            "version": "1.3.105",
+            "resolved": "https://registry.npmmirror.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.105.tgz",
+            "integrity": "sha512-3J8fkyDPFsS3mszuYUY4Wfk7/B2oio9qXUwF3DzOs2MK+XgdyMLIptIxL7gdfitXJBH8k39uVjrIw1JGJDjyFA==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/@swc/counter": {
+            "version": "0.1.2",
+            "resolved": "https://registry.npmmirror.com/@swc/counter/-/counter-0.1.2.tgz",
+            "integrity": "sha512-9F4ys4C74eSTEUNndnER3VJ15oru2NumfQxS8geE+f3eB5xvfxpWyqE5XlVnxb/R14uoXi6SLbBwwiDSkv+XEw==",
+            "dev": true
+        },
+        "node_modules/@swc/types": {
+            "version": "0.1.5",
+            "resolved": "https://registry.npmmirror.com/@swc/types/-/types-0.1.5.tgz",
+            "integrity": "sha512-myfUej5naTBWnqOCc/MdVOLVjXUXtIA+NpDrDBKJtLLg2shUjBu3cZmB/85RyitKc55+lUUyl7oRfLOvkr2hsw==",
+            "dev": true
+        },
+        "node_modules/@trysound/sax": {
+            "version": "0.2.0",
+            "resolved": "https://registry.npmmirror.com/@trysound/sax/-/sax-0.2.0.tgz",
+            "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==",
+            "dev": true,
+            "engines": {
+                "node": ">=10.13.0"
+            }
+        },
+        "node_modules/@types/estree": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmmirror.com/@types/estree/-/estree-1.0.0.tgz",
+            "integrity": "sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==",
+            "dev": true
+        },
+        "node_modules/@types/lodash": {
+            "version": "4.14.192",
+            "resolved": "https://registry.npmmirror.com/@types/lodash/-/lodash-4.14.192.tgz",
+            "integrity": "sha512-km+Vyn3BYm5ytMO13k9KTp27O75rbQ0NFw+U//g+PX7VZyjCioXaRFisqSIJRECljcTv73G3i6BpglNGHgUQ5A=="
+        },
+        "node_modules/@types/lodash-es": {
+            "version": "4.17.7",
+            "resolved": "https://registry.npmmirror.com/@types/lodash-es/-/lodash-es-4.17.7.tgz",
+            "integrity": "sha512-z0ptr6UI10VlU6l5MYhGwS4mC8DZyYer2mCoyysZtSF7p26zOX8UpbrV0YpNYLGS8K4PUFIyEr62IMFFjveSiQ==",
+            "dependencies": {
+                "@types/lodash": "*"
+            }
+        },
+        "node_modules/@types/node": {
+            "version": "18.15.11",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.11.tgz",
+            "integrity": "sha512-E5Kwq2n4SbMzQOn6wnmBjuK9ouqlURrcZDVfbo9ftDDTFt3nk7ZKK4GMOzoYgnpQJKcxwQw+lGaBvvlMo0qN/Q==",
+            "dev": true
+        },
+        "node_modules/@types/qrcode": {
+            "version": "1.5.0",
+            "resolved": "https://registry.npmjs.org/@types/qrcode/-/qrcode-1.5.0.tgz",
+            "integrity": "sha512-x5ilHXRxUPIMfjtM+1vf/GPTRWZ81nqscursm5gMznJeK9M0YnZ1c3bEvRLQ0zSSgedLx1J6MGL231ObQGGhaA==",
+            "dev": true,
+            "dependencies": {
+                "@types/node": "*"
+            }
+        },
+        "node_modules/@types/resolve": {
+            "version": "1.20.2",
+            "resolved": "https://registry.npmmirror.com/@types/resolve/-/resolve-1.20.2.tgz",
+            "integrity": "sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==",
+            "dev": true
+        },
+        "node_modules/@types/web-bluetooth": {
+            "version": "0.0.16",
+            "resolved": "https://registry.npmmirror.com/@types/web-bluetooth/-/web-bluetooth-0.0.16.tgz",
+            "integrity": "sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ=="
+        },
+        "node_modules/@unhead/dom": {
+            "version": "1.1.25",
+            "resolved": "https://registry.npmmirror.com/@unhead/dom/-/dom-1.1.25.tgz",
+            "integrity": "sha512-kJ5jhJFNQCyNENSw+mtmzgulA0kqUuXS3SRPl1umpofc8PH8tblSzXwqStxTj9r6E4wxJbEuygT/aHFJVioizw==",
+            "dev": true,
+            "dependencies": {
+                "@unhead/schema": "1.1.25",
+                "@unhead/shared": "1.1.25"
+            }
+        },
+        "node_modules/@unhead/schema": {
+            "version": "1.1.25",
+            "resolved": "https://registry.npmmirror.com/@unhead/schema/-/schema-1.1.25.tgz",
+            "integrity": "sha512-ygmaxWgGTAq9CcB6zGY4+0HlGdQt/oMq+CM18tTnvOBY0Og/uPGt7roW8eH717GpTPibKRTpagSYzZYdL0tWeg==",
+            "dev": true,
+            "dependencies": {
+                "hookable": "^5.5.1",
+                "zhead": "^2.0.4"
+            }
+        },
+        "node_modules/@unhead/shared": {
+            "version": "1.1.25",
+            "resolved": "https://registry.npmmirror.com/@unhead/shared/-/shared-1.1.25.tgz",
+            "integrity": "sha512-KptKbk4py1MFYHYwDJ/0kPOs+95dYMrWIT1fCV9lGcVAwu20wIHh+WX18s+iEWhc66xkGRxgC/xsl4wJJFPE+w==",
+            "dev": true,
+            "dependencies": {
+                "@unhead/schema": "1.1.25"
+            }
+        },
+        "node_modules/@unhead/ssr": {
+            "version": "1.1.25",
+            "resolved": "https://registry.npmmirror.com/@unhead/ssr/-/ssr-1.1.25.tgz",
+            "integrity": "sha512-2S3tiajy6n3D1WY2pVkRLr74WGaHD08w0+nFaQGNy0LszPlkWUuAmYYqDCXdh03ijEl+Tjwqjn+E9w1e3QakuQ==",
+            "dev": true,
+            "dependencies": {
+                "@unhead/schema": "1.1.25",
+                "@unhead/shared": "1.1.25"
+            }
+        },
+        "node_modules/@unhead/vue": {
+            "version": "1.1.25",
+            "resolved": "https://registry.npmmirror.com/@unhead/vue/-/vue-1.1.25.tgz",
+            "integrity": "sha512-ujincFHftg2N2i3G/gVkMyJ7CFzVyZ8SMb5cJCWZEnDBQGjgy3uvWT6EaM0d2jnaeXiYbB+iyY0O1o/H+XlpKQ==",
+            "dev": true,
+            "dependencies": {
+                "@unhead/schema": "1.1.25",
+                "@unhead/shared": "1.1.25",
+                "hookable": "^5.5.1",
+                "unhead": "1.1.25"
+            },
+            "peerDependencies": {
+                "vue": ">=2.7 || >=3"
+            }
+        },
+        "node_modules/@vercel/nft": {
+            "version": "0.22.6",
+            "resolved": "https://registry.npmmirror.com/@vercel/nft/-/nft-0.22.6.tgz",
+            "integrity": "sha512-gTsFnnT4mGxodr4AUlW3/urY+8JKKB452LwF3m477RFUJTAaDmcz2JqFuInzvdybYIeyIv1sSONEJxsxnbQ5JQ==",
+            "dev": true,
+            "dependencies": {
+                "@mapbox/node-pre-gyp": "^1.0.5",
+                "@rollup/pluginutils": "^4.0.0",
+                "acorn": "^8.6.0",
+                "async-sema": "^3.1.1",
+                "bindings": "^1.4.0",
+                "estree-walker": "2.0.2",
+                "glob": "^7.1.3",
+                "graceful-fs": "^4.2.9",
+                "micromatch": "^4.0.2",
+                "node-gyp-build": "^4.2.2",
+                "resolve-from": "^5.0.0"
+            },
+            "bin": {
+                "nft": "out/cli.js"
+            },
+            "engines": {
+                "node": ">=14"
+            }
+        },
+        "node_modules/@vercel/nft/node_modules/@rollup/pluginutils": {
+            "version": "4.2.1",
+            "resolved": "https://registry.npmmirror.com/@rollup/pluginutils/-/pluginutils-4.2.1.tgz",
+            "integrity": "sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==",
+            "dev": true,
+            "dependencies": {
+                "estree-walker": "^2.0.1",
+                "picomatch": "^2.2.2"
+            },
+            "engines": {
+                "node": ">= 8.0.0"
+            }
+        },
+        "node_modules/@vercel/nft/node_modules/brace-expansion": {
+            "version": "1.1.11",
+            "resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.11.tgz",
+            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+            "dev": true,
+            "dependencies": {
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
+            }
+        },
+        "node_modules/@vercel/nft/node_modules/estree-walker": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmmirror.com/estree-walker/-/estree-walker-2.0.2.tgz",
+            "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
+            "dev": true
+        },
+        "node_modules/@vercel/nft/node_modules/glob": {
+            "version": "7.2.3",
+            "resolved": "https://registry.npmmirror.com/glob/-/glob-7.2.3.tgz",
+            "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+            "dev": true,
+            "dependencies": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^3.1.1",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+            },
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/@vercel/nft/node_modules/minimatch": {
+            "version": "3.1.2",
+            "resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-3.1.2.tgz",
+            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+            "dev": true,
+            "dependencies": {
+                "brace-expansion": "^1.1.7"
+            },
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/@vitejs/plugin-vue": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmmirror.com/@vitejs/plugin-vue/-/plugin-vue-4.1.0.tgz",
+            "integrity": "sha512-++9JOAFdcXI3lyer9UKUV4rfoQ3T1RN8yDqoCLar86s0xQct5yblxAE+yWgRnU5/0FOlVCpTZpYSBV/bGWrSrQ==",
+            "dev": true,
+            "engines": {
+                "node": "^14.18.0 || >=16.0.0"
+            },
+            "peerDependencies": {
+                "vite": "^4.0.0",
+                "vue": "^3.2.25"
+            }
+        },
+        "node_modules/@vitejs/plugin-vue-jsx": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmmirror.com/@vitejs/plugin-vue-jsx/-/plugin-vue-jsx-3.0.1.tgz",
+            "integrity": "sha512-+Jb7ggL48FSPS1uhPnJbJwWa9Sr90vQ+d0InW+AhBM22n+cfuYqJZDckBc+W3QSHe1WDvewMZfa4wZOtk5pRgw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/core": "^7.20.7",
+                "@babel/plugin-transform-typescript": "^7.20.7",
+                "@vue/babel-plugin-jsx": "^1.1.1"
+            },
+            "engines": {
+                "node": "^14.18.0 || >=16.0.0"
+            },
+            "peerDependencies": {
+                "vite": "^4.0.0",
+                "vue": "^3.0.0"
+            }
+        },
+        "node_modules/@vue/babel-helper-vue-transform-on": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmmirror.com/@vue/babel-helper-vue-transform-on/-/babel-helper-vue-transform-on-1.0.2.tgz",
+            "integrity": "sha512-hz4R8tS5jMn8lDq6iD+yWL6XNB699pGIVLk7WSJnn1dbpjaazsjZQkieJoRX6gW5zpYSCFqQ7jUquPNY65tQYA==",
+            "dev": true
+        },
+        "node_modules/@vue/babel-plugin-jsx": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmmirror.com/@vue/babel-plugin-jsx/-/babel-plugin-jsx-1.1.1.tgz",
+            "integrity": "sha512-j2uVfZjnB5+zkcbc/zsOc0fSNGCMMjaEXP52wdwdIfn0qjFfEYpYZBFKFg+HHnQeJCVrjOeO0YxgaL7DMrym9w==",
+            "dev": true,
+            "dependencies": {
+                "@babel/helper-module-imports": "^7.0.0",
+                "@babel/plugin-syntax-jsx": "^7.0.0",
+                "@babel/template": "^7.0.0",
+                "@babel/traverse": "^7.0.0",
+                "@babel/types": "^7.0.0",
+                "@vue/babel-helper-vue-transform-on": "^1.0.2",
+                "camelcase": "^6.0.0",
+                "html-tags": "^3.1.0",
+                "svg-tags": "^1.0.0"
+            }
+        },
+        "node_modules/@vue/compiler-core": {
+            "version": "3.2.47",
+            "resolved": "https://registry.npmmirror.com/@vue/compiler-core/-/compiler-core-3.2.47.tgz",
+            "integrity": "sha512-p4D7FDnQb7+YJmO2iPEv0SQNeNzcbHdGByJDsT4lynf63AFkOTFN07HsiRSvjGo0QrxR/o3d0hUyNCUnBU2Tig==",
+            "dependencies": {
+                "@babel/parser": "^7.16.4",
+                "@vue/shared": "3.2.47",
+                "estree-walker": "^2.0.2",
+                "source-map": "^0.6.1"
+            }
+        },
+        "node_modules/@vue/compiler-core/node_modules/estree-walker": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmmirror.com/estree-walker/-/estree-walker-2.0.2.tgz",
+            "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="
+        },
+        "node_modules/@vue/compiler-core/node_modules/source-map": {
+            "version": "0.6.1",
+            "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz",
+            "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/@vue/compiler-dom": {
+            "version": "3.2.47",
+            "resolved": "https://registry.npmmirror.com/@vue/compiler-dom/-/compiler-dom-3.2.47.tgz",
+            "integrity": "sha512-dBBnEHEPoftUiS03a4ggEig74J2YBZ2UIeyfpcRM2tavgMWo4bsEfgCGsu+uJIL/vax9S+JztH8NmQerUo7shQ==",
+            "dependencies": {
+                "@vue/compiler-core": "3.2.47",
+                "@vue/shared": "3.2.47"
+            }
+        },
+        "node_modules/@vue/compiler-sfc": {
+            "version": "3.2.47",
+            "resolved": "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-3.2.47.tgz",
+            "integrity": "sha512-rog05W+2IFfxjMcFw10tM9+f7i/+FFpZJJ5XHX72NP9eC2uRD+42M3pYcQqDXVYoj74kHMSEdQ/WmCjt8JFksQ==",
+            "dependencies": {
+                "@babel/parser": "^7.16.4",
+                "@vue/compiler-core": "3.2.47",
+                "@vue/compiler-dom": "3.2.47",
+                "@vue/compiler-ssr": "3.2.47",
+                "@vue/reactivity-transform": "3.2.47",
+                "@vue/shared": "3.2.47",
+                "estree-walker": "^2.0.2",
+                "magic-string": "^0.25.7",
+                "postcss": "^8.1.10",
+                "source-map": "^0.6.1"
+            }
+        },
+        "node_modules/@vue/compiler-sfc/node_modules/estree-walker": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmmirror.com/estree-walker/-/estree-walker-2.0.2.tgz",
+            "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="
+        },
+        "node_modules/@vue/compiler-sfc/node_modules/magic-string": {
+            "version": "0.25.9",
+            "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.25.9.tgz",
+            "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==",
+            "dependencies": {
+                "sourcemap-codec": "^1.4.8"
+            }
+        },
+        "node_modules/@vue/compiler-sfc/node_modules/source-map": {
+            "version": "0.6.1",
+            "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz",
+            "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/@vue/compiler-ssr": {
+            "version": "3.2.47",
+            "resolved": "https://registry.npmmirror.com/@vue/compiler-ssr/-/compiler-ssr-3.2.47.tgz",
+            "integrity": "sha512-wVXC+gszhulcMD8wpxMsqSOpvDZ6xKXSVWkf50Guf/S+28hTAXPDYRTbLQ3EDkOP5Xz/+SY37YiwDquKbJOgZw==",
+            "dependencies": {
+                "@vue/compiler-dom": "3.2.47",
+                "@vue/shared": "3.2.47"
+            }
+        },
+        "node_modules/@vue/devtools-api": {
+            "version": "6.5.0",
+            "resolved": "https://registry.npmmirror.com/@vue/devtools-api/-/devtools-api-6.5.0.tgz",
+            "integrity": "sha512-o9KfBeaBmCKl10usN4crU53fYtC1r7jJwdGKjPT24t348rHxgfpZ0xL3Xm/gLUYnc0oTp8LAmrxOeLyu6tbk2Q=="
+        },
+        "node_modules/@vue/reactivity": {
+            "version": "3.2.47",
+            "resolved": "https://registry.npmmirror.com/@vue/reactivity/-/reactivity-3.2.47.tgz",
+            "integrity": "sha512-7khqQ/75oyyg+N/e+iwV6lpy1f5wq759NdlS1fpAhFXa8VeAIKGgk2E/C4VF59lx5b+Ezs5fpp/5WsRYXQiKxQ==",
+            "dependencies": {
+                "@vue/shared": "3.2.47"
+            }
+        },
+        "node_modules/@vue/reactivity-transform": {
+            "version": "3.2.47",
+            "resolved": "https://registry.npmmirror.com/@vue/reactivity-transform/-/reactivity-transform-3.2.47.tgz",
+            "integrity": "sha512-m8lGXw8rdnPVVIdIFhf0LeQ/ixyHkH5plYuS83yop5n7ggVJU+z5v0zecwEnX7fa7HNLBhh2qngJJkxpwEEmYA==",
+            "dependencies": {
+                "@babel/parser": "^7.16.4",
+                "@vue/compiler-core": "3.2.47",
+                "@vue/shared": "3.2.47",
+                "estree-walker": "^2.0.2",
+                "magic-string": "^0.25.7"
+            }
+        },
+        "node_modules/@vue/reactivity-transform/node_modules/estree-walker": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmmirror.com/estree-walker/-/estree-walker-2.0.2.tgz",
+            "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="
+        },
+        "node_modules/@vue/reactivity-transform/node_modules/magic-string": {
+            "version": "0.25.9",
+            "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.25.9.tgz",
+            "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==",
+            "dependencies": {
+                "sourcemap-codec": "^1.4.8"
+            }
+        },
+        "node_modules/@vue/runtime-core": {
+            "version": "3.2.47",
+            "resolved": "https://registry.npmmirror.com/@vue/runtime-core/-/runtime-core-3.2.47.tgz",
+            "integrity": "sha512-RZxbLQIRB/K0ev0K9FXhNbBzT32H9iRtYbaXb0ZIz2usLms/D55dJR2t6cIEUn6vyhS3ALNvNthI+Q95C+NOpA==",
+            "dependencies": {
+                "@vue/reactivity": "3.2.47",
+                "@vue/shared": "3.2.47"
+            }
+        },
+        "node_modules/@vue/runtime-dom": {
+            "version": "3.2.47",
+            "resolved": "https://registry.npmmirror.com/@vue/runtime-dom/-/runtime-dom-3.2.47.tgz",
+            "integrity": "sha512-ArXrFTjS6TsDei4qwNvgrdmHtD930KgSKGhS5M+j8QxXrDJYLqYw4RRcDy1bz1m1wMmb6j+zGLifdVHtkXA7gA==",
+            "dependencies": {
+                "@vue/runtime-core": "3.2.47",
+                "@vue/shared": "3.2.47",
+                "csstype": "^2.6.8"
+            }
+        },
+        "node_modules/@vue/server-renderer": {
+            "version": "3.2.47",
+            "resolved": "https://registry.npmmirror.com/@vue/server-renderer/-/server-renderer-3.2.47.tgz",
+            "integrity": "sha512-dN9gc1i8EvmP9RCzvneONXsKfBRgqFeFZLurmHOveL7oH6HiFXJw5OGu294n1nHc/HMgTy6LulU/tv5/A7f/LA==",
+            "dependencies": {
+                "@vue/compiler-ssr": "3.2.47",
+                "@vue/shared": "3.2.47"
+            },
+            "peerDependencies": {
+                "vue": "3.2.47"
+            }
+        },
+        "node_modules/@vue/shared": {
+            "version": "3.2.47",
+            "resolved": "https://registry.npmmirror.com/@vue/shared/-/shared-3.2.47.tgz",
+            "integrity": "sha512-BHGyyGN3Q97EZx0taMQ+OLNuZcW3d37ZEVmEAyeoA9ERdGvm9Irc/0Fua8SNyOtV1w6BS4q25wbMzJujO9HIfQ=="
+        },
+        "node_modules/@vueuse/core": {
+            "version": "9.13.0",
+            "resolved": "https://registry.npmmirror.com/@vueuse/core/-/core-9.13.0.tgz",
+            "integrity": "sha512-pujnclbeHWxxPRqXWmdkKV5OX4Wk4YeK7wusHqRwU0Q7EFusHoqNA/aPhB6KCh9hEqJkLAJo7bb0Lh9b+OIVzw==",
+            "dependencies": {
+                "@types/web-bluetooth": "^0.0.16",
+                "@vueuse/metadata": "9.13.0",
+                "@vueuse/shared": "9.13.0",
+                "vue-demi": "*"
+            }
+        },
+        "node_modules/@vueuse/metadata": {
+            "version": "9.13.0",
+            "resolved": "https://registry.npmmirror.com/@vueuse/metadata/-/metadata-9.13.0.tgz",
+            "integrity": "sha512-gdU7TKNAUVlXXLbaF+ZCfte8BjRJQWPCa2J55+7/h+yDtzw3vOoGQDRXzI6pyKyo6bXFT5/QoPE4hAknExjRLQ=="
+        },
+        "node_modules/@vueuse/shared": {
+            "version": "9.13.0",
+            "resolved": "https://registry.npmmirror.com/@vueuse/shared/-/shared-9.13.0.tgz",
+            "integrity": "sha512-UrnhU+Cnufu4S6JLCPZnkWh0WwZGUp72ktOF2DFptMlOs3TOdVv8xJN53zhHGARmVOsz5KqOls09+J1NR6sBKw==",
+            "dependencies": {
+                "vue-demi": "*"
+            }
+        },
+        "node_modules/@windicss/config": {
+            "version": "1.8.10",
+            "resolved": "https://registry.npmmirror.com/@windicss/config/-/config-1.8.10.tgz",
+            "integrity": "sha512-O9SsC110b1Ik3YYa4Ck/0TWuCo7YFfA9KDrwD5sAeqscT5COIGK1HszdCT3oh0MJFej2wNrvpfyW9h6yQaW6PA==",
+            "dev": true,
+            "dependencies": {
+                "debug": "^4.3.4",
+                "jiti": "^1.16.0",
+                "windicss": "^3.5.6"
+            }
+        },
+        "node_modules/@windicss/plugin-utils": {
+            "version": "1.8.10",
+            "resolved": "https://registry.npmmirror.com/@windicss/plugin-utils/-/plugin-utils-1.8.10.tgz",
+            "integrity": "sha512-Phqk5OW1w+Mv+ry6t7BzAeDq3aMhbI94gR49j9vQCufFfDGCHndhhjtMK0sBv+NPJUsIAIh6qayb1iwBCXUGrw==",
+            "dev": true,
+            "dependencies": {
+                "@antfu/utils": "^0.7.2",
+                "@windicss/config": "1.8.10",
+                "debug": "^4.3.4",
+                "fast-glob": "^3.2.12",
+                "magic-string": "^0.27.0",
+                "micromatch": "^4.0.5",
+                "windicss": "^3.5.6"
+            }
+        },
+        "node_modules/@windicss/plugin-utils/node_modules/magic-string": {
+            "version": "0.27.0",
+            "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.27.0.tgz",
+            "integrity": "sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==",
+            "dev": true,
+            "dependencies": {
+                "@jridgewell/sourcemap-codec": "^1.4.13"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/abbrev": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmmirror.com/abbrev/-/abbrev-1.1.1.tgz",
+            "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+            "dev": true
+        },
+        "node_modules/acorn": {
+            "version": "8.8.2",
+            "resolved": "https://registry.npmmirror.com/acorn/-/acorn-8.8.2.tgz",
+            "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==",
+            "dev": true,
+            "bin": {
+                "acorn": "bin/acorn"
+            },
+            "engines": {
+                "node": ">=0.4.0"
+            }
+        },
+        "node_modules/agent-base": {
+            "version": "6.0.2",
+            "resolved": "https://registry.npmmirror.com/agent-base/-/agent-base-6.0.2.tgz",
+            "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+            "dev": true,
+            "dependencies": {
+                "debug": "4"
+            },
+            "engines": {
+                "node": ">= 6.0.0"
+            }
+        },
+        "node_modules/ansi-escapes": {
+            "version": "6.1.0",
+            "resolved": "https://registry.npmmirror.com/ansi-escapes/-/ansi-escapes-6.1.0.tgz",
+            "integrity": "sha512-bQyg9bzRntwR/8b89DOEhGwctcwCrbWW/TuqTQnpqpy5Fz3aovcOTj5i8NJV6AHc8OGNdMaqdxAWww8pz2kiKg==",
+            "dev": true,
+            "dependencies": {
+                "type-fest": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=14.16"
+            }
+        },
+        "node_modules/ansi-regex": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-6.0.1.tgz",
+            "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+            "dev": true,
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/ansi-styles": {
+            "version": "6.2.1",
+            "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-6.2.1.tgz",
+            "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+            "dev": true,
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/anymatch": {
+            "version": "3.1.3",
+            "resolved": "https://registry.npmmirror.com/anymatch/-/anymatch-3.1.3.tgz",
+            "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+            "dev": true,
+            "dependencies": {
+                "normalize-path": "^3.0.0",
+                "picomatch": "^2.0.4"
+            },
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/aos": {
+            "version": "2.3.4",
+            "resolved": "https://registry.npmmirror.com/aos/-/aos-2.3.4.tgz",
+            "integrity": "sha512-zh/ahtR2yME4I51z8IttIt4lC1Nw0ktsFtmeDzID1m9naJnWXhCoARaCgNOGXb5CLy3zm+wqmRAEgMYB5E2HUw==",
+            "dependencies": {
+                "classlist-polyfill": "^1.0.3",
+                "lodash.debounce": "^4.0.6",
+                "lodash.throttle": "^4.0.1"
+            }
+        },
+        "node_modules/aproba": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/aproba/-/aproba-2.0.0.tgz",
+            "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==",
+            "dev": true
+        },
+        "node_modules/arch": {
+            "version": "2.2.0",
+            "resolved": "https://registry.npmmirror.com/arch/-/arch-2.2.0.tgz",
+            "integrity": "sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==",
+            "dev": true
+        },
+        "node_modules/archiver": {
+            "version": "5.3.1",
+            "resolved": "https://registry.npmmirror.com/archiver/-/archiver-5.3.1.tgz",
+            "integrity": "sha512-8KyabkmbYrH+9ibcTScQ1xCJC/CGcugdVIwB+53f5sZziXgwUh3iXlAlANMxcZyDEfTHMe6+Z5FofV8nopXP7w==",
+            "dev": true,
+            "dependencies": {
+                "archiver-utils": "^2.1.0",
+                "async": "^3.2.3",
+                "buffer-crc32": "^0.2.1",
+                "readable-stream": "^3.6.0",
+                "readdir-glob": "^1.0.0",
+                "tar-stream": "^2.2.0",
+                "zip-stream": "^4.1.0"
+            },
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/archiver-utils": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmmirror.com/archiver-utils/-/archiver-utils-2.1.0.tgz",
+            "integrity": "sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==",
+            "dev": true,
+            "dependencies": {
+                "glob": "^7.1.4",
+                "graceful-fs": "^4.2.0",
+                "lazystream": "^1.0.0",
+                "lodash.defaults": "^4.2.0",
+                "lodash.difference": "^4.5.0",
+                "lodash.flatten": "^4.4.0",
+                "lodash.isplainobject": "^4.0.6",
+                "lodash.union": "^4.6.0",
+                "normalize-path": "^3.0.0",
+                "readable-stream": "^2.0.0"
+            },
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/archiver-utils/node_modules/brace-expansion": {
+            "version": "1.1.11",
+            "resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.11.tgz",
+            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+            "dev": true,
+            "dependencies": {
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
+            }
+        },
+        "node_modules/archiver-utils/node_modules/glob": {
+            "version": "7.2.3",
+            "resolved": "https://registry.npmmirror.com/glob/-/glob-7.2.3.tgz",
+            "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+            "dev": true,
+            "dependencies": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^3.1.1",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+            },
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/archiver-utils/node_modules/minimatch": {
+            "version": "3.1.2",
+            "resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-3.1.2.tgz",
+            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+            "dev": true,
+            "dependencies": {
+                "brace-expansion": "^1.1.7"
+            },
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/archiver-utils/node_modules/readable-stream": {
+            "version": "2.3.8",
+            "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-2.3.8.tgz",
+            "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+            "dev": true,
+            "dependencies": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+            }
+        },
+        "node_modules/archiver-utils/node_modules/safe-buffer": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.1.2.tgz",
+            "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+            "dev": true
+        },
+        "node_modules/archiver-utils/node_modules/string_decoder": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.1.1.tgz",
+            "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+            "dev": true,
+            "dependencies": {
+                "safe-buffer": "~5.1.0"
+            }
+        },
+        "node_modules/are-we-there-yet": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz",
+            "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==",
+            "dev": true,
+            "dependencies": {
+                "delegates": "^1.0.0",
+                "readable-stream": "^3.6.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/async": {
+            "version": "3.2.4",
+            "resolved": "https://registry.npmmirror.com/async/-/async-3.2.4.tgz",
+            "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==",
+            "dev": true
+        },
+        "node_modules/async-sema": {
+            "version": "3.1.1",
+            "resolved": "https://registry.npmmirror.com/async-sema/-/async-sema-3.1.1.tgz",
+            "integrity": "sha512-tLRNUXati5MFePdAk8dw7Qt7DpxPB60ofAgn8WRhW6a2rcimZnYBP9oxHiv0OHy+Wz7kPMG+t4LGdt31+4EmGg==",
+            "dev": true
+        },
+        "node_modules/async-validator": {
+            "version": "4.2.5",
+            "resolved": "https://registry.npmmirror.com/async-validator/-/async-validator-4.2.5.tgz",
+            "integrity": "sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg=="
+        },
+        "node_modules/autoprefixer": {
+            "version": "10.4.14",
+            "resolved": "https://registry.npmmirror.com/autoprefixer/-/autoprefixer-10.4.14.tgz",
+            "integrity": "sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ==",
+            "dev": true,
+            "dependencies": {
+                "browserslist": "^4.21.5",
+                "caniuse-lite": "^1.0.30001464",
+                "fraction.js": "^4.2.0",
+                "normalize-range": "^0.1.2",
+                "picocolors": "^1.0.0",
+                "postcss-value-parser": "^4.2.0"
+            },
+            "bin": {
+                "autoprefixer": "bin/autoprefixer"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >=14"
+            },
+            "peerDependencies": {
+                "postcss": "^8.1.0"
+            }
+        },
+        "node_modules/balanced-match": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmmirror.com/balanced-match/-/balanced-match-1.0.2.tgz",
+            "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+            "dev": true
+        },
+        "node_modules/base64-js": {
+            "version": "1.5.1",
+            "resolved": "https://registry.npmmirror.com/base64-js/-/base64-js-1.5.1.tgz",
+            "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+            "dev": true
+        },
+        "node_modules/big.js": {
+            "version": "5.2.2",
+            "resolved": "https://registry.npmmirror.com/big.js/-/big.js-5.2.2.tgz",
+            "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+            "dev": true,
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/binary-extensions": {
+            "version": "2.2.0",
+            "resolved": "https://registry.npmmirror.com/binary-extensions/-/binary-extensions-2.2.0.tgz",
+            "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/bindings": {
+            "version": "1.5.0",
+            "resolved": "https://registry.npmmirror.com/bindings/-/bindings-1.5.0.tgz",
+            "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+            "dev": true,
+            "dependencies": {
+                "file-uri-to-path": "1.0.0"
+            }
+        },
+        "node_modules/bl": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmmirror.com/bl/-/bl-5.1.0.tgz",
+            "integrity": "sha512-tv1ZJHLfTDnXE6tMHv73YgSJaWR2AFuPwMntBe7XL/GBFHnT0CLnsHMogfk5+GzCDC5ZWarSCYaIGATZt9dNsQ==",
+            "dev": true,
+            "dependencies": {
+                "buffer": "^6.0.3",
+                "inherits": "^2.0.4",
+                "readable-stream": "^3.4.0"
+            }
+        },
+        "node_modules/boolbase": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmmirror.com/boolbase/-/boolbase-1.0.0.tgz",
+            "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
+            "dev": true
+        },
+        "node_modules/brace-expansion": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-2.0.1.tgz",
+            "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+            "dev": true,
+            "dependencies": {
+                "balanced-match": "^1.0.0"
+            }
+        },
+        "node_modules/braces": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmmirror.com/braces/-/braces-3.0.2.tgz",
+            "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+            "dev": true,
+            "dependencies": {
+                "fill-range": "^7.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/browserslist": {
+            "version": "4.21.5",
+            "resolved": "https://registry.npmmirror.com/browserslist/-/browserslist-4.21.5.tgz",
+            "integrity": "sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==",
+            "dev": true,
+            "dependencies": {
+                "caniuse-lite": "^1.0.30001449",
+                "electron-to-chromium": "^1.4.284",
+                "node-releases": "^2.0.8",
+                "update-browserslist-db": "^1.0.10"
+            },
+            "bin": {
+                "browserslist": "cli.js"
+            },
+            "engines": {
+                "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+            }
+        },
+        "node_modules/buffer": {
+            "version": "6.0.3",
+            "resolved": "https://registry.npmmirror.com/buffer/-/buffer-6.0.3.tgz",
+            "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+            "dev": true,
+            "dependencies": {
+                "base64-js": "^1.3.1",
+                "ieee754": "^1.2.1"
+            }
+        },
+        "node_modules/buffer-crc32": {
+            "version": "0.2.13",
+            "resolved": "https://registry.npmmirror.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+            "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
+            "dev": true,
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/buffer-from": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmmirror.com/buffer-from/-/buffer-from-1.1.2.tgz",
+            "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+            "dev": true
+        },
+        "node_modules/builtin-modules": {
+            "version": "3.3.0",
+            "resolved": "https://registry.npmmirror.com/builtin-modules/-/builtin-modules-3.3.0.tgz",
+            "integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==",
+            "dev": true,
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/c12": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmmirror.com/c12/-/c12-1.2.0.tgz",
+            "integrity": "sha512-CMznkE0LpNEuD8ILp5QvsQVP+YvcpJnrI/zFeFnosU2PyDtx1wT7tXfZ8S3Tl3l9MTTXbKeuhDYKwgvnAPOx3w==",
+            "dev": true,
+            "dependencies": {
+                "defu": "^6.1.2",
+                "dotenv": "^16.0.3",
+                "giget": "^1.1.2",
+                "jiti": "^1.17.2",
+                "mlly": "^1.2.0",
+                "pathe": "^1.1.0",
+                "pkg-types": "^1.0.2",
+                "rc9": "^2.0.1"
+            }
+        },
+        "node_modules/cac": {
+            "version": "6.7.14",
+            "resolved": "https://registry.npmmirror.com/cac/-/cac-6.7.14.tgz",
+            "integrity": "sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==",
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/camelcase": {
+            "version": "6.3.0",
+            "resolved": "https://registry.npmmirror.com/camelcase/-/camelcase-6.3.0.tgz",
+            "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+            "dev": true,
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/caniuse-api": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmmirror.com/caniuse-api/-/caniuse-api-3.0.0.tgz",
+            "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
+            "dev": true,
+            "dependencies": {
+                "browserslist": "^4.0.0",
+                "caniuse-lite": "^1.0.0",
+                "lodash.memoize": "^4.1.2",
+                "lodash.uniq": "^4.5.0"
+            }
+        },
+        "node_modules/caniuse-lite": {
+            "version": "1.0.30001473",
+            "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001473.tgz",
+            "integrity": "sha512-ewDad7+D2vlyy+E4UJuVfiBsU69IL+8oVmTuZnH5Q6CIUbxNfI50uVpRHbUPDD6SUaN2o0Lh4DhTrvLG/Tn1yg==",
+            "dev": true
+        },
+        "node_modules/chalk": {
+            "version": "5.2.0",
+            "resolved": "https://registry.npmmirror.com/chalk/-/chalk-5.2.0.tgz",
+            "integrity": "sha512-ree3Gqw/nazQAPuJJEy+avdl7QfZMcUvmHIKgEZkGL+xOBzRvup5Hxo6LHuMceSxOabuJLJm5Yp/92R9eMmMvA==",
+            "dev": true,
+            "engines": {
+                "node": "^12.17.0 || ^14.13 || >=16.0.0"
+            }
+        },
+        "node_modules/chardet": {
+            "version": "0.7.0",
+            "resolved": "https://registry.npmmirror.com/chardet/-/chardet-0.7.0.tgz",
+            "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
+            "dev": true
+        },
+        "node_modules/cheerio": {
+            "version": "1.0.0-rc.12",
+            "resolved": "https://registry.npmmirror.com/cheerio/-/cheerio-1.0.0-rc.12.tgz",
+            "integrity": "sha512-VqR8m68vM46BNnuZ5NtnGBKIE/DfN0cRIzg9n40EIq9NOv90ayxLBXA8fXC5gquFRGJSTRqBq25Jt2ECLR431Q==",
+            "dev": true,
+            "dependencies": {
+                "cheerio-select": "^2.1.0",
+                "dom-serializer": "^2.0.0",
+                "domhandler": "^5.0.3",
+                "domutils": "^3.0.1",
+                "htmlparser2": "^8.0.1",
+                "parse5": "^7.0.0",
+                "parse5-htmlparser2-tree-adapter": "^7.0.0"
+            },
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/cheerio-select": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmmirror.com/cheerio-select/-/cheerio-select-2.1.0.tgz",
+            "integrity": "sha512-9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g==",
+            "dev": true,
+            "dependencies": {
+                "boolbase": "^1.0.0",
+                "css-select": "^5.1.0",
+                "css-what": "^6.1.0",
+                "domelementtype": "^2.3.0",
+                "domhandler": "^5.0.3",
+                "domutils": "^3.0.1"
+            }
+        },
+        "node_modules/chokidar": {
+            "version": "3.5.3",
+            "resolved": "https://registry.npmmirror.com/chokidar/-/chokidar-3.5.3.tgz",
+            "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
+            "dev": true,
+            "dependencies": {
+                "anymatch": "~3.1.2",
+                "braces": "~3.0.2",
+                "glob-parent": "~5.1.2",
+                "is-binary-path": "~2.1.0",
+                "is-glob": "~4.0.1",
+                "normalize-path": "~3.0.0",
+                "readdirp": "~3.6.0"
+            },
+            "engines": {
+                "node": ">= 8.10.0"
+            },
+            "optionalDependencies": {
+                "fsevents": "~2.3.2"
+            }
+        },
+        "node_modules/chownr": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/chownr/-/chownr-2.0.0.tgz",
+            "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
+            "dev": true,
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/ci-info": {
+            "version": "3.8.0",
+            "resolved": "https://registry.npmmirror.com/ci-info/-/ci-info-3.8.0.tgz",
+            "integrity": "sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==",
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/classlist-polyfill": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmmirror.com/classlist-polyfill/-/classlist-polyfill-1.2.0.tgz",
+            "integrity": "sha512-GzIjNdcEtH4ieA2S8NmrSxv7DfEV5fmixQeyTmqmRmRJPGpRBaSnA2a0VrCjyT8iW8JjEdMbKzDotAJf+ajgaQ=="
+        },
+        "node_modules/clear": {
+            "version": "0.1.0",
+            "resolved": "https://registry.npmmirror.com/clear/-/clear-0.1.0.tgz",
+            "integrity": "sha512-qMjRnoL+JDPJHeLePZJuao6+8orzHMGP04A8CdwCNsKhRbOnKRjefxONR7bwILT3MHecxKBjHkKL/tkZ8r4Uzw==",
+            "dev": true,
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/cli-cursor": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmmirror.com/cli-cursor/-/cli-cursor-4.0.0.tgz",
+            "integrity": "sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg==",
+            "dev": true,
+            "dependencies": {
+                "restore-cursor": "^4.0.0"
+            },
+            "engines": {
+                "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+            }
+        },
+        "node_modules/cli-spinners": {
+            "version": "2.8.0",
+            "resolved": "https://registry.npmmirror.com/cli-spinners/-/cli-spinners-2.8.0.tgz",
+            "integrity": "sha512-/eG5sJcvEIwxcdYM86k5tPwn0MUzkX5YY3eImTGpJOZgVe4SdTMY14vQpcxgBzJ0wXwAYrS8E+c3uHeK4JNyzQ==",
+            "dev": true,
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/cli-width": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmmirror.com/cli-width/-/cli-width-4.0.0.tgz",
+            "integrity": "sha512-ZksGS2xpa/bYkNzN3BAw1wEjsLV/ZKOf/CCrJ/QOBsxx6fOARIkwTutxp1XIOIohi6HKmOFjMoK/XaqDVUpEEw==",
+            "dev": true,
+            "engines": {
+                "node": ">= 12"
+            }
+        },
+        "node_modules/clipboardy": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmmirror.com/clipboardy/-/clipboardy-3.0.0.tgz",
+            "integrity": "sha512-Su+uU5sr1jkUy1sGRpLKjKrvEOVXgSgiSInwa/qeID6aJ07yh+5NWc3h2QfjHjBnfX4LhtFcuAWKUsJ3r+fjbg==",
+            "dev": true,
+            "dependencies": {
+                "arch": "^2.2.0",
+                "execa": "^5.1.1",
+                "is-wsl": "^2.2.0"
+            },
+            "engines": {
+                "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+            }
+        },
+        "node_modules/cliui": {
+            "version": "8.0.1",
+            "resolved": "https://registry.npmmirror.com/cliui/-/cliui-8.0.1.tgz",
+            "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+            "dev": true,
+            "dependencies": {
+                "string-width": "^4.2.0",
+                "strip-ansi": "^6.0.1",
+                "wrap-ansi": "^7.0.0"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/cliui/node_modules/ansi-regex": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-5.0.1.tgz",
+            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/cliui/node_modules/ansi-styles": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+            "dev": true,
+            "dependencies": {
+                "color-convert": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/cliui/node_modules/color-convert": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+            "dev": true,
+            "dependencies": {
+                "color-name": "~1.1.4"
+            },
+            "engines": {
+                "node": ">=7.0.0"
+            }
+        },
+        "node_modules/cliui/node_modules/color-name": {
+            "version": "1.1.4",
+            "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+            "dev": true
+        },
+        "node_modules/cliui/node_modules/emoji-regex": {
+            "version": "8.0.0",
+            "resolved": "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-8.0.0.tgz",
+            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+            "dev": true
+        },
+        "node_modules/cliui/node_modules/string-width": {
+            "version": "4.2.3",
+            "resolved": "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz",
+            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+            "dev": true,
+            "dependencies": {
+                "emoji-regex": "^8.0.0",
+                "is-fullwidth-code-point": "^3.0.0",
+                "strip-ansi": "^6.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/cliui/node_modules/strip-ansi": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz",
+            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+            "dev": true,
+            "dependencies": {
+                "ansi-regex": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/cliui/node_modules/wrap-ansi": {
+            "version": "7.0.0",
+            "resolved": "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+            "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+            "dev": true,
+            "dependencies": {
+                "ansi-styles": "^4.0.0",
+                "string-width": "^4.1.0",
+                "strip-ansi": "^6.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/clone": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmmirror.com/clone/-/clone-1.0.4.tgz",
+            "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.8"
+            }
+        },
+        "node_modules/cluster-key-slot": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmmirror.com/cluster-key-slot/-/cluster-key-slot-1.1.2.tgz",
+            "integrity": "sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/color-convert": {
+            "version": "1.9.3",
+            "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-1.9.3.tgz",
+            "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+            "dev": true,
+            "dependencies": {
+                "color-name": "1.1.3"
+            }
+        },
+        "node_modules/color-name": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.3.tgz",
+            "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+            "dev": true
+        },
+        "node_modules/color-support": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmmirror.com/color-support/-/color-support-1.1.3.tgz",
+            "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
+            "dev": true,
+            "bin": {
+                "color-support": "bin.js"
+            }
+        },
+        "node_modules/colord": {
+            "version": "2.9.3",
+            "resolved": "https://registry.npmmirror.com/colord/-/colord-2.9.3.tgz",
+            "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==",
+            "dev": true
+        },
+        "node_modules/colorette": {
+            "version": "2.0.19",
+            "resolved": "https://registry.npmmirror.com/colorette/-/colorette-2.0.19.tgz",
+            "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==",
+            "dev": true
+        },
+        "node_modules/commander": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmmirror.com/commander/-/commander-7.2.0.tgz",
+            "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+            "dev": true,
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/commondir": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmmirror.com/commondir/-/commondir-1.0.1.tgz",
+            "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==",
+            "dev": true
+        },
+        "node_modules/compress-commons": {
+            "version": "4.1.1",
+            "resolved": "https://registry.npmmirror.com/compress-commons/-/compress-commons-4.1.1.tgz",
+            "integrity": "sha512-QLdDLCKNV2dtoTorqgxngQCMA+gWXkM/Nwu7FpeBhk/RdkzimqC3jueb/FDmaZeXh+uby1jkBqE3xArsLBE5wQ==",
+            "dev": true,
+            "dependencies": {
+                "buffer-crc32": "^0.2.13",
+                "crc32-stream": "^4.0.2",
+                "normalize-path": "^3.0.0",
+                "readable-stream": "^3.6.0"
+            },
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/concat-map": {
+            "version": "0.0.1",
+            "resolved": "https://registry.npmmirror.com/concat-map/-/concat-map-0.0.1.tgz",
+            "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+            "dev": true
+        },
+        "node_modules/connect": {
+            "version": "3.7.0",
+            "resolved": "https://registry.npmmirror.com/connect/-/connect-3.7.0.tgz",
+            "integrity": "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==",
+            "dev": true,
+            "dependencies": {
+                "debug": "2.6.9",
+                "finalhandler": "1.1.2",
+                "parseurl": "~1.3.3",
+                "utils-merge": "1.0.1"
+            },
+            "engines": {
+                "node": ">= 0.10.0"
+            }
+        },
+        "node_modules/connect/node_modules/debug": {
+            "version": "2.6.9",
+            "resolved": "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz",
+            "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+            "dev": true,
+            "dependencies": {
+                "ms": "2.0.0"
+            }
+        },
+        "node_modules/connect/node_modules/ms": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz",
+            "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+            "dev": true
+        },
+        "node_modules/consola": {
+            "version": "2.15.3",
+            "resolved": "https://registry.npmmirror.com/consola/-/consola-2.15.3.tgz",
+            "integrity": "sha512-9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw==",
+            "dev": true
+        },
+        "node_modules/console-control-strings": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmmirror.com/console-control-strings/-/console-control-strings-1.1.0.tgz",
+            "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==",
+            "dev": true
+        },
+        "node_modules/convert-source-map": {
+            "version": "1.9.0",
+            "resolved": "https://registry.npmmirror.com/convert-source-map/-/convert-source-map-1.9.0.tgz",
+            "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
+            "dev": true
+        },
+        "node_modules/cookie-es": {
+            "version": "0.5.0",
+            "resolved": "https://registry.npmmirror.com/cookie-es/-/cookie-es-0.5.0.tgz",
+            "integrity": "sha512-RyZrFi6PNpBFbIaQjXDlFIhFVqV42QeKSZX1yQIl6ihImq6vcHNGMtqQ/QzY3RMPuYSkvsRwtnt5M9NeYxKt0g==",
+            "dev": true
+        },
+        "node_modules/core-util-is": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmmirror.com/core-util-is/-/core-util-is-1.0.3.tgz",
+            "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
+            "dev": true
+        },
+        "node_modules/crc-32": {
+            "version": "1.2.2",
+            "resolved": "https://registry.npmmirror.com/crc-32/-/crc-32-1.2.2.tgz",
+            "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==",
+            "dev": true,
+            "bin": {
+                "crc32": "bin/crc32.njs"
+            },
+            "engines": {
+                "node": ">=0.8"
+            }
+        },
+        "node_modules/crc32-stream": {
+            "version": "4.0.2",
+            "resolved": "https://registry.npmmirror.com/crc32-stream/-/crc32-stream-4.0.2.tgz",
+            "integrity": "sha512-DxFZ/Hk473b/muq1VJ///PMNLj0ZMnzye9thBpmjpJKCc5eMgB95aK8zCGrGfQ90cWo561Te6HK9D+j4KPdM6w==",
+            "dev": true,
+            "dependencies": {
+                "crc-32": "^1.2.0",
+                "readable-stream": "^3.4.0"
+            },
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/create-require": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmmirror.com/create-require/-/create-require-1.1.1.tgz",
+            "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
+            "dev": true
+        },
+        "node_modules/cross-spawn": {
+            "version": "7.0.3",
+            "resolved": "https://registry.npmmirror.com/cross-spawn/-/cross-spawn-7.0.3.tgz",
+            "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+            "dev": true,
+            "dependencies": {
+                "path-key": "^3.1.0",
+                "shebang-command": "^2.0.0",
+                "which": "^2.0.1"
+            },
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/css-declaration-sorter": {
+            "version": "6.4.0",
+            "resolved": "https://registry.npmmirror.com/css-declaration-sorter/-/css-declaration-sorter-6.4.0.tgz",
+            "integrity": "sha512-jDfsatwWMWN0MODAFuHszfjphEXfNw9JUAhmY4pLu3TyTU+ohUpsbVtbU+1MZn4a47D9kqh03i4eyOm+74+zew==",
+            "dev": true,
+            "engines": {
+                "node": "^10 || ^12 || >=14"
+            },
+            "peerDependencies": {
+                "postcss": "^8.0.9"
+            }
+        },
+        "node_modules/css-select": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmmirror.com/css-select/-/css-select-5.1.0.tgz",
+            "integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==",
+            "dev": true,
+            "dependencies": {
+                "boolbase": "^1.0.0",
+                "css-what": "^6.1.0",
+                "domhandler": "^5.0.2",
+                "domutils": "^3.0.1",
+                "nth-check": "^2.0.1"
+            }
+        },
+        "node_modules/css-tree": {
+            "version": "2.3.1",
+            "resolved": "https://registry.npmmirror.com/css-tree/-/css-tree-2.3.1.tgz",
+            "integrity": "sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==",
+            "dev": true,
+            "dependencies": {
+                "mdn-data": "2.0.30",
+                "source-map-js": "^1.0.1"
+            },
+            "engines": {
+                "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0"
+            }
+        },
+        "node_modules/css-what": {
+            "version": "6.1.0",
+            "resolved": "https://registry.npmmirror.com/css-what/-/css-what-6.1.0.tgz",
+            "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
+            "dev": true,
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/cssesc": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmmirror.com/cssesc/-/cssesc-3.0.0.tgz",
+            "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+            "dev": true,
+            "bin": {
+                "cssesc": "bin/cssesc"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/cssnano": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmmirror.com/cssnano/-/cssnano-6.0.0.tgz",
+            "integrity": "sha512-RGlcbzGhzEBCHuQe3k+Udyj5M00z0pm9S+VurHXFEOXxH+y0sVrJH2sMzoyz2d8N1EScazg+DVvmgyx0lurwwA==",
+            "dev": true,
+            "dependencies": {
+                "cssnano-preset-default": "^6.0.0",
+                "lilconfig": "^2.1.0"
+            },
+            "engines": {
+                "node": "^14 || ^16 || >=18.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/cssnano-preset-default": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmmirror.com/cssnano-preset-default/-/cssnano-preset-default-6.0.0.tgz",
+            "integrity": "sha512-BDxlaFzObRDXUiCCBQUNQcI+f1/aX2mgoNtXGjV6PG64POcHoDUoX+LgMWw+Q4609QhxwkcSnS65YFs42RA6qQ==",
+            "dev": true,
+            "dependencies": {
+                "css-declaration-sorter": "^6.3.1",
+                "cssnano-utils": "^4.0.0",
+                "postcss-calc": "^8.2.3",
+                "postcss-colormin": "^6.0.0",
+                "postcss-convert-values": "^6.0.0",
+                "postcss-discard-comments": "^6.0.0",
+                "postcss-discard-duplicates": "^6.0.0",
+                "postcss-discard-empty": "^6.0.0",
+                "postcss-discard-overridden": "^6.0.0",
+                "postcss-merge-longhand": "^6.0.0",
+                "postcss-merge-rules": "^6.0.0",
+                "postcss-minify-font-values": "^6.0.0",
+                "postcss-minify-gradients": "^6.0.0",
+                "postcss-minify-params": "^6.0.0",
+                "postcss-minify-selectors": "^6.0.0",
+                "postcss-normalize-charset": "^6.0.0",
+                "postcss-normalize-display-values": "^6.0.0",
+                "postcss-normalize-positions": "^6.0.0",
+                "postcss-normalize-repeat-style": "^6.0.0",
+                "postcss-normalize-string": "^6.0.0",
+                "postcss-normalize-timing-functions": "^6.0.0",
+                "postcss-normalize-unicode": "^6.0.0",
+                "postcss-normalize-url": "^6.0.0",
+                "postcss-normalize-whitespace": "^6.0.0",
+                "postcss-ordered-values": "^6.0.0",
+                "postcss-reduce-initial": "^6.0.0",
+                "postcss-reduce-transforms": "^6.0.0",
+                "postcss-svgo": "^6.0.0",
+                "postcss-unique-selectors": "^6.0.0"
+            },
+            "engines": {
+                "node": "^14 || ^16 || >=18.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/cssnano-utils": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmmirror.com/cssnano-utils/-/cssnano-utils-4.0.0.tgz",
+            "integrity": "sha512-Z39TLP+1E0KUcd7LGyF4qMfu8ZufI0rDzhdyAMsa/8UyNUU8wpS0fhdBxbQbv32r64ea00h4878gommRVg2BHw==",
+            "dev": true,
+            "engines": {
+                "node": "^14 || ^16 || >=18.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/csso": {
+            "version": "5.0.5",
+            "resolved": "https://registry.npmmirror.com/csso/-/csso-5.0.5.tgz",
+            "integrity": "sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==",
+            "dev": true,
+            "dependencies": {
+                "css-tree": "~2.2.0"
+            },
+            "engines": {
+                "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0",
+                "npm": ">=7.0.0"
+            }
+        },
+        "node_modules/csso/node_modules/css-tree": {
+            "version": "2.2.1",
+            "resolved": "https://registry.npmmirror.com/css-tree/-/css-tree-2.2.1.tgz",
+            "integrity": "sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==",
+            "dev": true,
+            "dependencies": {
+                "mdn-data": "2.0.28",
+                "source-map-js": "^1.0.1"
+            },
+            "engines": {
+                "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0",
+                "npm": ">=7.0.0"
+            }
+        },
+        "node_modules/csso/node_modules/mdn-data": {
+            "version": "2.0.28",
+            "resolved": "https://registry.npmmirror.com/mdn-data/-/mdn-data-2.0.28.tgz",
+            "integrity": "sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==",
+            "dev": true
+        },
+        "node_modules/csstype": {
+            "version": "2.6.21",
+            "resolved": "https://registry.npmmirror.com/csstype/-/csstype-2.6.21.tgz",
+            "integrity": "sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w=="
+        },
+        "node_modules/cuint": {
+            "version": "0.2.2",
+            "resolved": "https://registry.npmmirror.com/cuint/-/cuint-0.2.2.tgz",
+            "integrity": "sha512-d4ZVpCW31eWwCMe1YT3ur7mUDnTXbgwyzaL320DrcRT45rfjYxkt5QWLrmOJ+/UEAI2+fQgKe/fCjR8l4TpRgw==",
+            "dev": true
+        },
+        "node_modules/data-uri-to-buffer": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmmirror.com/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz",
+            "integrity": "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==",
+            "dev": true,
+            "engines": {
+                "node": ">= 12"
+            }
+        },
+        "node_modules/dayjs": {
+            "version": "1.11.7",
+            "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.7.tgz",
+            "integrity": "sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ=="
+        },
+        "node_modules/debug": {
+            "version": "4.3.4",
+            "resolved": "https://registry.npmmirror.com/debug/-/debug-4.3.4.tgz",
+            "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+            "dev": true,
+            "dependencies": {
+                "ms": "2.1.2"
+            },
+            "engines": {
+                "node": ">=6.0"
+            },
+            "peerDependenciesMeta": {
+                "supports-color": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/decamelize": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+            "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/declass": {
+            "version": "0.0.1",
+            "resolved": "https://registry.npmmirror.com/declass/-/declass-0.0.1.tgz",
+            "integrity": "sha512-V1tO9kGH+GLfkeiYCF016HSBcTP5mI+eMusSFgxZv0BzKvUQgI/Xn6FdoFuMwQHEqxKXhaW02s8oZqXPclKPUg==",
+            "dev": true,
+            "dependencies": {
+                "cheerio": "^1.0.0-rc.3"
+            }
+        },
+        "node_modules/deepmerge": {
+            "version": "4.3.1",
+            "resolved": "https://registry.npmmirror.com/deepmerge/-/deepmerge-4.3.1.tgz",
+            "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/defaults": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmmirror.com/defaults/-/defaults-1.0.4.tgz",
+            "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==",
+            "dev": true,
+            "dependencies": {
+                "clone": "^1.0.2"
+            }
+        },
+        "node_modules/define-lazy-prop": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
+            "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/defu": {
+            "version": "6.1.2",
+            "resolved": "https://registry.npmmirror.com/defu/-/defu-6.1.2.tgz",
+            "integrity": "sha512-+uO4+qr7msjNNWKYPHqN/3+Dx3NFkmIzayk2L1MyZQlvgZb/J1A0fo410dpKrN2SnqFjt8n4JL8fDJE0wIgjFQ==",
+            "dev": true
+        },
+        "node_modules/delegates": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmmirror.com/delegates/-/delegates-1.0.0.tgz",
+            "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==",
+            "dev": true
+        },
+        "node_modules/denque": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmmirror.com/denque/-/denque-2.1.0.tgz",
+            "integrity": "sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.10"
+            }
+        },
+        "node_modules/depd": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/depd/-/depd-2.0.0.tgz",
+            "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/destr": {
+            "version": "1.2.2",
+            "resolved": "https://registry.npmmirror.com/destr/-/destr-1.2.2.tgz",
+            "integrity": "sha512-lrbCJwD9saUQrqUfXvl6qoM+QN3W7tLV5pAOs+OqOmopCCz/JkE05MHedJR1xfk4IAnZuJXPVuN5+7jNA2ZCiA==",
+            "dev": true
+        },
+        "node_modules/destroy": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmmirror.com/destroy/-/destroy-1.2.0.tgz",
+            "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.8",
+                "npm": "1.2.8000 || >= 1.4.16"
+            }
+        },
+        "node_modules/detect-libc": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/detect-libc/-/detect-libc-2.0.1.tgz",
+            "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==",
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/devalue": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmmirror.com/devalue/-/devalue-4.3.0.tgz",
+            "integrity": "sha512-n94yQo4LI3w7erwf84mhRUkUJfhLoCZiLyoOZ/QFsDbcWNZePrLwbQpvZBUG2TNxwV3VjCKPxkiiQA6pe3TrTA==",
+            "dev": true
+        },
+        "node_modules/dijkstrajs": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/dijkstrajs/-/dijkstrajs-1.0.2.tgz",
+            "integrity": "sha512-QV6PMaHTCNmKSeP6QoXhVTw9snc9VD8MulTT0Bd99Pacp4SS1cjcrYPgBPmibqKVtMJJfqC6XvOXgPMEEPH/fg=="
+        },
+        "node_modules/dir-glob": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmmirror.com/dir-glob/-/dir-glob-3.0.1.tgz",
+            "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+            "dev": true,
+            "dependencies": {
+                "path-type": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/dom-serializer": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/dom-serializer/-/dom-serializer-2.0.0.tgz",
+            "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
+            "dev": true,
+            "dependencies": {
+                "domelementtype": "^2.3.0",
+                "domhandler": "^5.0.2",
+                "entities": "^4.2.0"
+            }
+        },
+        "node_modules/domelementtype": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmmirror.com/domelementtype/-/domelementtype-2.3.0.tgz",
+            "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
+            "dev": true
+        },
+        "node_modules/domhandler": {
+            "version": "5.0.3",
+            "resolved": "https://registry.npmmirror.com/domhandler/-/domhandler-5.0.3.tgz",
+            "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
+            "dev": true,
+            "dependencies": {
+                "domelementtype": "^2.3.0"
+            },
+            "engines": {
+                "node": ">= 4"
+            }
+        },
+        "node_modules/domutils": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmmirror.com/domutils/-/domutils-3.0.1.tgz",
+            "integrity": "sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q==",
+            "dev": true,
+            "dependencies": {
+                "dom-serializer": "^2.0.0",
+                "domelementtype": "^2.3.0",
+                "domhandler": "^5.0.1"
+            }
+        },
+        "node_modules/dot-prop": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmmirror.com/dot-prop/-/dot-prop-7.2.0.tgz",
+            "integrity": "sha512-Ol/IPXUARn9CSbkrdV4VJo7uCy1I3VuSiWCaFSg+8BdUOzF9n3jefIpcgAydvUZbTdEBZs2vEiTiS9m61ssiDA==",
+            "dev": true,
+            "dependencies": {
+                "type-fest": "^2.11.2"
+            },
+            "engines": {
+                "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+            }
+        },
+        "node_modules/dot-prop/node_modules/type-fest": {
+            "version": "2.19.0",
+            "resolved": "https://registry.npmmirror.com/type-fest/-/type-fest-2.19.0.tgz",
+            "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
+            "dev": true,
+            "engines": {
+                "node": ">=12.20"
+            }
+        },
+        "node_modules/dotenv": {
+            "version": "16.0.3",
+            "resolved": "https://registry.npmmirror.com/dotenv/-/dotenv-16.0.3.tgz",
+            "integrity": "sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ==",
+            "dev": true,
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/duplexer": {
+            "version": "0.1.2",
+            "resolved": "https://registry.npmmirror.com/duplexer/-/duplexer-0.1.2.tgz",
+            "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
+            "dev": true
+        },
+        "node_modules/eastasianwidth": {
+            "version": "0.2.0",
+            "resolved": "https://registry.npmmirror.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+            "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+            "dev": true
+        },
+        "node_modules/ee-first": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmmirror.com/ee-first/-/ee-first-1.1.1.tgz",
+            "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
+            "dev": true
+        },
+        "node_modules/electron-to-chromium": {
+            "version": "1.4.347",
+            "resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.347.tgz",
+            "integrity": "sha512-LNi3+/9nV0vT6Bz1OsSoZ/w7IgNuWdefZ7mjKNjZxyRlI/ag6uMXxsxAy5Etvuixq3Q26exw2fc4bNYvYQqXSw==",
+            "dev": true
+        },
+        "node_modules/element-plus": {
+            "version": "2.3.2",
+            "resolved": "https://registry.npmmirror.com/element-plus/-/element-plus-2.3.2.tgz",
+            "integrity": "sha512-NIK0QckKKagdlMm3eLoVoD4Lkfj5ECzpZAxwrRLdm1Yi5qiTU9Guor33+IbIa52z4gHMuhMxgSVS2xAGmjLHsw==",
+            "dependencies": {
+                "@ctrl/tinycolor": "^3.4.1",
+                "@element-plus/icons-vue": "^2.0.6",
+                "@floating-ui/dom": "^1.0.1",
+                "@popperjs/core": "npm:@sxzz/popperjs-es@^2.11.7",
+                "@types/lodash": "^4.14.182",
+                "@types/lodash-es": "^4.17.6",
+                "@vueuse/core": "^9.1.0",
+                "async-validator": "^4.2.5",
+                "dayjs": "^1.11.3",
+                "escape-html": "^1.0.3",
+                "lodash": "^4.17.21",
+                "lodash-es": "^4.17.21",
+                "lodash-unified": "^1.0.2",
+                "memoize-one": "^6.0.0",
+                "normalize-wheel-es": "^1.2.0"
+            },
+            "peerDependencies": {
+                "vue": "^3.2.0"
+            }
+        },
+        "node_modules/emoji-regex": {
+            "version": "9.2.2",
+            "resolved": "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-9.2.2.tgz",
+            "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+            "dev": true
+        },
+        "node_modules/emojis-list": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmmirror.com/emojis-list/-/emojis-list-3.0.0.tgz",
+            "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+            "dev": true,
+            "engines": {
+                "node": ">= 4"
+            }
+        },
+        "node_modules/encode-utf8": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmjs.org/encode-utf8/-/encode-utf8-1.0.3.tgz",
+            "integrity": "sha512-ucAnuBEhUK4boH2HjVYG5Q2mQyPorvv0u/ocS+zhdw0S8AlHYY+GOFhP1Gio5z4icpP2ivFSvhtFjQi8+T9ppw=="
+        },
+        "node_modules/encodeurl": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmmirror.com/encodeurl/-/encodeurl-1.0.2.tgz",
+            "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/end-of-stream": {
+            "version": "1.4.4",
+            "resolved": "https://registry.npmmirror.com/end-of-stream/-/end-of-stream-1.4.4.tgz",
+            "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+            "dev": true,
+            "dependencies": {
+                "once": "^1.4.0"
+            }
+        },
+        "node_modules/enhanced-resolve": {
+            "version": "5.12.0",
+            "resolved": "https://registry.npmmirror.com/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz",
+            "integrity": "sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==",
+            "dev": true,
+            "dependencies": {
+                "graceful-fs": "^4.2.4",
+                "tapable": "^2.2.0"
+            },
+            "engines": {
+                "node": ">=10.13.0"
+            }
+        },
+        "node_modules/entities": {
+            "version": "4.5.0",
+            "resolved": "https://registry.npmmirror.com/entities/-/entities-4.5.0.tgz",
+            "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.12"
+            }
+        },
+        "node_modules/errno": {
+            "version": "0.1.8",
+            "resolved": "https://registry.npmmirror.com/errno/-/errno-0.1.8.tgz",
+            "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
+            "dev": true,
+            "dependencies": {
+                "prr": "~1.0.1"
+            },
+            "bin": {
+                "errno": "cli.js"
+            }
+        },
+        "node_modules/esbuild": {
+            "version": "0.17.17",
+            "resolved": "https://registry.npmmirror.com/esbuild/-/esbuild-0.17.17.tgz",
+            "integrity": "sha512-/jUywtAymR8jR4qsa2RujlAF7Krpt5VWi72Q2yuLD4e/hvtNcFQ0I1j8m/bxq238pf3/0KO5yuXNpuLx8BE1KA==",
+            "dev": true,
+            "hasInstallScript": true,
+            "bin": {
+                "esbuild": "bin/esbuild"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "optionalDependencies": {
+                "@esbuild/android-arm": "0.17.17",
+                "@esbuild/android-arm64": "0.17.17",
+                "@esbuild/android-x64": "0.17.17",
+                "@esbuild/darwin-arm64": "0.17.17",
+                "@esbuild/darwin-x64": "0.17.17",
+                "@esbuild/freebsd-arm64": "0.17.17",
+                "@esbuild/freebsd-x64": "0.17.17",
+                "@esbuild/linux-arm": "0.17.17",
+                "@esbuild/linux-arm64": "0.17.17",
+                "@esbuild/linux-ia32": "0.17.17",
+                "@esbuild/linux-loong64": "0.17.17",
+                "@esbuild/linux-mips64el": "0.17.17",
+                "@esbuild/linux-ppc64": "0.17.17",
+                "@esbuild/linux-riscv64": "0.17.17",
+                "@esbuild/linux-s390x": "0.17.17",
+                "@esbuild/linux-x64": "0.17.17",
+                "@esbuild/netbsd-x64": "0.17.17",
+                "@esbuild/openbsd-x64": "0.17.17",
+                "@esbuild/sunos-x64": "0.17.17",
+                "@esbuild/win32-arm64": "0.17.17",
+                "@esbuild/win32-ia32": "0.17.17",
+                "@esbuild/win32-x64": "0.17.17"
+            }
+        },
+        "node_modules/escalade": {
+            "version": "3.1.1",
+            "resolved": "https://registry.npmmirror.com/escalade/-/escalade-3.1.1.tgz",
+            "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+            "dev": true,
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/escape-html": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmmirror.com/escape-html/-/escape-html-1.0.3.tgz",
+            "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
+        },
+        "node_modules/escape-string-regexp": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmmirror.com/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz",
+            "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==",
+            "dev": true,
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/estree-walker": {
+            "version": "3.0.3",
+            "resolved": "https://registry.npmmirror.com/estree-walker/-/estree-walker-3.0.3.tgz",
+            "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==",
+            "dev": true,
+            "dependencies": {
+                "@types/estree": "^1.0.0"
+            }
+        },
+        "node_modules/etag": {
+            "version": "1.8.1",
+            "resolved": "https://registry.npmmirror.com/etag/-/etag-1.8.1.tgz",
+            "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/eventemitter3": {
+            "version": "4.0.7",
+            "resolved": "https://registry.npmmirror.com/eventemitter3/-/eventemitter3-4.0.7.tgz",
+            "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
+            "dev": true
+        },
+        "node_modules/execa": {
+            "version": "5.1.1",
+            "resolved": "https://registry.npmmirror.com/execa/-/execa-5.1.1.tgz",
+            "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+            "dev": true,
+            "dependencies": {
+                "cross-spawn": "^7.0.3",
+                "get-stream": "^6.0.0",
+                "human-signals": "^2.1.0",
+                "is-stream": "^2.0.0",
+                "merge-stream": "^2.0.0",
+                "npm-run-path": "^4.0.1",
+                "onetime": "^5.1.2",
+                "signal-exit": "^3.0.3",
+                "strip-final-newline": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/external-editor": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmmirror.com/external-editor/-/external-editor-3.1.0.tgz",
+            "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
+            "dev": true,
+            "dependencies": {
+                "chardet": "^0.7.0",
+                "iconv-lite": "^0.4.24",
+                "tmp": "^0.0.33"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/externality": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmmirror.com/externality/-/externality-1.0.0.tgz",
+            "integrity": "sha512-MAU9ci3XdpqOX1aoIoyL2DMzW97P8LYeJxIUkfXhOfsrkH4KLHFaYDwKN0B2l6tqedVJWiTIJtWmxmZfa05vOQ==",
+            "dev": true,
+            "dependencies": {
+                "enhanced-resolve": "^5.10.0",
+                "mlly": "^1.0.0",
+                "pathe": "^1.0.0",
+                "ufo": "^1.0.0"
+            }
+        },
+        "node_modules/fast-glob": {
+            "version": "3.2.12",
+            "resolved": "https://registry.npmmirror.com/fast-glob/-/fast-glob-3.2.12.tgz",
+            "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
+            "dev": true,
+            "dependencies": {
+                "@nodelib/fs.stat": "^2.0.2",
+                "@nodelib/fs.walk": "^1.2.3",
+                "glob-parent": "^5.1.2",
+                "merge2": "^1.3.0",
+                "micromatch": "^4.0.4"
+            },
+            "engines": {
+                "node": ">=8.6.0"
+            }
+        },
+        "node_modules/fastq": {
+            "version": "1.15.0",
+            "resolved": "https://registry.npmmirror.com/fastq/-/fastq-1.15.0.tgz",
+            "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
+            "dev": true,
+            "dependencies": {
+                "reusify": "^1.0.4"
+            }
+        },
+        "node_modules/fetch-blob": {
+            "version": "3.2.0",
+            "resolved": "https://registry.npmmirror.com/fetch-blob/-/fetch-blob-3.2.0.tgz",
+            "integrity": "sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==",
+            "dev": true,
+            "dependencies": {
+                "node-domexception": "^1.0.0",
+                "web-streams-polyfill": "^3.0.3"
+            },
+            "engines": {
+                "node": "^12.20 || >= 14.13"
+            }
+        },
+        "node_modules/figures": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmmirror.com/figures/-/figures-5.0.0.tgz",
+            "integrity": "sha512-ej8ksPF4x6e5wvK9yevct0UCXh8TTFlWGVLlgjZuoBH1HwjIfKE/IdL5mq89sFA7zELi1VhKpmtDnrs7zWyeyg==",
+            "dev": true,
+            "dependencies": {
+                "escape-string-regexp": "^5.0.0",
+                "is-unicode-supported": "^1.2.0"
+            },
+            "engines": {
+                "node": ">=14"
+            }
+        },
+        "node_modules/file-uri-to-path": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmmirror.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+            "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+            "dev": true
+        },
+        "node_modules/fill-range": {
+            "version": "7.0.1",
+            "resolved": "https://registry.npmmirror.com/fill-range/-/fill-range-7.0.1.tgz",
+            "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+            "dev": true,
+            "dependencies": {
+                "to-regex-range": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/finalhandler": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmmirror.com/finalhandler/-/finalhandler-1.1.2.tgz",
+            "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+            "dev": true,
+            "dependencies": {
+                "debug": "2.6.9",
+                "encodeurl": "~1.0.2",
+                "escape-html": "~1.0.3",
+                "on-finished": "~2.3.0",
+                "parseurl": "~1.3.3",
+                "statuses": "~1.5.0",
+                "unpipe": "~1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/finalhandler/node_modules/debug": {
+            "version": "2.6.9",
+            "resolved": "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz",
+            "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+            "dev": true,
+            "dependencies": {
+                "ms": "2.0.0"
+            }
+        },
+        "node_modules/finalhandler/node_modules/ms": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz",
+            "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+            "dev": true
+        },
+        "node_modules/finalhandler/node_modules/on-finished": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmmirror.com/on-finished/-/on-finished-2.3.0.tgz",
+            "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
+            "dev": true,
+            "dependencies": {
+                "ee-first": "1.1.1"
+            },
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/finalhandler/node_modules/statuses": {
+            "version": "1.5.0",
+            "resolved": "https://registry.npmmirror.com/statuses/-/statuses-1.5.0.tgz",
+            "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/find-up": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+            "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+            "dependencies": {
+                "locate-path": "^5.0.0",
+                "path-exists": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/flat": {
+            "version": "5.0.2",
+            "resolved": "https://registry.npmmirror.com/flat/-/flat-5.0.2.tgz",
+            "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
+            "dev": true,
+            "bin": {
+                "flat": "cli.js"
+            }
+        },
+        "node_modules/follow-redirects": {
+            "version": "1.15.2",
+            "resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.2.tgz",
+            "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
+            "dev": true,
+            "engines": {
+                "node": ">=4.0"
+            },
+            "peerDependenciesMeta": {
+                "debug": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/formdata-polyfill": {
+            "version": "4.0.10",
+            "resolved": "https://registry.npmmirror.com/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz",
+            "integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==",
+            "dev": true,
+            "dependencies": {
+                "fetch-blob": "^3.1.2"
+            },
+            "engines": {
+                "node": ">=12.20.0"
+            }
+        },
+        "node_modules/fraction.js": {
+            "version": "4.2.0",
+            "resolved": "https://registry.npmmirror.com/fraction.js/-/fraction.js-4.2.0.tgz",
+            "integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==",
+            "dev": true,
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/fresh": {
+            "version": "0.5.2",
+            "resolved": "https://registry.npmmirror.com/fresh/-/fresh-0.5.2.tgz",
+            "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/fs-constants": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmmirror.com/fs-constants/-/fs-constants-1.0.0.tgz",
+            "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
+            "dev": true
+        },
+        "node_modules/fs-extra": {
+            "version": "11.1.1",
+            "resolved": "https://registry.npmmirror.com/fs-extra/-/fs-extra-11.1.1.tgz",
+            "integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==",
+            "dev": true,
+            "dependencies": {
+                "graceful-fs": "^4.2.0",
+                "jsonfile": "^6.0.1",
+                "universalify": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=14.14"
+            }
+        },
+        "node_modules/fs-minipass": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmmirror.com/fs-minipass/-/fs-minipass-2.1.0.tgz",
+            "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
+            "dev": true,
+            "dependencies": {
+                "minipass": "^3.0.0"
+            },
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/fs-minipass/node_modules/minipass": {
+            "version": "3.3.6",
+            "resolved": "https://registry.npmmirror.com/minipass/-/minipass-3.3.6.tgz",
+            "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+            "dev": true,
+            "dependencies": {
+                "yallist": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/fs-minipass/node_modules/yallist": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz",
+            "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+            "dev": true
+        },
+        "node_modules/fs.realpath": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmmirror.com/fs.realpath/-/fs.realpath-1.0.0.tgz",
+            "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+            "dev": true
+        },
+        "node_modules/fsevents": {
+            "version": "2.3.2",
+            "resolved": "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.2.tgz",
+            "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+            "dev": true,
+            "hasInstallScript": true,
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+            }
+        },
+        "node_modules/function-bind": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmmirror.com/function-bind/-/function-bind-1.1.1.tgz",
+            "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+            "dev": true
+        },
+        "node_modules/gauge": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmmirror.com/gauge/-/gauge-3.0.2.tgz",
+            "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==",
+            "dev": true,
+            "dependencies": {
+                "aproba": "^1.0.3 || ^2.0.0",
+                "color-support": "^1.1.2",
+                "console-control-strings": "^1.0.0",
+                "has-unicode": "^2.0.1",
+                "object-assign": "^4.1.1",
+                "signal-exit": "^3.0.0",
+                "string-width": "^4.2.3",
+                "strip-ansi": "^6.0.1",
+                "wide-align": "^1.1.2"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/gauge/node_modules/ansi-regex": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-5.0.1.tgz",
+            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/gauge/node_modules/emoji-regex": {
+            "version": "8.0.0",
+            "resolved": "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-8.0.0.tgz",
+            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+            "dev": true
+        },
+        "node_modules/gauge/node_modules/string-width": {
+            "version": "4.2.3",
+            "resolved": "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz",
+            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+            "dev": true,
+            "dependencies": {
+                "emoji-regex": "^8.0.0",
+                "is-fullwidth-code-point": "^3.0.0",
+                "strip-ansi": "^6.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/gauge/node_modules/strip-ansi": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz",
+            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+            "dev": true,
+            "dependencies": {
+                "ansi-regex": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/gensync": {
+            "version": "1.0.0-beta.2",
+            "resolved": "https://registry.npmmirror.com/gensync/-/gensync-1.0.0-beta.2.tgz",
+            "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+            "dev": true,
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/get-caller-file": {
+            "version": "2.0.5",
+            "resolved": "https://registry.npmmirror.com/get-caller-file/-/get-caller-file-2.0.5.tgz",
+            "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+            "engines": {
+                "node": "6.* || 8.* || >= 10.*"
+            }
+        },
+        "node_modules/get-port": {
+            "version": "6.1.2",
+            "resolved": "https://registry.npmmirror.com/get-port/-/get-port-6.1.2.tgz",
+            "integrity": "sha512-BrGGraKm2uPqurfGVj/z97/zv8dPleC6x9JBNRTrDNtCkkRF4rPwrQXFgL7+I+q8QSdU4ntLQX2D7KIxSy8nGw==",
+            "dev": true,
+            "engines": {
+                "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+            }
+        },
+        "node_modules/get-port-please": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmmirror.com/get-port-please/-/get-port-please-3.0.1.tgz",
+            "integrity": "sha512-R5pcVO8Z1+pVDu8Ml3xaJCEkBiiy1VQN9za0YqH8GIi1nIqD4IzQhzY6dDzMRtdS1lyiGlucRzm8IN8wtLIXng==",
+            "dev": true
+        },
+        "node_modules/get-stream": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmmirror.com/get-stream/-/get-stream-6.0.1.tgz",
+            "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+            "dev": true,
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/giget": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmmirror.com/giget/-/giget-1.1.2.tgz",
+            "integrity": "sha512-HsLoS07HiQ5oqvObOI+Qb2tyZH4Gj5nYGfF9qQcZNrPw+uEFhdXtgJr01aO2pWadGHucajYDLxxbtQkm97ON2A==",
+            "dev": true,
+            "dependencies": {
+                "colorette": "^2.0.19",
+                "defu": "^6.1.2",
+                "https-proxy-agent": "^5.0.1",
+                "mri": "^1.2.0",
+                "node-fetch-native": "^1.0.2",
+                "pathe": "^1.1.0",
+                "tar": "^6.1.13"
+            },
+            "bin": {
+                "giget": "dist/cli.mjs"
+            }
+        },
+        "node_modules/git-config-path": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/git-config-path/-/git-config-path-2.0.0.tgz",
+            "integrity": "sha512-qc8h1KIQbJpp+241id3GuAtkdyJ+IK+LIVtkiFTRKRrmddDzs3SI9CvP1QYmWBFvm1I/PWRwj//of8bgAc0ltA==",
+            "dev": true,
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/git-up": {
+            "version": "7.0.0",
+            "resolved": "https://registry.npmmirror.com/git-up/-/git-up-7.0.0.tgz",
+            "integrity": "sha512-ONdIrbBCFusq1Oy0sC71F5azx8bVkvtZtMJAsv+a6lz5YAmbNnLD6HAB4gptHZVLPR8S2/kVN6Gab7lryq5+lQ==",
+            "dev": true,
+            "dependencies": {
+                "is-ssh": "^1.4.0",
+                "parse-url": "^8.1.0"
+            }
+        },
+        "node_modules/git-url-parse": {
+            "version": "13.1.0",
+            "resolved": "https://registry.npmmirror.com/git-url-parse/-/git-url-parse-13.1.0.tgz",
+            "integrity": "sha512-5FvPJP/70WkIprlUZ33bm4UAaFdjcLkJLpWft1BeZKqwR0uhhNGoKwlUaPtVb4LxCSQ++erHapRak9kWGj+FCA==",
+            "dev": true,
+            "dependencies": {
+                "git-up": "^7.0.0"
+            }
+        },
+        "node_modules/glob": {
+            "version": "8.1.0",
+            "resolved": "https://registry.npmmirror.com/glob/-/glob-8.1.0.tgz",
+            "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
+            "dev": true,
+            "dependencies": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^5.0.1",
+                "once": "^1.3.0"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/glob-parent": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmmirror.com/glob-parent/-/glob-parent-5.1.2.tgz",
+            "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+            "dev": true,
+            "dependencies": {
+                "is-glob": "^4.0.1"
+            },
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/globals": {
+            "version": "11.12.0",
+            "resolved": "https://registry.npmmirror.com/globals/-/globals-11.12.0.tgz",
+            "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+            "dev": true,
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/globby": {
+            "version": "13.1.4",
+            "resolved": "https://registry.npmmirror.com/globby/-/globby-13.1.4.tgz",
+            "integrity": "sha512-iui/IiiW+QrJ1X1hKH5qwlMQyv34wJAYwH1vrf8b9kBA4sNiif3gKsMHa+BrdnOpEudWjpotfa7LrTzB1ERS/g==",
+            "dev": true,
+            "dependencies": {
+                "dir-glob": "^3.0.1",
+                "fast-glob": "^3.2.11",
+                "ignore": "^5.2.0",
+                "merge2": "^1.4.1",
+                "slash": "^4.0.0"
+            },
+            "engines": {
+                "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+            }
+        },
+        "node_modules/graceful-fs": {
+            "version": "4.2.11",
+            "resolved": "https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.11.tgz",
+            "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+            "dev": true
+        },
+        "node_modules/gzip-size": {
+            "version": "7.0.0",
+            "resolved": "https://registry.npmmirror.com/gzip-size/-/gzip-size-7.0.0.tgz",
+            "integrity": "sha512-O1Ld7Dr+nqPnmGpdhzLmMTQ4vAsD+rHwMm1NLUmoUFFymBOMKxCCrtDxqdBRYXdeEPEi3SyoR4TizJLQrnKBNA==",
+            "dev": true,
+            "dependencies": {
+                "duplexer": "^0.1.2"
+            },
+            "engines": {
+                "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+            }
+        },
+        "node_modules/h3": {
+            "version": "1.6.4",
+            "resolved": "https://registry.npmmirror.com/h3/-/h3-1.6.4.tgz",
+            "integrity": "sha512-uoDNeaoeDRwWBtwwi4siZ6l5sBmDJpnpcBssuAbvsaPBonl8vP7Ym4tFPe+tAvGM0GbUoC24wYcloCG+J9hqmA==",
+            "dev": true,
+            "dependencies": {
+                "cookie-es": "^0.5.0",
+                "defu": "^6.1.2",
+                "destr": "^1.2.2",
+                "iron-webcrypto": "^0.6.0",
+                "radix3": "^1.0.1",
+                "ufo": "^1.1.1",
+                "uncrypto": "^0.1.2"
+            }
+        },
+        "node_modules/has": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmmirror.com/has/-/has-1.0.3.tgz",
+            "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+            "dev": true,
+            "dependencies": {
+                "function-bind": "^1.1.1"
+            },
+            "engines": {
+                "node": ">= 0.4.0"
+            }
+        },
+        "node_modules/has-flag": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-3.0.0.tgz",
+            "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+            "dev": true,
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/has-unicode": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/has-unicode/-/has-unicode-2.0.1.tgz",
+            "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==",
+            "dev": true
+        },
+        "node_modules/hash-sum": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-2.0.0.tgz",
+            "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==",
+            "dev": true
+        },
+        "node_modules/hookable": {
+            "version": "5.5.3",
+            "resolved": "https://registry.npmmirror.com/hookable/-/hookable-5.5.3.tgz",
+            "integrity": "sha512-Yc+BQe8SvoXH1643Qez1zqLRmbA5rCL+sSmk6TVos0LWVfNIB7PGncdlId77WzLGSIB5KaWgTaNTs2lNVEI6VQ==",
+            "dev": true
+        },
+        "node_modules/html-tags": {
+            "version": "3.3.1",
+            "resolved": "https://registry.npmmirror.com/html-tags/-/html-tags-3.3.1.tgz",
+            "integrity": "sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==",
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/htmlparser2": {
+            "version": "8.0.2",
+            "resolved": "https://registry.npmmirror.com/htmlparser2/-/htmlparser2-8.0.2.tgz",
+            "integrity": "sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==",
+            "dev": true,
+            "dependencies": {
+                "domelementtype": "^2.3.0",
+                "domhandler": "^5.0.3",
+                "domutils": "^3.0.1",
+                "entities": "^4.4.0"
+            }
+        },
+        "node_modules/http-errors": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/http-errors/-/http-errors-2.0.0.tgz",
+            "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+            "dev": true,
+            "dependencies": {
+                "depd": "2.0.0",
+                "inherits": "2.0.4",
+                "setprototypeof": "1.2.0",
+                "statuses": "2.0.1",
+                "toidentifier": "1.0.1"
+            },
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/http-proxy": {
+            "version": "1.18.1",
+            "resolved": "https://registry.npmmirror.com/http-proxy/-/http-proxy-1.18.1.tgz",
+            "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
+            "dev": true,
+            "dependencies": {
+                "eventemitter3": "^4.0.0",
+                "follow-redirects": "^1.0.0",
+                "requires-port": "^1.0.0"
+            },
+            "engines": {
+                "node": ">=8.0.0"
+            }
+        },
+        "node_modules/http-shutdown": {
+            "version": "1.2.2",
+            "resolved": "https://registry.npmmirror.com/http-shutdown/-/http-shutdown-1.2.2.tgz",
+            "integrity": "sha512-S9wWkJ/VSY9/k4qcjG318bqJNruzE4HySUhFYknwmu6LBP97KLLfwNf+n4V1BHurvFNkSKLFnK/RsuUnRTf9Vw==",
+            "dev": true,
+            "engines": {
+                "iojs": ">= 1.0.0",
+                "node": ">= 0.12.0"
+            }
+        },
+        "node_modules/https-proxy-agent": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmmirror.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+            "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+            "dev": true,
+            "dependencies": {
+                "agent-base": "6",
+                "debug": "4"
+            },
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/human-signals": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmmirror.com/human-signals/-/human-signals-2.1.0.tgz",
+            "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+            "dev": true,
+            "engines": {
+                "node": ">=10.17.0"
+            }
+        },
+        "node_modules/iconv-lite": {
+            "version": "0.4.24",
+            "resolved": "https://registry.npmmirror.com/iconv-lite/-/iconv-lite-0.4.24.tgz",
+            "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+            "dev": true,
+            "dependencies": {
+                "safer-buffer": ">= 2.1.2 < 3"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/ieee754": {
+            "version": "1.2.1",
+            "resolved": "https://registry.npmmirror.com/ieee754/-/ieee754-1.2.1.tgz",
+            "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+            "dev": true
+        },
+        "node_modules/ignore": {
+            "version": "5.2.4",
+            "resolved": "https://registry.npmmirror.com/ignore/-/ignore-5.2.4.tgz",
+            "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
+            "dev": true,
+            "engines": {
+                "node": ">= 4"
+            }
+        },
+        "node_modules/immutable": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmmirror.com/immutable/-/immutable-4.3.0.tgz",
+            "integrity": "sha512-0AOCmOip+xgJwEVTQj1EfiDDOkPmuyllDuTuEX+DDXUgapLAsBIfkg3sxCYyCEA8mQqZrrxPUGjcOQ2JS3WLkg==",
+            "dev": true
+        },
+        "node_modules/inflight": {
+            "version": "1.0.6",
+            "resolved": "https://registry.npmmirror.com/inflight/-/inflight-1.0.6.tgz",
+            "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+            "dev": true,
+            "dependencies": {
+                "once": "^1.3.0",
+                "wrappy": "1"
+            }
+        },
+        "node_modules/inherits": {
+            "version": "2.0.4",
+            "resolved": "https://registry.npmmirror.com/inherits/-/inherits-2.0.4.tgz",
+            "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+            "dev": true
+        },
+        "node_modules/ini": {
+            "version": "1.3.8",
+            "resolved": "https://registry.npmmirror.com/ini/-/ini-1.3.8.tgz",
+            "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+            "dev": true
+        },
+        "node_modules/inquirer": {
+            "version": "9.1.5",
+            "resolved": "https://registry.npmmirror.com/inquirer/-/inquirer-9.1.5.tgz",
+            "integrity": "sha512-3ygAIh8gcZavV9bj6MTdYddG2zPSYswP808fKS46NOwlF0zZljVpnLCHODDqItWJDbDpLb3aouAxGaJbkxoppA==",
+            "dev": true,
+            "dependencies": {
+                "ansi-escapes": "^6.0.0",
+                "chalk": "^5.2.0",
+                "cli-cursor": "^4.0.0",
+                "cli-width": "^4.0.0",
+                "external-editor": "^3.0.3",
+                "figures": "^5.0.0",
+                "lodash": "^4.17.21",
+                "mute-stream": "1.0.0",
+                "ora": "^6.1.2",
+                "run-async": "^2.4.0",
+                "rxjs": "^7.8.0",
+                "string-width": "^5.1.2",
+                "strip-ansi": "^7.0.1",
+                "through": "^2.3.6",
+                "wrap-ansi": "^8.1.0"
+            },
+            "engines": {
+                "node": ">=14.18.0"
+            }
+        },
+        "node_modules/ioredis": {
+            "version": "5.3.2",
+            "resolved": "https://registry.npmmirror.com/ioredis/-/ioredis-5.3.2.tgz",
+            "integrity": "sha512-1DKMMzlIHM02eBBVOFQ1+AolGjs6+xEcM4PDL7NqOS6szq7H9jSaEkIUH6/a5Hl241LzW6JLSiAbNvTQjUupUA==",
+            "dev": true,
+            "dependencies": {
+                "@ioredis/commands": "^1.1.1",
+                "cluster-key-slot": "^1.1.0",
+                "debug": "^4.3.4",
+                "denque": "^2.1.0",
+                "lodash.defaults": "^4.2.0",
+                "lodash.isarguments": "^3.1.0",
+                "redis-errors": "^1.2.0",
+                "redis-parser": "^3.0.0",
+                "standard-as-callback": "^2.1.0"
+            },
+            "engines": {
+                "node": ">=12.22.0"
+            }
+        },
+        "node_modules/ip-regex": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmmirror.com/ip-regex/-/ip-regex-5.0.0.tgz",
+            "integrity": "sha512-fOCG6lhoKKakwv+C6KdsOnGvgXnmgfmp0myi3bcNwj3qfwPAxRKWEuFhvEFF7ceYIz6+1jRZ+yguLFAmUNPEfw==",
+            "dev": true,
+            "engines": {
+                "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+            }
+        },
+        "node_modules/iron-webcrypto": {
+            "version": "0.6.0",
+            "resolved": "https://registry.npmmirror.com/iron-webcrypto/-/iron-webcrypto-0.6.0.tgz",
+            "integrity": "sha512-WYgEQttulX/+JTv1BTJFYY3OsAb+ZnCuA53IjppZMyiRsVdGeEuZ/k4fJrg77Rzn0pp9/PgWtXUF+5HndDA5SQ==",
+            "dev": true
+        },
+        "node_modules/is-binary-path": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmmirror.com/is-binary-path/-/is-binary-path-2.1.0.tgz",
+            "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+            "dev": true,
+            "dependencies": {
+                "binary-extensions": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/is-builtin-module": {
+            "version": "3.2.1",
+            "resolved": "https://registry.npmmirror.com/is-builtin-module/-/is-builtin-module-3.2.1.tgz",
+            "integrity": "sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==",
+            "dev": true,
+            "dependencies": {
+                "builtin-modules": "^3.3.0"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/is-core-module": {
+            "version": "2.11.0",
+            "resolved": "https://registry.npmmirror.com/is-core-module/-/is-core-module-2.11.0.tgz",
+            "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
+            "dev": true,
+            "dependencies": {
+                "has": "^1.0.3"
+            }
+        },
+        "node_modules/is-docker": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmmirror.com/is-docker/-/is-docker-3.0.0.tgz",
+            "integrity": "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==",
+            "dev": true,
+            "bin": {
+                "is-docker": "cli.js"
+            },
+            "engines": {
+                "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+            }
+        },
+        "node_modules/is-extglob": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmmirror.com/is-extglob/-/is-extglob-2.1.1.tgz",
+            "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/is-fullwidth-code-point": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmmirror.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+            "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/is-glob": {
+            "version": "4.0.3",
+            "resolved": "https://registry.npmmirror.com/is-glob/-/is-glob-4.0.3.tgz",
+            "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+            "dev": true,
+            "dependencies": {
+                "is-extglob": "^2.1.1"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/is-interactive": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/is-interactive/-/is-interactive-2.0.0.tgz",
+            "integrity": "sha512-qP1vozQRI+BMOPcjFzrjXuQvdak2pHNUMZoeG2eRbiSqyvbEf/wQtEOTOX1guk6E3t36RkaqiSt8A/6YElNxLQ==",
+            "dev": true,
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/is-module": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmmirror.com/is-module/-/is-module-1.0.0.tgz",
+            "integrity": "sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==",
+            "dev": true
+        },
+        "node_modules/is-number": {
+            "version": "7.0.0",
+            "resolved": "https://registry.npmmirror.com/is-number/-/is-number-7.0.0.tgz",
+            "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.12.0"
+            }
+        },
+        "node_modules/is-primitive": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmmirror.com/is-primitive/-/is-primitive-3.0.1.tgz",
+            "integrity": "sha512-GljRxhWvlCNRfZyORiH77FwdFwGcMO620o37EOYC0ORWdq+WYNVqW0w2Juzew4M+L81l6/QS3t5gkkihyRqv9w==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/is-promise": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmmirror.com/is-promise/-/is-promise-4.0.0.tgz",
+            "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==",
+            "dev": true
+        },
+        "node_modules/is-reference": {
+            "version": "1.2.1",
+            "resolved": "https://registry.npmmirror.com/is-reference/-/is-reference-1.2.1.tgz",
+            "integrity": "sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==",
+            "dev": true,
+            "dependencies": {
+                "@types/estree": "*"
+            }
+        },
+        "node_modules/is-ssh": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmmirror.com/is-ssh/-/is-ssh-1.4.0.tgz",
+            "integrity": "sha512-x7+VxdxOdlV3CYpjvRLBv5Lo9OJerlYanjwFrPR9fuGPjCiNiCzFgAWpiLAohSbsnH4ZAys3SBh+hq5rJosxUQ==",
+            "dev": true,
+            "dependencies": {
+                "protocols": "^2.0.1"
+            }
+        },
+        "node_modules/is-stream": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/is-stream/-/is-stream-2.0.1.tgz",
+            "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/is-unicode-supported": {
+            "version": "1.3.0",
+            "resolved": "https://registry.npmmirror.com/is-unicode-supported/-/is-unicode-supported-1.3.0.tgz",
+            "integrity": "sha512-43r2mRvz+8JRIKnWJ+3j8JtjRKZ6GmjzfaE/qiBJnikNnYv/6bagRJ1kUhNk8R5EX/GkobD+r+sfxCPJsiKBLQ==",
+            "dev": true,
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/is-wsl": {
+            "version": "2.2.0",
+            "resolved": "https://registry.npmmirror.com/is-wsl/-/is-wsl-2.2.0.tgz",
+            "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+            "dev": true,
+            "dependencies": {
+                "is-docker": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/is-wsl/node_modules/is-docker": {
+            "version": "2.2.1",
+            "resolved": "https://registry.npmmirror.com/is-docker/-/is-docker-2.2.1.tgz",
+            "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+            "dev": true,
+            "bin": {
+                "is-docker": "cli.js"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/isarray": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmmirror.com/isarray/-/isarray-1.0.0.tgz",
+            "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+            "dev": true
+        },
+        "node_modules/isexe": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/isexe/-/isexe-2.0.0.tgz",
+            "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+            "dev": true
+        },
+        "node_modules/jiti": {
+            "version": "1.18.2",
+            "resolved": "https://registry.npmmirror.com/jiti/-/jiti-1.18.2.tgz",
+            "integrity": "sha512-QAdOptna2NYiSSpv0O/BwoHBSmz4YhpzJHyi+fnMRTXFjp7B8i/YG5Z8IfusxB1ufjcD2Sre1F3R+nX3fvy7gg==",
+            "dev": true,
+            "bin": {
+                "jiti": "bin/jiti.js"
+            }
+        },
+        "node_modules/js-tokens": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmmirror.com/js-tokens/-/js-tokens-4.0.0.tgz",
+            "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+            "dev": true
+        },
+        "node_modules/jsesc": {
+            "version": "2.5.2",
+            "resolved": "https://registry.npmmirror.com/jsesc/-/jsesc-2.5.2.tgz",
+            "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+            "dev": true,
+            "bin": {
+                "jsesc": "bin/jsesc"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/json5": {
+            "version": "2.2.3",
+            "resolved": "https://registry.npmmirror.com/json5/-/json5-2.2.3.tgz",
+            "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+            "dev": true,
+            "bin": {
+                "json5": "lib/cli.js"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/jsonc-parser": {
+            "version": "3.2.0",
+            "resolved": "https://registry.npmmirror.com/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
+            "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==",
+            "dev": true
+        },
+        "node_modules/jsonfile": {
+            "version": "6.1.0",
+            "resolved": "https://registry.npmmirror.com/jsonfile/-/jsonfile-6.1.0.tgz",
+            "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+            "dev": true,
+            "dependencies": {
+                "universalify": "^2.0.0"
+            },
+            "optionalDependencies": {
+                "graceful-fs": "^4.1.6"
+            }
+        },
+        "node_modules/kleur": {
+            "version": "3.0.3",
+            "resolved": "https://registry.npmmirror.com/kleur/-/kleur-3.0.3.tgz",
+            "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
+            "dev": true,
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/klona": {
+            "version": "2.0.6",
+            "resolved": "https://registry.npmmirror.com/klona/-/klona-2.0.6.tgz",
+            "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==",
+            "dev": true,
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/knitwork": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmmirror.com/knitwork/-/knitwork-1.0.0.tgz",
+            "integrity": "sha512-dWl0Dbjm6Xm+kDxhPQJsCBTxrJzuGl0aP9rhr+TG8D3l+GL90N8O8lYUi7dTSAN2uuDqCtNgb6aEuQH5wsiV8Q==",
+            "dev": true
+        },
+        "node_modules/kolorist": {
+            "version": "1.7.0",
+            "resolved": "https://registry.npmmirror.com/kolorist/-/kolorist-1.7.0.tgz",
+            "integrity": "sha512-ymToLHqL02udwVdbkowNpzjFd6UzozMtshPQKVi5k1EjKRqKqBrOnE9QbLEb0/pV76SAiIT13hdL8R6suc+f3g==",
+            "dev": true
+        },
+        "node_modules/lazystream": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmmirror.com/lazystream/-/lazystream-1.0.1.tgz",
+            "integrity": "sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==",
+            "dev": true,
+            "dependencies": {
+                "readable-stream": "^2.0.5"
+            },
+            "engines": {
+                "node": ">= 0.6.3"
+            }
+        },
+        "node_modules/lazystream/node_modules/readable-stream": {
+            "version": "2.3.8",
+            "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-2.3.8.tgz",
+            "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+            "dev": true,
+            "dependencies": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+            }
+        },
+        "node_modules/lazystream/node_modules/safe-buffer": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.1.2.tgz",
+            "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+            "dev": true
+        },
+        "node_modules/lazystream/node_modules/string_decoder": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.1.1.tgz",
+            "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+            "dev": true,
+            "dependencies": {
+                "safe-buffer": "~5.1.0"
+            }
+        },
+        "node_modules/lilconfig": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmmirror.com/lilconfig/-/lilconfig-2.1.0.tgz",
+            "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==",
+            "dev": true,
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/listhen": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmmirror.com/listhen/-/listhen-1.0.4.tgz",
+            "integrity": "sha512-r94k7kmXHb8e8wpv7+UP/qqhhD+j/9TgX19QKim2cEJuWCLwlTw+5BkCFmYyjhQ7Bt8KdVun/2DcD7MF2Fe3+g==",
+            "dev": true,
+            "dependencies": {
+                "clipboardy": "^3.0.0",
+                "colorette": "^2.0.19",
+                "defu": "^6.1.2",
+                "get-port-please": "^3.0.1",
+                "http-shutdown": "^1.2.2",
+                "ip-regex": "^5.0.0",
+                "node-forge": "^1.3.1",
+                "ufo": "^1.1.1"
+            }
+        },
+        "node_modules/loader-utils": {
+            "version": "2.0.4",
+            "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.4.tgz",
+            "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+            "dev": true,
+            "dependencies": {
+                "big.js": "^5.2.2",
+                "emojis-list": "^3.0.0",
+                "json5": "^2.1.2"
+            },
+            "engines": {
+                "node": ">=8.9.0"
+            }
+        },
+        "node_modules/local-pkg": {
+            "version": "0.4.3",
+            "resolved": "https://registry.npmmirror.com/local-pkg/-/local-pkg-0.4.3.tgz",
+            "integrity": "sha512-SFppqq5p42fe2qcZQqqEOiVRXl+WCP1MdT6k7BDEW1j++sp5fIY+/fdRQitvKgB5BrBcmrs5m/L0v2FrU5MY1g==",
+            "dev": true,
+            "engines": {
+                "node": ">=14"
+            }
+        },
+        "node_modules/locate-path": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+            "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+            "dependencies": {
+                "p-locate": "^4.1.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/lodash": {
+            "version": "4.17.21",
+            "resolved": "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz",
+            "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+        },
+        "node_modules/lodash-es": {
+            "version": "4.17.21",
+            "resolved": "https://registry.npmmirror.com/lodash-es/-/lodash-es-4.17.21.tgz",
+            "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
+        },
+        "node_modules/lodash-unified": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmmirror.com/lodash-unified/-/lodash-unified-1.0.3.tgz",
+            "integrity": "sha512-WK9qSozxXOD7ZJQlpSqOT+om2ZfcT4yO+03FuzAHD0wF6S0l0090LRPDx3vhTTLZ8cFKpBn+IOcVXK6qOcIlfQ==",
+            "peerDependencies": {
+                "@types/lodash-es": "*",
+                "lodash": "*",
+                "lodash-es": "*"
+            }
+        },
+        "node_modules/lodash._reinterpolate": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmmirror.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
+            "integrity": "sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA==",
+            "dev": true
+        },
+        "node_modules/lodash.debounce": {
+            "version": "4.0.8",
+            "resolved": "https://registry.npmmirror.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
+            "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="
+        },
+        "node_modules/lodash.defaults": {
+            "version": "4.2.0",
+            "resolved": "https://registry.npmmirror.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
+            "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==",
+            "dev": true
+        },
+        "node_modules/lodash.difference": {
+            "version": "4.5.0",
+            "resolved": "https://registry.npmmirror.com/lodash.difference/-/lodash.difference-4.5.0.tgz",
+            "integrity": "sha512-dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA==",
+            "dev": true
+        },
+        "node_modules/lodash.flatten": {
+            "version": "4.4.0",
+            "resolved": "https://registry.npmmirror.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
+            "integrity": "sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==",
+            "dev": true
+        },
+        "node_modules/lodash.isarguments": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmmirror.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
+            "integrity": "sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==",
+            "dev": true
+        },
+        "node_modules/lodash.isplainobject": {
+            "version": "4.0.6",
+            "resolved": "https://registry.npmmirror.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
+            "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==",
+            "dev": true
+        },
+        "node_modules/lodash.memoize": {
+            "version": "4.1.2",
+            "resolved": "https://registry.npmmirror.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+            "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
+            "dev": true
+        },
+        "node_modules/lodash.pick": {
+            "version": "4.4.0",
+            "resolved": "https://registry.npmmirror.com/lodash.pick/-/lodash.pick-4.4.0.tgz",
+            "integrity": "sha512-hXt6Ul/5yWjfklSGvLQl8vM//l3FtyHZeuelpzK6mm99pNvN9yTDruNZPEJZD1oWrqo+izBmB7oUfWgcCX7s4Q==",
+            "dev": true
+        },
+        "node_modules/lodash.template": {
+            "version": "4.5.0",
+            "resolved": "https://registry.npmmirror.com/lodash.template/-/lodash.template-4.5.0.tgz",
+            "integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==",
+            "dev": true,
+            "dependencies": {
+                "lodash._reinterpolate": "^3.0.0",
+                "lodash.templatesettings": "^4.0.0"
+            }
+        },
+        "node_modules/lodash.templatesettings": {
+            "version": "4.2.0",
+            "resolved": "https://registry.npmmirror.com/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz",
+            "integrity": "sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==",
+            "dev": true,
+            "dependencies": {
+                "lodash._reinterpolate": "^3.0.0"
+            }
+        },
+        "node_modules/lodash.throttle": {
+            "version": "4.1.1",
+            "resolved": "https://registry.npmmirror.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz",
+            "integrity": "sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ=="
+        },
+        "node_modules/lodash.union": {
+            "version": "4.6.0",
+            "resolved": "https://registry.npmmirror.com/lodash.union/-/lodash.union-4.6.0.tgz",
+            "integrity": "sha512-c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw==",
+            "dev": true
+        },
+        "node_modules/lodash.uniq": {
+            "version": "4.5.0",
+            "resolved": "https://registry.npmmirror.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
+            "integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==",
+            "dev": true
+        },
+        "node_modules/log-symbols": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmmirror.com/log-symbols/-/log-symbols-5.1.0.tgz",
+            "integrity": "sha512-l0x2DvrW294C9uDCoQe1VSU4gf529FkSZ6leBl4TiqZH/e+0R7hSfHQBNut2mNygDgHwvYHfFLn6Oxb3VWj2rA==",
+            "dev": true,
+            "dependencies": {
+                "chalk": "^5.0.0",
+                "is-unicode-supported": "^1.1.0"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/lru-cache": {
+            "version": "5.1.1",
+            "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-5.1.1.tgz",
+            "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+            "dev": true,
+            "dependencies": {
+                "yallist": "^3.0.2"
+            }
+        },
+        "node_modules/magic-string": {
+            "version": "0.30.0",
+            "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.30.0.tgz",
+            "integrity": "sha512-LA+31JYDJLs82r2ScLrlz1GjSgu66ZV518eyWT+S8VhyQn/JL0u9MeBOvQMGYiPk1DBiSN9DDMOcXvigJZaViQ==",
+            "dev": true,
+            "dependencies": {
+                "@jridgewell/sourcemap-codec": "^1.4.13"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/make-dir": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmmirror.com/make-dir/-/make-dir-3.1.0.tgz",
+            "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+            "dev": true,
+            "dependencies": {
+                "semver": "^6.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/make-dir/node_modules/semver": {
+            "version": "6.3.0",
+            "resolved": "https://registry.npmmirror.com/semver/-/semver-6.3.0.tgz",
+            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+            "dev": true,
+            "bin": {
+                "semver": "bin/semver.js"
+            }
+        },
+        "node_modules/mdn-data": {
+            "version": "2.0.30",
+            "resolved": "https://registry.npmmirror.com/mdn-data/-/mdn-data-2.0.30.tgz",
+            "integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==",
+            "dev": true
+        },
+        "node_modules/memoize-one": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmmirror.com/memoize-one/-/memoize-one-6.0.0.tgz",
+            "integrity": "sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw=="
+        },
+        "node_modules/memory-fs": {
+            "version": "0.5.0",
+            "resolved": "https://registry.npmmirror.com/memory-fs/-/memory-fs-0.5.0.tgz",
+            "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==",
+            "dev": true,
+            "dependencies": {
+                "errno": "^0.1.3",
+                "readable-stream": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=4.3.0 <5.0.0 || >=5.10"
+            }
+        },
+        "node_modules/memory-fs/node_modules/readable-stream": {
+            "version": "2.3.8",
+            "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-2.3.8.tgz",
+            "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+            "dev": true,
+            "dependencies": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+            }
+        },
+        "node_modules/memory-fs/node_modules/safe-buffer": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.1.2.tgz",
+            "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+            "dev": true
+        },
+        "node_modules/memory-fs/node_modules/string_decoder": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.1.1.tgz",
+            "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+            "dev": true,
+            "dependencies": {
+                "safe-buffer": "~5.1.0"
+            }
+        },
+        "node_modules/merge-stream": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/merge-stream/-/merge-stream-2.0.0.tgz",
+            "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+            "dev": true
+        },
+        "node_modules/merge2": {
+            "version": "1.4.1",
+            "resolved": "https://registry.npmmirror.com/merge2/-/merge2-1.4.1.tgz",
+            "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+            "dev": true,
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/micromatch": {
+            "version": "4.0.5",
+            "resolved": "https://registry.npmmirror.com/micromatch/-/micromatch-4.0.5.tgz",
+            "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+            "dev": true,
+            "dependencies": {
+                "braces": "^3.0.2",
+                "picomatch": "^2.3.1"
+            },
+            "engines": {
+                "node": ">=8.6"
+            }
+        },
+        "node_modules/mime": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmmirror.com/mime/-/mime-3.0.0.tgz",
+            "integrity": "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==",
+            "dev": true,
+            "bin": {
+                "mime": "cli.js"
+            },
+            "engines": {
+                "node": ">=10.0.0"
+            }
+        },
+        "node_modules/mimic-fn": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmmirror.com/mimic-fn/-/mimic-fn-2.1.0.tgz",
+            "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+            "dev": true,
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/minimatch": {
+            "version": "5.1.6",
+            "resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-5.1.6.tgz",
+            "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+            "dev": true,
+            "dependencies": {
+                "brace-expansion": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/minipass": {
+            "version": "4.2.5",
+            "resolved": "https://registry.npmmirror.com/minipass/-/minipass-4.2.5.tgz",
+            "integrity": "sha512-+yQl7SX3bIT83Lhb4BVorMAHVuqsskxRdlmO9kTpyukp8vsm2Sn/fUOV9xlnG8/a5JsypJzap21lz/y3FBMJ8Q==",
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/minizlib": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmmirror.com/minizlib/-/minizlib-2.1.2.tgz",
+            "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
+            "dev": true,
+            "dependencies": {
+                "minipass": "^3.0.0",
+                "yallist": "^4.0.0"
+            },
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/minizlib/node_modules/minipass": {
+            "version": "3.3.6",
+            "resolved": "https://registry.npmmirror.com/minipass/-/minipass-3.3.6.tgz",
+            "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+            "dev": true,
+            "dependencies": {
+                "yallist": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/minizlib/node_modules/yallist": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz",
+            "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+            "dev": true
+        },
+        "node_modules/mkdirp": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmmirror.com/mkdirp/-/mkdirp-1.0.4.tgz",
+            "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+            "dev": true,
+            "bin": {
+                "mkdirp": "bin/cmd.js"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/mlly": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmmirror.com/mlly/-/mlly-1.2.0.tgz",
+            "integrity": "sha512-+c7A3CV0KGdKcylsI6khWyts/CYrGTrRVo4R/I7u/cUsy0Conxa6LUhiEzVKIw14lc2L5aiO4+SeVe4TeGRKww==",
+            "dev": true,
+            "dependencies": {
+                "acorn": "^8.8.2",
+                "pathe": "^1.1.0",
+                "pkg-types": "^1.0.2",
+                "ufo": "^1.1.1"
+            }
+        },
+        "node_modules/mri": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmmirror.com/mri/-/mri-1.2.0.tgz",
+            "integrity": "sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==",
+            "dev": true,
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/mrmime": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmmirror.com/mrmime/-/mrmime-1.0.1.tgz",
+            "integrity": "sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw==",
+            "dev": true,
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/ms": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.2.tgz",
+            "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+            "dev": true
+        },
+        "node_modules/mute-stream": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmmirror.com/mute-stream/-/mute-stream-1.0.0.tgz",
+            "integrity": "sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==",
+            "dev": true,
+            "engines": {
+                "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+            }
+        },
+        "node_modules/nanoid": {
+            "version": "4.0.2",
+            "resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-4.0.2.tgz",
+            "integrity": "sha512-7ZtY5KTCNheRGfEFxnedV5zFiORN1+Y1N6zvPTnHQd8ENUvfaDBeuJDZb2bN/oXwXxu3qkTXDzy57W5vAmDTBw==",
+            "dev": true,
+            "bin": {
+                "nanoid": "bin/nanoid.js"
+            },
+            "engines": {
+                "node": "^14 || ^16 || >=18"
+            }
+        },
+        "node_modules/nitropack": {
+            "version": "2.3.3",
+            "resolved": "https://registry.npmmirror.com/nitropack/-/nitropack-2.3.3.tgz",
+            "integrity": "sha512-1g/4zdwWo+tWSvno57rhRXeGk6jNbG5W1yRNtOywInT1nyoEG1ksOwQ3W3JHGB2E1GNjZwAVi611UVOVL+JgYw==",
+            "dev": true,
+            "dependencies": {
+                "@cloudflare/kv-asset-handler": "^0.3.0",
+                "@netlify/functions": "^1.4.0",
+                "@rollup/plugin-alias": "^5.0.0",
+                "@rollup/plugin-commonjs": "^24.0.1",
+                "@rollup/plugin-inject": "^5.0.3",
+                "@rollup/plugin-json": "^6.0.0",
+                "@rollup/plugin-node-resolve": "^15.0.2",
+                "@rollup/plugin-replace": "^5.0.2",
+                "@rollup/plugin-terser": "^0.4.1",
+                "@rollup/plugin-wasm": "^6.1.2",
+                "@rollup/pluginutils": "^5.0.2",
+                "@vercel/nft": "^0.22.6",
+                "archiver": "^5.3.1",
+                "c12": "^1.2.0",
+                "chalk": "^5.2.0",
+                "chokidar": "^3.5.3",
+                "consola": "^3.0.1",
+                "cookie-es": "^0.5.0",
+                "defu": "^6.1.2",
+                "destr": "^1.2.2",
+                "dot-prop": "^7.2.0",
+                "esbuild": "^0.17.16",
+                "escape-string-regexp": "^5.0.0",
+                "etag": "^1.8.1",
+                "fs-extra": "^11.1.1",
+                "globby": "^13.1.3",
+                "gzip-size": "^7.0.0",
+                "h3": "^1.6.4",
+                "hookable": "^5.5.3",
+                "http-proxy": "^1.18.1",
+                "is-primitive": "^3.0.1",
+                "jiti": "^1.18.2",
+                "klona": "^2.0.6",
+                "knitwork": "^1.0.0",
+                "listhen": "^1.0.4",
+                "mime": "^3.0.0",
+                "mlly": "^1.2.0",
+                "mri": "^1.2.0",
+                "node-fetch-native": "^1.1.0",
+                "ofetch": "^1.0.1",
+                "ohash": "^1.0.0",
+                "pathe": "^1.1.0",
+                "perfect-debounce": "^0.1.3",
+                "pkg-types": "^1.0.2",
+                "pretty-bytes": "^6.1.0",
+                "radix3": "^1.0.1",
+                "rollup": "^3.20.2",
+                "rollup-plugin-visualizer": "^5.9.0",
+                "scule": "^1.0.0",
+                "semver": "^7.4.0",
+                "serve-placeholder": "^2.0.1",
+                "serve-static": "^1.15.0",
+                "source-map-support": "^0.5.21",
+                "std-env": "^3.3.2",
+                "ufo": "^1.1.1",
+                "unenv": "^1.3.1",
+                "unimport": "^3.0.6",
+                "unstorage": "^1.4.1"
+            },
+            "bin": {
+                "nitro": "dist/cli.mjs",
+                "nitropack": "dist/cli.mjs"
+            },
+            "engines": {
+                "node": "^14.16.0 || ^16.11.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+            }
+        },
+        "node_modules/nitropack/node_modules/consola": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmmirror.com/consola/-/consola-3.0.2.tgz",
+            "integrity": "sha512-o/Wau2FmZKiQgyp3c3IULgN6J5yc0lwYMnoyiZdEpdGxKGBtt2ACbkulBZ6BUsHy1HlSJqoP4YOyPIJLgRJyKQ==",
+            "dev": true
+        },
+        "node_modules/node-domexception": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmmirror.com/node-domexception/-/node-domexception-1.0.0.tgz",
+            "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==",
+            "dev": true,
+            "engines": {
+                "node": ">=10.5.0"
+            }
+        },
+        "node_modules/node-fetch": {
+            "version": "3.3.1",
+            "resolved": "https://registry.npmmirror.com/node-fetch/-/node-fetch-3.3.1.tgz",
+            "integrity": "sha512-cRVc/kyto/7E5shrWca1Wsea4y6tL9iYJE5FBCius3JQfb/4P4I295PfhgbJQBLTx6lATE4z+wK0rPM4VS2uow==",
+            "dev": true,
+            "dependencies": {
+                "data-uri-to-buffer": "^4.0.0",
+                "fetch-blob": "^3.1.4",
+                "formdata-polyfill": "^4.0.10"
+            },
+            "engines": {
+                "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+            }
+        },
+        "node_modules/node-fetch-native": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmmirror.com/node-fetch-native/-/node-fetch-native-1.1.0.tgz",
+            "integrity": "sha512-nl5goFCig93JZ9FIV8GHT9xpNqXbxQUzkOmKIMKmncsBH9jhg7qKex8hirpymkBFmNQ114chEEG5lS4wgK2I+Q==",
+            "dev": true
+        },
+        "node_modules/node-forge": {
+            "version": "1.3.1",
+            "resolved": "https://registry.npmmirror.com/node-forge/-/node-forge-1.3.1.tgz",
+            "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
+            "dev": true,
+            "engines": {
+                "node": ">= 6.13.0"
+            }
+        },
+        "node_modules/node-gyp-build": {
+            "version": "4.6.0",
+            "resolved": "https://registry.npmmirror.com/node-gyp-build/-/node-gyp-build-4.6.0.tgz",
+            "integrity": "sha512-NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ==",
+            "dev": true,
+            "bin": {
+                "node-gyp-build": "bin.js",
+                "node-gyp-build-optional": "optional.js",
+                "node-gyp-build-test": "build-test.js"
+            }
+        },
+        "node_modules/node-releases": {
+            "version": "2.0.10",
+            "resolved": "https://registry.npmmirror.com/node-releases/-/node-releases-2.0.10.tgz",
+            "integrity": "sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w==",
+            "dev": true
+        },
+        "node_modules/nopt": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmmirror.com/nopt/-/nopt-5.0.0.tgz",
+            "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
+            "dev": true,
+            "dependencies": {
+                "abbrev": "1"
+            },
+            "bin": {
+                "nopt": "bin/nopt.js"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/normalize-path": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmmirror.com/normalize-path/-/normalize-path-3.0.0.tgz",
+            "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/normalize-range": {
+            "version": "0.1.2",
+            "resolved": "https://registry.npmmirror.com/normalize-range/-/normalize-range-0.1.2.tgz",
+            "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/normalize-wheel-es": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmmirror.com/normalize-wheel-es/-/normalize-wheel-es-1.2.0.tgz",
+            "integrity": "sha512-Wj7+EJQ8mSuXr2iWfnujrimU35R2W4FAErEyTmJoJ7ucwTn2hOUSsRehMb5RSYkxXGTM7Y9QpvPmp++w5ftoJw=="
+        },
+        "node_modules/npm-run-path": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmmirror.com/npm-run-path/-/npm-run-path-4.0.1.tgz",
+            "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+            "dev": true,
+            "dependencies": {
+                "path-key": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/npmlog": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmmirror.com/npmlog/-/npmlog-5.0.1.tgz",
+            "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==",
+            "dev": true,
+            "dependencies": {
+                "are-we-there-yet": "^2.0.0",
+                "console-control-strings": "^1.1.0",
+                "gauge": "^3.0.0",
+                "set-blocking": "^2.0.0"
+            }
+        },
+        "node_modules/nth-check": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmmirror.com/nth-check/-/nth-check-2.1.1.tgz",
+            "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
+            "dev": true,
+            "dependencies": {
+                "boolbase": "^1.0.0"
+            }
+        },
+        "node_modules/nuxi": {
+            "version": "3.4.1",
+            "resolved": "https://registry.npmmirror.com/nuxi/-/nuxi-3.4.1.tgz",
+            "integrity": "sha512-vp6unzdCxRvWyKoQCMN0Qq6D8ETqV5INuwAWG1WfhINXiQ34WRvwcTwU2zxKe29pzek1gGF30mxWK50OXGSepw==",
+            "dev": true,
+            "bin": {
+                "nuxi": "bin/nuxi.mjs"
+            },
+            "engines": {
+                "node": "^14.18.0 || ^16.10.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+            },
+            "optionalDependencies": {
+                "fsevents": "~2.3.2"
+            }
+        },
+        "node_modules/nuxt": {
+            "version": "3.4.1",
+            "resolved": "https://registry.npmmirror.com/nuxt/-/nuxt-3.4.1.tgz",
+            "integrity": "sha512-wKT5iZebO1D7QtAN1fDNNsjaTFbAC5pO4kWzw2qX2OOg2SWP/k42sCfxbcz/JkLL4FJVwpya+9OD9/2MwEdt1g==",
+            "dev": true,
+            "dependencies": {
+                "@nuxt/devalue": "^2.0.0",
+                "@nuxt/kit": "3.4.1",
+                "@nuxt/schema": "3.4.1",
+                "@nuxt/telemetry": "^2.2.0",
+                "@nuxt/ui-templates": "^1.1.1",
+                "@nuxt/vite-builder": "3.4.1",
+                "@unhead/ssr": "^1.1.25",
+                "@unhead/vue": "^1.1.25",
+                "@vue/reactivity": "^3.2.47",
+                "@vue/shared": "^3.2.47",
+                "chokidar": "^3.5.3",
+                "cookie-es": "^0.5.0",
+                "defu": "^6.1.2",
+                "destr": "^1.2.2",
+                "devalue": "^4.3.0",
+                "escape-string-regexp": "^5.0.0",
+                "estree-walker": "^3.0.3",
+                "fs-extra": "^11.1.1",
+                "globby": "^13.1.4",
+                "h3": "^1.6.4",
+                "hash-sum": "^2.0.0",
+                "hookable": "^5.5.3",
+                "jiti": "^1.18.2",
+                "knitwork": "^1.0.0",
+                "local-pkg": "^0.4.3",
+                "magic-string": "^0.30.0",
+                "mlly": "^1.2.0",
+                "nitropack": "^2.3.3",
+                "nuxi": "3.4.1",
+                "nypm": "^0.2.0",
+                "ofetch": "^1.0.1",
+                "ohash": "^1.0.0",
+                "pathe": "^1.1.0",
+                "perfect-debounce": "^0.1.3",
+                "prompts": "^2.4.2",
+                "scule": "^1.0.0",
+                "strip-literal": "^1.0.1",
+                "ufo": "^1.1.1",
+                "unctx": "^2.2.0",
+                "unenv": "^1.3.1",
+                "unimport": "^3.0.6",
+                "unplugin": "^1.3.1",
+                "untyped": "^1.3.2",
+                "vue": "^3.2.47",
+                "vue-bundle-renderer": "^1.0.3",
+                "vue-devtools-stub": "^0.1.0",
+                "vue-router": "^4.1.6"
+            },
+            "bin": {
+                "nuxi": "bin/nuxt.mjs",
+                "nuxt": "bin/nuxt.mjs"
+            },
+            "engines": {
+                "node": "^14.18.0 || ^16.10.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+            },
+            "peerDependencies": {
+                "@types/node": "^14.18.0 || ^16.10.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+            }
+        },
+        "node_modules/nuxt-windicss": {
+            "version": "2.6.0",
+            "resolved": "https://registry.npmmirror.com/nuxt-windicss/-/nuxt-windicss-2.6.0.tgz",
+            "integrity": "sha512-A4RyyDad6QM0XdgTsjmvQRR17jLF1ZnpMUEUdFjbfO9sgDuyTWtlmfCVtBW6wAIPavGZYD49cem75vyI7sD10g==",
+            "dev": true,
+            "dependencies": {
+                "@nuxt/kit": "3.0.0",
+                "@windicss/config": "^1.8.8",
+                "@windicss/plugin-utils": "^1.8.8",
+                "consola": "^2.15.3",
+                "defu": "^6.1.1",
+                "fs-extra": "^10.1.0",
+                "h3": "^1.0.1",
+                "listhen": "^1.0.0",
+                "pathe": "^1.0.0",
+                "read-cache": "^1.0.0",
+                "sirv": "^2.0.2",
+                "vite-plugin-windicss": "^1.8.8",
+                "windicss": "^3.5.6",
+                "windicss-analysis": "^0.3.5",
+                "windicss-webpack-plugin": "^1.7.7"
+            }
+        },
+        "node_modules/nuxt-windicss/node_modules/@nuxt/kit": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmmirror.com/@nuxt/kit/-/kit-3.0.0.tgz",
+            "integrity": "sha512-7ZsOLt5s9a0ZleAIzmoD70JwkZf5ti6bDdxl6f8ew7Huxz+ni/oRfTPTX9TrORXsgW5CvDt6Q9M7IJNPkAN/Iw==",
+            "dev": true,
+            "dependencies": {
+                "@nuxt/schema": "3.0.0",
+                "c12": "^1.0.1",
+                "consola": "^2.15.3",
+                "defu": "^6.1.1",
+                "globby": "^13.1.2",
+                "hash-sum": "^2.0.0",
+                "ignore": "^5.2.0",
+                "jiti": "^1.16.0",
+                "knitwork": "^1.0.0",
+                "lodash.template": "^4.5.0",
+                "mlly": "^1.0.0",
+                "pathe": "^1.0.0",
+                "pkg-types": "^1.0.1",
+                "scule": "^1.0.0",
+                "semver": "^7.3.8",
+                "unctx": "^2.1.0",
+                "unimport": "^1.0.1",
+                "untyped": "^1.0.0"
+            },
+            "engines": {
+                "node": "^14.16.0 || ^16.10.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+            }
+        },
+        "node_modules/nuxt-windicss/node_modules/@nuxt/schema": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmmirror.com/@nuxt/schema/-/schema-3.0.0.tgz",
+            "integrity": "sha512-5fwsidhs5NjFzR8sIzHMXO0WFGkI3tCH3ViANn2W4N5qCwoYZ0n1sZBkQ9Esn1VoEed6RsIlTpWrPZPVtqNkGQ==",
+            "dev": true,
+            "dependencies": {
+                "c12": "^1.0.1",
+                "create-require": "^1.1.1",
+                "defu": "^6.1.1",
+                "jiti": "^1.16.0",
+                "pathe": "^1.0.0",
+                "pkg-types": "^1.0.1",
+                "postcss-import-resolver": "^2.0.0",
+                "scule": "^1.0.0",
+                "std-env": "^3.3.1",
+                "ufo": "^1.0.0",
+                "unimport": "^1.0.1",
+                "untyped": "^1.0.0"
+            },
+            "engines": {
+                "node": "^14.16.0 || ^16.10.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+            }
+        },
+        "node_modules/nuxt-windicss/node_modules/fs-extra": {
+            "version": "10.1.0",
+            "resolved": "https://registry.npmmirror.com/fs-extra/-/fs-extra-10.1.0.tgz",
+            "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+            "dev": true,
+            "dependencies": {
+                "graceful-fs": "^4.2.0",
+                "jsonfile": "^6.0.1",
+                "universalify": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/nuxt-windicss/node_modules/magic-string": {
+            "version": "0.27.0",
+            "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.27.0.tgz",
+            "integrity": "sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==",
+            "dev": true,
+            "dependencies": {
+                "@jridgewell/sourcemap-codec": "^1.4.13"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/nuxt-windicss/node_modules/unimport": {
+            "version": "1.3.0",
+            "resolved": "https://registry.npmmirror.com/unimport/-/unimport-1.3.0.tgz",
+            "integrity": "sha512-fOkrdxglsHd428yegH0wPH/6IfaSdDeMXtdRGn6en/ccyzc2aaoxiUTMrJyc6Bu+xoa18RJRPMfLUHEzjz8atw==",
+            "dev": true,
+            "dependencies": {
+                "@rollup/pluginutils": "^5.0.2",
+                "escape-string-regexp": "^5.0.0",
+                "fast-glob": "^3.2.12",
+                "local-pkg": "^0.4.3",
+                "magic-string": "^0.27.0",
+                "mlly": "^1.1.0",
+                "pathe": "^1.0.0",
+                "pkg-types": "^1.0.1",
+                "scule": "^1.0.0",
+                "strip-literal": "^1.0.0",
+                "unplugin": "^1.0.1"
+            }
+        },
+        "node_modules/nypm": {
+            "version": "0.2.0",
+            "resolved": "https://registry.npmmirror.com/nypm/-/nypm-0.2.0.tgz",
+            "integrity": "sha512-auBv78LkHyU9TywBE91N+RTkanVyFLsVayZaHW+YYvJDJ3u2PCwLaYB3eecPQD9tgCIXGuH871HlHTdKSf6rtw==",
+            "dev": true,
+            "dependencies": {
+                "execa": "^7.1.1"
+            },
+            "engines": {
+                "node": "^14.16.0 || ^16.10.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+            }
+        },
+        "node_modules/nypm/node_modules/execa": {
+            "version": "7.1.1",
+            "resolved": "https://registry.npmmirror.com/execa/-/execa-7.1.1.tgz",
+            "integrity": "sha512-wH0eMf/UXckdUYnO21+HDztteVv05rq2GXksxT4fCGeHkBhw1DROXh40wcjMcRqDOWE7iPJ4n3M7e2+YFP+76Q==",
+            "dev": true,
+            "dependencies": {
+                "cross-spawn": "^7.0.3",
+                "get-stream": "^6.0.1",
+                "human-signals": "^4.3.0",
+                "is-stream": "^3.0.0",
+                "merge-stream": "^2.0.0",
+                "npm-run-path": "^5.1.0",
+                "onetime": "^6.0.0",
+                "signal-exit": "^3.0.7",
+                "strip-final-newline": "^3.0.0"
+            },
+            "engines": {
+                "node": "^14.18.0 || ^16.14.0 || >=18.0.0"
+            }
+        },
+        "node_modules/nypm/node_modules/human-signals": {
+            "version": "4.3.1",
+            "resolved": "https://registry.npmmirror.com/human-signals/-/human-signals-4.3.1.tgz",
+            "integrity": "sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==",
+            "dev": true,
+            "engines": {
+                "node": ">=14.18.0"
+            }
+        },
+        "node_modules/nypm/node_modules/is-stream": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmmirror.com/is-stream/-/is-stream-3.0.0.tgz",
+            "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==",
+            "dev": true,
+            "engines": {
+                "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+            }
+        },
+        "node_modules/nypm/node_modules/mimic-fn": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmmirror.com/mimic-fn/-/mimic-fn-4.0.0.tgz",
+            "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==",
+            "dev": true,
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/nypm/node_modules/npm-run-path": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmmirror.com/npm-run-path/-/npm-run-path-5.1.0.tgz",
+            "integrity": "sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==",
+            "dev": true,
+            "dependencies": {
+                "path-key": "^4.0.0"
+            },
+            "engines": {
+                "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+            }
+        },
+        "node_modules/nypm/node_modules/onetime": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmmirror.com/onetime/-/onetime-6.0.0.tgz",
+            "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==",
+            "dev": true,
+            "dependencies": {
+                "mimic-fn": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/nypm/node_modules/path-key": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmmirror.com/path-key/-/path-key-4.0.0.tgz",
+            "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==",
+            "dev": true,
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/nypm/node_modules/strip-final-newline": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmmirror.com/strip-final-newline/-/strip-final-newline-3.0.0.tgz",
+            "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==",
+            "dev": true,
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/object-assign": {
+            "version": "4.1.1",
+            "resolved": "https://registry.npmmirror.com/object-assign/-/object-assign-4.1.1.tgz",
+            "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/ofetch": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmmirror.com/ofetch/-/ofetch-1.0.1.tgz",
+            "integrity": "sha512-icBz2JYfEpt+wZz1FRoGcrMigjNKjzvufE26m9+yUiacRQRHwnNlGRPiDnW4op7WX/MR6aniwS8xw8jyVelF2g==",
+            "dev": true,
+            "dependencies": {
+                "destr": "^1.2.2",
+                "node-fetch-native": "^1.0.2",
+                "ufo": "^1.1.0"
+            }
+        },
+        "node_modules/ohash": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmmirror.com/ohash/-/ohash-1.0.0.tgz",
+            "integrity": "sha512-kxSyzq6tt+6EE/xCnD1XaFhCCjUNUaz3X30rJp6mnjGLXAAvuPFqohMdv0aScWzajR45C29HyBaXZ8jXBwnh9A==",
+            "dev": true
+        },
+        "node_modules/on-finished": {
+            "version": "2.4.1",
+            "resolved": "https://registry.npmmirror.com/on-finished/-/on-finished-2.4.1.tgz",
+            "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+            "dev": true,
+            "dependencies": {
+                "ee-first": "1.1.1"
+            },
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/once": {
+            "version": "1.4.0",
+            "resolved": "https://registry.npmmirror.com/once/-/once-1.4.0.tgz",
+            "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+            "dev": true,
+            "dependencies": {
+                "wrappy": "1"
+            }
+        },
+        "node_modules/onetime": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmmirror.com/onetime/-/onetime-5.1.2.tgz",
+            "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+            "dev": true,
+            "dependencies": {
+                "mimic-fn": "^2.1.0"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/open": {
+            "version": "8.4.2",
+            "resolved": "https://registry.npmmirror.com/open/-/open-8.4.2.tgz",
+            "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
+            "dev": true,
+            "dependencies": {
+                "define-lazy-prop": "^2.0.0",
+                "is-docker": "^2.1.1",
+                "is-wsl": "^2.2.0"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/open/node_modules/is-docker": {
+            "version": "2.2.1",
+            "resolved": "https://registry.npmmirror.com/is-docker/-/is-docker-2.2.1.tgz",
+            "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+            "dev": true,
+            "bin": {
+                "is-docker": "cli.js"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/ora": {
+            "version": "6.3.0",
+            "resolved": "https://registry.npmmirror.com/ora/-/ora-6.3.0.tgz",
+            "integrity": "sha512-1/D8uRFY0ay2kgBpmAwmSA404w4OoPVhHMqRqtjvrcK/dnzcEZxMJ+V4DUbyICu8IIVRclHcOf5wlD1tMY4GUQ==",
+            "dev": true,
+            "dependencies": {
+                "chalk": "^5.0.0",
+                "cli-cursor": "^4.0.0",
+                "cli-spinners": "^2.6.1",
+                "is-interactive": "^2.0.0",
+                "is-unicode-supported": "^1.1.0",
+                "log-symbols": "^5.1.0",
+                "stdin-discarder": "^0.1.0",
+                "strip-ansi": "^7.0.1",
+                "wcwidth": "^1.0.1"
+            },
+            "engines": {
+                "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+            }
+        },
+        "node_modules/os-tmpdir": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmmirror.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+            "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/p-limit": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+            "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+            "dependencies": {
+                "p-try": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=6"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/p-locate": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+            "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+            "dependencies": {
+                "p-limit": "^2.2.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/p-try": {
+            "version": "2.2.0",
+            "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+            "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/parse-git-config": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmmirror.com/parse-git-config/-/parse-git-config-3.0.0.tgz",
+            "integrity": "sha512-wXoQGL1D+2COYWCD35/xbiKma1Z15xvZL8cI25wvxzled58V51SJM04Urt/uznS900iQor7QO04SgdfT/XlbuA==",
+            "dev": true,
+            "dependencies": {
+                "git-config-path": "^2.0.0",
+                "ini": "^1.3.5"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/parse-path": {
+            "version": "7.0.0",
+            "resolved": "https://registry.npmmirror.com/parse-path/-/parse-path-7.0.0.tgz",
+            "integrity": "sha512-Euf9GG8WT9CdqwuWJGdf3RkUcTBArppHABkO7Lm8IzRQp0e2r/kkFnmhu4TSK30Wcu5rVAZLmfPKSBBi9tWFog==",
+            "dev": true,
+            "dependencies": {
+                "protocols": "^2.0.0"
+            }
+        },
+        "node_modules/parse-url": {
+            "version": "8.1.0",
+            "resolved": "https://registry.npmmirror.com/parse-url/-/parse-url-8.1.0.tgz",
+            "integrity": "sha512-xDvOoLU5XRrcOZvnI6b8zA6n9O9ejNk/GExuz1yBuWUGn9KA97GI6HTs6u02wKara1CeVmZhH+0TZFdWScR89w==",
+            "dev": true,
+            "dependencies": {
+                "parse-path": "^7.0.0"
+            }
+        },
+        "node_modules/parse5": {
+            "version": "7.1.2",
+            "resolved": "https://registry.npmmirror.com/parse5/-/parse5-7.1.2.tgz",
+            "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==",
+            "dev": true,
+            "dependencies": {
+                "entities": "^4.4.0"
+            }
+        },
+        "node_modules/parse5-htmlparser2-tree-adapter": {
+            "version": "7.0.0",
+            "resolved": "https://registry.npmmirror.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-7.0.0.tgz",
+            "integrity": "sha512-B77tOZrqqfUfnVcOrUvfdLbz4pu4RopLD/4vmu3HUPswwTA8OH0EMW9BlWR2B0RCoiZRAHEUu7IxeP1Pd1UU+g==",
+            "dev": true,
+            "dependencies": {
+                "domhandler": "^5.0.2",
+                "parse5": "^7.0.0"
+            }
+        },
+        "node_modules/parseurl": {
+            "version": "1.3.3",
+            "resolved": "https://registry.npmmirror.com/parseurl/-/parseurl-1.3.3.tgz",
+            "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/path-exists": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+            "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/path-is-absolute": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmmirror.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+            "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/path-key": {
+            "version": "3.1.1",
+            "resolved": "https://registry.npmmirror.com/path-key/-/path-key-3.1.1.tgz",
+            "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/path-parse": {
+            "version": "1.0.7",
+            "resolved": "https://registry.npmmirror.com/path-parse/-/path-parse-1.0.7.tgz",
+            "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+            "dev": true
+        },
+        "node_modules/path-type": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmmirror.com/path-type/-/path-type-4.0.0.tgz",
+            "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/pathe": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmmirror.com/pathe/-/pathe-1.1.0.tgz",
+            "integrity": "sha512-ODbEPR0KKHqECXW1GoxdDb+AZvULmXjVPy4rt+pGo2+TnjJTIPJQSVS6N63n8T2Ip+syHhbn52OewKicV0373w==",
+            "dev": true
+        },
+        "node_modules/perfect-debounce": {
+            "version": "0.1.3",
+            "resolved": "https://registry.npmmirror.com/perfect-debounce/-/perfect-debounce-0.1.3.tgz",
+            "integrity": "sha512-NOT9AcKiDGpnV/HBhI22Str++XWcErO/bALvHCuhv33owZW/CjH8KAFLZDCmu3727sihe0wTxpDhyGc6M8qacQ==",
+            "dev": true
+        },
+        "node_modules/picocolors": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmmirror.com/picocolors/-/picocolors-1.0.0.tgz",
+            "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
+        },
+        "node_modules/picomatch": {
+            "version": "2.3.1",
+            "resolved": "https://registry.npmmirror.com/picomatch/-/picomatch-2.3.1.tgz",
+            "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+            "dev": true,
+            "engines": {
+                "node": ">=8.6"
+            }
+        },
+        "node_modules/pify": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmmirror.com/pify/-/pify-2.3.0.tgz",
+            "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/pinia": {
+            "version": "2.0.33",
+            "resolved": "https://registry.npmmirror.com/pinia/-/pinia-2.0.33.tgz",
+            "integrity": "sha512-HOj1yVV2itw6rNIrR2f7+MirGNxhORjrULL8GWgRwXsGSvEqIQ+SE0MYt6cwtpegzCda3i+rVTZM+AM7CG+kRg==",
+            "dependencies": {
+                "@vue/devtools-api": "^6.5.0",
+                "vue-demi": "*"
+            },
+            "peerDependencies": {
+                "@vue/composition-api": "^1.4.0",
+                "typescript": ">=4.4.4",
+                "vue": "^2.6.14 || ^3.2.0"
+            },
+            "peerDependenciesMeta": {
+                "@vue/composition-api": {
+                    "optional": true
+                },
+                "typescript": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/pkg-types": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmmirror.com/pkg-types/-/pkg-types-1.0.2.tgz",
+            "integrity": "sha512-hM58GKXOcj8WTqUXnsQyJYXdeAPbythQgEF3nTcEo+nkD49chjQ9IKm/QJy9xf6JakXptz86h7ecP2024rrLaQ==",
+            "dev": true,
+            "dependencies": {
+                "jsonc-parser": "^3.2.0",
+                "mlly": "^1.1.1",
+                "pathe": "^1.1.0"
+            }
+        },
+        "node_modules/pngjs": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-5.0.0.tgz",
+            "integrity": "sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw==",
+            "engines": {
+                "node": ">=10.13.0"
+            }
+        },
+        "node_modules/postcss": {
+            "version": "8.4.21",
+            "resolved": "https://registry.npmmirror.com/postcss/-/postcss-8.4.21.tgz",
+            "integrity": "sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==",
+            "dependencies": {
+                "nanoid": "^3.3.4",
+                "picocolors": "^1.0.0",
+                "source-map-js": "^1.0.2"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >=14"
+            }
+        },
+        "node_modules/postcss-calc": {
+            "version": "8.2.4",
+            "resolved": "https://registry.npmmirror.com/postcss-calc/-/postcss-calc-8.2.4.tgz",
+            "integrity": "sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==",
+            "dev": true,
+            "dependencies": {
+                "postcss-selector-parser": "^6.0.9",
+                "postcss-value-parser": "^4.2.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.2"
+            }
+        },
+        "node_modules/postcss-colormin": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmmirror.com/postcss-colormin/-/postcss-colormin-6.0.0.tgz",
+            "integrity": "sha512-EuO+bAUmutWoZYgHn2T1dG1pPqHU6L4TjzPlu4t1wZGXQ/fxV16xg2EJmYi0z+6r+MGV1yvpx1BHkUaRrPa2bw==",
+            "dev": true,
+            "dependencies": {
+                "browserslist": "^4.21.4",
+                "caniuse-api": "^3.0.0",
+                "colord": "^2.9.1",
+                "postcss-value-parser": "^4.2.0"
+            },
+            "engines": {
+                "node": "^14 || ^16 || >=18.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/postcss-convert-values": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmmirror.com/postcss-convert-values/-/postcss-convert-values-6.0.0.tgz",
+            "integrity": "sha512-U5D8QhVwqT++ecmy8rnTb+RL9n/B806UVaS3m60lqle4YDFcpbS3ae5bTQIh3wOGUSDHSEtMYLs/38dNG7EYFw==",
+            "dev": true,
+            "dependencies": {
+                "browserslist": "^4.21.4",
+                "postcss-value-parser": "^4.2.0"
+            },
+            "engines": {
+                "node": "^14 || ^16 || >=18.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/postcss-discard-comments": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmmirror.com/postcss-discard-comments/-/postcss-discard-comments-6.0.0.tgz",
+            "integrity": "sha512-p2skSGqzPMZkEQvJsgnkBhCn8gI7NzRH2683EEjrIkoMiwRELx68yoUJ3q3DGSGuQ8Ug9Gsn+OuDr46yfO+eFw==",
+            "dev": true,
+            "engines": {
+                "node": "^14 || ^16 || >=18.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/postcss-discard-duplicates": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmmirror.com/postcss-discard-duplicates/-/postcss-discard-duplicates-6.0.0.tgz",
+            "integrity": "sha512-bU1SXIizMLtDW4oSsi5C/xHKbhLlhek/0/yCnoMQany9k3nPBq+Ctsv/9oMmyqbR96HYHxZcHyK2HR5P/mqoGA==",
+            "dev": true,
+            "engines": {
+                "node": "^14 || ^16 || >=18.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/postcss-discard-empty": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmmirror.com/postcss-discard-empty/-/postcss-discard-empty-6.0.0.tgz",
+            "integrity": "sha512-b+h1S1VT6dNhpcg+LpyiUrdnEZfICF0my7HAKgJixJLW7BnNmpRH34+uw/etf5AhOlIhIAuXApSzzDzMI9K/gQ==",
+            "dev": true,
+            "engines": {
+                "node": "^14 || ^16 || >=18.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/postcss-discard-overridden": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmmirror.com/postcss-discard-overridden/-/postcss-discard-overridden-6.0.0.tgz",
+            "integrity": "sha512-4VELwssYXDFigPYAZ8vL4yX4mUepF/oCBeeIT4OXsJPYOtvJumyz9WflmJWTfDwCUcpDR+z0zvCWBXgTx35SVw==",
+            "dev": true,
+            "engines": {
+                "node": "^14 || ^16 || >=18.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/postcss-import": {
+            "version": "15.1.0",
+            "resolved": "https://registry.npmmirror.com/postcss-import/-/postcss-import-15.1.0.tgz",
+            "integrity": "sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==",
+            "dev": true,
+            "dependencies": {
+                "postcss-value-parser": "^4.0.0",
+                "read-cache": "^1.0.0",
+                "resolve": "^1.1.7"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.0.0"
+            }
+        },
+        "node_modules/postcss-import-resolver": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/postcss-import-resolver/-/postcss-import-resolver-2.0.0.tgz",
+            "integrity": "sha512-y001XYgGvVwgxyxw9J1a5kqM/vtmIQGzx34g0A0Oy44MFcy/ZboZw1hu/iN3VYFjSTRzbvd7zZJJz0Kh0AGkTw==",
+            "dev": true,
+            "dependencies": {
+                "enhanced-resolve": "^4.1.1"
+            }
+        },
+        "node_modules/postcss-import-resolver/node_modules/enhanced-resolve": {
+            "version": "4.5.0",
+            "resolved": "https://registry.npmmirror.com/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz",
+            "integrity": "sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg==",
+            "dev": true,
+            "dependencies": {
+                "graceful-fs": "^4.1.2",
+                "memory-fs": "^0.5.0",
+                "tapable": "^1.0.0"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            }
+        },
+        "node_modules/postcss-import-resolver/node_modules/tapable": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmmirror.com/tapable/-/tapable-1.1.3.tgz",
+            "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
+            "dev": true,
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/postcss-merge-longhand": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmmirror.com/postcss-merge-longhand/-/postcss-merge-longhand-6.0.0.tgz",
+            "integrity": "sha512-4VSfd1lvGkLTLYcxFuISDtWUfFS4zXe0FpF149AyziftPFQIWxjvFSKhA4MIxMe4XM3yTDgQMbSNgzIVxChbIg==",
+            "dev": true,
+            "dependencies": {
+                "postcss-value-parser": "^4.2.0",
+                "stylehacks": "^6.0.0"
+            },
+            "engines": {
+                "node": "^14 || ^16 || >=18.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/postcss-merge-rules": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmmirror.com/postcss-merge-rules/-/postcss-merge-rules-6.0.0.tgz",
+            "integrity": "sha512-rCXkklftzEkniyv3f4mRCQzxD6oE4Quyh61uyWTUbCJ26Pv2hoz+fivJSsSBWxDBeScR4fKCfF3HHTcD7Ybqnw==",
+            "dev": true,
+            "dependencies": {
+                "browserslist": "^4.21.4",
+                "caniuse-api": "^3.0.0",
+                "cssnano-utils": "^4.0.0",
+                "postcss-selector-parser": "^6.0.5"
+            },
+            "engines": {
+                "node": "^14 || ^16 || >=18.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/postcss-minify-font-values": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmmirror.com/postcss-minify-font-values/-/postcss-minify-font-values-6.0.0.tgz",
+            "integrity": "sha512-zNRAVtyh5E8ndZEYXA4WS8ZYsAp798HiIQ1V2UF/C/munLp2r1UGHwf1+6JFu7hdEhJFN+W1WJQKBrtjhFgEnA==",
+            "dev": true,
+            "dependencies": {
+                "postcss-value-parser": "^4.2.0"
+            },
+            "engines": {
+                "node": "^14 || ^16 || >=18.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/postcss-minify-gradients": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmmirror.com/postcss-minify-gradients/-/postcss-minify-gradients-6.0.0.tgz",
+            "integrity": "sha512-wO0F6YfVAR+K1xVxF53ueZJza3L+R3E6cp0VwuXJQejnNUH0DjcAFe3JEBeTY1dLwGa0NlDWueCA1VlEfiKgAA==",
+            "dev": true,
+            "dependencies": {
+                "colord": "^2.9.1",
+                "cssnano-utils": "^4.0.0",
+                "postcss-value-parser": "^4.2.0"
+            },
+            "engines": {
+                "node": "^14 || ^16 || >=18.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/postcss-minify-params": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmmirror.com/postcss-minify-params/-/postcss-minify-params-6.0.0.tgz",
+            "integrity": "sha512-Fz/wMQDveiS0n5JPcvsMeyNXOIMrwF88n7196puSuQSWSa+/Ofc1gDOSY2xi8+A4PqB5dlYCKk/WfqKqsI+ReQ==",
+            "dev": true,
+            "dependencies": {
+                "browserslist": "^4.21.4",
+                "cssnano-utils": "^4.0.0",
+                "postcss-value-parser": "^4.2.0"
+            },
+            "engines": {
+                "node": "^14 || ^16 || >=18.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/postcss-minify-selectors": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmmirror.com/postcss-minify-selectors/-/postcss-minify-selectors-6.0.0.tgz",
+            "integrity": "sha512-ec/q9JNCOC2CRDNnypipGfOhbYPuUkewGwLnbv6omue/PSASbHSU7s6uSQ0tcFRVv731oMIx8k0SP4ZX6be/0g==",
+            "dev": true,
+            "dependencies": {
+                "postcss-selector-parser": "^6.0.5"
+            },
+            "engines": {
+                "node": "^14 || ^16 || >=18.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/postcss-normalize-charset": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmmirror.com/postcss-normalize-charset/-/postcss-normalize-charset-6.0.0.tgz",
+            "integrity": "sha512-cqundwChbu8yO/gSWkuFDmKrCZ2vJzDAocheT2JTd0sFNA4HMGoKMfbk2B+J0OmO0t5GUkiAkSM5yF2rSLUjgQ==",
+            "dev": true,
+            "engines": {
+                "node": "^14 || ^16 || >=18.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/postcss-normalize-display-values": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmmirror.com/postcss-normalize-display-values/-/postcss-normalize-display-values-6.0.0.tgz",
+            "integrity": "sha512-Qyt5kMrvy7dJRO3OjF7zkotGfuYALETZE+4lk66sziWSPzlBEt7FrUshV6VLECkI4EN8Z863O6Nci4NXQGNzYw==",
+            "dev": true,
+            "dependencies": {
+                "postcss-value-parser": "^4.2.0"
+            },
+            "engines": {
+                "node": "^14 || ^16 || >=18.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/postcss-normalize-positions": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmmirror.com/postcss-normalize-positions/-/postcss-normalize-positions-6.0.0.tgz",
+            "integrity": "sha512-mPCzhSV8+30FZyWhxi6UoVRYd3ZBJgTRly4hOkaSifo0H+pjDYcii/aVT4YE6QpOil15a5uiv6ftnY3rm0igPg==",
+            "dev": true,
+            "dependencies": {
+                "postcss-value-parser": "^4.2.0"
+            },
+            "engines": {
+                "node": "^14 || ^16 || >=18.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/postcss-normalize-repeat-style": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmmirror.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-6.0.0.tgz",
+            "integrity": "sha512-50W5JWEBiOOAez2AKBh4kRFm2uhrT3O1Uwdxz7k24aKtbD83vqmcVG7zoIwo6xI2FZ/HDlbrCopXhLeTpQib1A==",
+            "dev": true,
+            "dependencies": {
+                "postcss-value-parser": "^4.2.0"
+            },
+            "engines": {
+                "node": "^14 || ^16 || >=18.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/postcss-normalize-string": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmmirror.com/postcss-normalize-string/-/postcss-normalize-string-6.0.0.tgz",
+            "integrity": "sha512-KWkIB7TrPOiqb8ZZz6homet2KWKJwIlysF5ICPZrXAylGe2hzX/HSf4NTX2rRPJMAtlRsj/yfkrWGavFuB+c0w==",
+            "dev": true,
+            "dependencies": {
+                "postcss-value-parser": "^4.2.0"
+            },
+            "engines": {
+                "node": "^14 || ^16 || >=18.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/postcss-normalize-timing-functions": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmmirror.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-6.0.0.tgz",
+            "integrity": "sha512-tpIXWciXBp5CiFs8sem90IWlw76FV4oi6QEWfQwyeREVwUy39VSeSqjAT7X0Qw650yAimYW5gkl2Gd871N5SQg==",
+            "dev": true,
+            "dependencies": {
+                "postcss-value-parser": "^4.2.0"
+            },
+            "engines": {
+                "node": "^14 || ^16 || >=18.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/postcss-normalize-unicode": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmmirror.com/postcss-normalize-unicode/-/postcss-normalize-unicode-6.0.0.tgz",
+            "integrity": "sha512-ui5crYkb5ubEUDugDc786L/Me+DXp2dLg3fVJbqyAl0VPkAeALyAijF2zOsnZyaS1HyfPuMH0DwyY18VMFVNkg==",
+            "dev": true,
+            "dependencies": {
+                "browserslist": "^4.21.4",
+                "postcss-value-parser": "^4.2.0"
+            },
+            "engines": {
+                "node": "^14 || ^16 || >=18.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/postcss-normalize-url": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmmirror.com/postcss-normalize-url/-/postcss-normalize-url-6.0.0.tgz",
+            "integrity": "sha512-98mvh2QzIPbb02YDIrYvAg4OUzGH7s1ZgHlD3fIdTHLgPLRpv1ZTKJDnSAKr4Rt21ZQFzwhGMXxpXlfrUBKFHw==",
+            "dev": true,
+            "dependencies": {
+                "postcss-value-parser": "^4.2.0"
+            },
+            "engines": {
+                "node": "^14 || ^16 || >=18.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/postcss-normalize-whitespace": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmmirror.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-6.0.0.tgz",
+            "integrity": "sha512-7cfE1AyLiK0+ZBG6FmLziJzqQCpTQY+8XjMhMAz8WSBSCsCNNUKujgIgjCAmDT3cJ+3zjTXFkoD15ZPsckArVw==",
+            "dev": true,
+            "dependencies": {
+                "postcss-value-parser": "^4.2.0"
+            },
+            "engines": {
+                "node": "^14 || ^16 || >=18.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/postcss-ordered-values": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmmirror.com/postcss-ordered-values/-/postcss-ordered-values-6.0.0.tgz",
+            "integrity": "sha512-K36XzUDpvfG/nWkjs6d1hRBydeIxGpKS2+n+ywlKPzx1nMYDYpoGbcjhj5AwVYJK1qV2/SDoDEnHzlPD6s3nMg==",
+            "dev": true,
+            "dependencies": {
+                "cssnano-utils": "^4.0.0",
+                "postcss-value-parser": "^4.2.0"
+            },
+            "engines": {
+                "node": "^14 || ^16 || >=18.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/postcss-reduce-initial": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmmirror.com/postcss-reduce-initial/-/postcss-reduce-initial-6.0.0.tgz",
+            "integrity": "sha512-s2UOnidpVuXu6JiiI5U+fV2jamAw5YNA9Fdi/GRK0zLDLCfXmSGqQtzpUPtfN66RtCbb9fFHoyZdQaxOB3WxVA==",
+            "dev": true,
+            "dependencies": {
+                "browserslist": "^4.21.4",
+                "caniuse-api": "^3.0.0"
+            },
+            "engines": {
+                "node": "^14 || ^16 || >=18.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/postcss-reduce-transforms": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmmirror.com/postcss-reduce-transforms/-/postcss-reduce-transforms-6.0.0.tgz",
+            "integrity": "sha512-FQ9f6xM1homnuy1wLe9lP1wujzxnwt1EwiigtWwuyf8FsqqXUDUp2Ulxf9A5yjlUOTdCJO6lonYjg1mgqIIi2w==",
+            "dev": true,
+            "dependencies": {
+                "postcss-value-parser": "^4.2.0"
+            },
+            "engines": {
+                "node": "^14 || ^16 || >=18.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/postcss-selector-parser": {
+            "version": "6.0.11",
+            "resolved": "https://registry.npmmirror.com/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz",
+            "integrity": "sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==",
+            "dev": true,
+            "dependencies": {
+                "cssesc": "^3.0.0",
+                "util-deprecate": "^1.0.2"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/postcss-svgo": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmmirror.com/postcss-svgo/-/postcss-svgo-6.0.0.tgz",
+            "integrity": "sha512-r9zvj/wGAoAIodn84dR/kFqwhINp5YsJkLoujybWG59grR/IHx+uQ2Zo+IcOwM0jskfYX3R0mo+1Kip1VSNcvw==",
+            "dev": true,
+            "dependencies": {
+                "postcss-value-parser": "^4.2.0",
+                "svgo": "^3.0.2"
+            },
+            "engines": {
+                "node": "^14 || ^16 || >= 18"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/postcss-unique-selectors": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmmirror.com/postcss-unique-selectors/-/postcss-unique-selectors-6.0.0.tgz",
+            "integrity": "sha512-EPQzpZNxOxP7777t73RQpZE5e9TrnCrkvp7AH7a0l89JmZiPnS82y216JowHXwpBCQitfyxrof9TK3rYbi7/Yw==",
+            "dev": true,
+            "dependencies": {
+                "postcss-selector-parser": "^6.0.5"
+            },
+            "engines": {
+                "node": "^14 || ^16 || >=18.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/postcss-url": {
+            "version": "10.1.3",
+            "resolved": "https://registry.npmmirror.com/postcss-url/-/postcss-url-10.1.3.tgz",
+            "integrity": "sha512-FUzyxfI5l2tKmXdYc6VTu3TWZsInayEKPbiyW+P6vmmIrrb4I6CGX0BFoewgYHLK+oIL5FECEK02REYRpBvUCw==",
+            "dev": true,
+            "dependencies": {
+                "make-dir": "~3.1.0",
+                "mime": "~2.5.2",
+                "minimatch": "~3.0.4",
+                "xxhashjs": "~0.2.2"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "peerDependencies": {
+                "postcss": "^8.0.0"
+            }
+        },
+        "node_modules/postcss-url/node_modules/brace-expansion": {
+            "version": "1.1.11",
+            "resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.11.tgz",
+            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+            "dev": true,
+            "dependencies": {
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
+            }
+        },
+        "node_modules/postcss-url/node_modules/mime": {
+            "version": "2.5.2",
+            "resolved": "https://registry.npmmirror.com/mime/-/mime-2.5.2.tgz",
+            "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==",
+            "dev": true,
+            "bin": {
+                "mime": "cli.js"
+            },
+            "engines": {
+                "node": ">=4.0.0"
+            }
+        },
+        "node_modules/postcss-url/node_modules/minimatch": {
+            "version": "3.0.8",
+            "resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-3.0.8.tgz",
+            "integrity": "sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==",
+            "dev": true,
+            "dependencies": {
+                "brace-expansion": "^1.1.7"
+            },
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/postcss-value-parser": {
+            "version": "4.2.0",
+            "resolved": "https://registry.npmmirror.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+            "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+            "dev": true
+        },
+        "node_modules/postcss/node_modules/nanoid": {
+            "version": "3.3.6",
+            "resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.6.tgz",
+            "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==",
+            "bin": {
+                "nanoid": "bin/nanoid.cjs"
+            },
+            "engines": {
+                "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+            }
+        },
+        "node_modules/pretty-bytes": {
+            "version": "6.1.0",
+            "resolved": "https://registry.npmmirror.com/pretty-bytes/-/pretty-bytes-6.1.0.tgz",
+            "integrity": "sha512-Rk753HI8f4uivXi4ZCIYdhmG1V+WKzvRMg/X+M42a6t7D07RcmopXJMDNk6N++7Bl75URRGsb40ruvg7Hcp2wQ==",
+            "dev": true,
+            "engines": {
+                "node": "^14.13.1 || >=16.0.0"
+            }
+        },
+        "node_modules/process-nextick-args": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+            "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+            "dev": true
+        },
+        "node_modules/prompts": {
+            "version": "2.4.2",
+            "resolved": "https://registry.npmmirror.com/prompts/-/prompts-2.4.2.tgz",
+            "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
+            "dev": true,
+            "dependencies": {
+                "kleur": "^3.0.3",
+                "sisteransi": "^1.0.5"
+            },
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/protocols": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/protocols/-/protocols-2.0.1.tgz",
+            "integrity": "sha512-/XJ368cyBJ7fzLMwLKv1e4vLxOju2MNAIokcr7meSaNcVbWz/CPcW22cP04mwxOErdA5mwjA8Q6w/cdAQxVn7Q==",
+            "dev": true
+        },
+        "node_modules/prr": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmmirror.com/prr/-/prr-1.0.1.tgz",
+            "integrity": "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==",
+            "dev": true
+        },
+        "node_modules/qrcode": {
+            "version": "1.5.1",
+            "resolved": "https://registry.npmjs.org/qrcode/-/qrcode-1.5.1.tgz",
+            "integrity": "sha512-nS8NJ1Z3md8uTjKtP+SGGhfqmTCs5flU/xR623oI0JX+Wepz9R8UrRVCTBTJm3qGw3rH6jJ6MUHjkDx15cxSSg==",
+            "dependencies": {
+                "dijkstrajs": "^1.0.1",
+                "encode-utf8": "^1.0.3",
+                "pngjs": "^5.0.0",
+                "yargs": "^15.3.1"
+            },
+            "bin": {
+                "qrcode": "bin/qrcode"
+            },
+            "engines": {
+                "node": ">=10.13.0"
+            }
+        },
+        "node_modules/qrcode/node_modules/ansi-regex": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/qrcode/node_modules/ansi-styles": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+            "dependencies": {
+                "color-convert": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+            }
+        },
+        "node_modules/qrcode/node_modules/camelcase": {
+            "version": "5.3.1",
+            "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+            "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/qrcode/node_modules/cliui": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+            "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+            "dependencies": {
+                "string-width": "^4.2.0",
+                "strip-ansi": "^6.0.0",
+                "wrap-ansi": "^6.2.0"
+            }
+        },
+        "node_modules/qrcode/node_modules/color-convert": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+            "dependencies": {
+                "color-name": "~1.1.4"
+            },
+            "engines": {
+                "node": ">=7.0.0"
+            }
+        },
+        "node_modules/qrcode/node_modules/color-name": {
+            "version": "1.1.4",
+            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+        },
+        "node_modules/qrcode/node_modules/emoji-regex": {
+            "version": "8.0.0",
+            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+        },
+        "node_modules/qrcode/node_modules/string-width": {
+            "version": "4.2.3",
+            "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+            "dependencies": {
+                "emoji-regex": "^8.0.0",
+                "is-fullwidth-code-point": "^3.0.0",
+                "strip-ansi": "^6.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/qrcode/node_modules/strip-ansi": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+            "dependencies": {
+                "ansi-regex": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/qrcode/node_modules/wrap-ansi": {
+            "version": "6.2.0",
+            "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+            "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+            "dependencies": {
+                "ansi-styles": "^4.0.0",
+                "string-width": "^4.1.0",
+                "strip-ansi": "^6.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/qrcode/node_modules/y18n": {
+            "version": "4.0.3",
+            "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+            "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ=="
+        },
+        "node_modules/qrcode/node_modules/yargs": {
+            "version": "15.4.1",
+            "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
+            "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+            "dependencies": {
+                "cliui": "^6.0.0",
+                "decamelize": "^1.2.0",
+                "find-up": "^4.1.0",
+                "get-caller-file": "^2.0.1",
+                "require-directory": "^2.1.1",
+                "require-main-filename": "^2.0.0",
+                "set-blocking": "^2.0.0",
+                "string-width": "^4.2.0",
+                "which-module": "^2.0.0",
+                "y18n": "^4.0.0",
+                "yargs-parser": "^18.1.2"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/qrcode/node_modules/yargs-parser": {
+            "version": "18.1.3",
+            "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+            "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+            "dependencies": {
+                "camelcase": "^5.0.0",
+                "decamelize": "^1.2.0"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/qs": {
+            "version": "6.7.0",
+            "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
+            "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
+            "engines": {
+                "node": ">=0.6"
+            }
+        },
+        "node_modules/queue-microtask": {
+            "version": "1.2.3",
+            "resolved": "https://registry.npmmirror.com/queue-microtask/-/queue-microtask-1.2.3.tgz",
+            "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+            "dev": true
+        },
+        "node_modules/radix3": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmmirror.com/radix3/-/radix3-1.0.1.tgz",
+            "integrity": "sha512-y+AcwZ3HcUIGc9zGsNVf5+BY/LxL+z+4h4J3/pp8jxSmy1STaCocPS3qrj4tA5ehUSzqtqK+0Aygvz/r/8vy4g==",
+            "dev": true
+        },
+        "node_modules/randombytes": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmmirror.com/randombytes/-/randombytes-2.1.0.tgz",
+            "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+            "dev": true,
+            "dependencies": {
+                "safe-buffer": "^5.1.0"
+            }
+        },
+        "node_modules/range-parser": {
+            "version": "1.2.1",
+            "resolved": "https://registry.npmmirror.com/range-parser/-/range-parser-1.2.1.tgz",
+            "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/rc9": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmmirror.com/rc9/-/rc9-2.1.0.tgz",
+            "integrity": "sha512-ROO9bv8PPqngWKoiUZU3JDQ4sugpdRs9DfwHnzDSxK25XtQn6BEHL6EOd/OtKuDT2qodrtNR+0WkPT6l0jxH5Q==",
+            "dev": true,
+            "dependencies": {
+                "defu": "^6.1.2",
+                "destr": "^1.2.2",
+                "flat": "^5.0.2"
+            }
+        },
+        "node_modules/read-cache": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmmirror.com/read-cache/-/read-cache-1.0.0.tgz",
+            "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==",
+            "dev": true,
+            "dependencies": {
+                "pify": "^2.3.0"
+            }
+        },
+        "node_modules/readable-stream": {
+            "version": "3.6.2",
+            "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.2.tgz",
+            "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+            "dev": true,
+            "dependencies": {
+                "inherits": "^2.0.3",
+                "string_decoder": "^1.1.1",
+                "util-deprecate": "^1.0.1"
+            },
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/readdir-glob": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmmirror.com/readdir-glob/-/readdir-glob-1.1.3.tgz",
+            "integrity": "sha512-v05I2k7xN8zXvPD9N+z/uhXPaj0sUFCe2rcWZIpBsqxfP7xXFQ0tipAd/wjj1YxWyWtUS5IDJpOG82JKt2EAVA==",
+            "dev": true,
+            "dependencies": {
+                "minimatch": "^5.1.0"
+            }
+        },
+        "node_modules/readdirp": {
+            "version": "3.6.0",
+            "resolved": "https://registry.npmmirror.com/readdirp/-/readdirp-3.6.0.tgz",
+            "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+            "dev": true,
+            "dependencies": {
+                "picomatch": "^2.2.1"
+            },
+            "engines": {
+                "node": ">=8.10.0"
+            }
+        },
+        "node_modules/redis-errors": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmmirror.com/redis-errors/-/redis-errors-1.2.0.tgz",
+            "integrity": "sha512-1qny3OExCf0UvUV/5wpYKf2YwPcOqXzkwKKSmKHiE6ZMQs5heeE/c8eXK+PNllPvmjgAbfnsbpkGZWy8cBpn9w==",
+            "dev": true,
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/redis-parser": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmmirror.com/redis-parser/-/redis-parser-3.0.0.tgz",
+            "integrity": "sha512-DJnGAeenTdpMEH6uAJRK/uiyEIH9WVsUmoLwzudwGJUwZPp80PDBWPHXSAGNPwNvIXAbe7MSUB1zQFugFml66A==",
+            "dev": true,
+            "dependencies": {
+                "redis-errors": "^1.0.0"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/require-directory": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmmirror.com/require-directory/-/require-directory-2.1.1.tgz",
+            "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/require-main-filename": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+            "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="
+        },
+        "node_modules/requires-port": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmmirror.com/requires-port/-/requires-port-1.0.0.tgz",
+            "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
+            "dev": true
+        },
+        "node_modules/resolve": {
+            "version": "1.22.1",
+            "resolved": "https://registry.npmmirror.com/resolve/-/resolve-1.22.1.tgz",
+            "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
+            "dev": true,
+            "dependencies": {
+                "is-core-module": "^2.9.0",
+                "path-parse": "^1.0.7",
+                "supports-preserve-symlinks-flag": "^1.0.0"
+            },
+            "bin": {
+                "resolve": "bin/resolve"
+            }
+        },
+        "node_modules/resolve-from": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmmirror.com/resolve-from/-/resolve-from-5.0.0.tgz",
+            "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/restore-cursor": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmmirror.com/restore-cursor/-/restore-cursor-4.0.0.tgz",
+            "integrity": "sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg==",
+            "dev": true,
+            "dependencies": {
+                "onetime": "^5.1.0",
+                "signal-exit": "^3.0.2"
+            },
+            "engines": {
+                "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+            }
+        },
+        "node_modules/reusify": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmmirror.com/reusify/-/reusify-1.0.4.tgz",
+            "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+            "dev": true,
+            "engines": {
+                "iojs": ">=1.0.0",
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/rimraf": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmmirror.com/rimraf/-/rimraf-3.0.2.tgz",
+            "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+            "dev": true,
+            "dependencies": {
+                "glob": "^7.1.3"
+            },
+            "bin": {
+                "rimraf": "bin.js"
+            }
+        },
+        "node_modules/rimraf/node_modules/brace-expansion": {
+            "version": "1.1.11",
+            "resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.11.tgz",
+            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+            "dev": true,
+            "dependencies": {
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
+            }
+        },
+        "node_modules/rimraf/node_modules/glob": {
+            "version": "7.2.3",
+            "resolved": "https://registry.npmmirror.com/glob/-/glob-7.2.3.tgz",
+            "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+            "dev": true,
+            "dependencies": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^3.1.1",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+            },
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/rimraf/node_modules/minimatch": {
+            "version": "3.1.2",
+            "resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-3.1.2.tgz",
+            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+            "dev": true,
+            "dependencies": {
+                "brace-expansion": "^1.1.7"
+            },
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/rollup": {
+            "version": "3.20.2",
+            "resolved": "https://registry.npmmirror.com/rollup/-/rollup-3.20.2.tgz",
+            "integrity": "sha512-3zwkBQl7Ai7MFYQE0y1MeQ15+9jsi7XxfrqwTb/9EK8D9C9+//EBR4M+CuA1KODRaNbFez/lWxA5vhEGZp4MUg==",
+            "dev": true,
+            "bin": {
+                "rollup": "dist/bin/rollup"
+            },
+            "engines": {
+                "node": ">=14.18.0",
+                "npm": ">=8.0.0"
+            },
+            "optionalDependencies": {
+                "fsevents": "~2.3.2"
+            }
+        },
+        "node_modules/rollup-plugin-visualizer": {
+            "version": "5.9.0",
+            "resolved": "https://registry.npmmirror.com/rollup-plugin-visualizer/-/rollup-plugin-visualizer-5.9.0.tgz",
+            "integrity": "sha512-bbDOv47+Bw4C/cgs0czZqfm8L82xOZssk4ayZjG40y9zbXclNk7YikrZTDao6p7+HDiGxrN0b65SgZiVm9k1Cg==",
+            "dev": true,
+            "dependencies": {
+                "open": "^8.4.0",
+                "picomatch": "^2.3.1",
+                "source-map": "^0.7.4",
+                "yargs": "^17.5.1"
+            },
+            "bin": {
+                "rollup-plugin-visualizer": "dist/bin/cli.js"
+            },
+            "engines": {
+                "node": ">=14"
+            },
+            "peerDependencies": {
+                "rollup": "2.x || 3.x"
+            },
+            "peerDependenciesMeta": {
+                "rollup": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/run-async": {
+            "version": "2.4.1",
+            "resolved": "https://registry.npmmirror.com/run-async/-/run-async-2.4.1.tgz",
+            "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.12.0"
+            }
+        },
+        "node_modules/run-parallel": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmmirror.com/run-parallel/-/run-parallel-1.2.0.tgz",
+            "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+            "dev": true,
+            "dependencies": {
+                "queue-microtask": "^1.2.2"
+            }
+        },
+        "node_modules/rxjs": {
+            "version": "7.8.0",
+            "resolved": "https://registry.npmmirror.com/rxjs/-/rxjs-7.8.0.tgz",
+            "integrity": "sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==",
+            "dev": true,
+            "dependencies": {
+                "tslib": "^2.1.0"
+            }
+        },
+        "node_modules/safe-buffer": {
+            "version": "5.2.1",
+            "resolved": "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.2.1.tgz",
+            "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+            "dev": true
+        },
+        "node_modules/safer-buffer": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmmirror.com/safer-buffer/-/safer-buffer-2.1.2.tgz",
+            "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+            "dev": true
+        },
+        "node_modules/sass": {
+            "version": "1.60.0",
+            "resolved": "https://registry.npmmirror.com/sass/-/sass-1.60.0.tgz",
+            "integrity": "sha512-updbwW6fNb5gGm8qMXzVO7V4sWf7LMXnMly/JEyfbfERbVH46Fn6q02BX7/eHTdKpE7d+oTkMMQpFWNUMfFbgQ==",
+            "dev": true,
+            "dependencies": {
+                "chokidar": ">=3.0.0 <4.0.0",
+                "immutable": "^4.0.0",
+                "source-map-js": ">=0.6.2 <2.0.0"
+            },
+            "bin": {
+                "sass": "sass.js"
+            },
+            "engines": {
+                "node": ">=12.0.0"
+            }
+        },
+        "node_modules/scule": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmmirror.com/scule/-/scule-1.0.0.tgz",
+            "integrity": "sha512-4AsO/FrViE/iDNEPaAQlb77tf0csuq27EsVpy6ett584EcRTp6pTDLoGWVxCD77y5iU5FauOvhsI4o1APwPoSQ==",
+            "dev": true
+        },
+        "node_modules/semver": {
+            "version": "7.4.0",
+            "resolved": "https://registry.npmmirror.com/semver/-/semver-7.4.0.tgz",
+            "integrity": "sha512-RgOxM8Mw+7Zus0+zcLEUn8+JfoLpj/huFTItQy2hsM4khuC1HYRDp0cU482Ewn/Fcy6bCjufD8vAj7voC66KQw==",
+            "dev": true,
+            "dependencies": {
+                "lru-cache": "^6.0.0"
+            },
+            "bin": {
+                "semver": "bin/semver.js"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/semver/node_modules/lru-cache": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-6.0.0.tgz",
+            "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+            "dev": true,
+            "dependencies": {
+                "yallist": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/semver/node_modules/yallist": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz",
+            "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+            "dev": true
+        },
+        "node_modules/send": {
+            "version": "0.18.0",
+            "resolved": "https://registry.npmmirror.com/send/-/send-0.18.0.tgz",
+            "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+            "dev": true,
+            "dependencies": {
+                "debug": "2.6.9",
+                "depd": "2.0.0",
+                "destroy": "1.2.0",
+                "encodeurl": "~1.0.2",
+                "escape-html": "~1.0.3",
+                "etag": "~1.8.1",
+                "fresh": "0.5.2",
+                "http-errors": "2.0.0",
+                "mime": "1.6.0",
+                "ms": "2.1.3",
+                "on-finished": "2.4.1",
+                "range-parser": "~1.2.1",
+                "statuses": "2.0.1"
+            },
+            "engines": {
+                "node": ">= 0.8.0"
+            }
+        },
+        "node_modules/send/node_modules/debug": {
+            "version": "2.6.9",
+            "resolved": "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz",
+            "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+            "dev": true,
+            "dependencies": {
+                "ms": "2.0.0"
+            }
+        },
+        "node_modules/send/node_modules/debug/node_modules/ms": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz",
+            "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+            "dev": true
+        },
+        "node_modules/send/node_modules/mime": {
+            "version": "1.6.0",
+            "resolved": "https://registry.npmmirror.com/mime/-/mime-1.6.0.tgz",
+            "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+            "dev": true,
+            "bin": {
+                "mime": "cli.js"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/send/node_modules/ms": {
+            "version": "2.1.3",
+            "resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.3.tgz",
+            "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+            "dev": true
+        },
+        "node_modules/serialize-javascript": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmmirror.com/serialize-javascript/-/serialize-javascript-6.0.1.tgz",
+            "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==",
+            "dev": true,
+            "dependencies": {
+                "randombytes": "^2.1.0"
+            }
+        },
+        "node_modules/serve-placeholder": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/serve-placeholder/-/serve-placeholder-2.0.1.tgz",
+            "integrity": "sha512-rUzLlXk4uPFnbEaIz3SW8VISTxMuONas88nYWjAWaM2W9VDbt9tyFOr3lq8RhVOFrT3XISoBw8vni5una8qMnQ==",
+            "dev": true,
+            "dependencies": {
+                "defu": "^6.0.0"
+            }
+        },
+        "node_modules/serve-static": {
+            "version": "1.15.0",
+            "resolved": "https://registry.npmmirror.com/serve-static/-/serve-static-1.15.0.tgz",
+            "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
+            "dev": true,
+            "dependencies": {
+                "encodeurl": "~1.0.2",
+                "escape-html": "~1.0.3",
+                "parseurl": "~1.3.3",
+                "send": "0.18.0"
+            },
+            "engines": {
+                "node": ">= 0.8.0"
+            }
+        },
+        "node_modules/set-blocking": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/set-blocking/-/set-blocking-2.0.0.tgz",
+            "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="
+        },
+        "node_modules/setprototypeof": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmmirror.com/setprototypeof/-/setprototypeof-1.2.0.tgz",
+            "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
+            "dev": true
+        },
+        "node_modules/shebang-command": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/shebang-command/-/shebang-command-2.0.0.tgz",
+            "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+            "dev": true,
+            "dependencies": {
+                "shebang-regex": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/shebang-regex": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmmirror.com/shebang-regex/-/shebang-regex-3.0.0.tgz",
+            "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/signal-exit": {
+            "version": "3.0.7",
+            "resolved": "https://registry.npmmirror.com/signal-exit/-/signal-exit-3.0.7.tgz",
+            "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+            "dev": true
+        },
+        "node_modules/sirv": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmmirror.com/sirv/-/sirv-2.0.2.tgz",
+            "integrity": "sha512-4Qog6aE29nIjAOKe/wowFTxOdmbEZKb+3tsLljaBRzJwtqto0BChD2zzH0LhgCSXiI+V7X+Y45v14wBZQ1TK3w==",
+            "dev": true,
+            "dependencies": {
+                "@polka/url": "^1.0.0-next.20",
+                "mrmime": "^1.0.0",
+                "totalist": "^3.0.0"
+            },
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/sisteransi": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmmirror.com/sisteransi/-/sisteransi-1.0.5.tgz",
+            "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
+            "dev": true
+        },
+        "node_modules/slash": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmmirror.com/slash/-/slash-4.0.0.tgz",
+            "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
+            "dev": true,
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/smob": {
+            "version": "0.0.6",
+            "resolved": "https://registry.npmmirror.com/smob/-/smob-0.0.6.tgz",
+            "integrity": "sha512-V21+XeNni+tTyiST1MHsa84AQhT1aFZipzPpOFAVB8DkHzwJyjjAmt9bgwnuZiZWnIbMo2duE29wybxv/7HWUw==",
+            "dev": true
+        },
+        "node_modules/source-map": {
+            "version": "0.7.4",
+            "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.7.4.tgz",
+            "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
+            "dev": true,
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/source-map-js": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.0.2.tgz",
+            "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/source-map-support": {
+            "version": "0.5.21",
+            "resolved": "https://registry.npmmirror.com/source-map-support/-/source-map-support-0.5.21.tgz",
+            "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+            "dev": true,
+            "dependencies": {
+                "buffer-from": "^1.0.0",
+                "source-map": "^0.6.0"
+            }
+        },
+        "node_modules/source-map-support/node_modules/source-map": {
+            "version": "0.6.1",
+            "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz",
+            "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/sourcemap-codec": {
+            "version": "1.4.8",
+            "resolved": "https://registry.npmmirror.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz",
+            "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==",
+            "deprecated": "Please use @jridgewell/sourcemap-codec instead"
+        },
+        "node_modules/standard-as-callback": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmmirror.com/standard-as-callback/-/standard-as-callback-2.1.0.tgz",
+            "integrity": "sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==",
+            "dev": true
+        },
+        "node_modules/statuses": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/statuses/-/statuses-2.0.1.tgz",
+            "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/std-env": {
+            "version": "3.3.2",
+            "resolved": "https://registry.npmmirror.com/std-env/-/std-env-3.3.2.tgz",
+            "integrity": "sha512-uUZI65yrV2Qva5gqE0+A7uVAvO40iPo6jGhs7s8keRfHCmtg+uB2X6EiLGCI9IgL1J17xGhvoOqSz79lzICPTA==",
+            "dev": true
+        },
+        "node_modules/stdin-discarder": {
+            "version": "0.1.0",
+            "resolved": "https://registry.npmmirror.com/stdin-discarder/-/stdin-discarder-0.1.0.tgz",
+            "integrity": "sha512-xhV7w8S+bUwlPTb4bAOUQhv8/cSS5offJuX8GQGq32ONF0ZtDWKfkdomM3HMRA+LhX6um/FZ0COqlwsjD53LeQ==",
+            "dev": true,
+            "dependencies": {
+                "bl": "^5.0.0"
+            },
+            "engines": {
+                "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+            }
+        },
+        "node_modules/string_decoder": {
+            "version": "1.3.0",
+            "resolved": "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.3.0.tgz",
+            "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+            "dev": true,
+            "dependencies": {
+                "safe-buffer": "~5.2.0"
+            }
+        },
+        "node_modules/string-width": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmmirror.com/string-width/-/string-width-5.1.2.tgz",
+            "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+            "dev": true,
+            "dependencies": {
+                "eastasianwidth": "^0.2.0",
+                "emoji-regex": "^9.2.2",
+                "strip-ansi": "^7.0.1"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/strip-ansi": {
+            "version": "7.0.1",
+            "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-7.0.1.tgz",
+            "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
+            "dev": true,
+            "dependencies": {
+                "ansi-regex": "^6.0.1"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/strip-final-newline": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+            "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+            "dev": true,
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/strip-literal": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmmirror.com/strip-literal/-/strip-literal-1.0.1.tgz",
+            "integrity": "sha512-QZTsipNpa2Ppr6v1AmJHESqJ3Uz247MUS0OjrnnZjFAvEoWqxuyFuXn2xLgMtRnijJShAa1HL0gtJyUs7u7n3Q==",
+            "dev": true,
+            "dependencies": {
+                "acorn": "^8.8.2"
+            }
+        },
+        "node_modules/stylehacks": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmmirror.com/stylehacks/-/stylehacks-6.0.0.tgz",
+            "integrity": "sha512-+UT589qhHPwz6mTlCLSt/vMNTJx8dopeJlZAlBMJPWA3ORqu6wmQY7FBXf+qD+FsqoBJODyqNxOUP3jdntFRdw==",
+            "dev": true,
+            "dependencies": {
+                "browserslist": "^4.21.4",
+                "postcss-selector-parser": "^6.0.4"
+            },
+            "engines": {
+                "node": "^14 || ^16 || >=18.0"
+            },
+            "peerDependencies": {
+                "postcss": "^8.2.15"
+            }
+        },
+        "node_modules/supports-color": {
+            "version": "5.5.0",
+            "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-5.5.0.tgz",
+            "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+            "dev": true,
+            "dependencies": {
+                "has-flag": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/supports-preserve-symlinks-flag": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmmirror.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+            "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.4"
+            }
+        },
+        "node_modules/svg-tags": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmmirror.com/svg-tags/-/svg-tags-1.0.0.tgz",
+            "integrity": "sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==",
+            "dev": true
+        },
+        "node_modules/svgo": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmmirror.com/svgo/-/svgo-3.0.2.tgz",
+            "integrity": "sha512-Z706C1U2pb1+JGP48fbazf3KxHrWOsLme6Rv7imFBn5EnuanDW1GPaA/P1/dvObE670JDePC3mnj0k0B7P0jjQ==",
+            "dev": true,
+            "dependencies": {
+                "@trysound/sax": "0.2.0",
+                "commander": "^7.2.0",
+                "css-select": "^5.1.0",
+                "css-tree": "^2.2.1",
+                "csso": "^5.0.5",
+                "picocolors": "^1.0.0"
+            },
+            "bin": {
+                "svgo": "bin/svgo"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/swiper": {
+            "version": "11.1.15",
+            "resolved": "https://registry.npmmirror.com/swiper/-/swiper-11.1.15.tgz",
+            "integrity": "sha512-IzWeU34WwC7gbhjKsjkImTuCRf+lRbO6cnxMGs88iVNKDwV+xQpBCJxZ4bNH6gSrIbbyVJ1kuGzo3JTtz//CBw==",
+            "funding": [
+                {
+                    "type": "patreon",
+                    "url": "https://www.patreon.com/swiperjs"
+                },
+                {
+                    "type": "open_collective",
+                    "url": "http://opencollective.com/swiper"
+                }
+            ],
+            "engines": {
+                "node": ">= 4.7.0"
+            }
+        },
+        "node_modules/tapable": {
+            "version": "2.2.1",
+            "resolved": "https://registry.npmmirror.com/tapable/-/tapable-2.2.1.tgz",
+            "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
+            "dev": true,
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/tar": {
+            "version": "6.1.13",
+            "resolved": "https://registry.npmmirror.com/tar/-/tar-6.1.13.tgz",
+            "integrity": "sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw==",
+            "dev": true,
+            "dependencies": {
+                "chownr": "^2.0.0",
+                "fs-minipass": "^2.0.0",
+                "minipass": "^4.0.0",
+                "minizlib": "^2.1.1",
+                "mkdirp": "^1.0.3",
+                "yallist": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/tar-stream": {
+            "version": "2.2.0",
+            "resolved": "https://registry.npmmirror.com/tar-stream/-/tar-stream-2.2.0.tgz",
+            "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+            "dev": true,
+            "dependencies": {
+                "bl": "^4.0.3",
+                "end-of-stream": "^1.4.1",
+                "fs-constants": "^1.0.0",
+                "inherits": "^2.0.3",
+                "readable-stream": "^3.1.1"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/tar-stream/node_modules/bl": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmmirror.com/bl/-/bl-4.1.0.tgz",
+            "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+            "dev": true,
+            "dependencies": {
+                "buffer": "^5.5.0",
+                "inherits": "^2.0.4",
+                "readable-stream": "^3.4.0"
+            }
+        },
+        "node_modules/tar-stream/node_modules/buffer": {
+            "version": "5.7.1",
+            "resolved": "https://registry.npmmirror.com/buffer/-/buffer-5.7.1.tgz",
+            "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+            "dev": true,
+            "dependencies": {
+                "base64-js": "^1.3.1",
+                "ieee754": "^1.1.13"
+            }
+        },
+        "node_modules/tar/node_modules/yallist": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz",
+            "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+            "dev": true
+        },
+        "node_modules/terser": {
+            "version": "5.16.8",
+            "resolved": "https://registry.npmmirror.com/terser/-/terser-5.16.8.tgz",
+            "integrity": "sha512-QI5g1E/ef7d+PsDifb+a6nnVgC4F22Bg6T0xrBrz6iloVB4PUkkunp6V8nzoOOZJIzjWVdAGqCdlKlhLq/TbIA==",
+            "dev": true,
+            "dependencies": {
+                "@jridgewell/source-map": "^0.3.2",
+                "acorn": "^8.5.0",
+                "commander": "^2.20.0",
+                "source-map-support": "~0.5.20"
+            },
+            "bin": {
+                "terser": "bin/terser"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/terser/node_modules/commander": {
+            "version": "2.20.3",
+            "resolved": "https://registry.npmmirror.com/commander/-/commander-2.20.3.tgz",
+            "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+            "dev": true
+        },
+        "node_modules/through": {
+            "version": "2.3.8",
+            "resolved": "https://registry.npmmirror.com/through/-/through-2.3.8.tgz",
+            "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
+            "dev": true
+        },
+        "node_modules/tiny-invariant": {
+            "version": "1.3.1",
+            "resolved": "https://registry.npmmirror.com/tiny-invariant/-/tiny-invariant-1.3.1.tgz",
+            "integrity": "sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw==",
+            "dev": true
+        },
+        "node_modules/tmp": {
+            "version": "0.0.33",
+            "resolved": "https://registry.npmmirror.com/tmp/-/tmp-0.0.33.tgz",
+            "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+            "dev": true,
+            "dependencies": {
+                "os-tmpdir": "~1.0.2"
+            },
+            "engines": {
+                "node": ">=0.6.0"
+            }
+        },
+        "node_modules/to-fast-properties": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+            "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
+            "dev": true,
+            "engines": {
+                "node": ">=4"
+            }
+        },
+        "node_modules/to-regex-range": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmmirror.com/to-regex-range/-/to-regex-range-5.0.1.tgz",
+            "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+            "dev": true,
+            "dependencies": {
+                "is-number": "^7.0.0"
+            },
+            "engines": {
+                "node": ">=8.0"
+            }
+        },
+        "node_modules/toidentifier": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmmirror.com/toidentifier/-/toidentifier-1.0.1.tgz",
+            "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.6"
+            }
+        },
+        "node_modules/totalist": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmmirror.com/totalist/-/totalist-3.0.0.tgz",
+            "integrity": "sha512-eM+pCBxXO/njtF7vdFsHuqb+ElbxqtI4r5EAvk6grfAFyJ6IvWlSkfZ5T9ozC6xWw3Fj1fGoSmrl0gUs46JVIw==",
+            "dev": true,
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/tr46": {
+            "version": "0.0.3",
+            "resolved": "https://registry.npmmirror.com/tr46/-/tr46-0.0.3.tgz",
+            "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
+            "dev": true
+        },
+        "node_modules/tslib": {
+            "version": "2.5.0",
+            "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.5.0.tgz",
+            "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==",
+            "dev": true
+        },
+        "node_modules/type-fest": {
+            "version": "3.8.0",
+            "resolved": "https://registry.npmmirror.com/type-fest/-/type-fest-3.8.0.tgz",
+            "integrity": "sha512-FVNSzGQz9Th+/9R6Lvv7WIAkstylfHN2/JYxkyhhmKFYh9At2DST8t6L6Lref9eYO8PXFTfG9Sg1Agg0K3vq3Q==",
+            "dev": true,
+            "engines": {
+                "node": ">=14.16"
+            }
+        },
+        "node_modules/ufo": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmmirror.com/ufo/-/ufo-1.1.1.tgz",
+            "integrity": "sha512-MvlCc4GHrmZdAllBc0iUDowff36Q9Ndw/UzqmEKyrfSzokTd9ZCy1i+IIk5hrYKkjoYVQyNbrw7/F8XJ2rEwTg==",
+            "dev": true
+        },
+        "node_modules/uncrypto": {
+            "version": "0.1.2",
+            "resolved": "https://registry.npmmirror.com/uncrypto/-/uncrypto-0.1.2.tgz",
+            "integrity": "sha512-kuZwRKV615lEw/Xx3Iz56FKk3nOeOVGaVmw0eg+x4Mne28lCotNFbBhDW7dEBCBKyKbRQiCadEZeNAFPVC5cgw==",
+            "dev": true
+        },
+        "node_modules/unctx": {
+            "version": "2.2.0",
+            "resolved": "https://registry.npmmirror.com/unctx/-/unctx-2.2.0.tgz",
+            "integrity": "sha512-th8S0zg9m35lirV7FYI6AYMKHfmLoEGC87yjuS4MGLS/OZ3Pv1Qx+HyXtnlwteL2YL47xN1ADDKoFWYw3VZoEA==",
+            "dev": true,
+            "dependencies": {
+                "acorn": "^8.8.2",
+                "estree-walker": "^3.0.3",
+                "magic-string": "^0.30.0",
+                "unplugin": "^1.3.1"
+            }
+        },
+        "node_modules/unenv": {
+            "version": "1.4.1",
+            "resolved": "https://registry.npmmirror.com/unenv/-/unenv-1.4.1.tgz",
+            "integrity": "sha512-DuFZUDfaBC92zy3fW7QqKTLdYJIPkpwTN0yGZtaxnpOI7HvIfl41NYh9NVv4zcqhT8CGXJ1ELpvO2tecaB6NfA==",
+            "dev": true,
+            "dependencies": {
+                "defu": "^6.1.2",
+                "mime": "^3.0.0",
+                "node-fetch-native": "^1.1.0",
+                "pathe": "^1.1.0"
+            }
+        },
+        "node_modules/unhead": {
+            "version": "1.1.25",
+            "resolved": "https://registry.npmmirror.com/unhead/-/unhead-1.1.25.tgz",
+            "integrity": "sha512-KtTBgtQjxICoOjA4dyxJfj5fYoYJeYFUt/J8ulaTzbvTsXM9K+ztYjI65nf2CPYYXRCRz/iEt8trqcsGlsB5TQ==",
+            "dev": true,
+            "dependencies": {
+                "@unhead/dom": "1.1.25",
+                "@unhead/schema": "1.1.25",
+                "@unhead/shared": "1.1.25",
+                "hookable": "^5.5.1"
+            }
+        },
+        "node_modules/unimport": {
+            "version": "3.0.6",
+            "resolved": "https://registry.npmmirror.com/unimport/-/unimport-3.0.6.tgz",
+            "integrity": "sha512-GYxGJ1Bri1oqx8VFDjdgooGzeK7jBk3bvhXmamTIpu3nONOcUMGwZbX7X0L5RA7OWMXpR4vzpSQP7pXUzJg1/Q==",
+            "dev": true,
+            "dependencies": {
+                "@rollup/pluginutils": "^5.0.2",
+                "escape-string-regexp": "^5.0.0",
+                "fast-glob": "^3.2.12",
+                "local-pkg": "^0.4.3",
+                "magic-string": "^0.30.0",
+                "mlly": "^1.2.0",
+                "pathe": "^1.1.0",
+                "pkg-types": "^1.0.2",
+                "scule": "^1.0.0",
+                "strip-literal": "^1.0.1",
+                "unplugin": "^1.3.1"
+            }
+        },
+        "node_modules/universalify": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmmirror.com/universalify/-/universalify-2.0.0.tgz",
+            "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+            "dev": true,
+            "engines": {
+                "node": ">= 10.0.0"
+            }
+        },
+        "node_modules/unpipe": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmmirror.com/unpipe/-/unpipe-1.0.0.tgz",
+            "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/unplugin": {
+            "version": "1.3.1",
+            "resolved": "https://registry.npmmirror.com/unplugin/-/unplugin-1.3.1.tgz",
+            "integrity": "sha512-h4uUTIvFBQRxUKS2Wjys6ivoeofGhxzTe2sRWlooyjHXVttcVfV/JiavNd3d4+jty0SVV0dxGw9AkY9MwiaCEw==",
+            "dev": true,
+            "dependencies": {
+                "acorn": "^8.8.2",
+                "chokidar": "^3.5.3",
+                "webpack-sources": "^3.2.3",
+                "webpack-virtual-modules": "^0.5.0"
+            }
+        },
+        "node_modules/unstorage": {
+            "version": "1.5.0",
+            "resolved": "https://registry.npmmirror.com/unstorage/-/unstorage-1.5.0.tgz",
+            "integrity": "sha512-bL6sHwTKp2ns0SAGNHAbLP9LwmtPGMtaOVrHRA4V8ngQMHQR18q0uRgkeGB4qF84XSDu/o8ebv54p/HBJESXFA==",
+            "dev": true,
+            "dependencies": {
+                "anymatch": "^3.1.3",
+                "chokidar": "^3.5.3",
+                "destr": "^1.2.2",
+                "h3": "^1.6.4",
+                "ioredis": "^5.3.2",
+                "listhen": "^1.0.4",
+                "lru-cache": "^9.0.3",
+                "mri": "^1.2.0",
+                "node-fetch-native": "^1.1.0",
+                "ofetch": "^1.0.1",
+                "ufo": "^1.1.1"
+            },
+            "peerDependencies": {
+                "@azure/app-configuration": "^1.3.1",
+                "@azure/cosmos": "^3.17.3",
+                "@azure/data-tables": "^13.2.2",
+                "@azure/identity": "^3.1.4",
+                "@azure/keyvault-secrets": "^4.7.0",
+                "@azure/storage-blob": "^12.14.0",
+                "@planetscale/database": "^1.7.0"
+            },
+            "peerDependenciesMeta": {
+                "@azure/app-configuration": {
+                    "optional": true
+                },
+                "@azure/cosmos": {
+                    "optional": true
+                },
+                "@azure/data-tables": {
+                    "optional": true
+                },
+                "@azure/identity": {
+                    "optional": true
+                },
+                "@azure/keyvault-secrets": {
+                    "optional": true
+                },
+                "@azure/storage-blob": {
+                    "optional": true
+                },
+                "@planetscale/database": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/unstorage/node_modules/lru-cache": {
+            "version": "9.0.3",
+            "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-9.0.3.tgz",
+            "integrity": "sha512-cyjNRew29d4kbgnz1sjDqxg7qg8NW4s+HQzCGjeon7DV5T2yDije16W9HaUFV1dhVEMh+SjrOcK0TomBmf3Egg==",
+            "dev": true,
+            "engines": {
+                "node": "14 || >=16.14"
+            }
+        },
+        "node_modules/untyped": {
+            "version": "1.3.2",
+            "resolved": "https://registry.npmmirror.com/untyped/-/untyped-1.3.2.tgz",
+            "integrity": "sha512-z219Z65rOGD6jXIvIhpZFfwWdqQckB8sdZec2NO+TkcH1Bph7gL0hwLzRJs1KsOo4Jz4mF9guBXhsEnyEBGVfw==",
+            "dev": true,
+            "dependencies": {
+                "@babel/core": "^7.21.3",
+                "@babel/standalone": "^7.21.3",
+                "@babel/types": "^7.21.3",
+                "defu": "^6.1.2",
+                "jiti": "^1.18.2",
+                "mri": "^1.2.0",
+                "scule": "^1.0.0"
+            },
+            "bin": {
+                "untyped": "dist/cli.mjs"
+            }
+        },
+        "node_modules/update-browserslist-db": {
+            "version": "1.0.10",
+            "resolved": "https://registry.npmmirror.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
+            "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==",
+            "dev": true,
+            "dependencies": {
+                "escalade": "^3.1.1",
+                "picocolors": "^1.0.0"
+            },
+            "bin": {
+                "browserslist-lint": "cli.js"
+            },
+            "peerDependencies": {
+                "browserslist": ">= 4.21.0"
+            }
+        },
+        "node_modules/util-deprecate": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmmirror.com/util-deprecate/-/util-deprecate-1.0.2.tgz",
+            "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+            "dev": true
+        },
+        "node_modules/utils-merge": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmmirror.com/utils-merge/-/utils-merge-1.0.1.tgz",
+            "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
+            "dev": true,
+            "engines": {
+                "node": ">= 0.4.0"
+            }
+        },
+        "node_modules/uuid": {
+            "version": "9.0.1",
+            "resolved": "https://registry.npmmirror.com/uuid/-/uuid-9.0.1.tgz",
+            "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
+            "dev": true,
+            "bin": {
+                "uuid": "dist/bin/uuid"
+            }
+        },
+        "node_modules/vite": {
+            "version": "4.2.1",
+            "resolved": "https://registry.npmmirror.com/vite/-/vite-4.2.1.tgz",
+            "integrity": "sha512-7MKhqdy0ISo4wnvwtqZkjke6XN4taqQ2TBaTccLIpOKv7Vp2h4Y+NpmWCnGDeSvvn45KxvWgGyb0MkHvY1vgbg==",
+            "dev": true,
+            "dependencies": {
+                "esbuild": "^0.17.5",
+                "postcss": "^8.4.21",
+                "resolve": "^1.22.1",
+                "rollup": "^3.18.0"
+            },
+            "bin": {
+                "vite": "bin/vite.js"
+            },
+            "engines": {
+                "node": "^14.18.0 || >=16.0.0"
+            },
+            "optionalDependencies": {
+                "fsevents": "~2.3.2"
+            },
+            "peerDependencies": {
+                "@types/node": ">= 14",
+                "less": "*",
+                "sass": "*",
+                "stylus": "*",
+                "sugarss": "*",
+                "terser": "^5.4.0"
+            },
+            "peerDependenciesMeta": {
+                "@types/node": {
+                    "optional": true
+                },
+                "less": {
+                    "optional": true
+                },
+                "sass": {
+                    "optional": true
+                },
+                "stylus": {
+                    "optional": true
+                },
+                "sugarss": {
+                    "optional": true
+                },
+                "terser": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/vite-node": {
+            "version": "0.30.1",
+            "resolved": "https://registry.npmmirror.com/vite-node/-/vite-node-0.30.1.tgz",
+            "integrity": "sha512-vTikpU/J7e6LU/8iM3dzBo8ZhEiKZEKRznEMm+mJh95XhWaPrJQraT/QsT2NWmuEf+zgAoMe64PKT7hfZ1Njmg==",
+            "dev": true,
+            "dependencies": {
+                "cac": "^6.7.14",
+                "debug": "^4.3.4",
+                "mlly": "^1.2.0",
+                "pathe": "^1.1.0",
+                "picocolors": "^1.0.0",
+                "vite": "^3.0.0 || ^4.0.0"
+            },
+            "bin": {
+                "vite-node": "vite-node.mjs"
+            },
+            "engines": {
+                "node": ">=v14.18.0"
+            }
+        },
+        "node_modules/vite-plugin-checker": {
+            "version": "0.5.6",
+            "resolved": "https://registry.npmmirror.com/vite-plugin-checker/-/vite-plugin-checker-0.5.6.tgz",
+            "integrity": "sha512-ftRyON0gORUHDxcDt2BErmsikKSkfvl1i2DoP6Jt2zDO9InfvM6tqO1RkXhSjkaXEhKPea6YOnhFaZxW3BzudQ==",
+            "dev": true,
+            "dependencies": {
+                "@babel/code-frame": "^7.12.13",
+                "ansi-escapes": "^4.3.0",
+                "chalk": "^4.1.1",
+                "chokidar": "^3.5.1",
+                "commander": "^8.0.0",
+                "fast-glob": "^3.2.7",
+                "fs-extra": "^11.1.0",
+                "lodash.debounce": "^4.0.8",
+                "lodash.pick": "^4.4.0",
+                "npm-run-path": "^4.0.1",
+                "strip-ansi": "^6.0.0",
+                "tiny-invariant": "^1.1.0",
+                "vscode-languageclient": "^7.0.0",
+                "vscode-languageserver": "^7.0.0",
+                "vscode-languageserver-textdocument": "^1.0.1",
+                "vscode-uri": "^3.0.2"
+            },
+            "engines": {
+                "node": ">=14.16"
+            },
+            "peerDependencies": {
+                "eslint": ">=7",
+                "meow": "^9.0.0",
+                "optionator": "^0.9.1",
+                "stylelint": ">=13",
+                "typescript": "*",
+                "vite": ">=2.0.0",
+                "vls": "*",
+                "vti": "*",
+                "vue-tsc": "*"
+            },
+            "peerDependenciesMeta": {
+                "eslint": {
+                    "optional": true
+                },
+                "meow": {
+                    "optional": true
+                },
+                "optionator": {
+                    "optional": true
+                },
+                "stylelint": {
+                    "optional": true
+                },
+                "typescript": {
+                    "optional": true
+                },
+                "vls": {
+                    "optional": true
+                },
+                "vti": {
+                    "optional": true
+                },
+                "vue-tsc": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/vite-plugin-checker/node_modules/ansi-escapes": {
+            "version": "4.3.2",
+            "resolved": "https://registry.npmmirror.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+            "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+            "dev": true,
+            "dependencies": {
+                "type-fest": "^0.21.3"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/vite-plugin-checker/node_modules/ansi-regex": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-5.0.1.tgz",
+            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/vite-plugin-checker/node_modules/ansi-styles": {
+            "version": "4.3.0",
+            "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+            "dev": true,
+            "dependencies": {
+                "color-convert": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/vite-plugin-checker/node_modules/chalk": {
+            "version": "4.1.2",
+            "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+            "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+            "dev": true,
+            "dependencies": {
+                "ansi-styles": "^4.1.0",
+                "supports-color": "^7.1.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/vite-plugin-checker/node_modules/color-convert": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+            "dev": true,
+            "dependencies": {
+                "color-name": "~1.1.4"
+            },
+            "engines": {
+                "node": ">=7.0.0"
+            }
+        },
+        "node_modules/vite-plugin-checker/node_modules/color-name": {
+            "version": "1.1.4",
+            "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+            "dev": true
+        },
+        "node_modules/vite-plugin-checker/node_modules/commander": {
+            "version": "8.3.0",
+            "resolved": "https://registry.npmmirror.com/commander/-/commander-8.3.0.tgz",
+            "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
+            "dev": true,
+            "engines": {
+                "node": ">= 12"
+            }
+        },
+        "node_modules/vite-plugin-checker/node_modules/has-flag": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/vite-plugin-checker/node_modules/strip-ansi": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz",
+            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+            "dev": true,
+            "dependencies": {
+                "ansi-regex": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/vite-plugin-checker/node_modules/supports-color": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+            "dev": true,
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/vite-plugin-checker/node_modules/type-fest": {
+            "version": "0.21.3",
+            "resolved": "https://registry.npmmirror.com/type-fest/-/type-fest-0.21.3.tgz",
+            "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+            "dev": true,
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/vite-plugin-top-level-await": {
+            "version": "1.4.1",
+            "resolved": "https://registry.npmmirror.com/vite-plugin-top-level-await/-/vite-plugin-top-level-await-1.4.1.tgz",
+            "integrity": "sha512-hogbZ6yT7+AqBaV6lK9JRNvJDn4/IJvHLu6ET06arNfo0t2IsyCaon7el9Xa8OumH+ESuq//SDf8xscZFE0rWw==",
+            "dev": true,
+            "dependencies": {
+                "@rollup/plugin-virtual": "^3.0.2",
+                "@swc/core": "^1.3.100",
+                "uuid": "^9.0.1"
+            },
+            "peerDependencies": {
+                "vite": ">=2.8"
+            }
+        },
+        "node_modules/vite-plugin-windicss": {
+            "version": "1.8.10",
+            "resolved": "https://registry.npmmirror.com/vite-plugin-windicss/-/vite-plugin-windicss-1.8.10.tgz",
+            "integrity": "sha512-scywsuzo46lcTBohspmF0WiwhWEte6p+OUVrX4yr7VMRvLHMHVfLtJReyD5pppjijG7YOwVsZn7XBWWZtF658Q==",
+            "dev": true,
+            "dependencies": {
+                "@windicss/plugin-utils": "1.8.10",
+                "debug": "^4.3.4",
+                "kolorist": "^1.6.0",
+                "windicss": "^3.5.6"
+            },
+            "peerDependencies": {
+                "vite": "^2.0.1 || ^3.0.0 || ^4.0.0"
+            }
+        },
+        "node_modules/vscode-jsonrpc": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmmirror.com/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0.tgz",
+            "integrity": "sha512-wnJA4BnEjOSyFMvjZdpiOwhSq9uDoK8e/kpRJDTaMYzwlkrhG1fwDIZI94CLsLzlCK5cIbMMtFlJlfR57Lavmg==",
+            "dev": true,
+            "engines": {
+                "node": ">=8.0.0 || >=10.0.0"
+            }
+        },
+        "node_modules/vscode-languageclient": {
+            "version": "7.0.0",
+            "resolved": "https://registry.npmmirror.com/vscode-languageclient/-/vscode-languageclient-7.0.0.tgz",
+            "integrity": "sha512-P9AXdAPlsCgslpP9pRxYPqkNYV7Xq8300/aZDpO35j1fJm/ncize8iGswzYlcvFw5DQUx4eVk+KvfXdL0rehNg==",
+            "dev": true,
+            "dependencies": {
+                "minimatch": "^3.0.4",
+                "semver": "^7.3.4",
+                "vscode-languageserver-protocol": "3.16.0"
+            },
+            "engines": {
+                "vscode": "^1.52.0"
+            }
+        },
+        "node_modules/vscode-languageclient/node_modules/brace-expansion": {
+            "version": "1.1.11",
+            "resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.11.tgz",
+            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+            "dev": true,
+            "dependencies": {
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
+            }
+        },
+        "node_modules/vscode-languageclient/node_modules/minimatch": {
+            "version": "3.1.2",
+            "resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-3.1.2.tgz",
+            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+            "dev": true,
+            "dependencies": {
+                "brace-expansion": "^1.1.7"
+            },
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/vscode-languageserver": {
+            "version": "7.0.0",
+            "resolved": "https://registry.npmmirror.com/vscode-languageserver/-/vscode-languageserver-7.0.0.tgz",
+            "integrity": "sha512-60HTx5ID+fLRcgdHfmz0LDZAXYEV68fzwG0JWwEPBode9NuMYTIxuYXPg4ngO8i8+Ou0lM7y6GzaYWbiDL0drw==",
+            "dev": true,
+            "dependencies": {
+                "vscode-languageserver-protocol": "3.16.0"
+            },
+            "bin": {
+                "installServerIntoExtension": "bin/installServerIntoExtension"
+            }
+        },
+        "node_modules/vscode-languageserver-protocol": {
+            "version": "3.16.0",
+            "resolved": "https://registry.npmmirror.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0.tgz",
+            "integrity": "sha512-sdeUoAawceQdgIfTI+sdcwkiK2KU+2cbEYA0agzM2uqaUy2UpnnGHtWTHVEtS0ES4zHU0eMFRGN+oQgDxlD66A==",
+            "dev": true,
+            "dependencies": {
+                "vscode-jsonrpc": "6.0.0",
+                "vscode-languageserver-types": "3.16.0"
+            }
+        },
+        "node_modules/vscode-languageserver-textdocument": {
+            "version": "1.0.8",
+            "resolved": "https://registry.npmmirror.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.8.tgz",
+            "integrity": "sha512-1bonkGqQs5/fxGT5UchTgjGVnfysL0O8v1AYMBjqTbWQTFn721zaPGDYFkOKtfDgFiSgXM3KwaG3FMGfW4Ed9Q==",
+            "dev": true
+        },
+        "node_modules/vscode-languageserver-types": {
+            "version": "3.16.0",
+            "resolved": "https://registry.npmmirror.com/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz",
+            "integrity": "sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA==",
+            "dev": true
+        },
+        "node_modules/vscode-uri": {
+            "version": "3.0.7",
+            "resolved": "https://registry.npmmirror.com/vscode-uri/-/vscode-uri-3.0.7.tgz",
+            "integrity": "sha512-eOpPHogvorZRobNqJGhapa0JdwaxpjVvyBp0QIUMRMSf8ZAlqOdEquKuRmw9Qwu0qXtJIWqFtMkmvJjUZmMjVA==",
+            "dev": true
+        },
+        "node_modules/vue": {
+            "version": "3.2.47",
+            "resolved": "https://registry.npmmirror.com/vue/-/vue-3.2.47.tgz",
+            "integrity": "sha512-60188y/9Dc9WVrAZeUVSDxRQOZ+z+y5nO2ts9jWXSTkMvayiWxCWOWtBQoYjLeccfXkiiPZWAHcV+WTPhkqJHQ==",
+            "dependencies": {
+                "@vue/compiler-dom": "3.2.47",
+                "@vue/compiler-sfc": "3.2.47",
+                "@vue/runtime-dom": "3.2.47",
+                "@vue/server-renderer": "3.2.47",
+                "@vue/shared": "3.2.47"
+            }
+        },
+        "node_modules/vue-bundle-renderer": {
+            "version": "1.0.3",
+            "resolved": "https://registry.npmmirror.com/vue-bundle-renderer/-/vue-bundle-renderer-1.0.3.tgz",
+            "integrity": "sha512-EfjX+5TTUl70bki9hPuVp+54JiZOvFIfoWBcfXsSwLzKEiDYyHNi5iX8srnqLIv3YRnvxgbntdcG1WPq0MvffQ==",
+            "dev": true,
+            "dependencies": {
+                "ufo": "^1.1.1"
+            }
+        },
+        "node_modules/vue-demi": {
+            "version": "0.13.11",
+            "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.13.11.tgz",
+            "integrity": "sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==",
+            "hasInstallScript": true,
+            "bin": {
+                "vue-demi-fix": "bin/vue-demi-fix.js",
+                "vue-demi-switch": "bin/vue-demi-switch.js"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "peerDependencies": {
+                "@vue/composition-api": "^1.0.0-rc.1",
+                "vue": "^3.0.0-0 || ^2.6.0"
+            },
+            "peerDependenciesMeta": {
+                "@vue/composition-api": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/vue-devtools-stub": {
+            "version": "0.1.0",
+            "resolved": "https://registry.npmmirror.com/vue-devtools-stub/-/vue-devtools-stub-0.1.0.tgz",
+            "integrity": "sha512-RutnB7X8c5hjq39NceArgXg28WZtZpGc3+J16ljMiYnFhKvd8hITxSWQSQ5bvldxMDU6gG5mkxl1MTQLXckVSQ==",
+            "dev": true
+        },
+        "node_modules/vue-i18n": {
+            "version": "9.2.2",
+            "resolved": "https://registry.npmmirror.com/vue-i18n/-/vue-i18n-9.2.2.tgz",
+            "integrity": "sha512-yswpwtj89rTBhegUAv9Mu37LNznyu3NpyLQmozF3i1hYOhwpG8RjcjIFIIfnu+2MDZJGSZPXaKWvnQA71Yv9TQ==",
+            "dev": true,
+            "dependencies": {
+                "@intlify/core-base": "9.2.2",
+                "@intlify/shared": "9.2.2",
+                "@intlify/vue-devtools": "9.2.2",
+                "@vue/devtools-api": "^6.2.1"
+            },
+            "engines": {
+                "node": ">= 14"
+            },
+            "peerDependencies": {
+                "vue": "^3.0.0"
+            }
+        },
+        "node_modules/vue-router": {
+            "version": "4.1.6",
+            "resolved": "https://registry.npmmirror.com/vue-router/-/vue-router-4.1.6.tgz",
+            "integrity": "sha512-DYWYwsG6xNPmLq/FmZn8Ip+qrhFEzA14EI12MsMgVxvHFDYvlr4NXpVF5hrRH1wVcDP8fGi5F4rxuJSl8/r+EQ==",
+            "dev": true,
+            "dependencies": {
+                "@vue/devtools-api": "^6.4.5"
+            },
+            "peerDependencies": {
+                "vue": "^3.2.0"
+            }
+        },
+        "node_modules/wcwidth": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmmirror.com/wcwidth/-/wcwidth-1.0.1.tgz",
+            "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==",
+            "dev": true,
+            "dependencies": {
+                "defaults": "^1.0.3"
+            }
+        },
+        "node_modules/web-streams-polyfill": {
+            "version": "3.2.1",
+            "resolved": "https://registry.npmmirror.com/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz",
+            "integrity": "sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==",
+            "dev": true,
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/webidl-conversions": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmmirror.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+            "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
+            "dev": true
+        },
+        "node_modules/webpack-sources": {
+            "version": "3.2.3",
+            "resolved": "https://registry.npmmirror.com/webpack-sources/-/webpack-sources-3.2.3.tgz",
+            "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
+            "dev": true,
+            "engines": {
+                "node": ">=10.13.0"
+            }
+        },
+        "node_modules/webpack-virtual-modules": {
+            "version": "0.5.0",
+            "resolved": "https://registry.npmmirror.com/webpack-virtual-modules/-/webpack-virtual-modules-0.5.0.tgz",
+            "integrity": "sha512-kyDivFZ7ZM0BVOUteVbDFhlRt7Ah/CSPwJdi8hBpkK7QLumUqdLtVfm/PX/hkcnrvr0i77fO5+TjZ94Pe+C9iw==",
+            "dev": true
+        },
+        "node_modules/whatwg-url": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmmirror.com/whatwg-url/-/whatwg-url-5.0.0.tgz",
+            "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+            "dev": true,
+            "dependencies": {
+                "tr46": "~0.0.3",
+                "webidl-conversions": "^3.0.0"
+            }
+        },
+        "node_modules/which": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmmirror.com/which/-/which-2.0.2.tgz",
+            "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+            "dev": true,
+            "dependencies": {
+                "isexe": "^2.0.0"
+            },
+            "bin": {
+                "node-which": "bin/node-which"
+            },
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/which-module": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+            "integrity": "sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q=="
+        },
+        "node_modules/wide-align": {
+            "version": "1.1.5",
+            "resolved": "https://registry.npmmirror.com/wide-align/-/wide-align-1.1.5.tgz",
+            "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
+            "dev": true,
+            "dependencies": {
+                "string-width": "^1.0.2 || 2 || 3 || 4"
+            }
+        },
+        "node_modules/wide-align/node_modules/ansi-regex": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-5.0.1.tgz",
+            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/wide-align/node_modules/emoji-regex": {
+            "version": "8.0.0",
+            "resolved": "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-8.0.0.tgz",
+            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+            "dev": true
+        },
+        "node_modules/wide-align/node_modules/string-width": {
+            "version": "4.2.3",
+            "resolved": "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz",
+            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+            "dev": true,
+            "dependencies": {
+                "emoji-regex": "^8.0.0",
+                "is-fullwidth-code-point": "^3.0.0",
+                "strip-ansi": "^6.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/wide-align/node_modules/strip-ansi": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz",
+            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+            "dev": true,
+            "dependencies": {
+                "ansi-regex": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/windicss": {
+            "version": "3.5.6",
+            "resolved": "https://registry.npmmirror.com/windicss/-/windicss-3.5.6.tgz",
+            "integrity": "sha512-P1mzPEjgFMZLX0ZqfFht4fhV/FX8DTG7ERG1fBLiWvd34pTLVReS5CVsewKn9PApSgXnVfPWwvq+qUsRwpnwFA==",
+            "dev": true,
+            "bin": {
+                "windicss": "cli/index.js"
+            },
+            "engines": {
+                "node": ">= 12"
+            }
+        },
+        "node_modules/windicss-analysis": {
+            "version": "0.3.5",
+            "resolved": "https://registry.npmmirror.com/windicss-analysis/-/windicss-analysis-0.3.5.tgz",
+            "integrity": "sha512-g7306c47Yc9c0nAhVLwVDVYt+MQmxGfpg1Q06mP4+j5nqCrJgh18Km4HyL8BABv7wo6BdUN7FeVtxb+u5TokxA==",
+            "dev": true,
+            "dependencies": {
+                "@windicss/plugin-utils": "^1.1.1",
+                "cac": "^6.7.3",
+                "connect": "^3.7.0",
+                "declass": "^0.0.1",
+                "fast-glob": "^3.2.6",
+                "fs-extra": "^10.0.0",
+                "sirv": "^1.0.12"
+            },
+            "bin": {
+                "windicss-analysis": "bin/windicss-analysis.js"
+            }
+        },
+        "node_modules/windicss-analysis/node_modules/fs-extra": {
+            "version": "10.1.0",
+            "resolved": "https://registry.npmmirror.com/fs-extra/-/fs-extra-10.1.0.tgz",
+            "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
+            "dev": true,
+            "dependencies": {
+                "graceful-fs": "^4.2.0",
+                "jsonfile": "^6.0.1",
+                "universalify": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/windicss-analysis/node_modules/sirv": {
+            "version": "1.0.19",
+            "resolved": "https://registry.npmmirror.com/sirv/-/sirv-1.0.19.tgz",
+            "integrity": "sha512-JuLThK3TnZG1TAKDwNIqNq6QA2afLOCcm+iE8D1Kj3GA40pSPsxQjjJl0J8X3tsR7T+CP1GavpzLwYkgVLWrZQ==",
+            "dev": true,
+            "dependencies": {
+                "@polka/url": "^1.0.0-next.20",
+                "mrmime": "^1.0.0",
+                "totalist": "^1.0.0"
+            },
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/windicss-analysis/node_modules/totalist": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmmirror.com/totalist/-/totalist-1.1.0.tgz",
+            "integrity": "sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==",
+            "dev": true,
+            "engines": {
+                "node": ">=6"
+            }
+        },
+        "node_modules/windicss-webpack-plugin": {
+            "version": "1.7.8",
+            "resolved": "https://registry.npmmirror.com/windicss-webpack-plugin/-/windicss-webpack-plugin-1.7.8.tgz",
+            "integrity": "sha512-wjKczM/20gOaIaDQfdWV1M6dWAKKp/JQDuUmIEvDopmuo3ereUFVFnGxIjyKAu9U4U7RdcZGUwzL/+bJtIn+pA==",
+            "dev": true,
+            "dependencies": {
+                "@windicss/plugin-utils": "^1.8.10",
+                "debug": "^4.3.4",
+                "get-port": "^6.1.2",
+                "loader-utils": "^2.0.0",
+                "lodash": "^4.17.21",
+                "pathe": "^1.1.0",
+                "webpack-virtual-modules": "^0.5.0",
+                "windicss": "^3.5.6"
+            }
+        },
+        "node_modules/wrap-ansi": {
+            "version": "8.1.0",
+            "resolved": "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+            "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+            "dev": true,
+            "dependencies": {
+                "ansi-styles": "^6.1.0",
+                "string-width": "^5.0.1",
+                "strip-ansi": "^7.0.1"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/wrappy": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmmirror.com/wrappy/-/wrappy-1.0.2.tgz",
+            "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+            "dev": true
+        },
+        "node_modules/xxhashjs": {
+            "version": "0.2.2",
+            "resolved": "https://registry.npmmirror.com/xxhashjs/-/xxhashjs-0.2.2.tgz",
+            "integrity": "sha512-AkTuIuVTET12tpsVIQo+ZU6f/qDmKuRUcjaqR+OIvm+aCBsZ95i7UVY5WJ9TMsSaZ0DA2WxoZ4acu0sPH+OKAw==",
+            "dev": true,
+            "dependencies": {
+                "cuint": "^0.2.2"
+            }
+        },
+        "node_modules/y18n": {
+            "version": "5.0.8",
+            "resolved": "https://registry.npmmirror.com/y18n/-/y18n-5.0.8.tgz",
+            "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+            "dev": true,
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/yallist": {
+            "version": "3.1.1",
+            "resolved": "https://registry.npmmirror.com/yallist/-/yallist-3.1.1.tgz",
+            "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+            "dev": true
+        },
+        "node_modules/yargs": {
+            "version": "17.7.1",
+            "resolved": "https://registry.npmmirror.com/yargs/-/yargs-17.7.1.tgz",
+            "integrity": "sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==",
+            "dev": true,
+            "dependencies": {
+                "cliui": "^8.0.1",
+                "escalade": "^3.1.1",
+                "get-caller-file": "^2.0.5",
+                "require-directory": "^2.1.1",
+                "string-width": "^4.2.3",
+                "y18n": "^5.0.5",
+                "yargs-parser": "^21.1.1"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/yargs-parser": {
+            "version": "21.1.1",
+            "resolved": "https://registry.npmmirror.com/yargs-parser/-/yargs-parser-21.1.1.tgz",
+            "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+            "dev": true,
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/yargs/node_modules/ansi-regex": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-5.0.1.tgz",
+            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+            "dev": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/yargs/node_modules/emoji-regex": {
+            "version": "8.0.0",
+            "resolved": "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-8.0.0.tgz",
+            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+            "dev": true
+        },
+        "node_modules/yargs/node_modules/string-width": {
+            "version": "4.2.3",
+            "resolved": "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz",
+            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+            "dev": true,
+            "dependencies": {
+                "emoji-regex": "^8.0.0",
+                "is-fullwidth-code-point": "^3.0.0",
+                "strip-ansi": "^6.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/yargs/node_modules/strip-ansi": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz",
+            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+            "dev": true,
+            "dependencies": {
+                "ansi-regex": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/zhead": {
+            "version": "2.0.4",
+            "resolved": "https://registry.npmmirror.com/zhead/-/zhead-2.0.4.tgz",
+            "integrity": "sha512-V4R94t3ifk9AURym6OskbKcnowzgp5Z88tkoL/NF67vyryNxC62u6mx5F1Ux4oh4+YN7FFmKYEyWy6m5kfPH6g==",
+            "dev": true
+        },
+        "node_modules/zip-stream": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmmirror.com/zip-stream/-/zip-stream-4.1.0.tgz",
+            "integrity": "sha512-zshzwQW7gG7hjpBlgeQP9RuyPGNxvJdzR8SUM3QhxCnLjWN2E7j3dOvpeDcQoETfHx0urRS7EtmVToql7YpU4A==",
+            "dev": true,
+            "dependencies": {
+                "archiver-utils": "^2.1.0",
+                "compress-commons": "^4.1.0",
+                "readable-stream": "^3.6.0"
+            },
+            "engines": {
+                "node": ">= 10"
+            }
+        }
+    }
+}
diff --git a/web/package.json b/web/package.json
new file mode 100644
index 00000000..2a2ef704
--- /dev/null
+++ b/web/package.json
@@ -0,0 +1,31 @@
+{
+    "name": "web",
+    "private": true,
+    "version": "1.0.0",
+    "scripts": {
+        "build": "nuxt build --mode product",
+        "dev": "nuxt dev --mode dev",
+        "generate": "nuxt generate --mode product && node publish.cjs",
+        "preview": "nuxt preview --mode product",
+        "postinstall": "nuxt prepare --mode product"
+    },
+    "devDependencies": {
+        "@element-plus/nuxt": "^1.0.4",
+        "@types/qrcode": "^1.5.0",
+        "nuxt": "^3.4.1",
+        "nuxt-windicss": "^2.6.0",
+        "sass": "^1.60.0",
+        "vite-plugin-top-level-await": "^1.3.1",
+        "vue-i18n": "^9.2.2"
+    },
+    "dependencies": {
+        "@vueuse/core": "^9.13.0",
+        "aos": "^2.3.4",
+        "element-plus": "^2.3.2",
+        "pinia": "^2.0.33",
+        "qrcode": "^1.5.1",
+        "sass": "^1.60.0",
+        "swiper": "^11.1.15",
+        "qs": "6.7.0"
+    }
+}
\ No newline at end of file
diff --git a/web/plugins/aos.ts b/web/plugins/aos.ts
new file mode 100644
index 00000000..10ff7db9
--- /dev/null
+++ b/web/plugins/aos.ts
@@ -0,0 +1,6 @@
+import AOS from 'aos';
+import "aos/dist/aos.css";
+export default defineNuxtPlugin((NuxtApp) => {
+    AOS.init(); // 初始化
+    NuxtApp.vueApp.use(AOS)
+})
diff --git a/web/plugins/element.plus.ts b/web/plugins/element.plus.ts
new file mode 100644
index 00000000..f381103d
--- /dev/null
+++ b/web/plugins/element.plus.ts
@@ -0,0 +1,7 @@
+import * as ElementPlusIconsVue from '@element-plus/icons-vue'
+
+export default defineNuxtPlugin((NuxtApp) => {
+    for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
+        NuxtApp.vueApp.component(key, component)
+    }
+})
\ No newline at end of file
diff --git a/web/plugins/i18n.ts b/web/plugins/i18n.ts
new file mode 100644
index 00000000..1a485e6a
--- /dev/null
+++ b/web/plugins/i18n.ts
@@ -0,0 +1,25 @@
+import { createI18n } from 'vue-i18n'
+
+import zhCn from "~/lang/zh-cn/common.json"
+import en from "~/lang/en/common.json"
+import zhCnPages from "~/app/lang/zh-cn/pages.json"
+import enPages from "~/app/lang/en/pages.json"
+
+export default defineNuxtPlugin((NuxtApp) => {
+    const i18n = createI18n({
+        globalInjection: true, //是否全局注入
+        messages: {
+            "zh-cn": Object.assign(zhCn, zhCnPages),
+            "en": Object.assign(en, enPages)
+        },
+        silentFallbackWarn: true,
+        silentTranslationWarn: true
+    })
+    NuxtApp.vueApp.use(i18n)
+
+    return {
+        provide: {
+            getI18n: () => i18n
+        }
+    }
+})
diff --git a/web/plugins/pinia.ts b/web/plugins/pinia.ts
new file mode 100644
index 00000000..ff3b29a6
--- /dev/null
+++ b/web/plugins/pinia.ts
@@ -0,0 +1,5 @@
+import { createPinia } from 'pinia'
+
+export default defineNuxtPlugin((NuxtApp) => {
+    NuxtApp.vueApp.use(createPinia())
+})
\ No newline at end of file
diff --git a/web/public/favicon.ico b/web/public/favicon.ico
new file mode 100644
index 00000000..1144f7bc
Binary files /dev/null and b/web/public/favicon.ico differ
diff --git a/web/publish.cjs b/web/publish.cjs
new file mode 100644
index 00000000..1e8075cb
--- /dev/null
+++ b/web/publish.cjs
@@ -0,0 +1,40 @@
+const fs = require('fs')
+
+const publish = () => {
+    const src = './.output/public'
+    const dest = '../niucloud/public/web'
+
+    solve()
+
+    // 目标目录不存在停止复制
+    try {
+        const dir = fs.readdirSync(dest)
+    } catch (e) {
+        return
+    }
+
+    // 删除目标目录下文件
+    fs.rm(dest, { recursive: true }, err => {
+        if(err) {
+            console.log(err)
+            return
+        }
+
+        fs.cp(src, dest, { recursive: true }, (err) => {
+            if (err) {
+                console.error(err)
+            }
+        })
+    })
+}
+
+const solve = () => {
+    const fn = './.output/public/index.html'
+    const fc = fs.readFileSync(fn, 'utf-8')
+    let text = new String(fc)
+    text = text.replace('<script>window.__NUXT__', '<script>const match = location.href.match(/\\/web\\/(\\d*)\\//);window.__NUXT__')
+    text = text.replace('baseURL:"\\u002Fweb\\u002F"', 'baseURL: match ? `/web/${match[1]}/` : `/web/`')
+    fs.writeFileSync(fn, text, 'utf8')
+}
+
+publish()
diff --git a/web/stores/app.ts b/web/stores/app.ts
new file mode 100644
index 00000000..c347f39c
--- /dev/null
+++ b/web/stores/app.ts
@@ -0,0 +1,18 @@
+import { defineStore } from 'pinia'
+
+interface App {
+    route: string
+}
+
+const useAppStore = defineStore('app', {
+    state: (): App => {
+        return {
+            route: ''
+        }
+    },
+    actions: {
+
+    }
+})
+
+export default useAppStore
\ No newline at end of file
diff --git a/web/stores/config.ts b/web/stores/config.ts
new file mode 100644
index 00000000..d499923e
--- /dev/null
+++ b/web/stores/config.ts
@@ -0,0 +1,45 @@
+import { defineStore } from 'pinia'
+import { getConfig } from '@/app/api/auth'
+
+interface loginConfig {
+    is_username: number | boolean,
+    is_mobile: number | boolean,
+    is_auth_register: number | boolean,
+    is_bind_mobile: number | boolean,
+    agreement_show: number | boolean
+}
+
+interface Config {
+    login: loginConfig
+}
+
+const useConfigStore = defineStore('config', {
+    state: (): Config => {
+        return {
+            login: {
+                is_username: 0,
+                is_mobile: 0,
+                is_auth_register: 0,
+                is_bind_mobile: 0,
+                agreement_show: 0
+            }
+        }
+    },
+    actions: {
+        async getLoginConfig(router: any = null) {
+            await getConfig().then(({ data }) => {
+                this.login.is_username = parseInt(data.is_username)
+                this.login.is_mobile = parseInt(data.is_mobile)
+                this.login.is_auth_register = parseInt(data.is_auth_register)
+                this.login.is_bind_mobile = parseInt(data.is_bind_mobile)
+                this.login.agreement_show = parseInt(data.agreement_show)
+                if(data && router && router.currentRoute.value.path === '/site/close'){
+                    navigateTo('/', { replace: true })
+                }
+            }).catch(() => {
+            })
+        }
+    }
+})
+
+export default useConfigStore
diff --git a/web/stores/member.ts b/web/stores/member.ts
new file mode 100644
index 00000000..4f456c46
--- /dev/null
+++ b/web/stores/member.ts
@@ -0,0 +1,51 @@
+import { defineStore } from 'pinia'
+import { getMemberInfo } from '@/app/api/member'
+import { logout } from '@/app/api/auth'
+
+interface Member {
+    token: string | null
+    info: Record<string, any> | null,
+    loginPopup:boolean
+}
+
+const useMemberStore = defineStore('member', {
+    state: (): Member => {
+        return {
+            token: useCookie('token').value,
+            info: null,
+            loginPopup:false
+        }
+    },
+    actions: {
+        async setToken(token: string) {
+            this.token = token
+            useCookie('token').value = token
+            await this.getMemberInfo()
+        },
+        async getMemberInfo() {
+            if (!this.token) return
+            await getMemberInfo()
+                .then((res: any) => {
+                    this.info = res.data
+                })
+                .catch((err) => {
+                    this.logout()
+                })
+        },
+        logout() {
+            if (!this.token) return
+            this.token = ''
+            this.info = null
+            useCookie('token').value = null
+            logout().then().catch()
+        },
+        logOpen(){
+            this.loginPopup = true
+        },
+        logClose(){
+            this.loginPopup = false
+        }
+    }
+})
+
+export default useMemberStore
diff --git a/web/stores/system.ts b/web/stores/system.ts
new file mode 100644
index 00000000..279534e4
--- /dev/null
+++ b/web/stores/system.ts
@@ -0,0 +1,36 @@
+import { defineStore } from 'pinia'
+import storage from '@/utils/storage'
+import { getSiteInfo } from '@/app/api/system'
+
+interface System {
+    lang: string,
+    site: Record<string, any>
+
+}
+
+const useSystemStore = defineStore('system', {
+    state: (): System => {
+        return {
+            lang: storage.get('lang') ?? 'zh-cn',
+            site: {
+                front_end_name: '',
+                site_name: ''
+            }
+        }
+    },
+    actions: {
+        async getSiteInfoFn() {
+            await getSiteInfo().then((res: any) => {
+                this.site = res.data
+                if (!('shop_web' in this.site.site_addons)) {
+                    navigateTo('/app/index', { replace: true })
+                }
+
+            }).catch((err) => {
+
+            })
+        }
+    }
+})
+
+export default useSystemStore
diff --git a/web/tsconfig.json b/web/tsconfig.json
new file mode 100644
index 00000000..a746f2a7
--- /dev/null
+++ b/web/tsconfig.json
@@ -0,0 +1,4 @@
+{
+  // https://nuxt.com/docs/guide/concepts/typescript
+  "extends": "./.nuxt/tsconfig.json"
+}
diff --git a/web/types/global.d.ts b/web/types/global.d.ts
new file mode 100644
index 00000000..5d69deb6
--- /dev/null
+++ b/web/types/global.d.ts
@@ -0,0 +1,16 @@
+declare interface AnyObject {
+    [key: string]: any;
+}
+
+declare interface responseResult {
+    code: number,
+    data: any,
+    msg: string
+}
+
+interface requestMobileParam {
+    mobile: string,
+    captcha_code: string,
+    captcha_key: string,
+    type: string
+}
\ No newline at end of file
diff --git a/web/utils/common.ts b/web/utils/common.ts
new file mode 100644
index 00000000..3a7f6cc6
--- /dev/null
+++ b/web/utils/common.ts
@@ -0,0 +1,112 @@
+import useMemberStores from '@/stores/member'
+import { ElMessage } from 'element-plus'
+
+/**
+ * 获取token
+ * @returns
+ */
+export function getToken(): null | string {
+    return useMemberStores().token
+}
+/**
+ * 防抖函数
+ * @param fn
+ * @param delay
+ * @returns
+ */
+export function debounce(fn: (args?: any) => any, delay: number = 300) {
+    let timer: null | number = null
+    return function (...args: any) {
+        if (timer != null) {
+            clearTimeout(timer)
+            timer = null
+        }
+        timer = setTimeout(() => {
+            fn.call(this, ...args)
+        }, delay);
+    }
+}
+
+/**
+* 判断是否是url
+* @param str
+* @returns
+*/
+export function isUrl(str: string): boolean {
+    return str.indexOf('http://') != -1 || str.indexOf('https://') != -1
+}
+
+/**
+* 图片输出
+* @param path
+* @returns
+*/
+export function img(path: string): string {
+    const runtimeConfig = useRuntimeConfig()
+    return isUrl(path) ? path : `${runtimeConfig.public.VITE_IMG_DOMAIN || location.origin}/${path}`
+}
+
+/**
+ * 金额格式化
+ */
+export function moneyFormat(money: string): string {
+    return isNaN(parseFloat(money)) ? money : parseFloat(money).toFixed(2)
+}
+
+/**
+ * @description 深度克隆
+ * @param {object} obj 需要深度克隆的对象
+ * @returns {*} 克隆后的对象或者原值（不是对象）
+ */
+export function deepClone(obj: object) {
+    // 对常见的“非”值，直接返回原来值
+    if ([null, undefined, NaN, false].includes(obj)) return obj
+    if (typeof obj !== 'object' && typeof obj !== 'function') {
+        // 原始类型直接返回
+        return obj
+    }
+    const o = isArray(obj) ? [] : {}
+    for (const i in obj) {
+        if (obj.hasOwnProperty(i)) {
+            o[i] = typeof obj[i] === 'object' ? deepClone(obj[i]) : obj[i]
+        }
+    }
+    return o
+}
+const isArray = (value: any) => {
+    if (typeof Array.isArray === 'function') {
+        return Array.isArray(value)
+    }
+    return Object.prototype.toString.call(value) === '[object Array]'
+}
+
+/**
+ * 复制
+ * @param {Object} value
+ * @param {Object} callback
+ */
+export function copy(value, callback) {
+    var oInput = document.createElement('input'); //创建一个隐藏input（重要！）
+    oInput.value = value; //赋值
+    oInput.setAttribute("readonly", "readonly");
+    document.body.appendChild(oInput);
+    oInput.select(); // 选择对象
+    document.execCommand("Copy"); // 执行浏览器复制命令
+    oInput.className = 'oInput';
+    oInput.style.display = 'none';
+    document.body.removeChild(oInput); // 删除创建的对象
+    ElMessage({
+        message: '复制成功',
+        type: 'success',
+      })
+    typeof callback == 'function' && callback();
+}
+
+/**
+ * 过滤特殊字符
+  * @param event
+ */
+export function filterSpecial(event:any){
+    event.target.value = event.target.value.replace(/[^\u4e00-\u9fa5a-zA-Z0-9]/g, '')
+    event.target.value = event.target.value.replace(/[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、]/g,'')
+}
diff --git a/web/utils/language.ts b/web/utils/language.ts
new file mode 100644
index 00000000..3fbd1807
--- /dev/null
+++ b/web/utils/language.ts
@@ -0,0 +1,76 @@
+import { nextTick } from 'vue'
+
+class Language {
+    private i18n: any;
+    private loadLocale: Array<string> = []; //已加载的语言
+    public file: string = '';
+
+    constructor(i18n: any) {
+        this.i18n = i18n
+    }
+
+    /**
+     *
+     * @param locale 设置语言
+     */
+    public setI18nLanguage(locale: string) {
+        if (this.i18n.mode === 'legacy') {
+            this.i18n.global.locale = locale
+        } else {
+            this.i18n.global.locale = locale
+        }
+        let html = document.querySelector('html')
+        html && html.setAttribute('lang', locale)
+    }
+
+    /**
+     * 加载语言包
+     * @param path
+     * @param locale
+     * @returns
+     */
+    public async loadLocaleMessages(app: string, path: string, locale: string) {
+        try {
+            const file = path == '/' ? 'index' : path.replace('/', '').replaceAll('/', '.')
+
+            if (this.loadLocale.includes(`${app}/${locale}/${file}`)) {
+                return nextTick()
+            }
+            this.loadLocale.push(`${app}/${locale}/${file}`)
+
+            if (app != 'app' && !this.loadLocale.includes(`${app}/${locale}/pages`)) {
+                const pagesMessages = await import(`~/addon/${app}/lang/${locale}/pages.json`)
+                this.i18n.global.mergeLocaleMessage(locale, pagesMessages)
+                this.loadLocale.push(`${app}/${locale}/pages`)
+            }
+
+            // 引入语言包文件
+            const messages = await import(app == 'app' ? `~/app/lang/${locale}/${file}.json` : `~/addon/${app}/lang/${locale}/${file}.json`)
+            const prefix = this.getFileKey(app, path)
+
+            let data: Record<string, string> = {}
+            Object.keys(messages.default).forEach(key => {
+                data[`${prefix}.${key}`] = messages.default[key]
+            })
+
+            this.i18n.global.mergeLocaleMessage(locale, data)
+            this.setI18nLanguage(locale)
+            return nextTick()
+        } catch {
+            this.setI18nLanguage(locale)
+            return nextTick()
+        }
+    }
+
+    /**
+     * @param app
+     * @param path
+     */
+    public getFileKey = (app: string, path: string) => {
+        const file = path == '/' ? 'index' : path.replace('/', '').replaceAll('/', '.')
+        return `${app}.${file}`
+    }
+
+}
+
+export default Language
diff --git a/web/utils/request.ts b/web/utils/request.ts
new file mode 100644
index 00000000..39e6f623
--- /dev/null
+++ b/web/utils/request.ts
@@ -0,0 +1,185 @@
+import { ElMessage } from 'element-plus'
+import useMemberStore from '@/stores/member'
+import qs from 'qs'
+
+interface ConfigOption {
+    showErrorMessage?: boolean
+    showSuccessMessage?: boolean,
+    headers?: Headers
+}
+
+interface FetchOptions {
+    baseURL: string
+    headers: Record<string, any>
+    onRequest?: (data: any) => void
+    onResponse?: (data: any) => void
+    onResponseError?: (data: any) => void
+    showErrorMessage?: boolean
+    showSuccessMessage?: boolean
+    watch: boolean
+}
+
+class Http {
+    private options: FetchOptions = {
+        baseURL: '',
+        headers: {},
+        watch: false
+    }
+
+    public constructor() {
+        /**
+         * 全局请求拦截器
+         */
+        this.options.onRequest = (data) => {
+            const runtimeConfig = useRuntimeConfig()
+
+            this.options.baseURL = runtimeConfig.public.VITE_APP_BASE_URL || `${location.origin}/api/`
+            this.options.headers[runtimeConfig.public.VITE_REQUEST_HEADER_CHANNEL_KEY] = 'pc'
+            if (getToken()) this.options.headers[runtimeConfig.public.VITE_REQUEST_HEADER_TOKEN_KEY] = getToken()
+        }
+
+        /**
+         * 全局响应拦截器
+         */
+        this.options.onResponse = ({ response, options }) => {
+            const { _data: data } = response
+            this.handleNetworkError(response)
+            if (data.code != undefined) {
+                if (data.code == 1) {
+                    if (options.showSuccessMessage) ElMessage({ message: data.msg, type: 'success' })
+                } else {
+                    if (options.showErrorMessage === false) return;
+                    if (data.code == 0 || data.code == 400) {
+                        ElMessage({ message: data.msg, type: 'error' })
+                    } else {
+                        this.handleAuthError(data.code)
+                    }
+                }
+            }
+        }
+    }
+
+    public get(url: string, query = {}, config: ConfigOption = {}) {
+        url += '?' + qs.stringify(query)
+        return this.request(url, 'GET', {}, config)
+    }
+
+    public post(url: string, body = {}, config: ConfigOption = {}) {
+        return this.request(url, 'POST', { body }, config)
+    }
+
+    public put(url: string, body = {}, config: ConfigOption = {}) {
+        return this.request(url, 'PUT', { body }, config)
+    }
+
+    public delete(url: string, config: ConfigOption = {}) {
+        return this.request(url, 'DELETE', {}, config)
+    }
+
+    /**
+     * 发送请求
+     * @param url
+     * @param method
+     * @param param
+     * @param config
+     */
+    private request(url: string, method: string, param: AnyObject = {}, config: ConfigOption = {}) {
+        return new Promise((resolve, reject) => {
+            setTimeout(() => {
+                // 处理首次请求baseurl空的问题
+                const runtimeConfig = useRuntimeConfig()
+                !this.options.baseURL && (this.options.baseURL = runtimeConfig.public.VITE_APP_BASE_URL || `${location.origin}/api/`)
+                this.options.baseURL.substr(-1) != '/' && (this.options.baseURL += '/')
+                // 处理数组格式
+                for (const key in param.query) {
+                    if (param.query[key] instanceof Array) {
+                        param.query[key].forEach((item, index) => {
+                            param.query[`${key}[${index}]`] = item
+                        });
+                        delete param.query[key]
+                    }
+                }
+                useFetch(url, { ...this.options, method, ...config, ...param }).then((response) => {
+                    const { data: { value }, error } = response
+                    if (value) {
+                        if (value.code && value.code == 1) {
+                            resolve(value)
+                        } else {
+                            if (value.type && value.type == 'application/zip') {
+                                resolve(value)
+                            } else {
+                                reject(value)
+                            }
+                        }
+                    } else {
+                        reject(error)
+                    }
+                }).catch(err => {
+                    reject(err)
+                })
+            }, this.options.baseURL ? 0 : 500);
+        })
+    }
+
+    private handleAuthError(code: number) {
+        switch (code) {
+            case 401:
+                useMemberStore().logout()
+                break;
+            case 402:
+                navigateTo('/site/close', { replace: true })
+                break;
+        }
+    }
+
+    private handleNetworkError(err: any) {
+        if (err.status && err.status != 200) {
+            let errMessage = ''
+            switch (err.status) {
+                case 400:
+                    errMessage = t('request.400')
+                    break
+                case 401:
+                    errMessage = t('request.401')
+                    break
+                case 403:
+                    errMessage = t('request.403')
+                    break
+                case 404:
+                    errMessage = err.url + t('request.404')
+                    break
+                case 405:
+                    errMessage = t('request.405')
+                    break
+                case 408:
+                    errMessage = t('request.408')
+                    break
+                case 409:
+                    errMessage = t('request.409')
+                    break
+                case 500:
+                    errMessage = t('request.500')
+                    break
+                case 501:
+                    errMessage = t('request.501')
+                    break
+                case 502:
+                    errMessage = t('request.502')
+                    break
+                case 503:
+                    errMessage = t('request.503')
+                    break
+                case 504:
+                    errMessage = t('request.504')
+                    break
+                case 505:
+                    errMessage = t('request.505')
+                    break
+            }
+            ElMessage({ message: errMessage, type: 'error' })
+        }
+    }
+}
+
+const request = new Http()
+export default request
diff --git a/web/utils/storage.ts b/web/utils/storage.ts
new file mode 100644
index 00000000..730090c2
--- /dev/null
+++ b/web/utils/storage.ts
@@ -0,0 +1,55 @@
+interface setParam {
+    key: string,
+    data: any,
+    success?: () => {},
+    fail?: (err: any) => {}
+}
+
+class Storage {
+
+    /**
+     * 设置缓存
+     * @param param 
+     */
+    public set(param: setParam) {
+        try {
+            window.localStorage.setItem(param.key, JSON.stringify(param.data))
+            typeof param.success == 'function' && param.success()
+        } catch (error) {
+            typeof param.fail == 'function' && param.fail(error)
+        }
+    }
+
+    /**
+     * 获取缓存
+     * @param key 
+     * @returns 
+     */
+    public get(key: string) {
+        try {
+            const json: any = window.localStorage.getItem(key)
+            return JSON.parse(json)
+        } catch (error) {
+            return null
+        }
+    }
+
+    /**
+     * 移除指定缓存
+     * @param key 
+     */
+    public remove(key: string | string[]) {
+        if (typeof key == 'string') window.localStorage.removeItem(key)
+        else key.forEach(item => { window.localStorage.removeItem(item) })
+    }
+
+    /**
+     * 清理缓存
+     */
+    public clear() {
+        window.localStorage.clear()
+    }
+}
+
+const storage = new Storage()
+export default storage
diff --git a/web/utils/test.ts b/web/utils/test.ts
new file mode 100644
index 00000000..d290ec46
--- /dev/null
+++ b/web/utils/test.ts
@@ -0,0 +1,232 @@
+const test = {
+    /**
+     * 验证电子邮箱格式
+     */
+    email(value: string) {
+        return /^\w+((-\w+)|(\.\w+))*\@[A-Za-z0-9]+((\.|-)[A-Za-z0-9]+)*\.[A-Za-z0-9]+$/.test(value)
+    },
+    /**
+     * 验证手机格式
+     */
+    mobile(value: string) {
+        return /^1[23456789]\d{9}$/.test(value)
+    },
+    /**
+     * 验证URL格式
+     */
+    url(value: string) {
+        return /^((https|http|ftp|rtsp|mms):\/\/)(([0-9a-zA-Z_!~*'().&=+$%-]+: )?[0-9a-zA-Z_!~*'().&=+$%-]+@)?(([0-9]{1,3}.){3}[0-9]{1,3}|([0-9a-zA-Z_!~*'()-]+.)*([0-9a-zA-Z][0-9a-zA-Z-]{0,61})?[0-9a-zA-Z].[a-zA-Z]{2,6})(:[0-9]{1,4})?((\/?)|(\/[0-9a-zA-Z_!~*'().;?:@&=+$,%#-]+)+\/?)$/
+            .test(value)
+    },
+    /**
+     * 验证日期格式
+     */
+    date(value: string) {
+        if (!value) return false
+        // 判断是否数值或者字符串数值(意味着为时间戳)，转为数值，否则new Date无法识别字符串时间戳
+        if (this.number(value)) value = +value
+        return !/Invalid|NaN/.test(new Date(value).toString())
+    },
+    /**
+     * 验证ISO类型的日期格式
+     */
+    dateISO(value: string) {
+        return /^\d{4}[\/\-](0?[1-9]|1[012])[\/\-](0?[1-9]|[12][0-9]|3[01])$/.test(value)
+    },
+    /**
+     * 验证十进制数字
+     */
+    number(value: string) {
+        return /^[\+-]?(\d+\.?\d*|\.\d+|\d\.\d+e\+\d+)$/.test(value)
+    },
+    /**
+     * 验证字符串
+     */
+    string(value: string) {
+        return typeof value === 'string'
+    },
+    /**
+     * 验证整数
+     */
+    digits(value: string) {
+        return /^\d+$/.test(value)
+    },
+    /**
+     * 验证身份证号码
+     */
+    idCard(value: string) {
+        return /^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(
+            value
+        )
+    },
+    /**
+     * 是否车牌号
+     */
+    carNo(value: string) {
+        // 新能源车牌
+        const xreg = /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}(([0-9]{5}[DF]$)|([DF][A-HJ-NP-Z0-9][0-9]{4}$))/
+        // 旧车牌
+        const creg = /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}[A-HJ-NP-Z0-9]{4}[A-HJ-NP-Z0-9挂学警港澳]{1}$/
+        if (value.length === 7) {
+            return creg.test(value)
+        } if (value.length === 8) {
+            return xreg.test(value)
+        }
+        return false
+    },
+    /**
+     * 金额,只允许2位小数
+     */
+    amount(value: string) {
+        // 金额，只允许保留两位小数
+        return /^[1-9]\d*(,\d{3})*(\.\d{1,2})?$|^0\.\d{1,2}$/.test(value)
+    },
+    /**
+     * 中文
+     */
+    chinese(value: string) {
+        const reg = /^[\u4e00-\u9fa5]+$/gi
+        return reg.test(value)
+    },
+    /**
+     * 只能输入字母
+     */
+    letter(value: string) {
+        return /^[a-zA-Z]*$/.test(value)
+    },
+    /**
+     * 只能是字母或者数字
+     */
+    enOrNum(value: string) {
+        // 英文或者数字
+        const reg = /^[0-9a-zA-Z]*$/g
+        return reg.test(value)
+    },
+    /**
+     * 验证是否包含某个值
+     */
+    contains(value: string, param: string) {
+        return value.indexOf(param) >= 0
+    },
+    /**
+     * 验证一个值范围[min, max]
+     */
+    range(value: number, param: number[]) {
+        return value >= param[0] && value <= param[1]
+    },
+    /**
+     * 验证一个长度范围[min, max]
+     */
+    rangeLength(value: string, param: number[]) {
+        return value.length >= param[0] && value.length <= param[1]
+    },
+    /**
+     * 是否固定电话
+     */
+    landline(value: string) {
+        const reg = /^\d{3,4}-\d{7,8}(-\d{3,4})?$/
+        return reg.test(value)
+    },
+    /**
+     * 判断是否为空
+     */
+    empty(value: any) {
+        switch (typeof value) {
+            case 'undefined':
+                return true
+            case 'string':
+                if (value.replace(/(^[ \t\n\r]*)|([ \t\n\r]*$)/g, '').length == 0) return true
+                break
+            case 'boolean':
+                if (!value) return true
+                break
+            case 'number':
+                if (value === 0 || isNaN(value)) return true
+                break
+            case 'object':
+                if (value === null || value.length === 0) return true
+                for (const i in value) {
+                    return false
+                }
+                return true
+        }
+        return false
+    },
+    /**
+     * 是否json字符串
+     */
+    jsonString(value: object) {
+        if (typeof value === 'string') {
+            try {
+                const obj = JSON.parse(value)
+                if (typeof obj === 'object' && obj) {
+                    return true
+                }
+                return false
+            } catch (e) {
+                return false
+            }
+        }
+        return false
+    },
+    /**
+     * 是否数组
+     */
+    array(value: []) {
+        if (typeof Array.isArray === 'function') {
+            return Array.isArray(value)
+        }
+        return Object.prototype.toString.call(value) === '[object Array]'
+    },
+    /**
+     * 是否对象
+     */
+    object(value: object) {
+        return Object.prototype.toString.call(value) === '[object Object]'
+    },
+    /**
+     * 是否短信验证码
+     */
+    code(value: string, len = 6) {
+        return new RegExp(`^\\d{${len}}$`).test(value)
+    },
+    /**
+     * 是否函数方法
+     * @param {Object} value
+     */
+    func(value: string) {
+        return typeof value === 'function'
+    },
+    /**
+     * 是否promise对象
+     * @param {Object} value
+     */
+    promise(value: Promise<any>) {
+        return this.object(value) && this.func(value.then) && this.func(value.catch)
+    },
+    /** 是否图片格式
+     * @param {Object} value
+     */
+    image(value: string) {
+        const newValue = value.split('?')[0]
+        const IMAGE_REGEXP = /\.(jpeg|jpg|gif|png|svg|webp|jfif|bmp|dpg)/i
+        return IMAGE_REGEXP.test(newValue)
+    },
+    /**
+     * 是否视频格式
+     * @param {Object} value
+     */
+    video(value: string) {
+        const VIDEO_REGEXP = /\.(mp4|mpg|mpeg|dat|asf|avi|rm|rmvb|mov|wmv|flv|mkv|m3u8)/i
+        return VIDEO_REGEXP.test(value)
+    },
+    /**
+     * 是否为正则对象
+     * @param o
+     */
+    regExp(o) {
+        return o && Object.prototype.toString.call(o) === '[object RegExp]'
+    }
+}
+
+export default test
\ No newline at end of file
diff --git a/web/windi.config.ts b/web/windi.config.ts
new file mode 100644
index 00000000..17d19669
--- /dev/null
+++ b/web/windi.config.ts
@@ -0,0 +1,28 @@
+import { defineConfig } from 'windicss/helpers'
+
+export default defineConfig({
+    theme: {
+        extend: {
+            colors: {
+                white: 'var(--el-color-white)',
+                black: '#000',
+                primary: {
+                    DEFAULT: 'var(--el-color-primary)',
+                    'light-3': 'var(--el-color-primary-light-3)',
+                    'light-5': 'var(--el-color-primary-light-5)',
+                    'light-7': 'var(--el-color-primary-light-7)',
+                    'light-8': 'var(--el-color-primary-light-8)',
+                    'light-9': 'var(--el-color-primary-light-9)',
+                    'dark-2': 'var(--el-color-primary-dark-2)'
+                },
+                success: 'var(--el-color-success)',
+                warning: 'var(--el-color-warning)',
+                danger: 'var(--el-color-danger)',
+                error: 'var(--el-color-error)',
+                info: 'var(--el-color-info)',
+                body: 'var(--el-bg-color)',
+                page: 'var(--el-bg-color-page)'
+            }
+        }
+    }
+})
\ No newline at end of file