消费报告二期

parent df904460
...@@ -79,12 +79,13 @@ ...@@ -79,12 +79,13 @@
</view> </view>
<view class="school-report-context-card"> <view class="school-report-context-card">
<view class="school-report-context-card-one" <view class="school-report-context-card-one"
:style="{height:[612,256,pubTalkSummaryHeight][tabIndex-1]+'rpx'}"> :style="{height:[consumerDetailCalculateObj.totalData>0?496:598,256,pubTalkSummaryHeight][tabIndex-1]+'rpx'}">
<view :class="['consumer-report-img','attendance-report-img','pubTalk-report-img'][tabIndex-1]"> <view :class="['consumer-report-img','attendance-report-img','pubTalk-report-img'][tabIndex-1]">
</view> </view>
<!-- 消费报告 --> <!-- 消费报告 -->
<view v-show="tabIndex==1" class="school-report-context-card-one-context"> <view v-show="tabIndex==1&&consumerDetailCalculateObj.totalData>0"
<view class="school-report-context-card-one-context-item"> class="school-report-context-card-one-context">
<!-- <view class="school-report-context-card-one-context-item">
<view class="school-report-context-card-one-context-dot"> <view class="school-report-context-card-one-context-dot">
<view class="school-report-context-card-one-context-dot-item"> <view class="school-report-context-card-one-context-dot-item">
</view> </view>
...@@ -97,6 +98,19 @@ ...@@ -97,6 +98,19 @@
<text v-else>恭喜<text <text v-else>恭喜<text
class="txt-important">{{userInfo.userName}}</text>荣获“快乐干饭人”称号,快乐要和家人一起分享哦</text> class="txt-important">{{userInfo.userName}}</text>荣获“快乐干饭人”称号,快乐要和家人一起分享哦</text>
</view> </view>
</view> -->
<view class="school-report-context-card-one-context-item">
<view class="school-report-context-card-one-context-dot">
<view class="school-report-context-card-one-context-dot-item">
</view>
</view>
<view class="school-report-context-card-one-context-txt">
{{['',''][reportTypeIndex]}}就餐<text
class="txt-important">{{consumerDetailCalculateObj.cateringNumber}}</text>次,未就餐<text
class="txt-important">{{consumerDetailCalculateObj.notCateringNumber}}</text>次。食堂总消费<text
class="txt-important">{{consumerDetailCalculateObj.canteenData}}</text>元,生活费总花费<text
class="txt-important">{{consumerDetailCalculateObj.totalData}}</text>
</view>
</view> </view>
<view class="school-report-context-card-one-context-item"> <view class="school-report-context-card-one-context-item">
<view class="school-report-context-card-one-context-dot"> <view class="school-report-context-card-one-context-dot">
...@@ -109,7 +123,7 @@ ...@@ -109,7 +123,7 @@
<text v-else>饮食较<text class="txt-important-two">均衡</text>,继续保持哦</text> <text v-else>饮食较<text class="txt-important-two">均衡</text>,继续保持哦</text>
</view> </view>
</view> </view>
<view class="school-report-context-card-one-context-item"> <!-- <view class="school-report-context-card-one-context-item">
<view class="school-report-context-card-one-context-dot"> <view class="school-report-context-card-one-context-dot">
<view class="school-report-context-card-one-context-dot-item"> <view class="school-report-context-card-one-context-dot-item">
</view> </view>
...@@ -120,7 +134,7 @@ ...@@ -120,7 +134,7 @@
<text class="txt-important">{{consumerAmountObj.gtgraderate}}%</text> <text class="txt-important">{{consumerAmountObj.gtgraderate}}%</text>
的同学<text v-if="isReasonable">,请及时评估生活费是否合理</text> 的同学<text v-if="isReasonable">,请及时评估生活费是否合理</text>
</view> </view>
</view> </view> -->
<view class="school-report-context-card-one-context-item"> <view class="school-report-context-card-one-context-item">
<view class="school-report-context-card-one-context-dot"> <view class="school-report-context-card-one-context-dot">
<view class="school-report-context-card-one-context-dot-item"> <view class="school-report-context-card-one-context-dot-item">
...@@ -162,6 +176,18 @@ ...@@ -162,6 +176,18 @@
</view> </view>
</view> --> </view> -->
</view> </view>
<view v-show="tabIndex==1&&consumerDetailCalculateObj.totalData<=0"
class="school-report-context-card-one-context">
<view class="school-report-context-card-one-context-nodata">
<view class="card-one-nodata-img">
<image :src="ImgUrl+'SchoolReport/noConsumption.png'" mode=""></image>
</view>
<view class="card-one-nodata-txt">
<text>所选日期内暂无消费</text>
</view>
</view>
</view>
<!-- 出入校报告 --> <!-- 出入校报告 -->
<view v-show="tabIndex==2" class="attendance-report-context-card-one-context"> <view v-show="tabIndex==2" class="attendance-report-context-card-one-context">
<view class="attendance-report-context-card-one-context-item"> <view class="attendance-report-context-card-one-context-item">
...@@ -221,15 +247,96 @@ ...@@ -221,15 +247,96 @@
</view> </view>
</view> </view>
<!-- 消费报告 --> <!-- 消费报告 -->
<view v-show="tabIndex==1" class="school-report-context-card-two"> <view v-show="tabIndex==1" class="school-report-context-card-eight"
:style="{height:isOpen?'1431rpx':'882rpx'}">
<view class="school-report-context-card-title">
<view class="school-report-context-card-title-img">
<text>消费明细</text>
</view>
</view>
<view class="school-report-context-card-eight-conclusion">
<view v-if="consumerDetailCalculateObj.totalData>0"
class="school-report-context-card-eight-conclusion-item">
<text>{{['',''][reportTypeIndex]}}食堂<text
class="txt-important">{{consumerDetailCalculateObj.canteenData}}</text>元,总消费<text
class="txt-important">{{consumerDetailCalculateObj.totalData}}</text></text>
</view>
<view v-else
class="school-report-context-card-eight-conclusion-item eight-conclusion-nodata">
<text>所选日期内暂无消费</text>
</view>
</view>
<view class="school-report-context-card-eight-details">
<view class="consumer-details-header">
<view v-for="item in consumerDetailsHeaderList" class="consumer-details-header-item">
<text>{{item}}</text>
</view>
</view>
<view v-if="isOpen" class="consumer-details-body-box">
<view v-for="(item,index) in campusConsumerDetailObj.campusConsumerDetailList"
class="consumer-details-body"
:style="{background:Number.isInteger(index/2)?'#FFFFFF':'#F8F8F7'}">
<view class="consumer-details-body-item" v-for="(e,i) in item.consumerDetailsArr"
:class="i?'':'consumer-details-body-data'">
<text>{{e}}</text>
</view>
</view>
</view>
<view v-else class="consumer-details-body-box">
<view class="consumer-details-body" style="background: #FFFFFF;">
<view class="consumer-details-body-item"
v-for="(e,i) in campusConsumerDetailObj.campusConsumerDetailList[0].consumerDetailsArr"
:class="i?'':'consumer-details-body-data'">
<text>{{e}}</text>
</view>
</view>
<view class="consumer-details-body" style="background: #F8F8F7;">
<view class="consumer-details-body-item"
v-for="(e,i) in campusConsumerDetailObj.campusConsumerDetailList[1].consumerDetailsArr"
:class="i?'':'consumer-details-body-data'">
<text>{{e}}</text>
</view>
</view>
</view>
<view v-if="isOpen&&campusConsumerDetailObj.campusConsumerDetailList.length>7"
class="consumer-details-body-notice-box">
<view class="consumer-details-body-notice">
<view class="consumer-details-body-notice-txt">
<text>滑动查看更多</text>
</view>
<view class="consumer-details-body-notice-icon">
<image :src="ImgUrl+'SchoolReport/slide.png'" mode=""></image>
</view>
</view>
</view>
<view style="height: 40rpx;"
v-if="isOpen&&campusConsumerDetailObj.campusConsumerDetailList.length<=7">
</view>
<view v-if="isOpen"
v-for="item in campusConsumerDetailObj.campusConsumerDetailCalculateList"
class="consumer-details-sum">
<view v-for="(e,i) in item.consumerDetailsSumArr" class="consumer-details-sum-item"
:class="i?'':'consumer-details-sum-type'">
{{e}}
</view>
</view>
</view>
</view>
<view v-show="tabIndex==1&&isOpen" class="school-report-context-card-two"
:style="{height:consumerDetailCalculateObj.totalData>0?'876rpx':'916rpx'}">
<view class="school-report-context-card-title"> <view class="school-report-context-card-title">
<view class="school-report-context-card-title-img"> <view class="school-report-context-card-title-img">
<text>就餐情况</text> <text>就餐情况</text>
</view> </view>
</view> </view>
<view class="school-report-context-card-two-conclusion"> <view v-if="consumerDetailCalculateObj.totalData<=0" class="school-report-context-card-nodata">
<text>所选日期内暂无消费</text>
</view>
<view class="school-report-context-card-two-conclusion"
:style="{'margin-top': consumerDetailCalculateObj.totalData>0?'40rpx':''}">
<view class="school-report-context-card-two-conclusion-txt"> <view class="school-report-context-card-two-conclusion-txt">
<text>{{['',''][reportTypeIndex]}}<text <text
v-show="consumerDetailCalculateObj.totalData>0">{{['',''][reportTypeIndex]}}<text
class="abnormal-days">{{diningSituations.notRepastDay}}</text>天未就餐</text> class="abnormal-days">{{diningSituations.notRepastDay}}</text>天未就餐</text>
</view> </view>
<view class="school-report-context-card-two-conclusion-logo"> <view class="school-report-context-card-two-conclusion-logo">
...@@ -261,7 +368,7 @@ ...@@ -261,7 +368,7 @@
<view class="school-report-context-card-two-details-meal-logo"> <view class="school-report-context-card-two-details-meal-logo">
<view v-if="diningSituations.notRepastDetails.breakfastStatus==1" <view v-if="diningSituations.notRepastDetails.breakfastStatus==1"
class="school-report-context-card-two-details-meal-img"> class="school-report-context-card-two-details-meal-img">
<image src="../../static/images/eatted.png" mode=""></image> <image :src="ImgUrl+'SchoolReport/eatted.png'" mode=""></image>
</view> </view>
<view v-else-if="diningSituations.notRepastDetails.breakfastStatus==0" <view v-else-if="diningSituations.notRepastDetails.breakfastStatus==0"
class="school-report-context-card-two-details-meal-noeat"> class="school-report-context-card-two-details-meal-noeat">
...@@ -275,7 +382,7 @@ ...@@ -275,7 +382,7 @@
class="school-report-context-card-two-details-meal-logo school-report-context-card-two-details-meal-logo-two"> class="school-report-context-card-two-details-meal-logo school-report-context-card-two-details-meal-logo-two">
<view v-if="diningSituations.notRepastDetails.lunchStatus==1" <view v-if="diningSituations.notRepastDetails.lunchStatus==1"
class="school-report-context-card-two-details-meal-img"> class="school-report-context-card-two-details-meal-img">
<image src="../../static/images/eatted.png" mode=""></image> <image :src="ImgUrl+'SchoolReport/eatted.png'" mode=""></image>
</view> </view>
<view v-else-if="diningSituations.notRepastDetails.lunchStatus==0" <view v-else-if="diningSituations.notRepastDetails.lunchStatus==0"
class="school-report-context-card-two-details-meal-noeat"> class="school-report-context-card-two-details-meal-noeat">
...@@ -289,7 +396,7 @@ ...@@ -289,7 +396,7 @@
class="school-report-context-card-two-details-meal-logo school-report-context-card-two-details-meal-logo-three"> class="school-report-context-card-two-details-meal-logo school-report-context-card-two-details-meal-logo-three">
<view v-if="diningSituations.notRepastDetails.supperStatus==1" <view v-if="diningSituations.notRepastDetails.supperStatus==1"
class="school-report-context-card-two-details-meal-img"> class="school-report-context-card-two-details-meal-img">
<image src="../../static/images/eatted.png" mode=""></image> <image :src="ImgUrl+'SchoolReport/eatted.png'" mode=""></image>
</view> </view>
<view v-else-if="diningSituations.notRepastDetails.supperStatus==0" <view v-else-if="diningSituations.notRepastDetails.supperStatus==0"
class="school-report-context-card-two-details-meal-noeat"> class="school-report-context-card-two-details-meal-noeat">
...@@ -307,11 +414,17 @@ ...@@ -307,11 +414,17 @@
</view> </view>
</view> </view>
<view class="school-report-context-card-three-conclusion"> <view class="school-report-context-card-three-conclusion">
<view class="school-report-context-card-three-conclusion-item"> <view class="school-report-context-card-three-conclusion-item"
<text v-if="isEatLow">正餐消费占比<text :class="consumerDetailCalculateObj.totalData>0?'':'card-three-conclusion-nodata'">
class="school-report-context-card-three-conclusion-item-describe">过低</text>,请及时调整饮食习惯</text> <text v-if="consumerDetailCalculateObj.totalData>0">
<text v-else>饮食较<text <text v-if="isEatLow">正餐消费占比<text
class="school-report-context-card-three-conclusion-item-describe">均衡</text>,继续保持哦</text> class="school-report-context-card-three-conclusion-item-describe">过低</text>,请及时调整饮食习惯</text>
<text v-else>饮食较<text
class="school-report-context-card-three-conclusion-item-describe">均衡</text>,继续保持哦</text>
</text>
<text v-else>
所选日期内暂无消费
</text>
</view> </view>
</view> </view>
<view id="consumer-preferences-pie"> <view id="consumer-preferences-pie">
...@@ -324,48 +437,59 @@ ...@@ -324,48 +437,59 @@
</view> </view>
</view> </view>
<view class="school-report-context-card-four-conclusion"> <view class="school-report-context-card-four-conclusion">
<view class="school-report-context-card-four-conclusion-item"> <view class="school-report-context-card-four-conclusion-item"
<text>消费<text :class="consumerDetailCalculateObj.totalData>0?'':'card-four-conclusion-nodata'">
<!-- <text>消费<text
class="consume-total">{{consumerAmountObj.consumergrossamount}}</text>元,超过同年级<text class="consume-total">{{consumerAmountObj.consumergrossamount}}</text>元,超过同年级<text
class="consume-total">{{consumerAmountObj.gtgraderate}}%</text>的同学<text class="consume-total">{{consumerAmountObj.gtgraderate}}%</text>的同学<text
v-if="isReasonable">,请及时评估生活费是否合理</text></text> v-if="isReasonable">,请及时评估生活费是否合理</text></text> -->
<text v-if="consumerDetailCalculateObj.totalData>0">消费总额<text
class="consume-total">{{livingExpensesAllowance.userConsumeAmount}}</text>元,同比上{{['',''][reportTypeIndex]}}<text
class="consume-total">{{livingExpensesAllowance.lastMonthRateStr}}
<van-icon :class="livingExpensesAllowance.lastMonthRate>0?'':'livingCostUp'"
name="down" />
</text>
</text>
<text v-else>
所选日期内暂无消费
</text>
</view> </view>
</view> </view>
<view class="consume-total-img"> <view class="consume-total-img">
<view class="school-average" :style="{height:schoolAverageHeight+'rpx'}"> <view class="school-average" :style="{height:schoolAverageHeight+'rpx'}">
<view class="school-average-num"> <view class="school-average-num">
<text>{{consumerAmountObj.schoolavgamount}}</text> <text>{{livingExpensesAllowance.schoolAverageAmount}}</text>
</view> </view>
<view class="school-average-img"> <view class="school-average-img">
<image src="../../static/images/greenArrow.png" mode=""></image> <image :src="ImgUrl+'SchoolReport/greenArrow.png'" mode=""></image>
</view> </view>
</view> </view>
<view class="user-consume" :style="{height:userConsumeHeight+'rpx'}"> <view class="school-average last-month" :style="{height:gradeAverageHeight+'rpx'}">
<view class="user-consume-num"> <view class="school-average-num">
<text>{{consumerAmountObj.consumergrossamount}}</text> <text>{{livingExpensesAllowance.gradeAverageAmount}}</text>
</view> </view>
<view class="user-consume-img"> <view class="school-average-img">
<image src="../../static/images/yellowArrow.png" mode=""></image> <image :src="ImgUrl+'SchoolReport/greenArrow.png'" mode=""></image>
</view> </view>
</view> </view>
<view class="school-average" :style="{height:gradeAverageHeight+'rpx'}"> <view class="user-consume" :style="{height:userConsumeHeight+'rpx'}">
<view class="school-average-num"> <view class="user-consume-num">
<text>{{consumerAmountObj.gradeavgamount}}</text> <text>{{livingExpensesAllowance.userConsumeAmount}}</text>
</view> </view>
<view class="school-average-img"> <view class="user-consume-img">
<image src="../../static/images/greenArrow.png" mode=""></image> <image :src="ImgUrl+'SchoolReport/yellowArrow.png'" mode=""></image>
</view> </view>
</view> </view>
</view> </view>
<view class="consume-total-img-des"> <view class="consume-total-img-des">
<view class="consume-total-img-des-item"> <view class="consume-total-img-des-item" style="margin-left: 20rpx;">
<text>全校平均</text> <text>上上{{['',''][reportTypeIndex]}}</text>
</view> </view>
<view class="consume-total-img-des-item consume-des"> <view class="consume-total-img-des-item consume-des">
<text>本人消费</text> <text>{{['',''][reportTypeIndex]}}</text>
</view> </view>
<view class="consume-total-img-des-item"> <view class="consume-total-img-des-item">
<text>全年级平均</text> <text>{{['',''][reportTypeIndex]}}</text>
</view> </view>
</view> </view>
</view> </view>
...@@ -376,11 +500,16 @@ ...@@ -376,11 +500,16 @@
</view> </view>
</view> </view>
<view class="school-report-context-card-five-conclusion"> <view class="school-report-context-card-five-conclusion">
<view class="school-report-context-card-five-conclusion-item"> <view v-if="consumerDetailCalculateObj.totalData>0"
class="school-report-context-card-five-conclusion-item">
<text v-if="isAbnormal"><text <text v-if="isAbnormal"><text
class="abnormal-date">{{consumerTrend.clues}}</text>的消费金额存在异常,请及时关注</text> class="abnormal-date">{{consumerTrend.clues}}</text>的消费金额存在异常,请及时关注</text>
<text v-else>每日消费金额较稳定,继续保持哦</text> <text v-else>每日消费金额较稳定,继续保持哦</text>
</view> </view>
<view v-else
class="school-report-context-card-five-conclusion-item card-five-conclusion-nodata">
<text>所选日期内暂无消费</text>
</view>
</view> </view>
<view id="consumer-trend-line"> <view id="consumer-trend-line">
</view> </view>
...@@ -794,7 +923,7 @@ ...@@ -794,7 +923,7 @@
</view> </view>
</view> </view>
<view v-if="tabIndex&&flag==tabIndex" class="no-open" <view v-if="tabIndex&&flag==tabIndex" class="no-open"
:style="{height:[860,845,891][tabIndex-1]+'rpx',top:[1620,1099,pubTalkNoopenHeight][tabIndex-1]+'rpx'}"> :style="{height:[860,845,891][tabIndex-1]+'rpx',top:[1426,1099,pubTalkNoopenHeight][tabIndex-1]+'rpx'}">
<view class="no-open-solution" @tap="equityPay"> <view class="no-open-solution" @tap="equityPay">
<view class="no-open-solution-txt"> <view class="no-open-solution-txt">
<text>最低{{memberInfo.leastAmount}}元/天开通,查看完整{{['消费','出入校','公话'][tabIndex-1]}}报告</text> <text>最低{{memberInfo.leastAmount}}元/天开通,查看完整{{['消费','出入校','公话'][tabIndex-1]}}报告</text>
...@@ -820,7 +949,7 @@ ...@@ -820,7 +949,7 @@
<text>+</text> <text>+</text>
</view> </view>
<view class="summary-item"> <view class="summary-item">
<text>{{['月度出入校报告','月度公话报告'][tabIndex-2]}}</text> <text>{{['月','周'][reportTypeIndex]}}{{['度出入校报告','度公话报告'][tabIndex-2]}}</text>
</view> </view>
</view> </view>
<!-- 消费报告 --> <!-- 消费报告 -->
...@@ -840,13 +969,13 @@ ...@@ -840,13 +969,13 @@
</view> </view>
<view class="details-item-left"> <view class="details-item-left">
<view class="details-item-up"> <view class="details-item-up">
<text>担心孩子被迫高额消费</text> <text>钱花哪里了</text>
</view> </view>
<view class="details-item-down"> <view class="details-item-down">
<view class="consumer-trend-img"> <view class="consumer-trend-img">
</view> </view>
<view class="details-item-down-txt"> <view class="details-item-down-txt">
<text>【消费趋势】告诉你</text> <text>【消费明细】告诉你</text>
</view> </view>
</view> </view>
</view> </view>
...@@ -1004,8 +1133,7 @@ ...@@ -1004,8 +1133,7 @@
</view> </view>
<view v-else class="nodata" @click="nodataClick"> <view v-else class="nodata" @click="nodataClick">
<view class="nodataImg"> <view class="nodataImg">
<img style="width: 100%" <img style="width: 100%" :src="ImgUrl+'images/purchaseChart.gif'" />
src="https://xiaopay2020.oss-cn-shenzhen.aliyuncs.com/static/weapp/images/purchaseChart.gif" />
</view> </view>
<view class="nodataTxt"> <view class="nodataTxt">
<text>当前为使用高峰期,请稍后再试</text> <text>当前为使用高峰期,请稍后再试</text>
...@@ -1056,6 +1184,7 @@ ...@@ -1056,6 +1184,7 @@
name: 'SchoolReport', name: 'SchoolReport',
data() { data() {
return { return {
ImgUrl: this.$ImgUrl,
showReport: true, showReport: true,
nodataImgUrl: this.$ImgUrl, nodataImgUrl: this.$ImgUrl,
userInfo: {}, userInfo: {},
...@@ -1073,6 +1202,18 @@ ...@@ -1073,6 +1202,18 @@
imgUrl: '', // 存储base64图片 imgUrl: '', // 存储base64图片
dialogShow: false, dialogShow: false,
tabIndex: 0, tabIndex: 0,
// 消费明细
campusConsumerDetailObj: {
campusConsumerDetailList: [],
campusConsumerDetailCalculateList: []
},
consumerDetailsHeaderList: ['日期', '早餐', '午餐', '晚餐', '其他', '合计'],
consumerDetailCalculateObj: {
canteenData: '', // 食堂消费
totalData: '', // 总消费
cateringNumber: '', // 就餐次数
notCateringNumber: '', //未就餐次数
},
// 就餐情况 // 就餐情况
diningSituations: { diningSituations: {
diningSituationsDate: '', diningSituationsDate: '',
...@@ -1088,7 +1229,14 @@ ...@@ -1088,7 +1229,14 @@
pieDatas: [], pieDatas: [],
isEatLow: false, isEatLow: false,
// 生活费额度 // 生活费额度
consumerAmountObj: {}, livingExpensesAllowance: {
lastMonthRateStr: '',
lastMonthRate: '',
userConsumeAmount: '', //本月
gradeAverageAmount: '', //上月
schoolAverageAmount: '' //上上月
},
consumerAmountObj: [],
isReasonable: false, isReasonable: false,
schoolAverageHeight: '', schoolAverageHeight: '',
userConsumeHeight: '', userConsumeHeight: '',
...@@ -1209,6 +1357,7 @@ ...@@ -1209,6 +1357,7 @@
this.memberInfo.differDay = dayjs('2022/06/30').diff(dayjs(), 'day') + 1; this.memberInfo.differDay = dayjs('2022/06/30').diff(dayjs(), 'day') + 1;
this.containerHeight = 4200; this.containerHeight = 4200;
this.queryConsumerSummaryAmount(1).then(e => this.piechart()); this.queryConsumerSummaryAmount(1).then(e => this.piechart());
this.queryLivingCostsAmount();
this.queryDayConsumerTrend(1).then(e => this.linechart(this this.queryDayConsumerTrend(1).then(e => this.linechart(this
.reportTypeIndex)); .reportTypeIndex));
// this.queryMealPalAnalyse().then(() => this.mealPalBarchart()); // this.queryMealPalAnalyse().then(() => this.mealPalBarchart());
...@@ -1234,6 +1383,7 @@ ...@@ -1234,6 +1383,7 @@
this.queryIsDredgeMember(1002, 1).then(() => { this.queryIsDredgeMember(1002, 1).then(() => {
this.queryConsumerSummaryAmount(1).then(e => this this.queryConsumerSummaryAmount(1).then(e => this
.piechart()); .piechart());
this.queryLivingCostsAmount();
this.queryDayConsumerTrend(1).then(e => this.linechart(this this.queryDayConsumerTrend(1).then(e => this.linechart(this
.reportTypeIndex)); .reportTypeIndex));
// this.queryMealPalAnalyse().then(() => this.mealPalBarchart()); // this.queryMealPalAnalyse().then(() => this.mealPalBarchart());
...@@ -1257,6 +1407,19 @@ ...@@ -1257,6 +1407,19 @@
// }) // })
}); });
} }
this.queryNotRepastDetails(this.dataRangeArr[this.dataRangeIndex].startDate,
this.dataRangeArr[this
.dataRangeIndex].endDate).then(() => {
if (this.diningSituations.notRepastDetailsDTOS) {
let today = this.diningSituations.notRepastDetailsDTOS.filter(
e => e.repastDate ===
tmpDate)[
0];
this.diningSituations.notRepastDetails = today;
} else {
this.diningSituations.notRepastDetails = {};
}
});
}) })
} else { } else {
if (new Date().getTime() <= new Date('2022/06/30').getTime()) { if (new Date().getTime() <= new Date('2022/06/30').getTime()) {
...@@ -1267,6 +1430,7 @@ ...@@ -1267,6 +1430,7 @@
this.memberInfo.differDay = dayjs('2022/06/30').diff(dayjs(), 'day') + 1; this.memberInfo.differDay = dayjs('2022/06/30').diff(dayjs(), 'day') + 1;
this.containerHeight = 4200; this.containerHeight = 4200;
this.queryConsumerSummaryAmount(1).then(e => this.piechart()); this.queryConsumerSummaryAmount(1).then(e => this.piechart());
this.queryLivingCostsAmount();
this.queryDayConsumerTrend(1).then(e => this.linechart(this.reportTypeIndex)); this.queryDayConsumerTrend(1).then(e => this.linechart(this.reportTypeIndex));
// this.queryMealPalAnalyse().then(() => this.mealPalBarchart()); // this.queryMealPalAnalyse().then(() => this.mealPalBarchart());
// this.queryRepastTimeTrend().then(() => { // this.queryRepastTimeTrend().then(() => {
...@@ -1288,6 +1452,7 @@ ...@@ -1288,6 +1452,7 @@
this.tabIndex = 1; this.tabIndex = 1;
this.queryIsDredgeMember(1002, 1).then(() => { this.queryIsDredgeMember(1002, 1).then(() => {
this.queryConsumerSummaryAmount(); this.queryConsumerSummaryAmount();
this.queryLivingCostsAmount();
this.queryDayConsumerTrend(); this.queryDayConsumerTrend();
// this.queryMealPalAnalyse(); // this.queryMealPalAnalyse();
// this.queryRepastTimeTrend(); // this.queryRepastTimeTrend();
...@@ -1316,17 +1481,8 @@ ...@@ -1316,17 +1481,8 @@
this.attendanceSituations.attendanceDate = this.formatDate(this.minDate); this.attendanceSituations.attendanceDate = this.formatDate(this.minDate);
this.queryCampusStudentInfo(); this.queryCampusStudentInfo();
let tmpDate = this.formatDateTwo(this.minDate); let tmpDate = this.formatDateTwo(this.minDate);
this.queryNotRepastDetails(this.dataRangeArr[this.dataRangeIndex].startDate, this.dataRangeArr[this this.queryConsumerDetail(this.dataRangeArr[this.dataRangeIndex].startDate, this.dataRangeArr[this
.dataRangeIndex].endDate).then(() => { .dataRangeIndex].endDate);
if (this.diningSituations.notRepastDetailsDTOS) {
let today = this.diningSituations.notRepastDetailsDTOS.filter(e => e.repastDate ===
tmpDate)[
0];
this.diningSituations.notRepastDetails = today;
} else {
this.diningSituations.notRepastDetails = {};
}
});
if (this.isPubTalkService) { if (this.isPubTalkService) {
this.getPubTalkReport(); this.getPubTalkReport();
} }
...@@ -1363,23 +1519,29 @@ ...@@ -1363,23 +1519,29 @@
this.diningSituations.diningSituationsRequestDate = this.dataRangeArr[this.dataRangeIndex] this.diningSituations.diningSituationsRequestDate = this.dataRangeArr[this.dataRangeIndex]
.startDate; .startDate;
let tmpDate = this.formatDateTwo(this.minDate); let tmpDate = this.formatDateTwo(this.minDate);
this.queryNotRepastDetails(this.dataRangeArr[this.dataRangeIndex].startDate, this.dataRangeArr[this this.queryConsumerDetail(this.dataRangeArr[this.dataRangeIndex].startDate, this.dataRangeArr[this
.dataRangeIndex].endDate).then(() => { .dataRangeIndex].endDate);
if (this.diningSituations.notRepastDetailsDTOS) {
let today = this.diningSituations.notRepastDetailsDTOS.filter(e => e.repastDate ===
tmpDate)[
0];
this.diningSituations.notRepastDetails = today;
} else {
this.diningSituations.notRepastDetails = {};
}
});
this.queryConsumerSummaryAmount(); this.queryConsumerSummaryAmount();
this.queryLivingCostsAmount();
this.queryIsDredgeMember(1002, 1).then(() => { this.queryIsDredgeMember(1002, 1).then(() => {
if (this.isOpen) { if (this.isOpen) {
this.queryConsumerSummaryAmount(1).then(e => this.piechart()); this.queryConsumerSummaryAmount(1).then(e => this.piechart());
this.queryLivingCostsAmount();
this.queryDayConsumerTrend(1).then(e => this.linechart(this this.queryDayConsumerTrend(1).then(e => this.linechart(this
.reportTypeIndex)); .reportTypeIndex));
this.queryNotRepastDetails(this.dataRangeArr[this.dataRangeIndex].startDate, this
.dataRangeArr[this
.dataRangeIndex].endDate).then(() => {
if (this.diningSituations.notRepastDetailsDTOS) {
let today = this.diningSituations.notRepastDetailsDTOS.filter(e =>
e.repastDate ===
tmpDate)[
0];
this.diningSituations.notRepastDetails = today;
} else {
this.diningSituations.notRepastDetails = {};
}
});
// this.queryMealPalAnalyse().then(() => this.mealPalBarchart()); // this.queryMealPalAnalyse().then(() => this.mealPalBarchart());
// this.queryRepastTimeTrend().then(() => { // this.queryRepastTimeTrend().then(() => {
// if (this.mealtypeArr.indexOf(1) != -1) { // if (this.mealtypeArr.indexOf(1) != -1) {
...@@ -1400,6 +1562,7 @@ ...@@ -1400,6 +1562,7 @@
// }) // })
} else { } else {
this.queryConsumerSummaryAmount(); this.queryConsumerSummaryAmount();
this.queryLivingCostsAmount();
this.queryDayConsumerTrend(); this.queryDayConsumerTrend();
} }
}) })
...@@ -1606,6 +1769,9 @@ ...@@ -1606,6 +1769,9 @@
formatDateTwo(date) { formatDateTwo(date) {
return `${date.getFullYear()}-${date.getMonth()<9?'0'+(date.getMonth()+1):date.getMonth()+1}-${date.getDate()<10?'0'+date.getDate():date.getDate()}`; return `${date.getFullYear()}-${date.getMonth()<9?'0'+(date.getMonth()+1):date.getMonth()+1}-${date.getDate()<10?'0'+date.getDate():date.getDate()}`;
}, },
formatDateThree(date) {
return date.slice(5, 7) + '/' + date.slice(8);
},
dateSelect(date) { dateSelect(date) {
this.diningSituations.diningSituationsDate = this.formatDate(date); this.diningSituations.diningSituationsDate = this.formatDate(date);
var dateStr = var dateStr =
...@@ -2385,6 +2551,133 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -2385,6 +2551,133 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
}) })
} }
}, },
sortCalculateType: function(a, b) {
return a.calculateType - b.calculateType;
},
// 获取日期数组
enumerateDaysBetweenDates: function(startDate, endDate) { // startDate必须小于endDate,且二者不相等
let daysList = [];
let SDate = moment(startDate);
let EDate = moment(endDate);
let xt;
daysList.push(SDate.format("MM/DD"));
while (SDate.add(1, "days").isBefore(EDate)) { // 注意这里add方法处理后SDate对象已经改变。
daysList.push(SDate.format("MM/DD"));
}
daysList.push(EDate.format("MM/DD"));
return daysList;
},
// 查询消费明细
async queryConsumerDetail(startDate, endDate) {
try {
let data = await this.$http.get({
url: gHost +
'/report-push/campus-consumer-report/queryConsumerDetail'
}, {
schoolId: getQueryParams('schoolId'),
userId: getQueryParams('userId'),
startDate,
endDate,
timeType: this.dataRangeIndex == 0 ? 2 : 1
})
if (data.code == 200) {
if (data.obj && data.obj.campusConsumerDetailList && Array.isArray(data.obj
.campusConsumerDetailList) && data.obj.campusConsumerDetailList.length && data.obj
.campusConsumerDetailCalculateList && Array.isArray(data.obj
.campusConsumerDetailCalculateList) && data.obj.campusConsumerDetailCalculateList
.length) {
this.campusConsumerDetailObj = data.obj;
this.campusConsumerDetailObj.campusConsumerDetailList.forEach(e => {
e.currentDate = this.formatDateThree(e.currentDate);
e.consumerDetailsArr = Object.values(e);
})
this.campusConsumerDetailObj.campusConsumerDetailCalculateList.sort(this
.sortCalculateType);
this.campusConsumerDetailObj.campusConsumerDetailCalculateList.forEach((e, index) => {
e.calculateType = ['均值(元)', '较上月', '就餐(次)', '未就餐(次)', '总计(元)'][e
.calculateType -
1
];
if (e.calculateType == '较上月') {
for (let item in e) {
if (item != 'calculateType') {
e[item] = e[item] > 0 ? e[item] +
'%↑' : (e[item] < 0 ? e[item].toString().slice(1) + '%↓' :
0);
}
}
}
e.consumerDetailsSumArr = Object.values(e);
})
if (this.campusConsumerDetailObj.campusConsumerDetailCalculateList[4]) {
// 食堂消费=总消费-其他消费
this.consumerDetailCalculateObj.canteenData = this.campusConsumerDetailObj
.campusConsumerDetailCalculateList[4].totalAmount - this.campusConsumerDetailObj
.campusConsumerDetailCalculateList[4].otherAmount;
// 总消费
this.consumerDetailCalculateObj.totalData = this.campusConsumerDetailObj
.campusConsumerDetailCalculateList[4].totalAmount;
}
if (this.campusConsumerDetailObj.campusConsumerDetailCalculateList[2]) {
// 就餐次数
this.consumerDetailCalculateObj.cateringNumber = this.campusConsumerDetailObj
.campusConsumerDetailCalculateList[2].totalAmount;
}
if (this.campusConsumerDetailObj.campusConsumerDetailCalculateList[3]) {
// 未就餐次数
this.consumerDetailCalculateObj.notCateringNumber = this.campusConsumerDetailObj
.campusConsumerDetailCalculateList[3].totalAmount;
}
}
} else if (data.code == 500) { // 暂无消费数据
let tmpDetailList = [];
let dateList = this.enumerateDaysBetweenDates(startDate, endDate);
dateList.forEach(e => {
tmpDetailList.push({
"currentDate": e,
"breakfastAmount": 0,
"lunchAmount": 0,
"supperAmount": 0,
"otherAmount": 0,
"totalAmount": 0,
"consumerDetailsArr": [e, 0, 0, 0, 0, 0]
})
});
this.campusConsumerDetailObj.campusConsumerDetailList = JSON.parse(JSON.stringify(
tmpDetailList));
let tmpCalculatList = [];
let calculateTypeList = ['均值(元)', '较上月', '就餐(次)', '未就餐(次)', '总计(元)'];
calculateTypeList.forEach(e => {
tmpCalculatList.push({
"calculateType": e,
"breakfastAmount": 0,
"lunchAmount": 0,
"supperAmount": 0,
"otherAmount": 0,
"totalAmount": 0,
"consumerDetailsSumArr": [e, 0, 0, 0, 0, 0]
})
});
this.campusConsumerDetailObj.campusConsumerDetailCalculateList = JSON.parse(JSON.stringify(
tmpCalculatList));
} else {
uni.showToast({
icon: "none",
mask: true,
title: data.msg
})
return
}
} catch (e) {
//TODO handle the exception
console.log(e);
uni.showToast({
icon: "none",
mask: true,
title: e.message
})
}
},
// 查询就餐情况 // 查询就餐情况
async queryNotRepastDetails(startDate, endDate) { async queryNotRepastDetails(startDate, endDate) {
try { try {
...@@ -2496,7 +2789,6 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -2496,7 +2789,6 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
title: data.msg title: data.msg
}) })
return return
} }
if (!data.obj) return; if (!data.obj) return;
if (data.obj.length) { if (data.obj.length) {
...@@ -2517,24 +2809,86 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -2517,24 +2809,86 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
}] }]
] ]
} }
this.consumerAmountObj = tmpObj; // this.consumerAmountObj = tmpObj;
this.isReasonable = this.consumerAmountObj.gtgraderate >= 40 && this // this.isReasonable = this.consumerAmountObj.gtgraderate >= 40 && this
.consumerAmountObj.gtgraderate <= // .consumerAmountObj.gtgraderate <=
60 ? false : true; // 60 ? false : true;
// const sortArr = this.numsort({
// name: 'schoolAverageHeight',
// num: this.consumerAmountObj.schoolavgamount
// }, {
// name: 'userConsumeHeight',
// num: this.consumerAmountObj.consumergrossamount
// }, {
// name: 'gradeAverageHeight',
// num: this.consumerAmountObj.gradeavgamount
// });
// const tempArr = [this.consumerAmountObj.schoolavgamount, this
// .consumerAmountObj
// .consumergrossamount,
// this.consumerAmountObj.gradeavgamount
// ];
// const heightArr = Object.keys(this.counterArray(tempArr)).length == 1 ? [
// 139, 139, 139
// ] : (
// Object.keys(this.counterArray(tempArr)).length == 2 ? [139, 139,
// 160
// ] : [139, 160, 192]
// );
// sortArr.forEach(e => {
// this[e.name] = heightArr[e.tag]
// })
}
} catch (e) {
//TODO handle the exception
console.log(e);
uni.showToast({
icon: "none",
mask: true,
title: e.message
})
}
},
livingCostType: function(a, b) {
return a.livingCostType - b.livingCostType;
},
// 查询生活费额度
async queryLivingCostsAmount() {
try {
let data = await this.$http.get({
url: gHost +
'/report-push/campus-consumer-report/queryLivingCostsAmount'
}, {
schoolId: getQueryParams('schoolId'),
userId: getQueryParams('userId'),
startDate: this.dataRangeArr[this.dataRangeIndex].startDate,
endDate: this.dataRangeArr[this.dataRangeIndex].endDate,
timeType: this.dataRangeIndex == 0 ? 2 : 1
})
if (data.code != 200) {
uni.showToast({
icon: "none",
mask: true,
title: data.msg
})
return
}
if (!data.obj) return;
if (data.obj.length) {
this.consumerAmountObj = data.obj;
this.consumerAmountObj.sort(this.livingCostType);
const sortArr = this.numsort({ const sortArr = this.numsort({
name: 'schoolAverageHeight', name: 'schoolAverageHeight',
num: this.consumerAmountObj.schoolavgamount num: this.consumerAmountObj[2].livingCostAmount
}, {
name: 'userConsumeHeight',
num: this.consumerAmountObj.consumergrossamount
}, { }, {
name: 'gradeAverageHeight', name: 'gradeAverageHeight',
num: this.consumerAmountObj.gradeavgamount num: this.consumerAmountObj[1].livingCostAmount
}, {
name: 'userConsumeHeight',
num: this.consumerAmountObj[0].livingCostAmount
}); });
const tempArr = [this.consumerAmountObj.schoolavgamount, this const tempArr = [this.consumerAmountObj[2].livingCostAmount, this.consumerAmountObj[1]
.consumerAmountObj .livingCostAmount, this.consumerAmountObj[0].livingCostAmount
.consumergrossamount,
this.consumerAmountObj.gradeavgamount
]; ];
const heightArr = Object.keys(this.counterArray(tempArr)).length == 1 ? [ const heightArr = Object.keys(this.counterArray(tempArr)).length == 1 ? [
139, 139, 139 139, 139, 139
...@@ -2546,6 +2900,23 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -2546,6 +2900,23 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
sortArr.forEach(e => { sortArr.forEach(e => {
this[e.name] = heightArr[e.tag] this[e.name] = heightArr[e.tag]
}) })
if (this.consumerAmountObj[0]) {
this.livingExpensesAllowance.userConsumeAmount = this.consumerAmountObj[0]
.livingCostAmount; //本月
}
if (this.consumerAmountObj[1]) {
this.livingExpensesAllowance.gradeAverageAmount = this.consumerAmountObj[1]
.livingCostAmount; //上月
this.livingExpensesAllowance.lastMonthRate = this.consumerAmountObj[1].rate;
this.livingExpensesAllowance.lastMonthRateStr = this.consumerAmountObj[1].rate > 0 ? this
.consumerAmountObj[1].rate + '%' : (this.consumerAmountObj[1].rate < 0 ? this
.consumerAmountObj[1].rate.toString()
.slice(1) + '%' : 0 + '%');
}
if (this.consumerAmountObj[2]) {
this.livingExpensesAllowance.schoolAverageAmount = this.consumerAmountObj[2]
.livingCostAmount; //上上月
}
} }
} catch (e) { } catch (e) {
//TODO handle the exception //TODO handle the exception
...@@ -2632,7 +3003,8 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -2632,7 +3003,8 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
return return
} }
this.mealPalData = data.obj || []; this.mealPalData = data.obj || [];
this.mealPalArr = this.mealPalData.length ? this.mealPalData.map(v => v.mealpalname.slice(0, 1) + this.mealPalArr = this.mealPalData.length ? this.mealPalData.map(v => v.mealpalname
.slice(0, 1) +
'**') : []; '**') : [];
this.mealPalStr = this.mealPalArr.length ? this.mealPalArr.join('') : ''; this.mealPalStr = this.mealPalArr.length ? this.mealPalArr.join('') : '';
} catch (e) { } catch (e) {
...@@ -2651,15 +3023,19 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -2651,15 +3023,19 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
var breakfastAbnormalArr = []; var breakfastAbnormalArr = [];
var breakfastAbnormalStr = ''; var breakfastAbnormalStr = '';
if (breakfastArr.length && breakfastArr[0].cateringList) { if (breakfastArr.length && breakfastArr[0].cateringList) {
breakfastAbnormalArr = breakfastArr[0].cateringList.filter(e => e.repastType == 2 || e.repastType == 3) breakfastAbnormalArr = breakfastArr[0].cateringList.filter(e => e.repastType == 2 || e
.map(e => e.repasttime.slice(8, 9) ? e.repasttime.slice(8) : e.repasttime.slice(8, 9)) .repastType == 3)
.map(e => e.repasttime.slice(8, 9) ? e.repasttime.slice(8) : e.repasttime.slice(8,
9))
if (breakfastAbnormalArr.length > 1) { if (breakfastAbnormalArr.length > 1) {
for (var i = 0; i < breakfastAbnormalArr.length - 1; i++) { for (var i = 0; i < breakfastAbnormalArr.length - 1; i++) {
breakfastAbnormalStr += breakfastAbnormalArr[i] + '日、'; breakfastAbnormalStr += breakfastAbnormalArr[i] + '日、';
} }
breakfastAbnormalStr += breakfastAbnormalArr[breakfastAbnormalArr.length - 1] + ''; breakfastAbnormalStr += breakfastAbnormalArr[breakfastAbnormalArr.length - 1] +
'';
} else if (breakfastAbnormalArr.length == 1) { } else if (breakfastAbnormalArr.length == 1) {
breakfastAbnormalStr += breakfastAbnormalArr[breakfastAbnormalArr.length - 1] + ''; breakfastAbnormalStr += breakfastAbnormalArr[breakfastAbnormalArr.length - 1] +
'';
} }
} }
return breakfastAbnormalStr; return breakfastAbnormalStr;
...@@ -2684,20 +3060,26 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -2684,20 +3060,26 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
title: data.message title: data.message
}) })
return return
} }
if (data.obj) { if (data.obj) {
this.mealtimeTrendsData = data.obj this.mealtimeTrendsData = data.obj
} }
if (data.obj && data.obj.filter(e => e.mealtype == 1).length && data.obj.filter(e => e.mealtype == if (data.obj && data.obj.filter(e => e.mealtype == 1).length && data.obj.filter(
e => e.mealtype ==
1)[0].cateringList) { 1)[0].cateringList) {
this.mealtypeArr.push(1) this.mealtypeArr.push(1)
} }
if (data.obj && data.obj.filter(e => e.mealtype == 2).length && data.obj.filter(e => e.mealtype == if (data.obj && data.obj.filter(e => e.mealtype == 2).length && data.obj.filter(
e => e.mealtype ==
2)[0] 2)[0]
.cateringList) { .cateringList) {
this.mealtypeArr.push(2) this.mealtypeArr.push(2)
} }
if (data.obj && data.obj.filter(e => e.mealtype == 3).length && data.obj.filter(e => e.mealtype == if (data.obj && data.obj.filter(e => e.mealtype == 3).length && data.obj.filter(
e => e.mealtype ==
3)[0] 3)[0]
.cateringList) { .cateringList) {
this.mealtypeArr.push(3) this.mealtypeArr.push(3)
...@@ -2733,6 +3115,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -2733,6 +3115,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
title: data.message title: data.message
}) })
return return
} }
this.pubTalkReport = data.data || {}; this.pubTalkReport = data.data || {};
if (!this.pubTalkReport.talkText5 && !this.pubTalkReport if (!this.pubTalkReport.talkText5 && !this.pubTalkReport
...@@ -2823,6 +3206,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -2823,6 +3206,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
'4rpx solid #F9793F' : '4rpx solid #F9793F' :
'4rpx solid rgba(0, 0, 0, 0.25)' '4rpx solid rgba(0, 0, 0, 0.25)'
}) })
} }
}) })
this.attendanceReportDatail = tempList || []; this.attendanceReportDatail = tempList || [];
...@@ -3148,7 +3532,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -3148,7 +3532,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
.user-avatar { .user-avatar {
width: 88rpx; width: 88rpx;
height: 88rpx; height: 88rpx;
background: no-repeat center/100% url(../../static/images/avatar.png); background: no-repeat center/100% url(https://xiaopay2020.oss-cn-shenzhen.aliyuncs.com/static/weapp/SchoolReport/avatar.png);
} }
.user-info { .user-info {
...@@ -3200,7 +3584,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -3200,7 +3584,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
.triangle { .triangle {
width: 21rpx; width: 21rpx;
height: 10rpx; height: 10rpx;
background: no-repeat center/100% url(../../static/images/grayTriangle.png); background: no-repeat center/100% url(https://xiaopay2020.oss-cn-shenzhen.aliyuncs.com/static/weapp/SchoolReport/grayTriangle.png);
} }
} }
...@@ -3221,7 +3605,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -3221,7 +3605,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
.triangle { .triangle {
width: 21rpx; width: 21rpx;
height: 10rpx; height: 10rpx;
background: no-repeat center/100% url(../../static/images/grayTriangle.png); background: no-repeat center/100% url(https://xiaopay2020.oss-cn-shenzhen.aliyuncs.com/static/weapp/SchoolReport/grayTriangle.png);
} }
} }
} }
...@@ -3282,7 +3666,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -3282,7 +3666,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
.share-button-img { .share-button-img {
width: 26rpx; width: 26rpx;
height: 26rpx; height: 26rpx;
background: no-repeat center/100% url(../../static/images/share.png); background: no-repeat center/100% url(https://xiaopay2020.oss-cn-shenzhen.aliyuncs.com/static/weapp/SchoolReport/share.png);
margin-right: 11rpx; margin-right: 11rpx;
} }
...@@ -3302,19 +3686,19 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -3302,19 +3686,19 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
.consumer-report-bgImg { .consumer-report-bgImg {
width: 100%; width: 100%;
height: 452rpx; height: 452rpx;
background: no-repeat center/100% url(../../static/images/consumeReportBg.png); background: no-repeat center/100% url(https://xiaopay2020.oss-cn-shenzhen.aliyuncs.com/static/weapp/SchoolReport/consumeReportBg.png);
} }
.attendance-report-bgImg { .attendance-report-bgImg {
width: 100%; width: 100%;
height: 452rpx; height: 452rpx;
background: no-repeat center/100% url(../../static/images/attendanceReportBg.png); background: no-repeat center/100% url(https://xiaopay2020.oss-cn-shenzhen.aliyuncs.com/static/weapp/SchoolReport/attendanceReportBg.png);
} }
.pubTalk-report-bgImg { .pubTalk-report-bgImg {
width: 100%; width: 100%;
height: 452rpx; height: 452rpx;
background: no-repeat center/100% url(../../static/images/pubTalkReportBg.png); background: no-repeat center/100% url(https://xiaopay2020.oss-cn-shenzhen.aliyuncs.com/static/weapp/SchoolReport/pubTalkReportBg.png);
} }
.school-report-context-card-title { .school-report-context-card-title {
...@@ -3324,7 +3708,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -3324,7 +3708,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
.school-report-context-card-title-img { .school-report-context-card-title-img {
width: 318rpx; width: 318rpx;
background: no-repeat center/100% url(../../static/images/cardBg.png); background: no-repeat center/100% url(https://xiaopay2020.oss-cn-shenzhen.aliyuncs.com/static/weapp/SchoolReport/cardBg.png);
font-size: 32rpx; font-size: 32rpx;
font-family: PingFangSC-Semibold, PingFang SC; font-family: PingFangSC-Semibold, PingFang SC;
font-weight: 600; font-weight: 600;
...@@ -3353,7 +3737,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -3353,7 +3737,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
.consumer-report-img { .consumer-report-img {
width: 428rpx; width: 428rpx;
height: 428rpx; height: 428rpx;
background: no-repeat center/100% url(../../static/images/consumeReport.png); background: no-repeat center/100% url(https://xiaopay2020.oss-cn-shenzhen.aliyuncs.com/static/weapp/SchoolReport/consumeReport.png);
position: absolute; position: absolute;
top: -172rpx; top: -172rpx;
left: 160rpx; left: 160rpx;
...@@ -3362,7 +3746,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -3362,7 +3746,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
.attendance-report-img { .attendance-report-img {
width: 428rpx; width: 428rpx;
height: 428rpx; height: 428rpx;
background: no-repeat center/100% url(../../static/images/attendanceReport.png); background: no-repeat center/100% url(https://xiaopay2020.oss-cn-shenzhen.aliyuncs.com/static/weapp/SchoolReport/attendanceReport.png);
position: absolute; position: absolute;
top: -172rpx; top: -172rpx;
left: 160rpx; left: 160rpx;
...@@ -3371,7 +3755,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -3371,7 +3755,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
.pubTalk-report-img { .pubTalk-report-img {
width: 428rpx; width: 428rpx;
height: 428rpx; height: 428rpx;
background: no-repeat center/100% url(../../static/images/pubTalkReport.png); background: no-repeat center/100% url(https://xiaopay2020.oss-cn-shenzhen.aliyuncs.com/static/weapp/SchoolReport/pubTalkReport.png);
position: absolute; position: absolute;
top: -172rpx; top: -172rpx;
left: 160rpx; left: 160rpx;
...@@ -3383,6 +3767,34 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -3383,6 +3767,34 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
position: absolute; position: absolute;
top: 163rpx; top: 163rpx;
.school-report-context-card-one-context-nodata {
box-sizing: border-box;
display: flex;
align-items: center;
flex-direction: column;
padding: 80rpx 0 0;
box-sizing: border-box;
.card-one-nodata-img {
width: 500rpx;
height: 232rpx;
image {
width: 100%;
height: 100%;
}
}
.card-one-nodata-txt {
height: 40rpx;
font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: rgba(0, 0, 0, 0.45);
line-height: 40rpx;
}
}
.school-report-context-card-one-context-item { .school-report-context-card-one-context-item {
margin: 0 0 32rpx; margin: 0 0 32rpx;
display: flex; display: flex;
...@@ -3485,16 +3897,26 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -3485,16 +3897,26 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
} }
.school-report-context-card-two { .school-report-context-card-two {
height: 876rpx;
background: #FFFFFF; background: #FFFFFF;
border-radius: 16rpx; border-radius: 16rpx;
margin-bottom: 40rpx; margin-bottom: 40rpx;
.school-report-context-card-nodata {
height: 40rpx;
font-size: 28rpx;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
text-align: center;
color: orangered;
line-height: 40rpx;
margin: 40rpx 0 0;
}
.school-report-context-card-two-conclusion { .school-report-context-card-two-conclusion {
height: 40rpx; height: 40rpx;
padding: 0 40rpx 0 30rpx; padding: 0 40rpx 0 30rpx;
box-sizing: border-box; box-sizing: border-box;
margin: 40rpx 0 32rpx; margin: 0 0 32rpx;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
font-size: 28rpx; font-size: 28rpx;
...@@ -3603,7 +4025,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -3603,7 +4025,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
.school-report-context-card-two-details { .school-report-context-card-two-details {
height: 132rpx; height: 132rpx;
background: no-repeat center/100% url(../../static/images/diningSituations.png); background: no-repeat center/100% url(https://xiaopay2020.oss-cn-shenzhen.aliyuncs.com/static/weapp/SchoolReport/diningSituations.png);
padding: 55rpx 42rpx 30rpx 29rpx; padding: 55rpx 42rpx 30rpx 29rpx;
box-sizing: border-box; box-sizing: border-box;
border-radius: 0 0 16rpx 16rpx; border-radius: 0 0 16rpx 16rpx;
...@@ -3829,7 +4251,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -3829,7 +4251,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
/deep/ .champion-day { /deep/ .champion-day {
color: #DAA000; color: #DAA000;
background: url(../../static/images/champion.png) no-repeat -4rpx center/100%; background: url(https://xiaopay2020.oss-cn-shenzhen.aliyuncs.com/static/weapp/SchoolReport/champion.png) no-repeat -4rpx center/100%;
border-radius: 22rpx; border-radius: 22rpx;
width: 88rpx; width: 88rpx;
height: 88rpx; height: 88rpx;
...@@ -3838,7 +4260,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -3838,7 +4260,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
/deep/ .progress-day { /deep/ .progress-day {
color: #DAA000; color: #DAA000;
background: url(../../static/images/progress.png) no-repeat -2rpx center/100%; background: url(https://xiaopay2020.oss-cn-shenzhen.aliyuncs.com/static/weapp/SchoolReport/progress.png) no-repeat -2rpx center/100%;
border-radius: 22rpx; border-radius: 22rpx;
width: 88rpx; width: 88rpx;
height: 88rpx; height: 88rpx;
...@@ -3868,7 +4290,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -3868,7 +4290,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
.attendance-report-context-card-two-details-time-img { .attendance-report-context-card-two-details-time-img {
width: 25rpx; width: 25rpx;
height: 25rpx; height: 25rpx;
background: no-repeat center/100% url(../../static/images/attendanceTime.png); background: no-repeat center/100% url(https://xiaopay2020.oss-cn-shenzhen.aliyuncs.com/static/weapp/SchoolReport/attendanceTime.png);
} }
.attendance-report-context-card-two-details-time-txt { .attendance-report-context-card-two-details-time-txt {
...@@ -3999,14 +4421,14 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -3999,14 +4421,14 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
.early-champions-img { .early-champions-img {
width: 32rpx; width: 32rpx;
height: 29rpx; height: 29rpx;
background: no-repeat center/100% url(../../static/images/champions.png); background: no-repeat center/100% url(https://xiaopay2020.oss-cn-shenzhen.aliyuncs.com/static/weapp/SchoolReport/champions.png);
margin-right: 2rpx; margin-right: 2rpx;
} }
.progress-img { .progress-img {
width: 30rpx; width: 30rpx;
height: 29rpx; height: 29rpx;
background: no-repeat center/100% url(../../static/images/progressIcon.png); background: no-repeat center/100% url(https://xiaopay2020.oss-cn-shenzhen.aliyuncs.com/static/weapp/SchoolReport/progressIcon.png);
margin-right: 2rpx; margin-right: 2rpx;
} }
...@@ -4041,7 +4463,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -4041,7 +4463,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
.attendance-report-time-details-icon { .attendance-report-time-details-icon {
width: 21rpx; width: 21rpx;
height: 12rpx; height: 12rpx;
background: no-repeat center/100% url(../../static/images/arrowUp.png); background: no-repeat center/100% url(https://xiaopay2020.oss-cn-shenzhen.aliyuncs.com/static/weapp/SchoolReport/arrowUp.png);
// margin-left: 30rpx; // margin-left: 30rpx;
} }
} }
...@@ -4079,7 +4501,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -4079,7 +4501,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
margin: 78rpx 0 0 107rpx; margin: 78rpx 0 0 107rpx;
width: 474rpx; width: 474rpx;
height: 235rpx; height: 235rpx;
background: no-repeat center/100% url(../../static/images/noAttendanceReportDatailData.png); background: no-repeat center/100% url(https://xiaopay2020.oss-cn-shenzhen.aliyuncs.com/static/weapp/SchoolReport/noAttendanceReportDatailData.png);
} }
} }
...@@ -4203,6 +4625,12 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -4203,6 +4625,12 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
line-height: 40rpx; line-height: 40rpx;
margin-left: 30rpx; margin-left: 30rpx;
&.card-three-conclusion-nodata {
text-align: center;
margin: 0;
color: orangered;
}
.school-report-context-card-three-conclusion-item-describe { .school-report-context-card-three-conclusion-item-describe {
color: #04B871; color: #04B871;
} }
...@@ -4234,10 +4662,20 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -4234,10 +4662,20 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
line-height: 40rpx; line-height: 40rpx;
margin: 0 40rpx 0 30rpx; margin: 0 40rpx 0 30rpx;
&.card-four-conclusion-nodata {
margin: 0;
text-align: center;
color: orangered;
}
.consume-total { .consume-total {
color: #04B871; color: #04B871;
margin: 0 6rpx; margin: 0 6rpx;
} }
.livingCostUp {
transform: rotate(180deg);
}
} }
} }
...@@ -4274,6 +4712,10 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -4274,6 +4712,10 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
max-height: 100%; max-height: 100%;
} }
} }
&.last-month {
margin: 0 74rpx 0;
}
} }
.user-consume { .user-consume {
...@@ -4285,7 +4727,6 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -4285,7 +4727,6 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
align-items: center; align-items: center;
padding: 14rpx 0 0; padding: 14rpx 0 0;
box-sizing: border-box; box-sizing: border-box;
margin: 0 74rpx 0;
.user-consume-img { .user-consume-img {
width: 52rpx; width: 52rpx;
...@@ -4316,7 +4757,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -4316,7 +4757,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
line-height: 40rpx; line-height: 40rpx;
&.consume-des { &.consume-des {
margin: 0 64rpx 0 74rpx; margin: 0 128rpx 0 116rpx;
} }
} }
} }
...@@ -4341,6 +4782,12 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -4341,6 +4782,12 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
color: rgba(0, 0, 0, 0.85); color: rgba(0, 0, 0, 0.85);
line-height: 40rpx; line-height: 40rpx;
&.card-five-conclusion-nodata {
margin: 0;
text-align: center;
color: orangered;
}
.abnormal-date { .abnormal-date {
color: #04B871; color: #04B871;
} }
...@@ -4562,12 +5009,158 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -4562,12 +5009,158 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
} }
} }
.school-report-context-card-eight {
background: #FFFFFF;
border-radius: 16rpx;
margin: 0 0 40rpx;
.school-report-context-card-eight-conclusion {
margin: 40rpx 0 30rpx;
.school-report-context-card-eight-conclusion-item {
height: 40rpx;
font-size: 28rpx;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: rgba(0, 0, 0, 0.85);
line-height: 40rpx;
padding-left: 30rpx;
box-sizing: border-box;
&.eight-conclusion-nodata {
text-align: center;
color: orangered;
padding: 0;
}
.txt-important {
color: #04B871;
margin: 0 4rpx;
}
}
}
.school-report-context-card-eight-details {
.consumer-details-header {
height: 74rpx;
background: #F0F0F0;
padding: 19rpx 0;
box-sizing: border-box;
display: flex;
justify-content: space-around;
align-items: center;
.consumer-details-header-item {
font-size: 26rpx;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: rgba(0, 0, 0, 0.85);
}
}
.consumer-details-body-box {
max-height: 630rpx;
overflow: auto;
.consumer-details-body {
height: 74rpx;
border-radius: 47rpx;
display: flex;
margin: 16rpx 0 0;
.consumer-details-body-item {
width: calc(17%);
text-align: center;
font-size: 26rpx;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: rgba(0, 0, 0, 0.75);
line-height: 74rpx;
&.consumer-details-body-data {
font-family: DINPro-Medium, DINPro;
font-weight: 500;
color: rgba(0, 0, 0, 0.85);
}
}
}
}
.consumer-details-body-notice-box {
margin: 16rpx 0 23rpx;
height: 40rpx;
display: flex;
justify-content: center;
.consumer-details-body-notice {
width: 225rpx;
display: flex;
justify-content: space-between;
.consumer-details-body-notice-txt {
font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: rgba(0, 0, 0, 0.31);
line-height: 40rpx;
}
.consumer-details-body-notice-icon {
width: 38rpx;
height: 29rpx;
image {
width: 100%;
height: 100%;
}
}
}
}
.consumer-details-sum {
height: 74rpx;
display: flex;
margin: 0 0 16rpx;
.consumer-details-sum-item {
width: calc(16.4%);
text-align: center;
font-size: 26rpx;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: rgba(0, 0, 0, 0.65);
line-height: 74rpx;
&.consumer-details-sum-type {
font-size: 24rpx;
color: rgba(0, 0, 0, 0.85);
text-align: left;
padding-left: 12rpx;
box-sizing: border-box;
}
.type-unit {
font-size: 20rpx;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: rgba(0, 0, 0, 0.45);
text-align: left;
}
}
.consumer-details-sum-item:first-of-type {
width: calc(18%);
}
}
}
}
.school-report-footer { .school-report-footer {
height: 169rpx; height: 169rpx;
margin: 40rpx 0 43rpx; margin: 40rpx 0 43rpx;
padding: 33rpx 34rpx 42rpx 42rpx; padding: 33rpx 34rpx 42rpx 42rpx;
box-sizing: border-box; box-sizing: border-box;
background: no-repeat center/100% url(../../static/images/extendPermissionsBg.png); background: no-repeat center/100% url(https://xiaopay2020.oss-cn-shenzhen.aliyuncs.com/static/weapp/SchoolReport/extendPermissionsBg.png);
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
...@@ -4646,7 +5239,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -4646,7 +5239,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
.no-open-solution-item { .no-open-solution-item {
width: 15rpx; width: 15rpx;
height: 20rpx; height: 20rpx;
background: no-repeat center/100% url(../../static/images/rightArrow.png); background: no-repeat center/100% url(https://xiaopay2020.oss-cn-shenzhen.aliyuncs.com/static/weapp/SchoolReport/rightArrow.png);
} }
} }
...@@ -4656,7 +5249,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -4656,7 +5249,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
.open-results-title { .open-results-title {
width: 100%; width: 100%;
height: 83rpx; height: 83rpx;
background: url(../../static/images/openbgm.png) center/100% no-repeat; background: url(https://xiaopay2020.oss-cn-shenzhen.aliyuncs.com/static/weapp/SchoolReport/openbgm.png) center/100% no-repeat;
border-radius: 16rpx 16rpx 0 0; border-radius: 16rpx 16rpx 0 0;
font-size: 28rpx; font-size: 28rpx;
font-family: PingFangSC-Medium, PingFang SC; font-family: PingFangSC-Medium, PingFang SC;
...@@ -4667,7 +5260,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -4667,7 +5260,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
align-items: center; align-items: center;
&.consume-open-results-title { &.consume-open-results-title {
background: url(../../static/images/consumeOpenbgm.png) center/100% no-repeat; background: url(https://xiaopay2020.oss-cn-shenzhen.aliyuncs.com/static/weapp/SchoolReport/consumeOpenbgm.png) center/100% no-repeat;
} }
} }
...@@ -4746,37 +5339,37 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -4746,37 +5339,37 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
.dining-situations-img { .dining-situations-img {
width: 26rpx; width: 26rpx;
height: 21rpx; height: 21rpx;
background: no-repeat center/100% url(../../static/images/repast.png); background: no-repeat center/100% url(https://xiaopay2020.oss-cn-shenzhen.aliyuncs.com/static/weapp/SchoolReport/repast.png);
} }
.meal-pal-img { .meal-pal-img {
width: 26rpx; width: 26rpx;
height: 22rpx; height: 22rpx;
background: no-repeat center/100% url(../../static/images/mealPal.png); background: no-repeat center/100% url(https://xiaopay2020.oss-cn-shenzhen.aliyuncs.com/static/weapp/SchoolReport/mealPal.png);
} }
.consumer-num-img { .consumer-num-img {
width: 22rpx; width: 22rpx;
height: 25rpx; height: 25rpx;
background: no-repeat center/100% url(../../static/images/consumerNum.png); background: no-repeat center/100% url(https://xiaopay2020.oss-cn-shenzhen.aliyuncs.com/static/weapp/SchoolReport/consumerNum.png);
} }
.consumer-preference-img { .consumer-preference-img {
width: 25rpx; width: 25rpx;
height: 23rpx; height: 23rpx;
background: no-repeat center/100% url(../../static/images/consumerPreference.png); background: no-repeat center/100% url(https://xiaopay2020.oss-cn-shenzhen.aliyuncs.com/static/weapp/SchoolReport/consumerPreference.png);
} }
.consumer-trend-img { .consumer-trend-img {
width: 24rpx; width: 24rpx;
height: 21rpx; height: 24rpx;
background: no-repeat center/100% url(../../static/images/consumerTrend.png); background: no-repeat center/100% url(https://xiaopay2020.oss-cn-shenzhen.aliyuncs.com/static/weapp/SchoolReport/consumerTrend.png);
} }
.time-trends-img { .time-trends-img {
width: 25rpx; width: 25rpx;
height: 25rpx; height: 25rpx;
background: no-repeat center/100% url(../../static/images/timeTrends.png); background: no-repeat center/100% url(https://xiaopay2020.oss-cn-shenzhen.aliyuncs.com/static/weapp/SchoolReport/timeTrends.png);
} }
} }
} }
...@@ -4803,28 +5396,28 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -4803,28 +5396,28 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
.admission-notice-img { .admission-notice-img {
width: 30rpx; width: 30rpx;
height: 27rpx; height: 27rpx;
background: no-repeat center/100% url(../../static/images/admissionNotice.png); background: no-repeat center/100% url(https://xiaopay2020.oss-cn-shenzhen.aliyuncs.com/static/weapp/SchoolReport/admissionNotice.png);
margin-right: 23rpx; margin-right: 23rpx;
} }
.admission-analysis-img { .admission-analysis-img {
width: 30rpx; width: 30rpx;
height: 32rpx; height: 32rpx;
background: no-repeat center/100% url(../../static/images/admissionAnalysis.png); background: no-repeat center/100% url(https://xiaopay2020.oss-cn-shenzhen.aliyuncs.com/static/weapp/SchoolReport/admissionAnalysis.png);
margin: 0 25rpx 0 135rpx; margin: 0 25rpx 0 135rpx;
} }
.admission-record-img { .admission-record-img {
width: 29rpx; width: 29rpx;
height: 31rpx; height: 31rpx;
background: no-repeat center/100% url(../../static/images/admissionRecord.png); background: no-repeat center/100% url(https://xiaopay2020.oss-cn-shenzhen.aliyuncs.com/static/weapp/SchoolReport/admissionRecord.png);
margin-right: 24rpx; margin-right: 24rpx;
} }
.admission-image-img { .admission-image-img {
width: 29rpx; width: 29rpx;
height: 29rpx; height: 29rpx;
background: no-repeat center/100% url(../../static/images/admissionImage.png); background: no-repeat center/100% url(https://xiaopay2020.oss-cn-shenzhen.aliyuncs.com/static/weapp/SchoolReport/admissionImage.png);
margin-right: 24rpx; margin-right: 24rpx;
} }
...@@ -4832,56 +5425,56 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -4832,56 +5425,56 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
.video-call-img { .video-call-img {
width: 31rpx; width: 31rpx;
height: 24rpx; height: 24rpx;
background: no-repeat center/100% url(../../static/images/videoCall.png); background: no-repeat center/100% url(https://xiaopay2020.oss-cn-shenzhen.aliyuncs.com/static/weapp/SchoolReport/videoCall.png);
margin-right: 21rpx; margin-right: 21rpx;
} }
.communication-advice-img { .communication-advice-img {
width: 38rpx; width: 38rpx;
height: 31rpx; height: 31rpx;
background: no-repeat center/100% url(../../static/images/communicationAdvice.png); background: no-repeat center/100% url(https://xiaopay2020.oss-cn-shenzhen.aliyuncs.com/static/weapp/SchoolReport/communicationAdvice.png);
margin: 0 24rpx 0 165rpx; margin: 0 24rpx 0 165rpx;
} }
.voice-call-img { .voice-call-img {
width: 25rpx; width: 25rpx;
height: 34rpx; height: 34rpx;
background: no-repeat center/100% url(../../static/images/voiceCall.png); background: no-repeat center/100% url(https://xiaopay2020.oss-cn-shenzhen.aliyuncs.com/static/weapp/SchoolReport/voiceCall.png);
margin-right: 26rpx; margin-right: 26rpx;
} }
.call-count-img { .call-count-img {
width: 30rpx; width: 30rpx;
height: 30rpx; height: 30rpx;
background: no-repeat center/100% url(../../static/images/callCount.png); background: no-repeat center/100% url(https://xiaopay2020.oss-cn-shenzhen.aliyuncs.com/static/weapp/SchoolReport/callCount.png);
margin: 0 31rpx 0 165rpx; margin: 0 31rpx 0 165rpx;
} }
.leave-word-img { .leave-word-img {
width: 30rpx; width: 30rpx;
height: 28rpx; height: 28rpx;
background: no-repeat center/100% url(../../static/images/leaveWord.png); background: no-repeat center/100% url(https://xiaopay2020.oss-cn-shenzhen.aliyuncs.com/static/weapp/SchoolReport/leaveWord.png);
margin-right: 22rpx; margin-right: 22rpx;
} }
.call-duration-img { .call-duration-img {
width: 31rpx; width: 31rpx;
height: 35rpx; height: 35rpx;
background: no-repeat center/100% url(../../static/images/callDuration.png); background: no-repeat center/100% url(https://xiaopay2020.oss-cn-shenzhen.aliyuncs.com/static/weapp/SchoolReport/callDuration.png);
margin: 0 23rpx 0 165rpx; margin: 0 23rpx 0 165rpx;
} }
.face-call-img { .face-call-img {
width: 32rpx; width: 32rpx;
height: 31rpx; height: 31rpx;
background: no-repeat center/100% url(../../static/images/faceCall.png); background: no-repeat center/100% url(https://xiaopay2020.oss-cn-shenzhen.aliyuncs.com/static/weapp/SchoolReport/faceCall.png);
margin-right: 21rpx; margin-right: 21rpx;
} }
.leave-word-analysis-img { .leave-word-analysis-img {
width: 31rpx; width: 31rpx;
height: 31rpx; height: 31rpx;
background: no-repeat center/100% url(../../static/images/leaveWordAnalysis.png); background: no-repeat center/100% url(https://xiaopay2020.oss-cn-shenzhen.aliyuncs.com/static/weapp/SchoolReport/leaveWordAnalysis.png);
margin: 0 23rpx 0 165rpx; margin: 0 23rpx 0 165rpx;
} }
} }
......
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