From 209e6ba547d199a2167218b6187219cbf5d1abca Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Tue, 23 Jul 2024 14:10:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=A3=80=E9=AA=8C=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=85=B3=E9=97=AD=E6=8F=90=E7=A4=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/login/login/index.vue               |  2 +-
 .../quality/Materialinspection/index.vue      | 39 ++++++++++++++++++-
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue
index f42f220..7132770 100644
--- a/src/pages/login/login/index.vue
+++ b/src/pages/login/login/index.vue
@@ -142,7 +142,7 @@ export default class LoginPage extends BasePage {
     // console.log('Version////', this.Version);
   }
   ///********版本号修改区域**********
-  version = '0.0.81'; //正式版本号
+  version = '0.0.82'; //正式版本号
   //version = '0.0.4'; //测试版本号
   //***************标志修改区域：是否是测试标志： false 正式版本； true 测试版本****************
   //isTest = true;
diff --git a/src/pages/quality/Materialinspection/index.vue b/src/pages/quality/Materialinspection/index.vue
index 7fa08e4..8a68348 100644
--- a/src/pages/quality/Materialinspection/index.vue
+++ b/src/pages/quality/Materialinspection/index.vue
@@ -82,7 +82,8 @@
       </view>
     </view>
     <view>
-      <u-popup v-model="show" mode="center" width="98%" :closeable="true">
+      <u-popup v-model="show" mode="center" width="98%">
+        <view @click="closepopup"><u-icon style="position: absolute; right: 20rpx" name="close" color="#2979ff" size="28"></u-icon></view>
         <view class="selectlist">
           <div class="item-name">
             <div class="quest">检验项目 :</div>
@@ -1499,6 +1500,42 @@ export default class PurchaseWHSRM extends BasePage {
       url: `/pages/quality/Materialinspection/web?listitem=` + encodeURIComponent(result),
     });
   }
+  closepopup() {
+    //是否关闭弹窗
+    this.$nextTick(() => {
+      uni.showModal({
+        content: '是否退出？',
+        showCancel: true,
+        success: (res) => {
+          if (res.confirm) {
+            this.show = false;
+          } else if (res.cancel) {
+            console.log('不关闭');
+          }
+        },
+      });
+    });
+  }
+  onBackPress(e) {
+    if (e.from === 'backbutton') {
+      if (this.show === true) {
+        uni.showModal({
+          content: '是否退出？',
+          showCancel: true,
+          success: (res) => {
+            if (res.confirm) {
+              this.show = false;
+            } else if (res.cancel) {
+              console.log('不关闭');
+            }
+          },
+        });
+        return true;
+      } else {
+        ///
+      }
+    }
+  }
 }
 </script>
 <style lang="scss" scoped>