Merge remote-tracking branch 'origin/master'

# Conflicts:
#	dist/index.html

src/components/LoginPop/LoginPop.jsx

@@ -126,7 +126,7 @@ class LoginPop extends React.Component {
     const param = {
       mobile: phone,
       code: code,
-      redirectUrl: encodeURIComponent(window.location.href),
+      redirectUrl: window.location.href,
     };
 
     const {success, data, desc} = await API.bindPhone(param);