From 7286d152091243c9a73bb9b1664430cfdfabb137 Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Tue, 13 Jun 2023 15:13:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AE=9D=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/services/pay/OrderPayServices.php    | 6 +++---
 crmeb/crmeb/services/pay/storage/AliPay.php    | 2 +-
 template/uni-app/pages/goods/cashier/index.vue | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/crmeb/app/services/pay/OrderPayServices.php b/crmeb/app/services/pay/OrderPayServices.php
index 4e36f12f9..03bf7f224 100644
--- a/crmeb/app/services/pay/OrderPayServices.php
+++ b/crmeb/app/services/pay/OrderPayServices.php
@@ -106,7 +106,7 @@ class OrderPayServices
      */
     public function beforePay(array $orderInfo, string $payType, array $options = [])
     {
-        $wehcat = $payType == PayServices::WEIXIN_PAY;
+        $wechat = $payType == PayServices::WEIXIN_PAY;
 
         $payType = $this->getPayType($payType);
 
@@ -136,8 +136,8 @@ class OrderPayServices
                 $options['openid'] = $openid;
                 break;
             case PayServices::ALLIN_PAY:
-                if ($wehcat) {
-                    $options['wechat'] = $wehcat;
+                if ($wechat) {
+                    $options['wechat'] = $wechat;
                 }
                 break;
         }
diff --git a/crmeb/crmeb/services/pay/storage/AliPay.php b/crmeb/crmeb/services/pay/storage/AliPay.php
index 492513b23..483fc3566 100644
--- a/crmeb/crmeb/services/pay/storage/AliPay.php
+++ b/crmeb/crmeb/services/pay/storage/AliPay.php
@@ -50,7 +50,7 @@ class AliPay extends BasePay implements PayInterface
             $code = true;
         }
 
-        return AliPayService::instance()->create($body, $orderId, $totalFee, $attach, $options['uitUrl'] ?? '', $options['siteUrl'] ?? '', $code);
+        return AliPayService::instance()->create($body, $orderId, $totalFee, $attach, $options['quitUrl'] ?? '', $options['siteUrl'] ?? '', $code);
     }
 
     /**
diff --git a/template/uni-app/pages/goods/cashier/index.vue b/template/uni-app/pages/goods/cashier/index.vue
index abbd3aa12..64f26b8ad 100644
--- a/template/uni-app/pages/goods/cashier/index.vue
+++ b/template/uni-app/pages/goods/cashier/index.vue
@@ -293,7 +293,7 @@
 					// #endif
 				}).then(res => {
 					let status = res.data.status,
-						orderId = res.data.result.orderId,
+						orderId = res.data.result.order_id,
 						jsConfig = res.data.result.jsConfig,
 						goPages = '/pages/goods/order_pay_status/index?order_id=' + this.orderId + '&msg=' +
 						res
@@ -336,7 +336,7 @@
 								}
 							})
 							this.jumpData = {
-								orderId: res.data.result.orderId,
+								orderId: res.data.result.order_id,
 								msg: res.msg,
 							}
 							// #endif