修改日历

src/components/LocalTour/Appointment.vue

@@ -367,8 +367,11 @@ export default {
             MonthdayList.push(month)
         }
         let DayList=[];
-        this.timeStr.forEach(time=>{
+        // this.timeStr.forEach(time=>{
+        // console.log("time",time)
+            
             MonthdayList.forEach(item=>{
+                this.timeStr.forEach(time=>{
                 if(moment(time.startDate).isBefore(item.dateStr) && moment(item.dateStr).isBefore(time.endDate)){
                     let msg={
                         price:time.b2bPrice,
@@ -379,14 +382,16 @@ export default {
                         dateStr:item.dateStr,
                     };
                     DayList.push(msg)
-                }else{
-                    let date={
-                        dateStr:item.dateStr,
-                    }
-                    DayList.push(date)                    
                 }
+                // else{
+                //     let date={
+                //         dateStr:item.dateStr,
+                //     }
+                //     DayList.push(date)                    
+                // }
             })
         })
+        console.log("DayList",DayList)
           this.creatCalendar(DayList);
         
     },

src/components/LocalTour/TicketDetails.vue

@@ -73,8 +73,8 @@
                       <li v-for="item in dataDes.ticketList" :key="item.id">
                           <el-row>
                               <el-col :span="19">   
-                                {{item.ticketDesc}}
-                                <span class="pfR">({{item.ticketName}})</span>
+                                {{item.ticketName}}
+                                <span class="pfR">({{item.ticketDesc}})</span>
                                 <!-- <span>(18-64周岁)</span> -->
                                 <!-- <span class="colorG">可订今日</span>
                                 <span class="colorG">可订今日</span> -->