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

src/components/commonPage/TripDownLoadCommon.vue

@@ -95,6 +95,11 @@
           <td><input id="vshowK" v-model="TripLayer.vshowK" type="checkbox" /><label for="vshowK">{{$t('salesModule.JDTP')}}</label></td>
           <td><input id="vshowLLR" v-model="TripLayer.vshowLLR" type="checkbox" /><label for="vshowLLR">{{$t('salesModule.EmergencyContact')}}</label></td>
         </tr>
+        <tr height="36">
+          <td style="padding-left:28px;"><input id="vshowO" v-model="TripLayer.vshowO" type="checkbox" /><label for="vshowO">显示视频图片</label></td>
+          <td></td>
+        </tr>
+
       </tbody>
       <tr height="66">
         <td colspan="2" align="center">
@@ -138,6 +143,7 @@
             vshowM: this.TripLayer.vshowM,
             vshowN: this.TripLayer.vshowN,
             vshowLLR: this.TripLayer.vshowLLR,
+            vshowO: this.TripLayer.vshowO,
             vshowTCNUM: true,
             isopOperation: obj.isopOperation,
           }
@@ -167,6 +173,8 @@
         this.TripLayer.vshowM = false;
         this.TripLayer.vshowLLR = false;
       }
+
+      this.TripLayer.vshowO = false;
     }
   };
 

src/components/confirmationOrderDownLoad.vue

@@ -700,6 +700,7 @@
         vshowM: this.$route.query.vshowM === undefined ? true : this.$route.query.vshowM === 'true',
         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',
         list: [],
         tripList: [],
         priceList: [],
@@ -1036,6 +1037,8 @@
           isShowTripImage: this.vshowK ? 1 : 0,
           //是否显示签证信息
           isShowVisa: this.vshowH ? 1 : 0,
+          //是否显示视频图片
+          isShowVideoImg: this.vshowO ? 1 : 0,
           //isPc是否PC下载
           isPc: 2,
           //模板参数
@@ -1107,6 +1110,8 @@
           isShowTripImage: this.vshowK ? 1 : 0,
           //是否显示签证信息
           isShowVisa: this.vshowH ? 1 : 0,
+          //是否显示视频图片
+          isShowVideoImg: this.vshowO ? 1 : 0,
           //isPc是否PC下载
           isPc: 2,
           //模板参数
@@ -1174,6 +1179,8 @@
           isShowTripImage: this.vshowK ? 1 : 0,
           //是否显示签证信息
           isShowVisa: this.vshowH ? 1 : 0,
+          //是否显示视频图片
+          isShowVideoImg: this.vshowO ? 1 : 0,
           //isPc是否PC下载
           isPc: isPc,
           //模板参数
@@ -1221,6 +1228,8 @@
           isShowTripImage: this.vshowK ? 1 : 0,
           //是否显示签证信息
           isShowVisa: this.vshowH ? 1 : 0,
+          //是否显示视频图片
+          isShowVideoImg: this.vshowO ? 1 : 0,
           //isPc是否PC下载
           isPc: isPc,
           //模板参数