diff --git a/pages/plugins/distribution/map/map.css b/pages/plugins/distribution/map/map.css
index 0a9e7919..0c92be66 100644
--- a/pages/plugins/distribution/map/map.css
+++ b/pages/plugins/distribution/map/map.css
@@ -31,4 +31,8 @@
}
.user-container .item .base-top-icon .dis-inline-block:not(:last-child) {
margin-right: 30rpx;
+}
+.user-container .item .order-submit {
+ padding: 0rpx 20rpx !important;
+ line-height: 40rpx !important;
}
\ No newline at end of file
diff --git a/pages/plugins/distribution/map/map.vue b/pages/plugins/distribution/map/map.vue
index e74ae41e..45a9e950 100644
--- a/pages/plugins/distribution/map/map.vue
+++ b/pages/plugins/distribution/map/map.vue
@@ -49,6 +49,7 @@
下单总数
{{item.order_count}}
+
@@ -98,11 +99,9 @@
onLoad(params) {
this.setData({
params: params
- });
- },
-
- onShow() {
- // 获取数据
+ });
+
+ // 获取数据
this.init();
},
@@ -296,6 +295,14 @@
user: temp_user,
map_center_icon_status: 0
});
+ },
+
+ // 用户订单事件
+ user_order_event(e) {
+ var value = e.currentTarget.dataset.value;
+ uni.navigateTo({
+ url: '/pages/plugins/distribution/order/order?uid='+value
+ });
}
}
};
diff --git a/pages/plugins/distribution/team/team.css b/pages/plugins/distribution/team/team.css
index e48f559b..8c146b34 100644
--- a/pages/plugins/distribution/team/team.css
+++ b/pages/plugins/distribution/team/team.css
@@ -1,21 +1,25 @@
/**
* 搜索导航
*/
-.nav-search .item {
- /* width: calc(50% - 80rpx); */
+.nav-search .multiple-picker {
+ width: calc(100% - 240rpx);
}
-.form-container .multiple-picker {
- width: calc(100% - 150rpx);
+.nav-search .multiple-picker .item {
+ width: calc(50% - 24rpx);
}
-.form-container .multiple-picker .item {
- width: calc(50% - 40rpx);
+.nav-search .search-submit-list {
+ right: 20rpx;
+ bottom: 15rpx;
+}
+.nav-search .search-submit-list button {
+ line-height: 42rpx !important;
}
/*
* 列表
*/
.scroll-box {
- height: calc(100vh - 234rpx);
+ height: calc(100vh - 228rpx);
}
.data-list .item .base .avatar {
width: 40rpx;
diff --git a/pages/plugins/distribution/team/team.vue b/pages/plugins/distribution/team/team.vue
index b3ec0a93..c7b77ecb 100644
--- a/pages/plugins/distribution/team/team.vue
+++ b/pages/plugins/distribution/team/team.vue
@@ -1,37 +1,67 @@
-
+
+
- 下单时间：
-
+ 注册时间：
+
-
- {{nav_search_value.team_search_time_start || '开始时间'}}
+
+ {{nav_search_value.team_search_user_time_start || '开始时间'}}
-
-
- {{nav_search_value.team_search_time_end || '结束时间'}}
+
+ {{nav_search_value.team_search_user_time_end || '结束时间'}}
+
+
+
+
+
+ 下单时间：
+
+
+
+ {{nav_search_value.team_search_order_time_start || '开始时间'}}
+
+
+ -
+
+
+ {{nav_search_value.team_search_order_time_end || '结束时间'}}
+
+
+
+
+
+
是否下单：
-
-
-
+
+
+
-
+
+
+
@@ -44,7 +74,7 @@
{{fv.name}}
- {{item[fv.field] || 0}}
+ {{item[fv.field] || fv.default}}
{{fv.unit}}
@@ -81,11 +111,14 @@
data_is_loading: 0,
params: null,
content_list: [
- {name: "消费订单", field: "order_count", unit: "条"},
- {name: "消费金额", field: "order_total", unit: "元"},
- {name: "下级订单", field: "find_order_count", unit: "条"},
- {name: "下级消费", field: "find_order_total", unit: "元"},
- {name: "下级用户", field: "referrer_count", unit: "个"}
+ {name: "消费订单", field: "order_count", unit: "条", default: 0},
+ {name: "消费金额", field: "order_total", unit: "元", default: 0},
+ {name: "最后消费时间", field: "order_last_time", default: ''},
+ {name: "下级订单", field: "find_order_count", unit: "条", default: 0},
+ {name: "下级消费", field: "find_order_total", unit: "元", default: 0},
+ {name: "下级最后消费时间", field: "find_order_last_time", default: ''},
+ {name: "下级用户", field: "referrer_count", unit: "个", default: 0}
+
],
nav_search_buy_type_list: [
{value: -1, name: '全部'},
@@ -93,8 +126,12 @@
{value: 1, name: '已下单'}
],
nav_search_value: {
- team_search_time_start: '',
- team_search_time_end: '',
+ team_search_user_time_start: '',
+ team_search_user_time_end: '',
+ team_search_user_time_reverse: [],
+ team_search_order_time_start: '',
+ team_search_order_time_end: '',
+ team_search_order_time_reverse: [],
team_search_buy_type: [],
}
};
@@ -166,23 +203,39 @@
data_is_loading: 1,
data_list_loding_status: 1
});
-
+
// 加载loding
uni.showLoading({
title: '加载中...'
});
-
+
// 请求参数
var data = {
page: this.data_page,
};
-
- // 搜索下单时间
- if((this.nav_search_value.team_search_time_start || null) != null) {
- data['team_search_time_start'] = this.nav_search_value.team_search_time_start;
+
+ // 搜索注册时间
+ if((this.nav_search_value.team_search_user_time_start || null) != null) {
+ data['team_search_user_time_start'] = this.nav_search_value.team_search_user_time_start;
}
- if((this.nav_search_value.team_search_time_end || null) != null) {
- data['team_search_time_end'] = this.nav_search_value.team_search_time_end;
+ if((this.nav_search_value.team_search_user_time_end || null) != null) {
+ data['team_search_user_time_end'] = this.nav_search_value.team_search_user_time_end;
+ }
+ // 用户反向
+ if(this.nav_search_value.team_search_user_time_reverse.length > 0) {
+ data['team_search_user_time_reverse'] = 1;
+ }
+
+ // 搜索下单时间
+ if((this.nav_search_value.team_search_order_time_start || null) != null) {
+ data['team_search_order_time_start'] = this.nav_search_value.team_search_order_time_start;
+ }
+ if((this.nav_search_value.team_search_order_time_end || null) != null) {
+ data['team_search_order_time_end'] = this.nav_search_value.team_search_order_time_end;
+ }
+ // 订单反向
+ if(this.nav_search_value.team_search_order_time_reverse.length > 0) {
+ data['team_search_order_time_reverse'] = 1;
}
// 搜索是否下单
@@ -277,7 +330,7 @@
var value = e.currentTarget.dataset.value;
uni.navigateTo({
url: '/pages/plugins/distribution/order/order?uid='+value
- })
+ });
},
// 搜索条件事件
@@ -290,6 +343,20 @@
});
},
+ // 搜索重置事件
+ search_reset_event(e) {
+ var temp_data = this.nav_search_value;
+ var arr_field = ['team_search_buy_type', 'team_search_order_time_reverse', 'team_search_user_time_reverse'];
+ for(var i in temp_data) {
+ temp_data[i] = (arr_field.indexOf(i) == -1) ? '' : [];
+ }
+ this.setData({
+ nav_search_value: temp_data,
+ data_page: 1
+ });
+ this.get_data_list(1);
+ },
+
// 搜索确认事件
search_submit_event(e) {
this.setData({