huangzhenbao/medical-mall
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

继续完善购物逻辑闭环，consumer模块完成度80%

Browse Source
This commit is contained in:
cyh666666
2026-01-27 17:33:39 +08:00
parent f2f208f258
commit 4ab722a118
22 changed files with 5290 additions and 515 deletions
Download Patch File Download Diff File Expand all files Collapse all files

109
pages/mall/consumer/profile.uvue
View File

@@ -22,7 +22,7 @@
<view class="nav-stat-item">
<text class="nav-stat-label">余额</text>
<text class="nav-stat-value">¥{{ userStats.balance }}</text>
<text class="nav-stat-value" @click="goToWallet">¥{{ userStats.balance }}</text>
</view>
<view class="nav-stat-item" @click="goToCoupons">
@@ -99,16 +99,16 @@
<text class="tab-text">待支付</text>
<text v-if="orderCounts.pending > 0" class="tab-badge">{{ orderCounts.pending }}</text>
</view>
<view class="order-tab" :class="{ active: currentOrderTab === 'shipped' }" @click="switchOrderTab('shipped')">
<view class="order-tab" :class="{ active: currentOrderTab === 'toship' }" @click="switchOrderTab('toship')">
<text class="tab-icon">🚚</text>
<text class="tab-text">待发货</text>
<text v-if="orderCounts.toship > 0" class="tab-badge">{{ orderCounts.toship }}</text>
</view>
<view class="order-tab" :class="{ active: currentOrderTab === 'shipped' }" @click="switchOrderTab('shipped')">
<text class="tab-icon">📦</text>
<text class="tab-text">待收货</text>
<text v-if="orderCounts.shipped > 0" class="tab-badge">{{ orderCounts.shipped }}</text>
</view>
<view class="order-tab" :class="{ active: currentOrderTab === 'review' }" @click="switchOrderTab('review')">
<text class="tab-icon">⭐</text>
<text class="tab-text">待评价</text>
<text v-if="orderCounts.review > 0" class="tab-badge">{{ orderCounts.review }}</text>
</view>
</view>
</view>
@@ -217,7 +217,7 @@
</view>
<!-- 账户安全 -->
<view class="account-security">
<!-- <view class="account-security">
<view class="section-title">账户安全</view>
<view class="security-items">
<view class="security-item" @click="changePassword">
@@ -242,7 +242,7 @@
</view>
</view>
</view>
</view>
</view> -->
</view>
</template>
@@ -259,8 +259,8 @@ type UserStatsType = {
type OrderCountsType = {
total: number
pending: number
toship: number
shipped: number
review: number
}
type ServiceCountsType = {
@@ -302,9 +302,9 @@ export default {
orderCounts: {
total: 0,
pending: 0,
toship: 0,
shipped: 0,
review: 0
} as OrderCountsType,
} as any,
serviceCounts: {
coupons: 0,
favorites: 0
@@ -332,10 +332,17 @@ export default {
this.initPage()
this.loadUserProfile()
this.loadOrders()
// 监听订单更新事件
uni.$on('orderUpdated', this.handleOrderUpdated)
},
onShow() {
this.refreshData()
},
onUnload() {
// 移除事件监听
uni.$off('orderUpdated', this.handleOrderUpdated)
},
computed: {
// 根据当前Tab筛选订单
filteredOrders(): Array<OrderType> {
@@ -343,8 +350,10 @@ export default {
return this.allOrders
} else if (this.currentOrderTab === 'pending') {
return this.allOrders.filter((order: OrderType): boolean => order.status === 1)
} else if (this.currentOrderTab === 'toship') {
return this.allOrders.filter((order: OrderType): boolean => order.status === 2)
} else if (this.currentOrderTab === 'shipped') {
return this.allOrders.filter((order: OrderType): boolean => order.status === 2 || order.status === 3)
return this.allOrders.filter((order: OrderType): boolean => order.status === 3)
} else if (this.currentOrderTab === 'review') {
return this.allOrders.filter((order: OrderType): boolean => order.status === 4)
}
@@ -355,40 +364,32 @@ export default {
// 加载订单数据
async loadOrders() {
const userStore = uni.getStorageSync('userInfo')
const userId = userStore?.id
if (!userId) return
// const userId = userStore?.id
// if (!userId) return
try {
/* const { data, error } = await supa
.from('orders')
.select('*')
.eq('user_id', userId)
.order('created_at', { ascending: false })
if (error != null) {
console.error('加载订单失败', error)
return
// 从本地存储加载订单数据
const storedOrders = uni.getStorageSync('orders')
let orders: any[] = []
if (storedOrders) {
orders = JSON.parse(storedOrders as string) as any[]
}
if (data != null) {
this.allOrders = data as any[]
this.recentOrders = this.allOrders
// 更新角标统计
this.orderCounts = {
total: this.allOrders.length,
pending: this.allOrders.filter((o: any) => o.status === 1).length,
shipped: this.allOrders.filter((o: any) => o.status === 2 || o.status === 3).length,
review: this.allOrders.filter((o: any) => o.status === 4).length
}
} */
// MOCK ORDERS
this.allOrders = this.recentOrders
this.allOrders = orders
// 按时间倒序
this.allOrders.sort((a: any, b: any) => {
return new Date(b.created_at).getTime() - new Date(a.created_at).getTime()
})
// 过滤最近的订单
this.recentOrders = this.allOrders.slice(0, 5)
// 更新角标统计 (确保状态码一致: 1=待支付, 2=待发货, 3=待收货, 4=待评价)
this.orderCounts = {
total: this.allOrders.length,
pending: this.allOrders.filter((o: any) => o.status === 1).length,
shipped: this.allOrders.filter((o: any) => o.status === 2 || o.status === 3).length,
toship: this.allOrders.filter((o: any) => o.status === 2).length, // 修复：仅计算状态2为待发货
shipped: this.allOrders.filter((o: any) => o.status === 3).length, // 修复：仅计算状态3为待收货
review: this.allOrders.filter((o: any) => o.status === 4).length
}
} catch (e) {
@@ -581,12 +582,20 @@ export default {
})
},
// 跳转设置
goToSettings() {
uni.navigateTo({
url: '/pages/mall/consumer/settings'
})
},
// 跳转钱包
goToWallet() {
uni.navigateTo({
url: '/pages/mall/consumer/wallet'
})
},
goToOrders(type: string) {
uni.navigateTo({
url: `/pages/mall/consumer/orders?type=${type}`
@@ -696,6 +705,26 @@ export default {
uni.navigateTo({
url: '/pages/mall/consumer/bind-email'
})
},
// 处理订单更新事件
handleOrderUpdated(data: any) {
// 当收到订单更新事件时，刷新订单数据
console.log('收到订单更新事件:', data)
this.refreshData()
// 显示提示
if (data.status === 1) {
uni.showToast({
title: '订单已保存到待支付',
icon: 'success'
})
} else if (data.status === 2) {
uni.showToast({
title: '支付成功，订单待发货',
icon: 'success'
})
}
}
}
}