还原冲突掉代码

src/components/leaderPay2.vue

@@ -224,7 +224,7 @@ input[type="number"] {
               <td v-if="childIndex==0" :rowspan="subItem.TicketPriceList.length">
                 {{scenicTotalPrice(subItem, subItem.TicketPriceList)}}
               </td>
-              <td  v-if="childIndex==0" :rowspan="subItem.TicketPriceList.length"> 
+              <td  v-if="childIndex==0" :rowspan="subItem.TicketPriceList.length">
                 {{subItem.TradingTotalPrice}}
               </td>
 
@@ -1206,14 +1206,11 @@ export default {
         date = obj ? obj.UseTimeStr : 'all'
       } else if (name === 'bus') {
         path="CarDetails"
-        TCIDs=obj.TCIDs;
-        date=obj.UseTime;
+        date=obj?obj.UseTime:'all';
 
       } else if (name === 'dining') {
         path="DinningDetails"
-        TCIDs=obj.TCIDs;
-        date=obj.UseTimeStr;
-        
+        date=obj?obj.UseTimeStr:'all';
       } else if (name === 'hotel') {
         path = 'leaderPayHotelDetail'
         date = obj ? obj.CheckInDateStr : 'all'