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

fix(mine/bonus): 我的页面奖衔相关展示逻辑变更，奖金隐藏查看详情

This commit is contained in:
ywk 2025-04-14 09:44:09 +08:00
parent 1174d23ab1
commit 030f0e0771
9 changed files with 318 additions and 372 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/bonus/ckkj.vue
View File

@ -69,11 +69,11 @@
{{ item.makerRealSubtotal | toThousandthAndKeepDecimal }} {{ item.makerRealSubtotal | toThousandthAndKeepDecimal }}
</view> </view>
</view> </view>
<view class="border_s"> <!-- <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>

4
components/bonus/fgqsy.vue
View File

@ -71,11 +71,11 @@
{{item.repurCouponSubtotal | numberToCurrency}} {{item.repurCouponSubtotal | numberToCurrency}}
</view> </view>
</view> </view>
<view class="border_s"> <!-- <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>

4
components/bonus/fgsy.vue
View File

@ -87,11 +87,11 @@
{{item.repurRealSubtotal | toThousandthAndKeepDecimal}} {{item.repurRealSubtotal | toThousandthAndKeepDecimal}}
</view> </view>
</view> </view>
<view class="border_s"> <!-- <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>

4
components/bonus/hfsy.vue
View File

@ -63,11 +63,11 @@
{{item.realIncomeTotal| numberToCurrency}} {{item.realIncomeTotal| numberToCurrency}}
</view> </view>
</view> </view>
<view class="border_s"> <!-- <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>

4
components/bonus/hignfsy.vue
View File

@ -63,11 +63,11 @@
{{item.hiFunRealSubtotal | numberToCurrency}} {{item.hiFunRealSubtotal | numberToCurrency}}
</view> </view>
</view> </view>
<view class="border_s"> <!-- <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>

4
components/bonus/sgsy.vue
View File

@ -120,11 +120,11 @@
{{item.purRealSubtotal| toThousandthAndKeepDecimal}} {{item.purRealSubtotal| toThousandthAndKeepDecimal}}
</view> </view>
</view> </view>
<view class="border_s"> <!-- <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>

2
pages/makerspaceView/energySiloDetail.vue
View File

@ -16,7 +16,7 @@
<view class='line2'>{{item.gradeName}}</view> <view class='line2'>{{item.gradeName}}</view>
</view> </view>
<view class="line_box"> <view class="line_box">
<view class='line1'>{{'真实奖衔'}}</view> <view class='line1'>{{'荣誉奖衔'}}</view>
<view class='line2'>{{item.awardsName}}</view> <view class='line2'>{{item.awardsName}}</view>
</view> </view>
<view class="line_box"> <view class="line_box">

71
pages/mine/index.vue
View File

