Browse Source

退房确认的时候如果没有身份证信息去信息确认,延租申请内容提示修改

epass
mk 1 month ago
parent
commit
f1c01e5a78
  1. 8
      app.json
  2. 21
      pages/index/index.js
  3. 4
      pages/serve/serve.wxml
  4. 18
      subpages/OCRCard/pages/OCR/OCR.js
  5. 6
      subpages/OCRCard/pages/index/index.js
  6. 4
      subpages/OCRCard/pages/index/index.wxml
  7. 284
      subpages/index/checkInUser/checkInUser.js
  8. 2
      subpages/index/checkInUser/checkInUser.wxml
  9. 5
      subpages/index/checkOutConfirm/index/index.js
  10. 2
      subpages/index/renewalApplication/renewalApplication.wxml
  11. 4
      utils/config.js

8
app.json

@ -82,11 +82,7 @@
"pagePath": "pages/index/index", "pagePath": "pages/index/index",
"iconPath": "images/icon/home.png" "iconPath": "images/icon/home.png"
}, },
{
"text": "消息",
"pagePath": "pages/message/message",
"iconPath": "images/icon/home.png"
},
{ {
"text": "服务", "text": "服务",
"pagePath": "pages/serve/serve", "pagePath": "pages/serve/serve",
@ -113,4 +109,4 @@
], ],
"plugins": { "plugins": {
} }
} }

21
pages/index/index.js

