From 9d632cab9edfbddebac035d5b3400a9620d3793b Mon Sep 17 00:00:00 2001
From: liugongyu <290219706@qq.com>
Date: Tue, 20 Sep 2022 14:57:41 +0800
Subject: [PATCH] 购买卡券接口添加plNo参数

---
 common/common.js                   |   2 +-
 pages/businessCard/provideCard.vue |  21 ++++++++++++++++++++-
 pages/index/index.vue              |   2 +-
 pages/parkPay/parkPay.vue          | 568 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 4 files changed, 314 insertions(+), 279 deletions(-)

diff --git a/common/common.js b/common/common.js
index e2c4620..14f44a8 100644
--- a/common/common.js
+++ b/common/common.js
@@ -1,7 +1,7 @@
 import md5 from './md5.min.js';
 // 江阴正式环境
 var serverUrl = "https://bus.jycrtc.com";
-// 测试 http://test.jycrtc.com:8096     正式 https://bus.jycrtc.com
+// 测试 http://221.228.70.87:8096      正式 https://bus.jycrtc.com
 var serverPayUrl = ''
 // 测试环境
 // var serverUrl = "http://test.jycrtc.com:8096";
diff --git a/pages/businessCard/provideCard.vue b/pages/businessCard/provideCard.vue
index 46bb463..3e0beb9 100644
--- a/pages/businessCard/provideCard.vue
+++ b/pages/businessCard/provideCard.vue
@@ -65,15 +65,34 @@ export default {
     this.getCouponDynamicQR()
     that.timer = setInterval(() => {
       // 业务逻辑
-      console.log('11')
+      console.log(that.dateFormat(Date.parse(new Date())))
       that.getCouponDynamicQR() //调用二维码方法
     }, 60000)
   },
