合并冲突

src/api/user.js

@@ -91,6 +91,13 @@ export const _apiLogin = {
     getPhoneAreaCode:(params)=>{
         return get('/user_login/area_code/list',params)
     },
+
+    /**
+     * 校验用户是否为域用户登录
+     */
+    checkUserIsLdap:params=>{
+        return post('/user_login/ldap/user_check',params)
+    },
     /**
      * 获取备案信息
      * @returns 

src/views/Login.vue

@@ -58,13 +58,17 @@ const onSubmit2 = ()=>{
     //根据activeModel验证值
     const values = loginForm.value.getValues()
     if(activeModel.value==='ordinaryModel'){
-        loginForm.value.validate(['username','password']).then(()=>{
+        loginForm.value.validate(['username','password']).then(async ()=>{
             const t=new Date().getTime()
             const md5Key='MiQM9yusNA9T2uIH'
+            // 校验是否为域用户登录
+            let isLdap=false
+            const checkRes=await _apiLogin.checkUserIsLdap({UserName:values.username})
+            if(checkRes.Ret===200&&checkRes.Data) isLdap=true
             userLogin({
                 LoginType:1,
                 Username:values.username,
-                Password:md5(md5(values.password)+md5Key+t),
+                Password:isLdap?Base64.encode(values.password+md5Key): md5(md5(values.password)+md5Key+t),
                 ReqTime:`${t}`
             },values)
         }).catch((error)=>{
@@ -77,6 +81,7 @@ const onSubmit2 = ()=>{
             userLogin({
                 LoginType:2,
                 Mobile:values.mobile,
+                TelAreaCode:mobileModel.value.mobileTelAreaCode,
                 VerifyCode:values.mobileCode
             })
         }).catch((error)=>{

src/views/login/MobileModel.vue

@@ -87,7 +87,8 @@ function checkForm(){
 }
 
 defineExpose({
-    getPicCode
+    getPicCode,
+    mobileTelAreaCode
 })
 </script>