diff --git a/application/admin/controller/user4s/Goodlog.php b/application/admin/controller/user4s/Goodlog.php index 3462d99..3e65c89 100644 --- a/application/admin/controller/user4s/Goodlog.php +++ b/application/admin/controller/user4s/Goodlog.php @@ -126,7 +126,7 @@ class Goodlog extends Backend $need_price = $good->price * $num; $need_integral = $good->integral * $num; if($user->integral < $need_integral){ - $this->error('用户积分不足,用户只有'.$good->integral); + $this->error('用户积分不足,用户只有'.$good->integral.'积分'); } if($user->balance < $need_price){ $this->error('用户余额不足,用户只有'.$good->balance.'元'); diff --git a/application/admin/view/user4s/goodlog/index.html b/application/admin/view/user4s/goodlog/index.html index a1c21c6..b8125f5 100644 --- a/application/admin/view/user4s/goodlog/index.html +++ b/application/admin/view/user4s/goodlog/index.html @@ -7,7 +7,7 @@
- {:__('新兑换')} + {:__('新兑换')} {:__('Delete')} diff --git a/public/assets/js/backend/user4s/user.js b/public/assets/js/backend/user4s/user.js index 32b5ed7..47faf3f 100644 --- a/public/assets/js/backend/user4s/user.js +++ b/public/assets/js/backend/user4s/user.js @@ -127,7 +127,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'editable'], function return row.name +'-的回访单' }, classname: 'btn btn-xs btn-info btn-addtabs', - icon: 'fa fa-comments-o', + icon: 'fa fa-comments-o fa-fw', url: 'user4s/visit/index?user4s_id={id}&status=0', extend: 'data-area=\'["1000px","800px"]\'', },