Skip to content

S
SuperMan
Commit 132a8415 authored by 罗超's avatar 罗超
Browse files
Options

修复部分小问题

parent 5caf91e7
Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 38 deletions
src/components/champion/mycareer.vue
View file @ 132a8415
...@@ -430,7 +430,7 @@ export default { ...@@ -430,7 +430,7 @@ export default {
} }
.mycareer .uer-box .my-score .item .v { .mycareer .uer-box .my-score .item .v {
font-family: pingfangR; font-family: pingfangR;
font-size: 32px; font-size: 31px;
color: rgba(255, 255, 255, 1); color: rgba(255, 255, 255, 1);
background: linear-gradient( background: linear-gradient(
0deg, 0deg,
......
src/components/index.vue
View file @ 132a8415
...@@ -41,7 +41,10 @@ ...@@ -41,7 +41,10 @@
</span> </span>
<el-dropdown-menu slot="dropdown" class="_dropdown _more_dropdown"> <el-dropdown-menu slot="dropdown" class="_dropdown _more_dropdown">
<el-dropdown-item class="clearfix _dropdown_other" v-for="(item,index) in menuList" :key="index" v-if="item.MenuUrl!='' && index>maxLength" @click.native="goUrl(item.MenuUrl,item.MenuId,index)"> <el-dropdown-item class="clearfix _dropdown_other" v-for="(item,index) in menuList" :key="index" v-if="item.MenuUrl!='' && index>maxLength" @click.native="goUrl(item.MenuUrl,item.MenuId,index)">
<a target="_blank" style="color:#a6adb4;"> <a target="_blank" style="color:#a6adb4;" v-if="item.MenuUrl.indexOf('http://')==-1">
<i :class="[fontPub,item.icon]"></i>{{item.MenuName}}
</a>
<a target="_blank" style="color:#a6adb4;" v-else :href="item.MenuUrl">
<i :class="[fontPub,item.icon]"></i>{{item.MenuName}} <i :class="[fontPub,item.icon]"></i>{{item.MenuName}}
</a> </a>
</el-dropdown-item> </el-dropdown-item>
...@@ -50,11 +53,11 @@ ...@@ -50,11 +53,11 @@
<i class="iconfont icon-menu-zhishiquan"></i>知识圈 <i class="iconfont icon-menu-zhishiquan"></i>知识圈
</a> </a>
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item class="clearfix _dropdown_other" v-if='firstMenuList.indexOf("统计平台")!==-1'> <!-- <el-dropdown-item class="clearfix _dropdown_other" v-if='firstMenuList.indexOf("统计平台")!==-1'>
<a href="http://data.oytour.com" target="_blank" style="color:#a6adb4;"> <a href="http://data.oytour.com" target="_blank" style="color:#a6adb4;">
<i class="iconfont icon-tongji2"></i>统计平台 <i class="iconfont icon-tongji2"></i>统计平台
</a> </a>
</el-dropdown-item> </el-dropdown-item> -->
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</li> </li>
...@@ -3254,29 +3257,31 @@ export default { ...@@ -3254,29 +3257,31 @@ export default {
this.displayNone = true; this.displayNone = true;
}, },
goUrl(url, id, index) { goUrl(url, id, index) {
if(url=='/JapanHotel'){ if(url.indexOf("http://")==-1){
let userInfo = this.getLocalStorage(); if(url=='/JapanHotel'){
let msg = { let userInfo = this.getLocalStorage();
id:userInfo.EmployeeId let msg = {
} id:userInfo.EmployeeId
this.apipost("sellorder_post_GetDesEncrypt",msg,res => {
if (res.data.resultCode == 1) {
this.EnCodeWord=res.data.data;
window.open("http://www.oytour.com/#/hotelHome?uid="+encodeURIComponent(this.EnCodeWord), "_blank");
} else {
this.Error(res.data.message);
} }
}, this.apipost("sellorder_post_GetDesEncrypt",msg,res => {
err => {} if (res.data.resultCode == 1) {
); this.EnCodeWord=res.data.data;
}else{ window.open("http://www.oytour.com/#/hotelHome?uid="+encodeURIComponent(this.EnCodeWord), "_blank");
this.chosenIndex = id; } else {
if(localStorage.openMode && localStorage.openMode==1) this.Error(res.data.message);
this.$router.push({ path: url ,query:{blank:'y'}}); }
else },
this.$router.push({ path: url ,query:{}}); err => {}
);
} else{
this.chosenIndex = id;
if(localStorage.openMode && localStorage.openMode==1)
this.$router.push({ path: url ,query:{blank:'y'}});
else
this.$router.push({ path: url ,query:{}});
} }
}
}, },
goUrlT(url, index, name) { goUrlT(url, index, name) {
let query={ let query={
......
src/router/config.js
View file @ 132a8415
...@@ -1027,7 +1027,7 @@ export default { ...@@ -1027,7 +1027,7 @@ export default {
title: '未认款信息' title: '未认款信息'
}, },
}, },
{ {
path: '/transportCostsManagement', //联运成本管理 path: '/transportCostsManagement', //联运成本管理
name: 'transportCostsManagement', name: 'transportCostsManagement',
...@@ -1884,14 +1884,14 @@ export default { ...@@ -1884,14 +1884,14 @@ export default {
meta: { meta: {
title: '散卖酒店订单' title: '散卖酒店订单'
}, },
},{ }, {
path: '/HotelOrderTotal', //操作 散卖酒店订单统计 path: '/HotelOrderTotal', //操作 散卖酒店订单统计
name: 'HotelOrderTotal', name: 'HotelOrderTotal',
component: resolve => require(['@/components/TravelManager/TravelList/HotelOrderTotal'], resolve), component: resolve => require(['@/components/TravelManager/TravelList/HotelOrderTotal'], resolve),
meta: { meta: {
title: '散卖酒店订单统计' title: '散卖酒店订单统计'
}, },
},{ }, {
path: '/AmoebaDetail', //阿米巴结算详情 path: '/AmoebaDetail', //阿米巴结算详情
name: 'AmoebaDetail', name: 'AmoebaDetail',
component: resolve => require(['@/components/TravelManager/TravelList/AmoebaDetail'], resolve), component: resolve => require(['@/components/TravelManager/TravelList/AmoebaDetail'], resolve),
...@@ -2022,7 +2022,7 @@ export default { ...@@ -2022,7 +2022,7 @@ export default {
title: '客户分析' title: '客户分析'
}, },
}, },
{ // 销售 客户转交 { // 销售 客户转交
path: '/customerTransfer', path: '/customerTransfer',
name: 'customerTransfer', name: 'customerTransfer',
...@@ -2067,7 +2067,7 @@ export default { ...@@ -2067,7 +2067,7 @@ export default {
meta: { meta: {
title: '返佣查询' title: '返佣查询'
}, },
}, },
{ // 销售 返佣比例管理 { // 销售 返佣比例管理
path: '/Returnratio', path: '/Returnratio',
name: 'Returnratio', name: 'Returnratio',
...@@ -2075,7 +2075,7 @@ export default { ...@@ -2075,7 +2075,7 @@ export default {
meta: { meta: {
title: '返佣比例管理' title: '返佣比例管理'
}, },
},{ // 销售 统计 }, { // 销售 统计
path: '/demandStatistics', path: '/demandStatistics',
name: 'demandStatistics', name: 'demandStatistics',
component: resolve => require(['@/components/SalesModule/demandStatistics'], resolve), component: resolve => require(['@/components/SalesModule/demandStatistics'], resolve),
...@@ -2424,7 +2424,7 @@ export default { ...@@ -2424,7 +2424,7 @@ export default {
meta: { meta: {
title: '散卖酒店订单' title: '散卖酒店订单'
}, },
}, },
{ // 销售 报名统计 { // 销售 报名统计
path: '/enrollTotal', path: '/enrollTotal',
name: 'enrollTotal', name: 'enrollTotal',
...@@ -2498,7 +2498,7 @@ export default { ...@@ -2498,7 +2498,7 @@ export default {
} }
}, },
{ {
path: '/ElectronicContract', //合同预览 path: '/ElectronicContract', //合同预览
name: 'ElectronicContract', name: 'ElectronicContract',
component: resolve => require(['@/components/Contract/ElectronicContract'], resolve), component: resolve => require(['@/components/Contract/ElectronicContract'], resolve),
meta: { meta: {
...@@ -2724,7 +2724,7 @@ export default { ...@@ -2724,7 +2724,7 @@ export default {
meta: { meta: {
title: '线控配置' title: '线控配置'
}, },
}, },
{ //财务 机票分摊比例 { //财务 机票分摊比例
path: '/AirTicketApp', path: '/AirTicketApp',
name: 'AirTicketApp', name: 'AirTicketApp',
...@@ -2732,7 +2732,7 @@ export default { ...@@ -2732,7 +2732,7 @@ export default {
meta: { meta: {
title: '机票分摊比例' title: '机票分摊比例'
}, },
},{ //财务 资金调拨 新增 }, { //财务 资金调拨 新增
path: '/addCapitalAllocation', path: '/addCapitalAllocation',
name: 'addCapitalAllocation', name: 'addCapitalAllocation',
component: resolve => require(['@/components/FinancialModule/addCapitalAllocation'], resolve), component: resolve => require(['@/components/FinancialModule/addCapitalAllocation'], resolve),
...@@ -3215,7 +3215,7 @@ export default { ...@@ -3215,7 +3215,7 @@ export default {
meta: { meta: {
title: '收损订单' title: '收损订单'
}, },
},{ // 签证 个签办理 }, { // 签证 个签办理
path: '/signatureHandle', path: '/signatureHandle',
name: 'signatureHandle', name: 'signatureHandle',
component: resolve => require(['@/components/SalesVisa/signatureHandle'], resolve), component: resolve => require(['@/components/SalesVisa/signatureHandle'], resolve),
...@@ -3782,7 +3782,7 @@ export default { ...@@ -3782,7 +3782,7 @@ export default {
title: '票务规则配置' title: '票务规则配置'
} }
}, },
] ]
}, },
{ {
...@@ -3810,6 +3810,14 @@ export default { ...@@ -3810,6 +3810,14 @@ export default {
meta: { meta: {
title: '个人中心' title: '个人中心'
} }
},
{
path: '/magic', //供应商一级页面
name: 'magic',
component: resolve => require(['@/components/magic'], resolve),
meta: {
title: '统计中心'
}
} }
] ]
}, },
...@@ -3837,7 +3845,7 @@ export default { ...@@ -3837,7 +3845,7 @@ export default {
} }
}, },
{ {
path:'/TravelContractNew', //新电子合同 path: '/TravelContractNew', //新电子合同
name: 'TravelContractNew', name: 'TravelContractNew',
component: resolve => require(['@/components/TravelContractNew'], resolve), component: resolve => require(['@/components/TravelContractNew'], resolve),
meta: { meta: {
...@@ -3845,7 +3853,7 @@ export default { ...@@ -3845,7 +3853,7 @@ export default {
} }
}, },
{ {
path:'/TravelContractDetail', //新电子合同详情 path: '/TravelContractDetail', //新电子合同详情
name: 'TravelContractDetail', name: 'TravelContractDetail',
component: resolve => require(['@/components/TravelContractDetail'], resolve), component: resolve => require(['@/components/TravelContractDetail'], resolve),
meta: { meta: {
......
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