From c7b6916c3c0eca4a284ee38b7ef2d9cffc77ab2f Mon Sep 17 00:00:00 2001 From: gongfuxiang <2499232802@qq.com> Date: Mon, 15 Oct 2018 00:27:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/PayLogController.class.php | 10 +- .../Application/Admin/Lang/zh-cn/paylog.php | 2 +- .../Admin/View/Default/PayLog/Index.html | 12 +- service/Application/Common/Lang/zh-cn.php | 4 +- .../Home/Controller/UserController.class.php | 15 ++ .../Home/View/Default/Index/Index.html | 16 +- .../Home/View/Default/User/Index.html | 58 +++--- .../Service/GoodsService.class.php | 2 +- .../Service/MessageService.class.php | 192 ++++++++++++++++++ .../Service/OrderService.class.php | 14 +- .../Service/ResourcesService.class.php | 29 --- service/Public/Home/Default/Css/Common.css | 2 + service/Public/Home/Default/Css/Order.css | 1 + .../Images/user-index-nav-order-icon-2.png | Bin 669 -> 579 bytes .../Images/user-index-nav-order-icon-3.png | Bin 579 -> 669 bytes shopxo.sql | 33 ++- 16 files changed, 286 insertions(+), 104 deletions(-) create mode 100644 service/Application/Service/MessageService.class.php diff --git a/service/Application/Admin/Controller/PayLogController.class.php b/service/Application/Admin/Controller/PayLogController.class.php index b2eb2e19a..a473d1a65 100755 --- a/service/Application/Admin/Controller/PayLogController.class.php +++ b/service/Application/Admin/Controller/PayLogController.class.php @@ -70,7 +70,7 @@ class PayLogController extends CommonController $this->assign('common_pay_type_list', $pay_list); // 业务类型 - $this->assign('common_busines_type_list', L('common_busines_type_list')); + $this->assign('common_business_type_list', L('common_business_type_list')); // 参数 $this->assign('param', $param); @@ -97,11 +97,11 @@ class PayLogController extends CommonController if(!empty($data)) { $common_gender_list = L('common_gender_list'); - $common_busines_type_list = L('common_busines_type_list'); + $common_business_type_list = L('common_business_type_list'); foreach($data as &$v) { // 业务类型 - $v['busines_type_text'] = $common_busines_type_list[$v['busines_type']]['name']; + $v['business_type_text'] = $common_business_type_list[$v['business_type']]['name']; // 性别 $v['gender_text'] = $common_gender_list[$v['gender']]['name']; @@ -145,9 +145,9 @@ class PayLogController extends CommonController { $where['p.payment'] = I('pay_type'); } - if(I('busines_type', -1) > -1) + if(I('business_type', -1) > -1) { - $where['p.busines_type'] = intval(I('busines_type', 0)); + $where['p.business_type'] = intval(I('business_type', 0)); } if(I('gender', -1) > -1) { diff --git a/service/Application/Admin/Lang/zh-cn/paylog.php b/service/Application/Admin/Lang/zh-cn/paylog.php index a8a39c41f..c46ea3420 100755 --- a/service/Application/Admin/Lang/zh-cn/paylog.php +++ b/service/Application/Admin/Lang/zh-cn/paylog.php @@ -14,7 +14,7 @@ return array( 'paylog_user_name' => '用户信息', 'paylog_pay_type_name' => '支付类型', - 'paylog_busines_type_name' => '业务类型', + 'paylog_business_type_name' => '业务类型', 'paylog_order_id_name' => '业务订单id', 'paylog_trade_no_name' => '支付平台交易号', 'paylog_platform_buyer_user_name' => '支付平台用户帐号', diff --git a/service/Application/Admin/View/Default/PayLog/Index.html b/service/Application/Admin/View/Default/PayLog/Index.html index 0a6c56679..eb2bc9f54 100755 --- a/service/Application/Admin/View/Default/PayLog/Index.html +++ b/service/Application/Admin/View/Default/PayLog/Index.html @@ -29,10 +29,10 @@ - + + +
@@ -51,7 +51,7 @@ {{:L('paylog_user_name')}} {{:L('paylog_pay_type_name')}} - {{:L('paylog_busines_type_name')}} + {{:L('paylog_business_type_name')}} {{:L('paylog_order_id_name')}} {{:L('paylog_trade_no_name')}} {{:L('paylog_platform_buyer_user_name')}} @@ -82,7 +82,7 @@ {{:L('common_on_fill_in_the_text')}}{{$v.payment_name}} - {{:L('common_on_fill_in_the_text')}}{{$v.busines_type_text}} + {{:L('common_on_fill_in_the_text')}}{{$v.business_type_text}} {{:L('common_on_fill_in_the_text')}}{{$v.order_id}} diff --git a/service/Application/Common/Lang/zh-cn.php b/service/Application/Common/Lang/zh-cn.php index a6ae4a667..724e2e41b 100755 --- a/service/Application/Common/Lang/zh-cn.php +++ b/service/Application/Common/Lang/zh-cn.php @@ -433,8 +433,8 @@ return array( 1 => array('id' => 1, 'name' => '微信'), ), - // 支付日志 - 业务类型 - 'common_busines_type_list' => array( + // 业务类型 + 'common_business_type_list' => array( 0 => array('id' => 0, 'name' => '订单', 'checked' => true), ), diff --git a/service/Application/Home/Controller/UserController.class.php b/service/Application/Home/Controller/UserController.class.php index f19bf709f..e878a9da2 100755 --- a/service/Application/Home/Controller/UserController.class.php +++ b/service/Application/Home/Controller/UserController.class.php @@ -2,6 +2,9 @@ namespace Home\Controller; +use Service\OrderService; +use Service\GoodsService; + /** * 用户 * @author Devil @@ -54,6 +57,18 @@ class UserController extends CommonController */ public function Index() { + // 订单总数 + $where = ['user_id'=>$this->user['id'], 'is_delete_time'=>0, 'user_is_delete_time'=>0]; + $this->assign('user_order_count', OrderService::OrderTotal($where)); + + // 商品收藏总数 + $where = ['user_id'=>$this->user['id']]; + $this->assign('user_goods_favor_count', GoodsService::FavorGoodsTotal($where)); + + // 用户订单状态 + $user_order_status = OrderService::OrderStatusStepTotal(['user_type'=>'user', 'user'=>$this->user, 'is_comments'=>1]); + $this->assign('user_order_status', $user_order_status['data']); + $this->display('Index'); } diff --git a/service/Application/Home/View/Default/Index/Index.html b/service/Application/Home/View/Default/Index/Index.html index fa8966cd4..ed1f93136 100755 --- a/service/Application/Home/View/Default/Index/Index.html +++ b/service/Application/Home/View/Default/Index/Index.html @@ -88,13 +88,15 @@
- - - {{$v.count}}{{$v.name}} - - {{$v.count}}{{$v.name}} - - + + + + {{$v.count}}{{$v.name}} + + {{$v.count}}{{$v.name}} + + +
diff --git a/service/Application/Home/View/Default/User/Index.html b/service/Application/Home/View/Default/User/Index.html index f54170db7..64e1a078b 100755 --- a/service/Application/Home/View/Default/User/Index.html +++ b/service/Application/Home/View/Default/User/Index.html @@ -45,13 +45,13 @@