From cb834aaeca7eee403ac14b40f716bfa2210fd798 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Wed, 22 Feb 2023 19:06:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=A8=E6=97=A5=E6=94=B6?=
 =?UTF-8?q?=E7=9B=8A=EF=BC=8C=E4=BF=AE=E6=94=B9=E4=B8=BA=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/services/user/UserServices.php                | 2 +-
 template/uni-app/pages/goods/order_pay_status/index.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crmeb/app/services/user/UserServices.php b/crmeb/app/services/user/UserServices.php
index ffaefd0d8..1072ea838 100644
--- a/crmeb/app/services/user/UserServices.php
+++ b/crmeb/app/services/user/UserServices.php
@@ -1465,7 +1465,7 @@ class UserServices extends BaseServices
                 $user['vip_name'] = $userLevel['name'] ?? '';
             }
         }
-        $user['yesterDay'] = $userBill->getUsersBokerageSum(['uid' => $uid, 'pm' => 1], 'yesterday');
+        $user['yesterDay'] = $frozenPrices->getUsersBokerageSum(['uid' => $uid, 'pm' => 1], 'yesterday');
         $user['recharge_switch'] = (int)sys_config('recharge_switch');//充值开关
         $user['adminid'] = $storeService->checkoutIsService(['uid' => $uid, 'status' => 1, 'customer' => 1]);
         if ($user['phone'] && $user['user_type'] != 'h5') {
diff --git a/template/uni-app/pages/goods/order_pay_status/index.vue b/template/uni-app/pages/goods/order_pay_status/index.vue
index 6f21c20cd..9cfd086c0 100644
--- a/template/uni-app/pages/goods/order_pay_status/index.vue
+++ b/template/uni-app/pages/goods/order_pay_status/index.vue
@@ -31,7 +31,7 @@
 				<view class='item acea-row row-between-wrapper'
 					v-if="order_pay_info.paid==0 && order_pay_info.pay_type != 'offline'">
 					<view>{{$t(`失败原因`)}}</view>
-					<view class='itemCom'>{{status==2 ? $t(`取消支付`):msg}}</view>
+					<view class='itemCom'>{{$t(`未支付`)}}</view>
 				</view>
 			</view>
 			<!--失败时： 重新购买 -->