angelo
/
web-store-retail-h5
forked from angelo/web-retail-h5
3
0
Fork 0
Code Pull Requests 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 }}
</view>
</view>
<view class="border_s">
<!-- <view class="border_s">
<view class="button" v-if="checkRule == true" @click="urlTap">
{{ '查看详情' }}
</view>
</view>
</view> -->
<view style="clear: both"></view>
<view style="height: 20rpx; background-color: #fff"></view>
</view>

4
components/bonus/fgqsy.vue
View File

@ -71,11 +71,11 @@
{{item.repurCouponSubtotal | numberToCurrency}}
</view>
</view>
<view class="border_s">
<!-- <view class="border_s">
<view class="button" v-if="checkRule==true" @click="urlTap">
{{'查看详情'}}
</view>
</view>
</view> -->
<view style="clear: both;"></view>
<view style="height: 20rpx;background-color: #fff;"></view>
</view>

4
components/bonus/fgsy.vue
View File

@ -87,11 +87,11 @@
{{item.repurRealSubtotal | toThousandthAndKeepDecimal}}
</view>
</view>
<view class="border_s">
<!-- <view class="border_s">
<view class="button" v-if="checkRule==true" @click="urlTap">
{{'查看详情'}}
</view>
</view>
</view> -->
<view style="clear: both;"></view>
<view style="height: 20rpx;background-color: #fff;"></view>
</view>

4
components/bonus/hfsy.vue
View File

@ -63,11 +63,11 @@
{{item.realIncomeTotal| numberToCurrency}}
</view>
</view>
<view class="border_s">
<!-- <view class="border_s">
<view class="button" v-if="checkRule==true" @click="urlTap">
{{'查看详情'}}
</view>
</view>
</view> -->
<view style="clear: both;"></view>
<view style="height: 20rpx;background-color: #fff;"></view>
</view>

4
components/bonus/hignfsy.vue
View File

@ -63,11 +63,11 @@
{{item.hiFunRealSubtotal | numberToCurrency}}
</view>
</view>
<view class="border_s">
<!-- <view class="border_s">
<view class="button" v-if="checkRule==true" @click="urlTap">
{{'查看详情'}}
</view>
</view>
</view> -->
<view style="clear: both;"></view>
<view style="height: 20rpx;background-color: #fff;"></view>
</view>

4
components/bonus/sgsy.vue
View File

@ -120,11 +120,11 @@
{{item.purRealSubtotal| toThousandthAndKeepDecimal}}
</view>
</view>
<view class="border_s">
<!-- <view class="border_s">
<view class="button" v-if="checkRule==true" @click="urlTap">
{{'查看详情'}}
</view>
</view>
</view> -->
<view style="clear: both;"></view>
<view style="height: 20rpx;background-color: #fff;"></view>
</view>

2
pages/makerspaceView/energySiloDetail.vue
View File

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

71
pages/mine/index.vue
View File

@ -43,8 +43,8 @@
</view>
</view>
<view class="cmem">
<view style="margin-right: 10rpx;">{{ '真实奖衔' }}:</view>
<view class="jxTit1">{{ awards.awardsName }}</view>
<view style="margin-right: 10rpx;">{{ '荣誉奖衔' }}:</view>
<view class="jxTit1">{{ awardsList.awardsName }}</view>
</view>
</view>
@ -64,73 +64,6 @@
</view> -->
<view class="jugrade_flex">
<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="yes_t">{{ '昨日业绩' }}</view>
<view :class="awards.aNewPv!=0&&awards.bNewPv!=0?'ju_left_bottom1':'ju_left_bottom'">

201
pages/userData/index.vue
View File

