From 530410fcf0cb4d27e6f83dbaff47a1db5e0890ab Mon Sep 17 00:00:00 2001 From: puhui999 Date: Fri, 29 Nov 2024 10:29:31 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E3=80=91=E7=A7=AF=E5=88=86=E5=95=86=E5=9F=8E=E5=88=86=E4=BA=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/chat/components/messageListItem.vue | 4 ++-- pages/goods/point.vue | 7 +++---- sheep/platform/share.js | 7 +++++++ 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/pages/chat/components/messageListItem.vue b/pages/chat/components/messageListItem.vue index a1c66463..41db1650 100644 --- a/pages/chat/components/messageListItem.vue +++ b/pages/chat/components/messageListItem.vue @@ -241,7 +241,7 @@ padding: 20rpx; color: #fff; background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient)); - margin-top: 18px; + margin-top: 3px; margin-bottom: 9px; border-top-left-radius: 10px; border-bottom-right-radius: 10px; @@ -249,7 +249,7 @@ &.admin { background: #fff; color: #333; - margin-top: 18px; + margin-top: 3px; margin-bottom: 9px; border-radius: 0 10px 10px 10px; } diff --git a/pages/goods/point.vue b/pages/goods/point.vue index b5d44e3d..475fddf7 100644 --- a/pages/goods/point.vue +++ b/pages/goods/point.vue @@ -171,7 +171,6 @@ } // 分享信息 - // TODO puhui999: 下次 fix const shareInfo = computed(() => { if (isEmpty(unref(activity))) return {}; return sheep.$platform.share.getShareInfo( @@ -179,7 +178,7 @@ title: activity.value.name, image: sheep.$url.cdn(state.goodsInfo.picUrl), params: { - page: '4', + page: '6', query: activity.value.id, }, }, @@ -187,8 +186,8 @@ type: 'goods', // 商品海报 title: activity.value.name, // 商品标题 image: sheep.$url.cdn(state.goodsInfo.picUrl), // 商品主图 - price: state.goodsInfo.price, // 商品价格 - marketPrice: state.goodsInfo.marketPrice, // 商品原价 + price: (getShowPrice.value.price || 0) + ` + ${getShowPrice.value.point} 积分`, // 积分价格 + marketPrice: fen2yuan(state.goodsInfo.marketPrice), // 商品原价 }, ); }); diff --git a/sheep/platform/share.js b/sheep/platform/share.js index a3cf4124..67ecdae1 100644 --- a/sheep/platform/share.js +++ b/sheep/platform/share.js @@ -158,6 +158,13 @@ const decryptSpm = (spm) => { id: shareParamsArray[2], }; break; + case '6': + // 积分商品 + shareParams.page = '/pages/goods/point'; + shareParams.query = { + id: shareParamsArray[2], + }; + break; } shareParams.platform = platformMap[shareParamsArray[3] - 1]; shareParams.from = fromMap[shareParamsArray[4] - 1];