Merge remote-tracking branch 'origin/feature/v1.3_主agent_rxd' into test

# Conflicts: # src/views/agent/work-flow/components/DynamicForm.vue
2025-08-28 15:47:55 +08:00
parent a905d42ea7 c49349257d
commit 10c63e6500
327 changed files with 19899 additions and 1703 deletions
--- a/src/views/property-marketing/brands/brand-materials/index.vue
+++ b/src/views/property-marketing/brands/brand-materials/index.vue
@ -1,6 +1,6 @@
 <template>
  <div class="brand-wrap">
-    <div class="filter-wrap bg-#fff rounded-8px border-1px border-#D7D7D9 border-solid">
+    <div class="filter-wrap bg-#fff rounded-8px ">
      <div class="top flex h-64px px-24px py-10px justify-between items-center">
        <p class="text-18px font-400 lh-26px color-#211F24 title">品牌物料</p>
        <div class="flex items-center">
@ -72,7 +72,7 @@
      </div>
    </div>
    <div
-      class="table-wrap bg-#fff rounded-8px border-1px border-#D7D7D9 border-solid px-24px py-24px flex-1 flex flex-col"
+      class="table-wrap bg-#fff rounded-8px  px-24px py-24px  flex flex-col"
    >
      <a-table :data="tableData" ref="tableRef" :pagination="false">
        <template #columns>
@ -106,7 +106,7 @@
        </template>
      </a-table>

-      <div class="pagination-box">
+      <div class="pagination-row">
        <a-pagination
          :total="pageInfo.total"
          size="mini"
