修改头部站点

src/components/FreeTravel/payInfo.vue

@@ -121,8 +121,8 @@
                                 <div v-for="(item,index) in dataDetail.tour_list" :key="index+100">
                                     <p>第{{item.tour_day}}天</p>
                                     <p style="padding:8px 0">说明{{item.tour_desc}}</p>
-                                    <div>
-                                        <img v-if="item.photo_url&&item.photo_url!=''" style="width:100%;height: auto;display:block" :src="ConcatImg(item.photo_url)" alt="">
+                                    <div v-if="item.photo_url&&item.photo_url!=''">
+                                        <img style="width:100%;height: auto;display:block" :src="item.photo_url" alt="">
                                     </div>
                                 </div>
                                 <div v-if="dataDetail.meal_list">
@@ -295,7 +295,7 @@ export default {
         "dmc_post_Get_KKDayOrderQueryOrderDtl",
         this.msg,
         res => {
-            // console.log("sfafg",res);
+            console.log("sfafg",res);
           if (res.data.resultCode == 1) {
               this.oldModel=res.data.data.oldModel;
               this.jo=res.data.data.jo;
@@ -325,8 +325,9 @@ export default {
             if (res.data.data.result === "00") {
                 this.DomainUrl=res.data.data.KkdayDomain;
                 let data = res.data.data.prod
-                this.dataDetail = data;
                 console.log("data",data)
+                this.dataDetail = data;
+
 
             } else {
                 this.Error(res.data.data.result_msg)
@@ -370,6 +371,10 @@ export default {
     width:100%;
     height:194px;
     border-radius:3px;
+    overflow: hidden;
+}
+.FreeInfo .Left .imgDiv img{
+    width: 100%!important;
 }
 .FreeInfo  .commomStyle{
     border:1px solid rgba(224, 224, 224, 1);

src/components/global/newHead.vue

@@ -373,6 +373,9 @@ export default {
       this.$emit("siteCity", this.city == 0 ? -1 : this.city);
     },
     loadSites() {
+      let userInfo = this.getLocalStorage();
+      let state=false;
+
       let msg = {};
       let cmd = "b2b_get_site";
       this.apipost(
@@ -381,20 +384,33 @@ export default {
         r => {
           if (r.data.resultCode == 1) {
             this.sites = r.data.data;
-
-            let cityname = this.cityText.slice(0, this.cityText.length - 1);
-            if (this.sites.length > 0) {
-              this.sites.forEach(item => {
-                if (cityname.indexOf(item.siteName.replace("站", "")) != -1) {
-                  //出现改字段
+            if(userInfo){
+              let rB_Branch_id=userInfo.salesBaseInfo.rB_Branch_id;
+              // let rB_Branch_id=1;
+              this.sites.forEach(item=>{
+                if(item.companyId==rB_Branch_id){
+                  state=true;
                   this.city = item.companyId;
                   window.localStorage.site = this.city;
                   window.localStorage.cityId = item.cityId;
-                } else {
                 }
-              });
+              })
             }
-
+            if(!state){
+              let cityname = this.cityText.slice(0, this.cityText.length - 1);
+              if (this.sites.length > 0) {
+                this.sites.forEach(item => {
+                  if (cityname.indexOf(item.siteName.replace("站", "")) != -1) {
+                    //出现改字段
+                    this.city = item.companyId;
+                    window.localStorage.site = this.city;
+                    window.localStorage.cityId = item.cityId;
+                  } else {
+                  }
+                });
+              }
+            }
+            
             this.city = this.sites.length > 0 ? this.city : null;
           } else {
             this.sites = [];

src/components/newPersonalCenter/block/model/OrderInfoModel/FreeTable.vue

@@ -60,7 +60,7 @@
   }
   .freetable tbody .info .tc_info ._left img{
     height: 100%;
-    width: auto;
+    width: auto!important;
   }
   .orderTable tbody .info .tc_info ._right{
     color: #666666;