Merge branch 'master' of http://gitlab.oytour.com/huaguohao/athena

src/App.vue

@@ -101,7 +101,7 @@ export default {
 
 <style>
 @import './assets/global/font.css';
-@import '//at.alicdn.com/t/font_863923_gnvvvot7jvv.css';
+@import '//at.alicdn.com/t/font_863923_jgikji5npg.css';
 @import './assets/global/global.css';
 @import './assets/css/common.css';
 body,html{

src/components/mall/newTrip.vue

@@ -545,6 +545,11 @@
         color: #3D4756;
         font-size: 22px;
     }
+    .tripViewAgendaList .agendaBox .agendaPoi .tour {
+        color: #00A4A8;
+        font-size: 22px;
+    }
+
 
     .tripViewAgendaList .agendaBox .txtCont .title {
         font-size: 22px;
@@ -916,7 +921,7 @@
                                             v-for="(item,index) in dataList.currentPriceInfo.priceFlight" :key="index">
                                             <div class="arrangementSubContainer">
                                                 <div class="header">
-                                                    <span class="dayIndex">D{{index+1}}</span>
+                                                    <span class="dayIndex">{{item.startDate}}</span>
                                                 </div>
                                                 <div class="content">
                                                     <div class="name transit">{{item.flightNumber}}</div>
@@ -1032,6 +1037,10 @@
                                                         @click="bigImgShow(subItem.childItem.imaArray[0].url)">
                                                     </div>
                                                     <div class="txtCont icon-triangle">
+                                                        <div class="agendaPoi">
+                                                            <i class="iconfont icon-jingdianjingguan tour"></i>
+                                                            <span class="title" style="color:#00A4A8;">{{subItem.childItem.couponsName}}</span>
+                                                        </div>
                                                         <div class="detailBox">
                                                             <div style="border-top:0;margin:20px 0;"
                                                                 v-html='subItem.childItem.descriptionText'></div>