diff --git a/CoreCms.Net.Services/Share/CoreCmsShareServices.cs b/CoreCms.Net.Services/Share/CoreCmsShareServices.cs index f8562efe..718ad394 100644 --- a/CoreCms.Net.Services/Share/CoreCmsShareServices.cs +++ b/CoreCms.Net.Services/Share/CoreCmsShareServices.cs @@ -646,7 +646,7 @@ namespace CoreCms.Net.Services } break; case (int)GlobalEnumVars.UrlSharePageType.PinTuan: - if (arr.Length == 3) + if (arr.Length == 2) { jm.data = new { @@ -675,7 +675,7 @@ namespace CoreCms.Net.Services } break; case (int)GlobalEnumVars.UrlSharePageType.AddPinTuan: - if (arr.Length == 3) + if (arr.Length == 2) { jm.data = new { diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-groupPurchase.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-groupPurchase.vue index d3e661a6..d2a602c0 100644 --- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-groupPurchase.vue +++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-groupPurchase.vue @@ -16,13 +16,13 @@ {{ item.name }} {{ item.goodName }} - 仅剩: + 仅剩: - 即将开始: + 即将开始: - 已结束: + 已结束: diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-seckill.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-seckill.vue index 32f15a9f..6005a103 100644 --- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-seckill.vue +++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-seckill.vue @@ -16,13 +16,13 @@ {{ item.name }} {{ item.goodName }} - 仅剩: + 仅剩: - 即将开始: + 即将开始: - 已结束: + 已结束: diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-serviceGood.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-serviceGood.vue index 59b6fd46..07e2be23 100644 --- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-serviceGood.vue +++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-serviceGood.vue @@ -22,9 +22,9 @@ - 仅剩: + 仅剩: - - 即将开始: - - + - + 剩余时间: - + - + 拼主 ? - + 还差 {{ teamInfo.teamNums || '' }} @@ -963,6 +963,9 @@ pinTuanShow() { this.pinTuanpop = true; }, + pinTuanHiiden() { + this.pinTuanpop = false; + }, // 图片点击放大 clickImg(index) { if (this.goodsInfo.album[index].type == 'image') { @@ -1006,6 +1009,9 @@ }, // 显示modal弹出框 selectTap(type, teamId) { + if (this.pinTuanpop) { + this.pinTuanpop = false; + } this.pinTuanType = type; if (teamId) { this.teamId = teamId; diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/list/list.vue b/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/list/list.vue index 662ca752..fdb7eeae 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/list/list.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/list/list.vue @@ -35,7 +35,7 @@ - + 仅剩: @@ -57,7 +57,7 @@ - + 即将开始: diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/seckillDetails/seckillDetails.vue b/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/seckillDetails/seckillDetails.vue index a45ab705..473f94a9 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/seckillDetails/seckillDetails.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/seckillDetails/seckillDetails.vue @@ -24,7 +24,7 @@ - + 仅剩: diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/order/invitationGroup/invitationGroup.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/order/invitationGroup/invitationGroup.vue index 698cd96b..0c7ff5fe 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/member/order/invitationGroup/invitationGroup.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/order/invitationGroup/invitationGroup.vue @@ -13,7 +13,7 @@ - 剩余: + 剩余: diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/serviceGoods/details/details.vue b/CoreCms.Net.Uni-App/CoreShop/pages/serviceGoods/details/details.vue index 0903c36e..8ea2b7e5 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/serviceGoods/details/details.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/serviceGoods/details/details.vue @@ -26,7 +26,7 @@ - + 仅剩: @@ -48,7 +48,7 @@ - + 即将开始: diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/serviceGoods/index/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/serviceGoods/index/index.vue index e7fa9b27..f02937e6 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/serviceGoods/index/index.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/serviceGoods/index/index.vue @@ -40,7 +40,7 @@ - + 仅剩时间: @@ -62,7 +62,7 @@ - + 距离开始: diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/share/shareNewPoster/shareNewPoster.vue b/CoreCms.Net.Uni-App/CoreShop/pages/share/shareNewPoster/shareNewPoster.vue index 5d46fff8..e4372067 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/share/shareNewPoster/shareNewPoster.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/share/shareNewPoster/shareNewPoster.vue @@ -139,7 +139,7 @@ } }) } - else if (options.shareType == _this.$globalConstVars.shareType.pinTuan) { + else if (options.shareType == _this.$globalConstVars.shareType.pinTuan || options.shareType == _this.$globalConstVars.shareType.addPinTuan) { let data = { id: parseInt(options.groupId), data: false,