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

pages/album/albumIndex.vue

@@ -214,13 +214,13 @@ export default {
           const merchantId = this.options.merchantId || 'z0015605022691a5945bbe463141668c' // 默认长江索道
           if (res.data.isScanFace === 0) { //未扫脸
             uni.navigateTo({
-              url: `./getPortrait?merchantId${merchantId}`
+              url: `./getPortrait?merchantId=${merchantId}`
             })
           } else if (res.data.isScanFace === 1) { //已扫脸
             const faceIds = JSON.stringify(res.data.faceIds)
             const companyId = this.options.companyId
             uni.navigateTo({
-              url: `./myPhotoAlbum/myPhotoAlbum?faceIds=${faceIds}&companyId=${companyId}&merchantId${merchantId}`
+              url: `./myPhotoAlbum/myPhotoAlbum?faceIds=${faceIds}&companyId=${companyId}&merchantId=${merchantId}`
             })
           }
         } else {