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

src/models/useAdMonitor/useMonitor.ts

@@ -9,7 +9,7 @@ import {
 
 export default function useMonitor() {
     /** 获取起量计划列表 */
-    const getPlanList = useAjax((params: ListType) => getPlanListApi(params), { formatResult: true, debounceInterval: 1500 })
+    const getPlanList = useAjax((params: ListType) => getPlanListApi(params), { formatResult: true, debounceInterval: 1000 })
     /**获取起来计划列表明细*/
     const getPlanDetailList = useAjax((params: ListType) => getDetailListApi(params), { formatResult: true, debounceInterval: 100 })
     /**获取起来计划列表5min*/
@@ -23,7 +23,7 @@ export default function useMonitor() {
     /** 获取组员 */
     const getUserGroup = useAjax(() => getUserGroupApi(), { formatResult: true })
     /** 计划列表 */
-    const getAllPlanList = useAjax((params: allPlanProps) => getAllPlanListApi(params), { formatResult: true, debounceInterval: 1500 })
+    const getAllPlanList = useAjax((params: allPlanProps) => getAllPlanListApi(params), { formatResult: true, debounceInterval: 1000 })
     const getBookListAll = useAjax(() => getBookListAllApi(), { formatResult: true })
     /** 下载 */
     const downLoadUpAd = useAjax((params: ListType) => downLoadUpAdApi(params), { formatResult: true })

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

@@ -46,6 +46,8 @@ const PageModal: React.FC<Props> = (props) => {
 
     // 获取落地页列表
     const getList = () => {
+        console.log('data-->', cloudParams);
+        
         listAjax.run({ ...queryForm, ...cloudParams })
     }
 

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

@@ -442,6 +442,9 @@ function LeadAdModal(props: Props) {
                             <Col span={6}>
                                 <Checkbox value="SITE_SET_WECHAT">微信公众号与小程序</Checkbox>
                             </Col>
+                            <Col span={5}>
+                                <Checkbox value="SITE_SET_WECHAT_PLUGIN">微信新闻插件</Checkbox>
+                            </Col>
                         </Row>
                     </Checkbox.Group>
                 </Form.Item>}

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

@@ -310,8 +310,6 @@ function WeChatAdModal(props: Props) {
         })
     }
 
-    console.log('siteSetPackage--->', siteSetPackage, bidAdjustmentEnabled, siteSet);
-
     return <Modal
         visible={visible}
         title={type === 'add' ? '新建广告' : type === 'look' ? '广告详情' : '编辑广告'}
@@ -373,9 +371,9 @@ function WeChatAdModal(props: Props) {
                             <Col span={6}>
                                 <Checkbox value="SITE_SET_WECHAT">微信公众号与小程序</Checkbox>
                             </Col>
-                            {/* <Col span={5}>
-                                <Checkbox value="SITESET_WECHAT_PLUGIN">微信新闻插件</Checkbox>
-                            </Col> */}
+                            <Col span={5}>
+                                <Checkbox value="SITE_SET_WECHAT_PLUGIN">微信新闻插件</Checkbox>
+                            </Col>
                             <Col span={4}>
                                 <Checkbox value="SITE_SET_MOBILE_UNION">优量汇</Checkbox>
                             </Col>

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

@@ -31,6 +31,9 @@
     padding: 0 10px;
     border-right: 1px solid #dcdee2;
     color: #333;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
   }
 
   &:hover .selectorLabel {

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

@@ -624,8 +624,6 @@ const CreateAd: React.FC = () => {
         set_targetKey('0')
     }
 
-    console.log('queryForm111111---->', queryForm, accountCreateLogs);
-
     return <Space direction="vertical" style={{ width: '100%' }}>
         <Card
             title={<Space>