From c072be13747eba528a2821e9575b416a94777e01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cgrape=E2=80=9D?= <18746553572@163.com>
Date: Mon, 5 Sep 2022 13:52:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.dev | 2 ++
src/constants/api/login/login-mgt.api.ts | 9 ++++++---
src/constants/api/login/regist-mgt.api.ts | 4 +++-
src/services/api.service.ts | 7 +++++--
src/views/authentication/LoginView.vue | 8 +++++---
src/views/login/Register.vue | 3 ++-
src/views/main/Main.vue | 6 +++++-
src/views/workbench/businessProgress.vue | 2 +-
8 files changed, 29 insertions(+), 12 deletions(-)
diff --git a/.env.dev b/.env.dev
index d0fe90c..aa76a07 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 6126424..84f72fe 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 728f8ad..3daa9a0 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 25c7ee9..aae30d4 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 63e9e2c..d469188 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 dfaf61f..80fe1b7 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 0aca7e3..9b91e53 100644
--- a/src/views/main/Main.vue
+++ b/src/views/main/Main.vue
@@ -302,7 +302,7 @@
</van-row>
</div>
- <scroller-view v-calculate-height class="product">
+ <scroller-view v-calculate-height pulldown="true" pullup="true" :height="10000" class="product" >
<div
v-for="(item, index) in productList"
:key="index"
@@ -374,6 +374,10 @@ export default class Main extends Vue {
vanvcol42 = "vandilote";
vanvcol43 = "vandilote";
vanvcol44 = "vandilote";
+
+
+
+
active=0;
areaList = area;
outcsinfo = {
diff --git a/src/views/workbench/businessProgress.vue b/src/views/workbench/businessProgress.vue
index 3ecf549..418f7bd 100644
--- a/src/views/workbench/businessProgress.vue
+++ b/src/views/workbench/businessProgress.vue
@@ -2,7 +2,7 @@
* @ Author: zhaowei
* @ Create Time: 2022-09-3 10:20:17
* @ Modified by: zhaowei
- * @ Modified time: 2022-09-03 11:39:54
+ * @ Modified time: 2022-09-03 11:41:35
* @ Description:
-->
--
2.22.0