merge: 合并冲突

src/pages/marketingManage/marketing/detail/constants.tsx

@@ -196,7 +196,7 @@ export const GeneralEffect = (int, data) => {
           col: [
             {
               label: '优惠规则', extra: <Space direction='vertical'>
-                {!isEmpty(data.ladderList) && data.ladderList.map(item => (<div>{`满 ${item.num} 件, 打 ${item.discount / 10} 折`}</div>))}
+                {!isEmpty(data.ladderList) && data.ladderList.map(item => (<div>{`第 ${item.num} 件, 打 ${item.discount / 10} 折`}</div>))}
               </Space>
             },
             {
@@ -292,18 +292,18 @@ export const GeneralEffect = (int, data) => {
       return [
         {
           col: [
-            { label: '每日秒杀时间段', extra: '' },
+            { label: '每日秒杀时间段', extra: <>{format(data.startTime, 'HH:mm:ss')}~{format(data.endTime, 'HH:mm:ss')}</> },
             { label: '活动描述', extra: data.describe }
           ]
         },
         {
           col: [
-            { label: '叠加优惠券', extra: '' },
+            { label: '叠加优惠券', extra: data.allowCoupon ? '允许叠加' : '不允许叠加' },
           ]
         },
         {
           col: [
-            { label: '超限规则', extra: '' },
+            { label: '超限规则', extra: data.exceedRule === 1 ? '原价购买' : '不可购买' },
           ]
         }
       ]
@@ -341,18 +341,18 @@ export const GeneralEffect = (int, data) => {
       return [
         {
           col: [
-            { label: '定金支付时间', extra: '' },
+            { label: '定金支付时间', extra: <>{format(data.depositPayStartTime, 'HH:mm:ss')}~{format(data.depositPayEndTime, 'HH:mm:ss')}</> },
             { label: '活动描述', extra: data.describe },
           ]
         },
         {
           col: [
-            { label: '尾款支付时间', extra: '' },
+            { label: '尾款支付时间', extra: <>{format(data.balancePaymentPayStartTime, 'HH:mm:ss')}~{format(data.balancePaymentPayEndTime, 'HH:mm:ss')}</> },
           ]
         },
         {
           col: [
-            { label: '开始发货时间', extra: '' },
+            { label: '开始发货时间', extra: format(data.deliverTime, 'HH:mm:ss') },
           ]
         }
       ]

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

@@ -343,7 +343,7 @@ const RulesLayout: React.FC<RulesLayoutProps> = (props: any) => {
               >
                 {fields.map(({ key, name, fieldKey, ...restField }) => (
                   <Space key={key} style={{ display: 'flex', marginBottom: 8 }} align="center">
-                    满
+                    第
                     <Form.Item
                       {...restField}
                       style={{ margin: 0 }}

src/pages/pageCustomized/mobileEdit/index.tsx

@@ -138,7 +138,7 @@ const appMallEdit: React.FC<ShopPreviewPropsType> = (props) => {
           }
           break
         case 2:
-          const shopDetails = list.filter((item: any) => item.type === type)[0].details || []
+          const shopDetails = list.filter((item: any) => item.type === type)[0]?.details || []
           const shopResList: any[] = []
           if (shopDetails && shopDetails.length > 0) {
             const memberShopInGoodsList: any = []
@@ -169,7 +169,7 @@ const appMallEdit: React.FC<ShopPreviewPropsType> = (props) => {
           listRes = shopResList
           break
         case 3:
-          const brandDetails = list.filter((item: any) => item.type === type)[0].details || []
+          const brandDetails = list.filter((item: any) => item.type === type)[0]?.details || []
           let brandDetailsIds: any = []
           const brandResList: any[] = []
           brandDetails.forEach((detailsItem) => {
@@ -198,7 +198,7 @@ const appMallEdit: React.FC<ShopPreviewPropsType> = (props) => {
           listRes = brandResList
           break
         case 4:
-          const infoIds = list.filter((item: any) => item.type === type)[0].id || []
+          const infoIds = list.filter((item: any) => item.type === type)[0]?.id || []
           idsRes = infoIds
           if (idsRes && idsRes.length > 0) {
             const param: any = {

src/pages/user/login/style.less

@@ -48,6 +48,7 @@
 
     .login-form-box {
       background-color: #fff;
+      height: 447px;
 
       h2 {
         line-height: 2;
@@ -142,4 +143,4 @@
   75% {
     transform: scale(1.5);
   }
-}
+}
\ No newline at end of file