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

src/pages/pageCustomized/categoryNavigation/components/EditPanel/editPanel.tsx

@@ -79,7 +79,7 @@ const EditPanel = () => {
       return;
     }
     if (activeKey === null && selectedInfo !== null) {
-      message.info("请先选择一级导航类型");
+      message.info({content: "请先选择一级导航类型", key: 'first'});
       const primaryTabProps = pageConfig[domKey!].props;
       setFormValue({
         primary: primaryTabProps?.id,

src/pages/pageCustomized/categoryNavigation/index.tsx

 import React, { useEffect, useState } from 'react';
 import { Spin, message } from 'antd';
-import { BrickProvider, createActions, ModuleTree, useSelector } from '@linkseeks/design-react';
+import { BrickProvider, createActions, ModuleTree, ModuleTreeCollapse, useSelector } from '@linkseeks/design-react';
 
 import { history } from 'umi';
 import styles from './index.less';
@@ -139,7 +139,7 @@ const CategoryNavigation = () => {
   };
 
   return (
-    <Spin spinning={false}>
+    <Spin spinning={loading}>
       <BrickProvider
         config={configs}
         warn={(msg: string) => {

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
+}