From 6912cc8a59af3d122bd9eaa790726a5cc00fafe0 Mon Sep 17 00:00:00 2001
From: jyx <2012969435@qq.com>
Date: Thu, 10 Oct 2024 11:22:07 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=85=A5=E5=BA=93=E5=8F=96=E6=B6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/detail/index.vue   |  8 ++++----
 src/pages/painting/index.vue | 12 ++++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/pages/detail/index.vue b/src/pages/detail/index.vue
index 6bc6e3b..be2efd0 100644
--- a/src/pages/detail/index.vue
+++ b/src/pages/detail/index.vue
@@ -1,14 +1,14 @@
 <template>
     <view class="content">
       <navBar v-if="state.boxRelBucketStatus == 1"> 出库 </navBar>
-      <navBar v-if="state.boxRelBucketStatus == 2||state.boxRelBucketStatus ==3"> 画筒详情 </navBar>
+      <navBar v-if="state.boxRelBucketStatus == 2||state.boxRelBucketStatus ==4"> 画筒详情 </navBar>
       <view class="container-box" >
         <span style="font-weight: bold;text-align: center;" v-if="state.boxRelBucketStatus == 1">
             确定要出库{{state.locateAddress}}的 
         </span>
         <span style="font-weight: bold;text-align: center;margin-top: 20rpx;" v-if="state.boxRelBucketStatus == 1"> {{state.pid}}画筒吗？</span>
-        <span style="font-weight: bold;text-align: center;" v-if="state.boxRelBucketStatus == 2||state.boxRelBucketStatus ==3">画筒号：{{state.pid}}</span>
-        <span style="font-weight: bold;text-align: center;margin-top: 20rpx;" v-if="state.boxRelBucketStatus == 2||state.boxRelBucketStatus ==3">所在位置：{{ state.locateAddress }}</span>
+        <span style="font-weight: bold;text-align: center;" v-if="state.boxRelBucketStatus == 2||state.boxRelBucketStatus ==4">画筒号：{{state.pid}}</span>
+        <span style="font-weight: bold;text-align: center;margin-top: 20rpx;" v-if="state.boxRelBucketStatus == 2||state.boxRelBucketStatus ==4">所在位置：{{ state.locateAddress }}</span>
         <view class="painting-box" >
           <span>画作名称：{{ state.drawName }}</span>
           <span style="margin-top: 20rpx;">画家：{{ state.drawerName }}</span>
@@ -44,7 +44,7 @@
         color="#EFC54E"
         throttleTime="5"
         @click="login"
-        v-if="state.boxRelBucketStatus == 2||state.boxRelBucketStatus ==3"
+        v-if="state.boxRelBucketStatus == 2||state.boxRelBucketStatus ==4"
         >返回继续扫码</up-button
       >
       </view>
diff --git a/src/pages/painting/index.vue b/src/pages/painting/index.vue
index 1f72669..a568806 100644
--- a/src/pages/painting/index.vue
+++ b/src/pages/painting/index.vue
@@ -28,8 +28,9 @@
       style="width: 336rpx; margin: auto; height: 80rpx"
       color="#BABABA"
       throttleTime="5"
-      disabled="isButtonDisabled"
+      :disabled="closeButton"
       @click="closeFn"
+      :loading="loading"
       >取消</up-button
     >
     <up-button
@@ -37,7 +38,7 @@
       color="#EFC54E"
       throttleTime="5"
       @click="doneSet"
-      disabled="closeButton"
+      :disabled="isButtonDisabled"
       :loading="loading"
       >{{ buttonText }}</up-button
     >
@@ -109,15 +110,18 @@ const doneSet = async () => {
 };
 //入库取消
 const closeFn = async () => {
+  loading.value = true;
   const res = await cancel({
     boxUid : state.boxUid
   });
     if(res.status === 0){
+      showMessage({ type: "error", message: "取消入库" });
+      closeButton.value = true;
+      isButtonDisabled.value = true; 
     }else{
       showMessage({ type: "error", message: res.msg });
-      isButtonDisabled.value = true;
-      closeButton.value = true;
     }
+    loading.value = false;
 }
 //查孔洞是否能用
 const check = async () => {