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

src/components/car/Map.vue

@@ -7,7 +7,9 @@
     border-radius: 8px;}
     </style>
     <template>
+      <div>
         <div class="card" :id="`baidu-map_${center.Id}`"></div>
+      </div>
     </template>
     <script>
     export default {
@@ -17,7 +19,8 @@
                 center:{
                     Lng: 116.294625,
                     Lat: 39.961627
-                }
+                },
+                keywords: ''
             }
         },
       watch: {
@@ -27,6 +30,11 @@
             },
             deep:true,
             immediate:true
+        },
+        keywords:{
+          handler(newValue,onldValue) {
+              this.getLocalSearch()
+          },
         }
       },
      mounted() {
@@ -74,7 +82,7 @@
             offset: new BMapGL.Size(10, -60), // 设置标注的偏移量
           });
           this.map.addOverlay(label); // 将标注添加到地图中
-          label.addEventListener("click", function () {
+          label.addEventListener("click", function (e) {
             // alert("您点击了标注");
           });
           label.setStyle({
@@ -90,7 +98,12 @@
             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); 
-        }
+        },
+        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);
+        },
       },
     }
     </script>

src/components/trip/orderPreview.vue

@@ -330,7 +330,7 @@ export default {
         this.calcMoney()
       },
       deep: true,
-      immediate: true,
+      immediate: false,
     },
   },
   data() {

src/pages/detailsCar.vue

@@ -180,6 +180,7 @@
             color="primary"
             label="選擇方案"
             unelevated
+            :disable="priceList.length>0?false:true"
             @click="goScrollHandler('#scheme')"
             :class="{ 'q-mt-md full-width': $q.platform.is.desktop }"
           />
@@ -280,6 +281,7 @@
                 :dataList="dataList"
                 :configId="msg.configId"
                 :Month="currentYM.str"
+                :PlaceList="dataList.PlaceList"
                 :CarTypeList="dataList.CarTypeList"
                 :AirportList="dataList.AirportList"
                 :price="currentPrice"
@@ -372,6 +374,7 @@
                     :dataList="dataList"
                     :configId="msg.configId"
                     :Month="currentYM.str"
+                    :PlaceList="dataList.PlaceList"
                     :CarTypeList="dataList.CarTypeList"
                     :AirportList="dataList.AirportList"
                     :price="currentPrice"

src/pages/detailsNew.vue

@@ -190,6 +190,7 @@
             color="primary"
             label="選擇方案"
             unelevated
+            :disable="dataList.priceList.length>0?false:true"
             @click="goScrollHandler(priceListHeight)"
             :class="{ 'q-mt-md full-width': $q.platform.is.desktop }"
           />