From b15fb02ecfa53eb4755cde2ca318542790d06c75 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 5 Sep 2023 21:36:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E4=BD=A3=EF=BC=9Acommission-rank=20?=
 =?UTF-8?q?=E8=BF=81=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/member/brokerage.js                 |  21 -----
 api/trade/brokerage.js                  |  31 +++++++
 pages/users/commission_rank/index.vue   | 112 ++++++++++++------------
 pages/users/promoter-order/index.vue    |   2 +-
 pages/users/promoter_rank/index.vue     |  23 ++---
 pages/users/user_spread_code/index.vue  |   5 +-
 pages/users/user_spread_money/index.vue |   2 +-
 pages/users/user_spread_user/index.vue  |   2 +-
 utils/date.js                           |  26 ++++++
 9 files changed, 123 insertions(+), 101 deletions(-)
 delete mode 100644 api/member/brokerage.js
 create mode 100644 api/trade/brokerage.js
 create mode 100644 utils/date.js

diff --git a/api/member/brokerage.js b/api/member/brokerage.js
deleted file mode 100644
index bb056e08..00000000
--- a/api/member/brokerage.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import request from "@/utils/request.js";
-
-// 获得个人分销统计
-export function getBrokerageUserSummary() {
-  return request.get('app-api/member/brokerage-user/get-summary');
-}
-
-// 获得分销用户排行分页
-export function getBrokerageUserRankPage(data) {
-  return request.get('app-api/member/brokerage-user/rank-page', data);
-}
-
-// 获得分销提现分页记录
-export function getBrokerageWithdrawPage(data) {
-  return request.get('app-api/member/brokerage-withdraw/page', data);
-}
-
-// 获得分销记录分页
-export function getBrokerageRecordPage(data) {
-  return request.get('app-api/member/brokerage-record/page', data);
-}
diff --git a/api/trade/brokerage.js b/api/trade/brokerage.js
new file mode 100644
index 00000000..70202bad
--- /dev/null
+++ b/api/trade/brokerage.js
@@ -0,0 +1,31 @@
+import request from "@/utils/request.js";
+
+// 获得个人分销统计
+export function getBrokerageUserSummary() {
+  return request.get('app-api/trade/brokerage-user/get-summary');
+}
+
+// 获得分销用户排行分页（基于用户量）
+export function getBrokerageUserRankPageByUserCount(data) {
+  return request.get('app-api/trade/brokerage-user/rank-page-by-user-count', data);
+}
+
+// 获得分销用户排行（基于佣金）
+export function getBrokerageUserRankByPrice(data) {
+  return request.get('app-api/trade/brokerage-user/get-rank-by-price', data);
+}
+
+// 获得分销用户排行分页（基于佣金）
+export function getBrokerageUserRankPageByPrice(data) {
+  return request.get('app-api/trade/brokerage-user/rank-page-by-price', data);
+}
+
+// 获得分销提现分页记录
+export function getBrokerageWithdrawPage(data) {
+  return request.get('app-api/trade/brokerage-withdraw/page', data);
+}
+
+// 获得分销记录分页
+export function getBrokerageRecordPage(data) {
+  return request.get('app-api/trade/brokerage-record/page', data);
+}
diff --git a/pages/users/commission_rank/index.vue b/pages/users/commission_rank/index.vue
index 3cecd719..f9162a3d 100644
--- a/pages/users/commission_rank/index.vue
+++ b/pages/users/commission_rank/index.vue
@@ -7,63 +7,49 @@
 			</view>
 			<view class="wrapper">
 				<view class="nav acea-row row-around">
-					<view class="item" :class="active == index ? 'font-color' : ''" v-for="(item,index) in navList" :key="index"
-					 @click="switchTap(index)">
+					<view class="item" :class="active === index ? 'font-color' : ''" v-for="(item,index) in navList"
+                :key="index" @click="switchTap(index)">
 						{{ item }}
 					</view>
 				</view>
 				<view class="list">
 					<view class="item acea-row row-between-wrapper" v-for="(item,index) in rankList" :key="index">
 						<view class="num" v-if="index <= 2">
