From 93f3a52e33a0f13a4930ac32196bab9e8b55a75e Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期六, 03 八月 2024 17:35:14 +0800
Subject: [PATCH] 1

---
 sub_pages/partner/delivery/station-delivery.vue |    2 +-
 manifest.json                                   |    2 +-
 sub_pages/partner/delivery/delivery-detail.vue  |    4 ++--
 sub_pages/partner/delivery/delivery.vue         |    4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/manifest.json b/manifest.json
index 2848179..782394c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -49,7 +49,7 @@
     "quickapp" : {},
     /* 快应用特有相关 */
     "mp-weixin" : {
-        "appid" : "wx1441324401626290",
+        "appid" : "wx6d0ecc4e18710458",
         "setting" : {
             "urlCheck" : false,
             "es6" : true,
diff --git a/sub_pages/partner/delivery/delivery-detail.vue b/sub_pages/partner/delivery/delivery-detail.vue
index 20bcaf5..efb714a 100644
--- a/sub_pages/partner/delivery/delivery-detail.vue
+++ b/sub_pages/partner/delivery/delivery-detail.vue
@@ -189,10 +189,10 @@
 						</view>
 					</view>
 				</view>
-				<view class="line-gray" v-if="dto.satus == 'ARRIVED'">
+				<view class="line-gray" v-if="dto.satus == 'ARRIVED'||dto.satus == 'PENDING'">
 
 				</view>
-				<view class="buttons" v-if="dto.satus == 'ARRIVED'">
+				<view class="buttons" v-if="dto.satus == 'ARRIVED'||dto.satus == 'PENDING'">
 					<view class="button text-center" v-for="button of check_status" :key="button.value"
 						@click.stop="clickCheck(item,button.value)">{{ button.label }}
 					</view>
diff --git a/sub_pages/partner/delivery/delivery.vue b/sub_pages/partner/delivery/delivery.vue
index 1721d5d..3398f33 100644
--- a/sub_pages/partner/delivery/delivery.vue
+++ b/sub_pages/partner/delivery/delivery.vue
@@ -174,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'"
+						<view class="button button-1 m-l-15 m-r-0" 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>
diff --git a/sub_pages/partner/delivery/station-delivery.vue b/sub_pages/partner/delivery/station-delivery.vue
index d1289dc..3f873d0 100644
--- a/sub_pages/partner/delivery/station-delivery.vue
+++ b/sub_pages/partner/delivery/station-delivery.vue
@@ -79,7 +79,7 @@
 							</view>
 							<view class="form-item flex1">
 								<view class="form-item-label">供货数</view>
-								<view class="form-item-value t-red">{{ item.stationName || '0' }}</view>
+								<view class="form-item-value t-red">{{ item.totalNum || '0' }}</view>
 							</view>
 
 						</view>

--
Gitblit v1.9.3