Commit 9ba826c2 authored by 华国豪's avatar 华国豪 🙄

还原冲突掉代码

parent d7e17a91
...@@ -1206,14 +1206,11 @@ export default { ...@@ -1206,14 +1206,11 @@ export default {
date = obj ? obj.UseTimeStr : 'all' date = obj ? obj.UseTimeStr : 'all'
} else if (name === 'bus') { } else if (name === 'bus') {
path="CarDetails" path="CarDetails"
TCIDs=obj.TCIDs; date=obj?obj.UseTime:'all';
date=obj.UseTime;
} else if (name === 'dining') { } else if (name === 'dining') {
path="DinningDetails" path="DinningDetails"
TCIDs=obj.TCIDs; date=obj?obj.UseTimeStr:'all';
date=obj.UseTimeStr;
} else if (name === 'hotel') { } else if (name === 'hotel') {
path = 'leaderPayHotelDetail' path = 'leaderPayHotelDetail'
date = obj ? obj.CheckInDateStr : 'all' date = obj ? obj.CheckInDateStr : 'all'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment