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

src/pages/launchSystemV3/components/PageModal/index.tsx

@@ -222,12 +222,14 @@ const PageModal: React.FC<Props> = (props) => {
         <div className={style.content}>
             <div className={style.left}>
                 <h4 className={style.title}>媒体账户</h4>
-                {data?.map((item, index) => (
-                    <div key={index} onClick={() => { if (!loading) handleSelectAdz(index + 1, item) }} className={`${style.accItem} ${selectAdz === index + 1 && style.select} `}>
-                        {item?.accountId}
-                        {data[index].pageList?.length > 0 && <CheckOutlined style={{ color: '#1890ff' }} />}
-                    </div>
-                ))}
+                <div className={style.accountIdList}>
+                    {data?.map((item, index) => (
+                        <div key={index} onClick={() => { if (!loading) handleSelectAdz(index + 1, item) }} className={`${style.accItem} ${selectAdz === index + 1 && style.select} `}>
+                            {item?.accountId}
+                            {data[index].pageList?.length > 0 && <CheckOutlined style={{ color: '#1890ff' }} />}
+                        </div>
+                    ))}
+                </div>
             </div>
             <div className={style.right}>
                 <Space style={{ marginBottom: 10 }}>
@@ -273,7 +275,7 @@ const PageModal: React.FC<Props> = (props) => {
                     dataSource={tableData?.records}
                     size="small"
                     loading={listAjax?.loading || loading}
-                    scroll={{ y: 300 }}
+                    scroll={{ y: 400 }}
                     bordered
                     rowKey={'pageId'}
                     pagination={{
@@ -297,7 +299,7 @@ const PageModal: React.FC<Props> = (props) => {
                      */
                     rowSelection={{
                         type: ([910].includes(creativeTemplateId) || deliveryMode === "DELIVERY_MODE_COMPONENT") ? 'checkbox' : 'radio',
-                        getCheckboxProps: (record) => {
+                        getCheckboxProps: (record: any) => {
                             let { canvasType, pageElementsSpecList } = record
                             let topData = pageElementsSpecList[0]
                             if ([910].includes(creativeTemplateId) && canvasType === 'COMMON_PAGE') {

src/pages/launchSystemV3/components/PageModal/indexOfficial.tsx

@@ -128,7 +128,7 @@ const PageOfficialModal: React.FC<Props> = (props) => {
             });
             let filterData = newData?.filter(item => item.accountId !== data[selectAdz - 1].accountId)
             let ajax = filterData?.map(item => {
-                let params: any = { 
+                let params: any = {
                     ...queryForm,
                     pageNum: 1,
                     accountId: item.accountId,
@@ -138,9 +138,9 @@ const PageOfficialModal: React.FC<Props> = (props) => {
                     marketingGoal,
                     marketingTargetType,
                     marketingCarrierType,
-                    siteSet: siteSet ? siteSet : ["SITE_SET_CHANNELS", "SITE_SET_MOMENTS", "SITE_SET_WECHAT", "SITE_SET_WECHAT_PLUGIN", "SITE_SET_KANDIAN", "SITE_SET_QQ_MUSIC_GAME", "SITE_SET_TENCENT_NEWS", "SITE_SET_TENCENT_VIDEO", "SITE_SET_MOBILE_UNION"], 
-                    pageType: 'PAGE_TYPE_OFFICIAL', 
-                    creativeTemplateId: creativeTemplateId || 311 
+                    siteSet: siteSet ? siteSet : ["SITE_SET_CHANNELS", "SITE_SET_MOMENTS", "SITE_SET_WECHAT", "SITE_SET_WECHAT_PLUGIN", "SITE_SET_KANDIAN", "SITE_SET_QQ_MUSIC_GAME", "SITE_SET_TENCENT_NEWS", "SITE_SET_TENCENT_VIDEO", "SITE_SET_MOBILE_UNION"],
+                    pageType: 'PAGE_TYPE_OFFICIAL',
+                    creativeTemplateId: creativeTemplateId || 311
                 }
                 if (!params.isSqDownPage) {
                     delete params?.ownerUid
@@ -226,12 +226,14 @@ const PageOfficialModal: React.FC<Props> = (props) => {
         <div className={style.content}>
             <div className={style.left}>
                 <h4 className={style.title}>媒体账户</h4>
-                {data?.map((item, index) => (
-                    <div key={index} onClick={() => { if (!loading) handleSelectAdz(index + 1, item) }} className={`${style.accItem} ${selectAdz === index + 1 && style.select} `}>
-                        {item?.accountId}
-                        {data[index].pageList?.length > 0 && <CheckOutlined style={{ color: '#1890ff' }} />}
-                    </div>
-                ))}
+                <div className={style.accountIdList}>
+                    {data?.map((item, index) => (
+                        <div key={index} onClick={() => { if (!loading) handleSelectAdz(index + 1, item) }} className={`${style.accItem} ${selectAdz === index + 1 && style.select} `}>
+                            {item?.accountId}
+                            {data[index].pageList?.length > 0 && <CheckOutlined style={{ color: '#1890ff' }} />}
+                        </div>
+                    ))}
+                </div>
             </div>
             <div className={style.right}>
                 <Space style={{ marginBottom: 10 }}>
@@ -271,7 +273,7 @@ const PageOfficialModal: React.FC<Props> = (props) => {
                     dataSource={tableData?.records}
                     size="small"
                     loading={listAjax?.loading || loading}
-                    scroll={{ y: 300 }}
+                    scroll={{ y: 400 }}
                     bordered
                     rowKey={'pageId'}
                     pagination={{