From 6f7f24efb43a64c79325a425dcd3e507d55bf876 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期六, 25 四月 2026 14:46:26 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
small-program/pages/itinerary/itinerary.vue | 68 ++++++++++++++++++++++++---------
1 files changed, 49 insertions(+), 19 deletions(-)
diff --git a/small-program/pages/itinerary/itinerary.vue b/small-program/pages/itinerary/itinerary.vue
index 3db4fcb..53bc3a8 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>
@@ -89,12 +88,12 @@
<view class="card-footer">
<view class="footer-actions" v-if="item.type===0">
- <view class="footer-btn contact-btn" @click="contactPhone(item,0)" v-if="item.status ===1 || item.status==2 || item.status===98">鑱旂郴闂ㄥ簵</view>
+ <view class="footer-btn contact-btn" @click="contactPhone(item,0)" v-if="item.status ===1 ||item.status ===5 || item.status==2 || item.status===98">鑱旂郴闂ㄥ簵</view>
<view class="footer-btn contact-btn" v-if="item.status ===0 || item.status ===1" @click="cancelOrder(item)">鍙栨秷璁㈠崟</view>
<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>
@@ -120,7 +119,7 @@
<view class="phone">
<view class="phone-head">
<view></view>
- <text>鑱旂郴瀹㈡埛</text>
+ <text>{{linkItem.title}}</text>
</view>
<!-- <view class="phone-item">
<view>
@@ -130,10 +129,10 @@
<view class="line" v-if="serverPhone && serverPhone.length"></view>
</view> -->
<view class="phone-item" >
- <view>
- <image src="/static/icon/ic_call@2x.png" mode="widthFix" @click="contactPhoneDo()" ></image>
- <text>{{linkItem.linkname||''}} </text>
- <text style="margin-left: 10px;"> {{linkItem.linkphone||''}}</text>
+ <view @click="contactPhoneDo()">
+ <image src="/static/icon/ic_call@2x.png" mode="widthFix" ></image>
+ <text >{{linkItem.linkname||''}} </text>
+ <text style="margin-left: 10px;"> {{linkItem.linkphone||''}}</text>
</view>
</view>
<view style="width: 100%; height: 30rpx;"></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: {
@@ -225,6 +226,8 @@
qrcodeImage:null,
isLoadingMore: false,
currentOrder:null,
+ contanctType:0,
+ linkItem:{title:'',linkname:'',linkphone:''},
filterTabs: [
{ label: '鍏ㄩ儴' ,value: -1},
{ label: '寰呮敮浠�',value: 0 },
@@ -245,10 +248,9 @@
onLoad(options) {
console.log(options )
this.activeTab = -1
- if (options.status) {
+ if (options.status != null && options.status != undefined) {
this.activeTab = Number(options.status)
}
- this.getFirstPageData()
var that =this
uni.$on('updateOrder',function(data){
console.log('鐩戝惉鍒颁簨浠舵潵鑷� update 锛屾惡甯﹀弬鏁� msg 涓猴細' ,data);
@@ -261,6 +263,7 @@
if(item.id==data.info.orderId){
console.log('鐩戝惉鍒颁簨浠舵潵鑷� update 02锛�' ,data);
item.status = data.info.orderStatus
+ item.commentStatus = data.info.commentStatus
}
})
}
@@ -273,9 +276,18 @@
this.showDelete=false
this.showQrcode=false
this.showPay=false
+ this.contanctType =0
this.showPhone=false
this.loading=false
this.currentOrder=null
+ this.linkItem={title:'',linkname:'',linkphone:''}
+ var orderStatus = uni.getStorageSync("orderStatus");
+ console.log(orderStatus,"==================")
+ if (orderStatus != null &&orderStatus != undefined) {
+ this.activeTab = Number(orderStatus)
+ }
+ uni.clearStorageSync("orderStatus")
+ // this.getFirstPageData()
},
onReachBottom(){
this.getDataList();
@@ -335,10 +347,20 @@
that.showDone()
}
},
- contactPhone(item){
+ contactPhone(item,type){
this.showPhone = !this.showPhone
- this.linkItem = item ||{}
+ this.linkItem = {title:'',linkname:'',linkphone:''}
console.log("==================================",this.showPhone)
+ if(!item){
+ return
+ }
+ if(type == 0){
+ this.linkItem = {title:'鑱旂郴闂ㄥ簵',linkname:item.depositShopName,linkphone:item.depositShopPhone}
+ }else if(type ==2){
+ this.linkItem = {title:'鑱旂郴楠戞墜',linkname:item.driverName,linkphone:item.driverPhone}
+ }else if(type ==1){
+ this.linkItem = {title:'鑱旂郴闂ㄥ簵',linkname:item.takeShopName,linkphone:item.takeShopPhone}
+ }
},
contactPhoneDo(){
if(this.linkItem.linkphone !=null && this.linkItem.linkphone!=''){
@@ -473,7 +495,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 +702,12 @@
}
.text-ellipsis {
+ display: block;
white-space: nowrap;
overflow: hidden;
+ text-align: center;
text-overflow: ellipsis;
+ max-width: 100%;
}
.city-arrow {
--
Gitblit v1.9.3