修改6月6号到8号的问题 修改装配收货 弹出软键盘 预生产收货任务列表--上拉加载

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,

src/mycomponents/scan/winComScan.vue

@@ -171,7 +171,7 @@ const getfocus = () => {
   nextTick((r) => {
     boxfocus.value = true
   })
-  hide()
+  // hide()
 }
 const losefocus = () => {
   nextTick((r) => {

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(

src/pages/index/index.vue

@@ -136,24 +136,9 @@ onHide(() => {
 })
 onShow(() => {
   if (uni.getStorageSync('hasLogin') == null || uni.getStorageSync('hasLogin') == false) {
-    uni.showModal({
+    // uni.showModal({
-      title: '未登录',
+    uni.reLaunch({
-      content: '您未登录 , 需要登录后才能继续', // 如果需要强制登录，不显示取消按钮
+      url: '../login/index'
-      showCancel: !forcedLogin.value,
-      success: (res) => {
-        if (res.confirm) {
-          // 如果需要强制登录，使用reLanch方式
-          if (forcedLogin.value) {
-            uni.reLaunch({
-              url: '../login/index'
-            })
-          } else {
-            uni.navigateTo({
-              url: '../login/index'
-            })
-          }
-        }
-      }
     })
   } else {
     timerRefresh()

src/pages/productReceipt/job/fgProductReceiptDetail.vue

@@ -384,6 +384,7 @@ const commit = () => {
           submitJob()
         }
       } else {
+        subitem.scaned = true
         submitJob()
       }
     })