From d10ed72968a41dfc2c963101eaa16276a7f7b1a6 Mon Sep 17 00:00:00 2001 From: hzj <1831054011@qq.com> Date: 星期一, 13 十月 2025 14:20:51 +0800 Subject: [PATCH] Merge branch 'main' of http://8.134.184.104:10801/r/came --- API/v3/OrderPrice.gds | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/API/v3/OrderPrice.gds b/API/v3/OrderPrice.gds index 08702ed..8696145 100644 --- a/API/v3/OrderPrice.gds +++ b/API/v3/OrderPrice.gds @@ -213,7 +213,7 @@ '鍦板尯鎶ヤ环鏂规 appUrl="https://api.map.baidu.com/reverse_geocoding/v3/" - args1="location="&Region_lat&","&Region_lng&"&output=json&latest_admin=1&ak=itVkbEKpECSqWgP9u8Po7ZiBkUHR9p2p" + args1="coordtype=gcj02ll&location="&Region_lat&","&Region_lng&"&output=json&latest_admin=1&ak=itVkbEKpECSqWgP9u8Po7ZiBkUHR9p2p" HTMLCODE= GetBody(appUrl,args1) json = HTMLCODE 'Response.Write HTMLCODE @@ -390,7 +390,7 @@ OrderPriceFRM = OrderPriceFRM & "+"&WaitingInt&"*"&IRWaitingCost OrderPriceTXT = OrderPriceTXT&"绛夊緟璐圭敤:"&WaitingInt*IRWaitingCost&"鍏僜n" End If - If ServiceOrdApptDate<>"" Then '闈炲伐浣滄椂闂存湇鍔¤垂鐢紝鍛ㄤ竴~浜旂殑0800-2000 1.3鍊� + If ServiceOrdApptDate<>"" Then '闈炲伐浣滄椂闂存湇鍔¤垂鐢�20250624锛屽懆涓�~鍛ㄤ簲鏅氫笂22鐐瑰悗鑷虫棭涓�7鐐规暣鍓嶄负1.3鍊� sql="select SpecialRatio from SpecialDates where SpecialDates='"&formatdatetime(ServiceOrdApptDate,2)&"'" rs.open sql,objConn,1,1 if not rs.Eof Then @@ -398,7 +398,7 @@ OrderPriceFRM = OrderPriceFRM & OrderPrice*(SpecialRatio-1) OrderPriceTXT = OrderPriceTXT&"鑺傚亣鏃ユ椂闂存湇鍔¤垂鐢�:"&OrderPrice*(SpecialRatio-1)&"鍏僜n" OrderPrice=OrderPrice*SpecialRatio - ElseIf (hour(ServiceOrdApptDate)<=8 Or hour(ServiceOrdApptDate)>=20) Then + ElseIf (hour(ServiceOrdApptDate)>=22 Or hour(ServiceOrdApptDate)<7) Then OrderPriceFRM = OrderPriceFRM & OrderPrice*0.3 OrderPriceTXT = OrderPriceTXT&"闈炲伐浣滄椂闂存湇鍔¤垂鐢�:"&OrderPrice*0.3&"鍏僜n" OrderPrice=OrderPrice*1.3 -- Gitblit v1.9.1