Skip to content

W
wx-boss
Commit 71155f2c by 姜雷
Options

Merge branch 'test'

parents d4e9115f 9da4c0dc
Showing with 421 additions and 81 deletions
miniprogram/app.js
......@@ -29,7 +29,7 @@ App({
},
globalData: {
userInfo: initUserinfo(),
token: '',
token: 'system:login:token:a1d0c6e83f027327d8461063f4ac58a61572833345204',
userRoles: [],
},
getToken: function () {
......@@ -39,6 +39,10 @@ App({
this.globalData.token = '';
this.globalData.userInfo = initUserinfo();
this.globalData.userRoles = [];
try {
wx.setStorageSync('token', '');
}
catch (error) { }
},
});
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiYXBwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBYUEsSUFBTSxZQUFZLEdBQUcsY0FBTSxPQUFBLENBQUM7SUFDMUIsU0FBUyxFQUFFLEVBQUU7SUFDYixPQUFPLEVBQUUsRUFBRTtJQUNYLFFBQVEsRUFBRSxFQUFFO0lBQ1osRUFBRSxFQUFFLENBQUM7SUFDTCxhQUFhLEVBQUUsQ0FBQztJQUNoQixhQUFhLEVBQUUsQ0FBQztJQUNoQixhQUFhLEVBQUUsRUFBRTtJQUNqQixZQUFZLEVBQUUsRUFBRTtJQUNoQixVQUFVLEVBQUUsQ0FBQztJQUNiLElBQUksRUFBRSxFQUFFO0lBQ1IsU0FBUyxFQUFFLENBQUM7SUFDWixXQUFXLEVBQUUsRUFBRTtJQUNmLEtBQUssRUFBRSxFQUFFO0lBQ1QsUUFBUSxFQUFFLEVBQUU7Q0FDYixDQUFDLEVBZnlCLENBZXpCLENBQUM7QUFDSCxHQUFHLENBQVM7SUFDVixRQUFRO1FBQ04sT0FBTyxDQUFDLEdBQUcsQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUMzQixJQUFJLENBQUM7WUFDSCxJQUFJLEtBQUssR0FBRyxFQUFFLENBQUMsY0FBYyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1lBQ3ZDLEVBQUUsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUM7Z0JBQ1YsSUFBSSxDQUFDLFVBQVUsQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1lBQ2hDLENBQUM7UUFDSCxDQUFDO1FBQUMsS0FBSyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFBLENBQUM7SUFDcEIsQ0FBQztJQUNELFVBQVUsRUFBRTtRQUNWLFFBQVEsRUFBRSxZQUFZLEVBQUU7UUFDeEIsS0FBSyxFQUFFLEVBQUU7UUFDVCxTQUFTLEVBQUUsRUFBRTtLQUNkO0lBQ0QsUUFBUTtRQUNOLE1BQU0sQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLEtBQUssQ0FBQztJQUMvQixDQUFDO0lBQ0QsYUFBYTtRQUNYLElBQUksQ0FBQyxVQUFVLENBQUMsS0FBSyxHQUFHLEVBQUUsQ0FBQztRQUMzQixJQUFJLENBQUMsVUFBVSxDQUFDLFFBQVEsR0FBRyxZQUFZLEVBQUUsQ0FBQztRQUMxQyxJQUFJLENBQUMsVUFBVSxDQUFDLFNBQVMsR0FBRyxFQUFFLENBQUM7SUFDakMsQ0FBQztDQUNGLENBQUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFVzZXJpbmZvLCBVc2VyUm9sZSB9IGZyb20gJy4vc3RvcmUvdXNlcic7XG5cbi8vYXBwLnRzXG5leHBvcnQgaW50ZXJmYWNlIElNeUFwcCB7XG4gIHJlc2V0VXNlcmluZm86ICgpID0+IHZvaWQ7XG4gIGdldFRva2VuOiAoKSA9PiBzdHJpbmc7XG4gIGdsb2JhbERhdGE6IHtcbiAgICB1c2VySW5mbzogVXNlcmluZm87XG4gICAgdG9rZW46IHN0cmluZztcbiAgICB1c2VyUm9sZXM6IFVzZXJSb2xlW107XG4gIH07XG59XG5cbmNvbnN0IGluaXRVc2VyaW5mbyA9ICgpID0+ICh7XG4gIGNlbGxwaG9uZTogJycsXG4gIGNvbW1lbnQ6ICcnLFxuICBjcmVhdGVBdDogJycsXG4gIGlkOiAwLFxuICBpc09wZW5PcGVyTG9nOiAwLFxuICBpc1NldFBhc3N3b3JkOiAwLFxuICBsYXN0TG9naW5EYXRlOiAnJyxcbiAgbG9naW5BY2NvdW50OiAnJyxcbiAgbG9naW5Db3VudDogMCxcbiAgbmFtZTogJycsXG4gIG9wZXJhdGVJZDogMCxcbiAgb3BlcmF0ZU5hbWU6ICcnLFxuICBzdGF0ZTogJycsXG4gIHVwZGF0ZUF0OiAnJyxcbn0pO1xuQXBwPElNeUFwcD4oe1xuICBvbkxhdW5jaCgpIHtcbiAgICBjb25zb2xlLmxvZygnaW4gb25MYXVuY2gnKTtcbiAgICB0cnkge1xuICAgICAgbGV0IHRva2VuID0gd3guZ2V0U3RvcmFnZVN5bmMoJ3Rva2VuJyk7XG4gICAgICBpZiAodG9rZW4pIHtcbiAgICAgICAgdGhpcy5nbG9iYWxEYXRhLnRva2VuID0gdG9rZW47XG4gICAgICB9XG4gICAgfSBjYXRjaCAoZXJyb3IpIHt9XG4gIH0sXG4gIGdsb2JhbERhdGE6IHtcbiAgICB1c2VySW5mbzogaW5pdFVzZXJpbmZvKCksXG4gICAgdG9rZW46ICcnLFxuICAgIHVzZXJSb2xlczogW10sXG4gIH0sXG4gIGdldFRva2VuKCkge1xuICAgIHJldHVybiB0aGlzLmdsb2JhbERhdGEudG9rZW47XG4gIH0sXG4gIHJlc2V0VXNlcmluZm8oKSB7XG4gICAgdGhpcy5nbG9iYWxEYXRhLnRva2VuID0gJyc7XG4gICAgdGhpcy5nbG9iYWxEYXRhLnVzZXJJbmZvID0gaW5pdFVzZXJpbmZvKCk7XG4gICAgdGhpcy5nbG9iYWxEYXRhLnVzZXJSb2xlcyA9IFtdO1xuICB9LFxufSk7XG4iXX0=
\ No newline at end of file
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiYXBwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBYUEsSUFBTSxZQUFZLEdBQUcsY0FBTSxPQUFBLENBQUM7SUFDMUIsU0FBUyxFQUFFLEVBQUU7SUFDYixPQUFPLEVBQUUsRUFBRTtJQUNYLFFBQVEsRUFBRSxFQUFFO0lBQ1osRUFBRSxFQUFFLENBQUM7SUFDTCxhQUFhLEVBQUUsQ0FBQztJQUNoQixhQUFhLEVBQUUsQ0FBQztJQUNoQixhQUFhLEVBQUUsRUFBRTtJQUNqQixZQUFZLEVBQUUsRUFBRTtJQUNoQixVQUFVLEVBQUUsQ0FBQztJQUNiLElBQUksRUFBRSxFQUFFO0lBQ1IsU0FBUyxFQUFFLENBQUM7SUFDWixXQUFXLEVBQUUsRUFBRTtJQUNmLEtBQUssRUFBRSxFQUFFO0lBQ1QsUUFBUSxFQUFFLEVBQUU7Q0FDYixDQUFDLEVBZnlCLENBZXpCLENBQUM7QUFDSCxHQUFHLENBQVM7SUFDVixRQUFRO1FBQ04sT0FBTyxDQUFDLEdBQUcsQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUMzQixJQUFJLENBQUM7WUFDSCxJQUFJLEtBQUssR0FBRyxFQUFFLENBQUMsY0FBYyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1lBQ3ZDLEVBQUUsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUM7Z0JBQ1YsSUFBSSxDQUFDLFVBQVUsQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1lBQ2hDLENBQUM7UUFDSCxDQUFDO1FBQUMsS0FBSyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFBLENBQUM7SUFDcEIsQ0FBQztJQUNELFVBQVUsRUFBRTtRQUNWLFFBQVEsRUFBRSxZQUFZLEVBQUU7UUFDeEIsS0FBSyxFQUFFLGtFQUFrRTtRQUN6RSxTQUFTLEVBQUUsRUFBRTtLQUNkO0lBQ0QsUUFBUTtRQUNOLE1BQU0sQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLEtBQUssQ0FBQztJQUMvQixDQUFDO0lBQ0QsYUFBYTtRQUNYLElBQUksQ0FBQyxVQUFVLENBQUMsS0FBSyxHQUFHLEVBQUUsQ0FBQztRQUMzQixJQUFJLENBQUMsVUFBVSxDQUFDLFFBQVEsR0FBRyxZQUFZLEVBQUUsQ0FBQztRQUMxQyxJQUFJLENBQUMsVUFBVSxDQUFDLFNBQVMsR0FBRyxFQUFFLENBQUM7UUFDL0IsSUFBSSxDQUFDO1lBQ0gsRUFBRSxDQUFDLGNBQWMsQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFDakMsQ0FBQztRQUFDLEtBQUssQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQSxDQUFDO0lBQ3BCLENBQUM7Q0FDRixDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBVc2VyaW5mbywgVXNlclJvbGUgfSBmcm9tICcuL3N0b3JlL3VzZXInO1xuXG4vL2FwcC50c1xuZXhwb3J0IGludGVyZmFjZSBJTXlBcHAge1xuICByZXNldFVzZXJpbmZvOiAoKSA9PiB2b2lkO1xuICBnZXRUb2tlbjogKCkgPT4gc3RyaW5nO1xuICBnbG9iYWxEYXRhOiB7XG4gICAgdXNlckluZm86IFVzZXJpbmZvO1xuICAgIHRva2VuOiBzdHJpbmc7XG4gICAgdXNlclJvbGVzOiBVc2VyUm9sZVtdO1xuICB9O1xufVxuXG5jb25zdCBpbml0VXNlcmluZm8gPSAoKSA9PiAoe1xuICBjZWxscGhvbmU6ICcnLFxuICBjb21tZW50OiAnJyxcbiAgY3JlYXRlQXQ6ICcnLFxuICBpZDogMCxcbiAgaXNPcGVuT3BlckxvZzogMCxcbiAgaXNTZXRQYXNzd29yZDogMCxcbiAgbGFzdExvZ2luRGF0ZTogJycsXG4gIGxvZ2luQWNjb3VudDogJycsXG4gIGxvZ2luQ291bnQ6IDAsXG4gIG5hbWU6ICcnLFxuICBvcGVyYXRlSWQ6IDAsXG4gIG9wZXJhdGVOYW1lOiAnJyxcbiAgc3RhdGU6ICcnLFxuICB1cGRhdGVBdDogJycsXG59KTtcbkFwcDxJTXlBcHA+KHtcbiAgb25MYXVuY2goKSB7XG4gICAgY29uc29sZS5sb2coJ2luIG9uTGF1bmNoJyk7XG4gICAgdHJ5IHtcbiAgICAgIGxldCB0b2tlbiA9IHd4LmdldFN0b3JhZ2VTeW5jKCd0b2tlbicpO1xuICAgICAgaWYgKHRva2VuKSB7XG4gICAgICAgIHRoaXMuZ2xvYmFsRGF0YS50b2tlbiA9IHRva2VuO1xuICAgICAgfVxuICAgIH0gY2F0Y2ggKGVycm9yKSB7fVxuICB9LFxuICBnbG9iYWxEYXRhOiB7XG4gICAgdXNlckluZm86IGluaXRVc2VyaW5mbygpLFxuICAgIHRva2VuOiAnc3lzdGVtOmxvZ2luOnRva2VuOmExZDBjNmU4M2YwMjczMjdkODQ2MTA2M2Y0YWM1OGE2MTU3MjgzMzM0NTIwNCcsXG4gICAgdXNlclJvbGVzOiBbXSxcbiAgfSxcbiAgZ2V0VG9rZW4oKSB7XG4gICAgcmV0dXJuIHRoaXMuZ2xvYmFsRGF0YS50b2tlbjtcbiAgfSxcbiAgcmVzZXRVc2VyaW5mbygpIHtcbiAgICB0aGlzLmdsb2JhbERhdGEudG9rZW4gPSAnJztcbiAgICB0aGlzLmdsb2JhbERhdGEudXNlckluZm8gPSBpbml0VXNlcmluZm8oKTtcbiAgICB0aGlzLmdsb2JhbERhdGEudXNlclJvbGVzID0gW107XG4gICAgdHJ5IHtcbiAgICAgIHd4LnNldFN0b3JhZ2VTeW5jKCd0b2tlbicsICcnKTtcbiAgICB9IGNhdGNoIChlcnJvcikge31cbiAgfSxcbn0pO1xuIl19
\ No newline at end of file
miniprogram/app.ts
......@@ -39,7 +39,7 @@ App<IMyApp>({
},
globalData: {
userInfo: initUserinfo(),
token: '',
token: 'system:login:token:a1d0c6e83f027327d8461063f4ac58a61572833345204',
userRoles: [],
},
getToken() {
......@@ -49,5 +49,8 @@ App<IMyApp>({
this.globalData.token = '';
this.globalData.userInfo = initUserinfo();
this.globalData.userRoles = [];
try {
wx.setStorageSync('token', '');
} catch (error) {}
},
});
miniprogram/custom-tab-bar/index.wxml
<!--custom-tab-bar/index.wxml-->
<!-- custom-tab-bar/index.wxml -->
<cover-view class="custom-tab-bar">
<cover-view wx:for="{{listData}}" wx:key="index" class="custom-tab-bar-item {{checked === index?'checked':''}}" data-index="{{index}}" data-path="{{item.pagePath}}" bindtap="clickHandle">
<cover-image class="custom-tab-bar-icon" src="{{checked === index ? item.selectedIconPath : item.iconPath}}"></cover-image>
{{item.text}}
<cover-view>{{item.text}}</cover-view>
</cover-view>
</cover-view>
\ No newline at end of file
miniprogram/custom-tab-bar/index.wxss
......@@ -2,6 +2,8 @@
.custom-tab-bar {
position: fixed;
padding-bottom: constant(safe-area-inset-bottom);
padding-bottom: env(safe-area-inset-bottom);
bottom: 0;
width: 100%;
height: 96rpx;
......
miniprogram/pages/components/AreaSelect/AreaSelect.js 0 → 100644
"use strict";
Component({
properties: {
placeholder: {
type: String,
value: '请选择',
},
range: {
type: Array,
value: [],
observer: function (newVal) {
this.setData({ filterList: newVal });
},
},
rangeKey: {
type: String,
value: 'key',
},
value: {
type: String,
value: '',
observer: function (newVal) {
this.setData({ selected: newVal });
},
},
},
data: {
showPickerView: false,
selected: '',
selectedIndex: '',
filterList: [],
},
methods: {
inputClickHandle: function () {
this.setData({
showPickerView: !this.data.showPickerView,
});
},
innerClickHandle: function (e) {
return false;
},
maskClickHandle: function (e) {
this.setData({
showPickerView: false,
});
return false;
},
inputHandle: function (e) {
var _this = this;
var value = e.detail.value;
console.log(e, value);
var filterList = [];
if (value) {
filterList = this.data.range.filter(function (item) {
return item[_this.data.rangeKey].includes(value);
});
}
else {
filterList = this.data.range;
}
this.setData({
filterList: filterList,
});
},
bindPickerChange: function () {
var value = this.data.selected;
this.setData({
showPickerView: false,
});
this.triggerEvent('change', { value: value }, {});
},
selectedHandle: function (e) {
var value = e.currentTarget.dataset.value;
console.log(e, value);
if (this.data.selectedIndex === value) {
this.setData({
selected: '',
selectedIndex: '',
});
}
else {
this.setData({
selected: this.data.range[value].id,
selectedIndex: value,
});
}
},
},
});
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXJlYVNlbGVjdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIkFyZWFTZWxlY3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUNBLFNBQVMsQ0FBQztJQUNSLFVBQVUsRUFBRTtRQUNWLFdBQVcsRUFBRTtZQUNYLElBQUksRUFBRSxNQUFNO1lBQ1osS0FBSyxFQUFFLEtBQUs7U0FDYjtRQUNELEtBQUssRUFBRTtZQUNMLElBQUksRUFBRSxLQUFLO1lBQ1gsS0FBSyxFQUFFLEVBQUU7WUFDVCxRQUFRLFlBQUMsTUFBTTtnQkFDYixJQUFJLENBQUMsT0FBTyxDQUFDLEVBQUUsVUFBVSxFQUFFLE1BQU0sRUFBRSxDQUFDLENBQUM7WUFDdkMsQ0FBQztTQUNGO1FBQ0QsUUFBUSxFQUFFO1lBQ1IsSUFBSSxFQUFFLE1BQU07WUFDWixLQUFLLEVBQUUsS0FBSztTQUNiO1FBQ0QsS0FBSyxFQUFFO1lBQ0wsSUFBSSxFQUFFLE1BQU07WUFDWixLQUFLLEVBQUUsRUFBRTtZQUNULFFBQVEsWUFBQyxNQUFNO2dCQUNiLElBQUksQ0FBQyxPQUFPLENBQUMsRUFBRSxRQUFRLEVBQUUsTUFBTSxFQUFFLENBQUMsQ0FBQztZQUNyQyxDQUFDO1NBQ0Y7S0FDRjtJQUNELElBQUksRUFBRTtRQUNKLGNBQWMsRUFBRSxLQUFLO1FBQ3JCLFFBQVEsRUFBRSxFQUFFO1FBQ1osYUFBYSxFQUFFLEVBQUU7UUFDakIsVUFBVSxFQUFFLEVBQUU7S0FDZjtJQUNELE9BQU8sRUFBRTtRQUNQLGdCQUFnQjtZQUNkLElBQUksQ0FBQyxPQUFRLENBQUM7Z0JBQ1osY0FBYyxFQUFFLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxjQUFjO2FBQzFDLENBQUMsQ0FBQztRQUNMLENBQUM7UUFDRCxnQkFBZ0IsWUFBQyxDQUFDO1lBQ2hCLE1BQU0sQ0FBQyxLQUFLLENBQUM7UUFDZixDQUFDO1FBQ0QsZUFBZSxZQUFDLENBQUM7WUFDZixJQUFJLENBQUMsT0FBTyxDQUFDO2dCQUNYLGNBQWMsRUFBRSxLQUFLO2FBQ3RCLENBQUMsQ0FBQztZQUNILE1BQU0sQ0FBQyxLQUFLLENBQUM7UUFDZixDQUFDO1FBQ0QsV0FBVyxZQUFDLENBQUM7WUFBYixpQkFlQztZQWRTLElBQUEsc0JBQUssQ0FBYztZQUMzQixPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsRUFBRSxLQUFLLENBQUMsQ0FBQztZQUN0QixJQUFJLFVBQVUsR0FBRyxFQUFFLENBQUM7WUFDcEIsRUFBRSxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQztnQkFDVixVQUFVLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLFVBQUEsSUFBSTtvQkFDdEMsT0FBQSxJQUFJLENBQUMsS0FBSSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDO2dCQUF4QyxDQUF3QyxDQUN6QyxDQUFDO1lBQ0osQ0FBQztZQUFDLElBQUksQ0FBQyxDQUFDO2dCQUNOLFVBQVUsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQztZQUMvQixDQUFDO1lBRUQsSUFBSSxDQUFDLE9BQU8sQ0FBQztnQkFDWCxVQUFVLFlBQUE7YUFDWCxDQUFDLENBQUM7UUFDTCxDQUFDO1FBQ0QsZ0JBQWdCO1lBQ2QsSUFBSSxLQUFLLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUM7WUFDL0IsSUFBSSxDQUFDLE9BQVEsQ0FBQztnQkFDWixjQUFjLEVBQUUsS0FBSzthQUN0QixDQUFDLENBQUM7WUFDSCxJQUFJLENBQUMsWUFBWSxDQUFDLFFBQVEsRUFBRSxFQUFFLEtBQUssT0FBQSxFQUFFLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFDN0MsQ0FBQztRQUNELGNBQWMsWUFBQyxDQUFDO1lBQ04sSUFBQSxxQ0FBSyxDQUE2QjtZQUMxQyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsRUFBRSxLQUFLLENBQUMsQ0FBQztZQUN0QixFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLGFBQWEsS0FBSyxLQUFLLENBQUMsQ0FBQyxDQUFDO2dCQUN0QyxJQUFJLENBQUMsT0FBTyxDQUFDO29CQUNYLFFBQVEsRUFBRSxFQUFFO29CQUNaLGFBQWEsRUFBRSxFQUFFO2lCQUNsQixDQUFDLENBQUM7WUFDTCxDQUFDO1lBQUMsSUFBSSxDQUFDLENBQUM7Z0JBQ04sSUFBSSxDQUFDLE9BQU8sQ0FBQztvQkFDWCxRQUFRLEVBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUMsRUFBRTtvQkFDbkMsYUFBYSxFQUFFLEtBQUs7aUJBQ3JCLENBQUMsQ0FBQztZQUNMLENBQUM7UUFDSCxDQUFDO0tBQ0Y7Q0FDRixDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvLyBwYWdlcy9jb21wb25lbnRzL0FyZWFTZWxlY3QvQXJlYVNlbGVjdC5qc1xuQ29tcG9uZW50KHtcbiAgcHJvcGVydGllczoge1xuICAgIHBsYWNlaG9sZGVyOiB7XG4gICAgICB0eXBlOiBTdHJpbmcsXG4gICAgICB2YWx1ZTogJ+ivt+mAieaLqScsXG4gICAgfSxcbiAgICByYW5nZToge1xuICAgICAgdHlwZTogQXJyYXksXG4gICAgICB2YWx1ZTogW10sXG4gICAgICBvYnNlcnZlcihuZXdWYWwpIHtcbiAgICAgICAgdGhpcy5zZXREYXRhKHsgZmlsdGVyTGlzdDogbmV3VmFsIH0pO1xuICAgICAgfSxcbiAgICB9LFxuICAgIHJhbmdlS2V5OiB7XG4gICAgICB0eXBlOiBTdHJpbmcsXG4gICAgICB2YWx1ZTogJ2tleScsXG4gICAgfSxcbiAgICB2YWx1ZToge1xuICAgICAgdHlwZTogU3RyaW5nLFxuICAgICAgdmFsdWU6ICcnLFxuICAgICAgb2JzZXJ2ZXIobmV3VmFsKSB7XG4gICAgICAgIHRoaXMuc2V0RGF0YSh7IHNlbGVjdGVkOiBuZXdWYWwgfSk7XG4gICAgICB9LFxuICAgIH0sXG4gIH0sXG4gIGRhdGE6IHtcbiAgICBzaG93UGlja2VyVmlldzogZmFsc2UsXG4gICAgc2VsZWN0ZWQ6ICcnLFxuICAgIHNlbGVjdGVkSW5kZXg6ICcnLFxuICAgIGZpbHRlckxpc3Q6IFtdLFxuICB9LFxuICBtZXRob2RzOiB7XG4gICAgaW5wdXRDbGlja0hhbmRsZSgpIHtcbiAgICAgIHRoaXMuc2V0RGF0YSEoe1xuICAgICAgICBzaG93UGlja2VyVmlldzogIXRoaXMuZGF0YS5zaG93UGlja2VyVmlldyxcbiAgICAgIH0pO1xuICAgIH0sXG4gICAgaW5uZXJDbGlja0hhbmRsZShlKSB7XG4gICAgICByZXR1cm4gZmFsc2U7XG4gICAgfSxcbiAgICBtYXNrQ2xpY2tIYW5kbGUoZSkge1xuICAgICAgdGhpcy5zZXREYXRhKHtcbiAgICAgICAgc2hvd1BpY2tlclZpZXc6IGZhbHNlLFxuICAgICAgfSk7XG4gICAgICByZXR1cm4gZmFsc2U7XG4gICAgfSxcbiAgICBpbnB1dEhhbmRsZShlKSB7XG4gICAgICBjb25zdCB7IHZhbHVlIH0gPSBlLmRldGFpbDtcbiAgICAgIGNvbnNvbGUubG9nKGUsIHZhbHVlKTtcbiAgICAgIGxldCBmaWx0ZXJMaXN0ID0gW107XG4gICAgICBpZiAodmFsdWUpIHtcbiAgICAgICAgZmlsdGVyTGlzdCA9IHRoaXMuZGF0YS5yYW5nZS5maWx0ZXIoaXRlbSA9PlxuICAgICAgICAgIGl0ZW1bdGhpcy5kYXRhLnJhbmdlS2V5XS5pbmNsdWRlcyh2YWx1ZSksXG4gICAgICAgICk7XG4gICAgICB9IGVsc2Uge1xuICAgICAgICBmaWx0ZXJMaXN0ID0gdGhpcy5kYXRhLnJhbmdlO1xuICAgICAgfVxuXG4gICAgICB0aGlzLnNldERhdGEoe1xuICAgICAgICBmaWx0ZXJMaXN0LFxuICAgICAgfSk7XG4gICAgfSxcbiAgICBiaW5kUGlja2VyQ2hhbmdlKCkge1xuICAgICAgbGV0IHZhbHVlID0gdGhpcy5kYXRhLnNlbGVjdGVkO1xuICAgICAgdGhpcy5zZXREYXRhISh7XG4gICAgICAgIHNob3dQaWNrZXJWaWV3OiBmYWxzZSxcbiAgICAgIH0pO1xuICAgICAgdGhpcy50cmlnZ2VyRXZlbnQoJ2NoYW5nZScsIHsgdmFsdWUgfSwge30pO1xuICAgIH0sXG4gICAgc2VsZWN0ZWRIYW5kbGUoZSkge1xuICAgICAgY29uc3QgeyB2YWx1ZSB9ID0gZS5jdXJyZW50VGFyZ2V0LmRhdGFzZXQ7XG4gICAgICBjb25zb2xlLmxvZyhlLCB2YWx1ZSk7XG4gICAgICBpZiAodGhpcy5kYXRhLnNlbGVjdGVkSW5kZXggPT09IHZhbHVlKSB7XG4gICAgICAgIHRoaXMuc2V0RGF0YSh7XG4gICAgICAgICAgc2VsZWN0ZWQ6ICcnLFxuICAgICAgICAgIHNlbGVjdGVkSW5kZXg6ICcnLFxuICAgICAgICB9KTtcbiAgICAgIH0gZWxzZSB7XG4gICAgICAgIHRoaXMuc2V0RGF0YSh7XG4gICAgICAgICAgc2VsZWN0ZWQ6IHRoaXMuZGF0YS5yYW5nZVt2YWx1ZV0uaWQsXG4gICAgICAgICAgc2VsZWN0ZWRJbmRleDogdmFsdWUsXG4gICAgICAgIH0pO1xuICAgICAgfVxuICAgIH0sXG4gIH0sXG59KTtcbiJdfQ==
\ No newline at end of file
miniprogram/pages/components/AreaSelect/AreaSelect.json 0 → 100644
{
"component": true,
"usingComponents": {}
}
\ No newline at end of file
miniprogram/pages/components/AreaSelect/AreaSelect.ts 0 → 100644
// pages/components/AreaSelect/AreaSelect.js
Component({
properties: {
placeholder: {
type: String,
value: '请选择',
},
range: {
type: Array,
value: [],
observer(newVal) {
this.setData({ filterList: newVal });
},
},
rangeKey: {
type: String,
value: 'key',
},
value: {
type: String,
value: '',
observer(newVal) {
this.setData({ selected: newVal });
},
},
},
data: {
showPickerView: false,
selected: '',
selectedIndex: '',
filterList: [],
},
methods: {
inputClickHandle() {
this.setData!({
showPickerView: !this.data.showPickerView,
});
},
innerClickHandle(e) {
return false;
},
maskClickHandle(e) {
this.setData({
showPickerView: false,
});
return false;
},
inputHandle(e) {
const { value } = e.detail;
console.log(e, value);
let filterList = [];
if (value) {
filterList = this.data.range.filter(item =>
item[this.data.rangeKey].includes(value),
);
} else {
filterList = this.data.range;
}
this.setData({
filterList,
});
},
bindPickerChange() {
let value = this.data.selected;
this.setData!({
showPickerView: false,
});
this.triggerEvent('change', { value }, {});
},
selectedHandle(e) {
const { value } = e.currentTarget.dataset;
console.log(e, value);
if (this.data.selectedIndex === value) {
this.setData({
selected: '',
selectedIndex: '',
});
} else {
this.setData({
selected: this.data.range[value].id,
selectedIndex: value,
});
}
},
},
});
miniprogram/pages/components/AreaSelect/AreaSelect.wxml 0 → 100644
<!-- pages/components/AreaSelect/AreaSelect.wxml -->
<!-- pages/components/Select/Select.wxml -->
<view class="areaselect-input">
<!-- <picker class="areaselect-picker" mode="{{mode}}" bindchange="bindPickerChange" value="{{selected}}" range="{{range}}" range-key="{{rangeKey}}" fields="{{fields}}"> -->
<!-- </picker> -->
<view class="areaselect-picker" bindtap="inputClickHandle">
<view wx:if="{{selected}}" class="select-value">{{range[selectedIndex][rangeKey]}}</view>
<view wx:else class="select-placeholder">{{placeholder}}</view>
<image class="select-icon" src="../../../images/btn_xiala@2x.png" mode="aspectFill" />
</view>
<view class="areaselect-pickView {{showPickerView?'show':''}}" bindtap="maskClickHandle">
<view class="areaselect-pickBox {{showPickerView?'show':''}}" catchtap="innerClickHandle">
<view wx:if="{{showPickerView}}" class="areaselect-pickFilter">
<input class="areaselect-pickInput" type="text" bindconfirm="inputHandle" />
<view class="areaselect-pickBtn" bindtap="bindPickerChange">确认</view>
</view>
<view class="areaselect-list">
<view wx:for="{{filterList}}" class="areaselect-listItem {{selectedIndex === index?'selected':''}}" wx:key="{{item.id}}" data-value="{{index}}" bindtap="selectedHandle">
{{item[rangeKey]}}
</view>
</view>
</view>
</view>
</view>
\ No newline at end of file
miniprogram/pages/components/AreaSelect/AreaSelect.wxss 0 → 100644
/* pages/components/AreaSelect/AreaSelect.wxss */
.areaselect-input {
box-sizing: border-box;
width: 100%;
position: relative;
border: 1rpx solid #f8f8f8;
background-color: #f8f8f8;
padding: 0 40rpx;
border-radius: 96rpx;
height: 96rpx;
line-height: 96rpx;
font-size: 28rpx;
}
.areaselect-input:hover,
.areaselect-input:focus {
border-color: #6895fe;
}
.select-placeholder {
color: #999;
}
.select-value {
color: #333;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
width: 85%;
}
.select-icon {
position: absolute;
width: 44rpx;
height: 44rpx;
right: 40rpx;
top: 26rpx;
}
.areaselect-pickView {
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
width: 0;
height: 0;
background-color: rgba(0, 0, 0, 0.41);
z-index: 100;
}
.areaselect-pickView.show {
width: 100%;
height: 100%;
}
.areaselect-pickBox {
position: absolute;
box-sizing: border-box;
padding-bottom: constant(safe-area-inset-bottom);
padding-bottom: env(safe-area-inset-bottom);
bottom: 0;
background-color: #fff;
width: 100%;
height: 0;
transition: height 0.28s;
border-radius: 40rpx 40rpx 0 0;
display: flex;
flex-direction: column;
}
.areaselect-pickBox.show {
height: 70%;
}
.areaselect-pickFilter {
display: flex;
padding: 40rpx 40rpx 0;
}
.areaselect-pickInput {
flex: 1;
}
.areaselect-pickBtn {
color: #6895fe;
margin-left: 20rpx;
}
.areaselect-list {
flex: 1;
padding: 40rpx 0;
overflow-y: auto;
}
.areaselect-listItem {
line-height: 100rpx;
font-size: 28rpx;
color: #333;
padding: 0 80rpx;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.areaselect-listItem.selected {
background-color: #f0f5ff;
}
miniprogram/pages/components/Select/Select.wxss
/* pages/components/Select/Select.wxss */
.select-input {
box-sizing: border-box;
width: 100%;
position: relative;
border: 1rpx solid #f8f8f8;
background-color: #f8f8f8;
......@@ -18,6 +20,10 @@
}
.select-value {
color: #333;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
width: 85%;
}
.select-icon {
position: absolute;
......
miniprogram/pages/feedback/feedback.json
{
"navigationBarTitleText": "反馈处理",
"usingComponents": {
"c-select": "../components/Select/Select",
"area-select": "../components/AreaSelect/AreaSelect",
"feedback-item": "../components/FeedbackItem/FeedbackItem"
}
}
miniprogram/pages/feedback/feedback.ts
......@@ -61,7 +61,7 @@ Page({
const { value } = e.detail;
this.setData!(
{
areaId: this.data.areaList[value].id,
areaId: value,
},
() => {
this.initData();
......
miniprogram/pages/feedback/feedback.wxml
<!-- miniprogram/pages/feedback/feedback.wxml -->
<view class="container feedback">
<view class="feedback-area">
<c-select mode="selector" range="{{areaList}}" range-key="{{'areaName'}}" bindchange="bindPickerChange" placeholder="所属区域选择" />
<area-select range="{{areaList}}" range-key="{{'areaName'}}" bindchange="bindPickerChange" placeholder="所属区域选择" />
</view>
<view class="feedback-tabbar">
<view bind:tap="toggleList" data-tabIndex="{{1}}" class="feedback-tabItem {{tabIndex===1?'checked':''}}">
......
miniprogram/pages/home/home.ts
......@@ -7,11 +7,6 @@ Component({
attached() {
console.log('in show ', this.data.fetched);
!this.data.fetched && this.fetchRechargeData();
if (typeof this.getTabBar === 'function' && this.getTabBar()) {
this.getTabBar().setData({
selected: 0,
});
}
},
},
/**
......
miniprogram/pages/monthOperator/monthOperator.json
......@@ -2,6 +2,7 @@
"navigationBarTitleText": "月度运营分析",
"usingComponents": {
"c-select": "../components/Select/Select",
"area-select": "../components/AreaSelect/AreaSelect",
"recharge-chart": "../components/RechargeChart/RechargeChart",
"refund-chart": "../components/RefundChart/RefundChart",
"consume-chart": "../components/ConsumeChart/ConsumeChart",
......
miniprogram/pages/monthOperator/monthOperator.ts
......@@ -64,9 +64,33 @@ Page({
areaChangeHandle(val) {
console.log('areaChangeHandle', val);
const { value } = val.detail;
this.fetchList({ areaId: [value] });
this.setData!(
{
areaId: value,
},
() => {
if (value) {
this.fetchList({ areaId: [value] });
} else {
this.fetchList();
}
},
);
},
monthChangeHandle(val) {
console.log('monthChangeHandle', val);
const { value } = val.detail;
this.fetchList({ month: value });
this.setData!({
month: value,
});
},
fetchList(entity?: { areaId?: number; month?: string }) {
if (this.data.areaId) {
if (entity && entity.areaId) {
} else entity = { ...entity, areaId: [this.data.areaId] };
}
console.log(this.data.areaId, entity);
this.fetchRechargeData(entity);
this.fetchConsumeData(entity);
this.fetchServiceTypeList(entity);
......@@ -77,7 +101,6 @@ Page({
month: this.data.month,
...entity,
};
if (this.data.areaId) reqBody.areaId = this.data.areaId;
statisticsFetch({
url: '/dcxy/reportInfo/dailyConsumeCount',
method: 'POST',
......@@ -122,7 +145,6 @@ Page({
month: this.data.month,
...entity,
};
if (this.data.areaId) reqBody.areaId = this.data.areaId;
statisticsFetch({
url: '/dcxy/reportInfo/queryRechargeListDaily',
method: 'POST',
......@@ -170,7 +192,6 @@ Page({
month: this.data.month,
...entity,
};
if (this.data.areaId) reqBody.areaId = this.data.areaId;
statisticsFetch({
url: '/dcxy/reportInfo/serviceConsume',
method: 'POST',
......@@ -191,7 +212,6 @@ Page({
month: this.data.month,
...entity,
};
if (this.data.areaId) reqBody.areaId = this.data.areaId;
statisticsFetch({
url: '/dcxy/reportInfo/payTypeConsume',
method: 'POST',
......
miniprogram/pages/monthOperator/monthOperator.wxml
......@@ -2,10 +2,10 @@
<view class="monthOperator">
<view class="monthOperator-filter">
<view class="monthOperator-area">
<c-select mode="selector" range="{{areaList}}" range-key="{{'areaName'}}" bindchange="areaChangeHandle" placeholder="所属区域选择" />
<area-select range="{{areaList}}" range-key="{{'areaName'}}" bindchange="areaChangeHandle" placeholder="所属区域选择" />
</view>
<view class="monthOperator-time">
<c-select mode="date" fields="month" value="{{month}}" bindchange="bindPickerChange" />
<c-select mode="date" fields="month" value="{{month}}" bindchange="monthChangeHandle" />
</view>
</view>
<view class="monthOperator-block">
......
miniprogram/pages/monthOperator/monthOperator.wxss
......@@ -5,10 +5,11 @@
justify-content: space-between;
}
.monthOperator-area {
flex: 1;
width: 400rpx;
}
.monthOperator-time {
width: 250rpx;
min-width: 250rpx;
margin-left: 20rpx;
}
.monthOperator-block {
......@@ -55,6 +56,6 @@
width: 660rpx;
height: 350rpx;
}
.monthOperator-canvas.autoheight{
.monthOperator-canvas.autoheight {
height: auto;
}
\ No newline at end of file
}
miniprogram/pages/report/report.js
......@@ -2,15 +2,6 @@
Object.defineProperty(exports, "__esModule", { value: true });
var app = getApp();
Component({
pageLifetimes: {
show: function () {
if (typeof this.getTabBar === 'function' && this.getTabBar()) {
this.getTabBar().setData({
selected: 1,
});
}
},
},
lifetimes: {
attached: function () {
console.log(app.globalData.userInfo);
......@@ -31,7 +22,7 @@ Component({
{
name: '用户增长分析',
icon: '../../../images/btn_yonghu@2x.png',
url: '/pages/monthOperator/monthOperator',
url: '/pages/userGrowth/userGrowth',
reLaunch: false,
},
{
......@@ -41,25 +32,15 @@ Component({
reLaunch: false,
},
{
name: '服务费缴纳',
icon: '../../../images/btn_jiaona@2x.png',
url: '',
reLaunch: false,
},
{
name: '账户提现',
icon: '../../../images/btn_tixian@2x.png',
url: '',
reLaunch: false,
},
{
name: '退出登录',
icon: '../../../images/btn_Sign out@2x.png',
url: '/pages/index/index',
reLaunch: true,
},
{},
{},
],
account: 0,
},
});
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVwb3J0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsicmVwb3J0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBR0EsSUFBTSxHQUFHLEdBQUcsTUFBTSxFQUFVLENBQUM7QUFDN0IsU0FBUyxDQUFDO0lBQ1IsYUFBYSxFQUFFO1FBQ2IsSUFBSTtZQUNGLEVBQUUsQ0FBQyxDQUFDLE9BQU8sSUFBSSxDQUFDLFNBQVMsS0FBSyxVQUFVLElBQUksSUFBSSxDQUFDLFNBQVMsRUFBRSxDQUFDLENBQUMsQ0FBQztnQkFDN0QsSUFBSSxDQUFDLFNBQVMsRUFBRSxDQUFDLE9BQU8sQ0FBQztvQkFDdkIsUUFBUSxFQUFFLENBQUM7aUJBQ1osQ0FBQyxDQUFDO1lBQ0wsQ0FBQztRQUNILENBQUM7S0FDRjtJQUNELFNBQVMsRUFBRTtRQUNULFFBQVE7WUFDTixPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUMsUUFBUSxDQUFDLENBQUM7WUFDckMsSUFBSSxDQUFDLE9BQVEsQ0FBQztnQkFDWixRQUFRLEVBQUUsR0FBRyxDQUFDLFVBQVUsQ0FBQyxRQUFRO2FBQ2xDLENBQUMsQ0FBQztRQUNMLENBQUM7S0FDRjtJQUlELElBQUksRUFBRTtRQUNKLFFBQVEsRUFBRSxHQUFHLENBQUMsVUFBVSxDQUFDLFFBQVE7UUFDakMsUUFBUSxFQUFFO1lBQ1I7Z0JBQ0UsSUFBSSxFQUFFLFFBQVE7Z0JBQ2QsSUFBSSxFQUFFLGtDQUFrQztnQkFDeEMsR0FBRyxFQUFFLG9DQUFvQztnQkFDekMsUUFBUSxFQUFFLEtBQUs7YUFDaEI7WUFDRDtnQkFDRSxJQUFJLEVBQUUsUUFBUTtnQkFDZCxJQUFJLEVBQUUsbUNBQW1DO2dCQUN6QyxHQUFHLEVBQUUsb0NBQW9DO2dCQUN6QyxRQUFRLEVBQUUsS0FBSzthQUNoQjtZQUNEO2dCQUNFLElBQUksRUFBRSxNQUFNO2dCQUNaLElBQUksRUFBRSxtQ0FBbUM7Z0JBQ3pDLEdBQUcsRUFBRSwwQkFBMEI7Z0JBQy9CLFFBQVEsRUFBRSxLQUFLO2FBQ2hCO1lBQ0Q7Z0JBQ0UsSUFBSSxFQUFFLE9BQU87Z0JBQ2IsSUFBSSxFQUFFLG1DQUFtQztnQkFDekMsR0FBRyxFQUFFLEVBQUU7Z0JBQ1AsUUFBUSxFQUFFLEtBQUs7YUFDaEI7WUFDRDtnQkFDRSxJQUFJLEVBQUUsTUFBTTtnQkFDWixJQUFJLEVBQUUsbUNBQW1DO2dCQUN6QyxHQUFHLEVBQUUsRUFBRTtnQkFDUCxRQUFRLEVBQUUsS0FBSzthQUNoQjtZQUNEO2dCQUNFLElBQUksRUFBRSxNQUFNO2dCQUNaLElBQUksRUFBRSxxQ0FBcUM7Z0JBQzNDLEdBQUcsRUFBRSxvQkFBb0I7Z0JBQ3pCLFFBQVEsRUFBRSxJQUFJO2FBQ2Y7U0FDRjtRQUNELE9BQU8sRUFBRSxDQUFDO0tBQ1g7Q0FDRixDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJTXlBcHAgfSBmcm9tICcuLi8uLi9hcHAnO1xuXG4vLyBtaW5pcHJvZ3JhbS9wYWdlcy9yZXBvcnQvcmVwb3J0LmpzXG5jb25zdCBhcHAgPSBnZXRBcHA8SU15QXBwPigpO1xuQ29tcG9uZW50KHtcbiAgcGFnZUxpZmV0aW1lczoge1xuICAgIHNob3coKSB7XG4gICAgICBpZiAodHlwZW9mIHRoaXMuZ2V0VGFiQmFyID09PSAnZnVuY3Rpb24nICYmIHRoaXMuZ2V0VGFiQmFyKCkpIHtcbiAgICAgICAgdGhpcy5nZXRUYWJCYXIoKS5zZXREYXRhKHtcbiAgICAgICAgICBzZWxlY3RlZDogMSxcbiAgICAgICAgfSk7XG4gICAgICB9XG4gICAgfSxcbiAgfSxcbiAgbGlmZXRpbWVzOiB7XG4gICAgYXR0YWNoZWQoKSB7XG4gICAgICBjb25zb2xlLmxvZyhhcHAuZ2xvYmFsRGF0YS51c2VySW5mbyk7XG4gICAgICB0aGlzLnNldERhdGEhKHtcbiAgICAgICAgdXNlckluZm86IGFwcC5nbG9iYWxEYXRhLnVzZXJJbmZvLFxuICAgICAgfSk7XG4gICAgfSxcbiAgfSxcbiAgLyoqXG4gICAqIOmhtemdoueahOWIneWni+aVsOaNrlxuICAgKi9cbiAgZGF0YToge1xuICAgIHVzZXJJbmZvOiBhcHAuZ2xvYmFsRGF0YS51c2VySW5mbyxcbiAgICBpdGVtTGlzdDogW1xuICAgICAge1xuICAgICAgICBuYW1lOiAn5pyI5bqm6L+Q6JCl5YiG5p6QJyxcbiAgICAgICAgaWNvbjogJy4uLy4uLy4uL2ltYWdlcy9idG5feXVlZHVAMngucG5nJyxcbiAgICAgICAgdXJsOiAnL3BhZ2VzL21vbnRoT3BlcmF0b3IvbW9udGhPcGVyYXRvcicsXG4gICAgICAgIHJlTGF1bmNoOiBmYWxzZSxcbiAgICAgIH0sXG4gICAgICB7XG4gICAgICAgIG5hbWU6ICfnlKjmiLflop7plb/liIbmnpAnLFxuICAgICAgICBpY29uOiAnLi4vLi4vLi4vaW1hZ2VzL2J0bl95b25naHVAMngucG5nJyxcbiAgICAgICAgdXJsOiAnL3BhZ2VzL21vbnRoT3BlcmF0b3IvbW9udGhPcGVyYXRvcicsXG4gICAgICAgIHJlTGF1bmNoOiBmYWxzZSxcbiAgICAgIH0sXG4gICAgICB7XG4gICAgICAgIG5hbWU6ICfkvJrlkZjlj43ppognLFxuICAgICAgICBpY29uOiAnLi4vLi4vLi4vaW1hZ2VzL2J0bl9mc25rdWlAMngucG5nJyxcbiAgICAgICAgdXJsOiAnL3BhZ2VzL2ZlZWRiYWNrL2ZlZWRiYWNrJyxcbiAgICAgICAgcmVMYXVuY2g6IGZhbHNlLFxuICAgICAgfSxcbiAgICAgIHtcbiAgICAgICAgbmFtZTogJ+acjeWKoei0uee8tOe6sycsXG4gICAgICAgIGljb246ICcuLi8uLi8uLi9pbWFnZXMvYnRuX2ppYW9uYUAyeC5wbmcnLFxuICAgICAgICB1cmw6ICcnLFxuICAgICAgICByZUxhdW5jaDogZmFsc2UsXG4gICAgICB9LFxuICAgICAge1xuICAgICAgICBuYW1lOiAn6LSm5oi35o+Q546wJyxcbiAgICAgICAgaWNvbjogJy4uLy4uLy4uL2ltYWdlcy9idG5fdGl4aWFuQDJ4LnBuZycsXG4gICAgICAgIHVybDogJycsXG4gICAgICAgIHJlTGF1bmNoOiBmYWxzZSxcbiAgICAgIH0sXG4gICAgICB7XG4gICAgICAgIG5hbWU6ICfpgIDlh7rnmbvlvZUnLFxuICAgICAgICBpY29uOiAnLi4vLi4vLi4vaW1hZ2VzL2J0bl9TaWduIG91dEAyeC5wbmcnLFxuICAgICAgICB1cmw6ICcvcGFnZXMvaW5kZXgvaW5kZXgnLFxuICAgICAgICByZUxhdW5jaDogdHJ1ZSxcbiAgICAgIH0sXG4gICAgXSxcbiAgICBhY2NvdW50OiAwLFxuICB9LFxufSk7XG4iXX0=
\ No newline at end of file
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVwb3J0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsicmVwb3J0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBR0EsSUFBTSxHQUFHLEdBQUcsTUFBTSxFQUFVLENBQUM7QUFDN0IsU0FBUyxDQUFDO0lBQ1IsU0FBUyxFQUFFO1FBQ1QsUUFBUTtZQUNOLE9BQU8sQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsQ0FBQztZQUNyQyxJQUFJLENBQUMsT0FBUSxDQUFDO2dCQUNaLFFBQVEsRUFBRSxHQUFHLENBQUMsVUFBVSxDQUFDLFFBQVE7YUFDbEMsQ0FBQyxDQUFDO1FBQ0wsQ0FBQztLQUNGO0lBSUQsSUFBSSxFQUFFO1FBQ0osUUFBUSxFQUFFLEdBQUcsQ0FBQyxVQUFVLENBQUMsUUFBUTtRQUNqQyxRQUFRLEVBQUU7WUFDUjtnQkFDRSxJQUFJLEVBQUUsUUFBUTtnQkFDZCxJQUFJLEVBQUUsa0NBQWtDO2dCQUN4QyxHQUFHLEVBQUUsb0NBQW9DO2dCQUN6QyxRQUFRLEVBQUUsS0FBSzthQUNoQjtZQUNEO2dCQUNFLElBQUksRUFBRSxRQUFRO2dCQUNkLElBQUksRUFBRSxtQ0FBbUM7Z0JBQ3pDLEdBQUcsRUFBRSw4QkFBOEI7Z0JBQ25DLFFBQVEsRUFBRSxLQUFLO2FBQ2hCO1lBQ0Q7Z0JBQ0UsSUFBSSxFQUFFLE1BQU07Z0JBQ1osSUFBSSxFQUFFLG1DQUFtQztnQkFDekMsR0FBRyxFQUFFLDBCQUEwQjtnQkFDL0IsUUFBUSxFQUFFLEtBQUs7YUFDaEI7WUFhRDtnQkFDRSxJQUFJLEVBQUUsTUFBTTtnQkFDWixJQUFJLEVBQUUscUNBQXFDO2dCQUMzQyxHQUFHLEVBQUUsb0JBQW9CO2dCQUN6QixRQUFRLEVBQUUsSUFBSTthQUNmO1lBQ0QsRUFBRTtZQUNGLEVBQUU7U0FDSDtRQUNELE9BQU8sRUFBRSxDQUFDO0tBQ1g7Q0FDRixDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJTXlBcHAgfSBmcm9tICcuLi8uLi9hcHAnO1xuXG4vLyBtaW5pcHJvZ3JhbS9wYWdlcy9yZXBvcnQvcmVwb3J0LmpzXG5jb25zdCBhcHAgPSBnZXRBcHA8SU15QXBwPigpO1xuQ29tcG9uZW50KHtcbiAgbGlmZXRpbWVzOiB7XG4gICAgYXR0YWNoZWQoKSB7XG4gICAgICBjb25zb2xlLmxvZyhhcHAuZ2xvYmFsRGF0YS51c2VySW5mbyk7XG4gICAgICB0aGlzLnNldERhdGEhKHtcbiAgICAgICAgdXNlckluZm86IGFwcC5nbG9iYWxEYXRhLnVzZXJJbmZvLFxuICAgICAgfSk7XG4gICAgfSxcbiAgfSxcbiAgLyoqXG4gICAqIOmhtemdoueahOWIneWni+aVsOaNrlxuICAgKi9cbiAgZGF0YToge1xuICAgIHVzZXJJbmZvOiBhcHAuZ2xvYmFsRGF0YS51c2VySW5mbyxcbiAgICBpdGVtTGlzdDogW1xuICAgICAge1xuICAgICAgICBuYW1lOiAn5pyI5bqm6L+Q6JCl5YiG5p6QJyxcbiAgICAgICAgaWNvbjogJy4uLy4uLy4uL2ltYWdlcy9idG5feXVlZHVAMngucG5nJyxcbiAgICAgICAgdXJsOiAnL3BhZ2VzL21vbnRoT3BlcmF0b3IvbW9udGhPcGVyYXRvcicsXG4gICAgICAgIHJlTGF1bmNoOiBmYWxzZSxcbiAgICAgIH0sXG4gICAgICB7XG4gICAgICAgIG5hbWU6ICfnlKjmiLflop7plb/liIbmnpAnLFxuICAgICAgICBpY29uOiAnLi4vLi4vLi4vaW1hZ2VzL2J0bl95b25naHVAMngucG5nJyxcbiAgICAgICAgdXJsOiAnL3BhZ2VzL3VzZXJHcm93dGgvdXNlckdyb3d0aCcsXG4gICAgICAgIHJlTGF1bmNoOiBmYWxzZSxcbiAgICAgIH0sXG4gICAgICB7XG4gICAgICAgIG5hbWU6ICfkvJrlkZjlj43ppognLFxuICAgICAgICBpY29uOiAnLi4vLi4vLi4vaW1hZ2VzL2J0bl9mc25rdWlAMngucG5nJyxcbiAgICAgICAgdXJsOiAnL3BhZ2VzL2ZlZWRiYWNrL2ZlZWRiYWNrJyxcbiAgICAgICAgcmVMYXVuY2g6IGZhbHNlLFxuICAgICAgfSxcbiAgICAgIC8vIHtcbiAgICAgIC8vICAgbmFtZTogJ+acjeWKoei0uee8tOe6sycsXG4gICAgICAvLyAgIGljb246ICcuLi8uLi8uLi9pbWFnZXMvYnRuX2ppYW9uYUAyeC5wbmcnLFxuICAgICAgLy8gICB1cmw6ICcnLFxuICAgICAgLy8gICByZUxhdW5jaDogZmFsc2UsXG4gICAgICAvLyB9LFxuICAgICAgLy8ge1xuICAgICAgLy8gICBuYW1lOiAn6LSm5oi35o+Q546wJyxcbiAgICAgIC8vICAgaWNvbjogJy4uLy4uLy4uL2ltYWdlcy9idG5fdGl4aWFuQDJ4LnBuZycsXG4gICAgICAvLyAgIHVybDogJycsXG4gICAgICAvLyAgIHJlTGF1bmNoOiBmYWxzZSxcbiAgICAgIC8vIH0sXG4gICAgICB7XG4gICAgICAgIG5hbWU6ICfpgIDlh7rnmbvlvZUnLFxuICAgICAgICBpY29uOiAnLi4vLi4vLi4vaW1hZ2VzL2J0bl9TaWduIG91dEAyeC5wbmcnLFxuICAgICAgICB1cmw6ICcvcGFnZXMvaW5kZXgvaW5kZXgnLFxuICAgICAgICByZUxhdW5jaDogdHJ1ZSxcbiAgICAgIH0sXG4gICAgICB7fSxcbiAgICAgIHt9LFxuICAgIF0sXG4gICAgYWNjb3VudDogMCxcbiAgfSxcbn0pO1xuIl19
\ No newline at end of file
miniprogram/pages/report/report.ts
......@@ -3,15 +3,6 @@ import { IMyApp } from '../../app';
// miniprogram/pages/report/report.js
const app = getApp<IMyApp>();
Component({
pageLifetimes: {
show() {
if (typeof this.getTabBar === 'function' && this.getTabBar()) {
this.getTabBar().setData({
selected: 1,
});
}
},
},
lifetimes: {
attached() {
console.log(app.globalData.userInfo);
......@@ -35,7 +26,7 @@ Component({
{
name: '用户增长分析',
icon: '../../../images/btn_yonghu@2x.png',
url: '/pages/monthOperator/monthOperator',
url: '/pages/userGrowth/userGrowth',
reLaunch: false,
},
{
......@@ -44,24 +35,26 @@ Component({
url: '/pages/feedback/feedback',
reLaunch: false,
},
{
name: '服务费缴纳',
icon: '../../../images/btn_jiaona@2x.png',
url: '',
reLaunch: false,
},
{
name: '账户提现',
icon: '../../../images/btn_tixian@2x.png',
url: '',
reLaunch: false,
},
// {
// name: '服务费缴纳',
// icon: '../../../images/btn_jiaona@2x.png',
// url: '',
// reLaunch: false,
// },
// {
// name: '账户提现',
// icon: '../../../images/btn_tixian@2x.png',
// url: '',
// reLaunch: false,
// },
{
name: '退出登录',
icon: '../../../images/btn_Sign out@2x.png',
url: '/pages/index/index',
reLaunch: true,
},
{},
{},
],
account: 0,
},
......
miniprogram/pages/report/report.wxml
......@@ -13,7 +13,7 @@
<view class="report-header-userImg">
</view>
</view>
<view class="report-header-account">
<!-- <view class="report-header-account">
<view class="report-header-accountItem">
<view class="report-header-accountItemTitle">账户余额</view>
<view class="report-header-accountItemValue">10000</view>
......@@ -26,7 +26,7 @@
<view class="report-header-accountItemTitle">代缴服务费</view>
<view class="report-header-accountItemValue">10000</view>
</view>
</view>
</view> -->
<view class="report-header-bottom"></view>
</view>
<view class="report-nav">
......
miniprogram/pages/userGrowth/userGrowth.json
......@@ -3,6 +3,7 @@
"usingComponents": {
"user-grouth-chart": "../components/UserGrouthChart/UserGrouthChart",
"user-activity-chart": "../components/UserActivityChart/UserActivityChart",
"area-select": "../components/AreaSelect/AreaSelect",
"c-select": "../components/Select/Select"
}
}
miniprogram/pages/userGrowth/userGrowth.ts
......@@ -44,16 +44,23 @@ Page({
console.log(err);
});
},
fetchList(entity?: { areaId?: number; month?: string }) {
fetchList(entity?: { areaId?: number; monthString?: string }) {
if (this.data.areaId) {
if (entity && entity.areaId) {
} else entity = { ...entity, areaId: this.data.areaId };
}
this.fetchUserData(entity);
},
fetchUserData(entity) {
let monthString =
entity && entity.monthString ? entity.monthString : this.data.month;
const [year, month] = monthString.split('-');
let reqBody = {
year: this.data.month.slice(0, 4),
year,
month,
isAdmin: 1,
...entity,
};
if (this.data.areaId) reqBody.areaId = this.data.areaId;
statisticsFetch({
url: '/dcxy/reportInfo/queryReportList',
data: reqBody,
......@@ -71,7 +78,7 @@ Page({
let oList = dayVos;
for (let index = 0; index < oList.length; index++) {
const element = oList[index];
let daysIndex = element.completeAt.slice(-2);
let daysIndex = element.days.slice(-2);
dayList[daysIndex] = {
...dayList[daysIndex],
count: element.count,
......@@ -89,5 +96,28 @@ Page({
console.log(err);
});
},
areaChangeHandle() {},
areaChangeHandle(val) {
console.log('areaChangeHandle', val);
const { value } = val.detail;
this.setData!(
{
areaId: value,
},
() => {
if (value) {
this.fetchList({ areaId: value });
} else {
this.fetchList();
}
},
);
},
monthChangeHandle(val) {
console.log('monthChangeHandle', val);
const { value } = val.detail;
this.fetchList({ monthString: value });
this.setData!({
month: value,
});
},
});
miniprogram/pages/userGrowth/userGrowth.wxml
......@@ -16,10 +16,10 @@
</view>
<view class="userGrowth-filter">
<view class="userGrowth-area">
<c-select mode="selector" range="{{areaList}}" range-key="{{'areaName'}}" bindchange="areaChangeHandle" placeholder="所属区域选择" />
<area-select range="{{areaList}}" range-key="{{'areaName'}}" bindchange="areaChangeHandle" placeholder="所属区域选择" />
</view>
<view class="userGrowth-time">
<c-select mode="date" fields="month" value="{{month}}" bindchange="bindPickerChange" />
<c-select mode="date" fields="month" value="{{month}}" bindchange="monthChangeHandle" />
</view>
</view>
<view class="userGrowth-block">
......
miniprogram/pages/userGrowth/userGrowth.wxss
......@@ -20,7 +20,7 @@
justify-content: space-between;
}
.userGrowth-area {
flex: 1;
width: 400rpx;
}
.userGrowth-time {
width: 250rpx;
......
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