diff --git a/crmeb/app/services/order/StoreOrderRefundServices.php b/crmeb/app/services/order/StoreOrderRefundServices.php index 70f309414..202672f61 100644 --- a/crmeb/app/services/order/StoreOrderRefundServices.php +++ b/crmeb/app/services/order/StoreOrderRefundServices.php @@ -1171,6 +1171,8 @@ class StoreOrderRefundServices extends BaseServices $orderData['pay_postage'] = $this->getOrderSumPrice($orderData['cart_info'], 'origin_postage_price', false); $orderData['member_price'] = 0; $orderData['routine_contact_type'] = sys_config('routine_contact_type', 0); + $orderData['levelPrice'] = $this->getOrderSumPrice($orderData['cart_info'], 'level');//获取会员等级优惠 + $orderData['memberPrice'] = $this->getOrderSumPrice($orderData['cart_info'], 'member');//获取付费会员优惠 switch ($orderInfo['pay_type']) { case PayServices::WEIXIN_PAY: @@ -1185,6 +1187,9 @@ class StoreOrderRefundServices extends BaseServices case PayServices::ALIAPY_PAY: $pay_type_name = '支付宝支付'; break; + case PayServices::ALLIN_PAY: + $pay_type_name = '通联支付'; + break; default: $pay_type_name = '其他支付'; break; diff --git a/crmeb/app/services/pay/OrderPayServices.php b/crmeb/app/services/pay/OrderPayServices.php index 9375255ea..a34747be9 100644 --- a/crmeb/app/services/pay/OrderPayServices.php +++ b/crmeb/app/services/pay/OrderPayServices.php @@ -51,12 +51,12 @@ class OrderPayServices public function getPayType(string $payType) { //微信支付没有开启,通联支付开启,用户访问端在小程序或者公众号的时候,使用通联微信H5支付 - if ($payType == PayServices::WEIXIN_PAY) { + if ($payType == PayServices::WEIXIN_PAY && !request()->isH5() && !request()->isApp()) { $payType = sys_config('pay_weixin_open', 0); } //支付宝没有开启,通联支付开了,用户使用支付宝支付,并且在app端访问的时候,使用通联app支付宝支付 - if ($payType == PayServices::ALIAPY_PAY) { + if ($payType == PayServices::ALIAPY_PAY && request()->isApp()) { $payType = sys_config('ali_pay_status', 0); } diff --git a/crmeb/crmeb/services/app/WechatService.php b/crmeb/crmeb/services/app/WechatService.php index d1f15b2d9..b732f623e 100644 --- a/crmeb/crmeb/services/app/WechatService.php +++ b/crmeb/crmeb/services/app/WechatService.php @@ -80,7 +80,7 @@ class WechatService ]; if (isset($wechat['wechat_encode']) && (int)$wechat['wechat_encode'] > 0 && isset($wechat['wechat_encodingaeskey']) && !empty($wechat['wechat_encodingaeskey'])) $config['aes_key'] = $wechat['wechat_encodingaeskey']; - if (isset($payment['pay_weixin_open']) && $payment['pay_weixin_open'] == 'weixin') { + if (isset($payment['pay_weixin_open'])) { $config['payment'] = [ 'app_id' => $appId, 'merchant_id' => trim($payment['pay_weixin_mchid']), diff --git a/crmeb/crmeb/utils/Arr.php b/crmeb/crmeb/utils/Arr.php index eb34f10f5..f67cb131d 100644 --- a/crmeb/crmeb/utils/Arr.php +++ b/crmeb/crmeb/utils/Arr.php @@ -59,6 +59,8 @@ class Arr $newData = []; foreach ($data as $k => $v) { $temp = []; + $temp['id'] = $v['id']; + $temp['pid'] = $v['pid']; $temp['path'] = $v['menu_path']; $temp['title'] = $v['menu_name']; $temp['icon'] = $v['icon']; diff --git a/template/admin/src/pages/marketing/point_statistic/index.vue b/template/admin/src/pages/marketing/point_statistic/index.vue index cdead2684..a024c0d1b 100644 --- a/template/admin/src/pages/marketing/point_statistic/index.vue +++ b/template/admin/src/pages/marketing/point_statistic/index.vue @@ -375,6 +375,6 @@ export default { .num { white-space: nowrap; margin: 0 10px; - width: 15px; + width: 17px; } diff --git a/template/uni-app/pages/goods/order_details/index.vue b/template/uni-app/pages/goods/order_details/index.vue index a4ea83406..faa47261b 100644 --- a/template/uni-app/pages/goods/order_details/index.vue +++ b/template/uni-app/pages/goods/order_details/index.vue @@ -369,7 +369,7 @@ {{$t(`再次购买`)}} {{$t(`取消申请`)}}