hrjy 2 éve
szülő
commit
5a7bc6a945

+ 1 - 0
app/admin/controller/auction/AuctionProduct.php

@@ -61,6 +61,7 @@ class AuctionProduct extends AuthController
 
         foreach ($data['data'] as $key => $val){
             if ($data['data'][$key]['uid'] == 0) $data['data'][$key]['nickname'] = '管理';
+            $data['data'][$key]['gs_time'] = date('Y-m-d H:i:s', $val['gs_time']);
         }
 
 

+ 1 - 0
app/admin/controller/auction/AuctionProducts.php

@@ -48,6 +48,7 @@ class AuctionProducts extends AuthController
         $data = model::list($where);
         foreach ($data['data'] as $key => $val){
             if ($data['data'][$key]['uid'] == 0) $data['data'][$key]['nickname'] = '管理';
+            $data['data'][$key]['gs_time'] = date('Y-m-d H:i:s', $val['gs_time']);
         }
 
 

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

@@ -184,7 +184,7 @@
             {field: 'p_id', title: '商品ID', templet: '#p_id',  align: 'center'},
             {field: 'price', title: '购买价格', templet: '#price',  align: 'center', style : 'color: #DC143C;'},
             {field: 'status', title: '状态', templet: '#status', align: 'center'},
-            {field: 'create_time', title: '预约时间', templet: '#date', align: 'center'},
+            {field: 'create_time', title: '创建时间', templet: '#date', align: 'center'},
             {field: 'right', title: '操作', align: 'center', toolbar: '#act'},
         ];
     });

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

@@ -124,6 +124,7 @@
             {field: 'is_show', title: '状态', templet: '#is_show', align: 'center'},
             {field: 'sort', title: '排序', templet: '#sort', align: 'center'},
             {field: 'create_time', title: '创建时间', templet: '#create_time', align: 'center'},
+            {field: 'gs_time', title: '挂售时间', templet: '#gs_time', align: 'center'},
             {field: 'right', title: '操作', align: 'center', toolbar: '#act'},
         ];
     });

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

@@ -146,6 +146,7 @@
             {field: 'is_show', title: '状态', templet: '#is_show', align: 'center'},
             {field: 'sort', title: '排序', templet: '#sort', align: 'center'},
             {field: 'create_time', title: '创建时间', templet: '#create_time', align: 'center'},
+            {field: 'gs_time', title: '挂售时间', templet: '#gs_time', align: 'center'},
             {field: 'right', title: '操作', align: 'center', toolbar: '#act'},
         ];
     });

+ 1 - 1
app/api/controller/auction/AuctionProductController.php

@@ -187,7 +187,7 @@ class AuctionProductController
         ]);
         if (empty($data['pas'])) return app('json')->fail('请填写支付密码');
         if ($request->user()['payment_pas'] != md5($data['pas'].'sxg')) return app('json')->fail('支付密码不正确');
-        $product = AuctionProduct::where('id', $data['id'])->find();
+        $product = AuctionProduct::where('id', $data['id'])->where('uid', $request->uid())->find();
         if ($product['is_show'] == 1) return app('json')->fail('商品已挂售');
         $user = User::where('uid', $request->uid())->find();
         if (!$product) return app('json')->fail('商品不存在');