From 07fee088810805991ecf5c7cef7a157d78b29397 Mon Sep 17 00:00:00 2001
From: chenbiao <chenbiao0828@foxmail.com>
Date: Fri, 20 May 2022 14:34:36 +0800
Subject: [PATCH] add 停车缴费支付订单页面  接口联调

---
 common/common.js                    |   2 +-
 common/requestServer.js             |   4 ++--
 pages.json                          |   9 +++++++++
 pages/parkPay/parkPay.vue           |  84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------
 pages/wxpaySuccess/wxpaySuccess.vue | 145 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 213 insertions(+), 31 deletions(-)
 create mode 100644 pages/wxpaySuccess/wxpaySuccess.vue

diff --git a/common/common.js b/common/common.js
index 8671229..856425b 100644
--- a/common/common.js
+++ b/common/common.js
@@ -65,7 +65,7 @@ const publicUnifiedOrder = serverUrl + "/business/h5/pay/weixinpay/publicUnified
 
 // 钱包-根据订单ID获取购买优惠券信息
 const couponInfo = serverUrl + "/business/h5/wallet/detail/couponInfo";
-// const couponInfo = "http://127.0.0.1:8075/business/h5/wallet/detail/couponInfo";
+// 根据车牌号查询车牌号订单支付详情
 const queryParkingRecordByCarNumbers ="https://pay.jycrtc.com/queryParkOrder/queryParkingRecordPageByCarNumbersForBusiness";
 
 
diff --git a/common/requestServer.js b/common/requestServer.js
index da33ece..1e7e4d6 100644
--- a/common/requestServer.js
+++ b/common/requestServer.js
@@ -52,7 +52,7 @@ export const myRequest = (options) => {
 					uni.hideLoading();
 					uni.showToast({
 						title: result.message,
-						icon: 'none',
+						icon: 'error',
 						duration: 2000
 					});
 				}
@@ -65,7 +65,7 @@ export const myRequest = (options) => {
 				console.log("请求失败", error);
 				uni.showToast({
 					title: error.message,
-					icon: 'none',
+					icon: 'error',
 					duration: 2000
 				})
 				// 失败数据
diff --git a/pages.json b/pages.json
index 8748915..106c6b6 100644
--- a/pages.json
+++ b/pages.json
@@ -278,6 +278,15 @@
 
 		}
 	  
