From 9b5aebc54e14e42645500343059608fe35705f59 Mon Sep 17 00:00:00 2001
From: wanghongjun <1445693971@qq,com>
Date: Fri, 10 Nov 2023 16:14:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E8=B4=B9=E8=AE=B0=E5=BD=95=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/User.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controller/User.php b/app/controller/User.php
index 9f3dd12..9097aa5 100644
--- a/app/controller/User.php
+++ b/app/controller/User.php
@@ -133,7 +133,7 @@ class User extends BaseController
 
         $list = Db::name('consumption_records')
                   ->where(['user_id' => $userData['id']])
-                  ->field('zone_goods_id,actual_price,residue_amount,create_time')
+                  ->field('zone_goods_id,actual_price,residue_amount,create_time,actual_type')
                   ->order('id' ,'desc')
                   ->paginate($limit);
 
@@ -145,6 +145,7 @@ class User extends BaseController
             $item['zone_title'] = $Zone->title;
             give_symbol($item['actual_price'],'-');
             $item['create_time'] = date("m月d日 H:i",strtotime($item['create_time']));
+            $item['actual_type'] = $item['actual_type'] == 2 ? '可提余额' : '余额';
         }
 
         return $this->renderSuccess('数据获取成功',[