修改

src/components/newConfimationOrder.vue

@@ -41,6 +41,8 @@
     .newTrip_Main .newTripStartInfo{
         font-size:20px;
         margin-top:20px;
+        float:left;
+        width:60%;
     }
     .newTrip_Main .newTripStartInfo>div{
         margin-bottom:20px;
@@ -120,10 +122,11 @@
     .newTripleft{
       display: inline-block;
       text-align: left;
-      font-size: 18px;
+      font-size: 14px;
+      font-weight: bold;
       font-family: Arial;
       vertical-align: top;
-      margin-bottom: 15px;
+      margin:0 0 15px 0;
     }
     .newTripRight{
       width: 100%;
@@ -207,6 +210,16 @@
     margin-left: 10px;
     margin:20px 0;
 }
+.clearfix:after {content: "\0020";display: block;height: 0;clear: both;}
+.newTwoCodeRight{
+  float:right;
+  width:118px;
+  height:118px;
+  margin-top:40px;
+}
+.newTwoCodeRight img{
+  width:100%;
+}
 </style>
 <template>
     <div class="newTrip_Main">
@@ -221,11 +234,16 @@
                 {{title}}
             </div>
             <div class="newTripCankao">(行程中所涉及到的图片仅供参考)</div>
-            <div class="newTripStartInfo">
-                <div><span class="newtripComTitle">线路：</span>{{orderMsg.lineName}}</div>
-                <div><span class="newtripComTitle">出发日期：</span>{{orderMsg.startDate}}</div>
-                <div><span class="newtripComTitle">返回日期：</span>{{orderMsg.endDate}}</div>
-                <div><span class="newtripComTitle">行程天数：</span>{{orderMsg.dayNum}}</div>
+            <div class="clearfix">
+              <div class="newTripStartInfo">
+                  <div><span class="newtripComTitle">线路：</span>{{orderMsg.lineName}}</div>
+                  <div><span class="newtripComTitle">出发日期：</span>{{orderMsg.startDate}}</div>
+                  <div><span class="newtripComTitle">返回日期：</span>{{orderMsg.endDate}}</div>
+                  <div><span class="newtripComTitle">行程天数：</span>{{orderMsg.dayNum}}</div>
+              </div>
+              <div class="newTwoCodeRight">
+                  <img :src="'data:image/png;base64,'+WeiXinShareImgSrc" />
+              </div>
             </div>
 
             <div v-if='vshowL' class="newTripFeiyongtitle">
@@ -371,8 +389,10 @@
                     {{getTitle(item.title)}}
                 </div>
                 <div class="newTripDay" style="margin-bottom:0;" v-for="(subItem,subIndex) in item.details" :key="subIndex">
-                    <div class="newTripTutle">{{getTitle(subItem.title)}}</div>
-                    <div>{{subItem.content}}</div>
+                    <div>
+                      <span class="newTripTutle">{{getTitle(subItem.title)}}：</span>
+                      <span>{{subItem.content}}</span>
+                    </div>
                 </div>
                 <div class="newTripDay">
                     <div class="warmTipsTitle">温馨提示：</div><div class="warmTipsContent" v-html="item.tips[0].content"></div>
@@ -405,7 +425,7 @@
                             <td style="width:25%">
                               <label>交通：</label>
                               <template v-for="subItem in item.details">
-                                  {{subItem.goType}}
+                                <template v-for="childItem in subItem.trafficArray">{{childItem}}&nbsp;</template>
                               </template>
                             </td>
                         </tr>
@@ -428,7 +448,7 @@
                 <div class="newTripRight">
                   <div v-html="feature.feeInclude"></div>
                 </div>
-                <div class="newTripleft" style="margin: 15px 0 15px 0;">费用不包含</div>
+                <div class="newTripleft" style="margin: 15px 0 10px 8px;">费用不包含</div>
                 <div class="newTripRight">
                   <div v-html="feature.feeNonInclude"></div>
                 </div>
@@ -500,7 +520,7 @@
                 </div>
               </div>
               <div v-if='vshowG' class="newTripExpense">
-                <div class="newTripleft">温馨提示</div>
+                <div class="newTripleft" style="margin-top:15px;">温馨提示</div>
                 <div class="newTripRight">
                   <div v-html="feature.warmTip"></div>
                 </div>
@@ -626,13 +646,14 @@
         vshowLLR: this.$route.query.vshowLLR === undefined ? true : this.$route.query.vshowLLR === 'true',
         vshowTCNUM: this.$route.query.vshowTCNUM === undefined ? false : this.$route.query.vshowTCNUM === 'true',
         vshowO: this.$route.query.vshowO === undefined ? true : this.$route.query.vshowO === 'true',
-        goType:''
+        //微信分享图片
+        WeiXinShareImgSrc:"",
       }
     },
     mounted() {
       this.orderId = this.$route.query.orderId;
       this.isopOperation = this.$route.query.isopOperation;
-    //   this.getWxCode();
+      this.getWxCode();
       this.init();
       this.initAirlines()
       this.getDataList();
@@ -969,7 +990,8 @@
         this.priceList = data.priceList;
         this.dataList = data;
         this.tripList.forEach((x, j) => {
-          let useDinnerTypeBy = ''
+          let useDinnerTypeBy = '';
+          let trafficArray=[];
           let jin = [],
             jiu = [],
             jiu2 = [],
@@ -997,21 +1019,32 @@
               dadian.push(obj)
             } else if (y.type == 1 && y.childItem.subTraffic.length > 0) {
               let title = '';
-              this.goType='';
               y.childItem.subTraffic.forEach((z, i) => {
                 title += z.startCityName
                 if (z.arrivalType == 1) {
                   title += '<i class="iconfont icon-feiji"></i>'
-                  this.goType ='飞机'
+                  if(!(trafficArray.indexOf("飞机") > -1))
+                  {
+                    trafficArray.push("飞机")
+                  }                
                 } else if (z.arrivalType == 2) {
                   title += '<i class="iconfont icon-bus"></i>'
-                  this.goType ='巴士'
+                  if(!(trafficArray.indexOf("巴士") > -1))
+                  {
+                     trafficArray.push("巴士")
+                  }
                 } else if (z.arrivalType == 3) {
                   title += '<i class="iconfont icon-icon31"></i>'
-                  this.goType ='轮船'
+                  if(!(trafficArray.indexOf("轮船") > -1))
+                  {
+                     trafficArray.push("轮船")
+                  }
                 } else {
                   title += '<i class="iconfont icon-gaotiedongche"></i>'
-                  this.goType ='火车'
+                   if(!(trafficArray.indexOf("火车") > -1))
+                  {
+                     trafficArray.push("火车")
+                  }
                 }
                 if (i + 1 == y.childItem.subTraffic.length) {
                   title += z.arrivalCityName
@@ -1019,7 +1052,7 @@
               })
               let obj = {
                 title: title,
-                goType: this.goType,
+                trafficArray: trafficArray,
                 content: y.childItem.description,
                 img: '',
                 ticketName: '',
@@ -1040,7 +1073,7 @@
                 playTimeMinutes: y.childItem.playTimeMinutes,
                 scenicJson: y.childItem.scenicJson,
                 url: y.childItem.url,
-                goType: this.goType,
+                trafficArray: trafficArray,
               }
               jin.push(obj)
             } else if (y.type == 3 && y.childItem.hotelName != '' && y.childItem.imaArray.length > 0) {