diff --git a/.env.dev b/.env.dev index 98ceb1a2..08fb4e8b 100644 --- a/.env.dev +++ b/.env.dev @@ -30,4 +30,4 @@ VITE_OUT_DIR=dist VITE_APP_CAPTCHA_ENABLE=false # 登录相关,如果后端启用oauth2,则返回 oauth2client ,如果后端不启用oauth2,后端账户使用mdp-lcode服务,则返回 lcode ,如果使用mdp-sys提供服务,则返回sys -VITE_CTX_LOGIN=lcode +# VITE_CTX_LOGIN=oauth2client diff --git a/.env.prod b/.env.prod index a92d6f88..6d638747 100644 --- a/.env.prod +++ b/.env.prod @@ -26,3 +26,6 @@ VITE_BASE_PATH=./ # 输出路径 VITE_OUT_DIR=dist-prod + +# 登录相关,如果后端启用oauth2,则返回 oauth2client ,如果后端不启用oauth2,后端账户使用mdp-lcode服务,则返回 lcode ,如果使用mdp-sys提供服务,则返回sys +# VITE_CTX_LOGIN=oauth2client diff --git a/src/api/login/index.ts b/src/api/login/index.ts index f53156cf..fb22c556 100644 --- a/src/api/login/index.ts +++ b/src/api/login/index.ts @@ -4,8 +4,7 @@ import type { UserLoginVO } from './types' import config from '@/api/mdp_pub/mdp_config' - -const base=config.getLoginCtx(); + export interface SmsCodeVO { mobile: string @@ -19,7 +18,7 @@ export interface SmsLoginVO { // 登录 export const login = (data: UserLoginVO) => { - return axios.post(base+'/login/token?grantType='+data.grantType, data ) + return axios.post(config.getLoginCtx()+'/login/token?grantType='+data.grantType, data ) } // 刷新访问令牌 @@ -51,7 +50,7 @@ export function getUserInfo(params) { } const data=params; return axios.request({ - url: base+'/user/info', + url: config.getLoginCtx()+'/user/info', method: 'post', data }) @@ -98,7 +97,7 @@ export function switchUser(userloginid, password,grantType,authType,deptid,useri userid:userid, } return axios.request({ - url: base+'/login/token?grantType='+grantType, + url: config.getLoginCtx()+'/login/token?grantType='+grantType, method: 'post', data }) @@ -109,7 +108,7 @@ export function setDefLogin(userid,defLogin) { defLogin:defLogin } return axios.request({ - url: base+'/user/setDefLogin', + url: config.getLoginCtx()+'/user/setDefLogin', method: 'post', data }) @@ -119,7 +118,7 @@ export function checkUserid(userid ) { userid: userid } return axios.request({ - url: base+'/user/check/userid', + url: config.getLoginCtx()+'/user/check/userid', method: 'post', data }) @@ -129,7 +128,7 @@ export function checkDisplayUserid(displayUserid ) { displayUserid: displayUserid } return axios.request({ - url: base+'/user/check/displayUserid', + url: config.getLoginCtx()+'/user/check/displayUserid', method: 'post', data }) @@ -138,7 +137,7 @@ export function checkDisplayUserid(displayUserid ) { export function updatePhoneno(params ) { const data = params return axios.request({ - url: base+'/user/update/phoneno', + url: config.getLoginCtx()+'/user/update/phoneno', method: 'post', data }) @@ -148,14 +147,14 @@ export function checkPhoneno(phoneno ) { phoneno: phoneno } return axios.request({ - url: base+'/user/check/phoneno', + url: config.getLoginCtx()+'/user/check/phoneno', method: 'post', data }) } export function queryByUserloginid( params ) { return axios.request({ - url: base+'/user/queryByUserloginid', + url: config.getLoginCtx()+'/user/queryByUserloginid', method: 'get', params:params }) @@ -174,7 +173,7 @@ export function doRegister( userInfo ) { branchId:userInfo.branchId } return axios.request({ - url: base+'/user/register', + url: config.getLoginCtx()+'/user/register', method: 'post', data }) @@ -188,7 +187,7 @@ export function resetPasswordByPhoneno( userInfo ) { userid:userInfo.userid } return axios.request({ - url: base+'/user/password/reset?type=sms', + url: config.getLoginCtx()+'/user/password/reset?type=sms', method: 'post', data }) @@ -202,7 +201,7 @@ export function resetPasswordByPhoneno( userInfo ) { export function sendEmail(params) { const data=params; return axios.request({ - url: base+'/user/sendEmail', + url: config.getLoginCtx()+'/user/sendEmail', method: 'post', data }) @@ -213,7 +212,7 @@ export function sendEmail(params) { export function validEmailCode(params) { return axios.request({ - url: base+'/user/validEmailCode', + url: config.getLoginCtx()+'/user/validEmailCode', method: 'get', params:params }) @@ -239,7 +238,7 @@ export function getTpaState( ) { */ export function queryMyUsers( ) { return axios.request({ - url: base+'/user/queryMyUsers', + url: config.getLoginCtx()+'/user/queryMyUsers', method: 'get' }) } \ No newline at end of file diff --git a/src/api/mdp_pub/mdp_api_ext.js b/src/api/mdp_pub/mdp_api_ext.js index 95432f24..8046ad1a 100644 --- a/src/api/mdp_pub/mdp_api_ext.js +++ b/src/api/mdp_pub/mdp_api_ext.js @@ -42,14 +42,14 @@ editUser : params => { return axios.post(`${sysBase}/mdp/sys/user/edit`, params) editSomeFieldsUser : params => { return axios.post(`${sysBase}/mdp/sys/user/editSomeFields`, params);}, //管理人员帮别人重置密码 -resetPasswordByAdmin : params => { return axios.post(`${sysBase}/sys/user/resetPassword`, params);}, +resetPasswordByAdmin : params => { return axios.post(`${sysBase}/mdp/sys/user/resetPassword`, params);}, //修改自己的密码 -changePassword : params => { return axios.post(`${sysBase}/sys/user/changePassword`, params);}, +changePassword : params => { return axios.post(`${sysBase}/mdp/sys/user/changePassword`, params);}, //更新当前登录着的头像 -editHeadimgurl : params => { return axios.post(`${sysBase}/sys/user/editHeadimgurl`, params); }, +editHeadimgurl : params => { return axios.post(`${sysBase}/mdp/sys/user/editHeadimgurl`, params); }, //查询机构列表 listBranch : params => { return axios.get(`${sysBase}/mdp/sys/branch/list`, { params: params }); }, diff --git a/src/api/mdp_pub/mdp_config.js b/src/api/mdp_pub/mdp_config.js index fe64c5af..96f30992 100644 --- a/src/api/mdp_pub/mdp_config.js +++ b/src/api/mdp_pub/mdp_config.js @@ -12,7 +12,7 @@ export default { //登录相关,如果后端启用oauth2,则返回 oauth2client ,如果后端不启用oauth2,后端账户使用mdp-lcode服务,则返回 lcode ,如果使用mdp-sys提供服务,则返回sys getLoginCtx:function(){ - return import.meta.env.VITE_CTX_LOGIN||'oauth2client' + return import.meta.env.VITE_CTX_LOGIN||'lcode' }, //模块订单 如果后端使用mdp-lcode提供订单服务,则返回lcode,如果使用mdp-sys服务,则返回sys diff --git a/src/components/mdp-ui-ext/mdp-select-dept/Index.vue b/src/components/mdp-ui-ext/mdp-select-dept/Index.vue index 7018d0f4..d2a30ff6 100644 --- a/src/components/mdp-ui-ext/mdp-select-dept/Index.vue +++ b/src/components/mdp-ui-ext/mdp-select-dept/Index.vue @@ -89,7 +89,7 @@ import DeptTree from './DeptTree.vue';//下拉框数据查询 }, onTreeConfirm(row){ - this.$refs['select'].onTableDataSelect(this.multiple?[row]:row) + this.$refs['select'].onTableDataSelect(this.multiple?row:[row]) this.$refs['tableDialog'].close() }, onChange2(row){ @@ -97,9 +97,9 @@ import DeptTree from './DeptTree.vue';//下拉框数据查询 this.$emit("selected", row); this.$emit("change2", row); }, - onChange(val){ + onChange(val){ this.$emit("change", val); - this.$emit("input",val); + this.$emit("update:modelValue",val); }, onClear(){ this.$emit("clear");