Skip to content

W
wx-boss
Commit 874c3fc6 by 姜雷
Options

Merge branch 'develop' into test

parents e1146d3d 00d1515c
Showing with 71 additions and 12 deletions
miniprogram/pages/userGrowth/userGrowth.js
......@@ -22,6 +22,7 @@ Page({
areaName: '',
areaList: [],
growthList: [],
activateList: [],
registerCount: 0,
customerCount: 0,
activeCount: 0,
......@@ -84,12 +85,12 @@ Page({
var reqBody = __assign({ year: year,
month: month, isAdmin: this.data.isAdmin }, entity);
fetch_1.statisticsFetch({
url: '/dcxy/reportInfo/queryReportList',
url: '/dcxy/reportInfo/boss/queryReportList',
data: reqBody,
})
.then(function (res) {
console.log(res);
var _a = res.data, customerCount = _a.customerCount, dayVos = _a.dayVos, activeCount = _a.activeCount;
var _a = res.data, customerCount = _a.customerCount, dayVos = _a.dayVos, activeCount = _a.activeCount, dayAcs = _a.dayAcs;
var dayList = new Array(31)
.fill({
count: 0,
......@@ -100,13 +101,37 @@ Page({
for (var index = 0; index < oList.length; index++) {
var element = oList[index];
var daysIndex = Number(element.days.slice(-2));
dayList[daysIndex - 1] = __assign({}, dayList[daysIndex - 1], { count: element.count });
if (dayList[daysIndex - 1].count) {
dayList[daysIndex - 1] = __assign({}, dayList[daysIndex - 1], { count: dayList[daysIndex - 1].count + element.count });
}
else {
dayList[daysIndex - 1] = __assign({}, dayList[daysIndex - 1], { count: element.count });
}
}
}
var activateList = new Array(31)
.fill({
count: 0,
})
.map(function (v, idx) { return (__assign({}, v, { days: idx + 1 })); });
if (dayAcs && dayAcs.length) {
var oList = dayAcs;
for (var index = 0; index < oList.length; index++) {
var element = oList[index];
var daysIndex = Number(element.days.slice(-2));
if (activateList[daysIndex - 1].count) {
activateList[daysIndex - 1] = __assign({}, activateList[daysIndex - 1], { count: activateList[daysIndex - 1].count + element.count });
}
else {
activateList[daysIndex - 1] = __assign({}, activateList[daysIndex - 1], { count: element.count });
}
}
}
var registerCount = dayVos.reduce(function (total, current) { return (total += current.count); }, 0);
console.log('dayList:', dayList);
_this.setData({
growthList: dayList,
activateList: activateList,
registerCount: registerCount,
customerCount: customerCount ? customerCount : 0,
activeCount: activeCount ? activeCount : 0,
......@@ -141,4 +166,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';\nimport { IMyApp } from '../../app';\nconst app = getApp<IMyApp>();\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    registerCount: 0,\n    customerCount: 0,\n    activeCount: 0,\n    isAdmin: 0,\n  },\n  initData() {\n    let time = formatTime(new Date());\n    console.log(time);\n    console.log(app.globalData.userRoles);\n    this.setData!({\n      userInfo: app.globalData.userInfo,\n    });\n    let isAdmin = 0;\n    let registerRoute = app.globalData.userRoles.find(\n      item => item.menuCode === '0083',\n    );\n    if (\n      registerRoute &&\n      registerRoute.listMenuButtonVo &&\n      registerRoute.listMenuButtonVo.length\n    ) {\n      if (\n        registerRoute.listMenuButtonVo.find(item => item.buttonCode === '0001')\n      )\n        isAdmin = 1;\n    }\n\n    this.setData!({ month: time.slice(0, 7), isAdmin }, () => {\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: this.data.isAdmin,\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        let registerCount = dayVos.reduce(\n          (total, current) => (total += current.count),\n          0,\n        );\n        console.log('dayList:', dayList);\n        this.setData!({\n          growthList: dayList,\n          registerCount: registerCount,\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
//# 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';\nimport { IMyApp } from '../../app';\nconst app = getApp<IMyApp>();\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    activateList: [],\n    registerCount: 0,\n    customerCount: 0,\n    activeCount: 0,\n    isAdmin: 0,\n  },\n  initData() {\n    let time = formatTime(new Date());\n    console.log(time);\n    console.log(app.globalData.userRoles);\n    this.setData!({\n      userInfo: app.globalData.userInfo,\n    });\n    let isAdmin = 0;\n    let registerRoute = app.globalData.userRoles.find(\n      item => item.menuCode === '0083',\n    );\n    if (\n      registerRoute &&\n      registerRoute.listMenuButtonVo &&\n      registerRoute.listMenuButtonVo.length\n    ) {\n      if (\n        registerRoute.listMenuButtonVo.find(item => item.buttonCode === '0001')\n      )\n        isAdmin = 1;\n    }\n\n    this.setData!({ month: time.slice(0, 7), isAdmin }, () => {\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: this.data.isAdmin,\n      ...entity,\n    };\n    statisticsFetch({\n      url: '/dcxy/reportInfo/boss/queryReportList',\n      data: reqBody,\n    })\n      .then(res => {\n        console.log(res);\n        const { customerCount, dayVos, activeCount, dayAcs } = 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            if (dayList[daysIndex - 1].count) {\n              dayList[daysIndex - 1] = {\n                ...dayList[daysIndex - 1],\n                count: dayList[daysIndex - 1].count + element.count,\n              };\n            } else {\n              dayList[daysIndex - 1] = {\n                ...dayList[daysIndex - 1],\n                count: element.count,\n              };\n            }\n          }\n        }\n        let activateList = new Array(31)\n          .fill({\n            count: 0,\n          })\n          .map((v, idx) => ({ ...v, days: idx + 1 }));\n        if (dayAcs && dayAcs.length) {\n          let oList = dayAcs;\n          for (let index = 0; index < oList.length; index++) {\n            const element = oList[index];\n            let daysIndex = Number(element.days.slice(-2));\n            if (activateList[daysIndex - 1].count) {\n              activateList[daysIndex - 1] = {\n                ...activateList[daysIndex - 1],\n                count: activateList[daysIndex - 1].count + element.count,\n              };\n            } else {\n              activateList[daysIndex - 1] = {\n                ...activateList[daysIndex - 1],\n                count: element.count,\n              };\n            }\n          }\n        }\n\n        let registerCount = dayVos.reduce(\n          (total, current) => (total += current.count),\n          0,\n        );\n        console.log('dayList:', dayList);\n        this.setData!({\n          growthList: dayList,\n          activateList: activateList,\n          registerCount: registerCount,\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
miniprogram/pages/userGrowth/userGrowth.ts
......@@ -18,6 +18,7 @@ Page({
areaName: '',
areaList: [],
growthList: [],
activateList: [],
registerCount: 0,
customerCount: 0,
activeCount: 0,
......@@ -86,12 +87,12 @@ Page({
...entity,
};
statisticsFetch({
url: '/dcxy/reportInfo/queryReportList',
url: '/dcxy/reportInfo/boss/queryReportList',
data: reqBody,
})
.then(res => {
console.log(res);
const { customerCount, dayVos, activeCount } = res.data;
const { customerCount, dayVos, activeCount, dayAcs } = res.data;
let dayList = new Array(31)
.fill({
count: 0,
......@@ -103,12 +104,43 @@ Page({
for (let index = 0; index < oList.length; index++) {
const element = oList[index];
let daysIndex = Number(element.days.slice(-2));
dayList[daysIndex - 1] = {
...dayList[daysIndex - 1],
count: element.count,
};
if (dayList[daysIndex - 1].count) {
dayList[daysIndex - 1] = {
...dayList[daysIndex - 1],
count: dayList[daysIndex - 1].count + element.count,
};
} else {
dayList[daysIndex - 1] = {
...dayList[daysIndex - 1],
count: element.count,
};
}
}
}
let activateList = new Array(31)
.fill({
count: 0,
})
.map((v, idx) => ({ ...v, days: idx + 1 }));
if (dayAcs && dayAcs.length) {
let oList = dayAcs;
for (let index = 0; index < oList.length; index++) {
const element = oList[index];
let daysIndex = Number(element.days.slice(-2));
if (activateList[daysIndex - 1].count) {
activateList[daysIndex - 1] = {
...activateList[daysIndex - 1],
count: activateList[daysIndex - 1].count + element.count,
};
} else {
activateList[daysIndex - 1] = {
...activateList[daysIndex - 1],
count: element.count,
};
}
}
}
let registerCount = dayVos.reduce(
(total, current) => (total += current.count),
0,
......@@ -116,6 +148,7 @@ Page({
console.log('dayList:', dayList);
this.setData!({
growthList: dayList,
activateList: activateList,
registerCount: registerCount,
customerCount: customerCount ? customerCount : 0,
activeCount: activeCount ? activeCount : 0,
......
miniprogram/pages/userGrowth/userGrowth.wxml
......@@ -37,7 +37,7 @@
<view class="userGrowth-title-text">用户活跃</view>
</view>
<view class="userGrowth-canvas">
<user-activity-chart dataList="{{growthList}}" month="{{month}}" />
<user-activity-chart dataList="{{activateList}}" month="{{month}}" />
</view>
</view>
</view>
\ No newline at end of file
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