merge: 合并冲突

package.json

@@ -39,6 +39,7 @@
     "start:25": "cross-env SITE_ID=1 BACK_GATEWAY=http://10.0.0.25:8100 SOCKET_URL=ws://10.0.0.25:9400 yarn start",
     "start:v2": "cross-env SITE_ID=1 BACK_GATEWAY=http://10.0.0.17:8100 SOCKET_URL=ws://10.0.0.17:9880 yarn start",
     "start:v2Preview": "cross-env SITE_ID=1 BACK_GATEWAY=http://10.0.1.220:8100 SOCKET_URL=ws://10.0.1.220:9400 yarn start",
+    "start:v2Test": "cross-env SITE_ID=1 BACK_GATEWAY=http://lx-pre-gateway.shushangyun.com USE_ROUTE_CONFIG=false SOCKET_URL=ws://lx-pre-gateway.shushangyun.com yarn start",
     "start:scm": "cross-env BACK_GATEWAY=http://lingxi-scm.wg.shushangyun.com SOCKET_URL=ws://lingxi-scm.wg.shushangyun.com SITE_ID=1 yarn start",
     "start:study": "cross-env SITE_ID=1 BACK_GATEWAY=http://10.0.1.207:8100 SOCKET_URL=ws://10.0.1.207:9400 yarn start"
   },
@@ -85,7 +86,7 @@
     "react-sortablejs": "^6.0.0",
     "sortablejs": "^1.12.0",
     "styled-components": "^5.2.1",
-    "umi": "^3.2.28",
+    "umi": "~3.2.28",
     "yorkie": "^2.0.0"
   },
   "devDependencies": {

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

@@ -173,8 +173,15 @@ const DetialLayout = () => {
     fetchDataSource();
   }, [])
 
-  const handlCollocation = (val) => {
-    setCollocation(val.goodsSubsidiaryGroupList);
+  const handlCollocation = (record) => {
+    const tableRecord: any = { ...record }
+    if (remind?.value !== 1 && tableRecord.couponGroupList !== undefined) {
+      setCollocation(tableRecord.couponGroupList)
+    } else if (remind?.value === 1 && tableRecord.goodsSubsidiaryGroupList !== undefined) {
+      setCollocation(tableRecord.goodsSubsidiaryGroupList)
+    } else {
+      setCollocation([])
+    }
     setListModalVisible(true)
   }
 
@@ -254,7 +261,7 @@ const DetialLayout = () => {
       {/* 查看优惠券 */}
       {(!isEmpty(remind) && remind?.value !== 1) && (
         <CouponsListLayout
-          title={remind?.modalTitle}
+          title='赠品-买商品赠优惠券'
           remind={remind}
           visible={listModalVisible}
           value={collocation}

src/pages/marketingManage/marketing/waitAddedMarketing/components/partakeUserLayout/index.less

@@ -10,7 +10,7 @@
       font-weight: 400;
       padding: 5.6px 0px;
       border: 1px solid transparent;
-      box-shadow: 0 2px 0 rgb(0 0 0 / 2%);
+      // box-shadow: 0 2px 0 rgb(0 0 0 / 2%);
       border-color: #d9d9d9;
     }
     .ant-checkbox-wrapper-checked {

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

@@ -224,6 +224,7 @@ const PrizeListLayout: React.FC<PrizeListProps> = (props: any) => {
       title: '奖品',
       key: 'prize',
       dataIndex: 'prize',
+      width: 350,
       render: (_text, _record, _index) => (
         <Form.Item
           noStyle

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

@@ -21,6 +21,7 @@
       border: 1px solid transparent;
       // box-shadow: 0 2px 0 rgb(0 0 0 / 2%);
       border-color: #d9d9d9;
+      justify-content: center;
     }
     .ant-checkbox-wrapper-checked {
       color: @main-color;

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

@@ -5,6 +5,7 @@ import CardLayout from '../card';
 import { GlobalConfig } from '@/global/config'
 import style from './index.less';
 import { isEmpty } from '@/components/NiceForm/components/AntUpload/shared';
+import { PublicApi } from '@/services/api';
 
 type ShopItem = {
   describe?: string
@@ -31,11 +32,12 @@ const ShopLayout: React.FC<shopListProps> = (props: any) => {
   const [mallList, setMallList] = useState<ShopItem[]>([]);
 
   useEffect(() => {
-    const shopInfo = GlobalConfig.web.shopInfo.filter(v => v.type == 1).map(
-      v => v
-    )
-    console.log(shopInfo)
-    setMallList(shopInfo)
+    PublicApi.postManageWebShopWebAll({siteId: GlobalConfig.site.siteInfo.id, type: 1}).then(res => {
+      if (res.code !== 1000) {
+        return
+      }
+      setMallList(res.data)
+    })
   }, [])
 
   const handleShopList = (index) => {

src/pages/pageCustomized/components/toolBar/returnSaveParams.ts

@@ -705,7 +705,7 @@ export const paramsBusiness = (
         childNodes = get(pageConfig, ['5', 'childNodes']) || {};
         _params.adornContent.navList = {
           style: propsData.styleTheme || 0,
-          status: true,
+          status: propsData.status,
           details: [],
         };
         if (childNodes && Array.isArray(childNodes) && childNodes.length > 0) {

src/pages/pageCustomized/mobileEdit/config.ts

@@ -107,10 +107,12 @@ export const defaultConfig: PageConfigType = {
     title: '分类导航',
     componentName: 'MobileNavCard',
     canDelete: false,
+    hideAction: true,
     props: {
       style: {
         margin: '8px',
       },
+      status: true,
       stylesthemelist: [
         {
           key: 0,