Merge branch 'v_req_0831'

src/pages/SchoolReport/SchoolReport.vue

@@ -134,7 +134,7 @@
 											class="txt-important"> {{consumerSummaryAmountOBj.canteenamount}} </text> 元，超市和其他场景消费 <text
 											class="txt-important">{{consumerSummaryAmountOBj.superAndOtherAmount}}</text>元。孩子在食堂消费<text
 											class="txt-important">占比过低</text>，要注意均衡饮食习惯哦~</view>
-									<view v-else>食堂消费 <text
+									<view class="school-report-context-card-one-context-txt" v-else>食堂消费 <text
 											class="txt-important"> {{consumerSummaryAmountOBj.canteenamount}} </text> 元，超市和其他场景消费<text
 											class="txt-important"> {{consumerSummaryAmountOBj.superAndOtherAmount}}</text> 元。按时就餐均衡饮食，要继续保持哦~</view>
 							</view>
@@ -3401,10 +3401,10 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
             ) {
               // 食堂消费=总消费-其他消费
               this.consumerDetailCalculateObj.canteenData =
-                this.campusConsumerDetailObj
+                (this.campusConsumerDetailObj
                   .campusConsumerDetailCalculateList[4].totalAmount -
                 this.campusConsumerDetailObj
-                  .campusConsumerDetailCalculateList[4].otherAmount;
+                  .campusConsumerDetailCalculateList[4].otherAmount).toFixed(2);
               // 总消费
               this.consumerDetailCalculateObj.totalData =
                 this.campusConsumerDetailObj.campusConsumerDetailCalculateList[4].totalAmount;
@@ -5067,6 +5067,7 @@ uni-page-wrapper {
           .school-report-context-card-one-context-item {
             display: inline-flex;
             line-height: 40rpx;
+            font-size: 14px;
 
             .school-report-context-card-one-context-dot {
               margin-left: 27rpx;