From 11bd72494100da36cf51f2b9ef78012ca2c6e7a8 Mon Sep 17 00:00:00 2001 From: wuhui_zzw <1760308791@qq.com> Date: Thu, 23 Feb 2023 18:06:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0:=20=E4=BA=A4=E6=98=93?= =?UTF-8?q?=E5=B8=82=E5=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addon/futures/model/User.php | 2 +- addon/futures/shop/controller/Futures.php | 84 +++++- addon/futures/shop/controller/User.php | 9 +- addon/futures/shop/view/futures/index.html | 255 ++++++++++++------- addon/futures/shop/view/futures/see.html | 242 ++++++++++++++++++ addon/futures/shop/view/user/index.html | 29 ++- addon/futures/shop/view/user/send_goods.html | 6 - 7 files changed, 515 insertions(+), 112 deletions(-) create mode 100644 addon/futures/shop/view/futures/see.html diff --git a/addon/futures/model/User.php b/addon/futures/model/User.php index 041124bd..427b7dcf 100644 --- a/addon/futures/model/User.php +++ b/addon/futures/model/User.php @@ -114,7 +114,7 @@ class User extends BaseModel{ for($i=0;$i<$info['order_num'];$i++){ $insert[] = [ 'site_id' => $this->site_id, - 'member_id' => $memberId, + 'seller_uid' => $memberId, 'goods_id' => (int)$info['goods_id'], 'total' => (int)$info['goods_num'], 'unit_price' => sprintf("%.2f",$info['unit_price'] * $info['goods_num']), diff --git a/addon/futures/shop/controller/Futures.php b/addon/futures/shop/controller/Futures.php index c37daefc..e9744858 100644 --- a/addon/futures/shop/controller/Futures.php +++ b/addon/futures/shop/controller/Futures.php @@ -12,21 +12,95 @@ */ namespace addon\futures\shop\controller; use app\shop\controller\BaseShop; +use addon\futures\model\Futures as futuresModel; class Futures extends BaseShop{ - - // 进入首页 + /** + * Common: 进入交易市场 + * Author: wu-hui + * Time: 2023/02/23 14:38 + * @return array|mixed + */ public function index(){ + if(request()->isAjax()){ + // 参数获取 + $page = input('page',1); + $pageSize = input('page_size',PAGE_LIST_ROWS); + $nickname = input('nickname',''); + $status = (int)input('status',0);// 状态（1=库存，2=已上架，3=已售出，4=提货中，5=提货完成，6=待支付，7=捡漏) + $timeType = (string)input('time_type','created'); + $startTime = (int)input('start_time',0); + $endTime = (int)input('end_time',0); + // 获取内容 + $field = [ + 'seller.username as seller_username', + 'seller.nickname as seller_nickname', + 'seller.headimg as seller_headimg', + 'g.goods_name', + 'g.goods_image', + 'a.id', + 'a.total', + 'a.unit_price', + 'a.price', + 'a.status', + 'a.release_time', + 'a.sell_time', + 'a.created_time', + 'a.take_time', + ]; + // 表关联 + $join = [ + ['member seller', 'seller.member_id = a.seller_uid', 'left'],// 获取卖家信息 + ['goods g', 'g.goods_id = a.goods_id', 'left'],// 获取商品信息 + ]; + // 条件生成 + $condition = [ + ['a.site_id','=',$this->site_id] + ]; + if($nickname) $condition[] = ['seller.username|seller.nickname',"like","%{$nickname}%"]; + if($status > 0) $condition[] = ['a.status',"=",$status]; + $timeField = [ + 'created' => 'a.created_time', + 'release' => 'a.release_time', + 'sell' => 'a.sell_time', + 'take' => 'a.take_time', + ]; + if($startTime > 0) $condition[] = [$timeField[$timeType],">=",$startTime]; + if($endTime > 0) $condition[] = [$timeField[$timeType],"<=",$endTime]; - - + return (new futuresModel())->getPageList($condition, $page, $pageSize, 'a.created_time desc,a.id desc', $field, 'a', $join); + } $this->forthMenu(); return $this->fetch('futures/index'); } + /** + * Common: 查看交易详情 + * Author: wu-hui + * Time: 2023/02/23 18:04 + * @return mixed + */ + public function seeDetail(){ + // 参数获取 + $id = input('id',0); + // 获取交易信息 + $field = "id,seller_uid,order_id,member_id,goods_id,total,unit_price,price,status,release_time,sell_time,created_time,take_time,old_futures_id"; + $data['info'] = (array)model('futures')->getInfo(['id' => $id],$field); + // 获取卖家信息 买家信息 + $memberField = "username,nickname,headimg"; + $data['seller'] = (array)model('member')->getInfo(['member_id' => $data['info']['seller_uid']],$memberField); + $data['buyer'] = (array)model('member')->getInfo(['member_id' => $data['info']['member_id']],$memberField); + // 获取订单信息 + $orderField = "order_no"; + $data['order'] = (array)model('order')->getInfo(['order_id' => $data['info']['order_id']],$orderField); + // 商品信息 + $goodsField = "goods_name,goods_image"; + $data['goods'] = (array)model('goods')->getInfo(['goods_id' => $data['info']['goods_id']],$goodsField); + $data['goods']['goods_image'] = explode(',',$data['goods']['goods_image'])[0]; - + return $this->fetch('futures/see',$data); + } diff --git a/addon/futures/shop/controller/User.php b/addon/futures/shop/controller/User.php index 0b1d4811..979b7102 100644 --- a/addon/futures/shop/controller/User.php +++ b/addon/futures/shop/controller/User.php @@ -38,9 +38,12 @@ class User extends BaseShop{ return (new userModel($this->site_id))->changeSpecial(); } - - - // 商品赠送 + /** + * Common: 商品赠送 + * Author: wu-hui + * Time: 2023/02/23 14:01 + * @return array|mixed + */ public function sendGoods(){ if(request()->isAjax()) return (new userModel($this->site_id))->sendGoods(); diff --git a/addon/futures/shop/view/futures/index.html b/addon/futures/shop/view/futures/index.html index d0f91651..67460588 100644 --- a/addon/futures/shop/view/futures/index.html +++ b/addon/futures/shop/view/futures/index.html @@ -15,136 +15,217 @@ height:40px; margin-right:20px; } + .time_p{ + height: 20px; + line-height: 20px; + font-size: 13px; + } {/block} {block name="main"} - -
-
- - - + +
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ + +
+ +
+ +
+ + +
+
-
+
+ + +
+
+
+
+ + +
+
-
+ + + + {/block} {block name="script"} +{/block} \ No newline at end of file diff --git a/addon/futures/shop/view/user/index.html b/addon/futures/shop/view/user/index.html index 6ef0eda8..f25eddc7 100644 --- a/addon/futures/shop/view/user/index.html +++ b/addon/futures/shop/view/user/index.html @@ -22,7 +22,7 @@
-
+
@@ -43,7 +43,7 @@
- +
@@ -58,7 +58,7 @@ {{# } }} - 删除 +
@@ -147,6 +147,22 @@ }); return false; }); + // 重置表单 + form.on('submit(reset)', function(data) { + let field = { + "nickname": "", + "status": "", + }; + form.val("search_form", field); + layui.form.render(); + // 刷新表格 + table.reload({ + page: { + curr: 1 + }, + where: field + }); + }); // 监听工具栏操作 table.tool(function(obj) { var data = obj.data; @@ -166,12 +182,5 @@ } }); } - - - - - - - {/block} \ No newline at end of file diff --git a/addon/futures/shop/view/user/send_goods.html b/addon/futures/shop/view/user/send_goods.html index ccddc8b3..86c59a09 100644 --- a/addon/futures/shop/view/user/send_goods.html +++ b/addon/futures/shop/view/user/send_goods.html @@ -152,12 +152,6 @@ }) }); }); - - - - - - }); }); // 点击关闭弹框