From 8a5737f83f2dbee77f0de3a90d181545f2602bf7 Mon Sep 17 00:00:00 2001 From: jianglong Date: Wed, 21 Jun 2023 15:16:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/logic/ShopLogic.php | 5 ++++- app/common/enum/AdEnum.php | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/api/logic/ShopLogic.php b/app/api/logic/ShopLogic.php index 5aaf1f4..ac6124f 100644 --- a/app/api/logic/ShopLogic.php +++ b/app/api/logic/ShopLogic.php @@ -191,7 +191,10 @@ class ShopLogic extends Logic $city = DevRegion::where('id',$get['city_id'])->field('db09_lng,db09_lat')->findOrEmpty()->toArray(); - $list = Shop::field('id,name,logo,background,visited_num,cover,banner,st_distance_sphere(point('.$city['db09_lng'].','.$city['db09_lat'].'),point(longitude, latitude)) as distance') +// $list = Shop::field('id,name,logo,background,visited_num,cover,banner,st_distance_sphere(point('.$city['db09_lng'].','.$city['db09_lat'].'),point(longitude, latitude)) as distance') + $list = Shop::field('id,name,logo,background,visited_num,cover,banner,ROUND(ACOS(SIN(RADIANS('.$city['db09_lat'].')) * SIN(RADIANS(latitude)) + + COS(RADIANS('.$city['db09_lat'].')) * COS(RADIANS(latitude)) * + COS(RADIANS('.$city['db09_lng'].' - longitude))) * 6371,2) AS distance ') ->where($where) // 无限期 或 未到期 ->whereRaw('expire_time =0 OR expire_time > '. time()) diff --git a/app/common/enum/AdEnum.php b/app/common/enum/AdEnum.php index edca872..bc4fe16 100644 --- a/app/common/enum/AdEnum.php +++ b/app/common/enum/AdEnum.php @@ -124,6 +124,11 @@ class AdEnum{ 'path' => '/bundle/pages/integral_mall/integral_mall', 'is_tab' => 0, ], + [ + 'name' => '资料库', + 'path' => '/pages/resource_list/resource_list', + 'is_tab' => 1, + ] ], self::PC => [ [