pull

src/App.js

-import React, {Component} from 'react'
+import React, { Component } from 'react'
 import Routes from './router'
 import cookie from 'js-cookie'
-import {connect} from "react-redux";
-import {setCurrentUser, startFetchUser} from "@/store/userAction";
-import {withRouter} from 'react-router-dom'
-import {compose} from 'redux'
-import {getParam, http, browser} from "@/utils";
-import {Toast} from "antd-mobile";
-import {addDays} from 'date-fns'
+import { connect } from "react-redux";
+import { setCurrentUser, startFetchUser } from "@/store/userAction";
+import { withRouter } from 'react-router-dom'
+import { compose } from 'redux'
+import { getParam, http, browser } from "@/utils";
+import { Toast } from "antd-mobile";
+import { addDays } from 'date-fns'
 
 
 //拦截ajax请求，返回mock数据
@@ -69,12 +69,18 @@ class App extends Component {
                     return
                 }
                 location.state = {from: this.previousLocation};
+            } else {
+                this.removeShareCodeCookie()
             }
         })
 
 
     }
 
+    removeShareCodeCookie = () => {
+        cookie.remove('share_code', {path: '/', domain: '.julyedu.com'})
+    }
+
     setNavigationRecord = (location) => {
         let {location: _location} = this.props
         let {state: _state = {}} = _location
@@ -165,7 +171,7 @@ class App extends Component {
         let payload
         if (res.data.code === 200) {
             //移除红包统计cookie
-            cookie.remove('share_code', {path: '/', domain: '.julyedu.com'})
+            this.removeShareCodeCookie()
             const {
                 msg, data: {
                     avatar_file: avatar,
@@ -201,6 +207,8 @@ class App extends Component {
     transformWxUser = res => {
         let data = res.data
         if (data.errno == 200) {
+            //移除红包统计cookie
+            this.removeShareCodeCookie()
             let {uid, token, avatar_file: avatar, uname: username,} = data.data
 
             return {

src/components/passport/login/index.js

@@ -148,7 +148,7 @@ const FormikConfig = {
     validateOnChange: true,
     validate: (values) => {
         let errors = {}
-        if (!validateTel(values.tel)) {
+        if (!/\d/.test(values.tel)) {
             errors.tel = '请填写正确格式的手机号'
         }
         if (!/[0-9]{6}/.test(values.veriCode)) {