no message

src/components/car/orderPreview.vue

@@ -13,7 +13,7 @@
       <template v-if="dataList.CarType!=3">
         <div class="text-grey-6 f12 q-my-md">選擇機場</div>
         <div class="row wrap">
-          <div v-for="(x,i) in AirportList" :key="i">
+          <div v-for="(x,i) in dataList.AirportList" :key="i">
             <q-chip size="14px" clickable @click="handleSelect(x,1)" 
             :text-color="selectedAirportObj&&selectedAirportObj.Id==x.Id?'white':'dark'" 
             :color="selectedAirportObj&&selectedAirportObj.Id==x.Id?'primary':'grey-3'" square>{{ x.AirportName }}</q-chip>
@@ -21,20 +21,20 @@
         </div>
       </template>
       <div class="row no-wrap">
-        <div v-if="dataList.CarType!=1" :class="{'col':PlaceList.length>2}">
+        <div v-if="dataList.CarType!=1" :class="{'col':dataList.PlaceList.length>2}">
           <div class="text-grey-6 f12 q-my-md">選擇上車範圍</div>
           <div class="row wrap">
-            <div v-for="(x,i) in PlaceList" :key="i">
+            <div v-for="(x,i) in dataList.PlaceList" :key="i">
               <q-chip size="14px" clickable @click="handleSelect(x,3)" 
               :text-color="onCarObj&&onCarObj.Id==x.Id?'white':'dark'" 
               :color="onCarObj&&onCarObj.Id==x.Id?'primary':'grey-3'" square>{{ x.Name }}({{ x.Range }}m)</q-chip>
             </div>
           </div>
         </div>
-        <div v-if="dataList.CarType!=2" class="q-ml-md" :class="{'col':PlaceList.length>2}">
+        <div v-if="dataList.CarType!=2" class="q-ml-md" :class="{'col':dataList.PlaceList.length>2}">
           <div class="text-grey-6 f12 q-my-md">選擇下車範圍</div>
           <div class="row wrap">
-            <div v-for="(x,i) in PlaceList" :key="i">
+            <div v-for="(x,i) in dataList.PlaceList" :key="i">
               <q-chip size="14px" clickable @click="handleSelect(x,4)" 
               :text-color="unCarObj&&unCarObj.Id==x.Id?'white':'dark'" 
               :color="unCarObj&&unCarObj.Id==x.Id?'primary':'grey-3'" square>{{ x.Name }}({{ x.Range }}m)</q-chip>
@@ -46,7 +46,7 @@
       
       <div class="text-grey-6 f12 q-my-md">選擇車類型</div>
       <div class="row wrap">
-        <div v-for="(x,i) in CarTypeList" :key="i">
+        <div v-for="(x,i) in dataList.CarTypeList" :key="i">
           <q-chip size="14px" clickable @click="handleSelect(x,2)" 
           :text-color="selectedCarObj&&selectedCarObj.Id==x.Id?'white':'dark'" 
           :color="selectedCarObj&&selectedCarObj.Id==x.Id?'primary':'grey-3'" square>{{ x.CarName }}({{ x.PeopleNum }}人)</q-chip>
@@ -135,16 +135,17 @@
 </template>
 
 <script>
