wjx 2 năm trước cách đây
mục cha
commit
887350b55e

+ 9 - 9
src/Hook/useAjax.tsx

@@ -1,4 +1,4 @@
-import {  CombineService, Mutate } from '@ahooksjs/use-request/lib/types'
+import { CombineService, Mutate } from '@ahooksjs/use-request/lib/types'
 import { message } from 'antd'
 import moment from 'moment'
 import { useRequest } from 'umi'
@@ -33,14 +33,14 @@ interface Options {
  * @param  msgNmae?: string,//操作完成提示文字
  * 
  */
-export interface FnAjax<T>{
-    loading:boolean,
-    data:T,
-    run:(...args:any)=>Promise<any>,
-    refresh:()=>Promise<any>,
+export interface FnAjax<T> {
+    loading: boolean,
+    data: T,
+    run: (...args: any) => Promise<any>,
+    refresh: () => Promise<any>,
     mutate: Mutate<any>
 }
-export function useAjax(fnc: CombineService<any, any>, options?: Options){
+export function useAjax(fnc: CombineService<any, any>, options?: Options) {
     const ajax = useRequest(fnc, {
         manual: options?.manual || true,
         cacheKey: options?.cacheKey,
@@ -50,8 +50,8 @@ export function useAjax(fnc: CombineService<any, any>, options?: Options){
         formatResult: (res) => {
             let reqTime = moment().format('YYYY-MM-DD HH:mm:ss')
             res['reqTime'] = reqTime
-            return options?.formatResult ? {...res,reqTime} :res
-            
+            return options?.formatResult ? { ...res, reqTime } : res.data
+
         },
         onSuccess: (res) => {
             if (res) {

+ 5 - 4
src/models/useLaunchAdq/useBdMediaPup.ts

@@ -329,11 +329,11 @@ function useBdMediaPup() {
     const changeClickFile = useCallback((e: any, item: { id: any, folder?: boolean }, isAll?: boolean, noFile?: boolean) => {
         let { id } = item
         e?.stopPropagation()//阻止冒泡传递到文件夹被点击事件
-        console.log(111111);
+        console.log(111111, num);
         
-        if (mediaType === 'PAGE') {
+        // if (mediaType === 'PAGE') {
 
-        } else {
+        // } else {
             let state = selectFile?.some((i) => i === id)
             if (state) {//存在就是删除
                 set({ selectFile: selectFile?.filter(i => i !== id), selectItem: selectItem?.filter((i: { id: number }) => i.id !== id) })
@@ -342,6 +342,7 @@ function useBdMediaPup() {
                     if (state) {//存在就是删除
                         set({ selectFile: selectFile?.filter(i => i !== id), selectItem: [] })
                     } else {//否则新增
+                        console.log(11111)
                         set({ selectFile: [id], selectItem: [item] })
                     }
                 } else {
@@ -354,7 +355,7 @@ function useBdMediaPup() {
                     set({ selectItem: newSelectItem, selectFile: [...selectFile as number[], id] })
                 }
             }
-        }
+        // }
     }, [selectFile, mediaType, num])
     /**开启删除弹窗 */
     const delPupOn = useCallback((delPupId) => {

+ 3 - 2
src/pages/launchSystemNew/components/selectCloud/index.tsx

@@ -10,6 +10,7 @@ interface Props {
     onChange?: (content: string[]) => void,
     onClose?: () => void,
     sliderImgContent?: { url: string, width?: number, height?: number }[]
+    isBack?: boolean
 }
 /**
  * 选择素材
@@ -18,7 +19,7 @@ interface Props {
 const SelectCloud: React.FC<Props> = (props) => {
 
     /**================================**/
-    const { visible, onChange, onClose, sliderImgContent } = props
+    const { visible, onChange, onClose, sliderImgContent, isBack = true } = props
     const { state, set, getList } = useModel('useLaunchAdq.useBdMediaPup')
     const { mediaType, belongUser, parentId, selectItem, num } = state
     /**================================**/
@@ -88,7 +89,7 @@ const SelectCloud: React.FC<Props> = (props) => {
             <Tabs.TabPane tab={'个人本地'} key={1} />
             <Tabs.TabPane tab={'公共本地'} key={0} />
         </Tabs>
-        <FileBoxAD isAll={false} noFile={true} isBack={true} />
+        <FileBoxAD isAll={false} noFile={true} isBack={isBack} />
     </Modal>
 }
 

+ 5 - 2
src/pages/launchSystemNew/launchManage/createAd/index.tsx

@@ -248,7 +248,10 @@ const CreateAd: React.FC = () => {
                             <div className={style.top}>落地页</div>
                             <div className={style.center}>
                                 <div className={style.centerContent}>
-                                    <div>落地页:<Button type="link" onClick={() => { setSelectImgVisible(true) }}>选择落地页</Button></div>
+                                    <div>落地页:{queryForm?.sysAdgroupsId ? <Button type="link" onClick={() => { setSelectImgVisible(true) }}>选择落地页</Button> : <Tooltip title="请先设置广告基本信息">
+                                        <Button type="link">选择落地页</Button>
+                                    </Tooltip>}
+                                    </div>
                                 </div>
                             </div>
                             {/* <div className={style.bottom}><span>添加</span></div> */}
@@ -275,7 +278,7 @@ const CreateAd: React.FC = () => {
         {/* 选择转化ID */}
         {idVisible && <IdModal visible={idVisible} data={accountCreateLogs} onClose={() => setIdVisible(false)} onChange={(e) => { setAccountCreateLogs(e); setSourceVisible(false) }} />}
         {/* 选择素材 */}
-        {selectImgVisible && <SelectCloud visible={selectImgVisible} onClose={() => setSelectImgVisible(false)} onChange={setPage} />}
+        {selectImgVisible && <SelectCloud visible={selectImgVisible} onClose={() => setSelectImgVisible(false)} onChange={setPage} isBack={false} />}
     </Card>
 }