From a59ff44b2eaa7020f0529632d9ec064c4dc38e27 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期二, 28 四月 2026 22:08:46 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
app/pages/mine/mine.vue | 135 ++++++++++++++++++++++++++++++++-------------
1 files changed, 96 insertions(+), 39 deletions(-)
diff --git a/app/pages/mine/mine.vue b/app/pages/mine/mine.vue
index fdb3a46..291295b 100644
--- a/app/pages/mine/mine.vue
+++ b/app/pages/mine/mine.vue
@@ -6,20 +6,19 @@
</view>
</view>
- <scroll-view class="mine-page__body" scroll-y :style="bodyStyle">
+ <view class="mine-page__body" :style="bodyStyle">
<view class="mine-page__content">
<view class="mine-page__profile">
- <image class="mine-page__avatar" src="/static/image/ic_pic@2x.png" mode="aspectFill"></image>
+ <image class="mine-page__avatar" :src="userInfo.imgurl || '/static/image/ic_pic@2x.png'" mode="aspectFill"></image>
<view class="mine-page__profile-info">
<view class="mine-page__name-row">
- <text class="mine-page__name">{{ currentProfile.name }}</text>
- <view v-if="currentProfile.levelTag" class="mine-page__level-tag">
- <!-- <text class="mine-page__level-dot"></text> -->
+ <text class="mine-page__name">{{ userInfo.name }}</text>
+ <view v-if="userInfo.driverLevel" class="mine-page__level-tag">
<image src="/static/image/ic_jiangpai@2x.png" mode="widthFix" class="mine-page__level-dot"></image>
- <text class="mine-page__level-text">{{ currentProfile.levelTag }}</text>
+ <text class="mine-page__level-text">{{ getDriverLevelText(userInfo.driverLevel) }}</text>
</view>
</view>
- <text class="mine-page__phone">{{ currentProfile.phone }}</text>
+ <text class="mine-page__phone">{{ userInfo.telephone || '' }} 锛坽{ userInfo.carCode || '' }} 锛�</text>
</view>
</view>
@@ -47,12 +46,11 @@
<template v-if="item.key === 'wallet'">
<text class="menu-panel__sub menu-panel__sub--muted">浣欓锛歿{ currentProfile.walletBalance }}</text>
</template>
- <template v-else-if="item.key === 'driver' && !currentProfile.verified">
- <text class="menu-panel__sub menu-panel__sub--danger">瀹屾垚璁よ瘉鍚庡嵆鍙帴鍗�</text>
- </template>
- <template v-else-if="item.key === 'driver' && currentProfile.verified">
- <text class="menu-panel__sub menu-panel__sub--warning">瀹℃牳涓�</text>
- <text class="menu-panel__sub menu-panel__sub--primary">宸茶璇�</text>
+ <template v-if="item.key === 'driver'">
+ <text v-if="userInfo.auditStatus === 99" class="menu-panel__sub menu-panel__sub--danger">瀹屾垚璁よ瘉鍚庡嵆鍙帴鍗�</text>
+ <text v-else-if="userInfo.auditStatus === 0" class="menu-panel__sub menu-panel__sub--danger">瀹℃牳涓�</text>
+ <text v-if="userInfo.auditStatus === 2" class="menu-panel__sub menu-panel__sub--danger">宸查┏鍥�</text>
+ <text v-else-if="userInfo.auditStatus === 3" class="menu-panel__sub menu-panel__sub--primary">宸茶璇�</text>
</template>
<template v-else-if="item.key === 'setting'">
<text class="menu-panel__sub menu-panel__sub--muted">褰撳墠鐗堟湰V1.0.0</text>
@@ -63,16 +61,18 @@
</view>
</view>
</view>
+ <view style="width: 100%; height: 5rpx;"></view>
</view>
- </scroll-view>
+ </view>
<view class="mine-page__footer">
- <button class="mine-page__logout" hover-class="mine-page__logout--hover">閫�鍑虹櫥褰�</button>
+ <button class="mine-page__logout" hover-class="mine-page__logout--hover" @click.stop="handleLogout">閫�鍑虹櫥褰�</button>
</view>
</view>
</template>
<script>
+ import { mapState } from 'vuex'
export default {
data() {
return {
@@ -82,7 +82,13 @@
menuList: [
{ key: 'wallet', title: '鎴戠殑閽卞寘' },
{ key: 'driver', title: '鍙告満璁よ瘉' },
- { key: 'guide', title: '瑙勮寖椤荤煡' },
+ { key: 'agreementPrivacy', title: '鍙告満闅愮鏀跨瓥', type: 'driverPrivacyPolicy' },
+ { key: 'agreementErrandLuggage', title: '璺戣吙杞︿富琛屾潕瀵勫瓨椤荤煡', type: 'errandLuggageStorageNotice' },
+ { key: 'agreementErrandService', title: '璺戣吙杈句汉鏈嶅姟鍗忚', type: 'errandServiceAgreement' },
+ { key: 'agreementErrandRisk', title: '璺戣吙杈句汉椋庨櫓鎵胯', type: 'errandRiskCommitment' },
+ { key: 'agreementOwnerLuggage', title: '骞冲彴杞︿富琛屾潕瀵勫瓨椤荤煡', type: 'ownerLuggageStorageNotice' },
+ { key: 'agreementOwnerService', title: '骞冲彴杞︿富鏈嶅姟鍗忚', type: 'ownerServiceAgreement' },
+ { key: 'agreementOwnerRisk', title: '骞冲彴杞︿富椋庨櫓鎵胯', type: 'ownerRiskCommitment' },
{ key: 'help', title: '甯姪涓庡鏈�' },
{ key: 'setting', title: '璁剧疆' }
],
@@ -101,24 +107,23 @@
name: '姹ゅ瓙鏂�',
phone: '18166565677锛堢殩BD23189锛�',
levelTag: 'S绾�',
- totalIncome: '8,314.90',
- pendingIncome: '2000.00',
- orderCount: '329',
- walletBalance: '楼1500.00',
+ totalIncome: '-',
+ pendingIncome: '-',
+ orderCount: '-',
+ walletBalance: '楼0',
verified: true
}
}
}
},
computed: {
+ ...mapState(['userInfo']),
currentProfile() {
return this.useVerifiedState ? this.profileStates.verified : this.profileStates.guest
},
bodyStyle() {
- const footerHeight = uni.upx2px(124)
return {
- marginTop: this.navHeight + 'px',
- height: `calc(100vh - ${this.navHeight + footerHeight}px)`
+ marginTop: this.navHeight + 'px'
}
}
},
@@ -127,7 +132,32 @@
this.statusBarHeight = systemInfo.statusBarHeight || 0
this.navHeight = this.statusBarHeight + uni.upx2px(88)
},
+ onShow() {
+ this.getStats()
+ this.getUserInfo()
+ },
methods: {
+ getUserInfo() {
+ this.$u.api.verifyDetail().then(user => {
+ if (user.code === 200) {
+ this.$store.commit('setUserInfo', user.data);
+ }
+ })
+ },
+ getStats() {
+ this.$u.api.stats().then(res => {
+ if (res.code === 200 && res.data) {
+ this.profileStates.verified.totalIncome = (res.data.totalCommission / 100).toFixed(2)
+ this.profileStates.verified.pendingIncome = (res.data.pendingCommission / 100).toFixed(2)
+ this.profileStates.verified.orderCount = res.data.totalOrderCount || 0
+ this.profileStates.verified.walletBalance = '楼' + (res.data.balance / 100).toFixed(2)
+ }
+ })
+ },
+ getDriverLevelText(level) {
+ const map = { 5: 'S', 4: 'A', 3: 'B', 2: 'C', 1: 'D' }
+ return map[level] ? map[level] + '绾�' : ''
+ },
jump(item) {
console.log(item)
if (item.key === 'setting') {
@@ -135,10 +165,38 @@
url: '/pages/settings/settings'
})
} else if (item.key === 'driver') {
+ if (this.userInfo.auditStatus === 99) {
+ uni.navigateTo({
+ url: '/pages/driver-certification/driver-certification'
+ })
+ } else {
+ uni.navigateTo({
+ url: '/pages/certification-details/certification-details'
+ })
+ }
+ } else if (item.key === 'wallet') {
uni.navigateTo({
- url: '/pages/certification-details/certification-details'
+ url: '/pages/wallet/wallet'
+ })
+ } else if (item.key && item.key.startsWith('agreement')) {
+ uni.navigateTo({
+ url: `/pages/agreement/agreement?type=${item.type}&title=${encodeURIComponent(item.title)}`
})
}
+ },
+ handleLogout() {
+ uni.showToast({ title: '閫�鍑轰腑...', icon: 'loading' })
+ this.$u.api.logOutDriver().then(res => {
+ console.log('logout res', res)
+ if (res.code === 200) {
+ this.$store.commit('clearAll')
+ uni.reLaunch({
+ url: '/pages/login/login'
+ })
+ }
+ }).catch(err => {
+ console.log('logout err', err)
+ })
}
}
}
@@ -146,9 +204,7 @@
<style lang="scss" scoped>
.mine-page {
- height: 100vh;
background: #f6f8fc;
- overflow: hidden;
&__nav {
position: fixed;
@@ -174,10 +230,11 @@
&__body {
box-sizing: border-box;
+ // overflow: hidden;
}
&__content {
- padding: 28rpx 20rpx 20rpx;
+ padding: 28rpx 20rpx 0;
}
&__profile {
@@ -243,23 +300,22 @@
position: fixed;
left: 0;
right: 0;
- bottom: 0;
- padding: 16rpx 0 calc(env(safe-area-inset-bottom) + 20rpx);
- background: #f6f8fc;
+ bottom: 60rpx;
+ // padding: 16rpx 0 calc(env(safe-area-inset-bottom) + 20rpx);
display: flex;
justify-content: center;
}
&__logout {
- width: 186rpx;
- height: 70rpx;
- line-height: 70rpx;
- border-radius: 999rpx;
+ width: 200rpx;
+ height: 72rpx;
+ line-height: 72rpx;
+ border-radius: 36rpx;
background: #ffffff;
- border: 1rpx solid #d8dde5;
+ border: 1rpx solid #999999;
+ font-weight: 400;
font-size: 28rpx;
- font-weight: 500;
- color: #7e8794;
+ color: #333333;
padding: 0;
&::after {
@@ -328,6 +384,7 @@
.menu-panel {
margin-top: 20rpx;
+ margin-bottom: 200rpx;
border-radius: 22rpx;
background: #ffffff;
overflow: hidden;
@@ -367,7 +424,7 @@
}
&--danger {
- color: #ff5a4f;
+ color: #FA1010;
}
&--warning {
@@ -375,7 +432,7 @@
}
&--primary {
- color: #2b7cff;
+ color: #106EFA;
}
}
--
Gitblit v1.9.3