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

src/pages/ScenicSpotTicket/details.vue

@@ -29,7 +29,7 @@
           class="col product-price text-subtitle1 text-weight-bold"
           style="text-align: left"
         >
-          <span v-if="priceList2&&priceList2.length">{{dataList.CurrencyCode}} {{ moneyFormat(priceList2[0].originalB2CPrice, 0) }}</span>
+          <span v-if="priceList&&priceList.length">{{dataList.CurrencyCode}} {{ moneyFormat(priceList[0].originalB2CPrice, 0) }}</span>
           <span class="q-ml-sm f12 text-grey-7">起</span>
         </span>
         <q-btn
@@ -174,9 +174,9 @@
               $q.platform.is.mobile,
           }"
         >
-          <div class="product-price text-h6" v-if="priceList2&&priceList2.length>0">
+          <div class="product-price text-h6" v-if="priceList&&priceList.length>0">
             <!-- CNY：{{ dataList. }} -->
-            {{dataList.CurrencyCode?dataList.CurrencyCode:'CNY'}}：{{ moneyFormat(priceList2[0].originalB2CPrice, 0) }}
+            {{dataList.CurrencyCode?dataList.CurrencyCode:'CNY'}}：{{ moneyFormat(priceList[0].originalB2CPrice, 0) }}
             <span class="f12 text-grey-6">起</span>
           </div>
           <div v-else class="text-subtitle1 text-grey-6">暫無報價</div>
@@ -318,7 +318,7 @@
                   <span class="product-price text-h6 q-mr-md"
                     >{{dataList.CurrencyCode?dataList.CurrencyCode:'CNY'}}
                     {{
-                      moneyFormat(priceList2[0].originalB2CPrice, 0)
+                      moneyFormat(priceList[0].originalB2CPrice, 0)
                     }}</span
                   >
                   <q-btn
@@ -330,7 +330,7 @@
                   />
                 </div>
                 <div class="text-info q-mt-md text-right">
-                  最早可預訂日期：{{ priceList2[0].startDate }}
+                  最早可預訂日期：{{ priceList[0].startDate }}
                 </div>
               </div>
             </div>
@@ -562,7 +562,6 @@ export default {
   data() {
     return {
       AddressObj: null,
-      priceList2: [],
       priceList: [],
       selectedId: '',
       currentYM: { year: 2023, month: 2, str: "2023-02" }, // 当前年月
@@ -713,7 +712,6 @@ export default {
       this.TripConfig = JSON.parse(window.localStorage.getItem("baseifo"));
     }
     window.addEventListener("scroll", this.menu);
-    window.addEventListener("scroll", this.menu);
     this.getData();
   },
   methods: {
@@ -722,6 +720,9 @@ export default {
       if(!this.showOrderPreview){
         this.changeTripShowHandler()
       }
+      this.dataList.TicketList.forEach(x=>{
+        x.checked = false
+      })
     },
     changeTripShowHandler() {
       this.$nextTick(() => {
@@ -815,6 +816,7 @@ export default {
     },
     resetHandler() {
       this.currentPrice.startDate = "";
+      
       if(!this.$q.platform.is.mobile){
         this.$refs.calendar.reset();
       }
@@ -841,14 +843,18 @@ export default {
         { CouponsId: this.msg.configId },
         (r) => {
           if (r.data.resultCode == 1) {
+            let addList = function (arr) {
+                arr.forEach(item => {
+                  item.checked = false
+                  item.Count = 1
+                });
+            };
+            addList(r.data.data.TicketList);
             this.dataList = r.data.data;
             this.selectedId = this.dataList.TicketList.find(x=>x.Id)
             this.dataList.imgCover = this.dataList.PicPathList;
             this.AddressObj = this.dataList
             this.AddressObj.Address = `${this.dataList.CountryName}-${this.dataList.CityName}-${this.dataList.ProvinceName}-${this.dataList.Address}`
-            // {
-            //   Address:`${this.dataList.CountryName}-${this.dataList.CityName}-${this.dataList.Address}`
-            // }
             this.isShow = true;
             if (this.dataList.videoStr && this.dataList.videoStr != "") {
               this.options.loop = false;
@@ -864,7 +870,7 @@ export default {
               });
             }
             this.$nextTick(() => {
-              this.getCarPriceData2()
+              this.getCarPriceData()
               setTimeout(() => {
                 this.navs.forEach((x) => {
                   x.top =
@@ -900,36 +906,34 @@ export default {
       );
     },
     //  获取报价的详情
-    getCarPriceData2() {
+    getCarPriceData() {
       this.priceList = []
       this.apipost(
-        "b2c_get_GetTicketCouponsMonthPrice",
+        "b2c_get_GetTicketCouponsMonthPriceAll",
         { 
           CouponsId: this.msg.configId, 
-          TicketId: this.dataList.TicketList[1].Id,
+          // TicketId: this.dataList.TicketList[0].Id,
           Month: this.currentYM.str,
          },
         (r) => {
           if (r.data.resultCode == 1) {
             let arr = []
             r.data.data.forEach(x=>{
-              if(x.Price){
-                let dataObj = {
+              x.PriceList = x.PriceList.sort((a,b)=>{return a.Price-b.Price})
+              let dataObj = {
                   startDate: x.Date,
-                  originalB2CPrice: x.Price,
+                  originalB2CPrice: x.PriceList[0].Price,
                   remainNum: 1,
                   Count: 1,
                   safeMoney: 0,
-                  PeopleNum: 1
+                  MailingMoney: x.PriceList[0].MailingMoney,
+                  PriceList: x.PriceList,
                 }
                 if(date.formatDate(Date.now(), 'YYYY-MM-DD')!=x.Date&&x.Date>date.formatDate(Date.now(), 'YYYY-MM-DD')){
                   arr.push(dataObj)
                 }
-                
-              }
             })
             this.priceList = JSON.parse(JSON.stringify(arr))
-            this.priceList2 = JSON.parse(JSON.stringify(arr))
           }
           
         },null)

src/pages/detailsCar.vue

@@ -773,10 +773,7 @@ export default {
       this.TripConfig = JSON.parse(window.localStorage.getItem("baseifo"));
     }
     window.addEventListener("scroll", this.menu);
-    // this.getData();
-    window.addEventListener("scroll", this.menu);
     this.getCarData();
-    // this.getCarPriceData();
   },
   methods: {
     changeShowOrderPreviewHandler(){