no message

src/components/car/orderPreview.vue

@@ -136,7 +136,7 @@
         v-if="(p.startDate&&!selectedCarObj)
         ||(p.startDate&&dataList.CarType==1&&(!selectedAirportObj||!unCarObj))
         ||(p.startDate&&dataList.CarType==2&&(!selectedAirportObj||!onCarObj))
-        ||(p.startDate&&dataList.CarType==3&&(!selectedAirportObj||(!onCarObj||!unCarObj)))" >
+        ||(p.startDate&&dataList.CarType==3&&(!onCarObj||!unCarObj))" >
           {{`請選擇上面的${dataList.CarType==3?'車類型、上車下車點':dataList.CarType==1?'機場、車類型、下車點':'機場、車類型、上車點'}`}} 
         </span>
         <q-btn color="primary" label="立即訂購" unelevated class="q-px-lg" 
@@ -202,18 +202,45 @@ export default {
     goUrl(){
       let OrderDate = {
         CarObj: this.selectedCarObj,
-        AirportObj: this.selectedAirportObj,
+        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,
         sumPrice: this.sumPrice,
-        details: this.dataList,
-        onCarObj: this.onCarObj,
-        unCarObj: this.unCarObj,
+        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,
+        },
+        onCarObj: {
+          Address: this.onCarObj?this.onCarObj.Address:'',
+          Name: this.onCarObj?this.onCarObj.Name:'',
+          Lat: this.onCarObj?this.onCarObj.Lat:'',
+          Lng: this.onCarObj?this.onCarObj.Lng:'',
+          Range: this.onCarObj?this.onCarObj.Range:'',
+        },
+        unCarObj: {
+          Address: this.unCarObj?this.unCarObj.Address:'',
+          Name: this.unCarObj?this.unCarObj.Name:'',
+          Lat: this.unCarObj?this.unCarObj.Lat:'',
+          Lng: this.unCarObj?this.unCarObj.Lng:'',
+          Range: this.unCarObj?this.unCarObj.Range:''
+        },
       }
+      // console.log(OrderDate,'========')
+      // return
       this.CommonJump(
         "/PickuporderForm",
         {
-          OrderDate: JSON.stringify(OrderDate),
+          OrderDate: encodeURIComponent(JSON.stringify(OrderDate)),
           // CarObj: JSON.stringify(this.selectedCarObj),
           // AirportObj: JSON.stringify(this.selectedAirportObj),
           // calculationAmount: JSON.stringify(this.p),

src/components/trip/orderPreview.vue

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

src/pages/Pickuporder/orderForm.vue

@@ -56,6 +56,19 @@
                   standout
                 />
               </div>
+              <div :class="filedWidth">
+                <q-input
+                    standout
+                    v-model="parameters.Mobile"
+                    label="電話"
+                    :rules="[(val) => !!val && val.length == 11 || '請輸正確電話']"
+                    ref="Mobile"
+                >
+                    <template v-slot:prepend>
+                    <div class="text-subtitle2">+{{ userInfo.areaCode }}</div>
+                    </template>
+                </q-input>
+            </div>
               <div :class="filedWidth">
                 <q-input
                   standout
@@ -431,21 +444,24 @@
               </div>
             </div>
             <div class="q-mt-md text-grey-6">
-              <div class="row q-pb-xs" v-if="AirportObj">
+              <div class="row q-pb-xs" v-if="AirportObj&&AirportObj.Name">
                 <div style="width: 80px">{{details.CarType==1?'接':'送'}}機機場：</div>
                 <div class="q-ml-md ellipsis-2-lines">{{AirportObj.Name}}</div>
               </div>
-              <!-- <div class="row q-pb-xs" v-if="onCarObj">
-                <div style="width: 80px">上車範圍：</div>
-                <div class="q-ml-md ellipsis-2-lines">{{onCarObj.Name}}</div>
+              <div class="row q-pb-xs" v-if="parameters.GetonAddress">
+                <div style="width: 80px">上車點：</div>
+                <div class="q-ml-md ellipsis-2-lines">{{parameters.GetonAddress}}</div>
+              </div>
+              <div class="row q-pb-xs" v-if="parameters.GetoffAddress">
+                <div style="width: 80px">下車點：</div>
+                <div class="q-ml-md ellipsis-2-lines">{{parameters.GetoffAddress}}</div>
               </div>
-              <div class="row q-pb-xs" v-if="unCarObj">
-                <div style="width: 80px">下車範圍：</div>
-                <div class="q-ml-md ellipsis-2-lines">{{unCarObj.Name}}</div>
-              </div> -->
               <div class="row">
                 <div style="width: 80px">出發日期：</div>
-                <div class="q-ml-md">{{calculationAmount.startDate}}</div>
+                <div class="q-ml-md">
+                  {{parameters.OrderDate}}
+                  <!-- {{calculationAmount.startDate}} -->
+                </div>
               </div>
             </div>
             <q-separator color="grey-2" class="q-my-md"/>
@@ -454,13 +470,13 @@
                 <div class="col">{{CarObj.CarName}} x {{ chosenObj.Count }}</div>
                 <div>CNY {{ moneyFormat(sumPrice,2) }}</div>
               </div>
-              <hr style="border:none;border-top:1px dashed #EEE !important;" class="bg-transparent q-mb-sm" />
+              <!-- <hr style="border:none;border-top:1px dashed #EEE !important;" class="bg-transparent q-mb-sm" />
               <div class="row q-mb-sm items-center" v-if="(chosenObj.Count)>0">
                 <div class="col">總金額</div>
                 <div class="text-subtitle2 text-weight-bolder text-primary">CNY {{ moneyFormat(sumPrice,2) }}</div>
-              </div>
+              </div> -->
               <hr style="border:none;border-top:1px dashed #EEE !important;" class="bg-transparent q-mb-sm" />
-              <div class="row q-mb-sm items-center" v-if="(chosenObj.Count)>0">
+              <div class="row q-mb-sm items-center" v-if="chosenObj.Count>0">
                 <div class="col">支付金額</div>
                 <div class="text-h6 text-weight-bolder text-primary product-price">CNY {{ moneyFormat(sumPrice,2) }}</div>
               </div>