Commit 82765151 authored by 黄奎's avatar 黄奎

页面修改

parent 1d25f131
......@@ -120,10 +120,10 @@ export default {
let crmUrl = ""; //crm API
let locationName = window.location.hostname;
let isOnline = 0; //0-本地测试,1-线上
let ocrUrl = "http://192.168.10.68:8888";
let ocrUrl = "http://192.168.10.214:8140";
// domainUrl = "http://192.168.10.238:8083"; // 刘东电脑
// domainUrl = "http://192.168.10.226"; //春姐
domainUrl = "http://192.168.10.160"; //奎哥
domainUrl = "http://192.168.10.68"; //奎哥
let crmLocalFileStreamDownLoadUrl = "";
crmLocalFileStreamDownLoadUrl = locationName.indexOf('oytour') !== -1 ? "http://crm.oytour.com" : "http://testcrm.oytour.com";
......@@ -262,6 +262,7 @@ export default {
this.$route.name.indexOf('confirmationOrderDownLoadNew') === -1 && this.$route.name.indexOf('PrintPage') === -1 &&
this.$route.name.indexOf('TravelContractConfirm') === -1 && this.$route.name.indexOf('ViittoContractConfirm') === -1 &&
this.$route.name.indexOf('OrderProfitLossList') === -1 && this.$route.name.indexOf('clientProtocol') === -1
&& this.$route.name.indexOf('clientDisclaimerProtocol')===-1
) {
let previousPathInfo = {
path: this.$route.name,
......@@ -279,7 +280,6 @@ export default {
}
var timestamp = (new Date()).valueOf();
this.apiurl = apiurl;
if (this.$route.path.toLowerCase() == "/signature") {
this.$router.push({
path: '/signature'
......@@ -327,7 +327,22 @@ export default {
guestId: guestId,
}
})
} else if (this.$route.path == "/TravelContractConfirm") {
}
else if(this.$route.path=="/clientDisclaimerProtocol")
{
let TCID = this.$route.query.TCID;
let OrderId = this.$route.query.OrderId;
let GuestId = this.$route.query.GuestId;
this.$router.push({
name: "clientDisclaimerProtocol",
query: {
TCID: TCID,
OrderId: OrderId,
GuestId: GuestId,
}
})
}
else if (this.$route.path == "/TravelContractConfirm") {
let ContractId = this.$route.query.ContractId;
this.$router.push({
name: "TravelContractConfirm",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment