Skip to content

S
SuperMan
Commit b0023773 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents 2e5095ec f0bbd5cc
Hide whitespace changes
Inline Side-by-side
Showing with 359 additions and 280 deletions
src/components/SalesModule/groupTourOrder.vue
View file @ b0023773
......@@ -1260,7 +1260,7 @@
<!-- 申请优惠-->
<div class="productQuerybottomLayer ownScrollbarStyle" v-show="SpecialOffer"
style="height: 150px;min-height:200px;">
<p>{{$t('salesModule.ApplyYH')}}
<p>{{$t('pub.ApplyYH')}}
<span class="fr">
<input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')" @click="cancelSubmitRemarks()" />
<input type="button" class="normalBtn" :value="$t('pub.saveBtn')" @click="Preservation()" />
......@@ -1270,7 +1270,7 @@
<el-row :gutter="20">
<el-col :span="24">
<el-form-item>
<em style="font-size: 12px !important;color: #606266;line-height: 34px">{{$t('salesModule.NowPrice')}}</em>
<em style="font-size: 12px !important;color: #606266;line-height: 34px">{{$t('pub.NowPrice')}}</em>
<em
style=" display: inline-block;padding: 0 10px;height: 34px;line-height: 34px;text-align: left;font-size: 16px;border-radius: 3px;background-color: #E5E5E5;vertical-align: top;"
class='w150'>{{SOMsg.OrderUnitPrice}}</em>
......
src/components/index.vue
View file @ b0023773
......@@ -191,7 +191,7 @@
合同管理
<i class="iconfont icon-right1"></i>
</el-dropdown-item>
<el-dropdown-item class="clearfix _dropdown_other" @click.native="goUrlZC()">
<el-dropdown-item class="clearfix _dropdown_other" @click.native="goUrlZC()" v-if="qjGroupId==userInfo.RB_Group_id">
<i class="iconfont icon-Newspaper" style="color:#f39c12"></i>
资产管理
<i class="iconfont icon-right1"></i>
......@@ -847,7 +847,7 @@
<div style="width: 100%; height: 50px;"></div>
</div>
</div>
<div class="logsBack" v-if="logsShow">
<div class="logsBack" v-if="logsShow&&isShowMore">
<div class="updateLogs">
<img src="../assets/img/logsImg.png" alt="" class="logsImg" />
<div class="logsTitle">
......@@ -1103,7 +1103,7 @@
</el-dialog>
<div v-show="mazip==0" id="downzip">
<div v-show="mazip==0&&isShowMore" id="downzip">
<div>
<div>
<a href="http://im.oytour.com/麦子助手.exe">
......@@ -1117,7 +1117,7 @@
<a id='groupTourOrderByTuan_DownLoad' target="_blank" style="display:none"></a>
<!-- 投诉 -->
<div class="tsDiv" v-if="tsState">
<div class="tsDiv" v-if="tsState&&isShowMore">
<div class="tsContent">
<div style="width:100%;height:372px;position:relative">
<p style="text-align:center;font-size:14px;z-index:100;">投诉案例</p>
......@@ -1839,7 +1839,9 @@ export default {
}
}
if (!rep) {
this.saleRnkShow = true
if(this.isShowMore){
this.saleRnkShow = true
}
arr.push(this.NewSaleRnkInfo.StartDateMonth + this.NewSaleRnkInfo.StartDateDay)
}
localStorage.saleRnkInfo = JSON.stringify(arr)
......
src/components/personalCenter/index.vue
View file @ b0023773
......@@ -82,7 +82,9 @@
</tbody>
</table>
</div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryCommonData.pageIndex" layout="total,prev, pager, next, jumper" :page-size="queryCommonData.pageSize" :total="queryCommonData.total" v-if="queryCommonData.total>6"></el-pagination>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryCommonData.pageIndex"
layout="total,prev, pager, next, jumper" :page-size="queryCommonData.pageSize"
:total="queryCommonData.total" v-if="queryCommonData.total>6"></el-pagination>
</div>
<!-- 未认款 -->
<el-row :gutter="20">
......@@ -154,7 +156,7 @@
<div class="r-box">
<div class="sell">
<div class="title">本周销冠</div>
<i class="more iconfont icon-gengduo1 white" title="查看往期排行" @click="openRank"></i>
<i class="more iconfont icon-gengduo1 white" title="查看往期排行" v-if="CurrentUserInfo.RB_Group_id==2" @click="openRank"></i>
<sell :champion="result.orderRankList"></sell>
</div>
<div class="todayOpera">
......@@ -178,163 +180,180 @@
</div>
</template>
<script>
import fince from "./fince";
import myorder from "./myorder";
import todayOpera from "./todayOpera";
import pingtai from "./pingtai";
import cloud from "./cloud";
import imbox from "./imbox";
import gonggao from "./gonggao";
import notice from "./notice";
import sell from "./sell";
import newpersonal from "./newpersonal";
import tousu from "./tousu";
export default {
import fince from "./fince";
import myorder from "./myorder";
import todayOpera from "./todayOpera";
import pingtai from "./pingtai";
import cloud from "./cloud";
import imbox from "./imbox";
import gonggao from "./gonggao";
import notice from "./notice";
import sell from "./sell";
import newpersonal from "./newpersonal";
import tousu from "./tousu";
export default {
data() {
return {
defaultHeadImg: `this.src="${require("../../assets/img/default_head_img.jpg")}"`,
zoomW: 0,
choseNoticeType: 0,
queryCommonData: {
pageSize: 6,
total: 0,
pageIndex: 1
},
result: null,
orders: [],
pageLoading: false,
RLoading: false
};
return {
defaultHeadImg: `this.src="${require("../../assets/img/default_head_img.jpg")}"`,
zoomW: 0,
choseNoticeType: 0,
queryCommonData: {
pageSize: 6,
total: 0,
pageIndex: 1
},
result: null,
orders: [],
pageLoading: false,
RLoading: false,
CurrentUserInfo: {},
};
},
components: {
fince,
myorder,
todayOpera,
pingtai,
cloud,
imbox,
gonggao,
notice,
sell,
newpersonal,
tousu
fince,
myorder,
todayOpera,
pingtai,
cloud,
imbox,
gonggao,
notice,
sell,
newpersonal,
tousu
},
filters: {
PNumber(val) {
if (val) {
return val.substr(0, 4) + "****" + val.substr(-4, 4);
}
},
MoneyMu(val) {
if (val) {
val = val.toFixed(2);
let arr = val.split(".");
let length = arr[0].length;
if (length < 3) {
return val;
} else {
let str = "*************************";
return val.substr(0, 2) + str.substr(0, length - 2) + ".**";
}
} else {
return val;
}
PNumber(val) {
if (val) {
return val.substr(0, 4) + "****" + val.substr(-4, 4);
}
},
MoneyMu(val) {
if (val) {
val = val.toFixed(2);
let arr = val.split(".");
let length = arr[0].length;
if (length < 3) {
return val;
} else {
let str = "*************************";
return val.substr(0, 2) + str.substr(0, length - 2) + ".**";
}
} else {
return val;
}
}
},
mounted() {
this.zoomW = (document.documentElement.clientWidth / 1920).toFixed(2);
this.init();
this.queryOrder();
this.getList();
this.CurrentUserInfo = this.getLocalStorage();
this.zoomW = (document.documentElement.clientWidth / 1920).toFixed(2);
this.init();
this.queryOrder();
this.getList();
},
methods: {
openAllMan(id) {
const { href } = this.$router.resolve({ path: "/Maninfo" });
window.open(href, "_blank");
},
openRank() {
const { href } = this.$router.resolve({ path: "/saleRnkBefore" });
window.open(href, "_blank");
},
getList() {
let msg = {
pageIndex: 1,
pageSize: 6,
StartTime: "",
EndTime: "",
BankAccountId: "",
Remitter: "",
SIncome: "",
EIncome: "",
SRefund: "",
ERefund: "",
AccountName: "",
Type: -1
};
this.RLoading = true;
this.apipost(
"Financial_post_GetFinanceRemittanceClaimPageList",
msg,
res => {
this.RLoading = false;
if (res.data.resultCode == 1) {
this.rList = res.data.data.pageData;
} else {
this.Error(res.data.message);
}
},
err => {}
);
},
handleCurrentChange(index) {
this.queryCommonData.pageIndex = index;
this.queryOrder();
},
changeNoticeType(t) {
this.choseNoticeType = t;
},
init() {
this.apipost("customerIndex_post_GetPersonalCenter", {}, r => {
this.result = r.data.data;
if (this.result) {
this.result.totalFinancePrice = 0;
this.result.financeWeekList.forEach(x => {
this.result.totalFinancePrice += x.preferPrice;
});
}
});
},
queryOrder() {
this.pageLoading = true;
this.apipost(
"customerIndex_post_GetPersonalCenterOrder",
this.queryCommonData,
r => {
this.orders = r.data.data.pageData;
this.queryCommonData.total = r.data.data.count;
this.pageLoading = false;
}
);
},
openOrders(id) {
let query = {
id
};
const { href } = this.$router.resolve({
path: "/groupTourOrder",
query
openAllMan(id) {
const {
href
} = this.$router.resolve({
path: "/Maninfo"
});
window.open(href, "_blank");
},
openRank() {
const {
href
} = this.$router.resolve({
path: "/saleRnkBefore"
});
window.open(href, "_blank");
},
getList() {
let msg = {
pageIndex: 1,
pageSize: 6,
StartTime: "",
EndTime: "",
BankAccountId: "",
Remitter: "",
SIncome: "",
EIncome: "",
SRefund: "",
ERefund: "",
AccountName: "",
Type: -1
};
this.RLoading = true;
this.apipost(
"Financial_post_GetFinanceRemittanceClaimPageList",
msg,
res => {
this.RLoading = false;
if (res.data.resultCode == 1) {
this.rList = res.data.data.pageData;
} else {
this.Error(res.data.message);
}
},
err => {}
);
},
handleCurrentChange(index) {
this.queryCommonData.pageIndex = index;
this.queryOrder();
},
changeNoticeType(t) {
this.choseNoticeType = t;
},
init() {
this.apipost("customerIndex_post_GetPersonalCenter", {}, r => {
this.result = r.data.data;
if (this.result) {
this.result.totalFinancePrice = 0;
this.result.financeWeekList.forEach(x => {
this.result.totalFinancePrice += x.preferPrice;
});
window.open(href, "_blank");
},
openAllOrders(id) {
const { href } = this.$router.resolve({ path: "/groupTourOrder" });
window.open(href, "_blank");
}
}
});
},
queryOrder() {
this.pageLoading = true;
this.apipost(
"customerIndex_post_GetPersonalCenterOrder",
this.queryCommonData,
r => {
this.orders = r.data.data.pageData;
this.queryCommonData.total = r.data.data.count;
this.pageLoading = false;
}
);
},
openOrders(id) {
let query = {
id
};
const {
href
} = this.$router.resolve({
path: "/groupTourOrder",
query
});
window.open(href, "_blank");
},
openAllOrders(id) {
const {
href
} = this.$router.resolve({
path: "/groupTourOrder"
});
window.open(href, "_blank");
}
}
};
};
</script>
<style scoped>
.personal .c-box {
.personal .c-box {
position: absolute;
left: 0;
top: 0;
......@@ -342,11 +361,13 @@ export default {
right: 480px;
background: rgba(242, 243, 248, 1);
padding: 20px;
}
.personal .c-box .first {
}
.personal .c-box .first {
display: flex;
}
.personal .r-box {
}
.personal .r-box {
position: absolute;
top: 0;
bottom: 0;
......@@ -355,12 +376,13 @@ export default {
padding: 20px;
padding-left: 0;
background: rgba(242, 243, 248, 1);
}
.personal .c-box .fince,
.personal .c-box .myorder,
.personal .c-box .pingtai,
.personal .c-box .cloud,
.personal .c-box .imbox {
}
.personal .c-box .fince,
.personal .c-box .myorder,
.personal .c-box .pingtai,
.personal .c-box .cloud,
.personal .c-box .imbox {
width: 540px;
height: 360px;
border-radius: 4px;
......@@ -368,21 +390,25 @@ export default {
background: #fff;
box-shadow: 0px 3px 14px 0px rgba(193, 198, 221, 1);
position: relative;
}
.personal .c-box .imbox {
}
.personal .c-box .imbox {
height: 419px;
}
.personal .c-box .pingtai {
}
.personal .c-box .pingtai {
height: 300px;
margin: 20px 0;
padding-top: 65px;
}
.personal .c-box .cloud {
}
.personal .c-box .cloud {
height: 300px;
margin: 20px 0 20px 20px;
padding: 110px 45px 0 45px;
}
.personal .c-box .orders {
}
.personal .c-box .orders {
height: 419px;
background: #fff;
box-shadow: 0px 3px 14px 0px rgba(193, 198, 221, 1);
......@@ -390,32 +416,37 @@ export default {
margin-top: 20px;
position: relative;
padding-top: 50px;
}
.personal .r-box .todayOpera,
.personal .r-box .newpersonal {
}
.personal .r-box .todayOpera,
.personal .r-box .newpersonal {
height: 460px;
box-shadow: 0px 3px 14px 0px rgba(193, 198, 221, 1);
border-radius: 6px;
background: #fff;
margin-top: 20px;
}
.personal .r-box .newpersonal {
}
.personal .r-box .newpersonal {
height: auto;
position: relative;
}
.personal .r-box .sell,
.personal .r-box .tousu {
}
.personal .r-box .sell,
.personal .r-box .tousu {
height: auto;
box-shadow: 0px 3px 14px 0px rgba(193, 198, 221, 1);
border-radius: 6px;
background: #fff;
position: relative;
overflow: hidden;
}
.personal .r-box .tousu {
}
.personal .r-box .tousu {
margin-top: 20px;
}
.personal .r-box .sell .title {
}
.personal .r-box .sell .title {
height: 73px;
padding: 0 30px;
padding-top: 21px;
......@@ -423,47 +454,54 @@ export default {
color: #fff;
box-sizing: border-box;
background: #8eafec;
}
}
.personal .r-box .tousu .title {
.personal .r-box .tousu .title {
padding: 20px 30px;
font-size: 16px;
color: #2c3343;
}
.personal .r-box .tousu .content {
}
.personal .r-box .tousu .content {
height: 154px;
}
.personal .r-box .todayOpera .title,
.personal .r-box .newpersonal .title {
}
.personal .r-box .todayOpera .title,
.personal .r-box .newpersonal .title {
height: 56px;
line-height: 56px;
padding-left: 30px;
border-bottom: 1px solid #ebedf2;
font-size: 16px;
color: #2c3343;
}
.personal .r-box .todayOpera .content {
}
.personal .r-box .todayOpera .content {
width: 100%;
height: 403px;
padding: 15px 30px;
overflow-y: auto;
box-sizing: border-box;
}
.personal .c-box .myorder {
}
.personal .c-box .myorder {
margin-left: 20px;
}
.personal .c-box .fince .canvas-box {
}
.personal .c-box .fince .canvas-box {
width: 100%;
height: 203px;
}
.personal .c-box .myorder .canvas-box {
}
.personal .c-box .myorder .canvas-box {
position: absolute;
left: 0;
right: 0;
bottom: 0;
height: 220px;
}
.personal .c-box .fince .todayIncome {
}
.personal .c-box .fince .todayIncome {
width: 213px;
height: 144px;
background: rgba(255, 255, 255, 1);
......@@ -474,68 +512,81 @@ export default {
position: absolute;
padding: 25px 27px;
box-sizing: border-box;
}
.personal .c-box .fince .todayIncome .infos {
}
.personal .c-box .fince .todayIncome .infos {
display: flex;
}
.personal .c-box .myorder .infos {
}
.personal .c-box .myorder .infos {
margin-top: 80px;
margin-left: 30px;
font-size: 12px;
color: #93959a;
}
.personal .c-box .myorder .infos * {
}
.personal .c-box .myorder .infos * {
display: block;
}
.personal .c-box .myorder .infos .bold {
}
.personal .c-box .myorder .infos .bold {
font-size: 28px;
color: #5d78ff;
font-family: pingfangR;
}
.personal .c-box .fince .todayIncome .infos .left-text {
}
.personal .c-box .fince .todayIncome .infos .left-text {
flex: 1;
height: 36px;
line-height: 21px;
font-size: 12px;
color: #93959a;
}
.personal .c-box .fince .todayIncome .infos .left-text * {
}
.personal .c-box .fince .todayIncome .infos .left-text * {
display: block;
}
.personal .c-box .fince .todayIncome .infos .left-text .bold {
}
.personal .c-box .fince .todayIncome .infos .left-text .bold {
font-family: pingfangR;
font-size: 14px;
color: #0a0919;
}
.personal .c-box .fince .todayIncome .infos .right-icon {
}
.personal .c-box .fince .todayIncome .infos .right-icon {
font-size: 36px;
color: #0abb87;
width: 36px;
margin-top: -10px;
}
.personal .c-box .fince .todayIncome .infos .right-icon.red {
}
.personal .c-box .fince .todayIncome .infos .right-icon.red {
color: #dc3545;
}
.personal .c-box .fince .todayIncome .sumMoney {
}
.personal .c-box .fince .todayIncome .sumMoney {
color: #2c3343;
font-size: 12px;
text-align: right;
margin-top: 20px;
}
.personal .c-box .fince .todayIncome .sumMoney .bold {
}
.personal .c-box .fince .todayIncome .sumMoney .bold {
font-size: 28px;
font-family: pingfangR;
}
.personal .c-box .fince .todayIncome .sumMoney .mbold {
}
.personal .c-box .fince .todayIncome .sumMoney .mbold {
font-size: 25px;
font-family: pingfangR;
}
.personal .c-box .fince .title,
.personal .c-box .myorder .title,
.personal .c-box .orders .title,
.personal .c-box .pingtai .title,
.personal .c-box .cloud .title,
.personal .c-box .imbox .title {
}
.personal .c-box .fince .title,
.personal .c-box .myorder .title,
.personal .c-box .orders .title,
.personal .c-box .pingtai .title,
.personal .c-box .cloud .title,
.personal .c-box .imbox .title {
height: 15px;
font-size: 16px;
font-family: MicrosoftYaHei;
......@@ -546,105 +597,126 @@ export default {
left: 30px;
top: 10px;
font-family: pingfangR;
}
.personal .more {
}
.personal .more {
position: absolute;
top: 17px;
right: 20px;
font-size: 13px;
color: #8a8894;
cursor: pointer;
}
.personal .more:hover {
}
.personal .more:hover {
color: #5d78ff;
}
.personal .more.white {
}
.personal .more.white {
color: #fff;
opacity: 0.5;
}
.personal .more.white:hover {
}
.personal .more.white:hover {
opacity: 1;
}
.personal .c-box .myorder .title,
.personal .c-box .orders .title,
.personal .c-box .pingtai .title,
.personal .c-box .cloud .title,
.personal .c-box .imbox .title {
}
.personal .c-box .myorder .title,
.personal .c-box .orders .title,
.personal .c-box .pingtai .title,
.personal .c-box .cloud .title,
.personal .c-box .imbox .title {
color: #2c3343;
}
.personal .c-box .fince .todayIncome.daishou {
}
.personal .c-box .fince .todayIncome.daishou {
right: 40px;
left: unset;
}
.personal .per-tab {
}
.personal .per-tab {
min-height: 295px;
}
.personal .per-tab table {
}
.personal .per-tab table {
padding: 0;
margin: 0;
width: 100%;
border-collapse: collapse;
color: #6c7293;
}
.personal .per-tab table thead th {
}
.personal .per-tab table thead th {
font-size: 14px;
font-family: pingfangR;
padding: 10px 16px;
border-bottom: 1px solid #ebedf2;
text-align: left;
}
.personal .per-tab table td.blue,
.personal .per-tab table th.blue {
}
.personal .per-tab table td.blue,
.personal .per-tab table th.blue {
color: #5d78ff;
}
.personal .per-tab table td.org,
.personal .per-tab table th.org {
}
.personal .per-tab table td.org,
.personal .per-tab table th.org {
color: #ffb822;
}
.personal .per-tab table td.red,
.personal .per-tab table th.red {
}
.personal .per-tab table td.red,
.personal .per-tab table th.red {
color: #fd397a;
}
.personal .per-tab table td {
}
.personal .per-tab table td {
padding: 10px 16px;
font-size: 12px;
border-bottom: 1px solid #ebedf2;
text-align: left;
}
.personal .per-tab table td.bold {
}
.personal .per-tab table td.bold {
font-size: 14px;
font-family: pingfangR;
}
.personal .per-tab table td.op i {
}
.personal .per-tab table td.op i {
font-size: 18px;
color: #5d78ff;
cursor: pointer;
}
.personal .per-tab table td.op i:hover {
}
.personal .per-tab table td.op i:hover {
color: #3658ff;
}
.personal .el-pagination {
}
.personal .el-pagination {
margin-top: 18px;
border-top: none;
font-weight: 400px;
}
.personal .c-box .imbox .tab {
}
.personal .c-box .imbox .tab {
position: absolute;
top: 18px;
right: 0px;
display: flex;
}
.personal .c-box .imbox .tab .item {
}
.personal .c-box .imbox .tab .item {
margin-right: 40px;
padding: 7px 8px;
font-size: 12px;
color: #757880;
cursor: pointer;
border-radius: 2px;
}
.personal .c-box .imbox .tab .item.active,
.personal .c-box .imbox .tab .item:hover {
}
.personal .c-box .imbox .tab .item.active,
.personal .c-box .imbox .tab .item:hover {
background: #eef1ff;
color: #5d78ff;
}
}
</style>
src/components/personalCenter/sell.vue
View file @ b0023773
......@@ -2,7 +2,12 @@
<div class="sell-box">
<div class="top">
<div class="h">
<img :src="champion.employeeImg" :onerror="defaultHeadImg" />
<template v-if="CurrentUserInfo.RB_Group_id==2">
<img :src="champion.employeeImg" :onerror="defaultHeadImg" />
</template>
<template>
<img src="../../assets/img/default_head_img.jpg" :onerror="defaultHeadImg" />
</template>
</div>
<img class="caidai" src="../../assets/img/persion/caidai.png" />
<div class="money" v-if="CurrentUserInfo.RB_Group_id==2">
......
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