From f7c561866b43ca7499201a9ded0eecffea05030d Mon Sep 17 00:00:00 2001
From: jyx <2012969435@qq.com>
Date: Thu, 19 Sep 2024 16:37:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=81=A2=E5=A4=8D=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   | 13 ++++++++++---
 src/pages/index/index.vue    |  6 ++++++
 src/pages/painting/index.vue |  8 +++++++-
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/pages/detail/index.vue b/src/pages/detail/index.vue
index 5d56468..fcbdfac 100644
--- a/src/pages/detail/index.vue
+++ b/src/pages/detail/index.vue
@@ -23,8 +23,15 @@
       </view>
     </view>
     <view class="button-container">
+      <up-button
+      style="width: 336rpx; margin: auto; height: 80rpx"
+      color="#BABABA"
+      throttleTime="5"
+      v-if="state.boxRelBucketStatus == 1"
+      >取消</up-button
+    >
         <up-button
-          style="width: 456rpx; margin: auto; height: 86rpx;"
+          style="width: 336rpx; margin: auto; height: 80rpx;"
           color="#EFC54E"
           throttleTime="5"
           @click="doneSet"
@@ -32,14 +39,14 @@
           :disabled="isButtonDisabled"
           > {{ buttonText }}</up-button
         >
-        <!-- <up-button
+        <up-button
         style="width: 426rpx; margin: auto; height: 86rpx;"
         color="#EFC54E"
         throttleTime="5"
         @click="login"
         v-if="state.boxRelBucketStatus == 2||state.boxRelBucketStatus ==3"
         >返回继续扫码</up-button
-      > -->
+      >
       </view>
   </template>
   
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 5794d00..7d8833d 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -43,6 +43,12 @@
     </view>
   </view>
   <view class="button-container">
+    <up-button
+      style="width: 336rpx; margin: auto; height: 80rpx"
+      color="#BABABA"
+      throttleTime="5"
+      >取消</up-button
+    >
       <up-button
           style="width: 456rpx; margin: auto; height: 86rpx;"
           color="#EFC54E"
diff --git a/src/pages/painting/index.vue b/src/pages/painting/index.vue
index 60fe4ed..4ad1e23 100644
--- a/src/pages/painting/index.vue
+++ b/src/pages/painting/index.vue
@@ -25,7 +25,13 @@
   </view>
   <view class="button-container">
     <up-button
-      style="width: 456rpx; margin: auto; height: 80rpx"
+      style="width: 336rpx; margin: auto; height: 80rpx"
+      color="#BABABA"
+      throttleTime="5"
+      >取消</up-button
+    >
+    <up-button
+      style="width: 336rpx; margin: auto; height: 80rpx"
       color="#EFC54E"
       throttleTime="5"
       @click="doneSet"