Merge branch 'develop' into 'test'

src/containers/App.js

 import React, { useState } from 'react';
 import { Switch, Route } from 'react-router-dom';
-import UserInfoContext, { initUserinfo } from '../context/userinfo-context';
+import { UserProvider } from '../context/userinfo-context';
 
 import NavBar from '../components/NavBar';
 import Index from './Index/Index';
@@ -11,19 +11,10 @@ import BindEquipment from './BindEquipment';
 import NoMatch from './NoMatch';
 
 function App() {
-  const [userinfo, setUserinfo] = useState(initUserinfo);
   const [title, setTitle] = useState('多彩运维');
   return (
     <div className='App'>
-      <UserInfoContext.Provider
-        value={{
-          userinfo: userinfo,
-          updateUserInfo: val =>
-            setUserinfo({
-              ...userinfo,
-              ...val,
-            }),
-        }}>
+      <UserProvider>
         <Route render={props => <NavBar {...props} title={title} />} />
         <Switch>
           <Route
@@ -49,7 +40,7 @@ function App() {
           />
           <Route component={NoMatch} />
         </Switch>
-      </UserInfoContext.Provider>
+      </UserProvider>
     </div>
   );
 }

src/containers/Equipment/EquipmentTest.js

@@ -105,7 +105,7 @@ class EquipmentTest extends Component {
             <i className='linkIcon'>
               <img src={testIcon} alt='' />
             </i>
-            <span>测试放水</span>
+            <span>测试吹风</span>
           </div>
         </div>
       </div>

src/containers/Equipment/index.js

@@ -48,7 +48,7 @@ export class Index extends React.Component {
             <i className='linkIcon'>
               <img src={testIcon} alt='' />
             </i>
-            <span>测试放水</span>
+            <span>测试吹风</span>
           </Link>
           <Link
             className='linkItem'

src/containers/Login/index.js

@@ -21,7 +21,6 @@ export class Index extends React.Component {
   }
 
   componentWillMount() {
-    console.log(this.props);
     const { setTitle, updateUserInfo } = this.props;
     setTitle('登陆');
     const { code } = this.props;

src/containers/TestWater/index.js

@@ -20,7 +20,7 @@ export class Index extends React.Component {
 
   componentWillMount() {
     const { setTitle } = this.props;
-    setTitle('测试放水');
+    setTitle('测试吹风');
   }
   componentDidMount() {
     this.createBarcode();

src/context/userinfo-context.js

-import React from 'react';
+import React, { createContext, useState } from 'react';
 
 function is_weixn() {
   var ua = navigator.userAgent.toLowerCase();
@@ -21,9 +21,24 @@ export const initUserinfo = {
   },
 };
 
-export const UserContext = React.createContext({
-  userinfo: initUserinfo,
-  updateUserInfo: () => {},
-});
+export const UserContext = createContext();
+
+export const UserProvider = props => {
+  const [userinfo, setUserinfo] = useState(initUserinfo);
+
+  return (
+    <UserContext.Provider
+      value={{
+        userinfo: userinfo,
+        updateUserInfo: val =>
+          setUserinfo({
+            ...userinfo,
+            ...val,
+          }),
+      }}>
+      {props.children}
+    </UserContext.Provider>
+  );
+};
 
 export default UserContext;