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

src/components/hotal/orderPreview.vue

@@ -20,7 +20,78 @@
           </div>
         </div>
       </template>
-      <div class="text-grey-6 f12 q-my-md">選擇數量</div>
+      <div class="text-grey-6 f12 q-my-md">住宿日期</div>
+      <div v-for="(x,index) in roomGroup" :key="index">
+        <div v-for="(y,i) in x.rateGroup" :key="i">
+          <div class="row items-end">
+            <div class="col" :class="{'column':$q.platform.is.mobile}">
+              <div>
+                <span class="text-subtitle2 text-weight-bold">{{ selectedObj?getMealType(selectedObj.meals):''}}</span>
+                <span class="text-grey-6 f12 q-ml-sm">{{y.stayDate}}</span></span>
+              </div>
+              <div v-if="$q.platform.is.mobile">
+                <span class="text-grey-7 product-price" style="font-size: 13px">
+                  <template v-if="y.perAdultRateBySetCurrency">
+                     CNY{{y.perAdultRateBySetCurrency}}/人
+                  </template>
+                  <template v-else="y.totalPerRoomRateBySetCurrency">
+                     CNY{{y.totalPerRoomRateBySetCurrency}}/晚
+                  </template>
+                  <!-- CNY {{ selectedObj?getPrice2(selectedObj.chargeableRateInfoPerPersonForANightBySetCurrency):0 }} /人均 -->
+                </span>
+              </div>
+            </div>
+            <div class="row items-end">
+              <span v-if="$q.platform.is.desktop" class="text-grey-7 product-price" style="font-size: 13px">
+                <template v-if="y.perAdultRateBySetCurrency">
+                  CNY{{y.perAdultRateBySetCurrency}}/人
+                </template>
+                <template v-else="y.totalPerRoomRateBySetCurrency">
+                  CNY{{y.totalPerRoomRateBySetCurrency}}/晚
+                </template>
+                <!-- CNY {{selectedObj? getPrice2(selectedObj.chargeableRateInfoPerPersonForANightBySetCurrency):0 }} /人均 -->
+              </span>
+              <!-- <q-input
+                style="width: 150px"
+                @input="changePeople"
+                v-model="chosenObj.Count"
+                class="col"
+                :class="{
+                  'q-ml-sm q-px-none q-pl-none': $q.platform.is.desktop,
+                }"
+                mask="#"
+                reverse-fill-mask
+                dense
+                standout
+                readonly
+              >
+                <template v-slot:prepend>
+                  <q-btn
+                    color="primary"
+                    size="sm"
+                    class="q-px-none"
+                    flat
+                    icon="remove"
+                    @click="addPeople('Count', -1)"
+                  />
+                </template>
+                <template v-slot:append>
+                  <q-btn
+                    color="primary"
+                    size="sm"
+                    class="q-px-none"
+                    flat
+                    icon="add"
+                    @click="addPeople('Count', 1)"
+                  />
+                </template>
+              </q-input> -->
+            </div>
+          </div>
+        </div>
+      </div>
+      
+      <!-- <div class="text-grey-6 f12 q-my-md">選擇數量</div>
       <div class="row items-end">
         <div class="col" :class="{'column':$q.platform.is.mobile}">
           <div>
@@ -73,7 +144,7 @@
             </template>
           </q-input>
         </div>
-      </div>
+      </div> -->
     </div>
     <div class="q-mt-md q-pt-md" style="border-top: 1px dashed #eee">
       <div class="row items-center">
