处理全局布局样式和修改支付策略接口和配置等

config/routes/ruleSettingRoutes.ts

@@ -2,7 +2,7 @@
  * @Author: LeeJiancong
  * @Date: 2020-08-04 16:21:48
  * @LastEditors: LeeJiancong
- * @LastEditTime: 2020-08-13 09:52:00
+ * @LastEditTime: 2020-08-20 19:43:26
  */
 const router = {
   path: '/ruleSettingManager',

scripts/services/index.js

@@ -2,7 +2,7 @@
  * @Author: LeeJiancong
  * @Date: 2020-08-10 14:41:27
  * @LastEditors: LeeJiancong
- * @LastEditTime: 2020-08-18 14:55:46
+ * @LastEditTime: 2020-08-20 19:07:46
  */
 /**
  * 用于在项目开始前获取所有的配置
@@ -57,7 +57,7 @@ async function batchAxiosHttps() {
      for (const subItem in serviceConfig[item]) {
         try {
           const data = await axios(serviceConfig[item][subItem])
-          asyncHttpQueue[item][subItem] = data.data.data
+          asyncHttpQueue[item][subItem] = data.data
         } catch(err) {
           console.log(serviceConfig[item][subItem].url)
           console.log(err.response.data)

src/global/styles/mixins/layout.css

+/**
+* @description 布局类
+* @author xjm
+*/
+.ant-pro-basicLayout-content .ant-pro-page-header-wrap {
+  margin: 0 !important;
+}

src/global/styles/mixins/layout.less

@@ -4,7 +4,11 @@
 */
 
 // ------------  容器container  ------------
-
+.ant-pro-basicLayout-content{
+  .ant-pro-page-header-wrap{
+    margin: 0 !important;
+  }
+} 
 .make-container(@pad-x: @padding-lg) {
   width: 100%;
   .make-center(block);

src/pages/ruleSettingManage/paySetting/settingIndex.tsx

@@ -2,7 +2,7 @@
  * @Author: LeeJiancong
  * @Date: 2020-08-13 09:50:41
  * @LastEditors: LeeJiancong
- * @LastEditTime: 2020-08-13 17:26:35
+ * @LastEditTime: 2020-08-20 20:09:43
  */
 import React, { useEffect, useState, useRef } from 'react'
 import { Card, Button, Tabs, Radio, Space, Row, Col, Table,Popconfirm } from 'antd'
@@ -22,7 +22,7 @@ import '../components/PayForm/components/index.less'
 const payActions = createFormActions()
 const { TabPane } = Tabs
 const { onFieldValueChange$ } = FormEffectHooks
-const TabList = GlobalConfig.payConfig.payPlatformPayConfig
+const TabList:any = GlobalConfig.payConfig.payPlatformPayConfig.data || []
 const PaySetting: React.FC<{}> = () => {
   const ref = useRef<any>({})
   const [mode, setmode] = useState<number>(0)

src/pages/ruleSettingManage/payStrategy/detail.tsx

+/*
+ * @Author: LeeJiancong
+ * @Date: 2020-08-06 19:07:53
+ * @LastEditors: LeeJiancong
+ * @Copyright: 1549414730@qq.com
+ * @LastEditTime: 2020-08-20 20:16:22
+ */
 import React, { useEffect , useState,useRef } from 'react'
 import {Card,Button,Modal} from 'antd'
 import { PlusOutlined, SaveOutlined } from '@ant-design/icons'
@@ -18,8 +25,13 @@ import { GlobalConfig } from '@/global/config'
 import { PublicApi } from '@/services/api'
 import style from './index.less'
 const payActions = createFormActions()
+/**
+ * @description: 会员弹窗列表
+ * @param {type} 
+ * @return {type} 
+ */
 const fetchMemberList = async (params) => {
-  const res = await PublicApi.getMemberMaintenancePage(params)
+  const res = await PublicApi.getMemberManagePayPage(params)
   return res.data
 }
 

src/pages/ruleSettingManage/schema/index.tsx

@@ -2,7 +2,7 @@
  * @Author: LeeJiancong
  * @Date: 2020-08-06 11:12:18
  * @LastEditors: LeeJiancong
- * @LastEditTime: 2020-08-18 15:21:25
+ * @LastEditTime: 2020-08-20 19:18:53
  */
 import React, { useState, useEffect } from 'react'
 import { ISchema } from '@formily/antd'
@@ -17,7 +17,7 @@ let currentTab;
 export const strategyDetailTab = (props: any, usePageStatus: any) => {
 
   //新增时候就初始化
-  let baseList: any = GlobalConfig.payConfig.payInitializeConfig
+  let baseList: any = GlobalConfig.payConfig.payInitializeConfig.data
 
   console.log('baseList', JSON.stringify(baseList))
   // baseList[2].ruleConfigurations = [{value:1,label:"1",platformType:1}]