feat(bonus): 奖金添加复购级差收益字段，且只有存在时才可见
This commit is contained in:
woody
parent
aec869deab
commit
4d15edb36d
|
|
@ -1,62 +1,61 @@
|
|||
|
||||
<template>
|
||||
<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="time-text">{{'查询时间'}}</view>
|
||||
<view class="time-text">{{ '查询时间' }}</view>
|
||||
<view class="time1">
|
||||
<picker :value="query.startDate" mode="date" @change="bindDateChange">
|
||||
<view v-if="query.startDate!=''" class="uni-input">{{query.startDate}}</view>
|
||||
<view v-else class="uni-input">{{'开始日期'}}</view>
|
||||
<view v-if="query.startDate != ''" class="uni-input">{{
|
||||
query.startDate
|
||||
}}</view>
|
||||
<view v-else class="uni-input">{{ '开始日期' }}</view>
|
||||
</picker>
|
||||
</view>
|
||||
<view class="text_s">{{'至'}}</view>
|
||||
<view class="text_s">{{ '至' }}</view>
|
||||
<view class="time1">
|
||||
<picker :value="query.endDate" mode="date" @change="bindDateChange1">
|
||||
<view v-if="query.endDate!=''" class="uni-input">{{query.endDate}}</view>
|
||||
<view v-else class="uni-input">{{'结束日期'}}</view>
|
||||
<view v-if="query.endDate != ''" class="uni-input">{{
|
||||
query.endDate
|
||||
}}</view>
|
||||
<view v-else class="uni-input">{{ '结束日期' }}</view>
|
||||
</picker>
|
||||
</view>
|
||||
<view class="search-icons" @click="submit">
|
||||
<image class="search-icon-s" src="../../static/images/search.png"></image>
|
||||
<image
|
||||
class="search-icon-s"
|
||||
src="../../static/images/search.png"
|
||||
></image>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
<view class="search-content">
|
||||
<view class="search-list">
|
||||
<view v-for="item in dataList" class="search-view">
|
||||
<view style="height: 20rpx;"></view>
|
||||
<view style="height: 20rpx"></view>
|
||||
<view class="flex_s">
|
||||
<view class="data-left">
|
||||
{{'奖金日期'}}
|
||||
{{ '奖金日期' }}
|
||||
</view>
|
||||
<view class="data-right">
|
||||
{{item.settleDate }}
|
||||
{{ item.settleDate }}
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex_s">
|
||||
<view class="data-left">
|
||||
{{'直推收益'}}({{ isLocaled() }})
|
||||
</view>
|
||||
<view class="data-left"> {{ '直推收益' }}({{ isLocaled() }}) </view>
|
||||
<view class="data-right">
|
||||
{{item.directIncome| toThousandthAndKeepDecimal }}
|
||||
{{ item.directIncome | toThousandthAndKeepDecimal }}
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex_s">
|
||||
<view class="data-left">
|
||||
{{'拓展收益'}}({{ isLocaled() }})
|
||||
</view>
|
||||
<view class="data-left"> {{ '拓展收益' }}({{ isLocaled() }}) </view>
|
||||
<view class="data-right">
|
||||
{{item.expandIncome| toThousandthAndKeepDecimal}}
|
||||
{{ item.expandIncome | toThousandthAndKeepDecimal }}
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex_s">
|
||||
<view class="data-left">
|
||||
{{'辅导收益'}}({{ isLocaled() }})
|
||||
</view>
|
||||
<view class="data-left"> {{ '辅导收益' }}({{ isLocaled() }}) </view>
|
||||
<view class="data-right">
|
||||
{{item.coachIncome | toThousandthAndKeepDecimal}}
|
||||
{{ item.coachIncome | toThousandthAndKeepDecimal }}
|
||||
</view>
|
||||
</view>
|
||||
<!-- <view class="flex_s">
|
||||
|
|
@ -67,23 +66,19 @@
|
|||
{{item.shareIncome| toThousandthAndKeepDecimal}}
|
||||
</view>
|
||||
</view> -->
|
||||
<view class="flex_s" v-if="userInfo.pkCountry==1">
|
||||
<view class="data-left">
|
||||
{{'服务补贴'}}({{ isLocaled() }})
|
||||
</view>
|
||||
<view class="flex_s" v-if="userInfo.pkCountry == 1">
|
||||
<view class="data-left"> {{ '服务补贴' }}({{ isLocaled() }}) </view>
|
||||
<view class="data-right">
|
||||
{{item.serviceIncome| toThousandthAndKeepDecimal}}
|
||||
{{ item.serviceIncome | toThousandthAndKeepDecimal }}
|
||||
</view>
|
||||
</view>
|
||||
<view v-if="item.repurRangeIncome" class="flex_s">
|
||||
<view class="data-left"> 复购级差收益({{ isLocaled() }}) </view>
|
||||
<view class="data-right">
|
||||
{{ item.repurRangeIncome | toThousandthAndKeepDecimal }}
|
||||
</view>
|
||||
</view>
|
||||
<!-- <view class="flex_s">
|
||||
<view class="data-left">
|
||||
级差收益({{ isLocaled() }})
|
||||
</view>
|
||||
<view class="data-right">
|
||||
{{item.repurRangeIncome| toThousandthAndKeepDecimal}}
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex_s">
|
||||
<view class="data-left">
|
||||
{{$t('直推级差')}}({{ isLocaled() }})
|
||||
</view>
|
||||
|
|
@ -91,28 +86,24 @@
|
|||
{{item.globalPoints| toThousandthAndKeepDecimal}}
|
||||
</view>
|
||||
</view> -->
|
||||
<view class="flex_s" v-if="userInfo.pkCountry==1">
|
||||
<view class="flex_s" v-if="userInfo.pkCountry == 1">
|
||||
<view class="data-left"> {{ '重复消费' }}({{ isLocaled() }}) </view>
|
||||
<view class="data-right">
|
||||
{{ item.backPoints | toThousandthAndKeepDecimal }}
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex_s" v-if="userInfo.pkCountry == 1">
|
||||
<view class="data-left">
|
||||
{{'重复消费'}}({{ isLocaled() }})
|
||||
{{ '平台服务费' }}({{ isLocaled() }})
|
||||
</view>
|
||||
<view class="data-right">
|
||||
{{item.backPoints| toThousandthAndKeepDecimal}}
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex_s" v-if="userInfo.pkCountry==1">
|
||||
<view class="data-left">
|
||||
{{'平台服务费'}}({{ isLocaled() }})
|
||||
</view>
|
||||
<view class="data-right">
|
||||
{{item.serviceSpend| toThousandthAndKeepDecimal}}
|
||||
{{ item.serviceSpend | toThousandthAndKeepDecimal }}
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex_s">
|
||||
<view class="data-left">
|
||||
{{'实发小计'}}({{ isLocaled() }})
|
||||
</view>
|
||||
<view class="data-left"> {{ '实发小计' }}({{ isLocaled() }}) </view>
|
||||
<view class="data-right">
|
||||
{{item.purRealSubtotal| toThousandthAndKeepDecimal}}
|
||||
{{ item.purRealSubtotal | toThousandthAndKeepDecimal }}
|
||||
</view>
|
||||
</view>
|
||||
<!-- <view class="border_s">
|
||||
|
|
@ -120,8 +111,8 @@
|
|||
{{'查看详情'}}
|
||||
</view>
|
||||
</view> -->
|
||||
<view style="clear: both;"></view>
|
||||
<view style="height: 20rpx;background-color: #fff;"></view>
|
||||
<view style="clear: both"></view>
|
||||
<view style="height: 20rpx; background-color: #fff"></view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -129,16 +120,12 @@
|
|||
</template>
|
||||
|
||||
<script>
|
||||
import * as api from '@/config/login.js'
|
||||
import {
|
||||
setToken
|
||||
} from '@/config/auth.js'
|
||||
import store from '@/store'
|
||||
import {
|
||||
isLocaled
|
||||
} from '@/util/numberToCurrency'
|
||||
import * as api from '@/config/login.js'
|
||||
import { setToken } from '@/config/auth.js'
|
||||
import store from '@/store'
|
||||
import { isLocaled } from '@/util/numberToCurrency'
|
||||
|
||||
export default {
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
getBonusTypeList: [],
|
||||
|
|
@ -150,18 +137,16 @@
|
|||
endDate: '',
|
||||
sourceMemberCode: '',
|
||||
sourceMemberName: '',
|
||||
pkBonusItems: ''
|
||||
pkBonusItems: '',
|
||||
},
|
||||
page: {
|
||||
pageNum: 1,
|
||||
pageSize: 50
|
||||
}
|
||||
pageSize: 50,
|
||||
},
|
||||
}
|
||||
},
|
||||
props: ["num", "checkRule"],
|
||||
onLoad() {
|
||||
|
||||
},
|
||||
props: ['num', 'checkRule'],
|
||||
onLoad() {},
|
||||
created() {
|
||||
// this.getType()
|
||||
this.userInfo = uni.getStorageSync('User')
|
||||
|
|
@ -171,15 +156,18 @@
|
|||
isLocaled,
|
||||
urlTap() {
|
||||
uni.navigateTo({
|
||||
url: '/pages/bonusSource/index'
|
||||
url: '/pages/bonusSource/index',
|
||||
})
|
||||
},
|
||||
getInfo() {
|
||||
api.getInfo().then(res => {
|
||||
api
|
||||
.getInfo()
|
||||
.then(res => {
|
||||
if (res) {
|
||||
this.userInfo = res.data
|
||||
}
|
||||
}).catch(error => {
|
||||
})
|
||||
.catch(error => {
|
||||
reject(error)
|
||||
})
|
||||
},
|
||||
|
|
@ -187,11 +175,14 @@
|
|||
this.getDataList()
|
||||
},
|
||||
getType() {
|
||||
api.getBonusType().then(res => {
|
||||
api
|
||||
.getBonusType()
|
||||
.then(res => {
|
||||
if (res) {
|
||||
this.getBonusTypeList = res.rows
|
||||
}
|
||||
}).catch(error => {
|
||||
})
|
||||
.catch(error => {
|
||||
reject(error)
|
||||
})
|
||||
},
|
||||
|
|
@ -205,27 +196,31 @@
|
|||
this.query.endDate = e.detail.value
|
||||
},
|
||||
getDataList(num) {
|
||||
api.queryBonusFirst(this.query, `?pageNum=${num||1}&pageSize=${this.page.pageSize}`).then(res => {
|
||||
api
|
||||
.queryBonusFirst(
|
||||
this.query,
|
||||
`?pageNum=${num || 1}&pageSize=${this.page.pageSize}`
|
||||
)
|
||||
.then(res => {
|
||||
if (res) {
|
||||
this.dataList.push(...res.rows)
|
||||
}
|
||||
}).catch(error => {
|
||||
})
|
||||
.catch(error => {
|
||||
reject(error)
|
||||
})
|
||||
},
|
||||
submit() {
|
||||
|
||||
submit() {},
|
||||
},
|
||||
},
|
||||
}
|
||||
}
|
||||
</script>
|
||||
<style>
|
||||
.border_s {
|
||||
.border_s {
|
||||
border-bottom: 1rpx solid #eee;
|
||||
height: 10rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.button {
|
||||
.button {
|
||||
padding: 0 30rpx;
|
||||
/* width: 150rpx; */
|
||||
height: 52rpx;
|
||||
|
|
@ -233,74 +228,74 @@
|
|||
color: #fff;
|
||||
font-size: 28rpx;
|
||||
text-align: center;
|
||||
background: #005BAC;
|
||||
background: #005bac;
|
||||
margin: 30rpx 0 0 0;
|
||||
float: right;
|
||||
border-radius: 24rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.type {
|
||||
color: #005BAC !important;
|
||||
}
|
||||
.type {
|
||||
color: #005bac !important;
|
||||
}
|
||||
|
||||
.flex_s {
|
||||
.flex_s {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
padding-bottom: 15rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.data-left {
|
||||
.data-left {
|
||||
color: #999;
|
||||
font-size: 26rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.data-right {
|
||||
.data-right {
|
||||
color: #333;
|
||||
font-size: 26rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.search-view {
|
||||
.search-view {
|
||||
/* display: flex; */
|
||||
/* justify-content: space-between; */
|
||||
padding: 30rpx 20rpx 0 20rpx;
|
||||
border-bottom: 20rpx solid #eee;
|
||||
/* border-bottom: 1px solid #eee; */
|
||||
margin: 0;
|
||||
}
|
||||
}
|
||||
|
||||
.search-list {
|
||||
.search-list {
|
||||
margin-bottom: 25rpx;
|
||||
background-color: #fff;
|
||||
}
|
||||
}
|
||||
|
||||
.search-content {
|
||||
.search-content {
|
||||
margin-top: 25rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.text_s {
|
||||
.text_s {
|
||||
color: #333;
|
||||
font-size: 26rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.search-icon-s {
|
||||
.search-icon-s {
|
||||
width: 22rpx;
|
||||
height: 22rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.search-icons {
|
||||
.search-icons {
|
||||
width: 47rpx;
|
||||
height: 47rpx;
|
||||
background: #005BAC;
|
||||
background: #005bac;
|
||||
border-radius: 50%;
|
||||
margin-left: 20rpx;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
margin: 30rpx 20rpx 0 0;
|
||||
}
|
||||
}
|
||||
|
||||
.time1 {
|
||||
.time1 {
|
||||
width: 158rpx;
|
||||
height: 75rpx;
|
||||
border-bottom: 1rpx solid #eee;
|
||||
|
|
@ -309,21 +304,21 @@
|
|||
text-align: center;
|
||||
font-size: 24rpx;
|
||||
/* margin-bottom: 30rpx; */
|
||||
}
|
||||
}
|
||||
|
||||
.time-text {
|
||||
.time-text {
|
||||
color: #999;
|
||||
font-size: 26rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.search-bottom {
|
||||
.search-bottom {
|
||||
height: 100rpx;
|
||||
line-height: 100rpx;
|
||||
display: flex;
|
||||
margin-left: 20rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.texts {
|
||||
.texts {
|
||||
color: #333;
|
||||
font-size: 26rpx;
|
||||
overflow: hidden;
|
||||
|
|
@ -331,80 +326,82 @@
|
|||
text-overflow: ellipsis;
|
||||
/* width:200rpx; */
|
||||
text-align: right;
|
||||
}
|
||||
}
|
||||
|
||||
.select-text {
|
||||
.select-text {
|
||||
display: flex;
|
||||
margin-right: 20rpx;
|
||||
font-size: 26rpx;
|
||||
color: #333;
|
||||
position: relative;
|
||||
}
|
||||
}
|
||||
|
||||
.selIcon {
|
||||
.selIcon {
|
||||
width: 20rpx;
|
||||
height: 20rpx;
|
||||
margin-top: 10rpx;
|
||||
margin-left: 5rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.text-s {
|
||||
.text-s {
|
||||
font-size: 26rpx;
|
||||
color: #999;
|
||||
margin-right: 10rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.place {
|
||||
.place {
|
||||
font-size: 26rpx;
|
||||
color: #999;
|
||||
}
|
||||
}
|
||||
|
||||
.border-colors {
|
||||
.border-colors {
|
||||
border: none;
|
||||
font-size: 26rpx;
|
||||
color: #333;
|
||||
margin-left: 30rpx;
|
||||
}
|
||||
}
|
||||
|
||||
page {
|
||||
page {
|
||||
background-color: #f2f2f2;
|
||||
}
|
||||
}
|
||||
|
||||
.search-icon {
|
||||
.search-icon {
|
||||
width: 25rpx;
|
||||
height: 25rpx;
|
||||
position: absolute;
|
||||
left: 30rpx;
|
||||
top: 12rpx;
|
||||
|
||||
image {}
|
||||
image {
|
||||
}
|
||||
}
|
||||
|
||||
.search-bg {}
|
||||
.search-bg {
|
||||
}
|
||||
|
||||
.top {
|
||||
.top {
|
||||
/* height: 200rpx; */
|
||||
background-color: #fff;
|
||||
padding: 20rpx 0 20rpx 0;
|
||||
}
|
||||
}
|
||||
|
||||
.search-tops {
|
||||
.search-tops {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
height: 65rpx;
|
||||
line-height: 65rpx;
|
||||
padding-bottom: 40rpx;
|
||||
border-bottom: 1px solid #eee;
|
||||
}
|
||||
}
|
||||
|
||||
.search-bg {
|
||||
.search-bg {
|
||||
width: 432rpx;
|
||||
height: 35rpx;
|
||||
background: #F5F6F8;
|
||||
background: #f5f6f8;
|
||||
border-radius: 33rpx;
|
||||
display: flex;
|
||||
position: relative;
|
||||
padding: 20rpx 50rpx;
|
||||
margin-left: 20rpx;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
@ -20,7 +20,7 @@ module.exports = vm => {
|
|||
|
||||
//#ifdef DEV_SERVER
|
||||
console.log('DEV_SERVER')
|
||||
config.baseURL = 'http://192.168.0.86:8080'
|
||||
config.baseURL = '/prod-api'
|
||||
//#endif
|
||||
|
||||
//#ifdef QA_SERVER
|
||||
|
|
|
|||
|
|
@ -53,12 +53,13 @@
|
|||
<view
|
||||
v-for="(fieldName, fieldKey) in BONUS_FIELD_MAP"
|
||||
:key="fieldKey"
|
||||
class="bonus-item"
|
||||
>
|
||||
<view class="bonus-item" v-if="dailyBonus[fieldKey]">
|
||||
<text class="item-label">{{ fieldName }}(¥)</text>
|
||||
<text class="item-value">{{ dailyBonus[fieldKey] }}</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="card-footer">
|
||||
<text class="subtotal-label">小计(¥)</text>
|
||||
<text class="subtotal-value">{{
|
||||
|
|
@ -115,7 +116,8 @@ export default {
|
|||
retailSameLevelIncome: '平级收益',
|
||||
retailAreaIncome: '区域收益',
|
||||
retailBenefitRangeIncome: '福利级差收益',
|
||||
retailMonthRepurchaseIncome: '复购级差收益',
|
||||
repurRangeIncome: '复购级差收益',
|
||||
retailMonthRepurchaseIncome: '月复购级差收益',
|
||||
coachIncome: '培育津贴',
|
||||
retailBenefitIncomeTotal: '福利分红收益',
|
||||
backPoints: '重消收益',
|
||||
|
|
|
|||
|
|
@ -21,11 +21,22 @@
|
|||
}}</text>
|
||||
</view>
|
||||
<view v-for="(label, key) in detailLabels" :key="key" class="detail-item">
|
||||
<template
|
||||
v-if="key === 'repurRangeIncome' && bonusData.repurRangeIncome"
|
||||
>
|
||||
<text class="detail-label">{{ label }}</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 class="divider"></view>
|
||||
|
|
@ -63,6 +74,7 @@ export default {
|
|||
retailRangeIncome: '直推收益(¥)',
|
||||
retailSameLevelIncome: '平级收益(¥)',
|
||||
retailAreaIncome: '区域收益(¥)',
|
||||
repurRangeIncome: '复购级差收益(¥)',
|
||||
// welfareLevelDifferenceIncome: '福利级差收益(¥)',
|
||||
// welfareDividendIncome: '福利分红收益(¥)',
|
||||
backPoints: '重消收益(¥)',
|
||||
|
|
|
|||
Loading…
Reference in New Issue