From f1c01e5a780b813248f7be0b98d824784e747e6c Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Tue, 22 Jul 2025 11:13:32 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=88=BF=E7=A1=AE=E8=AE=A4=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=E5=A6=82=E6=9E=9C=E6=B2=A1=E6=9C=89=E8=BA=AB?=
 =?UTF-8?q?=E4=BB=BD=E8=AF=81=E4=BF=A1=E6=81=AF=E5=8E=BB=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=EF=BC=8C=E5=BB=B6=E7=A7=9F=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json                                      |   8 +-
 pages/index/index.js                          |  21 +-
 pages/serve/serve.wxml                        |   4 +-
 subpages/OCRCard/pages/OCR/OCR.js             |  18 +-
 subpages/OCRCard/pages/index/index.js         |   6 +
 subpages/OCRCard/pages/index/index.wxml       |   4 +-
 subpages/index/checkInUser/checkInUser.js     | 284 ++++++++++--------
 subpages/index/checkInUser/checkInUser.wxml   |   2 +-
 subpages/index/checkOutConfirm/index/index.js |   5 -
 .../renewalApplication.wxml                   |   2 +-
 utils/config.js                               |   4 +-
 11 files changed, 203 insertions(+), 155 deletions(-)

diff --git a/app.json b/app.json
index d029af9..2effdc0 100644
--- a/app.json
+++ b/app.json
@@ -82,11 +82,7 @@
                 "pagePath": "pages/index/index",
                 "iconPath": "images/icon/home.png"
             },
-            {
-                "text": "消息",
-                "pagePath": "pages/message/message",
-                "iconPath": "images/icon/home.png"
-            },
+          
             {
                 "text": "服务",
                 "pagePath": "pages/serve/serve",
@@ -113,4 +109,4 @@
     ],
     "plugins": {
     }
