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

src/pages/launchSystemV3/tencentAdPutIn/create/Dynamic/creativeTemplateContent.tsx

@@ -139,7 +139,7 @@ const CreativeTemplateContent: React.FC<{ automaticSiteEnabled: boolean, putInTy
                                                 }}
                                             />
                                         </Form.Item>
-                                        {((siteSet?.some((name: string) => name === 'SITE_SET_MOMENTS') || automaticSiteEnabled) && pageSpec?.[index]?.pageType === 'PAGE_TYPE_WECHAT_CANVAS') && <div style={{ margin: 0, backgroundColor: '#fafafb', padding: '8px 16px 8px', borderRadius: 8 }}>
+                                        {(((deliveryMode === 'DELIVERY_MODE_CUSTOMIZE' ? siteSet?.some((name: string) => name === 'SITE_SET_MOMENTS') : true) || automaticSiteEnabled) && pageSpec?.[index]?.pageType === 'PAGE_TYPE_WECHAT_CANVAS') && <div style={{ margin: 0, backgroundColor: '#fafafb', padding: '8px 16px 8px', borderRadius: 8 }}>
                                             <Form.Item
                                                 name={[name, 'overrideCanvasHeadOption']}
                                                 style={{ marginBottom: 0 }}
@@ -161,7 +161,7 @@ const CreativeTemplateContent: React.FC<{ automaticSiteEnabled: boolean, putInTy
                                     <Button type="dashed" disabled block icon={<PlusOutlined />}>
                                         还可以添加 {jumpInfoNumber - pageSpec?.length} 组
                                     </Button>
-                                </Tooltip> : <Button type="dashed" onClick={() => add({ pageId: null, pageType: pageSpec?.[0]?.pageType || 'PAGE_TYPE_WECHAT_CANVAS', overrideCanvasHeadOption: 'OPTION_CREATIVE_OVERRIDE_CANVAS' })} block icon={<PlusOutlined />}>
+                                </Tooltip> : <Button type="dashed" onClick={() => add({ pageId: null, pageType: pageSpec?.[0]?.pageType || 'PAGE_TYPE_WECHAT_CANVAS', overrideCanvasHeadOption: pageSpec?.[0]?.overrideCanvasHeadOption || 'OPTION_CREATIVE_OVERRIDE_CANVAS' })} block icon={<PlusOutlined />}>
                                     还可以添加 {jumpInfoNumber - pageSpec?.length} 组
                                 </Button>}
                             </Form.Item>}