Merge branch 'v5.1.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.1.0dev

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;
         }

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);
     }
 
     /**

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