opition 代码

pages/album/myPhotoAlbum/myPhotoAlbum.vue

@@ -175,7 +175,7 @@ export default {
     this.openid = uni.getStorageSync('openid') //获取openid
     this.faceIds = JSON.parse(option.faceIds)
     this.location = JSON.parse(uni.getStorageSync('location'))
-    this.merchantId = uni.getStorageSync('merchantId')// 'z0015605022691a5945bbe463141668c'
+    this.merchantId = option.merchantId||''// 'z0015605022691a5945bbe463141668c'
     this.obtainProvince()//获取省市区
     this.inquireMerchant()//查询所有商户
     this.getPhotos()//照片列表