diff --git a/subpages/OCRCard/pages/OCR/OCR.js b/subpages/OCRCard/pages/OCR/OCR.js index 02835ce..8543c92 100644 --- a/subpages/OCRCard/pages/OCR/OCR.js +++ b/subpages/OCRCard/pages/OCR/OCR.js @@ -115,12 +115,11 @@ import { ocrAction(res.tempFiles[0].tempFilePath).then(res=>{ console.log(res); wx.navigateTo({ - url: `/subpages/index/checkInUser/checkInUser?idCard=${res.result.data.idcard_res.id.text}&type=${this.data.type}`, + url: `/subpages/index/checkInUser/checkInUser?idCard=${res.result.data.idcard_res.id.text}&type=${this.data.type}&name=${res.result.data.idcard_res.name.text}`, }) - }).catch(err=>{ wx.navigateTo({ - url: `/subpages/index/checkInUser/checkInUser?idCard=${res.result.data.idcard_res}&type=${this.data.type}`, + url: `/subpages/index/checkInUser/checkInUser?idCard=${res.result.data.idcard_res}&type=${this.data.type}&name=${res.result.data.idcard_res.name.text}`, }) }) }, @@ -221,7 +220,7 @@ import { success(e) { console.log(e); wx.navigateTo({ - url: `/subpages/index/checkInUser/checkInUser?idCard=${e.result.data.idcard_res.id.text}&type=${this.data.type}`, + url: `/subpages/index/checkInUser/checkInUser?idCard=${e.result.data.idcard_res.id.text}&type=${this.data.type}&name=${e.result.data.idcard_res.name.text}`, }) }, }) \ No newline at end of file diff --git a/subpages/index/checkInUser/checkInUser.js b/subpages/index/checkInUser/checkInUser.js index 992b6eb..a9ef168 100644 --- a/subpages/index/checkInUser/checkInUser.js +++ b/subpages/index/checkInUser/checkInUser.js @@ -29,7 +29,8 @@ Page({ if (options) { this.setData({ 'form.idCard': options.idCard, - 'form.telephone':app.globalData.userInfo.phone, + 'form.telephone':app.globalData.userInfo.phone || '', + 'form.graduateName': options.name, type: options.type || '' }) } diff --git a/subpages/mine/checkInEvaluate/checkInEvaluate.js b/subpages/mine/checkInEvaluate/checkInEvaluate.js index 43068a8..a5428c1 100644 --- a/subpages/mine/checkInEvaluate/checkInEvaluate.js +++ b/subpages/mine/checkInEvaluate/checkInEvaluate.js @@ -27,6 +27,9 @@ Page({ * 生命周期函数--监听页面显示 */ onShow() { + this.setData({ + list:[] + }) this.getList() }, 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/' }