yudao
/
mall-uniapp
mirror of https://gitee.com/yudaocode/yudao-mall-uniapp.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

分佣：commission-rank 迁移

pull/1/MERGE
YunaiV 2023-09-05 21:36:10 +08:00
parent 5b8b91356f
commit b15fb02ecf
9 changed files with 123 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
api/member/brokerage.js
View File

@ -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);
}

31
api/trade/brokerage.js Normal file
View File

@ -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);
}

112
pages/users/commission_rank/index.vue
View File

@ -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();

2
pages/users/promoter-order/index.vue
View File

@ -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 {

23
pages/users/promoter_rank/index.vue
View File

@ -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");

5
pages/users/user_spread_code/index.vue
View File

@ -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';

2
pages/users/user_spread_money/index.vue
View File

@ -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 {

2
pages/users/user_spread_user/index.vue
View File

@ -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: {

26
utils/date.js Normal file
View File

@ -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]
}