fix

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;" 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 ==3">所在位置：{{ state.locateAddress }}</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>

src/pages/index/index.vue

@@ -141,7 +141,7 @@ const doneSet = async () => {
             drawerName: selectedPainting.ArtistName,
             drawerUid: selectedPainting.ArtistUuid,
             rulerNum:selectedPainting.Ruler,
-            drawThumbnai:selectedPainting.HdPic,
+             drawThumbnail:selectedPainting.HdPic,
             drawerNum:selectedPainting.Tnum,//画家编号
             drawNum:selectedPainting.Tfnum,
         });

src/pages/login/index.vue

@@ -199,6 +199,7 @@ const paintingDetail = async () => {
 // };
 const toCode = () => {
   isCode.value = true;
+  state.Password= "";
 };
 //获取验证码
 const obtainCode = async () => {

src/pages/painting/index.vue

@@ -21,9 +21,9 @@
   </view>
   <view class="button-container">
     <up-button style="width: 336rpx; margin: auto; height: 80rpx" color="#BABABA" throttleTime="5"
-      disabled="isButtonDisabled" @click="closeFn" v-if="runTimeEnv()">取消</up-button>
+      :disabled="closeButton" @click="closeFn" :loading="loading">取消</up-button>
     <up-button style="width: 336rpx; margin: auto; height: 80rpx" color="#EFC54E" throttleTime="5" @click="doneSet"
-      disabled="closeButton" :loading="loading">{{ buttonText }}</up-button>
+      :disabled="isButtonDisabled" :loading="loading">{{ buttonText }}</up-button>
   </view>
 </template>
 
@@ -93,19 +93,18 @@ const doneSet = async () => {
 };
 //入库取消
 const closeFn = async () => {
+  loading.value = true;
   const res = await cancel({
     boxUid: state.boxUid
   });
   if (res.status === 0) {
-    // console.log(123123123, runTimeEnv())
+    showMessage({ type: "error", message: "取消入库" });
-    // if (runTimeEnv()) {
+    closeButton.value = true;
-    //   closeWebview()
+    isButtonDisabled.value = true;
-    // }
   } else {
     showMessage({ type: "error", message: res.msg });
-    isButtonDisabled.value = true;
-    closeButton.value = true;
   }
+  loading.value = false;
 }
 //查孔洞是否能用
 const check = async () => {