c端预定

@@ -3,7 +3,8 @@ import util from '../../utils/util';
 import App from '../../utils/api';
 import App from '../../utils/api';
 import DA from './data';
 import DA from './data';
 const {regeneratorRuntime} = global
 const {regeneratorRuntime} = global
-const mapScale=18
+const mapScale=18;
+const transverseViewHeight=170;
 const renNum=function(){
 const renNum=function(){
   let arr=[]
   let arr=[]
   for(let i=1;i<=30;i++){
   for(let i=1;i<=30;i++){
@@ -32,7 +33,7 @@ Page({
     suggestion:{},
     suggestion:{},
     hasSuggestion:false,
     hasSuggestion:false,
   },
   },
-  transverseViewHeight:170,//横向滚动高度
+  transverseViewHeight:transverseViewHeight,//横向滚动高度,苹果要比安卓多20
   //qqmapsdk:null,
   //qqmapsdk:null,
   sellers: [],
   sellers: [],
   sellersIds:[],
   sellersIds:[],
@@ -85,7 +86,10 @@ Page({
     if(this.data.hasSuggestion) return;
     if(this.data.hasSuggestion) return;
     await getApp().getSystemInfo();
     await getApp().getSystemInfo();
     let sys=getApp().system;
     let sys=getApp().system;
-    console.log('onShow',sys.windowHeight,sys.windowHeight-this.transverseViewHeight)
+    if(sys.system.toLowerCase().indexOf('ios')>-1){
+      this.transverseViewHeight=transverseViewHeight+20;
+    }
+    console.log('onShow',sys,sys.windowHeight,sys.windowHeight-this.transverseViewHeight)
     this.setData({
     this.setData({
       [`map.height`]: sys.windowHeight-this.transverseViewHeight,
       [`map.height`]: sys.windowHeight-this.transverseViewHeight,
       searchAddrTop:sys.statusBarHeight
       searchAddrTop:sys.statusBarHeight
@@ -345,6 +349,9 @@ Page({
             if(seller.cate.length>0){
             if(seller.cate.length>0){
               marker.iconPath=seller.cate[0].icon
               marker.iconPath=seller.cate[0].icon
             }
             }
+            marker.iconPath=marker.iconPath.replace(/\/cates\/(.*)\.png/,function ($0,$1) {
+              return '/cates/'+encodeURI($1)+'.png'
+            })
             marker.width=20;
             marker.width=20;
             marker.height=25;
             marker.height=25;
             marker.callout={
             marker.callout={