--- a/src/views/property-marketing/brands/brand-materials/style.scss
+++ b/src/views/property-marketing/brands/brand-materials/style.scss
@ -1,5 +1,4 @@
 .brand-wrap {
-  height: 100%;
  display: flex;
  flex-direction: column;

@ -11,14 +10,6 @@
  .table-wrap {
    width: 100%;

-    .pagination-box {
-      display: flex;
-      width: 100%;
-      padding: 16px 24px;
-      justify-content: flex-end;
-      align-items: center;
-    }
-
    margin-top: 20px;
  }

--- a/src/views/property-marketing/intelligent-solution/businessAnalysisReport.vue
+++ b/src/views/property-marketing/intelligent-solution/businessAnalysisReport.vue
@ -46,7 +46,7 @@
    >
      <a-table :columns="columns" :data="tableData" @change="handleChange"  :pagination="false">
      </a-table>
-      <div class="pagination-box">
+      <div class="pagination-row">
        <a-pagination
          :total="pageInfo.total"
          size="mini"
@ -177,14 +177,6 @@ const columns = [
  .table-wrap {
    width: 100%;

-    .pagination-box {
-      display: flex;
-      width: 100%;
-      padding: 16px 24px;
-      justify-content: flex-end;
-      align-items: center;
-    }
-
    margin-top: 20px;
  }

--- a/src/views/property-marketing/intelligent-solution/competitiveProductAnalysisReport.vue
+++ b/src/views/property-marketing/intelligent-solution/competitiveProductAnalysisReport.vue
@ -46,7 +46,7 @@
    >
      <a-table :columns="columns" :data="tableData" @change="handleChange"  :pagination="false">
      </a-table>
-      <div class="pagination-box">
+      <div class="pagination-row">
        <a-pagination
          :total="pageInfo.total"
          size="mini"
@ -169,7 +169,7 @@ const columns = [
  .table-wrap {
    width: 100%;

-    .pagination-box {
+    .pagination-row {
      display: flex;
      width: 100%;
      padding: 16px 24px;
--- 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
@ -41,7 +41,7 @@
    :selected-keys="selectedItems"
    :pagination="false"
    :scroll="{ x: '100%' }"
-    class="account-table w-100%"
+    class="account-table w-100% flex-1"
    bordered
    @sorter-change="handleSorterChange"
    @select="handleSelect"
--- a/src/views/property-marketing/media-account/account-dashboard/components/account-table/style.scss
+++ b/src/views/property-marketing/media-account/account-dashboard/components/account-table/style.scss
@ -18,8 +18,6 @@
  :deep(.status-box) {
    .label {
      font-family: $font-family-medium;
-      font-size: 14px;
-      line-height: 22px;
    }
  }
  .ai-evaluation-row {
--- a/src/views/property-marketing/media-account/account-dashboard/index.vue
+++ b/src/views/property-marketing/media-account/account-dashboard/index.vue
@ -5,7 +5,7 @@

 <template>
  <div class="account-dashboard-wrap">
-    <div class="filter-wrap bg-#fff rounded-8px border-1px border-#D7D7D9 border-solid px-24px pb-20px mb-16px">
+    <div class="filter-wrap bg-#fff rounded-8px px-24px pb-20px mb-16px">
      <div class="top flex h-64px py-10px justify-between items-center">
        <div class="flex items-center">
          <p class="text-18px font-400 lh-26px color-#211F24 mr-4px title">数据总览</p>
@ -27,12 +27,10 @@
        </div>
      </div>
    </div>
-    <div class="filter-wrap bg-#fff rounded-8px border-1px border-#D7D7D9 border-solid px-24px py-24px mb-16px">
+    <div class="filter-wrap bg-#fff rounded-8px px-24px py-24px mb-16px">
      <FilterBlock v-model:query="query" @onSearch="handleSearch" @onReset="handleReset" />
    </div>
-    <div
-      class="table-wrap bg-#fff rounded-8px border-1px border-#D7D7D9 border-solid px-24px py-24px flex-1 flex flex-col"
-    >
+    <div class="table-wrap bg-#fff rounded-8px px-24px py-24px flex flex-col">
      <AccountTable
        ref="accountTableRef"
        :dataSource="dataSource"
@ -41,7 +39,7 @@
        @export="handleExport"
        @sorterChange="handleSorterChange"
      />
-      <div v-if="pageInfo.total > 0" class="pagination-box">
+      <div v-if="pageInfo.total > 0" class="pagination-row">
        <a-pagination
          :total="pageInfo.total"
          size="mini"
--- a/src/views/property-marketing/media-account/account-dashboard/style.scss
+++ b/src/views/property-marketing/media-account/account-dashboard/style.scss
@ -1,10 +1,9 @@
 .account-dashboard-wrap {
-  height: 100%;
  display: flex;
  flex-direction: column;
  .filter-wrap {
    border-radius: 8px;
-    border: 1px solid #e6e6e8;
+    // border: 1px solid #e6e6e8;
    .top {
      .title {
        font-family: $font-family-medium;
@ -47,12 +46,5 @@

  .table-wrap {
    width: 100%;
-    .pagination-box {
-      display: flex;
-      width: 100%;
-      padding: 16px 24px;
-      justify-content: flex-end;
-      align-items: center;
-    }
  }
 }
--- a/src/views/property-marketing/media-account/account-detail/components/account-info/index.vue
+++ b/src/views/property-marketing/media-account/account-detail/components/account-info/index.vue
@ -3,7 +3,7 @@
 * @Date: 2025-06-28 12:58:25
 -->
 <template>
-  <div class="account-info-wrap bg-#fff rounded-8px border-1px border-#D7D7D9 border-solid px-24px mb-16px">
+  <div class="account-info-wrap bg-#fff rounded-8px  px-24px mb-16px">
    <div class="title-row">
      <span class="cts !text-18px !lh-26px title">账号信息</span>
    </div>
--- 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
@ -3,7 +3,7 @@
 * @Date: 2025-06-28 12:58:09
 -->
 <template>
-  <div class="note-table-wrap bg-#fff rounded-8px border-1px border-#D7D7D9 border-solid px-24px flex-1 flex flex-col">
+  <div class="note-table-wrap bg-#fff rounded-8px  px-24px flex-1 flex flex-col">
    <div class="title-row">
      <div class="flex items-center">
        <span class="cts !text-18px !lh-26px mr-4px title">笔记详情</span>
@ -97,7 +97,7 @@
        </a-table-column>
      </template>
    </a-table>
-    <div v-if="pageInfo.total > 0" class="pagination-box">
+    <div v-if="pageInfo.total > 0" class="pagination-row mb-24px">
      <a-pagination
        :total="pageInfo.total"
        size="mini"
--- 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
@ -19,12 +19,4 @@
      }
    }
  }
-
-  .pagination-box {
-    display: flex;
-    width: 100%;
-    padding: 16px 24px;
-    justify-content: flex-end;
-    align-items: center;
-  }
 }
--- a/src/views/property-marketing/media-account/account-detail/style.scss
+++ b/src/views/property-marketing/media-account/account-detail/style.scss
@ -22,12 +22,5 @@

  .table-wrap {
    width: 100%;
-    .pagination-box {
-      display: flex;
-      width: 100%;
-      padding: 16px 24px;
-      justify-content: flex-end;
-      align-items: center;
-    }
  }
 }
--- a/src/views/property-marketing/media-account/account-manage/components/account-table/style.scss
+++ b/src/views/property-marketing/media-account/account-manage/components/account-table/style.scss
@ -6,7 +6,7 @@
  gap: 20px;
  .card-item {
    border-radius: 8px;
-    border: 1px solid var(--BG-300, #e6e6e8);
+    // border: 1px solid var(--BG-300, #e6e6e8);
    background: var(--BG-white, #fff);
    padding: 12px 16px 16px;
    display: flex;
--- a/src/views/property-marketing/media-account/account-manage/components/group-manage-modal/index.vue
+++ b/src/views/property-marketing/media-account/account-manage/components/group-manage-modal/index.vue
@ -60,7 +60,7 @@
        </div>
      </template>
    </a-table>
-    <div v-if="pageInfo.total > 0" class="pagination-box flex justify-end">
+    <div v-if="pageInfo.total > 0" class="pagination-row flex justify-end">
      <a-pagination
        :total="pageInfo.total"
        size="mini"
--- a/src/views/property-marketing/media-account/account-manage/components/group-manage-modal/style.scss
+++ b/src/views/property-marketing/media-account/account-manage/components/group-manage-modal/style.scss
@ -16,12 +16,7 @@
      font-weight: 400;
      line-height: 22px; /* 157.143% */
    }
-    .pagination-box {
-      display: flex;
-      width: 100%;
-      padding: 16px 24px;
-      justify-content: flex-end;
-      align-items: center;
+    .pagination-row {
      .arco-pagination {
        .arco-pagination-list {
          .arco-pagination-item {
--- a/src/views/property-marketing/media-account/account-manage/index.vue
+++ b/src/views/property-marketing/media-account/account-manage/index.vue
@ -4,7 +4,7 @@
 -->
 <template>
  <div class="account-manage-wrap">
-    <div class="filter-wrap bg-#fff rounded-8px border-1px border-#D7D7D9 border-solid">
+    <div class="filter-wrap bg-#fff rounded-8px ">
      <div class="top flex h-64px px-24px py-10px justify-between items-center">
        <p class="text-18px font-400 lh-26px color-#211F24 title">账号管理</p>
        <div class="flex items-center">
@ -91,7 +91,7 @@
      />
      <NoData v-else />

-      <div v-if="pageInfo.total > 0" class="pagination-box">
+      <div v-if="pageInfo.total > 0" class="pagination-row">
        <a-pagination
          :total="pageInfo.total"
          size="mini"
--- a/src/views/property-marketing/media-account/account-manage/style.scss
+++ b/src/views/property-marketing/media-account/account-manage/style.scss
@ -50,10 +50,10 @@
        margin-right: 16px;
      }
      &.red {
-        color: #F64B31;
+        color: #f64b31;
      }
      &.disabled {
-        color: #C5B7FF;
+        color: #c5b7ff;
        cursor: not-allowed;
      }
    }
@ -61,13 +61,5 @@
  .card-wrap {
    display: flex;
    flex-direction: column;
-    .pagination-box {
-      display: flex;
-      width: 100%;
-      padding: 16px 24px;
-      justify-content: flex-end;
-      align-items: center;
-
-    }
  }
 }
--- a/src/views/property-marketing/media-account/components/status-select/status-box.tsx
+++ b/src/views/property-marketing/media-account/components/status-select/status-box.tsx
@ -115,14 +115,14 @@ export default defineComponent({
            {to_be_expire_for_cookie === EnumExpireForCookie.EXPIRE && (
              <div class="flex items-center rounded-2px px-8px mr-8px" style={{ background, color }}>
                <img src={icon1} width="12" height="12" class="mr-4px" />
-                <span class="text-12px lh-20px font-400 label">{label}</span>
+                <span class="text-14px lh-22px font-400 label">{label}</span>
              </div>
            )}
            <div
              class="flex items-center rounded-2px px-8px"
              style={{ background: normalStyle.background, color: normalStyle.color }}
            >
-              <span class="text-12px lh-20px font-400">正常</span>
+              <span class="text-14px lh-22px font-400 label">正常</span>
            </div>
          </div>
        );
@ -130,7 +130,7 @@ export default defineComponent({

      return (
        <div class="flex items-center rounded-2px px-8px status-box" style={{ background, color }}>
-          <span class="text-12px lh-20px font-400 label">{label}</span>
+          <span class="text-14px lh-22px font-400 label">{label}</span>
          {status === EnumStatus.PAUSE ? (
            <img src={iconWarn1} width="12" height="12" class="ml-4px" />
          ) : (
--- a/src/views/property-marketing/project-manage/project-list/index.vue
+++ b/src/views/property-marketing/project-manage/project-list/index.vue
@ -1,12 +1,12 @@
 <template>
  <div class="project-list-wrap">
-    <div class="filter-wrap bg-#fff rounded-8px border-1px border-#D7D7D9 border-solid mb-16px">
+    <div class="filter-wrap bg-#fff rounded-8px mb-16px">
      <div class="top flex h-64px px-24px py-10px justify-between items-center">
        <p class="text-18px font-400 lh-26px color-#211F24 title">项目列表</p>
        <div class="flex items-center">
          <a-button type="primary" class="w-112px search-btn" size="medium" @click="handleOpenAddProjectModal">
            <template #icon>
-              <icon-plus size="16"/>
+              <icon-plus size="16" />
            </template>
            <template #default>添加项目</template>
          </a-button>
@ -14,16 +14,14 @@
      </div>
      <FilterBlock v-model:query="query" @onSearch="handleSearch" @onReset="handleReset" />
    </div>
-    <div
-      class="table-wrap bg-#fff rounded-8px border-1px border-#D7D7D9 border-solid px-24px py-24px flex-1 flex flex-col"
-    >
+    <div class="table-wrap bg-#fff rounded-8px px-24px py-24px flex flex-col">
      <ProjectTable
        :dataSource="dataSource"
        @sorterChange="handleSorterChange"
        @delete="handleDelete"
        @edit="handleEdit"
      />
-      <div v-if="pageInfo.total > 0" class="pagination-box">
+      <div v-if="pageInfo.total > 0" class="pagination-row">
        <a-pagination
          :total="pageInfo.total"
          size="mini"
--- a/src/views/property-marketing/project-manage/project-list/style.scss
+++ b/src/views/property-marketing/project-manage/project-list/style.scss
@ -1,5 +1,4 @@
 .project-list-wrap {
-  height: 100%;
  display: flex;
  flex-direction: column;
  .filter-wrap {
@ -18,12 +17,5 @@
  .table-wrap {
    display: flex;
    flex-direction: column;
-    .pagination-box {
-      display: flex;
-      width: 100%;
-      padding: 16px 24px;
-      justify-content: flex-end;
-      align-items: center;
-    }
  }
 }
--- a/src/views/property-marketing/put-account/account-dashboard/index.vue
+++ b/src/views/property-marketing/put-account/account-dashboard/index.vue
@ -1,6 +1,6 @@
 <template>
  <div class="account-dashboard-wrap">
-    <div class="filter-wrap bg-#fff rounded-8px border-1px border-#D7D7D9 border-solid pb-24px mb-16px">
+    <div class="filter-wrap bg-#fff rounded-8px  pb-24px mb-16px">
      <a-tabs v-model:activeKey="accountType" @tab-click="handleTabClick">
        <a-tab-pane key="1" title="账户"></a-tab-pane>
        <a-tab-pane key="2" title="计划"></a-tab-pane>
--- a/src/views/property-marketing/put-account/account-dashboard/style.scss
+++ b/src/views/property-marketing/put-account/account-dashboard/style.scss
@ -17,7 +17,7 @@

  .filter-wrap {
    border-radius: 8px;
-    border: 1px solid #e6e6e8;
+    // border: 1px solid #e6e6e8;

    :deep(.arco-tabs) {
      .arco-tabs-tab {
--- a/src/views/property-marketing/put-account/account-data/components/group-manage-modal/index.vue
+++ b/src/views/property-marketing/put-account/account-data/components/group-manage-modal/index.vue
@ -59,7 +59,7 @@
        </div>
      </template>
    </a-table>
-    <div v-if="pageInfo.total > 0" class="pagination-box flex justify-end">
+    <div v-if="pageInfo.total > 0" class="pagination-row flex justify-end">
      <a-pagination
        :total="pageInfo.total"
        size="mini"
--- a/src/views/property-marketing/put-account/account-data/components/group-manage-modal/style.scss
+++ b/src/views/property-marketing/put-account/account-data/components/group-manage-modal/style.scss
@ -16,12 +16,7 @@
      font-weight: 400;
      line-height: 22px; /* 157.143% */
    }
-    .pagination-box {
-      display: flex;
-      width: 100%;
-      padding: 16px 24px;
-      justify-content: flex-end;
-      align-items: center;
+    .pagination-row {
      .arco-pagination {
        .arco-pagination-list {
          .arco-pagination-item {
--- a/src/views/property-marketing/put-account/account-data/index.vue
+++ b/src/views/property-marketing/put-account/account-data/index.vue
@ -4,7 +4,7 @@
 -->
 <template>
  <div class="account-data-wrap">
-    <div class="filter-wrap bg-#fff rounded-8px border-1px border-#D7D7D9 border-solid pb-24px mb-16px">
+    <div class="filter-wrap bg-#fff rounded-8px pb-24px mb-16px">
      <a-tabs v-model="activeTab" @tab-click="handleTabClick">
        <a-tab-pane key="1" title="账户"></a-tab-pane>
        <a-tab-pane key="2" title="计划"></a-tab-pane>
@ -25,9 +25,7 @@
        @onReset="init"
      />
    </div>
-    <div
-      class="table-wrap bg-#fff rounded-8px border-1px border-#D7D7D9 border-solid px-24px py-24px flex-1 flex flex-col"
-    >
+    <div class="table-wrap bg-#fff rounded-8px px-24px py-24px flex flex-col">
      <component
        :is="isAccountTab ? BoardTable : PlanTable"
        ref="accountTableRef"
@ -36,7 +34,7 @@
        @sorterChange="handleSorterChange"
        @selectionChange="handleSelectionChange"
      />
-      <div v-if="pageInfo.total > 0" class="pagination-box">
+      <div v-if="pageInfo.total > 0" class="pagination-row">
        <a-pagination
          :total="pageInfo.total"
          size="mini"
--- a/src/views/property-marketing/put-account/account-data/style.scss
+++ b/src/views/property-marketing/put-account/account-data/style.scss
@ -1,10 +1,9 @@
 .account-data-wrap {
-    height: 100%;
  display: flex;
  flex-direction: column;
  .filter-wrap {
    border-radius: 8px;
-    border: 1px solid #e6e6e8;
+    // border: 1px solid #e6e6e8;
    :deep(.arco-tabs) {
      .arco-tabs-tab {
        height: 56px;
@ -21,7 +20,6 @@
        font-family: $font-family-medium;
        font-style: normal;
      }
-      
    }
    .overview-row {
      .overview-item {
@ -38,12 +36,5 @@

  .table-wrap {
    width: 100%;
-    .pagination-box {
-      display: flex;
-      width: 100%;
-      padding: 16px 24px;
-      justify-content: flex-end;
-      align-items: center;
-    }
  }
-}
+}
--- a/src/views/property-marketing/put-account/account-manage/components/account-table/style.scss
+++ b/src/views/property-marketing/put-account/account-manage/components/account-table/style.scss
@ -6,7 +6,7 @@
    gap: 20px;
  .card-item {
    border-radius: 8px;
-    border: 1px solid var(--BG-300, #e6e6e8);
+    // border: 1px solid var(--BG-300, #e6e6e8);s
    background: var(--BG-white, #fff);
    padding: 12px 16px 16px;
    display: flex;
--- a/src/views/property-marketing/put-account/account-manage/index.vue
+++ b/src/views/property-marketing/put-account/account-manage/index.vue
@ -4,7 +4,7 @@
 -->
 <template>
  <div class="account-manage-wrap">
-    <div class="filter-wrap bg-#fff rounded-8px border-1px border-#D7D7D9 border-solid">
+    <div class="filter-wrap bg-#fff rounded-8px ">
      <div class="top flex h-64px px-24px py-10px justify-between items-center">
        <p class="text-18px font-400 lh-26px color-#211F24 title">账户管理</p>
        <div class="flex items-center">
@ -70,7 +70,7 @@
      />
      <NoData v-else />

-      <div v-if="pageInfo.total > 0" class="pagination-box">
+      <div v-if="pageInfo.total > 0" class="pagination-row">
        <a-pagination
          :total="pageInfo.total"
          size="mini"
--- a/src/views/property-marketing/put-account/account-manage/style.scss
+++ b/src/views/property-marketing/put-account/account-manage/style.scss
@ -51,12 +51,5 @@
  .card-wrap {
    display: flex;
    flex-direction: column;
-    .pagination-box {
-      display: flex;
-      width: 100%;
-      padding: 16px 24px;
-      justify-content: flex-end;
-      align-items: center;
-    }
  }
 }
--- a/src/views/property-marketing/put-account/investment-guidelines/detail.vue
+++ b/src/views/property-marketing/put-account/investment-guidelines/detail.vue
@ -1,6 +1,6 @@
 <template>
  <div class="guidelines-data-wrap">
-    <div class="filter-wrap bg-#fff rounded-8px border-1px border-#D7D7D9 border-solid">
+    <div class="filter-wrap bg-#fff rounded-8px ">
      <div class="top flex h-64px px-24px py-10px justify-between items-center">
        <p class="text-18px font-400 lh-26px color-#211F24 title">投放信息</p>
      </div>
--- a/src/views/property-marketing/put-account/investment-guidelines/style.scss
+++ b/src/views/property-marketing/put-account/investment-guidelines/style.scss
@ -6,7 +6,7 @@
  .pagination-box {
    display: flex;
    width: 100%;
-    padding: 16px 24px;
+      padding:  4px 24px 24px;
    justify-content: flex-end;
    align-items: center;
  }
@ -32,7 +32,7 @@

  .filter-wrap {
    border-radius: 8px;
-    border: 1px solid #e6e6e8;
+    // border: 1px solid #e6e6e8;

    :deep(.arco-tabs) {
      .arco-tabs-tab {
@ -75,7 +75,7 @@
    .pagination-box {
      display: flex;
      width: 100%;
-      padding: 16px 24px;
+      padding:  4px 24px 24px;
      justify-content: flex-end;
      align-items: center;
    }
@ -84,7 +84,7 @@
  .pagination-box {
    display: flex;
    width: 100%;
-    padding: 16px 24px;
+      padding:  4px 24px 24px;
    justify-content: flex-end;
    align-items: center;

@ -129,7 +129,7 @@
    background: var(--BG-white, white);
    overflow: hidden;
    border-radius: 8px;
-    outline: 1px var(--BG-300, #E6E6E8) solid;
+    // outline: 1px var(--BG-300, #E6E6E8) solid;
    outline-offset: -1px;
    flex-direction: column;
    justify-content: flex-start;