-							<image :src="'/static/images/medal0'+(index+1)+'.png'"></image>
+							<image :src="'/static/images/medal0' + (index+1) + '.png'" />
 						</view>
 						<view class="num" v-else>
-							{{index+1}}
+							{{index + 1}}
 						</view>
 						<view class="picTxt acea-row row-between-wrapper">
 							<view class="pictrue">
 								<image :src="item.avatar"></image>
 							</view>
-							<view class="text line1">{{item.nickname}}</view>
+							<view class="text line1">{{ item.nickname }}</view>
 						</view>
-						<view class="people font-color">￥{{item.brokeragePrice}}</view>
+						<view class="people font-color">￥{{ fen2yuan(item.brokeragePrice) }}</view>
 					</view>
 				</view>
-				<view class='noCommodity' v-if="rankList.length == 0 && (page != 1 || active== 0)">
+				<view class='noCommodity' v-if="rankList.length === 0 && (page !== 1 || active === 0)">
 					<emptyPage title="暂无排行～"></emptyPage>
 				</view>
 			</view>
 		</view>
-		<!-- #ifdef MP -->
-		<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
-		<!-- #endif -->
 		<home></home>
 	</view>
 </template>
-
 <script>
-	import {
-		getBrokerageRank,
-		brokerageRankNumber
-	} from '@/api/user.js';
-	import {
-		toLogin
-	} from '@/libs/login.js';
+	import { toLogin } from '@/libs/login.js';
 	import home from '@/components/home';
 	import emptyPage from '@/components/emptyPage.vue'
