diff --git a/components/ymf-components/ymf-share-popup.vue b/components/ymf-components/ymf-share-popup.vue index b795124..95d8b68 100644 --- a/components/ymf-components/ymf-share-popup.vue +++ b/components/ymf-components/ymf-share-popup.vue @@ -112,8 +112,9 @@ // console.log('分享组件挂载完毕:currentOptions',currentOptions); if(res){ Object.assign(config,res) + const rewardSharePages=res.rewardSharePages.split(',') const pTag = returnPageTags(path) - if(pTag&¤tOptions.fromUserId&&res.isSharedUserPopup){ + if( pTag&&rewardSharePages.includes(pTag)&¤tOptions.fromUserId&&res.isSharedUserPopup){ show.value=true } // if(res.sharedUserCouponId&&res.sharedUserCouponNum){ diff --git a/distribution/shop-detail/index.vue b/distribution/shop-detail/index.vue index e1cb053..5c61688 100644 --- a/distribution/shop-detail/index.vue +++ b/distribution/shop-detail/index.vue @@ -203,7 +203,7 @@ - + 加入股东群,优惠、活动多多{{'>>'}} @@ -434,7 +434,7 @@ if (res.distributionId) { options.type = 'activates'; } - if(res.distributionUser&&!res.distributionUser.firstIn){ + if(res.distributionUser&&!res.distributionUser.firstIn&&res.group&&res.group.isEnable){ showGroup.value=true } Object.assign(state, res);