订单详情开发

src/pages/usercenter/order/carPriceDetail.vue

@@ -4,7 +4,7 @@
 <template>
     <div>
       <div
-      class="rounded-borders bg-white q-pa-md"
+      class="rounded-borders bg-white q-py-md"
       style="width: 300px"
       :style="{
         width:
@@ -15,7 +15,7 @@
         top:$q.platform.is.mobile?'unset':'50px',
       }"
     >
-      <div class="text-subtitle1 text-weight-bolder">付款明細</div>
+      <!-- <div class="text-subtitle1 text-weight-bolder">付款明細</div> -->
       <!-- <div class="q-mt-md text-grey-6">
         <div class="row q-pb-xs no-wrap" v-if="AirportObj&&AirportObj.Name">
           <div style="width: 80px">{{details.CarType==1?'接':'送'}}機機場：</div>
@@ -48,31 +48,31 @@
           <div>{{details.CurrencyCode}} {{ moneyFormat(OrderDate.originalB2CPrice,2) }}</div>
         </div> -->
         <hr
-          style="border: none; border-top: 1px dashed #eee !important"
+          style="border: none;"
           class="bg-transparent q-mb-sm"
         />
         <div class="row q-mb-sm items-center">
-          <div class="col">總金額</div>
-          <div class="text-subtitle2 text-weight-bolder text-primary">
+          <div class="q-mr-lg">總金額</div>
+          <div class="text-subtitle2 text-weight-bolder">
             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;" class="bg-transparent q-mb-sm" />
         <div class="row q-mb-sm items-center">
-            <div class="col">優惠金額</div>
+            <div class="q-mr-lg">優惠金額</div>
             <div
-              class="text-subtitle2 text-weight-bolder text-teal"
+              class="text-subtitle2 text-weight-bolder"
               v-if="DiscountsMoney > 0"
             >
               CNY - {{ moneyFormat(DiscountsMoney, 2) }}
             </div>
             <div class="text-grey-5" v-else>暫無優惠</div>
           </div>
-        <hr style="border:none;border-top:1px dashed #EEE !important;" class="bg-transparent q-mb-sm" />
+        <!-- <hr style="border:none;" class="bg-transparent q-mb-sm" />
         <div class="row q-mb-sm items-center">
           <div class="col">支付金額</div>
           <div class="text-h6 text-weight-bolder text-primary product-price">{{details.CurrencyCode}} {{ moneyFormat(Money,2) }}</div>
-        </div>
+        </div> -->
       </div>
       
     </div>

src/pages/usercenter/order/groupPriceDetail.vue

@@ -4,7 +4,7 @@
 <template>
     <div>
       <div
-      class="rounded-borders bg-white q-pa-md"
+      class="rounded-borders bg-white q-py-md"
       style="width: 300px"
       :style="{
         width:
@@ -15,7 +15,7 @@
         top:$q.platform.is.mobile?'unset':'50px',
       }"
     >
-      <div class="text-subtitle1 text-weight-bolder">付款明細</div>
+      <!-- <div class="text-subtitle1 text-weight-bolder">付款明細</div> -->
       <!-- <div class="q-mt-md text-grey-6">
         <div class="row q-pb-xs no-wrap" v-if="AirportObj&&AirportObj.Name">
           <div style="width: 80px">{{details.CarType==1?'接':'送'}}機機場：</div>
@@ -47,19 +47,19 @@
           <div class="col">{{CarObj.CarName}} x {{ chosenObj.Count }}</div>
           <div>{{details.CurrencyCode}} {{ moneyFormat(OrderDate.originalB2CPrice,2) }}</div>
         </div> -->
-        <hr
+        <!-- <hr
           style="border: none; border-top: 1px dashed #eee !important"
           class="bg-transparent q-mb-sm"
-        />
+        /> -->
         <div class="row q-mb-sm items-center">
-          <div class="col">總金額</div>
-          <div class="text-subtitle2 text-weight-bolder text-primary">
+          <div class="q-mr-lg">總金額</div>
+          <div class="text-subtitle2 text-weight-bolder">
             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;" class="bg-transparent q-mb-sm" />
         <div class="row q-mb-sm items-center">
-            <div class="col">優惠金額</div>
+            <div class="q-mr-lg">優惠金額</div>
             <div
               class="text-subtitle2 text-weight-bolder text-teal"
               v-if="DiscountsMoney > 0"
@@ -68,11 +68,11 @@
             </div>
             <div class="text-grey-5" v-else>暫無優惠</div>
           </div>
-        <hr style="border:none;border-top:1px dashed #EEE !important;" class="bg-transparent q-mb-sm" />
+        <!-- <hr style="border:none;" class="bg-transparent q-mb-sm" />
         <div class="row q-mb-sm items-center">
