From 1c12bb1a47ad7e0c005424f93675def0fce399f8 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 27 Aug 2024 17:28:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B96=E6=9C=886=E5=8F=B7=E5=88=B0?=
 =?UTF-8?q?8=E5=8F=B7=E7=9A=84=E9=97=AE=E9=A2=98=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=A3=85=E9=85=8D=E6=94=B6=E8=B4=A7=20=E5=BC=B9=E5=87=BA?=
 =?UTF-8?q?=E8=BD=AF=E9=94=AE=E7=9B=98=20=E9=A2=84=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E6=94=B6=E8=B4=A7=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8--?=
 =?UTF-8?q?=E4=B8=8A=E6=8B=89=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/http.ts                               |  1 +
 src/mycomponents/scan/winComScan.vue          |  2 +-
 src/mycomponents/scan/winComScanFg.vue        |  4 ++--
 src/pages/index/index.vue                     | 21 +++----------------
 .../job/fgProductReceiptDetail.vue            |  1 +
 5 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/src/api/http.ts b/src/api/http.ts
index 608ba47e..93e5502a 100644
--- a/src/api/http.ts
+++ b/src/api/http.ts
@@ -8,6 +8,7 @@ const instance = axios.create({
 	adapter(config) {
 		const { url, method, data, params, headers, baseURL, paramsSerializer } =
 			config
+		config.timeout = 300000
 		return new Promise((resolve, reject) => {
 			uni.request({
 				method: method!.toUpperCase() as any,
diff --git a/src/mycomponents/scan/winComScan.vue b/src/mycomponents/scan/winComScan.vue
index bd5f3543..b2dd09ca 100644
--- a/src/mycomponents/scan/winComScan.vue
+++ b/src/mycomponents/scan/winComScan.vue
@@ -171,7 +171,7 @@ const getfocus = () => {
   nextTick((r) => {
     boxfocus.value = true
   })
-  hide()
+  // hide()
 }
 const losefocus = () => {
   nextTick((r) => {
diff --git a/src/mycomponents/scan/winComScanFg.vue b/src/mycomponents/scan/winComScanFg.vue
index a3a965c9..746df870 100644
--- a/src/mycomponents/scan/winComScanFg.vue
+++ b/src/mycomponents/scan/winComScanFg.vue
@@ -88,14 +88,14 @@ const itemCode = ref('')
 const comMessageRef = ref()
 onMounted(() => {
   boxfocus.value = true
-  uni.hideKeyboard()
+  // uni.hideKeyboard()
 
   // #ifdef H5
   if (document.querySelector('textarea') != null) {
     document.querySelector('textarea').setAttribute('inputmode', 'none')
   }
   // #endif
-  hide()
+  // hide()
   placeholderValue.value = `请扫描${props.placeholder}`
 })
 watch(
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index e34f3b9f..dc8c67f2 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -136,24 +136,9 @@ onHide(() => {
 })
 onShow(() => {
   if (uni.getStorageSync('hasLogin') == null || uni.getStorageSync('hasLogin') == false) {
-    uni.showModal({
-      title: '未登录',
-      content: '您未登录 , 需要登录后才能继续', // 如果需要强制登录，不显示取消按钮
-      showCancel: !forcedLogin.value,
-      success: (res) => {
-        if (res.confirm) {
-          // 如果需要强制登录，使用reLanch方式
-          if (forcedLogin.value) {
-            uni.reLaunch({
-              url: '../login/index'
-            })
-          } else {
-            uni.navigateTo({
-              url: '../login/index'
-            })
-          }
-        }
-      }
+    // uni.showModal({
+    uni.reLaunch({
+      url: '../login/index'
     })
   } else {
     timerRefresh()
diff --git a/src/pages/productReceipt/job/fgProductReceiptDetail.vue b/src/pages/productReceipt/job/fgProductReceiptDetail.vue
index d9eb1538..e1e98fca 100644
--- a/src/pages/productReceipt/job/fgProductReceiptDetail.vue
+++ b/src/pages/productReceipt/job/fgProductReceiptDetail.vue
@@ -384,6 +384,7 @@ const commit = () => {
           submitJob()
         }
       } else {
+        subitem.scaned = true
         submitJob()
       }
     })