Commit 5d3f481b authored by 黄奎's avatar 黄奎

页面修改

parent cfe99384
...@@ -107,11 +107,13 @@ ...@@ -107,11 +107,13 @@
<li style="width:65px;height:50px;line-height: 50px;padding: 0;font-size: 15px;font-family: pingfangR;" <li style="width:65px;height:50px;line-height: 50px;padding: 0;font-size: 15px;font-family: pingfangR;"
v-if="isShowMore"> v-if="isShowMore">
<el-dropdown trigger="hover"> <el-dropdown trigger="hover">
<span v-if="!useRed" class="el-dropdown-link" style="cursor: pointer;display: block;height: 100%;width: 100%;"> <span v-if="!useRed" class="el-dropdown-link"
style="cursor: pointer;display: block;height: 100%;width: 100%;">
<span style="color: #a6adb4;"><i class="iconfont icon-biaoge" <span style="color: #a6adb4;"><i class="iconfont icon-biaoge"
style="margin-right: 5px;font-size:13px"></i>更多</span> style="margin-right: 5px;font-size:13px"></i>更多</span>
</span> </span>
<span v-if="useRed" class="el-dropdown-link" style="cursor: pointer;display: block;height: 100%;width: 100%;"> <span v-if="useRed" class="el-dropdown-link"
style="cursor: pointer;display: block;height: 100%;width: 100%;">
<span style="color: #FFF;font-size:15px"><i class="iconfont icon-biaoge" <span style="color: #FFF;font-size:15px"><i class="iconfont icon-biaoge"
style="margin-right: 5px;font-size:12px"></i>更多</span> style="margin-right: 5px;font-size:12px"></i>更多</span>
</span> </span>
...@@ -229,7 +231,8 @@ ...@@ -229,7 +231,8 @@
@click="IM_bodyIsShow=!IM_bodyIsShow,IM_navType=1"></i> @click="IM_bodyIsShow=!IM_bodyIsShow,IM_navType=1"></i>
</li> </li>
<li><i class="iconfont icon-banbengengxin" @click="goUrlLog()"></i></li> <li><i class="iconfont icon-banbengengxin" @click="goUrlLog()"></i></li>
<li v-if="!useRed"><i class="iconfont icon-gonggao" @click="IM_bodyIsShow=!IM_bodyIsShow, IM_navType=52"></i></li> <li v-if="!useRed"><i class="iconfont icon-gonggao" @click="IM_bodyIsShow=!IM_bodyIsShow, IM_navType=52"></i>
</li>
<li> <li>
<el-dropdown trigger="click"> <el-dropdown trigger="click">
<span class="el-dropdown-link"> <span class="el-dropdown-link">
...@@ -251,7 +254,8 @@ ...@@ -251,7 +254,8 @@
<i @click="downmz=!downmz" class="el-icon-download"></i> <i @click="downmz=!downmz" class="el-icon-download"></i>
</li> </li>
<li> <li>
<a :href="`http://${b2bDomain}`" target="_blank" v-if="b2bDomain && b2bDomain!=''" style="color:#FFF">前往前台</a> <a :href="`http://${b2bDomain}`" target="_blank" v-if="b2bDomain && b2bDomain!=''"
style="color:#FFF">前往前台</a>
<a href="javascript:alert('未開通B2B前端系統,請您聯繫業務員')" v-else style="color:#FFF">前往前台</a> <a href="javascript:alert('未開通B2B前端系統,請您聯繫業務員')" v-else style="color:#FFF">前往前台</a>
</li> </li>
</ul> </ul>
...@@ -380,7 +384,8 @@ ...@@ -380,7 +384,8 @@
<div class='IM_contacts contact-box' v-show="IM_navType==2 && searchList.length===0"> <div class='IM_contacts contact-box' v-show="IM_navType==2 && searchList.length===0">
<div class="contacts-type-box"> <div class="contacts-type-box">
<div class="contacts-type-item" :class="{active:contactsType==0}" @click="changeContactGroup(0)">同事</div> <div class="contacts-type-item" :class="{active:contactsType==0}" @click="changeContactGroup(0)">同事</div>
<div class="contacts-type-item" :class="{active:contactsType==1}" @click="changeContactGroup(1)" v-if="!useRed">群聊</div> <div class="contacts-type-item" :class="{active:contactsType==1}" @click="changeContactGroup(1)"
v-if="!useRed">群聊</div>
<el-tooltip effect="dark" content="新建群聊" placement="top-start"> <el-tooltip effect="dark" content="新建群聊" placement="top-start">
<i class="plus iconfont icon-img_jiahao_big" v-if="contactsType==1" @click="createGroup"></i> <i class="plus iconfont icon-img_jiahao_big" v-if="contactsType==1" @click="createGroup"></i>
</el-tooltip> </el-tooltip>
...@@ -1215,8 +1220,8 @@ ...@@ -1215,8 +1220,8 @@
}, },
data() { data() {
return { return {
b2bDomain:"", b2bDomain: "",
useRed:false, useRed: false,
//提成账单弹窗 //提成账单弹窗
commissionDialog: false, commissionDialog: false,
//判断显示哪个组件 //判断显示哪个组件
...@@ -1736,9 +1741,9 @@ ...@@ -1736,9 +1741,9 @@
} else { } else {
this.isShowMore = false this.isShowMore = false
} }
this.b2bDomain=this.userInfo.B2BDomain this.b2bDomain = this.userInfo.B2BDomain
this.useRed=(this.userInfo.ThemeType?this.userInfo.ThemeType:0)==1 this.useRed = (this.userInfo.ThemeType ? this.userInfo.ThemeType : 0) == 1
this.MsgBus.$emit("changeTheme",this.useRed) this.MsgBus.$emit("changeTheme", this.useRed)
document.title = this.userInfo.GroupName document.title = this.userInfo.GroupName
if (this.userInfo.Icon != null) { if (this.userInfo.Icon != null) {
this.userInfo.UserPhoto = this.userInfo.Icon; this.userInfo.UserPhoto = this.userInfo.Icon;
...@@ -1835,6 +1840,7 @@ ...@@ -1835,6 +1840,7 @@
this.allWindowWidth = allWindowWidth - 50 - 220 - 60; this.allWindowWidth = allWindowWidth - 50 - 220 - 60;
let maxLength = parseInt(allWindowWidth / 110); let maxLength = parseInt(allWindowWidth / 110);
this.maxLength = maxLength; this.maxLength = maxLength;
this.testApi();
}, },
watch: { watch: {
filterText(val) { filterText(val) {
...@@ -1842,6 +1848,21 @@ ...@@ -1842,6 +1848,21 @@
} }
}, },
methods: { methods: {
testApi() {
this.apipost(
"sellorder_post_GetMiniAppTravelOrderList", {
"MiniAppUserId": 113859,
pageIndex:1,
pageSize:5,
},
res => {
console.log("res",res.data);
if (res.data.resultCode == 1) {
}
}
);
},
GetSupperOrderEditAuth() { GetSupperOrderEditAuth() {
var actiionContract = this.$AuthCode.F_ContractManagement; var actiionContract = this.$AuthCode.F_ContractManagement;
var F_Finance_CreateCode = this.$AuthCode.F_Finance_Create; var F_Finance_CreateCode = this.$AuthCode.F_Finance_Create;
...@@ -4539,10 +4560,12 @@ ...@@ -4539,10 +4560,12 @@
.min-width(1366px); .min-width(1366px);
background: #1f1e2e; background: #1f1e2e;
} }
.red-theme .nav{
.red-theme .nav {
.size(100%, 58px); .size(100%, 58px);
background:linear-gradient(270deg,rgba(244,92,67,1),rgba(235,51,73,1)); background: linear-gradient(270deg, rgba(244, 92, 67, 1), rgba(235, 51, 73, 1));
} }
.nav-left { .nav-left {
width: 56px; width: 56px;
color: #e73828; color: #e73828;
...@@ -4584,7 +4607,7 @@ ...@@ -4584,7 +4607,7 @@
display: flex; display: flex;
} }
.red-theme .nav .nav-middle{ .red-theme .nav .nav-middle {
align-items: center; align-items: center;
} }
...@@ -4607,14 +4630,17 @@ ...@@ -4607,14 +4630,17 @@
z-index: 2019128; z-index: 2019128;
cursor: pointer; cursor: pointer;
} }
.red-theme .nav .nav-middle ul li{
color:#fff; .red-theme .nav .nav-middle ul li {
padding:14px 10px; color: #fff;
padding: 14px 10px;
} }
.red-theme .nav .nav-middle ul li i{
color:#fff; .red-theme .nav .nav-middle ul li i {
color: #fff;
font-size: 0px; font-size: 0px;
} }
.nav-middle ul li i { .nav-middle ul li i {
font-size: 16px; font-size: 16px;
color: #a6adb4; color: #a6adb4;
...@@ -4654,9 +4680,11 @@ ...@@ -4654,9 +4680,11 @@
overflow: hidden; overflow: hidden;
box-shadow: 0px 0px 50px 0px rgba(82, 63, 105, 0.15); box-shadow: 0px 0px 50px 0px rgba(82, 63, 105, 0.15);
} }
.red-theme .nav-middle ul li .menuList_son{
.red-theme .nav-middle ul li .menuList_son {
top: 58px; top: 58px;
} }
.menuList_tittle_box { .menuList_tittle_box {
line-height: 30px; line-height: 30px;
} }
...@@ -4669,9 +4697,11 @@ ...@@ -4669,9 +4697,11 @@
padding: 9px 10px; padding: 9px 10px;
font-family: "pingfangR"; font-family: "pingfangR";
} }
.red-theme .menuList_son_one_tittle{
.red-theme .menuList_son_one_tittle {
color: #333; color: #333;
} }
.menuList_son_two_tittle { .menuList_son_two_tittle {
color: #a1aad0; color: #a1aad0;
text-align: left; text-align: left;
...@@ -4723,15 +4753,17 @@ ...@@ -4723,15 +4753,17 @@
left: 0; left: 0;
bottom: -2px; bottom: -2px;
} }
.red-theme .nav .hoverNote{
background:#f5f5f5; .red-theme .nav .hoverNote {
background: #f5f5f5;
border-radius: 2px; border-radius: 2px;
} }
.nav-middle ul li:hover { .nav-middle ul li:hover {
background-color: #232337; background-color: #232337;
} }
.red-theme .nav .nav-middle ul li:hover { .red-theme .nav .nav-middle ul li:hover {
background-color: #c1272d; background-color: #c1272d;
} }
...@@ -4750,10 +4782,12 @@ ...@@ -4750,10 +4782,12 @@
font-size: 15px; font-size: 15px;
font-family: 'pingfangR'; font-family: 'pingfangR';
} }
.red-theme .nav .big_tittle{
font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji,MicrosoftJhengHeiBoldFix,"\5FAE\8EDF\6B63\9ED1\9AD4",Microsoft JhengHei; .red-theme .nav .big_tittle {
font-size:16px; font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Helvetica Neue, Arial, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol, Noto Color Emoji, MicrosoftJhengHeiBoldFix, "\5FAE\8EDF\6B63\9ED1\9AD4", Microsoft JhengHei;
font-size: 16px;
} }
.nav-middle ul li.active .big_tittle { .nav-middle ul li.active .big_tittle {
color: #ffffff; color: #ffffff;
cursor: pointer; cursor: pointer;
...@@ -4768,43 +4802,54 @@ ...@@ -4768,43 +4802,54 @@
position: absolute; position: absolute;
right: 0; right: 0;
} }
.red-theme .nav-right{
.red-theme .nav-right {
width: unset; width: unset;
} }
.nav-right ul { .nav-right ul {
display: flex; display: flex;
line-height: 50px; line-height: 50px;
justify-content: flex-end; justify-content: flex-end;
} }
.red-theme .nav .nav-right ul{
.red-theme .nav .nav-right ul {
line-height: 58px; line-height: 58px;
} }
.nav-right ul li { .nav-right ul li {
height: 50px; height: 50px;
margin-right: 20px; margin-right: 20px;
text-align: center; text-align: center;
justify-content: flex-end; justify-content: flex-end;
} }
.red-theme .nav .nav-right ul li{
.red-theme .nav .nav-right ul li {
height: 58px; height: 58px;
} }
.red-theme .nav .nav-right ul li i {
.red-theme .nav .nav-right ul li i {
color: #fff; color: #fff;
} }
.nav-right ul li i { .nav-right ul li i {
cursor: pointer; cursor: pointer;
.fz(18px); .fz(18px);
color: #e4e4e4; color: #e4e4e4;
} }
.red-theme .nav .nav-right ul li i:hover {
.red-theme .nav .nav-right ul li i:hover {
color: #e4e4e4; color: #e4e4e4;
} }
.nav-right ul li i:hover { .nav-right ul li i:hover {
color: #999; color: #999;
} }
.red-theme .nav .nav-right ul li i.red{
color:#FFF !important; .red-theme .nav .nav-right ul li i.red {
color: #FFF !important;
} }
.hide { .hide {
display: none; display: none;
} }
...@@ -4889,11 +4934,11 @@ ...@@ -4889,11 +4934,11 @@
/* Opera */ /* Opera */
} }
.red-theme .nav .animation::before { .red-theme .nav .animation::before {
color: #FFF; color: #FFF;
} }
#message_box .content { #message_box .content {
width: 350px; width: 350px;
...@@ -5054,7 +5099,10 @@ ...@@ -5054,7 +5099,10 @@
left: 0px; left: 0px;
right: 0px; right: 0px;
} }
.red-theme .temDivs {top:58px;}
.red-theme .temDivs {
top: 58px;
}
.red { .red {
color: #e95252 !important; color: #e95252 !important;
......
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