From 0019c650ae3db70436cf9de1881fb1520db37495 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Mon, 26 Aug 2024 11:22:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E6=98=BE?=
=?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../model-nav-group/model-nav-group-content.vue | 4 ++--
src/components/model-notice/model-notice-content.vue | 6 +++---
src/components/model-tabs/model-tabs-content.vue | 2 +-
src/layout/components/main/default/user-info.ts | 5 ++++-
src/layout/components/main/index.vue | 12 ++++++------
5 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/src/components/model-nav-group/model-nav-group-content.vue b/src/components/model-nav-group/model-nav-group-content.vue
index d6a10ea3..34cce2f5 100644
--- a/src/components/model-nav-group/model-nav-group-content.vue
+++ b/src/components/model-nav-group/model-nav-group-content.vue
@@ -40,10 +40,10 @@
-
+
-
+
diff --git a/src/components/model-notice/model-notice-content.vue b/src/components/model-notice/model-notice-content.vue
index 57e61373..48707bcc 100644
--- a/src/components/model-notice/model-notice-content.vue
+++ b/src/components/model-notice/model-notice-content.vue
@@ -53,13 +53,13 @@
-
+
-
+
-
+
diff --git a/src/components/model-tabs/model-tabs-content.vue b/src/components/model-tabs/model-tabs-content.vue
index d7fecb84..885a4d1d 100644
--- a/src/components/model-tabs/model-tabs-content.vue
+++ b/src/components/model-tabs/model-tabs-content.vue
@@ -1,6 +1,6 @@
-
+
展示设置
diff --git a/src/layout/components/main/default/user-info.ts b/src/layout/components/main/default/user-info.ts
index 50a6e369..2bdb51aa 100644
--- a/src/layout/components/main/default/user-info.ts
+++ b/src/layout/components/main/default/user-info.ts
@@ -51,7 +51,10 @@ const defaultUserInfo: DefaultUserInfo = {
stats_number_color: 'rgba(0, 0, 0, 1)',
stats_number_weight: '500',
stats_number_size: 16,
- common_style: defaultCommon,
+ common_style: {
+ ...defaultCommon,
+ color_list: [{ color: '#fff', color_percentage: '' }],
+ },
},
};
diff --git a/src/layout/components/main/index.vue b/src/layout/components/main/index.vue
index 94dc598f..4dd92d44 100644
--- a/src/layout/components/main/index.vue
+++ b/src/layout/components/main/index.vue
@@ -208,18 +208,18 @@ const components = reactive([
{ key: 'carousel', name: '轮播图' },
{ key: 'search', name: '搜索框' },
{ key: 'nav-group', name: '导航组' },
- { key: 'shop-list', name: '商品列表' },
- { key: 'tabs', name: '选项卡' },
{ key: 'notice', name: '公告' },
- { key: 'img-magic', name: '图片魔方' },
{ key: 'video', name: '视频' },
{ key: 'user-info', name: '用户信息' },
- { key: 'article-list', name: '文章列表' },
- { key: 'shop-tabs', name: '商品选项卡' },
+ { key: 'tabs', name: '选项卡' },
{ key: 'article-tabs', name: '文章选项卡' },
+ { key: 'shop-tabs', name: '商品选项卡' },
+ { key: 'article-list', name: '文章列表' },
+ { key: 'shop-list', name: '商品列表' },
+ { key: 'img-magic', name: '图片魔方' },
+ { key: 'data-magic', name: '数据魔方' },
{ key: 'hot-zone', name: '热区' },
{ key: 'custom', name: '自定义' },
- { key: 'data-magic', name: '数据魔方' },
],
},
{