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/index/index.vue | 249 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 210 insertions(+), 39 deletions(-)
diff --git a/app/pages/index/index.vue b/app/pages/index/index.vue
index 7427c91..d373554 100644
--- a/app/pages/index/index.vue
+++ b/app/pages/index/index.vue
@@ -1,7 +1,7 @@
<template>
<view class="hall-page">
<view class="hall-page__header" :style="{ paddingTop: statusBarHeight + 'px' }">
- <view class="hall-page__user-row">
+ <view class="hall-page__user-row" @click="handleUserClick">
<view class="hall-page__user">
<image class="hall-page__avatar" :src="centerUserInfo.fullImgUrl || '/static/image/ic_pic@2x.png'" mode="aspectFill"></image>
<text class="hall-page__name">{{ centerUserInfo.name }}</text>
@@ -68,15 +68,18 @@
<image src="/static/image/default_unverified@2x.png" mode="widthFix"></image>
<button @click="toDriverCertification">鍘昏璇�</button>
</view>
- <view v-else-if="userInfo.auditStatus === 3 && currentOrderList.length" class="hall-page__list">
+ <view v-else-if="userInfo.auditStatus === 3 && acceptingStatus === 1 && currentOrderList.length" class="hall-page__list">
<view v-for="(item, index) in currentOrderList" :key="item.id" class="order-card" @click="goToOrderDetail(item, index)">
<view class="order-card__head">
- <view class="order-card__time">
- <text class="order-card__time-main">{{ item.remainMinutes }}</text>
- <text class="order-card__time-sub">鍒嗛挓</text>
+ <view class="order-card__time" v-if="item.remainMinutes > 0">
+ <text class="order-card__time-main">{{ formatRemainTime(item.remainMinutes) }}</text>
+ <text class="order-card__time-sub">閫佽揪</text>
+ </view>
+ <view class="order-card__time" v-else>
+ <text class="order-card__time-main">閰嶉�佸凡瓒呮椂锛岃灏藉揩閫佽揪</text>
</view>
<view v-if="activeTab === 'hall'" class="order-card__price-wrap">
- <text class="order-card__price">楼{{ (item.driverFee / 100).toFixed(1) }}</text>
+ <text class="order-card__price">楼{{ item.platformRewardAmount ? (item.driverFee + item.platformRewardAmount) / 100 : (item.driverFee / 100).toFixed(2) }}</text>
</view>
<view v-else class="order-card__price-wrap order-card__price-wrap--serial-only">
<text v-if="item.code" class="order-card__serial">#{{ index + 1 }}</text>
@@ -90,22 +93,28 @@
<text v-if="item.isValuable === true" class="order-card__tag order-card__tag--orange">璐甸噸鐗╁搧</text>
<text v-else class="order-card__tag order-card__tag--blue">{{ item.goodLevelName }}</text>
</view>
- <text v-if="activeTab === 'hall' && item.urgentAmount" class="order-card__extra">鍚姞鎬ヂ{ item.urgentAmount / 100 }}</text>
+ <text v-if="activeTab === 'hall' && item.platformRewardAmount" class="order-card__extra">鍚姞鎬ヂ{ (item.platformRewardAmount / 100).toFixed(2) }}</text>
</view>
<view class="order-card__route">
<view class="order-card__route-side">
- <text class="order-card__distance-top">{{ item.depositDistance }}</text>
+ <view class="order-card__distance-block order-card__distance-block--top">
+ <text class="order-card__distance-value">{{ formatDistanceParts(item.depositDistance).value }}</text>
+ <text class="order-card__distance-unit">{{ formatDistanceParts(item.depositDistance).unit }}</text>
+ </view>
<view class="order-card__line"></view>
- <text class="order-card__distance-bottom">{{ item.takeDistance }}</text>
+ <view class="order-card__distance-block order-card__distance-block--bottom">
+ <text class="order-card__distance-value">{{ formatDistanceParts(item.takeDistance).value }}</text>
+ <text class="order-card__distance-unit">{{ formatDistanceParts(item.takeDistance).unit }}</text>
+ </view>
</view>
<view class="order-card__route-main">
<view class="order-card__route-item">
<view class="order-card__route-texts">
- <text class="order-card__route-title">{{ item.depositShopName }}</text>
+ <text class="order-card__route-title">{{ item.depositShopName }}澶ц嫃鎵撴墦绠�</text>
<text class="order-card__route-desc">{{ item.depositShopAddress }}</text>
</view>
- <image src="/static/image/ic_daohang@2x.png" mode="widthFix" class="order-card__nav"></image>
+ <image src="/static/image/ic_daohang@2x.png" mode="widthFix" class="order-card__nav" @click.stop="navigateToAddress(item, 'deposit')"></image>
</view>
<view class="order-card__route-item order-card__route-item--destination">
<view class="order-card__route-texts">
@@ -115,14 +124,14 @@
</template>
<text v-else class="order-card__route-title">{{ item.takeAddress }}</text>
</view>
- <image src="/static/image/ic_daohang@2x.png" mode="widthFix" class="order-card__nav"></image>
+ <image src="/static/image/ic_daohang@2x.png" mode="widthFix" class="order-card__nav" @click.stop="navigateToAddress(item, 'take')"></image>
</view>
</view>
</view>
- <view class="order-card__goods" v-if="item.items && item.items.length > 0">
- <text class="order-card__goods-text">{{ item.items ? item.items.map(i => `${i.name}*${i.quantity}`).join('銆�') : '鏃�' }}</text>
- <text class="order-card__goods-arrow">鈱�</text>
+ <view class="order-card__goods" v-if="item.items && item.items.length > 0" @click.stop="toggleGoodsExpand(item.id)">
+ <text class="order-card__goods-text">{{ getGoodsText(item.items, item.id) }}</text>
+ <u-icon v-if="getGoodsText(item.items, item.id).length > 20" name="arrow-down" :class="{ 'order-card__goods-arrow--expanded': expandedGoodsIds.includes(item.id) }" size="12" color="#a4a9b1"></u-icon>
</view>
<view class="order-card__actions" :class="'order-card__actions--' + activeTab">
@@ -148,13 +157,13 @@
</view>
<button class="order-card__button order-card__button--code" hover-class="order-card__button--hover" @click.stop="handleShowPickupCode(item)">瀛樹欢鐮�</button>
</template>
- <button v-else class="order-card__button" hover-class="order-card__button--hover" @click="handleGrabOrder(item)">绔嬪嵆鎶㈠崟</button>
+ <button v-else class="order-card__button" hover-class="order-card__button--hover" @click.stop="handleGrabOrder(item)">绔嬪嵆鎶㈠崟</button>
</view>
</view>
</view>
<view v-else class="hall-page__empty">
- <image class="hall-page__empty-icon" src="/static/image/default_nodata_grey@2x.png" mode="aspectFit"></image>
+ <image class="hall-page__empty-icon" :src="acceptingStatus === 0 ? '/static/image/default_nodata_grey@2x.png' : '/static/image/default_nodata@2x.png'" mode="aspectFit"></image>
</view>
</scroll-view>
@@ -278,6 +287,7 @@
],
centerUserInfo: {},
activeTab: 'hall',
+ expandedGoodsIds: [],
categoryList: [],
filterSections: [
{ key: 'sort', title: '鎺掑簭', options: ['缁煎悎鎺掑簭', '璺濈鏈�杩�'] },
@@ -326,6 +336,8 @@
this.headerHeight = this.statusBarHeight + uni.upx2px(308)
this.tabbarHeight = uni.upx2px(100) + safeBottom
this.scrollHeight = Math.max(windowHeight - this.headerHeight, 0)
+ if (this.userInfo.auditStatus === 99) return;
+ this.acceptingStatus = this.userInfo.acceptingStatus || 0
this.loadOrdersByTab(this.activeTab)
},
@@ -336,6 +348,7 @@
},
onReachBottom() {
+ if (this.acceptingStatus === 0) return;
if (this.activeTab === 'hall') {
this.hallPage++
this.getHallOrders()
@@ -379,6 +392,94 @@
},
methods: {
+ formatRemainTime(minutes) {
+ if (!minutes) return 0
+ if (minutes === 0) {
+ return '閰嶉�佸凡瓒呮椂'
+ }
+ if (minutes >= 60) {
+ return (minutes / 60).toFixed(2) + '灏忔椂鍐�'
+ }
+ return minutes + '鍒嗛挓鍐�'
+ },
+
+ getGoodsText(items, itemId) {
+ if (!items || items.length === 0) return '鏃�'
+ const text = items.map(i => `${i.name}*${i.quantity}`).join('銆�')
+ if (text.length > 20 && !this.expandedGoodsIds.includes(itemId)) {
+ return text.substring(0, 20) + '...'
+ }
+ return text
+ },
+
+ toggleGoodsExpand(id) {
+ const index = this.expandedGoodsIds.indexOf(id)
+ if (index > -1) {
+ this.expandedGoodsIds.splice(index, 1)
+ } else {
+ this.expandedGoodsIds.push(id)
+ }
+ },
+
+ formatDistanceParts(distance) {
+ if (distance === null || distance === undefined || distance === '') {
+ return { value: '--', unit: '' }
+ }
+
+ if (typeof distance === 'number') {
+ if (distance >= 1000) {
+ return { value: (distance / 1000).toFixed(1), unit: 'km' }
+ }
+ return { value: String(Math.round(distance)), unit: 'm' }
+ }
+
+ const text = String(distance).trim()
+ const match = text.match(/^([\d.]+)\s*([a-zA-Z\u4e00-\u9fa5]*)$/)
+ if (match) {
+ return {
+ value: match[1],
+ unit: match[2] || ''
+ }
+ }
+
+ return { value: text, unit: '' }
+ },
+
+ navigateToAddress(item, type) {
+ let latitude, longitude, name, address
+ if (type === 'deposit') {
+ latitude = item.depositLat
+ longitude = item.depositLng
+ name = item.depositShopName
+ address = item.depositShopAddress
+ } else {
+ latitude = item.takeLat
+ longitude = item.takeLng
+ name = item.takeName
+ address = item.takeAddress
+ }
+ if (!latitude || !longitude) {
+ uni.showToast({ title: '鍦板潃鍧愭爣缂哄け', icon: 'none' })
+ return
+ }
+ uni.openLocation({
+ latitude,
+ longitude,
+ name,
+ address,
+ success: () => {},
+ fail: (err) => {
+ uni.showToast({ title: '鎵撳紑鍦板浘澶辫触', icon: 'none' })
+ console.error('openLocation fail:', err)
+ }
+ })
+ },
+
+ handleUserClick() {
+ uni.navigateTo({
+ url: '/pages/test/test'
+ })
+ },
getActiveOrderCount() {
this.$u.api.activeOrderCount().then(res => {
if (res.code === 200) {
@@ -390,6 +491,7 @@
},
handleGrabOrder(item) {
+ console.log(item)
this.selectedGrabOrder = item
this.showGrabModal = true
},
@@ -456,9 +558,11 @@
},
goToOrderDetail(item, index) {
- uni.navigateTo({
- url: `/pages/order-detail/order-detail?id=${item.id}&index=${index + 1}`
- })
+ let url = `/pages/order-detail/order-detail?id=${item.id}`
+ if (this.activeTab === 'pickup' || this.activeTab === 'delivering') {
+ url += `&index=${index + 1}`
+ }
+ uni.navigateTo({ url })
},
getCenterInfo() {
@@ -492,6 +596,8 @@
},
loadOrdersByTab(tab) {
+ if (this.userInfo.auditStatus === 99) return;
+ if (this.acceptingStatus === 0) return;
if (tab === 'hall') {
this.hallPage = 1
this.hallHasMore = true
@@ -507,6 +613,7 @@
},
getHallOrders() {
+ if (this.acceptingStatus === 0) return;
if (this.hallLoading || !this.hallHasMore) {
return
}
@@ -559,6 +666,7 @@
},
getPickupOrders() {
+ if (this.acceptingStatus === 0) return;
if (this.pickupLoading) return
this.pickupLoading = true
this.$u.api.activeOrders({ status: 3 }).then(res => {
@@ -573,6 +681,7 @@
},
getDeliveringOrders() {
+ if (this.acceptingStatus === 0) return;
if (this.deliveringLoading) return
this.deliveringLoading = true
this.$u.api.activeOrders({ status: 4 }).then(res => {
@@ -595,7 +704,24 @@
const selectedValue = e.value[0]
this.$u.api.updateAcceptingStatus({ status: selectedValue.value }).then(res => {
if (res.code === 200) {
+ this.acceptingStatus = selectedValue.value
this.getCenterInfo()
+ if (this.acceptingStatus === 0) {
+ this.orderList = []
+ this.pickupOrderList = []
+ this.deliveringOrderList = []
+ } else {
+ if (this.activeTab === 'pickup') {
+ this.getPickupOrders()
+ } else if (this.activeTab === 'delivering') {
+ this.getDeliveringOrders()
+ } else {
+ this.hallPage = 1
+ this.hallHasMore = true
+ this.orderList = []
+ this.getHallOrders()
+ }
+ }
}
})
},
@@ -618,12 +744,13 @@
},
resetFilters() {
+ this.showFilterPopup = false
+ if (this.userInfo.auditStatus === 99) return;
this.selectedFilters = {
sort: '缁煎悎鎺掑簭',
level: '涓嶉檺',
distance: '涓嶉檺'
}
- this.showFilterPopup = false
if (this.activeTab === 'hall') {
this.hallPage = 1
this.hallHasMore = true
@@ -634,6 +761,10 @@
confirmFilters() {
this.showFilterPopup = false
+ if (this.userInfo.auditStatus === 99) {
+ this.hallHasMore = true
+ return
+ }
if (this.activeTab === 'hall') {
this.hallPage = 1
this.hallHasMore = true
@@ -1132,7 +1263,6 @@
left: 0;
right: 0;
z-index: 20;
- background: rgba(0, 0, 0, 0.24);
&__panel {
display: flex;
@@ -1360,29 +1490,56 @@
}
&__route-side {
- width: 64rpx;
+ width: 70rpx;
display: flex;
flex-direction: column;
align-items: center;
flex-shrink: 0;
+ padding: 14rpx 0 8rpx;
+ border-radius: 26rpx;
+ background: #f6f7f9;
+ margin-right: 20rpx;
}
- &__distance-top,
- &__distance-bottom {
- font-size: 22rpx;
- font-weight: 600;
- color: #555b66;
+ &__distance-block {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ line-height: 1;
+
+ &--top {
+ margin-bottom: 6rpx;
+ }
+
+ &--bottom {
+ margin-top: 6rpx;
+ }
+ }
+
+ &__distance-value {
+ font-size: 26rpx;
+ font-weight: 700;
+ color: #333333;
text-align: center;
+ }
+
+ &__distance-unit {
+ margin-top: 6rpx;
+ font-size: 18rpx;
+ font-weight: 500;
+ color: #8c939f;
+ text-align: center;
+ text-transform: lowercase;
}
&__line {
position: relative;
- width: 4rpx;
+ width: 100%;
flex: 1;
- min-height: 86rpx;
- margin: 10rpx 0;
- border-radius: 999rpx;
- background: #d8dbe1;
+ min-height: 62rpx;
+ margin: 8rpx 0;
+ background: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='20' height='26' viewBox='0 0 20 26'%3E%3Cpath fill='%238C939F' d='M10 0C5.03 0 1 3.99 1 8.92c0 6.31 7.28 12.87 8.07 13.57a1.4 1.4 0 0 0 1.86 0C11.72 21.79 19 15.23 19 8.92 19 3.99 14.97 0 10 0Zm0 12.24a3.32 3.32 0 1 1 0-6.64 3.32 3.32 0 0 1 0 6.64Z'/%3E%3C/svg%3E") center center no-repeat;
+ background-size: 20rpx 26rpx;
&::before,
&::after {
@@ -1390,18 +1547,19 @@
position: absolute;
left: 50%;
transform: translateX(-50%);
- width: 14rpx;
- height: 14rpx;
- border-radius: 50%;
- background: #6a6f79;
+ width: 2rpx;
+ border-radius: 999rpx;
+ background: #cfd4dc;
}
&::before {
- top: -4rpx;
+ top: 0;
+ height: 18rpx;
}
&::after {
- bottom: -4rpx;
+ bottom: 0;
+ height: 24rpx;
}
}
@@ -1426,19 +1584,27 @@
}
&__route-title {
+ width: 500rpx;
display: block;
font-size: 40rpx;
font-weight: 700;
color: #2d3139;
line-height: 1.3;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
}
&__route-desc {
+ width: 500rpx;
display: block;
margin-top: 8rpx;
font-size: 28rpx;
color: #9ea4ae;
line-height: 1.4;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
}
&__nav {
@@ -1471,6 +1637,11 @@
margin-left: 12rpx;
font-size: 24rpx;
color: #a4a9b1;
+ transition: transform 0.3s;
+
+ &--expanded {
+ transform: rotate(180deg);
+ }
}
&__button {
--
Gitblit v1.9.3