Bläddra i källkod

Merge branch 'master' of http://git.ycjcjy.com/xiangsong/miniapp

xcx 4 år sedan
förälder
incheckning
ef7bd7c6f4
2 ändrade filer med 15 tillägg och 0 borttagningar
  1. 1
    0
      config/index.js
  2. 14
    0
      src/layouts/index.jsx

+ 1
- 0
config/index.js Visa fil

65
   alias: {
65
   alias: {
66
     '@/assets': path.resolve(__dirname, '..', 'src/assets'),
66
     '@/assets': path.resolve(__dirname, '..', 'src/assets'),
67
     '@/components': path.resolve(__dirname, '..', 'src/components'),
67
     '@/components': path.resolve(__dirname, '..', 'src/components'),
68
+    '@/layouts': path.resolve(__dirname, '..', 'src/layouts'),
68
     '@/store': path.resolve(__dirname, '..', 'src/store'),
69
     '@/store': path.resolve(__dirname, '..', 'src/store'),
69
     '@/utils': path.resolve(__dirname, '..', 'src/utils')
70
     '@/utils': path.resolve(__dirname, '..', 'src/utils')
70
   }
71
   }

+ 14
- 0
src/layouts/index.jsx Visa fil

1
+import React from 'react'
2
+import { useModel } from '@/store'
3
+
4
+const Spin = <></>
5
+
6
+export default function(props) {
7
+  const { user } = useModel('user')
8
+
9
+  const loading = !user || !user.personId
10
+
11
+  return (
12
+    <Spin loading={loading}>{ props.children }</Spin>
13
+  )
14
+}