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

config/routes/merchantMarketingRoute.ts

@@ -4,44 +4,44 @@ const merchantMarketing = {
   routes: [
     {
       /** 商家营销活动查询 - merchantMarketingSearch */
-      path: '/merchantMarketing/merchantMarketingSearch',
+      path: '/marketingManage/merchantMarketing/merchantMarketingSearch',
       name: '商家营销活动查询',
       hidePageHeader: true,
-      component: '@/pages/merchantMarketing/merchantMarketingSearch',
+      component: '@/pages/marketingManage/merchantMarketing/merchantMarketingSearch',
     },
     {
       /** 商家营销活动查询详情 - preview */
-      path: '/merchantMarketing/merchantMarketingSearch/preview',
+      path: '/marketingManage/merchantMarketing/merchantMarketingSearch/preview',
       name: '商家营销活动查询详情',
       hidePageHeader: true,
       hideInMenu: true,
       noMargin: true,
-      component: '@/pages/merchantMarketing/detail',
+      component: '@/pages/marketingManage/merchantMarketing/detail',
     },
     {
       /** 待审核商家营销活动 - waitAuditMerchantMarketing */
-      path: '/merchantMarketing/waitAuditMerchantMarketing',
+      path: '/marketingManage/merchantMarketing/waitAuditMerchantMarketing',
       name: '待审核商家营销活动',
       hidePageHeader: true,
-      component: '@/pages/merchantMarketing/waitAuditMerchantMarketing',
+      component: '@/pages/marketingManage/merchantMarketing/waitAuditMerchantMarketing',
     },
     {
       /** 待审核商家营销活动详情 - preview */
-      path: '/merchantMarketing/waitAuditMerchantMarketing/preview',
+      path: '/marketingManage/merchantMarketing/waitAuditMerchantMarketing/preview',
       name: '待审核商家营销活动详情',
       hidePageHeader: true,
       hideInMenu: true,
       noMargin: true,
-      component: '@/pages/merchantMarketing/detail',
+      component: '@/pages/marketingManage/merchantMarketing/detail',
     },
     {
       /** 待审核商家营销活动详情 - detail */
-      path: '/merchantMarketing/waitAuditMerchantMarketing/detail',
+      path: '/marketingManage/merchantMarketing/waitAuditMerchantMarketing/detail',
       name: '待审核商家营销活动详情',
       hidePageHeader: true,
       hideInMenu: true,
       noMargin: true,
-      component: '@/pages/merchantMarketing/detail',
+      component: '@/pages/marketingManage/merchantMarketing/detail',
     },
   ]
 }

src/pages/marketingManage/marketing/components/dateModal/index.tsx

@@ -28,7 +28,6 @@ const DateModalLayout: React.FC<DateModalProps> = (props: any) => {
         time: moment(res.time).format('x'),
         reason: res.reason,
       }
-      console.log(params, fieldApi)
       setLoading(true)
       fieldApi(params).then(res => {
         if (res.code !== 1000) {
@@ -36,6 +35,8 @@ const DateModalLayout: React.FC<DateModalProps> = (props: any) => {
           return
         }
         onSubmit();
+        form.resetFields()
+        setLoading(false)
       }).catch(err => {
         setLoading(false)
       })

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

@@ -248,7 +248,7 @@ const AddedMarketing = (props: any) => {
         roleType: item.roleId,
         roleTypeName: item.roleName,
         level: item.level,
-        levelTyp: item.levelTyp,
+        levelTyp: item.levelType,
         levelTypeName: item.levelTypeName,
         levelTag: item.levelTag,
       }

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

@@ -282,6 +282,7 @@ const ApplyMemberLayout: React.FC<ApplyMemberLayoutProps> = (props: any) => {
             }
           }
         }}
+        value={dataSource}
       />
     </CardLayout>
   )

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

@@ -65,6 +65,13 @@ const BasicInfoLayout: React.FC<BasicInfoProps> = (props: any) => {
     focus$.emit(option);
   }
 
+  useEffect(() => {
+    if (isEdit) {
+      setActivitySignUpType(1);
+      form.setFieldsValue({ 'activitySignUpType': 1 })
+    }
+  }, [isEdit])
+
   return (
     <CardLayout
       id="basicInfoLayout"
@@ -136,6 +143,7 @@ const BasicInfoLayout: React.FC<BasicInfoProps> = (props: any) => {
               >
                 <DatePicker
                   showTime
+                  showNow={false}
                   allowClear
                   disabledDate={(current) => startTimeDisabled(current, 'endTime')}
                 />
@@ -173,6 +181,7 @@ const BasicInfoLayout: React.FC<BasicInfoProps> = (props: any) => {
               >
                 <DatePicker
                   showTime
+                  showNow={false}
                   allowClear
                   disabledDate={(current) => endTimeDisabled(current, 'startTime')}
                 />
@@ -215,6 +224,7 @@ const BasicInfoLayout: React.FC<BasicInfoProps> = (props: any) => {
                 >
                   <DatePicker
                     showTime
+                    showNow={false}
                     allowClear
                     disabledDate={(current) => startTimeDisabled(current, 'signUpEndTime')}
                   />
@@ -249,6 +259,7 @@ const BasicInfoLayout: React.FC<BasicInfoProps> = (props: any) => {
                 >
                   <DatePicker
                     showTime
+                    showNow={false}
                     allowClear
                     disabledDate={(current) => endTimeDisabled(current, 'signUpStartTime')}
                   />