+        ,{
+            "path" : "pages/wxpaySuccess/wxpaySuccess",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
diff --git a/pages/parkPay/parkPay.vue b/pages/parkPay/parkPay.vue
index 6cff815..e9df56a 100644
--- a/pages/parkPay/parkPay.vue
+++ b/pages/parkPay/parkPay.vue
@@ -1,9 +1,9 @@
 <template>
 	<view>
 
-		<view class="order-time">
+		<!-- 	<view class="order-time">
 			剩余支付时间: {{appOrderTimeout}}
-		</view>
+		</view> -->
 
 		<view class="order-title">
 			订单详情
@@ -13,19 +13,19 @@
 		</view>
 		<view class="order-line"></view>
 		<view class="order-info">
-			停车场：{{myorderinfo.parkName | tranNull}}
+			停车场：{{parkName | tranNull}}
 		</view>
 		<view class="order-line"></view>
 		<view class="order-info">
-			进场时间：{{myorderinfo.inparktime | tranNull}}
+			进场时间：{{parkInTime | tranNull}}
 		</view>
 		<view class="order-line"></view>
 		<view class="order-info">
-			停车时间：{{myorderinfo.staytime | timeFormatter}}
+			停车时间：{{staytime | timeFormatter}}
 		</view>
 		<view class="order-line"></view>
 		<view class="order-info">
-			总计费用：{{myorderinfo.due |toFixed2}}元
+			总计费用：{{due |toFixed2}}元
 		</view>
 		<view class="order-line"></view>
 
@@ -35,7 +35,7 @@
 			</view>
 			<view class="flex-row-justify-end">
 				<view class="order-info" style="font-weight:bold;font-size:17px ;">
-					{{myorderinfo.orderFee | toFixed2}}
+					{{orderFee | toFixed2}}
 				</view>
 				<view class="order-info" style="margin-right: 50upx;margin-left: 0px;">
 					元
@@ -70,17 +70,15 @@
 		data() {
 			return {
 				businessId: '',
-				mycarNumber: '',		
-				myorderinfo: {
-					parkName:'',
-					inparktime:'',
-					staytime:'',
-					due:'',
-					orderFee:'',
-				},	
-				appOrderTimeout:'0',
+				orderId: '',
+				mycarNumber: '',
+				parkName: '',
+				parkInTime: '',
+				staytime: '',
+				due: '',
+				orderFee: '',
+				// appOrderTimeout:'0',
 				totalFee: '', //应收
-				unPayFee: '' //实收
 			}
 		},
 		onLoad(params) {
@@ -90,7 +88,7 @@
 			this.mycarNumber = params.carNumber;
 			let indexInfo = uni.getStorageSync("indexInfo");
 			this.businessId = indexInfo.businessId;
-			console.log(this.mycarNumber,this.businessId)
+			console.log(this.mycarNumber, this.businessId)
 			this.getbBillQueryInfo();
 		},
 		onShow() {
@@ -99,20 +97,44 @@
 		methods: {
 
 			payClick() {
-				var that = this;
-				that.goPay_billQueryInfo();
+				let that = this;
+				let paramsData = {
+					payType: '35',
+					paySrcType: '101',
+					orderId: that.orderId,
+					payFee: that.orderFee,
+
+				}
+				// 获取 接口
+				that.$myRequest({
+					url: that.$common.accountPay,
+					method: 'POST',
+					data: that.$common.requestSign(paramsData)
+				}).then(res => {
+					console.log('余额支付:' + res)
+					uni.showToast({
+						title: "支付成功",
+						icon: 'success',
+						duration: 2000
+					});
+					setTimeout(function() {
+						uni.navigateTo({
+							url: '../inputCarNumber/inputCarNumber'
+						})
+					}, 2000);
+
+				})
 			},
 
 			getbBillQueryInfo() {
 				let that = this
 				let paramsData = {
 					carNumber: that.mycarNumber,
-					pageNum:'1',
-					pageSize:'10',
+					pageNum: '1',
+					pageSize: '10',
 					businessId: that.businessId,
-					terminalSource: '11',
 					parkState: '10',
-					
+
 				}
 				// 获取 接口
 				that.$myRequest({
@@ -120,10 +142,16 @@
 					method: 'POST',
 					data: that.$common.requestSign(paramsData)
 				}).then(res => {
-					console.log(res)
-					that.myorderinfo = res.data.dataList[0];
-					that.appOrderTimeout = res.data.dataList[0].appOrderTimeout;
-					 
+					console.log(res.data.dataList[0])
+					let data = res.data.dataList[0]
+
+					that.parkName = data.parkName;
+					that.parkInTime = data.parkInTime;
+					that.staytime = data.parkDuration;
+					that.due = data.totalFee;
+					that.orderFee = data.payFee;
+					that.orderId = data.orderId;
+
 				})
 
 			},
diff --git a/pages/wxpaySuccess/wxpaySuccess.vue b/pages/wxpaySuccess/wxpaySuccess.vue
new file mode 100644
index 0000000..ace3762
--- /dev/null
+++ b/pages/wxpaySuccess/wxpaySuccess.vue
@@ -0,0 +1,145 @@
+<template>
+	<view class="page-fill">
+		<view class="successicon">
+			<image class="imageIcon" src="../../static/orderInfo/orderinfo-success.png" mode=""></image>
+		</view>
+		<text class="paystatus">支付成功</text>
+		<text class="payinfo">
+			{{mycarNumber}} ￥{{payMoney|priceFormat()}}
+		</text>
+		<text class="paytime">
+			支付时间：{{dateStr}}
+		</text>
+		<view style="background: #d9d9d9;height:1px;margin-top:7px ;margin-left:15px ;opacity:  0.5; padding:0px;overflow:hidden;"></view>
+
+		<text class="payways">
+			支付方式：{{payWays}}
+		</text>
+		<view style="background: #d9d9d9;height:1px;margin-top:7px;margin-left:15px ;opacity: 0.5;padding:0px;overflow:hidden;"></view>
+		
+		<text v-if="appOrderTimeout !=''"  class="payways">
+			温馨提示：{{appOrderTimeout}}
+		</text>
+		<view v-if="appOrderTimeout !=''"   style="background: #d9d9d9;height:1px;margin-top:7px;margin-left:15px ;opacity: 0.5;padding:0px;overflow:hidden;"></view>
+		
+		<button @click="Click" class="button-sp-area" type="primary" plain="true">完成</button>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				mycarNumber:'',
+				payWays:'',
+				payMoney:0,
+				appOrderTimeout:'',
+				dateStr:''
+			}
+		},
+
+		onLoad(params) {
+			wx.showShareMenu({
+				withShareTicket: true
+			})
+			this.mycarNumber = params.carNumber;
+
+			this.payWays = params.payWays;
+			this.payMoney = params.payMoney;
+			this.appOrderTimeout = params.appOrderTimeout; 
+			this.getNowDate();
+		},
+		methods: {
+			Click() {
+				uni.navigateTo({
+					url: '../index/idnex'
+				
+				});
+			},
+			getNowDate(){
+				var dateTime = new Date();
+				this.dateStr = this.getDateWeek(dateTime);
+				
+			},
+			
+		getDateWeek(now) {
+			// var now=new Date();
+			var year = now.getFullYear(); //获取四位数年数
+			var month = now.getMonth() + 1;
+			var date = now.getDate();
+			var weeknum = now.getDay();
+
+			var s = year + '-' + this.Appendzero(month) + '-' + this.Appendzero(date);
+			return s;
+		},
+		Appendzero(obj) {
+			if (obj < 10) return '0' + '' + obj;
+			else return obj;
+		}
+		}
+	}
+</script>
+
+<style>
+	.page-fill {
+		width: 100%;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+	}
+
+	.imageIcon {
+		width: 96px;
+		height: 95px;
+		margin-top: 42px;
+		margin-left: auto;
+		margin-right: auto;
+		/* margin: 42px auto; */
+		display: flex;
+		justify-content: center;
+
+
+	}
+
+	.paystatus {
+		margin-top: 20px;
+		font-weight: bold;
+		font-size: 18px;
+		color: #404040;
+		display: flex;
+		justify-content: center;
+	}
+
+	.payinfo {
+		margin-top: 3px;
+		font-size: 16px;
+		color: #404040;
+		display: flex;
+		justify-content: center;
+	}
+
+	.paytime {
+		margin-top: 51px;
+		margin-left: 15px;
+		font-size: 14px;
+		color: #404040;
+		display: flex;
+		justify-content: flex-start;
+	}
+
+	.payways {
+		margin-top: 17px;
+		margin-left: 15px;
+		font-size: 14px;
+		color: #404040;
+		display: flex;
+		justify-content: flex-start;
+	}
+
+	.button-sp-area {
+		margin: 0 auto;
+		width: 60%;
+		margin-top: 114px;
+
+	}
+</style>
--
libgit2 0.21.4