From f93f455134ff234be9d257c0f432c8052f1c32cd Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 18 七月 2025 19:20:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
small-program/pages/mine/mine.vue | 85 +++++++++++++++++++++++++++++++-----------
1 files changed, 63 insertions(+), 22 deletions(-)
diff --git a/small-program/pages/mine/mine.vue b/small-program/pages/mine/mine.vue
index d420adf..a6fe7a9 100644
--- a/small-program/pages/mine/mine.vue
+++ b/small-program/pages/mine/mine.vue
@@ -28,8 +28,8 @@
</view>
<view class="info-box-label">璐︽埛浣欓</view>
<view class="info-box-price">
- <text>锟{isLogin?(userInfo.amount || 0) :0.00}}</text>
- <view class="info-box-price-btn" @click="jump(6)">鍘绘彁鐜�</view>
+ <text>锟{isLogin?((userInfo.amount|| 0)/100).toFixed(2) :0.00}}</text>
+ <view class="info-box-price-btn" @click="jump(isLogin?6:5)">鍘绘彁鐜�</view>
</view>
</view>
</view>
@@ -80,7 +80,7 @@
<view class="paidan-label">鎺ュ彈绯荤粺鑷姩娲惧崟</view>
<view class="paidan-right">
<text>鍏抽棴</text>
- <u-switch activeColor="#00BC12" v-model="autoReceiveStatus"></u-switch>
+ <u-switch activeColor="#00BC12" @change="updateMemberInfo" v-model="autoReceiveStatus"></u-switch>
</view>
</view>
</view>
@@ -94,24 +94,33 @@
<text>鏀惰垂鏍囧噯</text>
<u-icon name="arrow-right" color="#111111" size="18"></u-icon>
</view>
- <view class="list-hz-item" @click="jump(2)">
+ <view class="list-hz-item" @click="jump(isLogin?2:5)">
<text>宸ヤ汉璧氶挶</text>
<view class="list-hz-item-r">
- <text>鍙帴鐢ㄥ伐璁㈠崟</text>
+ <text v-if="userInfo.workerIdentity === 2">宸茶璇�</text>
+ <text class="orangetxt" v-else-if="userInfo.workerIdentity === 1">璁よ瘉涓�</text>
+ <text class="redtxt" v-else-if="userInfo.workerIdentity === 3">璁よ瘉澶辫触</text>
+ <text v-else>鍙帴鐢ㄥ伐璁㈠崟</text>
<u-icon name="arrow-right" color="#111111" size="18"></u-icon>
</view>
</view>
- <view class="list-hz-item" @click="jump(3)">
+ <view class="list-hz-item" @click="jump(isLogin?3:5)">
<text>鍙告満璧氶挶</text>
<view class="list-hz-item-r">
- <text>鍙帴鐢ㄥ伐璁㈠崟</text>
+ <text v-if="userInfo.driverIdentity === 2">宸茶璇�</text>
+ <text class="orangetxt" v-else-if="userInfo.driverIdentity === 1">璁よ瘉涓�</text>
+ <text class="redtxt" v-else-if="userInfo.driverIdentity === 3">璁よ瘉澶辫触</text>
+ <text v-else>鍙帴杩愯揣璁㈠崟</text>
<u-icon name="arrow-right" color="#111111" size="18"></u-icon>
</view>
</view>
- <view class="list-hz-item" @click="jump(4)">
+ <view class="list-hz-item" @click="jump(isLogin?4:5)">
<text>鎴戣兘渚涢</text>
<view class="list-hz-item-r">
- <text>鍙帴鐢ㄥ伐璁㈠崟</text>
+ <text v-if="userInfo.chefIdentity === 2">宸茶璇�</text>
+ <text class="orangetxt" v-else-if="userInfo.chefIdentity === 1">璁よ瘉涓�</text>
+ <text class="redtxt" v-else-if="userInfo.chefIdentity === 3">璁よ瘉澶辫触</text>
+ <text v-else>鍙帴鐢ㄩ璁㈠崟</text>
<u-icon name="arrow-right" color="#111111" size="18"></u-icon>
</view>
</view>
@@ -146,6 +155,7 @@
this.isLogin=false
this.autoReceiveStatus=false;
this.useIdentity =0
+
if(this.token &&this.token!='' && this.userInfo && JSON.stringify(this.userInfo) != '{}'){
this.isLogin=true
this.getUserInfo()
@@ -169,7 +179,7 @@
},
jumpService(flag) {
uni.navigateTo({
- url: '/pages/withdrawal/withdrawal'
+ url: '/pages/rich-text-page/rich-text-page?flag='+flag
})
},
jump(type) {
@@ -180,30 +190,52 @@
})
break;
case 2:
- uni.navigateTo({
- url: '/pages/employment-certification/employment-certification'
- })
+ if(!this.userInfo.workerIdentity ||this.userInfo.workerIdentity ==0){
+ uni.navigateTo({
+ url: '/pages/employment-certification/employment-certification?flag=0'
+ })
+ }else{
+ uni.navigateTo({
+ url: '/pages/certification-results/certification-results?flag=0'
+ })
+ }
+ break;
break;
case 3:
- uni.navigateTo({
- url: '/pages/freight-certification/freight-certification'
- })
+ if(!this.userInfo.driverIdentity ||this.userInfo.driverIdentity ==0){
+ uni.navigateTo({
+ url: '/pages/employment-certification/employment-certification?flag=1'
+ })
+ }else{
+ uni.navigateTo({
+ url: '/pages/certification-results/certification-results?flag=1'
+ })
+ }
break;
case 4:
- uni.navigateTo({
- url: '/pages/catering-certification/catering-certification'
- })
-
+ if(!this.userInfo.chefIdentity ||this.userInfo.chefIdentity ==0){
+ uni.navigateTo({
+ url: '/pages/employment-certification/employment-certification?flag=2'
+ })
+ }else{
+ uni.navigateTo({
+ url: '/pages/certification-results/certification-results?flag=2'
+ })
+ }
break;
case 5:
uni.navigateTo({
url: '/pages/login/login'
})
break;
-
case 6:
uni.navigateTo({
url: '/pages/withdrawal/withdrawal'
+ })
+ break;
+ case 7:
+ uni.navigateTo({
+ url: '/pages/certification-results/certification-results'
})
break;
}
@@ -228,12 +260,13 @@
console.log(222,res)
if(res.code ===200){
that.userInfo.useIdentity = param.useIdentity
+ uni.$emit('refresh')
}
}).finally(() => {
that.changing1 = false
})
} ,
- updateMemberInfo() {
+ updateMemberInfo(e) {
if(this.changing){
return
}
@@ -268,6 +301,7 @@
.list {
width: 100%;
padding: 0 30rpx;
+ padding-bottom: 30px;
box-sizing: border-box;
.list-hz {
width: 100%;
@@ -532,8 +566,15 @@
color: #5BBE38;
margin-top: 80rpx;
border: 1rpx solid #15CF52;
+ bottom: 50px;
}
+ .bluetxt{
+ color:blue !important ;
+ }
.redtxt{
color:#FF0000 !important ;
+ }
+ .orangetxt{
+ color: #FF7200 !important ;
}
</style>
--
Gitblit v1.9.3