From 772b6c6bc48d26b9f5bc613dda574bdfdfa61c6a Mon Sep 17 00:00:00 2001
From: xuminyui <576362016@qq.com>
Date: Thu, 17 Oct 2024 11:15:33 +0800
Subject: [PATCH] fix

---
 src/pages/detail/index.vue | 84 ++++++++++++++++++++++++++------------
 1 file changed, 59 insertions(+), 25 deletions(-)

diff --git a/src/pages/detail/index.vue b/src/pages/detail/index.vue
index 5bb342f..7db5f8c 100644
--- a/src/pages/detail/index.vue
+++ b/src/pages/detail/index.vue
@@ -1,42 +1,76 @@
 <template>
   <view class="content">
     <navBar v-if="state.boxRelBucketStatus == 1"> 出库 </navBar>
-    <navBar v-if="state.boxRelBucketStatus == 2 || state.boxRelBucketStatus == 4"> 画筒详情 </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">
+      <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 == 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>
+      <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 == 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>
-        <span style="margin-top: 20rpx;">预览图：</span>
+        <span style="margin-top: 20rpx">画家：{{ state.drawerName }}</span>
+        <span style="margin-top: 20rpx">预览图：</span>
         <view class="image-container">
-          <up-image :src=state.drawThumbnail></up-image>
+          <up-image :src="state.drawThumbnail"></up-image>
         </view>
       </view>
-
     </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: 336rpx; margin: auto; height: 80rpx;" color="#EFC54E" throttleTime="5" @click="doneSet"
-      v-if="state.boxRelBucketStatus == 1" :disabled="isButtonDisabled"> {{ buttonText }}</up-button>
-    <up-button style="width: 426rpx; margin: auto; height: 86rpx;" color="#EFC54E" throttleTime="5" @click="login"
-      v-if="state.boxRelBucketStatus == 2 || state.boxRelBucketStatus == 4">返回继续扫码</up-button>
+    <up-button
+      style="width: 336rpx; margin: auto; height: 80rpx"
+      color="#BABABA"
+      throttleTime="5"
+      v-if="state.boxRelBucketStatus == 1"
+      >取消</up-button
+    >
+    <up-button
+      style="width: 336rpx; margin: auto; height: 80rpx"
+      color="#EFC54E"
+      throttleTime="5"
+      @click="doneSet"
+      v-if="state.boxRelBucketStatus == 1"
+      :disabled="isButtonDisabled"
+    >
+      {{ buttonText }}</up-button
+    >
+    <up-button
+      style="width: 426rpx; margin: auto; height: 86rpx"
+      color="#EFC54E"
+      throttleTime="5"
+      @click="backScan"
+      v-if="state.boxRelBucketStatus == 2 || state.boxRelBucketStatus == 4"
+      >返回继续扫码</up-button
+    >
   </view>
 </template>
 
-
 <script setup>
 import { ref, reactive, onBeforeMount } from "vue";
-// import { closeWebview, runTimeEnv } from "@/utils/index.js"
+import { closeWebview, runTimeEnv } from "../../../utils/index.js";
 
 import { onLoad } from "@dcloudio/uni-app";
 import useToast from "@/hooks/toast/useToast.js";
@@ -61,7 +95,7 @@ onLoad((options) => {
   state.id = options.id;
   state.pid = options.pid;
   state.boxRelBucketStatus = options.boxRelBucketStatus;
-  paintingDetail()
+  paintingDetail();
 });
 const paintingDetail = async () => {
   loading.value = true;
@@ -76,7 +110,6 @@ const paintingDetail = async () => {
     state.locateAddress = res.data.locateAddress;
     state.boxUid = res.data.boxUid;
   }
-
 };
 const doneSet = async () => {
   loading.value = true;
@@ -94,6 +127,9 @@ const doneSet = async () => {
   }
   loading.value = false;
 };
+const backScan = () => {
+  closeWebview();
+};
 </script>
 
 <style lang="scss" scoped>
@@ -119,10 +155,8 @@ page {
     margin-top: 60rpx;
     padding: 40rpx;
     box-sizing: border-box;
-
   }
 
-
   .painting-box {
     height: 100%;
     width: 100%;
@@ -156,4 +190,4 @@ page {
   background-color: #fff;
   height: 8%;
 }
-</style>
\ No newline at end of file
+</style>