From 3696830fbaf2fd97d98020087abf20917e491bdc Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 23 四月 2026 20:06:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
small-program/pages/itinerary/itinerary.vue | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/small-program/pages/itinerary/itinerary.vue b/small-program/pages/itinerary/itinerary.vue
index 3db4fcb..45bf1f8 100644
--- a/small-program/pages/itinerary/itinerary.vue
+++ b/small-program/pages/itinerary/itinerary.vue
@@ -26,7 +26,7 @@
<view class="content-wrap">
<view class="page-padding card-list">
<view v-for="(item, index) in dataList" :key="item.id" class="order-card">
- <view class="order-head" :class="item.mode === 'city' ? 'city-head-bg' : 'local-head-bg'">
+ <view class="order-head" :class="item.mode === 'city' ? 'city-head-bg' : 'local-head-bg'" @click="jumpOrderDetail(item.id)">
<view v-if="item.type === 0" class="head-local">
<view class="mode-tag local-tag">灏卞湴瀵勫瓨</view>
<view class="head-copy single-copy">
@@ -34,7 +34,7 @@
<text class="head-user">{{ item.takeUser ||'' }}</text>
</view>
<text v-if="item.status < 7" class=" status-text status-orange">{{ item.statusName||'' }}</text>
- <text v-else-if="item.status ===7" class=" status-text">{{ item.statusName||'' }}</text>
+ <text v-else-if="item.status ===7" class=" status-text status-grey">{{ item.statusName||'' }}</text>
<text v-else-if="item.status >7" class=" status-text status-grey">{{ item.statusName||'' }}</text>
</view>
<view v-else class="head-city">
@@ -49,15 +49,14 @@
</view>
<view class="head-copy city-right align-right">
<text v-if="item.status < 7" class=" status-text status-orange">{{ item.statusName||'' }}</text>
- <text v-else-if="item.status ===7" class="status-text">{{ item.statusName||'' }}</text>
+ <text v-else-if="item.status ===7" class="status-text status-grey" >{{ item.statusName||'' }}</text>
<text v-else-if="item.status >7" class=" status-text status-grey">{{ item.statusName||'' }}</text>
- <text class="head-name text-ellipsis">{{ item.takeShopName||'瀵瑰瀵�' }}</text>
+ <text class="head-name text-ellipsis">{{ item.takeShopName || item.takeLocation||'' }}</text>
<text class="head-user">{{ item.takeUser||'' }}</text>
</view>
</view>
</view>
-
- <view class="goods-area" v-if="item.detailList">
+ <view class="goods-area" v-if="item.detailList" @click="jumpOrderDetail(item.id)">
<view v-for="goods in item.detailList " :key="goods.luggageName" class="goods-row">
<view class="goods-left">
<text class="goods-name">{{ goods.luggageName ||'' }}</text>
@@ -94,7 +93,7 @@
<view class="footer-btn contact-btn" @click="deleteOrder(item)" v-if="item.status ===7 || item.status===96 || item.status == 99">鍒犻櫎璁㈠崟</view>
<view class="footer-btn primary-btn" @click="payOrder(item)" v-if="item.status ===0">绔嬪嵆鏀粯</view>
<view class="footer-btn primary-btn" v-if="item.status >=1 &&item.status <7 " @click="openQrcode(item)" >鏍搁攢鐮�</view>
- <view class="footer-btn primary-btn" v-if="item.status ===7 && !commentStatus ">璇勪环璁㈠崟</view>
+ <view class="footer-btn primary-btn" @click="evaluateOrder(item)" v-if="item.status ===7 && !item.commentStatus ">璇勪环璁㈠崟</view>
</view>
<view class="footer-actions" v-else>
<view class="footer-btn contact-btn" @click="contactPhone(item,0)" v-if="item.status ===1 || item.status ==2">鑱旂郴闂ㄥ簵</view>
@@ -106,7 +105,7 @@
<view class="footer-btn primary-btn" @click="cancelOrder(item)" v-if="item.status ===1">鐢宠閫�娆�</view>
<view class="footer-btn primary-btn" v-if="item.status ===1 || (item.takeShopId && item.status ===5)" @click="openQrcode(item)" >鏍搁攢鐮�</view>
<view class="footer-btn primary-btn" @click="doneOrder(item)" v-if="!item.takeShopId && item.status ===5">纭鏀惰揣</view>
- <view class="footer-btn primary-btn" v-if="item.status ===7 && !commentStatus ">璇勪环璁㈠崟</view>
+ <view class="footer-btn primary-btn" @click="evaluateOrder(item)" v-if="item.status ===7 && !item.commentStatus ">璇勪环璁㈠崟</view>
</view>
</view>
</view>
@@ -197,11 +196,13 @@
</view>
</view>
</u-popup>
+ <custom-tabbar></custom-tabbar>
</view>
</template>
<script>
import { mapState } from 'vuex'
+ import CustomTabbar from '@/components/custom-tabbar/custom-tabbar.vue'
import drawQrcode from 'weapp-qrcode'
export default {
computed: {
@@ -261,6 +262,7 @@
if(item.id==data.info.orderId){
console.log('鐩戝惉鍒颁簨浠舵潵鑷� update 02锛�' ,data);
item.status = data.info.orderStatus
+ item.commentStatus = data.info.commentStatus
}
})
}
@@ -473,7 +475,12 @@
},
jumpOrderDetail(id){
uni.navigateTo({
- url:'/pages/details-entry/details-entry?userType='+this.userType+'&id='+id
+ url:'/pages/delivery-order-detail/delivery-order-detail?userType=0&id='+id
+ })
+ },
+ evaluateOrder(item){
+ uni.navigateTo({
+ url:"/pages/evaluate/evaluate?id="+item.id
})
}
}
@@ -675,9 +682,11 @@
}
.text-ellipsis {
+ display: block;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
+ max-width: 100%;
}
.city-arrow {
--
Gitblit v1.9.3