wjx 3 settimane fa
parent
commit
f13785de54
19 ha cambiato i file con 70 aggiunte e 36 eliminazioni
  1. 1 1
      src/pages/weComTask/components/filterUser/filterUserTooltip.tsx
  2. 10 4
      src/pages/weComTask/page/bookLink/selectBookLink.tsx
  3. 3 1
      src/pages/weComTask/page/businessPlan/create/components/friends/previewFriendsStrategy.tsx
  4. 4 2
      src/pages/weComTask/page/businessPlan/create/components/friends/strategy.tsx
  5. 3 1
      src/pages/weComTask/page/businessPlan/create/components/highMassSending/strategy.tsx
  6. 3 1
      src/pages/weComTask/page/businessPlan/create/components/massSending/previewMassSendingStrategy.tsx
  7. 3 1
      src/pages/weComTask/page/businessPlan/create/components/massSending/strategy.tsx
  8. 3 1
      src/pages/weComTask/page/businessPlan/create/components/userInherit/previewUserlnherit.tsx
  9. 3 1
      src/pages/weComTask/page/businessPlan/create/components/userInherit/settingsUserlnherit.tsx
  10. 8 8
      src/pages/weComTask/page/businessPlan/create/tableConfig.tsx
  11. 3 1
      src/pages/weComTask/page/groupChat/create/components/strategy/previewStrategy.tsx
  12. 4 1
      src/pages/weComTask/page/groupChat/create/components/strategy/settingsStrategy.tsx
  13. 1 0
      src/pages/weComTask/page/groupChat/create/index.tsx
  14. 4 2
      src/pages/weComTask/page/groupChatSend/official/create/components/Strategy/previewStrategy.tsx
  15. 3 1
      src/pages/weComTask/page/groupChatSend/official/create/components/Strategy/settingsStrategy.tsx
  16. 4 4
      src/pages/weComTask/page/groupChatSend/official/create/tableConfig.tsx
  17. 3 1
      src/pages/weComTask/page/groupChatSend/robot/create/components/Strategy/previewStrategy.tsx
  18. 3 1
      src/pages/weComTask/page/groupChatSend/robot/create/components/Strategy/settingsStrategy.tsx
  19. 4 4
      src/pages/weComTask/page/groupChatSend/robot/create/tableConfig.tsx

+ 1 - 1
src/pages/weComTask/components/filterUser/filterUserTooltip.tsx

