hrjy vor 2 Jahren
Ursprung
Commit
0b2838a28e

+ 2 - 0
app/admin/controller/user/User.php

@@ -133,6 +133,8 @@ class User extends AuthController
             ['money', 0],
             ['integration_status', 0],
             ['integration', 0],
+            ['anticipate_status', 0],
+            ['anticipate', 0],
         ], $this->request);
         if (!$uid) return $this->failed('数据不存在');
         $user = UserModel::get($uid);

+ 1 - 1
app/admin/view/auction/auction/index.php

@@ -106,7 +106,7 @@
             {field: 'nickname', title: '竞拍场', templet: '#nickname', align: 'center'},
             {field: 'name', title: '所属场馆', templet: '#name',  align: 'center'},
             {field: 'anticipate', title: '预约价格', templet: '#anticipate',  align: 'center',style : 'color: #DC143C;'},
-            {field: 'image', title: '封面', templet: '#image', align: 'center', width: '10%',},
+            {field: 'image', title: '封面', templet: '#image', align: 'center', width: '10%',style: 'width: 30px;height: 30px;margin:0;cursor: pointer;'},
             {field: 'status', title: '状态', templet: '#status', align: 'center'},
             {field: 'add_time', title: '预约开始', templet: '#add_time',  align: 'center'},
             {field: 'end_time', title: '预约结束', templet: '#end_time', align: 'center'},

+ 10 - 2
app/models/user/UserBill.php

@@ -77,12 +77,16 @@ class UserBill extends BaseModel
                 ->order('add_time DESC')
                 ->select();
         }
+        $data['zj'] = [];
+        $data['kc'] = [];
         $list = count($list) ? $list->toArray() : [];
         foreach ($list as &$v) {
             $v['add_time'] = date('Y/m/d H:i', $v['add_time']);
             $v['number'] = floatval($v['number']);
+            if ($v['pm'] == 1) $data['zj'][] = $v;
+            if ($v['pm'] == 0) $data['kc'][] = $v;
         }
-        return $list;
+        return $data;
     }
 
     /**
@@ -114,12 +118,16 @@ class UserBill extends BaseModel
                 ->order('add_time DESC')
                 ->select();
         }
+        $data['zj'] = [];
+        $data['kc'] = [];
         $list = count($list) ? $list->toArray() : [];
         foreach ($list as &$v) {
             $v['add_time'] = date('Y/m/d H:i', $v['add_time']);
             $v['number'] = floatval($v['number']);
+            if ($v['pm'] == 1) $data['zj'][] = $v;
+            if ($v['pm'] == 0) $data['kc'][] = $v;
         }
-        return $list;
+        return $data;
     }
 
     /**

+ 1 - 1
runtime/session/sess_e933a47d1e79bb070a55a2d46e11eb99

@@ -1 +1 @@
-a:3:{s:7:"adminId";i:1;s:9:"adminInfo";a:13:{s:2:"id";i:1;s:7:"account";s:5:"admin";s:3:"pwd";s:32:"e10adc3949ba59abbe56e057f20f883e";s:9:"real_name";s:5:"admin";s:5:"roles";s:1:"1";s:7:"last_ip";s:11:"192.168.2.1";s:9:"last_time";i:1648705370;s:8:"add_time";i:1647842101;s:11:"login_count";i:0;s:5:"level";i:0;s:6:"status";i:1;s:6:"is_del";i:0;s:3:"uid";N;}s:11:"login_error";N;}
+a:3:{s:7:"adminId";i:1;s:9:"adminInfo";a:13:{s:2:"id";i:1;s:7:"account";s:5:"admin";s:3:"pwd";s:32:"e10adc3949ba59abbe56e057f20f883e";s:9:"real_name";s:5:"admin";s:5:"roles";s:1:"1";s:7:"last_ip";s:9:"127.0.0.1";s:9:"last_time";i:1648718935;s:8:"add_time";i:1647842101;s:11:"login_count";i:0;s:5:"level";i:0;s:6:"status";i:1;s:6:"is_del";i:0;s:3:"uid";N;}s:11:"login_error";N;}