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

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

@@ -1,12 +1,13 @@
 
 import { useAjax } from "@/Hook/useAjax"
 import { CheckOutlined, CloseOutlined, QuestionCircleOutlined, SyncOutlined } from "@ant-design/icons"
-import { Button, Input, message, Modal, Space, Table, Tooltip, Typography } from "antd"
+import { Button, Input, message, Modal, Select, Space, Table, Tooltip, Typography } from "antd"
 import React, { useEffect, useState } from "react"
 import style from '../GoodsModal/index.less'
 import columns from "./tableConfig"
 import { getWechatAppletApi } from "@/services/adqV3/global"
 import New1Radio from "../New1Radio"
+import { getErpUserAll } from "@/services/launchAdq/adq"
 const { Title, Text } = Typography;
 
 /**
@@ -28,12 +29,18 @@ const MiniProgramPage: React.FC<Props> = (props) => {
     const { creativeTemplateId, deliveryMode, creativeComponents: { mainJumpInfo }, landingPageType } = dynamic
     const [selectAdz, setSelectAdz] = useState<number>(1)   // 选择广告主
     const [data, setData] = useState<PULLIN.AccountCreateLogsProps[]>(data1 || [])
-    const [queryForm, setQueryForm] = useState<{ appletName?: string, appletIdList?: string[], pageSize: number, pageNum: number }>({ pageNum: 1, pageSize: 20 })
+    const userId = localStorage.getItem('userId')
+    const [queryForm, setQueryForm] = useState<{ appletName?: string, appletIdList?: string[], createBy?: number, pageSize: number, pageNum: number }>({ pageNum: 1, pageSize: 20, createBy: userId ? Number(userId) : undefined })
     const [pageAllocationType, setPageAllocationType] = useState<0 | 1>(landingPageType || 0)
 
     const listAjax = useAjax((params) => getWechatAppletApi(params))
+    const allOfMember = useAjax(() => getErpUserAll())
     /*************************/
 
+    useEffect(() => {
+        allOfMember.run()
+    }, [])
+
     useEffect(() => {
         getList()
     }, [queryForm])
@@ -123,18 +130,36 @@ const MiniProgramPage: 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={() => { 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={() => { 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 }}>
-                    <Input style={{ width: 200 }} placeholder="请输入小程序名称" value={queryForm?.appletName} allowClear onChange={(e) => setQueryForm({ ...queryForm, appletName: e.target.value, pageNum: 1 })} />
+                    <Select
+                        showSearch
+                        placeholder="请选择创建人"
+                        onChange={(e) => setQueryForm({ ...queryForm, createBy: e, pageNum: 1 })}
+                        filterOption={(input, option) =>
+                            (option?.label as any)?.toLowerCase().indexOf(input.toLowerCase()) >= 0
+                        }
+                        value={queryForm?.createBy}
+                        allowClear
+                        style={{ width: 120 }}
+                        loading={allOfMember.loading}
+                        options={allOfMember?.data?.map((item: { userId: any; nickname: string }) => ({
+                            value: item.userId,
+                            label: item.nickname
+                        }))}
+                    />
+                    <Input style={{ width: 160 }} placeholder="请输入小程序名称" value={queryForm?.appletName} allowClear onChange={(e) => setQueryForm({ ...queryForm, appletName: e.target.value, pageNum: 1 })} />
                     <Input.TextArea
-                        style={{ width: 300 }}
+                        style={{ width: 250 }}
                         placeholder="请输入小程序原始ID（多个逗号隔开）"
                         allowClear
                         rows={1}
@@ -155,7 +180,7 @@ const MiniProgramPage: React.FC<Props> = (props) => {
                     dataSource={listAjax.data?.records?.map((item: { appletName: any; id: any }) => ({ ...item, pageName: item.appletName, pageId: item.id }))}
                     size="small"
                     loading={listAjax?.loading}
-                    scroll={{ y: 300 }}
+                    scroll={{ y: 400 }}
                     bordered
                     rowKey={'id'}
                     pagination={{

src/services/adqV3/global.ts

@@ -485,7 +485,7 @@ export async function addWechatAppletApi(data: { appletId: string, appletName: s
  * @param data 
  * @returns 
  */
-export async function getWechatAppletApi(data: { pageNum: number, pageSize: number, appletName?: string, appletIdList?: string[] }) {
+export async function getWechatAppletApi(data: { pageNum: number, pageSize: number, appletName?: string, appletIdList?: string[], createBy?: number }) {
     return request(api + `/adq/v3/wechatApplet/list`, {
         method: 'POST',
         data

tsconfig.json

@@ -1,6 +1,5 @@
 {
   "compilerOptions": {
-    "ignoreDeprecations": "5.0",
     "outDir": "build/dist",
     "module": "esnext",
     "target": "esnext",
@@ -12,7 +11,6 @@
     "moduleResolution": "node",
     "forceConsistentCasingInFileNames": true,
     "noImplicitReturns": true,
-    "suppressImplicitAnyIndexErrors": true,
     "noUnusedLocals": true,
     "allowJs": true,
     "skipLibCheck": true,