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

src/models/useLaunchAdq/useAdAuthorize.ts

@@ -1,11 +1,12 @@
 import { useAjax } from '@/Hook/useAjax'
-import { getAdAccountApi } from '@/services/launchAdq/adAuthorize'
+import { getAdAccountApi, getAllUserAccountApi } from '@/services/launchAdq/adAuthorize'
 import { getGroupListApi } from '@/services/launchAdq/subgroup'
 
 
 export default function useAdAuthorize() {
 
     const getAdAccount = useAjax(() => getAdAccountApi(), { formatResult: true })
+    const getAllUserAccount = useAjax(() => getAllUserAccountApi(), { formatResult: true })
 
     /** 所有分组列表 */
     const getGroupList = useAjax(() => getGroupListApi())
@@ -22,6 +23,7 @@ export default function useAdAuthorize() {
 
     return {
         getAdAccount,
+        getAllUserAccount,
         getGroupList,
         groupListInit,
         groupRefresh

src/pages/launchSystemNew/account/index.tsx

@@ -177,6 +177,7 @@ const AdAuthorize: React.FC = () => {
                         />
                         <Button onClick={getList} type='primary' loading={getAdAccountList.loading}>搜索</Button>
                         <AddAccountToGroup onChange={() => getAdAccountList.refresh()} />
+                        <Button type='primary' onClick={() => setVisible(true)}><PlusOutlined />广告账号授权</Button>
                         {switchType === 'account' ?
                             (selectAccData?.length > 0 && <Button type="primary" ghost icon={<SwapOutlined />} onClick={() => { checkAccount(selectAccData) }}>批量切号</Button>) :
                             (selectAccData?.length > 0 && <Button type="primary" ghost icon={<SwapOutlined />} onClick={() => { putUserHandle(selectAccData) }}>批量指派投放助理</Button>)}
@@ -227,7 +228,7 @@ const AdAuthorize: React.FC = () => {
             </div>
         </div>
         {/* 广告授权 */}
-        {visible && <QQAuth qqVisible={visible} callBack={()=>setVisible(false)} />}
+        {visible && <QQAuth qqVisible={visible} callBack={() => setVisible(false)} />}
         {/* 变更记录 */}
         {crShow && <ChangeRecord visible={crShow} data={crData} onClose={() => { setCrShow(false); setCrData(null) }} />}
         {/* 切号 */}

src/pages/launchSystemNew/launchManage/createAd/index.tsx

@@ -33,7 +33,7 @@ import { getAccountListApi, getGroupListApi } from "@/services/launchAdq/subgrou
 const CreateAd: React.FC = () => {
 
     /*************************/
-    const { getAdAccount } = useModel('useLaunchAdq.useAdAuthorize')
+    const { getAllUserAccount } = useModel('useLaunchAdq.useAdAuthorize')
     const [queryForm, setQueryForm] = useState<Partial<CreateAdProps>>({
         campaignName: '',  // 计划名称
         campaignType: 'CAMPAIGN_TYPE_NORMAL', // 计划类型 CAMPAIGN_TYPE_NORMAL CAMPAIGN_TYPE_SEARCH 
@@ -215,16 +215,16 @@ const CreateAd: React.FC = () => {
 
     // 获取账户列表
     useEffect(() => {
-        getAdAccount.run()
+        getAllUserAccount.run()
     }, [])
 
     // 账号对比
     useEffect(() => {
-        if (getAdAccount?.data?.data && accountCreateLogs) {
-            if (accountCreateLogs.some(item => !getAdAccount?.data?.data?.find((item1: { id: number, accountId: number }) => item.id === item1.id && item.adAccountId == item1.accountId))) {
+        if (getAllUserAccount?.data?.data && accountCreateLogs) {
+            if (accountCreateLogs.some(item => !getAllUserAccount?.data?.data?.find((item1: { accountId: number }) => item.adAccountId == item1.accountId))) {
                 let errorData: any[] = []
                 let newAccountCreateLogs = accountCreateLogs.filter(item => {
-                    let data = getAdAccount?.data?.data?.find((item1: { id: number, accountId: number }) => item.id === item1.id && item.adAccountId == item1.accountId)
+                    let data = getAllUserAccount?.data?.data?.find((item1: { accountId: number }) => item.adAccountId == item1.accountId)
                     if (data) {
                         return true
                     } else {
@@ -241,7 +241,7 @@ const CreateAd: React.FC = () => {
                 setQueryForm({ ...queryForm, adqPageList: [], taskMediaMaps: queryForm?.taskMediaMaps?.map(item => ({ ...item, accountPageIdMap: {} })) })
             }
         }
-    }, [getAdAccount?.data, accountCreateLogs, queryForm])
+    }, [getAllUserAccount?.data, accountCreateLogs, queryForm])
 
     /** 获取广告详情 */
     useEffect(() => {
@@ -710,7 +710,7 @@ const CreateAd: React.FC = () => {
                             clearData()
                         }}
                     >
-                        {getAdAccount?.data?.data?.map((item: any) => <Select.Option value={item.id} key={item.id}>{item.remark ? item.accountId + '——' + item.remark : item.accountId}</Select.Option>)}
+                        {getAllUserAccount?.data?.data?.map((item: any) => <Select.Option value={item.id} key={item.id}>{item.remark ? item.accountId + '——' + item.remark : item.accountId}</Select.Option>)}
                     </Select>
                 </Selector>
                 <Selector label="推广目标">