Commit a650d787 authored by 袁玲利's avatar 袁玲利

校园报告

parent ac2fd620
...@@ -380,17 +380,17 @@ ...@@ -380,17 +380,17 @@
<view class="firstLine"> <view class="firstLine">
<view class="firstCol">合计</view> <view class="firstCol">合计</view>
<view class="lastCol"> <view class="lastCol">
<view>{{consumerAmountObj.campusMealTypeConsumerSummaryList.length && consumerAmountObj.campusMealTypeConsumerSummaryList[0].mealTypeTotalAmount ? consumerAmountObj.campusMealTypeConsumerSummaryList[0].mealTypeTotalAmount : '--'}}</view> <view>{{consumerAmountObj.campusMealTypeConsumerSummaryList && consumerAmountObj.campusMealTypeConsumerSummaryList.length && consumerAmountObj.campusMealTypeConsumerSummaryList[0].mealTypeTotalAmount ? consumerAmountObj.campusMealTypeConsumerSummaryList[0].mealTypeTotalAmount : '--'}}</view>
<view>{{consumerAmountObj.campusMealTypeConsumerSummaryList.length && consumerAmountObj.campusMealTypeConsumerSummaryList[0].gradeMealTypeTotalAmount ? consumerAmountObj.campusMealTypeConsumerSummaryList[0].gradeMealTypeTotalAmount : '--'}}</view> <view>{{consumerAmountObj.campusMealTypeConsumerSummaryList && consumerAmountObj.campusMealTypeConsumerSummaryList.length && consumerAmountObj.campusMealTypeConsumerSummaryList[0].gradeMealTypeTotalAmount ? consumerAmountObj.campusMealTypeConsumerSummaryList[0].gradeMealTypeTotalAmount : '--'}}</view>
<view>{{consumerAmountObj.campusMealTypeConsumerSummaryList.length && consumerAmountObj.campusMealTypeConsumerSummaryList[0].schoolMealTypeTotalAmount ? consumerAmountObj.campusMealTypeConsumerSummaryList[0].schoolMealTypeTotalAmount : '--'}}</view> <view>{{consumerAmountObj.campusMealTypeConsumerSummaryList && consumerAmountObj.campusMealTypeConsumerSummaryList.length && consumerAmountObj.campusMealTypeConsumerSummaryList[0].schoolMealTypeTotalAmount ? consumerAmountObj.campusMealTypeConsumerSummaryList[0].schoolMealTypeTotalAmount : '--'}}</view>
</view> </view>
</view> </view>
<view class="secondLine"> <view class="secondLine">
<view class="firstCol">餐均</view> <view class="firstCol">餐均</view>
<view class="lastCol"> <view class="lastCol">
<view>{{consumerAmountObj.campusMealTypeConsumerSummaryList.length && consumerAmountObj.campusMealTypeConsumerSummaryList[0].mealTypeAvgAmount ? consumerAmountObj.campusMealTypeConsumerSummaryList[0].mealTypeAvgAmount : '--'}}</view> <view>{{consumerAmountObj.campusMealTypeConsumerSummaryList && consumerAmountObj.campusMealTypeConsumerSummaryList.length && consumerAmountObj.campusMealTypeConsumerSummaryList[0].mealTypeAvgAmount ? consumerAmountObj.campusMealTypeConsumerSummaryList[0].mealTypeAvgAmount : '--'}}</view>
<view>{{consumerAmountObj.campusMealTypeConsumerSummaryList.length && consumerAmountObj.campusMealTypeConsumerSummaryList[0].gradeMealTypeAvgAmount ? consumerAmountObj.campusMealTypeConsumerSummaryList[0].gradeMealTypeAvgAmount : '--'}}</view> <view>{{consumerAmountObj.campusMealTypeConsumerSummaryList && consumerAmountObj.campusMealTypeConsumerSummaryList.length && consumerAmountObj.campusMealTypeConsumerSummaryList[0].gradeMealTypeAvgAmount ? consumerAmountObj.campusMealTypeConsumerSummaryList[0].gradeMealTypeAvgAmount : '--'}}</view>
<view>{{consumerAmountObj.campusMealTypeConsumerSummaryList.length && consumerAmountObj.campusMealTypeConsumerSummaryList[0].schoolMealTypeAvgAmount ? consumerAmountObj.campusMealTypeConsumerSummaryList[0].schoolMealTypeAvgAmount : '--'}}</view> <view>{{consumerAmountObj.campusMealTypeConsumerSummaryList && consumerAmountObj.campusMealTypeConsumerSummaryList.length && consumerAmountObj.campusMealTypeConsumerSummaryList[0].schoolMealTypeAvgAmount ? consumerAmountObj.campusMealTypeConsumerSummaryList[0].schoolMealTypeAvgAmount : '--'}}</view>
</view> </view>
</view> </view>
</view> </view>
...@@ -406,17 +406,17 @@ ...@@ -406,17 +406,17 @@
<view class="firstLine"> <view class="firstLine">
<view class="firstCol">合计</view> <view class="firstCol">合计</view>
<view class="lastCol"> <view class="lastCol">
<view>{{consumerAmountObj.campusMealTypeConsumerSummaryList.length && consumerAmountObj.campusMealTypeConsumerSummaryList[1].mealTypeTotalAmount ? consumerAmountObj.campusMealTypeConsumerSummaryList[1].mealTypeTotalAmount : '--'}}</view> <view>{{consumerAmountObj.campusMealTypeConsumerSummaryList && consumerAmountObj.campusMealTypeConsumerSummaryList.length && consumerAmountObj.campusMealTypeConsumerSummaryList[1].mealTypeTotalAmount ? consumerAmountObj.campusMealTypeConsumerSummaryList[1].mealTypeTotalAmount : '--'}}</view>
<view>{{consumerAmountObj.campusMealTypeConsumerSummaryList.length && consumerAmountObj.campusMealTypeConsumerSummaryList[1].gradeMealTypeTotalAmount ? consumerAmountObj.campusMealTypeConsumerSummaryList[1].gradeMealTypeTotalAmount : '--'}}</view> <view>{{consumerAmountObj.campusMealTypeConsumerSummaryList && consumerAmountObj.campusMealTypeConsumerSummaryList.length && consumerAmountObj.campusMealTypeConsumerSummaryList[1].gradeMealTypeTotalAmount ? consumerAmountObj.campusMealTypeConsumerSummaryList[1].gradeMealTypeTotalAmount : '--'}}</view>
<view>{{consumerAmountObj.campusMealTypeConsumerSummaryList.length && consumerAmountObj.campusMealTypeConsumerSummaryList[1].schoolMealTypeTotalAmount ? consumerAmountObj.campusMealTypeConsumerSummaryList[1].schoolMealTypeTotalAmount : '--'}}</view> <view>{{consumerAmountObj.campusMealTypeConsumerSummaryList && consumerAmountObj.campusMealTypeConsumerSummaryList.length && consumerAmountObj.campusMealTypeConsumerSummaryList[1].schoolMealTypeTotalAmount ? consumerAmountObj.campusMealTypeConsumerSummaryList[1].schoolMealTypeTotalAmount : '--'}}</view>
</view> </view>
</view> </view>
<view class="secondLine"> <view class="secondLine">
<view class="firstCol">餐均</view> <view class="firstCol">餐均</view>
<view class="lastCol"> <view class="lastCol">
<view>{{consumerAmountObj.campusMealTypeConsumerSummaryList.length && consumerAmountObj.campusMealTypeConsumerSummaryList[1].mealTypeAvgAmount ? consumerAmountObj.campusMealTypeConsumerSummaryList[1].mealTypeAvgAmount : '--'}}</view> <view>{{consumerAmountObj.campusMealTypeConsumerSummaryList && consumerAmountObj.campusMealTypeConsumerSummaryList.length && consumerAmountObj.campusMealTypeConsumerSummaryList[1].mealTypeAvgAmount ? consumerAmountObj.campusMealTypeConsumerSummaryList[1].mealTypeAvgAmount : '--'}}</view>
<view>{{consumerAmountObj.campusMealTypeConsumerSummaryList.length && consumerAmountObj.campusMealTypeConsumerSummaryList[1].gradeMealTypeAvgAmount ? consumerAmountObj.campusMealTypeConsumerSummaryList[1].gradeMealTypeAvgAmount : '--'}}</view> <view>{{consumerAmountObj.campusMealTypeConsumerSummaryList && consumerAmountObj.campusMealTypeConsumerSummaryList.length && consumerAmountObj.campusMealTypeConsumerSummaryList[1].gradeMealTypeAvgAmount ? consumerAmountObj.campusMealTypeConsumerSummaryList[1].gradeMealTypeAvgAmount : '--'}}</view>
<view>{{consumerAmountObj.campusMealTypeConsumerSummaryList.length && consumerAmountObj.campusMealTypeConsumerSummaryList[1].schoolMealTypeAvgAmount ? consumerAmountObj.campusMealTypeConsumerSummaryList[1].schoolMealTypeAvgAmount : '--'}}</view> <view>{{consumerAmountObj.campusMealTypeConsumerSummaryList && consumerAmountObj.campusMealTypeConsumerSummaryList.length && consumerAmountObj.campusMealTypeConsumerSummaryList[1].schoolMealTypeAvgAmount ? consumerAmountObj.campusMealTypeConsumerSummaryList[1].schoolMealTypeAvgAmount : '--'}}</view>
</view> </view>
</view> </view>
</view> </view>
...@@ -432,17 +432,17 @@ ...@@ -432,17 +432,17 @@
<view class="firstLine"> <view class="firstLine">
<view class="firstCol">合计</view> <view class="firstCol">合计</view>
<view class="lastCol"> <view class="lastCol">
<view>{{consumerAmountObj.campusMealTypeConsumerSummaryList.length && consumerAmountObj.campusMealTypeConsumerSummaryList[2].mealTypeTotalAmount ? consumerAmountObj.campusMealTypeConsumerSummaryList[2].mealTypeTotalAmount : '--'}}</view> <view>{{consumerAmountObj.campusMealTypeConsumerSummaryList && consumerAmountObj.campusMealTypeConsumerSummaryList.length && consumerAmountObj.campusMealTypeConsumerSummaryList[2].mealTypeTotalAmount ? consumerAmountObj.campusMealTypeConsumerSummaryList[2].mealTypeTotalAmount : '--'}}</view>
<view>{{consumerAmountObj.campusMealTypeConsumerSummaryList.length && consumerAmountObj.campusMealTypeConsumerSummaryList[2].gradeMealTypeTotalAmount ? consumerAmountObj.campusMealTypeConsumerSummaryList[2].gradeMealTypeTotalAmount : '--'}}</view> <view>{{consumerAmountObj.campusMealTypeConsumerSummaryList && consumerAmountObj.campusMealTypeConsumerSummaryList.length && consumerAmountObj.campusMealTypeConsumerSummaryList[2].gradeMealTypeTotalAmount ? consumerAmountObj.campusMealTypeConsumerSummaryList[2].gradeMealTypeTotalAmount : '--'}}</view>
<view>{{consumerAmountObj.campusMealTypeConsumerSummaryList.length && consumerAmountObj.campusMealTypeConsumerSummaryList[2].schoolMealTypeTotalAmount ? consumerAmountObj.campusMealTypeConsumerSummaryList[2].schoolMealTypeTotalAmount : '--'}}</view> <view>{{consumerAmountObj.campusMealTypeConsumerSummaryList && consumerAmountObj.campusMealTypeConsumerSummaryList.length && consumerAmountObj.campusMealTypeConsumerSummaryList[2].schoolMealTypeTotalAmount ? consumerAmountObj.campusMealTypeConsumerSummaryList[2].schoolMealTypeTotalAmount : '--'}}</view>
</view> </view>
</view> </view>
<view class="secondLine"> <view class="secondLine">
<view class="firstCol">餐均</view> <view class="firstCol">餐均</view>
<view class="lastCol"> <view class="lastCol">
<view>{{consumerAmountObj.campusMealTypeConsumerSummaryList.length && consumerAmountObj.campusMealTypeConsumerSummaryList[2].mealTypeAvgAmount ? consumerAmountObj.campusMealTypeConsumerSummaryList[2].mealTypeAvgAmount : '--'}}</view> <view>{{consumerAmountObj.campusMealTypeConsumerSummaryList && consumerAmountObj.campusMealTypeConsumerSummaryList.length && consumerAmountObj.campusMealTypeConsumerSummaryList[2].mealTypeAvgAmount ? consumerAmountObj.campusMealTypeConsumerSummaryList[2].mealTypeAvgAmount : '--'}}</view>
<view>{{consumerAmountObj.campusMealTypeConsumerSummaryList.length && consumerAmountObj.campusMealTypeConsumerSummaryList[2].gradeMealTypeAvgAmount ? consumerAmountObj.campusMealTypeConsumerSummaryList[2].gradeMealTypeAvgAmount : '--'}}</view> <view>{{consumerAmountObj.campusMealTypeConsumerSummaryList && consumerAmountObj.campusMealTypeConsumerSummaryList.length && consumerAmountObj.campusMealTypeConsumerSummaryList[2].gradeMealTypeAvgAmount ? consumerAmountObj.campusMealTypeConsumerSummaryList[2].gradeMealTypeAvgAmount : '--'}}</view>
<view>{{consumerAmountObj.campusMealTypeConsumerSummaryList.length && consumerAmountObj.campusMealTypeConsumerSummaryList[2].schoolMealTypeAvgAmount ? consumerAmountObj.campusMealTypeConsumerSummaryList[2].schoolMealTypeAvgAmount : '--'}}</view> <view>{{consumerAmountObj.campusMealTypeConsumerSummaryList && consumerAmountObj.campusMealTypeConsumerSummaryList.length && consumerAmountObj.campusMealTypeConsumerSummaryList[2].schoolMealTypeAvgAmount ? consumerAmountObj.campusMealTypeConsumerSummaryList[2].schoolMealTypeAvgAmount : '--'}}</view>
</view> </view>
</view> </view>
</view> </view>
...@@ -458,9 +458,9 @@ ...@@ -458,9 +458,9 @@
<view class="firstLine"> <view class="firstLine">
<view class="firstCol">合计</view> <view class="firstCol">合计</view>
<view class="lastCol"> <view class="lastCol">
<view>{{consumerAmountObj.campusMealTypeConsumerSummaryList.length && consumerAmountObj.campusMealTypeConsumerSummaryList[3].mealTypeTotalAmount ? consumerAmountObj.campusMealTypeConsumerSummaryList[3].mealTypeTotalAmount : '--'}}</view> <view>{{consumerAmountObj.campusMealTypeConsumerSummaryList && consumerAmountObj.campusMealTypeConsumerSummaryList.length && consumerAmountObj.campusMealTypeConsumerSummaryList[3].mealTypeTotalAmount ? consumerAmountObj.campusMealTypeConsumerSummaryList[3].mealTypeTotalAmount : '--'}}</view>
<view>{{consumerAmountObj.campusMealTypeConsumerSummaryList.length && consumerAmountObj.campusMealTypeConsumerSummaryList[3].gradeMealTypeTotalAmount ? consumerAmountObj.campusMealTypeConsumerSummaryList[3].gradeMealTypeTotalAmount : '--'}}</view> <view>{{consumerAmountObj.campusMealTypeConsumerSummaryList && consumerAmountObj.campusMealTypeConsumerSummaryList.length && consumerAmountObj.campusMealTypeConsumerSummaryList[3].gradeMealTypeTotalAmount ? consumerAmountObj.campusMealTypeConsumerSummaryList[3].gradeMealTypeTotalAmount : '--'}}</view>
<view>{{consumerAmountObj.campusMealTypeConsumerSummaryList.length && consumerAmountObj.campusMealTypeConsumerSummaryList[3].schoolMealTypeTotalAmount ? consumerAmountObj.campusMealTypeConsumerSummaryList[3].schoolMealTypeTotalAmount : '--'}}</view> <view>{{consumerAmountObj.campusMealTypeConsumerSummaryList && consumerAmountObj.campusMealTypeConsumerSummaryList.length && consumerAmountObj.campusMealTypeConsumerSummaryList[3].schoolMealTypeTotalAmount ? consumerAmountObj.campusMealTypeConsumerSummaryList[3].schoolMealTypeTotalAmount : '--'}}</view>
</view> </view>
</view> </view>
</view> </view>
...@@ -742,7 +742,7 @@ ...@@ -742,7 +742,7 @@
</view> </view>
</view> </view>
</view> </view>
<view id="consumer-preferences-pie" style="width: 100%; height: 205px;" v-if="consumerSummaryAmountOBj.canteenamount || consumerSummaryAmountOBj.superAndOtherAmount"> <view id="consumer-preferences-pie" ref="consumer-preferences-pie" style="width: 100%; height: 205px;" v-if="consumerSummaryAmountOBj.canteenamount || consumerSummaryAmountOBj.superAndOtherAmount">
&nbsp; &nbsp;
</view> </view>
</view> </view>
...@@ -1521,7 +1521,21 @@ ...@@ -1521,7 +1521,21 @@
</template> </template>
<script> <script>
// import html2cancas from "html2canvas" // 在H5页面中
if (window.AlipayJSBridge) {
AlipayJSBridge.call("onBackPressed", {
// 回调函数
onBackPressed: function () {
// 处理返回事件
console.log("用户点击了返回按钮");
my.navigateTo({
url: "/pages/home/home",
});
// 可以选择直接关闭当前页面
// AlipayJSBridge.call('closeWebview');
},
});
}
import { requestPost } from "../ApplyConsumption/common/request.js"; import { requestPost } from "../ApplyConsumption/common/request.js";
var gHost = "https://" + window.location.host; var gHost = "https://" + window.location.host;
var envVersion = "release"; var envVersion = "release";
...@@ -1740,7 +1754,7 @@ export default { ...@@ -1740,7 +1754,7 @@ export default {
}, },
async mounted() { async mounted() {
await this.init(); await this.init();
this.piechart();
}, },
methods: { methods: {
async init() { async init() {
...@@ -1797,6 +1811,12 @@ export default { ...@@ -1797,6 +1811,12 @@ export default {
// 微信消费会员到期日 // 微信消费会员到期日
await this.queryMemberValidTime(1002); await this.queryMemberValidTime(1002);
} }
// this.queryConsumerSummaryAmount(1).then(()=>{
// self.piechart();
// });
// this.$nextTick(() => {
// self.piechart();
// });
if ( if (
new Date(this.memberInfo.invalidDate).getTime() <= new Date(this.memberInfo.invalidDate).getTime() <=
new Date("2022/06/30").getTime() new Date("2022/06/30").getTime()
...@@ -1836,8 +1856,10 @@ export default { ...@@ -1836,8 +1856,10 @@ export default {
this.diningSituations.diningSituationsDate = this.formatDate( this.diningSituations.diningSituationsDate = this.formatDate(
this.minDate this.minDate
); );
await this.queryConsumerSummaryAmount(1); this.queryConsumerSummaryAmount(1).then(()=>{
self.piechart();
});
this.queryLivingCostsAmount(); this.queryLivingCostsAmount();
// this.queryDayConsumerTrend(1).then((e) => // this.queryDayConsumerTrend(1).then((e) =>
// // this.linechart(this.reportTypeIndex) // // this.linechart(this.reportTypeIndex)
...@@ -1908,6 +1930,10 @@ export default { ...@@ -1908,6 +1930,10 @@ export default {
this.minDate = new Date(this.dataRangeArr[this.dataRangeIndex].startDate); this.minDate = new Date(this.dataRangeArr[this.dataRangeIndex].startDate);
this.maxDate = new Date(this.dataRangeArr[this.dataRangeIndex].endDate); this.maxDate = new Date(this.dataRangeArr[this.dataRangeIndex].endDate);
if (num == 1) { if (num == 1) {
// await this.queryConsumerSummaryAmount(1);
// this.$nextTick(() => {
// self.piechart();
// });
await this.getCateringAbnormalGroupList(); await this.getCateringAbnormalGroupList();
this.diningSituations.diningSituationsDate = this.formatDate( this.diningSituations.diningSituationsDate = this.formatDate(
this.minDate this.minDate
...@@ -1939,12 +1965,13 @@ export default { ...@@ -1939,12 +1965,13 @@ export default {
this.dataRangeArr[this.dataRangeIndex].startDate, this.dataRangeArr[this.dataRangeIndex].startDate,
this.dataRangeArr[this.dataRangeIndex].endDate this.dataRangeArr[this.dataRangeIndex].endDate
); );
this.queryConsumerSummaryAmount(1).then(()=>{
self.piechart()
})
// this.queryConsumerSummaryAmount(); // this.queryConsumerSummaryAmount();
// this.queryIsDredgeMember(1002, 1).then(() => { // this.queryIsDredgeMember(1002, 1).then(() => {
// if (this.isOpen) { // if (this.isOpen) {
// if (true) { // if (true) {
await this.queryConsumerSummaryAmount(1);
this.piechart();
this.queryLivingCostsAmount(); this.queryLivingCostsAmount();
// this.queryDayConsumerTrend(1).then((e) => // this.queryDayConsumerTrend(1).then((e) =>
...@@ -2318,16 +2345,17 @@ export default { ...@@ -2318,16 +2345,17 @@ export default {
this.attendanceReprotDatail(this.formatDateTwo(date)); this.attendanceReprotDatail(this.formatDateTwo(date));
}, },
piechart() { piechart() {
const self = this;
this.$nextTick(() => { this.$nextTick(() => {
console.log(
document.getElementById("consumer-preferences-pie"),
"xxxxxxxxxxxxxxxxxxxxxx",
this.pieDatas
);
let arr = this.pieDatas; let arr = this.pieDatas;
let domChart = document.getElementById("consumer-preferences-pie");
if(!domChart){
return;
}
let myChart = echarts.init( let myChart = echarts.init(
document.getElementById("consumer-preferences-pie") domChart
); );
console.log(myChart, 'zzzzzzzzzzzzzzzzz')
let option = { let option = {
tooltip: { tooltip: {
trigger: "item", trigger: "item",
...@@ -2375,7 +2403,7 @@ export default { ...@@ -2375,7 +2403,7 @@ export default {
? year + "-" + month + "-" + "0" + i ? year + "-" + month + "-" + "0" + i
: year + "-" + month + "-" + i; : year + "-" + month + "-" + i;
} }
const saturdayDate = allDate.filter((e) => { const saturdayDate = (allDate.length || []) && allDate.filter((e) => {
const date = new Date(e); const date = new Date(e);
if (date.getDay() == 6) { if (date.getDay() == 6) {
return true; return true;
...@@ -2531,7 +2559,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -2531,7 +2559,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
mySize.style.width = 350 + "px"; mySize.style.width = 350 + "px";
mySize.style.height = 260 + "px"; mySize.style.height = 260 + "px";
var myBreakfastTimeLineChart = echarts.init(mySize); var myBreakfastTimeLineChart = echarts.init(mySize);
var cateringList = this.mealtimeTrendsData.filter( var cateringList = (this.mealtimeTrendsData.length || []) && this.mealtimeTrendsData.filter(
(e) => e.mealtype == mealtype (e) => e.mealtype == mealtype
)[0].cateringList; )[0].cateringList;
var breakfastTimeData = JSON.parse(JSON.stringify(cateringList)); var breakfastTimeData = JSON.parse(JSON.stringify(cateringList));
...@@ -2557,7 +2585,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -2557,7 +2585,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
var xInterval = this.reportTypeIndex ? 0 : 6; var xInterval = this.reportTypeIndex ? 0 : 6;
var yMidPoint = var yMidPoint =
"2022/07/01 " + "2022/07/01 " +
this.mealtimeTrendsData.filter((e) => e.mealtype == 1)[0].earliestTime; (this.mealtimeTrendsData.length || []) && this.mealtimeTrendsData.filter((e) => e.mealtype == 1)[0].earliestTime;
var maxDate = new Date(yMidPoint).setHours( var maxDate = new Date(yMidPoint).setHours(
new Date(yMidPoint).getHours() == 23 new Date(yMidPoint).getHours() == 23
? "00" ? "00"
...@@ -3546,6 +3574,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -3546,6 +3574,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
// 查询消费总额及学生消费偏好类型 // 查询消费总额及学生消费偏好类型
async queryConsumerSummaryAmount(num) { async queryConsumerSummaryAmount(num) {
try { try {
const self = this;
let params = { let params = {
schoolId: getQueryParams("schoolId"), schoolId: getQueryParams("schoolId"),
userId: getQueryParams("userId"), userId: getQueryParams("userId"),
...@@ -3621,7 +3650,9 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -3621,7 +3650,9 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
], ],
]; ];
} }
this.$forceUpdate(); // this.$nextTick(() => {
// self.piechart()
// })
// this.consumerAmountObj = tmpObj; // this.consumerAmountObj = tmpObj;
// this.isReasonable = this.consumerAmountObj.gtgraderate >= 40 && this // this.isReasonable = this.consumerAmountObj.gtgraderate >= 40 && this
// .consumerAmountObj.gtgraderate <= // .consumerAmountObj.gtgraderate <=
...@@ -3738,14 +3769,14 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -3738,14 +3769,14 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
let newArr = []; let newArr = [];
// 早餐 mealType = 1 // 早餐 mealType = 1
let arr = array_.filter((x) => x.mealType == 1); let arr = (array_ && array_.length || []) && array_.filter((x) => x.mealType == 1);
if (arr.length) { if (arr.length) {
newArr.push(arr[0]); newArr.push(arr[0]);
} else { } else {
newArr.push(nullObj); newArr.push(nullObj);
} }
// 午餐 mealType = 2 // 午餐 mealType = 2
let arr1 = array_.filter((x) => x.mealType == 2); let arr1 = (array_ && array_.length || []) && array_.filter((x) => x.mealType == 2);
if (arr1.length) { if (arr1.length) {
newArr.push(arr1[0]); newArr.push(arr1[0]);
} else { } else {
...@@ -3753,7 +3784,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -3753,7 +3784,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
} }
// 晚餐 mealType = 3 // 晚餐 mealType = 3
let arr2 = array_.filter((x) => x.mealType == 3); let arr2 = (array_ && array_.length || []) && array_.filter((x) => x.mealType == 3);
if (arr2.length) { if (arr2.length) {
newArr.push(arr2[0]); newArr.push(arr2[0]);
} else { } else {
...@@ -3761,8 +3792,8 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -3761,8 +3792,8 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
} }
// 其他 mealType = 4 夜宵 mealType = 5 夜夜宵 // 其他 mealType = 4 夜宵 mealType = 5 夜夜宵
let arr3 = array_.filter((x) => x.mealType == 4); let arr3 = (array_ && array_.length || []) && array_.filter((x) => x.mealType == 4);
let arr4 = array_.filter((x) => x.mealType == 5); let arr4 = (array_ && array_.length || []) && array_.filter((x) => x.mealType == 5);
if (arr3.length) { if (arr3.length) {
let obj = JSON.parse(JSON.stringify(arr3[0])); let obj = JSON.parse(JSON.stringify(arr3[0]));
if (arr4.length) { if (arr4.length) {
...@@ -4061,6 +4092,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -4061,6 +4092,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
} }
if ( if (
data.obj && data.obj &&
data.obj.length &&
data.obj.filter((e) => e.mealtype == 1).length && data.obj.filter((e) => e.mealtype == 1).length &&
data.obj.filter((e) => e.mealtype == 1)[0].cateringList data.obj.filter((e) => e.mealtype == 1)[0].cateringList
) { ) {
...@@ -4068,6 +4100,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -4068,6 +4100,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
} }
if ( if (
data.obj && data.obj &&
data.obj.length &&
data.obj.filter((e) => e.mealtype == 2).length && data.obj.filter((e) => e.mealtype == 2).length &&
data.obj.filter((e) => e.mealtype == 2)[0].cateringList data.obj.filter((e) => e.mealtype == 2)[0].cateringList
) { ) {
...@@ -4075,6 +4108,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -4075,6 +4108,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
} }
if ( if (
data.obj && data.obj &&
data.obj.length &&
data.obj.filter((e) => e.mealtype == 3).length && data.obj.filter((e) => e.mealtype == 3).length &&
data.obj.filter((e) => e.mealtype == 3)[0].cateringList data.obj.filter((e) => e.mealtype == 3)[0].cateringList
) { ) {
...@@ -4474,7 +4508,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`, ...@@ -4474,7 +4508,7 @@ color: #FF8646;padding:13rpx 12rpx 30rpx 17rpx;`,
}, },
// 跳转云平台权益中心-支付宝 // 跳转云平台权益中心-支付宝
async openAzMenber_() { async openAzMenber_() {
jWeixin.miniProgram.navigateTo({ my.navigateTo({
url: "/pages/ToCloudOrder/ToCloudOrder", url: "/pages/ToCloudOrder/ToCloudOrder",
}); });
}, },
......
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