From fbc074229fd4736f1ae2793c9daebf04726188b2 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 22 五月 2026 18:27:27 +0800
Subject: [PATCH] 提交
---
small-program/pages/itinerary/itinerary.vue | 168 +++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 123 insertions(+), 45 deletions(-)
diff --git a/small-program/pages/itinerary/itinerary.vue b/small-program/pages/itinerary/itinerary.vue
index 5b8ed12..11c8539 100644
--- a/small-program/pages/itinerary/itinerary.vue
+++ b/small-program/pages/itinerary/itinerary.vue
@@ -7,6 +7,12 @@
<view class="header-bar" :style="{ height: navHeight + 'px' }">
<text class="header-title">鎴戠殑琛岀▼</text>
</view>
+ <view class="top-search">
+ <view class="searchbox">
+ <u-icon name="search" color="#999999" size="28"></u-icon>
+ <input class="search-input" v-model="keyword" @confirm="getFirstPageData" type="text" placeholder="杈撳叆濮撳悕銆佺數璇濄�佽鍗曠紪鍙锋悳绱�">
+ </view>
+ </view>
<scroll-view scroll-x class="tabs-row page-padding" style="padding: 0 0 0 30rpx !important;" show-scrollbar="false">
<view class="tabs-inner">
<view
@@ -89,19 +95,20 @@
<view class="amount-area">
<view class="pay-row">
<text class="pay-label">瀹炰粯娆撅細</text>
- <text class="pay-value">{{((item.estimatedAmount || 0)/100).toFixed(2) }}</text>
+ <text class="pay-value">{{(((item.estimatedAmount || 0) - (item.deductionAmount || 0)) / 100).toFixed(2) }}</text>
</view>
<view class="insurance-row">
<text class="insurance-label">鍚鏉庝繚璐癸細</text>
<text class="insurance-value">{{((item.declaredFee || 0)/100).toFixed(2) }}</text>
</view>
+ <view class="yichang" v-if="item.type === 0 && item.abnormalOrder === 1">寮傚父杞瓨</view>
</view>
</view>
<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 ===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" v-if="[0,1].includes(item.status) && item.abnormalOrder !== 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" @click="payOrderFee(item)" v-if="item.status ===5 && item.overdueStatus===3 ">绔嬪嵆鏀粯</view>
@@ -109,10 +116,10 @@
<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>
- <view class="footer-btn contact-btn" @click="contactPhone(item,2)" v-if="item.status ===3 || item.status ===4 ">鑱旂郴楠戞墜</view>
- <view class="footer-btn contact-btn" @click="contactPhone(item,1)" v-if="item.status ===5">鑱旂郴闂ㄥ簵</view>
- <view class="footer-btn contact-btn" v-if="item.status ===0" @click="cancelOrder(item)">鍙栨秷璁㈠崟</view>
+ <view class="footer-btn contact-btn" @click="contactPhone(item,0)" v-if="(item.status ===1 || item.status ==2) && item.takeShopId">鑱旂郴闂ㄥ簵</view>
+ <view class="footer-btn contact-btn" @click="contactPhone(item,2)" v-if="[3,4,5].includes(item.status) && !item.takeShopId">鑱旂郴楠戞墜</view>
+ <view class="footer-btn contact-btn" @click="contactPhone(item,1)" v-if="item.status ===5 && item.takeShopId">鑱旂郴闂ㄥ簵</view>
+ <view class="footer-btn contact-btn" v-if="[0,1,2].includes(item.status)" @click="cancelOrder(item)">鍙栨秷璁㈠崟</view>
<view class="footer-btn primary-btn" @click="payOrder(item)" v-if="item.status ===0">绔嬪嵆鏀粯</view>
<view class="footer-btn primary-btn" @click="payOrderFee(item)" v-if="item.status ===5 && item.overdueStatus===3 ">绔嬪嵆鏀粯</view>
<view class="footer-btn contact-btn" @click="deleteOrder(item)" v-if="item.status ===7 || item.status===96 || item.status == 99">鍒犻櫎璁㈠崟</view>
@@ -198,16 +205,27 @@
</view>
</u-popup>
<u-popup :show="showQrcode" round="15" @close="openQrcode()" :safeAreaInsetBottom="false" mode="bottom" :closeable="true" :closeOnClickOverlay="false">
- <view class="tc" style="height: 700rpx;width: 100%; ">
+ <view class="tc" style="height: auto;width: 100%; ">
<view class="tc-contemt" style="text-align: center;">
- <view class="tc-contemt-title" style="text-align: center;">鏍搁攢鐮�</view>
+ <view style="margin-bottom: 30rpx;">
+ <text class="pickup-code" style="font-size: 48rpx;">琛屾潕缂栧彿锛歿{ currentOrder.sortnum||'' }}</text>
+ <view class="pickup-code" style="margin-left: 60rpx;font-size: 28rpx;text-align: left;font-weight: normal;">鐢ㄦ埛锛歿{currentOrder.takeUser||''}}({{currentOrder.takePhone||''}})</view>
+ <view class="pickup-code" style="margin-left: 60rpx;font-size: 28rpx;text-align: left;font-weight: normal;" v-if="currentOrder.type === 1">闂ㄥ簵锛歿{ currentOrder.status === 1 ? currentOrder.depositShopName||'' : currentOrder.status === 5 ? currentOrder.takeShopName||'' : ''}}</view>
+ <view class="pickup-code" style="margin-left: 60rpx;font-size: 28rpx;text-align: left;font-weight: normal;" v-else>闂ㄥ簵锛歿{ currentOrder.depositShopName||'' }}</view>
+ <view class="item-form-list" style="align-items:baseline;" v-if="currentOrder && currentOrder.orderImages && currentOrder.orderImages.length">
+ <view class="item-form-list-row" v-for="(item,index) in currentOrder.orderImages" key="item">
+ <image :src="item" mode="widthFix" @click="previewImage(currentOrder.orderImages,index)" ></image>
+ </view>
+ </view>
+ </view>
<view class="qrcode-box">
- <canvas canvas-id="qrcodeCanvas" id="qrcodeCanvas" style="width: 100px; height: 100px;"></canvas>
+ <canvas canvas-id="qrcodeCanvas" id="qrcodeCanvas" style="width: 100px; height: 100px; position: fixed; top: -100%; left: -100%; z-index: -1;"></canvas>
<image class="qrcode-image" :src="qrcodeImage" mode="widthFix"></image>
</view>
- <text class="pickup-code">{{ currentOrder.memberVerifyCode||'' }}</text>
- <text class="pickup-tip" @tap="copyCode">鐐瑰嚮澶嶅埗鑷彁鐮�</text>
+ <text class="pickup-code">鏍搁攢鐮�:{{ currentOrder.memberVerifyCode||'' }}</text>
+ <text class="pickup-tip" @tap="copyCode">鐐瑰嚮澶嶅埗鏍搁攢鐮�</text>
</view>
+
</view>
</u-popup>
<custom-tabbar></custom-tabbar>
@@ -236,6 +254,7 @@
showPhone:false,
total:0,
hasNext:true,
+ keyword:'',
userType: 0,
qrcodeImage:null,
isLoadingMore: false,
@@ -265,6 +284,7 @@
/* 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);
@@ -281,38 +301,37 @@
}
})
}
-
})
- },
- onShow() {
-
- this.activeTab = -1
- this.showDone=false
- this.showCancel=false
- 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 ) {
+ uni.$on('shuaxin', (orderStatus) => {
+ this.activeTab = -1
+ this.showDone=false
+ this.showCancel=false
+ 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:''}
if( Number(orderStatus) === -2){
this.activeTab = 0
- } else{
+ } else if( Number(orderStatus) !== 0 ){
this.activeTab = Number(orderStatus)
}
- }
- uni.clearStorageSync("orderStatus")
- this.getFirstPageData()
+ this.getFirstPageData()
+ })
},
onReachBottom(){
this.getDataList();
},
methods: {
+ previewImage(images,index = 0) {
+ uni.previewImage({
+ current: index,
+ urls: images
+ });
+ },
changeTab(item){
this.activeTab = item.value
this.getFirstPageData()
@@ -478,7 +497,7 @@
data: this.currentOrder.memberVerifyCode,
success: () => {
uni.showToast({
- title: '宸插鍒惰嚜鎻愮爜',
+ title: '宸插鍒舵牳閿�鐮�',
icon: 'none'
})
}
@@ -530,12 +549,13 @@
var that =this
let res ={};
res = await that.$u.api.myOrderPage({
- capacity:10,
- model: {
- combinedStatus: this.activeTab == -1?'':this.activeTab
- },
- page:this.currentPage
- });
+ capacity:10,
+ model: {
+ combinedStatus: this.activeTab == -1?'':this.activeTab,
+ keyword: this.keyword
+ },
+ page:this.currentPage
+ });
console.log(res)
if (res.code === 200 ) {
@@ -559,7 +579,7 @@
},
evaluateOrder(item){
uni.navigateTo({
- url:"/pages/evaluate/evaluate?id="+item.id
+ url:`/pages/evaluate/evaluate?id=${item.id}&type=${item.type}&takeShopId=${item.takeShopId || ''}`
})
}
}
@@ -611,6 +631,38 @@
align-items: center;
justify-content: space-between;
box-sizing: border-box;
+ }
+
+ .top-search {
+ width: 100%;
+ height: 88rpx;
+ padding: 8rpx 30rpx;
+ box-sizing: border-box;
+ display: flex;
+ align-items: center;
+ }
+
+ .searchbox {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ padding: 0 30rpx;
+ box-sizing: border-box;
+ background: rgba(255,255,255,0.9);
+ border-radius: 16rpx;
+ overflow: hidden;
+ }
+
+ .search-input {
+ flex: 1;
+ height: 72rpx;
+ background: #F9F9FB;
+ border-radius: 16rpx;
+ border: 1rpx solid #EEEEEE;
+ font-weight: 400;
+ font-size: 26rpx;
+ color: #333333;
+ margin-left: 16rpx;
}
.header-title {
@@ -717,6 +769,7 @@
.mode-tag {
width: 112rpx;
height: 38rpx;
+ line-height: 38rpx;
border-radius: 8rpx;
display: flex;
align-items: baseline;
@@ -879,14 +932,15 @@
color: #8C939F;
}
.price-line{
+ padding: 0 30rpx;
box-sizing: border-box;
display: flex;
- align-items: flex-end;
+ align-items: end;
}
.amount-area {
width: 50%;
- padding: 0 30rpx;
- box-sizing: border-box;
+ // padding: 0 30rpx;
+ // box-sizing: border-box;
display: flex;
flex-direction: column;
align-items: flex-end;
@@ -912,6 +966,13 @@
}
.insurance-row {
+ margin-top: 12rpx;
+ }
+
+ .yichang {
+ font-weight: 400;
+ font-size: 24rpx;
+ color: #FF0000;
margin-top: 12rpx;
}
@@ -967,6 +1028,7 @@
font-size: 28rpx;
box-sizing: border-box;
margin-right: 20rpx;
+ white-space: nowrap;
&:last-child {
margin: 0 !important;
}
@@ -976,6 +1038,7 @@
border: 1rpx solid #B2B2B2;
background: #ffffff;
color: #666666;
+ white-space: nowrap;
}
.primary-btn {
@@ -1003,7 +1066,22 @@
opacity: 0;
}
}
-
+ .item-form-list {
+ max-width: 100%;
+ display: flex;
+ flex-wrap: wrap;
+ align-items: center;
+ justify-content: center;
+ gap: 20rpx;
+ .item-form-list-row {
+ border-radius: 8rpx;
+ overflow: hidden;
+ image {
+ width: 130rpx;
+ max-height: 150rpx;
+ }
+ }
+ }
.qrcode-image {
width: 100%;
height: 100%;
--
Gitblit v1.9.3