From 55174e4258e85c5998763f88ff253557561691ea Mon Sep 17 00:00:00 2001
From: rd <1344903914@qq.com>
Date: Tue, 22 Jul 2025 11:28:39 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=BB=9F=E4=B8=80button4=E7=A7=8D?=
=?UTF-8?q?=E6=A0=B7=E5=BC=8F=EF=BC=9Aprimary/outline/text/default?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../_base/exit-account-modal/index.vue | 11 ++-
src/components/_base/navbar/index.vue | 2 +-
src/styles/components/button.scss | 67 +++++++++++++++++++
src/styles/components/index.scss | 3 +-
src/views/components/login/index.vue | 7 +-
.../brands/brand-materials/index.vue | 4 +-
.../brands/brand-materials/style.scss | 12 ----
.../businessAnalysisReport.vue | 4 +-
.../competitiveProductAnalysisReport.vue | 4 +-
.../components/account-table/index.vue | 8 +--
.../components/filter-block/index.vue | 4 +-
.../account-dashboard/style.scss | 10 ---
.../components/note-table/index.vue | 4 +-
.../media-account/account-detail/style.scss | 10 ---
.../components/account-table/index.vue | 8 +--
.../components/filter-block/index.vue | 4 +-
.../media-account/account-manage/index.vue | 6 +-
.../media-account/account-manage/style.scss | 10 ---
.../components/add-project-modal/index.vue | 32 +++++++++
.../components/add-project-modal/style.scss | 3 +
.../components/filter-block/index.vue | 6 +-
.../components/filter-block/style.scss | 2 +-
.../components/project-table/constants.ts | 1 +
.../components/project-table/index.vue | 2 +-
.../project-manage/project-list/index.vue | 3 +
.../project-manage/project-list/style.scss | 10 ---
.../put-account/account-dashboard/index.vue | 4 +-
.../components/board-table/index.vue | 6 +-
.../components/filter-block/index.vue | 4 +-
.../components/plan-table/index.vue | 6 +-
.../put-account/account-data/index.vue | 2 +-
.../put-account/account-data/style.scss | 10 ---
.../components/account-table/index.vue | 7 +-
.../components/filter-block/index.vue | 4 +-
.../put-account/account-manage/index.vue | 2 +-
.../put-account/account-manage/style.scss | 10 ---
.../components/table-data/listSearchForm.vue | 4 +-
37 files changed, 164 insertions(+), 132 deletions(-)
create mode 100644 src/styles/components/button.scss
create mode 100644 src/views/property-marketing/project-manage/project-list/components/add-project-modal/index.vue
create mode 100644 src/views/property-marketing/project-manage/project-list/components/add-project-modal/style.scss
diff --git a/src/components/_base/exit-account-modal/index.vue b/src/components/_base/exit-account-modal/index.vue
index 32a8380..b100121 100644
--- a/src/components/_base/exit-account-modal/index.vue
+++ b/src/components/_base/exit-account-modal/index.vue
@@ -17,7 +17,7 @@
退出登录后,你将无法收到该账号的通知
-
返回
+
返回
退出登录
@@ -83,15 +83,12 @@ defineExpose({ open });
}
.cancel-btn {
border-radius: 4px;
- border: 1px solid var(--BG-500, #b1b2b5);
- &:hover {
- border: 1px solid var(--BG-500, #b1b2b5);
- }
}
.danger-btn {
- border-radius: 4px;
background: var(--Functional-Danger-6, #f64b31) !important;
- border: none !important;
+ &:hover {
+ background: var(--Functional-Danger-6, #f64b31) !important;
+ }
}
}
}
diff --git a/src/components/_base/navbar/index.vue b/src/components/_base/navbar/index.vue
index 0fc5d65..cacc3f6 100644
--- a/src/components/_base/navbar/index.vue
+++ b/src/components/_base/navbar/index.vue
@@ -63,7 +63,7 @@ const onEnterpriseItemClick = async (item) => {
-
{{ isLogin ? '登录' : '注册并开通企业账号' }}
-
+
diff --git a/src/views/property-marketing/brands/brand-materials/index.vue b/src/views/property-marketing/brands/brand-materials/index.vue
index 9715c2f..3e9edaa 100644
--- a/src/views/property-marketing/brands/brand-materials/index.vue
+++ b/src/views/property-marketing/brands/brand-materials/index.vue
@@ -21,13 +21,13 @@
-
+
搜索
-
+
diff --git a/src/views/property-marketing/brands/brand-materials/style.scss b/src/views/property-marketing/brands/brand-materials/style.scss
index 2f61084..86e618c 100644
--- a/src/views/property-marketing/brands/brand-materials/style.scss
+++ b/src/views/property-marketing/brands/brand-materials/style.scss
@@ -3,23 +3,11 @@
display: flex;
flex-direction: column;
- :deep(.search-btn) {
- border-radius: 4px;
- border: 1px solid var(--Brand-Brand-6, #6d4cfe);
- color: #6d4cfe;
- }
-
:deep(.edit-btn) {
border: 1px solid var(--Brand-Brand-6, #6d4cfe);
color: #6d4cfe;
}
- :deep(.reset-btn) {
- border-radius: 4px;
- border: 1px solid var(--BG-500, #b1b2b5);
- background: var(--BG-white, #fff);
- }
-
.table-wrap {
width: 100%;
diff --git a/src/views/property-marketing/intelligent-solution/businessAnalysisReport.vue b/src/views/property-marketing/intelligent-solution/businessAnalysisReport.vue
index 0bbeacd..2fe0259 100644
--- a/src/views/property-marketing/intelligent-solution/businessAnalysisReport.vue
+++ b/src/views/property-marketing/intelligent-solution/businessAnalysisReport.vue
@@ -25,13 +25,13 @@
-
+
搜索
-
+
diff --git a/src/views/property-marketing/intelligent-solution/competitiveProductAnalysisReport.vue b/src/views/property-marketing/intelligent-solution/competitiveProductAnalysisReport.vue
index d1fe428..0c7a42f 100644
--- a/src/views/property-marketing/intelligent-solution/competitiveProductAnalysisReport.vue
+++ b/src/views/property-marketing/intelligent-solution/competitiveProductAnalysisReport.vue
@@ -25,13 +25,13 @@
-
+
搜索
-
+
diff --git a/src/views/property-marketing/media-account/account-dashboard/components/account-table/index.vue b/src/views/property-marketing/media-account/account-dashboard/components/account-table/index.vue
index 6c51cd1..ae320c0 100644
--- a/src/views/property-marketing/media-account/account-dashboard/components/account-table/index.vue
+++ b/src/views/property-marketing/media-account/account-dashboard/components/account-table/index.vue
@@ -15,11 +15,11 @@
>
-
+
导出数据
-
+
@@ -119,7 +119,7 @@
}}
- 详情
+ 详情
@@ -148,7 +148,7 @@
- 详情
+ 详情
diff --git a/src/views/property-marketing/media-account/account-dashboard/components/filter-block/index.vue b/src/views/property-marketing/media-account/account-dashboard/components/filter-block/index.vue
index d7a2089..4a452eb 100644
--- a/src/views/property-marketing/media-account/account-dashboard/components/filter-block/index.vue
+++ b/src/views/property-marketing/media-account/account-dashboard/components/filter-block/index.vue
@@ -47,13 +47,13 @@
-
+
搜索
-
+
diff --git a/src/views/property-marketing/media-account/account-dashboard/style.scss b/src/views/property-marketing/media-account/account-dashboard/style.scss
index 050075c..16fd193 100644
--- a/src/views/property-marketing/media-account/account-dashboard/style.scss
+++ b/src/views/property-marketing/media-account/account-dashboard/style.scss
@@ -2,16 +2,6 @@
height: 100%;
display: flex;
flex-direction: column;
- :deep(.search-btn) {
- border-radius: 4px;
- border: 1px solid var(--Brand-Brand-6, #6d4cfe);
- color: #6d4cfe;
- }
- :deep(.reset-btn) {
- border-radius: 4px;
- border: 1px solid var(--BG-500, #b1b2b5);
- background: var(--BG-white, #fff);
- }
.filter-wrap {
border-radius: 8px;
border: 1px solid #e6e6e8;
diff --git a/src/views/property-marketing/media-account/account-detail/components/note-table/index.vue b/src/views/property-marketing/media-account/account-detail/components/note-table/index.vue
index 97ac577..3ee11e6 100644
--- a/src/views/property-marketing/media-account/account-detail/components/note-table/index.vue
+++ b/src/views/property-marketing/media-account/account-detail/components/note-table/index.vue
@@ -36,13 +36,13 @@
/>
-
+
搜索
-
+
diff --git a/src/views/property-marketing/media-account/account-detail/style.scss b/src/views/property-marketing/media-account/account-detail/style.scss
index 8b5ad4b..40d5a29 100644
--- a/src/views/property-marketing/media-account/account-detail/style.scss
+++ b/src/views/property-marketing/media-account/account-detail/style.scss
@@ -19,16 +19,6 @@
padding: 10px 0;
align-items: center;
}
- :deep(.search-btn) {
- border-radius: 4px;
- border: 1px solid var(--Brand-Brand-6, #6d4cfe);
- color: #6d4cfe;
- }
- :deep(.reset-btn) {
- border-radius: 4px;
- border: 1px solid var(--BG-500, #b1b2b5);
- background: var(--BG-white, #fff);
- }
.table-wrap {
width: 100%;
diff --git a/src/views/property-marketing/media-account/account-manage/components/account-table/index.vue b/src/views/property-marketing/media-account/account-manage/components/account-table/index.vue
index 2c82938..fbf87c4 100644
--- a/src/views/property-marketing/media-account/account-manage/components/account-table/index.vue
+++ b/src/views/property-marketing/media-account/account-manage/components/account-table/index.vue
@@ -76,7 +76,7 @@
-
+
更多
@@ -89,7 +89,7 @@
>
删除
-
+
{{ getBtnText(item) }}
@@ -101,8 +101,8 @@
更新数据失败
diff --git a/src/views/property-marketing/media-account/account-manage/components/filter-block/index.vue b/src/views/property-marketing/media-account/account-manage/components/filter-block/index.vue
index 0734e15..27df722 100644
--- a/src/views/property-marketing/media-account/account-manage/components/filter-block/index.vue
+++ b/src/views/property-marketing/media-account/account-manage/components/filter-block/index.vue
@@ -59,13 +59,13 @@
-
+
搜索
-
+
diff --git a/src/views/property-marketing/media-account/account-manage/index.vue b/src/views/property-marketing/media-account/account-manage/index.vue
index 6448c07..70fcb8d 100644
--- a/src/views/property-marketing/media-account/account-manage/index.vue
+++ b/src/views/property-marketing/media-account/account-manage/index.vue
@@ -8,19 +8,19 @@
账号管理
-
+
标签管理
-
+
分组管理
-
+
diff --git a/src/views/property-marketing/media-account/account-manage/style.scss b/src/views/property-marketing/media-account/account-manage/style.scss
index e064951..21bd7de 100644
--- a/src/views/property-marketing/media-account/account-manage/style.scss
+++ b/src/views/property-marketing/media-account/account-manage/style.scss
@@ -2,16 +2,6 @@
height: 100%;
display: flex;
flex-direction: column;
- :deep(.search-btn) {
- border-radius: 4px;
- border: 1px solid var(--Brand-Brand-6, #6d4cfe);
- color: #6d4cfe;
- }
- :deep(.reset-btn) {
- border-radius: 4px;
- border: 1px solid var(--BG-500, #b1b2b5);
- background: var(--BG-white, #fff);
- }
.filter-wrap {
.top {
.title {
diff --git a/src/views/property-marketing/project-manage/project-list/components/add-project-modal/index.vue b/src/views/property-marketing/project-manage/project-list/components/add-project-modal/index.vue
new file mode 100644
index 0000000..86740d4
--- /dev/null
+++ b/src/views/property-marketing/project-manage/project-list/components/add-project-modal/index.vue
@@ -0,0 +1,32 @@
+
+
+
+ 取消
+ 确定
+
+
+
+
+
diff --git a/src/views/property-marketing/project-manage/project-list/components/add-project-modal/style.scss b/src/views/property-marketing/project-manage/project-list/components/add-project-modal/style.scss
new file mode 100644
index 0000000..c6e2143
--- /dev/null
+++ b/src/views/property-marketing/project-manage/project-list/components/add-project-modal/style.scss
@@ -0,0 +1,3 @@
+.add-project-modal {
+
+}
\ No newline at end of file
diff --git a/src/views/property-marketing/project-manage/project-list/components/filter-block/index.vue b/src/views/property-marketing/project-manage/project-list/components/filter-block/index.vue
index b22abea..bb52cbe 100644
--- a/src/views/property-marketing/project-manage/project-list/components/filter-block/index.vue
+++ b/src/views/property-marketing/project-manage/project-list/components/filter-block/index.vue
@@ -4,7 +4,7 @@
* @Date: 2025-06-25 14:02:40
-->
-
+
项目名称
@@ -24,13 +24,13 @@
-
+
搜索
-
+
diff --git a/src/views/property-marketing/project-manage/project-list/components/filter-block/style.scss b/src/views/property-marketing/project-manage/project-list/components/filter-block/style.scss
index 48e2115..dd08cb3 100644
--- a/src/views/property-marketing/project-manage/project-list/components/filter-block/style.scss
+++ b/src/views/property-marketing/project-manage/project-list/components/filter-block/style.scss
@@ -1,4 +1,4 @@
-.container {
+.filter-wrap {
.filter-row {
.filter-row-item {
&:not(:last-child) {
diff --git a/src/views/property-marketing/project-manage/project-list/components/project-table/constants.ts b/src/views/property-marketing/project-manage/project-list/components/project-table/constants.ts
index ae9a58f..8e879e9 100644
--- a/src/views/property-marketing/project-manage/project-list/components/project-table/constants.ts
+++ b/src/views/property-marketing/project-manage/project-list/components/project-table/constants.ts
@@ -13,6 +13,7 @@ export const TABLE_COLUMNS = [
title: '项目预算',
dataIndex: 'key1',
width: 180,
+ prefix: "¥"
},
{
title: '关联平台账号',
diff --git a/src/views/property-marketing/project-manage/project-list/components/project-table/index.vue b/src/views/property-marketing/project-manage/project-list/components/project-table/index.vue
index dc8e325..5b70c15 100644
--- a/src/views/property-marketing/project-manage/project-list/components/project-table/index.vue
+++ b/src/views/property-marketing/project-manage/project-list/components/project-table/index.vue
@@ -41,7 +41,7 @@
![]()
-
编辑
+
编辑
diff --git a/src/views/property-marketing/project-manage/project-list/index.vue b/src/views/property-marketing/project-manage/project-list/index.vue
index 88ddc92..274231a 100644
--- a/src/views/property-marketing/project-manage/project-list/index.vue
+++ b/src/views/property-marketing/project-manage/project-list/index.vue
@@ -37,6 +37,8 @@
/>
+
+
@@ -46,6 +48,7 @@ import { useTableSelectionWithPagination } from '@/hooks/useTableSelectionWithPa
import FilterBlock from './components/filter-block';
import ProjectTable from './components/project-table';
+import AddProjectModal from './components/add-project-modal';
import icon1 from '@/assets/img/media-account/icon-add.png';
diff --git a/src/views/property-marketing/project-manage/project-list/style.scss b/src/views/property-marketing/project-manage/project-list/style.scss
index dda7199..09ee598 100644
--- a/src/views/property-marketing/project-manage/project-list/style.scss
+++ b/src/views/property-marketing/project-manage/project-list/style.scss
@@ -2,16 +2,6 @@
height: 100%;
display: flex;
flex-direction: column;
- :deep(.search-btn) {
- border-radius: 4px;
- border: 1px solid var(--Brand-Brand-6, #6d4cfe);
- color: #6d4cfe;
- }
- :deep(.reset-btn) {
- border-radius: 4px;
- border: 1px solid var(--BG-500, #b1b2b5);
- background: var(--BG-white, #fff);
- }
.filter-wrap {
.top {
.title {
diff --git a/src/views/property-marketing/put-account/account-dashboard/index.vue b/src/views/property-marketing/put-account/account-dashboard/index.vue
index dee8513..9a5fa7f 100644
--- a/src/views/property-marketing/put-account/account-dashboard/index.vue
+++ b/src/views/property-marketing/put-account/account-dashboard/index.vue
@@ -43,13 +43,13 @@
-
+
搜索
-
+
diff --git a/src/views/property-marketing/put-account/account-data/components/board-table/index.vue b/src/views/property-marketing/put-account/account-data/components/board-table/index.vue
index b60414d..a7ba0a1 100644
--- a/src/views/property-marketing/put-account/account-data/components/board-table/index.vue
+++ b/src/views/property-marketing/put-account/account-data/components/board-table/index.vue
@@ -16,11 +16,11 @@
-
+
导出数据
-
+
@@ -106,7 +106,7 @@
- 详情
+ 详情
diff --git a/src/views/property-marketing/put-account/account-data/components/filter-block/index.vue b/src/views/property-marketing/put-account/account-data/components/filter-block/index.vue
index be083c7..e35f3b7 100644
--- a/src/views/property-marketing/put-account/account-data/components/filter-block/index.vue
+++ b/src/views/property-marketing/put-account/account-data/components/filter-block/index.vue
@@ -55,13 +55,13 @@
/>
-
+
搜索
-
+
diff --git a/src/views/property-marketing/put-account/account-data/components/plan-table/index.vue b/src/views/property-marketing/put-account/account-data/components/plan-table/index.vue
index 4ae434e..957231b 100644
--- a/src/views/property-marketing/put-account/account-data/components/plan-table/index.vue
+++ b/src/views/property-marketing/put-account/account-data/components/plan-table/index.vue
@@ -16,11 +16,11 @@
-
+
导出数据
-
+
@@ -106,7 +106,7 @@
- 详情
+ 详情
diff --git a/src/views/property-marketing/put-account/account-data/index.vue b/src/views/property-marketing/put-account/account-data/index.vue
index 8f7a3e5..b4c7646 100644
--- a/src/views/property-marketing/put-account/account-data/index.vue
+++ b/src/views/property-marketing/put-account/account-data/index.vue
@@ -9,7 +9,7 @@
-
+
diff --git a/src/views/property-marketing/put-account/account-data/style.scss b/src/views/property-marketing/put-account/account-data/style.scss
index dc0fcac..9fcc279 100644
--- a/src/views/property-marketing/put-account/account-data/style.scss
+++ b/src/views/property-marketing/put-account/account-data/style.scss
@@ -2,16 +2,6 @@
height: 100%;
display: flex;
flex-direction: column;
- :deep(.search-btn) {
- border-radius: 4px;
- border: 1px solid var(--Brand-Brand-6, #6d4cfe);
- color: #6d4cfe;
- }
- :deep(.reset-btn) {
- border-radius: 4px;
- border: 1px solid var(--BG-500, #b1b2b5);
- background: var(--BG-white, #fff);
- }
.filter-wrap {
border-radius: 8px;
border: 1px solid #e6e6e8;
diff --git a/src/views/property-marketing/put-account/account-manage/components/account-table/index.vue b/src/views/property-marketing/put-account/account-manage/components/account-table/index.vue
index a2e75c0..69ada73 100644
--- a/src/views/property-marketing/put-account/account-manage/components/account-table/index.vue
+++ b/src/views/property-marketing/put-account/account-manage/components/account-table/index.vue
@@ -53,17 +53,18 @@
暂停同步
-
+
获取凭证
-
+
编辑
diff --git a/src/views/property-marketing/put-account/account-manage/components/filter-block/index.vue b/src/views/property-marketing/put-account/account-manage/components/filter-block/index.vue
index 3b90852..0968c71 100644
--- a/src/views/property-marketing/put-account/account-manage/components/filter-block/index.vue
+++ b/src/views/property-marketing/put-account/account-manage/components/filter-block/index.vue
@@ -47,13 +47,13 @@
-
+
搜索
-
+
diff --git a/src/views/property-marketing/put-account/account-manage/index.vue b/src/views/property-marketing/put-account/account-manage/index.vue
index aa50bcd..d7483f6 100644
--- a/src/views/property-marketing/put-account/account-manage/index.vue
+++ b/src/views/property-marketing/put-account/account-manage/index.vue
@@ -8,7 +8,7 @@
账户管理
-
+
diff --git a/src/views/property-marketing/put-account/account-manage/style.scss b/src/views/property-marketing/put-account/account-manage/style.scss
index 824b821..8e211fd 100644
--- a/src/views/property-marketing/put-account/account-manage/style.scss
+++ b/src/views/property-marketing/put-account/account-manage/style.scss
@@ -2,16 +2,6 @@
height: 100%;
display: flex;
flex-direction: column;
- :deep(.search-btn) {
- border-radius: 4px;
- border: 1px solid var(--Brand-Brand-6, #6d4cfe);
- color: #6d4cfe;
- }
- :deep(.reset-btn) {
- border-radius: 4px;
- border: 1px solid var(--BG-500, #b1b2b5);
- background: var(--BG-white, #fff);
- }
.filter-wrap {
.top {
.title {
diff --git a/src/views/property-marketing/put-account/investment-guidelines/components/table-data/listSearchForm.vue b/src/views/property-marketing/put-account/investment-guidelines/components/table-data/listSearchForm.vue
index b8dcd00..1d3fd84 100644
--- a/src/views/property-marketing/put-account/investment-guidelines/components/table-data/listSearchForm.vue
+++ b/src/views/property-marketing/put-account/investment-guidelines/components/table-data/listSearchForm.vue
@@ -35,13 +35,13 @@