Merge branch 'dev_tide' into dev_tide_zlglxt_xinlan

zouyu

8 天以前 648003a577ef7a03046269c77fc5cc64199945e7

 src/store/modules/user.js

@@ -99,9 +99,8 @@
      loginCheckFactory(userInfo) {

        const username = userInfo.username.trim()

        const password = userInfo.password

        const factoryId = userInfo.currentFatoryId

        return new Promise((resolve, reject) => {

          loginCheckFactory(username, password, factoryId).then(res => {

          loginCheckFactory(username, password).then(res => {

            setToken(res.token)

            this.token = res.token

            resolve()

@@ -116,9 +115,6 @@
              .then((res) => {

                setToken(res.token);

                this.token = res.token

                Vue.prototype.uploadHeader = {

                  Authorization: "Bearer " + res.token,

                };

                resolve();

              })

              .catch((error) => {