+  onUnload() {
+    if(this.timer) {
+      clearTimeout(this.timer);
+      this.timer = null;
+    }
+  },
   onShow() {
     var me = this;
   },
   computed: {},
   methods: {
+    dateFormat(time) {
+      let date = new Date(time);
+      let year = date.getFullYear();
+      // 在日期格式中，月份是从0开始的，因此要加0，使用三元表达式在小于10的前面加0，以达到格式统一  如 09:11:05
+      let month = date.getMonth() + 1 < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1;
+      let day = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
+      let hours = date.getHours() < 10 ? "0" + date.getHours() : date.getHours();
+      let minutes = date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes();
+      let seconds = date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds();
+      // 拼接
+      return year + "年" + month + "月" + day + "日" + hours + ":" + minutes + ":" + seconds;
+      // return year + "-" + month + "-" + day;
+    },
     getCouponDynamicQR() {
       let that = this
       let paramsData = {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index d66555a..065ee6a 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -21,7 +21,7 @@
 				<button type="primary" @click="login">登录</button>
 			</view>
 			<view class="uni-common-mt login-foot">
-				点击”登录“，即表示你同意<view style="color: blue;">《商户用户协议》</view>
+				点击"登录"，即表示你同意<view style="color: blue;">《商户用户协议》</view>
 			</view>
 		</view>
 		<view class="bg-white" v-else>
diff --git a/pages/parkPay/parkPay.vue b/pages/parkPay/parkPay.vue
index 67b256b..5359894 100644
--- a/pages/parkPay/parkPay.vue
+++ b/pages/parkPay/parkPay.vue
@@ -1,311 +1,327 @@
 <template>
-	<view>
+    <view>
 
-		<!-- 	<view class="order-time">
+        <!-- 	<view class="order-time">
             剩余支付时间: {{appOrderTimeout}}
         </view> -->
 
-		<view class="order-title">
-			订单详情
-		</view>
-		<view class="order-info">
-			车牌号：{{mycarNumber | tranNull}}
-		</view>
-		<view class="order-line"></view>
-		<view class="order-info">
-			停车场：{{parkName | tranNull}}
-		</view>
-		<view class="order-line"></view>
-		<view class="order-info">
-			进场时间：{{parkInTime | tranNull}}
-		</view>
-		<view class="order-line"></view>
-		<view class="order-info">
-			停车时间：{{staytime | timeFormatter}}
-		</view>
-		<view class="order-line"></view>
-		<view class="order-info">
-			总计费用：{{due |toFixed2}}元
-		</view>
-		<view class="order-line"></view>
+        <view class="order-title">
+            订单详情
+        </view>
+        <view class="order-info">
+            车牌号：{{mycarNumber | tranNull}}
+        </view>
+        <view class="order-line"></view>
+        <view class="order-info">
+            停车场：{{parkName | tranNull}}
+        </view>
+        <view class="order-line"></view>
+        <view class="order-info">
+            进场时间：{{parkInTime | tranNull}}
+        </view>
+        <view class="order-line"></view>
+        <view class="order-info">
+            停车时间：{{staytime | timeFormatter}}
+        </view>
+        <view class="order-line"></view>
+        <view class="order-info">
+            总计费用：{{due |toFixed2}}元
+        </view>
+        <view class="order-line"></view>
 
-		<view class="flex-row-justify-between">
-			<view class="order-info">
-				需支付金额
-			</view>
-			<view class="flex-row-justify-end">
-				<view class="order-info" style="font-weight:bold;font-size:18px;">
-					{{orderFee | toFixed2}}
-				</view>
-				<view class="order-info" style="margin-right: 50upx;margin-left: 0px;">
-					元
-				</view>
-			</view>
-		</view>
-		<!-- <view class="uni-list-cell-pd pos-rel">
-			<input class="" type="number"
-				style="background-color: #fff;height:40px;line-height: 40px;padding-left: 15px;font-size: 20px;" v-model="rechargeNum"
-				@input="checkNum" :maxlength="maxlength" placeholder="确认支付金额(单位:元)">
-			<view class="pos-abs paywarp">
-				元
-			</view>
-		</view> -->
-		<view class="order-line-bold"></view>
+        <view class="flex-row-justify-between">
+            <view class="order-info">
+                需支付金额
+            </view>
+            <view class="flex-row-justify-end">
+                <view class="order-info" style="font-weight:bold;font-size:18px;">
+                    {{orderFee | toFixed2}}
+                </view>
+                <view class="order-info" style="margin-right: 50upx;margin-left: 0px;">
+                    元
+                </view>
+            </view>
+        </view>
+        <!-- <view class="uni-list-cell-pd pos-rel">
+            <input class="" type="number"
+                style="background-color: #fff;height:40px;line-height: 40px;padding-left: 15px;font-size: 20px;" v-model="rechargeNum"
+                @input="checkNum" :maxlength="maxlength" placeholder="确认支付金额(单位:元)">
+            <view class="pos-abs paywarp">
+                元
+            </view>
+        </view> -->
+        <view class="order-line-bold"></view>
 
-		<view class="order-title">
-			支付方法
-		</view>
-		<view class="order-line"></view>
+        <view class="order-title">
+            支付方法
+        </view>
+        <view class="order-line"></view>
 
-		<view class="orderwaysview">
-			<!--<image src="../../static/orderInfo/orderinfo-wechat.png" class="orderways"></image>-->
-			<view class="order-info" style="margin-left: 15px;">
-				商户余额
-			</view>
-			<image src="../../static/orderInfo/orderinfo-sel.png" class="orderwaysSel"></image>
+        <view class="orderwaysview">
+            <!--<image src="../../static/orderInfo/orderinfo-wechat.png" class="orderways"></image>-->
+            <view class="order-info" style="margin-left: 15px;">
+                商户余额
+            </view>
+            <image src="../../static/orderInfo/orderinfo-sel.png" class="orderwaysSel"></image>
 
-		</view>
+        </view>
 
-		<view class="order-line"></view>
-		<button @click="payClick" class="button-sp-area" type="primary" plain="true">确认支付</button>
+        <view class="order-line"></view>
+        <button @click="payClick" class="button-sp-area" type="primary" plain="true" :loading="loadingFlag"
+                :disabled="disabledFlag">{{btnText}}
+        </button>
 
-	</view>
+    </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				businessId: '',
-				orderId: '',
-				mycarNumber: '',
-				parkName: '',
-				parkInTime: '',
-				staytime: '',
-				due: '',
-				orderFee: '',
-				// appOrderTimeout:'0',
-				totalFee: '', //应收
-				// rechargeNum: '',
-				// maxlength: 6 //默认一个长度
-			}
-		},
-		onLoad(params) {
-			wx.showShareMenu({
-				withShareTicket: true
-			})
-			let data = JSON.parse(params.optionData)
-			this.mycarNumber = data.carNumber
-			this.parkName = data.parkName;
-			this.parkInTime = data.parkInTime;
-			this.staytime = data.parkDuration;
-			this.due = data.totalFee;
-			this.orderFee = data.unPayFee;
-			// this.rechargeNum = data.unPayFee / 100;
-			this.orderId = data.orderId;
-		},
-		onShow() {},
-		methods: {
-			checkNum(e) {
-				let value = e.detail.value;
-				let dot = value.indexOf('.'); //包含小数点
-				let reg = /^[0-9]+$/; //正整数
-				if (dot > -1) {
-					this.maxlength = dot + 3; //长度是小数点后两位
-					if (value.length > dot + 3) {}
-				}
-				if (reg.test(value)) { //如果是正整数不包含小数点
-					this.maxlength = 6;
-				}
-			},
-			payClick() {
-					let that = this;
-					let orderFee = that.orderFee;
-					
-					let paramsData = {
-						payType: '35',
-						paySrcType: '101',
-						orderId: that.orderId,
-						payFee: 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() {
-							let pages = getCurrentPages(); //当前页
-							let beforePage = pages[pages.length - 2];
-							uni.navigateBack({
-								success: function() {
-									beforePage.onLoad();
-								}
-							})
-						}, 2000);
-					})
-			
-				},
-			
-			// payClick() {
-			// 	let that = this;
-			// 	let orderFee = that.orderFee;
-			// 	let rechargeNum = that.rechargeNum;
-			// 	if (rechargeNum <= 0) {
-			// 		return uni.showToast({
-			// 			title: '不能输入小于等于0的金额',
-			// 			icon: 'error'
-			// 		})
-			// 	} else if (rechargeNum === " ") {
-			// 		return uni.showToast({
-			// 			title: '金额不能为空',
-			// 			icon: 'error'
-			// 		})
-			// 	} else if (rechargeNum > orderFee) {
-			// 		return uni.showToast({
-			// 			title: '金额不能大于需支付金额',
-			// 			icon: 'error'
-			// 		})
-			// 	} else {
+export default {
+  data() {
+    return {
+      loadingFlag: false,
+      disabledFlag: false,
+      btnText:'确认支付',
+      businessId: '',
+      orderId: '',
+      mycarNumber: '',
+      parkName: '',
+      parkInTime: '',
+      staytime: '',
+      due: '',
+      orderFee: '',
+      // appOrderTimeout:'0',
+      totalFee: '', //应收
+      // rechargeNum: '',
+      // maxlength: 6 //默认一个长度
+    }
+  },
+  onLoad(params) {
+    wx.showShareMenu({
+      withShareTicket: true
+    })
+    let data = JSON.parse(params.optionData)
+    this.mycarNumber = data.carNumber
+    this.parkName = data.parkName;
+    this.parkInTime = data.parkInTime;
+    this.staytime = data.parkDuration;
+    this.due = data.totalFee;
+    this.orderFee = data.unPayFee;
+    // this.rechargeNum = data.unPayFee / 100;
+    this.orderId = data.orderId;
+  },
+  onShow() {
+  },
+  methods: {
+    checkNum(e) {
+      let value = e.detail.value;
+      let dot = value.indexOf('.'); //包含小数点
+      let reg = /^[0-9]+$/; //正整数
+      if (dot > -1) {
+        this.maxlength = dot + 3; //长度是小数点后两位
+        if (value.length > dot + 3) {
+        }
+      }
+      if (reg.test(value)) { //如果是正整数不包含小数点
+        this.maxlength = 6;
+      }
+    },
+    payClick() {
+      let that = this;
+      that.loadingFlag = true
+      that.disabledFlag = true
+      that.btnText = '支付中,请稍后'
+      let orderFee = that.orderFee;
+      let paramsData = {
+        payType: '35',
+        paySrcType: '101',
+        orderId: that.orderId,
+        payFee: orderFee,
+      }
+      // 获取 接口
+      that.$myRequest({
+        url: that.$common.accountPay,
+        method: 'POST',
+        data: that.$common.requestSign(paramsData)
+      }).then(res => {
+        console.log(res)
+        console.log('1')
 
-			// 		let paramsData = {
-			// 			payType: '35',
-			// 			paySrcType: '101',
-			// 			orderId: that.orderId,
-			// 			payFee: (rechargeNum * 100).toString(),
-			// 		}
-			// 		// 获取 接口
-			// 		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() {
-			// 				let pages = getCurrentPages(); //当前页
-			// 				let beforePage = pages[pages.length - 2];
-			// 				uni.navigateBack({
-			// 					success: function() {
-			// 						beforePage.onLoad();
-			// 					}
-			// 				})
-			// 			}, 2000);
-			// 		})
-			// 	}
+        that.loadingFlag = false
+        that.disabledFlag = false
+        if(res.code == '0'){
+          that.btnText = '支付完成'
+          console.log('余额支付:' + res)
+          uni.showToast({
+            title: "支付成功",
+            icon: 'success',
+            duration: 500
+          });
+          setTimeout(function () {
+            let pages = getCurrentPages(); //当前页
+            let beforePage = pages[pages.length - 2];
+            uni.navigateBack({
+              success: function () {
+                beforePage.onLoad();
+              }
+            })
+          }, 1000);
+        }else {
+          that.btnText = '支付失败,重新支付'
+        }
 
-			// },
-		}
-	}
+      })
+    },
+    // payClick() {
+    // 	let that = this;
+    // 	let orderFee = that.orderFee;
+    // 	let rechargeNum = that.rechargeNum;
+    // 	if (rechargeNum <= 0) {
+    // 		return uni.showToast({
+    // 			title: '不能输入小于等于0的金额',
+    // 			icon: 'error'
+    // 		})
+    // 	} else if (rechargeNum === " ") {
+    // 		return uni.showToast({
+    // 			title: '金额不能为空',
+    // 			icon: 'error'
+    // 		})
+    // 	} else if (rechargeNum > orderFee) {
+    // 		return uni.showToast({
+    // 			title: '金额不能大于需支付金额',
+    // 			icon: 'error'
+    // 		})
+    // 	} else {
+    // 		let paramsData = {
+    // 			payType: '35',
+    // 			paySrcType: '101',
+    // 			orderId: that.orderId,
+    // 			payFee: (rechargeNum * 100).toString(),
+    // 		}
+    // 		// 获取 接口
+    // 		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() {
+    // 				let pages = getCurrentPages(); //当前页
+    // 				let beforePage = pages[pages.length - 2];
+    // 				uni.navigateBack({
+    // 					success: function() {
+    // 						beforePage.onLoad();
+    // 					}
+    // 				})
+    // 			}, 2000);
+    // 		})
+    // 	}
+    // },
+  }
+}
 </script>
 
 <style scoped lang="scss">
