From 6e4b859a05e29eb75ff39c340e015265c3be85e9 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期日, 04 八月 2024 11:51:43 +0800
Subject: [PATCH] update 合伙人、花店端

---
 sub_pages/partner/delivery/delivery.vue |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/sub_pages/partner/delivery/delivery.vue b/sub_pages/partner/delivery/delivery.vue
index a2ae2d3..a7eaf87 100644
--- a/sub_pages/partner/delivery/delivery.vue
+++ b/sub_pages/partner/delivery/delivery.vue
@@ -117,19 +117,24 @@
 						</template>
 					</u-input>
 				</view>
+				<view class="component-filter-container p10 bg-white m-l-10">
+					<view class="flex1" @click="show_select_status=true">
+						配送单状态:{{ query.statusStr || '全部' }}
+						<image src="../../../static/common/icon-arrow-down.png" class="icon-arrow-down"></image>
+					</view>
+				</view>
 			</view>
 
-			<view class="component-filter-container p20 bg-white">
+			<!-- <view class="component-filter-container p20 bg-white">
 				<view class="flex1" @click="show_select_status=true">
 					配送单状态:{{ query.statusStr || '全部' }}
 					<image src="../../../static/common/icon-arrow-down.png" class="icon-arrow-down"></image>
 				</view>
-				<!-- @click="show_select_station=true" -->
 				<view class="flex1">
 					集货站:{{ query.stationName || '全部' }}
 					<image src="../../../static/common/icon-arrow-down.png" class="icon-arrow-down"></image>
 				</view>
-			</view>
+			</view> -->
 
 			<no-data v-if="!list||list.length===0" style="width: 100%;"></no-data>
 			<view v-for="(item,index) in list" :key="index" class="m-b-24">
@@ -169,10 +174,10 @@
 
 					<view class="line-gray"></view>
 					<view class="flex buttons">
-						<view class="button button-1 m-l-15 m-r-0" v-if="item.status==='ARRIVED'"
-							@click="compelete(item)">质检完成</view>
+						<view class="button button-1 m-l-a m-r-15"
+							v-if="item.status==='ARRIVED'||item.status==='PENDING'" @click="compelete(item)">质检完成</view>
 						<view class="button button-0 m-l-a m-r-0" @click="toDetail(item)">
-							{{item.status==='ARRIVED'?'前往质检':'查看详情'}}
+							{{(item.status==='ARRIVED'||item.status==='PENDING')?'前往质检':'查看详情'}}
 						</view>
 
 					</view>

--
Gitblit v1.9.3