Merge branch 'international-phone-number' into pre

# Conflicts:
#	src/components/detail/redPacket/index.js

src/components/detail/redPacket/index.js

@@ -9,6 +9,8 @@ import { Toast } from 'antd-mobile';
 import Captcha from '@/common/Captcha';
 import FollowQRcode from './../followQRcode';
 import './index.scss';
+import { Link } from "react-router-dom";
+
 import cookie from 'js-cookie'
 
 class RedPacket extends PureComponent {
@@ -206,7 +208,7 @@ class RedPacket extends PureComponent {
         const { code, data } = res.data;
         if(code === 200) {
 
-          // is_receive	是否领取过 0-否 1-是            
+          // is_receive	是否领取过 0-否 1-是
           if(data.is_receive) {
             this.judgeReceiveStatus(data, 8);
           }else {
@@ -626,7 +628,6 @@ class RedPacket extends PureComponent {
       bindInfo,
       country
     } = this.state;
-    // console.log(share_code);
     const cls = classnames('popup-mask',{
       'popup-mask--no': type !== 2
     });
@@ -665,7 +666,7 @@ class RedPacket extends PureComponent {
                     {!isCopy
                       ? userInfo && userInfo.uid
                       ? (
-                        <CopyToClipboard 
+                        <CopyToClipboard
                           text={command}
                           onCopy={() => this.setState({
                             isCopy: true
@@ -675,8 +676,8 @@ class RedPacket extends PureComponent {
                         </CopyToClipboard>
                       )
                       : (
-                          <button 
-                            className="popup-password__button--copy" 
+                          <button
+                            className="popup-password__button--copy"
                             onClick={() => {
                               window.localStorage.setItem('redpacket-click', 'copy');
                               history.push('/passport/login');
@@ -850,12 +851,12 @@ class RedPacket extends PureComponent {
                     <Form className="popup-form__content">
                       <h4 className="popup-form__title">绑定手机号</h4>
                       <div className="popup-form__item">
-                        <a 
+                        <Link
                           className="popup-form__button--num" 
-                          href={`/country?id=${getParam('id')}&share_code=${share_code}`}>
+                          to={`/country?id=${getParam('id')}&share_code=${share_code}`}>
                           +{country.num}
-                          <i className="iconfont iconiconfront-69"></i>
-                        </a>
+                          <i className="iconfont iconiconfront-69"/>
+                        </Link>
                         <Field
                           name="tel"
                           render={({field}) => {

src/components/passport/login/index.js

@@ -13,7 +13,6 @@ import { connect } from 'react-redux';
 import { compose } from 'redux';
 import { isEmpty } from 'lodash'
 import { Toast } from 'antd-mobile';
-import { validateTel } from "@/utils";
 import { HeaderBar } from "@/common";