Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-system into v2

src/pages/afterService/returnManage/components/ReturnProfile/index.tsx

@@ -133,9 +133,8 @@ const ReturnProfile: React.ForwardRefRenderFunction<ReturnProfileRefHandle, Retu
 
   // 退款
   const handleRefund = (values): Promise<any> => {
-    const { id, refundAmount, ...rest } = values;
     if (onRefund) {
-      return onRefund?.(rest);
+      return onRefund?.(values);
     }
     return Promise.reject();
   };

src/pages/marketingManage/marketing/waitAddedMarketing/add.tsx

@@ -99,9 +99,9 @@ const AddedMarketing = (props: any) => {
         memberLevelList,
       }
 
-      if (res['activityDefined']['assembleTime']) {
-        params['activityDefined'].assembleTime = Number(moment(res['activityDefined']['assembleTime']).format('x'));
-      }
+      // if (res['activityDefined']['assembleTime']) {
+      //   params['activityDefined'].assembleTime = Number(moment(res['activityDefined']['assembleTime']).format('x'));
+      // }
       if (res['activityDefined']['startTime']) {
         params['activityDefined']['startTime'] = Number(moment(res['activityDefined']['startTime']).format('x'));
       }
@@ -189,9 +189,9 @@ const AddedMarketing = (props: any) => {
           }
         })[0])
         focus$.emit(option)
-        if (data['activityDefined']['assembleTime']) {
-          data['activityDefined']['assembleTime'] = moment(data['activityDefined']['assembleTime']);
-        }
+        // if (data['activityDefined']['assembleTime']) {
+        //   data['activityDefined']['assembleTime'] = moment(data['activityDefined']['assembleTime']);
+        // }
         if (data['activityDefined']['startTime']) {
           data['activityDefined']['startTime'] = moment(data['activityDefined']['startTime']);
         }

src/pages/marketingManage/marketing/waitAddedMarketing/components/rulesLayout/index.tsx

@@ -549,10 +549,11 @@ const RulesLayout: React.FC<RulesLayoutProps> = (props: any) => {
                 <Form.Item
                   style={{ margin: 0 }}
                   name={['activityDefined', 'assembleStatus']}
+                  initialValue={1}
                   rules={[{ required: true, message: "请选择" }]}
                 >
                   <Radio.Group>
-                    <Radio.Button value={0}>不限制</Radio.Button>
+                    {/* <Radio.Button value={0}>不限制</Radio.Button> */}
                     <Radio.Button value={1}>限制</Radio.Button>
                   </Radio.Group>
                 </Form.Item>
@@ -584,7 +585,7 @@ const RulesLayout: React.FC<RulesLayoutProps> = (props: any) => {
                 </Form.Item>
               </Space>
             </Form.Item>
-            <Form.Item
+            {/* <Form.Item
               tooltip="用户参团限制表示已在本团购活动内参团的用户是否可以参加其他有效团购活动，不限制表示可以无限制参加，限制时要求填写次数，默认为1"
               label="用户参团限制"
               className={style.rulesLayout}
@@ -628,7 +629,7 @@ const RulesLayout: React.FC<RulesLayoutProps> = (props: any) => {
                   )}
                 </Form.Item>
               </Space>
-            </Form.Item>
+            </Form.Item> */}
           </Fragment>
         )
     }