@ -189,7 +189,7 @@ Page({
}, },
navigateTo(e){ navigateTo(e){
if(wx.getStorageSync('token')){ 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'){ if(e.currentTarget.dataset.url === '/pages/serve/serve'){
wx.switchTab({ wx.switchTab({
url: '/pages/serve/serve', url: '/pages/serve/serve',
@ -198,7 +198,7 @@ Page({
wx.navigateTo({ wx.navigateTo({
url: e.currentTarget.dataset.url, 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.bindPhone){
if(this.data.userInfo.idCard){ if(this.data.userInfo.idCard){
wx.navigateTo({ wx.navigateTo({
@ -214,7 +214,22 @@ Page({
url: '/pages/register/register', 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',
})
}
} }
} }
} }

4
pages/serve/serve.wxml

@ -21,10 +21,10 @@
<image src="../../images/icon/nav_10.png" class="icon-100" mode="" /> <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> <view style="font-size:28rpx;color:#ffffff;font-weight: 600;" class="flex items-center flex-1 mt-14">延租申请</view>
</navigator> </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="" /> <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> <text style="font-size:28rpx;color:#ffffff;font-weight: 600;" class="flex items-center flex-1 mt-14">居住评价</text>
</navigator> --> </navigator>
</view> </view>
</view> </view>
<!-- <view class="card flex flex-col list"> <!-- <view class="card flex flex-col list">

18
subpages/OCRCard/pages/OCR/OCR.js

@ -26,13 +26,19 @@ import {
left: 24, left: 24,
width: 666, width: 666,
height: 464, height: 464,
info:{} info:{},
type:null
}, },
onLoad(opt) { onLoad(opt) {
wx.setNavigationBarTitle({ wx.setNavigationBarTitle({
title: this.data.title title: this.data.title
}) })
this.initData() this.initData()
if(opt.type){
this.setData({
type:opt.type
})
}
}, },
showTool() { showTool() {
this.setData({ this.setData({
@ -215,12 +221,18 @@ import {
this.selectMzGraduateInfo(e.result.data.idcard_res) this.selectMzGraduateInfo(e.result.data.idcard_res)
}else{ }else{
wx.navigateTo({ wx.navigateTo({
url: `/subpages/index/checkInUser/checkInUser`, url: `/subpages/index/checkInUser/checkInUser?type=${this.data.type}`,
}) })
} }
}, },
selectMzGraduateInfo(data){ selectMzGraduateInfo(data){
if(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=>{ selectMzGraduateInfo({idCard:data.id.text}).then(res=>{
if(res.code === 200){ if(res.code === 200){
wx.navigateTo({ wx.navigateTo({
@ -231,7 +243,7 @@ import {
}) })
}else{ }else{
wx.navigateTo({ wx.navigateTo({
url: `/subpages/index/checkInUser/checkInUser`, url: `/subpages/index/checkInUser/checkInUser?type=${this.data.type}`,
}) })
} }

6
subpages/OCRCard/pages/index/index.js

@ -7,12 +7,18 @@ Page({
*/ */
data: { data: {
scanAnimation: null, scanAnimation: null,
type:null
}, },
/** /**
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad(options) { onLoad(options) {
if(options.type){
this.setData({
type:options.type
})
}
this.setData({ this.setData({
statusHeight: app.globalData.deviceInfo.statusHeight, statusHeight: app.globalData.deviceInfo.statusHeight,
navigationHeight: app.globalData.deviceInfo.navigationHeight, navigationHeight: app.globalData.deviceInfo.navigationHeight,

4
subpages/OCRCard/pages/index/index.wxml

@ -18,10 +18,10 @@
</view> </view>
<view style="font-size: 28rpx;color: #666666;" class="mt-16">温馨提示:请先拍照或上传身份证照片进行身份识别。</view> <view style="font-size: 28rpx;color: #666666;" class="mt-16">温馨提示:请先拍照或上传身份证照片进行身份识别。</view>
</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> <button hover-class="color" class="btn1" style="background-color:#0bb4b4">开始识别</button>
</navigator> </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> <button hover-class="color" class="btn2" style="background-color:#0bb4b4;margin-top: 10rpx;" >手动输入</button>
</navigator> </navigator>
</view> </view>

284
subpages/index/checkInUser/checkInUser.js

@ -1,142 +1,166 @@
// subpages/index/checkInUser/checkInUser.js // subpages/index/checkInUser/checkInUser.js
import {bindIdCard} from "../../../api/user" import {
import {selectMzGraduateInfo,eSignDownload} from "../../../api/index" bindIdCard
} from "../../../api/user"
import {
selectMzGraduateInfo,
eSignDownload
} from "../../../api/index"
const app = getApp() const app = getApp()
Page({ Page({
/** /**
* 页面的初始数据 * 页面的初始数据
*/ */
data: { data: {
form:{ form: {
graduateName:'', graduateName: '',
idCard:'', idCard: '',
telephone:'' telephone: '',
} type: ''
}, }
},
/**
* 生命周期函数--监听页面加载 /**
*/ * 生命周期函数--监听页面加载
onLoad(options) { */
if(options.idCard){ onLoad(options) {
this.setData({ console.log(options);
'form.idCard':options.idCard, if (options) {
})
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){
this.setData({ this.setData({
'form.telephone':e.detail 'form.idCard': options.idCard,
type: options.type || ''
}) })
}, if(!options.type){
onChangeName(e){ this.selectMzGraduateInfo()
this.setData({ }
'form.graduateName':e.detail }
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
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',
}) })
}, return false
submit(){ }
// this.bindIdCard() selectMzGraduateInfo({
selectMzGraduateInfo({idCard:this.data.form.idCard}).then(res=>{ idCard: this.data.form.idCard
console.log(res,'毕业生信息'); }).then(res => {
if(res.code === 200){ console.log(res, '毕业生信息');
this.bindIdCard() if (res.code === 200) {
if(res.data.signType === 0 && res.data.contract){ this.bindIdCard()
//线上支付去跳转签合同
app.globalData.userInfo.chooseRoomId = res.data.chooseRecId if (res.data.signType === 0 && res.data.contract) {
console.log(res.data.contract,'链接》》》》'); //线上支付去跳转签合同
res.data.contract = res.data.contract.replace('https://h5.esign.cn','https://hxm5112004501.h5.esign.cn') app.globalData.userInfo.chooseRoomId = res.data.chooseRecId
wx.navigateTo({ console.log(res.data.contract, '链接》》》》');
url: '/pages/webView/webView?url=' + encodeURIComponent(res.data.contract), res.data.contract = res.data.contract.replace('https://h5.esign.cn', 'https://hxm5112004501.h5.esign.cn')
}) wx.navigateTo({
}else if(res.data.signType === 1){ url: '/pages/webView/webView?url=' + encodeURIComponent(res.data.contract),
// 线下签订去支付 })
wx.switchTab({ } else if (res.data.signType === 1) {
url: '/pages/index/index', // 线下签订去支付
}) wx.switchTab({
}else{ url: '/pages/index/index',
wx.navigateTo({ })
url: `/subpages/index/checkInWait/checkInWait?idCard=${this.data.form.idCard}`, } 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
}) })
} }
}).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);
})
}
}) })

2
subpages/index/checkInUser/checkInUser.wxml

@ -1,5 +1,5 @@
<!--subpages/index/checkInUser/checkInUser.wxml--> <!--subpages/index/checkInUser/checkInUser.wxml-->
<navigationBar title="入住办理" isSowArrow isShowBg="" titleAlign="center"></navigationBar> <navigationBar title="信息确认" isSowArrow isShowBg="" titleAlign="center"></navigationBar>
<view class="cont"> <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="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 "> <view class="flex flex-col ">

5
subpages/index/checkOutConfirm/index/index.js

@ -131,11 +131,6 @@ console.log('area',scrollArea.node);
navigationHeight: app.globalData.deviceInfo.navigationHeight, navigationHeight: app.globalData.deviceInfo.navigationHeight,
checkOutDate: `${year}-${month}-${day}` checkOutDate: `${year}-${month}-${day}`
}) })
this.setData({
})
}, },
getProcessingCheckOutInfo(){ getProcessingCheckOutInfo(){
getProcessingCheckOutInfo().then(res=>{ getProcessingCheckOutInfo().then(res=>{

2
subpages/index/renewalApplication/renewalApplication.wxml

@ -5,7 +5,7 @@
<van-image width="72" height="72" src="/images/mine/md-restore.png" custom-class="cusImage" /> <van-image width="72" height="72" src="/images/mine/md-restore.png" custom-class="cusImage" />
<view class="txt"> <view class="txt">
<view>温馨提示:</view> <view>温馨提示:</view>
<view class="des">您需要登“爱山东”APP搜索“青岛免租金住房”进入青岛市免租金住宿保障平台进行延租申请。</view> <view class="des">您需要登“爱山东”APP搜索“青岛免租金住房”进入青岛市免租金住宿保障平台进行延租申请。</view>
</view> </view>
</view> </view>
<van-button slot="button" block type="primary" round color="linear-gradient(to right, #0DC6C6 , #46DBD5)" bind:tap="submit" custom-class="btn"> <van-button slot="button" block type="primary" round color="linear-gradient(to right, #0DC6C6 , #46DBD5)" bind:tap="submit" custom-class="btn">

4
utils/config.js

@ -13,8 +13,8 @@ module.exports = {
}; };
function BASEURL() { function BASEURL() {
// return 'https://zsbz.qdcfy.com/mz-api' return 'https://zsbz.qdcfy.com/mz-api'
return 'http://219.146.91.110:30801/mz-api' // return 'http://219.146.91.110:30801/mz-api'
// return 'https://epmet-test.elinkservice.cn/api/' // return 'https://epmet-test.elinkservice.cn/api/'
} }

Loading…
Cancel
Save