Skip to content

S
SuperMan
Commit 2721a048 authored by 黄奎's avatar 黄奎
Browse files
Options

配置文件修改

parent 0bb1d608
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 53 deletions
src/plug/index.js
View file @ 2721a048
......@@ -121,7 +121,7 @@ export default {
domainUrl = "http://192.168.2.214:8082"; //214主域名
domainUrl = "http://192.168.2.65:8025"; //214主域名
// domainUrl = "http://192.168.0.119:8082";
domainUrl = "http://192.168.2.16:8083";
domainUrl = "http://127.0.0.1";
// domainUrl = "http://reborn.oytour.com"
if (locationName.indexOf('oytour') !== -1) {
domainUrl = "http://reborn.oytour.com";
......@@ -312,25 +312,25 @@ export default {
if (msg == null || msg == "") {
msg = {}
}
var apiNewurl = this.domainManager().DomainUrl;
var apiNewurl = this.domainManager().PostUrl;
var timestamp = (new Date()).valueOf();
apiNewurl = apiNewurl + "/Api/Trip/" + cmd;
if (this.$route.path.toLowerCase() == "/signature") {
this.$router.push({
path: '/signature'
})
} else {
if (!localStorage.userInfo && localStorage.userInfo != "" && this.$route.path.toLowerCase() != "/login") {
if (!localStorage.userInfo && localStorage.userInfo != "" && this.$route.path.toLowerCase() != "/supplierLogin") {
this.$router.push({
path: '/login'
path: '/supplierLogin'
})
}
}
var token = "";
var key = "";
if (this.getLocalStorage() != null) {
token = this.getLocalStorage().token;
key = this.getLocalStorage().SecretKey;
if (this.getLocalStorageSupplier() != null) {
token = this.getLocalStorageSupplier().Token;
key = this.getLocalStorageSupplier().SecretKey;
}
var encodeMsg = encodeURIComponent(JSON.stringify(msg)).toLowerCase();
var md5Str = md5(`cmd=${cmd}&msg=${encodeMsg}&timestamp=${timestamp}&token=${token}&key=${key}`);
......@@ -340,7 +340,7 @@ export default {
"timestamp": timestamp,
"token": token,
"sign": md5Str,
"uid": this.getLocalStorage().EmployeeId
"uid": this.getLocalStorageSupplier()!=null?this.getLocalStorageSupplier().SupplierAccountId:0
}
this.$http.post(apiNewurl, postData, {
......@@ -352,7 +352,7 @@ export default {
.then(res => {
if (res.data.resultCode == 10000 || res.data.resultCode == 10001) {
this.$router.push({
path: '/login'
path: '/supplierLogin'
});
} else if (res.resultCode == 10005) {
this.$router.go(-1);
......
src/router/config.js
View file @ 2721a048
......@@ -698,46 +698,6 @@ export default {
title: '酒店查询统计'
},
},
{
path: '/HotelManagement2', //供应商->酒店管理
name: 'HotelManagement2',
component: resolve => require(['@/components/Supplier/HotelManagement'], resolve),
meta: {
title: '酒店管理'
},
},
{
path: '/HotelSalesBoard2', //供应商->酒店统计
name: 'HotelSalesBoard2',
component: resolve => require(['@/components/Supplier/HotelSalesBoard'], resolve),
meta: {
title: '酒店统计'
},
},
{
path: '/HotelTotalStock2', //供应商->总库存看板
name: 'HotelTotalStock2',
component: resolve => require(['@/components/Supplier/HotelTotalStock'], resolve),
meta: {
title: '总库存看板'
},
},
{
path: '/roomQuery2', //供应商->定房查询
name: 'roomQuery2',
component: resolve => require(['@/components/Supplier/roomQuery'], resolve),
meta: {
title: '定房查询'
},
},
{
path: '/HotelQueryList2', //供应商->酒店查询
name: 'HotelQueryList2',
component: resolve => require(['@/components/Supplier/HotelQueryList'], resolve),
meta: {
title: '酒店查询'
},
},
{
path: '/RestauranOrder', //餐厅订单信息
name: 'RestauranOrder',
......@@ -3408,9 +3368,54 @@ export default {
}
},
{
path: '/SupplierLogin',//供应商登录
name: 'SupplierLogin',
path: '/supplierLogin',//供应商登录
name: 'supplierLogin',
component: supplierLogin
}
},
{
path: '/supplierIndex',//供应商首页
name: 'supplierIndex',
component: supplierIndex,
children: [ {
path: '/HotelManagement2', //供应商->酒店管理
name: 'HotelManagement2',
component: resolve => require(['@/components/Supplier/HotelManagement'], resolve),
meta: {
title: '酒店管理'
},
},
{
path: '/HotelSalesBoard2', //供应商->酒店统计
name: 'HotelSalesBoard2',
component: resolve => require(['@/components/Supplier/HotelSalesBoard'], resolve),
meta: {
title: '酒店统计'
},
},
{
path: '/HotelTotalStock2', //供应商->总库存看板
name: 'HotelTotalStock2',
component: resolve => require(['@/components/Supplier/HotelTotalStock'], resolve),
meta: {
title: '总库存看板'
},
},
{
path: '/roomQuery2', //供应商->定房查询
name: 'roomQuery2',
component: resolve => require(['@/components/Supplier/roomQuery'], resolve),
meta: {
title: '定房查询'
},
},
{
path: '/HotelQueryList2', //供应商->酒店查询
name: 'HotelQueryList2',
component: resolve => require(['@/components/Supplier/HotelQueryList'], resolve),
meta: {
title: '酒店查询'
},
}]
},
]
}
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