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

src/pages/content/utils/utils.tsx

@@ -81,7 +81,8 @@ const ADVERTISE_APP_COLUMN_TYPE = {
 const ANNOUNCE_COLUMN_TYPE = {
   '1': '会员首页公告',
   '2': '注册须知',
-  '3': '入库须知'
+  '3': '入库须知',
+  '4': '会员服务协议'
 }
 
 // 内容管理 - 图片管理 - 使用场景

src/pages/marketingManage/marketing/marketingActivitiesManagement/activePage/fixtures/components/EditPanelFormily/Coupon/index.tsx

@@ -76,7 +76,7 @@ const FormilyCoupon: React.FC<Iprops> & { isFieldComponent: boolean } = (props:
       render: (_text, _record) => {
         return (
           <div>
-            <span>{_record?.releaseTimeStart && moment(_record?.releaseTimeStar).format(format)}</span>
+            <span>{_record?.releaseTimeStart && moment(_record?.releaseTimeStart).format(format)}</span>
             至
             <span>{_record?.releaseTimeEnd && moment(_record?.releaseTimeEnd).format(format)}</span>
           </div>

src/pages/marketingManage/marketing/marketingActivitiesManagement/activePage/fixtures/index.tsx

@@ -101,13 +101,16 @@ const Fixtures = () => {
         result  = generaterData(result, dataIndex, temp);
       }
     });
-    const { data, code } = await PublicApi.postTemplateWebActivityPageAdorn({
+    const { data, code, ...rest } = await PublicApi.postTemplateWebActivityPageAdorn({
       id: id,
       adornContent: result
-    } as any);
+    } as any, {ctlType: 'none'});
     setSubmitLoading(false);
     if (code === 1000) {
-      history.goBack();
+      // history.goBack();
+      message.success("保存成功")
+    } else {
+      message.error(rest.message)
     }
   };
 

src/pages/marketingManage/platformCoupon/platformCouponUnsubmitted/components/CouponForm/effects/index.tsx

@@ -2,12 +2,13 @@
  * @Author: XieZhiXiong
  * @Date: 2021-06-24 14:03:34
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-09-23 16:17:02
+ * @LastEditTime: 2021-10-16 16:15:27
  * @Description: 
  */
 import { FormPath, FormEffectHooks } from '@formily/antd';
 import { useAsyncInitSelect } from '@/formSchema/effects/useAsyncInitSelect';
 import { PublicApi } from '@/services/api';
+import { GlobalConfig } from '@/global/config';
 import { useBusinessEffects } from './useBusinessEffects';
 import { ResponseType } from '../../../../components/MemberCheckboxGroup';
 
@@ -144,8 +145,9 @@ export const createEffects = (context, actions) => {
 
   // 初始化 适用商城数据
   onFieldMount$('suitableMallTypes').subscribe(() => {
-    PublicApi.getManageShopAllByShopType({
-      shopType: `${1}`,  // 企业商城
+    PublicApi.postManageWebShopWebAll({
+      siteId: GlobalConfig.site.siteInfo.id,
+      type: 1, // 企业商城
     }).then((res) => {
       if (res.code === 1000) {
         const { data = [] } = res;

src/pages/orderManage/orderSystem/index.tsx

@@ -98,7 +98,7 @@ export const baseOrderListColumns: any[] = [
     align: 'center',
     dataIndex: 'orderNo',
     key: 'orderNo',
-    render: (text, record) => <EyePreview url={`/orderSystem/detail?id=${record.orderId}`}>
+    render: (text, record) => <EyePreview url={`/orderSystem/list/detail?id=${record.orderId}`}>
       {text}
     </EyePreview>
   },

src/pages/orderManage/orderSystem/readyConfirmPayList/model/useSelfTable.tsx

@@ -57,7 +57,7 @@ export const useSelfTable = () => {
       dataIndex: 'orderNo',
       key: 'orderNo',
       render: (text, record) => {
-        return <EyePreview url={`/orderSystem/detail?id=${record.orderId}`}>
+        return <EyePreview url={`/orderSystem/list/detail?id=${record.orderId}`}>
           {text}
         </EyePreview>
       }

src/pages/pageCustomized/categoryNavigation/index.tsx

@@ -121,13 +121,16 @@ const CategoryNavigation = () => {
       return tabProps;
     });
     const postData = { style: 0, category: result.filter(Boolean) };
-    const { data, code } = await PublicApi.postTemplateAdornAppEnterpriseSave({
+    const { data, code, ...rest } = await PublicApi.postTemplateAdornAppEnterpriseSave({
       templateId: id,
       categoryAdornContent: postData as any,
-    });
+    }, { ctlType: 'none' });
     setLoading(false);
     if (code === 1000) {
-      history.goBack();
+      // history.goBack();
+      message.success("保存成功")
+    } else {
+      message.error(rest.message)
     }
     // const { data, code }
   };