From 54e0d66936d1635e0f2885d6d5f4d6c93ba9f0d3 Mon Sep 17 00:00:00 2001 From: Jason <1432334894@qq.com> Date: Wed, 3 Aug 2022 15:00:57 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E8=A7=86=E8=A7=89=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- view/css/admin_style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/css/admin_style.css b/view/css/admin_style.css index 4cc56e7..4b74202 100644 --- a/view/css/admin_style.css +++ b/view/css/admin_style.css @@ -729,7 +729,7 @@ body{ margin:0 auto; } .admin-menuleft-footer div{ - width: 100%; + width: 200px; font-size: 12px; text-align: center; } From 7d3ae402da6a47b5d476607990db081fe037b664 Mon Sep 17 00:00:00 2001 From: Jason <1432334894@qq.com> Date: Wed, 3 Aug 2022 15:07:16 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E8=A7=86=E8=A7=89=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- control/index.php | 1 + view/templates/include/admin_leftmenu.html | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/control/index.php b/control/index.php index 22dfac8..1667dcb 100644 --- a/control/index.php +++ b/control/index.php @@ -13,6 +13,7 @@ class index extends publicBase { $obj = new mOrder(); $this->view['today_data'] = $obj->getTodayData($uid, $shop_id); $this->view['total_data'] = $obj->getToalData($uid, $shop_id); + $this->view['menu_page'] = 'home'; } public function ajax_get_data() { diff --git a/view/templates/include/admin_leftmenu.html b/view/templates/include/admin_leftmenu.html index b1720eb..69520ae 100644 --- a/view/templates/include/admin_leftmenu.html +++ b/view/templates/include/admin_leftmenu.html @@ -7,7 +7,7 @@
- + 首页 From 9dceaf744ee4be97c1240b7ad87a0313589229f0 Mon Sep 17 00:00:00 2001 From: Jason <1432334894@qq.com> Date: Wed, 3 Aug 2022 15:09:03 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- control/index.php | 4 +++- view/templates/include/admin_leftmenu.html | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/control/index.php b/control/index.php index 1667dcb..08e53a1 100644 --- a/control/index.php +++ b/control/index.php @@ -93,7 +93,9 @@ class index extends publicBase { $this->ajax_json(true, 'succ', $nlist); } - public function after_sale_list() {} + public function after_sale_list() { + $this->view['menu_page'] = 'after_sale_list'; + } public function ajax_get_after_sale_order_list() { $shopinfo = $this->get_shopinfo(); diff --git a/view/templates/include/admin_leftmenu.html b/view/templates/include/admin_leftmenu.html index 69520ae..3cd22a0 100644 --- a/view/templates/include/admin_leftmenu.html +++ b/view/templates/include/admin_leftmenu.html @@ -35,8 +35,8 @@
-
- +
+ 售后监控 From a4dadae2ed25d323f04c56c6d74d24aee9720b22 Mon Sep 17 00:00:00 2001 From: Jason <1432334894@qq.com> Date: Wed, 3 Aug 2022 15:10:25 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- control/index.php | 4 +++- view/templates/include/admin_leftmenu.html | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/control/index.php b/control/index.php index 08e53a1..08540b3 100644 --- a/control/index.php +++ b/control/index.php @@ -34,7 +34,9 @@ class index extends publicBase { $this->ajax_json(true, 'succ', $list); } - public function order_list() {} + public function order_list() { + $this->view['menu_page'] = 'order_list'; + } public function ajax_get_order_list() { $shopinfo = $this->get_shopinfo(); diff --git a/view/templates/include/admin_leftmenu.html b/view/templates/include/admin_leftmenu.html index 3cd22a0..2afe11e 100644 --- a/view/templates/include/admin_leftmenu.html +++ b/view/templates/include/admin_leftmenu.html @@ -46,7 +46,7 @@
- + 订单列表 From fb9ba15333d664f0b3ddc7a143e03639e6c04475 Mon Sep 17 00:00:00 2001 From: Jason <1432334894@qq.com> Date: Wed, 3 Aug 2022 15:13:06 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- control/index.php | 4 ++++ view/templates/include/admin_leftmenu.html | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/control/index.php b/control/index.php index 08540b3..985b824 100644 --- a/control/index.php +++ b/control/index.php @@ -38,6 +38,10 @@ class index extends publicBase { $this->view['menu_page'] = 'order_list'; } + public function wait_deliver_list() { + $this->view['menu_page'] = 'wait_deliver_list'; + } + public function ajax_get_order_list() { $shopinfo = $this->get_shopinfo(); diff --git a/view/templates/include/admin_leftmenu.html b/view/templates/include/admin_leftmenu.html index 2afe11e..0dff859 100644 --- a/view/templates/include/admin_leftmenu.html +++ b/view/templates/include/admin_leftmenu.html @@ -25,8 +25,8 @@ 常用功能
-
- +
+ 发货提醒 From 3e4d49d74501f48bbcbb99fccbb279047b1ba6f2 Mon Sep 17 00:00:00 2001 From: Jason <1432334894@qq.com> Date: Wed, 3 Aug 2022 15:20:22 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- view/css/admin_style.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/view/css/admin_style.css b/view/css/admin_style.css index 4b74202..0dccf59 100644 --- a/view/css/admin_style.css +++ b/view/css/admin_style.css @@ -563,6 +563,9 @@ body{ .deliver_remind_list_table_class .layui-table-main tr:hover > td:nth-child(-n+2){ color:#1890FF !important; } + .deliver_remind_list_table_class .layui-table-main tr:hover > td:nth-child(-n+2) a{ + color:#1890FF !important; + } .count_down_wait{ color: #F21019; position: relative; From e4637bc12a41386186e34fbe0c20c203a2ea47b3 Mon Sep 17 00:00:00 2001 From: Jason <1432334894@qq.com> Date: Wed, 3 Aug 2022 15:22:05 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=8F=B7=E7=82=B9=E5=87=BB=E6=97=A0=E6=B3=95=E5=A4=8D=E5=88=B6?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- view/templates/index/order_list.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/view/templates/index/order_list.html b/view/templates/index/order_list.html index 7c25cb2..a448e5c 100644 --- a/view/templates/index/order_list.html +++ b/view/templates/index/order_list.html @@ -96,7 +96,7 @@ layui.use(['element', 'layer', 'util', 'table'], function(){ ,{field:'refund_status_desc', title:'退款状态' ,templet: function(d){ return ''+d.refund_status_desc+''; - + }} ]] ,page: true @@ -115,7 +115,7 @@ layui.use(['element', 'layer', 'util', 'table'], function(){ var data = res.data; for(var i=0; i Date: Wed, 3 Aug 2022 15:35:27 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=A7=86=E8=A7=89?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- view/css/admin_style.css | 12 +++++++++++- view/templates/include/admin_leftmenu.html | 2 +- view/templates/index/home.html | 14 +++++++------- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/view/css/admin_style.css b/view/css/admin_style.css index 0dccf59..f64b148 100644 --- a/view/css/admin_style.css +++ b/view/css/admin_style.css @@ -264,7 +264,7 @@ body{ padding-left: 22px; padding-right: 6px; } - .admin-index-top-item-list-item-child-dot-red2{ + .admin-index-top-item-list-item-child-dot-red2,.admin-index-top-item-list-item-child-dot-grey2{ margin-right: 5px; } .admin-index-top-item-list-item-child-dot-red2::after{ @@ -277,6 +277,16 @@ body{ position: relative; top: -2px; } + .admin-index-top-item-list-item-child-dot-grey2::after{ + content: ''; + display: inline-block; + width: 6px; + height: 6px; + background: #69717D; + border-radius: 50%; + position: relative; + top: -2px; + } .admin-card-text-3 span,.admin-card-text-4 span{ font-size: 11px; margin-left: 5px; diff --git a/view/templates/include/admin_leftmenu.html b/view/templates/include/admin_leftmenu.html index 0dff859..7a1247c 100644 --- a/view/templates/include/admin_leftmenu.html +++ b/view/templates/include/admin_leftmenu.html @@ -7,7 +7,7 @@
- + 首页 diff --git a/view/templates/index/home.html b/view/templates/index/home.html index 4bb98e4..10773b1 100644 --- a/view/templates/index/home.html +++ b/view/templates/index/home.html @@ -100,7 +100,7 @@
-
催发货订单(总)  
+
催发货订单(总)  
{$total_data.total_urge_order_count} 单
日增长：+0.61%
周减少：-0.61%
@@ -109,7 +109,7 @@
-
倒计时订单(总)  
+
倒计时订单(总)  
{$total_data.total_countdown_order_count} 单
日增长：+0.61%
周减少：-0.61%
@@ -118,17 +118,17 @@
-
待发货订单(总)  
+
待发货订单(总)  
{$total_data.total_wait_deliver_goods_count} 单
日增长：+0.61%
周减少：-0.61%
-
有新增的订单啦
+
有新增的订单啦
-
平台介入中订单(总)  
+
平台介入中订单(总)  
{$total_data.total_platform_processing_count} 单
日增长：+0.61%
周减少：-0.61%
@@ -138,11 +138,11 @@
-
待售后订单(总)  
+
待售后订单(总)  
{$total_data.total_wait_after_sale_count} 单
日增长：+0.61%
周减少：-0.61%
-
这些顾客想要退款
+
这些顾客想要退款