-          <div class="col">支付金額</div>
+          <div class="q-mr-lg">支付金額</div>
           <div class="text-h6 text-weight-bolder text-primary product-price">{{details.CurrencyCode}} {{ moneyFormat(Money,2) }}</div>
-        </div>
+        </div> -->
       </div>
       
     </div>

src/pages/usercenter/order/hotelMap.vue

@@ -2,80 +2,33 @@
 
 </style>
 <template>
-    <div>
+<div>
         <div
-      class="rounded-borders bg-white q-pa-md"
-      style="width: 300px"
-      :style="{
-        width:
-          $q.screen.width < 1200 || $q.platform.is.mobile
-            ? 'unset'
-            : '300px',
-        position:$q.platform.is.mobile?'unset':'sticky',
-        top:$q.platform.is.mobile?'unset':'50px',
+          class="text-h5 text-weight-bold text-left q-mt-xl"
+          ref="assemblypoint"
+          :class="{
+            'q-px-md': $q.screen.width < 1220 && $q.platform.is.mobile,
           }"
         >
-      <div class="text-subtitle1 text-weight-bolder">付款明細</div>
-      <!-- <div class="q-mt-md text-grey-6">
-        <div class="row q-pb-xs no-wrap" 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 no-wrap" v-if="AirportObj&&AirportObj.Name">
-          <div style="width: 80px">{{details.CarType==1?'抵達':'起飛'}}時間：</div>
-          <div class="q-ml-md ellipsis-2-lines">{{parameters.FlightTime}}</div>
-        </div>
-        <div class="row q-pb-xs no-wrap" 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 no-wrap" v-if="parameters.GetoffAddress">
-          <div style="width: 80px">下車點：</div>
-          <div class="q-ml-md ellipsis-2-lines">{{parameters.GetoffAddress}}</div>
-        </div>
-        <div class="row">
-          <div style="width: 80px">
-            接駁日期：</div>
-          <div class="q-ml-md">
-            {{parameters.OrderDate}}
-          </div>
-        </div>
-      </div>
-      <q-separator color="grey-2" class="q-my-md"/> -->
-      <div class="text-grey-9">
-        <!-- <div class="row q-mb-sm" v-if="chosenObj.Count>0&&CarObj">
-          <div class="col">{{CarObj.CarName}} x {{ chosenObj.Count }}</div>
-          <div>{{details.CurrencyCode}} {{ moneyFormat(OrderDate.originalB2CPrice,2) }}</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">
-          <div class="col">總金額</div>
-          <div class="text-subtitle2 text-weight-bolder text-primary">
-            CNY {{ moneyFormat(sumPrice, 2) }}
-          </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">
-            <div class="col">優惠金額</div>
         <div
-              class="text-subtitle2 text-weight-bolder text-teal"
-              v-if="DiscountsMoney > 0"
-            >
-              CNY - {{ moneyFormat(DiscountsMoney, 2) }}
-            </div>
-            <div class="text-grey-5" v-else>暫無優惠</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">
-          <div class="col">支付金額</div>
-          <div class="text-h6 text-weight-bolder text-primary product-price">{{details.CurrencyCode}} {{ moneyFormat(Money,2) }}</div>
-        </div>
-      </div>
+          class="q-mt-lg trip-text rounded-borders q-mb-xl"
+          style="border: 1px dashed var(--q-color-warning)"
+          :class="{
+            'q-mx-md': $q.screen.width < 1220 && $q.platform.is.mobile,
+          }">
+          <div class="q-pa-md" style="border-bottom: 1px dashed var(--q-color-warning)">
+            <div class="text-weight-bold text-h6">酒店名稱：{{hotelSummary.hotelName}}</div>
+            <div class="text-grey-9">地址：{{`${hotelSummary.address}`}}</div>
           </div>
+          <div class="q-pa-md" :class="{
+            'q-mx-md': $q.screen.width < 1220 && $q.platform.is.mobile,
+          }" v-for="(x,index) in travelLngLat" :key="index">
+            <componentsMap v-if="x.Lng&&x.Lat" :AddressObj="x"/>
+            <div v-else class="card text-center">经纬度未知</div>
           </div>
