Merge branch 'master' of http://gitlab.oytour.com/viitto/million

src/App.vue

@@ -79,6 +79,14 @@ body {
   display: flex;
     align-items: center;
 }
+
+.BMap_cpyCtrl {
+    display: none;
+}
+ 
+.anchorBL {
+    display: none;
+}
 @media only screen and (max-width: 1200px) {
   .section-block {
     max-width: 768px !important;

src/components/car/Map.vue

@@ -53,8 +53,14 @@
           let map = new BMapGL.Map(`baidu-map_${this.center.Id}`); // 创建地图实例
           let point = new BMapGL.Point(this.center.Lng, this.center.Lat); // 创建点坐标
           map.centerAndZoom(point, 15); // 初始化地图，设置中心点坐标和地图级别
+          map.enableScrollWheelZoom(true); 
+          var scaleCtrl = new BMapGL.ScaleControl();  // 添加比例尺控件
+          map.addControl(scaleCtrl);
+          var zoomCtrl = new BMapGL.ZoomControl();  // 添加缩放控件//开启鼠标滚轮缩放
+          map.addControl(zoomCtrl);
           this.map = map;
         },
+        
         addMarker() {
           let icon = require(`../../assets/img/marker.png`);
           var myIcon = new BMapGL.Icon(icon, new BMapGL.Size(23, 25), {
@@ -97,13 +103,86 @@
         addCircle(){
             var mPoint = new BMapGL.Point(this.center.Lng, this.center.Lat);
             var circle = new BMapGL.Circle(mPoint,this.center.Range,{fillColor:"blue", strokeWeight: 1 ,fillOpacity: 0.3, strokeOpacity: 0.3});
-            this.map.addOverlay(circle); 
+            this.map.addOverlay(circle);
+            let getNeSw = circle.getBounds()
+            var mPoint1 = new BMapGL.Point(getNeSw.ne.lng,getNeSw.ne.lat)
+            var mPoint2 = new BMapGL.Point(getNeSw.sw.lng,getNeSw.sw.lat)
+            let points=[mPoint1,mPoint2]
+            this.map.centerAndZoom(mPoint, this.map.getViewport(points).zoom+1);
         },
         getLocalSearch(){
           var mPoint = new BMapGL.Point(this.center.Lng, this.center.Lat);
           var local =  new BMapGL.LocalSearch(this.map, {renderOptions: {map: this.map, autoViewport: false}});  
           local.searchNearby(this.keywords,mPoint,this.center.Range);
         },
+        // 根据地图缩放比例获取当前地图比例尺
+        getMapScale(zoom){
+          let scale = 0;
+          switch (zoom) {
+            case 1:
+              scale = 10000000;
+              break;
+            case 2:
+              scale = 5000000;
+              break;
+            case 3:
+              scale = 2000000;
+              break;
+            case 4:
+              scale = 1000000;
+              break;
+            case 5:
+              scale = 500000;
+              break;
+            case 6:
+              scale = 200000;
+              break;
+            case 7:
+              scale = 100000;
+              break;
+            case 8:
+              scale = 50000;
+              break;
+            case 9:
+              scale = 25000;
+              break;
+            case 10:
+              scale = 20000;
+              break;
+            case 11:
+              scale = 10000;
+              break;
+            case 12:
+              scale = 5000;
+              break;
+            case 13:
+              scale = 2000;
+              break;
+            case 14:
+              scale = 1000;
+              break;
+            case 15:
+              scale = 500;
+              break;
+            case 16:
+              scale = 200;
+              break;
+            case 17:
+              scale = 100;
+              break;
+            case 18:
+              scale = 50;
+              break;
+            case 19:
+              scale = 20;
+              break;
+            default:
+              scale = 0;
+              break;
+          }
+          return scale;
+        },
+
       },
     }
     </script>

src/components/hotal/RoomCard.vue

@@ -81,7 +81,7 @@
         </div>
         <q-separator color="grey-2" class="q-my-md"/>
       </div>
-      <div v-if="!prices" class="text-center q-my-xl">
+      <div v-if="prices.length==0" class="text-center q-my-xl">
         <none-data
           iconType="order"
           title="沒有找到您的房間信息哦"

src/pages/detailsHotal.vue → src/pages/detailHotal.vue

@@ -1027,7 +1027,7 @@ export default {
     
   },
   mounted() {
-    
+    window.addEventListener("scroll", this.handleScroll);
     
     this.dateRange.to = date.formatDate(date.addToDate(new Date(), { days: 9 }), 'YYYY-MM-DD')
     this.dateRange.from = date.formatDate(date.addToDate(new Date(), { days: 8 }), 'YYYY-MM-DD')
@@ -1587,9 +1587,6 @@ export default {
               }
             });
             this.JapanIncrease = res.data.data.JapanIncrease;
-            this.$nextTick(()=>{
-              window.addEventListener("scroll", this.handleScroll);
-            })
           } else {
             this.$q.notify({
               type: "negative",

src/pages/detailsCar.vue

@@ -29,7 +29,7 @@
           class="col product-price text-subtitle1 text-weight-bold"
           style="text-align: left"
         >
-          <span v-if="dataList&&dataList.MinPrice">{{dataList.CurrencyCode}} {{ moneyFormat(dataList.MinPrice, 0) }}</span>
+          <span v-if="priceList.length>0&&priceList[0].originalB2CPrice">CNY {{ moneyFormat(priceList[0].originalB2CPrice, 0) }}</span>
           <span class="q-ml-sm f12 text-grey-7">起</span>
         </span>
         <q-btn
@@ -174,9 +174,8 @@
               $q.platform.is.mobile,
           }"
         >
-          <div class="product-price text-h6" v-if="dataList.MinPrice > 0">
-            <!-- CNY：{{ dataList. }} -->
-            {{dataList.CurrencyCode}}：{{ moneyFormat(dataList.MinPrice, 0) }}
+          <div class="product-price text-h6" v-if="priceList.length>0&&priceList[0].originalB2CPrice > 0">
+            CNY：{{ moneyFormat(priceList[0].originalB2CPrice, 0) }}
             <span class="f12 text-grey-6">起</span>
           </div>
           <div v-else class="text-subtitle1 text-grey-6">暫無報價</div>
@@ -317,7 +316,7 @@
               <div class="" v-if="$q.platform.is.desktop">
                 <div class="row items-center">
                   <span class="product-price text-h6 q-mr-md"
-                    >{{dataList.CurrencyCode}}
+                    >CNY
                     {{
                       moneyFormat(priceList[0].originalB2CPrice, 0)
                     }}</span

src/router/routes.js

@@ -58,7 +58,7 @@ const routes = [{
                 path: '/detailHotal/:id/:b2CPrice',
                 meta: { title: '酒店' },
                 component: () =>
-                    import ('pages/detailsHotal.vue')
+                    import ('pages/detailHotal.vue')
             }, { // 酒店下单
                 path: '/HotalForm/:id',
                 component: () =>