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

src/components/commonPage/newTripCommon.vue

+<style>
+    .newTripOneImg img{
+      width:100%;
+    }
+    .newTripHalfImg{
+      display: inline-block;
+      width:49%;
+      height:300px;
+    }
+    .newTripHalfImg img{
+      width:100%;
+      height:100%;
+    }
+    .threeTripLeft{
+      float:left;
+      width:60%;
+      height:600px;
+    }
+    .threeTripLeft img{
+      width:100%;
+      height:100%;
+    }
+    .threeTripRight{
+      float:right;
+      width:39%;
+    }
+    .threeRightTop{
+      width:100%;
+      height:230px;
+    }
+    .threeRightBtm{
+      width:100%;
+      height:359px;
+      margin-top:10px;
+    }
+    .threeRightTop img,.threeRightBtm img{
+      width:100%;
+      height:100%;
+    }
+    .clearfix:after {content: "\0020";display: block;height: 0;clear: both;}
+    .fourTripTop{
+      width:100%;
+      height:450px;
+    }
+    .fourTripImg img{
+      width:100%;
+      height:100%;
+    }
+    .fourBtmOne{
+      width:32%;
+      float:left;
+      margin-top:11px;
+      height:260px;
+      margin-right:11px;
+    }
+    .fourBtmOne:nth-child(2){
+      width:34%;
+    }
+    .fourBtmOne:last-child{
+      margin-right:0;
+    }
+    .fiveTripLeft{
+      float:left;
+      width:35%;
+      height:530px;
+    }
+    .fiveRight{
+      float:right;
+      width:64%;
+    }
+    .fiveTripImg img{
+      width:100%;
+      height:100%;
+    }
+    .fiveRightItem{
+      display: inline-block;
+      width:49%;
+      margin-right:4px;
+      height:260px;
+      margin-bottom:10px;
+    }
+    .fiveRightItem:nth-child(2){
+      margin-right:0;
+    }
+</style>
+<template>
+    <div class="newTripImgContent">
+        <div class="newTripOneImg" v-if="day.length==1">
+            <img :src="day[0].img" alt=""/>
+        </div>
+        <div class="newTripTwoImg" v-if="day.length==2">
+          <div class="newTripHalfImg">
+              <img :src="day[0].img" alt="">
+          </div>
+          <div class="newTripHalfImg" style="margin-left:5px;">
+              <img :src="day[1].img" alt="">
+          </div>
+        </div>
+        <div class="threeTripImg clearfix" v-if="day.length==3"> 
+            <div class="threeTripLeft">
+              <img :src="day[0].img" alt=""/>
+            </div>
+            <div class="threeTripRight">
+              <div class="threeRightTop">
+                <img :src="day[1].img" alt=""/>
+              </div>
+              <div class="threeRightBtm">
+                <img :src="day[2].img" alt=""/>
+              </div>
+            </div>
+        </div>
+        <div class="fourTripImg" v-if="day.length==4">
+            <div class="fourTripTop">
+              <img :src="day[0].img" alt=""/>
+            </div>
+            <div class="fourBtmContent clearfix">
+                <div class="fourBtmOne">
+                    <img :src="day[1].img" alt=""/>
+                </div>
+                <div class="fourBtmOne">
+                    <img :src="day[2].img" alt=""/>
+                </div>
+                <div class="fourBtmOne">
+                    <img :src="day[3].img" alt=""/>
+                </div>
+            </div>
+        </div>
+        <div class="fiveTripImg clearfix" v-if="day.length==5">
+           <div class="fiveTripLeft">
+              <img :src="day[0].img" alt=""/>
+           </div> 
+           <div class="fiveRight">
+              <div class="fiveRightItem">
+                <img :src="day[1].img" alt=""/>
+              </div>
+              <div class="fiveRightItem">
+                <img :src="day[2].img" alt=""/>
+              </div>
+              <div class="fiveRightItem">
+                <img :src="day[3].img" alt=""/>
+              </div>
+              <div class="fiveRightItem">
+                <img :src="day[4].img" alt=""/>
+              </div>
+           </div>
+        </div>
+    </div>
+</template>
+<script>
+  export default {
+    props: {
+      day:{}
+    },
+    methods: {
+
+    },
+    mounted() {
+      console.log(this.day,'dayyyyy');
+    }
+  };
+
+</script>

src/components/confirmationOrderDownLoad.vue

@@ -51,7 +51,7 @@
           @click="gernalFeature(0)" />
         <input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版WORD"
           @click="gernalFeature(1)" /> -->
-        <input type="button" value="新版行程" class="travelControlTripBtn" style="display:none;" @click="goUrlView()"/>
+        <input v-if="CurrentUserInfo.RB_Branch_id==49" type="button" value="新版行程" class="travelControlTripBtn" @click="goUrlView()"/>
         <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;"
           :href="domainManager().ViittoFileUrl+priceList[0].wordPath">下载WORD行程</a>
@@ -679,6 +679,7 @@
   export default {
     data() {
       return {
+        CurrentUserInfo:{},//当前用户信息
         Typevalue:-1,
         titleList:[],
         listMsg:{
@@ -743,6 +744,7 @@
       }
     },
     mounted() {
+      this.CurrentUserInfo = this.getLocalStorage();;
       this.orderId = this.$route.query.orderId;
       this.isopOperation = this.$route.query.isopOperation;
       this.getWxCode();
@@ -1387,12 +1389,6 @@
             for (let i = 0; i < imgs.length; i++) {
               document.getElementsByTagName('img')[i].removeAttribute('crossOrigin')
             }
-            // let imgList = document.getElementById("gernalCanvas").getElementsByTagName("img")
-            // for (let i = 0; i < imgList.length; i++) {
-            //   if (imgList[i].src.indexOf('http') !== -1 && imgList[i].src.indexOf('icon') === -1 && imgList[i].src.indexOf('_bg_') === -1 && imgList[i].src.indexOf('_top_') === -1 && imgList[i].src.indexOf('_title') === -1) {
-            //     imgList[i].src = this.compressImg(imgList[i].src, "filt", imgList[i].clientWidth, '')
-            //   }
-            // }
           })
         }, err => {})
       },
