修改bug

package-lock.json

@@ -11,11 +11,7 @@
         "axios": "^1.4.0",
         "core-js": "^3.8.3",
         "element-ui": "^2.15.13",
-<<<<<<< HEAD
-        "express": "^4.18.2",
-=======
         "js-md5": "^0.7.3",
->>>>>>> liyangzheng
         "sm-crypto": "^0.3.12",
         "vue": "^2.6.14",
         "vue-router": "^3.5.1",

package.json

@@ -10,11 +10,7 @@
     "axios": "^1.4.0",
     "core-js": "^3.8.3",
     "element-ui": "^2.15.13",
-<<<<<<< HEAD
-    "express": "^4.18.2",
-=======
     "js-md5": "^0.7.3",
->>>>>>> liyangzheng
     "sm-crypto": "^0.3.12",
     "vue": "^2.6.14",
     "vue-router": "^3.5.1",

src/api/login/login.js

@@ -12,5 +12,5 @@ export function login(data) {
         method: "post",
         headers: { 'content-type ': 'application/x-www-form-urlencoded' },
         data
-    });
+    })
 }

src/utils/request.js

@@ -14,6 +14,7 @@ const service = axios.create({
 service.interceptors.request.use(
   config => {
     let user = localStorage.getItem("userInfo")
+    console.log(user,'user');
     if (user) {
       user = JSON.parse(user)
       let userToken = user.sessionid
@@ -67,7 +68,7 @@ service.interceptors.request.use(
 // 响应拦截
 service.interceptors.response.use(
   response => {
-    let res = response
+    let res = response.data
     return res
   },
   error => {

src/views/login/Login.vue

@@ -20,7 +20,7 @@
                     </el-form-item>
                     <el-form-item class="loginItem">
                         <el-checkbox v-model="rememberUser" @change="rememberNow">记住账号</el-checkbox><br>
-                        <el-button class="loginButton" @click="loginNow" >登录</el-button>
+                        <el-button class="loginButton" @click="loginNow">登录</el-button>
                     </el-form-item>
                 </el-form>
             </div>
@@ -65,8 +65,13 @@ export default {
             if (this.form.username != '' && this.form.password != "") {
                 if (!this.userBlur && !this.passBlur) {
                     const wordType = this.encryptPassword(this.form.password)
+                    // console.log(100);
                     let res = await login({ login_account: this.form.username, pwd: wordType })
-                    if (res.returncode === 200) {
+                    // console.log(105);
+                    // this.$router.push("/")
+                    // localStorage.setItem('userInfo', JSON.stringify(res.data))
+                    // this.rememberUser = false
+                    if (res.returncode == 200) {
                         this.$message({
                             type: "success",
                             message: "登陆成功"
@@ -74,13 +79,13 @@ export default {
                         this.$router.push("/")
                         localStorage.setItem('userInfo', JSON.stringify(res.data))
                         this.rememberUser = false
-                    } else if(res.returncode === 500) {
+                    } else if (res.returncode == 500) {
+                        console.log(500);
                         this.$message({
-                            type:"error",
-                            message:res.msg
+                            type: "error",
+                            message: res.msg
                         })
                     }
-
                 } else {
                     this.$message({
                         message: '账号或密码错误',