-	.order-time {
-		padding: 5px 0;
-		background: #f0ad4e;
-		text-align: center;
-		color: #fff;
-	}
+    .order-time {
+        padding: 5px 0;
+        background: #f0ad4e;
+        text-align: center;
+        color: #fff;
+    }
 
-	.order-title {
-		font-size: 18px;
-		margin-left: 16px;
-		margin-top: 15px;
-		font-weight: bold;
-		color: #404040;
-	}
+    .order-title {
+        font-size: 18px;
+        margin-left: 16px;
+        margin-top: 15px;
+        font-weight: bold;
+        color: #404040;
+    }
 
-	.order-info {
-		font-size: 14px;
-		margin-left: 15px;
-		margin-top: 12px;
-		color: #404040;
-	}
+    .order-info {
+        font-size: 14px;
+        margin-left: 15px;
+        margin-top: 12px;
+        color: #404040;
+    }
 
-	.order-line {
-		background: #D9D9D9;
-		height: 1px;
-		margin-top: 12px;
-		margin-left: 15px;
-		padding: 0px;
-		overflow: hidden;
-		/* 透明度 */
-		opacity: 0.5;
-	}
+    .order-line {
+        background: #D9D9D9;
+        height: 1px;
+        margin-top: 12px;
+        margin-left: 15px;
+        padding: 0px;
+        overflow: hidden;
+        /* 透明度 */
+        opacity: 0.5;
+    }
 
