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

src/pages/launchSystemNew/adq/ad/adPlanList.tsx

@@ -168,13 +168,13 @@ const AdPlanList: React.FC<{ userId: string }> = (props) => {
         let params: any = {}
         if (type === 'play') {
             params.configuredStatus = 'AD_STATUS_NORMAL'
-            params.adgroupIds = selectedRows.filter((item: { configuredStatus: string, adgroup_id: number }) => item.configuredStatus === 'AD_STATUS_SUSPEND').map(item => item.adgroup_id)
+            params.adgroupIds = selectedRows.filter((item: { configured_status: string, adgroup_id: number }) => item.configured_status === 'AD_STATUS_SUSPEND').map(item => item.adgroup_id)
         } else {
             params.configuredStatus = 'AD_STATUS_SUSPEND'
-            params.adgroupIds = selectedRows.filter((item: { configuredStatus: string, adgroup_id: number }) => item.configuredStatus === 'AD_STATUS_NORMAL').map(item => item.adgroup_id)
+            params.adgroupIds = selectedRows.filter((item: { configured_status: string, adgroup_id: number }) => item.configured_status === 'AD_STATUS_NORMAL').map(item => item.adgroup_id)
         }
         if (params.adgroupIds.length === 0) {
-            message.warn(`所以账号都是${type === 'play' ? '启动' : '暂停'}状态,无需${type === 'play' ? '启动' : '暂停'}操作`)
+            message.warn(`所有账号都是${type === 'play' ? '启动' : '暂停'}状态,无需${type === 'play' ? '启动' : '暂停'}操作`)
             return
         }
         editAdqAdgroupsData.run(params).then(res => {

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

@@ -1061,7 +1061,6 @@ const CreateAd: React.FC = () => {
                                     <span>+{accountCreateLogs?.length > 1 ? accountCreateLogs.length - 1 : 0}</span>
                                 </Tooltip>
                             }
-                            dropdownMatchSelectWidth={false}
                             autoClearSearchValue={false}
                             filterOption={(input: any, option: any) => {
                                 let newInput: string[] = input ? input?.split(/[,，\n\s]+/ig).filter((item: any) => item) : []

src/pages/launchSystemV3/adMonitorListV3/config.ts

@@ -24,7 +24,7 @@ const planAdConfig = [
             { title: '广告状态', dataIndex: 'system_status', serverIndex: 'adgroup.system_status', label: '广告详情', default: 20, width: 70 },
             { title: '广告详情', dataIndex: 'cost_speed', label: '广告详情', default: 21, width: 80 },
             { title: '标记备注', dataIndex: 'tag_remark', label: '广告详情', width: 80, serverIndex: 'adgroup_user_tag.tag_remark' },
-            { title: '创意预览', dataIndex: 'creative_ids', serverIndex: 'adgroup_data.creative_ids', label: '设置信息', width: 130 },
+            { title: '创意预览', dataIndex: 'creative_ids', serverIndex: 'adgroup_data.creative_ids', label: '广告详情', width: 130 },
             { title: '操作', dataIndex: 'cz', label: '广告详情', default: 22, width: 116 },
         ]
     },