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

src/components/SalesconfirmationOrder.vue

@@ -15,9 +15,9 @@
     <div class="trip_cover" v-show="pdfLoading" v-loading="pdfLoading"></div>
     <input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版PDF"
       @click="toPDF(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" />
-    <input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载手机版WORD"
+    <input type="button" style="width: auto !important; display:none;" class="travelControlTripBtn" value="下载手机版WORD"
       @click="gernalFeature(0)" />
-    <input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版WORD"
+    <input type="button" style="width: auto !important; display:none;" class="travelControlTripBtn" value="下载电脑版WORD"
       @click="gernalFeature(1)" />
     <a class="travelControlTripBtn" v-if="priceList.length>0&& priceList[0].wordPath!=''" style="display:inline-block;text-decoration:none;
       width:135px;text-align:center;line-height:30px;font-size:13px;position:relative;top:2px;"
@@ -305,11 +305,14 @@
                       <span class="title">
                         {{son.childItem.couponsName}}
                       </span>
-                                    <span class="playTime"> <i class="iconfont icon-shijian"></i> 游玩时间：<span v-if="son.childItem.playTimeHour!=null&&son.childItem.playTimeHour!=''">{{son.childItem.playTimeHour+'小时'}}</span><span v-if="son.childItem.playTimeMinutes!=null&&son.childItem.playTimeMinutes!=''">{{son.childItem.playTimeMinutes+'分钟'}}</span></span>
-                                    <span class="content" v-html="son.childItem.description"></span>
-                                    <div class="Newimg-list" v-if="son.childItem.imaArray.length">
+                      <div class="playTime"> <i class="iconfont icon-shijian"></i> 游玩时间：
+                        <span v-if="son.childItem.playTimeHour!=null&&son.childItem.playTimeHour!=''">{{son.childItem.playTimeHour+'小时'}}</span>
+                        <span v-if="son.childItem.playTimeMinutes!=null&&son.childItem.playTimeMinutes!=''">{{son.childItem.playTimeMinutes+'分钟'}}</span>
+                      </div>
+                      <div class="content" v-html="son.childItem.description"></div>
+                      <div class="Newimg-list clearfix" v-if="son.childItem.imaArray.length">
                         <div class="item" v-for="(img,i) in son.childItem.imaArray" :key="i">
-                                            <img :src='img.url'/>
+                          <img :src='img.url' />
                         </div>
                       </div>
                     </div>
@@ -325,13 +328,13 @@
                       <span class="time" v-if="son.childItem.timeType==1">上午</span>
                       <span class="time" v-if="son.childItem.timeType==2">下午</span>
                       <span class="time" v-if="son.childItem.timeType==0">全天</span>
-                                    <span class="title">
+                      <div class="title">
                         {{son.childItem.hotelName+son.childItem.hotelProductName}}
-                                    </span>
-                                    <span class="content" v-html="son.childItem.description"></span>
-                                    <div class="Newimg-list" v-if="son.childItem.imaArray.length">
+                      </div>
+                      <div class="content" v-html="son.childItem.description"></div>
+                      <div class="Newimg-list clearfix" v-if="son.childItem.imaArray.length">
                         <div class="item" v-for="(img,i) in son.childItem.imaArray" :key="i">
-                                            <img :src='img.url'/>
+                          <img :src='img.url' />
                         </div>
                       </div>
                     </div>
@@ -349,11 +352,13 @@
                       <span class="title">
                         {{son.childItem.dinnerName+son.childItem.mealName}}
                       </span>
-                                    <span class="playTime"> <i class="iconfont icon-shijian"></i> 用餐时长：<span v-if="son.childItem.playTimeHour!=null&&son.childItem.playTimeHour!=''">{{son.childItem.playTimeHour+'小时'}}</span><span v-if="son.childItem.playTimeMinutes!=null&&son.childItem.playTimeMinutes!=''">{{son.childItem.playTimeMinutes+'分钟'}}</span></span>
-                                    <span class="content" v-html="son.childItem.description"></span>
-                                    <div class="Newimg-list" v-if="son.childItem.imaArray.length">
+                      <div class="playTime"> <i class="iconfont icon-shijian"></i> 用餐时长：<span
+                          v-if="son.childItem.playTimeHour!=null&&son.childItem.playTimeHour!=''">{{son.childItem.playTimeHour+'小时'}}</span><span
+                          v-if="son.childItem.playTimeMinutes!=null&&son.childItem.playTimeMinutes!=''">{{son.childItem.playTimeMinutes+'分钟'}}</span></div>
+                      <div class="content" v-html="son.childItem.description"></div>
+                      <div class="Newimg-list clearfix" v-if="son.childItem.imaArray.length">
                         <div class="item" v-for="(img,i) in son.childItem.imaArray" :key="i">
-                                            <img :src='img.url'/>
+                          <img :src='img.url' />
                         </div>
                       </div>
                     </div>
@@ -961,7 +966,7 @@
           url: urlObj.DomainUrl + '/api/file/GetWebHtmlTwo',
           data: {
             "msg": pageData,
-            isSale:1
+            sign: "sale_pdf"
           }
         }).then(res => {
           if (res.data.resultCode === 1) {
@@ -1044,7 +1049,7 @@
         }, res => {
           if (res.data.resultCode == 1) {
             let data = (res.data.data);
-            console.log(data,'dataaaa');
+            console.log(data, 'dataaaa');
             this.orderTripdiff = data.orderTripdiff;
             this.orderMsg = data.orderMsg;
             if (this.orderTripdiff && this.orderTripdiff.flightInfoJson) {
@@ -1397,7 +1402,7 @@
 </script>
 <style>
   @import url('../assets/css/tripIndex.css');
-  @import url('../assets/css/salefeture2.css');
+  @import url('../assets/css/sale_pdf.css');
 
   .edit_form_box {
     display: flex;