Skip to content

C
CivWeb
Commit 673aed6e authored by 邓晓峰's avatar 邓晓峰
Browse files
Options

Merge branch 'master' into dev_info

parents 9ad4dfd5 04f7321d
Pipeline #33980 passed with stages
        in 51 minutes 6 seconds
        Hide whitespace changes
        Inline Side-by-side
        Showing with 3 additions and 3 deletions
        src/pages/user/login/login.js
        View file @ 673aed6e
        ...@@ -511,9 +511,9 @@ class Login { ...@@ -511,9 +511,9 @@ class Login {
        cacheBust: true, cacheBust: true,
        }) })
        .then(response => { .then(response => {
        console.log('sceen wx', response);
        if (response.token) { if (response.token) {
        self.globalConfig.token = response.token; self.globalConfig.token = response.token;
        Cookies.set('token', response.token);
        self.updateConfig && self.updateConfig(this.globalConfig); self.updateConfig && self.updateConfig(this.globalConfig);
        self.isSignIn = true; self.isSignIn = true;
        self.getUserInfoAndConfig(); self.getUserInfoAndConfig();
        ...@@ -600,8 +600,8 @@ class Login { ...@@ -600,8 +600,8 @@ class Login {
        } }
        getUserInfoAndConfig(failCallback, flag, industry) { getUserInfoAndConfig(failCallback, flag, industry) {
        // const { token } = this.globalConfig; const { token: tk } = this.globalConfig;
        const token = Cookies.get('token'); const token = tk || Cookies.get('token')
        const site = Cookies.get('site'); const site = Cookies.get('site');
        const self = this; const self = this;
        /* eslint-disable */ /* eslint-disable */
        ......
        Markdown is supported
        0% or
        You are about to add 0 people to the discussion. Proceed with caution.
        Finish editing this message first!
        Please register or to comment