Skip to content

W
wx-boss
Commit 522498da by 姜雷
Options

Merge branch 'develop' into test

parents 4a375d84 021979b3
Showing with 21 additions and 13 deletions
miniprogram/pages/monthOperator/monthOperator.js
...@@ -112,7 +112,7 @@ Page({ ...@@ -112,7 +112,7 @@ Page({
consumePrice += element.payableMoney; consumePrice += element.payableMoney;
consumeCount += element.payMen; consumeCount += element.payMen;
var daysIndex = Number(element.createDate.slice(-2)); var daysIndex = Number(element.createDate.slice(-2));
dayList[daysIndex] = __assign({}, dayList[daysIndex], { payMen: element.payMen, payableMoney: element.payableMoney }); dayList[daysIndex - 1] = __assign({}, dayList[daysIndex - 1], { payMen: element.payMen, payableMoney: element.payableMoney });
} }
} }
_this.setData({ _this.setData({
...@@ -151,7 +151,7 @@ Page({ ...@@ -151,7 +151,7 @@ Page({
rechargePrice += element.rechargeMoney; rechargePrice += element.rechargeMoney;
rechargeCount += element.rechargeMen; rechargeCount += element.rechargeMen;
var daysIndex = Number(element.completeAt.slice(-2)); var daysIndex = Number(element.completeAt.slice(-2));
dayList[daysIndex] = __assign({}, dayList[daysIndex], { rechargeMoney: element.rechargeMoney, rechargeMen: element.rechargeMen, refundCount: element.refundCount, refundMoney: element.refundMoney }); dayList[daysIndex - 1] = __assign({}, dayList[daysIndex - 1], { rechargeMoney: element.rechargeMoney, rechargeMen: element.rechargeMen, refundCount: element.refundCount, refundMoney: element.refundMoney });
} }
} }
console.log(dayList); console.log(dayList);
...@@ -216,4 +216,4 @@ Page({ ...@@ -216,4 +216,4 @@ Page({
}); });
}, },
}); });
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"monthOperator.js","sourceRoot":"","sources":["monthOperator.ts"],"names":[],"mappings":"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","sourcesContent":["import { statisticsFetch } from '../../api/fetch';\nimport { formatTime } from '../../utils/util';\n\nPage({\n  onLoad() {\n    this.initData();\n  },\n  data: {\n    month: '',\n    areaId: '',\n    areaName: '',\n    rechargeData: {\n      title: '充值总额',\n      numberType: 'price',\n      count: 0,\n    },\n    rechargeCount: {\n      title: '充值笔数',\n      numberType: '',\n      count: 0,\n    },\n    rechargeAndRefundList: [],\n    consumeData: {\n      title: '消费总额',\n      numberType: 'price',\n      count: 0,\n    },\n    consumeCount: {\n      title: '消费笔数',\n      numberType: '',\n      count: 0,\n    },\n    consumeList: [],\n    serviceTypeList: [],\n    payTypeList: [],\n  },\n  initData() {\n    let time = formatTime(new Date());\n    console.log(time);\n    this.setData!({ month: time.slice(0, 7) }, () => {\n      this.fetchList();\n    });\n  },\n  areaChangeHandle(val) {\n    console.log('areaChangeHandle', val);\n    const { id, name } = val;\n    this.setData!(\n      {\n        areaId: id,\n        areaName: name,\n      },\n      () => {\n        if (id) {\n          this.fetchList({ areaId: [id] });\n        } else {\n          this.fetchList();\n        }\n      },\n    );\n  },\n  monthChangeHandle(val) {\n    console.log('monthChangeHandle', val);\n    const { value } = val.detail;\n    this.fetchList({ month: value });\n    this.setData!({\n      month: value,\n    });\n  },\n  fetchList(entity?: { areaId?: number; month?: string }) {\n    if (this.data.areaId) {\n      if (entity && entity.areaId) {\n      } else entity = { ...entity, areaId: [this.data.areaId] };\n    }\n    console.log(this.data.areaId, entity);\n    this.fetchRechargeData(entity);\n    this.fetchConsumeData(entity);\n    this.fetchServiceTypeList(entity);\n    this.fetchPayTypeList(entity);\n  },\n  fetchConsumeData(entity?: { areaId?: number; month?: string }) {\n    let reqBody = {\n      month: this.data.month,\n      ...entity,\n    };\n    statisticsFetch({\n      url: '/dcxy/reportInfo/dailyConsumeCount',\n      method: 'POST',\n      data: reqBody,\n    })\n      .then(res => {\n        let dayList = new Array(31)\n          .fill({\n            payMen: 0,\n            payableMoney: 0,\n          })\n          .map((v, idx) => ({ ...v, days: idx + 1 }));\n\n        let consumePrice = 0;\n        let consumeCount = 0;\n        if (res.data && res.data.length) {\n          let oList = res.data;\n          for (let index = 0; index < oList.length; index++) {\n            const element = oList[index];\n            consumePrice += element.payableMoney;\n            consumeCount += element.payMen;\n            let daysIndex = Number(element.createDate.slice(-2));\n            dayList[daysIndex] = {\n              ...dayList[daysIndex],\n              payMen: element.payMen,\n              payableMoney: element.payableMoney,\n            };\n          }\n        }\n        this.setData!({\n          consumeList: dayList,\n          'consumeData.count': consumePrice,\n          'consumeCount.count': consumeCount,\n        });\n      })\n      .catch(err => {\n        console.log(err);\n      });\n  },\n  fetchRechargeData(entity?: { areaId?: number; month?: string }) {\n    let reqBody = {\n      month: this.data.month,\n      ...entity,\n    };\n    statisticsFetch({\n      url: '/dcxy/reportInfo/queryRechargeListDaily',\n      method: 'POST',\n      data: reqBody,\n    })\n      .then(res => {\n        let dayList = new Array(31)\n          .fill({\n            rechargeMoney: 0,\n            rechargeMen: 0,\n            refundCount: 0,\n            refundMoney: 0,\n          })\n          .map((v, idx) => ({ ...v, days: idx + 1 }));\n        let rechargePrice = 0;\n        let rechargeCount = 0;\n        if (res.data && res.data.length) {\n          let oList = res.data;\n          for (let index = 0; index < oList.length; index++) {\n            const element = oList[index];\n            rechargePrice += element.rechargeMoney;\n            rechargeCount += element.rechargeMen;\n            let daysIndex = Number(element.completeAt.slice(-2));\n            dayList[daysIndex] = {\n              ...dayList[daysIndex],\n              rechargeMoney: element.rechargeMoney,\n              rechargeMen: element.rechargeMen,\n              refundCount: element.refundCount,\n              refundMoney: element.refundMoney,\n            };\n          }\n        }\n        console.log(dayList);\n        this.setData!({\n          rechargeAndRefundList: dayList,\n          'rechargeData.count': rechargePrice,\n          'rechargeCount.count': rechargeCount,\n        });\n      })\n      .catch(err => {\n        console.log(err);\n      });\n  },\n  fetchServiceTypeList(entity) {\n    let reqBody = {\n      month: this.data.month,\n      ...entity,\n    };\n    statisticsFetch({\n      url: '/dcxy/reportInfo/queryConsumeOrderList',\n      method: 'POST',\n      data: reqBody,\n    })\n      .then(res => {\n        console.log(res);\n        this.setData!({\n          serviceTypeList: res.data,\n        });\n      })\n      .catch(err => {\n        console.log(err);\n      });\n  },\n  fetchPayTypeList(entity) {\n    let reqBody = {\n      month: this.data.month,\n      ...entity,\n    };\n    statisticsFetch({\n      url: '/dcxy/reportInfo/payTypeConsume',\n      method: 'POST',\n      data: reqBody,\n    })\n      .then(res => {\n        console.log(res);\n        if (res.data) {\n          const keyMap = {\n            aimi: '艾米豆',\n            bean: '消费豆',\n            discount: '优惠金额',\n            online: '线上支付',\n          };\n          let dataList = Object.keys(res.data).map(key => ({\n            key,\n            a: '1',\n            name: keyMap[key],\n            count: res.data[key],\n          }));\n          this.setData!({\n            payTypeList: dataList,\n          });\n        }\n      })\n      .catch(err => {\n        console.log(err);\n      });\n  },\n});\n"]} //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"monthOperator.js","sourceRoot":"","sources":["monthOperator.ts"],"names":[],"mappings":"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","sourcesContent":["import { statisticsFetch } from '../../api/fetch';\nimport { formatTime } from '../../utils/util';\n\nPage({\n  onLoad() {\n    this.initData();\n  },\n  data: {\n    month: '',\n    areaId: '',\n    areaName: '',\n    rechargeData: {\n      title: '充值总额',\n      numberType: 'price',\n      count: 0,\n    },\n    rechargeCount: {\n      title: '充值笔数',\n      numberType: '',\n      count: 0,\n    },\n    rechargeAndRefundList: [],\n    consumeData: {\n      title: '消费总额',\n      numberType: 'price',\n      count: 0,\n    },\n    consumeCount: {\n      title: '消费笔数',\n      numberType: '',\n      count: 0,\n    },\n    consumeList: [],\n    serviceTypeList: [],\n    payTypeList: [],\n  },\n  initData() {\n    let time = formatTime(new Date());\n    console.log(time);\n    this.setData!({ month: time.slice(0, 7) }, () => {\n      this.fetchList();\n    });\n  },\n  areaChangeHandle(val) {\n    console.log('areaChangeHandle', val);\n    const { id, name } = val;\n    this.setData!(\n      {\n        areaId: id,\n        areaName: name,\n      },\n      () => {\n        if (id) {\n          this.fetchList({ areaId: [id] });\n        } else {\n          this.fetchList();\n        }\n      },\n    );\n  },\n  monthChangeHandle(val) {\n    console.log('monthChangeHandle', val);\n    const { value } = val.detail;\n    this.fetchList({ month: value });\n    this.setData!({\n      month: value,\n    });\n  },\n  fetchList(entity?: { areaId?: number; month?: string }) {\n    if (this.data.areaId) {\n      if (entity && entity.areaId) {\n      } else entity = { ...entity, areaId: [this.data.areaId] };\n    }\n    console.log(this.data.areaId, entity);\n    this.fetchRechargeData(entity);\n    this.fetchConsumeData(entity);\n    this.fetchServiceTypeList(entity);\n    this.fetchPayTypeList(entity);\n  },\n  fetchConsumeData(entity?: { areaId?: number; month?: string }) {\n    let reqBody = {\n      month: this.data.month,\n      ...entity,\n    };\n    statisticsFetch({\n      url: '/dcxy/reportInfo/dailyConsumeCount',\n      method: 'POST',\n      data: reqBody,\n    })\n      .then(res => {\n        let dayList = new Array(31)\n          .fill({\n            payMen: 0,\n            payableMoney: 0,\n          })\n          .map((v, idx) => ({ ...v, days: idx + 1 }));\n\n        let consumePrice = 0;\n        let consumeCount = 0;\n        if (res.data && res.data.length) {\n          let oList = res.data;\n          for (let index = 0; index < oList.length; index++) {\n            const element = oList[index];\n            consumePrice += element.payableMoney;\n            consumeCount += element.payMen;\n            let daysIndex = Number(element.createDate.slice(-2));\n            dayList[daysIndex - 1] = {\n              ...dayList[daysIndex - 1],\n              payMen: element.payMen,\n              payableMoney: element.payableMoney,\n            };\n          }\n        }\n        this.setData!({\n          consumeList: dayList,\n          'consumeData.count': consumePrice,\n          'consumeCount.count': consumeCount,\n        });\n      })\n      .catch(err => {\n        console.log(err);\n      });\n  },\n  fetchRechargeData(entity?: { areaId?: number; month?: string }) {\n    let reqBody = {\n      month: this.data.month,\n      ...entity,\n    };\n    statisticsFetch({\n      url: '/dcxy/reportInfo/queryRechargeListDaily',\n      method: 'POST',\n      data: reqBody,\n    })\n      .then(res => {\n        let dayList = new Array(31)\n          .fill({\n            rechargeMoney: 0,\n            rechargeMen: 0,\n            refundCount: 0,\n            refundMoney: 0,\n          })\n          .map((v, idx) => ({ ...v, days: idx + 1 }));\n        let rechargePrice = 0;\n        let rechargeCount = 0;\n        if (res.data && res.data.length) {\n          let oList = res.data;\n          for (let index = 0; index < oList.length; index++) {\n            const element = oList[index];\n            rechargePrice += element.rechargeMoney;\n            rechargeCount += element.rechargeMen;\n            let daysIndex = Number(element.completeAt.slice(-2));\n            dayList[daysIndex - 1] = {\n              ...dayList[daysIndex - 1],\n              rechargeMoney: element.rechargeMoney,\n              rechargeMen: element.rechargeMen,\n              refundCount: element.refundCount,\n              refundMoney: element.refundMoney,\n            };\n          }\n        }\n        console.log(dayList);\n        this.setData!({\n          rechargeAndRefundList: dayList,\n          'rechargeData.count': rechargePrice,\n          'rechargeCount.count': rechargeCount,\n        });\n      })\n      .catch(err => {\n        console.log(err);\n      });\n  },\n  fetchServiceTypeList(entity) {\n    let reqBody = {\n      month: this.data.month,\n      ...entity,\n    };\n    statisticsFetch({\n      url: '/dcxy/reportInfo/queryConsumeOrderList',\n      method: 'POST',\n      data: reqBody,\n    })\n      .then(res => {\n        console.log(res);\n        this.setData!({\n          serviceTypeList: res.data,\n        });\n      })\n      .catch(err => {\n        console.log(err);\n      });\n  },\n  fetchPayTypeList(entity) {\n    let reqBody = {\n      month: this.data.month,\n      ...entity,\n    };\n    statisticsFetch({\n      url: '/dcxy/reportInfo/payTypeConsume',\n      method: 'POST',\n      data: reqBody,\n    })\n      .then(res => {\n        console.log(res);\n        if (res.data) {\n          const keyMap = {\n            aimi: '艾米豆',\n            bean: '消费豆',\n            discount: '优惠金额',\n            online: '线上支付',\n          };\n          let dataList = Object.keys(res.data).map(key => ({\n            key,\n            a: '1',\n            name: keyMap[key],\n            count: res.data[key],\n          }));\n          this.setData!({\n            payTypeList: dataList,\n          });\n        }\n      })\n      .catch(err => {\n        console.log(err);\n      });\n  },\n});\n"]}
\ No newline at end of file \ No newline at end of file
miniprogram/pages/monthOperator/monthOperator.ts
...@@ -104,8 +104,8 @@ Page({ ...@@ -104,8 +104,8 @@ Page({
consumePrice += element.payableMoney; consumePrice += element.payableMoney;
consumeCount += element.payMen; consumeCount += element.payMen;
let daysIndex = Number(element.createDate.slice(-2)); let daysIndex = Number(element.createDate.slice(-2));
dayList[daysIndex] = { dayList[daysIndex - 1] = {
...dayList[daysIndex], ...dayList[daysIndex - 1],
payMen: element.payMen, payMen: element.payMen,
payableMoney: element.payableMoney, payableMoney: element.payableMoney,
}; };
...@@ -149,8 +149,8 @@ Page({ ...@@ -149,8 +149,8 @@ Page({
rechargePrice += element.rechargeMoney; rechargePrice += element.rechargeMoney;
rechargeCount += element.rechargeMen; rechargeCount += element.rechargeMen;
let daysIndex = Number(element.completeAt.slice(-2)); let daysIndex = Number(element.completeAt.slice(-2));
dayList[daysIndex] = { dayList[daysIndex - 1] = {
...dayList[daysIndex], ...dayList[daysIndex - 1],
rechargeMoney: element.rechargeMoney, rechargeMoney: element.rechargeMoney,
rechargeMen: element.rechargeMen, rechargeMen: element.rechargeMen,
refundCount: element.refundCount, refundCount: element.refundCount,
......
miniprogram/pages/userGrowth/userGrowth.js
...@@ -85,7 +85,7 @@ Page({ ...@@ -85,7 +85,7 @@ Page({
for (var index = 0; index < oList.length; index++) { for (var index = 0; index < oList.length; index++) {
var element = oList[index]; var element = oList[index];
var daysIndex = Number(element.days.slice(-2)); var daysIndex = Number(element.days.slice(-2));
dayList[daysIndex] = __assign({}, dayList[daysIndex], { count: element.count }); dayList[daysIndex - 1] = __assign({}, dayList[daysIndex - 1], { count: element.count });
} }
} }
console.log('dayList:', dayList); console.log('dayList:', dayList);
...@@ -124,4 +124,4 @@ Page({ ...@@ -124,4 +124,4 @@ Page({
}); });
}, },
}); });
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"userGrowth.js","sourceRoot":"","sources":["userGrowth.ts"],"names":[],"mappings":"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","sourcesContent":["import { baseFetch, statisticsFetch } from '../../api/fetch';\nimport { formatTime } from '../../utils/util';\n\n// miniprogram/pages/userGrowth/userGrowth.js\nPage({\n  onLoad() {\n    this.initData();\n    this.fetchAreaList();\n  },\n  /**\n   * 页面的初始数据\n   */\n  data: {\n    month: '',\n    areaId: '',\n    areaName: '',\n    areaList: [],\n    growthList: [],\n    customerCount: 0,\n    activeCount: 0,\n  },\n  initData() {\n    let time = formatTime(new Date());\n    console.log(time);\n    this.setData!({ month: time.slice(0, 7) }, () => {\n      this.fetchList();\n    });\n  },\n  fetchAreaList() {\n    baseFetch({\n      url: '/dcxy/baseArea/queryAll',\n    })\n      .then(res => {\n        if (res.data) {\n          this.setData!({\n            areaList: res.data,\n          });\n        } else {\n          this.setData!({\n            areaList: [],\n          });\n        }\n      })\n      .catch(err => {\n        console.log(err);\n      });\n  },\n  fetchList(entity?: { areaId?: number; monthString?: string }) {\n    if (this.data.areaId) {\n      if (entity && entity.areaId) {\n      } else entity = { ...entity, areaId: this.data.areaId };\n    }\n    this.fetchUserData(entity);\n  },\n  fetchUserData(entity) {\n    let monthString =\n      entity && entity.monthString ? entity.monthString : this.data.month;\n    const [year, month] = monthString.split('-');\n    let reqBody = {\n      year,\n      month,\n      isAdmin: 1,\n      ...entity,\n    };\n    statisticsFetch({\n      url: '/dcxy/reportInfo/queryReportList',\n      data: reqBody,\n    })\n      .then(res => {\n        console.log(res);\n        const { customerCount, dayVos, activeCount } = res.data;\n        let dayList = new Array(31)\n          .fill({\n            count: 0,\n          })\n          .map((v, idx) => ({ ...v, days: idx + 1 }));\n\n        if (dayVos && dayVos.length) {\n          let oList = dayVos;\n          for (let index = 0; index < oList.length; index++) {\n            const element = oList[index];\n            let daysIndex = Number(element.days.slice(-2));\n            dayList[daysIndex] = {\n              ...dayList[daysIndex],\n              count: element.count,\n            };\n          }\n        }\n        console.log('dayList:', dayList);\n        this.setData!({\n          growthList: dayList,\n          customerCount: customerCount ? customerCount : 0,\n          activeCount: activeCount ? activeCount : 0,\n        });\n      })\n      .catch(err => {\n        console.log(err);\n      });\n  },\n  areaChangeHandle(val) {\n    console.log('areaChangeHandle', val);\n    const { id, name } = val;\n    this.setData!(\n      {\n        areaId: id,\n        areaName: name,\n      },\n      () => {\n        if (id) {\n          this.fetchList({ areaId: id });\n        } else {\n          this.fetchList();\n        }\n      },\n    );\n  },\n  monthChangeHandle(val) {\n    console.log('monthChangeHandle', val);\n    const { value } = val.detail;\n    this.fetchList({ monthString: value });\n    this.setData!({\n      month: value,\n    });\n  },\n});\n"]} //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"userGrowth.js","sourceRoot":"","sources":["userGrowth.ts"],"names":[],"mappings":"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","sourcesContent":["import { baseFetch, statisticsFetch } from '../../api/fetch';\nimport { formatTime } from '../../utils/util';\n\n// miniprogram/pages/userGrowth/userGrowth.js\nPage({\n  onLoad() {\n    this.initData();\n    this.fetchAreaList();\n  },\n  /**\n   * 页面的初始数据\n   */\n  data: {\n    month: '',\n    areaId: '',\n    areaName: '',\n    areaList: [],\n    growthList: [],\n    customerCount: 0,\n    activeCount: 0,\n  },\n  initData() {\n    let time = formatTime(new Date());\n    console.log(time);\n    this.setData!({ month: time.slice(0, 7) }, () => {\n      this.fetchList();\n    });\n  },\n  fetchAreaList() {\n    baseFetch({\n      url: '/dcxy/baseArea/queryAll',\n    })\n      .then(res => {\n        if (res.data) {\n          this.setData!({\n            areaList: res.data,\n          });\n        } else {\n          this.setData!({\n            areaList: [],\n          });\n        }\n      })\n      .catch(err => {\n        console.log(err);\n      });\n  },\n  fetchList(entity?: { areaId?: number; monthString?: string }) {\n    if (this.data.areaId) {\n      if (entity && entity.areaId) {\n      } else entity = { ...entity, areaId: this.data.areaId };\n    }\n    this.fetchUserData(entity);\n  },\n  fetchUserData(entity) {\n    let monthString =\n      entity && entity.monthString ? entity.monthString : this.data.month;\n    const [year, month] = monthString.split('-');\n    let reqBody = {\n      year,\n      month,\n      isAdmin: 1,\n      ...entity,\n    };\n    statisticsFetch({\n      url: '/dcxy/reportInfo/queryReportList',\n      data: reqBody,\n    })\n      .then(res => {\n        console.log(res);\n        const { customerCount, dayVos, activeCount } = res.data;\n        let dayList = new Array(31)\n          .fill({\n            count: 0,\n          })\n          .map((v, idx) => ({ ...v, days: idx + 1 }));\n\n        if (dayVos && dayVos.length) {\n          let oList = dayVos;\n          for (let index = 0; index < oList.length; index++) {\n            const element = oList[index];\n            let daysIndex = Number(element.days.slice(-2));\n            dayList[daysIndex - 1] = {\n              ...dayList[daysIndex - 1],\n              count: element.count,\n            };\n          }\n        }\n        console.log('dayList:', dayList);\n        this.setData!({\n          growthList: dayList,\n          customerCount: customerCount ? customerCount : 0,\n          activeCount: activeCount ? activeCount : 0,\n        });\n      })\n      .catch(err => {\n        console.log(err);\n      });\n  },\n  areaChangeHandle(val) {\n    console.log('areaChangeHandle', val);\n    const { id, name } = val;\n    this.setData!(\n      {\n        areaId: id,\n        areaName: name,\n      },\n      () => {\n        if (id) {\n          this.fetchList({ areaId: id });\n        } else {\n          this.fetchList();\n        }\n      },\n    );\n  },\n  monthChangeHandle(val) {\n    console.log('monthChangeHandle', val);\n    const { value } = val.detail;\n    this.fetchList({ monthString: value });\n    this.setData!({\n      month: value,\n    });\n  },\n});\n"]}
\ No newline at end of file \ No newline at end of file
miniprogram/pages/userGrowth/userGrowth.ts
...@@ -80,8 +80,8 @@ Page({ ...@@ -80,8 +80,8 @@ Page({
for (let index = 0; index < oList.length; index++) { for (let index = 0; index < oList.length; index++) {
const element = oList[index]; const element = oList[index];
let daysIndex = Number(element.days.slice(-2)); let daysIndex = Number(element.days.slice(-2));
dayList[daysIndex] = { dayList[daysIndex - 1] = {
...dayList[daysIndex], ...dayList[daysIndex - 1],
count: element.count, count: element.count,
}; };
} }
......
sitemap.json 0 → 100644
{
"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