Commit 522498da by 姜雷

Merge branch 'develop' into test

parents 4a375d84 021979b3
......@@ -104,8 +104,8 @@ Page({
consumePrice += element.payableMoney;
consumeCount += element.payMen;
let daysIndex = Number(element.createDate.slice(-2));
dayList[daysIndex] = {
...dayList[daysIndex],
dayList[daysIndex - 1] = {
...dayList[daysIndex - 1],
payMen: element.payMen,
payableMoney: element.payableMoney,
};
......@@ -149,8 +149,8 @@ Page({
rechargePrice += element.rechargeMoney;
rechargeCount += element.rechargeMen;
let daysIndex = Number(element.completeAt.slice(-2));
dayList[daysIndex] = {
...dayList[daysIndex],
dayList[daysIndex - 1] = {
...dayList[daysIndex - 1],
rechargeMoney: element.rechargeMoney,
rechargeMen: element.rechargeMen,
refundCount: element.refundCount,
......
......@@ -80,8 +80,8 @@ Page({
for (let index = 0; index < oList.length; index++) {
const element = oList[index];
let daysIndex = Number(element.days.slice(-2));
dayList[daysIndex] = {
...dayList[daysIndex],
dayList[daysIndex - 1] = {
...dayList[daysIndex - 1],
count: element.count,
};
}
......
{
"rules": [
{
"action": "disallow",
"page": "*"
}
]
}
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