From 32469acf9f1d0c682d962d1864d3f92413689ac4 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Fri, 2 Sep 2022 12:23:00 +0800
Subject: [PATCH] youhau daima

---
 api/fee/feeApi.js                          | 2 +-
 components/select-carnum/select-carnum.vue | 4 ++--
 constant/url.js                            | 6 ++++--
 lib/java110/utils/EnvUtil.js               | 2 +-
 pages/tempCarFee/tempCarFee.vue            | 2 +-
 pages/tempParkingFee/tempParkingFee.vue    | 4 ++++
 6 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/api/fee/feeApi.js b/api/fee/feeApi.js
index ab52ce6..0cb483f 100755
--- a/api/fee/feeApi.js
+++ b/api/fee/feeApi.js
@@ -212,7 +212,7 @@ export function toPayTempCarFee(_objData){
 export function toAliPayTempCarFee(_objData){
 	return new Promise((resolve, reject) => {
 	requestNoAuth({
-		url: url.payTempCarFee,
+		url: url.alipayPayTempCarFee,
 		method: "POST",
 		data: JSON.stringify(_objData), //动态数据
 		success: function(res) {
diff --git a/components/select-carnum/select-carnum.vue b/components/select-carnum/select-carnum.vue
index d34d56e..e397719 100644
--- a/components/select-carnum/select-carnum.vue
+++ b/components/select-carnum/select-carnum.vue
@@ -70,11 +70,11 @@
 			},
 			defProv:{
 				type:String,
-				default:'青'
+				default:'渝'
 			},
 			defChar:{
 				type:String,
-				default:'A'
+				default:'H'
 			},
 			gua: {
 				type: Boolean,
diff --git a/constant/url.js b/constant/url.js
index 896eb05..5d5ccb4 100755
--- a/constant/url.js
+++ b/constant/url.js
@@ -15,7 +15,7 @@ export default {
 	saveOwner: baseUrl + 'app/owner.saveOwner', //家庭成员列表
 	queryOwnerMembers: baseUrl + 'app/owner.queryOwnerMembers', //投诉建议列表
 	listComplaints: baseUrl + 'app/complaint.listComplaints', //添加投诉建议
-	saveComplaint: baseUrl + 'app/complaint', //查询业主房间
+	saveComplaint: baseUrl + 'app/complaint.saveComplaint', //查询业主房间
 	queryRoomsByOwner: baseUrl + 'app/room.queryRoomsByOwner', //绑定业主
 	appUserBindingOwner: baseUrl + 'app/owner.appUserBindingOwner', //查询绑定业主
 	ownerRegiter: baseUrl + 'app/owner.ownerRegister', //业主注册
@@ -149,7 +149,9 @@ export default {
 	listOwnerVisit: baseUrl + "app/visit.listVisits",
 		listSystemInfo:baseUrl+"app/system.listSystemInfo",
 		queryWaitPayFeeTempCar:baseUrl+"app/car.queryWaitPayFeeTempCar",
-		payTempCarFee:baseUrl+"app/alipay.payTempCarFee",
+		alipayPayTempCarFee:baseUrl+"app/alipay.payTempCarFee",
+		
+		getOpenIdFromAliPay:baseUrl+"app/alipay.getOpenIdFromAliPay",
 		
 		
 		
diff --git a/lib/java110/utils/EnvUtil.js b/lib/java110/utils/EnvUtil.js
index 2fa71fe..7efde61 100644
--- a/lib/java110/utils/EnvUtil.js
+++ b/lib/java110/utils/EnvUtil.js
@@ -3,7 +3,7 @@ export function isWxOrAli() {
 	if (/MicroMessenger/.test(window.navigator.userAgent)) {
 		_env = "WECHAT"
 	} else if (/AlipayClient/.test(window.navigator.userAgent)) {
-		_env = "ALI"
+		_env = "ALIPAY"
 	} else {
 		_env = "OTHER"
 	}
diff --git a/pages/tempCarFee/tempCarFee.vue b/pages/tempCarFee/tempCarFee.vue
index 182173d..9121d49 100644
--- a/pages/tempCarFee/tempCarFee.vue
+++ b/pages/tempCarFee/tempCarFee.vue
@@ -172,7 +172,7 @@
 				})
 			},
 			onPayFee: function() {
-				if(isWxOrAli == 'ALIPAY'){
+				if(isWxOrAli() == 'ALIPAY'){
 					this.onAliPayPayFee();
 				}else{
 					this.onWxPayFee();
diff --git a/pages/tempParkingFee/tempParkingFee.vue b/pages/tempParkingFee/tempParkingFee.vue
index 9e8cbe0..338c43e 100644
--- a/pages/tempParkingFee/tempParkingFee.vue
+++ b/pages/tempParkingFee/tempParkingFee.vue
@@ -233,6 +233,10 @@
 					appId: this.aliAppId,
 					scopes: ['auth_base'],
 				}, function(res) {
+					uni.showToast({
+						title:JSON.stringify(res),
+						icon:'none'
+					})
 					ap.alert(JSON.stringify(res));
 					getOpenIdFromAliPay({
 						authCode:res.authCode,