-	.order-line-bold {
-		background: #FAFAFA;
-		height: 12px;
-		margin-top: 12px;
-		padding: 0px;
-		overflow: hidden;
-	}
+    .order-line-bold {
+        background: #FAFAFA;
+        height: 12px;
+        margin-top: 12px;
+        padding: 0px;
+        overflow: hidden;
+    }
 
-	.flex-row-justify-between {
-		display: flex;
-		flex-direction: row;
-		justify-content: space-between;
-	}
+    .flex-row-justify-between {
+        display: flex;
+        flex-direction: row;
+        justify-content: space-between;
+    }
 
-	.flex-row-justify-end {
-		display: flex;
-		flex-direction: row;
-		/* 水平对齐*/
-		align-items: baseline;
+    .flex-row-justify-end {
+        display: flex;
+        flex-direction: row;
+        /* 水平对齐*/
+        align-items: baseline;
 
-	}
+    }
 
-	.order-discount {
-		color: #C8C7CC;
-		margin-right: 20 upx;
-		/* margin-right: 12px ; */
-		/* margin-top:12px ; */
+    .order-discount {
+        color: #C8C7CC;
+        margin-right: 20 upx;
+        /* margin-right: 12px ; */
+        /* margin-top:12px ; */
 
-	}
+    }
 