@ -43,8 +43,8 @@
</view> </view>
</view> </view>
<view class="cmem"> <view class="cmem">
<view style="margin-right: 10rpx;">{{ '真实奖衔' }}:</view> <view style="margin-right: 10rpx;">{{ '荣誉奖衔' }}:</view>
<view class="jxTit1">{{ awards.awardsName }}</view> <view class="jxTit1">{{ awardsList.awardsName }}</view>
</view> </view>
</view> </view>
@ -64,73 +64,6 @@
</view> --> </view> -->
<view class="jugrade_flex"> <view class="jugrade_flex">
<view class="ju_left"> <view class="ju_left">
<view v-if="userInfo.pkCountry == 1">
<view
class="ju_left_top"
v-if="awards.targetPv != '-6.40'"
:spv="awards.sumRealPv"
:tpv="awards.targetPv"
>
<span class="ju_text1">恭喜您!已达成 </span>
<span class="ju_text2">{{ awards.awardsName }}</span>
<span> 奖衔,冲刺 </span>
<span class="ju_text2">{{ awards.pkTransactionVal }}</span>
<span>奖衔,小区仅需</span>
<span class="ju_text2">
{{
(awards.targetPv - awards.sumRealPv > 0
? awards.targetPv - awards.sumRealPv
: "0.00") | toThousandthAndKeepDecimal
}}{{ '万' }}</span
>
</view>
<view class="ju_left_top" v-else>
<span class="ju_text1">恭喜您!已达标当月最高奖衔</span>
<span class="ju_text2">{{ awards.awardsName }}</span>
<span class="ju_text1">!记得保持哦!</span>
</view>
</view>
<view v-else>
<view
class="ju_left_top"
v-if="awards.targetPv != '-1.00'"
:spv="awards.sumRealPv"
:tpv="awards.targetPv"
>
<span class="ju_text1">恭喜您!已达成 </span>
<span class="ju_text2">{{ awards.awardsName }}</span>
<span> 奖衔,冲刺 </span>
<span class="ju_text2">{{ awards.pkTransactionVal }}</span>
<span>奖衔,小区仅需</span>
<span class="ju_text2">
{{
(awards.targetPv - awards.sumRealPv > 0
? awards.targetPv - awards.sumRealPv
: "0.00") | toThousandthAndKeepDecimal
}}{{ '万' }}</span
>
</view>
<view class="ju_left_top" v-else>
<span class="ju_text1">恭喜您!已达标当月最高奖衔</span>
<span class="ju_text2">{{ awards.awardsName }}</span>
<span class="ju_text1">!记得保持哦!</span>
</view>
</view>
<view class="yestDay">
<view class="yes_t">{{ '当月奖衔' }}</view>
<view class="ju_left_bottom">
<view
class="current-schedule1"
:style="{
width: GetPercent(awards.sumRealPv, awards.targetPv),
}"
></view>
<view class="cha" v-if="awards.targetPv > 0">
{{ awards.sumRealPv }}万/{{ awards.targetPv }}万</view
>
<view class="cha" v-else> {{ awards.sumRealPv }}万</view>
</view>
</view>
<view class="yestDay"> <view class="yestDay">
<view class="yes_t">{{ '昨日业绩' }}</view> <view class="yes_t">{{ '昨日业绩' }}</view>
<view :class="awards.aNewPv!=0&&awards.bNewPv!=0?'ju_left_bottom1':'ju_left_bottom'"> <view :class="awards.aNewPv!=0&&awards.bNewPv!=0?'ju_left_bottom1':'ju_left_bottom'">

67
pages/userData/index.vue
View File

