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

src/components/SalesModule/productQuery.vue

@@ -144,15 +144,15 @@
 	.PQ_detail tr th,.v-table-title-cell{background: #E6E6E6;height:40px; font-size: 14px;border-right:1px solid #e6e6e6;color: #333;}
 	.PQ_detail tr{background: #fff;text-align: center; height: 40px;}
 	.PQ_detail tr td{font-size: 12px;border: 1px solid #E5E5E5;}
-  .TC_HotelPop{
+  .PQ_HotelPop{
     overflow: auto;
     max-height:350px;
   }
-  .TC_HotelPop table td{
+  .PQ_HotelPop table td{
     padding:5px 0;
     text-align: center;
   }
-  .TC_HotelPop table th{
+  .PQ_HotelPop table th{
     text-align: center;
   }
 </style>
@@ -708,7 +708,7 @@
               <p><span>返回城市</span>{{item.ReturnArriveCityName}}</p>
               <p><span>出团公司</span>{{item.OutBranchName}}</p>
                <p v-if="item.LineID==14 && item.HotelOrderListReports && item.HotelOrderListReports.length>0 ">
-                    <el-popover width="600" trigger="click" popper-class="TC_HotelPop">
+                    <el-popover width="600" trigger="click" popper-class="PQ_HotelPop">
                       <commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj"></commonHotelInfo>
                       <!-- <table width="100%" border="0" cellspacing="0" cellpadding="0" class="singeRowTable">
                         <tr>

src/components/SalesModule/productQueryOne.vue

@@ -144,17 +144,6 @@
 	.PQ_detail tr th,.v-table-title-cell{background: #E6E6E6;height:40px; font-size: 14px;border-right:1px solid #e6e6e6;color: #333;}
 	.PQ_detail tr{background: #fff;text-align: center; height: 40px;}
 	.PQ_detail tr td{font-size: 12px;border: 1px solid #E5E5E5;}
-  .TC_HotelPop >div{
-    overflow: auto;
-    max-height:350px;
-  }
-  .TC_HotelPop table td{
-    padding:5px 0;
-    text-align: center;
-  }
-  .TC_HotelPop table th{
-    text-align: center;
-  }
 </style>
 <template>
   <div class="flexOne">

src/components/busManagement/busStatistics.vue

@@ -76,7 +76,7 @@
                 </div>
               </td>
               <td>
-                 <el-popover width="750" trigger="click" popper-class="TC_HotelPop">
+                 <el-popover width="750" trigger="click" popper-class="Bus_HotelPop">
                    <commonHotelInfo :HotelObj="item.CommonReport.PriceHotelResult" :showHotelObj="showHotelObj"></commonHotelInfo>
                     <div slot="reference" class="w80" style="cursor:pointer;text-decoration:underline;">酒店信息</div>
                   </el-popover>
@@ -538,7 +538,7 @@
   .busStatistics_tripDetails table tr._color_666 th {
     padding: 9px 15px;
   }
-  .TC_HotelPop{
+  .Bus_HotelPop{
     overflow: auto;
     max-height: 350px;
   }

src/components/confirmationOrderDownLoad.vue

@@ -7,7 +7,9 @@
   .travelControlTrip .hangban-info tr th {
     padding-left: 0 !important;
   }
-
+  .WeiXinShare{
+    width:118px;position:relative;top:55px;
+  }
 </style>
 
 <template>
@@ -65,7 +67,7 @@
                 <p class="pvalue">{{orderMsg.endDate}}</p>
               </td>
               <td rowspan="2">
-                  <!-- <img :src="WeiXinShareImgSrc" /> -->
+                  <img class="WeiXinShare" :src="'data:image/png;base64,'+WeiXinShareImgSrc" />
               </td>
             </tr>
             <tr>

src/components/dmc/manager/dmcTotalTable.vue

@@ -290,7 +290,7 @@
                 </div>
                 <p
                   v-if="item.LineId==14 && item.CommonReport.PriceHotelResult && item.CommonReport.PriceHotelResult.length>0">
-                  <el-popover width="750" trigger="click" popper-class="TC_HotelPop">
+                  <el-popover width="750" trigger="click" popper-class="DMC_HotelPop">
                     <commonHotelInfo :HotelObj="item.CommonReport.PriceHotelResult" :showHotelObj="showHotelObj"
                       :TCID="item.TCID" :DMCNum="item.DMCNum" :TCNUM="item.TCNUMS" @SetShouPeiShu="SetShouPeiShu(item.TCID,item.ShouPeiStatus)"></commonHotelInfo>
                     <span slot="reference" class="price" style="cursor:pointer;text-decoration:underline;">酒店信息</span>
@@ -1069,7 +1069,7 @@
   .dmcSetTable tr {
     height: 50px;
   }
-  .TC_HotelPop{
+  .DMC_HotelPop{
     overflow: auto;
     max-height: 350px;
   }

src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue

@@ -351,6 +351,20 @@
           "";
         TripFeature.FeatureHtmlJsonDelete = TripFeature.FeatureHtmlJsonDelete ? JSON.stringify(TripFeature.FeatureHtmlJsonDelete) :
           "";
+        var htmlObj = document.getElementById("newFeatureBox");
+        if(htmlObj){
+          if(htmlObj.innerHTML!=null||htmlObj.innerHTML!=""){
+          }
+        }else if(TripFeature.FeatureType>=4){
+           this.$alert('请点击更新行程特色','提示', {
+              confirmButtonText: '确定',
+              callback: action => {
+                this.custormAnchor('thirdAnchor',3);
+                this.isSubmit = true;
+                return
+              }
+            });
+        }
         TripFeature.FeeInclude = this.PostNotice.FeeInclude;
         TripFeature.FeeNonInclude = this.PostNotice.FeeNonInclude;
         TripFeature.ImportantTip = this.PostNotice.ImportantTip;