@ -8,58 +8,57 @@
<view class="main">
<view class="content">
<view class="index-view tops" @click="updateImg">
<view class="user-name">{{'头像'}}</view>
<view class="user-name">{{ '头像' }}</view>
<view class="user-right rights">
<view class="avatar">
<image :src="userInfo.headPath"/>
<image :src="userInfo.headPath" />
</view>
<view class="right-icon">
<image src="../../static/images/right.png"/>
<image src="../../static/images/right.png" />
</view>
</view>
</view>
<view class="index-view">
<view class="user-name">{{'昵称'}}</view>
<view class="user-right rights" @click="downShow=true">
<view class="user-name">{{ '昵称' }}</view>
<view class="user-right rights" @click="downShow = true">
<!-- {{ userInfo.nickName1 }} -->
<!-- <view >
<u-input class="border-s" :maxlength="40" v-model="userInfo.nickName" />
</view> -->
<view class="nana">{{ userInfo.nickName }}</view>
<view class="right-icon">
<image src="../../static/images/right.png"/>
<image src="../../static/images/right.png" />
</view>
</view>
</view>
</view>
<view class="content">
<view class="index-view tops">
<view class="user-name">{{'真实姓名'}}</view>
<view class="user-name">{{ '真实姓名' }}</view>
<view class="user-right">
{{userInfo.memberName}}
{{ userInfo.memberName }}
</view>
</view>
<view class="index-view">
<view class="user-name">{{'会员编号'}}</view>
<view class="user-name">{{ '会员编号' }}</view>
<view class="user-right">
{{userInfo.memberCode}}
{{ userInfo.memberCode }}
</view>
</view>
<view class="index-view">
<view class="user-name">
{{'联系方式'}}</view>
<view class="user-name"> {{ '联系方式' }}</view>
<view class="user-right">
{{userInfo.phone}}
{{ userInfo.phone }}
</view>
</view>
<view class="index-view">
<view class="user-name">{{'证件号码'}}</view>
<view class="user-name">{{ '证件号码' }}</view>
<view class="user-right">
{{userInfo.idCardAuth}}
{{ userInfo.idCardAuth }}
</view>
</view>
</view>
<view class="content" style="border-bottom: none;">
<view class="content" style="border-bottom: none">
<!-- <view class="index-view tops">
<view class="user-name">{{'自然国家'}}</view>
<view class="user-right">
@ -73,15 +72,15 @@
</view>
</view> -->
<view class="index-view">
<view class="user-name">{{'注册等级'}}</view>
<view class="user-name">{{ '注册等级' }}</view>
<view class="user-right">
{{userInfo.registerGradeVal}}
{{ userInfo.registerGradeVal }}
</view>
</view>
<view class="index-view">
<view class="user-name">{{'结算等级'}}</view>
<view class="user-name">{{ '结算等级' }}</view>
<view class="user-right">
{{userInfo.settleGradeVal}}
{{ userInfo.settleGradeVal }}
</view>
</view>
<!-- <view class="index-view">
@ -90,52 +89,55 @@
{{userInfo.agentGrade}}
</view>
</view> -->
<view class="index-view">
<view class="user-name">{{'真实奖衔'}}</view>
<!-- <view class="index-view">
<view class="user-name">{{ '真实奖衔' }}</view>
<view class="user-right">
{{userInfo.awardsVal}}
</view>
{{ userInfo.awardsVal }}
</view>
</view> -->
<view class="index-view">
<view class="user-name">荣誉奖衔</view>
<view class="user-right">
{{userInfo.maxAwardsVal}}
{{ userInfo.awardsVal }}
</view>
</view>
<view class="index-view none">
<view class="user-name">{{'创建日期'}}</view>
<view class="user-name">{{ '创建日期' }}</view>
<view class="user-right">
{{userInfo.payTime}}
{{ userInfo.payTime }}
</view>
</view>
<view class="index-view none">
<view class="user-name">{{'注册业绩'}}</view>
<view class="user-name">{{ '注册业绩' }}</view>
<view class="user-right">
{{userInfo.consumeAchieve|toThousandthAndKeepDecimal}}
{{ userInfo.consumeAchieve | toThousandthAndKeepDecimal }}
</view>
</view>
<view class="index-view none">
<view class="user-name">{{'会员权益'}}</view>
<view class="user-name">{{ '会员权益' }}</view>
<view class="user-right">
{{userInfo.registerAuthorityVal}}
{{ userInfo.registerAuthorityVal }}
</view>
</view>
<view class="index-view none">
<view class="user-name">{{'支付时间'}}</view>
<view class="user-name">{{ '支付时间' }}</view>
<view class="user-right">
{{userInfo.payTime}}
{{ userInfo.payTime }}
</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-right">
{{userData.expireDate}}
{{ userData.expireDate }}
</view>
</view>
<view class="index-view none" v-if="userInfo.serviceCode">
<view class="user-name">{{'服务编号'}}</view>
<view class="user-name">{{ '服务编号' }}</view>
<view class="user-right">
{{userData.serviceCode}}
{{ userData.serviceCode }}
</view>
</view>
</view>
@ -162,7 +164,13 @@
>
</u--input>
</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>
</view>
</template>
@ -175,10 +183,10 @@ import store from '@/store'
export default {
data() {
return {
downShow:false,
userInfo:{},
userData:'',
urls:'/member/api/maker-space/update-file',
downShow: false,
userInfo: {},
userData: '',
urls: '/member/api/maker-space/update-file',
}
},
onLoad() {
@ -191,17 +199,17 @@ export default {
},
updateImg() {
const http = uni.$u.http.config.baseURL
let token = getToken();
let token = getToken()
uni.chooseImage({
sourceType: ['album'], //从相册选择
success: chooseImageRes => {
const tempFilePaths = chooseImageRes.tempFilePaths;
const tempFilePaths = chooseImageRes.tempFilePaths
uni.uploadFile({
url: http+'/member/api/member/update-head', //仅为示例，非真实的接口地址
url: http + '/member/api/member/update-head', //仅为示例，非真实的接口地址
filePath: tempFilePaths[0],
name: 'file',
header: {
Authorization:token
Authorization: token,
},
success: res => {
console.error(res)
@ -210,18 +218,20 @@ export default {
let data = JSON.parse(res.data)
this.userInfo.headPath = data.data.url
}
}
});
},
})
},
fail: err => {
uni.$u.toast('上传失败', 'none');
}
});
uni.$u.toast('上传失败', 'none')
},
})
},
submit() {
api.updateData({
api
.updateData({
nickName: this.userInfo.nickName,
}).then((res)=>{
})
.then(res => {
uni.showToast({
title: res.msg,
icon: 'none',
@ -247,15 +257,19 @@ export default {
// }
// });
// },
getInfo(){
api.getData().then(res => {
getInfo() {
api
.getData()
.then(res => {
if (res) {
this.userInfo = res.data
if(this.userInfo.nickName.length > 20){
this.userInfo.nickName1 = this.userInfo.nickName.substring(0,20)+'...'
if (this.userInfo.nickName.length > 20) {
this.userInfo.nickName1 =
this.userInfo.nickName.substring(0, 20) + '...'
}
}
}).catch(error => {
})
.catch(error => {
reject(error)
})
// api.getInfo().then(res => {
@ -272,8 +286,8 @@ export default {
</script>
<style lang="scss" scoped>
.kung{
padding: 20rpx 20rpx
.kung {
padding: 20rpx 20rpx;
}
.title {
font-size: 40rpx;
@ -282,75 +296,74 @@ export default {
color: #333;
font-weight: bold;
}
.border-s{
.border-s {
border: none;
position: absolute;
right: 0;
width: 120rpx;
height: 85rpx;
margin-right: 20rpx;
}
page{
background-color: #F2F2F2;
}
.none{
}
page {
background-color: #f2f2f2;
}
.none {
border-bottom: none;
}
.tops{
}
.tops {
border-top: 1rpx solid #eee;
}
.content{
border-bottom: 20rpx solid #F2F2F2;
}
.content {
border-bottom: 20rpx solid #f2f2f2;
background-color: #fff;
}
.index-view{
}
.index-view {
height: 110rpx;
margin: 0 30rpx 0 30rpx;
padding: 0 10rpx;
line-height: 110rpx;
border-bottom: 1rpx solid #EEEEEE;
border-bottom: 1rpx solid #eeeeee;
display: flex;
justify-content: space-between;
position: relative;
color: #333;
}
.user-right{
}
.user-right {
color: #999;
font-size: 28rpx;
display: flex;
align-items: center;
}
.rights{
}
.rights {
margin-right: 45rpx;
}
.nana{
}
.nana {
flex: 1;
}
.right-icon{
}
.right-icon {
position: absolute;
top:12rpx;
top: 12rpx;
right: 0;
image{
image {
width: 40rpx;
height:40rpx;
height: 40rpx;
}
}
.avatar{
}
.avatar {
margin-top: 10rpx;
image{
image {
width: 89rpx;
height: 89rpx;
border-radius: 50%;
}
}
.btn{
background-color: #FB3024;
}
.btn {
background-color: #fb3024;
border: none;
height: 92rpx;
line-height: 92rpx;
font-size:30rpx;
font-size: 30rpx;
margin: 40rpx auto;
width: 690rpx;
}
}
</style>