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

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

@@ -160,15 +160,15 @@ function useSaveData(options: Options) {
     }
     // console.log(withThemeStyle);
     // return;
-    const { data, code } = await postTemplateWebActivityPageAdorn({
+    const { data, code, message: msg } = await postTemplateWebActivityPageAdorn({
       id: +id,
       adornContent: withThemeStyle
     } as any);
     setSaving(false);
-    if (code === 1000) {
-      // history.goBack();
-      message.success("修改成功")
-    }
+    // if (code !== 1000) {
+    //   // history.goBack();
+    //   message.error(msg)
+    // }
   }
 
   return { saving, onSave };

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

@@ -350,6 +350,38 @@ const WebComponentModule: React.FC<Iprops> = (props: Iprops) => {
     
     const newKey = childNodes[childNodes.length - 1]  + 1
 
+    if (platform === 'mobile' && _item === 'combination') {
+      addChildComponent({
+        newKey: `${newKey}`,
+        componentName: COMPONENT_NAME[_item][platform]['container'],
+        parentPropName: '',
+        parentKey: '0',
+        childProps: {
+          addBtnText: "添加子节点",
+          canDelete: true,
+          childComponentName: COMPONENT_NAME[_item][platform]['childContainer'],
+          childNodes: [],
+          childProps: {
+            addBtnText: "添加组合促销节点",
+            canDelete: true,
+            childComponentName: 'Combination.Item',
+            otherProps: {
+              type: `combinationItemProduct`
+            },
+            childProps: {
+              otherProps: {
+                type: `combinationItem`
+              },
+            }
+          },
+          otherProps: { type: _item },
+          props: {visible: true, theme: 0, title: ACTIVITYS_MAP[_item].title},
+          title: ACTIVITYS_MAP[_item].title,
+        }
+      })
+      return;
+    }
+
     addChildComponent({
       newKey: `${newKey}`,
       componentName: COMPONENT_NAME[_item][platform]['container'],

src/utils/request.ts

@@ -27,7 +27,6 @@ type httpStatus = {
   [key: number]: string
 }
 
-const intl = getIntl()
 const errorMessage: httpStatus = {
   400: "发出的请求有错误，服务器没有进行新建或修改数据的操作。",
   401: "用户没有权限（令牌、用户名、密码错误）。",
@@ -129,6 +128,8 @@ class ApiRequest {
 
   createRequest<T>(url: string, options: IApiRequest = { ctlType: 'none' }): Promise<IRequestSuccess<T>> {
     return new Promise((resolve, reject) => {
+      const intl = getIntl()
+
       baseRequest<IRequestSuccess<T>>(url, options).then(res => {
         // 登录验证
         if (res.code === 1101) {
@@ -144,7 +145,7 @@ class ApiRequest {
           if (options.ctlType === 'message') {
             message.destroy()
           }
-          options.ctlType === 'message' && message.success(res.message)
+          options.ctlType === 'message' && message.success(intl.formatMessage({ id: `${res.code}`, defaultMessage: res.message}))
           resolve(res)
         } else {
           // 使用resolve将数据返回, 请求时需手动处理data为null的情况