Merge remote-tracking branch 'origin/main' into feature/v1.2灵机空间-内容上传审核_rxd

# Conflicts:
#	src/components/_base/navbar/components/navbar-menu/index.vue

src/views/property-marketing/put-account/account-data/components/board-table/index.vue

@@ -135,7 +135,7 @@
 
 <script setup>
 import { ref, computed } from 'vue';
-import { STATUS_LIST } from '@/views/property-marketing/media-account/components/status-select/constants';
+import { STATUS_LIST } from '@/views/property-marketing/put-account/components/status-select/constants';
 import { formatTableField, exactFormatTime } from '@/utils/tools';
 import { TABLE_COLUMNS } from './constants';
 import { useRouter } from 'vue-router';

src/views/property-marketing/put-account/account-data/components/plan-table/index.vue

@@ -133,7 +133,7 @@
 
 <script setup>
 import { ref, computed } from 'vue';
-import { STATUS_LIST } from '@/views/property-marketing/media-account/components/status-select/constants';
+import { STATUS_LIST } from '@/views/property-marketing/put-account/components/status-select/constants';
 import { formatTableField } from '@/utils/tools';
 import { TABLE_COLUMNS } from './constants';
 import { useRouter } from 'vue-router';

src/views/property-marketing/put-account/account-manage/components/account-table/index.vue

@@ -102,7 +102,7 @@
 <script setup>
 import { defineProps, ref, computed } from 'vue';
 import { PLATFORM_LIST } from '@/utils/platform';
-import { EnumStatus } from '@/views/property-marketing/media-account/components/status-select/constants';
+import { EnumStatus } from '@/views/property-marketing/put-account/components/status-select/constants';
 
 import { formatNumberShow, exactFormatTime } from '@/utils/tools';
 
@@ -160,7 +160,7 @@ const handlePause = (item) => {
 };
 
 const showPauseButton = (status) => {
-  return status === EnumStatus.NORMAL;
+  return status === EnumPutAccountStatus.NORMAL;
 };
 </script>
 

src/views/property-marketing/put-account/account-manage/components/filter-block/index.vue

@@ -73,7 +73,7 @@
 import { defineEmits, defineProps } from 'vue';
 import { getPlacementAccountOperators, getProjectList } from '@/api/all/propertyMarketing';
 import { PLATFORM_LIST } from '@/utils/platform';
