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

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" @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 => {})
       },