From 0649c175125bf444afe4c2c0e4db9f79b35a0480 Mon Sep 17 00:00:00 2001
From: caolc <572275724@qq.com>
Date: Tue, 6 Jun 2023 14:56:49 +0800
Subject: [PATCH] 111

---
 BagStation/pages/makeOrder/orderPaying.vue | 7 ++++---
 manifest.json                              | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/BagStation/pages/makeOrder/orderPaying.vue b/BagStation/pages/makeOrder/orderPaying.vue
index 5431ca4..bf9fc90 100644
--- a/BagStation/pages/makeOrder/orderPaying.vue
+++ b/BagStation/pages/makeOrder/orderPaying.vue
@@ -285,7 +285,7 @@
 					this.cooling = true
 					setTimeout(() => {
 						this.cooling = false
-					}, 5000)
+					}, 5000);
 					if (this.activePay == 0) {
 						this.selfCardPay()
 					} else if (this.activePay == 2) {
@@ -315,7 +315,8 @@
 					payCode: 'WECHAT_ORDER_PAY_WECHAT', //APP填WECHAT_ORDER_PAY_APP，小程序填
 					orderId: this.order.orderSerialNumber,
 					payClient: 'XOIL_DRIVER_WECHAT_APPLET', //"支付端。安卓XOIL_DRIVER_ANDROID，小程序
-					userIp:  (this.userIp?this.userIp:"36.57.160.59") 
+					userIp:  (this.userIp?this.userIp:"36.57.160.59"),
+					merchantNo:10089145264
 				}
 
 				oilPayApi.aggregatePay(payData).then(res => {
@@ -391,7 +392,7 @@
 					"orderSerialNumber": this.order.orderSerialNumber, //类型：String  必有字段  备注：订单编号
 					"payChannel": "BALANCE_PAYMENT", //类型：String  必有字段  备注：支付渠道（BALANCE_PAYMENT：余额支付）
 					"orderMethod": "CUSTOMER_ACTIVE", //类型：String  必有字段  备注：订单产生方式（CUSTOMER_ACTIVE：客户扫码支付：客户扫描油站二维码完成支付）
-					"createSource": "XOIL_DRIVER_WECHAT_APPLET"
+					"createSource": "XOIL_DRIVER_WECHAT_APPLET",
 				}
 				oilOrderApi.payOrder(payData).then(res => {
 					if (res.code == 20000) {
diff --git a/manifest.json b/manifest.json
index c44ba70..a520b77 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
 {
     "name" : "XiaoXing",
-    "appid" : "__UNI__EA8D131",
+    "appid" : "__UNI__62FBBA8",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",