@@ -135,6 +206,7 @@ export default {
       chosenObj: null,
       sumPrice:0,
       selectedObj: null,
+      roomGroup: null
     };
   },
   created() {
@@ -143,7 +215,7 @@ export default {
   methods: {
     goOrderHandler(){
       let order = {
-        msg: JSON.stringify(this.msg),
+        msg: this.msg,
         // hotelId: this.msg.hotelId,
         // arrivalDate: this.msg.arrivalDate,
         // departureDate: this.msg.departureDate,
@@ -152,7 +224,7 @@ export default {
         id: this.p.id,
         selectedObjId: this.selectedObj.id,
         roomOptionCd: this.selectedObj.roomOptionCd,
-        chosenObj: this.chosenObj,
+        Count: this.chosenObj.Count,
         sumPrice: this.sumPrice
       }
       let key = this.$md5(JSON.stringify(order))
@@ -167,11 +239,110 @@ export default {
     },
     handleSelect(item){
       this.selectedObj = item
-      console.log(this.selectedObj,'-----')
+      this.sumPrice = 0
       setTimeout(()=>{
-        this.calcMoney()
+        this.getData()
+        // this.calcMoney()
       },100)
     },
+    getData() {
+      let msg = JSON.parse(JSON.stringify(this.msg))
+      msg.roomOptionCd = this.selectedObj.roomOptionCd
+      this.$q.loading.show();
+      this.apipost(
+        "dmc_post_Get_GetJAPAN_RoomsList",
+        msg,
+        (r) => {
+          this.$q.loading.hide();
+          if (r.data.resultCode == 1) {
+            let rateGrouoLen = 0;
+            if(Object.prototype.toString.call(r.data.data.roomGroup) == '[object Object]'){
+                let arr = [];
+                arr.push(r.data.data.roomGroup);
+                this.roomGroup=arr;
+            }
+            this.roomGroup.forEach(x=>{
+                    if(Object.prototype.toString.call(x.rateGroup) == '[object Object]'){
+                        let arr = [];
+                        arr.push(x.rateGroup);
+                        x.rateGroup= arr;
+                    }
+                    let tt = 0;
+                    let tt2 = 0;
+                    let AdultTotalPrice = 0;
+                    let childToTalPrice = 0;
+                    let AdultCount = 0;
+                    let childCount = 0;
+
+                    let AdultJapanPrice = 0;
+                    let ChildJapanPrice = 0;
+                    let AdultJapanCount = 0;
+                    let childJapanCount = 0;
+                    
+                    //原始成人
+                    let oldAount=0;
+                    let childAount=0;
+                    let oldAuditPrice=0;
+                    let oldChildPrice=0;
+                    // this.TotalChildCount+=x.roomChildCount*x.rateGroup.length;
+
+                    rateGrouoLen+= x.rateGroup.length;
+                    // this.chekedChildCount = this.numberOfChildren*rateGrouoLen;
+                    //无价格 只有房间价格
+                    this.sumPrice = 0
+                    let onlyRoomPrice=0;
+                    let onlyJanpnase=0;
+                    x.rateGroup.forEach(z=>{
+                        if(z.perAdultRateBySetCurrency){
+                            z.oldAuditPrice = z.perAdultRateBySetCurrency;
+                            z.oldchildPrice = z.perChildRateBySetCurrency;
+
+                            z.perAdultRateBySetCurrency = Math.ceil(z.perAdultRateBySetCurrency/r.data.data.JapanIncrease);
+                            z.perChildRateBySetCurrency = Math.ceil(z.perChildRateBySetCurrency/r.data.data.JapanIncrease);
+                            if(x.roomAdultCount>0){
+                                AdultTotalPrice+=parseFloat(z.perAdultRateBySetCurrency);
+                                oldAuditPrice+=parseFloat(z.oldAuditPrice);
+
+                                AdultJapanPrice+=parseFloat(z.perAdultRate);
+
+                            }
+                            if(x.roomChildCount>0){
+                                childToTalPrice+=parseFloat(z.perChildRateBySetCurrency);
+                                oldChildPrice+=parseFloat(z.oldchildPrice);
+
+                                ChildJapanPrice+=parseFloat(z.perChildRate);
+                            }
+                        }
+                        if(z.totalPerRoomRateBySetCurrency){
+                            z.totalPerRoomRateBySetCurrency = Math.ceil(z.totalPerRoomRateBySetCurrency/r.data.data.JapanIncrease);
+
+                            onlyRoomPrice+=parseFloat(z.totalPerRoomRateBySetCurrency);
+                            onlyJanpnase+=parseFloat(z.totalPerRoomRate);
+                        }
+                        
+                    })
+                    AdultCount+=AdultTotalPrice*x.roomAdultCount;
+                    childCount+=childToTalPrice*x.roomChildCount;
+                    // AdultCount+=AdultTotalPrice;
+                    // childCount+=childToTalPrice;
+                    oldAount+=oldAuditPrice;
+                    childAount+=childAount;
+                    // this.parameters.totalChargeableRateInfo += parseFloat(AdultCount+childCount+onlyRoomPrice);
+                    // this.parameters.OldTotalPrice+=parseFloat(oldAount+childAount+onlyRoomPrice);
+                    AdultJapanCount+=AdultJapanPrice*x.roomAdultCount;
+                    childJapanCount+=ChildJapanPrice*x.roomChildCount;
+                    // this.SettlementPrice=this.parameters.totalChargeableRateInfo;
+                    // this.SettlementPrice=this.parameters.totalChargeableRateInfo;
+
+                    // let price=this.parameters.totalChargeableRateInfo;
+                    
+                    this.sumPrice += parseFloat(AdultJapanCount+childJapanCount+onlyJanpnase);
+                    console.log(this.sumPrice,'----')
+                  })
+                
+          }
+        })
+    },
     initModel() {
       this.sumPrice=0
       this.chosenObj = {

src/pages/usercenter/order/orderPriceDetail.vue → src/pages/usercenter/order/carPriceDetail.vue

@@ -2,7 +2,81 @@
 
 </style>
 <template>
-    <div>价格详情</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',
+      }"
+    >
+      <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>
+      
+    </div>
+    </div>
 </template>
 <script>
 export default {
@@ -12,7 +86,14 @@ export default {
             default: () => ({})
         }
     },
-    data() {},
+    data() {
+      return {
+        details: null,
+      sumPrice: 0,//总金额
+      DiscountsMoney: 0,//优惠金额
+      Money: 0, // 支付金額
+      }
+    },
     mounted() {
         this.getCarData()
         this.getCarOrder()
@@ -20,13 +101,14 @@ export default {
     methods: {
     //  获取团的详情
     getGroupData() {
-      this.$q.loading.show();
+      // this.$q.loading.show();
       this.apipost(
         "b2c_get_GetCarSingleProductDetail",
-        { ProductId: this.msg.configId },
+        { ProductId: this.orderInfo.GoodsId },
         (r) => {
           if (r.data.resultCode == 1) {
             this.dataList = r.data.data;
+            this.emitAddress()
           } else {
             this.$q.notify({
               type: "negative",
@@ -35,20 +117,21 @@ export default {
               timeout: 2000, // 以毫秒为单位; 0意味着没有超时
             });
           }
-          this.$q.loading.hide();
+          // this.$q.loading.hide();
         },
         null
       );
     },
     //  获取车的详情
     getCarData() {
-      this.$q.loading.show();
+      // this.$q.loading.show();
       this.apipost(
         "b2c_get_GetCarSingleProductDetail",
-        { ProductId: this.msg.configId },
+        { ProductId: this.orderInfo.GoodsId },
         (r) => {
           if (r.data.resultCode == 1) {
             this.dataList = r.data.data;
+            this.details = r.data.data;
           } else {
             this.$q.notify({
               type: "negative",
@@ -57,7 +140,7 @@ export default {
               timeout: 2000, // 以毫秒为单位; 0意味着没有超时
             });
           }
-          this.$q.loading.hide();
+          // this.$q.loading.hide();
         },
         null
       );
@@ -67,10 +150,11 @@ export default {
         this.$q.loading.show();
       this.apipost(
         "CarSingle_post_GetTYMyCarOrderInfo",
-        { OrderId: this.msg.configId },
+        { 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",
@@ -84,6 +168,11 @@ export default {
         null
       );
     
+    },
+    emitAddress() {
+      const {PlaceList} = this.dataList
+            PlaceList.findItem(item => item.id === this.id)
+            this.$emit('address', this.dataList)
     }
     }
 }

src/pages/usercenter/order/orderDetail.vue

@@ -94,7 +94,7 @@
           }">
             <componentsMap :AddressObj="detail"/>
           </div>
-          <orderPriceDetail v-if="detail.OrderNo" :orderInfo="detail"></orderPriceDetail>
+          <carPriceDetail v-if="detail.OrderNo" :orderInfo="detail"></carPriceDetail>
     </q-card>
     <div v-if="(!orderNo || orderNo == '') && !loading" class="text-center q-my-xl">
       <none-data
@@ -108,9 +108,9 @@
 
 <script>
 import componentsMap from "../../../components/car/Map.vue";
-import orderPriceDetail from './orderPriceDetail.vue'
+import carPriceDetail from './carPriceDetail.vue'
 export default {
-    components: {componentsMap, orderPriceDetail},
+    components: {componentsMap, carPriceDetail},
 data() {
     return {
         detail: {},
@@ -122,7 +122,7 @@ data() {
 },
 created() {},
 mounted() {
-    const {orderNo} = this.$route.query
+    const {orderNo} = this.$route.params
     if(orderNo) {
     this.getOrderDetail(orderNo)
     } else {

src/router/routes.js

@@ -195,7 +195,7 @@ const routes = [{
                     import ('pages/pay/paysuccess.vue')
             },
             {
-                path: '/orderinfo', //訂單詳情
+                path: '/orderinfo/:orderNo', //訂單詳情
                 meta: { title: '訂單詳情', isUserCenter: false, needLogin: true, },
                 component: () =>
                     import ('pages/usercenter/order/orderDetail.vue')