diff --git a/crmeb/app/services/user/UserMoneyServices.php b/crmeb/app/services/user/UserMoneyServices.php index 278d00e34..8f421a90e 100644 --- a/crmeb/app/services/user/UserMoneyServices.php +++ b/crmeb/app/services/user/UserMoneyServices.php @@ -202,8 +202,11 @@ class UserMoneyServices extends BaseServices /** @var UserServices $userServices */ $userServices = app()->make(UserServices::class); $data['now_balance'] = $userServices->sum(['status' => 1], 'now_money', true); - $data['add_balance'] = $this->dao->sum(['pm' => 1], 'number', true); - $data['sub_balance'] = $this->dao->sum(['pm' => 0], 'number', true); + $data['add_balance'] = $this->dao->sum([ + ['pm', '=', 1], + ['type', 'in', ['system_add', 'recharge', 'extract', 'lottery_add', 'register_system_add']] + ], 'number', false); + $data['sub_balance'] = bcsub($data['add_balance'], $data['now_balance'], 2); return $data; } diff --git a/template/uni-app/pages/admin/order/index.vue b/template/uni-app/pages/admin/order/index.vue index c8cf820b8..56eaf83f4 100644 --- a/template/uni-app/pages/admin/order/index.vue +++ b/template/uni-app/pages/admin/order/index.vue @@ -99,7 +99,8 @@ loading: false } }, - onLoad() { + onShow() { + this.clear(); this.getIndex(); this.getList(); // this.$scroll(this.$refs.container, () => { @@ -107,6 +108,11 @@ // }); }, methods: { + clear(){ + this.loaded = false; + this.list = [] + this.where.page = 1; + }, getIndex: function() { var that = this; getStatisticsInfo().then(