diff --git a/constant/UrlConstant.js b/constant/UrlConstant.js index bca9047..a6e7231 100644 --- a/constant/UrlConstant.js +++ b/constant/UrlConstant.js @@ -51,6 +51,11 @@ const listApplicationKeys = baseUrl +"app/applicationKey.listApplicationKeys"; //申请访客钥匙 const applyVisitorApplicationKey = baseUrl + "app/applicationKey.applyVisitorApplicationKey"; +//上传业主照片 +const uploadOwnerPhoto = baseUrl +"app/owner.uploadOwnerPhoto"; + +const getOwnerPhotoPath = "https://hc.demo.winqi.cn/callComponent/download/getFile/fileByObjId"; + module.exports = { baseUrl: baseUrl, @@ -69,5 +74,7 @@ module.exports = { listOwnerMachines: listOwnerMachines, applyApplicationKey: applyApplicationKey, listApplicationKeys: listApplicationKeys, - applyVisitorApplicationKey: applyVisitorApplicationKey + applyVisitorApplicationKey: applyVisitorApplicationKey, + uploadOwnerPhoto: uploadOwnerPhoto, + getOwnerPhotoPath: getOwnerPhotoPath }; \ No newline at end of file diff --git a/images/camera.png b/images/camera.png index a6d382f..47b26dd 100644 Binary files a/images/camera.png and b/images/camera.png differ diff --git a/pages/collectFace/collectFace.js b/pages/collectFace/collectFace.js index 11e6287..3ab7671 100644 --- a/pages/collectFace/collectFace.js +++ b/pages/collectFace/collectFace.js @@ -1,11 +1,15 @@ // pages/collectFace/collectFace.js +const context = require("../../context/Java110Context.js"); +const constant = context.constant; +const factory = context.factory; Page({ /** * 页面的初始数据 */ data: { - src:'' + src:'', + uploadFlag:false }, /** @@ -64,14 +68,79 @@ Page({ }, takePhoto:function() { - const ctx = wx.createCameraContext() + let _that = this; + _that.setData({ + uploadFlag: true + }) + const ctx = wx.createCameraContext(); ctx.takePhoto({ quality: 'high', success: (res) => { - this.setData({ - src: res.tempImagePath + wx.getFileSystemManager().readFile({ + filePath: res.tempImagePath, + encoding: 'base64', + success: (photoRes) => { + let _baseInfo = photoRes.data; + _that.setData({ + src: _baseInfo + }); + _that._uploadOwnerPhoto(); + wx.hideLoading() + } + }); + }, + fail:(e)=>{ + _that.setData({ + uploadFlag:false }) } }) + }, + _uploadOwnerPhoto:function(){ + let _that = this; + context.getOwner(function (_owner) { + let _memberId = _owner.memberId; + let _communityId = _owner.communityId; + let obj = { + memberId: _memberId, + communityId: _communityId, + photo: _that.data.src + }; + context.request({ + url: constant.url.uploadOwnerPhoto, + header: context.getHeaders(), + method: "POST", + data: obj, //动态数据 + success: function (res) { + console.log(res); + if (res.statusCode != 200) { + wx.showToast({ + title: '人脸上传失败', + icon: 'none', + duration: 2000 + }); + _that.setData({ + uploadFlag: false + }); + return; + } + //成功情况下跳转 + wx.navigateBack({ + delta:1 + }); + }, + fail: function (e) { + wx.showToast({ + title: "服务器异常了", + icon: 'none', + duration: 2000 + }); + _that.setData({ + uploadFlag: false + }); + } + }); + }); + } }) \ No newline at end of file diff --git a/pages/collectFace/collectFace.wxml b/pages/collectFace/collectFace.wxml index 758b04c..8e88091 100644 --- a/pages/collectFace/collectFace.wxml +++ b/pages/collectFace/collectFace.wxml @@ -1,10 +1,19 @@ - - - - + + + + - 拿起手机,面向手机 - + + + + 人脸采集 + + + + + + + diff --git a/pages/collectFace/collectFace.wxss b/pages/collectFace/collectFace.wxss index 49e41c9..2403535 100644 --- a/pages/collectFace/collectFace.wxss +++ b/pages/collectFace/collectFace.wxss @@ -5,9 +5,24 @@ .cf_text_na{ font-size: 48rpx; - text-align: center; margin:80rpx 0rpx; font-display: 700; + position: absolute; + top: 0rpx; + text-align: center; + width: 100%; +} + +.cf_btn{ + text-align: center; + width: 100%; + padding:40rpx 0; + background-color: #f8f8f8; +} + +.cf_btn .cf_btn_v{ + width: 80%; + margin: 0 auto; } .noticeTXT{ font-size: 10PX; diff --git a/pages/repair/repair.js b/pages/repair/repair.js index 0003084..5213752 100644 --- a/pages/repair/repair.js +++ b/pages/repair/repair.js @@ -159,7 +159,7 @@ Page({ }) } else { console.log("提交数据", obj); - wx.request({ + context.request({ url: constant.url.saveOwnerRepair, // http://hc.demo.winqi.cn:8012/appApi/ownerRepair.saveOwnerRepair header: context.getHeaders(), method: "POST", diff --git a/pages/viewPersonFace/viewPersonFace.js b/pages/viewPersonFace/viewPersonFace.js index 5ec8f5d..6952e2b 100644 --- a/pages/viewPersonFace/viewPersonFace.js +++ b/pages/viewPersonFace/viewPersonFace.js @@ -1,4 +1,6 @@ // pages/viewPersonFace/viewPersonFace.js +const context = require("../../context/Java110Context.js"); +const constant = context.constant; Page({ /** @@ -77,6 +79,12 @@ Page({ * 查询业主人脸 */ loadOwnerFace:function(){ - + let _that = this; + context.getOwner(function(_owner){ + let _face = constant.url.getOwnerPhotoPath + "?objId=" + _owner.memberId+"&communityId="+_owner.communityId+"&fileTypeCd=10000&time=" + new Date(); + _that.setData({ + face: _face + }); + }); } }) \ No newline at end of file