diff --git a/.env.dev b/.env.dev index d0fe90cc483ca1826a1f899296b586dcd8cf8940..aa76a07eca9f1ecc4201e546f2063291dbc7a62a 100644 --- a/.env.dev +++ b/.env.dev @@ -21,5 +21,7 @@ VUE_APP_MS_APPLICATION_API = http://15.1.48.21:9140/ms-application VUE_APP_QL_FORM_API = http://152.136.68.93:9018/ms-qing-long/api/v1/des-cache-info/permit_endpoint/query-cacheversion-by-appid-cachetype // 启动网关 (on | off) VUE_APP_ENABLE_GATEWAY = off +VUE_APP_BASE_API = http://10.2.3.118:9165/online-financial-service/api/v1/cust-info/permit_endpoint + diff --git a/src/constants/api/login/login-mgt.api.ts b/src/constants/api/login/login-mgt.api.ts index 61264240effacb8ba558a7f9bf5e65c2f447c6f6..84f72fe7cb0c872ac2fbfb1d384bae55e6287c99 100644 --- a/src/constants/api/login/login-mgt.api.ts +++ b/src/constants/api/login/login-mgt.api.ts @@ -8,9 +8,12 @@ */ import { MethodType } from "@/constants/enum/general/method-type.enum"; import { HeaderType } from "@/constants/enum/general/header-type.enum"; -const prefix = "http://10.0.2.248:9165/online-financial-service/api/v1/cust-info/permit_endpoint" -// const prefix = process.env.VUE_APP_BASE_API; -console.log(prefix+"================="); +// const prefix = "http://10.0.2.248:9165/online-financial-service/api/v1/cust-info/permit_endpoint" +const prefix = process.env.VUE_APP_BASE_API; + + +// const prefix = "http://10.0.3.144:9165/online-financial-service/api/v1/cust-info/permit_endpoint" +// console.log(prefix+"================="); const loginApi = { updatePicCode: { url: prefix + "/getVerifyCode", diff --git a/src/constants/api/login/regist-mgt.api.ts b/src/constants/api/login/regist-mgt.api.ts index 728f8adb896a0e6ca64ea6ec4c35349bb637c219..3daa9a086f7400a5bf2d9111b5c1ab2520c2ad70 100644 --- a/src/constants/api/login/regist-mgt.api.ts +++ b/src/constants/api/login/regist-mgt.api.ts @@ -10,7 +10,9 @@ import { MethodType } from "@/constants/enum/general/method-type.enum"; import { HeaderType } from "@/constants/enum/general/header-type.enum"; // const prefix = "http://10.2.3.118:9165/online-financial-service/api/v1/cust-info/permit_endpoint" -const prefix = "http://10.0.2.248:9165/online-financial-service/api/v1/cust-info/permit_endpoint" +// const prefix = "http://10.0.3.144:9165/online-financial-service/api/v1/cust-info/permit_endpoint" +const prefix = process.env.VUE_APP_BASE_API; + const registApi = { registSystem: { url: prefix + "/register", diff --git a/src/services/api.service.ts b/src/services/api.service.ts index 25c7ee92de6c7e86f1ba63908e96b123123f8679..aae30d4d8954dce5121719c3c4ed5592400185f1 100644 --- a/src/services/api.service.ts +++ b/src/services/api.service.ts @@ -176,9 +176,12 @@ class ApiService { path = query != null ? this.urlQueryConvert(path, query) : path; console.log("服务调用--" + path); - return Vue.axios.post(`${path}`, params, requestConfig).then(this.createBusCodeHandler(query)).catch(this.createErrorHandler()); - + // return Vue.axios.post(`${path}`, params, requestConfig).then(this.createBusCodeHandler(query)).catch(this.createErrorHandler()); + return Vue.axios.post(`${path}`, params, requestConfig).then(res=>{ + //TODO + return res.data + }); } /** * POST请求 文件上传 diff --git a/src/views/authentication/LoginView.vue b/src/views/authentication/LoginView.vue index 63e9e2ca59fc2fe33e6036850782d860d5aacadc..d4691889d40d5932d65afec6582cf30d046e1a94 100644 --- a/src/views/authentication/LoginView.vue +++ b/src/views/authentication/LoginView.vue @@ -195,21 +195,23 @@ export default class LoginView extends Vue { //验证码失败刷新 //this._updatePicCode(); let param = { - phone: this.loginNo, + loginNo: this.loginNo, //图形验证码 imageVerifyKey: this.imageSrcValue, //渠道 - loginType: "2", + loginType: "5", //手机验证码 messCode: this.sms, //密码 - passWord: this.password + credential: this.password } apiService.general(loginApi.loginSystem, undefined, param, undefined).then((response: RestfulResponse) => { console.log(response); //发送请求就保存账号 localStorage.setItem('loginNo', this.loginNo); + // debugger; if (response.code == Code.SUCCESS.code) { + Toast(response.msg+""); this.$router.push({ name: `Mianview`, params: { diff --git a/src/views/login/Register.vue b/src/views/login/Register.vue index dfaf61fc1a52f42e74bd6f61bbc868137c53f978..80fe1b7d71dcc6078fd5c1d401ef3cc9a06407f8 100644 --- a/src/views/login/Register.vue +++ b/src/views/login/Register.vue @@ -152,7 +152,7 @@ export default class ForgetPassView extends Vue { registSystem() { if (this.password === this.restpassword && this.checked) { let param = { - phone: this.phone, + loginNo: this.phone, //短信验证码TODO phoneVerifyCode: this.sms, //数字渠道 @@ -170,6 +170,7 @@ export default class ForgetPassView extends Vue { } }) } + Toast(response.msg + ""); }); } } diff --git a/src/views/main/Main.vue b/src/views/main/Main.vue index 0aca7e373ca6b74a6233ccfa9560f37b18809b59..9b91e538e56e64df28de579c8d1b2634050a296f 100644 --- a/src/views/main/Main.vue +++ b/src/views/main/Main.vue @@ -302,7 +302,7 @@ - +