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

src/components/car/orderPreview.vue

@@ -144,7 +144,7 @@
         ||(dataList.CarType!=3&&!selectedAirportObj)
         ||(dataList.CarType==1&&!unCarObj)||(dataList.CarType==2&&!onCarObj)
         ||(dataList.CarType==3&&(!onCarObj||!unCarObj))"
-        @click="goUrl"/>
+        @click="goOrderHandler"/>
       </div>
     </div>
   </div>
@@ -199,27 +199,15 @@ export default {
     
   },
   methods: {
-    goUrl(){
-      let OrderDate = {
-        CarObj: this.selectedCarObj,
-        AirportObj: {
-          Address: this.selectedAirportObj?this.selectedAirportObj.Address:'',
-          AirportId: this.selectedAirportObj?this.selectedAirportObj.AirportId:'',
-          AirportName: this.selectedAirportObj?this.selectedAirportObj.AirportName:'',
-          Id: this.selectedAirportObj?this.selectedAirportObj.Id:'',
-          Name: this.selectedAirportObj?this.selectedAirportObj.Name:''
-        },
-        calculationAmount: this.p,
-        calculationNum: this.chosenObj,
+    goOrderHandler(){
+      let order = {
+        CarId: this.selectedCarObj.Id,
+        AirportId: this.selectedAirportObj?this.selectedAirportObj.Id:'',
+        startDate: this.p.startDate,
+        originalB2CPrice: this.p.originalB2CPrice,
+        orderInfo: this.chosenObj,
         sumPrice: this.sumPrice,
-        details: {
-          Name: this.dataList.Name,
-          Description: this.dataList.Description,
-          videoStr: this.dataList.videoStr,
-          imgCover: this.dataList.imgCover,
-          CarType: this.dataList.CarType,
-          Id: this.dataList.Id,
-        },
+        Id: this.dataList.Id,
         onCarObj: {
           Address: this.onCarObj?this.onCarObj.Address:'',
           Name: this.onCarObj?this.onCarObj.Name:'',
@@ -235,20 +223,15 @@ export default {
           Range: this.unCarObj?this.unCarObj.Range:''
         },
       }
-      // console.log(OrderDate,'========')
-      // return
-      this.CommonJump(
-        "/PickuporderForm",
-        {
-          OrderDate: encodeURIComponent(JSON.stringify(OrderDate)),
-          // CarObj: JSON.stringify(this.selectedCarObj),
-          // AirportObj: JSON.stringify(this.selectedAirportObj),
-          // calculationAmount: JSON.stringify(this.p),
-          // calculationNum: JSON.stringify(this.chosenObj),
-          // sumPrice: JSON.stringify(this.sumPrice),
-          // details: JSON.stringify(this.dataList)
-        }
-      );
+      let key = this.$md5(JSON.stringify(order))
+      let pickuporderCars = localStorage.getItem('pickuporderCars')
+      pickuporderCars = pickuporderCars?JSON.parse(pickuporderCars):[]
+      pickuporderCars.push({
+        key,
+        order
+      })
+      localStorage.setItem("pickuporderCars",JSON.stringify(pickuporderCars))
+      this.CommonJump('/PickuporderForm/'+key, {});
     },
     //  获取车的详情
     getCarPriceData2() {

src/pages/detailsCar.vue

 <template>
   <div style="min-height: 80vh">
+    
     <div
       style="
         position: fixed;
@@ -22,7 +23,7 @@
           class="col product-price text-subtitle1 text-weight-bold"
           style="text-align: left"
         >
-          <span v-if="dataList&&dataList.MinPrice">CNY {{ moneyFormat(dataList.MinPrice, 0) }}</span>
+          <span v-if="dataList&&dataList.MinPrice">{{dataList.CurrencyCode}} {{ moneyFormat(dataList.MinPrice, 0) }}</span>
           <span class="q-ml-sm f12 text-grey-7">起</span>
         </span>
         <q-btn
@@ -172,7 +173,7 @@
         >
           <div class="product-price text-h6" v-if="dataList.MinPrice > 0">
             <!-- CNY：{{ dataList. }} -->
-            CNY：{{ moneyFormat(dataList.MinPrice, 0) }}
+            {{dataList.CurrencyCode}}：{{ moneyFormat(dataList.MinPrice, 0) }}
             <span class="f12 text-grey-6">起</span>
           </div>
           <div v-else class="text-subtitle1 text-grey-6">暫無報價</div>
@@ -326,7 +327,7 @@
               <div class="" v-if="$q.platform.is.desktop">
                 <div class="row items-center">
                   <span class="product-price text-h6 q-mr-md"
-                    >CNY
+                    >{{dataList.CurrencyCode}}
                     {{
                       moneyFormat(priceList[0].originalB2CPrice, 0)
                     }}</span
@@ -597,10 +598,12 @@
         </div>
       </template>
     </div>
+    <!-- <auth></auth> -->
   </div>
 </template>
 
 <script>
+import auth from "src/components/common/auth.vue";
 import { slider, slideritem } from "vue-concise-slider";
 import calendar from "../components/trip/calendar.vue";
 import OrderPreview from "src/components/car/orderPreview.vue";
@@ -729,7 +732,8 @@ export default {
     smaple,
     Trip,
     block,
-    componentsMap
+    componentsMap,
+    auth,
   },
   watch: {
     days: {

src/router/routes.js

@@ -33,7 +33,7 @@ const routes = [{
                 component: () =>
                     import ('pages/detailsCar.vue')
             }, { // 包车，接机下单
-                path: '/PickuporderForm',
+                path: '/PickuporderForm/:id',
                 component: () =>
                     import ('pages/Pickuporder/orderForm.vue')
             }, { // 酒店