浏览代码

初始化登陆

Gavin1101 1 年之前
父节点
当前提交
214f6ea115
共有 11 个文件被更改,包括 23 次插入31 次删除
  1. 1 1
      .env.development
  2. 1 1
      .env.preview
  3. 0 1
      .husky/.gitignore
  4. 0 4
      .husky/commit-msg
  5. 0 4
      .husky/pre-commit
  6. 1 1
      src/api/login.js
  7. 2 2
      src/layouts/UserLayout.vue
  8. 1 1
      src/mock/index.js
  9. 2 1
      src/store/modules/user.js
  10. 7 7
      src/views/user/Login.vue
  11. 8 8
      vue.config.js

+ 1 - 1
.env.development

@@ -1,3 +1,3 @@
 NODE_ENV=development
-VUE_APP_PREVIEW=true
+VUE_APP_PREVIEW=false
 VUE_APP_API_BASE_URL=/api

+ 1 - 1
.env.preview

@@ -1,3 +1,3 @@
 NODE_ENV=production
-VUE_APP_PREVIEW=true
+VUE_APP_PREVIEW==false
 VUE_APP_API_BASE_URL=/api

+ 0 - 1
.husky/.gitignore

@@ -1 +0,0 @@
-_

+ 0 - 4
.husky/commit-msg

@@ -1,4 +0,0 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-npx --no-install commitlint --edit "$1"

+ 0 - 4
.husky/pre-commit

@@ -1,4 +0,0 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-npm run lint

+ 1 - 1
src/api/login.js

@@ -1,7 +1,7 @@
 import request from '@/utils/request'
 
 const userApi = {
-  Login: '/auth/login',
+  Login: '/login',
   Logout: '/auth/logout',
   ForgePassword: '/auth/forge-password',
   Register: '/auth/register',

+ 2 - 2
src/layouts/UserLayout.vue

@@ -10,11 +10,11 @@
           <div class="header">
             <a href="/">
               <img src="~@/assets/logo.svg" class="logo" alt="logo">
-              <span class="title">Ant Design</span>
+              <span class="title">autocde2.0</span>
             </a>
           </div>
           <div class="desc">
-            {{ $t('layouts.userLayout.title') }}
+            autocde2.0
           </div>
         </div>
 

+ 1 - 1
src/mock/index.js

@@ -1,7 +1,7 @@
 import { isIE } from '@/utils/util'
 
 // 判断环境不是 prod 或者 preview 是 true 时,加载 mock 服务
-if (process.env.NODE_ENV !== 'production' || process.env.VUE_APP_PREVIEW === 'true') {
+if (process.env.NODE_ENV !== 'production' && process.env.VUE_APP_PREVIEW === 'true') {
   if (isIE()) {
     console.error('[antd-pro] ERROR: `mockjs` NOT SUPPORT `IE` PLEASE DO NOT USE IN `production` ENV.')
   }

+ 2 - 1
src/store/modules/user.js

@@ -39,7 +39,8 @@ const user = {
     Login ({ commit }, userInfo) {
       return new Promise((resolve, reject) => {
         login(userInfo).then(response => {
-          const result = response.result
+          const result = response.data
+          console.log(response)
           storage.set(ACCESS_TOKEN, result.token, new Date().getTime() + 7 * 24 * 60 * 60 * 1000)
           commit('SET_TOKEN', result.token)
           resolve()

+ 7 - 7
src/views/user/Login.vue

@@ -21,7 +21,7 @@
               :placeholder="$t('user.login.username.placeholder')"
               v-decorator="[
                 'username',
-                {rules: [{ required: true, message: $t('user.userName.required') }, { validator: handleUsernameOrEmail }], validateTrigger: 'change'}
+                {rules: [{ required: true, message: $t('user.userName.required') }], validateTrigger: 'change'}
               ]"
             >
               <a-icon slot="prefix" type="user" :style="{ color: 'rgba(0,0,0,.25)' }"/>
@@ -41,7 +41,7 @@
             </a-input-password>
           </a-form-item>
         </a-tab-pane>
-        <a-tab-pane key="tab2" :tab="$t('user.login.tab-login-mobile')">
+        <!-- <a-tab-pane key="tab2" :tab="$t('user.login.tab-login-mobile')">
           <a-form-item>
             <a-input size="large" type="text" :placeholder="$t('user.login.mobile.placeholder')" v-decorator="['mobile', {rules: [{ required: true, pattern: /^1[34578]\d{9}$/, message: $t('user.login.mobile.placeholder') }], validateTrigger: 'change'}]">
               <a-icon slot="prefix" type="mobile" :style="{ color: 'rgba(0,0,0,.25)' }"/>
@@ -66,7 +66,7 @@
               ></a-button>
             </a-col>
           </a-row>
-        </a-tab-pane>
+        </a-tab-pane> -->
       </a-tabs>
 
       <a-form-item>
@@ -89,7 +89,7 @@
         >{{ $t('user.login.login') }}</a-button>
       </a-form-item>
 
-      <div class="user-login-other">
+      <!-- <div class="user-login-other">
         <span>{{ $t('user.login.sign-in-with') }}</span>
         <a>
           <a-icon class="item-icon" type="alipay-circle"></a-icon>
@@ -101,7 +101,7 @@
           <a-icon class="item-icon" type="weibo-circle"></a-icon>
         </a>
         <router-link class="register" :to="{ name: 'register' }">{{ $t('user.login.signup') }}</router-link>
-      </div>
+      </div> -->
     </a-form>
 
     <two-step-captcha
@@ -188,8 +188,8 @@ export default {
           console.log('login form', values)
           const loginParams = { ...values }
           delete loginParams.username
-          loginParams[!state.loginType ? 'email' : 'username'] = values.username
-          loginParams.password = md5(values.password)
+          loginParams['username'] = values.username
+          loginParams.password = values.password
           Login(loginParams)
             .then((res) => this.loginSuccess(res))
             .catch(err => this.requestFailed(err))

+ 8 - 8
vue.config.js

@@ -123,15 +123,15 @@ const vueConfig = {
 
   devServer: {
     // development server port 8000
-    port: 8000
+    port: 8000,
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
-    // proxy: {
-    //   '/api': {
-    //     target: 'https://mock.ihx.me/mock/5baf3052f7da7e07e04a5116/antd-pro',
-    //     ws: false,
-    //     changeOrigin: true
-    //   }
-    // }
+    proxy: {
+      '/api': {
+        target: 'http://111.230.204.244:8080/',
+        ws: false,
+        changeOrigin: true
+      }
+    }
   },
 
   // disable source map in production