@@ -235,7 +235,7 @@ const FilterUserTooltip: React.FC<Props> = (props) => {
             <strong>关注距今天:</strong><span>{content?.subDay?.subDayMin ? content?.subDay?.subDayMin + '天' : '不限'} - {content?.subDay?.subDayMax ? content?.subDay?.subDayMax + '天' : '不限'}</span>
         </div>}
         {content?.lastRechargeHour && <div>
-            <strong>最近一次充值距今(小时):</strong><span>{content?.lastRechargeHour?.lastRechargeHourMin ? content?.lastRechargeHour?.lastRechargeHourMin + '' : '不限'} - {content?.lastRechargeHour?.lastRechargeHourMax ? content?.lastRechargeHour?.lastRechargeHourMax + '小时' : '不限'}</span>
+            <strong>最近一次充值距今(小时):</strong><span>{content?.lastRechargeHour?.lastRechargeHourMin ? content?.lastRechargeHour?.lastRechargeHourMin + '小时' : '不限'} - {content?.lastRechargeHour?.lastRechargeHourMax ? content?.lastRechargeHour?.lastRechargeHourMax + '小时' : '不限'}</span>
         </div>}
         {content?.opers?.length > 0 && <div>
             <strong>手机系统:</strong><span>{content?.opers.map(g => ({ '0': '未知', '1': '安卓', '2': 'IOS' } as any)[g]).toString()}</span>

+ 10 - 4
src/pages/weComTask/page/bookLink/selectBookLink.tsx

@@ -51,10 +51,16 @@ const SelectBookLink: React.FC<Props> = ({ bookPlatForm, linkData, mpAccountId,
 
     const handleOk = () => {
         if (data?.every(item => item?.bookLink?.length)) {
-            const linkStr = data.map(item => item.bookLink?.[0].link).join(',')
-            const miniprogramAppid = data?.[0]?.bookLink?.[0]?.wxAppid
-            const miniprogramPage = data?.[0]?.bookLink?.[0]?.miniappPagePath
-            onChange?.(linkStr, miniprogramAppid, miniprogramPage)
+            const miniprogramAppid: string[] = [];
+            const miniprogramPage: string[] = [];
+            const linkStr = data.map(item => {
+                if (item?.bookLink?.[0]?.wxAppid) {
+                    miniprogramAppid.push(item?.bookLink?.[0]?.wxAppid)
+                    miniprogramPage.push(item?.bookLink?.[0]?.miniappPagePath)
+                }
+                return item.bookLink?.[0].link
+            }).join(',')
+            onChange?.(linkStr, miniprogramAppid?.join(','), miniprogramPage?.join(','))
         } else {
             message.error('请选择链接')
         }

+ 3 - 1
src/pages/weComTask/page/businessPlan/create/components/friends/previewFriendsStrategy.tsx

@@ -24,11 +24,13 @@ const PreviewFriendsStrategy: React.FC<{ friendsStrategy: { [x: string]: any },
                 ...friendsStrategy, strategySettings: friendsStrategy?.strategySettings?.map(item => {
                     const { sendTime, startTime, endTime, sendDay, timeRepeatType } = item
                     if (timeRepeatType === 'TIME_TYPE_SINGLE_PLACE') {
-                        return {
+                        const data = {
                             ...item,
                             timeRepeatType,
                             sendDay: sendDay ? dayjs(sendDay + ' ' + sendTime) : undefined
                         }
+                        delete data?.sendTime
+                        return data
                     }
                     return {
                         ...item,

+ 4 - 2
src/pages/weComTask/page/businessPlan/create/components/friends/strategy.tsx

@@ -43,11 +43,13 @@ const Strategy = forwardRef(({ value, onChange }: TASK_CREATE.StrategyProps, ref
                 ...value, strategySettings: value?.strategySettings?.map(item => {
                     const { sendTime, startTime, endTime, sendDay, timeRepeatType } = item
                     if (timeRepeatType === 'TIME_TYPE_SINGLE_PLACE') {
-                        return {
+                        const data = {
                             ...item,
                             timeRepeatType,
                             sendDay: sendDay ? dayjs(sendDay + ' ' + sendTime) : undefined
                         }
+                        delete data?.sendTime
+                        return data
                     }
                     return {
                         ...item,
@@ -164,7 +166,7 @@ const Strategy = forwardRef(({ value, onChange }: TASK_CREATE.StrategyProps, ref
                 }}
                 initialValues={{
                     taskType: 'novel',
-                    strategySettings: [{ }],
+                    strategySettings: [{}],
                 }}
                 onFieldsChange={() => {
                     filedUpdateChange(form.getFieldsValue())

+ 3 - 1
src/pages/weComTask/page/businessPlan/create/components/highMassSending/strategy.tsx

@@ -43,11 +43,13 @@ const Strategy = forwardRef(({ value, onChange }: TASK_CREATE.StrategyProps, ref
                 ...value, strategySettings: value?.strategySettings?.map(item => {
                     const { sendTime, startTime, endTime, sendDay, timeRepeatType } = item
                     if (timeRepeatType === 'TIME_TYPE_SINGLE_PLACE') {
-                        return {
+                        const data = {
                             ...item,
                             timeRepeatType,
                             sendDay: sendDay ? dayjs(sendDay + ' ' + sendTime) : undefined
                         }
+                        delete data?.sendTime
+                        return data
                     }
                     return {
                         ...item,

+ 3 - 1
src/pages/weComTask/page/businessPlan/create/components/massSending/previewMassSendingStrategy.tsx

@@ -24,11 +24,13 @@ const PreviewMassSendingStrategy: React.FC<{ massSendingStrategy: { [x: string]:
                 ...massSendingStrategy, strategySettings: massSendingStrategy?.strategySettings?.map(item => {
                     const { sendTime, startTime, endTime, sendDay, timeRepeatType } = item
                     if (timeRepeatType === 'TIME_TYPE_SINGLE_PLACE') {
-                        return {
+                        const data = {
                             ...item,
                             timeRepeatType,
                             sendDay: sendDay ? dayjs(sendDay + ' ' + sendTime) : undefined
                         }
+                        delete data?.sendTime
+                        return data
                     }
                     return {
                         ...item,

+ 3 - 1
src/pages/weComTask/page/businessPlan/create/components/massSending/strategy.tsx

@@ -43,11 +43,13 @@ const Strategy = forwardRef(({ value, onChange }: TASK_CREATE.StrategyProps, ref
                 ...value, strategySettings: value?.strategySettings?.map(item => {
                     const { sendTime, startTime, endTime, sendDay, timeRepeatType } = item
                     if (timeRepeatType === 'TIME_TYPE_SINGLE_PLACE') {
-                        return {
+                        const data = {
                             ...item,
                             timeRepeatType,
                             sendDay: sendDay ? dayjs(sendDay + ' ' + sendTime) : undefined
                         }
+                        delete data?.sendTime
+                        return data
                     }
                     return {
                         ...item,

+ 3 - 1
src/pages/weComTask/page/businessPlan/create/components/userInherit/previewUserlnherit.tsx

@@ -23,11 +23,13 @@ const PreviewUserInherit: React.FC<{ userInherit: any }> = ({ userInherit }) =>
                 ...userInherit, schedulingStrategyDTO: userInherit?.schedulingStrategyDTO?.map(item => {
                     const { sendTime, startTime, endTime, sendDay, timeRepeatType } = item
                     if (timeRepeatType === 'TIME_TYPE_SINGLE_PLACE') {
-                        return {
+                        const data = {
                             ...item,
                             timeRepeatType,
                             sendDay: sendDay ? dayjs(sendDay + ' ' + sendTime) : undefined
                         }
+                        delete data?.sendTime
+                        return data
                     }
                     return {
                         ...item,

+ 3 - 1
src/pages/weComTask/page/businessPlan/create/components/userInherit/settingsUserlnherit.tsx

@@ -45,11 +45,13 @@ const SettingsUserInherit: React.FC<TASK_CREATE.UserInheritProps<any>> = ({ valu
                 ...value, schedulingStrategyDTO: value?.schedulingStrategyDTO?.map(item => {
                     const { sendTime, startTime, endTime, sendDay, timeRepeatType } = item
                     if (timeRepeatType === 'TIME_TYPE_SINGLE_PLACE') {
-                        return {
+                        const data = {
                             ...item,
                             timeRepeatType,
                             sendDay: sendDay ? dayjs(sendDay + ' ' + sendTime) : undefined
                         }
+                        delete data?.sendTime
+                        return data
                     }
                     return {
                         ...item,

+ 8 - 8
src/pages/weComTask/page/businessPlan/create/tableConfig.tsx

@@ -291,14 +291,14 @@ export const massSendingColumns = (setContent: (data: TASK_CREATE.SetContentProp
                         bookPlatForm={bookPlatForm}
                         platform={platform}
                         mpAccountId={record.corpUserList?.[0]?.mpAccountId}
-                        linkData={[{
+                        linkData={record.miniProgramData.map(item => ({
                             msgType: "TASK_CONTENT_LINK",
                             link: {
-                                title: record.miniProgramData?.[0]?.miniprogram?.title,
-                                picUrl: record.miniProgramData?.[0]?.miniprogram?.picUrl,
+                                title: item?.miniprogram?.title,
+                                picUrl: item?.miniprogram?.picUrl,
                                 desc: ''
                             }
-                        }]}
+                        }))}
                         onChange={(_, miniprogramAppid, miniprogramPage) => {
                             const msg: { [x: string]: string } = {}
                             if (miniprogramAppid && miniprogramPage) {
@@ -607,14 +607,14 @@ export const welcomeColumns = (bookPlatForm: TASK_CREATE.BookPlatFormProps[], bo
                         bookPlatForm={bookPlatForm}
                         platform={platform}
                         mpAccountId={record.corpUserList?.[0]?.mpAccountId}
-                        linkData={[{
+                        linkData={record.miniProgramData.map(item => ({
                             msgType: "TASK_CONTENT_LINK",
                             link: {
-                                title: record.miniProgramData?.[0]?.miniprogramTitle,
-                                picUrl: record.miniProgramData?.[0]?.miniprogramPicurl,
+                                title: item.miniprogramTitle,
+                                picUrl: item.miniprogramPicurl,
                                 desc: ''
                             }
-                        }]}
+                        }))}
                         onChange={(_, miniprogramAppid, miniprogramPage) => {
                             const msg: { [x: string]: string } = {}
                             if (miniprogramAppid && miniprogramPage) {

+ 3 - 1
src/pages/weComTask/page/groupChat/create/components/strategy/previewStrategy.tsx

@@ -21,11 +21,13 @@ const PreviewStrategy: React.FC<Props> = ({ strategyDTO }) => {
                 ...strategyDTO, strategyList: strategyDTO?.strategyList?.map(item => {
                     const { sendTime, startTime, endTime, sendDay, timeRepeatType } = item
                     if (timeRepeatType === 'TIME_TYPE_SINGLE_PLACE') {
-                        return {
+                        const data = {
                             ...item,
                             timeRepeatType,
                             sendDay: sendDay ? dayjs(sendDay + ' ' + sendTime) : undefined
                         }
+                        delete data?.sendTime
+                        return data
                     }
                     return {
                         ...item,

+ 4 - 1
src/pages/weComTask/page/groupChat/create/components/strategy/settingsStrategy.tsx

@@ -33,11 +33,13 @@ const SettingsStrategy: React.FC<GROUP_CHAT_CREATE.FoundationProps<any>> = ({ vi
                 ...value, strategyList: value?.strategyList?.map(item => {
                     const { sendTime, startTime, endTime, sendDay, timeRepeatType } = item
                     if (timeRepeatType === 'TIME_TYPE_SINGLE_PLACE') {
-                        return {
+                        const data = {
                             ...item,
                             timeRepeatType,
                             sendDay: sendDay ? dayjs(sendDay + ' ' + sendTime) : undefined
                         }
+                        delete data?.sendTime
+                        return data
                     }
                     return {
                         ...item,
@@ -49,6 +51,7 @@ const SettingsStrategy: React.FC<GROUP_CHAT_CREATE.FoundationProps<any>> = ({ vi
                     }
                 })
             }
+            console.log('=================>', data)
             filedUpdateChange(data)
             form.setFieldsValue(data)
         }

+ 1 - 0
src/pages/weComTask/page/groupChat/create/index.tsx

@@ -64,6 +64,7 @@ const GroupChatCreate: React.FC<{ weComTaskStore: { data: { bookList: TASK_CREAT
                 if (res?.data) {
                     const { bizType, platform, templateProductId, corpUsers, corpChatUserList, corpRobots, strategyList } = res.data
                     const data = getPullGroupData(strategyList || [])
+                    console.log('data-->', data)
                     let newSettings: GROUP_CHAT_CREATE.SettingsProps = {
                         bizType,
                         platform: Number(platform) as any,

+ 4 - 2
src/pages/weComTask/page/groupChatSend/official/create/components/Strategy/previewStrategy.tsx

@@ -22,11 +22,13 @@ const PreviewStrategy: React.FC<Props> = ({ strategyDTO }) => {
                 ...strategyDTO, strategyList: strategyDTO?.strategyList?.map(item => {
                     const { sendTime, startTime, endTime, sendDay, timeRepeatType } = item
                     if (timeRepeatType === 'TIME_TYPE_SINGLE_PLACE') {
-                        return {
+                        const data = {
                             ...item,
                             timeRepeatType,
                             sendDay: sendDay ? dayjs(sendDay + ' ' + sendTime) : undefined
                         }
+                        delete data?.sendTime
+                        return data
                     }
                     return {
                         ...item,
@@ -106,7 +108,7 @@ const PreviewStrategy: React.FC<Props> = ({ strategyDTO }) => {
                                                                     name={[name, 'externalUserFilter']}
                                                                     noStyle
                                                                 >
-                                                                    <FilterUser configType={'GROUP_GROUP'} isSHow/>
+                                                                    <FilterUser configType={'GROUP_GROUP'} isSHow />
                                                                 </Form.Item>
                                                             </div>}
                                                         </div>

+ 3 - 1
src/pages/weComTask/page/groupChatSend/official/create/components/Strategy/settingsStrategy.tsx

@@ -46,11 +46,13 @@ const SettingsStrategy: React.FC<GROUP_CHAT_CREATE.FoundationProps<any>> = ({ vi
                 ...value, strategyList: value?.strategyList?.map(item => {
                     const { sendTime, startTime, endTime, sendDay, timeRepeatType } = item
                     if (timeRepeatType === 'TIME_TYPE_SINGLE_PLACE') {
-                        return {
+                        const data = {
                             ...item,
                             timeRepeatType,
                             sendDay: sendDay ? dayjs(sendDay + ' ' + sendTime) : undefined
                         }
+                        delete data?.sendTime
+                        return data
                     }
                     return {
                         ...item,

+ 4 - 4
src/pages/weComTask/page/groupChatSend/official/create/tableConfig.tsx

@@ -179,14 +179,14 @@ export const PreviewColumns = (bookPlatForm: TASK_CREATE.BookPlatFormProps[], bo
                         bookPlatForm={bookPlatForm}
                         platform={platform}
                         mpAccountId={record.mpAccountId}
-                        linkData={[{
+                        linkData={record.miniProgramData.map(item => ({
                             msgType: "TASK_CONTENT_LINK",
                             link: {
-                                title: record.miniProgramData?.[0]?.miniprogram?.title,
-                                picUrl: record.miniProgramData?.[0]?.miniprogram?.picUrl,
+                                title: item?.miniprogram?.title,
+                                picUrl: item?.miniprogram?.picUrl,
                                 desc: ''
                             }
-                        }]}
+                        }))}
                         onChange={(_, miniprogramAppid, miniprogramPage) => {
                             const msg: { [x: string]: string } = {}
                             if (miniprogramAppid && miniprogramPage) {

+ 3 - 1
src/pages/weComTask/page/groupChatSend/robot/create/components/Strategy/previewStrategy.tsx

@@ -25,11 +25,13 @@ const PreviewStrategy: React.FC<Props> = ({ strategyDTO, corpList }) => {
                 ...strategyDTO, strategyList: strategyDTO?.strategyList?.map(item => {
                     const { sendTime, startTime, endTime, sendDay, timeRepeatType } = item
                     if (timeRepeatType === 'TIME_TYPE_SINGLE_PLACE') {
-                        return {
+                        const data = {
                             ...item,
                             timeRepeatType,
                             sendDay: sendDay ? dayjs(sendDay + ' ' + sendTime) : undefined
                         }
+                        delete data?.sendTime
+                        return data
                     }
                     return {
                         ...item,

+ 3 - 1
src/pages/weComTask/page/groupChatSend/robot/create/components/Strategy/settingsStrategy.tsx

@@ -51,11 +51,13 @@ const SettingsStrategy: React.FC<Props> = ({ visible, onClose, value, onChange,
                 ...value, strategyList: value?.strategyList?.map(item => {
                     const { sendTime, startTime, endTime, sendDay, timeRepeatType } = item
                     if (timeRepeatType === 'TIME_TYPE_SINGLE_PLACE') {
-                        return {
+                        const data = {
                             ...item,
                             timeRepeatType,
                             sendDay: sendDay ? dayjs(sendDay + ' ' + sendTime) : undefined
                         }
+                        delete data?.sendTime
+                        return data
                     }
                     return {
                         ...item,

+ 4 - 4
src/pages/weComTask/page/groupChatSend/robot/create/tableConfig.tsx

@@ -263,14 +263,14 @@ export const PreviewColumns = (
                         bookPlatForm={bookPlatForm}
                         platform={platform}
                         mpAccountId={record.mpAccountId}
-                        linkData={[{
+                        linkData={record.miniProgramData.map(item => ({
                             msgType: "TASK_CONTENT_LINK",
                             link: {
-                                title: record.miniProgramData?.[0]?.miniprogram?.title,
-                                picUrl: record.miniProgramData?.[0]?.miniprogram?.picUrl,
+                                title: item?.miniprogram?.title,
+                                picUrl: item?.miniprogram?.picUrl,
                                 desc: ''
                             }
-                        }]}
+                        }))}
                         onChange={(_, miniprogramAppid, miniprogramPage) => {
                             const msg: { [x: string]: string } = {}
                             if (miniprogramAppid && miniprogramPage) {