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

src/components/car/orderPreview.vue

 <template>
   <div class="column full-height">
     <div class="col">
-      <div class="text-right">
+      <div class="text-right" v-if="$q.platform.is.desktop">
         <q-btn
           color="primary"
           icon="refresh"
@@ -112,23 +112,29 @@
         <span class="text-subtitle2 text-grey-6 col">總金額</span>
         <span class="text-h6 text-primary product-price">CNY {{ moneyFormat(sumPrice,0) }}</span>
       </div>
-      <div class="q-mt-md text-right">
-        <span class="q-mr-lg f12 text-negative" v-if="!p.startDate" >
+      <div class="q-mt-md text-right"
+      :class="{'row wrap justify-end items-start':$q.platform.is.mobile}">
+        <span :class="{'col-12 q-mb-sm':$q.platform.is.mobile}">
+        <span class="f12 text-negative" v-if="!p.startDate" 
+        :class="{'q-mr-lg':$q.platform.is.desktop}">
           {{$q.platform.is.mobile?'請選擇上面的出行日期':'請選擇左側的出行日期'}} 
         </span>
-        <span class="q-mr-lg f12 text-negative" 
+        <span class="f12 text-negative" 
+        :class="{'q-mr-lg':$q.platform.is.desktop}"
         v-if="(p.startDate&&!selectedCarObj)
         ||(p.startDate&&dataList.CarType==1&&(!selectedAirportObj||!unCarObj))
         ||(p.startDate&&dataList.CarType==2&&(!selectedAirportObj||!onCarObj))
         ||(p.startDate&&dataList.CarType==3&&(!onCarObj||!unCarObj))" >
           {{`請選擇上面的${dataList.CarType==3?'車類型、上車下車點':dataList.CarType==1?'機場、車類型、下車點':'機場、車類型、上車點'}`}} 
         </span>
+        </span>
         <q-btn color="primary" label="立即訂購" unelevated class="q-px-lg" 
         :disable="sumPrice==0||!selectedCarObj
         ||(dataList.CarType!=3&&!selectedAirportObj)
         ||(dataList.CarType==1&&!unCarObj)||(dataList.CarType==2&&!onCarObj)
         ||(dataList.CarType==3&&(!onCarObj||!unCarObj))"
         @click="goOrderHandler"/>
+        
       </div>
     </div>
   </div>
@@ -176,6 +182,7 @@ export default {
   },
   created() {
     this.initModel();
+    console.log(this.p,'=======')
     if(this.p.startDate){
       this.chosenObj.startDate = this.p.startDate;
       this.calcMoney()

src/pages/detailsNew.vue

@@ -308,7 +308,7 @@
               </div>
               <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">
+                  <li v-for="(x, i) in warnBuy" :class="{'q-mt-md':$q.platform.is.desktop|(i!=0&&$q.platform.is.mobile)}" :key="i">
                     {{ x }}
                   </li>
                 </ul>