Skip to content

X
xzf_uniapp-wechat-web
Commit a73c6a26 authored by aifen@azjy1.onexmail.com's avatar aifen@azjy1.onexmail.com
Browse files
Options

校园报告优化

parent 08c5753d
Show whitespace changes
Inline Side-by-side
Showing with 29 additions and 28 deletions
src/pages/SchoolReport/SchoolReport.vue
View file @ a73c6a26
......@@ -272,7 +272,7 @@
</view>
</view>
</view>
<view v-if="tabIndex==1&&isOpen" class="school-report-context-card-three">
<view v-show="tabIndex==1&&isOpen" class="school-report-context-card-three">
<view class="school-report-context-card-title">
<view class="school-report-context-card-title-img">
<text>消费偏好</text>
......@@ -289,7 +289,7 @@
<view id="consumer-preferences-pie">
</view>
</view>
<view v-if="tabIndex==1&&isOpen" class="school-report-context-card-four">
<view v-show="tabIndex==1&&isOpen" class="school-report-context-card-four">
<view class="school-report-context-card-title">
<view class="school-report-context-card-title-img">
<text>生活费额度</text>
......@@ -341,7 +341,7 @@
</view>
</view>
</view>
<view v-if="tabIndex==1&&isOpen" class="school-report-context-card-five">
<view v-show="tabIndex==1&&isOpen" class="school-report-context-card-five">
<view class="school-report-context-card-title">
<view class="school-report-context-card-title-img">
<text>消费趋势</text>
......@@ -417,7 +417,7 @@
</van-calendar>
</view>
</view>
<view v-if="tabIndex==2" class="attendance-report-context-details"
<view v-if="tabIndex==2&&isAttendanceOpen" class="attendance-report-context-details"
:style="{height:attendanceReportDatail.length?858:620+'rpx',overflow:attendanceReportDatail.length?'scroll':'none',top:attendanceReportDatail.length?-30:0+'rpx'}">
<view v-for="(detailItem,detailIndex) in attendanceReportDatail" :key="detailIndex">
<view v-if="detailItem.attendIntervalType&&detailItem.attendIntervalType!=-1"
......@@ -591,7 +591,7 @@
<view id="leave-message-bar">
</view>
</view>
<view v-if="isOpen||isPubTalkOpen||isAttendanceOpen" class="school-report-footer">
<view v-if="flag!=tabIndex" class="school-report-footer">
<view class="school-report-footer-item">
<view class="school-report-footer-item-txt">
<text>到期后将无法查看完整报告</text>
......@@ -609,11 +609,11 @@
</view>
</view>
</view>
<view v-if="false" class="no-open"
:style="{height:[915,845,891][tabIndex-1]+'rpx',top:[1425,1099,1260][tabIndex-1]+'rpx'}">
<view v-if="flag==tabIndex" class="no-open"
:style="{height:[915,845,891][tabIndex-1]+'rpx',top:[1425,1099,pubTalkNoopenHeight][tabIndex-1]+'rpx'}">
<view class="no-open-solution" @tap="equityPay">
<view class="no-open-solution-txt">
<text>最低{{memberInfo.leastAmount||''}}元/天开通，查看完整{{['消费','出入校','公话'][tabIndex-1]}}报告</text>
<text>最低{{memberInfo.leastAmount}}元/天开通，查看完整{{['消费','出入校','公话'][tabIndex-1]}}报告</text>
</view>
<view class="no-open-solution-item">
</view>
......@@ -929,11 +929,11 @@
isOpen: false,
isService: false,
// 出入校
isAttendanceOpen: true,
isAttendanceService: true,
isAttendanceOpen: false,
isAttendanceService: false,
// 公话
isPubTalkOpen: true,
isPubTalkService: true,
isPubTalkOpen: false,
isPubTalkService: false,
flag: 0,
memberInfo: {
leastAmount: '',
......@@ -941,7 +941,8 @@
differDay: ''
},
containerHeight: '',
pubTalkSummaryHeight: 525
pubTalkSummaryHeight: 525,
pubTalkNoopenHeight:1260
}
},
mounted() {
......@@ -961,12 +962,12 @@
})
}
// 有无进出校、公话入口
// this.queryMemberServcieItem().then(() => {
// if (this.queryMemberServcieItemList.length) {
// this.isAttendanceService = this.queryMemberServcieItemList.indexOf(3002) == -1 ? false : true;
// this.isPubTalkService = this.queryMemberServcieItemList.indexOf(2002) == -1 ? false : true;
// }
// })
this.queryMemberServcieItem().then(() => {
if (this.queryMemberServcieItemList.length) {
this.isAttendanceService = this.queryMemberServcieItemList.indexOf(3002) == -1 ? false : true;
this.isPubTalkService = this.queryMemberServcieItemList.indexOf(2002) == -1 ? false : true;
}
})
// 消费报告
this.queryIsDredgeMember(1002).then(() => {
if (this.isOpen) {
......@@ -1111,7 +1112,7 @@
if (this.attendanceReportDatail.length) {
this.containerHeight = 2762;
} else {
this.containerHeight = 1904;
this.containerHeight = 2524;
}
});
}
......@@ -2124,6 +2125,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
} else {
this.queryMemberConsumerAmount(serviceItemCode);
this.containerHeight = 1605 + this.pubTalkSummaryHeight;
this.pubTalkNoopenHeight=735+this.pubTalkSummaryHeight;
this.flag = 3;
}
break;
......@@ -2135,7 +2137,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
this.flag = 0;
} else {
this.queryMemberConsumerAmount(serviceItemCode);
this.containerHeight = 1944;
this.containerHeight = 1974;
this.flag = 2;
}
break;
......@@ -2213,7 +2215,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
})
return
}
this.memberInfo.leastAmount = data.obj.leastAmount || '';
this.memberInfo.leastAmount = data.obj.leastAmount;
} catch (e) {
//TODO handle the exception
console.log(e);
......@@ -3064,7 +3066,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
/deep/ .progress-day {
color: #DAA000;
background: url(../../static/images/progress.png) no-repeat -4rpx center/100%;
background: url(../../static/images/progress.png) no-repeat -2rpx center/100%;
border-radius: 22rpx;
width: 88rpx;
height: 88rpx;
......@@ -3276,15 +3278,14 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
.attendance-report-details-img-item {
display: flex;
align-items: flex-end;
width: 155rpx;
justify-content: flex-end;
width: 100%;
height: 95rpx;
margin: 14rpx 0 0;
.attendance-report-details-img-box {
display: flex;
justify-content: flex-end;
width: 155rpx;
height: 95rpx;
image {
width: 100%;
height: 100%;
......
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