Merge branch 'master' of http://101.37.147.115:3000/bocaigroup/daotian_pc

* 'master' of http://101.37.147.115:3000/bocaigroup/daotian_pc:
  职位详情联系客服显示

# Conflicts:
#	src/utils/request.js

src/components/FirstJob/detail.vue

@@ -167,7 +167,7 @@
 								<span>{{ jobDetail.servetype }}</span>
 							</div>
 						</div>
-						<div class="sub-bottombox">
+						<div class="sub-bottombox fss">
 							<button type="primary" class="jobDespBtn">
 								<a :href="customServiceUrl" target="_blank"> <i class="iconfont icon-kefu_lan mr6"></i>联系客服</a>
 							</button>

src/utils/request.js

@@ -4,6 +4,7 @@ import Cookies from "js-cookie";
 import qs from "qs";
 
 // import Vue from "vue";
+// const baseURL = "http://1shoudan.com"; // 正式环境线上 废弃
 // const baseURL = "//idaotian.com"; // 正式环境线上
 const baseURL = "//test.renminshitang.com.cn/daotian/api_dev"; // 测试环境本地
 // const baseURL = "//idagou.cn"; // 正式环境线上 废弃