Skip to content

W
wx-boss
Commit 756ce1b0 by 姜雷
Options

Merge branch 'test'

parents a66ccfc6 60d79da4
Showing with 443 additions and 91 deletions
miniprogram/app.json
......@@ -6,7 +6,8 @@
"pages/feedback/feedback",
"pages/monthOperator/monthOperator",
"pages/homeAndReport/homeAndReport",
"pages/userGrowth/userGrowth"
"pages/userGrowth/userGrowth",
"pages/areaSelect/areaSelect"
],
"window": {
"backgroundTextStyle": "light",
......
miniprogram/pages/areaSelect/areaSelect.js 0 → 100644
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
var fetch_1 = require("../../api/fetch");
Page({
data: {
selected: '',
selectedIndex: '',
areaList: [],
filterList: [],
methodName: '',
},
onLoad: function (options) {
console.log(options);
var methodName = options.methodName, value = options.value;
this.fetchAreaList();
this.setData({
methodName: methodName,
selected: value,
});
},
onShow: function () { },
fetchAreaList: function () {
var _this = this;
fetch_1.baseFetch({
url: '/dcxy/baseArea/queryAll',
})
.then(function (res) {
if (res.data) {
_this.setData({
areaList: res.data,
filterList: res.data,
});
if (_this.data.selected) {
var index = res.data.findIndex(function (item) { return item.id == _this.data.selected; });
console.log(_this.data.selected, index);
if (index > -1) {
_this.setData({
selectedIndex: index,
});
}
}
}
else {
_this.setData({
areaList: [],
filterList: [],
});
}
})
.catch(function (err) {
console.log(err);
});
},
inputHandle: function (e) {
var value = e.detail.value;
console.log(e, value);
var filterList = [];
if (value) {
filterList = this.data.areaList.filter(function (item) {
return item['areaName'].includes(value);
});
}
else {
filterList = this.data.areaList;
}
this.setData({
filterList: filterList,
});
},
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.filterList[value].id,
selectedIndex: value,
});
}
},
bindPickerChange: function () {
var value = this.data.selected;
var pages = getCurrentPages();
var prevPage = pages[pages.length - 2];
var entity = {};
if (value) {
entity = {
id: value,
name: this.data.filterList[this.data.selectedIndex].areaName,
};
}
else {
entity = { id: '', name: '' };
}
if (this.data.methodName && prevPage[this.data.methodName]) {
prevPage[this.data.methodName](entity);
}
wx.navigateBack({ delta: 1 });
},
});
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXJlYVNlbGVjdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImFyZWFTZWxlY3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSx5Q0FBNEM7QUFHNUMsSUFBSSxDQUFDO0lBSUgsSUFBSSxFQUFFO1FBQ0osUUFBUSxFQUFFLEVBQUU7UUFDWixhQUFhLEVBQUUsRUFBRTtRQUNqQixRQUFRLEVBQUUsRUFBRTtRQUNaLFVBQVUsRUFBRSxFQUFFO1FBQ2QsVUFBVSxFQUFFLEVBQUU7S0FDZjtJQUtELE1BQU0sRUFBRSxVQUFTLE9BQU87UUFDdEIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUNiLElBQUEsK0JBQVUsRUFBRSxxQkFBSyxDQUFhO1FBQ3RDLElBQUksQ0FBQyxhQUFhLEVBQUUsQ0FBQztRQUNyQixJQUFJLENBQUMsT0FBUSxDQUFDO1lBQ1osVUFBVSxZQUFBO1lBQ1YsUUFBUSxFQUFFLEtBQUs7U0FDaEIsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUlELE1BQU0sRUFBRSxjQUFZLENBQUM7SUFDckIsYUFBYTtRQUFiLGlCQStCQztRQTlCQyxpQkFBUyxDQUFDO1lBQ1IsR0FBRyxFQUFFLHlCQUF5QjtTQUMvQixDQUFDO2FBQ0MsSUFBSSxDQUFDLFVBQUEsR0FBRztZQUNQLEVBQUUsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDO2dCQUNiLEtBQUksQ0FBQyxPQUFRLENBQUM7b0JBQ1osUUFBUSxFQUFFLEdBQUcsQ0FBQyxJQUFJO29CQUNsQixVQUFVLEVBQUUsR0FBRyxDQUFDLElBQUk7aUJBQ3JCLENBQUMsQ0FBQztnQkFDSCxFQUFFLENBQUMsQ0FBQyxLQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUM7b0JBQ3ZCLElBQUksS0FBSyxHQUFHLEdBQUcsQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUM1QixVQUFBLElBQUksSUFBSSxPQUFBLElBQUksQ0FBQyxFQUFFLElB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LEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxJQUFJLEVBQUUsRUFBRSxFQUFFLENBQUM7UUFDaEMsQ0FBQztRQUNELEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsVUFBVSxJQUFJLFFBQVEsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUMzRCxRQUFRLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUN6QyxDQUFDO1FBQ0QsRUFBRSxDQUFDLFlBQVksQ0FBQyxFQUFFLEtBQUssRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDO0lBQ2hDLENBQUM7Q0FDRixDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBiYXNlRmV0Y2ggfSBmcm9tICcuLi8uLi9hcGkvZmV0Y2gnO1xuXG4vLyBtaW5pcHJvZ3JhbS9wYWdlcy9hcmVhU2VsZWN0L2FyZWFTZWxlY3QuanNcblBhZ2Uoe1xuICAvKipcbiAgICog6aG16Z2i55qE5Yid5aeL5pWw5o2uXG4gICAqL1xuICBkYXRhOiB7XG4gICAgc2VsZWN0ZWQ6ICcnLFxuICAgIHNlbGVjdGVkSW5kZXg6ICcnLFxuICAgIGFyZWFMaXN0OiBbXSxcbiAgICBmaWx0ZXJMaXN0OiBbXSxcbiAgICBtZXRob2ROYW1lOiAnJyxcbiAgfSxcblxuICAvKipcbiAgICog55Sf5ZG95ZGo5pyf5Ye95pWwLS3nm5HlkKzpobXpnaLliqDovb1cbiAgICovXG4gIG9uTG9hZDogZnVuY3Rpb24ob3B0aW9ucykge1xuICAgIGNvbnNvbGUubG9nKG9wdGlvbnMpO1xuICAgIGNvbnN0IHsgbWV0aG9kTmFtZSwgdmFsdWUgfSA9IG9wdGlvbnM7XG4gICAgdGhpcy5mZXRjaEFyZWFMaXN0KCk7XG4gICAgdGhpcy5zZXREYXRhISh7XG4gICAgICBtZXRob2ROYW1lLFxuICAgICAgc2VsZWN0ZWQ6IHZhbHVlLFxuICAgIH0pO1xuICB9LFxuICAvKipcbiAgICog55Sf5ZG95ZGo5pyf5Ye95pWwLS3nm5HlkKzpobXpnaLmmL7npLpcbiAgICovXG4gIG9uU2hvdzogZnVuY3Rpb24oKSB7fSxcbiAgZmV0Y2hBcmVhTGlzdCgpIHtcbiAgICBiYXNlRmV0Y2goe1xuICAgICAgdXJsOiAnL2RjeHkvYmFzZUFyZWEvcXVlcnlBbGwnLFxuICAgIH0pXG4gICAgICAudGhlbihyZXMgPT4ge1xuICAgICAgICBpZiAocmVzLmRhdGEpIHtcbiAgICAgICAgICB0aGlzLnNldERhdGEhKHtcbiAgICAgICAgICAgIGFyZWFMaXN0OiByZXMuZGF0YSxcbiAgICAgICAgICAgIGZpbHRlckxpc3Q6IHJlcy5kYXRhLFxuICAgICAgICAgIH0pO1xuICAgICAgICAgIGlmICh0aGlzLmRhdGEuc2VsZWN0ZWQpIHtcbiAgICAgICAgICAgIGxldCBpbmRleCA9IHJlcy5kYXRhLmZpbmRJbmRleChcbiAgICAgICAgICAgICAgaXRlbSA9PiBpdGVtLmlkID09IHRoaXMuZGF0YS5zZWxlY3RlZCxcbiAgICAgICAgICAgICk7XG4gICAgICAgICAgICBjb25zb2xlLmxvZyh0aGlzLmRhdGEuc2VsZWN0ZWQsaW5kZXgpXG4gICAgICAgICAgICBpZiAoaW5kZXggPiAtMSkge1xuICAgICAgICAgICAgICB0aGlzLnNldERhdGEoe1xuICAgICAgICAgICAgICAgIHNlbGVjdGVkSW5kZXg6IGluZGV4LFxuICAgICAgICAgICAgICB9KTtcbiAgICAgICAgICAgIH1cbiAgICAgICAgICB9XG4gICAgICAgIH0gZWxzZSB7XG4gICAgICAgICAgdGhpcy5zZXREYXRhISh7XG4gICAgICAgICAgICBhcmVhTGlzdDogW10sXG4gICAgICAgICAgICBmaWx0ZXJMaXN0OiBbXSxcbiAgICAgICAgICB9KTtcbiAgICAgICAgfVxuICAgICAgfSlcbiAgICAgIC5jYXRjaChlcnIgPT4ge1xuICAgICAgICBjb25zb2xlLmxvZyhlcnIpO1xuICAgICAgfSk7XG4gIH0sXG4gIGlucHV0SGFuZGxlKGUpIHtcbiAgICBjb25zdCB7IHZhbHVlIH0gPSBlLmRldGFpbDtcbiAgICBjb25zb2xlLmxvZyhlLCB2YWx1ZSk7XG4gICAgbGV0IGZpbHRlckxpc3QgPSBbXTtcbiAgICBpZiAodmFsdWUpIHtcbiAgICAgIGZpbHRlckxpc3QgPSB0aGlzLmRhdGEuYXJlYUxpc3QuZmlsdGVyKGl0ZW0gPT5cbiAgICAgICAgaXRlbVsnYXJlYU5hbWUnXS5pbmNsdWRlcyh2YWx1ZSksXG4gICAgICApO1xuICAgIH0gZWxzZSB7XG4gICAgICBmaWx0ZXJMaXN0ID0gdGhpcy5kYXRhLmFyZWFMaXN0O1xuICAgIH1cbiAgICB0aGlzLnNldERhdGEoe1xuICAgICAgZmlsdGVyTGlzdCxcbiAgICB9KTtcbiAgfSxcbiAgc2VsZWN0ZWRIYW5kbGUoZSkge1xuICAgIGNvbnN0IHsgdmFsdWUgfSA9IGUuY3VycmVudFRhcmdldC5kYXRhc2V0O1xuICAgIGNvbnNvbGUubG9nKGUsIHZhbHVlKTtcbiAgICBpZiAodGhpcy5kYXRhLnNlbGVjdGVkSW5kZXggPT09IHZhbHVlKSB7XG4gICAgICB0aGlzLnNldERhdGEoe1xuICAgICAgICBzZWxlY3RlZDogJycsXG4gICAgICAgIHNlbGVjdGVkSW5kZXg6ICcnLFxuICAgICAgfSk7XG4gICAgfSBlbHNlIHtcbiAgICAgIHRoaXMuc2V0RGF0YSh7XG4gICAgICAgIHNlbGVjdGVkOiB0aGlzLmRhdGEuZmlsdGVyTGlzdFt2YWx1ZV0uaWQsXG4gICAgICAgIHNlbGVjdGVkSW5kZXg6IHZhbHVlLFxuICAgICAgfSk7XG4gICAgfVxuICB9LFxuICBiaW5kUGlja2VyQ2hhbmdlKCkge1xuICAgIGxldCB2YWx1ZSA9IHRoaXMuZGF0YS5zZWxlY3RlZDtcbiAgICAvLyB0aGlzLnNldERhdGEhKHtcbiAgICAvLyAgIHNob3dQaWNrZXJWaWV3OiBmYWxzZSxcbiAgICAvLyB9KTtcbiAgICAvLyB0aGlzLnRyaWdnZXJFdmVudCgnY2hhbmdlJywgeyB2YWx1ZSB9LCB7fSk7XG4gICAgdmFyIHBhZ2VzID0gZ2V0Q3VycmVudFBhZ2VzKCk7XG4gICAgdmFyIHByZXZQYWdlID0gcGFnZXNbcGFnZXMubGVuZ3RoIC0gMl07IC8v5LiK5LiA5Liq6aG16Z2iXG4gICAgbGV0IGVudGl0eSA9IHt9O1xuICAgIGlmICh2YWx1ZSkge1xuICAgICAgZW50aXR5ID0ge1xuICAgICAgICBpZDogdmFsdWUsXG4gICAgICAgIG5hbWU6IHRoaXMuZGF0YS5maWx0ZXJMaXN0W3RoaXMuZGF0YS5zZWxlY3RlZEluZGV4XS5hcmVhTmFtZSxcbiAgICAgIH07XG4gICAgfSBlbHNlIHtcbiAgICAgIGVudGl0eSA9IHsgaWQ6ICcnLCBuYW1lOiAnJyB9O1xuICAgIH1cbiAgICBpZiAodGhpcy5kYXRhLm1ldGhvZE5hbWUgJiYgcHJldlBhZ2VbdGhpcy5kYXRhLm1ldGhvZE5hbWVdKSB7XG4gICAgICBwcmV2UGFnZVt0aGlzLmRhdGEubWV0aG9kTmFtZV0oZW50aXR5KTtcbiAgICB9XG4gICAgd3gubmF2aWdhdGVCYWNrKHsgZGVsdGE6IDEgfSk7XG4gIH0sXG59KTtcbiJdfQ==
\ No newline at end of file
miniprogram/pages/areaSelect/areaSelect.json 0 → 100644
{
"navigationBarTitleText": "区域选择",
"usingComponents": {}
}
\ No newline at end of file
miniprogram/pages/areaSelect/areaSelect.ts 0 → 100644
import { baseFetch } from '../../api/fetch';
// miniprogram/pages/areaSelect/areaSelect.js
Page({
/**
* 页面的初始数据
*/
data: {
selected: '',
selectedIndex: '',
areaList: [],
filterList: [],
methodName: '',
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function(options) {
console.log(options);
const { methodName, value } = options;
this.fetchAreaList();
this.setData!({
methodName,
selected: value,
});
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function() {},
fetchAreaList() {
baseFetch({
url: '/dcxy/baseArea/queryAll',
})
.then(res => {
if (res.data) {
this.setData!({
areaList: res.data,
filterList: res.data,
});
if (this.data.selected) {
let index = res.data.findIndex(
item => item.id == this.data.selected,
);
console.log(this.data.selected,index)
if (index > -1) {
this.setData({
selectedIndex: index,
});
}
}
} else {
this.setData!({
areaList: [],
filterList: [],
});
}
})
.catch(err => {
console.log(err);
});
},
inputHandle(e) {
const { value } = e.detail;
console.log(e, value);
let filterList = [];
if (value) {
filterList = this.data.areaList.filter(item =>
item['areaName'].includes(value),
);
} else {
filterList = this.data.areaList;
}
this.setData({
filterList,
});
},
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.filterList[value].id,
selectedIndex: value,
});
}
},
bindPickerChange() {
let value = this.data.selected;
// this.setData!({
// showPickerView: false,
// });
// this.triggerEvent('change', { value }, {});
var pages = getCurrentPages();
var prevPage = pages[pages.length - 2]; //上一个页面
let entity = {};
if (value) {
entity = {
id: value,
name: this.data.filterList[this.data.selectedIndex].areaName,
};
} else {
entity = { id: '', name: '' };
}
if (this.data.methodName && prevPage[this.data.methodName]) {
prevPage[this.data.methodName](entity);
}
wx.navigateBack({ delta: 1 });
},
});
miniprogram/pages/areaSelect/areaSelect.wxml 0 → 100644
<!-- miniprogram/pages/areaSelect/areaSelect.wxml -->
<view class="areaselect-pickBox">
<view 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.areaName}}
</view>
</view>
</view>
\ No newline at end of file
miniprogram/pages/areaSelect/areaSelect.wxss 0 → 100644
/* miniprogram/pages/areaSelect/areaSelect.wxss */
page {
height: 100%;
}
.areaselect-pickBox {
box-sizing: border-box;
padding-bottom: constant(safe-area-inset-bottom);
padding-bottom: env(safe-area-inset-bottom);
background-color: #fff;
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
}
.areaselect-pickFilter {
display: flex;
padding: 40rpx 40rpx 0;
align-items: center;
}
.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/AreaSelect/AreaSelect.js
......@@ -20,9 +20,25 @@ Component({
type: String,
value: '',
observer: function (newVal) {
console.log(newVal);
this.setData({ selected: newVal });
},
},
mode: {
type: String,
value: 'selector',
},
methodName: {
type: String,
value: '',
},
showText: {
type: String,
value: '',
observer: function (val) {
console.log('in showText', val);
},
},
},
data: {
showPickerView: false,
......@@ -32,9 +48,16 @@ Component({
},
methods: {
inputClickHandle: function () {
if (this.data.mode === 'page') {
wx.navigateTo({
url: "/pages/areaSelect/areaSelect?methodName=" + this.data.methodName + "&value=" + this.data.value,
});
}
else {
this.setData({
showPickerView: !this.data.showPickerView,
});
}
},
innerClickHandle: function (e) {
return false;
......@@ -87,4 +110,4 @@ Component({
},
},
});
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXJlYVNlbGVjdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIkFyZWFTZWxlY3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUNBLFNBQVMsQ0FBQztJQUNSLFVBQVUsRUFBRTtRQUNWLFdBQVcsRUFBRTtZQUNYLElBQUksRUFBRSxNQUFNO1lBQ1osS0FBSyxFQUFFLEtBQUs7U0FDYjtRQUNELEtBQUssRUFBRTtZQUNMLElBQUksRUFBRSxLQUFLO1lBQ1gsS0FBSyxFQUFFLEVBQUU7WUFDVCxRQUFRLFlBQUMsTUFBTTtnQkFDYixJQUFJLENBQUMsT0FBTyxDQUFDLEVBQUUsVUFBVSxFQUFFLE1BQU0sRUFBRSxDQUFDLENBQUM7WUFDdkMsQ0FBQztTQUNGO1FBQ0QsUUFBUSxFQUFFO1lBQ1IsSUFBSSxFQUFFLE1BQU07WUFDWixLQUFLLEVBQUUsS0FBSztTQUNiO1FBQ0QsS0FBSyxFQUFFO1lBQ0wsSUFBSSxFQUFFLE1BQU07WUFDWixLQUFLLEVBQUUsRUFBRTtZQUNULFFBQVEsWUFBQyxNQUFNO2dCQUNiLElBQUksQ0FBQyxPQUFPLENBQUMsRUFBRSxRQUFRLEVBQUUsTUFBTSxFQUFFLENBQUMsQ0FBQztZQUNyQyxDQUFDO1NBQ0Y7S0FDRjtJQUNELElBQUksRUFBRTtRQUNKLGNBQWMsRUFBRSxLQUFLO1FBQ3JCLFFBQVEsRUFBRSxFQUFFO1FBQ1osYUFBYSxFQUFFLEVBQUU7UUFDakIsVUFBVSxFQUFFLEVBQUU7S0FDZjtJQUNELE9BQU8sRUFBRTtRQUNQLGdCQUFnQjtZQUNkLElBQUksQ0FBQyxPQUFRLENBQUM7Z0JBQ1osY0FBYyxFQUFFLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxjQUFjO2FBQzFDLENBQUMsQ0FBQztRQUNMLENBQUM7UUFDRCxnQkFBZ0IsWUFBQyxDQUFDO1lBQ2hCLE1BQU0sQ0FBQyxLQUFLLENBQUM7UUFDZixDQUFDO1FBQ0QsZUFBZSxZQUFDLENBQUM7WUFDZixJQUFJLENBQUMsT0FBTyxDQUFDO2dCQUNYLGNBQWMsRUFBRSxLQUFLO2FBQ3RCLENBQUMsQ0FBQztZQUNILE1BQU0sQ0FBQyxLQUFLLENBQUM7UUFDZixDQUFDO1FBQ0QsV0FBVyxZQUFDLENBQUM7WUFBYixpQkFlQztZQWRTLElBQUEsc0JBQUssQ0FBYztZQUMzQixPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsRUFBRSxLQUFLLENBQUMsQ0FBQztZQUN0QixJQUFJLFVBQVUsR0FBRyxFQUFFLENBQUM7WUFDcEIsRUFBRSxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQztnQkFDVixVQUFVLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLFVBQUEsSUFBSTtvQkFDdEMsT0FBQSxJQUFJLENBQUMsS0FBSSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDO2dCQUF4QyxDQUF3QyxDQUN6QyxDQUFDO1lBQ0osQ0FBQztZQUFDLElBQUksQ0FBQyxDQUFDO2dCQUNOLFVBQVUsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQztZQUMvQixDQUFDO1lBRUQsSUFBSSxDQUFDLE9BQU8sQ0FBQztnQkFDWCxVQUFVLFlBQUE7YUFDWCxDQUFDLENBQUM7UUFDTCxDQUFDO1FBQ0QsZ0JBQWdCO1lBQ2QsSUFBSSxLQUFLLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUM7WUFDL0IsSUFBSSxDQUFDLE9BQVEsQ0FBQztnQkFDWixjQUFjLEVBQUUsS0FBSzthQUN0QixDQUFDLENBQUM7WUFDSCxJQUFJLENBQUMsWUFBWSxDQUFDLFFBQVEsRUFBRSxFQUFFLEtBQUssT0FBQSxFQUFFLEVBQUUsRUFBRSxDQUFDLENBQUM7UUFDN0MsQ0FBQztRQUNELGNBQWMsWUFBQyxDQUFDO1lBQ04sSUFBQSxxQ0FBSyxDQUE2QjtZQUMxQyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsRUFBRSxLQUFLLENBQUMsQ0FBQztZQUN0QixFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLGFBQWEsS0FBSyxLQUFLLENBQUMsQ0FBQyxDQUFDO2dCQUN0QyxJQUFJLENBQUMsT0FBTyxDQUFDO29CQUNYLFFBQVEsRUFBRSxFQUFFO29CQUNaLGFBQWEsRUFBRSxFQUFFO2lCQUNsQixDQUFDLENBQUM7WUFDTCxDQUFDO1lBQUMsSUFBSSxDQUFDLENBQUM7Z0JBQ04sSUFBSSxDQUFDLE9BQU8sQ0FBQztvQkFDWCxRQUFRLEVBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUMsRUFBRTtvQkFDbkMsYUFBYSxFQUFFLEtBQUs7aUJBQ3JCLENBQUMsQ0FBQztZQUNMLENBQUM7UUFDSCxDQUFDO0tBQ0Y7Q0FDRixDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvLyBwYWdlcy9jb21wb25lbnRzL0FyZWFTZWxlY3QvQXJlYVNlbGVjdC5qc1xuQ29tcG9uZW50KHtcbiAgcHJvcGVydGllczoge1xuICAgIHBsYWNlaG9sZGVyOiB7XG4gICAgICB0eXBlOiBTdHJpbmcsXG4gICAgICB2YWx1ZTogJ+ivt+mAieaLqScsXG4gICAgfSxcbiAgICByYW5nZToge1xuICAgICAgdHlwZTogQXJyYXksXG4gICAgICB2YWx1ZTogW10sXG4gICAgICBvYnNlcnZlcihuZXdWYWwpIHtcbiAgICAgICAgdGhpcy5zZXREYXRhKHsgZmlsdGVyTGlzdDogbmV3VmFsIH0pO1xuICAgICAgfSxcbiAgICB9LFxuICAgIHJhbmdlS2V5OiB7XG4gICAgICB0eXBlOiBTdHJpbmcsXG4gICAgICB2YWx1ZTogJ2tleScsXG4gICAgfSxcbiAgICB2YWx1ZToge1xuICAgICAgdHlwZTogU3RyaW5nLFxuICAgICAgdmFsdWU6ICcnLFxuICAgICAgb2JzZXJ2ZXIobmV3VmFsKSB7XG4gICAgICAgIHRoaXMuc2V0RGF0YSh7IHNlbGVjdGVkOiBuZXdWYWwgfSk7XG4gICAgICB9LFxuICAgIH0sXG4gIH0sXG4gIGRhdGE6IHtcbiAgICBzaG93UGlja2VyVmlldzogZmFsc2UsXG4gICAgc2VsZWN0ZWQ6ICcnLFxuICAgIHNlbGVjdGVkSW5kZXg6ICcnLFxuICAgIGZpbHRlckxpc3Q6IFtdLFxuICB9LFxuICBtZXRob2RzOiB7XG4gICAgaW5wdXRDbGlja0hhbmRsZSgpIHtcbiAgICAgIHRoaXMuc2V0RGF0YSEoe1xuICAgICAgICBzaG93UGlja2VyVmlldzogIXRoaXMuZGF0YS5zaG93UGlja2VyVmlldyxcbiAgICAgIH0pO1xuICAgIH0sXG4gICAgaW5uZXJDbGlja0hhbmRsZShlKSB7XG4gICAgICByZXR1cm4gZmFsc2U7XG4gICAgfSxcbiAgICBtYXNrQ2xpY2tIYW5kbGUoZSkge1xuICAgICAgdGhpcy5zZXREYXRhKHtcbiAgICAgICAgc2hvd1BpY2tlclZpZXc6IGZhbHNlLFxuICAgICAgfSk7XG4gICAgICByZXR1cm4gZmFsc2U7XG4gICAgfSxcbiAgICBpbnB1dEhhbmRsZShlKSB7XG4gICAgICBjb25zdCB7IHZhbHVlIH0gPSBlLmRldGFpbDtcbiAgICAgIGNvbnNvbGUubG9nKGUsIHZhbHVlKTtcbiAgICAgIGxldCBmaWx0ZXJMaXN0ID0gW107XG4gICAgICBpZiAodmFsdWUpIHtcbiAgICAgICAgZmlsdGVyTGlzdCA9IHRoaXMuZGF0YS5yYW5nZS5maWx0ZXIoaXRlbSA9PlxuICAgICAgICAgIGl0ZW1bdGhpcy5kYXRhLnJhbmdlS2V5XS5pbmNsdWRlcyh2YWx1ZSksXG4gICAgICAgICk7XG4gICAgICB9IGVsc2Uge1xuICAgICAgICBmaWx0ZXJMaXN0ID0gdGhpcy5kYXRhLnJhbmdlO1xuICAgICAgfVxuXG4gICAgICB0aGlzLnNldERhdGEoe1xuICAgICAgICBmaWx0ZXJMaXN0LFxuICAgICAgfSk7XG4gICAgfSxcbiAgICBiaW5kUGlja2VyQ2hhbmdlKCkge1xuICAgICAgbGV0IHZhbHVlID0gdGhpcy5kYXRhLnNlbGVjdGVkO1xuICAgICAgdGhpcy5zZXREYXRhISh7XG4gICAgICAgIHNob3dQaWNrZXJWaWV3OiBmYWxzZSxcbiAgICAgIH0pO1xuICAgICAgdGhpcy50cmlnZ2VyRXZlbnQoJ2NoYW5nZScsIHsgdmFsdWUgfSwge30pO1xuICAgIH0sXG4gICAgc2VsZWN0ZWRIYW5kbGUoZSkge1xuICAgICAgY29uc3QgeyB2YWx1ZSB9ID0gZS5jdXJyZW50VGFyZ2V0LmRhdGFzZXQ7XG4gICAgICBjb25zb2xlLmxvZyhlLCB2YWx1ZSk7XG4gICAgICBpZiAodGhpcy5kYXRhLnNlbGVjdGVkSW5kZXggPT09IHZhbHVlKSB7XG4gICAgICAgIHRoaXMuc2V0RGF0YSh7XG4gICAgICAgICAgc2VsZWN0ZWQ6ICcnLFxuICAgICAgICAgIHNlbGVjdGVkSW5kZXg6ICcnLFxuICAgICAgICB9KTtcbiAgICAgIH0gZWxzZSB7XG4gICAgICAgIHRoaXMuc2V0RGF0YSh7XG4gICAgICAgICAgc2VsZWN0ZWQ6IHRoaXMuZGF0YS5yYW5nZVt2YWx1ZV0uaWQsXG4gICAgICAgICAgc2VsZWN0ZWRJbmRleDogdmFsdWUsXG4gICAgICAgIH0pO1xuICAgICAgfVxuICAgIH0sXG4gIH0sXG59KTtcbiJdfQ==
\ No newline at end of file
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXJlYVNlbGVjdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIkFyZWFTZWxlY3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUNBLFNBQVMsQ0FBQztJQUNSLFVBQVUsRUFBRTtRQUNWLFdBQVcsRUFBRTtZQUNYLElBQUksRUFBRSxNQUFNO1lBQ1osS0FBSyxFQUFFLEtBQUs7U0FDYjtRQUNELEtBQUssRUFBRTtZQUNMLElBQUksRUFBRSxLQUFLO1lBQ1gsS0FBSyxFQUFFLEVBQUU7WUFDVCxRQUFRLFlBQUMsTUFBTTtnQkFDYixJQUFJLENBQUMsT0FBTyxDQUFDLEVBQUUsVUFBVSxFQUFFLE1BQU0sRUFBRSxDQUFDLENBQUM7WUFDdkMsQ0FBQztTQUNGO1FBQ0QsUUFBUSxFQUFFO1lBQ1IsSUFBSSxFQUFFLE1BQU07WUFDWixLQUFLLEVBQUUsS0FBSztTQUNiO1FBQ0QsS0FBSyxFQUFFO1lBQ0wsSUFBSSxFQUFFLE1BQU07WUFDWixLQUFLLEVBQUUsRUFBRTtZQUNULFFBQVEsWUFBQyxNQUFNO2dCQUNiLE9BQU8sQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLENBQUM7Z0JBQ3BCLElBQUksQ0FBQyxPQUFPLENBQUMsRUFBRSxRQUFRLEVBQUUsTUFBTSxFQUFFLENBQUMsQ0FBQztZQUNyQyxDQUFDO1NBQ0Y7UUFDRCxJQUFJLEVBQUU7WUFDSixJQUFJLEVBQUUsTUFBTTtZQUNaLEtBQUssRUFBRSxVQUFVO1NBQ2xCO1FBQ0QsVUFBVSxFQUFFO1lBQ1YsSUFBSSxFQUFFLE1BQU07WUFDWixLQUFLLEVBQUUsRUFBRTtTQUNWO1FBQ0QsUUFBUSxFQUFFO1lBQ1IsSUFBSSxFQUFFLE1BQU07WUFDWixLQUFLLEVBQUUsRUFBRTtZQUNULFFBQVEsWUFBQyxHQUFHO2dCQUNWLE9BQU8sQ0FBQyxHQUFHLENBQUMsYUFBYSxFQUFFLEdBQUcsQ0FBQyxDQUFDO1lBQ2xDLENBQUM7U0FDRjtLQUNGO0lBQ0QsSUFBSSxFQUFFO1FBQ0osY0FBYyxFQUFFLEtB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QXJlYVNlbGVjdC9BcmVhU2VsZWN0LmpzXG5Db21wb25lbnQoe1xuICBwcm9wZXJ0aWVzOiB7XG4gICAgcGxhY2Vob2xkZXI6IHtcbiAgICAgIHR5cGU6IFN0cmluZyxcbiAgICAgIHZhbHVlOiAn6K+36YCJ5oupJyxcbiAgICB9LFxuICAgIHJhbmdlOiB7XG4gICAgICB0eXBlOiBBcnJheSxcbiAgICAgIHZhbHVlOiBbXSxcbiAgICAgIG9ic2VydmVyKG5ld1ZhbCkge1xuICAgICAgICB0aGlzLnNldERhdGEoeyBmaWx0ZXJMaXN0OiBuZXdWYWwgfSk7XG4gICAgICB9LFxuICAgIH0sXG4gICAgcmFuZ2VLZXk6IHtcbiAgICAgIHR5cGU6IFN0cmluZyxcbiAgICAgIHZhbHVlOiAna2V5JyxcbiAgICB9LFxuICAgIHZhbHVlOiB7XG4gICAgICB0eXBlOiBTdHJpbmcsXG4gICAgICB2YWx1ZTogJycsXG4gICAgICBvYnNlcnZlcihuZXdWYWwpIHtcbiAgICAgICAgY29uc29sZS5sb2cobmV3VmFsKTtcbiAgICAgICAgdGhpcy5zZXREYXRhKHsgc2VsZWN0ZWQ6IG5ld1ZhbCB9KTtcbiAgICAgIH0sXG4gICAgfSxcbiAgICBtb2RlOiB7XG4gICAgICB0eXBlOiBTdHJpbmcsXG4gICAgICB2YWx1ZTogJ3NlbGVjdG9yJyxcbiAgICB9LFxuICAgIG1ldGhvZE5hbWU6IHtcbiAgICAgIHR5cGU6IFN0cmluZyxcbiAgICAgIHZhbHVlOiAnJyxcbiAgICB9LFxuICAgIHNob3dUZXh0OiB7XG4gICAgICB0eXBlOiBTdHJpbmcsXG4gICAgICB2YWx1ZTogJycsXG4gICAgICBvYnNlcnZlcih2YWwpIHtcbiAgICAgICAgY29uc29sZS5sb2coJ2luIHNob3dUZXh0JywgdmFsKTtcbiAgICAgIH0sXG4gICAgfSxcbiAgfSxcbiAgZGF0YToge1xuICAgIHNob3dQaWNrZXJWaWV3OiBmYWxzZSxcbiAgICBzZWxlY3RlZDogJycsXG4gICAgc2VsZWN0ZWRJbmRleDogJycsXG4gICAgZmlsdGVyTGlzdDogW10sXG4gIH0sXG4gIG1ldGhvZHM6IHtcbiAgICBpbnB1dENsaWNrSGFuZGxlKCkge1xuICAgICAgaWYgKHRoaXMuZGF0YS5tb2RlID09PSAncGFnZScpIHtcbiAgICAgICAgd3gubmF2aWdhdGVUbyh7XG4gICAgICAgICAgdXJsOiBgL3BhZ2VzL2FyZWFTZWxlY3QvYXJlYVNlbGVjdD9tZXRob2ROYW1lPSR7dGhpcy5kYXRhLm1ldGhvZE5hbWV9JnZhbHVlPSR7dGhpcy5kYXRhLnZhbHVlfWAsXG4gICAgICAgIH0pO1xuICAgICAgfSBlbHNlIHtcbiAgICAgICAgdGhpcy5zZXREYXRhISh7XG4gICAgICAgICAgc2hvd1BpY2tlclZpZXc6ICF0aGlzLmRhdGEuc2hvd1BpY2tlclZpZXcsXG4gICAgICAgIH0pO1xuICAgICAgfVxuICAgIH0sXG4gICAgaW5uZXJDbGlja0hhbmRsZShlKSB7XG4gICAgICByZXR1cm4gZmFsc2U7XG4gICAgfSxcbiAgICBtYXNrQ2xpY2tIYW5kbGUoZSkge1xuICAgICAgdGhpcy5zZXREYXRhKHtcbiAgICAgICAgc2hvd1BpY2tlclZpZXc6IGZhbHNlLFxuICAgICAgfSk7XG4gICAgICByZXR1cm4gZmFsc2U7XG4gICAgfSxcbiAgICBpbnB1dEhhbmRsZShlKSB7XG4gICAgICBjb25zdCB7IHZhbHVlIH0gPSBlLmRldGFpbDtcbiAgICAgIGNvbnNvbGUubG9nKGUsIHZhbHVlKTtcbiAgICAgIGxldCBmaWx0ZXJMaXN0ID0gW107XG4gICAgICBpZiAodmFsdWUpIHtcbiAgICAgICAgZmlsdGVyTGlzdCA9IHRoaXMuZGF0YS5yYW5nZS5maWx0ZXIoaXRlbSA9PlxuICAgICAgICAgIGl0ZW1bdGhpcy5kYXRhLnJhbmdlS2V5XS5pbmNsdWRlcyh2YWx1ZSksXG4gICAgICAgICk7XG4gICAgICB9IGVsc2Uge1xuICAgICAgICBmaWx0ZXJMaXN0ID0gdGhpcy5kYXRhLnJhbmdlO1xuICAgICAgfVxuXG4gICAgICB0aGlzLnNldERhdGEoe1xuICAgICAgICBmaWx0ZXJMaXN0LFxuICAgICAgfSk7XG4gICAgfSxcbiAgICBiaW5kUGlja2VyQ2hhbmdlKCkge1xuICAgICAgbGV0IHZhbHVlID0gdGhpcy5kYXRhLnNlbGVjdGVkO1xuICAgICAgdGhpcy5zZXREYXRhISh7XG4gICAgICAgIHNob3dQaWNrZXJWaWV3OiBmYWxzZSxcbiAgICAgIH0pO1xuICAgICAgdGhpcy50cmlnZ2VyRXZlbnQoJ2NoYW5nZScsIHsgdmFsdWUgfSwge30pO1xuICAgIH0sXG4gICAgc2VsZWN0ZWRIYW5kbGUoZSkge1xuICAgICAgY29uc3QgeyB2YWx1ZSB9ID0gZS5jdXJyZW50VGFyZ2V0LmRhdGFzZXQ7XG4gICAgICBjb25zb2xlLmxvZyhlLCB2YWx1ZSk7XG4gICAgICBpZiAodGhpcy5kYXRhLnNlbGVjdGVkSW5kZXggPT09IHZhbHVlKSB7XG4gICAgICAgIHRoaXMuc2V0RGF0YSh7XG4gICAgICAgICAgc2VsZWN0ZWQ6ICcnLFxuICAgICAgICAgIHNlbGVjdGVkSW5kZXg6ICcnLFxuICAgICAgICB9KTtcbiAgICAgIH0gZWxzZSB7XG4gICAgICAgIHRoaXMuc2V0RGF0YSh7XG4gICAgICAgICAgc2VsZWN0ZWQ6IHRoaXMuZGF0YS5yYW5nZVt2YWx1ZV0uaWQsXG4gICAgICAgICAgc2VsZWN0ZWRJbmRleDogdmFsdWUsXG4gICAgICAgIH0pO1xuICAgICAgfVxuICAgIH0sXG4gIH0sXG59KTtcbiJdfQ==
\ No newline at end of file
miniprogram/pages/components/AreaSelect/AreaSelect.ts
......@@ -20,9 +20,25 @@ Component({
type: String,
value: '',
observer(newVal) {
console.log(newVal);
this.setData({ selected: newVal });
},
},
mode: {
type: String,
value: 'selector',
},
methodName: {
type: String,
value: '',
},
showText: {
type: String,
value: '',
observer(val) {
console.log('in showText', val);
},
},
},
data: {
showPickerView: false,
......@@ -32,9 +48,15 @@ Component({
},
methods: {
inputClickHandle() {
if (this.data.mode === 'page') {
wx.navigateTo({
url: `/pages/areaSelect/areaSelect?methodName=${this.data.methodName}&value=${this.data.value}`,
});
} else {
this.setData!({
showPickerView: !this.data.showPickerView,
});
}
},
innerClickHandle(e) {
return false;
......
miniprogram/pages/components/AreaSelect/AreaSelect.wxml
......@@ -4,7 +4,8 @@
<!-- <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:if="{{mode === 'page' && selected}}" class="select-value">{{showText}}</view>
<view wx:elif="{{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>
......
miniprogram/pages/feedback/feedback.js
......@@ -12,18 +12,20 @@ Page({
list1: [],
list2: [],
areaList: [],
list: [],
pageNum: [null, 0, 0],
},
initData: function () {
this.fetchList(1);
this.fetchList(2);
},
toggleList: function (e) {
var _this = this;
var tabindex = e.currentTarget.dataset.tabindex;
if (tabindex !== this.data.tabIndex) {
this.setData({
tabIndex: tabindex,
this.setData({ tabIndex: tabindex }, function () {
_this.fetchList(tabindex);
});
this.fetchList(tabindex);
}
},
fetchList: function (state) {
......@@ -43,8 +45,15 @@ Page({
.then(function (res) {
wx.hideLoading();
var list = res.data;
var viewList = list.slice(0, 10);
if (state === _this.data.tabIndex) {
_this.setData({
list: viewList,
});
}
_this.setData((_a = {},
_a['list' + state] = list,
_a["pageNum[" + state + "]"] = 0,
_a));
var _a;
})
......@@ -90,5 +99,24 @@ Page({
console.log(err);
});
},
getMoreListItem: function () {
var state = this.data.tabIndex;
var index = this.data.pageNum[state] + 1;
var max = Math.ceil(this.data['list' + state].length / 10);
console.log('in getMoreListItem', index, max);
if (index >= max) {
wx.showToast({
title: '没有更多数据',
icon: 'none',
});
}
else {
this.setData((_a = {},
_a["pageNum[" + state + "]"] = index,
_a.list = this.data.list.concat(this.data['list' + state].slice(index * 10, (index + 1) * 10)),
_a));
}
var _a;
},
});
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmVlZGJhY2suanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJmZWVkYmFjay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLHlDQUE2RDtBQUc3RCxJQUFJLENBQUM7SUFDSCxNQUFNO1FBQ0osSUFBSSxDQUFDLFFBQVEsRUFBRSxDQUFDO1FBQ2hCLElBQUksQ0FBQyxhQUFhLEVBQUUsQ0FBQztJQUN2QixDQUFDO0lBSUQsSUFBSSxFQUFFO1FBQ0osUUFBUSxFQUFFLENBQUM7UUFDWCxNQUFNLEVBQUUsRUFBRTtRQUNWLEtBQUssRUFBRSxFQUFFO1FBQ1QsS0FBSyxFQUFFLEVBQUU7UUFDVCxRQUFRLEVBQUUsRUFBRTtLQUNiO0lBQ0QsUUFBUTtRQUNOLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDbEIsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNwQixDQUFDO0lBQ0QsVUFBVSxZQUFDLENBQUM7UUFDRixJQUFBLDJDQUFRLENBQTZCO1FBQzdDLEVBQUUsQ0FBQyxDQUFDLFFBQVEsS0FBSyxJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUM7WUFDcEMsSUFBSSxDQUFDLE9BQVEsQ0FBQztnQkFDWixRQUFRLEVBQUUsUUFBUTthQUNuQixDQUFDLENBQUM7WUFDSCxJQUFJLENBQUMsU0FBUyxDQUFDLFFBQVEsQ0FBQyxDQUFDO1FBQzNCLENBQUM7SUFDSCxDQUFDO0lBQ0QsU0FBUyxZQUFDLEtBQWM7UUFBeEIsaUJBMEJDO1FBekJDLEVBQUUsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDO1lBQUMsS0FBSyxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDO1FBQ3ZDLEVBQUUsQ0FBQyxXQUFXLENBQUMsRUFBRSxLQUFLLEVBQUUsRUFBRSxFQUFFLENBQUMsQ0FBQztRQUM5Qix1QkFBZSxDQUFDO1lBQ2QsR0FBRyxFQUFFLHNDQUFzQztZQUMzQyxJQUFJLEVBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxNQUFNO2dCQUNwQixDQUFDLENBQUM7b0JBQ0UsS0FBSyxPQUFBO29CQUNMLE1BQU0sRUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU07aUJBQ3pCO2dCQUNILENBQUMsQ0FBQyxFQUFFLEtBQUssT0FBQSxFQUFFO1NBQ2QsQ0FBQzthQUNDLElBQUksQ0FBQyxVQUFBLEdBQUc7WUFDUCxFQUFFLENBQUMsV0FBVyxFQUFFLENBQUM7WUFDakIsSUFBTSxJQUFJLEdBQUcsR0FBRyxDQUFDLElBQUksQ0FBQztZQUN0QixLQUFJLENBQUMsT0FBUTtnQkFDWCxHQUFDLE1BQU0sR0FBRyxLQUFLLElBQUcsSUFBSTtvQkFDdEIsQ0FBQzs7UUFDTCxDQUFDLENBQUM7YUFDRCxLQUFLLENBQUMsVUFBQSxHQUFHO1lBQ1IsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQztZQUNqQixFQUFFLENBQUMsU0FBUyxDQUFDO2dCQUNYLEtBQUssRUFBRSxHQUFHLENBQUMsTUFBTTtnQkFDakIsSUFBSSxFQUFFLE1BQU07YUFDYixDQUFDLENBQUM7UUFDTCxDQUFDLENBQUMsQ0FBQztJQUNQLENBQUM7SUFDRCxnQkFBZ0IsWUFBQyxDQUFDO1FBQWxCLGlCQVdDO1FBVkMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUNQLElBQUEsc0JBQUssQ0FBYztRQUMzQixJQUFJLENBQUMsT0FBUSxDQUNYO1lBQ0UsTUFBTSxFQUFFLEtBQUs7U0FDZCxFQUNEO1lBQ0UsS0FBSSxDQUFDLFFBQVEsRUFBRSxDQUFDO1FBQ2xCLENBQUMsQ0FDRixDQUFDO0lBQ0osQ0FBQztJQUNELGFBQWEsWUFBQyxDQUFDO1FBQ2IsSUFBSSxDQUFDLFNBQVMsRUFBRSxDQUFDO0lBQ25CLENBQUM7SUFDRCxhQUFhO1FBQWIsaUJBa0JDO1FBakJDLGlCQUFTLENBQUM7WUFDUixHQUFHLEVBQUUseUJBQXlCO1NBQy9CLENBQUM7YUFDQyxJQUFJLENBQUMsVUFBQSxHQUFHO1lBQ1AsRUFBRSxDQUFDLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUM7Z0JBQ2IsS0FBSSxDQUFDLE9BQVEsQ0FBQztvQkFDWixRQUFRLEVBQUUsR0FBRyxDQUFDLElBQUk7aUJBQ25CLENBQUMsQ0FBQztZQUNMLENBQUM7WUFBQyxJQUFJLENBQUMsQ0FBQztnQkFDTixLQUFJLENBQUMsT0FBUSxDQUFDO29CQUNaLFFBQVEsRUFBRSxFQUFFO2lCQUNiLENBQUMsQ0FBQztZQUNMLENBQUM7UUFDSCxDQUFDLENBQUM7YUFDRCxLQUFLLENBQUMsVUFBQSxHQUFHO1lBQ1IsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUNuQixDQUFDLENBQUMsQ0FBQztJQUNQLENBQUM7Q0FDRixDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBzdGF0aXN0aWNzRmV0Y2gsIGJhc2VGZXRjaCB9IGZyb20gJy4uLy4uL2FwaS9mZXRjaCc7XG5cbi8vIG1pbmlwcm9ncmFtL3BhZ2VzL2ZlZWRiYWNrL2ZlZWRiYWNrLmpzXG5QYWdlKHtcbiAgb25Mb2FkKCkge1xuICAgIHRoaXMuaW5pdERhdGEoKTtcbiAgICB0aGlzLmZldGNoQXJlYUxpc3QoKTtcbiAgfSxcbiAgLyoqXG4gICAqIOmhtemdoueahOWIneWni+aVsOaNrlxuICAgKi9cbiAgZGF0YToge1xuICAgIHRhYkluZGV4OiAxLFxuICAgIGFyZWFJZDogJycsXG4gICAgbGlzdDE6IFtdLFxuICAgIGxpc3QyOiBbXSxcbiAgICBhcmVhTGlzdDogW10sXG4gIH0sXG4gIGluaXREYXRhKCkge1xuICAgIHRoaXMuZmV0Y2hMaXN0KDEpO1xuICAgIHRoaXMuZmV0Y2hMaXN0KDIpO1xuICB9LFxuICB0b2dnbGVMaXN0KGUpIHtcbiAgICBjb25zdCB7IHRhYmluZGV4IH0gPSBlLmN1cnJlbnRUYXJnZXQuZGF0YXNldDtcbiAgICBpZiAodGFiaW5kZXggIT09IHRoaXMuZGF0YS50YWJJbmRleCkge1xuICAgICAgdGhpcy5zZXREYXRhISh7XG4gICAgICAgIHRhYkluZGV4OiB0YWJpbmRleCxcbiAgICAgIH0pO1xuICAgICAgdGhpcy5mZXRjaExpc3QodGFiaW5kZXgpO1xuICAgIH1cbiAgfSxcbiAgZmV0Y2hMaXN0KHN0YXRlPzogbnVtYmVyKSB7XG4gICAgaWYgKCFzdGF0ZSkgc3RhdGUgPSB0aGlzLmRhdGEudGFiSW5kZXg7XG4gICAgd3guc2hvd0xvYWRpbmcoeyB0aXRsZTogJycgfSk7XG4gICAgc3RhdGlzdGljc0ZldGNoKHtcbiAgICAgIHVybDogJy9kY3h5L3JlcG9ydEluZm8vcXVlcnlGZWVkYmFja0xpc3RWMicsXG4gICAgICBkYXRhOiB0aGlzLmRhdGEuYXJlYUlkXG4gICAgICAgID8ge1xuICAgICAgICAgICAgc3RhdGUsXG4gICAgICAgICAgICBhcmVhSWQ6IHRoaXMuZGF0YS5hcmVhSWQsXG4gICAgICAgICAgfVxuICAgICAgICA6IHsgc3RhdGUgfSxcbiAgICB9KVxuICAgICAgLnRoZW4ocmVzID0+IHtcbiAgICAgICAgd3guaGlkZUxvYWRpbmcoKTtcbiAgICAgICAgY29uc3QgbGlzdCA9IHJlcy5kYXRhO1xuICAgICAgICB0aGlzLnNldERhdGEhKHtcbiAgICAgICAgICBbJ2xpc3QnICsgc3RhdGVdOiBsaXN0LFxuICAgICAgICB9KTtcbiAgICAgIH0pXG4gICAgICAuY2F0Y2goZXJyID0+IHtcbiAgICAgICAgY29uc29sZS5sb2coZXJyKTtcbiAgICAgICAgd3guc2hvd1RvYXN0KHtcbiAgICAgICAgICB0aXRsZTogZXJyLmVyck1zZyxcbiAgICAgICAgICBpY29uOiAnbm9uZScsXG4gICAgICAgIH0pO1xuICAgICAgfSk7XG4gIH0sXG4gIGJpbmRQaWNrZXJDaGFuZ2UoZSkge1xuICAgIGNvbnNvbGUubG9nKGUpO1xuICAgIGNvbnN0IHsgdmFsdWUgfSA9IGUuZGV0YWlsO1xuICAgIHRoaXMuc2V0RGF0YSEoXG4gICAgICB7XG4gICAgICAgIGFyZWFJZDogdmFsdWUsXG4gICAgICB9LFxuICAgICAgKCkgPT4ge1xuICAgICAgICB0aGlzLmluaXREYXRhKCk7XG4gICAgICB9LFxuICAgICk7XG4gIH0sXG4gIHJlZnJlc2hIYW5kbGUoZSkge1xuICAgIHRoaXMuZmV0Y2hMaXN0KCk7XG4gIH0sXG4gIGZldGNoQXJlYUxpc3QoKSB7XG4gICAgYmFzZUZldGNoKHtcbiAgICAgIHVybDogJy9kY3h5L2Jhc2VBcmVhL3F1ZXJ5QWxsJyxcbiAgICB9KVxuICAgICAgLnRoZW4ocmVzID0+IHtcbiAgICAgICAgaWYgKHJlcy5kYXRhKSB7XG4gICAgICAgICAgdGhpcy5zZXREYXRhISh7XG4gICAgICAgICAgICBhcmVhTGlzdDogcmVzLmRhdGEsXG4gICAgICAgICAgfSk7XG4gICAgICAgIH0gZWxzZSB7XG4gICAgICAgICAgdGhpcy5zZXREYXRhISh7XG4gICAgICAgICAgICBhcmVhTGlzdDogW10sXG4gICAgICAgICAgfSk7XG4gICAgICAgIH1cbiAgICAgIH0pXG4gICAgICAuY2F0Y2goZXJyID0+IHtcbiAgICAgICAgY29uc29sZS5sb2coZXJyKTtcbiAgICAgIH0pO1xuICB9LFxufSk7XG4iXX0=
\ No newline at end of file
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmVlZGJhY2suanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJmZWVkYmFjay50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLHlDQUE2RDtBQUc3RCxJQUFJLENBQUM7SUFDSCxNQUFNO1FBQ0osSUFBSSxDQUFDLFFBQVEsRUFBRSxDQUFDO1FBQ2hCLElBQUksQ0FBQyxhQUFhLEVBQUUsQ0FBQztJQUN2QixDQUFDO0lBSUQsSUFBSSxFQUFFO1FBQ0osUUFBUSxFQUFFLENBQUM7UUFDWCxNQUFNLEVBQUUsRUFBRTtRQUNWLEtBQUssRUFBRSxFQUFFO1FBQ1QsS0FBSyxFQUFFLEVBQUU7UUFDVCxRQUFRLEVBQUUsRUFBRTtRQUNaLElBQUksRUFBRSxFQUFFO1FBQ1IsT0FBTyxFQUFFLENBQUMsSUFBSSxFQUFFLENBQUMsRUFBRSxDQUFDLENBQUM7S0FDdEI7SUFDRCxRQUFRO1FBQ04sSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUNsQixJQUFJLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ3BCLENBQUM7SUFDRCxVQUFVLFlBQUMsQ0FBQztRQUFaLGlCQU9DO1FBTlMsSUFBQSwyQ0FBUSxDQUE2QjtRQUM3QyxFQUFFLENBQUMsQ0FBQyxRQUFRLEtBQUssSUFBSSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDO1lBQ3BDLElBQUksQ0FBQyxPQUFRLENBQUMsRUFBRSxRQUFRLEVBQUUsUUFBUSxFQUFFLEVBQUU7Z0JBQ3BDLEtBQUksQ0FBQyxTQUFTLENBQUMsUUFBUSxDQUFDLENBQUM7WUFDM0IsQ0FBQyxDQUFDLENBQUM7UUFDTCxDQUFDO0lBQ0gsQ0FBQztJQUNELFNBQVMsWUFBQyxLQUFjO1FBQXhCLGlCQWlDQztRQWhDQyxFQUFFLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQztZQUFDLEtBQUssR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQztRQUN2QyxFQUFFLENBQUMsV0FB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LEdBQUcsRUFBRSxDQUFDLENBQUM7UUFDM0QsT0FBTyxDQUFDLEdBQUcsQ0FBQyxvQkFBb0IsRUFBRSxLQUFLLEVBQUUsR0FBRyxDQUFDLENBQUM7UUFDOUMsRUFBRSxDQUFDLENBQUMsS0FBSyxJQUFJLEdBQUcsQ0FBQyxDQUFDLENBQUM7WUFDakIsRUFBRSxDQUFDLFNBQVMsQ0FBQztnQkFDWCxLQUFLLEVBQUUsUUFBUTtnQkFDZixJQUFJLEVBQUUsTUFBTTthQUNiLENBQUMsQ0FBQztRQUNMLENBQUM7UUFBQyxJQUFJLENBQUMsQ0FBQztZQUNOLElBQUksQ0FBQyxPQUFPO2dCQUNWLEdBQUMsYUFBVyxLQUFLLE1BQUcsSUFBRyxLQUFLO2dCQUM1QixPQUFJLEdBQ0MsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLFFBQ2QsSUFBSSxDQUFDLElBQUksQ0FBQyxNQUFNLEdBQUcsS0FBSyxDQUFDLENBQUMsS0FBSyxDQUFDLEtBQUssR0FBRyxFQUFFLEVBQUUsQ0FBQyxLQUFLLEdBQUcsQ0FBQyxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQ2pFO29CQUNELENBQUM7UUFDTCxDQUFDOztJQUNILENBQUM7Q0FDRixDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBzdGF0aXN0aWNzRmV0Y2gsIGJhc2VGZXRjaCB9IGZyb20gJy4uLy4uL2FwaS9mZXRjaCc7XG5cbi8vIG1pbmlwcm9ncmFtL3BhZ2VzL2ZlZWRiYWNrL2ZlZWRiYWNrLmpzXG5QYWdlKHtcbiAgb25Mb2FkKCkge1xuICAgIHRoaXMuaW5pdERhdGEoKTtcbiAgICB0aGlzLmZldGNoQXJlYUxpc3QoKTtcbiAgfSxcbiAgLyoqXG4gICAqIOmhtemdoueahOWIneWni+aVsOaNrlxuICAgKi9cbiAgZGF0YToge1xuICAgIHRhYkluZGV4OiAxLFxuICAgIGFyZWFJZDogJycsXG4gICAgbGlzdDE6IFtdLFxuICAgIGxpc3QyOiBbXSxcbiAgICBhcmVhTGlzdDogW10sXG4gICAgbGlzdDogW10sXG4gICAgcGFnZU51bTogW251bGwsIDAsIDBdLFxuICB9LFxuICBpbml0RGF0YSgpIHtcbiAgICB0aGlzLmZldGNoTGlzdCgxKTtcbiAgICB0aGlzLmZldGNoTGlzdCgyKTtcbiAgfSxcbiAgdG9nZ2xlTGlzdChlKSB7XG4gICAgY29uc3QgeyB0YWJpbmRleCB9ID0gZS5jdXJyZW50VGFyZ2V0LmRhdGFzZXQ7XG4gICAgaWYgKHRhYmluZGV4ICE9PSB0aGlzLmRhdGEudGFiSW5kZXgpIHtcbiAgICAgIHRoaXMuc2V0RGF0YSEoeyB0YWJJbmRleDogdGFiaW5kZXggfSwgKCkgPT4ge1xuICAgICAgICB0aGlzLmZldGNoTGlzdCh0YWJpbmRleCk7XG4gICAgICB9KTtcbiAgICB9XG4gIH0sXG4gIGZldGNoTGlzdChzdGF0ZT86IG51bWJlcikge1xuICAgIGlmICghc3RhdGUpIHN0YXRlID0gdGhpcy5kYXRhLnRhYkluZGV4O1xuICAgIHd4LnNob3dMb2FkaW5nKHsgdGl0bGU6ICcnIH0pO1xuICAgIHN0YXRpc3RpY3NGZXRjaCh7XG4gICAgICB1cmw6ICcvZGN4eS9yZXBvcnRJbmZvL3F1ZXJ5RmVlZGJhY2tMaXN0VjInLFxuICAgICAgZGF0YTogdGhpcy5kYXRhLmFyZWFJZFxuICAgICAgICA/IHtcbiAgICAgICAgICAgIHN0YXRlLFxuICAgICAgICAgICAgYXJlYUlkOiB0aGlzLmRhdGEuYXJlYUlkLFxuICAgICAgICAgIH1cbiAgICAgICAgOiB7IHN0YXRlIH0sXG4gICAgfSlcbiAgICAgIC50aGVuKHJlcyA9PiB7XG4gICAgICAgIHd4LmhpZGVMb2FkaW5nKCk7XG4gICAgICAgIGNvbnN0IGxpc3QgPSByZXMuZGF0YTtcbiAgICAgICAgbGV0IHZpZXdMaXN0ID0gbGlzdC5zbGljZSgwLCAxMCk7XG4gICAgICAgIGlmIChzdGF0ZSA9PT0gdGhpcy5kYXRhLnRhYkluZGV4KSB7XG4gICAgICAgICAgdGhpcy5zZXREYXRhISh7XG4gICAgICAgICAgICBsaXN0OiB2aWV3TGlzdCxcbiAgICAgICAgICB9KTtcbiAgICAgICAgfVxuICAgICAgICB0aGlzLnNldERhdGEhKHtcbiAgICAgICAgICBbJ2xpc3QnICsgc3RhdGVdOiBsaXN0LFxuICAgICAgICAgIFtgcGFnZU51bVske3N0YXRlfV1gXTogMCxcbiAgICAgICAgfSk7XG4gICAgICB9KVxuICAgICAgLmNhdGNoKGVyciA9PiB7XG4gICAgICAgIGNvbnNvbGUubG9nKGVycik7XG4gICAgICAgIHd4LnNob3dUb2FzdCh7XG4gICAgICAgICAgdGl0bGU6IGVyci5lcnJNc2csXG4gICAgICAgICAgaWNvbjogJ25vbmUnLFxuICAgICAgICB9KTtcbiAgICAgIH0pO1xuICB9LFxuICBiaW5kUGlja2VyQ2hhbmdlKGUpIHtcbiAgICBjb25zb2xlLmxvZyhlKTtcbiAgICBjb25zdCB7IHZhbHVlIH0gPSBlLmRldGFpbDtcbiAgICB0aGlzLnNldERhdGEhKFxuICAgICAge1xuICAgICAgICBhcmVhSWQ6IHZhbHVlLFxuICAgICAgfSxcbiAgICAgICgpID0+IHtcbiAgICAgICAgdGhpcy5pbml0RGF0YSgpO1xuICAgICAgfSxcbiAgICApO1xuICB9LFxuICByZWZyZXNoSGFuZGxlKGUpIHtcbiAgICB0aGlzLmZldGNoTGlzdCgpO1xuICB9LFxuICBmZXRjaEFyZWFMaXN0KCkge1xuICAgIGJhc2VGZXRjaCh7XG4gICAgICB1cmw6ICcvZGN4eS9iYXNlQXJlYS9xdWVyeUFsbCcsXG4gICAgfSlcbiAgICAgIC50aGVuKHJlcyA9PiB7XG4gICAgICAgIGlmIChyZXMuZGF0YSkge1xuICAgICAgICAgIHRoaXMuc2V0RGF0YSEoe1xuICAgICAgICAgICAgYXJlYUxpc3Q6IHJlcy5kYXRhLFxuICAgICAgICAgIH0pO1xuICAgICAgICB9IGVsc2Uge1xuICAgICAgICAgIHRoaXMuc2V0RGF0YSEoe1xuICAgICAgICAgICAgYXJlYUxpc3Q6IFtdLFxuICAgICAgICAgIH0pO1xuICAgICAgICB9XG4gICAgICB9KVxuICAgICAgLmNhdGNoKGVyciA9PiB7XG4gICAgICAgIGNvbnNvbGUubG9nKGVycik7XG4gICAgICB9KTtcbiAgfSxcbiAgZ2V0TW9yZUxpc3RJdGVtKCkge1xuICAgIGxldCBzdGF0ZSA9IHRoaXMuZGF0YS50YWJJbmRleDtcbiAgICBsZXQgaW5kZXggPSB0aGlzLmRhdGEucGFnZU51bVtzdGF0ZV0gKyAxO1xuICAgIGxldCBtYXggPSBNYXRoLmNlaWwodGhpcy5kYXRhWydsaXN0JyArIHN0YXRlXS5sZW5ndGggLyAxMCk7XG4gICAgY29uc29sZS5sb2coJ2luIGdldE1vcmVMaXN0SXRlbScsIGluZGV4LCBtYXgpO1xuICAgIGlmIChpbmRleCA+PSBtYXgpIHtcbiAgICAgIHd4LnNob3dUb2FzdCh7XG4gICAgICAgIHRpdGxlOiAn5rKh5pyJ5pu05aSa5pWw5o2uJyxcbiAgICAgICAgaWNvbjogJ25vbmUnLFxuICAgICAgfSk7XG4gICAgfSBlbHNlIHtcbiAgICAgIHRoaXMuc2V0RGF0YSh7XG4gICAgICAgIFtgcGFnZU51bVske3N0YXRlfV1gXTogaW5kZXgsXG4gICAgICAgIGxpc3Q6IFtcbiAgICAgICAgICAuLi50aGlzLmRhdGEubGlzdCxcbiAgICAgICAgICAuLi50aGlzLmRhdGFbJ2xpc3QnICsgc3RhdGVdLnNsaWNlKGluZGV4ICogMTAsIChpbmRleCArIDEpICogMTApLFxuICAgICAgICBdLFxuICAgICAgfSk7XG4gICAgfVxuICB9LFxufSk7XG4iXX0=
\ No newline at end of file
miniprogram/pages/feedback/feedback.ts
......@@ -15,6 +15,8 @@ Page({
list1: [],
list2: [],
areaList: [],
list: [],
pageNum: [null, 0, 0],
},
initData() {
this.fetchList(1);
......@@ -23,10 +25,9 @@ Page({
toggleList(e) {
const { tabindex } = e.currentTarget.dataset;
if (tabindex !== this.data.tabIndex) {
this.setData!({
tabIndex: tabindex,
});
this.setData!({ tabIndex: tabindex }, () => {
this.fetchList(tabindex);
});
}
},
fetchList(state?: number) {
......@@ -44,8 +45,15 @@ Page({
.then(res => {
wx.hideLoading();
const list = res.data;
let viewList = list.slice(0, 10);
if (state === this.data.tabIndex) {
this.setData!({
list: viewList,
});
}
this.setData!({
['list' + state]: list,
[`pageNum[${state}]`]: 0,
});
})
.catch(err => {
......@@ -90,4 +98,24 @@ Page({
console.log(err);
});
},
getMoreListItem() {
let state = this.data.tabIndex;
let index = this.data.pageNum[state] + 1;
let max = Math.ceil(this.data['list' + state].length / 10);
console.log('in getMoreListItem', index, max);
if (index >= max) {
wx.showToast({
title: '没有更多数据',
icon: 'none',
});
} else {
this.setData({
[`pageNum[${state}]`]: index,
list: [
...this.data.list,
...this.data['list' + state].slice(index * 10, (index + 1) * 10),
],
});
}
},
});
miniprogram/pages/feedback/feedback.wxml
......@@ -13,10 +13,10 @@
<text class="feedback-tabCount">{{list2.length}}</text>
</view>
</view>
<view wx:if="{{tabIndex===1}}" class="feedback-list">
<feedback-item wx:for="{{list1}}" wx:key="{{item.id}}" feedback-data="{{item}}" bind:refresh="refreshHandle" />
</view>
<view wx:elif="{{tabIndex===2}}" class="feedback-list">
<feedback-item wx:for="{{list2}}" wx:key="{{item.id}}" feedback-data="{{item}}" bind:refresh="refreshHandle" />
</view>
<scroll-view wx:if="{{tabIndex===1}}" class="feedback-list" scroll-y bindscrolltolower="getMoreListItem">
<feedback-item wx:for="{{list}}" wx:key="{{item.id}}" feedback-data="{{item}}" bind:refresh="refreshHandle" />
</scroll-view>
<scroll-view wx:elif="{{tabIndex===2}}" class="feedback-list" scroll-y bindscrolltolower="getMoreListItem">
<feedback-item wx:for="{{list}}" wx:key="{{item.id}}" feedback-data="{{item}}" bind:refresh="refreshHandle" />
</scroll-view>
</view>
\ No newline at end of file
miniprogram/pages/monthOperator/monthOperator.js
......@@ -13,12 +13,11 @@ var util_1 = require("../../utils/util");
Page({
onLoad: function () {
this.initData();
this.fetchAreaList();
},
data: {
areaList: [],
month: '',
areaId: 0,
areaId: '',
areaName: '',
rechargeData: {
title: '充值总额',
numberType: 'price',
......@@ -52,36 +51,16 @@ Page({
_this.fetchList();
});
},
fetchAreaList: function () {
var _this = this;
fetch_1.baseFetch({
url: '/dcxy/baseArea/queryAll',
})
.then(function (res) {
if (res.data) {
_this.setData({
areaList: res.data,
});
}
else {
_this.setData({
areaList: [],
});
}
})
.catch(function (err) {
console.log(err);
});
},
areaChangeHandle: function (val) {
var _this = this;
console.log('areaChangeHandle', val);
var value = val.detail.value;
var id = val.id, name = val.name;
this.setData({
areaId: value,
areaId: id,
areaName: name,
}, function () {
if (value) {
_this.fetchList({ areaId: [value] });
if (id) {
_this.fetchList({ areaId: [id] });
}
else {
_this.fetchList();
......@@ -189,7 +168,7 @@ Page({
var _this = this;
var reqBody = __assign({ month: this.data.month }, entity);
fetch_1.statisticsFetch({
url: '/dcxy/reportInfo/serviceConsume',
url: '/dcxy/reportInfo/queryConsumeOrderList',
method: 'POST',
data: reqBody,
})
......@@ -236,4 +215,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.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
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"monthOperator.js","sourceRoot":"","sources":["monthOperator.ts"],"names":[],"mappings":"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","sourcesContent":["import { statisticsFetch } from '../../api/fetch';\nimport { formatTime } from '../../utils/util';\n\nPage({\n  onLoad() {\n    this.initData();\n  },\n  data: {\n    month: '',\n    areaId: '',\n    areaName: '',\n    rechargeData: {\n      title: '充值总额',\n      numberType: 'price',\n      count: 0,\n    },\n    rechargeCount: {\n      title: '充值笔数',\n      numberType: '',\n      count: 0,\n    },\n    rechargeAndRefundList: [],\n    consumeData: {\n      title: '消费总额',\n      numberType: 'price',\n      count: 0,\n    },\n    consumeCount: {\n      title: '消费笔数',\n      numberType: '',\n      count: 0,\n    },\n    consumeList: [],\n    serviceTypeList: [],\n    payTypeList: [],\n  },\n  initData() {\n    let time = formatTime(new Date());\n    console.log(time);\n    this.setData!({ month: time.slice(0, 7) }, () => {\n      this.fetchList();\n    });\n  },\n  areaChangeHandle(val) {\n    console.log('areaChangeHandle', val);\n    const { id, name } = val;\n    this.setData!(\n      {\n        areaId: id,\n        areaName: name,\n      },\n      () => {\n        if (id) {\n          this.fetchList({ areaId: [id] });\n        } else {\n          this.fetchList();\n        }\n      },\n    );\n  },\n  monthChangeHandle(val) {\n    console.log('monthChangeHandle', val);\n    const { value } = val.detail;\n    this.fetchList({ month: value });\n    this.setData!({\n      month: value,\n    });\n  },\n  fetchList(entity?: { areaId?: number; month?: string }) {\n    if (this.data.areaId) {\n      if (entity && entity.areaId) {\n      } else entity = { ...entity, areaId: [this.data.areaId] };\n    }\n    console.log(this.data.areaId, entity);\n    this.fetchRechargeData(entity);\n    this.fetchConsumeData(entity);\n    this.fetchServiceTypeList(entity);\n    this.fetchPayTypeList(entity);\n  },\n  fetchConsumeData(entity?: { areaId?: number; month?: string }) {\n    let reqBody = {\n      month: this.data.month,\n      ...entity,\n    };\n    statisticsFetch({\n      url: '/dcxy/reportInfo/dailyConsumeCount',\n      method: 'POST',\n      data: reqBody,\n    })\n      .then(res => {\n        let dayList = new Array(31)\n          .fill({\n            payMen: 0,\n            payableMoney: 0,\n          })\n          .map((v, idx) => ({ ...v, days: idx + 1 }));\n\n        let consumePrice = 0;\n        let consumeCount = 0;\n        if (res.data && res.data.length) {\n          let oList = res.data;\n          for (let index = 0; index < oList.length; index++) {\n            const element = oList[index];\n            consumePrice += element.payableMoney;\n            consumeCount += element.payMen;\n            let daysIndex = 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/queryConsumeOrderList',\n      method: 'POST',\n      data: reqBody,\n    })\n      .then(res => {\n        console.log(res);\n        this.setData!({\n          serviceTypeList: res.data,\n        });\n      })\n      .catch(err => {\n        console.log(err);\n      });\n  },\n  fetchPayTypeList(entity) {\n    let reqBody = {\n      month: this.data.month,\n      ...entity,\n    };\n    statisticsFetch({\n      url: '/dcxy/reportInfo/payTypeConsume',\n      method: 'POST',\n      data: reqBody,\n    })\n      .then(res => {\n        console.log(res);\n        if (res.data) {\n          const keyMap = {\n            aimi: '艾米豆',\n            bean: '消费豆',\n            discount: '优惠金额',\n            online: '线上支付',\n          };\n          let dataList = Object.keys(res.data).map(key => ({\n            key,\n            a: '1',\n            name: keyMap[key],\n            count: res.data[key],\n          }));\n          this.setData!({\n            payTypeList: dataList,\n          });\n        }\n      })\n      .catch(err => {\n        console.log(err);\n      });\n  },\n});\n"]}
\ No newline at end of file
miniprogram/pages/monthOperator/monthOperator.ts
import { baseFetch, statisticsFetch } from '../../api/fetch';
import { statisticsFetch } from '../../api/fetch';
import { formatTime } from '../../utils/util';
Page({
onLoad() {
this.initData();
this.fetchAreaList();
},
data: {
areaList: [],
month: '',
areaId: 0,
areaId: '',
areaName: '',
rechargeData: {
title: '充值总额',
numberType: 'price',
......@@ -42,35 +41,17 @@ Page({
this.fetchList();
});
},
fetchAreaList() {
baseFetch({
url: '/dcxy/baseArea/queryAll',
})
.then(res => {
if (res.data) {
this.setData!({
areaList: res.data,
});
} else {
this.setData!({
areaList: [],
});
}
})
.catch(err => {
console.log(err);
});
},
areaChangeHandle(val) {
console.log('areaChangeHandle', val);
const { value } = val.detail;
const { id, name } = val;
this.setData!(
{
areaId: value,
areaId: id,
areaName: name,
},
() => {
if (value) {
this.fetchList({ areaId: [value] });
if (id) {
this.fetchList({ areaId: [id] });
} else {
this.fetchList();
}
......@@ -193,7 +174,7 @@ Page({
...entity,
};
statisticsFetch({
url: '/dcxy/reportInfo/serviceConsume',
url: '/dcxy/reportInfo/queryConsumeOrderList',
method: 'POST',
data: reqBody,
})
......
miniprogram/pages/monthOperator/monthOperator.wxml
......@@ -2,7 +2,7 @@
<view class="monthOperator">
<view class="monthOperator-filter">
<view class="monthOperator-area">
<area-select range="{{areaList}}" range-key="{{'areaName'}}" bindchange="areaChangeHandle" placeholder="所属区域选择" />
<area-select mode="page" bindchange="areaChangeHandle" methodName="areaChangeHandle" value="{{areaId}}" showText="{{areaName}}" placeholder="所属区域选择" />
</view>
<view class="monthOperator-time">
<c-select mode="date" fields="month" value="{{month}}" bindchange="monthChangeHandle" />
......
miniprogram/pages/userGrowth/userGrowth.js
......@@ -17,7 +17,8 @@ Page({
},
data: {
month: '',
areaId: 0,
areaId: '',
areaName: '',
areaList: [],
growthList: [],
customerCount: 0,
......@@ -101,12 +102,13 @@ Page({
areaChangeHandle: function (val) {
var _this = this;
console.log('areaChangeHandle', val);
var value = val.detail.value;
var id = val.id, name = val.name;
this.setData({
areaId: value,
areaId: id,
areaName: name,
}, function () {
if (value) {
_this.fetchList({ areaId: value });
if (id) {
_this.fetchList({ areaId: id });
}
else {
_this.fetchList();
......@@ -122,4 +124,4 @@ Page({
});
},
});
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"userGrowth.js","sourceRoot":"","sources":["userGrowth.ts"],"names":[],"mappings":"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","sourcesContent":["import { baseFetch, statisticsFetch } from '../../api/fetch';\nimport { formatTime } from '../../utils/util';\n\n// miniprogram/pages/userGrowth/userGrowth.js\nPage({\n  onLoad() {\n    this.initData();\n    this.fetchAreaList();\n  },\n  /**\n   * 页面的初始数据\n   */\n  data: {\n    month: '',\n    areaId: 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
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"userGrowth.js","sourceRoot":"","sources":["userGrowth.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,yCAA6D;AAC7D,yCAA8C;AAG9C,IAAI,CAAC;IACH,MAAM;QACJ,IAAI,CAAC,QAAQ,EAAE,CAAC;QAChB,IAAI,CAAC,aAAa,EAAE,CAAC;IACvB,CAAC;IAID,IAAI,EAAE;QACJ,KAAK,EAAE,EAAE;QACT,MAAM,EAAE,EAAE;QACV,QAAQ,EAAE,EAAE;QACZ,QAAQ,EAAE,EAAE;QACZ,UAAU,EAAE,EAAE;QACd,aAAa,EAAE,CAAC;QAChB,WAAW,EAAE,CAAC;KACf;IACD,QAAQ;QAAR,iBAMC;QALC,IAAI,IAAI,GAAG,iBAAU,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;QAClC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAClB,IAAI,CAAC,OAAQ,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;YACzC,KAAI,CAAC,SAAS,EAAE,CAAC;QACnB,CAAC,CAAC,CAAC;IACL,CAAC;IACD,aAAa;QAAb,iBAkBC;QAjBC,iBAAS,CAAC;YACR,GAAG,EAAE,yBAAyB;SAC/B,CAAC;aACC,IAAI,CAAC,UAAA,GAAG;YACP,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;gBACb,KAAI,CAAC,OAAQ,CAAC;oBACZ,QAAQ,EAAE,GAAG,CAAC,IAAI;iBACnB,CAAC,CAAC;YACL,CAAC;YAAC,IAAI,CAAC,CAAC;gBACN,KAAI,CAAC,OAAQ,CAAC;oBACZ,QAAQ,EAAE,EAAE;iBACb,CAAC,CAAC;YACL,CAAC;QACH,CAAC,CAAC;aACD,KAAK,CAAC,UAAA,GAAG;YACR,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACnB,CAAC,CAAC,CAAC;IACP,CAAC;IACD,SAAS,YAAC,MAAkD;QAC1D,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;YACrB,EAAE,CAAC,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;YAC9B,CAAC;YAAC,IAAI;gBAAC,MAAM,gBAAQ,MAAM,IAAE,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,GAAE,CAAC;QAC1D,CAAC;QACD,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAC7B,CAAC;IACD,aAAa,YAAC,MAAM;QAApB,iBA4CC;QA3CC,IAAI,WAAW,GACb,MAAM,IAAI,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;QAChE,IAAA,2BAAsC,EAArC,YAAI,EAAE,aAAK,CAA2B;QAC7C,IAAI,OAAO,cACT,IAAI,MAAA;YACJ,KAAK,OAAA,EACL,OAAO,EAAE,CAAC,IACP,MAAM,CACV,CAAC;QACF,uBAAe,CAAC;YACd,GAAG,EAAE,kCAAkC;YACvC,IAAI,EAAE,OAAO;SACd,CAAC;aACC,IAAI,CAAC,UAAA,GAAG;YACP,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACX,IAAA,aAAiD,EAA/C,gCAAa,EAAE,kBAAM,EAAE,4BAAW,CAAc;YACxD,IAAI,OAAO,GAAG,IAAI,KAAK,CAAC,EAAE,CAAC;iBACxB,IAAI,CAAC;gBACJ,KAAK,EAAE,CAAC;aACT,CAAC;iBACD,GAAG,CAAC,UAAC,CAAC,EAAE,GAAG,IAAK,OAAA,cAAM,CAAC,IAAE,IAAI,EAAE,GAAG,GAAG,CAAC,IAAG,EAAzB,CAAyB,CAAC,CAAC;YAE9C,EAAE,CAAC,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;gBAC5B,IAAI,KAAK,GAAG,MAAM,CAAC;gBACnB,GAAG,CAAC,CAAC,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC;oBAClD,IAAM,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;oBAC7B,IAAI,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;oBACvC,OAAO,CAAC,SAAS,CAAC,gBACb,OAAO,CAAC,SAAS,CAAC,IACrB,KAAK,EAAE,OAAO,CAAC,KAAK,GACrB,CAAC;gBACJ,CAAC;YACH,CAAC;YACD,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;YACjC,KAAI,CAAC,OAAQ,CAAC;gBACZ,UAAU,EAAE,OAAO;gBACnB,aAAa,EAAE,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;gBAChD,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;aAC3C,CAAC,CAAC;QACL,CAAC,CAAC;aACD,KAAK,CAAC,UAAA,GAAG;YACR,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACnB,CAAC,CAAC,CAAC;IACP,CAAC;IACD,gBAAgB,YAAC,GAAG;QAApB,iBAgBC;QAfC,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE,GAAG,CAAC,CAAC;QAC7B,IAAA,WAAE,EAAE,eAAI,CAAS;QACzB,IAAI,CAAC,OAAQ,CACX;YACE,MAAM,EAAE,EAAE;YACV,QAAQ,EAAE,IAAI;SACf,EACD;YACE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBACP,KAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;YACjC,CAAC;YAAC,IAAI,CAAC,CAAC;gBACN,KAAI,CAAC,SAAS,EAAE,CAAC;YACnB,CAAC;QACH,CAAC,CACF,CAAC;IACJ,CAAC;IACD,iBAAiB,YAAC,GAAG;QACnB,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC;QAC9B,IAAA,wBAAK,CAAgB;QAC7B,IAAI,CAAC,SAAS,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC;QACvC,IAAI,CAAC,OAAQ,CAAC;YACZ,KAAK,EAAE,KAAK;SACb,CAAC,CAAC;IACL,CAAC;CACF,CAAC,CAAC","sourcesContent":["import { baseFetch, statisticsFetch } from '../../api/fetch';\nimport { formatTime } from '../../utils/util';\n\n// miniprogram/pages/userGrowth/userGrowth.js\nPage({\n  onLoad() {\n    this.initData();\n    this.fetchAreaList();\n  },\n  /**\n   * 页面的初始数据\n   */\n  data: {\n    month: '',\n    areaId: '',\n    areaName: '',\n    areaList: [],\n    growthList: [],\n    customerCount: 0,\n    activeCount: 0,\n  },\n  initData() {\n    let time = formatTime(new Date());\n    console.log(time);\n    this.setData!({ month: time.slice(0, 7) }, () => {\n      this.fetchList();\n    });\n  },\n  fetchAreaList() {\n    baseFetch({\n      url: '/dcxy/baseArea/queryAll',\n    })\n      .then(res => {\n        if (res.data) {\n          this.setData!({\n            areaList: res.data,\n          });\n        } else {\n          this.setData!({\n            areaList: [],\n          });\n        }\n      })\n      .catch(err => {\n        console.log(err);\n      });\n  },\n  fetchList(entity?: { areaId?: number; monthString?: string }) {\n    if (this.data.areaId) {\n      if (entity && entity.areaId) {\n      } else entity = { ...entity, areaId: this.data.areaId };\n    }\n    this.fetchUserData(entity);\n  },\n  fetchUserData(entity) {\n    let monthString =\n      entity && entity.monthString ? entity.monthString : this.data.month;\n    const [year, month] = monthString.split('-');\n    let reqBody = {\n      year,\n      month,\n      isAdmin: 1,\n      ...entity,\n    };\n    statisticsFetch({\n      url: '/dcxy/reportInfo/queryReportList',\n      data: reqBody,\n    })\n      .then(res => {\n        console.log(res);\n        const { customerCount, dayVos, activeCount } = res.data;\n        let dayList = new Array(31)\n          .fill({\n            count: 0,\n          })\n          .map((v, idx) => ({ ...v, days: idx + 1 }));\n\n        if (dayVos && dayVos.length) {\n          let oList = dayVos;\n          for (let index = 0; index < oList.length; index++) {\n            const element = oList[index];\n            let daysIndex = element.days.slice(-2);\n            dayList[daysIndex] = {\n              ...dayList[daysIndex],\n              count: element.count,\n            };\n          }\n        }\n        console.log('dayList:', dayList);\n        this.setData!({\n          growthList: dayList,\n          customerCount: customerCount ? customerCount : 0,\n          activeCount: activeCount ? activeCount : 0,\n        });\n      })\n      .catch(err => {\n        console.log(err);\n      });\n  },\n  areaChangeHandle(val) {\n    console.log('areaChangeHandle', val);\n    const { id, name } = val;\n    this.setData!(\n      {\n        areaId: id,\n        areaName: name,\n      },\n      () => {\n        if (id) {\n          this.fetchList({ areaId: id });\n        } else {\n          this.fetchList();\n        }\n      },\n    );\n  },\n  monthChangeHandle(val) {\n    console.log('monthChangeHandle', val);\n    const { value } = val.detail;\n    this.fetchList({ monthString: value });\n    this.setData!({\n      month: value,\n    });\n  },\n});\n"]}
\ No newline at end of file
miniprogram/pages/userGrowth/userGrowth.ts
......@@ -12,7 +12,8 @@ Page({
*/
data: {
month: '',
areaId: 0,
areaId: '',
areaName: '',
areaList: [],
growthList: [],
customerCount: 0,
......@@ -98,14 +99,15 @@ Page({
},
areaChangeHandle(val) {
console.log('areaChangeHandle', val);
const { value } = val.detail;
const { id, name } = val;
this.setData!(
{
areaId: value,
areaId: id,
areaName: name,
},
() => {
if (value) {
this.fetchList({ areaId: value });
if (id) {
this.fetchList({ areaId: id });
} else {
this.fetchList();
}
......
miniprogram/pages/userGrowth/userGrowth.wxml
......@@ -16,7 +16,7 @@
</view>
<view class="userGrowth-filter">
<view class="userGrowth-area">
<area-select range="{{areaList}}" range-key="{{'areaName'}}" bindchange="areaChangeHandle" placeholder="所属区域选择" />
<area-select mode="page" bindchange="areaChangeHandle" methodName="areaChangeHandle" value="{{areaId}}" showText="{{areaName}}" placeholder="所属区域选择" />
</view>
<view class="userGrowth-time">
<c-select mode="date" fields="month" value="{{month}}" bindchange="monthChangeHandle" />
......
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