From 7095a98bcdc824cf139433f5d1d297d53e30c522 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 3 Jul 2025 17:41:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E8=AF=86=E5=88=AB?=
 =?UTF-8?q?=E6=88=90=E5=8A=9F=E4=B8=8E=E5=90=A6=E9=83=BD=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E5=88=B0=E5=85=A5=E4=BD=8F=E5=8A=9E=E7=90=86=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json                          |  1 -
 ocr.js                            |  1 +
 pages/index/index.js              | 21 ++++++++-----------
 project.private.config.json       |  2 +-
 subpages/OCRCard/pages/OCR/OCR.js | 34 ++++++++++++++++++++++---------
 5 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/app.json b/app.json
index 0a7d904..666c036 100644
--- a/app.json
+++ b/app.json
@@ -114,7 +114,6 @@
           }
     },
     "requiredPrivateInfos": [
-        "getLocation",
         "chooseLocation"
     ],
     "plugins": {
diff --git a/ocr.js b/ocr.js
index eb5f133..78d8b89 100644
--- a/ocr.js
+++ b/ocr.js
@@ -33,6 +33,7 @@ export const ocrAction = async (filePath) => {
   wx.showLoading({
     title: '正在处理',
   });
+  console.log(filePath,'拿到的文件地址');
   try {
     // 上传文件到 CDN 并获取 url
     const img_url = await uploadFilePromise(filePath);
diff --git a/pages/index/index.js b/pages/index/index.js
index 5bffddb..e98c411 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -190,18 +190,15 @@ Page({
           url: e.currentTarget.dataset.url,
         })
     }else if(e.currentTarget.dataset.url){
-      wx.navigateTo({
-        url: `/subpages/OCRCard/pages/index/index`,
-      })
-      //   if(this.data.userInfo.idCard){
-      //   wx.navigateTo({
-      //     url: `/subpages/index/checkInUser/checkInUser?idCard=${this.data.userInfo.idCard}`,
-      //   })
-      // }else{
-      //   wx.navigateTo({
-      //     url: `/subpages/OCRCard/pages/index/index`,
-      //   })
-      // }
+        if(this.data.userInfo.idCard){
+        wx.navigateTo({
+          url: `/subpages/index/checkInUser/checkInUser?idCard=${this.data.userInfo.idCard}`,
+        })
+      }else{
+        wx.navigateTo({
+          url: `/subpages/OCRCard/pages/index/index`,
+        })
+      }
     }
   }
 });
\ No newline at end of file
diff --git a/project.private.config.json b/project.private.config.json
index 8ea26ca..1af94ec 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -2,7 +2,7 @@
     "libVersion": "3.8.9",
     "projectname": "epmet-apartment-mp",
     "setting": {
-        "urlCheck": true,
+        "urlCheck": false,
         "coverView": true,
         "lazyloadPlaceholderEnable": false,
         "skylineRenderEnable": false,
diff --git a/subpages/OCRCard/pages/OCR/OCR.js b/subpages/OCRCard/pages/OCR/OCR.js
index aa76e34..42dc34f 100644
--- a/subpages/OCRCard/pages/OCR/OCR.js
+++ b/subpages/OCRCard/pages/OCR/OCR.js
@@ -109,7 +109,11 @@ import {
           ocrAction(res.tempFiles[0].tempFilePath).then(res=>{
             if(res.success){
               that.selectMzGraduateInfo(res.result.data.idcard_res)
+            }else{
+            that.selectMzGraduateInfo()
             }
+          }).catch(err=>{
+            that.selectMzGraduateInfo()
           })
         },
         fail: (res) => {
@@ -188,7 +192,7 @@ import {
                     that.setData({
                       isShowImage: true
                     })
-                    console.error('因为没有真的上传图片，所以走到出错的逻辑里了')
+                  
                     wx.showToast({
                       title: '出错啦...',
                       icon: 'loading'
@@ -209,17 +213,27 @@ import {
     success(e) {
       if(e.success){
         this.selectMzGraduateInfo(e.result.data.idcard_res)
+      }else{
+        wx.navigateTo({
+          url: `/subpages/index/checkInUser/checkInUser`,
+        })
       }
     },
     selectMzGraduateInfo(data){
-      selectMzGraduateInfo({idCard:data.id.text}).then(res=>{
-        if(res.code === 200){
-          wx.navigateTo({
-            url: `/subpages/index/checkInUser/checkInUser?idCard=${data.id.text}`,
-          })
-        }
-      }).catch(err=>{
-        console.log(err);
-      })
+      if(data){
+        selectMzGraduateInfo({idCard:data.id.text}).then(res=>{
+          if(res.code === 200){
+            wx.navigateTo({
+              url: `/subpages/index/checkInUser/checkInUser?idCard=${data.id.text}`,
+            })
+          }
+        }).catch(err=>{
+        })
+      }else{
+        wx.navigateTo({
+          url: `/subpages/index/checkInUser/checkInUser`,
+        })
+      }
+      
     }
   })
\ No newline at end of file