+        </div></div>
 </template>
 <script>
 export default {
@@ -86,70 +39,39 @@ export default {
         }
     },
     data() {
-      return {
-        details: null,
-      sumPrice: 0,//总金额
-      DiscountsMoney: 0,//优惠金额
-      Money: 0, // 支付金額
+      return {hotelSummary: {},
+      travelLngLat: []
       }
     },
     mounted() {
-        this.getGroupData()
-        this.getCarOrder()
+        this.getData()
     },
     methods: {
-    //  获取团的详情
-    getGroupData() {
-      // this.$q.loading.show();
+    //  获取详情
+    getData() {
+      this.$q.loading.show();
       this.apipost(
-        "b2c_get_GetCarSingleProductDetail",
+        "dmc_post_Get_GetJAPAN_HotelDetail",
         { ProductId: this.orderInfo.GoodsId },
-        (r) => {
-          if (r.data.resultCode == 1) {
-            this.dataList = r.data.data;
-            this.emitAddress()
-          } else {
-            this.$q.notify({
-              type: "negative",
-              message: r.data.message,
-              position: "top",
-              timeout: 2000, // 以毫秒为单位; 0意味着没有超时
+        (res) => {
+          this.$q.loading.hide();
+          if (res.data.resultCode == 1) {
+            this.hotelDetails = res.data.data.hotelDetails;
+            this.hotelSummary = res.data.data.hotelSummary;
+            this.roomReviewRating = Number(this.hotelDetails.roomReviewRating);
+            this.travelLngLat.push({
+              Lat: this.hotelSummary.latitudeW,
+              Lng: this.hotelSummary.longitudeW,
+              Address: this.hotelSummary.hotelName
             });
-          }
-          // this.$q.loading.hide();
-        },
-        null
-      );
-    },
-    getCarOrder() {
-        
-        this.$q.loading.show();
-      this.apipost(
-        "CarSingle_post_GetTYMyCarOrderInfo",
-        { OrderId: this.orderInfo.ErpOrderId },
-        (r) => {
-          if (r.data.resultCode == 1) {
-            this.dataList = r.data.data;
-            this.Money = r.data.data.Money;
           } else {
-            this.$q.notify({
-              type: "negative",
-              message: r.data.message,
-              position: "top",
-              timeout: 2000, // 以毫秒为单位; 0意味着没有超时
-            });
+            this.$message.error(res.data.message);
           }
-          this.$q.loading.hide();
+          
         },
         null
       );
-    
     },
-    emitAddress() {
-      const {PlaceList} = this.dataList
-            PlaceList.findItem(item => item.id === this.id)
-            this.$emit('address', this.dataList)
-    }
     }
 }
 </script>
\ No newline at end of file

src/pages/usercenter/order/hotelPriceDetail.vue

@@ -3,54 +3,6 @@
 </style>
 <template>
     <div>
-      <div
-      class="rounded-borders bg-white q-pa-md"
-      style="width: 300px"
-      :style="{
-        width:
-          $q.screen.width < 1200 || $q.platform.is.mobile
-            ? 'unset'
-            : '300px',
-        position:$q.platform.is.mobile?'unset':'sticky',
-        top:$q.platform.is.mobile?'unset':'50px',
-      }"
-    >
-      <div class="text-subtitle1 text-weight-bolder">付款明細</div>
-      <!-- <div class="q-mt-md text-grey-6">
-        <div class="row q-pb-xs no-wrap" 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 no-wrap" v-if="AirportObj&&AirportObj.Name">
-          <div style="width: 80px">{{details.CarType==1?'抵達':'起飛'}}時間：</div>
-          <div class="q-ml-md ellipsis-2-lines">{{parameters.FlightTime}}</div>
-        </div>
-        <div class="row q-pb-xs no-wrap" 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 no-wrap" v-if="parameters.GetoffAddress">
-          <div style="width: 80px">下車點：</div>
-          <div class="q-ml-md ellipsis-2-lines">{{parameters.GetoffAddress}}</div>
-        </div>
-        <div class="row">
-          <div style="width: 80px">
-            接駁日期：</div>
-          <div class="q-ml-md">
-            {{parameters.OrderDate}}
-          </div>
-        </div>
-      </div>
-      <q-separator color="grey-2" class="q-my-md"/> -->
-      <div class="text-grey-9">
-        <!-- <div class="row q-mb-sm" v-if="chosenObj.Count>0&&CarObj">
-          <div class="col">{{CarObj.CarName}} x {{ chosenObj.Count }}</div>
-          <div>{{details.CurrencyCode}} {{ moneyFormat(OrderDate.originalB2CPrice,2) }}</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">
               <div class="col">總金額</div>
               <div class="text-subtitle2 text-weight-bolder text-primary">
@@ -58,7 +10,7 @@
               </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">
+            <div class="row q-mb-sm items-center" v-if="DiscountsMoney > 0">
               <div class="col">優惠金額</div>
               <div
                 class="text-subtitle2 text-weight-bolder text-teal"
@@ -68,11 +20,10 @@
               </div>
               <div class="text-grey-5" v-else>暫無優惠</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">
               <div class="col">支付金額</div>
-          <div class="text-h6 text-weight-bolder text-primary product-price">{{details.CurrencyCode}} {{ moneyFormat(Money,2) }}</div>
-        </div>
+              <div class="text-h6 text-weight-bolder text-primary product-price">
+                CNY {{ moneyFormat(Money, 2) }}
               </div>
             </div>
     </div>
@@ -102,12 +53,24 @@ export default {
     getGroupData() {
       // this.$q.loading.show();
       this.apipost(
-        "b2c_get_GetCarSingleProductDetail",
+        "dmc_post_GetThirdHotelOrder",
         { ProductId: this.orderInfo.GoodsId },
         (r) => {
           if (r.data.resultCode == 1) {
             this.dataList = r.data.data;
-            this.emitAddress()
+            const {DiscountsMoney,MailingState,Money} = r.data.data;
+            console.log('getTicket Data', r.data.data,DiscountsMoney,MailingState,Money)
+      // sumPrice: 0,//总金额
+      // DiscountsMoney: 0,//优惠金额
+      // Money: 0, // 支付金額
+      // MailingState: '',//邮寄状态 1自取 2邮寄
+            this.Money = Money;
+            this.DiscountsMoney = DiscountsMoney
+            this.MailingState = MailingState;
+            this.sumPrice = Money + DiscountsMoney
+            // this.sumPrice = this.moneyFormat(this.sumPrice, 2)
+            // this.Money = this.moneyFormat(this.Money, 2)
+            // this.DiscountsMoney = this.moneyFormat(this.DiscountsMoney, 2)
           } else {
             this.$q.notify({
               type: "negative",
@@ -121,35 +84,6 @@ export default {
         null
       );
     },
-    getCarOrder() {
-        
-        this.$q.loading.show();
-      this.apipost(
-        "dmc_post_GetThirdHotelOrder",
-        { OrderID: this.orderInfo.ErpOrderId },
-        (r) => {
-          if (r.data.resultCode == 1) {
-            this.dataList = r.data.data;
-            this.Money = r.data.data.Money;
-          } else {
-            this.$q.notify({
-              type: "negative",
-              message: r.data.message,
-              position: "top",
-              timeout: 2000, // 以毫秒为单位; 0意味着没有超时
-            });
-          }
-          this.$q.loading.hide();
-        },
-        null
-      );
-    
-    },
-    emitAddress() {
-      const {PlaceList} = this.dataList
-            PlaceList.findItem(item => item.id === this.id)
-            this.$emit('address', this.dataList)
-    }
     }
 }
 </script>
\ No newline at end of file

src/pages/usercenter/order/ticketPriceDetail.vue

@@ -4,7 +4,7 @@
 <template>
     <div>
           <div
-            class="rounded-borders bg-white q-pa-md"
+            class="rounded-borders bg-white q-py-md"
             style="width: 300px"
             :style="{
               width:$q.platform.is.mobile
@@ -14,21 +14,21 @@
               top:$q.platform.is.mobile?'unset':'50px',
             }"
           >
-            <div class="text-subtitle1 text-weight-bolder">付款明細</div>
-            <q-separator color="grey-2" class="q-my-md"/>
-              <hr
+            <!-- <div class="text-subtitle1 text-weight-bolder">付款明細</div> -->
+            <!-- <q-separator color="grey-2" class="q-my-md"/> -->
+              <!-- <hr
                 style="border: none; border-top: 1px dashed #eee !important"
                 class="bg-transparent q-mb-sm"
-              />
+              /> -->
               <div class="row q-mb-sm items-center">
-                <div class="col">總金額</div>
-                <div class="text-subtitle2 text-weight-bolder text-primary">
+                <div class="q-mr-lg">總金額</div>
+                <div class="text-subtitle2 text-weight-bolder">
                   CNY {{sumPrice }}
                 </div>
               </div>
-              <hr style="border:none;border-top:1px dashed #EEE !important;" class="bg-transparent q-mb-sm" />
+              <hr style="border:none;" class="bg-transparent q-mb-sm" />
               <div class="row q-mb-sm items-center" v-if="MailingState==2&&MailingMoney>0">
-                <div class="col">邮寄费</div>
+                <div class="q-mr-lg">邮寄费</div>
                 <div
                   class="text-subtitle2 text-weight-bolder text-grey-6"
                 >
@@ -36,7 +36,7 @@
                 </div>
               </div>
               <div class="row q-mb-sm items-center">
-                <div class="col">優惠金額</div>
+                <div class="q-mr-lg">優惠金額</div>
                 <div
                   class="text-subtitle2 text-weight-bolder text-teal"
                   v-if="DiscountsMoney > 0"
@@ -45,12 +45,12 @@
                 </div>
                 <div class="text-grey-5" v-else>暫無優惠</div>
               </div>
-              <div class="row q-mb-sm items-center">
+              <!-- <div class="row q-mb-sm items-center">
                 <div class="col">支付金額</div>
                 <div class="text-h6 text-weight-bolder text-primary product-price">
                   CNY {{ Money }}
                 </div>
-              </div>
+              </div> -->
             </div>
           </div>
     </div>