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 | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/app/pages/mine/mine.vue b/app/pages/mine/mine.vue
index 176735d..291295b 100644
--- a/app/pages/mine/mine.vue
+++ b/app/pages/mine/mine.vue
@@ -6,7 +6,7 @@
</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="userInfo.imgurl || '/static/image/ic_pic@2x.png'" mode="aspectFill"></image>
@@ -61,8 +61,9 @@
</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" @click.stop="handleLogout">閫�鍑虹櫥褰�</button>
@@ -81,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: '璁剧疆' }
],
@@ -115,10 +122,8 @@
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'
}
}
},
@@ -160,7 +165,7 @@
url: '/pages/settings/settings'
})
} else if (item.key === 'driver') {
- if (this.userInfo.businessStatus === 99) {
+ if (this.userInfo.auditStatus === 99) {
uni.navigateTo({
url: '/pages/driver-certification/driver-certification'
})
@@ -172,6 +177,10 @@
} else if (item.key === 'wallet') {
uni.navigateTo({
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)}`
})
}
},
@@ -195,9 +204,7 @@
<style lang="scss" scoped>
.mine-page {
- height: 100vh;
background: #f6f8fc;
- overflow: hidden;
&__nav {
position: fixed;
@@ -223,10 +230,11 @@
&__body {
box-sizing: border-box;
+ // overflow: hidden;
}
&__content {
- padding: 28rpx 20rpx 20rpx;
+ padding: 28rpx 20rpx 0;
}
&__profile {
@@ -294,7 +302,6 @@
right: 0;
bottom: 60rpx;
// padding: 16rpx 0 calc(env(safe-area-inset-bottom) + 20rpx);
- background: #f6f8fc;
display: flex;
justify-content: center;
}
@@ -377,6 +384,7 @@
.menu-panel {
margin-top: 20rpx;
+ margin-bottom: 200rpx;
border-radius: 22rpx;
background: #ffffff;
overflow: hidden;
--
Gitblit v1.9.3