Commit 2a15e4fd authored by 潘永坪's avatar 潘永坪

Merge branch 'develop' of http://git.tbd.yanzuoguang.com/panyongping/uni-pdtravel into develop

parents 2f67601e f610d8fc
...@@ -214,13 +214,13 @@ export default { ...@@ -214,13 +214,13 @@ export default {
const merchantId = this.options.merchantId || 'z0015605022691a5945bbe463141668c' // 默认长江索道 const merchantId = this.options.merchantId || 'z0015605022691a5945bbe463141668c' // 默认长江索道
if (res.data.isScanFace === 0) { //未扫脸 if (res.data.isScanFace === 0) { //未扫脸
uni.navigateTo({ uni.navigateTo({
url: `./getPortrait?merchantId${merchantId}` url: `./getPortrait?merchantId=${merchantId}`
}) })
} else if (res.data.isScanFace === 1) { //已扫脸 } else if (res.data.isScanFace === 1) { //已扫脸
const faceIds = JSON.stringify(res.data.faceIds) const faceIds = JSON.stringify(res.data.faceIds)
const companyId = this.options.companyId const companyId = this.options.companyId
uni.navigateTo({ uni.navigateTo({
url: `./myPhotoAlbum/myPhotoAlbum?faceIds=${faceIds}&companyId=${companyId}&merchantId${merchantId}` url: `./myPhotoAlbum/myPhotoAlbum?faceIds=${faceIds}&companyId=${companyId}&merchantId=${merchantId}`
}) })
} }
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment