页面修改

src/assets/utils/tripUtils.js

@@ -225,8 +225,8 @@ var tripUtils = {
       CurrencyId: 0, //币种id
       Money: 0.0, //费用
       PeopleNumber: 0, //人数
-      SalePrice:0,//销售价格
-      CostRemark:"",//成本备注
+      SalePrice: 0, //销售价格
+      CostRemark: "", //成本备注
     }
   },
   //地接成本报价币种
@@ -350,12 +350,12 @@ var tripUtils = {
       //行程介绍
       trafficIntroduce: {
         IntroduceTitle: "", //行程介绍标题
-        IntroduceImage: ViittoFileUrl+"/Upload/DefalutImage/DMC/defaultairline.png", //行程介绍图片
+        IntroduceImage: ViittoFileUrl + "/Upload/DefalutImage/DMC/defaultairline.png", //行程介绍图片
         IntroduceDetail: "", //行程介绍详细信息
-        TrafficType:2,//交通类型,默认为专车
-        TrafficContent:"",//交通详情
-        TrafficImage:"",//交通图片
-      
+        TrafficType: 2, //交通类型,默认为专车
+        TrafficContent: "", //交通详情
+        TrafficImage: "", //交通图片
+
       }
     };
   },
@@ -371,8 +371,8 @@ var tripUtils = {
       StartCityName: "",
       //到达城市名称
       ArrivalCityName: "",
-      StartTime:"",//出发时间
-      EndTime:"",//到达时间
+      StartTime: "", //出发时间
+      EndTime: "", //到达时间
     };
   },
   //行程-景点对象
@@ -399,16 +399,16 @@ var tripUtils = {
       QCity: '',
       NewScenicImg: '', //改版后的景点图片
       NewImaArray: [],
-      MD5Sign:"",
+      MD5Sign: "",
       //景点JSon字符串
-      ScenicJson:{
-        x:0,//初始位移x
-        y:0 //初始位移y
+      ScenicJson: {
+        x: 0, //初始位移x
+        y: 0 //初始位移y
       },
-      TrafficType:2,//交通类型(1-飞机,2-专车,3-地铁,4-步行)
-      TrafficContent:"",//交通内容
-      TrafficImage:"",//交通图片
-      TimeStr:"",//时间字符串备注
+      TrafficType: 2, //交通类型(1-飞机,2-专车,3-地铁,4-步行)
+      TrafficContent: "", //交通内容
+      TrafficImage: "", //交通图片
+      TimeStr: "", //时间字符串备注
     };
   },
   //行程-酒店对象
@@ -437,9 +437,9 @@ var tripUtils = {
       //0-不同级酒店，1同级酒店
       IsSameLevel: 0,
       //酒店类型
-      HotelType:0,
-      MD5Sign:"",
-      TimeStr:"",//时间字符串备注
+      HotelType: 0,
+      MD5Sign: "",
+      TimeStr: "", //时间字符串备注
     };
   },
   //行程-餐饮对象
@@ -467,8 +467,8 @@ var tripUtils = {
       MealName: "",
       QCity: '',
       BreakfastUseType: 2,
-      MD5Sign:"",
-      TimeStr:"",//时间字符串备注
+      MD5Sign: "",
+      TimeStr: "", //时间字符串备注
     };
   },
   //行程-自由活动对象
@@ -526,10 +526,10 @@ var tripUtils = {
       DayNum: 0,
       TitleObj: {},
       TrafficObj: {},
-      HotelChooseArray:[],
+      HotelChooseArray: [],
       HotelArray: [],
       DinnerArray: [],
-      ChooseScenicArray:[],
+      ChooseScenicArray: [],
       ScenicArray: [],
       WarmTipObj: {},
     }