-}
\ No newline at end of file
+}
diff --git a/pages/index/index.js b/pages/index/index.js
index e029962..b154bb3 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -189,7 +189,7 @@ Page({
   },
   navigateTo(e){
     if(wx.getStorageSync('token')){
-      if(e.currentTarget.dataset.url && e.currentTarget.dataset.url != '/subpages/OCRCard/pages/index/index'){
+      if(e.currentTarget.dataset.url && e.currentTarget.dataset.url != '/subpages/OCRCard/pages/index/index' && e.currentTarget.dataset.url != '/subpages/index/checkOutConfirm/index/index'){
         if(e.currentTarget.dataset.url === '/pages/serve/serve'){
           wx.switchTab({
             url: '/pages/serve/serve',
@@ -198,7 +198,7 @@ Page({
           wx.navigateTo({
             url: e.currentTarget.dataset.url,
           })
-      }else if(e.currentTarget.dataset.url){
+      }else if(e.currentTarget.dataset.url === '/subpages/OCRCard/pages/index/index'){
         if(!this.data.bindPhone){
           if(this.data.userInfo.idCard){
             wx.navigateTo({
@@ -214,7 +214,22 @@ Page({
             url: '/pages/register/register',
           })
         }
-          
+      }else if(e.currentTarget.dataset.url === '/subpages/index/checkOutConfirm/index/index'){
+        if(!this.data.bindPhone){
+          if(this.data.userInfo.idCard){
+            wx.navigateTo({
+              url: `/subpages/index/checkOutConfirm/index/index`,
+            })
+          }else{
+            wx.navigateTo({
+              url: `/subpages/OCRCard/pages/index/index?type=out`,
+            })
+          }
+        }else{
+          wx.navigateTo({
+            url: '/pages/register/register',
+          })
+        }
       }
     }
   }
diff --git a/pages/serve/serve.wxml b/pages/serve/serve.wxml
index 9216004..285dc44 100644
--- a/pages/serve/serve.wxml
+++ b/pages/serve/serve.wxml
@@ -21,10 +21,10 @@
                 <image src="../../images/icon/nav_10.png" class="icon-100" mode="" />
                 <view style="font-size:28rpx;color:#ffffff;font-weight: 600;" class="flex items-center flex-1 mt-14">延租申请</view>
             </navigator>
-            <!-- <navigator url="/subpages/mine/checkInEvaluate/checkInEvaluate" class=" flex items-center flex-center-j flex-col" style="width: 25%;">
+            <navigator url="/subpages/mine/checkInEvaluate/checkInEvaluate" class=" flex items-center flex-center-j flex-col" style="width: 25%;">
                 <image src="../../images/icon/nav_3.png" class="icon-100" mode="" />
                 <text style="font-size:28rpx;color:#ffffff;font-weight: 600;" class="flex items-center flex-1 mt-14">居住评价</text>
-            </navigator> -->
+            </navigator>
         </view>
     </view>
 <!-- <view class="card flex flex-col list">
diff --git a/subpages/OCRCard/pages/OCR/OCR.js b/subpages/OCRCard/pages/OCR/OCR.js
index 42dc34f..b3c9e1f 100644
--- a/subpages/OCRCard/pages/OCR/OCR.js
+++ b/subpages/OCRCard/pages/OCR/OCR.js
@@ -26,13 +26,19 @@ import {
       left: 24,
       width: 666,
       height: 464,
-      info:{}
+      info:{},
+      type:null
     },
     onLoad(opt) {
       wx.setNavigationBarTitle({
         title: this.data.title
       })
       this.initData()
+      if(opt.type){
+          this.setData({
+            type:opt.type
+          })
+      }
     },
     showTool() {
       this.setData({
@@ -215,12 +221,18 @@ import {
         this.selectMzGraduateInfo(e.result.data.idcard_res)
       }else{
         wx.navigateTo({
-          url: `/subpages/index/checkInUser/checkInUser`,
+          url: `/subpages/index/checkInUser/checkInUser?type=${this.data.type}`,
         })
       }
     },
     selectMzGraduateInfo(data){
       if(data){
+        if(this.data.type== 'out'){
+          wx.navigateTo({
+            url: `/subpages/index/checkInUser/checkInUser?type=${this.data.type}&idCard=${data.id.text || ''}`,
+          })
+          return
+        }
         selectMzGraduateInfo({idCard:data.id.text}).then(res=>{
           if(res.code === 200){
             wx.navigateTo({
@@ -231,7 +243,7 @@ import {
         })
       }else{
         wx.navigateTo({
-          url: `/subpages/index/checkInUser/checkInUser`,
+          url: `/subpages/index/checkInUser/checkInUser?type=${this.data.type}`,
         })
       }
       
diff --git a/subpages/OCRCard/pages/index/index.js b/subpages/OCRCard/pages/index/index.js
index 257cc19..6200aff 100644
--- a/subpages/OCRCard/pages/index/index.js
+++ b/subpages/OCRCard/pages/index/index.js
@@ -7,12 +7,18 @@ Page({
      */
     data: {
         scanAnimation: null,
+        type:null
     },
 
     /**
      * 生命周期函数--监听页面加载
      */
     onLoad(options) {
+      if(options.type){
+        this.setData({
+          type:options.type
+        })
+      }
         this.setData({
             statusHeight: app.globalData.deviceInfo.statusHeight,
             navigationHeight: app.globalData.deviceInfo.navigationHeight,
diff --git a/subpages/OCRCard/pages/index/index.wxml b/subpages/OCRCard/pages/index/index.wxml
index 838c1ec..0da571b 100644
--- a/subpages/OCRCard/pages/index/index.wxml
+++ b/subpages/OCRCard/pages/index/index.wxml
@@ -18,10 +18,10 @@
 </view>
         <view style="font-size: 28rpx;color: #666666;" class="mt-16">温馨提示：请先拍照或上传身份证照片进行身份识别。</view>
     </view>
-    <navigator url="/subpages/OCRCard/pages/OCR/OCR" certificateType="idCard" opposite="{{false}}" class="ocr">
+    <navigator url="/subpages/OCRCard/pages/OCR/OCR?type={{type}}" certificateType="idCard" opposite="{{false}}" class="ocr">
         <button hover-class="color" class="btn1"  style="background-color:#0bb4b4">开始识别</button>
     </navigator>
-    <navigator url="/subpages/index/checkInUser/checkInUser" certificateType="idCard" opposite="{{false}}" class="ocr">
+    <navigator url="/subpages/index/checkInUser/checkInUser?type={{type}}" certificateType="idCard" opposite="{{false}}" class="ocr">
         <button hover-class="color"  class="btn2" style="background-color:#0bb4b4;margin-top: 10rpx;" >手动输入</button>
     </navigator>
 </view>
\ No newline at end of file
diff --git a/subpages/index/checkInUser/checkInUser.js b/subpages/index/checkInUser/checkInUser.js
index be993ee..dcf5a20 100644
--- a/subpages/index/checkInUser/checkInUser.js
+++ b/subpages/index/checkInUser/checkInUser.js
@@ -1,142 +1,166 @@
 // subpages/index/checkInUser/checkInUser.js
-import {bindIdCard} from "../../../api/user"
-import {selectMzGraduateInfo,eSignDownload} from "../../../api/index"
+import {
+  bindIdCard
+} from "../../../api/user"
+import {
+  selectMzGraduateInfo,
+  eSignDownload
+} from "../../../api/index"
 const app = getApp()
 Page({
 
-    /**
-     * 页面的初始数据
-     */
-    data: {
-        form:{
-            graduateName:'',
-            idCard:'',
-            telephone:''
-        }
-    },
-
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad(options) {
-        if(options.idCard){
-            this.setData({
-                'form.idCard':options.idCard,
-            })
-            this.selectMzGraduateInfo()
-        }
-    },  
-
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady() {
-
-    },
-    onRouteDone(e){
-      console.log(e);
-    },
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow() {
-      
-    },
-  
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload() {
-
-    },
-
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh() {
-
-    },
-
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom() {
-
-    },
-
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage() {
-
-    },
-    onChange(e){
-      console.log(e);
-      this.setData({
-        'form.idCard':e.detail
-      })
-    },
-    onChangePhone(e){
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    form: {
+      graduateName: '',
+      idCard: '',
+      telephone: '',
+      type: ''
+    }
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    console.log(options);
+    if (options) {
       this.setData({
-        'form.telephone':e.detail
+        'form.idCard': options.idCard,
+        type: options.type || ''
       })
-    },
-    onChangeName(e){
-      this.setData({
-        'form.graduateName':e.detail
+      if(!options.type){
+        this.selectMzGraduateInfo()
+      }
+    }
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+  onRouteDone(e) {
+  },
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  },
+  onChange(e) {
+    console.log(e);
+    this.setData({
+      'form.idCard': e.detail
+    })
+  },
+  onChangePhone(e) {
+    this.setData({
+      'form.telephone': e.detail
+    })
+  },
+  onChangeName(e) {
+    this.setData({
+      'form.graduateName': e.detail
+    })
+  },
+  submit() {
+    // this.bindIdCard()
+    if (this.data.type === 'out') {
+      wx.navigateTo({
+        url: '/subpages/index/checkOutConfirm/index/index',
       })
-    },
-    submit(){
-      // this.bindIdCard()
-        selectMzGraduateInfo({idCard:this.data.form.idCard}).then(res=>{
-          console.log(res,'毕业生信息');
-            if(res.code === 200){
-            this.bindIdCard()
-              if(res.data.signType === 0 && res.data.contract){
-                //线上支付去跳转签合同
-                  app.globalData.userInfo.chooseRoomId = res.data.chooseRecId
-                  console.log(res.data.contract,'链接》》》》');
-                  res.data.contract = res.data.contract.replace('https://h5.esign.cn','https://hxm5112004501.h5.esign.cn')
-                  wx.navigateTo({
-                    url: '/pages/webView/webView?url=' +  encodeURIComponent(res.data.contract),
-                  })
-              }else if(res.data.signType === 1){
-                // 线下签订去支付
-                wx.switchTab({
-                  url: '/pages/index/index',
-                })
-              }else{
-                wx.navigateTo({
-                    url: `/subpages/index/checkInWait/checkInWait?idCard=${this.data.form.idCard}`,
-                  })
-              }
-             
-            }
-          }).catch(err=>{
-            console.log(err);
-          })
-    },
-    bindIdCard(){
-        bindIdCard({idCard:this.data.form.idCard,name:this.data.form.graduateName}).then(res=>{
-            console.log(res);
-        })
-      },
-      selectMzGraduateInfo(){
-        selectMzGraduateInfo({idCard:this.data.form.idCard}).then(res=>{
-          if(res.code === 200){
-            this.setData({
-                form:res.data
+      return false
+    }
+    selectMzGraduateInfo({
+      idCard: this.data.form.idCard
+    }).then(res => {
+      console.log(res, '毕业生信息');
+      if (res.code === 200) {
+        this.bindIdCard()
+        
+          if (res.data.signType === 0 && res.data.contract) {
+            //线上支付去跳转签合同
+            app.globalData.userInfo.chooseRoomId = res.data.chooseRecId
+            console.log(res.data.contract, '链接》》》》');
+            res.data.contract = res.data.contract.replace('https://h5.esign.cn', 'https://hxm5112004501.h5.esign.cn')
+            wx.navigateTo({
+              url: '/pages/webView/webView?url=' + encodeURIComponent(res.data.contract),
+            })
+          } else if (res.data.signType === 1) {
+            // 线下签订去支付
+            wx.switchTab({
+              url: '/pages/index/index',
+            })
+          } else {
+            wx.navigateTo({
+              url: `/subpages/index/checkInWait/checkInWait?idCard=${this.data.form.idCard}`,
             })
           }
-        }).catch(err=>{
-          console.log(err);
+     
+
+      }
+    }).catch(err => {
+      console.log(err);
+    })
+  },
+  bindIdCard() {
+    bindIdCard({
+      idCard: this.data.form.idCard,
+      name: this.data.form.graduateName
+    }).then(res => {
+      console.log(res);
+    })
+  },
+  selectMzGraduateInfo() {
+    selectMzGraduateInfo({
+      idCard: this.data.form.idCard
+    }).then(res => {
+      if (res.code === 200) {
+        this.setData({
+          form: res.data
         })
       }
+    }).catch(err => {
+      console.log(err);
+    })
+  }
 })
\ No newline at end of file
diff --git a/subpages/index/checkInUser/checkInUser.wxml b/subpages/index/checkInUser/checkInUser.wxml
index f3819d1..1df56f8 100644
--- a/subpages/index/checkInUser/checkInUser.wxml
+++ b/subpages/index/checkInUser/checkInUser.wxml
@@ -1,5 +1,5 @@
 <!--subpages/index/checkInUser/checkInUser.wxml-->
-<navigationBar title="入住办理" isSowArrow isShowBg="" titleAlign="center"></navigationBar>
+<navigationBar title="信息确认" isSowArrow isShowBg="" titleAlign="center"></navigationBar>
 <view class="cont">
     <view class="header flex flex-sb flex-center-j " style="background-image:url(https://hrss.qingdao.gov.cn/mzjwj/1752628959782_37671749449508391_5648bg02.png);">
         <view class="flex flex-col ">
diff --git a/subpages/index/checkOutConfirm/index/index.js b/subpages/index/checkOutConfirm/index/index.js
index e528f68..117fe2b 100644
--- a/subpages/index/checkOutConfirm/index/index.js
+++ b/subpages/index/checkOutConfirm/index/index.js
@@ -131,11 +131,6 @@ console.log('area',scrollArea.node);
       navigationHeight: app.globalData.deviceInfo.navigationHeight,
       checkOutDate: `${year}-${month}-${day}`
     })
-   
-    this.setData({
-
-    })
-   
   },
   getProcessingCheckOutInfo(){
     getProcessingCheckOutInfo().then(res=>{
diff --git a/subpages/index/renewalApplication/renewalApplication.wxml b/subpages/index/renewalApplication/renewalApplication.wxml
index aff743c..caafed4 100644
--- a/subpages/index/renewalApplication/renewalApplication.wxml
+++ b/subpages/index/renewalApplication/renewalApplication.wxml
@@ -5,7 +5,7 @@
         <van-image width="72" height="72" src="/images/mine/md-restore.png" custom-class="cusImage" />
         <view class="txt">
             <view>温馨提示：</view>
-            <view class="des">您需要登陆“爱山东”APP搜索“青岛免租金住房”进入青岛市免租金住宿保障平台进行延租申请。</view>
+            <view class="des">您需要登录“爱山东”APP搜索“青岛免租金住房”进入青岛市免租金住宿保障平台进行延租申请。</view>
         </view>
     </view>
     <van-button slot="button" block type="primary" round  color="linear-gradient(to right, #0DC6C6 , #46DBD5)" bind:tap="submit" custom-class="btn">
diff --git a/utils/config.js b/utils/config.js
index 02ccc2c..62064f1 100644
--- a/utils/config.js
+++ b/utils/config.js
@@ -13,8 +13,8 @@ module.exports = {
   };
   
   function BASEURL() {
-    // return 'https://zsbz.qdcfy.com/mz-api'
-    return 'http://219.146.91.110:30801/mz-api'
+    return 'https://zsbz.qdcfy.com/mz-api'
+    // return 'http://219.146.91.110:30801/mz-api'
     // return 'https://epmet-test.elinkservice.cn/api/'
   }