Commit e1349f5c authored by huangyuanyuan's avatar huangyuanyuan

解决冲突

parent 23be4684
This diff is collapsed.
...@@ -503,7 +503,12 @@ ...@@ -503,7 +503,12 @@
<div style="padding:10px 0"> <div style="padding:10px 0">
<span class="RL-remarkTitle">名单:</span> <span class="RL-remarkTitle">名单:</span>
<span class="RL-redType RL-remarkCon" v-if="item.VisaGuestList.length>0"> <span class="RL-redType RL-remarkCon" v-if="item.VisaGuestList.length>0">
<span style="color:blue !important" v-for="(childItem) in item.VisaGuestList">{{childItem.GuestName}}</span> <span style="color:blue !important" v-for="(childItem) in item.VisaGuestList">
<span v-if="childItem.VisaStatus===2" class="groupTourOrder_tickets_blue" >{{childItem.GuestName}}</span>
<span v-else-if="childItem.VisaStatus===3" class="groupTourOrder_tickets_green" >{{childItem.GuestName}}</span>
<span v-else-if="childItem.VisaStatus===1" class="groupTourOrder_tickets_red" >{{childItem.GuestName}}</span>
</span>
</span> </span>
<span class="RL-redType RL-remarkCon" v-else> <span class="RL-redType RL-remarkCon" v-else>
<span>暂无名单</span> <span>暂无名单</span>
......
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