Merge branch 'main' of https://git.evo-techina.com/hbyt/hd-miniprogram

src/minePages/account/index.vue

@@ -37,7 +37,7 @@
 					</view>
 					<view style="text-align: right;">
 						<view v-if="n.tradeType == 1" style="padding-bottom: 8rpx;font-size: 40rpx;color: #00aa00;">+<text>{{n.tradeTotalAmount/100}}</text></view>
-						<view v-else-if="n.tradeType == 2" style="padding-bottom: 8rpx;font-size: 40rpx;color: #191919;"><text>{{n.tradeTotalAmount/100}}</text></view>
+						<view v-else-if="n.tradeType == 2" style="padding-bottom: 8rpx;font-size: 40rpx;color: #191919;">-<text>{{n.tradeTotalAmount/100}}</text></view>
 						<view v-else-if="n.tradeType == 9" style="padding-bottom: 8rpx;font-size: 40rpx;color: #c79a11;">-<text>{{n.tradeTotalAmount/100}}</text></view>
 					</view>
 				</view>
@@ -236,8 +236,8 @@
 	
 	function getInfor() {
 		getaccou(uni.getStorageSync('wxuid')).then((rps:any) => {
-			if(rps.data.records){
+			if(rps.data){
-				totalAmount.value =	rps.data.records[0].totalAmount
+				totalAmount.value =	rps.data.totalAmount
 				uni.setStorageSync('totalAmount',totalAmount.value)
 			}
 		})

src/minePages/payment/index.vue

@@ -62,8 +62,8 @@
 		orderNo.value = opt.orderNo
 		
 		getaccou(uni.getStorageSync('wxuid')).then((rps:any) => {
-			if(rps.data.records){
+			if(rps.data){
-				totalAmount.value = rps.data.records[0].totalAmount
+				totalAmount.value = rps.data.totalAmount
 				iskt.value = true 
 				if(opt.amount*1 > totalAmount.value*1){
 					iskzf.value = false

src/pages/home/index.vue

@@ -284,6 +284,7 @@ function getinfo(){
 	//获取换电站
 	covers.value.splice(0)
 	gethdz({
+		longitudeAndLatitude: latitude.value+","+longitude.value
 		//plateNum:formdata.plateNum
 	}).then((rps:any) => {
 		
@@ -337,10 +338,10 @@ function getinfo(){
 	
 	//获取账户信息
 	getaccou(uni.getStorageSync('wxuid')).then((rps:any) => {
-		if(rps.data.records){
+		if(rps.data){
-			account.value =	rps.data.records[0]
+			account.value =	rps.data
-			uni.setStorageSync('totalAmount', rps.data.records[0].totalAmount)
+			uni.setStorageSync('totalAmount', rps.data.totalAmount)
-			uni.setStorageSync('walletCode', rps.data.records[0].code)
+			uni.setStorageSync('walletCode', rps.data.code)
 		}
 	})
 }

src/pages/mine/index.vue

@@ -233,10 +233,10 @@
 			
 			//获取账户信息
 			getaccou(uni.getStorageSync('wxuid')).then((rps:any) => {
-				if(rps.data.records){
+				if(rps.data){
-					totalAmount.value = rps.data.records[0].totalAmount
+					totalAmount.value = rps.data.totalAmount
-					uni.setStorageSync('totalAmount', rps.data.records[0].totalAmount)
+					uni.setStorageSync('totalAmount', rps.data.totalAmount)
-					uni.setStorageSync('walletCode', rps.data.records[0].code)
+					uni.setStorageSync('walletCode', rps.data.code)
 				}
 			})
 			

src/utils/service.ts

@@ -193,7 +193,7 @@ export function carlist(wuid:String){
 // 	stationCode:String
 // }
 export function payment(parameter:any){
-	return request('post_json','/wechat/wechatpay/xcx/prepay',parameter)
+	return request('post_json','/wechat/pay/wechatpay/applet',parameter)
 }
 
 //获取ip
@@ -208,7 +208,7 @@ export function openaccou(wuid:string){
 
 //查询钱包账户
 export function getaccou(wuid:string){
-	return request('post_form','/wechat/wechat/user/wallet/list',{wuid})
+	return request('post_form','/wechat/wechat/user/wallet/one',{wuid})
 }
 
 //余额明细列表
@@ -224,7 +224,7 @@ export function balancedetails(parameter:Balande){
 //转出余额
 
 export function zcbalan(wuid:string,total:string|number){
-	return request('post_json','/wechat/wechatpay/xcx/refundsBalance',{
+	return request('post_json','/wechat/pay/wechatpay/refunds',{
 		wuid,
 		total
 	})