fix

config/proxy.ts

@@ -10,7 +10,7 @@
  export default {
   dev: {
     '/api/': {
-      target: 'http://47.97.38.17/api',
+      target: 'http://test.api.zanxiangwl.com/api',
       // target: 'http://api.zanxiangwl.com',
       changeOrigin: true,
       pathRewrite: { '/api': '' },

src/components/FileBoxAD/components/imgModal/index.tsx

@@ -31,8 +31,12 @@ let ImgModal = React.memo((props: { isAll?: boolean }) => {
     }
 
     const getVideo = useMemo(() => {
-        if (queryForm?.file) {
-            return <video src={URL.createObjectURL(queryForm?.file)} style={{ width: '100%' }} controls />
+        if (mediaType === 'VIDEO') {
+            if (queryForm?.file) {
+                return <video src={URL.createObjectURL(queryForm?.file)} style={{ width: '100%' }} controls />
+            } else {
+                return null
+            }
         } else {
             return null
         }
@@ -88,6 +92,9 @@ let ImgModal = React.memo((props: { isAll?: boolean }) => {
                                 setPreviewVisible(true)
                                 setFileUrl(file.thumbUrl)
                             }}
+                            onRemove={() => {
+                                setQueryForm({ ...queryForm, file: null })
+                            }}
                         >
                             {fileList?.length < 1 && '普通上传'}
                         </Upload>

src/pages/launchSystemNew/components/addLandingPage/index.tsx

@@ -1867,7 +1867,7 @@ function AddLandingPage(props: Props) {
                                                                     <div className="adui-form-item" style={{ alignItems: 'center' }}>
                                                                         <Select style={{ width: 180 }} className="aside-select" dropdownClassName="aside-select" onChange={(e) => { setGlobalComponentItem('componentItem', e) }} value={componentItem?.elementType} size="small">
                                                                             <Option value="GH"><FollowAcc />关注公众号</Option>
-                                                                            <Option value="ENTERPRISE_WX"><WxAutoSvg />添加商家微信</Option>
+                                                                            {/* <Option value="ENTERPRISE_WX"><WxAutoSvg />添加商家微信</Option> */}
                                                                         </Select>
                                                                     </div>
                                                                 </div>
@@ -2261,7 +2261,7 @@ function AddLandingPage(props: Props) {
                         <div className={style.assembly}>
                             <div {...getDragPropsCon(`GH`)}> <FollowAcc /> <span className="my">关注公众号</span> </div>
                             {/* <div {...getDragPropsCon(`JumpLink`)}> <JumpLink /> <span className="my">跳转链接</span> </div> */}
-                            <div {...getDragPropsCon(`ENTERPRISE_WX`)}> <WxAutoSvg /> <span className="my">添加商家微信</span> </div>
+                            {/* <div {...getDragPropsCon(`ENTERPRISE_WX`)}> <WxAutoSvg /> <span className="my">添加商家微信</span> </div> */}
                         </div>
                         <div className={style.title}>营销组件</div>
                         <div className={style.assembly}>

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

@@ -1,6 +1,6 @@
 
 import HocError from '@/Hoc/HocError'
-import { Card, Col, Modal, Row, Table, Tag, Input, message, Space } from 'antd'
+import { Card, Col, Modal, Row, Table, Tag, Input, message, Space, Button } from 'antd'
 import React, { useCallback, useEffect, useState } from 'react'
 import { columnsMp } from './tableConfig'
 import { useModel } from 'umi'
@@ -24,18 +24,21 @@ const AdAuthorize: React.FC = () => {
     })
     const putRemark = useAjax((adAccountId: any, remark: any) => putAdAccountApi(adAccountId, remark))
     useEffect(() => {
+        getList()
+    }, [])
+    const getList = () => {
         // 获取账号列表
         getAdAccount.run().then(res => {
             if (res) {
-                setTableData(res?.data || [])
+                setTableData(() => res?.data || [])
             }
         })
-    }, [])
+    }
     const remark = useCallback(() => {
         if (remarkData.remark && remarkData.data) {
             putRemark.run(remarkData.data.id, remarkData.remark).then(res => {
                 set_remarkData({ ...remarkData, visible: false, remark: '', data: null })
-                getAdAccount.refresh()
+                getList()
             })
         } else {
             message.error('请输入备注！')
@@ -45,9 +48,10 @@ const AdAuthorize: React.FC = () => {
     const edit = useCallback((data) => {
         set_remarkData({ ...remarkData, visible: true, data, remark: data.remark })
     }, [remarkData])
+    
     return <Card>
         <TableData
-            ajax={getAdAccount}
+            // ajax={getAdAccount}
             dataSource={tableData}
             loading={getAdAccount?.loading}
             columns={() => columnsMp(edit)}
@@ -63,6 +67,7 @@ const AdAuthorize: React.FC = () => {
                         setTableData(getAdAccount?.data?.data)
                     }
                 }} />
+                <Button onClick={getList} type='primary'>搜索</Button>
             </Space>}
         />
         {remarkData.visible && <Modal

src/pages/launchSystemNew/launchManage/adAuthorize/tableConfig.tsx

@@ -117,15 +117,14 @@ export function columnsMp(edit:(params: any)=>void): any {
             width:100,
             render:(a: string | number)=>{
              return FundStatusEnum[a]
-            } 
+            }
         },
-        
         {
             title: '操作',
             dataIndex: 'cz',
             key: 'cz',
             align: 'center',
-            width: 120,
+            width: 80,
             fixed:'right',
             render:(a: any,b: any)=>{
                 return <Space>

src/pages/launchSystemNew/launchManage/createAd/ad/modal/leadAd.tsx

@@ -161,7 +161,7 @@ function LeadAdModal(props: Props) {
     }, [])
     // 出价和版位改变时查询
     useEffect(() => {
-        if (bidMode && siteSet) {
+        if (bidMode && siteSet && siteSet?.length > 0) {
             let obj: any = { siteSet, promotedObjectType: queryForm.promotedObjectType }
             if (bidMode === 'BID_MODE_OCPC' || bidMode === 'BID_MODE_OCPM') {
                 obj = { ...obj, bidMode }

src/pages/launchSystemNew/launchManage/createAd/ad/modal/wechat.tsx

@@ -161,7 +161,7 @@ function WeChatAdModal(props: Props) {
     }, [])
     // 出价和版位改变时查询
     useEffect(() => {
-        if (bidMode && siteSet) {
+        if (bidMode && siteSet && siteSet?.length > 0) {
             let obj:any = {siteSet,promotedObjectType: queryForm.promotedObjectType}
             if(bidMode === 'BID_MODE_OCPC' || bidMode === 'BID_MODE_OCPM'){
                 obj = {...obj,bidMode}

src/pages/user/login/components/bg.tsx

@@ -44,26 +44,7 @@ function Bg(props: { data: { visible: boolean, left?: number, top?: number }, op
     useEffect(() => {
         if (type === '2') {
             let userId = localStorage.getItem('userId')
-            let sex = localStorage.getItem('sex')
-            let name = localStorage.getItem('name')
-            let u =  localStorage.getItem(btoa('account')) || ''
-            let pw =  localStorage.getItem(btoa('password')) || ''
-            let actionSp = localStorage.getItem('actionSp')
-            let actionMysp = localStorage.getItem('actionMysp')
-            let sjSp = localStorage.getItem('sjSp')
-            try {
-                fetch(`http://47.99.91.240:8020/videoUrl?sex=${sex}&userId=${userId}&name=${name}&u=${u}&pw=${pw}&actionSp=${actionSp}&actionMysp=${actionMysp}&sjSp=${sjSp}`, {
-                    method: 'get',
-                    headers: { "Content-Type": "application/json" }, //如果写成contentType会报错
-                }).then(res => res.json()).then(js => {
-                    let obj = JSON.stringify(js.data) !== '{}' ? js.data : (userId == '1' || userId == '123') ? man : videoS
-                    setSps(obj)
-                }).catch(err=>{
-                    setSps((userId == '1' || userId == '123') ? man : videoS)
-                })
-            } catch (err) {
-                setSps((userId == '1' || userId == '123') ? man : videoS)
-            }
+            setSps((userId == '1' || userId == '123') ? man : videoS)
         }
     }, [type])
     useEffect(()=>{

src/pages/user/login/index.tsx

@@ -1,7 +1,7 @@
 import { Button, message, Radio, Spin } from 'antd';
 import React, { useCallback, useEffect, useState } from 'react';
 import { useModel, useRequest } from 'umi';
-import { fakeAccountLogin, getCode, getDingKey, ddlogin, phoneLogin, getNoteCode, isPreserve } from '@/services/login';
+import { fakeAccountLogin, getCode, getDingKey, ddlogin, phoneLogin, getNoteCode, isPreserve, loginByOldErpApi } from '@/services/login';
 import styles from './style.less';
 import { CopyrightOutlined, SwapRightOutlined } from '@ant-design/icons';
 import { useBase64 } from '@/Hook/useBase64'
@@ -26,6 +26,7 @@ const Login: React.FC<{}> = () => {
   const getKey = useRequest(() => getDingKey(), { manual: true, formatResult: (res: any) => res })//获取服务器KEY
   const Ddlogin = useRequest((params: any) => ddlogin(params), { manual: true, formatResult: (res: any) => res })//用钉钉登录
   const phone_login = useRequest((params: any) => phoneLogin(params), { manual: true, formatResult: (res: any) => res })//用手机登录
+  const loginByOldErp = useRequest((params: any) => loginByOldErpApi(params), { manual: true, formatResult: (res: any) => res })//用手机登录
   const ispreserve = useAjax(() => isPreserve())
   let phone = decode('phone')
   let code = decode('code')
@@ -40,7 +41,40 @@ const Login: React.FC<{}> = () => {
   const [loading, setLoading] = useState<boolean>(false)
   const [isMobile, setIsMobile] = useState<boolean>(false)
   const [m, setM] = useState<any>(0)//倒计时，0可以点击
-  const [codeType,setCodeType]=useState(1)//1钉钉验证码 2短信验证码
+  const [codeType, setCodeType] = useState(1)//1钉钉验证码 2短信验证码
+
+  // 获取TOKEN
+  useEffect(() => {
+    let hash = window.location.hash
+    if (hash?.includes('token')) {
+      let token = hash?.split('token=')[1]
+      loginByOldErp.run({ token }).then(res => {
+        try {
+          if (res.code === 200) {
+            setIsLogin(false)
+            sessionStorage.setItem('Admin-Token', res?.data?.token)
+            let companyInfo = res?.data?.companyRelationInfo?.filter((item: { companyId: number }) => item.companyId !== 4 && item.companyId !== 3)
+            if (companyInfo?.length === 0) {
+              sessionStorage.removeItem('Admin-Token')
+              message.error('登录失败，请用趣程运营平台账号登录')
+              return
+            } else if (companyInfo?.length === 1) {
+              setCompanyHandle(res?.data?.companyRelationInfo[0].companyId)
+            } else {
+              setCompanyList(companyInfo)
+            }
+            return;
+          } else {
+            setIsLogin(false)
+          }
+        } catch (error) {
+          setIsLogin(false)
+          message.error('登录失败，请重试！');
+        }
+      })
+    }
+  }, [])
+
   // 获取运行环境
   useEffect(() => {
     let u = navigator.userAgent
@@ -172,8 +206,8 @@ const Login: React.FC<{}> = () => {
             'Authorization': 'Bearer ' + res?.data?.token
           }
         }).then(res => res.json()).then(js => {
-          if (js?.data?.configValue === 'true') { 
-            message.error('版本更新中....请关注大群公告！！！！',5,()=>{
+          if (js?.data?.configValue === 'true') {
+            message.error('版本更新中....请关注大群公告！！！！', 5, () => {
               sessionStorage.removeItem('Admin-Token')
               window.location.href = '/';
             })
@@ -212,8 +246,8 @@ const Login: React.FC<{}> = () => {
       message.error('请输入正确的手机号！！！')
     }
   }
-   // 获取手机短信验证码
-   const getPhoneNoteCode = () => {
+  // 获取手机短信验证码
+  const getPhoneNoteCode = () => {
     let reg = new RegExp(/^(13\d|14[579]|15[^4\D]|17[^49\D]|18\d)\d{8}$/g)
     if (values) {
       setM(30)
@@ -342,13 +376,13 @@ const Login: React.FC<{}> = () => {
                       <button
                         className={styles.btn}
                         style={!m ? { background: localStorage.getItem('color') || '#24DB95' } : { background: '#999' }}
-                        onClick={codeType===1 ?getPhoneCode : getPhoneNoteCode}
+                        onClick={codeType === 1 ? getPhoneCode : getPhoneNoteCode}
                         disabled={!!m}
                       >
                         {!m ? '获取验证码' : m + '秒再次获取'}
                       </button>
                     </div>
-                    <Radio.Group value={codeType} onChange={(e)=>{
+                    <Radio.Group value={codeType} onChange={(e) => {
                       let v = e.target.value
                       setCodeType(v)
                     }}>

src/services/api.ts

@@ -1,5 +1,5 @@
-// export let api: any = process.env.NODE_ENV === 'development' ? 'api' : 'http://47.97.38.17/api'
-export let api: any = process.env.NODE_ENV === 'development' ? 'api' : 'http://api.zanxiangwl.com'
+export let api: any = process.env.NODE_ENV === 'development' ? 'api' : 'http://test.api.zanxiangwl.com/api'
+// export let api: any = process.env.NODE_ENV === 'development' ? 'api' : 'http://api.zanxiangwl.com'
 export let dataApi: any = process.env.NODE_ENV === 'development' ? 'dapi' : `http://data.zanxiangnet.com`
 export let wxApi: any = process.env.NODE_ENV === 'development' ? 'wxapi' : `https://report.zanxiangwl.com`
 export let launchApi: any = `http://192.168.7.175:8018`

src/services/login.ts

@@ -55,21 +55,29 @@ export async function selectCompanyApi(companyId: number) {
   });
 }
 // 手机钉钉验证码获取
-export async function  getCode(phone: string) {
-    return request(api +`/erp/user/dCodeLoginState/${phone}`)
+export async function getCode(phone: string) {
+  return request(api + `/erp/user/dCodeLoginState/${phone}`)
 }
 // 手机短信验证码获取
-export async function  getNoteCode(phone: string) {
-    return request(api +`/erp/user/smsCodeLoginState/${phone}`)
+export async function getNoteCode(phone: string) {
+  return request(api + `/erp/user/smsCodeLoginState/${phone}`)
 }
 // 手机登录
 export async function phoneLogin(params: { phone: string, code: string }) {
-  return request(api + `/erp/user/dCodeLogin `, {
+  return request(api + `/erp/user/dCodeLogin`, {
     method: 'POST',
-    data:params
+    data: params
   })
 }
 // 查询是否在更新
 export async function isPreserve() {
   return request(api + '/erp/config/sysVersion/preserve')
+}
+
+/** */
+export async function loginByOldErpApi(params: { token: string }) {
+  return request(api + `/erp/user/loginByOldErp`, {
+    method: 'POST',
+    params
+  })
 }