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

src/assets/utils/tripUtils.js

@@ -800,7 +800,7 @@ var tripUtils = {
   GetB2BUrl(B2BDomain, ConfigId, tcid) {
     var url = "";
     if (B2BDomain) {
-      url = "http://" + B2BDomain + "/details/" +
+      url = "http://" + B2BDomain + "/#/details/" +
         encodeURIComponent(ConfigId) +
         "/" +
         tcid;

src/components/WebSet/WebSiteSearch.vue

@@ -65,7 +65,7 @@
         </el-tab-pane>
         <el-tab-pane label="供應商旅行社" name="third">
           <div class="webSiteBg">
-            <el-button :disabled="chooseTAArray.length>0?false:true" @click="setTravelagencyArea(1)">批次設定區域</el-button>
+            <el-button :disabled="chooseTAArray.length>0?false:true" @click="setTravelagencyArea(1)" style="padding-bottom:10px;">批次設定區域</el-button>
             <el-table ref="multipleTable" :data="PostMsg.TravelagencyList" tooltip-effect="dark" style="width: 100%"
               @selection-change="handleSelectionChange" height="550">
               <el-table-column type="selection" width="100px">