1

app/admin/controller/user/User.php

@@ -142,6 +142,7 @@ class User extends AuthController
         $user = UserModel::where('uid', $uid)->find();
         if (!$user) return Json::fail('数据不存在!');
         $f = array();
+        $f[] = Form::radio('type', '充值类型', 'now_money')->options([['value' => 'now_money', 'label' => '余额'], ['value' => 'consumer', 'label' => '消费券'], ['value' => 'integral', 'label' => '积分']]);
         $f[] = Form::radio('brokerage_status', '充值余额', 1)->options([['value' => 1, 'label' => '增加'], ['value' => 0, 'label' => '减少']]);
         $f[] = Form::number('money', '金额')->min(0);
         $f[] = Form::uploadFiles('evaluation', '付款凭证', Url::buildUrl('file_upload'))->name('file');
@@ -157,12 +158,10 @@ class User extends AuthController
             ['money', 0],
             ['type', 'now_money'],
         ], $this->request);
-
-        if (!$uid) return $this->failed('数据不存在');
         $user = UserModel::where('uid', $uid)->find();
+        if (!$user) return $this->failed('数据不存在');
         if (is_array(input('evaluation'))) {
             $cdata = ['number' => $data['money'], 'way' => $data['brokerage_status'], 'evaluation' => join(",", input('evaluation'))];
-
         } else {
             $cdata = ['number' => $data['money'], 'way' => $data['brokerage_status']];
         }
@@ -935,6 +934,7 @@ class User extends AuthController
     {
         return Json::successful(UserBillAdmin::getOneBalanceChangList(compact('uid', 'page', 'limit')));
     }
+
     /**
      * 获取某用户的余额变动记录
      */
@@ -986,10 +986,10 @@ class User extends AuthController
             if ($auth_status == 1) {
                 if ($data['way'] == 1) {//增加
                     $edit[$data['type']] = bcadd($user[$data['type']], $data['number'], 2);
-                    $res1 = UserBillAdmin::income('系统增加余额', $user['uid'], $data['type'], 'system_add', $data['number'], $this->adminId, $edit[$data['type']], '系统增加了' . floatval($data['number']) . '数量');
+                    $res1 = UserBillAdmin::income('系统增加', $user['uid'], $data['type'], 'system_add', $data['number'], $this->adminId, $edit[$data['type']], '系统增加了' . floatval($data['number']) . '数量');
                 } else if ($data['way'] == 0) {//减少
                     $edit[$data['type']] = bcsub($user[$data['type']], $data['number'], 2);
-                    $res1 = UserBillAdmin::expend('系统减少余额', $user['uid'], $data['type'], 'system_sub', $data['number'], $this->adminId, $edit[$data['type']], '系统扣除了' . floatval($data['number']) . '数量');
+                    $res1 = UserBillAdmin::expend('系统减少', $user['uid'], $data['type'], 'system_sub', $data['number'], $this->adminId, $edit[$data['type']], '系统扣除了' . floatval($data['number']) . '数量');
                 }
                 UserModel::edit($edit, $data['uid'], 'uid');
             }

app/admin/view/user/user/index.php

@@ -243,10 +243,10 @@
                                 <a href="javascript:void(0);" lay-event="pay">
                                     <i class="layui-icon layui-icon-edit"></i> 充值</a>
                             </li>
-                            <li>
-                                <a href="javascript:void(0);" lay-event="charge">
-                                    <i class="layui-icon layui-icon-edit"></i> 积分消费券</a>
-                            </li>
+<!--                            <li>-->
+<!--                                <a href="javascript:void(0);" lay-event="charge">-->
+<!--                                    <i class="layui-icon layui-icon-edit"></i> 积分消费券</a>-->
+<!--                            </li>-->
                             <li>
                             <a href="javascript:void(0);" lay-event="exchange">
                                 <i class="layui-icon layui-icon-edit"></i> 兑换充值卡</a>

app/admin/view/user/user/recharge_auth.php

@@ -104,6 +104,18 @@
                         {{d.number}}
                         {{# } }}                        
                     </script>
+
+                    <script type="text/html" id="type">
+                        {{# if(d.type=='now_money'){ }}
+                        <font color="#eeff00"> 余额  </font>
+                        {{# } }}
+                        {{# if(d.type=='consumer'){ }}
+                        <font color="#ff00ee"> 消费券  </font>
+                        {{# } }}
+                        {{# if(d.type=='integral'){ }}
+                        <font color="#00eeff"> 积分  </font>
+                        {{# } }}
+                    </script>
                     <script type="text/html" id="status">
                         {{# if(d.auth_status==1){ }}
                         通过
@@ -125,9 +137,10 @@
     layList.tableList('List', "{:Url('recharge_list',['key'=>$key])}", function () {
         return [
             {type: 'checkbox'},
-            {field: 'id', title: '订单号', sort: true, event: 'id', width: '14%'},
-            {field: 'uid', title: '用户信息', templet: '#user',  align: 'center'},
-            {field: 'number', title: '充值余额', templet: '#number', height: 'full-20'},
+            {field: 'id', title: '订单号', sort: true, event: 'id'},
+            {field: 'uid', title: '用户信息', templet: '#user',  align: 'center', width: '15%'},
+            {field: 'type', title: '充值类型', templet: '#type'},
+            {field: 'number', title: '充值余额', templet: '#number'},
             {field: 'admin_real_name', title: '创建员姓名', width: '10%', align: 'center'},
             {field: 'create_admin_time_txt', title: '创建时间', width: '10%', align: 'center'},
             {field: 'auth_real_name', title: '审核人', width: '10%', align: 'center'},