From c88ad73a062ace43c2a484648aa27ba43eb3eaac Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Wed, 1 Nov 2023 14:29:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E8=AF=86=E5=88=AB?=
 =?UTF-8?q?=E5=90=8E=E6=96=B0=E5=A2=9E=E5=B1=85=E6=B0=91=E5=9B=9E=E5=A1=AB?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 subpages/OCRCard/pages/index/index.js          | 18 ++++++++++++++----
 subpages/addResi/pages/addResi/addResi.js      |  9 +++++++++
 .../searchResult/pages/punchCard/punchCard.js  |  1 -
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/subpages/OCRCard/pages/index/index.js b/subpages/OCRCard/pages/index/index.js
index 4f70b4e..909af73 100644
--- a/subpages/OCRCard/pages/index/index.js
+++ b/subpages/OCRCard/pages/index/index.js
@@ -85,6 +85,7 @@ Page({
         }
     },
     cardSuccess: async function(e){
+        console.log(e.detail);
         this.setData({
           keyWord:e.detail.id.text,
           tableData:[]
@@ -92,12 +93,21 @@ Page({
         await this.getTable('card')
         if(this.data.tableData.length != 0){
             wx.navigateTo({
-              url: `/subpages/addResi/pages/addResi/addResi?type=edit&resiId=${this.data.tableData[0].resiId}`,
+              url: `/subpages/searchResult/pages/punchCard/punchCard?resiId=${this.data.tableData[0].resiId}`,
             })
         }else{
-            wx.navigateTo({
-                url: `/subpages/addResi/pages/addResi/addResi?type=add`,
-              })
+           wx.showToast({
+            title: '未查询到该居民，请录入居民信息',
+            duration:3000,
+            icon:'none',
+            success:function(){
+                setTimeout(()=>{
+                    wx.navigateTo({
+                        url: `/subpages/addResi/pages/addResi/addResi?type=add&name=${e.detail.name.text}&idCard=${e.detail.id.text}&gender=${e.detail.gender.text}&birth=${e.detail.birth.text}`,
+                      })
+                },3000)
+            }
+        })
         }
     },
     back(){
diff --git a/subpages/addResi/pages/addResi/addResi.js b/subpages/addResi/pages/addResi/addResi.js
index 75d9df9..fd2b93d 100644
--- a/subpages/addResi/pages/addResi/addResi.js
+++ b/subpages/addResi/pages/addResi/addResi.js
@@ -146,6 +146,15 @@ Page({
                  this.getFamilyInfoDetailById()
                 },500)
             }else{
+                if(options.idCard){
+                    this.setData({
+                        'form.name':options.name,
+                        'form.idNum':options.idCard,
+                        'form.gender':options.gender == '男'?'1':"2",
+                        genderName:options.gender,
+                        'form.birthday':options.birth,
+                    })
+                }
                 this.setData({
                     isFirstLoadGrid:false,
                     isFirstLoadVillage: false,
diff --git a/subpages/searchResult/pages/punchCard/punchCard.js b/subpages/searchResult/pages/punchCard/punchCard.js
index 1a94642..1196ed1 100644
--- a/subpages/searchResult/pages/punchCard/punchCard.js
+++ b/subpages/searchResult/pages/punchCard/punchCard.js
@@ -37,7 +37,6 @@ Page({
             this.setData({
                 resiId:options.resiId
             })
-            console.log(this.data.resiId);
             this.getResiDetail()
         }
         this.data.qqMapWX = new QQMapWX({