-	.orderwaysview {
-		display: flex;
-		flex-direction: row;
-	}
+    .orderwaysview {
+        display: flex;
+        flex-direction: row;
+    }
 
-	.orderways {
-		width: 18px;
-		height: 18px;
-		margin-left: 15px;
-		margin-top: 14px;
-	}
+    .orderways {
+        width: 18px;
+        height: 18px;
+        margin-left: 15px;
+        margin-top: 14px;
+    }
 
-	.orderwaysSel {
-		width: 16px;
-		height: 16px;
-		margin-left: auto;
-		margin-right: 14px;
-		margin-top: 14px;
-		/* justify-content:flex-end; */
-	}
+    .orderwaysSel {
+        width: 16px;
+        height: 16px;
+        margin-left: auto;
+        margin-right: 14px;
+        margin-top: 14px;
+        /* justify-content:flex-end; */
+    }
 
-	.button-sp-area {
-		margin: 0 auto;
-		width: 60%;
-		margin-top: 40px;
+    .button-sp-area {
+        margin: 0 auto;
+        width: 60%;
+        margin-top: 40px;
 
-	}
+    }
 
-	.paywarp {
-		top: 12px;
-		right: 30px;
-		font-size: 20px;
-		height: 40px;
-		line-height: 40px;
-	}
+    .paywarp {
+        top: 12px;
+        right: 30px;
+        font-size: 20px;
+        height: 40px;
+        line-height: 40px;
+    }
 </style>
--
libgit2 0.21.4