图游改版

app.json

@@ -182,8 +182,8 @@
 	"pages/user/address/add/index",
 	"pages/user/linkman/index",
   "pages/user/userPrivacy/index",
-	"pages/user/personalInfo/index"
-  
+	"pages/user/personalInfo/index",
+  "pages/info/luggageInfo/index"
 
   ],
   "plugins": {

pages/info/luggageInfo/index.js

@@ -0,0 +1,112 @@
+// pages/info/redmapInfo/index.js
+// pages/info/culturalUnitInfo/index.js
+import commonApi from "../../../utils/https/common"
+let app = getApp();
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    info:null,
+    currentIndex:0,
+    top:0,
+    htmls:[]
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    this.setData({
+      id:options.id
+    })
+    commonApi._post("scene/detail",{
+      id:options.id
+    }).then(res=>{
+      this.setData({
+        info:res.data
+      })
+      this.BroswerRecord()
+    })
+  },
+  changeSlide(e){
+    this.setData({
+      currentIndex:e.detail.current
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+  BroswerRecord:function(){
+    setTimeout(()=>{
+      if(app.globalData.uuid){
+        commonApi._post('browse/browse_record',{
+          type:"scene",
+          title:this.data.info.title,
+          drive:"mini",
+          source_id:this.data.id,
+          url:"/pages/info/foodInfo/index?id="+this.data.id,
+          uuid:app.globalData.uuid
+        }).then(res=>{
+          console.log(res)
+        })
+      }
+      else {
+        this.BroswerRecord();
+      }
+    },500)
+  },
+  gotolocation: function () {
+    let info = this.data.info;
+    wx.openLocation({
+      latitude: Number(info.lat),
+      longitude: Number(info.lon)
+    })
+  },
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

pages/info/luggageInfo/index.json

@@ -0,0 +1,5 @@
+{
+  "usingComponents": {
+    "title":"/pages/component/TitleHeader"
+  }
+}

pages/info/luggageInfo/index.wxml

@@ -0,0 +1,39 @@
+<!--pages/info/redmapInfo/index.wxml-->
+<wxs src="../../../utils/filter.wxs" module="tool" />
+<!-- <title wx:if="{{info}}" title="红色地图详情"></title> -->
+<title title="寄存点位详情"></title>
+<view class="box">
+  <view class="title textOver2">
+    {{info.title}}
+  </view>
+  <view class="address">
+    <image class="address-icon" src="https://static.ticket.sz-trip.com/uploads/20240124/3625398e2fba9768aa891f806b855716.png" mode=""/>
+    <view class="textOver address-text">{{info.address}}</view>
+    <image class="map-icon" src="https://static.ticket.sz-trip.com/uploads/20240124/bfe241bd7606cdaec78da737166a42fc.png" mode=""/>
+    <view class="go-there" bindtap="gotolocation">到这去</view>
+  </view>
+  <view class="address" style="margin: 27rpx 0;">
+    <image class="call-icon" src="https://static.ticket.sz-trip.com/uploads/20240124/fbd073d47279f137775ad39b5a6fe454.png" mode=""/>
+    <view class="call">电话：{{info.tel}}</view>
+  </view>
+  <view class="line"></view>
+  <view>
+    <view class="h-title">寄存时间</view>
+    <view class="btm-line"></view>
+  </view>
+  <view class="text">
+    <rich-text nodes="{{info.time_info}}"></rich-text>
+  </view>
+  <view>
+    <view class="h-title">收费情况</view>
+    <view class="btm-line"></view>
+  </view>
+  <view class="text"><rich-text nodes="{{info.content}}"></rich-text></view>
+  <view>
+    <view class="h-title2">寄存须知</view>
+    <view class="btm-line"></view>
+  </view>
+  <view class="text">
+    <rich-text nodes="{{info.book_info}}"></rich-text>
+  </view>
+</view>

pages/info/luggageInfo/index.wxss

@@ -0,0 +1,93 @@
+/* pages/pbService/museum/info/index.wxss */
+.box {
+  padding: 0 26.67rpx;
+}
+
+.title {
+  font-size: 35rpx;
+  font-family: PingFang SC;
+  font-weight: bold;
+  color: #000000;
+  margin: 28rpx 0 58rpx;
+}
+
+.address {
+  display: flex;
+  align-items: center;
+}
+
+.address-icon {
+  width: 29.33rpx;
+  height: 29.33rpx;
+  flex-shrink: 0;
+  margin-right: 22rpx;
+}
+
+.map-icon {
+  width: 24rpx;
+  height: 26.67rpx;
+  flex-shrink: 0;
+  margin: 0 12.67rpx 0 21.33rpx;
+}
+
+.address-text {
+  font-size: 24rpx;
+  font-family: PingFang SC;
+  font-weight: 500;
+  color: #999999;
+  max-width: 450rpx;
+}
+
+.go-there {
+  font-size: 24rpx;
+  font-family: PingFang SC;
+  font-weight: 500;
+  color: #0B898E;
+}
+
+.call-icon {
+  width: 29.33rpx;
+  height: 29.33rpx;
+  margin-right: 24rpx;
+}
+
+.call {
+  font-size: 24rpx;
+  font-family: PingFangSC;
+  font-weight: 400;
+  color: #999999;
+}
+
+.line {
+  width: 697rpx;
+  height: 1rpx;
+  background: #D8D8D8;
+  margin-bottom: 43.33rpx;
+}
+
+.h-title {
+  padding-left: 6.67rpx;
+  font-size: 32rpx;
+  font-family: PingFang SC;
+  font-weight: bold;
+  color: #333333;
+}
+
+.btm-line {
+  width: 173rpx;
+  height: 19rpx;
+  background: #0B898E;
+  opacity: 0.2;
+  margin-top: -15rpx;
+}
+
+.text {
+  margin: 41.33rpx 0 64.67rpx;
+}
+
+.h-title2 {
+  font-size: 36rpx;
+  font-family: PingFang SC;
+  font-weight: bold;
+  color: #333333;
+}

pages/map/index.js

@@ -17,7 +17,8 @@ Page({
     areaIndex:0,
     latitude:"",
     longitude:"",
-    type:0,
+    // type:0,
+    type:1, // 改为默认选中第一个类型：景点
     keywords:"",
     list:[],
     showInfo:false,
@@ -27,7 +28,14 @@ Page({
     productList:[],
     productPage:1,
     productTotal:1,
-    timeList:{}
+    timeList:{},
+    showMore:'close',
+    scrollLeft: 0,
+  },
+  listenScroll(e) {
+    this.setData({
+      scrollLeft: e.detail.scrollLeft
+    })
   },
 
   /**
@@ -67,6 +75,17 @@ Page({
       
     })
   },
+  changeClose() {
+    this.setData({
+      showMore:'close'
+    })
+  },
+  changeShow() {
+    this.setData({
+      showMore:'open'
+    })
+    console.log(this.data.showMore);
+  },
   getIsTest(){
     if(app.globalData.configJson){
       this.setData({
@@ -97,6 +116,12 @@ Page({
         url: '/pages/info/redmapInfo/index?id='+this.data.info.info.id,
       })
     }
+    else if(this.data.info.info.type=='luggage'){
+      // 行李寄存
+      wx.navigateTo({
+        url: '/pages/info/luggageInfo/index?id='+this.data.info.info.id,
+      })
+    }
     else if(this.data.info.info.type=='restaurant' || this.data.info.info.type=='tenscenic'){
       wx.navigateTo({
         url: '/pages/info/foodInfo/index?id='+this.data.info.info.id,
@@ -112,9 +137,97 @@ Page({
     }
     
   },
+  goAddress(e) {
+    let item = e.currentTarget.dataset.item;
+    wx.showModal({
+      title:'到这去',
+      content:item.info.showContent?item.info.showContent:item.info.title,
+      success:function(res){
+        if(res.confirm){
+          wx.openLocation({
+            latitude: item.latitude,
+            longitude: item.longitude,
+          })
+        }
+      }
+    })
+  },
   onTapMarker:function(e){
     console.log(e)
+    console.log(this.data.list,this.data.list.length);
     let info = this.data.list[e.detail.markerId];
+    let list = [];
+    this.data.list.map((item,itemIndex)=>{
+      let mapItem = item;
+      if (itemIndex == e.detail.markerId) {
+        mapItem.width = 30;
+        mapItem.height=36;
+        if (mapItem.info.type == "scenic") {
+          mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240125/4b340f512e8e424cb70ef766ad35cddb.png";
+        }else if (mapItem.info.type=='venue') {
+          mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240125/ff2d05414295b5e987c3fdc7373c5f38.png";
+        }else if (mapItem.info.type=='room') {
+          mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240125/fc2e8f86ad4977f08e7fe6284f946cb9.png";
+        }else if (mapItem.info.type=='publicBycicle') {
+          mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240125/1c35ea03927638d3d6fef7f15f92d67d.png";
+        }else if (mapItem.info.type=='restaurant') {
+          mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240125/4239b516f5ba99bff0b892a25a96c762.png";
+        }else if (mapItem.info.type=='relic') {
+          mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240125/ae03ad079e3e667e84b4e49e498c77a9.png";
+        }else if (mapItem.info.type=='tenscenic') {
+          mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240125/15f025534e644799f8c7cae6efee732f.png";
+        }else if (mapItem.info.type=='academes') {
+          mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240125/63e375cd4227fe6a58ef4eef85c38e4c.png";
+        }else if (mapItem.info.type=='park') {
+          mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240125/82218d810a22ea254afdf2a089cfd0a7.png";
+        }else if (mapItem.info.type=='luggage') {
+          mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240125/d73376830530e13963ccc3211480f975.png";
+        }else if (mapItem.info.type=='tourist') {
+          mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240125/eeb6894d312a6fd0b771623a2db6120c.png"; 
+        }else if (mapItem.info.type=='post') {
+          mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240125/2594df53aad900e56173eb024786379c.png";
+        } else {
+          mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240125/27517eb0968079bbeadb3b6438d3fbf3.png";
+        }
+      }else {
+            mapItem.width = 20;
+            mapItem.height=23;
+            if (mapItem.info.type == "scenic") {
+              mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/c59dc041fcfd8b7a62ad2ac2444adcda.png";
+            }else if (mapItem.info.type=='venue') {
+              mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/04aedae4dc498d45267f3636d5524af6.png";
+            }else if (mapItem.info.type=='room') {
+              mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/78ff8b94929d18dc6349a3482069b756.png";
+            }else if (mapItem.info.type=='publicBycicle') {
+              mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/6ce2b9e6eda6f8a3fea5073d5d5ad19a.png";
+            }else if (mapItem.info.type=='restaurant') {
+              mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/3f5bdfd0f0c81e2263bc3999291bec8f.png";
+            }else if (mapItem.info.type=='relic') {
+              mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/dfb34899466e98e1f2e02a40175a7672.png";
+            }else if (mapItem.info.type=='tenscenic') {
+              mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/f77236d6a84b8d28027417aa8ef60c96.png";
+            }else if (mapItem.info.type=='academes') {
+              mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/44da805692924852614afb013479e917.png";
+            }else if (mapItem.info.type=='park') {
+              mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/0b95fda240aa4f5eb89667188cfa1517.png";
+            }else if (mapItem.info.type=='luggage') {
+              mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/6ba1e554b71f451a120217c029fe1877.png";
+            }else if (mapItem.info.type=='tourist') {
+              mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/24fba3a917652e1bdfe31d5785dba09f.png"; 
+            }else if (mapItem.info.type=='post') {
+              mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/754a384e8aacd4a1ea41007e79910c67.png";
+            } else {
+              mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/2d61b60609564fc48e38768fbef87c0a.png";
+            }
+      }
+      if(mapItem.latitude<40){
+        list.push(mapItem)
+      }
+    })
+    this.setData({
+      list:list
+    })
+    console.log('换完图标后的list',list);
     if(info.info.type=='tenscenic'){
       // 运河十景需要先获取景点详情
       commonApi._post("scene/detail",{
@@ -219,12 +332,19 @@ Page({
         this.getProductList()
       })
       return;
+    }else if (info.info.type=='publicBycicle' || info.info.type=='park') {
+        console.log(e)
+        let index = e.detail.markerId,list = this.data.list;
+        let item = list[index];
+    } else {
+      
     }
     this.setData({
       info:info,
       showInfo:true,
       showAllMask:false
     })
+    console.log('打印',this.data.info);
   },
   changeMenu:function(e){
     let index = e.currentTarget.dataset.index;
@@ -424,11 +544,71 @@ Page({
   },
   changeRegion:function(e){
     console.log(e)
+    if(e.type!='end') return;
+    console.log(e.detail.centerLocation)
+    this.setData(e.detail.centerLocation)
     this.getList()
   },
   getList:function(){
+    // this.setData({
+    //   list:[]
+    // })
     this.mapCtx = wx.createMapContext("map");
-    let types = ['','scenic','venue','post','restaurant','relic','tenscenic','cinema','academes','red_map'],that = this;
+    // let types = ['','scenic','venue','post','restaurant','relic','tenscenic','cinema','academes','red_map'],that = this;
+    let types = ['','scenic','venue','room','publicBycicle','restaurant','relic','tenscenic','academes','park','luggage','tourist','post','red_map'],that = this;
+    if (types[that.data.type] == 'publicBycicle') {
+      commonApi.user_post("pbservice/Ztfw/publicBycicle",{
+        point_type:"gaode",
+        lat:this.data.latitude,
+        lon:this.data.longitude
+      }).then(res=>{
+        let list = [];
+        res.data.map((item,index)=>{
+          let mapItem = {};
+          item.showContent = item.name + "(" + item.address + ")";
+          mapItem.latitude = Number(item.lat);
+          mapItem.longitude = Number(item.lng);
+          mapItem.id = index;
+          mapItem.info = item;
+          mapItem.info.type = 'publicBycicle';
+          mapItem.width = 20;
+          mapItem.height=23;
+          mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/6ce2b9e6eda6f8a3fea5073d5d5ad19a.png";
+          if(mapItem.latitude<40){
+            list.push(mapItem)
+          }
+        })
+        this.setData({
+          list:list
+        })
+      })
+    } else if (types[that.data.type] == 'park') {
+      commonApi.user_post("pbservice/Ztfw/park_new",{
+        point_type:"gaode",
+        lat:this.data.latitude,
+        lon:this.data.longitude
+      }).then(res=>{
+        let list = [];
+        res.data.map((item,index)=>{
+          let mapItem = {};
+          item.showContent = item.name + "(" + item.address + ")";
+          mapItem.latitude = Number(item.lat);
+          mapItem.longitude = Number(item.lng);
+          mapItem.id = index;
+          mapItem.info = item;
+          mapItem.info.type = 'park';
+          mapItem.width = 20;
+          mapItem.height=23;
+          mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/0b95fda240aa4f5eb89667188cfa1517.png";
+          if(mapItem.latitude<40){
+            list.push(mapItem)
+          }
+        })
+        this.setData({
+          list:list
+        })
+      })
+    } else {
       this.mapCtx.getRegion({
         type: 'gcj02',
         success: function(res) {
@@ -449,11 +629,28 @@ Page({
               mapItem.longitude = Number(item.lon);
               mapItem.id = index;
               mapItem.info = item;
-            if(item.type=='red_map'){
-              mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20230506/054cea53a068545e9e27fa9cd3acbdec.png";
-            }
-            else {
-              mapItem.iconPath = "https://static.ticket.sz-trip.com/xcxImages/map/"+item.type+".png";
+              if(item.type=='scenic'){
+                mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/c59dc041fcfd8b7a62ad2ac2444adcda.png";
+              }else if (item.type=='venue') {
+                mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/04aedae4dc498d45267f3636d5524af6.png";
+              }else if (item.type=='room') {
+                mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/78ff8b94929d18dc6349a3482069b756.png";
+              }else if (item.type=='restaurant') {
+                mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/3f5bdfd0f0c81e2263bc3999291bec8f.png";
+              }else if (item.type=='relic') {
+                mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/dfb34899466e98e1f2e02a40175a7672.png";
+              }else if (item.type=='tenscenic') {
+                mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/f77236d6a84b8d28027417aa8ef60c96.png";
+              }else if (item.type=='academes') {
+                mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/44da805692924852614afb013479e917.png";
+              }else if (item.type=='luggage') {
+                mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/6ba1e554b71f451a120217c029fe1877.png";
+              }else if (item.type=='tourist') {
+                mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/24fba3a917652e1bdfe31d5785dba09f.png"; 
+              }else if (item.type=='post') {
+                mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/754a384e8aacd4a1ea41007e79910c67.png";
+              } else {
+                mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20240124/2d61b60609564fc48e38768fbef87c0a.png";
               }
               mapItem.width = 20;
               mapItem.height=23;
@@ -465,15 +662,55 @@ Page({
               list:list
             })
           })
-        // that.mapCtx.getRegion({
-        //   success:function(r){
-        //     let location = r.longitude+","+r.latitude;
+        }
+      })
+    }
+    console.log('list',this.data.list);
+    // this.mapCtx.getRegion({
+    //   type: 'gcj02',
+    //   success: function(res) {
+    //     commonApi._post("act/map_travel",{
+    //       type:types[that.data.type],
+    //       title:that.data.keywords,
+    //       m_lon:res.southwest.longitude-0.05,
+    //       l_lon:res.northeast.longitude+0.05,
+    //       m_lat:res.southwest.latitude-0.05,
+    //       l_lat:res.northeast.latitude+0.05
+    //     }).then(res=>{
+    //       let list = [];
+    //       res.data.map((item,index)=>{
+    //         let mapItem = {};
+    //         item.lat = item.tx_lat;
+    //         item.lon = item.tx_lon;
+    //         mapItem.latitude = Number(item.lat);
+    //         mapItem.longitude = Number(item.lon);
+    //         mapItem.id = index;
+    //         mapItem.info = item;
+    //         if(item.type=='red_map'){
+    //           mapItem.iconPath = "https://static.ticket.sz-trip.com/uploads/20230506/054cea53a068545e9e27fa9cd3acbdec.png";
+    //         }
+    //         else {
+    //           mapItem.iconPath = "https://static.ticket.sz-trip.com/xcxImages/map/"+item.type+".png";
+    //         }
+    //         mapItem.width = 20;
+    //         mapItem.height=23;
+    //         if(mapItem.latitude<40){
+    //           list.push(mapItem)
+    //         }
+    //       })
+    //       that.setData({
+    //         list:list
+    //       })
+    //     })
+    //     // that.mapCtx.getRegion({
+    //     //   success:function(r){
+    //     //     let location = r.longitude+","+r.latitude;
             
-        //     that.getParkList(res.northeast.longitude,res.northeast.latitude,res.southwest.longitude,res.southwest.latitude,location)
+    //     //     that.getParkList(res.northeast.longitude,res.northeast.latitude,res.southwest.longitude,res.southwest.latitude,location)
+    //     //   }
+    //     // })
     //   }
     // })
-      }
-    })
   },
   search:function(e){
     console.log(e)

pages/map/index.wxml

@@ -10,64 +10,181 @@
     <image src="https://static.ticket.sz-trip.com/xcxImages/activity/arrow.png" mode="widthFix"></image>
   </view>
 </picker>
-<view class="right-menus" style="top:{{seachHeight}}px">
+<view class="menus" wx:if="{{showMore=='close'}}">
+  <view class="open" bindtap="changeShow"></view>
+  <view class="menu-list">
+    <view class="menus-item{{type==1?' active':''}}" bindtap="changeType" data-title="景点" data-type="1">
+      <image class="menus-item-img" src="{{type==1?'https://static.ticket.sz-trip.com/uploads/20240123/f188907357875241284e3b108f44588f.png':'https://static.ticket.sz-trip.com/uploads/20240123/ef1d97cfef1494aafe9913dcd98ea677.png'}}" mode="aspectFill"/>
+      <text class="text">景点</text>
+    </view>
+    <view class="menu-item{{type==2?' active':''}}" bindtap="changeType" data-title="场馆" data-type="2">
+      <image class="menu-item-img" src="{{type==2?'https://static.ticket.sz-trip.com/uploads/20240123/021858cdaa954dab5eb8180303f33143.png':'https://static.ticket.sz-trip.com/uploads/20240123/c6c46566f32eeb8b9663a6be2ef0ae08.png'}}" mode="aspectFill"/>
+      <text class="text">场馆</text>
+    </view>
+    <view class="menu-item{{type==3?' active':''}}" bindtap="changeType" data-title="酒店" data-type="3">
+      <image class="menu-item-img" src="{{type==3?'https://static.ticket.sz-trip.com/uploads/20240123/bf35245fe360ee8ff7194deff26285e5.png':'https://static.ticket.sz-trip.com/uploads/20240123/8e81faa85e98a7bee269ef9fdbfd6628.png'}}" mode="aspectFill"/>
+      <text class="text">酒店</text>
+    </view>
+    <view class="menu-item{{type==4?' active':''}}" bindtap="changeType" data-title="公共自行车" data-type="4">
+      <image class="menu-item-img" src="{{type==4?'https://static.ticket.sz-trip.com/uploads/20240123/8a953d4354ce4fd6b63832d00ba1d93a.png':'https://static.ticket.sz-trip.com/uploads/20240123/47a1dc475686ef5a080ba2a297dd78d8.png'}}" mode="aspectFill"/>
+      <text class="text">公共自行车</text>
+    </view>
+  </view>
+</view>
+<view class="menus2" wx:else>
+  <image class="shouqi" bindtap="changeClose" src="https://static.ticket.sz-trip.com/uploads/20240123/2ce83ab3fb61f0bf2b3aa8338ac30d73.png" mode=""/>
+  <scroll-view scroll-x style="height:280rpx" bindscroll="listenScroll" class="">
+    <view class="menus-list1" style="margin-bottom:30rpx">
+      <view class="menus-item{{type==1?' active':''}}" bindtap="changeType" data-title="景点" data-type="1">
+        <image class="menu-item-img" src="{{type==1?'https://static.ticket.sz-trip.com/uploads/20240123/f188907357875241284e3b108f44588f.png':'https://static.ticket.sz-trip.com/uploads/20240123/ef1d97cfef1494aafe9913dcd98ea677.png'}}" mode="aspectFill"/>
+        <text class="text">景点</text>
+      </view>
+      <view class="menus-item{{type==2?' active':''}}" bindtap="changeType" data-title="场馆" data-type="2">
+      <image class="menu-item-img" src="{{type==2?'https://static.ticket.sz-trip.com/uploads/20240123/021858cdaa954dab5eb8180303f33143.png':'https://static.ticket.sz-trip.com/uploads/20240123/c6c46566f32eeb8b9663a6be2ef0ae08.png'}}" mode="aspectFill"/>
+      <text class="text">场馆</text>
+    </view>
+    <view class="menus-item{{type==3?' active':''}}" bindtap="changeType" data-title="酒店" data-type="3">
+      <image class="menu-item-img" src="{{type==3?'https://static.ticket.sz-trip.com/uploads/20240123/bf35245fe360ee8ff7194deff26285e5.png':'https://static.ticket.sz-trip.com/uploads/20240123/8e81faa85e98a7bee269ef9fdbfd6628.png'}}" mode="aspectFill"/>
+      <text class="text">酒店</text>
+    </view>
+    <view class="menus-item{{type==4?' active':''}}" bindtap="changeType" data-title="公共自行车" data-type="4">
+      <image class="menu-item-img" src="{{type==4?'https://static.ticket.sz-trip.com/uploads/20240123/8a953d4354ce4fd6b63832d00ba1d93a.png':'https://static.ticket.sz-trip.com/uploads/20240123/47a1dc475686ef5a080ba2a297dd78d8.png'}}" mode="aspectFill"/>
+      <text class="text">公共自行车</text>
+    </view>
+    <view class="menus-item{{type==5?' active':''}}" bindtap="changeType" data-title="美食" data-type="5">
+      <image class="menu-item-img" src="{{type==5?'https://static.ticket.sz-trip.com/uploads/20240123/a1c54d7b95d69646d55a7cb66a5b7ba2.png':'https://static.ticket.sz-trip.com/uploads/20240123/491264b09539365d16c8f625a5c40258.png'}}" mode="aspectFill"/>
+      <text class="text">美食</text>
+    </view>
+    <view class="menus-item{{type==6?' active':''}}" bindtap="changeType" data-title="文保单位" data-type="6">
+      <image class="menu-item-img" src="{{type==6?'https://static.ticket.sz-trip.com/uploads/20240123/7ff3f0b3305d326eeef98d2886533230.png':'https://static.ticket.sz-trip.com/uploads/20240123/8c35ff42eb2c0c41dfadaa21af3310d5.png'}}" mode="aspectFill"/>
+      <text class="text">文保单位</text>
+    </view>
+    <view class="menus-item{{type==7?' active':''}}" bindtap="changeType" data-title="运河十景" data-type="7">
+      <image class="menu-item-img" src="{{type==7?'https://static.ticket.sz-trip.com/uploads/20240123/c57bfbb67fe73593904e92188399ea10.png':'https://static.ticket.sz-trip.com/uploads/20240123/c99e25679e5c1d5a9e0587ddcb278948.png'}}" mode="aspectFill"/>
+      <text class="text">运河十景</text>
+    </view>
+    <view class="menus-item{{type==8?' active':''}}" bindtap="changeType" data-title="江南小书场" data-type="8">
+      <image class="menu-item-img" src="{{type==8?'https://static.ticket.sz-trip.com/uploads/20240123/a95f3135ee4c9550b7bb0e855e8eb13b.png':'https://static.ticket.sz-trip.com/uploads/20240123/7dc1051d06ad9a4703edc209b065e851.png'}}" mode="aspectFill"/>
+      <text class="text">江南小书场</text>
+    </view>
+    <view class="menus-item{{type==9?' active':''}}" bindtap="changeType" data-title="停车场" data-type="9">
+      <image class="menu-item-img" src="{{type==9?'https://static.ticket.sz-trip.com/uploads/20240123/45fc9c09cbbe5d4059c147f8374f21ac.png':'https://static.ticket.sz-trip.com/uploads/20240123/8d115105bc4eab2e2e87b36657f8c908.png'}}" mode="aspectFill"/>
+      <text class="text">停车场</text>
+    </view>
+    <view class="menus-item{{type==10?' active':''}}" bindtap="changeType" data-title="行李寄存" data-type="10">
+      <image class="menu-item-img" src="{{type==10?'https://static.ticket.sz-trip.com/uploads/20240123/4288a56bbb7d333e4c007baa68c5e02f.png':'https://static.ticket.sz-trip.com/uploads/20240123/fdd743af95af2679f2dd60229fe06bd0.png'}}" mode="aspectFill"/>
+      <text class="text">行李寄存</text>
+    </view>
+    <view class="menus-item{{type==11?' active':''}}" bindtap="changeType" data-title="游客中心" data-type="11">
+      <image class="menu-item-img" src="{{type==11?'https://static.ticket.sz-trip.com/uploads/20240123/2f90c0a3be0afbab22ab9c07c6a0eb4c.png':'https://static.ticket.sz-trip.com/uploads/20240123/434433c37b40681d6b6d7e99fe8736f3.png'}}" mode="aspectFill"/>
+      <text class="text">游客中心</text>
+    </view>
+    <view class="menus-item{{type==12?' active':''}}" bindtap="changeType" data-title="特产" data-type="12">
+      <image class="menu-item-img" src="{{type==12?'https://static.ticket.sz-trip.com/uploads/20240123/8d8bf4cd274617eddc67b7f7bfc600ad.png':'https://static.ticket.sz-trip.com/uploads/20240123/c3fe8b4e3c7b13ff8eeabad48f2784c1.png'}}" mode="aspectFill"/>
+      <text class="text">特产</text>
+    </view>
+    <view class="menus-item{{type==13?' active':''}}" bindtap="changeType" data-title="红色地图" data-type="13">
+      <image class="menu-item-img" src="{{type==13?'https://static.ticket.sz-trip.com/uploads/20240123/176d442b0df8b16329ac62ffd481815a.png':'https://static.ticket.sz-trip.com/uploads/20240123/789606012a481332c98a5bd7ccb07306.png'}}" mode="aspectFill"/>
+      <text class="text">红色地图</text>
+    </view>
+    </view>
+  </scroll-view>
+  <view class="progress-line">
+    <view class="line-bg" wx:if="{{scrollLeft == 0}}" style="width:20rpx;"></view>
+    <view class="line-bg2" wx:else style="width:20rpx;"></view>
+  </view>
+</view>
+<!-- <view class="right-menus" style="top:{{seachHeight}}px">
   <view class="right-menu-item{{type==1?' active':''}}" bindtap="changeType" data-title="景点" data-type="1">
-    <!-- <text style="color:#0A9947" class="iconfont icon-location"></text> -->
     <image src="{{type==1?'https://static.ticket.sz-trip.com/uploads/20230506/575180365a27f3060e6a15e796229ce9.png':'https://static.ticket.sz-trip.com/uploads/20230506/5ec907e6ff03f558b1f6a3bf96894ccb.png'}}" mode="aspectFill"/>
     <text class="text">景点</text>
   </view>
   <view class="right-menu-item{{type==2?' active':''}}" bindtap="changeType" data-title="场馆" data-type="2">
     <image src="{{type==2?'https://static.ticket.sz-trip.com/uploads/20230506/575180365a27f3060e6a15e796229ce9.png':'https://static.ticket.sz-trip.com/uploads/20230506/4019480777583c7efcf18943b21b1ba3.png'}}" mode="aspectFill"/>
 
-    <!-- <text style="color:#3D77D8" class="iconfont icon-location"></text> -->
     <text class="text">场馆</text>
   </view>
   <view wx:if="{{isTest==false}}" class="right-menu-item{{type==3?' active':''}}" data-title="特产" bindtap="changeType" data-type="3">
-    <!-- <text style="color:#C02C2C" class="iconfont icon-location"></text> -->
 
     <image src="{{type==3?'https://static.ticket.sz-trip.com/uploads/20230506/575180365a27f3060e6a15e796229ce9.png':'https://static.ticket.sz-trip.com/uploads/20230506/054cea53a068545e9e27fa9cd3acbdec.png'}}" mode="aspectFill"/>
 
     <text class="text">特产</text>
   </view>
   <view wx:if="{{isTest==false}}" class="right-menu-item{{type==4?' active':''}}" data-title="美食" bindtap="changeType" data-type="4">
-    <!-- <text style="color:#EE641B" class="iconfont icon-location"></text> -->
     <image src="{{type==4?'https://static.ticket.sz-trip.com/uploads/20230506/575180365a27f3060e6a15e796229ce9.png':'https://static.ticket.sz-trip.com/uploads/20230506/04c558efe2650ca21f4612d60cc02a32.png'}}" mode="aspectFill"/>
 
     <text class="text">美食</text>
   </view>
   <view class="right-menu-item{{type==5?' active':''}}" bindtap="changeType" data-title="文物" data-type="5">
-    <!-- <text style="color:#00B3C8" class="iconfont icon-location"></text> -->
     <image src="{{type==5?'https://static.ticket.sz-trip.com/uploads/20230506/575180365a27f3060e6a15e796229ce9.png':'https://static.ticket.sz-trip.com/uploads/20230506/be9f147b71b30acb0cd210b973787a31.png'}}" mode="aspectFill"/>
 
     <text class="text">文保单位</text>
-  </view>
+  </view> -->
   <!-- <view class="right-menu-item{{type==7?' active':''}}" bindtap="changeType" data-title="影院" data-type="7">
     <text style="color:#9342CB" class="iconfont icon-location"></text>
     <text>影院</text>
   </view> -->
-  <view class="right-menu-item{{type==6?' active':''}}" bindtap="changeType" data-title="运河十景" data-type="6">
-    <!-- <text style="color:#EB3C70" class="iconfont icon-location"></text> -->
+  <!-- <view class="right-menu-item{{type==6?' active':''}}" bindtap="changeType" data-title="运河十景" data-type="6">
     <image src="{{type==6?'https://static.ticket.sz-trip.com/uploads/20230506/575180365a27f3060e6a15e796229ce9.png':'https://static.ticket.sz-trip.com/uploads/20230506/848919fa7df7d7a2cac6c671ff36c28c.png'}}" mode="aspectFill"/>
 
     <text class="text">运河十景</text>
   </view>
   <view class="right-menu-item{{type==8?' active':''}}" bindtap="changeType" data-title="江南小书场" data-type="8">
-    <!-- <text style="color:#9d6b00" class="iconfont icon-location"></text> -->
     <image src="{{type==8?'https://static.ticket.sz-trip.com/uploads/20230506/575180365a27f3060e6a15e796229ce9.png':'https://static.ticket.sz-trip.com/uploads/20230506/825ba0d2c4879e5609ecd1f585e48df8.png'}}" mode="aspectFill"/>
 
     <text class="text">江南小书场</text>
   </view>
   <view class="right-menu-item{{type==9?' active':''}}" bindtap="changeType" data-title="江南小书场" data-type="9">
-    <!-- <text style="color:#F60C1C" class="iconfont icon-location"></text> -->
     <image src="{{type==9?'https://static.ticket.sz-trip.com/uploads/20230506/575180365a27f3060e6a15e796229ce9.png':'https://static.ticket.sz-trip.com/uploads/20230506/054cea53a068545e9e27fa9cd3acbdec.png'}}" mode="aspectFill"/>
     <text class="text">红色地图</text>
-  </view>
+  </view> -->
   <!-- <view class="right-menu-item{{type==9?' active':''}}" bindtap="changeType" data-title="文化单位" data-type="9">
     <text style="color:rgb(160, 248, 248)" class="iconfont icon-location"></text>
     <text>文化单位</text>
   </view> -->
+<!-- </view> -->
+<!-- 公共自行车 -->
+<view class="map-item" wx:if="{{showInfo && info && info.info.type=='publicBycicle'}}">
+  <view class="iconfont icon-ic_searchclosed" bindtap="hideInfo"></view>
+  <view class="info" style="{{info.info.headimg?'':'width:100%'}}">
+    <view class="title textOver">{{info.info.name}}</view>
+    <view class="subtitle textOver2">地址：{{info.info.address}}</view>
+    <view wx:if="{{info.info.type!='academes'}}" bindtap="goAddress"  data-item="{{info}}" class="info-btn" style="margin-right: 0;">到这去</view>
+  </view>
+</view>
+<!-- 停车场 -->
+<view class="map-item"  wx:if="{{showInfo && info && info.info.type=='park'}}">
+  <view class="iconfont icon-ic_searchclosed" bindtap="hideInfo"></view>
+  <view class="info" style="{{info.info.headimg?'':'width:100%'}}">
+    <view class="title textOver2">{{info.info.name}}</view>
+    <view class="subtitle textOver2">当前停车场总停车位：{{info.info.capacityNum}}</view>
+    <view class="subtitle textOver2">{{info.info.freeNum_text}}</view>
+    <view wx:if="{{info.info.type!='academes'}}" bindtap="goAddress"  data-item="{{info}}" class="info-btn" style="margin-right: 0;">到这去</view>
+  </view>
+</view>
+<!-- 游客中心 -->
+<view class="map-item" wx:if="{{showInfo && info && info.info.type=='tourist'}}">
+  <view class="iconfont icon-ic_searchclosed" bindtap="hideInfo"></view>
+  <view class="info" style="width:600rpx">
+    <view class="title textOver2">{{info.info.title}}</view>
+    <view class="subtitle textOver2">地址：{{info.info.address}}</view>
+    <view wx:if="{{info.info.type!='academes'}}" bindtap="goAddress"  data-item="{{info}}" class="info-btn" style="margin-right: 0;">到这去</view>
+  </view>
+</view>
+<!-- 行李寄存 -->
+<view class="map-item" wx:if="{{showInfo && info && info.info.type=='luggage'}}">
+  <view class="iconfont icon-ic_searchclosed" bindtap="hideInfo"></view>
+  <view class="info" style="width:600rpx">
+    <view class="title textOver2">{{info.info.title}}</view>
+    <view class="subtitle textOver2">地址：{{info.info.address}}</view>
+    <view class="subtitle textOver3">
+      寄存时间：
+      <rich-text nodes="{{info.info.time_info}}"></rich-text>
+    </view>
+    <view wx:if="{{info.info.type!='academes'}}" bindtap="gotoDetail"  data-item="{{info}}" class="info-btn" style="margin-right: 0;">查看详情</view>
+  </view>
 </view>
-<view class="map-item" wx:if="{{showInfo && info && info.info.type!='tenscenic'}}">
+<view class="map-item" wx:if="{{showInfo && info && (info.info.type!='park' &&info.info.type!='publicBycicle' &&info.info.type!='tourist' &&info.info.type!='luggage')}}">
   <view class="iconfont icon-ic_searchclosed" bindtap="hideInfo"></view>
   <image wx:if="{{info.info.headimg}}" src="{{info.info.headimg}}" mode="aspectFill"></image>
   <view class="info" style="{{info.info.headimg?'':'width:100%'}}">

pages/map/index.wxss

@@ -9,7 +9,9 @@
 }
 .picker {
   position: fixed;
-  left: 25rpx;
+  /* left: 25rpx; */
+  left: 0;
+  top: 150rpx;
   display: flex;
   align-items: center;
   width: 202rpx;
@@ -128,7 +130,7 @@
   margin-right: 20rpx;
 }
 .map-item .info {
-  width: 260rpx;
+  width: 300rpx;
   display: flex;
   flex-direction: column;
   justify-content: space-between;
@@ -148,15 +150,17 @@
   width: 199rpx;
   line-height: 56rpx;
   color: #fff;
-  background: #D62828;
+  background: linear-gradient(180deg, #FDAB70, #FE7F19);
   font-size: 28rpx;
   text-align: center;
   border-radius: 28rpx;
 }
 .icon-ic_searchclosed {
   position: absolute;
-  right: -40rpx;
-  top: -40rpx;
+  right: 7rpx;
+  top: 7rpx;
+  /* right: -40rpx;
+  top: -40rpx; */
 }
 .title-header .icon-fanhui1 {
   display: none;
@@ -482,3 +486,142 @@
   width:21.33rpx;
   height:25.33rpx;
 }
+
+.menus {
+  position: fixed;
+  left: 26.67rpx;
+  bottom: 26.67rpx;
+  width: 697rpx;
+  height: 200rpx;
+  background: rgba(255,255,255,0.8);
+  box-shadow: 0rpx 1rpx 16rpx 0rpx rgba(153,153,153,0.35);
+  border-radius: 20rpx;
+}
+
+.open {
+  width: 99rpx;
+  height: 3rpx;
+  background: #999;
+  border: 3rpx solid #999999;
+  margin: 0 auto;
+  margin-top: 13.3rpx;
+}
+
+.menu-list {
+  margin-top: 37.33rpx;
+  display: flex;
+  justify-content: space-around;
+}
+
+.menu-item{
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+.menu-item-img.active{
+  background: #0B898E;
+}
+
+.menu-item-img {
+  width: 67rpx;
+  height: 67rpx;
+  /* border: 3rpx solid rgba(11,137,142, .6); */
+  border-radius: 50%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-bottom: 20.67rpx;
+}
+
+.menu-item-img image {
+  width: 35rpx;
+  height: 37rpx;
+}
+
+.text {
+  font-size: 25rpx;
+  font-family: PingFang SC;
+  font-weight: 500;
+  color: #0B898E;
+}
+
+.menus2 {
+  width: 697rpx;
+  height: 380rpx;
+  background: rgba(255,255,255,0.8);
+  box-shadow: 0rpx 1rpx 16rpx 0rpx rgba(153,153,153,0.35);
+  border-radius: 20rpx;
+  position: fixed;
+  left: 26.67rpx;
+  bottom: 26.67rpx;
+}
+
+.shouqi {
+  width: 100rpx;
+  height: 14rpx;
+  display: block;
+  margin: 0 auto;
+  margin-top: 20rpx;
+  margin-bottom: 26rpx;
+}
+
+.menus-list1 {
+  /* margin-top: 37.33rpx; */
+  display: flex;
+  /* justify-content: space-around; */
+  flex-wrap: wrap;
+  width: calc(170rpx * 8);
+  margin: 0 20rpx;
+}
+
+.menus-item{
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  width: 150rpx;
+  margin-bottom: 30.33rpx;
+  margin-right: 20rpx;
+}
+.menus-item-img.active{
+  background: #0B898E;
+}
+.menus-item-img {
+  width: 67rpx;
+  height: 67rpx;
+  /* border: 3rpx solid rgba(11,137,142, .6); */
+  border-radius: 50%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-bottom: 20.67rpx;
+}
+
+.progress-line {
+  width: 40rpx;
+  height: 5rpx;
+  background: rgba(11,137,142, .3);
+  border-radius: 3rpx;
+  margin: 0 auto;
+  margin-top: 10rpx;
+}
+
+.line-bg {
+  width: 20rpx;
+  height: 5rpx;
+  background: #0B898E;
+  border-radius: 3rpx;
+}
+
+.line-bg2 {
+  margin-left: 20rpx;
+  background: #0B898E;
+  height: 5rpx;
+  border-radius: 3rpx;
+}
+
+.textOver3 {
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 3;
+  overflow: hidden;
+}