From 0b8a61baf3529b7574a4b16d78f62fe41d7eeb70 Mon Sep 17 00:00:00 2001
From: Zhang Hang <3325346757@qq.com>
Date: Sun, 17 Dec 2023 09:21:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .eslintignore             |  1 +
 src/api/dorm.js           |  9 +++++++
 src/api/user.js           | 12 +++++++--
 src/router/index.js       | 13 ++++++++++
 src/store/modules/user.js |  4 +--
 src/utils/request.js      | 12 ++++-----
 src/views/dorm/index.vue  | 51 ++++++++++++++++++++++++++++++++++++++
 src/views/login/index.vue | 52 ++++++++++++++++++++++-----------------
 vue.config.js             | 10 +++++++-
 9 files changed, 131 insertions(+), 33 deletions(-)
 create mode 100644 src/api/dorm.js
 create mode 100644 src/views/dorm/index.vue

diff --git a/.eslintignore b/.eslintignore
index e6529fc..36d5749 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -2,3 +2,4 @@ build/*.js
 src/assets
 public
 dist
+*
diff --git a/src/api/dorm.js b/src/api/dorm.js
new file mode 100644
index 0000000..8ff7e7d
--- /dev/null
+++ b/src/api/dorm.js
@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+export function AppList(data) {
+  return request({
+    url: '/dorm/list',
+    method: 'post',
+    data
+  })
+}
diff --git a/src/api/user.js b/src/api/user.js
index 8ff4389..aa90c2b 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -2,15 +2,23 @@ import request from '@/utils/request'
 
 export function login(data) {
   return request({
-    url: '/vue-admin-template/user/login',
+    url: '/auth/login',
     method: 'post',
     data
   })
 }
 
+export function sendCode(phone) {
+  return request({
+    url: '/auth/sendCode/'+phone,
+    method: 'post',
+    data:phone
+  })
+}
+
 export function getInfo(token) {
   return request({
-    url: '/vue-admin-template/user/info',
+    url: '/auth/userInfo',
     method: 'get',
     params: { token }
   })
diff --git a/src/router/index.js b/src/router/index.js
index 13459e9..f19fe37 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -90,6 +90,19 @@ export const constantRoutes = [
     ]
   },
 
+  {
+    path: '/dorm',
+    component: Layout,
+    children: [
+      {
+        path: 'index',
+        name: '宿舍管理',
+        component: () => import('@/views/dorm/index'),
+        meta: { title: '宿舍管理', icon: 'el-icon-platform-eleme' }
+      }
+    ]
+  },
+
   {
     path: '/nested',
     component: Layout,
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 2f6423f..7220b3a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -30,9 +30,9 @@ const mutations = {
 const actions = {
   // user login
   login({ commit }, userInfo) {
-    const { username, password } = userInfo
+    const { phone, code } = userInfo
     return new Promise((resolve, reject) => {
-      login({ username: username.trim(), password: password }).then(response => {
+      login({ phone: phone.trim(), code: code }).then(response => {
         const { data } = response
         commit('SET_TOKEN', data.token)
         setToken(data.token)
diff --git a/src/utils/request.js b/src/utils/request.js
index 2fb95ac..608d615 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -7,7 +7,7 @@ import { getToken } from '@/utils/auth'
 const service = axios.create({
   baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url
   // withCredentials: true, // send cookies when cross-domain requests
-  timeout: 5000 // request timeout
+  timeout: 50000 // request timeout
 })
 
 // request interceptor
@@ -19,7 +19,7 @@ service.interceptors.request.use(
       // let each request carry token
       // ['X-Token'] is a custom headers key
       // please modify it according to the actual situation
-      config.headers['X-Token'] = getToken()
+      config.headers['token'] = getToken()
     }
     return config
   },
@@ -46,9 +46,9 @@ service.interceptors.response.use(
     const res = response.data
 
     // if the custom code is not 20000, it is judged as an error.
-    if (res.code !== 20000) {
+    if (res.code !== 200) {
       Message({
-        message: res.message || 'Error',
+        message: res.msg || 'Error',
         type: 'error',
         duration: 5 * 1000
       })
@@ -66,7 +66,7 @@ service.interceptors.response.use(
           })
         })
       }
-      return Promise.reject(new Error(res.message || 'Error'))
+      return Promise.reject(new Error(res.msg || 'Error'))
     } else {
       return res
     }
@@ -74,7 +74,7 @@ service.interceptors.response.use(
   error => {
     console.log('err' + error) // for debug
     Message({
-      message: error.message,
+      message: error.msg,
       type: 'error',
       duration: 5 * 1000
     })
diff --git a/src/views/dorm/index.vue b/src/views/dorm/index.vue
new file mode 100644
index 0000000..ce6fea9
--- /dev/null
+++ b/src/views/dorm/index.vue
@@ -0,0 +1,51 @@
+<template>
+  <div>
+
+    
+
+  </div>
+</template>
+
+<script>
+//这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
+//例如：import 《组件名称》 from '《组件路径》,
+  export default {
+    //import引入的组件需要注入到对象中才能使用"
+    components: {},
+    props: {},
+    data() {
+      //这里存放数据"
+
+      return {};
+    },
+    //计算属性 类似于data概念",
+    computed: {},
+    //监控data中的数据变化",
+    watch: {},
+    //方法集合",
+    methods: {},
+    //生命周期 - 创建完成（可以访问当前this实例）",
+    created() {
+    },
+    //生命周期 - 挂载完成（可以访问DOM元素）",
+    mounted() {
+    },
+    beforeCreate() {
+    }, //生命周期 - 创建之前",
+    beforeMount() {
+    }, //生命周期 - 挂载之前",
+    beforeUpdate() {
+    }, //生命周期 - 更新之前",
+    updated() {
+    }, //生命周期 - 更新之后",
+    beforeDestroy() {
+    }, //生命周期 - 销毁之前",
+    destroyed() {
+    }, //生命周期 - 销毁完成",
+    activated() {
+    } //如果页面有keep-alive缓存功能，这个函数会触发",
+  };
+</script>
+<style scoped>
+
+</style>
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 1db2464..9c72fcf 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -12,7 +12,7 @@
         </span>
         <el-input
           ref="username"
-          v-model="loginForm.username"
+          v-model="loginForm.phone"
           placeholder="Username"
           name="username"
           type="text"
@@ -26,9 +26,8 @@
           <svg-icon icon-class="password" />
         </span>
         <el-input
-          :key="passwordType"
           ref="password"
-          v-model="loginForm.password"
+          v-model="loginForm.code"
           :type="passwordType"
           placeholder="Password"
           name="password"
@@ -41,7 +40,8 @@
         </span>
       </el-form-item>
 
-      <el-button :loading="loading" type="primary" style="width:100%;margin-bottom:30px;" @click.native.prevent="handleLogin">Login</el-button>
+      <el-button :loading="loading" type="primary" style="width:100%;margin-bottom:30px;" @click.native.prevent="sendCode">获取验证码</el-button>
+      <el-button :loading="loading" type="primary" style="width:100%;margin-bottom:30px;" @click.native.prevent="handleLogin">登录</el-button>
 
       <div class="tips">
         <span style="margin-right:20px;">username: admin</span>
@@ -54,32 +54,33 @@
 
 <script>
 import { validUsername } from '@/utils/validate'
+import { sendCode } from '@/api/user'
 
 export default {
   name: 'Login',
   data() {
-    const validateUsername = (rule, value, callback) => {
-      if (!validUsername(value)) {
-        callback(new Error('Please enter the correct user name'))
-      } else {
-        callback()
-      }
-    }
-    const validatePassword = (rule, value, callback) => {
-      if (value.length < 6) {
-        callback(new Error('The password can not be less than 6 digits'))
-      } else {
-        callback()
-      }
-    }
+    // const validateUsername = (rule, value, callback) => {
+    //   if (!validUsername(value)) {
+    //     callback(new Error('Please enter the correct user name'))
+    //   } else {
+    //     callback()
+    //   }
+    // }
+    // const validatePassword = (rule, value, callback) => {
+    //   if (value.length < 6) {
+    //     callback(new Error('The password can not be less than 6 digits'))
+    //   } else {
+    //     callback()
+    //   }
+    // }
     return {
       loginForm: {
-        username: 'admin',
-        password: '111111'
+        phone: '',
+        code: ''
       },
       loginRules: {
-        username: [{ required: true, trigger: 'blur', validator: validateUsername }],
-        password: [{ required: true, trigger: 'blur', validator: validatePassword }]
+        phone: [{ required: true, trigger: 'blur' }],
+        code: [{ required: true, trigger: 'blur' }]
       },
       loading: false,
       passwordType: 'password',
@@ -95,6 +96,13 @@ export default {
     }
   },
   methods: {
+    sendCode(){
+      sendCode(this.loginForm.phone).then(
+        res=>{
+          this.$message.success(res.msg);
+        }
+      )
+    },
     showPwd() {
       if (this.passwordType === 'password') {
         this.passwordType = ''
diff --git a/vue.config.js b/vue.config.js
index 4856ed0..1304d76 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -36,7 +36,15 @@ module.exports = {
       warnings: false,
       errors: true
     },
-    before: require('./mock/mock-server.js')
+    proxy:{
+      [process.env.VUE_APP_BASE_API]: {
+        target: 'http://127.0.0.1:18080',
+        changeOrigin: true,
+        pathRewrite: {
+          ['^' + process.env.VUE_APP_BASE_API]: ''
+        }
+      }
+    }
   },
   configureWebpack: {
     // provide the app's title in webpack's name field, so that