Commit 5cc29765 authored by 袁玲利's avatar 袁玲利

校园报告

parent c1485ac5
...@@ -89,12 +89,12 @@ ...@@ -89,12 +89,12 @@
"disableHostCheck": true, "disableHostCheck": true,
"proxy": { "proxy": {
"/": { "/": {
"target": "https://uat-pay.xiaopay.net", "target": "https://pay.xiaopay.net",
"changeOrigin": true, "changeOrigin": true,
"secure": false "secure": false
}, },
"/cgi-xpay": { "/cgi-xpay": {
"target": "https://uat-pay.xiaopay.net", "target": "https://pay.xiaopay.net",
"changeOrigin": true, "changeOrigin": true,
"secure": false, "secure": false,
"pathRewrite": { "pathRewrite": {
......
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
class="txt-important"> {{consumerSummaryAmountOBj.canteenamount}} </text> 元,超市和其他场景消费 <text class="txt-important"> {{consumerSummaryAmountOBj.canteenamount}} </text> 元,超市和其他场景消费 <text
class="txt-important">{{consumerSummaryAmountOBj.superAndOtherAmount}}</text>元。孩子在食堂消费<text class="txt-important">{{consumerSummaryAmountOBj.superAndOtherAmount}}</text>元。孩子在食堂消费<text
class="txt-important">占比过低</text>,要注意均衡饮食习惯哦~</view> 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.canteenamount}} </text> 元,超市和其他场景消费<text
class="txt-important"> {{consumerSummaryAmountOBj.superAndOtherAmount}}</text> 元。按时就餐均衡饮食,要继续保持哦~</view> class="txt-important"> {{consumerSummaryAmountOBj.superAndOtherAmount}}</text> 元。按时就餐均衡饮食,要继续保持哦~</view>
</view> </view>
...@@ -1527,7 +1527,7 @@ var gHost = "https://" + window.location.host; ...@@ -1527,7 +1527,7 @@ var gHost = "https://" + window.location.host;
var envVersion = "release"; var envVersion = "release";
var azAppId = "wx5decb3fc29c94953"; var azAppId = "wx5decb3fc29c94953";
if (window.location.protocol != "https:") { if (window.location.protocol != "https:") {
gHost = "https://uat-pay.xiaopay.net"; gHost = "https://pay.xiaopay.net";
envVersion = "trial"; envVersion = "trial";
azAppId = "wx008a4a07f3d9f7a7"; azAppId = "wx008a4a07f3d9f7a7";
} }
...@@ -3401,10 +3401,10 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -3401,10 +3401,10 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
) { ) {
// 食堂消费=总消费-其他消费 // 食堂消费=总消费-其他消费
this.consumerDetailCalculateObj.canteenData = this.consumerDetailCalculateObj.canteenData =
this.campusConsumerDetailObj (this.campusConsumerDetailObj
.campusConsumerDetailCalculateList[4].totalAmount - .campusConsumerDetailCalculateList[4].totalAmount -
this.campusConsumerDetailObj this.campusConsumerDetailObj
.campusConsumerDetailCalculateList[4].otherAmount; .campusConsumerDetailCalculateList[4].otherAmount).toFixed(2);
// 总消费 // 总消费
this.consumerDetailCalculateObj.totalData = this.consumerDetailCalculateObj.totalData =
this.campusConsumerDetailObj.campusConsumerDetailCalculateList[4].totalAmount; this.campusConsumerDetailObj.campusConsumerDetailCalculateList[4].totalAmount;
...@@ -5067,6 +5067,7 @@ uni-page-wrapper { ...@@ -5067,6 +5067,7 @@ uni-page-wrapper {
.school-report-context-card-one-context-item { .school-report-context-card-one-context-item {
display: inline-flex; display: inline-flex;
line-height: 40rpx; line-height: 40rpx;
font-size: 14px;
.school-report-context-card-one-context-dot { .school-report-context-card-one-context-dot {
margin-left: 27rpx; margin-left: 27rpx;
......
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