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

pages/album/albumIndex.vue

@@ -163,7 +163,9 @@ export default {
             })
           }else if(res.data.isScanFace === 1) {//已扫脸
             uni.navigateTo({
-						  url: `./myPhotoAlbum/myPhotoAlbum?faceIds=${JSON.stringify(res.data.faceIds)}`
+						  url: `./myPhotoAlbum/myPhotoAlbum?
+										companyId=${this.options.companyId}&
+										faceIds=${JSON.stringify(res.data.faceIds)}`
             })
           }
 			  }else{
@@ -245,6 +247,7 @@ export default {
     }
   },
   onLoad(options) {
+		this.$commonjs.getCompanyId(options)
     this.recordDeviceInfo()
     this.options = options
     if(this.options.tip === 'true') {