diff --git a/components/popup-distribution-group-code.vue b/components/popup-distribution-group-code.vue index 131124b..7e79c88 100644 --- a/components/popup-distribution-group-code.vue +++ b/components/popup-distribution-group-code.vue @@ -28,7 +28,7 @@ import { ref, onMounted } from 'vue'; import { centerConfig,distributionEditIn } from '@/common/api/market/distribution.js'; import { checkArrayElementsExist } from '@/utils/util.js'; -const shopInfo = ref(''); +const shopInfo = defineModel('shopInfo'); const props = defineProps({ type: { diff --git a/components/ymf-components/ymf-share-popup.vue b/components/ymf-components/ymf-share-popup.vue index 95d8b68..754f485 100644 --- a/components/ymf-components/ymf-share-popup.vue +++ b/components/ymf-components/ymf-share-popup.vue @@ -110,11 +110,11 @@ }).then(res => { // console.log('分享组件挂载完毕:shareConfig',res); // console.log('分享组件挂载完毕:currentOptions',currentOptions); - if(res){ + if(res&& typeof res==='object'){ Object.assign(config,res) const rewardSharePages=res.rewardSharePages.split(',') const pTag = returnPageTags(path) - if( pTag&&rewardSharePages.includes(pTag)&¤tOptions.fromUserId&&res.isSharedUserPopup){ + if( pTag&&rewardSharePages.includes(pTag)&¤tOptions.fromUserId&&res.isSharedUserPopup&&res.isEnabled){ show.value=true } // if(res.sharedUserCouponId&&res.sharedUserCouponNum){ diff --git a/distribution/index.vue b/distribution/index.vue index 6753150..16464ae 100644 --- a/distribution/index.vue +++ b/distribution/index.vue @@ -2,7 +2,7 @@ @@ -102,7 +102,7 @@ - + diff --git a/distribution/shop-detail/components/share-popup.vue b/distribution/shop-detail/components/share-popup.vue index c828f94..d0addfc 100644 --- a/distribution/shop-detail/components/share-popup.vue +++ b/distribution/shop-detail/components/share-popup.vue @@ -3,7 +3,8 @@ - + @@ -25,12 +26,15 @@ ref="wQrcode" @generate="(e) => qrcodeResult(e)" > --> - + + 保存图片 - 微信分享 + + 微信分享 + @@ -38,223 +42,252 @@ + + .box { + width: 638rpx; + background-color: #fff; + border-radius: 16rpx; + // overflow: hidden; + position: relative; + + .title { + color: #000000; + font-size: 32rpx; + font-weight: 700; + } + + .top { + border-bottom: 2rpx solid #ededed; + } + + .info { + padding: 96rpx 40rpx 96rpx 40rpx; + font-size: 28rpx; + } + + .small-title { + min-width: 84rpx; + text-align: right; + } + + .footer-wrap { + width: 100%; + position: absolute; + left: 0; + bottom: -100upx; + display: flex; + gap: 28upx; + } + } + + .cancel { + padding: 14rpx 76rpx; + border-radius: 36rpx; + border: 2rpx solid #e8ad7b; + color: #e8ad7b; + font-size: 32rpx; + font-weight: 400; + white-space: nowrap; + line-height: 48rpx; + } + + .confirm { + $color: #e8ad7b; + flex: 1; + padding: 14rpx 76rpx; + border-radius: 16rpx; + background-color: $color; + border: 2rpx solid $color; + color: #fff; + font-size: 32rpx; + font-weight: 400; + white-space: nowrap; + display: flex; + justify-content: center; + align-items: center; + + &.line { + background-color: #fff; + color: $color; + } + } + + .line-height-54 { + line-height: 54rpx; + } + + .w-qrcode { + position: fixed; + left: -9999px; + top: -9999px; + z-index: -1; + } + .code{ + width: 322rpx; + height: 322rpx; + } + \ No newline at end of file diff --git a/distribution/shop-detail/index.vue b/distribution/shop-detail/index.vue index abfc25b..495cc2b 100644 --- a/distribution/shop-detail/index.vue +++ b/distribution/shop-detail/index.vue @@ -1,6 +1,6 @@