-import StatusSelect from '@/views/property-marketing/media-account/components/status-select';
+import StatusSelect from '@/views/property-marketing/put-account/components/status-select';
 import CommonSelect from '@/components/common-select';
 
 const props = defineProps({

src/views/property-marketing/put-account/account-manage/components/select-sub-account-modal/style.scss

@@ -22,7 +22,7 @@
         .label {
           margin-right: 12px;
           color: #211f24;
-          font-family: 'PuHuiTi-Regular';
+          font-family: $font-family-regular;
           font-size: 14px;
           font-style: normal;
           font-weight: 400;

src/views/property-marketing/put-account/account-manage/components/status-box/index.vue

@@ -13,7 +13,7 @@
 
 <script setup>
 import { computed } from 'vue';
-import { STATUS_LIST, EnumStatus } from '@/views/property-marketing/media-account/components/status-select/constants';
+import { STATUS_LIST, EnumPutAccountStatus } from '@/views/property-marketing/put-account/components/status-select/constants';
 
 import iconWarn1 from '@/assets/img/media-account/icon-warn-1.png';
 import iconWarn2 from '@/assets/img/media-account/icon-warn-2.png';
@@ -38,16 +38,16 @@ const tooltipText = computed(() => {
 });
 
 const showIcon = computed(() => {
-  return ![EnumStatus.NORMAL, EnumStatus.UNAUTHORIZED].includes(props.status);
+  return ![EnumPutAccountStatus.NORMAL, EnumPutAccountStatus.UNAUTHORIZED].includes(props.status);
 });
 
 const iconSrc = computed(() => {
-  return props.status === EnumStatus.PAUSE ? iconWarn1 : iconWarn2;
+  return props.status === EnumPutAccountStatus.PAUSE ? iconWarn1 : iconWarn2;
 });
 
 // 判断是否为禁用重新授权的状态
 const isDisabledReauthorize = (status) => {
-  return [EnumStatus.ABNORMAL_LOGIN, EnumStatus.ABNORMAL_REQUEST, EnumStatus.ABNORMAL_FREEZE].includes(status);
+  return [EnumPutAccountStatus.ABNORMAL_LOGIN, EnumPutAccountStatus.ABNORMAL_REQUEST, EnumPutAccountStatus.ABNORMAL_FREEZE].includes(status);
 };
 </script>
 
@@ -75,7 +75,7 @@ const isDisabledReauthorize = (status) => {
     }
   }
 
-  &-2,
+  &-3,
   &-4,
   &-5,
   &-6 {
@@ -85,7 +85,7 @@ const isDisabledReauthorize = (status) => {
     }
   }
 
-  &-3 {
+  &-2{
     background: #fff7e5;
     color: #ffae00;
     .text {

src/views/property-marketing/put-account/components/status-select/constants.ts

@@ -0,0 +1,60 @@
+/*
+ * @Author: RenXiaoDong
+ * @Date: 2025-07-04 11:18:11
+ */
+export enum EnumPutAccountStatus {
+  UNAUTHORIZED = 0,
+  NORMAL = 1,
+  ABNORMAL = 3,
+  PAUSE = 2,
+  ABNORMAL_LOGIN = 4,
+  ABNORMAL_REQUEST = 5,
+  ABNORMAL_FREEZE = 6,
+  ABNORMAL_MISSING = 7,
+}
+
+export const STATUS_LIST = [
+  {
+    text: '正常',
+    label: '正常',
+    value: EnumPutAccountStatus.NORMAL,
+  },
+  {
+    text: '暂停同步',
+    label: '暂停同步',
+    value: EnumPutAccountStatus.PAUSE,
+  },
+  {
+    text: '未授权',
+    label: '未授权',
+    value: EnumPutAccountStatus.UNAUTHORIZED,
+  },
+  {
+    text: '异常',
+    label: '异常',
+    value: EnumPutAccountStatus.ABNORMAL,
+  },
+  {
+    text: '数据缺失',
+    label: '数据缺失',
+    value: EnumPutAccountStatus.ABNORMAL_MISSING,
+  },
+  {
+    text: '异常-登录状态失效',
+    label: '异常',
+    value: EnumPutAccountStatus.ABNORMAL_LOGIN,
+    tooltip: '登录状态失效，需重新扫码授权',
+  },
+  {
+    text: '异常-请求过于频繁',
+    label: '异常',
+    value: EnumPutAccountStatus.ABNORMAL_REQUEST,
+    tooltip: '请求过于频繁，需等待24小时后重试',
+  },
+  {
+    text: '异常-账号被冻结/封禁',
+    label: '异常',
+    value: EnumPutAccountStatus.ABNORMAL_FREEZE,
+    tooltip: '账号被冻结/封禁',
+  },
+];

src/views/property-marketing/put-account/components/status-select/index.vue

@@ -0,0 +1,60 @@
+<!--
+ * @Author: RenXiaoDong
+ * @Date: 2025-06-25 14:02:40
+-->
+<template>
+  <a-select
+    v-model="selectedStatus"
+    :multiple="multiple"
+    size="medium"
+    :placeholder="placeholder"
+    allow-clear
+    @change="handleChange"
+  >
+    <a-option v-for="(item, index) in STATUS_LIST" :key="index" :value="item.value" :label="item.text">
+      {{ item.text }}
+    </a-option>
+  </a-select>
+</template>
+
+<script setup>
+import { ref, watch } from 'vue';
+import { STATUS_LIST } from '@/views/property-marketing/put-account/components/status-select/constants';
+
+const props = defineProps({
+  modelValue: {
+    type: [Array, String, Number],
+    default: () => [],
+  },
+  multiple: {
+    type: Boolean,
+    default: false,
+  },
+  placeholder: {
+    type: String,
+    default: '全部',
+  },
+});
+
+const emits = defineEmits(['update:modelValue', 'change']);
+
+const selectedStatus = ref(props.multiple ? [] : '');
+
+// 监听外部传入的值变化
+watch(
+  () => props.modelValue,
+  (newVal) => {
+    selectedStatus.value = newVal;
+  },
+  { immediate: true },
+);
+// 监听内部值变化，向外部发送更新
+watch(selectedStatus, (newVal) => {
+  emits('update:modelValue', newVal);
+});
+
+const handleChange = (value) => {
+  selectedStatus.value = value;
+  emits('change', value);
+};
+</script>