Merge branch 'develop' of http://git.zanxiangnet.com/wjx/ad-manage

src/pages/launchSystemV3/monitorEWList/tableConfig.tsx

@@ -5,6 +5,7 @@ import { Space, Statistic } from "antd";
 import AstraGroupHourEle from "./astraGroupHourEle";
 import AstraGroupIndexEle from "./astraGroupIndexEle";
 import DoubleDelDetails from "./doubleDelDetails";
+import { POOLTYPEEle } from "../tencenTasset/corpWechat/csgroup/const";
 
 /** 客服号加粉 */
 export const CorpUserDayListTableConfig = (): ColumnsType<never> => {
@@ -17,6 +18,7 @@ export const CorpUserDayListTableConfig = (): ColumnsType<never> => {
             width: 80,
             ellipsis: true,
             align: 'center',
+            fixed: 'left',
             render(value) {
                 return <span style={{ fontSize: 12 }}>{value}</span>
             },
@@ -27,6 +29,7 @@ export const CorpUserDayListTableConfig = (): ColumnsType<never> => {
             key: 'corpName',
             width: 100,
             ellipsis: true,
+            fixed: 'left',
             render(value) {
                 return <span style={{ fontSize: 12 }}>{value || '--'}</span>
             },
@@ -67,10 +70,22 @@ export const CorpUserDayListTableConfig = (): ColumnsType<never> => {
             key: 'localCorpUserDepartment',
             width: 120,
             ellipsis: true,
+            align: 'center',
             render(value) {
                 return <span style={{ fontSize: 12 }}>{value}</span>
             },
         },
+        {
+            title: '客服号当前归属的客服池',
+            dataIndex: 'poolType',
+            key: 'poolType',
+            width: 140,
+            ellipsis: true,
+            align: 'center',
+            render(value) {
+                return POOLTYPEEle[value as keyof typeof POOLTYPEEle] || '--'
+            },
+        },
         {
             title: '新增用户数',
             dataIndex: 'addUserCount',
@@ -104,6 +119,50 @@ export const CorpUserDayListTableConfig = (): ColumnsType<never> => {
                 return <span style={{ fontSize: 12 }}>{value}</span>
             },
         },
+        {
+            title: '客服号单日限制加粉数量',
+            dataIndex: 'limitAddFansOfDay',
+            key: 'limitAddFansOfDay',
+            width: 100,
+            align: 'right',
+            sorter: true,
+            render(value) {
+                return <span style={{ fontSize: 12 }}>{(value || value === 0) ? value : '--'}</span>
+            },
+        },
+        {
+            title: '客服号单日剩余加粉数量',
+            dataIndex: 'remainAddFansOfDay',
+            key: 'remainAddFansOfDay',
+            width: 100,
+            align: 'right',
+            sorter: true,
+            render(value) {
+                return <span style={{ fontSize: 12 }}>{(value || value === 0) ? value : '--'}</span>
+            },
+        },
+        {
+            title: '客服号最新加粉时间',
+            dataIndex: 'lastAddFansTime',
+            key: 'lastAddFansTime',
+            width: 100,
+            align: 'right',
+            sorter: true,
+            render(value) {
+                return <span style={{ fontSize: 12 }}>{value || '--'}</span>
+            },
+        },
+        {
+            title: '客服号最新加粉距今时间',
+            dataIndex: 'lastAddFansAgoTimeStr',
+            key: 'lastAddFansAgoTimeStr',
+            width: 100,
+            align: 'right',
+            sorter: true,
+            render(value) {
+                return <span style={{ fontSize: 12 }}>{value || '--'}</span>
+            },
+        },
         {
             title: 'dn双删详情',
             dataIndex: 'dnOutUserCount',
@@ -130,12 +189,14 @@ export const CorpUserDayListTableConfig = (): ColumnsType<never> => {
                 return <span style={{ fontSize: 12 }}>{value}</span>
             },
         },
+        
         {
             title: '操作',
             dataIndex: 'cz',
             key: 'cz',
-            width: 210,
-            ellipsis: true,
+            width: 70,
+            align: 'center',
+            fixed: 'right',
             render(_, record: any) {
                 return <AstraSupportHour
                     corpName={record.corpName}

src/pages/launchSystemV3/tencenTasset/manageComponent/const.ts

@@ -308,6 +308,11 @@ export const DEFAULT_COMPONENT_SUB_SHOW_VIDEO = [
     "VIDEO_SHOWCASE"
 ]
 
+export const DEFAULT_COMPONENT_SUB_SHOW_TEXT = [
+    'DESCRIPTION',
+    'TITLE'
+]
+
 /** 潜力状态 */
 export enum COMMON_POTENTIAL_STATUS_ENUM {
     COMMON_POTENTIAL_STATUS_DEFAULT = '潜力暂无判断',

src/pages/launchSystemV3/tencenTasset/manageComponent/index.tsx

@@ -6,7 +6,7 @@ import './index.less'
 import { DeleteOutlined, PlusOutlined, SyncOutlined } from "@ant-design/icons"
 import { useAjax } from "@/Hook/useAjax"
 import SelectAdAccount from "@/components/SelectAdAccount"
-import { COMMON_POTENTIAL_STATUS_ENUM, COMPONENT_GENERATION_TYPE_ENUM, DEFAULT_COMPONENT_SUB_IMAGE_TYPE, DEFAULT_COMPONENT_SUB_SHOW_IMAGE, DEFAULT_COMPONENT_SUB_SHOW_VIDEO, DEFAULT_COMPONENT_SUB_VIDEO_TYPE } from "./const"
+import { COMMON_POTENTIAL_STATUS_ENUM, COMPONENT_GENERATION_TYPE_ENUM, DEFAULT_COMPONENT_SUB_IMAGE_TYPE, DEFAULT_COMPONENT_SUB_SHOW_IMAGE, DEFAULT_COMPONENT_SUB_SHOW_TEXT, DEFAULT_COMPONENT_SUB_SHOW_VIDEO, DEFAULT_COMPONENT_SUB_VIDEO_TYPE } from "./const"
 import moment from "moment"
 import { useDebounce, useSize } from "ahooks"
 import AddComponents from "./addComponents"
@@ -59,7 +59,7 @@ const ManageComponent: React.FC = () => {
             } else {
                 delete params?.['componentId']
             }
-            getCreativeComponentList.run({ ...params, componentSubType: componentSubType && componentSubType?.length > 0 ? componentSubType : (activeKey === 'IMAGE' ? DEFAULT_COMPONENT_SUB_SHOW_IMAGE : DEFAULT_COMPONENT_SUB_SHOW_VIDEO) })
+            getCreativeComponentList.run({ ...params, componentSubType: componentSubType && componentSubType?.length > 0 ? componentSubType : (activeKey === 'IMAGE' ? DEFAULT_COMPONENT_SUB_SHOW_IMAGE : activeKey === 'VIDEO' ? DEFAULT_COMPONENT_SUB_SHOW_VIDEO : DEFAULT_COMPONENT_SUB_SHOW_TEXT) })
         }
     }, [queryParams, debouncedIdSting, debouncedComponentIdStingSting])
 
@@ -116,7 +116,8 @@ const ManageComponent: React.FC = () => {
                 <Tabs
                     items={[
                         { label: '图片', key: 'IMAGE', children: false },
-                        { label: '视频', key: 'VIDEO', children: false }
+                        { label: '视频', key: 'VIDEO', children: false },
+                        // { label: '文案', key: 'TEXT', children: false },
                     ]}
                     activeKey={queryParams?.activeKey}
                     onChange={(e) => {

src/pages/launchSystemV3/tencenTasset/wechatCanvasPage/copyPage.tsx

@@ -7,7 +7,6 @@ import { Button, Card, Form, message, Modal, Space, Spin } from "antd"
 import React, { useEffect, useState } from "react"
 import styles from '../../tencentAdPutIn/create/Material/index.less'
 import VideoNews from "@/pages/launchSystemNew/components/newsModal/videoNews"
-import SelectCloud from "@/pages/launchSystemNew/components/selectCloud"
 import { batchCreateDownPageApi } from "@/services/adqV3"
 import SelectCloudNew from "../../material/cloudNew/selectCloudNew"