Merge branch 'master' of http://git.jihengcc.cn/sendy/KM-Front-Milestone2

src/api/login.js

@@ -107,5 +107,8 @@ LoginApi.getAuthUrl = (params) => rxAjax.get(
 LoginApi.autoLoginByCode=(params)=>rxAjax.postUrl(
     LoginApi.authUrl+'/oauth/user/autoLogin',params
 )
-
+//根据Ad域自动登录userKey
+LoginApi.autoAdLogin=()=>rxAjax.postUrl(
+  LoginApi.authUrl+'/oauth/user/autoAdLogin'
+)
 export  default LoginApi;

src/store/modules/user.js

@@ -155,6 +155,19 @@ const user = {
           })
       })
      },
+     //根据Ad域登录
+     AutoAdLogin({ commit }) {
+      return new Promise((resolve, reject) => {
+        LoginApi.autoAdLogin().then(res => {
+          const result = res.data
+          Vue.ls.set(ACCESS_TOKEN,result.access_token,12*60*60*1000)
+          commit('SET_TOKEN', result.access_token)
+          resolve(res)
+        }) .catch(error => {
+          reject(error)
+        })
+      })
+    }
   }
 }
 

src/views/user/Login.vue

@@ -16,8 +16,8 @@
                             <a-input
                                 size="large"
                                 type="text"
-                                placeholder="请输入帐户名或邮箱地址"
-                                v-decorator="['username',{rules: [{ required: true, message: '请输入帐户名或邮箱地址' }, { validator: handleUsernameOrEmail }], validateTrigger: 'change'}]">
+                                placeholder="账号:工号"
+                                v-decorator="['username',{rules: [{ required: true, message: '请输入帐号' }, { validator: handleUsernameOrEmail }], validateTrigger: 'change'}]">
                                     <a-icon slot="prefix" type="user" :style="{ color: 'rgba(0,0,0,.25)' }"/>
                                 </a-input>
                             </a-form-item>
@@ -27,7 +27,7 @@
                                     size="large"
                                     type="password"
                                     autocomplete="false"
-                                    placeholder="请输入密码"
+                                    placeholder="初始密码:hkc+身份证后六位"
                                     @enter="handleSubmit"
                                     v-decorator="['password',{rules: [{ required: true, message: '请输入密码' }], validateTrigger: 'blur'}]">
                                 <a-icon slot="prefix" type="lock" :style="{ color: 'rgba(0,0,0,.25)' }"/>
@@ -58,6 +58,17 @@
                             :disabled="state.loginBtn">登录
                         </a-button>
                     </a-form-item>
+                    <a-form-item style="margin-top:24px">
+                        <a-button
+                            size="large"
+                            type="primaryad"
+                            @click="handAdClick"
+                            class="login-button"
+                            :loading="state.loginBtn"
+                            :disabled="state.loginBtn"
+                        >AD域登录
+                        </a-button>
+                    </a-form-item>
 <!--                    <div style="width:100%;">-->
 <!--                        &lt;!&ndash;                    <a-checkbox v-decorator="['rememberMe']">自动登录</a-checkbox>&ndash;&gt;-->
 <!--                        <router-link-->
@@ -117,7 +128,7 @@ export default {
             isLoginError: false,
             errorMsg: '',
             form: this.$form.createForm(this),
-            appName:'企业级业务平台',
+            appName:'知识管理系统PC端',
             //是否忽略验证码
             ignoreValidCode:false,
 
@@ -139,12 +150,13 @@ export default {
     },
     computed: {
         ...mapState({
-            navigation: state => state.appSetting.knowNavigation,
+            navigation: state => state.appSetting.navigation,
         })
     },
     methods: {
         ...mapActions({
             Login: 'user/Login',
+            AutoAdLogin:'user/AutoAdLogin',
             LoginByMobile: 'user/LoginByMobile',
             AuthorizeLogin: 'user/AuthorizeLogin',
             AuthorizeTicketLogin: 'user/AuthorizeTicketLogin',
@@ -179,7 +191,7 @@ export default {
                 //是否显示验证码
                self.ignoreValidCode = resp.data.ignoreValidCode;
                //应用名称
-               self.appName=resp.data.appName;
+               //self.appName=resp.data.appName;
            });
         },
 
@@ -285,6 +297,26 @@ export default {
             this.customActiveKey = key
             // this.form.resetFields()
         },
+        handAdClick(e)
+        {
+            var cont = [{key: 'home-index', title: '首页', collapsed: false}];
+            var _self=this;
+            this.setNavigation(cont);
+            this.setActiveKey('home-index');
+            e.preventDefault()
+            const {
+                state,
+                AutoAdLogin
+            } = _self
+            state.loginBtn = true;
+            AutoAdLogin()
+                .then((res) => _self.loginSuccess(res))
+                .catch(err =>  _self.requestFailed(err))
+                .finally(() => {
+                    state.loginBtn = false
+                })
+        },
+
         //处理提交
         handleSubmit(e) {
             // 登录清空面包屑里的数据