From 6de3c818e81708208f7f37852b948473ac873120 Mon Sep 17 00:00:00 2001
From: rd <1344903914@qq.com>
Date: Mon, 14 Jul 2025 11:16:37 +0800
Subject: [PATCH 1/8] =?UTF-8?q?perf:=20=E6=89=B9=E9=87=8F=E6=93=8D?=
=?UTF-8?q?=E4=BD=9C=E6=97=B6=E5=80=99reload?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../property-marketing/media-account/account-manage/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 74753a7..879c09d 100644
--- a/src/views/property-marketing/media-account/account-manage/index.vue
+++ b/src/views/property-marketing/media-account/account-manage/index.vue
@@ -212,7 +212,7 @@ const reload = () => {
getData();
};
const handleSearch = () => {
- getData();
+ reload();
};
const handleReset = () => {
pageInfo.value = cloneDeep(INITIAL_PAGE_INFO);
From 97dd86cd45a9985939de93b4076a6badd7cf7d52 Mon Sep 17 00:00:00 2001
From: rd <1344903914@qq.com>
Date: Tue, 15 Jul 2025 11:03:44 +0800
Subject: [PATCH 2/8] =?UTF-8?q?feat:=20=E7=BB=9F=E4=B8=80input=E3=80=81sel?=
=?UTF-8?q?ect=E3=80=81picker=E7=AD=89=E7=BB=84=E4=BB=B6=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/styles/components/date-picker.scss | 15 ++
src/styles/components/index.scss | 5 +-
src/styles/components/input.scss | 16 +-
src/styles/components/modal.scss | 5 +
src/styles/components/select.scss | 15 ++
src/styles/components/textarea.scss | 15 ++
src/views/property-marketing/component.scss | 16 --
.../components/filter-block/style.scss | 13 --
.../components/note-table/style.scss | 14 --
.../components/filter-block/style.scss | 13 --
.../components/filter-block/style.scss | 14 --
.../components/account-table/index.vue | 6 +-
.../account-table/pause-account-patch.vue | 6 +-
.../components/add-account-modal/index.vue | 8 +-
.../authorized-account-modal/index.vue | 13 +-
.../components/filter-block/style.scss | 13 --
.../select-sub-account-modal/constants.ts | 20 ++
.../select-sub-account-modal/index.vue | 198 ++++++++++++++++++
.../select-sub-account-modal/style.scss | 35 ++++
.../put-account/account-manage/index.vue | 5 +-
20 files changed, 344 insertions(+), 101 deletions(-)
create mode 100644 src/styles/components/date-picker.scss
create mode 100644 src/styles/components/select.scss
create mode 100644 src/styles/components/textarea.scss
create mode 100644 src/views/property-marketing/put-account/account-manage/components/select-sub-account-modal/constants.ts
create mode 100644 src/views/property-marketing/put-account/account-manage/components/select-sub-account-modal/index.vue
create mode 100644 src/views/property-marketing/put-account/account-manage/components/select-sub-account-modal/style.scss
diff --git a/src/styles/components/date-picker.scss b/src/styles/components/date-picker.scss
new file mode 100644
index 0000000..6120784
--- /dev/null
+++ b/src/styles/components/date-picker.scss
@@ -0,0 +1,15 @@
+.arco-picker {
+ border-radius: 4px !important;
+ border-color: #d7d7d9 !important;
+ background-color: #fff !important;
+ &:hover {
+ background-color: #fff !important;
+ }
+ &:focus-within,
+ &.arco-input-focus,
+ &.arco-textarea-focus {
+ background-color: var(--color-bg-2) !important;
+ border-color: rgb(var(--primary-6)) !important;
+ box-shadow: 0 0 0 0 var(--color-primary-light-2) !important;
+ }
+}
diff --git a/src/styles/components/index.scss b/src/styles/components/index.scss
index 39ccb7a..00e6c0f 100644
--- a/src/styles/components/index.scss
+++ b/src/styles/components/index.scss
@@ -3,4 +3,7 @@
@import './checkbox.scss';
@import './pagination.scss';
@import './tabs.scss';
-@import './modal.scss';
\ No newline at end of file
+@import './modal.scss';
+@import "./textarea.scss";
+@import "./select.scss";
+@import "./date-picker.scss"
\ No newline at end of file
diff --git a/src/styles/components/input.scss b/src/styles/components/input.scss
index a352fa3..896bb8b 100644
--- a/src/styles/components/input.scss
+++ b/src/styles/components/input.scss
@@ -1,5 +1,15 @@
.arco-input-wrapper {
- border-radius: 4px;
- border-color: #d7d7d9;
- background-color: #fff;
+ border-radius: 4px !important;
+ border-color: #d7d7d9 !important;
+ background-color: #fff !important;
+ &:hover {
+ background-color: #fff !important;
+ }
+ &:focus-within,
+ &.arco-input-focus,
+ &.arco-textarea-focus {
+ background-color: var(--color-bg-2) !important;
+ border-color: rgb(var(--primary-6)) !important;
+ box-shadow: 0 0 0 0 var(--color-primary-light-2) !important;
+ }
}
diff --git a/src/styles/components/modal.scss b/src/styles/components/modal.scss
index aee1303..c088215 100644
--- a/src/styles/components/modal.scss
+++ b/src/styles/components/modal.scss
@@ -4,6 +4,11 @@
height: 56px;
padding: 0 20px;
.arco-modal-title {
+ font-family: $font-family-medium;
+ color: #211f24;
+ font-size: 16px;
+ font-style: normal;
+ font-weight: 400;
justify-content: flex-start;
}
}
diff --git a/src/styles/components/select.scss b/src/styles/components/select.scss
new file mode 100644
index 0000000..cf0b8aa
--- /dev/null
+++ b/src/styles/components/select.scss
@@ -0,0 +1,15 @@
+.arco-select {
+ border-radius: 4px !important;
+ border-color: #d7d7d9 !important;
+ background-color: #fff !important;
+ &:hover {
+ background-color: #fff !important;
+ }
+ &:focus-within,
+ &.arco-input-focus,
+ &.arco-textarea-focus {
+ background-color: var(--color-bg-2) !important;
+ border-color: rgb(var(--primary-6)) !important;
+ box-shadow: 0 0 0 0 var(--color-primary-light-2) !important;
+ }
+}
diff --git a/src/styles/components/textarea.scss b/src/styles/components/textarea.scss
new file mode 100644
index 0000000..f87db35
--- /dev/null
+++ b/src/styles/components/textarea.scss
@@ -0,0 +1,15 @@
+.arco-textarea-wrapper {
+ border-radius: 4px !important;
+ border-color: #d7d7d9 !important;
+ background-color: #fff !important;
+ &:hover {
+ background-color: #fff !important;
+ }
+ &:focus-within,
+ &.arco-input-focus,
+ &.arco-textarea-focus {
+ background-color: var(--color-bg-2) !important;
+ border-color: rgb(var(--primary-6)) !important;
+ box-shadow: 0 0 0 0 var(--color-primary-light-2) !important;
+ }
+}
diff --git a/src/views/property-marketing/component.scss b/src/views/property-marketing/component.scss
index f952093..e90c356 100644
--- a/src/views/property-marketing/component.scss
+++ b/src/views/property-marketing/component.scss
@@ -1,19 +1,3 @@
-.arco-input-wrapper,
-.arco-select-view-single,
-.arco-textarea-wrapper,
-.arco-picker,
-.arco-select-view-multiple {
- border-radius: 4px;
- border-color: #d7d7d9;
- background-color: #fff;
- &:focus-within,
- &.arco-input-focus,
- &.arco-textarea-focus {
- background-color: var(--color-bg-2);
- border-color: rgb(var(--primary-6));
- box-shadow: 0 0 0 0 var(--color-primary-light-2);
- }
-}
.arco-modal {
.cancel-btn {
border-radius: 4px;
diff --git a/src/views/property-marketing/media-account/account-dashboard/components/filter-block/style.scss b/src/views/property-marketing/media-account/account-dashboard/components/filter-block/style.scss
index 7814361..48e2115 100644
--- a/src/views/property-marketing/media-account/account-dashboard/components/filter-block/style.scss
+++ b/src/views/property-marketing/media-account/account-dashboard/components/filter-block/style.scss
@@ -1,17 +1,4 @@
.container {
- :deep(.arco-input-wrapper),
- :deep(.arco-select-view-single),
- :deep(.arco-select-view-multiple) {
- border-radius: 4px;
- border-color: #d7d7d9;
- background-color: #fff;
- &:focus-within,
- &.arco-input-focus {
- background-color: var(--color-bg-2);
- border-color: rgb(var(--primary-6));
- box-shadow: 0 0 0 0 var(--color-primary-light-2);
- }
- }
.filter-row {
.filter-row-item {
&:not(:last-child) {
diff --git a/src/views/property-marketing/media-account/account-detail/components/note-table/style.scss b/src/views/property-marketing/media-account/account-detail/components/note-table/style.scss
index 782fab8..e772b23 100644
--- a/src/views/property-marketing/media-account/account-detail/components/note-table/style.scss
+++ b/src/views/property-marketing/media-account/account-detail/components/note-table/style.scss
@@ -1,18 +1,4 @@
.note-table-wrap {
- :deep(.arco-input-wrapper),
- :deep(.arco-select-view-single),
- :deep(.arco-select-view-multiple),
- :deep(.arco-picker) {
- border-radius: 4px;
- border-color: #d7d7d9;
- background-color: #fff;
- &:focus-within,
- &.arco-input-focus {
- background-color: var(--color-bg-2);
- border-color: rgb(var(--primary-6));
- box-shadow: 0 0 0 0 var(--color-primary-light-2);
- }
- }
.filter-row {
.filter-row-item {
&:not(:last-child) {
diff --git a/src/views/property-marketing/media-account/account-manage/components/filter-block/style.scss b/src/views/property-marketing/media-account/account-manage/components/filter-block/style.scss
index 7814361..48e2115 100644
--- a/src/views/property-marketing/media-account/account-manage/components/filter-block/style.scss
+++ b/src/views/property-marketing/media-account/account-manage/components/filter-block/style.scss
@@ -1,17 +1,4 @@
.container {
- :deep(.arco-input-wrapper),
- :deep(.arco-select-view-single),
- :deep(.arco-select-view-multiple) {
- border-radius: 4px;
- border-color: #d7d7d9;
- background-color: #fff;
- &:focus-within,
- &.arco-input-focus {
- background-color: var(--color-bg-2);
- border-color: rgb(var(--primary-6));
- box-shadow: 0 0 0 0 var(--color-primary-light-2);
- }
- }
.filter-row {
.filter-row-item {
&:not(:last-child) {
diff --git a/src/views/property-marketing/put-account/account-data/components/filter-block/style.scss b/src/views/property-marketing/put-account/account-data/components/filter-block/style.scss
index 191ada1..48e2115 100644
--- a/src/views/property-marketing/put-account/account-data/components/filter-block/style.scss
+++ b/src/views/property-marketing/put-account/account-data/components/filter-block/style.scss
@@ -1,18 +1,4 @@
.container {
- :deep(.arco-input-wrapper),
- :deep(.arco-select-view-single),
- :deep(.arco-select-view-multiple),
- :deep(.arco-picker) {
- border-radius: 4px;
- border-color: #d7d7d9;
- background-color: #fff;
- &:focus-within,
- &.arco-input-focus {
- background-color: var(--color-bg-2);
- border-color: rgb(var(--primary-6));
- box-shadow: 0 0 0 0 var(--color-primary-light-2);
- }
- }
.filter-row {
.filter-row-item {
&:not(:last-child) {
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 e778bfe..2548668 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
@@ -63,8 +63,8 @@
-
-
+
+
@@ -92,7 +92,7 @@ const props = defineProps({
},
});
-const emits = defineEmits(['openEdit', 'update', 'selectionChange', 'delete']);
+const emits = defineEmits(['openEdit', 'selectionChange', 'delete']);
const pauseAccountPatchModalRef = ref(null);
const authorizedAccountModalRef = ref(null);
diff --git a/src/views/property-marketing/put-account/account-manage/components/account-table/pause-account-patch.vue b/src/views/property-marketing/put-account/account-manage/components/account-table/pause-account-patch.vue
index 9649f20..7509a48 100644
--- a/src/views/property-marketing/put-account/account-manage/components/account-table/pause-account-patch.vue
+++ b/src/views/property-marketing/put-account/account-manage/components/account-table/pause-account-patch.vue
@@ -20,8 +20,8 @@ import { ref } from 'vue';
import { pausePatchPlacementAccount } from '@/api/all/propertyMarketing';
import icon1 from '@/assets/img/media-account/icon-warn-1.png';
-const emits = defineEmits(['update', 'close']);
-
+const emits = defineEmits(['close']);
+const update = inject('update');
const visible = ref(false);
const accountId = ref(null);
const accountName = ref('');
@@ -45,7 +45,7 @@ async function onConfirm() {
const { code } = await pausePatchPlacementAccount(accountId.value);
if (code === 200) {
AMessage.success('暂停成功');
- emits('update');
+ update();
onClose();
}
}
diff --git a/src/views/property-marketing/put-account/account-manage/components/add-account-modal/index.vue b/src/views/property-marketing/put-account/account-manage/components/add-account-modal/index.vue
index 021d701..01fc429 100644
--- a/src/views/property-marketing/put-account/account-manage/components/add-account-modal/index.vue
+++ b/src/views/property-marketing/put-account/account-manage/components/add-account-modal/index.vue
@@ -137,7 +137,7 @@
-
+
@@ -161,7 +161,7 @@ import {
import icon1 from '@/assets/img/media-account/icon-download.png';
import icon2 from '@/assets/img/media-account/icon-delete.png';
-const emits = defineEmits(['update']);
+const update = inject('update');
const UploadStatus = {
DEFAULT: 'default',
@@ -278,7 +278,7 @@ const handleBatchImport = async () => {
});
if (code === 200) {
AMessage.success('导入成功');
- emits('update');
+ update();
onClose();
} else {
uploadStatus.value = UploadStatus.ERROR;
@@ -303,7 +303,7 @@ async function onSubmit() {
const { code, data } = await _fn(_params);
if (code === 200) {
isEdit.value && AMessage.success('修改成功');
- emits('update');
+ update();
if (isEdit.value) {
onClose();
diff --git a/src/views/property-marketing/put-account/account-manage/components/authorized-account-modal/index.vue b/src/views/property-marketing/put-account/account-manage/components/authorized-account-modal/index.vue
index 4f5bb36..7a632a0 100644
--- a/src/views/property-marketing/put-account/account-manage/components/authorized-account-modal/index.vue
+++ b/src/views/property-marketing/put-account/account-manage/components/authorized-account-modal/index.vue
@@ -59,6 +59,8 @@
{{ confirmBtnText }}
+
+
+
+
diff --git a/src/views/property-marketing/put-account/account-manage/components/select-sub-account-modal/style.scss b/src/views/property-marketing/put-account/account-manage/components/select-sub-account-modal/style.scss
new file mode 100644
index 0000000..28af786
--- /dev/null
+++ b/src/views/property-marketing/put-account/account-manage/components/select-sub-account-modal/style.scss
@@ -0,0 +1,35 @@
+.select-sub-account-modal {
+ .arco-modal-header {
+ }
+ .arco-modal-body {
+ height: 536px;
+ .filter-row {
+ .filter-row-item {
+ &:not(:last-child) {
+ margin-right: 24px;
+ }
+ .label {
+ margin-right: 12px;
+ color: #211f24;
+ font-family: 'PuHuiTi-Regular';
+ font-size: 14px;
+ font-style: normal;
+ font-weight: 400;
+ flex-shrink: 0;
+ line-height: 22px; /* 157.143% */
+ }
+ :deep(.arco-space-item) {
+ width: 100%;
+ }
+ }
+ }
+ .cts {
+ color: var(--Text-1, #211f24);
+ font-family: $font-family-medium;
+ font-size: 14px;
+ font-style: normal;
+ font-weight: 400;
+ line-height: 22px;
+ }
+ }
+}
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 d0b4a33..6099120 100644
--- a/src/views/property-marketing/put-account/account-manage/index.vue
+++ b/src/views/property-marketing/put-account/account-manage/index.vue
@@ -67,7 +67,6 @@
@selectionChange="handleSelectionChange"
@delete="handleDelete"
@openEdit="handleOpenEdit"
- @update="getData"
/>
@@ -86,7 +85,7 @@
-
+
@@ -254,6 +253,8 @@ const handleOpenAbnormalAccount = () => {
query.value.status = 2;
reload();
};
+
+provide('update', getData);