Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue

@@ -293,7 +293,9 @@
     background-color: #e95252 !important;
     color: white;
   }
-
+  .TpricehasTicket{
+    color:#47BF8C!important;
+  }
 </style>
 
 <template>
@@ -339,20 +341,14 @@
             </ul>
             <!-- 日期 -->
             <ul class="days">
-              <li class="liList" v-for="(dayobject,index) in days" :key="dayobject.subCode">
+              <li class="liList" v-for="(dayobject,index) in days" :key="dayobject.subCode" :class="{'TpricehasTicket':dayobject.Tip}" :title="dayobject.Tip?'当天有机票':''">
                 <template v-if="dayobject.click">
                   <span v-if="dayobject.checkState==$calendarUtils.checkState.checked" class="checked1"
                     @click="clickedDay(dayobject)">{{dayobject.day.getDate()}}
-                      <!-- <template v-if="dayobject.Tip">
-                        有机票
-                      </template> -->
-                    </span>
+                  </span>
                   <span v-else-if="dayobject.checkState==$calendarUtils.checkState.hasValue"
                     @click="clickedDay(dayobject)">{{dayobject.day.getDate()}}
-                     <!-- <template v-if="dayobject.Tip">
-                        有机票
-                      </template> -->
-                    </span>
+                  </span>
                 </template>
                 <template v-else>
                   <span class="other-month">{{dayobject.day.getDate()}}</span>