From 096e31448ca089004c78af69f2006c2b0324d8a4 Mon Sep 17 00:00:00 2001 From: wikiboss Date: Fri, 20 Nov 2026 09:05:07 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=87=AA=E5=AE=9A=E4=B9=89=E5=BA=95?= =?UTF-8?q?=E9=83=A8=E5=AF=BC=E8=88=AA=E6=A0=8F=E5=8F=8A=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E3=80=81=E5=88=86=E7=B1=BB=E3=80=81=E5=95=86=E5=93=81=E7=AD=89?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shopro-auth-modal/shopro-auth-modal.vue | 46 ++- .../shopro-goods-card/shopro-goods-card.vue | 9 +- components/shopro-sku/shopro-sku.vue | 20 +- components/shopro-tabbar/shopro-tabbar.vue | 90 ++++- custom-tab-bar/index.vue | 18 + manifest.json | 14 +- pages.json | 32 +- pages/activity/discounts/list.vue | 13 +- pages/activity/groupon/my-groupon.vue | 12 +- pages/goods/components/sh-activity.vue | 12 +- pages/goods/components/sh-groupon.vue | 11 +- pages/goods/detail.vue | 84 ++++- pages/index/cart.vue | 2 +- pages/index/category/one-catgory.vue | 41 +- pages/index/category/takeout-catgory.vue | 36 +- pages/index/category/three-catgory.vue | 74 +++- pages/index/category/two-catgory.vue | 353 ++++++++++++++++-- pages/index/components/sh-goods-card.vue | 9 +- pages/index/components/sh-order-card.vue | 3 +- pages/index/user/userinfo-card.vue | 9 +- pages/order/confirm.vue | 245 ++++++++++-- pages/order/detail.vue | 9 +- pages/order/express/distribution-detail.vue | 66 +++- pages/order/list.vue | 11 +- pages/user/wallet/withdraw.vue | 2 +- shopro/utils/tools.js | 116 +++++- 26 files changed, 1083 insertions(+), 254 deletions(-) create mode 100644 custom-tab-bar/index.vue diff --git a/components/shopro-auth-modal/shopro-auth-modal.vue b/components/shopro-auth-modal/shopro-auth-modal.vue index b064ef4..ab5e86d 100644 --- a/components/shopro-auth-modal/shopro-auth-modal.vue +++ b/components/shopro-auth-modal/shopro-auth-modal.vue @@ -1,7 +1,7 @@ @@ -377,6 +384,7 @@ buyType: 'sku', is_play: 'stop', grouponBuyType: 'alone', //拼团购买方式。 + joinGrouponId: 0, // 参团ID,0表示开团 showEmpty: false, showEmptyText: '', showServe: false, @@ -582,8 +590,30 @@ }, // 轮播图预览 - onGoodsSwiper(e) { - this.$tools.previewImage(this.goodsInfo.images, e); + onGoodsSwiper(index) { + const images = this.goodsInfo.images || []; + let urls = []; + let currentUrl = ''; + + if (this.detailType === 'score') { + urls = images.map((img) => this.$tools.formatImageUrl(img)); + currentUrl = urls[index]; + } else { + const current = images[index]; + if (!current || Number(current.type) !== 0) { + return; + } + urls = images + .filter((img) => Number(img.type) === 0) + .map((img) => this.$tools.formatImageUrl(img.src)); + currentUrl = this.$tools.formatImageUrl(current.src); + } + + if (!urls.length || !currentUrl) { + return; + } + + this.$tools.previewImage(urls, currentUrl); }, getActivityRules(e) { if (e) { @@ -742,8 +772,12 @@ if (this.isLogin) { if (type === 'groupon') { this.grouponBuyType = 'groupon'; + this.joinGrouponId = 0; + } else if (type === 'join') { + this.grouponBuyType = 'groupon'; } else { this.grouponBuyType = 'alone'; + this.joinGrouponId = 0; } this.buyType = 'buy'; this.showSku = true; @@ -751,6 +785,12 @@ this.$store.dispatch('showAuthModal'); } }, + onJoinGroupon(grouponId) { + this.joinGrouponId = Number(grouponId) || 0; + this.grouponBuyType = 'groupon'; + this.buyType = 'buy'; + this.showSku = true; + }, // 预约抢购 handleRobOrder() { if (!this.isLogin) { @@ -859,6 +899,18 @@ font-weight: bold; } + .goods-swiper-item { + width: 100%; + height: 100%; + } + + .goods-swiper-image { + width: 100%; + height: 100%; + display: block; + pointer-events: none; + } + // 标题栏 .nav-box { position: fixed; @@ -866,6 +918,14 @@ min-height: 140rpx; z-index: 888; top: 0; + pointer-events: none; + + .back-box, + .back-hover, + .tool-button, + .nav-item { + pointer-events: auto; + } .back-box { background-color: rgba(#000, 0.18); diff --git a/pages/index/cart.vue b/pages/index/cart.vue index cb2d344..478d4f4 100644 --- a/pages/index/cart.vue +++ b/pages/index/cart.vue @@ -184,7 +184,7 @@ this.$u.toast('活动商品只能单独购买'); return false; } - that.jump('/pages/order/confirm', { + that.$tools.toOrderConfirm({ goodsList: confirmcartList, from: 'cart' }); diff --git a/pages/index/category/one-catgory.vue b/pages/index/category/one-catgory.vue index ed43d81..6c4aac2 100644 --- a/pages/index/category/one-catgory.vue +++ b/pages/index/category/one-catgory.vue @@ -1,12 +1,12 @@