diff --git a/employee-mp/src/components/image-cropper/index.js b/employee-mp/src/components/image-cropper/index.js index e51347a..9419af3 100644 --- a/employee-mp/src/components/image-cropper/index.js +++ b/employee-mp/src/components/image-cropper/index.js @@ -299,12 +299,13 @@ Component({ */ upload() { let that = this; - wx.chooseImage({ + wx.chooseMedia({ count: 1, + mediaType: ['image'], sizeType: ['original', 'compressed'], sourceType: ['album', 'camera'], success: res => { - const tempFilePaths = res.tempFilePaths[0]; + const tempFilePaths = res.tempFiles[0].tempFilePath; that.pushImg(tempFilePaths); }, fail: () => { diff --git a/ower-mp/src/app.js b/ower-mp/src/app.js index c361f0b..147ed50 100644 --- a/ower-mp/src/app.js +++ b/ower-mp/src/app.js @@ -125,15 +125,18 @@ App({ communityInfo: res.data.communityInfo, globalFetching: false }); - - if (!res.data.userInfo.intact) { + var pages = getCurrentPages() //获取加载的页面 + var currentPage = pages[pages.length - 1].route //获取当前页面的对象 修改数量可以获取之前跳转页面的地址 + if (currentPage !== 'pages/zone/avatar') { + if (!res.data.userInfo.intact) { wx.redirectTo({ url: '/pages/zone/supplement' }); - } else if (res.data.communityInfo.list.length === 0) { - wx.redirectTo({ - url: '/pages/community/binding' - }); + } else if (res.data.communityInfo.list.length === 0) { + wx.redirectTo({ + url: '/pages/community/binding' + }); + } } }); }, diff --git a/ower-mp/src/components/image-cropper/index.js b/ower-mp/src/components/image-cropper/index.js index e51347a..9419af3 100644 --- a/ower-mp/src/components/image-cropper/index.js +++ b/ower-mp/src/components/image-cropper/index.js @@ -299,12 +299,13 @@ Component({ */ upload() { let that = this; - wx.chooseImage({ + wx.chooseMedia({ count: 1, + mediaType: ['image'], sizeType: ['original', 'compressed'], sourceType: ['album', 'camera'], success: res => { - const tempFilePaths = res.tempFilePaths[0]; + const tempFilePaths = res.tempFiles[0].tempFilePath; that.pushImg(tempFilePaths); }, fail: () => {