From 7164a9afbcafacc77e7295694d9d791c6fbe5d55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <wangiegie@gmail.com>
Date: Sun, 25 Mar 2018 21:56:06 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8Davue,=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=20thx@=E5=B0=8F=E4=BC=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/login.js               | 13 +++++++++++++
 src/page/login/codelogin.vue   | 32 +++++++++++++++++++++++---------
 src/router/router.js           | 20 +++++++++++++++++++-
 src/store/modules/user.js      | 23 +++++++++++++----------
 src/views/admin/menu/index.vue |  9 +++++++--
 5 files changed, 75 insertions(+), 22 deletions(-)

diff --git a/src/api/login.js b/src/api/login.js
index 9fc94861..746c7e32 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -15,6 +15,19 @@ export const loginByUsername = (username, password, code, randomStr) => {
     })
 }
 
+export function mobileLogin(mobile, code) {
+  var grant_type = 'mobile'
+  var scope = 'server'
+  return request({
+    url: '/auth/mobile/token',
+    headers: {
+      'Authorization': 'Basic cGlnOnBpZw=='
+    },
+    method: 'post',
+    params: { mobile, code, grant_type, scope }
+  })
+}
+
 export const getUserInfo = () => {
     return request({
         url: '/admin/user/info',
diff --git a/src/page/login/codelogin.vue b/src/page/login/codelogin.vue
index 6423a1f7..f81d005a 100644
--- a/src/page/login/codelogin.vue
+++ b/src/page/login/codelogin.vue
@@ -1,7 +1,7 @@
 <template>
    <el-form class="login-form" status-icon :rules="loginRules" ref="loginForm" :model="loginForm" label-width="0" >
-        <el-form-item prop="phone">
-        <el-input @keyup.enter.native="handleLogin" v-model="loginForm.phone" auto-complete="off" placeholder="请输入手机号码"></el-input>
+        <el-form-item prop="mobile">
+        <el-input @keyup.enter.native="handleLogin" v-model="loginForm.mobile" auto-complete="off" placeholder="请输入手机号码"></el-input>
         </el-form-item>
         <el-form-item prop="code">
         <el-input @keyup.enter.native="handleLogin"  v-model="loginForm.code" auto-complete="off" placeholder="请输入验证码">
@@ -21,6 +21,7 @@ const MSGINIT = "发送验证码",
   MSGTIME = 60;
 import { isvalidatemobile } from "@/util/validate";
 import { mapGetters } from "vuex";
+import request from '@/router/axios'
 export default {
   name: "codelogin",
   data() {
@@ -43,11 +44,11 @@ export default {
       msgTime: MSGTIME,
       msgKey: false,
       loginForm: {
-        phone: "17547400800",
+        mobile: "17034642119",
         code: ""
       },
       loginRules: {
-        phone: [{ required: true, trigger: "blur", validator: validatePhone }],
+        mobile: [{ required: true, trigger: "blur", validator: validatePhone }],
         code: [{ required: true, trigger: "blur", validator: validateCode }]
       }
     };
@@ -61,6 +62,23 @@ export default {
   methods: {
     handleSend() {
       if (this.msgKey) return;
+      if (!this.loginForm.mobile) {
+        this.$message.error('请输入手机号码')
+      } else if (!(/^1[34578]\d{9}$/.test(this.loginForm.mobile))) {
+        this.$message.error('手机号格式不正确')
+      } else {
+        request({
+          url: '/admin/smsCode/' + this.loginForm.mobile,
+          method: 'get'
+        }).then(response => {
+          if (response.data.data) {
+            this.timer()
+            this.$message.success('验证码发送成功')
+          } else {
+            this.$message.error(response.data.msg)
+          }
+        })
+      }
       this.msgText = MSGSCUCCESS.replace("${time}", this.msgTime);
       this.msgKey = true;
       const time = setInterval(() => {
@@ -78,11 +96,7 @@ export default {
       this.$refs.loginForm.validate(valid => {
         if (valid) {
           this.$store.dispatch("LoginByPhone", this.loginForm).then(response => {
-            if (response.data.data) {
-              this.$message.success('验证码发送成功')
-            } else {
-              this.$message.error(response.data.msg)
-            }
+            console.log(response)
             this.$store.commit("ADD_TAG", this.tagWel);
             this.$router.push({ path: this.tagWel.value });
           });
diff --git a/src/router/router.js b/src/router/router.js
index cd35042a..3af98d91 100644
--- a/src/router/router.js
+++ b/src/router/router.js
@@ -77,5 +77,23 @@ export const asyncRouterMap = [
 				component: _import('wel')
 			}
 		]
-	}
+	}, {
+		menuId: 1,
+		path: '/admin',
+		component: Layout,
+		name: '系统管理',
+		hidden: false,
+		redirect: '/admin/user',
+		meta: {
+			title: '系统管理',
+		},
+		children: [
+			{ menuId: 2, path: 'user', component: _import('admin/user/index', 'views'), name: '用户管理', meta: { title: '用户管理' } },
+			{ menuId: 3, path: 'menu', component: _import('admin/menu/index', 'views'), name: '菜单管理', meta: { title: '菜单管理' } },
+			{ menuId: 4, path: 'role', component: _import('admin/role/index', 'views'), name: '角色管理', meta: { title: '角色管理' } },
+			{ menuId: 5, path: 'dept', component: _import('admin/dept/index', 'views'), name: '部门管理', meta: { title: '部门管理' } },
+			{ menuId: 6, path: 'dict', component: _import('admin/dict/index', 'views'), name: '字典管理', meta: { title: '字典管理' } },
+			{ menuId: 7, path: 'log', component: _import('admin/log/index', 'views'), name: '日志管理', meta: { title: '日志管理' } }
+		]
+	},
 ]
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 17b51de2..840fcd81 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,7 +1,7 @@
 import { getToken, setToken, removeToken } from '@/util/auth'
 import { setStore, getStore } from '@/util/store'
 import { validatenull } from '@/util/validate'
-import { loginByUsername, getUserInfo, logout } from '@/api/login'
+import { loginByUsername, mobileLogin, getUserInfo, logout } from '@/api/login'
 import { GetMenu } from '@/api/menu'
 const user = {
     state: {
@@ -30,16 +30,19 @@ const user = {
         },
         //根据手机号登录
         LoginByPhone({ commit, state, dispatch }, userInfo) {
-            return new Promise((resolve, reject) => {
-                loginByUsername(userInfo.phone, userInfo.code).then(res => {
-                    const data = response.data
-                    setToken(data.access_token)
-                    commit('SET_ACCESS_TOKEN', data.access_token)
-                    commit('SET_REFRESH_TOKEN', data.refresh_token)
-                    commit('CLEAR_LOCK');
-                    resolve();
-                })
+          const mobile = userInfo.mobile.trim()
+          return new Promise((resolve, reject) => {
+            mobileLogin(mobile, userInfo.smsCode).then(response => {
+              const data = response.data
+              setToken(data.access_token)
+              commit('SET_ACCESS_TOKEN', data.access_token)
+              commit('SET_REFRESH_TOKEN', data.refresh_token)
+              commit('CLEAR_LOCK');
+              resolve()
+            }).catch(error => {
+              reject(error)
             })
+          })
         },
         GetTableData({ commit, state, dispatch }, page) {
             return new Promise((resolve, reject) => {
diff --git a/src/views/admin/menu/index.vue b/src/views/admin/menu/index.vue
index 11b5d275..6e456bcb 100644
--- a/src/views/admin/menu/index.vue
+++ b/src/views/admin/menu/index.vue
@@ -59,6 +59,9 @@
             <el-form-item label="前端组件"   prop="component">
               <el-input v-model="form.component" :disabled="formEdit" placeholder="请输入描述"></el-input>
             </el-form-item>
+            <el-form-item label="前端地址"   prop="component">
+              <el-input v-model="form.path" :disabled="formEdit" placeholder="iframe嵌套地址"></el-input>
+            </el-form-item>
             <el-form-item v-if="formStatus == 'update'">
               <el-button type="primary" @click="update">更新</el-button>
               <el-button @click="onCancel">取消</el-button>
@@ -108,7 +111,8 @@
           sort: undefined,
           component: undefined,
           type: undefined,
-          method: undefined
+          method: undefined,
+          path: undefined
         },
         currentId: -1,
         menuManager_btn_add: false,
@@ -224,7 +228,8 @@
           sort: undefined,
           component: undefined,
           type: undefined,
-          method: undefined
+          method: undefined,
+          path: undefined
         }
       }
     }