angelo
/
web-zk-h5
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(bonus): 奖金添加复购级差收益字段，且只有存在时才可见

This commit is contained in:
woody 2025-07-09 15:54:49 +08:00
parent 45bc6165e5
commit 4320d22cac
4 changed files with 379 additions and 368 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

713
components/bonus/sgsy.vue
View File

@ -1,65 +1,64 @@
<template> <template>
<view class="main"> <view class="main">
<view v-if="userInfo.pkCountry!=1" class="top"> <view v-if="userInfo.pkCountry != 1" class="top">
<view class="search-bottom"> <view class="search-bottom">
<view class="time-text">{{'查询时间'}}</view> <view class="time-text">{{ '查询时间' }}</view>
<view class="time1"> <view class="time1">
<picker :value="query.startDate" mode="date" @change="bindDateChange"> <picker :value="query.startDate" mode="date" @change="bindDateChange">
<view v-if="query.startDate!=''" class="uni-input">{{query.startDate}}</view> <view v-if="query.startDate != ''" class="uni-input">{{
<view v-else class="uni-input">{{'开始日期'}}</view> query.startDate
</picker> }}</view>
</view> <view v-else class="uni-input">{{ '开始日期' }}</view>
<view class="text_s">{{'至'}}</view> </picker>
<view class="time1"> </view>
<picker :value="query.endDate" mode="date" @change="bindDateChange1"> <view class="text_s">{{ '至' }}</view>
<view v-if="query.endDate!=''" class="uni-input">{{query.endDate}}</view> <view class="time1">
<view v-else class="uni-input">{{'结束日期'}}</view> <picker :value="query.endDate" mode="date" @change="bindDateChange1">
</picker> <view v-if="query.endDate != ''" class="uni-input">{{
</view> query.endDate
<view class="search-icons" @click="submit"> }}</view>
<image class="search-icon-s" src="../../static/images/search.png"></image> <view v-else class="uni-input">{{ '结束日期' }}</view>
</view> </picker>
</view> </view>
<view class="search-icons" @click="submit">
</view> <image
<view class="search-content"> class="search-icon-s"
<view class="search-list"> src="../../static/images/search.png"
<view v-for="item in dataList" class="search-view"> ></image>
<view style="height: 20rpx;"></view> </view>
<view class="flex_s"> </view>
<view class="data-left"> </view>
{{'奖金日期'}} <view class="search-content">
</view> <view class="search-list">
<view class="data-right"> <view v-for="item in dataList" class="search-view">
{{item.settleDate }} <view style="height: 20rpx"></view>
</view> <view class="flex_s">
</view> <view class="data-left">
<view class="flex_s"> {{ '奖金日期' }}
<view class="data-left"> </view>
{{'直推收益'}}({{ isLocaled() }}) <view class="data-right">
</view> {{ item.settleDate }}
<view class="data-right"> </view>
{{item.directIncome| toThousandthAndKeepDecimal }} </view>
</view> <view class="flex_s">
</view> <view class="data-left"> {{ '直推收益' }}({{ isLocaled() }}) </view>
<view class="flex_s"> <view class="data-right">
<view class="data-left"> {{ item.directIncome | toThousandthAndKeepDecimal }}
{{'拓展收益'}}({{ isLocaled() }}) </view>
</view> </view>
<view class="data-right"> <view class="flex_s">
{{item.expandIncome| toThousandthAndKeepDecimal}} <view class="data-left"> {{ '拓展收益' }}({{ isLocaled() }}) </view>
</view> <view class="data-right">
</view> {{ item.expandIncome | toThousandthAndKeepDecimal }}
<view class="flex_s"> </view>
<view class="data-left"> </view>
{{'辅导收益'}}({{ isLocaled() }}) <view class="flex_s">
</view> <view class="data-left"> {{ '辅导收益' }}({{ isLocaled() }}) </view>
<view class="data-right"> <view class="data-right">
{{item.coachIncome | toThousandthAndKeepDecimal}} {{ item.coachIncome | toThousandthAndKeepDecimal }}
</view> </view>
</view> </view>
<!-- <view class="flex_s"> <!-- <view class="flex_s">
<view class="data-left"> <view class="data-left">
{{'分红收益'}}({{ isLocaled() }}) {{'分红收益'}}({{ isLocaled() }})
</view> </view>
@ -67,23 +66,19 @@
{{item.shareIncome| toThousandthAndKeepDecimal}} {{item.shareIncome| toThousandthAndKeepDecimal}}
</view> </view>
</view> --> </view> -->
<view class="flex_s" v-if="userInfo.pkCountry==1"> <view class="flex_s" v-if="userInfo.pkCountry == 1">
<view class="data-left"> <view class="data-left"> {{ '服务补贴' }}({{ isLocaled() }}) </view>
{{'服务补贴'}}({{ isLocaled() }}) <view class="data-right">
</view> {{ item.serviceIncome | toThousandthAndKeepDecimal }}
<view class="data-right"> </view>
{{item.serviceIncome| toThousandthAndKeepDecimal}} </view>
</view> <view v-if="item.repurRangeIncome" class="flex_s">
</view> <view class="data-left"> 复购级差收益({{ isLocaled() }}) </view>
<!-- <view class="flex_s"> <view class="data-right">
<view class="data-left"> {{ item.repurRangeIncome | toThousandthAndKeepDecimal }}
级差收益({{ isLocaled() }}) </view>
</view> </view>
<view class="data-right"> <!-- <view class="flex_s">
{{item.repurRangeIncome| toThousandthAndKeepDecimal}}
</view>
</view>
<view class="flex_s">
<view class="data-left"> <view class="data-left">
{{$t('直推级差')}}({{ isLocaled() }}) {{$t('直推级差')}}({{ isLocaled() }})
</view> </view>
@ -91,320 +86,322 @@
{{item.globalPoints| toThousandthAndKeepDecimal}} {{item.globalPoints| toThousandthAndKeepDecimal}}
</view> </view>
</view> --> </view> -->
<view class="flex_s" v-if="userInfo.pkCountry==1"> <view class="flex_s" v-if="userInfo.pkCountry == 1">
<view class="data-left"> <view class="data-left"> {{ '重复消费' }}({{ isLocaled() }}) </view>
{{'重复消费'}}({{ isLocaled() }}) <view class="data-right">
</view> {{ item.backPoints | toThousandthAndKeepDecimal }}
<view class="data-right"> </view>
{{item.backPoints| toThousandthAndKeepDecimal}} </view>
</view> <view class="flex_s" v-if="userInfo.pkCountry == 1">
</view> <view class="data-left">
<view class="flex_s" v-if="userInfo.pkCountry==1"> {{ '平台服务费' }}({{ isLocaled() }})
<view class="data-left"> </view>
{{'平台服务费'}}({{ isLocaled() }}) <view class="data-right">
</view> {{ item.serviceSpend | toThousandthAndKeepDecimal }}
<view class="data-right"> </view>
{{item.serviceSpend| toThousandthAndKeepDecimal}} </view>
</view> <view class="flex_s">
</view> <view class="data-left"> {{ '实发小计' }}({{ isLocaled() }}) </view>
<view class="flex_s"> <view class="data-right">
<view class="data-left"> {{ item.purRealSubtotal | toThousandthAndKeepDecimal }}
{{'实发小计'}}({{ isLocaled() }}) </view>
</view> </view>
<view class="data-right"> <!-- <view class="border_s">
{{item.purRealSubtotal| toThousandthAndKeepDecimal}}
</view>
</view>
<!-- <view class="border_s">
<view class="button" v-if="checkRule==true" @click="urlTap"> <view class="button" v-if="checkRule==true" @click="urlTap">
{{'查看详情'}} {{'查看详情'}}
</view> </view>
</view> --> </view> -->
<view style="clear: both;"></view> <view style="clear: both"></view>
<view style="height: 20rpx;background-color: #fff;"></view> <view style="height: 20rpx; background-color: #fff"></view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</template> </template>
<script> <script>
import * as api from '@/config/login.js' import * as api from '@/config/login.js'
import { import { setToken } from '@/config/auth.js'
setToken import store from '@/store'
} from '@/config/auth.js' import { isLocaled } from '@/util/numberToCurrency'
import store from '@/store'
import {
isLocaled
} from '@/util/numberToCurrency'
export default { export default {
data() { data() {
return { return {
getBonusTypeList: [], getBonusTypeList: [],
index: null, index: null,
dataList: [], dataList: [],
userInfo: [], userInfo: [],
query: { query: {
startDate: '', startDate: '',
endDate: '', endDate: '',
sourceMemberCode: '', sourceMemberCode: '',
sourceMemberName: '', sourceMemberName: '',
pkBonusItems: '' pkBonusItems: '',
}, },
page: { page: {
pageNum: 1, pageNum: 1,
pageSize: 50 pageSize: 50,
} },
} }
}, },
props: ["num", "checkRule"], props: ['num', 'checkRule'],
onLoad() { onLoad() {},
created() {
}, // this.getType()
created() { this.userInfo = uni.getStorageSync('User')
// this.getType() this.getDataList()
this.userInfo = uni.getStorageSync('User') },
this.getDataList() methods: {
}, isLocaled,
methods: { urlTap() {
isLocaled, uni.navigateTo({
urlTap() { url: '/pages/bonusSource/index',
uni.navigateTo({ })
url: '/pages/bonusSource/index' },
}) getInfo() {
}, api
getInfo() { .getInfo()
api.getInfo().then(res => { .then(res => {
if (res) { if (res) {
this.userInfo = res.data this.userInfo = res.data
} }
}).catch(error => { })
reject(error) .catch(error => {
}) reject(error)
}, })
submit() { },
this.getDataList() submit() {
}, this.getDataList()
getType() { },
api.getBonusType().then(res => { getType() {
if (res) { api
this.getBonusTypeList = res.rows .getBonusType()
} .then(res => {
}).catch(error => { if (res) {
reject(error) this.getBonusTypeList = res.rows
}) }
}, })
bindPickerChange(e) { .catch(error => {
this.index = e.detail.value reject(error)
}, })
bindDateChange(e) { },
this.query.startDate = e.detail.value bindPickerChange(e) {
}, this.index = e.detail.value
bindDateChange1(e) { },
this.query.endDate = e.detail.value bindDateChange(e) {
}, this.query.startDate = e.detail.value
getDataList(num) { },
api.queryBonusFirst(this.query, `?pageNum=${num||1}&pageSize=${this.page.pageSize}`).then(res => { bindDateChange1(e) {
if (res) { this.query.endDate = e.detail.value
this.dataList.push(...res.rows) },
} getDataList(num) {
}).catch(error => { api
reject(error) .queryBonusFirst(
}) this.query,
}, `?pageNum=${num || 1}&pageSize=${this.page.pageSize}`
submit() { )
.then(res => {
}, if (res) {
}, this.dataList.push(...res.rows)
} }
})
.catch(error => {
reject(error)
})
},
submit() {},
},
}
</script> </script>
<style> <style>
.border_s { .border_s {
border-bottom: 1rpx solid #eee; border-bottom: 1rpx solid #eee;
height: 10rpx; height: 10rpx;
} }
.button { .button {
padding: 0 30rpx; padding: 0 30rpx;
/* width: 150rpx; */ /* width: 150rpx; */
height: 52rpx; height: 52rpx;
line-height: 52rpx; line-height: 52rpx;
color: #fff; color: #fff;
font-size: 28rpx; font-size: 28rpx;
text-align: center; text-align: center;
background: #005BAC; background: #005bac;
margin: 30rpx 0 0 0; margin: 30rpx 0 0 0;
float: right; float: right;
border-radius: 24rpx; border-radius: 24rpx;
} }
.type { .type {
color: #005BAC !important; color: #005bac !important;
} }
.flex_s { .flex_s {
width: 100%; width: 100%;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
padding-bottom: 15rpx; padding-bottom: 15rpx;
} }
.data-left { .data-left {
color: #999; color: #999;
font-size: 26rpx; font-size: 26rpx;
} }
.data-right { .data-right {
color: #333; color: #333;
font-size: 26rpx; font-size: 26rpx;
} }
.search-view { .search-view {
/* display: flex; */ /* display: flex; */
/* justify-content: space-between; */ /* justify-content: space-between; */
padding: 30rpx 20rpx 0 20rpx; padding: 30rpx 20rpx 0 20rpx;
border-bottom: 20rpx solid #eee; border-bottom: 20rpx solid #eee;
/* border-bottom: 1px solid #eee; */ /* border-bottom: 1px solid #eee; */
margin: 0; margin: 0;
} }
.search-list { .search-list {
margin-bottom: 25rpx; margin-bottom: 25rpx;
background-color: #fff; background-color: #fff;
} }
.search-content { .search-content {
margin-top: 25rpx; margin-top: 25rpx;
} }
.text_s { .text_s {
color: #333; color: #333;
font-size: 26rpx; font-size: 26rpx;
} }
.search-icon-s { .search-icon-s {
width: 22rpx; width: 22rpx;
height: 22rpx; height: 22rpx;
} }
.search-icons { .search-icons {
width: 47rpx; width: 47rpx;
height: 47rpx; height: 47rpx;
background: #005BAC; background: #005bac;
border-radius: 50%; border-radius: 50%;
margin-left: 20rpx; margin-left: 20rpx;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
margin: 30rpx 20rpx 0 0; margin: 30rpx 20rpx 0 0;
} }
.time1 { .time1 {
width: 158rpx; width: 158rpx;
height: 75rpx; height: 75rpx;
border-bottom: 1rpx solid #eee; border-bottom: 1rpx solid #eee;
margin: 0 50rpx 30rpx 50rpx; margin: 0 50rpx 30rpx 50rpx;
color: #999; color: #999;
text-align: center; text-align: center;
font-size: 24rpx; font-size: 24rpx;
/* margin-bottom: 30rpx; */ /* margin-bottom: 30rpx; */
} }
.time-text { .time-text {
color: #999; color: #999;
font-size: 26rpx; font-size: 26rpx;
} }
.search-bottom { .search-bottom {
height: 100rpx; height: 100rpx;
line-height: 100rpx; line-height: 100rpx;
display: flex; display: flex;
margin-left: 20rpx; margin-left: 20rpx;
} }
.texts { .texts {
color: #333; color: #333;
font-size: 26rpx; font-size: 26rpx;
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
/* width:200rpx; */ /* width:200rpx; */
text-align: right; text-align: right;
} }
.select-text { .select-text {
display: flex; display: flex;
margin-right: 20rpx; margin-right: 20rpx;
font-size: 26rpx; font-size: 26rpx;
color: #333; color: #333;
position: relative; position: relative;
} }
.selIcon { .selIcon {
width: 20rpx; width: 20rpx;
height: 20rpx; height: 20rpx;
margin-top: 10rpx; margin-top: 10rpx;
margin-left: 5rpx; margin-left: 5rpx;
} }
.text-s { .text-s {
font-size: 26rpx; font-size: 26rpx;
color: #999; color: #999;
margin-right: 10rpx; margin-right: 10rpx;
} }
.place { .place {
font-size: 26rpx; font-size: 26rpx;
color: #999; color: #999;
} }
.border-colors { .border-colors {
border: none; border: none;
font-size: 26rpx; font-size: 26rpx;
color: #333; color: #333;
margin-left: 30rpx; margin-left: 30rpx;
} }
page { page {
background-color: #f2f2f2; background-color: #f2f2f2;
} }
.search-icon { .search-icon {
width: 25rpx; width: 25rpx;
height: 25rpx; height: 25rpx;
position: absolute; position: absolute;
left: 30rpx; left: 30rpx;
top: 12rpx; top: 12rpx;
image {} image {
} }
}
.search-bg {} .search-bg {
}
.top { .top {
/* height: 200rpx; */ /* height: 200rpx; */
background-color: #fff; background-color: #fff;
padding: 20rpx 0 20rpx 0; padding: 20rpx 0 20rpx 0;
} }
.search-tops { .search-tops {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
height: 65rpx; height: 65rpx;
line-height: 65rpx; line-height: 65rpx;
padding-bottom: 40rpx; padding-bottom: 40rpx;
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
} }
.search-bg { .search-bg {
width: 432rpx; width: 432rpx;
height: 35rpx; height: 35rpx;
background: #F5F6F8; background: #f5f6f8;
border-radius: 33rpx; border-radius: 33rpx;
display: flex; display: flex;
position: relative; position: relative;
padding: 20rpx 50rpx; padding: 20rpx 50rpx;
margin-left: 20rpx; margin-left: 20rpx;
} }
</style> </style>

