From 777bcb6c5660c0ed14d85207377b62b779d81dde Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 20 五月 2026 23:08:55 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
small-program/shop/pages/orders/orders.vue | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 52 insertions(+), 3 deletions(-)
diff --git a/small-program/shop/pages/orders/orders.vue b/small-program/shop/pages/orders/orders.vue
index 8901ca0..71d5ce5 100644
--- a/small-program/shop/pages/orders/orders.vue
+++ b/small-program/shop/pages/orders/orders.vue
@@ -1,6 +1,12 @@
<template>
<view class="itinerary-page">
<view class="top-fixed">
+ <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>
<view class="top-inner">
<scroll-view scroll-x class="tabs-row page-padding" style="padding: 0 0 0 30rpx !important;" show-scrollbar="false">
<view class="tabs-inner">
@@ -90,6 +96,7 @@
<text class="insurance-label">鍚鏉庝繚璐癸細</text>
<text class="insurance-value">{{((item.declaredFee || 0)/100).toFixed(2) }}</text>
</view>
+ <view class="yichang" v-if="item.abnormalOrder === 1">寮傚父杞瓨</view>
</view>
</view>
@@ -97,8 +104,8 @@
<view class="footer-actions" >
<view class="footer-btn contact-btn" @click="contactPhoneDo(item.takePhone)" v-if="item.status === 1 || item.status === 5" >鑱旂郴瀹㈡埛</view>
<view class="footer-btn contact-btn" @click="contactPhoneDo(item.driverPhone)" v-if="item.type ===1&&(item.status === 4 || item.status === 3)">鑱旂郴楠戞墜</view>
- <view class="footer-btn primary-btn" v-if="item.status ===1 ||item.status ===4 " @click="hexiaoOrder(item)" >鏀朵欢鏍搁攢</view>
- <view class="footer-btn primary-btn" v-if="item.status ===5 &&(item.overdueStatus ==0 || item.overdueStatus == 1)" @click="hexiaoOrder(item)" >纭鍒板簵</view>
+ <view class="footer-btn primary-btn" v-if="[1,4].includes(item.status) && item.takeShopId" @click="hexiaoOrder(item)" >鏀朵欢鏍搁攢</view>
+ <view class="footer-btn primary-btn" v-if="item.status ===5 &&(item.overdueStatus ==0 || item.overdueStatus == 1) && item.takeShopId" @click="hexiaoOrder(item)" >纭鍒板簵</view>
<view class="footer-btn primary-btn" v-if="item.status ===5 && (item.overdueStatus == 4 || item.overdueStatus == 2)" @click="hexiaoOrder(item)" >鍙栦欢鏍搁攢</view>
</view>
</view>
@@ -126,6 +133,7 @@
pageSize: 10,
currentPage: 1,
total:0,
+ keyword:'',
hasNext:true,
isLoadingMore: false,
currentOrder:null,
@@ -214,7 +222,8 @@
res = await that.$u.api.shopOrderPage({
capacity:10,
model: {
- combinedStatus: this.activeTab == -1?'':this.activeTab
+ combinedStatus: this.activeTab == -1?'':this.activeTab,
+ keyword: this.keyword
},
page:this.currentPage
});
@@ -269,6 +278,38 @@
height: 100%;
background: #ffffff;
// background: linear-gradient(90deg, #1ba8fa 0%, #73e5cf 100%);
+ }
+
+ .top-search {
+ width: 100%;
+ height: 88rpx;
+ padding: 8rpx 30rpx;
+ box-sizing: border-box;
+ display: flex;
+ align-items: center;
+ background: #ffffff;
+ }
+
+ .searchbox {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ background: #F9F9FB;
+ padding: 0 30rpx;
+ box-sizing: border-box;
+ border: 1rpx solid #EEEEEE;
+ }
+
+ .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;
}
.top-inner {
@@ -394,6 +435,7 @@
.mode-tag {
width: 112rpx;
height: 38rpx;
+ line-height: 38rpx;
border-radius: 8rpx;
display: flex;
align-items: baseline;
@@ -463,6 +505,13 @@
border-top: 3rpx solid #ff8c1f;
}
+ .yichang {
+ font-weight: 400;
+ font-size: 24rpx;
+ color: #FF0000;
+ margin-top: 12rpx;
+ }
+
.arrow-head {
position: absolute;
right: 8rpx;
--
Gitblit v1.9.3