+import { date } from "quasar";
 export default {
-  props: ["dataList","PlaceList","price","CarTypeList","AirportList","configId","Month"],
+  props: ["dataList","price","configId","Month"],
   watch: {
     price: {
       handler(n, o) {
         this.p = n;
         if(n&&n.startDate){
           this.chosenObj.startDate = n.startDate;
-          // this.selectedCar = this.CarTypeList[0].Id
-          // this.selectedCarObj = this.CarTypeList[0]
+          // this.selectedCar = this.dataList.CarTypeList[0].Id
+          // this.selectedCarObj = this.dataList.CarTypeList[0]
         }
         this.calcMoney()
         
@@ -152,9 +153,9 @@ export default {
       deep: true,
       immediate: false
     },
-    CarTypeList: {
+    dataList: {
       handler(n, o) {
-        this.CarTypeList = n;
+        this.dataList = n;
         
       },
       deep: true,
@@ -205,7 +206,7 @@ export default {
       localStorage.setItem("pickuporderCars",JSON.stringify(pickuporderCars))
       this.CommonJump('/PickuporderForm/'+key, {});
     },
-    //  获取车的详情
+    //  获取车型的详情
     getCarPriceData2() {
       this.priceList = []
       this.apipost(
@@ -232,8 +233,10 @@ export default {
                   isSupportChildren: 1,
                   safeMoney: 0,
                 }
+                if(date.formatDate(Date.now(), 'YYYY-MM-DD')!=x.Date){
                   arr.push(dataObj)
                 }
+              }
             })
             const temp= JSON.parse(JSON.stringify(r.data.data))
             let PriceArr = temp.filter(x=>{ return x.Price>0 })

src/pages/Pickuporder/orderForm.vue

@@ -628,7 +628,7 @@ export default {
           Mobile:'',//电话
           ProductId: '',
           CarId: '',//产品类型ID
-          OrderSource: 1,//类型 0来源B2B 1来源B2C
+          OrderSource: 1,//类型 0 来源B2B 1 来源B2C
       },
       flightTime: null,//航班起飞抵达时间
       getBusTime: null,//预约车时间
@@ -902,6 +902,9 @@ export default {
         this.apipost("GetCustomerInfo_post", { Id: u.id }, (r) => {
           if (r.data.resultCode == 1) {
             this.userInfo = r.data.data;
+            if(r.data.data.Moblie){
+              this.parameters.Mobile = r.data.data.Moblie
+            }
           } else {
             this.$user.userInfo = null;
           }

src/pages/detailsCar.vue

@@ -118,7 +118,7 @@
       >
         <div class="col q-mr-lg">
           <div class="text-h6 ellipsis-2-lines">{{ dataList.Name }}</div>
-          <div class="text-grey-7 fz17 ellipsis-2-lines">{{ dataList.Description }}</div>
+          <!-- <div class="text-grey-7 fz17 ellipsis-2-lines">{{ dataList.Description }}</div> -->
           <div class="q-mt-md f12 text-grey-6">
             <q-icon
               name="iconfont icondingweixiao"
@@ -282,9 +282,6 @@
                 :dataList="dataList"
                 :configId="msg.configId"
                 :Month="currentYM.str"
-                :PlaceList="dataList.PlaceList"
-                :CarTypeList="dataList.CarTypeList"
-                :AirportList="dataList.AirportList"
                 :price="currentPrice"
                 @reset="resetHandler"
                 @getPriceList="getPriceList"
@@ -316,13 +313,13 @@
                     :label="`${dataList.FreeCancelDay}天前可免费取消`"
                   />
                 </div>
-                <!-- <div class="text-grey f12">
+                <div class="text-grey f12">
                   <ul class="q-pl-md no-margin">
                     <li v-for="(x, i) in warnBuy" class="q-mt-md" :key="i">
                       {{ x }}
                     </li>
                   </ul>
-                </div> -->
+                </div>
               </div>
               <div class="" v-if="$q.platform.is.desktop">
                 <div class="row items-center">
@@ -377,9 +374,6 @@
                     :dataList="dataList"
                     :configId="msg.configId"
                     :Month="currentYM.str"
-                    :PlaceList="dataList.PlaceList"
-                    :CarTypeList="dataList.CarTypeList"
-                    :AirportList="dataList.AirportList"
                     :price="currentPrice"
                     @reset="resetHandler"
                     @getPriceList="getPriceList"
@@ -660,10 +654,9 @@ export default {
         loop: true,
       },
       warnBuy: [
-        "未满 2 岁幼儿不占位可免费参加（不含座位，餐点，门票，床位），请先于下订时在「备注栏」告知。",
-        "如需要單人房，請購買單房",
-        "不占床2-11(包含)岁幼童可购买儿童价，如需占床請購買成人價",
-        "12歲以上皆視同成人售價",
+        "如一輛車位不夠使用，請購買多輛車",
+        "收費公路費、停車費、入園費等請另行繳納",
+        "由於交通擁堵，時間可能會略有變化",
       ],
       showOrderPreview: false,
       videoPosition: 0,
@@ -764,6 +757,7 @@ export default {
   mounted() {
     const timeStamp = Date.now()
     const formattedString = date.formatDate(timeStamp, 'YYYY-MM-DD')
+    // date.formatDate(date.addToDate(new Date(), { days: 1 }), 'YYYY-MM-DD')
     this.currentYM = {
       year: date.formatDate(timeStamp, 'YYYY'),
       month: date.formatDate(timeStamp, 'MM'),
@@ -944,8 +938,11 @@ export default {
                   isSupportChildren: 1,
                   safeMoney: 0,
                 }
+                if(date.formatDate(Date.now(), 'YYYY-MM-DD')!=x.Date){
                   arr.push(dataObj)
                 }
+                
+              }
             })
             this.priceList = JSON.parse(JSON.stringify(arr))
           }