Merge branch 'develop' into test

src/pages/Login/Login.tsx

@@ -73,7 +73,10 @@ class Login extends Component {
         .then(res => {
           const data = res.data;
           console.log(data);
-          this.props.updateUserInfo(data);
+          this.props.updateUserInfo({
+            ...data,
+            token: data.wxToken,
+          });
           Taro.navigateTo({
             url: '/pages/Home/Home',
           });