布局容器

src/components/NiceForm/index.tsx

@@ -36,6 +36,23 @@ const RowLayout = styled(props => <Row justify='end' {...props}/>)`
   }
 `
 
+// 自定义flex布局容器
+registerVirtualBox('flex-box', props => {
+  const childProperties = props.schema.getOrderProperties()
+  const { title, required } = props.props
+  const {labelcol, wrappercol} = props.schema.getExtendsComponentProps()
+  return <Row>
+      { title && <Col span={labelcol} className={cx(required ? 'flex-layout-label-required' : '')}>{title}</Col>}
+      <Col span={wrappercol}>
+        <Row>
+          {
+            childProperties.map((v, i, arr) => renderCol(v.schema, arr.length - 1 === i))
+          }
+        </Row>
+      </Col>
+  </Row>
+})
+
 registerVirtualBox('flex-layout', (_props) => {
   const { children, props } = _props
   const rowStyle = props['x-component-props'] ? props['x-component-props'].rowStyle : {}

src/global/config/global.d.ts

+export interface MemberType {
+	id: number;
+	typeName: string;
+}
+
+export interface BusinessType {
+	id: number;
+	typeName: string;
+}
+
+export interface UseType {
+	memberType: MemberType[];
+	businessType: BusinessType[];
+}
+
+export interface UserRegister {
+	useType: UseType;
+}
+
+export interface Web {
+	shopInfo: any[];
+}
+
+export interface PayConfig {
+	paymemberConfig?: any;
+}
+
+export interface CountryList {
+	name: string;
+	key: string;
+	icon: string;
+}
+
+export interface Global {
+	siteId: number;
+	siteUrl: string;
+	logo: string;
+	countryList: CountryList[];
+}
+
+export interface RootObject {
+	userRegister: UserRegister;
+	web: Web;
+	payConfig: PayConfig;
+	global: Global;
+}
\ No newline at end of file

src/utils/request.ts

@@ -70,10 +70,12 @@ const baseRequest = extend({
 // 请求拦截器
 baseRequest.interceptors.request.use((url: string, options: RequestOptionsInit): { url: string, options: RequestOptionsInit } => {
   // 判断是否有权限
-  const loginAfterHeaders = getAuth()
+  const { userId, memberId, token } = getAuth()
   const headers = {
     ...options.headers,
-    ...loginAfterHeaders
+    userId,
+    memberId,
+    token
   }
   return {
     // 前缀如果已经带上api, 跳过自动补前缀