Browse Source

登录的。。

liuxinyun 3 years ago
parent
commit
a02309faa2

+ 2 - 1
ele-admin-template/.env.development

@@ -1,2 +1,3 @@
-VUE_APP_API_BASE_URL=https://v2.eleadmin.com/api
+# VUE_APP_API_BASE_URL=https://v2.eleadmin.com/api
+VUE_APP_API_BASE_URL=/kingdom
 #VUE_APP_API_BASE_URL=http://localhost:8081/api

+ 2 - 0
ele-admin-template/.eslintignore

@@ -2,3 +2,5 @@ public
 src/assets
 node_modules
 dist
+src/api 
+src/views 

+ 3 - 3
ele-admin-template/src/api/login/index.js

@@ -5,10 +5,10 @@ import { setToken } from '@/utils/token-util';
  * 登录
  */
 export async function login(data) {
-  data.tenantId = 1; // 租户id
-  const res = await request.post('/login', data);
+  //data.tenantId = 1; // 租户id
+  const res = await request.post('/main/user/login', data);
   if (res.data.code === 0) {
-    setToken(res.data.data.access_token, data.remember);
+    setToken(res.data.data.oken, true);
     return res.data.message;
   }
   return Promise.reject(new Error(res.data.message));

+ 21 - 21
ele-admin-template/src/views/login/index.vue

@@ -14,23 +14,23 @@
       @keyup.enter.native="submit"
     >
       <h4>{{ $t('login.title') }}</h4>
-      <el-form-item prop="username">
+      <el-form-item prop="loginName">
         <el-input
           clearable
-          v-model="form.username"
+          v-model="form.loginName"
           prefix-icon="el-icon-user"
-          :placeholder="$t('login.username')"
+          :placeholder="$t('login.loginName')"
         />
       </el-form-item>
-      <el-form-item prop="password">
+      <el-form-item prop="loginPwd">
         <el-input
           show-password
-          v-model="form.password"
+          v-model="form.loginPwd"
           prefix-icon="el-icon-lock"
-          :placeholder="$t('login.password')"
+          :placeholder="$t('login.loginPwd')"
         />
       </el-form-item>
-      <el-form-item prop="code">
+      <!-- <el-form-item prop="code">
         <div class="login-input-group">
           <el-input
             clearable
@@ -46,7 +46,7 @@
             @click="changeCaptcha"
           />
         </div>
-      </el-form-item>
+      </el-form-item> -->
       <div class="el-form-item">
         <el-checkbox v-model="form.remember">
           {{ $t('login.remember') }}
@@ -123,10 +123,10 @@
         loading: false,
         // 表单数据
         form: {
-          username: 'admin',
-          password: 'admin',
-          remember: true,
-          code: ''
+          loginName: 'aaa',
+          loginPwd: 'admin',
+          pageNum:1,
+          pageSize:10
         },
         // 验证码base64数据
         captcha: '',
@@ -138,18 +138,18 @@
       // 表单验证规则
       rules() {
         return {
-          username: [
+          loginName: [
             {
               required: true,
-              message: this.$t('login.username'),
+              message: this.$t('login.loginName'),
               type: 'string',
               trigger: 'blur'
             }
           ],
-          password: [
+          loginPwd: [
             {
               required: true,
-              message: this.$t('login.password'),
+              message: this.$t('login.loginPwd'),
               type: 'string',
               trigger: 'blur'
             }
@@ -161,7 +161,7 @@
       if (getToken()) {
         this.goHome();
       } else {
-        this.changeCaptcha();
+        // this.changeCaptcha();
       }
     },
     methods: {
@@ -171,10 +171,10 @@
           if (!valid) {
             return false;
           }
-          if (this.form.code.toLowerCase() !== this.text) {
-            this.$message.error('验证码错误');
-            return;
-          }
+          // if (this.form.code.toLowerCase() !== this.text) {
+          //   this.$message.error('验证码错误');
+          //   return;
+          // }
           this.loading = true;
           login(this.form)
             .then((msg) => {

+ 17 - 1
ele-admin-template/vue.config.js

@@ -30,5 +30,21 @@ module.exports = {
         }
       }
     }
-  }
+  },
+  devServer: { //liu 
+   
+    proxy: {
+        
+        '/kingdom': {
+            target: 'http://192.168.3.51:18086',
+            //target: 'http://192.168.3.35:8080', // kang杨威
+            changeOrigin: true,
+            pathRewrite: {
+                "^/kingdom": '',
+            }
+        },
+       
+    },
+    
+},
 };