@@ -539,7 +539,7 @@ var tripUtils = {
     return {
       Id: 0,
       Describe: "",
-      Sort:1
+      Sort: 1
     }
   },
   daysArrayItemObj: function () {
@@ -587,21 +587,22 @@ var tripUtils = {
   },
   CreateUUID(len, radix) {
     var chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('');
-    var uuid = [], i;
+    var uuid = [],
+      i;
     radix = radix || chars.length;
     if (len) {
-        // Compact form
-        for (i = 0; i < len; i++) uuid[i] = chars[0 | Math.random()*radix];
+      // Compact form
+      for (i = 0; i < len; i++) uuid[i] = chars[0 | Math.random() * radix];
     } else {
-        var r;
-        uuid[8] = uuid[13] = uuid[18] = uuid[23] = '-';
-        uuid[14] = '4';
-        for (i = 0; i < 36; i++) {
-            if (!uuid[i]) {
-                r = 0 | Math.random()*16;
-                uuid[i] = chars[(i == 19) ? (r & 0x3) | 0x8 : r];
-            }
+      var r;
+      uuid[8] = uuid[13] = uuid[18] = uuid[23] = '-';
+      uuid[14] = '4';
+      for (i = 0; i < 36; i++) {
+        if (!uuid[i]) {
+          r = 0 | Math.random() * 16;
+          uuid[i] = chars[(i == 19) ? (r & 0x3) | 0x8 : r];
         }
+      }
     }
     return uuid.join('');
   },
@@ -616,8 +617,7 @@ var tripUtils = {
     if (DayList != null && DayList.length > 0) {
       DayList.forEach((dayItem, dayIndex) => {
         if (dayIndex == currentDayIndex) {
-          if(dayItem.TrafficObj!=null &&dayItem.TrafficObj.SubTraffic!=null && dayItem.TrafficObj.SubTraffic.length>0 )
-          {
+          if (dayItem.TrafficObj != null && dayItem.TrafficObj.SubTraffic != null && dayItem.TrafficObj.SubTraffic.length > 0) {
             dayItem.TrafficObj.SubTraffic.forEach(subItem => {
               cityIdStr += subItem.StartCityId + "," + subItem.ArrivalCityId + ","
             });
@@ -736,17 +736,42 @@ var tripUtils = {
     return flag;
   },
   //跳转到B2B一日游页面
-  GotoB2BOneDayPage(B2BDomain,ConfigId,tcid)
-  {
+  GotoB2BOneDayPage(B2BDomain, ConfigId, tcid) {
     if (B2BDomain) {
-     var url = "http://"+B2BDomain;
+      var url = "http://" + B2BDomain;
       window.open(
-        url+'/#/OneDayDetailTwo/' +
+        url + '/#/OneDayDetailTwo/' +
         encodeURIComponent(ConfigId) + '/' + tcid +
         '/preview',
         '_blank'
       )
     }
   },
+  //跳转到B2B页面
+  GotoB2BPage(B2BDomain, ConfigId, tcid) {
+    if (B2BDomain) {
+      var url = "http://" + B2BDomain;
+      window.open(
+        url + "/#/detailTwo/" +
+        encodeURIComponent(ConfigId) +
+        "/" +
+        tcid +
+        "/preview",
+        "_blank"
+      );
+    }
+  },
+  //跳转到B2C页面
+  GotoB2CPage(B2BDomain, ConfigId, tcid) {
+    if (B2BDomain) {
+      var url = "http://" + B2BDomain;
+      window.open(
+        url + "/#/newTrip" + '?ID=' + encodeURIComponent(ConfigId) +
+        "&" +
+        'tcid=' + tcid,
+        "_blank"
+      );
+    }
+  },
 }
 export default tripUtils;

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -972,8 +972,8 @@
                         {{$t('Operation.Op_b2bView')}}
                       </el-dropdown-item>
 
-                      <el-dropdown-item @click.native="goB2B(item.ConfigId, item.TCID , 2)"
-                        v-if="item.LineID!=2&&item.LineID!=8">
+                      <el-dropdown-item  @click.native="goB2B(item.ConfigId, item.TCID , 2)"
+                        v-if="CurrentUserInfo.B2BDomain!=''&&item.LineID!=2&&item.LineID!=8">
                         直客版预览
                       </el-dropdown-item>
 
@@ -1861,24 +1861,11 @@
         });
       },
       goB2B(ConfigId, tcid, type) {
+           var B2BDomain = this.CurrentUserInfo.B2BDomain;
         if (type == 1) {
-          var B2BDomain = this.CurrentUserInfo.B2BDomain;
-          window.open(
-            "http://www.oytour.com/#/detailTwo/" +
-            encodeURIComponent(ConfigId) +
-            "/" +
-            tcid +
-            "/preview",
-            "_blank"
-          );
+           this.$tripUtils.GotoB2BPage(B2BDomain,ConfigId,tcid);
         } else {
-          var B2BDomain = this.CurrentUserInfo.B2BDomain;
-          window.open(
-            "http://www.oytour.com/#/newTrip" + '?ID=' + encodeURIComponent(ConfigId) +
-            "&" +
-            'tcid=' + tcid,
-            "_blank"
-          );
+          this.$tripUtils.GotoB2CPage(B2BDomain,ConfigId,tcid);
         }
       },
       goTeamBalance(id, OutBranchId) {