Merge branch 'redirect-info'

src/App.js

@@ -154,7 +154,7 @@ class App extends Component {
 
         if (code && !oid) {
 
-            http.get(`${API['home']}/m/wx_loginInfo/code/${code}`)
+            http.get(`${API['home']}/m/wx_loginInfo/code/${code}?redirect=${encodeURIComponent(window.location.href)}`)
                 .then(res => {
                     let data = res.data
                     if (data.errno == 200) {

src/components/passport/login/index.js

@@ -135,7 +135,7 @@ const FormikConfig = {
             phone_num: values.tel,
             phone_code: values.veriCode,
             area_code: '00'+props.country.num,
-            redirect: from && window.location.origin + from.pathname + from.search + from.hash
+            redirect: from && encodeURIComponent(window.location.origin + from.pathname + from.search + from.hash)
         }).then(res => {
             if (res.hasError) {
                 Toast.info(res.msg);

src/store/userAction.js

@@ -8,7 +8,7 @@ const accountLogin = user => dispatch => {
         user_name: user.username,
         password: encrypt(user.password),
         is_encrypt: 1,
-        redirect: user.redirect
+        redirect: encodeURIComponent(user.redirect)
     }).then(res => {
         return storeUser(res, dispatch)
     })