挂售

app/admin/controller/auction/Auction.php

@@ -436,7 +436,8 @@ class Auction extends AuthController
             'hanging_price',
             'slider_image',
             'description',
-            'fictitious_price'
+            'fictitious_price',
+            'give'
         ]);
         $data['slider_image'] = json_encode($data['slider_image']);
         $data['description'] = htmlspecialchars($data['description']);
@@ -473,7 +474,8 @@ class Auction extends AuthController
             'hanging_price',
             'slider_image',
             'description',
-            'fictitious_price'
+            'fictitious_price',
+            'give'
         ]);
         $data['slider_image'] = json_encode($data['slider_image']);
         $data['description'] = htmlspecialchars($data['description']);

app/admin/model/auction/AuctionOrder.php

@@ -38,7 +38,7 @@ class AuctionOrder extends BaseModel
     {
         $model = self::alias('a')
             ->order('a.id', 'desc')
-            ->field('a.*, u.account, u.nickname,us.account as us_account,p.name, p.image, au.nickname as au_name, gu.name as gu_name')
+            ->field('a.*, u.account, u.nickname,us.account as us_account,us.nickname as us_nickname,p.name, p.image, au.nickname as au_name, gu.name as gu_name')
             ->leftJoin('user u', 'a.uid = u.uid')
             ->leftJoin('user us', 'us.uid = a.collection_id')
             ->leftJoin('auction_product p', 'a.product_id = p.id')
@@ -122,13 +122,14 @@ class AuctionOrder extends BaseModel
                 $item['account'],
                 $item['nickname'],
                 $item['us_account'],
+                $item['us_nickname'],
                 $item['price'],
                 $status,
                 $is_gs,
                 $item['create_time'],
             ];
         }
-        PHPExcelService::setExcelHeader(['订单号', '商品名', '场馆', '场次', '买家账号', '买家昵称', '卖家账号','商品价格', '状态','挂售状态',
+        PHPExcelService::setExcelHeader(['订单号', '商品名', '场馆', '场次', '买家账号', '买家昵称', '卖家账号','卖家昵称','商品价格', '状态','挂售状态',
             '订单时间'])
             ->setExcelTile('订单导出' . date('YmdHis', time()), '订单信息' . time(), ' 生成时间：' . date('Y-m-d H:i:s', time()))
             ->setExcelContent($export)

app/admin/view/auction/auction/product_create.php

@@ -352,15 +352,15 @@
                 is_show:1,
                 image:'',
                 price:'',
-                deduct: 1.2,
-                rise: 2.7,
+                deduct: 1.5,
+                rise: 1,
                 info: '',
                 sort: 0,
                 auction_id: id,
                 hanging_price: '',
                 fictitious_price: '',
                 slider_image: [],
-                give: 0
+                give: 0.5
 
             },
             rule: { //多图选择规则

app/admin/view/auction/auction_order/index.php

@@ -246,9 +246,10 @@
             {field: 'image', title: '图片', templet: '#image',  align: 'center', width: '5%'},
             {field: 'order_id', title: '订单号', templet: '#order_id',  align: 'center'},
             {field: 'au_name', title: '场次', templet: '#au_name',  align: 'center'},
-            {field: 'account', title: '购买用户账号', templet: '#account',  align: 'center'},
-            {field: 'nickname', title: '购买用户呢称', templet: '#nickname',  align: 'center'},
+            {field: 'account', title: '用户账号', templet: '#account',  align: 'center'},
+            {field: 'nickname', title: '用户呢称', templet: '#nickname',  align: 'center'},
             {field: 'us_account', title: '卖家账号', templet: '#us_account',  align: 'us_account'},
+            {field: 'us_account', title: '卖家昵称', templet: '#us_account',  align: 'us_account'},
             {field: 'name', title: '商品', templet: '#name',  align: 'center'},
             {field: 'price', title: '购买价格', templet: '#price',  align: 'center', style : 'color: #DC143C;'},
             {field: 'upload_image', title: '打款凭证', templet: '#upload_image',  align: 'center',width: '5%'},

app/api/controller/auction/AuctionController.php

@@ -75,7 +75,7 @@ class AuctionController
         $userModel = new User();
         $user = $userModel->find($request->uid());
         if ($user['is_auth'] != 2) return app('json')->fail('未实名认证');
-        if ($user['anticipate'] < $auction['anticipate']) return app('json')->fail('预约卷不够');
+        if ($user['anticipate'] < $auction['anticipate']) return app('json')->fail('艺金券不足');
         $user['anticipate'] = $user['anticipate'] - $auction['anticipate'];// 扣除预约卷
 
         User::rollbackTrans();
@@ -271,7 +271,8 @@ class AuctionController
             ['bank'],
             ['name'],
             ['type'],
-            ['phone']
+            ['phone'],
+            ['bank_name']
         ], $request);
         if (!$data['type'])  return app('json')->fail('数据传入错误');
         $data['uid'] =$request->uid();
@@ -296,7 +297,7 @@ class AuctionController
                 $pay['payment'] = $data['payment'];
                 $pay['image'] = $data['image'];
                 $pay['name'] = $data['name'];
-                $pay['name'] = $data['name'];
+                $pay['phone'] = $data['phone'];
             }elseif ($data['type'] == 2){
                 // 支付宝收款方式
                 if (!$data['payment'])  return app('json')->fail('支付宝账号不能为空');
@@ -304,17 +305,19 @@ class AuctionController
                 if (!$data['phone'])  return app('json')->fail('请填写手机号');
                 $pay['payment'] = $data['payment'];
                 $pay['name'] = $data['name'];
-                $pay['name'] = $data['name'];
+                $pay['phone'] = $data['phone'];
             }elseif ($data['type'] == 3){
                 // 银行卡收款方式
                 if (!$data['payment'])  return app('json')->fail('银行卡号不能为空');
                 if (!$data['name'])  return app('json')->fail('姓名不能为空');
-                if (!$data['bank'])  return app('json')->fail('开户行');
+                if (!$data['bank'])  return app('json')->fail('开户行不能为空');
+                if (!$data['bank_name'])  return app('json')->fail('开户支行不能为空');
                 if (!$data['phone'])  return app('json')->fail('请填写手机号');
                 $pay['payment'] = $data['payment'];
-                $pay['image'] = $data['image'];
-                $pay['bank'] = $data['name'];
+                $pay['bank'] = $data['bank'];
+                $pay['bank_name'] = $data['bank_name'];
                 $pay['phone'] = $data['phone'];
+                $pay['name'] = $data['name'];
 
             }
             $res = $pay->save();
@@ -339,6 +342,7 @@ class AuctionController
                 if (!$data['payment'])  return app('json')->fail('银行卡号不能为空');
                 if (!$data['name'])  return app('json')->fail('姓名不能为空');
                 if (!$data['bank'])  return app('json')->fail('开户行不能为空');
+                if (!$data['bank_name'])  return app('json')->fail('开户支行不能为空');
                 if (!$data['phone'])  return app('json')->fail('请填写手机号');
             }
             $res = $model->save($data);

public/index/index.html

@@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>商城</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.a9cbb497.js></script><script src=/index/static/js/index.a73fb3d8.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.a9cbb497.js></script><script src=/index/static/js/index.86056633.js></script></body></html>