From 0e4b49f4bee160790b1830e6a8606e739b32fc3b Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 11 三月 2026 09:09:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
mini-program/pages/mine/mine.vue | 65 +++++++++++++++++++-------------
1 files changed, 38 insertions(+), 27 deletions(-)
diff --git a/mini-program/pages/mine/mine.vue b/mini-program/pages/mine/mine.vue
index 917616f..e87da0b 100644
--- a/mini-program/pages/mine/mine.vue
+++ b/mini-program/pages/mine/mine.vue
@@ -6,17 +6,13 @@
<view class="head-bar-nav" :style="{ height: navHeight + 'px' }"></view>
</view>
<view class="user">
-<<<<<<< HEAD
- <view class="user-left" @click="jumpUser">
-=======
<view class="user-left" @click="jumpSettings">
->>>>>>> 7b09a9950f13521190a4aef9bbc2a6163445566c
<view class="user-image">
<image :src="userInfo.imgFullUrl?userInfo.imgFullUrl:'/static/icon/default.png'" mode="widthFix"></image>
</view>
<view class="user-name">
<button open-type="getPhoneNumber" @getphonenumber="getphonenumber" v-if="!userInfo">鑾峰彇鎵嬫満鍙�</button>
- {{userInfo ? userInfo.nickname : '鐐瑰嚮鐧诲綍'}}
+ {{userInfo ? maskPhone(userInfo.phone) : '鐐瑰嚮鐧诲綍'}}
</view>
</view>
<view class="user-right" v-if="userInfo">
@@ -57,18 +53,24 @@
</view>
<view class="func-list">
<view class="func-list-item" @click="jumpOrder(1)">
- <view class="func-list-item-num" v-if="orderNum && orderNum.waitPayOrders > 0">{{orderNum.waitPayOrders > 99 ? '99+' : orderNum.waitPayOrders}}</view>
- <image src="/static/icon/mine_ic_daifukuan@2x.png" mode="widthFix"></image>
+ <view class="func-list-item-image">
+ <image src="/static/icon/mine_ic_daifukuan@2x.png" mode="widthFix"></image>
+ <view class="func-list-item-num" v-if="orderNum && orderNum.waitPayOrders > 0">{{orderNum.waitPayOrders > 99 ? '99+' : orderNum.waitPayOrders}}</view>
+ </view>
<text>寰呮敮浠�</text>
</view>
<view class="func-list-item" @click="jumpOrder(2)">
- <view class="func-list-item-num" v-if="orderNum && orderNum.waitOrders > 0">{{orderNum.waitOrders > 99 ? '99+' : orderNum.waitOrders}}</view>
- <image src="/static/icon/mine_ic_daifahuo@2x.png" mode="widthFix"></image>
+ <view class="func-list-item-image">
+ <view class="func-list-item-num" v-if="orderNum && orderNum.waitOrders > 0">{{orderNum.waitOrders > 99 ? '99+' : orderNum.waitOrders}}</view>
+ <image src="/static/icon/mine_ic_daifahuo@2x.png" mode="widthFix"></image>
+ </view>
<text>寰呭彂璐�/鑷彁</text>
</view>
<view class="func-list-item" @click="jumpOrder(3)">
- <view class="func-list-item-num" v-if="orderNum && orderNum.waitReceivedOrders > 0">{{orderNum.waitReceivedOrders > 99 ? '99+' : orderNum.waitReceivedOrders}}</view>
- <image src="/static/icon/mine_ic_daishouhuo@2x.png" mode="widthFix"></image>
+ <view class="func-list-item-image">
+ <view class="func-list-item-num" v-if="orderNum && orderNum.waitReceivedOrders > 0">{{orderNum.waitReceivedOrders > 99 ? '99+' : orderNum.waitReceivedOrders}}</view>
+ <image src="/static/icon/mine_ic_daishouhuo@2x.png" mode="widthFix"></image>
+ </view>
<text>寰呮敹璐�</text>
</view>
</view>
@@ -130,6 +132,11 @@
}
},
methods: {
+ maskPhone(phone) {
+ if (!phone) return '';
+ // 鍋囪鎵嬫満鍙蜂负 11 浣嶏紝淇濈暀鍓� 3 浣嶅拰鍚� 4 浣�
+ return phone.slice(0, 3) + '****' + phone.slice(-4);
+ },
jumpUser() {
if (this.userInfo) {
uni.navigateTo({
@@ -361,24 +368,28 @@
flex-direction: column;
align-items: center;
justify-content: center;
- position: relative;
- .func-list-item-num {
- position: absolute;
- top: 0;
- right: -10rpx;
- width: 40rpx;
- height: 40rpx;
- line-height: 40rpx;
- text-align: center;
- border-radius: 50%;
- background-color: #E4001D;
- font-weight: 400;
- font-size: 22rpx;
- color: #FFFFFF;
- }
- image {
+ .func-list-item-image {
width: 60rpx;
height: 60rpx;
+ position: relative;
+ image {
+ width: 60rpx;
+ height: 60rpx;
+ }
+ .func-list-item-num {
+ position: absolute;
+ top: 0;
+ right: -10rpx;
+ width: 40rpx;
+ height: 40rpx;
+ line-height: 40rpx;
+ text-align: center;
+ border-radius: 50%;
+ background-color: #E4001D;
+ font-weight: 400;
+ font-size: 22rpx;
+ color: #FFFFFF;
+ }
}
text {
font-weight: 400;
--
Gitblit v1.9.3