调整团购限时

app/Model/UserGroupModel.php

@@ -74,7 +74,7 @@ class UserGroupModel extends Model
         foreach ($data as &$v) {
         foreach ($data as &$v) {
             // 若已参团，且非系统分配，则查询参团表
             // 若已参团，且非系统分配，则查询参团表
             if ($v['status'] == 1 && $v['is_assign'] == -1) {
             if ($v['status'] == 1 && $v['is_assign'] == -1) {
-                $join = $UserGroupJoinModel->where('group_id', $v['id'])->first()->toArray();
+                $join = $UserGroupJoinModel->where('group_id', $v['id'])->first();
 
 
                 $v['join_user_id']  = $join['user_id'];
                 $v['join_user_id']  = $join['user_id'];
                 $v['join_account']  = $join['account'];
                 $v['join_account']  = $join['account'];
@@ -89,7 +89,8 @@ class UserGroupModel extends Model
                 $v['join_time']     = '';
                 $v['join_time']     = '';
             }
             }
 
 
-             $v['create_time'] = date('Y-m-d H:i:s', $v['create_time']);
+            $v['limited_time'] = $v['limited_time'] ? date('Y-m-d H:i:s', $v['limited_time']) : '';
+            $v['create_time'] = date('Y-m-d H:i:s', $v['create_time']);
         }
         }
 
 
         return $data;
         return $data;

public/js/web/groupList.js

@@ -32,7 +32,7 @@ layui.use(['form', 'table', 'laydate'], function(){
                 ,{field: 'join_order_id', title: '参团订单ID', width: 120}
                 ,{field: 'join_order_id', title: '参团订单ID', width: 120}
                 ,{field: 'join_order_sn', title: '参团订单号', width: 150}
                 ,{field: 'join_order_sn', title: '参团订单号', width: 150}
                 ,{field: 'join_time', title: '参团时间', width: 180}
                 ,{field: 'join_time', title: '参团时间', width: 180}
-                ,{field: 'limited_time', title: '团购限时（小时）', width: 200}
+                ,{field: 'limited_time', title: '团购限时时间', width: 180}
                 ,{field: 'create_time', title: '创建时间', width: 180}
                 ,{field: 'create_time', title: '创建时间', width: 180}
             ]]
             ]]
             ,limit: 10
             ,limit: 10