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

src/pages/authConfig/memberSystem/memberDetail.tsx

@@ -563,7 +563,10 @@ const MemberDetail: React.FC<{}> = () => {
                         );
                       })}
 
-                      <Button block type="dashed" onClick={handleOpenOrg}>
+                      <Button block type="dashed" onClick={handleOpenOrg} disabled={
+                        pageStatus === PageStatus.PREVIEW ||
+                        !disabledCheckAuthConfig.dataAuthConfig
+                      }>
                         <PlusOutlined /> {intl.formatMessage({ id: 'authConfig.orientation' })}
                       </Button>
                     </div>

src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/fixtures/common/hooks/useSaveData.ts

@@ -8,6 +8,7 @@ import { history } from 'umi';
 
 type Options = {
   id: number;
+  environment?: "app" | "web"
 }
 
 /** 数组转合集 */
@@ -59,7 +60,7 @@ type ResultType = {
 } & ActivityContent
 
 function useSaveData(options: Options) {
-  const { id } = options
+  const { id, environment = 'app' } = options
   const [saving, setSaving] = useState<boolean>(false);
 
   const generaterData = (source: ResultType, dataIndex: string, assignData: {[key: string]: any} ) => {
@@ -102,22 +103,7 @@ function useSaveData(options: Options) {
             childrenData: childrenData
           }
         });
-      } else if (ACTIVITY_LIST.includes( dataIndex as ACTIVITY_KEYS ) && dataIndex !== 'combination') {
-        const { ...otherProps } = props || {};
-        const childrenData = childNodes.map((_record) => {
-          const childTargetProps = pageConfig[_record].props;
-          return childTargetProps?.id || undefined;
-        }).filter(Boolean);
-        // const childrenData = products?.map((_item) => _item.id) || [];
-        result = generaterData(result, dataIndex, {
-          sort: sort,
-          props: {
-            ...pick(otherProps, ['theme', 'title']),
-            visible: props.status ?? true,
-            childrenData: childrenData
-          }
-        });
-      } else if (dataIndex === 'suggestProduct' || dataIndex === 'combination') {
+      } else if (dataIndex === 'suggestProduct' || (dataIndex === 'combination' && environment === 'app')) {
         const { ...otherProps } = props || {};
         const { childNodes } = target;
         const temp = {
@@ -147,6 +133,21 @@ function useSaveData(options: Options) {
           }
         };
         result  = generaterData(result, dataIndex, temp);
+      } else if (ACTIVITY_LIST.includes( dataIndex as ACTIVITY_KEYS )) {
+        const { ...otherProps } = props || {};
+        const childrenData = childNodes.map((_record) => {
+          const childTargetProps = pageConfig[_record].props;
+          return childTargetProps?.id || undefined;
+        }).filter(Boolean);
+        // const childrenData = products?.map((_item) => _item.id) || [];
+        result = generaterData(result, dataIndex, {
+          sort: sort,
+          props: {
+            ...pick(otherProps, ['theme', 'title']),
+            visible: props.status ?? true,
+            childrenData: childrenData
+          }
+        });
       }
     });
     const withThemeStyle = {

src/pages/transaction/marketingAbility/marketingActivitiesManagement/activePage/fixtures/web.tsx

@@ -24,7 +24,7 @@ const Web = () => {
   // useDraggable(el);
   const { id } = usePageStatus();
   const [scale, setScale] = useState(0.75);
-  const { saving, onSave } = useSaveData({ id: +id });
+  const { saving, onSave } = useSaveData({ id: +id, environment: 'web' });
   const [leftBarVisible, setLeftBarVisible] = useState<boolean>(true);
 
   const { detail, loading } = useGetWebLayout();

src/utils/type.ts

@@ -42,6 +42,8 @@ interface getShopListsParmasProps {
  * @param params 接口参数
  */
 export const fectchShopListsSource = async (params?: getShopListsParmasProps) => {
-  const { data } = await postManageWebShopWebAll({ ...params, siteId: GlobalConfig.global.siteInfo.id }, { ctlType: 'none' })
-  return data
+  if (postManageWebShopWebAll) {
+    const { data } = await postManageWebShopWebAll({ ...params, siteId: GlobalConfig.global.siteInfo.id }, { ctlType: 'none' })
+    return data
+  }
 }