-	import {
-		mapGetters
-	} from "vuex";
-	// #ifdef MP
-	import authorize from '@/components/Authorize';
-	// #endif
-	export default {
+	import { mapGetters } from "vuex";
+  import * as BrokerageAPI from '@/api/trade/brokerage.js'
+  import dayjs from "@/plugin/dayjs/dayjs.min.js";
+  import * as DateUtil from '@/utils/date.js';
+  import * as Util from '@/utils/util.js';
+  export default {
 		components: {
 			emptyPage,
 			home,
-			// #ifdef MP
-			authorize
-			// #endif
 		},
 		data() {
 			return {
@@ -77,15 +63,13 @@
 				loadTitle: '加载更多',
 				type: 'week',
 				position: 0,
-				isAuto: false, //没有授权的不会自动授权
-				isShowAuth: false //是否隐藏授权
 			};
 		},
 		computed: mapGetters(['isLogin']),
 		watch:{
 			isLogin:{
-				handler:function(newV,oldV){
-					if(newV){
+				handler:function(newV, oldV) {
+					if (newV) {
 						this.getBrokerageRankList();
 						this.getBrokerageRankNumber(this.type);
 					}
@@ -94,61 +78,73 @@
 			}
 		},
 		onLoad() {
-			if (this.isLogin) {
-				this.getBrokerageRankList();
-				this.getBrokerageRankNumber(this.type);
-			} else {
-				toLogin();
+			if (!this.isLogin) {
+        toLogin();
+        return;
 			}
+      this.calculateTimes();
+      this.getBrokerageRankList();
+      this.getBrokerageRankNumber(this.type);
 		},
 		methods: {
-			onLoadFun: function() {
-				this.getBrokerageRankList();
-				this.getBrokerageRankNumber(this.type);
-			},
-			// 授权关闭
-			authColse: function(e) {
-				this.isShowAuth = e
-			},
 			switchTap: function(index) {
 				this.active = index;
 				this.type = index ? 'month' : 'week';
 				this.page = 1;
 				this.loadend = false;
 				this.$set(this, 'rankList', []);
+        this.calculateTimes();
 				this.getBrokerageRankList();
 				this.getBrokerageRankNumber(this.type);
 			},
-			getBrokerageRankNumber(type) {
-				brokerageRankNumber({
-					type: type
+			getBrokerageRankNumber() {
+        BrokerageAPI.getBrokerageUserRankByPrice({
+          // 'startTime': this.times[0],
+          // 'endTime': this.times[1],
+          'times': this.times
 				}).then(res => {
 					this.position = res.data;
 				})
 			},
 			getBrokerageRankList: function() {
-				if (this.loadend) return;
-				if (this.loading) return;
+				if (this.loadend || this.loading) {
+          return;
+        }
 				this.loading = true;
 				this.loadTitle = '';
-				getBrokerageRank({
-					page: this.page,
-					limit: this.limit,
-					type: this.type
+        BrokerageAPI.getBrokerageUserRankPageByPrice({
+					pageNo: this.page,
+					pageSize: this.limit,
+          'times[0]': this.times[0],
+          'times[1]': this.times[1],
 				}).then(res => {
-					let list = res.data;
+					let list = res.data.list;
 					let loadend = list.length <= this.limit;
 					this.rankList.push.apply(this.rankList, list);
 					this.loading = false;
 					this.loadend = loadend;
 					this.loadTitle = loadend ? '😕我也是有底线的' : '加载更多';
 					this.$set(this, 'rankList', this.rankList);
-					//this.position = res.data.position;
 				}).catch(err => {
 					this.loading = false;
-					this.loadTitle = '加载更多'; 
+					this.loadTitle = '加载更多';
 				})
-			}
+			},
+      calculateTimes: function() {
+        let times;
+        if (this.type === 'week') {
+          times = DateUtil.getWeekTimes();
+        } else {
+          times = DateUtil.getMonthTimes();
+        }
+        this.times = [ this.formatDate(times[0]), this.formatDate(times[1]) ]
+      },
+      formatDate: function(date) {
+        return dayjs(date).format("YYYY-MM-DD HH:mm:ss");
+      },
+      fen2yuan(price) {
+        return Util.fen2yuan(price)
+      },
 		},
 		onReachBottom: function() {
 			this.getBrokerageRankList();
diff --git a/pages/users/promoter-order/index.vue b/pages/users/promoter-order/index.vue
index 6771d7e7..62fc68c4 100644
--- a/pages/users/promoter-order/index.vue
+++ b/pages/users/promoter-order/index.vue
@@ -43,7 +43,7 @@
 	import { mapGetters } from "vuex";
 	import emptyPage from '@/components/emptyPage.vue'
 	import home from '@/components/home';
-  import * as BrokerageAPI from '@/api/member/brokerage.js'
+  import * as BrokerageAPI from '@/api/trade/brokerage.js'
   import * as Util from '@/utils/util.js';
   import dayjs from "@/plugin/dayjs/dayjs.min.js";
   export default {
diff --git a/pages/users/promoter_rank/index.vue b/pages/users/promoter_rank/index.vue
index 9a91034f..24b52557 100644
--- a/pages/users/promoter_rank/index.vue
+++ b/pages/users/promoter_rank/index.vue
@@ -57,8 +57,10 @@
 	import { toLogin } from '@/libs/login.js';
 	import { mapGetters } from "vuex";
 	import home from '@/components/home';
-  import * as BrokerageAPI from '@/api/member/brokerage.js'
+  import * as BrokerageAPI from '@/api/trade/brokerage.js'
   import dayjs from "@/plugin/dayjs/dayjs.min.js";
+  import * as DateUtil from '@/utils/date.js';
+  import * as Util from '@/utils/util.js';
   export default {
 		components: {
 			home
@@ -105,7 +107,7 @@
           return;
         }
 				this.loading = true;
-        BrokerageAPI.getBrokerageUserRankPage({
+        BrokerageAPI.getBrokerageUserRankPageByUserCount({
 					pageNo: this.page,
 					pageSize: this.limit,
 					'times[0]': this.times[0],
@@ -143,22 +145,13 @@
         this.getRanklist();
 			},
       calculateTimes: function() {
-        // TODO @芋艿：优化代码
-        let startDate;
-        let endDate;
-        const today = new Date();
+        let times;
         if (this.type === 'week') {
-          const dayOfWeek = today.getDay();
-          startDate = new Date(today.getFullYear(), today.getMonth(), today.getDate() - dayOfWeek, 0, 0, 0);
-          endDate = new Date(today.getFullYear(), today.getMonth(), today.getDate() + (6 - dayOfWeek), 23, 59, 59);
+          times = DateUtil.getWeekTimes();
         } else {
-          const year = today.getFullYear();
-          const month = today.getMonth();
-          startDate = new Date(year, month, 1, 0, 0, 0);
-          const nextMonth = new Date(year, month + 1, 1);
-          endDate = new Date(nextMonth.getTime() - 1);
+          times = DateUtil.getMonthTimes();
         }
-        this.times = [ this.formatDate(startDate), this.formatDate(endDate) ]
+        this.times = [ this.formatDate(times[0]), this.formatDate(times[1]) ]
       },
       formatDate: function(date) {
         return dayjs(date).format("YYYY-MM-DD HH:mm:ss");
diff --git a/pages/users/user_spread_code/index.vue b/pages/users/user_spread_code/index.vue
index 5a358f30..617c304a 100644
--- a/pages/users/user_spread_code/index.vue
+++ b/pages/users/user_spread_code/index.vue
@@ -35,10 +35,7 @@
 	// #ifdef H5
 	import uQRCode from '@/js_sdk/Sansnn-uQRCode/uqrcode.js'
 	// #endif
-	import {
-		getUserInfo,
-		spreadBanner
-	} from '@/api/user.js';
+	import { spreadBanner } from '@/api/user.js';
 	import {
 		toLogin
 	} from '@/libs/login.js';
diff --git a/pages/users/user_spread_money/index.vue b/pages/users/user_spread_money/index.vue
index 0fb86a56..c340e303 100644
--- a/pages/users/user_spread_money/index.vue
+++ b/pages/users/user_spread_money/index.vue
@@ -69,7 +69,7 @@
 	import { mapGetters } from "vuex";
 	import emptyPage from '@/components/emptyPage.vue'
 	import home from '@/components/home';
-  import * as BrokerageAPI from '@/api/member/brokerage.js'
+  import * as BrokerageAPI from '@/api/trade/brokerage.js'
   import * as Util from '@/utils/util.js';
   import dayjs from "@/plugin/dayjs/dayjs.min.js";
   export default {
diff --git a/pages/users/user_spread_user/index.vue b/pages/users/user_spread_user/index.vue
index 6fb7bc06..fbf0ab5c 100644
--- a/pages/users/user_spread_user/index.vue
+++ b/pages/users/user_spread_user/index.vue
@@ -61,7 +61,7 @@
 	import { toLogin } from '@/libs/login.js';
 	import { mapGetters } from "vuex";
 	import home from '@/components/home';
-  import * as BrokerageAPI from '@/api/member/brokerage.js'
+  import * as BrokerageAPI from '@/api/trade/brokerage.js'
   import * as Util from '@/utils/util.js';
   export default {
 		components: {
diff --git a/utils/date.js b/utils/date.js
new file mode 100644
index 00000000..2f84a364
--- /dev/null
+++ b/utils/date.js
@@ -0,0 +1,26 @@
+import dayjs from "@/plugin/dayjs/dayjs.min.js";
+
+/**
+ * 获得当前周的开始和结束时间
+ */
+export function getWeekTimes() {
+  const today = new Date();
+  const dayOfWeek = today.getDay();
+  return [
+    new Date(today.getFullYear(), today.getMonth(), today.getDate() - dayOfWeek, 0, 0, 0),
+    new Date(today.getFullYear(), today.getMonth(), today.getDate() + (6 - dayOfWeek), 23, 59, 59)
+  ]
+}
+
+/**
+ * 获得当前月的开始和结束时间
+ */
+export function getMonthTimes() {
+  const today = new Date();
+  const year = today.getFullYear();
+  const month = today.getMonth();
+  const startDate = new Date(year, month, 1, 0, 0, 0);
+  const nextMonth = new Date(year, month + 1, 1);
+  const endDate = new Date(nextMonth.getTime() - 1);
+  return [startDate, endDate]
+}