@@ -1659,14 +1655,27 @@
         let routeData = this.$router.resolve({
           name: 'newConfimationOrder',
           query: {
-            // configId: item.ID,
-            // cityId: cityId,
-            // tcid: item.TCID,
-            // orderId: 0,
-            // vshowL: false,
-            // vshowM: false,
-            // vshowTCNUM: true,
-            // isClick: 1 //不计算点击
+            configId: this.$route.query.configId,
+            cityId: this.$route.query.cityId,
+            tcid: this.$route.query.tcid,
+            orderId: this.$route.query.orderId,
+            isClick: 1, //不计算点击
+            vshowA: this.vshowA,
+            vshowB: this.vshowB,
+            vshowC: this.vshowC,
+            vshowD: this.vshowD,
+            vshowE: this.vshowE,
+            vshowF: this.vshowF,
+            vshowG: this.vshowG,
+            vshowH: this.vshowH,
+            vshowI: this.vshowI,
+            vshowJ: this.vshowJ,
+            vshowK: this.vshowK,
+            vshowL: this.vshowL,
+            vshowM: this.vshowM,
+            vshowLLR: this.vshowLLR,
+            vshowTCNUM: this.vshowTCNUM,
+            vshowO: this.vshowO,
           }
         });
         window.open(routeData.href, "_blank");

src/components/systemManagement/lineManagement.vue

@@ -609,7 +609,38 @@
               </div>
             </el-form-item>
           </el-col>
-
+          <el-col :span="5">
+            <el-form-item label="行程顶部图片">
+              <div class="TFimgList">
+                <img v-if="!addMsg.TripFeatureTopBg" src="../../assets/img/bg_c3@3x.png">
+                <img v-else :src='addMsg.TripFeatureTopBg'>
+                <div class="TFIMGzhe">
+                  <div class="TFreupload">
+                    <el-upload :http-request="uploadTripFeatureTopBg" :multiple="false"
+                      accept="image/jpeg, image/gif, image/png, image/bmp" :show-file-list="false" action="">
+                      <i class="iconfont icon-Edit"></i>
+                    </el-upload>
+                  </div>
+                </div>
+              </div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="行程底部图片">
+              <div class="TFimgList">
+                <img v-if="!addMsg.TripFeatureBottomBg" src="../../assets/img/bg_c3@3x.png">
+                <img v-else :src='addMsg.TripFeatureBottomBg'>
+                <div class="TFIMGzhe">
+                  <div class="TFreupload">
+                    <el-upload :http-request="uploadTripFeatureBottomBg" :multiple="false"
+                      accept="image/jpeg, image/gif, image/png, image/bmp" :show-file-list="false" action="">
+                      <i class="iconfont icon-Edit"></i>
+                    </el-upload>
+                  </div>
+                </div>
+              </div>
+            </el-form-item>
+          </el-col>
           <div class="LM_Btcontent">
             <input type="button" class="normalBtn" @click="submitForm('addMsg')" :value="$t('pub.saveBtn')" />
             <input type="button" class="hollowFixedBtn" @click="isShowDIv=false" :value="$t('pub.cancelBtn')" />
@@ -717,6 +748,8 @@
           BroadsideImage: '',
           AppLineIcon: "",
           RebateMoney: 0, //人头返佣
+          TripFeatureTopBg: "", //行程特色顶部图片
+          TripFeatureBottomBg: "", //行程特色顶部图片
         },
         departCompany: "",
         departDepartment: "",
@@ -780,9 +813,27 @@
         this.fileList = fileList.slice(-1);
       },
       handleChange2(file, fileList) {
-
         this.fileList2 = fileList.slice(-1);
       },
+      //行程特色顶部图片
+      uploadTripFeatureTopBg(file) {
+        let newArr = [];
+        newArr.push(file.file);
+        let path = "/Upload/DMC/Icon/";
+        this.UploadSelfFileT(path, newArr, x => {
+          let url = this.domainManager().ViittoFileUrl + x.data.FilePath;
+          this.addMsg.TripFeatureTopBg = url;
+        });
+      },
+      uploadTripFeatureBottomBg(file) {
+        let newArr = [];
+        newArr.push(file.file);
+        let path = "/Upload/DMC/Icon/";
+        this.UploadSelfFileT(path, newArr, x => {
+          let url = this.domainManager().ViittoFileUrl + x.data.FilePath;
+          this.addMsg.TripFeatureBottomBg = url;
+        });
+      },
       uploadTest3(file) {
         let newArr = [];
         newArr.push(file.file);
@@ -891,7 +942,6 @@
       },
       updateData(index) {
         //修改线路信息
-
         this.lineCountryArr = [];
         var getInfo = this.DataList[index];
         this.addMsg.lineName = getInfo.lineName;
@@ -913,6 +963,8 @@
         this.addMsg.BroadsideImage = getInfo.broadsideImage;
         this.addMsg.AppLineIcon = getInfo.appLineIcon;
         this.addMsg.RebateMoney = getInfo.rebateMoney;
+        this.addMsg.TripFeatureTopBg=getInfo.tripFeatureTopBg;
+        this.addMsg.TripFeatureBottomBg=getInfo.tripFeatureBottomBg;
       },
       deletelist(lineID) {
         var that = this;