Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-system into dev

config/routes/index.ts

@@ -24,6 +24,7 @@ import balancedRoute from './balancedRoute'; // 平台结算管理
 import capitalAccount from './capitalAccountRoute'; // 会员资金账户
 import messageRoute from './messgeRoute'; // 消息管理
 import systemManageRoute from './systemManageRoute'; // 系统管理
+import orderSystemRoutes from './orderSystemRoutes'; // 订单管理
 const routeList = [
   pageCustomized, 
   calssPropertyRoute, 
@@ -43,6 +44,7 @@ const routeList = [
   capitalAccount,
   messageRoute,
   systemManageRoute,
+  orderSystemRoutes
 ]
 
 const router = [

src/pages/capitalAccount/accountLists/index.tsx

@@ -52,12 +52,12 @@ const AccountLists: React.FC<{}> = () => {
       dataIndex: 'memberRoleName',
       key: 'memberRoleName',
     },
-    {
-      title: '会员等级',
-      dataIndex: 'memberLevel',
-      key: 'memberLevel',
-      render: (t, r) => <LevelBrand level={r.level} />
-    },
+    // {
+    //   title: '会员等级',
+    //   dataIndex: 'memberLevel',
+    //   key: 'memberLevel',
+    //   render: (t, r) => <LevelBrand level={r.level} />
+    // },
     {
       title: '账户余额',
       dataIndex: 'accountBalance',

src/pages/capitalAccount/accountLists/schema/index.ts

@@ -58,16 +58,16 @@ export const searchSchema: ISchema = {
                 }
               }
             },
-            memberLevel: {
-              type: 'string',
-              enum: [],
-              "x-component-props": {
-                placeholder: '请选择会员等级',
-                style: {
-                  width: 174
-                }
-              }
-            },
+            // memberLevel: {
+            //   type: 'string',
+            //   enum: [],
+            //   "x-component-props": {
+            //     placeholder: '请选择会员等级',
+            //     style: {
+            //       width: 174
+            //     }
+            //   }
+            // },
             memberStatus: {
               type: 'string',
               'x-component-props': {