Skip to content

W
wx-boss
Commit 71155f2c by 姜雷
Options

Merge branch 'test'

parents d4e9115f 9da4c0dc
Showing with 490 additions and 109 deletions
miniprogram/app.js
...@@ -29,7 +29,7 @@ App({ ...@@ -29,7 +29,7 @@ App({
}, },
globalData: { globalData: {
userInfo: initUserinfo(), userInfo: initUserinfo(),
token: '', token: 'system:login:token:a1d0c6e83f027327d8461063f4ac58a61572833345204',
userRoles: [], userRoles: [],
}, },
getToken: function () { getToken: function () {
...@@ -39,6 +39,10 @@ App({ ...@@ -39,6 +39,10 @@ App({
this.globalData.token = ''; this.globalData.token = '';
this.globalData.userInfo = initUserinfo(); this.globalData.userInfo = initUserinfo();
this.globalData.userRoles = []; this.globalData.userRoles = [];
try {
wx.setStorageSync('token', '');
}
catch (error) { }
}, },
}); });
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiYXBwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBYUEsSUFBTSxZQUFZLEdBQUcsY0FBTSxPQUFBLENBQUM7SUFDMUIsU0FBUyxFQUFFLEVBQUU7SUFDYixPQUFPLEVBQUUsRUFBRTtJQUNYLFFBQVEsRUFBRSxFQUFFO0lBQ1osRUFBRSxFQUFFLENBQUM7SUFDTCxhQUFhLEVBQUUsQ0FBQztJQUNoQixhQUFhLEVBQUUsQ0FBQztJQUNoQixhQUFhLEVBQUUsRUFBRTtJQUNqQixZQUFZLEVBQUUsRUFBRTtJQUNoQixVQUFVLEVBQUUsQ0FBQztJQUNiLElBQUksRUFBRSxFQUFFO0lBQ1IsU0FBUyxFQUFFLENBQUM7SUFDWixXQUFXLEVBQUUsRUFBRTtJQUNmLEtBQUssRUFBRSxFQUFFO0lBQ1QsUUFBUSxFQUFFLEVBQUU7Q0FDYixDQUFDLEVBZnlCLENBZXpCLENBQUM7QUFDSCxHQUFHLENBQVM7SUFDVixRQUFRO1FBQ04sT0FBTyxDQUFDLEdBQUcsQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUMzQixJQUFJLENBQUM7WUFDSCxJQUFJLEtBQUssR0FBRyxFQUFFLENBQUMsY0FBYyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1lBQ3ZDLEVBQUUsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUM7Z0JBQ1YsSUFBSSxDQUFDLFVBQVUsQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1lBQ2hDLENBQUM7UUFDSCxDQUFDO1FBQUMsS0FBSyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFBLENBQUM7SUFDcEIsQ0FBQztJQUNELFVBQVUsRUFBRTtRQUNWLFFBQVEsRUFBRSxZQUFZLEVBQUU7UUFDeEIsS0FBSyxFQUFFLEVBQUU7UUFDVCxTQUFTLEVBQUUsRUFBRTtLQUNkO0lBQ0QsUUFBUTtRQUNOLE1BQU0sQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLEtBQUssQ0FBQztJQUMvQixDQUFDO0lBQ0QsYUFBYTtRQUNYLElBQUksQ0FBQyxVQUFVLENBQUMsS0FBSyxHQUFHLEVBQUUsQ0FBQztRQUMzQixJQUFJLENBQUMsVUFBVSxDQUFDLFFBQVEsR0FBRyxZQUFZLEVBQUUsQ0FBQztRQUMxQyxJQUFJLENBQUMsVUFBVSxDQUFDLFNBQVMsR0FBRyxFQUFFLENBQUM7SUFDakMsQ0FBQztDQUNGLENBQUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IFVzZXJpbmZvLCBVc2VyUm9sZSB9IGZyb20gJy4vc3RvcmUvdXNlcic7XG5cbi8vYXBwLnRzXG5leHBvcnQgaW50ZXJmYWNlIElNeUFwcCB7XG4gIHJlc2V0VXNlcmluZm86ICgpID0+IHZvaWQ7XG4gIGdldFRva2VuOiAoKSA9PiBzdHJpbmc7XG4gIGdsb2JhbERhdGE6IHtcbiAgICB1c2VySW5mbzogVXNlcmluZm87XG4gICAgdG9rZW46IHN0cmluZztcbiAgICB1c2VyUm9sZXM6IFVzZXJSb2xlW107XG4gIH07XG59XG5cbmNvbnN0IGluaXRVc2VyaW5mbyA9ICgpID0+ICh7XG4gIGNlbGxwaG9uZTogJycsXG4gIGNvbW1lbnQ6ICcnLFxuICBjcmVhdGVBdDogJycsXG4gIGlkOiAwLFxuICBpc09wZW5PcGVyTG9nOiAwLFxuICBpc1NldFBhc3N3b3JkOiAwLFxuICBsYXN0TG9naW5EYXRlOiAnJyxcbiAgbG9naW5BY2NvdW50OiAnJyxcbiAgbG9naW5Db3VudDogMCxcbiAgbmFtZTogJycsXG4gIG9wZXJhdGVJZDogMCxcbiAgb3BlcmF0ZU5hbWU6ICcnLFxuICBzdGF0ZTogJycsXG4gIHVwZGF0ZUF0OiAnJyxcbn0pO1xuQXBwPElNeUFwcD4oe1xuICBvbkxhdW5jaCgpIHtcbiAgICBjb25zb2xlLmxvZygnaW4gb25MYXVuY2gnKTtcbiAgICB0cnkge1xuICAgICAgbGV0IHRva2VuID0gd3guZ2V0U3RvcmFnZVN5bmMoJ3Rva2VuJyk7XG4gICAgICBpZiAodG9rZW4pIHtcbiAgICAgICAgdGhpcy5nbG9iYWxEYXRhLnRva2VuID0gdG9rZW47XG4gICAgICB9XG4gICAgfSBjYXRjaCAoZXJyb3IpIHt9XG4gIH0sXG4gIGdsb2JhbERhdGE6IHtcbiAgICB1c2VySW5mbzogaW5pdFVzZXJpbmZvKCksXG4gICAgdG9rZW46ICcnLFxuICAgIHVzZXJSb2xlczogW10sXG4gIH0sXG4gIGdldFRva2VuKCkge1xuICAgIHJldHVybiB0aGlzLmdsb2JhbERhdGEudG9rZW47XG4gIH0sXG4gIHJlc2V0VXNlcmluZm8oKSB7XG4gICAgdGhpcy5nbG9iYWxEYXRhLnRva2VuID0gJyc7XG4gICAgdGhpcy5nbG9iYWxEYXRhLnVzZXJJbmZvID0gaW5pdFVzZXJpbmZvKCk7XG4gICAgdGhpcy5nbG9iYWxEYXRhLnVzZXJSb2xlcyA9IFtdO1xuICB9LFxufSk7XG4iXX0= //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBwLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiYXBwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBYUEsSUFBTSxZQUFZLEdBQUcsY0FBTSxPQUFBLENBQUM7SUFDMUIsU0FBUyxFQUFFLEVBQUU7SUFDYixPQUFPLEVBQUUsRUFBRTtJQUNYLFFBQVEsRUFBRSxFQUFFO0lBQ1osRUFBRSxFQUFFLENBQUM7SUFDTCxhQUFhLEVBQUUsQ0FBQztJQUNoQixhQUFhLEVBQUUsQ0FBQztJQUNoQixhQUFhLEVBQUUsRUFBRTtJQUNqQixZQUFZLEVBQUUsRUFBRTtJQUNoQixVQUFVLEVBQUUsQ0FBQztJQUNiLElBQUksRUFBRSxFQUFFO0lBQ1IsU0FBUyxFQUFFLENBQUM7SUFDWixXQUFXLEVBQUUsRUFBRTtJQUNmLEtBQUssRUFBRSxFQUFFO0lBQ1QsUUFBUSxFQUFFLEVBQUU7Q0FDYixDQUFDLEVBZnlCLENBZXpCLENBQUM7QUFDSCxHQUFHLENBQVM7SUFDVixRQUFRO1FBQ04sT0FBTyxDQUFDLEdBQUcsQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUMzQixJQUFJLENBQUM7WUFDSCxJQUFJLEtBQUssR0FBRyxFQUFFLENBQUMsY0FBYyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1lBQ3ZDLEVBQUUsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUM7Z0JBQ1YsSUFBSSxDQUFDLFVBQVUsQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1lBQ2hDLENBQUM7UUFDSCxDQUFDO1FBQUMsS0FBSyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFBLENBQUM7SUFDcEIsQ0FBQztJQUNELFVBQVUsRUFBRTtRQUNWLFFBQVEsRUFBRSxZQUFZLEVBQUU7UUFDeEIsS0FBSyxFQUFFLGtFQUFrRTtRQUN6RSxTQUFTLEVBQUUsRUFBRTtLQUNkO0lBQ0QsUUFBUTtRQUNOLE1BQU0sQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLEtBQUssQ0FBQztJQUMvQixDQUFDO0lBQ0QsYUFBYTtRQUNYLElBQUksQ0FBQyxVQUFVLENBQUMsS0FBSyxHQUFHLEVBQUUsQ0FBQztRQUMzQixJQUFJLENBQUMsVUFBVSxDQUFDLFFBQVEsR0FBRyxZQUFZLEVBQUUsQ0FBQztRQUMxQyxJQUFJLENBQUMsVUFBVSxDQUFDLFNBQVMsR0FBRyxFQUFFLENBQUM7UUFDL0IsSUFBSSxDQUFDO1lBQ0gsRUFBRSxDQUFDLGNBQWMsQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFDakMsQ0FBQztRQUFDLEtBQUssQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQSxDQUFDO0lBQ3BCLENBQUM7Q0FDRixDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBVc2VyaW5mbywgVXNlclJvbGUgfSBmcm9tICcuL3N0b3JlL3VzZXInO1xuXG4vL2FwcC50c1xuZXhwb3J0IGludGVyZmFjZSBJTXlBcHAge1xuICByZXNldFVzZXJpbmZvOiAoKSA9PiB2b2lkO1xuICBnZXRUb2tlbjogKCkgPT4gc3RyaW5nO1xuICBnbG9iYWxEYXRhOiB7XG4gICAgdXNlckluZm86IFVzZXJpbmZvO1xuICAgIHRva2VuOiBzdHJpbmc7XG4gICAgdXNlclJvbGVzOiBVc2VyUm9sZVtdO1xuICB9O1xufVxuXG5jb25zdCBpbml0VXNlcmluZm8gPSAoKSA9PiAoe1xuICBjZWxscGhvbmU6ICcnLFxuICBjb21tZW50OiAnJyxcbiAgY3JlYXRlQXQ6ICcnLFxuICBpZDogMCxcbiAgaXNPcGVuT3BlckxvZzogMCxcbiAgaXNTZXRQYXNzd29yZDogMCxcbiAgbGFzdExvZ2luRGF0ZTogJycsXG4gIGxvZ2luQWNjb3VudDogJycsXG4gIGxvZ2luQ291bnQ6IDAsXG4gIG5hbWU6ICcnLFxuICBvcGVyYXRlSWQ6IDAsXG4gIG9wZXJhdGVOYW1lOiAnJyxcbiAgc3RhdGU6ICcnLFxuICB1cGRhdGVBdDogJycsXG59KTtcbkFwcDxJTXlBcHA+KHtcbiAgb25MYXVuY2goKSB7XG4gICAgY29uc29sZS5sb2coJ2luIG9uTGF1bmNoJyk7XG4gICAgdHJ5IHtcbiAgICAgIGxldCB0b2tlbiA9IHd4LmdldFN0b3JhZ2VTeW5jKCd0b2tlbicpO1xuICAgICAgaWYgKHRva2VuKSB7XG4gICAgICAgIHRoaXMuZ2xvYmFsRGF0YS50b2tlbiA9IHRva2VuO1xuICAgICAgfVxuICAgIH0gY2F0Y2ggKGVycm9yKSB7fVxuICB9LFxuICBnbG9iYWxEYXRhOiB7XG4gICAgdXNlckluZm86IGluaXRVc2VyaW5mbygpLFxuICAgIHRva2VuOiAnc3lzdGVtOmxvZ2luOnRva2VuOmExZDBjNmU4M2YwMjczMjdkODQ2MTA2M2Y0YWM1OGE2MTU3MjgzMzM0NTIwNCcsXG4gICAgdXNlclJvbGVzOiBbXSxcbiAgfSxcbiAgZ2V0VG9rZW4oKSB7XG4gICAgcmV0dXJuIHRoaXMuZ2xvYmFsRGF0YS50b2tlbjtcbiAgfSxcbiAgcmVzZXRVc2VyaW5mbygpIHtcbiAgICB0aGlzLmdsb2JhbERhdGEudG9rZW4gPSAnJztcbiAgICB0aGlzLmdsb2JhbERhdGEudXNlckluZm8gPSBpbml0VXNlcmluZm8oKTtcbiAgICB0aGlzLmdsb2JhbERhdGEudXNlclJvbGVzID0gW107XG4gICAgdHJ5IHtcbiAgICAgIHd4LnNldFN0b3JhZ2VTeW5jKCd0b2tlbicsICcnKTtcbiAgICB9IGNhdGNoIChlcnJvcikge31cbiAgfSxcbn0pO1xuIl19
\ No newline at end of file \ No newline at end of file
miniprogram/app.ts
...@@ -39,7 +39,7 @@ App<IMyApp>({ ...@@ -39,7 +39,7 @@ App<IMyApp>({
}, },
globalData: { globalData: {
userInfo: initUserinfo(), userInfo: initUserinfo(),
token: '', token: 'system:login:token:a1d0c6e83f027327d8461063f4ac58a61572833345204',
userRoles: [], userRoles: [],
}, },
getToken() { getToken() {
...@@ -49,5 +49,8 @@ App<IMyApp>({ ...@@ -49,5 +49,8 @@ App<IMyApp>({
this.globalData.token = ''; this.globalData.token = '';
this.globalData.userInfo = initUserinfo(); this.globalData.userInfo = initUserinfo();
this.globalData.userRoles = []; 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 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-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> <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>
</cover-view> </cover-view>
\ No newline at end of file
miniprogram/custom-tab-bar/index.wxss
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
.custom-tab-bar { .custom-tab-bar {
position: fixed; position: fixed;
padding-bottom: constant(safe-area-inset-bottom);
padding-bottom: env(safe-area-inset-bottom);
bottom: 0; bottom: 0;
width: 100%; width: 100%;
height: 96rpx; 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 */ /* pages/components/Select/Select.wxss */
.select-input { .select-input {
box-sizing: border-box;
width: 100%;
position: relative; position: relative;
border: 1rpx solid #f8f8f8; border: 1rpx solid #f8f8f8;
background-color: #f8f8f8; background-color: #f8f8f8;
...@@ -18,6 +20,10 @@ ...@@ -18,6 +20,10 @@
} }
.select-value { .select-value {
color: #333; color: #333;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
width: 85%;
} }
.select-icon { .select-icon {
position: absolute; position: absolute;
......
miniprogram/pages/feedback/feedback.js
...@@ -61,7 +61,7 @@ Page({ ...@@ -61,7 +61,7 @@ Page({
console.log(e); console.log(e);
var value = e.detail.value; var value = e.detail.value;
this.setData({ this.setData({
areaId: this.data.areaList[value].id, areaId: value,
}, function () { }, function () {
_this.initData(); _this.initData();
}); });
...@@ -91,4 +91,4 @@ Page({ ...@@ -91,4 +91,4 @@ Page({
}); });
}, },
}); });
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmVlZGJhY2suanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJmZWVkYmFjay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLHlDQUE2RDtBQUc3RCxJQUFJLENBQUM7SUFDSCxNQUFNO1FBQ0osSUFBSSxDQUFDLFFBQVEsRUFBRSxDQUFDO1FBQ2hCLElBQUksQ0FBQyxhQUFhLEVBQUUsQ0FBQztJQUN2QixDQUFDO0lBSUQsSUFBSSxFQUFFO1FBQ0osUUFBUSxFQUFFLENBQUM7UUFDWCxNQUFNLEVBQUUsRUFBRTtRQUNWLEtBQUssRUFBRSxFQUFFO1FBQ1QsS0FBSyxFQUFFLEVBQUU7UUFDVCxRQUFRLEVBQUUsRUFBRTtLQUNiO0lBQ0QsUUFBUTtRQUNOLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDbEIsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNwQixDQUFDO0lBQ0QsVUFBVSxZQUFDLENBQUM7UUFDRixJQUFBLDJDQUFRLENBQTZCO1FBQzdDLEVBQUUsQ0FBQyxDQUFDLFFBQVEsS0FBSyxJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUM7WUFDcEMsSUFBSSxDQUFDLE9BQVEsQ0FBQztnQkFDWixRQUFRLEVBQUUsUUFBUTthQUNuQixDQUFDLENBQUM7WUFDSCxJQUFJLENBQUMsU0FBUyxDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQzNCLENBQUM7SUFDSCxDQUFDO0lBQ0QsU0FBUyxZQUFDLEtBQWM7UUFBeEIsaUJBMEJDO1FBekJDLEVBQUUsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDO1lBQUMsS0FBSyxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDO1FBQ3ZDLEVBQUUsQ0FBQyxXQUFXLENBQUMsRUFBRSxLQUFLLEVBQUUsRUFBRSxFQUFFLENBQUMsQ0FBQztRQUM5Qix1QkFBZSxDQUFDO1lBQ2QsR0FBRyxFQUFFLHNDQUFzQztZQUMzQyxJQUFJLEVBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxNQUFNO2dCQUNwQixDQUFDLENBQUM7b0JBQ0UsS0FBSyxPQUFBO29CQUNMLE1BQU0sRUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU07aUJBQ3pCO2dCQUNILENBQUMsQ0FBQyxFQUFFLEtBQUssT0FBQSxFQUFFO1NBQ2QsQ0FBQzthQUNDLElBQUksQ0FBQyxVQUFBLEdBQUc7WUFDUCxFQUFFLENBQUMsV0FBVyxFQUFFLENBQUM7WUFDakIsSUFBTSxJQUFJLEdBQUcsR0FBRyxDQUFDLElBQUksQ0FBQztZQUN0QixLQUFJLENBQUMsT0FBUTtnQkFDWCxHQUFDLE1BQU0sR0FBRyxLQUFLLElBQUcsSUFBSTtvQkFDdEIsQ0FBQzs7UUFDTCxDQUFDLENBQUM7YUFDRCxLQUFLLENBQUMsVUFBQSxHQUFHO1lBQ1IsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQztZQUNqQixFQUFFLENBQUMsU0FBUyxDQUFDO2dCQUNYLEtBQUssRUFBRSxHQUFHLENBQUMsTUFBTTtnQkFDakIsSUFBSSxFQUFFLE1BQU07YUFDYixDQUFDLENBQUM7UUFDTCxDQUFDLENBQUMsQ0FBQztJQUNQLENBQUM7SUFDRCxnQkFBZ0IsWUFBQyxDQUFDO1FBQWxCLGlCQVdDO1FBVkMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUNQLElBQUEsc0JBQUssQ0FBYztRQUMzQixJQUFJLENBQUMsT0FBUSxDQUNYO1lBQ0UsTUFBTSxFQUFFLElBQUksQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxDQUFDLEVBQUU7U0FDckMsRUFDRDtZQUNFLEtBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQztRQUNsQixDQUFDLENBQ0YsQ0FBQztJQUNKLENBQUM7SUFDRCxhQUFhLFlBQUMsQ0FBQztRQUNiLElBQUksQ0FBQyxTQUFTLEVBQUUsQ0FBQztJQUNuQixDQUFDO0lBQ0QsYUFBYTtRQUFiLGlCQWtCQztRQWpCQyxpQkFBUyxDQUFDO1lBQ1IsR0FBRyxFQUFFLHlCQUF5QjtTQUMvQixDQUFDO2FBQ0MsSUFBSSxDQUFDLFVBQUEsR0FBRztZQUNQLEVBQUUsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDO2dCQUNiLEtBQUksQ0FBQyxPQUFRLENBQUM7b0JBQ1osUUFBUSxFQUFFLEdBQUcsQ0FBQyxJQUFJO2lCQUNuQixDQUFDLENBQUM7WUFDTCxDQUFDO1lBQUMsSUFBSSxDQUFDLENBQUM7Z0JBQ04sS0FBSSxDQUFDLE9BQVEsQ0FBQztvQkFDWixRQUFRLEVBQUUsRUFBRTtpQkFDYixDQUFDLENBQUM7WUFDTCxDQUFDO1FBQ0gsQ0FBQyxDQUFDO2FBQ0QsS0FBSyxDQUFDLFVBQUEsR0FBRztZQUNSLE9BQU8sQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDbkIsQ0FBQyxDQUFDLENBQUM7SUFDUCxDQUFDO0NBQ0YsQ0FBQyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgc3RhdGlzdGljc0ZldGNoLCBiYXNlRmV0Y2ggfSBmcm9tICcuLi8uLi9hcGkvZmV0Y2gnO1xuXG4vLyBtaW5pcHJvZ3JhbS9wYWdlcy9mZWVkYmFjay9mZWVkYmFjay5qc1xuUGFnZSh7XG4gIG9uTG9hZCgpIHtcbiAgICB0aGlzLmluaXREYXRhKCk7XG4gICAgdGhpcy5mZXRjaEFyZWFMaXN0KCk7XG4gIH0sXG4gIC8qKlxuICAgKiDpobXpnaLnmoTliJ3lp4vmlbDmja5cbiAgICovXG4gIGRhdGE6IHtcbiAgICB0YWJJbmRleDogMSxcbiAgICBhcmVhSWQ6ICcnLFxuICAgIGxpc3QxOiBbXSxcbiAgICBsaXN0MjogW10sXG4gICAgYXJlYUxpc3Q6IFtdLFxuICB9LFxuICBpbml0RGF0YSgpIHtcbiAgICB0aGlzLmZldGNoTGlzdCgxKTtcbiAgICB0aGlzLmZldGNoTGlzdCgyKTtcbiAgfSxcbiAgdG9nZ2xlTGlzdChlKSB7XG4gICAgY29uc3QgeyB0YWJpbmRleCB9ID0gZS5jdXJyZW50VGFyZ2V0LmRhdGFzZXQ7XG4gICAgaWYgKHRhYmluZGV4ICE9PSB0aGlzLmRhdGEudGFiSW5kZXgpIHtcbiAgICAgIHRoaXMuc2V0RGF0YSEoe1xuICAgICAgICB0YWJJbmRleDogdGFiaW5kZXgsXG4gICAgICB9KTtcbiAgICAgIHRoaXMuZmV0Y2hMaXN0KHRhYmluZGV4KTtcbiAgICB9XG4gIH0sXG4gIGZldGNoTGlzdChzdGF0ZT86IG51bWJlcikge1xuICAgIGlmICghc3RhdGUpIHN0YXRlID0gdGhpcy5kYXRhLnRhYkluZGV4O1xuICAgIHd4LnNob3dMb2FkaW5nKHsgdGl0bGU6ICcnIH0pO1xuICAgIHN0YXRpc3RpY3NGZXRjaCh7XG4gICAgICB1cmw6ICcvZGN4eS9yZXBvcnRJbmZvL3F1ZXJ5RmVlZGJhY2tMaXN0VjInLFxuICAgICAgZGF0YTogdGhpcy5kYXRhLmFyZWFJZFxuICAgICAgICA/IHtcbiAgICAgICAgICAgIHN0YXRlLFxuICAgICAgICAgICAgYXJlYUlkOiB0aGlzLmRhdGEuYXJlYUlkLFxuICAgICAgICAgIH1cbiAgICAgICAgOiB7IHN0YXRlIH0sXG4gICAgfSlcbiAgICAgIC50aGVuKHJlcyA9PiB7XG4gICAgICAgIHd4LmhpZGVMb2FkaW5nKCk7XG4gICAgICAgIGNvbnN0IGxpc3QgPSByZXMuZGF0YTtcbiAgICAgICAgdGhpcy5zZXREYXRhISh7XG4gICAgICAgICAgWydsaXN0JyArIHN0YXRlXTogbGlzdCxcbiAgICAgICAgfSk7XG4gICAgICB9KVxuICAgICAgLmNhdGNoKGVyciA9PiB7XG4gICAgICAgIGNvbnNvbGUubG9nKGVycik7XG4gICAgICAgIHd4LnNob3dUb2FzdCh7XG4gICAgICAgICAgdGl0bGU6IGVyci5lcnJNc2csXG4gICAgICAgICAgaWNvbjogJ25vbmUnLFxuICAgICAgICB9KTtcbiAgICAgIH0pO1xuICB9LFxuICBiaW5kUGlja2VyQ2hhbmdlKGUpIHtcbiAgICBjb25zb2xlLmxvZyhlKTtcbiAgICBjb25zdCB7IHZhbHVlIH0gPSBlLmRldGFpbDtcbiAgICB0aGlzLnNldERhdGEhKFxuICAgICAge1xuICAgICAgICBhcmVhSWQ6IHRoaXMuZGF0YS5hcmVhTGlzdFt2YWx1ZV0uaWQsXG4gICAgICB9LFxuICAgICAgKCkgPT4ge1xuICAgICAgICB0aGlzLmluaXREYXRhKCk7XG4gICAgICB9LFxuICAgICk7XG4gIH0sXG4gIHJlZnJlc2hIYW5kbGUoZSkge1xuICAgIHRoaXMuZmV0Y2hMaXN0KCk7XG4gIH0sXG4gIGZldGNoQXJlYUxpc3QoKSB7XG4gICAgYmFzZUZldGNoKHtcbiAgICAgIHVybDogJy9kY3h5L2Jhc2VBcmVhL3F1ZXJ5QWxsJyxcbiAgICB9KVxuICAgICAgLnRoZW4ocmVzID0+IHtcbiAgICAgICAgaWYgKHJlcy5kYXRhKSB7XG4gICAgICAgICAgdGhpcy5zZXREYXRhISh7XG4gICAgICAgICAgICBhcmVhTGlzdDogcmVzLmRhdGEsXG4gICAgICAgICAgfSk7XG4gICAgICAgIH0gZWxzZSB7XG4gICAgICAgICAgdGhpcy5zZXREYXRhISh7XG4gICAgICAgICAgICBhcmVhTGlzdDogW10sXG4gICAgICAgICAgfSk7XG4gICAgICAgIH1cbiAgICAgIH0pXG4gICAgICAuY2F0Y2goZXJyID0+IHtcbiAgICAgICAgY29uc29sZS5sb2coZXJyKTtcbiAgICAgIH0pO1xuICB9LFxufSk7XG4iXX0= //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmVlZGJhY2suanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJmZWVkYmFjay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLHlDQUE2RDtBQUc3RCxJQUFJLENBQUM7SUFDSCxNQUFNO1FBQ0osSUFBSSxDQUFDLFFBQVEsRUFBRSxDQUFDO1FBQ2hCLElBQUksQ0FBQyxhQUFhLEVBQUUsQ0FBQztJQUN2QixDQUFDO0lBSUQsSUFBSSxFQUFFO1FBQ0osUUFBUSxFQUFFLENBQUM7UUFDWCxNQUFNLEVBQUUsRUFBRTtRQUNWLEtBQUssRUFBRSxFQUFFO1FBQ1QsS0FBSyxFQUFFLEVBQUU7UUFDVCxRQUFRLEVBQUUsRUFBRTtLQUNiO0lBQ0QsUUFBUTtRQUNOLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDbEIsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNwQixDQUFDO0lBQ0QsVUFBVSxZQUFDLENBQUM7UUFDRixJQUFBLDJDQUFRLENBQTZCO1FBQzdDLEVBQUUsQ0FBQyxDQUFDLFFBQVEsS0FBSyxJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUM7WUFDcEMsSUFBSSxDQUFDLE9BQVEsQ0FBQztnQkFDWixRQUFRLEVBQUUsUUFBUTthQUNuQixDQUFDLENBQUM7WUFDSCxJQUFJLENBQUMsU0FBUyxDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQzNCLENBQUM7SUFDSCxDQUFDO0lBQ0QsU0FBUyxZQUFDLEtBQWM7UUFBeEIsaUJBMEJDO1FBekJDLEVBQUUsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDO1lBQUMsS0FBSyxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDO1FBQ3ZDLEVBQUUsQ0FBQyxXQUFXLENBQUMsRUFBRSxLQUFLLEVBQUUsRUFBRSxFQUFFLENBQUMsQ0FBQztRQUM5Qix1QkFBZSxDQUFDO1lBQ2QsR0FBRyxFQUFFLHNDQUFzQztZQUMzQyxJQUFJLEVBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxNQUFNO2dCQUNwQixDQUFDLENBQUM7b0JBQ0UsS0FBSyxPQUFBO29CQUNMLE1BQU0sRUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU07aUJBQ3pCO2dCQUNILENBQUMsQ0FBQyxFQUFFLEtBQUssT0FBQSxFQUFFO1NBQ2QsQ0FBQzthQUNDLElBQUksQ0FBQyxVQUFBLEdBQUc7WUFDUCxFQUFFLENBQUMsV0FBVyxFQUFFLENBQUM7WUFDakIsSUFBTSxJQUFJLEdBQUcsR0FBRyxDQUFDLElBQUksQ0FBQztZQUN0QixLQUFJLENBQUMsT0FBUTtnQkFDWCxHQUFDLE1BQU0sR0FBRyxLQUFLLElBQUcsSUFBSTtvQkFDdEIsQ0FBQzs7UUFDTCxDQUFDLENBQUM7YUFDRCxLQUFLLENBQUMsVUFBQSxHQUFHO1lBQ1IsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQztZQUNqQixFQUFFLENBQUMsU0FBUyxDQUFDO2dCQUNYLEtBQUssRUFBRSxHQUFHLENBQUMsTUFBTTtnQkFDakIsSUFBSSxFQUFFLE1BQU07YUFDYixDQUFDLENBQUM7UUFDTCxDQUFDLENBQUMsQ0FBQztJQUNQLENBQUM7SUFDRCxnQkFBZ0IsWUFBQyxDQUFDO1FBQWxCLGlCQVdDO1FBVkMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUNQLElBQUEsc0JBQUssQ0FBYztRQUMzQixJQUFJLENBQUMsT0FBUSxDQUNYO1lBQ0UsTUFBTSxFQUFFLEtBQUs7U0FDZCxFQUNEO1lBQ0UsS0FBSSxDQUFDLFFBQVEsRUFBRSxDQUFDO1FBQ2xCLENBQUMsQ0FDRixDQUFDO0lBQ0osQ0FBQztJQUNELGFBQWEsWUFBQyxDQUFDO1FBQ2IsSUFBSSxDQUFDLFNBQVMsRUFBRSxDQUFDO0lBQ25CLENBQUM7SUFDRCxhQUFhO1FBQWIsaUJBa0JDO1FBakJDLGlCQUFTLENBQUM7WUFDUixHQUFHLEVBQUUseUJBQXlCO1NBQy9CLENBQUM7YUFDQyxJQUFJLENBQUMsVUFBQSxHQUFHO1lBQ1AsRUFBRSxDQUFDLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUM7Z0JBQ2IsS0FBSSxDQUFDLE9BQVEsQ0FBQztvQkFDWixRQUFRLEVBQUUsR0FBRyxDQUFDLElBQUk7aUJBQ25CLENBQUMsQ0FBQztZQUNMLENBQUM7WUFBQyxJQUFJLENBQUMsQ0FBQztnQkFDTixLQUFJLENBQUMsT0FBUSxDQUFDO29CQUNaLFFBQVEsRUFBRSxFQUFFO2lCQUNiLENBQUMsQ0FBQztZQUNMLENBQUM7UUFDSCxDQUFDLENBQUM7YUFDRCxLQUFLLENBQUMsVUFBQSxHQUFHO1lBQ1IsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUNuQixDQUFDLENBQUMsQ0FBQztJQUNQLENBQUM7Q0FDRixDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBzdGF0aXN0aWNzRmV0Y2gsIGJhc2VGZXRjaCB9IGZyb20gJy4uLy4uL2FwaS9mZXRjaCc7XG5cbi8vIG1pbmlwcm9ncmFtL3BhZ2VzL2ZlZWRiYWNrL2ZlZWRiYWNrLmpzXG5QYWdlKHtcbiAgb25Mb2FkKCkge1xuICAgIHRoaXMuaW5pdERhdGEoKTtcbiAgICB0aGlzLmZldGNoQXJlYUxpc3QoKTtcbiAgfSxcbiAgLyoqXG4gICAqIOmhtemdoueahOWIneWni+aVsOaNrlxuICAgKi9cbiAgZGF0YToge1xuICAgIHRhYkluZGV4OiAxLFxuICAgIGFyZWFJZDogJycsXG4gICAgbGlzdDE6IFtdLFxuICAgIGxpc3QyOiBbXSxcbiAgICBhcmVhTGlzdDogW10sXG4gIH0sXG4gIGluaXREYXRhKCkge1xuICAgIHRoaXMuZmV0Y2hMaXN0KDEpO1xuICAgIHRoaXMuZmV0Y2hMaXN0KDIpO1xuICB9LFxuICB0b2dnbGVMaXN0KGUpIHtcbiAgICBjb25zdCB7IHRhYmluZGV4IH0gPSBlLmN1cnJlbnRUYXJnZXQuZGF0YXNldDtcbiAgICBpZiAodGFiaW5kZXggIT09IHRoaXMuZGF0YS50YWJJbmRleCkge1xuICAgICAgdGhpcy5zZXREYXRhISh7XG4gICAgICAgIHRhYkluZGV4OiB0YWJpbmRleCxcbiAgICAgIH0pO1xuICAgICAgdGhpcy5mZXRjaExpc3QodGFiaW5kZXgpO1xuICAgIH1cbiAgfSxcbiAgZmV0Y2hMaXN0KHN0YXRlPzogbnVtYmVyKSB7XG4gICAgaWYgKCFzdGF0ZSkgc3RhdGUgPSB0aGlzLmRhdGEudGFiSW5kZXg7XG4gICAgd3guc2hvd0xvYWRpbmcoeyB0aXRsZTogJycgfSk7XG4gICAgc3RhdGlzdGljc0ZldGNoKHtcbiAgICAgIHVybDogJy9kY3h5L3JlcG9ydEluZm8vcXVlcnlGZWVkYmFja0xpc3RWMicsXG4gICAgICBkYXRhOiB0aGlzLmRhdGEuYXJlYUlkXG4gICAgICAgID8ge1xuICAgICAgICAgICAgc3RhdGUsXG4gICAgICAgICAgICBhcmVhSWQ6IHRoaXMuZGF0YS5hcmVhSWQsXG4gICAgICAgICAgfVxuICAgICAgICA6IHsgc3RhdGUgfSxcbiAgICB9KVxuICAgICAgLnRoZW4ocmVzID0+IHtcbiAgICAgICAgd3guaGlkZUxvYWRpbmcoKTtcbiAgICAgICAgY29uc3QgbGlzdCA9IHJlcy5kYXRhO1xuICAgICAgICB0aGlzLnNldERhdGEhKHtcbiAgICAgICAgICBbJ2xpc3QnICsgc3RhdGVdOiBsaXN0LFxuICAgICAgICB9KTtcbiAgICAgIH0pXG4gICAgICAuY2F0Y2goZXJyID0+IHtcbiAgICAgICAgY29uc29sZS5sb2coZXJyKTtcbiAgICAgICAgd3guc2hvd1RvYXN0KHtcbiAgICAgICAgICB0aXRsZTogZXJyLmVyck1zZyxcbiAgICAgICAgICBpY29uOiAnbm9uZScsXG4gICAgICAgIH0pO1xuICAgICAgfSk7XG4gIH0sXG4gIGJpbmRQaWNrZXJDaGFuZ2UoZSkge1xuICAgIGNvbnNvbGUubG9nKGUpO1xuICAgIGNvbnN0IHsgdmFsdWUgfSA9IGUuZGV0YWlsO1xuICAgIHRoaXMuc2V0RGF0YSEoXG4gICAgICB7XG4gICAgICAgIGFyZWFJZDogdmFsdWUsXG4gICAgICB9LFxuICAgICAgKCkgPT4ge1xuICAgICAgICB0aGlzLmluaXREYXRhKCk7XG4gICAgICB9LFxuICAgICk7XG4gIH0sXG4gIHJlZnJlc2hIYW5kbGUoZSkge1xuICAgIHRoaXMuZmV0Y2hMaXN0KCk7XG4gIH0sXG4gIGZldGNoQXJlYUxpc3QoKSB7XG4gICAgYmFzZUZldGNoKHtcbiAgICAgIHVybDogJy9kY3h5L2Jhc2VBcmVhL3F1ZXJ5QWxsJyxcbiAgICB9KVxuICAgICAgLnRoZW4ocmVzID0+IHtcbiAgICAgICAgaWYgKHJlcy5kYXRhKSB7XG4gICAgICAgICAgdGhpcy5zZXREYXRhISh7XG4gICAgICAgICAgICBhcmVhTGlzdDogcmVzLmRhdGEsXG4gICAgICAgICAgfSk7XG4gICAgICAgIH0gZWxzZSB7XG4gICAgICAgICAgdGhpcy5zZXREYXRhISh7XG4gICAgICAgICAgICBhcmVhTGlzdDogW10sXG4gICAgICAgICAgfSk7XG4gICAgICAgIH1cbiAgICAgIH0pXG4gICAgICAuY2F0Y2goZXJyID0+IHtcbiAgICAgICAgY29uc29sZS5sb2coZXJyKTtcbiAgICAgIH0pO1xuICB9LFxufSk7XG4iXX0=
\ No newline at end of file \ No newline at end of file
miniprogram/pages/feedback/feedback.json
{ {
"navigationBarTitleText": "反馈处理", "navigationBarTitleText": "反馈处理",
"usingComponents": { "usingComponents": {
"c-select": "../components/Select/Select", "area-select": "../components/AreaSelect/AreaSelect",
"feedback-item": "../components/FeedbackItem/FeedbackItem" "feedback-item": "../components/FeedbackItem/FeedbackItem"
} }
} }
miniprogram/pages/feedback/feedback.ts
...@@ -61,7 +61,7 @@ Page({ ...@@ -61,7 +61,7 @@ Page({
const { value } = e.detail; const { value } = e.detail;
this.setData!( this.setData!(
{ {
areaId: this.data.areaList[value].id, areaId: value,
}, },
() => { () => {
this.initData(); this.initData();
......
miniprogram/pages/feedback/feedback.wxml
<!-- miniprogram/pages/feedback/feedback.wxml --> <!-- miniprogram/pages/feedback/feedback.wxml -->
<view class="container feedback"> <view class="container feedback">
<view class="feedback-area"> <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>
<view class="feedback-tabbar"> <view class="feedback-tabbar">
<view bind:tap="toggleList" data-tabIndex="{{1}}" class="feedback-tabItem {{tabIndex===1?'checked':''}}"> <view bind:tap="toggleList" data-tabIndex="{{1}}" class="feedback-tabItem {{tabIndex===1?'checked':''}}">
......
miniprogram/pages/home/home.js
...@@ -7,11 +7,6 @@ Component({ ...@@ -7,11 +7,6 @@ Component({
attached: function () { attached: function () {
console.log('in show ', this.data.fetched); console.log('in show ', this.data.fetched);
!this.data.fetched && this.fetchRechargeData(); !this.data.fetched && this.fetchRechargeData();
if (typeof this.getTabBar === 'function' && this.getTabBar()) {
this.getTabBar().setData({
selected: 0,
});
}
}, },
}, },
data: { data: {
...@@ -170,4 +165,4 @@ Component({ ...@@ -170,4 +165,4 @@ Component({
}, },
}, },
}); });
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"home.js","sourceRoot":"","sources":["home.ts"],"names":[],"mappings":";;AAAA,yCAAkD;AAClD,yCAA8C;AAG9C,SAAS,CAAC;IACR,SAAS,EAAE;QACT,QAAQ;YACN,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC3C,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC/C,EAAE,CAAC,CAAC,OAAO,IAAI,CAAC,SAAS,KAAK,UAAU,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;gBAC7D,IAAI,CAAC,SAAS,EAAE,CAAC,OAAO,CAAC;oBACvB,QAAQ,EAAE,CAAC;iBACZ,CAAC,CAAC;YACL,CAAC;QACH,CAAC;KACF;IAID,IAAI,EAAE;QACJ,QAAQ,EAAE,CAAC;QACX,OAAO,EAAE,KAAK;QACd,WAAW,EAAE,EAAE;QACf,YAAY,EAAE;YACZ,KAAK,EAAE,MAAM;YACb,UAAU,EAAE,OAAO;YACnB,KAAK,EAAE,CAAC;SACT;QACD,aAAa,EAAE;YACb,KAAK,EAAE,OAAO;YACd,UAAU,EAAE,EAAE;YACd,KAAK,EAAE,CAAC;SACT;QACD,kBAAkB,EAAE;YAClB,KAAK,EAAE,MAAM;YACb,UAAU,EAAE,GAAG;YACf,KAAK,EAAE,CAAC;YACR,KAAK,EAAE,CAAC;SACT;QACD,mBAAmB,EAAE;YACnB,KAAK,EAAE,MAAM;YACb,UAAU,EAAE,GAAG;YACf,KAAK,EAAE,CAAC;YACR,KAAK,EAAE,CAAC;SACT;QACD,YAAY,EAAE;YACZ,KAAK,EAAE,MAAM;YACb,UAAU,EAAE,OAAO;YACnB,KAAK,EAAE,CAAC;SACT;QACD,aAAa,EAAE;YACb,KAAK,EAAE,OAAO;YACd,UAAU,EAAE,EAAE;YACd,KAAK,EAAE,CAAC;SACT;QACD,UAAU,EAAE;YACV,KAAK,EAAE,MAAM;YACb,UAAU,EAAE,OAAO;YACnB,KAAK,EAAE,CAAC;SACT;QACD,WAAW,EAAE;YACX,KAAK,EAAE,OAAO;YACd,UAAU,EAAE,EAAE;YACd,KAAK,EAAE,CAAC;SACT;QACD,QAAQ,EAAE;YACR,KAAK,EAAE,MAAM;YACb,UAAU,EAAE,OAAO;YACnB,KAAK,EAAE,CAAC;SACT;QACD,SAAS,EAAE;YACT,KAAK,EAAE,MAAM;YACb,UAAU,EAAE,GAAG;YACf,KAAK,EAAE,CAAC;YACR,KAAK,EAAE,CAAC;SACT;KACF;IACD,OAAO,EAAE;QACP,cAAc,YAAC,CAAC;YACN,IAAA,2CAAQ,CAA6B;YAC7C,EAAE,CAAC,CAAC,QAAQ,KAAK,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;gBAAC,MAAM,CAAC;YAC5C,IAAI,CAAC,OAAO,CAAC;gBACX,QAAQ,EAAE,QAAQ;aACnB,CAAC,CAAC;YACH,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;YACjC,MAAM,CAAC,KAAK,CAAC;QACf,CAAC;QACD,iBAAiB,YAAC,QAAiB;YAAnC,iBA2FC;YA1FC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;gBAAC,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;YAC7C,IAAM,KAAK,GAAG,iBAAU,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;YACrC,IAAI,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YAC/B,IAAI,MAAM,GAAG;gBACX,QAAQ,UAAA;aACT,CAAC;YACF,EAAE,CAAC,CAAC,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC;gBACnB,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;YACrB,CAAC;YAAC,IAAI,CAAC,EAAE,CAAC,CAAC,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC;gBAC1B,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAClC,CAAC;YAAC,IAAI,CAAC,EAAE,CAAC,CAAC,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC;gBAC1B,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YACjC,CAAC;YACD,EAAE,CAAC,WAAW,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;YAE9B,IAAI,iBAAiB,GAAG,uBAAe,CAAC;gBACtC,GAAG,EAAE,2CAA2C;gBAChD,MAAM,EAAE,MAAM;gBACd,IAAI,EAAE,MAAM;aACb,CAAC,CAAC,IAAI,CAAC,UAAA,GAAG;gBACT,IAAM,IAAI,GAAG,GAAG,CAAC,oBAAoB,CAAC;gBACtC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;oBAEP,IAAA,8BAAW,EACX,kCAAa,EACb,8BAAW,EACX,8BAAW,EACX,4CAAkB,EAClB,gDAAoB,EACpB,0CAAiB,EACjB,8CAAmB,CACZ;oBACT,KAAI,CAAC,OAAO,CAAC;wBACX,oBAAoB,EAAE,aAAa;wBACnC,qBAAqB,EAAE,WAAW;wBAClC,kBAAkB,EAAE,WAAW;wBAC/B,mBAAmB,EAAE,WAAW;wBAChC,0BAA0B,EAAE,mBAAmB;wBAC/C,0BAA0B,EAAE,iBAAiB;wBAC7C,2BAA2B,EAAE,oBAAoB;wBACjD,2BAA2B,EAAE,kBAAkB;qBAChD,CAAC,CAAC;gBACL,CAAC;gBAAC,IAAI,CAAC,CAAC;oBACN,KAAI,CAAC,OAAO,CAAC;wBACX,oBAAoB,EAAE,CAAC;wBACvB,qBAAqB,EAAE,CAAC;wBACxB,kBAAkB,EAAE,CAAC;wBACrB,mBAAmB,EAAE,CAAC;wBACtB,0BAA0B,EAAE,CAAC;wBAC7B,0BAA0B,EAAE,CAAC;wBAC7B,2BAA2B,EAAE,CAAC;wBAC9B,2BAA2B,EAAE,CAAC;qBAC/B,CAAC,CAAC;gBACL,CAAC;YACH,CAAC,CAAC,CAAC;YACH,IAAI,gBAAgB,GAAG,uBAAe,CAAC;gBACrC,GAAG,EAAE,wCAAwC;gBAC7C,MAAM,EAAE,MAAM;gBACd,IAAI,EAAE,MAAM;aACb,CAAC,CAAC,IAAI,CAAC,UAAA,GAAG;gBACD,IAAA,mCAAc,EAAE,eAAI,CAAS;gBACrC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBACjB,KAAI,CAAC,OAAO,CAAC;oBACX,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,UAAA,IAAI,IAAI,OAAA,CAAC;wBAC7B,SAAS,EAAE,IAAI,CAAC,SAAS;wBACzB,KAAK,EAAE,IAAI,CAAC,WAAW;wBACvB,UAAU,EAAE,GAAG;wBACf,KAAK,EAAE,IAAI,CAAC,MAAM;wBAClB,KAAK,EAAE,IAAI,CAAC,YAAY;qBACzB,CAAC,EAN4B,CAM5B,CAAC;oBACH,oBAAoB,EAClB,cAAc,IAAI,cAAc,CAAC,YAAY;wBAC3C,CAAC,CAAC,cAAc,CAAC,YAAY;wBAC7B,CAAC,CAAC,CAAC;oBACP,qBAAqB,EACnB,cAAc,IAAI,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;iBACtE,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;YACH,OAAO,CAAC,GAAG,CAAC,CAAC,gBAAgB,EAAE,iBAAiB,CAAC,CAAC;iBAC/C,IAAI,CAAC;gBACJ,EAAE,CAAC,WAAW,EAAE,CAAC;YACnB,CAAC,CAAC;iBACD,KAAK,CAAC,UAAC,GAA6B;gBACnC,EAAE,CAAC,WAAW,EAAE,CAAC;gBACjB,EAAE,CAAC,SAAS,CAAC;oBACX,KAAK,EAAE,GAAG,CAAC,MAAM;oBACjB,IAAI,EAAE,MAAM;iBACb,CAAC,CAAC;gBACH,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACnB,CAAC,CAAC,CAAC;QACP,CAAC;KACF;CACF,CAAC,CAAC","sourcesContent":["import { statisticsFetch } from '../../api/fetch';\nimport { formatTime } from '../../utils/util';\n\n// miniprogram/pages/home/home.js\nComponent({\n  lifetimes: {\n    attached() {\n      console.log('in show ', this.data.fetched);\n      !this.data.fetched && this.fetchRechargeData();\n      if (typeof this.getTabBar === 'function' && this.getTabBar()) {\n        this.getTabBar().setData({\n          selected: 0,\n        });\n      }\n    },\n  },\n  /**\n   * 页面的初始数据\n   */\n  data: {\n    timeType: 0,\n    fetched: false,\n    serviceList: [],\n    rechargeData: {\n      title: '充值总额',\n      numberType: 'price',\n      count: 0,\n    },\n    rechargeCount: {\n      title: '充值总笔数',\n      numberType: '',\n      count: 0,\n    },\n    onlineRechargeData: {\n      title: '线上充值',\n      numberType: '1',\n      count: 0,\n      price: 0,\n    },\n    offlineRechargeData: {\n      title: '线下充值',\n      numberType: '1',\n      count: 0,\n      price: 0,\n    },\n    comsumerData: {\n      title: '消费总额',\n      numberType: 'price',\n      count: 0,\n    },\n    comsumerCount: {\n      title: '消费总笔数',\n      numberType: '',\n      count: 0,\n    },\n    refundData: {\n      title: '退款总额',\n      numberType: 'price',\n      count: 0,\n    },\n    refundCount: {\n      title: '退款总笔数',\n      numberType: '',\n      count: 0,\n    },\n    testData: {\n      title: '充值总额',\n      numberType: 'price',\n      count: 0,\n    },\n    testData2: {\n      title: '线上充值',\n      numberType: '1',\n      count: 0,\n      price: 0,\n    },\n  },\n  methods: {\n    changeTimeType(e) {\n      const { timetype } = e.currentTarget.dataset;\n      if (timetype === this.data.timeType) return;\n      this.setData({\n        timeType: timetype,\n      });\n      this.fetchRechargeData(timetype);\n      return false;\n    },\n    fetchRechargeData(timeType?: number) {\n      if (!timeType) timeType = this.data.timeType;\n      const today = formatTime(new Date());\n      let date = today.split(' ')[0];\n      let entity = {\n        timeType,\n      };\n      if (timeType === 0) {\n        entity.date = date;\n      } else if (timeType === 1) {\n        entity.month = date.slice(0, 7);\n      } else if (timeType === 2) {\n        entity.year = date.slice(0, 4);\n      }\n      wx.showLoading({ title: '' });\n\n      let rechargeDataFetch = statisticsFetch({\n        url: '/dcxy/reportInfo/queryRechargeOrderListV2',\n        method: 'POST',\n        data: entity,\n      }).then(res => {\n        const data = res.rechargeOrderCountVo;\n        if (data) {\n          const {\n            rechargeMen,\n            rechargeMoney,\n            refundCount,\n            refundMoney,\n            offlineRechargeMen,\n            offlineRechargeMoney,\n            onlineRechargeMen,\n            onlineRechargeMoney,\n          } = data;\n          this.setData({\n            'rechargeData.count': rechargeMoney,\n            'rechargeCount.count': rechargeMen,\n            'refundData.count': refundMoney,\n            'refundCount.count': refundCount,\n            'onlineRechargeData.price': onlineRechargeMoney,\n            'onlineRechargeData.count': onlineRechargeMen,\n            'offlineRechargeData.price': offlineRechargeMoney,\n            'offlineRechargeData.count': offlineRechargeMen,\n          });\n        } else {\n          this.setData({\n            'rechargeData.count': 0,\n            'rechargeCount.count': 0,\n            'refundData.count': 0,\n            'refundCount.count': 0,\n            'onlineRechargeData.price': 0,\n            'onlineRechargeData.count': 0,\n            'offlineRechargeData.price': 0,\n            'offlineRechargeData.count': 0,\n          });\n        }\n      });\n      let consumeDataFetch = statisticsFetch({\n        url: '/dcxy/reportInfo/queryConsumeOrderList',\n        method: 'POST',\n        data: entity,\n      }).then(res => {\n        const { consumeCountVo, data } = res;\n        console.log(res);\n        this.setData({\n          serviceList: data.map(item => ({\n            serviceId: item.serviceId,\n            title: item.serviceName,\n            numberType: '1',\n            count: item.payMen,\n            price: item.payableMoney,\n          })),\n          'comsumerData.count':\n            consumeCountVo && consumeCountVo.payableMoney\n              ? consumeCountVo.payableMoney\n              : 0,\n          'comsumerCount.count':\n            consumeCountVo && consumeCountVo.payMen ? consumeCountVo.payMen : 0,\n        });\n      });\n      Promise.all([consumeDataFetch, rechargeDataFetch])\n        .then(() => {\n          wx.hideLoading();\n        })\n        .catch((err: wx.GeneralCallbackResult) => {\n          wx.hideLoading();\n          wx.showToast({\n            title: err.errMsg,\n            icon: 'none',\n          });\n          console.log(err);\n        });\n    },\n  },\n});\n"]} //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"home.js","sourceRoot":"","sources":["home.ts"],"names":[],"mappings":"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","sourcesContent":["import { statisticsFetch } from '../../api/fetch';\nimport { formatTime } from '../../utils/util';\n\n// miniprogram/pages/home/home.js\nComponent({\n  lifetimes: {\n    attached() {\n      console.log('in show ', this.data.fetched);\n      !this.data.fetched && this.fetchRechargeData();\n    },\n  },\n  /**\n   * 页面的初始数据\n   */\n  data: {\n    timeType: 0,\n    fetched: false,\n    serviceList: [],\n    rechargeData: {\n      title: '充值总额',\n      numberType: 'price',\n      count: 0,\n    },\n    rechargeCount: {\n      title: '充值总笔数',\n      numberType: '',\n      count: 0,\n    },\n    onlineRechargeData: {\n      title: '线上充值',\n      numberType: '1',\n      count: 0,\n      price: 0,\n    },\n    offlineRechargeData: {\n      title: '线下充值',\n      numberType: '1',\n      count: 0,\n      price: 0,\n    },\n    comsumerData: {\n      title: '消费总额',\n      numberType: 'price',\n      count: 0,\n    },\n    comsumerCount: {\n      title: '消费总笔数',\n      numberType: '',\n      count: 0,\n    },\n    refundData: {\n      title: '退款总额',\n      numberType: 'price',\n      count: 0,\n    },\n    refundCount: {\n      title: '退款总笔数',\n      numberType: '',\n      count: 0,\n    },\n    testData: {\n      title: '充值总额',\n      numberType: 'price',\n      count: 0,\n    },\n    testData2: {\n      title: '线上充值',\n      numberType: '1',\n      count: 0,\n      price: 0,\n    },\n  },\n  methods: {\n    changeTimeType(e) {\n      const { timetype } = e.currentTarget.dataset;\n      if (timetype === this.data.timeType) return;\n      this.setData({\n        timeType: timetype,\n      });\n      this.fetchRechargeData(timetype);\n      return false;\n    },\n    fetchRechargeData(timeType?: number) {\n      if (!timeType) timeType = this.data.timeType;\n      const today = formatTime(new Date());\n      let date = today.split(' ')[0];\n      let entity = {\n        timeType,\n      };\n      if (timeType === 0) {\n        entity.date = date;\n      } else if (timeType === 1) {\n        entity.month = date.slice(0, 7);\n      } else if (timeType === 2) {\n        entity.year = date.slice(0, 4);\n      }\n      wx.showLoading({ title: '' });\n\n      let rechargeDataFetch = statisticsFetch({\n        url: '/dcxy/reportInfo/queryRechargeOrderListV2',\n        method: 'POST',\n        data: entity,\n      }).then(res => {\n        const data = res.rechargeOrderCountVo;\n        if (data) {\n          const {\n            rechargeMen,\n            rechargeMoney,\n            refundCount,\n            refundMoney,\n            offlineRechargeMen,\n            offlineRechargeMoney,\n            onlineRechargeMen,\n            onlineRechargeMoney,\n          } = data;\n          this.setData({\n            'rechargeData.count': rechargeMoney,\n            'rechargeCount.count': rechargeMen,\n            'refundData.count': refundMoney,\n            'refundCount.count': refundCount,\n            'onlineRechargeData.price': onlineRechargeMoney,\n            'onlineRechargeData.count': onlineRechargeMen,\n            'offlineRechargeData.price': offlineRechargeMoney,\n            'offlineRechargeData.count': offlineRechargeMen,\n          });\n        } else {\n          this.setData({\n            'rechargeData.count': 0,\n            'rechargeCount.count': 0,\n            'refundData.count': 0,\n            'refundCount.count': 0,\n            'onlineRechargeData.price': 0,\n            'onlineRechargeData.count': 0,\n            'offlineRechargeData.price': 0,\n            'offlineRechargeData.count': 0,\n          });\n        }\n      });\n      let consumeDataFetch = statisticsFetch({\n        url: '/dcxy/reportInfo/queryConsumeOrderList',\n        method: 'POST',\n        data: entity,\n      }).then(res => {\n        const { consumeCountVo, data } = res;\n        console.log(res);\n        this.setData({\n          serviceList: data.map(item => ({\n            serviceId: item.serviceId,\n            title: item.serviceName,\n            numberType: '1',\n            count: item.payMen,\n            price: item.payableMoney,\n          })),\n          'comsumerData.count':\n            consumeCountVo && consumeCountVo.payableMoney\n              ? consumeCountVo.payableMoney\n              : 0,\n          'comsumerCount.count':\n            consumeCountVo && consumeCountVo.payMen ? consumeCountVo.payMen : 0,\n        });\n      });\n      Promise.all([consumeDataFetch, rechargeDataFetch])\n        .then(() => {\n          wx.hideLoading();\n        })\n        .catch((err: wx.GeneralCallbackResult) => {\n          wx.hideLoading();\n          wx.showToast({\n            title: err.errMsg,\n            icon: 'none',\n          });\n          console.log(err);\n        });\n    },\n  },\n});\n"]}
\ No newline at end of file \ No newline at end of file
miniprogram/pages/home/home.ts
...@@ -7,11 +7,6 @@ Component({ ...@@ -7,11 +7,6 @@ Component({
attached() { attached() {
console.log('in show ', this.data.fetched); console.log('in show ', this.data.fetched);
!this.data.fetched && this.fetchRechargeData(); !this.data.fetched && this.fetchRechargeData();
if (typeof this.getTabBar === 'function' && this.getTabBar()) {
this.getTabBar().setData({
selected: 0,
});
}
}, },
}, },
/** /**
......
miniprogram/pages/monthOperator/monthOperator.js
...@@ -74,11 +74,36 @@ Page({ ...@@ -74,11 +74,36 @@ Page({
}); });
}, },
areaChangeHandle: function (val) { areaChangeHandle: function (val) {
var _this = this;
console.log('areaChangeHandle', val); console.log('areaChangeHandle', val);
var value = val.detail.value; var value = val.detail.value;
this.fetchList({ areaId: [value] }); this.setData({
areaId: value,
}, function () {
if (value) {
_this.fetchList({ areaId: [value] });
}
else {
_this.fetchList();
}
});
},
monthChangeHandle: function (val) {
console.log('monthChangeHandle', val);
var value = val.detail.value;
this.fetchList({ month: value });
this.setData({
month: value,
});
}, },
fetchList: function (entity) { fetchList: function (entity) {
if (this.data.areaId) {
if (entity && entity.areaId) {
}
else
entity = __assign({}, entity, { areaId: [this.data.areaId] });
}
console.log(this.data.areaId, entity);
this.fetchRechargeData(entity); this.fetchRechargeData(entity);
this.fetchConsumeData(entity); this.fetchConsumeData(entity);
this.fetchServiceTypeList(entity); this.fetchServiceTypeList(entity);
...@@ -87,8 +112,6 @@ Page({ ...@@ -87,8 +112,6 @@ Page({
fetchConsumeData: function (entity) { fetchConsumeData: function (entity) {
var _this = this; var _this = this;
var reqBody = __assign({ month: this.data.month }, entity); var reqBody = __assign({ month: this.data.month }, entity);
if (this.data.areaId)
reqBody.areaId = this.data.areaId;
fetch_1.statisticsFetch({ fetch_1.statisticsFetch({
url: '/dcxy/reportInfo/dailyConsumeCount', url: '/dcxy/reportInfo/dailyConsumeCount',
method: 'POST', method: 'POST',
...@@ -126,8 +149,6 @@ Page({ ...@@ -126,8 +149,6 @@ Page({
fetchRechargeData: function (entity) { fetchRechargeData: function (entity) {
var _this = this; var _this = this;
var reqBody = __assign({ month: this.data.month }, entity); var reqBody = __assign({ month: this.data.month }, entity);
if (this.data.areaId)
reqBody.areaId = this.data.areaId;
fetch_1.statisticsFetch({ fetch_1.statisticsFetch({
url: '/dcxy/reportInfo/queryRechargeListDaily', url: '/dcxy/reportInfo/queryRechargeListDaily',
method: 'POST', method: 'POST',
...@@ -167,8 +188,6 @@ Page({ ...@@ -167,8 +188,6 @@ Page({
fetchServiceTypeList: function (entity) { fetchServiceTypeList: function (entity) {
var _this = this; var _this = this;
var reqBody = __assign({ month: this.data.month }, entity); var reqBody = __assign({ month: this.data.month }, entity);
if (this.data.areaId)
reqBody.areaId = this.data.areaId;
fetch_1.statisticsFetch({ fetch_1.statisticsFetch({
url: '/dcxy/reportInfo/serviceConsume', url: '/dcxy/reportInfo/serviceConsume',
method: 'POST', method: 'POST',
...@@ -187,8 +206,6 @@ Page({ ...@@ -187,8 +206,6 @@ Page({
fetchPayTypeList: function (entity) { fetchPayTypeList: function (entity) {
var _this = this; var _this = this;
var reqBody = __assign({ month: this.data.month }, entity); var reqBody = __assign({ month: this.data.month }, entity);
if (this.data.areaId)
reqBody.areaId = this.data.areaId;
fetch_1.statisticsFetch({ fetch_1.statisticsFetch({
url: '/dcxy/reportInfo/payTypeConsume', url: '/dcxy/reportInfo/payTypeConsume',
method: 'POST', method: 'POST',
...@@ -219,4 +236,4 @@ Page({ ...@@ -219,4 +236,4 @@ Page({
}); });
}, },
}); });
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"monthOperator.js","sourceRoot":"","sources":["monthOperator.ts"],"names":[],"mappings":"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","sourcesContent":["import { baseFetch, statisticsFetch } from '../../api/fetch';\nimport { formatTime } from '../../utils/util';\n\nPage({\n  onLoad() {\n    this.initData();\n    this.fetchAreaList();\n  },\n  data: {\n    areaList: [],\n    month: '',\n    areaId: 0,\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  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  areaChangeHandle(val) {\n    console.log('areaChangeHandle', val);\n    const { value } = val.detail;\n    this.fetchList({ areaId: [value] });\n  },\n  fetchList(entity?: { areaId?: number; month?: string }) {\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    if (this.data.areaId) reqBody.areaId = this.data.areaId;\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 = 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    if (this.data.areaId) reqBody.areaId = this.data.areaId;\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 = 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        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    if (this.data.areaId) reqBody.areaId = this.data.areaId;\n    statisticsFetch({\n      url: '/dcxy/reportInfo/serviceConsume',\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    if (this.data.areaId) reqBody.areaId = this.data.areaId;\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 { baseFetch, statisticsFetch } from '../../api/fetch';\nimport { formatTime } from '../../utils/util';\n\nPage({\n  onLoad() {\n    this.initData();\n    this.fetchAreaList();\n  },\n  data: {\n    areaList: [],\n    month: '',\n    areaId: 0,\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  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  areaChangeHandle(val) {\n    console.log('areaChangeHandle', val);\n    const { value } = val.detail;\n    this.setData!(\n      {\n        areaId: value,\n      },\n      () => {\n        if (value) {\n          this.fetchList({ areaId: [value] });\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 = 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 = 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        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/serviceConsume',\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.json
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
"navigationBarTitleText": "月度运营分析", "navigationBarTitleText": "月度运营分析",
"usingComponents": { "usingComponents": {
"c-select": "../components/Select/Select", "c-select": "../components/Select/Select",
"area-select": "../components/AreaSelect/AreaSelect",
"recharge-chart": "../components/RechargeChart/RechargeChart", "recharge-chart": "../components/RechargeChart/RechargeChart",
"refund-chart": "../components/RefundChart/RefundChart", "refund-chart": "../components/RefundChart/RefundChart",
"consume-chart": "../components/ConsumeChart/ConsumeChart", "consume-chart": "../components/ConsumeChart/ConsumeChart",
......
miniprogram/pages/monthOperator/monthOperator.ts
...@@ -64,9 +64,33 @@ Page({ ...@@ -64,9 +64,33 @@ Page({
areaChangeHandle(val) { areaChangeHandle(val) {
console.log('areaChangeHandle', val); console.log('areaChangeHandle', val);
const { value } = val.detail; 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 }) { 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.fetchRechargeData(entity);
this.fetchConsumeData(entity); this.fetchConsumeData(entity);
this.fetchServiceTypeList(entity); this.fetchServiceTypeList(entity);
...@@ -77,7 +101,6 @@ Page({ ...@@ -77,7 +101,6 @@ Page({
month: this.data.month, month: this.data.month,
...entity, ...entity,
}; };
if (this.data.areaId) reqBody.areaId = this.data.areaId;
statisticsFetch({ statisticsFetch({
url: '/dcxy/reportInfo/dailyConsumeCount', url: '/dcxy/reportInfo/dailyConsumeCount',
method: 'POST', method: 'POST',
...@@ -122,7 +145,6 @@ Page({ ...@@ -122,7 +145,6 @@ Page({
month: this.data.month, month: this.data.month,
...entity, ...entity,
}; };
if (this.data.areaId) reqBody.areaId = this.data.areaId;
statisticsFetch({ statisticsFetch({
url: '/dcxy/reportInfo/queryRechargeListDaily', url: '/dcxy/reportInfo/queryRechargeListDaily',
method: 'POST', method: 'POST',
...@@ -170,7 +192,6 @@ Page({ ...@@ -170,7 +192,6 @@ Page({
month: this.data.month, month: this.data.month,
...entity, ...entity,
}; };
if (this.data.areaId) reqBody.areaId = this.data.areaId;
statisticsFetch({ statisticsFetch({
url: '/dcxy/reportInfo/serviceConsume', url: '/dcxy/reportInfo/serviceConsume',
method: 'POST', method: 'POST',
...@@ -191,7 +212,6 @@ Page({ ...@@ -191,7 +212,6 @@ Page({
month: this.data.month, month: this.data.month,
...entity, ...entity,
}; };
if (this.data.areaId) reqBody.areaId = this.data.areaId;
statisticsFetch({ statisticsFetch({
url: '/dcxy/reportInfo/payTypeConsume', url: '/dcxy/reportInfo/payTypeConsume',
method: 'POST', method: 'POST',
......
miniprogram/pages/monthOperator/monthOperator.wxml
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
<view class="monthOperator"> <view class="monthOperator">
<view class="monthOperator-filter"> <view class="monthOperator-filter">
<view class="monthOperator-area"> <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>
<view class="monthOperator-time"> <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> </view>
<view class="monthOperator-block"> <view class="monthOperator-block">
......
miniprogram/pages/monthOperator/monthOperator.wxss
...@@ -5,10 +5,11 @@ ...@@ -5,10 +5,11 @@
justify-content: space-between; justify-content: space-between;
} }
.monthOperator-area { .monthOperator-area {
flex: 1; width: 400rpx;
} }
.monthOperator-time { .monthOperator-time {
width: 250rpx; width: 250rpx;
min-width: 250rpx;
margin-left: 20rpx; margin-left: 20rpx;
} }
.monthOperator-block { .monthOperator-block {
...@@ -55,6 +56,6 @@ ...@@ -55,6 +56,6 @@
width: 660rpx; width: 660rpx;
height: 350rpx; height: 350rpx;
} }
.monthOperator-canvas.autoheight{ .monthOperator-canvas.autoheight {
height: auto; height: auto;
} }
\ No newline at end of file
miniprogram/pages/report/report.js
...@@ -2,15 +2,6 @@ ...@@ -2,15 +2,6 @@
Object.defineProperty(exports, "__esModule", { value: true }); Object.defineProperty(exports, "__esModule", { value: true });
var app = getApp(); var app = getApp();
Component({ Component({
pageLifetimes: {
show: function () {
if (typeof this.getTabBar === 'function' && this.getTabBar()) {
this.getTabBar().setData({
selected: 1,
});
}
},
},
lifetimes: { lifetimes: {
attached: function () { attached: function () {
console.log(app.globalData.userInfo); console.log(app.globalData.userInfo);
...@@ -31,7 +22,7 @@ Component({ ...@@ -31,7 +22,7 @@ Component({
{ {
name: '用户增长分析', name: '用户增长分析',
icon: '../../../images/btn_yonghu@2x.png', icon: '../../../images/btn_yonghu@2x.png',
url: '/pages/monthOperator/monthOperator', url: '/pages/userGrowth/userGrowth',
reLaunch: false, reLaunch: false,
}, },
{ {
...@@ -41,25 +32,15 @@ Component({ ...@@ -41,25 +32,15 @@ Component({
reLaunch: false, reLaunch: false,
}, },
{ {
name: '服务费缴纳',
icon: '../../../images/btn_jiaona@2x.png',
url: '',
reLaunch: false,
},
{
name: '账户提现',
icon: '../../../images/btn_tixian@2x.png',
url: '',
reLaunch: false,
},
{
name: '退出登录', name: '退出登录',
icon: '../../../images/btn_Sign out@2x.png', icon: '../../../images/btn_Sign out@2x.png',
url: '/pages/index/index', url: '/pages/index/index',
reLaunch: true, reLaunch: true,
}, },
{},
{},
], ],
account: 0, account: 0,
}, },
}); });
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVwb3J0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsicmVwb3J0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBR0EsSUFBTSxHQUFHLEdBQUcsTUFBTSxFQUFVLENBQUM7QUFDN0IsU0FBUyxDQUFDO0lBQ1IsYUFBYSxFQUFFO1FBQ2IsSUFBSTtZQUNGLEVBQUUsQ0FBQyxDQUFDLE9BQU8sSUFBSSxDQUFDLFNBQVMsS0FBSyxVQUFVLElBQUksSUFBSSxDQUFDLFNBQVMsRUFBRSxDQUFDLENBQUMsQ0FBQztnQkFDN0QsSUFBSSxDQUFDLFNBQVMsRUFBRSxDQUFDLE9BQU8sQ0FBQztvQkFDdkIsUUFBUSxFQUFFLENBQUM7aUJBQ1osQ0FBQyxDQUFDO1lBQ0wsQ0FBQztRQUNILENBQUM7S0FDRjtJQUNELFNBQVMsRUFBRTtRQUNULFFBQVE7WUFDTixPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUMsUUFBUSxDQUFDLENBQUM7WUFDckMsSUFBSSxDQUFDLE9BQVEsQ0FBQztnQkFDWixRQUFRLEVBQUUsR0FBRyxDQUFDLFVBQVUsQ0FBQyxRQUFRO2FBQ2xDLENBQUMsQ0FBQztRQUNMLENBQUM7S0FDRjtJQUlELElBQUksRUFBRTtRQUNKLFFBQVEsRUFBRSxHQUFHLENBQUMsVUFBVSxDQUFDLFFBQVE7UUFDakMsUUFBUSxFQUFFO1lBQ1I7Z0JBQ0UsSUFBSSxFQUFFLFFBQVE7Z0JBQ2QsSUFBSSxFQUFFLGtDQUFrQztnQkFDeEMsR0FBRyxFQUFFLG9DQUFvQztnQkFDekMsUUFBUSxFQUFFLEtBQUs7YUFDaEI7WUFDRDtnQkFDRSxJQUFJLEVBQUUsUUFBUTtnQkFDZCxJQUFJLEVBQUUsbUNBQW1DO2dCQUN6QyxHQUFHLEVBQUUsb0NBQW9DO2dCQUN6QyxRQUFRLEVBQUUsS0FBSzthQUNoQjtZQUNEO2dCQUNFLElBQUksRUFBRSxNQUFNO2dCQUNaLElBQUksRUFBRSxtQ0FBbUM7Z0JBQ3pDLEdBQUcsRUFBRSwwQkFBMEI7Z0JBQy9CLFFBQVEsRUFBRSxLQUFLO2FBQ2hCO1lBQ0Q7Z0JBQ0UsSUFBSSxFQUFFLE9BQU87Z0JBQ2IsSUFBSSxFQUFFLG1DQUFtQztnQkFDekMsR0FBRyxFQUFFLEVBQUU7Z0JBQ1AsUUFBUSxFQUFFLEtBQUs7YUFDaEI7WUFDRDtnQkFDRSxJQUFJLEVBQUUsTUFBTTtnQkFDWixJQUFJLEVBQUUsbUNBQW1DO2dCQUN6QyxHQUFHLEVBQUUsRUFBRTtnQkFDUCxRQUFRLEVBQUUsS0FBSzthQUNoQjtZQUNEO2dCQUNFLElBQUksRUFBRSxNQUFNO2dCQUNaLElBQUksRUFBRSxxQ0FBcUM7Z0JBQzNDLEdBQUcsRUFBRSxvQkFBb0I7Z0JBQ3pCLFFBQVEsRUFBRSxJQUFJO2FBQ2Y7U0FDRjtRQUNELE9BQU8sRUFBRSxDQUFDO0tBQ1g7Q0FDRixDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJTXlBcHAgfSBmcm9tICcuLi8uLi9hcHAnO1xuXG4vLyBtaW5pcHJvZ3JhbS9wYWdlcy9yZXBvcnQvcmVwb3J0LmpzXG5jb25zdCBhcHAgPSBnZXRBcHA8SU15QXBwPigpO1xuQ29tcG9uZW50KHtcbiAgcGFnZUxpZmV0aW1lczoge1xuICAgIHNob3coKSB7XG4gICAgICBpZiAodHlwZW9mIHRoaXMuZ2V0VGFiQmFyID09PSAnZnVuY3Rpb24nICYmIHRoaXMuZ2V0VGFiQmFyKCkpIHtcbiAgICAgICAgdGhpcy5nZXRUYWJCYXIoKS5zZXREYXRhKHtcbiAgICAgICAgICBzZWxlY3RlZDogMSxcbiAgICAgICAgfSk7XG4gICAgICB9XG4gICAgfSxcbiAgfSxcbiAgbGlmZXRpbWVzOiB7XG4gICAgYXR0YWNoZWQoKSB7XG4gICAgICBjb25zb2xlLmxvZyhhcHAuZ2xvYmFsRGF0YS51c2VySW5mbyk7XG4gICAgICB0aGlzLnNldERhdGEhKHtcbiAgICAgICAgdXNlckluZm86IGFwcC5nbG9iYWxEYXRhLnVzZXJJbmZvLFxuICAgICAgfSk7XG4gICAgfSxcbiAgfSxcbiAgLyoqXG4gICAqIOmhtemdoueahOWIneWni+aVsOaNrlxuICAgKi9cbiAgZGF0YToge1xuICAgIHVzZXJJbmZvOiBhcHAuZ2xvYmFsRGF0YS51c2VySW5mbyxcbiAgICBpdGVtTGlzdDogW1xuICAgICAge1xuICAgICAgICBuYW1lOiAn5pyI5bqm6L+Q6JCl5YiG5p6QJyxcbiAgICAgICAgaWNvbjogJy4uLy4uLy4uL2ltYWdlcy9idG5feXVlZHVAMngucG5nJyxcbiAgICAgICAgdXJsOiAnL3BhZ2VzL21vbnRoT3BlcmF0b3IvbW9udGhPcGVyYXRvcicsXG4gICAgICAgIHJlTGF1bmNoOiBmYWxzZSxcbiAgICAgIH0sXG4gICAgICB7XG4gICAgICAgIG5hbWU6ICfnlKjmiLflop7plb/liIbmnpAnLFxuICAgICAgICBpY29uOiAnLi4vLi4vLi4vaW1hZ2VzL2J0bl95b25naHVAMngucG5nJyxcbiAgICAgICAgdXJsOiAnL3BhZ2VzL21vbnRoT3BlcmF0b3IvbW9udGhPcGVyYXRvcicsXG4gICAgICAgIHJlTGF1bmNoOiBmYWxzZSxcbiAgICAgIH0sXG4gICAgICB7XG4gICAgICAgIG5hbWU6ICfkvJrlkZjlj43ppognLFxuICAgICAgICBpY29uOiAnLi4vLi4vLi4vaW1hZ2VzL2J0bl9mc25rdWlAMngucG5nJyxcbiAgICAgICAgdXJsOiAnL3BhZ2VzL2ZlZWRiYWNrL2ZlZWRiYWNrJyxcbiAgICAgICAgcmVMYXVuY2g6IGZhbHNlLFxuICAgICAgfSxcbiAgICAgIHtcbiAgICAgICAgbmFtZTogJ+acjeWKoei0uee8tOe6sycsXG4gICAgICAgIGljb246ICcuLi8uLi8uLi9pbWFnZXMvYnRuX2ppYW9uYUAyeC5wbmcnLFxuICAgICAgICB1cmw6ICcnLFxuICAgICAgICByZUxhdW5jaDogZmFsc2UsXG4gICAgICB9LFxuICAgICAge1xuICAgICAgICBuYW1lOiAn6LSm5oi35o+Q546wJyxcbiAgICAgICAgaWNvbjogJy4uLy4uLy4uL2ltYWdlcy9idG5fdGl4aWFuQDJ4LnBuZycsXG4gICAgICAgIHVybDogJycsXG4gICAgICAgIHJlTGF1bmNoOiBmYWxzZSxcbiAgICAgIH0sXG4gICAgICB7XG4gICAgICAgIG5hbWU6ICfpgIDlh7rnmbvlvZUnLFxuICAgICAgICBpY29uOiAnLi4vLi4vLi4vaW1hZ2VzL2J0bl9TaWduIG91dEAyeC5wbmcnLFxuICAgICAgICB1cmw6ICcvcGFnZXMvaW5kZXgvaW5kZXgnLFxuICAgICAgICByZUxhdW5jaDogdHJ1ZSxcbiAgICAgIH0sXG4gICAgXSxcbiAgICBhY2NvdW50OiAwLFxuICB9LFxufSk7XG4iXX0= //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVwb3J0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsicmVwb3J0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBR0EsSUFBTSxHQUFHLEdBQUcsTUFBTSxFQUFVLENBQUM7QUFDN0IsU0FBUyxDQUFDO0lBQ1IsU0FBUyxFQUFFO1FBQ1QsUUFBUTtZQUNOLE9BQU8sQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsQ0FBQztZQUNyQyxJQUFJLENBQUMsT0FBUSxDQUFDO2dCQUNaLFFBQVEsRUFBRSxHQUFHLENBQUMsVUFBVSxDQUFDLFFBQVE7YUFDbEMsQ0FBQyxDQUFDO1FBQ0wsQ0FBQztLQUNGO0lBSUQsSUFBSSxFQUFFO1FBQ0osUUFBUSxFQUFFLEdBQUcsQ0FBQyxVQUFVLENBQUMsUUFBUTtRQUNqQyxRQUFRLEVBQUU7WUFDUjtnQkFDRSxJQUFJLEVBQUUsUUFBUTtnQkFDZCxJQUFJLEVBQUUsa0NBQWtDO2dCQUN4QyxHQUFHLEVBQUUsb0NBQW9DO2dCQUN6QyxRQUFRLEVBQUUsS0FBSzthQUNoQjtZQUNEO2dCQUNFLElBQUksRUFBRSxRQUFRO2dCQUNkLElBQUksRUFBRSxtQ0FBbUM7Z0JBQ3pDLEdBQUcsRUFBRSw4QkFBOEI7Z0JBQ25DLFFBQVEsRUFBRSxLQUFLO2FBQ2hCO1lBQ0Q7Z0JBQ0UsSUFBSSxFQUFFLE1BQU07Z0JBQ1osSUFBSSxFQUFFLG1DQUFtQztnQkFDekMsR0FBRyxFQUFFLDBCQUEwQjtnQkFDL0IsUUFBUSxFQUFFLEtBQUs7YUFDaEI7WUFhRDtnQkFDRSxJQUFJLEVBQUUsTUFBTTtnQkFDWixJQUFJLEVBQUUscUNBQXFDO2dCQUMzQyxHQUFHLEVBQUUsb0JBQW9CO2dCQUN6QixRQUFRLEVBQUUsSUFBSTthQUNmO1lBQ0QsRUFBRTtZQUNGLEVBQUU7U0FDSDtRQUNELE9BQU8sRUFBRSxDQUFDO0tBQ1g7Q0FDRixDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJTXlBcHAgfSBmcm9tICcuLi8uLi9hcHAnO1xuXG4vLyBtaW5pcHJvZ3JhbS9wYWdlcy9yZXBvcnQvcmVwb3J0LmpzXG5jb25zdCBhcHAgPSBnZXRBcHA8SU15QXBwPigpO1xuQ29tcG9uZW50KHtcbiAgbGlmZXRpbWVzOiB7XG4gICAgYXR0YWNoZWQoKSB7XG4gICAgICBjb25zb2xlLmxvZyhhcHAuZ2xvYmFsRGF0YS51c2VySW5mbyk7XG4gICAgICB0aGlzLnNldERhdGEhKHtcbiAgICAgICAgdXNlckluZm86IGFwcC5nbG9iYWxEYXRhLnVzZXJJbmZvLFxuICAgICAgfSk7XG4gICAgfSxcbiAgfSxcbiAgLyoqXG4gICAqIOmhtemdoueahOWIneWni+aVsOaNrlxuICAgKi9cbiAgZGF0YToge1xuICAgIHVzZXJJbmZvOiBhcHAuZ2xvYmFsRGF0YS51c2VySW5mbyxcbiAgICBpdGVtTGlzdDogW1xuICAgICAge1xuICAgICAgICBuYW1lOiAn5pyI5bqm6L+Q6JCl5YiG5p6QJyxcbiAgICAgICAgaWNvbjogJy4uLy4uLy4uL2ltYWdlcy9idG5feXVlZHVAMngucG5nJyxcbiAgICAgICAgdXJsOiAnL3BhZ2VzL21vbnRoT3BlcmF0b3IvbW9udGhPcGVyYXRvcicsXG4gICAgICAgIHJlTGF1bmNoOiBmYWxzZSxcbiAgICAgIH0sXG4gICAgICB7XG4gICAgICAgIG5hbWU6ICfnlKjmiLflop7plb/liIbmnpAnLFxuICAgICAgICBpY29uOiAnLi4vLi4vLi4vaW1hZ2VzL2J0bl95b25naHVAMngucG5nJyxcbiAgICAgICAgdXJsOiAnL3BhZ2VzL3VzZXJHcm93dGgvdXNlckdyb3d0aCcsXG4gICAgICAgIHJlTGF1bmNoOiBmYWxzZSxcbiAgICAgIH0sXG4gICAgICB7XG4gICAgICAgIG5hbWU6ICfkvJrlkZjlj43ppognLFxuICAgICAgICBpY29uOiAnLi4vLi4vLi4vaW1hZ2VzL2J0bl9mc25rdWlAMngucG5nJyxcbiAgICAgICAgdXJsOiAnL3BhZ2VzL2ZlZWRiYWNrL2ZlZWRiYWNrJyxcbiAgICAgICAgcmVMYXVuY2g6IGZhbHNlLFxuICAgICAgfSxcbiAgICAgIC8vIHtcbiAgICAgIC8vICAgbmFtZTogJ+acjeWKoei0uee8tOe6sycsXG4gICAgICAvLyAgIGljb246ICcuLi8uLi8uLi9pbWFnZXMvYnRuX2ppYW9uYUAyeC5wbmcnLFxuICAgICAgLy8gICB1cmw6ICcnLFxuICAgICAgLy8gICByZUxhdW5jaDogZmFsc2UsXG4gICAgICAvLyB9LFxuICAgICAgLy8ge1xuICAgICAgLy8gICBuYW1lOiAn6LSm5oi35o+Q546wJyxcbiAgICAgIC8vICAgaWNvbjogJy4uLy4uLy4uL2ltYWdlcy9idG5fdGl4aWFuQDJ4LnBuZycsXG4gICAgICAvLyAgIHVybDogJycsXG4gICAgICAvLyAgIHJlTGF1bmNoOiBmYWxzZSxcbiAgICAgIC8vIH0sXG4gICAgICB7XG4gICAgICAgIG5hbWU6ICfpgIDlh7rnmbvlvZUnLFxuICAgICAgICBpY29uOiAnLi4vLi4vLi4vaW1hZ2VzL2J0bl9TaWduIG91dEAyeC5wbmcnLFxuICAgICAgICB1cmw6ICcvcGFnZXMvaW5kZXgvaW5kZXgnLFxuICAgICAgICByZUxhdW5jaDogdHJ1ZSxcbiAgICAgIH0sXG4gICAgICB7fSxcbiAgICAgIHt9LFxuICAgIF0sXG4gICAgYWNjb3VudDogMCxcbiAgfSxcbn0pO1xuIl19
\ No newline at end of file \ No newline at end of file
miniprogram/pages/report/report.ts
...@@ -3,15 +3,6 @@ import { IMyApp } from '../../app'; ...@@ -3,15 +3,6 @@ import { IMyApp } from '../../app';
// miniprogram/pages/report/report.js // miniprogram/pages/report/report.js
const app = getApp<IMyApp>(); const app = getApp<IMyApp>();
Component({ Component({
pageLifetimes: {
show() {
if (typeof this.getTabBar === 'function' && this.getTabBar()) {
this.getTabBar().setData({
selected: 1,
});
}
},
},
lifetimes: { lifetimes: {
attached() { attached() {
console.log(app.globalData.userInfo); console.log(app.globalData.userInfo);
...@@ -35,7 +26,7 @@ Component({ ...@@ -35,7 +26,7 @@ Component({
{ {
name: '用户增长分析', name: '用户增长分析',
icon: '../../../images/btn_yonghu@2x.png', icon: '../../../images/btn_yonghu@2x.png',
url: '/pages/monthOperator/monthOperator', url: '/pages/userGrowth/userGrowth',
reLaunch: false, reLaunch: false,
}, },
{ {
...@@ -44,24 +35,26 @@ Component({ ...@@ -44,24 +35,26 @@ Component({
url: '/pages/feedback/feedback', url: '/pages/feedback/feedback',
reLaunch: false, reLaunch: false,
}, },
{ // {
name: '服务费缴纳', // name: '服务费缴纳',
icon: '../../../images/btn_jiaona@2x.png', // icon: '../../../images/btn_jiaona@2x.png',
url: '', // url: '',
reLaunch: false, // reLaunch: false,
}, // },
{ // {
name: '账户提现', // name: '账户提现',
icon: '../../../images/btn_tixian@2x.png', // icon: '../../../images/btn_tixian@2x.png',
url: '', // url: '',
reLaunch: false, // reLaunch: false,
}, // },
{ {
name: '退出登录', name: '退出登录',
icon: '../../../images/btn_Sign out@2x.png', icon: '../../../images/btn_Sign out@2x.png',
url: '/pages/index/index', url: '/pages/index/index',
reLaunch: true, reLaunch: true,
}, },
{},
{},
], ],
account: 0, account: 0,
}, },
......
miniprogram/pages/report/report.wxml
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<view class="report-header-userImg"> <view class="report-header-userImg">
</view> </view>
</view> </view>
<view class="report-header-account"> <!-- <view class="report-header-account">
<view class="report-header-accountItem"> <view class="report-header-accountItem">
<view class="report-header-accountItemTitle">账户余额</view> <view class="report-header-accountItemTitle">账户余额</view>
<view class="report-header-accountItemValue">10000</view> <view class="report-header-accountItemValue">10000</view>
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<view class="report-header-accountItemTitle">代缴服务费</view> <view class="report-header-accountItemTitle">代缴服务费</view>
<view class="report-header-accountItemValue">10000</view> <view class="report-header-accountItemValue">10000</view>
</view> </view>
</view> </view> -->
<view class="report-header-bottom"></view> <view class="report-header-bottom"></view>
</view> </view>
<view class="report-nav"> <view class="report-nav">
......
miniprogram/pages/userGrowth/userGrowth.js
...@@ -53,13 +53,20 @@ Page({ ...@@ -53,13 +53,20 @@ Page({
}); });
}, },
fetchList: function (entity) { fetchList: function (entity) {
if (this.data.areaId) {
if (entity && entity.areaId) {
}
else
entity = __assign({}, entity, { areaId: this.data.areaId });
}
this.fetchUserData(entity); this.fetchUserData(entity);
}, },
fetchUserData: function (entity) { fetchUserData: function (entity) {
var _this = this; var _this = this;
var reqBody = __assign({ year: this.data.month.slice(0, 4), isAdmin: 1 }, entity); var monthString = entity && entity.monthString ? entity.monthString : this.data.month;
if (this.data.areaId) var _a = monthString.split('-'), year = _a[0], month = _a[1];
reqBody.areaId = this.data.areaId; var reqBody = __assign({ year: year,
month: month, isAdmin: 1 }, entity);
fetch_1.statisticsFetch({ fetch_1.statisticsFetch({
url: '/dcxy/reportInfo/queryReportList', url: '/dcxy/reportInfo/queryReportList',
data: reqBody, data: reqBody,
...@@ -76,7 +83,7 @@ Page({ ...@@ -76,7 +83,7 @@ Page({
var oList = dayVos; var oList = dayVos;
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 = element.completeAt.slice(-2); var daysIndex = element.days.slice(-2);
dayList[daysIndex] = __assign({}, dayList[daysIndex], { count: element.count }); dayList[daysIndex] = __assign({}, dayList[daysIndex], { count: element.count });
} }
} }
...@@ -91,6 +98,28 @@ Page({ ...@@ -91,6 +98,28 @@ Page({
console.log(err); console.log(err);
}); });
}, },
areaChangeHandle: function () { }, areaChangeHandle: function (val) {
var _this = this;
console.log('areaChangeHandle', val);
var value = val.detail.value;
this.setData({
areaId: value,
}, function () {
if (value) {
_this.fetchList({ areaId: value });
}
else {
_this.fetchList();
}
});
},
monthChangeHandle: function (val) {
console.log('monthChangeHandle', val);
var value = val.detail.value;
this.fetchList({ monthString: value });
this.setData({
month: value,
});
},
}); });
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXNlckdyb3d0aC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInVzZXJHcm93dGgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLHlDQUE2RDtBQUM3RCx5Q0FBOEM7QUFHOUMsSUFBSSxDQUFDO0lBQ0gsTUFBTTtRQUNKLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQztRQUNoQixJQUFJLENBQUMsYUFBYSxFQUFFLENBQUM7SUFDdkIsQ0FBQztJQUlELElBQUksRUFBRTtRQUNKLEtBQUssRUFBRSxFQUFFO1FBQ1QsTUFBTSxFQUFFLENBQUM7UUFDVCxRQUFRLEVBQUUsRUFBRTtRQUNaLFVBQVUsRUFBRSxFQUFFO1FBQ2QsYUFBYSxFQUFFLENBQUM7UUFDaEIsV0FBVyxFQUFFLENBQUM7S0FDZjtJQUNELFFBQVE7UUFBUixpQkFNQztRQUxDLElBQUksSUFBSSxHQUFHLGlCQUFVLENBQUMsSUFBSSxJQUFJLEVBQUUsQ0FBQyxDQUFDO1FBQ2xDLE9BQU8sQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDbEIsSUFBSSxDQUFDLE9BQVEsQ0FBQyxFQUFFLEtBQUssRUFBRSxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsRUFBRSxFQUFFO1lBQ3pDLEtBQUksQ0FBQyxTQUFTLEVBQUUsQ0FBQztRQUNuQixDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFDRCxhQUFhO1FBQWIsaUJBa0JDO1FBakJDLGlCQUFTLENBQUM7WUFDUixHQUFHLEVBQUUseUJBQXlCO1NBQy9CLENBQUM7YUFDQyxJQUFJLENBQUMsVUFBQSxHQUFHO1lBQ1AsRUFBRSxDQUFDLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUM7Z0JBQ2IsS0FBSSxDQUFDLE9BQVEsQ0FBQztvQkFDWixRQUFRLEVBQUUsR0FBRyxDQUFDLElBQUk7aUJBQ25CLENBQUMsQ0FBQztZQUNMLENBQUM7WUFBQyxJQUFJLENBQUMsQ0FBQztn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Li8uLi9hcGkvZmV0Y2gnO1xuaW1wb3J0IHsgZm9ybWF0VGltZSB9IGZyb20gJy4uLy4uL3V0aWxzL3V0aWwnO1xuXG4vLyBtaW5pcHJvZ3JhbS9wYWdlcy91c2VyR3Jvd3RoL3VzZXJHcm93dGguanNcblBhZ2Uoe1xuICBvbkxvYWQoKSB7XG4gICAgdGhpcy5pbml0RGF0YSgpO1xuICAgIHRoaXMuZmV0Y2hBcmVhTGlzdCgpO1xuICB9LFxuICAvKipcbiAgICog6aG16Z2i55qE5Yid5aeL5pWw5o2uXG4gICAqL1xuICBkYXRhOiB7XG4gICAgbW9udGg6ICcnLFxuICAgIGFyZWFJZDogMCxcbiAgICBhcmVhTGlzdDogW10sXG4gICAgZ3Jvd3RoTGlzdDogW10sXG4gICAgY3VzdG9tZXJDb3VudDogMCxcbiAgICBhY3RpdmVDb3VudDogMCxcbiAgfSxcbiAgaW5pdERhdGEoKSB7XG4gICAgbGV0IHRpbWUgPSBmb3JtYXRUaW1lKG5ldyBEYXRlKCkpO1xuICAgIGNvbnNvbGUubG9nKHRpbWUpO1xuICAgIHRoaXMuc2V0RGF0YSEoeyBtb250aDogdGltZS5zbGljZSgwLCA3KSB9LCAoKSA9PiB7XG4gICAgICB0aGlzLmZldGNoTGlzdCgpO1xuICAgIH0pO1xuICB9LFxuICBmZXRjaEFyZWFMaXN0KCkge1xuICAgIGJhc2VGZXRjaCh7XG4gICAgICB1cmw6ICcvZGN4eS9iYXNlQXJlYS9xdWVyeUFsbCcsXG4gICAgfSlcbiAgICAgIC50aGVuKHJlcyA9PiB7XG4gICAgICAgIGlmIChyZXMuZGF0YSkge1xuICAgICAgICAgIHRoaXMuc2V0RGF0YSEoe1xuICAgICAgICAgICAgYXJlYUxpc3Q6IHJlcy5kYXRhLFxuICAgICAgICAgIH0pO1xuICAgICAgICB9IGVsc2Uge1xuICAgICAgICAgIHRoaXMuc2V0RGF0YSEoe1xuICAgICAgICAgICAgYXJlYUxpc3Q6IFtdLFxuICAgICAgICAgIH0pO1xuICAgICAgICB9XG4gICAgICB9KVxuICAgICAgLmNhdGNoKGVyciA9PiB7XG4gICAgICAgIGNvbnNvbGUubG9nKGVycik7XG4gICAgICB9KTtcbiAgfSxcbiAgZmV0Y2hMaXN0KGVudGl0eT86IHsgYXJlYUlkPzogbnVtYmVyOyBtb250aD86IHN0cmluZyB9KSB7XG4gICAgdGhpcy5mZXRjaFVzZXJEYXRhKGVudGl0eSk7XG4gIH0sXG4gIGZldGNoVXNlckRhdGEoZW50aXR5KSB7XG4gICAgbGV0IHJlcUJvZHkgPSB7XG4gICAgICB5ZWFyOiB0aGlzLmRhdGEubW9udGguc2xpY2UoMCwgNCksXG4gICAgICBpc0FkbWluOiAxLFxuICAgICAgLi4uZW50aXR5LFxuICAgIH07XG4gICAgaWYgKHRoaXMuZGF0YS5hcmVhSWQpIHJlcUJvZHkuYXJlYUlkID0gdGhpcy5kYXRhLmFyZWFJZDtcbiAgICBzdGF0aXN0aWNzRmV0Y2goe1xuICAgICAgdXJsOiAnL2RjeHkvcmVwb3J0SW5mby9xdWVyeVJlcG9ydExpc3QnLFxuICAgICAgZGF0YTogcmVxQm9keSxcbiAgICB9KVxuICAgICAgLnRoZW4ocmVzID0+IHtcbiAgICAgICAgY29uc29sZS5sb2cocmVzKTtcbiAgICAgICAgY29uc3QgeyBjdXN0b21lckNvdW50LCBkYXlWb3MsIGFjdGl2ZUNvdW50IH0gPSByZXMuZGF0YTtcbiAgICAgICAgbGV0IGRheUxpc3QgPSBuZXcgQXJyYXkoMzEpXG4gICAgICAgICAgLmZpbGwoe1xuICAgICAgICAgICAgY291bnQ6IDAsXG4gICAgICAgICAgfSlcbiAgICAgICAgICAubWFwKCh2LCBpZHgpID0+ICh7IC4uLnYsIGRheXM6IGlkeCArIDEgfSkpO1xuXG4gICAgICAgIGlmIChkYXlWb3MgJiYgZGF5Vm9zLmxlbmd0aCkge1xuICAgICAgICAgIGxldCBvTGlzdCA9IGRheVZvcztcbiAgICAgICAgICBmb3IgKGxldCBpbmRleCA9IDA7IGluZGV4IDwgb0xpc3QubGVuZ3RoOyBpbmRleCsrKSB7XG4gICAgICAgICAgICBjb25zdCBlbGVtZW50ID0gb0xpc3RbaW5kZXhdO1xuICAgICAgICAgICAgbGV0IGRheXNJbmRleCA9IGVsZW1lbnQuY29tcGxldGVBdC5zbGljZSgtMik7XG4gICAgICAgICAgICBkYXlMaXN0W2RheXNJbmRleF0gPSB7XG4gICAgICAgICAgICAgIC4uLmRheUxpc3RbZGF5c0luZGV4XSxcbiAgICAgICAgICAgICAgY291bnQ6IGVsZW1lbnQuY291bnQsXG4gICAgICAgICAgICB9O1xuICAgICAgICAgIH1cbiAgICAgICAgfVxuICAgICAgICBjb25zb2xlLmxvZygnZGF5TGlzdDonLCBkYXlMaXN0KTtcbiAgICAgICAgdGhpcy5zZXREYXRhISh7XG4gICAgICAgICAgZ3Jvd3RoTGlzdDogZGF5TGlzdCxcbiAgICAgICAgICBjdXN0b21lckNvdW50OiBjdXN0b21lckNvdW50ID8gY3VzdG9tZXJDb3VudCA6IDAsXG4gICAgICAgICAgYWN0aXZlQ291bnQ6IGFjdGl2ZUNvdW50ID8gYWN0aXZlQ291bnQgOiAwLFxuICAgICAgICB9KTtcbiAgICAgIH0pXG4gICAgICAuY2F0Y2goZXJyID0+IHtcbiAgICAgICAgY29uc29sZS5sb2coZXJyKTtcbiAgICAgIH0pO1xuICB9LFxuICBhcmVhQ2hhbmdlSGFuZGxlKCkge30sXG59KTtcbiJdfQ== //# 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: 0,\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 = 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 { value } = val.detail;\n    this.setData!(\n      {\n        areaId: value,\n      },\n      () => {\n        if (value) {\n          this.fetchList({ areaId: value });\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.json
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
"usingComponents": { "usingComponents": {
"user-grouth-chart": "../components/UserGrouthChart/UserGrouthChart", "user-grouth-chart": "../components/UserGrouthChart/UserGrouthChart",
"user-activity-chart": "../components/UserActivityChart/UserActivityChart", "user-activity-chart": "../components/UserActivityChart/UserActivityChart",
"area-select": "../components/AreaSelect/AreaSelect",
"c-select": "../components/Select/Select" "c-select": "../components/Select/Select"
} }
} }
miniprogram/pages/userGrowth/userGrowth.ts
...@@ -44,16 +44,23 @@ Page({ ...@@ -44,16 +44,23 @@ Page({
console.log(err); 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); this.fetchUserData(entity);
}, },
fetchUserData(entity) { fetchUserData(entity) {
let monthString =
entity && entity.monthString ? entity.monthString : this.data.month;
const [year, month] = monthString.split('-');
let reqBody = { let reqBody = {
year: this.data.month.slice(0, 4), year,
month,
isAdmin: 1, isAdmin: 1,
...entity, ...entity,
}; };
if (this.data.areaId) reqBody.areaId = this.data.areaId;
statisticsFetch({ statisticsFetch({
url: '/dcxy/reportInfo/queryReportList', url: '/dcxy/reportInfo/queryReportList',
data: reqBody, data: reqBody,
...@@ -71,7 +78,7 @@ Page({ ...@@ -71,7 +78,7 @@ Page({
let oList = dayVos; let oList = dayVos;
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 = element.completeAt.slice(-2); let daysIndex = element.days.slice(-2);
dayList[daysIndex] = { dayList[daysIndex] = {
...dayList[daysIndex], ...dayList[daysIndex],
count: element.count, count: element.count,
...@@ -89,5 +96,28 @@ Page({ ...@@ -89,5 +96,28 @@ Page({
console.log(err); 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 @@ ...@@ -16,10 +16,10 @@
</view> </view>
<view class="userGrowth-filter"> <view class="userGrowth-filter">
<view class="userGrowth-area"> <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>
<view class="userGrowth-time"> <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> </view>
<view class="userGrowth-block"> <view class="userGrowth-block">
......
miniprogram/pages/userGrowth/userGrowth.wxss
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
justify-content: space-between; justify-content: space-between;
} }
.userGrowth-area { .userGrowth-area {
flex: 1; width: 400rpx;
} }
.userGrowth-time { .userGrowth-time {
width: 250rpx; 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