Merge branch 'login-binding' into dev

src/App.js

@@ -178,12 +178,6 @@ class App extends Component {
         let oid = getParam('oid')
         if (code && !oid) {
 
-            //针对2019双旦活动特殊处理，活动结束后删掉
-            //treasure_code=3538333139312c31&origin=2&aa=bb&code=0211aiYB1VVOL60rmWWB1367YB11aiY7&state=STATE
-            if (getParam('treasure_code') == '3538333139312c31' && code == '0211aiYB1VVOL60rmWWB1367YB11aiY7') {
-                return
-            }
-
             http.get(`${API["passport-api"]}/m/wx_loginInfo/code/${code}?redirect=${encodeURIComponent(window.location.href)}`)
                 .then(res => {
                     let data = res.data

src/common/Captcha/index.js

@@ -24,7 +24,6 @@ class Captcha extends Component {
                     width: 'auto',
                     onReady: function (instance) {
                         // 验证码一切准备就绪，此时可正常使用验证码的相关功能
-                        console.log(_this);
                         _this.setState({
                             isReady: true
                         });

src/components/passport/accountLogin/index.js

@@ -77,6 +77,10 @@ const formikConfig = {
       username, password, redirect: from && window.location.origin + from.pathname + from.search + from.hash
     }).then(res => {
       if (res.hasError) {
+        if(res.code === 4004){
+          history.push(`/passport/binding-tel?username=${username}`)
+          return
+        }
         Toast.info(res.msg, 2, null, false)
       }
     })

src/components/passport/bindingTel/index.js

@@ -39,6 +39,9 @@ class BindingTel extends Component {
     }
   }
 
+  componentDidMount() {
+    console.log(this.props.location.state)
+  }
 
   render() {
     const {
@@ -119,17 +122,52 @@ const formikConfig = {
     return errors
   },
   handleSubmit(values, {props}) {
-    http.post(`${API['passport-api']}/bind_mobile`, {
+    const username = getParam('username')
+    if (username) {
+      //老账号绑定手机号
+      http.post(`${API["passport-api"]}/m/personal/bindMobile`, {
+        phone_num: values.tel,
+        code: values.veriCode,
+        type: 1,
+        area_code: '00' + props.country.num,
+        user_name: username
+      }).then(res => {
+        const {data, errno, msg} = res.data
+        if (errno === 200) {
+          props.setCurrentUser({
+            hasError: false,
+            data: {
+              username: data.user_name,
+              avatar: data.avatar_file,
+              isVip: parseInt(data.vip),
+              token: data.access_token,
+              uid: data.uid
+            }
+          })
+          const {from} = props.location.state || {from: {pathname: '/'}}
+          props.history.push(from)
+        } else {
+          Toast.info(msg, 2, null, false)
+        }
+      })
+    } else {
+      const uid = getParam('uid')
+      const params = {
         phone_num: values.tel,
         phone_code: values.veriCode,
         mkey: getParam('mkey'),
         area_code: '00' + props.country.num,
-      plat: 5
-    }).then(res => {
+        plat: 5,
+        type: uid ? 1 : 2
+      }
+      if (uid) {
+        params.uid = uid
+      }
+      http.post(`${API['passport-api']}/bind_mobile`, params).then(res => {
         const data = res.data
         if (data.errno == 200) {
-        if (data.data['is_set_pwd']) {
           const {history} = props
+          if (data.data['is_set_pwd']) {
             history.replace(`/passport/set-password`, {
               user: {
                 hasError: false,
@@ -141,8 +179,16 @@ const formikConfig = {
               }
             })
           } else {
+            if (uid) {
+              const redirect = localStorage.getItem('binding_redirect')
+              if (redirect) {
+                localStorage.removeItem('binding_redirect')
+                history.replace(JSON.parse(redirect))
+              } else {
                 location.assign(data.data['jump_url'])
               }
+            }
+          }
 
 
         } else {
@@ -150,6 +196,8 @@ const formikConfig = {
         }
       })
     }
+
+  }
 }
 export default compose(
   connect(

src/store/userAction.js

@@ -67,7 +67,8 @@ const storeUser = (res, dispatch) => {
         payload = {
             hasError: true,
             msg: data.msg,
-            data: {}
+            data: {},
+            code: data.errno
         }
     }
     dispatch(setCurrentUser(payload))