From 70b92c6e98d2bc43a25a7b6e8c1701c5eb1cba58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=90=BD=E6=97=A5=E6=99=9A=E9=A3=8E?= <1811466536@qq.com>
Date: Wed, 3 Jan 2024 14:40:49 +0800
Subject: [PATCH] /pages/commission/team
---
App.vue | 2 +-
pages/commission/team.vue | 60 +++++++++++++++++++++++++-------------
sheep/request/index.js | 11 +++----
static/images/search.png | Bin 0 -> 5071 bytes
static/images/sort1.png | Bin 0 -> 1137 bytes
static/images/sort2.png | Bin 0 -> 1117 bytes
static/images/sort3.png | Bin 0 -> 1139 bytes
7 files changed, 46 insertions(+), 27 deletions(-)
create mode 100644 static/images/search.png
create mode 100644 static/images/sort1.png
create mode 100644 static/images/sort2.png
create mode 100644 static/images/sort3.png
diff --git a/App.vue b/App.vue
index 9f8b1f5c..485b5cbb 100644
--- a/App.vue
+++ b/App.vue
@@ -19,7 +19,7 @@
// 获取urlSchemes参数
const args = plus.runtime.arguments;
if (args) {
- }
+ }
// 获取剪贴板
uni.getClipboardData({
diff --git a/pages/commission/team.vue b/pages/commission/team.vue
index 1af9a52b..92a02f0e 100644
--- a/pages/commission/team.vue
+++ b/pages/commission/team.vue
@@ -15,21 +15,20 @@
-
+
一级({{state.getSummary.firstBrokerageUserCount || 0 }})
-
+
二级({{state.getSummary.secondBrokerageUserCount || 0 }})
-
-
-
-
-
-
+
+
+
+
@@ -67,29 +66,28 @@
-
+
+ 暂无推广人数
+
@@ -199,6 +197,7 @@
state.scrollTop = true;
}
});
+ let sort=ref();
const state = reactive({
getSummary: {},
pagination: {
@@ -210,7 +209,9 @@
loadStatus: '',
// ↓新ui逻辑
level: 1,
- nickname: ref('')
+ nickname: ref(''),
+ sortKey:'',
+ isAsc:''
});
@@ -221,6 +222,10 @@
return `下级团队${num}人`;
}
+ function submitForm() {
+ state.pagination.data = []
+ getTeamList();
+ }
async function getTeamList(page = 1, list_rows = 8) {
state.loadStatus = 'loading';
// nickname: this.nickname,
@@ -229,10 +234,10 @@
let res = await sheep.$api.commission.team({
pageSize: list_rows,
pageNo: page,
- level: '1',
+ level: state.level,
'sortingField.order': 'desc',
'sortingField.field': 'userCount',
- nickname: ''
+ nickname: state.nickname
});
console.log(res, '分销团队列表');
if (res.code === 0) {
@@ -249,6 +254,19 @@
}
}
+ function setType(e) {
+ state.pagination.data = []
+ state.level = e + '';
+ getTeamList( )
+ }
+
+ function setSort(sortKey, isAsc) {
+ state.pagination.data = []
+ sort = sortKey + isAsc.toUpperCase();
+ state.isAsc=isAsc;
+ state.sortKey=sortKey;
+ getTeamList();
+ }
onLoad(async () => {
getTeamList();
let res = await sheep.$api.commission.getSummary();
diff --git a/sheep/request/index.js b/sheep/request/index.js
index fce7546d..ec964987 100644
--- a/sheep/request/index.js
+++ b/sheep/request/index.js
@@ -94,7 +94,8 @@ http.interceptors.request.use(
if (config.url.indexOf('/app-api/') !== -1) {
config.header['Accept'] = '*/*'
config.header['tenant-id'] = '1';
- config.header['terminal'] = '20';
+ config.header['terminal'] = '20';
+ config.header['Authorization'] = 'Bearer test247';
}
return config;
},
@@ -108,10 +109,10 @@ http.interceptors.request.use(
*/
http.interceptors.response.use(
(response) => {
- // 约定:如果是 /auth/ 下的 URL 地址,并且返回了 accessToken 说明是登录相关的接口,则自动设置登陆令牌
- if (response.config.url.indexOf('/member/auth/') >= 0 && response.data?.data?.accessToken) {
- $store('user').setToken(response.data.data.accessToken);
- }
+ // 约定:如果是 /auth/ 下的 URL 地址,并且返回了 accessToken 说明是登录相关的接口,则自动设置登陆令牌
+ if (response.config.url.indexOf('/member/auth/') >= 0 && response.data?.data?.accessToken) {
+ $store('user').setToken(response.data.data.accessToken);
+ }
response.config.custom.showLoading && closeLoading();
if (response.data.error !== 0 && response.data.code !== 0) {
diff --git a/static/images/search.png b/static/images/search.png
new file mode 100644
index 0000000000000000000000000000000000000000..157be9dfafed90abdb72490976cf3e7530a54866
GIT binary patch
literal 5071
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
D;IL2#
literal 0
HcmV?d00001
diff --git a/static/images/sort1.png b/static/images/sort1.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a88241a1408a201652207ca0d7d37fca6b8d119
GIT binary patch
literal 1137
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gjk|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+nAI{vB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxOgGuk#8koDQqR!L
z*u>ION5ROz&_dt9Lf_C>*U-$$#K6kPNC66zfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5
zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7I$DAX(!G{Q6U
zQu51-HNkp(eXTt6ic1pnl2bihY?Xkf=w)W6SQ$CF7?>Iv85p~|85F!Nq_$Tw`bO6!xYpT+4+t$F{v0WgUQ<(MOY0n;2ACY5KJ3F?m^L$A)8s^wH9@$woKAII!z!r3w`a1IeP>Oyf+g2>+@qSdmCB=qROhbbZBn@Q2&UMS
zm4HRPZ`_9a$J04=d{`AUx_b|ZlttpefLH-#W5jgCa+F^7E0VKoW@xYs!NXB{MN~eO
z0SRP75cGw-Di;WXF2Toz`~gAO4S1FdGi;dQ{9Z0323V2jLFJ=KG+Qf(S*f=Yi`=4g
z5o1eam{O_aEBSrM9%48_5Ezzcc-~78UT4h2O4(~VZB-8vbW~fnu#QaNdQ=9{D2~!Z
z=}HQQl}fETHl0eLNXeM8VlkYLWemg3YZ>j}Ec_v3O|+96vmld&4jQ#p(vL!0l}u{)
z`#>&`s1YTkjvCO!NhwMbi%-)vG3HN%;=x3hU+(pDoGipc@jxsg$E1KH$9lWuDmQ65
zSTR*t27Uq2F@Fgbfvp>>NTP)$V1A2qUM6ERaaJ-4a0OfNpB2*XY6uJAfE?t4aX}9ALY(Md;c9E-Ug2`T
zOptqA9bIx+9e!w%iMPpU-~ZJ1FL@U8Nhy{qFAjcNTI#OxdK&qgGcyEs7Jo|{c+tk`W)meWiJ>8yuaBs4+
ze`@+-=F7ns()BlI7n(bEb&TDfF*_i(4Yp$C?Khw7P>G3nw2<*7mo~
zoq0KM?O|=?_5X9pTVQd$clPN5ziIl&hC6*X{%QZ3-F#qo>*akrAD*82Z(ZS4^PgO1
te$E4TTzj)_s@+rE@<(lp{%*um&r*13*WdHA+t0fXJ}IZAJMqJ(z5^)?YI6Vp
literal 0
HcmV?d00001
diff --git a/static/images/sort3.png b/static/images/sort3.png
new file mode 100644
index 0000000000000000000000000000000000000000..c3ce7d42b6fbd494c07b53a0eebaaf75926122a3
GIT binary patch
literal 1139
zcmaJ>TWAzl7@n}LCfNo=qiCu2Fw&5qvvb+aW@pGG+1<%@*JeW4EV!m3&d!|8PLi23
znK|iB^0dT&iUf?M@1cEZA9_KsEm$Z*P*fBV@xd3R(uabW;){Z!o=LKa53U0<=lqBN
z`~KT^=IqGumu;<|wo(+;mdh%6vhEGu=56Hrs4Bl8%RW3<#G|N;tC|a`q=8Bh09tO4JevOUR{=`~)7?1N*L25T;OQl{6F
zDykzOja&%2BXLIOW8I)fjPUVjOcW0Tf#VY_mtgrQ!^foQvdq?{3xZbsc|J8h?874{CpVdwYWF+TQv6
z+Cs}NY57Upz-OVAm)U1cdnnfW@f*WT^e|rP|W{TYG9$h+6$mzVh?k>}2p8$PErFzobsizXd?!aE$-}
literal 0
HcmV?d00001