2
config/request.js
View File

@ -20,7 +20,7 @@ module.exports = vm => {
//#ifdef DEV_SERVER //#ifdef DEV_SERVER
console.log('DEV_SERVER') console.log('DEV_SERVER')
config.baseURL = 'http://192.168.0.86:8080' config.baseURL = '/prod-api'
//#endif //#endif
//#ifdef QA_SERVER //#ifdef QA_SERVER

10
pages/bonus/index.vue
View File

@ -53,10 +53,11 @@
<view <view
v-for="(fieldName, fieldKey) in BONUS_FIELD_MAP" v-for="(fieldName, fieldKey) in BONUS_FIELD_MAP"
:key="fieldKey" :key="fieldKey"
class="bonus-item"
> >
<text class="item-label">{{ fieldName }}(¥)</text> <view class="bonus-item" v-if="dailyBonus[fieldKey]">
<text class="item-value">{{ dailyBonus[fieldKey] }}</text> <text class="item-label">{{ fieldName }}(¥)</text>
<text class="item-value">{{ dailyBonus[fieldKey] }}</text>
</view>
</view> </view>
</view> </view>
<view class="card-footer"> <view class="card-footer">
@ -115,7 +116,8 @@ export default {
retailSameLevelIncome: '平级收益', retailSameLevelIncome: '平级收益',
retailAreaIncome: '区域收益', retailAreaIncome: '区域收益',
retailBenefitRangeIncome: '福利级差收益', retailBenefitRangeIncome: '福利级差收益',
retailMonthRepurchaseIncome: '复购级差收益', repurRangeIncome: '复购级差收益',
retailMonthRepurchaseIncome: '月复购级差收益',
coachIncome: '培育津贴', coachIncome: '培育津贴',
retailBenefitIncomeTotal: '福利分红收益', retailBenefitIncomeTotal: '福利分红收益',
backPoints: '重消收益', backPoints: '重消收益',

22
pages/bonus/real-time.vue
View File

@ -21,11 +21,22 @@
}}</text> }}</text>
</view> </view>
<view v-for="(label, key) in detailLabels" :key="key" class="detail-item"> <view v-for="(label, key) in detailLabels" :key="key" class="detail-item">
<text class="detail-label">{{ label }}</text> <template
<text class="detail-value"> v-if="key === 'repurRangeIncome' && bonusData.repurRangeIncome"
<text class="currency-symbol-small">¥</text> >
{{ bonusData[key] || '0.00' }} <text class="detail-label">{{ label }}</text>
</text> <text class="detail-value">
<text class="currency-symbol-small">¥</text>
{{ bonusData[key] || '0.00' }}
</text>
</template>
<template v-else>
<text class="detail-label">{{ label }}</text>
<text class="detail-value">
<text class="currency-symbol-small">¥</text>
{{ bonusData[key] || '0.00' }}
</text>
</template>
</view> </view>
<!-- 分割线 --> <!-- 分割线 -->
<view class="divider"></view> <view class="divider"></view>
@ -63,6 +74,7 @@ export default {
retailRangeIncome: '直推收益(¥)', retailRangeIncome: '直推收益(¥)',
retailSameLevelIncome: '平级收益(¥)', retailSameLevelIncome: '平级收益(¥)',
retailAreaIncome: '区域收益(¥)', retailAreaIncome: '区域收益(¥)',
repurRangeIncome: '复购级差收益(¥)',
// welfareLevelDifferenceIncome: '福利级差收益(¥)', // welfareLevelDifferenceIncome: '福利级差收益(¥)',
// welfareDividendIncome: '福利分红收益(¥)', // welfareDividendIncome: '福利分红收益(¥)',
backPoints: '重消收益(¥)', backPoints: '重消收益(¥)',