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

src/pages/pageCustomized/categoryNavigation/components/Layout/Tabs/index.tsx

@@ -55,7 +55,7 @@ const CustomizeTabs: React.FC<Iprops> & { TabItem: typeof TabItem } = (props: Ip
       return null;
     }
     return getMarketingAdornGoodsListAdorn({
-      idInList: ids as any,
+      idInList: ids ? ids.join(',') : '' as any,
       shopId: shopId,
       current: 1,
       pageSize: ids.length,

src/pages/pageCustomized/components/drawers/commodityDrawer/index.tsx

@@ -56,7 +56,7 @@ const CommodityDrawer: React.FC<CommodityDrawerProps> = (props: CommodityDrawerP
       <>
         {record?.activityList?.map((item, index) => {
           return (
-            <a key={index} style={{ marginBottom: 8 }} href={`/marketingManage/marketing/marketingSearch/preview?id=${item.id}`} target={"_blank"}>
+            <a key={index} style={{ marginBottom: 8 }} href={item?.belongType === 1 ? `/marketingManage/marketing/marketingSearch/preview?id=${item.id}` : `/marketingManage/merchantMarketing/merchantMarketingSearch/preview?id=${item.id}`} target={"_blank"}>
               <Space direction='horizontal'>
                 <img src={ActivityImage} style={{ width: 24, height: 24, borderRadius: 4 }} />
                 <span>{item?.name}</span>
@@ -139,7 +139,7 @@ const CommodityDrawer: React.FC<CommodityDrawerProps> = (props: CommodityDrawerP
     const _params = {
       ...params,
       shopId,
-      idNotInList: Array.isArray(selectId) ? selectId : [selectId],
+      idNotInList: Array.isArray(selectId) ? selectId.join(',') : selectId,
       ...filterParam
     };
     console.log(_params, filterParam, '_params')

src/pages/pageCustomized/mobileClientEdit/index.tsx

@@ -1031,7 +1031,7 @@ const mobileClientEdit: React.FC<ShopPreviewPropsType> = (props) => {
               <MobileDesignPanel theme={theme} onlyEidt />
             </div>
           </div>
-          <MobileSettingPanel shopId={shopId} property={2} />
+          <MobileSettingPanel shopId={shopId} property={2} environment={Number(environment)} />
         </div>
       </div>
     </BrickProvider>) : <Loading />

src/pages/pageCustomized/mobileEdit/index.tsx

@@ -123,7 +123,7 @@ const appMallEdit: React.FC<ShopPreviewPropsType> = (props) => {
             idsRes = selectIds
             if (idsRes && idsRes.length > 0) {
               const param: any = {
-                idInList: selectIds,
+                idInList: idsRes.join(','),
                 shopId: shopId,
                 current: 1,
                 pageSize: 50
@@ -286,7 +286,7 @@ const appMallEdit: React.FC<ShopPreviewPropsType> = (props) => {
               params = {
                 current: 1,
                 pageSize: 100,
-                idInList: showCaseItem.id,
+                idInList: showCaseItem.id.join(','),
                 shopId,
               }
               res = await getMarketingAdornGoodsListAdorn(params)

src/pages/pageCustomized/mobileEdit/preview.tsx

@@ -176,7 +176,7 @@ const appMallEdit: React.FC<ShopPreviewPropsType> = (props) => {
           idsRes = selectIds
           if (idsRes && idsRes.length > 0) {
             const param: any = {
-              idInList: selectIds,
+              idInList: idsRes.join(','),
               shopId: shopId,
               current: 1,
               pageSize: 50
@@ -318,7 +318,7 @@ const appMallEdit: React.FC<ShopPreviewPropsType> = (props) => {
               params = {
                 current: 1,
                 pageSize: 100,
-                idInList: showCaseItem.id,
+                idInList: showCaseItem.id.join(','),
                 shopId,
               }
               res = await getMarketingAdornGoodsListAdorn(params)

src/pages/pageCustomized/mobileSettingPanel/propsSettings/components/marketingCardHeader/index.tsx

@@ -50,7 +50,7 @@ const MarketingCardHeader: React.FC<MarketingCardHeaderProps> = (props: Marketin
     <div className={styles['marketingCardHeader']}>
       <div className={styles['marketingCardHeader-box']}>
         <div className={styles['marketingCardHeader-box-label']}>标题</div>
-        <Input key={`${selectedKey}-title`} defaultValue={title || _defaultInfo?.title} onBlur={_onChangeTitle} />
+        <Input key={`${selectedKey}-title`} defaultValue={title || _defaultInfo?.title} onBlur={_onChangeTitle} maxLength={16} />
       </div>
       <div className={styles['marketingCardHeader-box']}>
         <div className={styles['marketingCardHeader-box-label']}>标题说明</div>

src/pages/pageCustomized/mobileSettingPanel/propsSettings/components/suggestProductCommodity/index.tsx

@@ -41,7 +41,7 @@ const SuggestProductCommodity: React.FC<SuggestProductCommodityProps> = (props:
     if (id && id != record[0]?.id) {
       const _params: any = {
         shopId,
-        idInList: id,
+        idInList: Array.isArray(id) ? id.join(',') : id,
         current: 1,
         pageSize: 10
       };

src/pages/systemManage/operationLog/index.tsx

@@ -134,7 +134,7 @@ const OperationLog: React.FC = () => {
 
   const setExtraStateFunc = (type) => {
     batchedUpdates(() => {
-      setStatusState(1);
+      setStatusState((typeState === 8 && (type === 3 || type === 4)) ? 2 : 1);
       setExtraState(type);
     });
   }
@@ -171,6 +171,14 @@ const OperationLog: React.FC = () => {
     return `table_${_actionKey}_${extraState}_${statusState}`
   }, [_actionKey, extraState, statusState])
 
+  const _hideOutStatus = useMemo(() => {
+    return typeState === 8 && (extraState === 3 || extraState === 4)
+  }, [typeState, extraState])
+
+  const _hideInStatus = useMemo(() => {
+    return typeState === 3
+  }, [typeState])
+
   const fetchTableData = async (params: any) => {
     let _fetch: any;
     let _params = { ...params };
@@ -281,9 +289,11 @@ const OperationLog: React.FC = () => {
           key={_tableKey}
           currentRef={ref}
           columns={_columns}
-          tableProps={{ rowKey: (record) => {
-            return `${record[_actionKey]}_${(record?.operateTime || record?.createTime)}_${record?.status || record?.statusName}`;
-          } }}
+          tableProps={{
+            rowKey: (record) => {
+              return `${record[_actionKey]}_${(record?.operateTime || record?.createTime)}_${record?.status || record?.statusName}`;
+            }
+          }}
           fetchTableData={(params) => fetchTableData(params)}
           formilyLayouts={{
             justify: 'space-between'
@@ -312,8 +322,8 @@ const OperationLog: React.FC = () => {
             },
             children: (
               <Radio.Group defaultValue={statusState} onChange={(e) => { setStatusState(e.target.value) }}>
-                <Radio.Button value={1}>外部流转</Radio.Button>
-                <Radio.Button value={2}>内部流转</Radio.Button>
+                {!_hideOutStatus && <Radio.Button value={1}>外部流转</Radio.Button>}
+                {!_hideInStatus && <Radio.Button value={2}>内部流转</Radio.Button>}
               </Radio.Group>
             )
           }}