From 18d26aa3f2f079dd71d22e4172fb4ae9350111d4 Mon Sep 17 00:00:00 2001 From: Mike Date: Wed, 9 Sep 2020 19:55:34 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=BC=BA=E8=A1=8C=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=95=86=E6=88=B7=E7=9B=B8=E5=85=B3=E6=93=8D=E4=BD=9Cblock?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UserCenterBlockService.php | 26 ++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/app/Service/v3/Implementations/UserCenterBlockService.php b/app/Service/v3/Implementations/UserCenterBlockService.php index 72c8675..55433ca 100644 --- a/app/Service/v3/Implementations/UserCenterBlockService.php +++ b/app/Service/v3/Implementations/UserCenterBlockService.php @@ -43,18 +43,26 @@ class UserCenterBlockService implements UserCenterBlockServiceInterface ] ]; + $blocks[] = [ + 'type' => 'store_user', + 'title' => '商户相关', + 'items' => [ + ['name' => '商家入口', 'icon' => $img_host . 'user_icons/shop_enter.png', 'type' => 'page', 'path' => '/pages/shopLogin/shopLogin','command'=>'store_login'] + ] + ]; + foreach ($roles as $key => $item) { # code... - if($item['key'] == 'store'){ - $blocks[] = [ - 'type' => 'store_user', - 'title' => '商户相关', - 'items' => [ - ['name' => '商家入口', 'icon' => $img_host . 'user_icons/shop_enter.png', 'type' => 'page', 'path' => '/pages/shopLogin/shopLogin','command'=>'store_login'] - ] - ]; - } + // if($item['key'] == 'store'){ + // $blocks[] = [ + // 'type' => 'store_user', + // 'title' => '商户相关', + // 'items' => [ + // ['name' => '商家入口', 'icon' => $img_host . 'user_icons/shop_enter.png', 'type' => 'page', 'path' => '/pages/shopLogin/shopLogin','command'=>'store_login'] + // ] + // ]; + // } if($item['key'] == 'sp'){ $blocks[] = [ From 1d05f15c176bab9947c55a3f0eea997ff4917844 Mon Sep 17 00:00:00 2001 From: Mike Date: Wed, 9 Sep 2020 20:16:31 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Controller/v3/HomeController.php | 6 ++++-- app/Service/v3/Implementations/UserCenterBlockService.php | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/Controller/v3/HomeController.php b/app/Controller/v3/HomeController.php index c6c86bb..bdab336 100644 --- a/app/Controller/v3/HomeController.php +++ b/app/Controller/v3/HomeController.php @@ -135,7 +135,8 @@ class HomeController extends BaseController $roles[] = [ 'key'=>'store', 'title'=>'商家', - 'color'=>'#0091FF' + 'color'=>'#0091FF', + 'data'=>$store_info, ]; } @@ -143,7 +144,8 @@ class HomeController extends BaseController $roles[] = [ 'key'=>'sp', 'title'=>'服务', - 'color'=>'#0091FF' + 'color'=>'#0091FF', + 'data'=>$sp_info, ]; } diff --git a/app/Service/v3/Implementations/UserCenterBlockService.php b/app/Service/v3/Implementations/UserCenterBlockService.php index 55433ca..d078797 100644 --- a/app/Service/v3/Implementations/UserCenterBlockService.php +++ b/app/Service/v3/Implementations/UserCenterBlockService.php @@ -69,7 +69,7 @@ class UserCenterBlockService implements UserCenterBlockServiceInterface 'type' => 'sp_user', 'title' => '服务专员', 'items' => [ - ['name' => '评价', 'icon' => $img_host . 'user_icons/shop_enter.png', 'type' => 'page', 'path' => '/zh_cjdianc/pages/appraise/index','command'=>'store_login'] + ['name' => '评价', 'icon' => $img_host . 'user_icons/shop_enter.png', 'type' => 'page', 'path' => '/zh_cjdianc/pages/appraise/index?service_personnel_id='.$item['data']['id'],'command'=>'sp_login'] ] ]; } From c425764668f82e31d77968a403576b786fb56525 Mon Sep 17 00:00:00 2001 From: Mike Date: Wed, 9 Sep 2020 20:21:51 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=BD=93=E9=9D=A2=E4=BB=98=E5=9C=B0=E5=9D=80=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Service/v3/Implementations/UserCenterBlockService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Service/v3/Implementations/UserCenterBlockService.php b/app/Service/v3/Implementations/UserCenterBlockService.php index d078797..1964962 100644 --- a/app/Service/v3/Implementations/UserCenterBlockService.php +++ b/app/Service/v3/Implementations/UserCenterBlockService.php @@ -35,7 +35,7 @@ class UserCenterBlockService implements UserCenterBlockServiceInterface 'title' => '常用功能', 'items' => [ ['name' => '收货地址', 'icon' => $img_host . 'user_icons/user_addr.png', 'type' => 'page', 'path' => '/pages/address/userAddress/userAddress','command'=>'user_addr'], - ['name' => '当面付订单查询', 'icon' => $img_host . 'user_icons/offline_orders.png', 'type' => 'page', 'path' => '/pages/faceOrderList/faceOrderList','command'=>'offline_orders'], + ['name' => '当面付订单查询', 'icon' => $img_host . 'user_icons/offline_orders.png', 'type' => 'page', 'path' => '/pages/facepay/facepay','command'=>'offline_orders'], ['name' => '在线客服', 'icon' => $img_host . 'user_icons/online_kf.png', 'type' => 'page', 'path' => '','command'=>'online_kf'], ['name' => '联系服务站', 'icon' => $img_host . 'user_icons/contact_fwz.png', 'type' => 'page', 'path' => '/pages/contactMarket/contactMarket','command'=>'contact_fwz'], ['name' => '关于懒族', 'icon' => $img_host . 'user_icons/about_lz.png', 'type' => 'page', 'path' => '/pages/aboutUs/aboutUs','command'=>'about'],