From 9904f1baf92c1cc033e1ad261b9a0a66cb81554f Mon Sep 17 00:00:00 2001
From: shaojing <2901156235@qq.com>
Date: Wed, 1 Nov 2023 09:08:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=81=9C=E8=BD=A6=E5=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/pbService/bike/index.js | 24 +++++++++++++++---------
 pages/pbService/index.wxml    |  8 ++++++--
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/pages/pbService/bike/index.js b/pages/pbService/bike/index.js
index 684c960..a8de7a4 100644
--- a/pages/pbService/bike/index.js
+++ b/pages/pbService/bike/index.js
@@ -19,7 +19,8 @@ Page({
     list:[],
     types:["公共自行车","找厕所","停车场"],//都做一起了 根据type来分 默认就是自行车
     type:0,
-    typeService:['pbservice/Ztfw/publicBycicle','pbservice/Ztfw/toilets','pbservice/Ztfw/park']
+    // typeService:['pbservice/Ztfw/publicBycicle','pbservice/Ztfw/toilets','pbservice/Ztfw/park']
+    typeService:['pbservice/Ztfw/publicBycicle','pbservice/Ztfw/toilets','pbservice/Ztfw/park_new']
   },
 
   /**
@@ -66,15 +67,17 @@ Page({
       lon:this.data.longitude
     }).then(res=>{
       let list = this.data.list;
-      if(this.data.type==2){
-        res.data = res.data.parklist;
-      }
+      // if(this.data.type==2){
+      //   res.data = res.data.parklist;
+      // }
       res.data.map((item,index)=>{
         let mapItem = {};
         if(this.data.type==0){
           item.showContent = item.name + "(" + item.address + ")";
-          mapItem.latitude = Number(item.gaodelat);
-          mapItem.longitude = Number(item.gaodelng);
+          mapItem.latitude = Number(item.lat);
+          mapItem.longitude = Number(item.lng);
+          // mapItem.latitude = Number(item.gaodelat);
+          // mapItem.longitude = Number(item.gaodelng);
         }
         else if(this.data.type==1){
           item.showContent = item.poiname;
@@ -82,9 +85,12 @@ Page({
           mapItem.longitude = Number(item.longitude);
         }
         else if(this.data.type==2){
-          item.showContent = item.parkName + "(" + item.address + ")";
-          mapItem.latitude = Number(item.gaodelat);
-          mapItem.longitude = Number(item.gaodelon);
+          // item.showContent = item.parkName + "(" + item.address + ")";
+          item.showContent = item.name;
+          mapItem.latitude = Number(item.lat);
+          mapItem.longitude = Number(item.lng);
+          // mapItem.latitude = Number(item.gaodelat);
+          // mapItem.longitude = Number(item.gaodelon);
         }
         mapItem.id = list.length+index;
         mapItem.info = item;
diff --git a/pages/pbService/index.wxml b/pages/pbService/index.wxml
index 721fdc0..3878ae2 100644
--- a/pages/pbService/index.wxml
+++ b/pages/pbService/index.wxml
@@ -47,6 +47,10 @@
       <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb20.png" mode="widthFix"></image>
       <view>文化配送</view>
     </view> -->
+     <view class="pb-item" data-title="附近图书馆" bindtap="gotoUrl" data-url="https://www.szlib.com/szlibposition">
+      <image src="https://static.ticket.sz-trip.com/uploads/20231031/858e6ced1edaf072aa7879ee6ff5204f.png" mode="widthFix"></image>
+      <view>附近图书馆</view>
+    </view>
   </view>
 </view>
 <image class="title-img" src="https://static.ticket.sz-trip.com/uploads/20211115/335a42385c9e15ece075980209b0643a.png"
@@ -59,11 +63,11 @@
       <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb6.png" mode="widthFix"></image>
       <view>实时公交</view>
     </view> -->
-    <!-- <view class="pb-item" data-event="car_park_public_click" data-title="停车场" bindtap="gotoPath"
+    <view class="pb-item" data-event="car_park_public_click" data-title="停车场" bindtap="gotoPath"
       data-path="/pages/pbService/bike/index?type=2">
       <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb5.png" mode="widthFix"></image>
       <view>停车场</view>
-    </view> -->
+    </view>
     <view class="pb-item" data-event="bicycle_click" data-title="公共自行车" bindtap="gotoPath"
       data-path="/pages/pbService/bike/index?type=0">
       <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb7.png" mode="widthFix"></image>