@ -46,8 +46,7 @@
</view> </view>
</view> </view>
<view class="index-view"> <view class="index-view">
<view class="user-name"> <view class="user-name"> {{ '联系方式' }}</view>
{{'联系方式'}}</view>
<view class="user-right"> <view class="user-right">
{{ userInfo.phone }} {{ userInfo.phone }}
</view> </view>
@ -59,7 +58,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class="content" style="border-bottom: none;"> <view class="content" style="border-bottom: none">
<!-- <view class="index-view tops"> <!-- <view class="index-view tops">
<view class="user-name">{{'自然国家'}}</view> <view class="user-name">{{'自然国家'}}</view>
<view class="user-right"> <view class="user-right">
@ -90,16 +89,16 @@
{{userInfo.agentGrade}} {{userInfo.agentGrade}}
</view> </view>
</view> --> </view> -->
<view class="index-view"> <!-- <view class="index-view">
<view class="user-name">{{ '真实奖衔' }}</view> <view class="user-name">{{ '真实奖衔' }}</view>
<view class="user-right"> <view class="user-right">
{{ userInfo.awardsVal }} {{ userInfo.awardsVal }}
</view> </view>
</view> </view> -->
<view class="index-view"> <view class="index-view">
<view class="user-name">荣誉奖衔</view> <view class="user-name">荣誉奖衔</view>
<view class="user-right"> <view class="user-right">
{{userInfo.maxAwardsVal}} {{ userInfo.awardsVal }}
</view> </view>
</view> </view>
<view class="index-view none"> <view class="index-view none">
@ -126,7 +125,10 @@
{{ userInfo.payTime }} {{ userInfo.payTime }}
</view> </view>
</view> </view>
<view class="index-view none" v-if="userInfo.pkCountry == 1&&userData.expireDate"> <view
class="index-view none"
v-if="userInfo.pkCountry == 1 && userData.expireDate"
>
<view class="user-name">有效期</view> <view class="user-name">有效期</view>
<view class="user-right"> <view class="user-right">
{{ userData.expireDate }} {{ userData.expireDate }}
@ -162,7 +164,13 @@
> >
</u--input> </u--input>
</view> </view>
<u-button :disabled="!userInfo.nickName" class="btn" @click="submit" type="error" text="确 定"></u-button> <u-button
:disabled="!userInfo.nickName"
class="btn"
@click="submit"
type="error"
text="确 定"
></u-button>
</u-popup> </u-popup>
</view> </view>
</template> </template>
@ -191,17 +199,17 @@ export default {
}, },
updateImg() { updateImg() {
const http = uni.$u.http.config.baseURL const http = uni.$u.http.config.baseURL
let token = getToken(); let token = getToken()
uni.chooseImage({ uni.chooseImage({
sourceType: ['album'], //从相册选择 sourceType: ['album'], //从相册选择
success: chooseImageRes => { success: chooseImageRes => {
const tempFilePaths = chooseImageRes.tempFilePaths; const tempFilePaths = chooseImageRes.tempFilePaths
uni.uploadFile({ uni.uploadFile({
url: http + '/member/api/member/update-head', //仅为示例，非真实的接口地址 url: http + '/member/api/member/update-head', //仅为示例，非真实的接口地址
filePath: tempFilePaths[0], filePath: tempFilePaths[0],
name: 'file', name: 'file',
header: { header: {
Authorization:token Authorization: token,
}, },
success: res => { success: res => {
console.error(res) console.error(res)
@ -210,18 +218,20 @@ export default {
let data = JSON.parse(res.data) let data = JSON.parse(res.data)
this.userInfo.headPath = data.data.url this.userInfo.headPath = data.data.url
} }
} },
}); })
}, },
fail: err => { fail: err => {
uni.$u.toast('上传失败', 'none'); uni.$u.toast('上传失败', 'none')
} },
}); })
}, },
submit() { submit() {
api.updateData({ api
.updateData({
nickName: this.userInfo.nickName, nickName: this.userInfo.nickName,
}).then((res)=>{ })
.then(res => {
uni.showToast({ uni.showToast({
title: res.msg, title: res.msg,
icon: 'none', icon: 'none',
@ -248,14 +258,18 @@ export default {
// }); // });
// }, // },
getInfo() { getInfo() {
api.getData().then(res => { api
.getData()
.then(res => {
if (res) { if (res) {
this.userInfo = res.data this.userInfo = res.data
if (this.userInfo.nickName.length > 20) { if (this.userInfo.nickName.length > 20) {
this.userInfo.nickName1 = this.userInfo.nickName.substring(0,20)+'...' this.userInfo.nickName1 =
this.userInfo.nickName.substring(0, 20) + '...'
} }
} }
}).catch(error => { })
.catch(error => {
reject(error) reject(error)
}) })
// api.getInfo().then(res => { // api.getInfo().then(res => {
@ -273,7 +287,7 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.kung { .kung {
padding: 20rpx 20rpx padding: 20rpx 20rpx;
} }
.title { .title {
font-size: 40rpx; font-size: 40rpx;
@ -291,7 +305,7 @@ export default {
margin-right: 20rpx; margin-right: 20rpx;
} }
page { page {
background-color: #F2F2F2; background-color: #f2f2f2;
} }
.none { .none {
border-bottom: none; border-bottom: none;
@ -300,16 +314,15 @@ export default {
border-top: 1rpx solid #eee; border-top: 1rpx solid #eee;
} }
.content { .content {
border-bottom: 20rpx solid #F2F2F2; border-bottom: 20rpx solid #f2f2f2;
background-color: #fff; background-color: #fff;
} }
.index-view { .index-view {
height: 110rpx; height: 110rpx;
margin: 0 30rpx 0 30rpx; margin: 0 30rpx 0 30rpx;
padding: 0 10rpx; padding: 0 10rpx;
line-height: 110rpx; line-height: 110rpx;
border-bottom: 1rpx solid #EEEEEE; border-bottom: 1rpx solid #eeeeee;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
position: relative; position: relative;
@ -345,7 +358,7 @@ export default {
} }
} }
.btn { .btn {
background-color: #FB3024; background-color: #fb3024;
border: none; border: none;
height: 92rpx; height: 92rpx;
line-height: 92rpx; line-height: 92rpx;