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

package.json

@@ -6,8 +6,8 @@
     "start:dev": "umi dev",
     "start:analyze": "ANALYZE=1 umi dev",
     "clean": "rimraf node_modules",
-    "start": "yarn scripts:build && umi dev",
-    "build": "umi build",
+    "start": "yarn api && yarn scripts:build && umi dev",
+    "build": "yarn api && yarn scripts:build && umi build",
     "build:analyze": "ANALYZE=1 umi build",
     "postinstall": "umi generate tmp",
     "prettier": "prettier --write '**/*.{js,jsx,tsx,ts,less,md,json}'",

src/pages/user/index.tsx

@@ -9,12 +9,12 @@ import {
   ScanOutlined
 } from '@ant-design/icons';
 import { Link, history } from 'umi'
-import LoginWrap from './components/loginWrap';
 import ScanLoginWrap from './components/ScanLoginWrap';
 // import leftPicture from '../../../mockStatic/image_ad.png'
 import wechat from '../../../mockStatic/Wechat.png'
 import qq from '../../../mockStatic/QQ.png'
 import alipay from '../../../mockStatic/Alipay.png'
+import LoginWrap from './components/LoginWrap';
 
 const User: React.FC = () => {
   const [isScanQrCode,setIsScanQrCode] = useState(false)