diff --git a/pages/activity/groupon/detail.vue b/pages/activity/groupon/detail.vue index 7b606ec6..0d691887 100644 --- a/pages/activity/groupon/detail.vue +++ b/pages/activity/groupon/detail.vue @@ -209,6 +209,7 @@ import { isEmpty } from 'lodash-es'; import CombinationApi from '@/sheep/api/promotion/combination'; import SpuApi from '@/sheep/api/product/spu'; + import { SharePageEnum } from '@/sheep/util/const'; const headerBg = sheep.$url.css('/static/img/shop/user/withdraw_bg.png'); const statusBarHeight = sheep.$platform.device.statusBarHeight * 2; @@ -234,7 +235,7 @@ image: sheep.$url.cdn(state.data.headRecord.picUrl), desc: state.data.goods?.subtitle, params: { - page: '5', + page: SharePageEnum.GROUPON_DETAIL.value, query: state.data.headRecord.id, }, }, diff --git a/pages/commission/index.vue b/pages/commission/index.vue index 73c1eb7a..ab0984dd 100644 --- a/pages/commission/index.vue +++ b/pages/commission/index.vue @@ -23,11 +23,13 @@ import commissionMenu from './components/commission-menu.vue'; import commissionAuth from './components/commission-auth.vue'; import sheep from '@/sheep'; + import { SharePageEnum } from '@/sheep/util/const'; + /** 分销邀请 */ const shareInfo = computed(() => { return sheep.$platform.share.getShareInfo({ params: { - page: '6', + page: SharePageEnum.HOME.value, // 用户通邀请进入到首页 }, }, { type: 'user', diff --git a/pages/goods/groupon.vue b/pages/goods/groupon.vue index b24b1614..51329296 100644 --- a/pages/goods/groupon.vue +++ b/pages/goods/groupon.vue @@ -159,6 +159,7 @@ import { useDurationTime, formatGoodsSwiper, fen2yuan } from '@/sheep/hooks/useGoods'; import CombinationApi from '@/sheep/api/promotion/combination'; import SpuApi from '@/sheep/api/product/spu'; + import { SharePageEnum } from '@/sheep/util/const'; const headerBg = sheep.$url.css('/static/img/shop/goods/groupon-bg.png'); const btnBg = sheep.$url.css('/static/img/shop/goods/groupon-btn.png'); @@ -239,7 +240,7 @@ title: state.activity.name, image: sheep.$url.cdn(state.goodsInfo.picUrl), params: { - page: '3', + page: SharePageEnum.GROUPON.value, query: state.activity.id, }, }, diff --git a/pages/goods/index.vue b/pages/goods/index.vue index e3e3b3b0..11ea8288 100644 --- a/pages/goods/index.vue +++ b/pages/goods/index.vue @@ -234,6 +234,7 @@ import countDown from '@/sheep/components/countDown/index.vue'; import OrderApi from '@/sheep/api/trade/order'; import activity from '@/sheep/api/promotion/activity'; + import { SharePageEnum } from '@/sheep/util/const'; const bgColor = { bgColor: '#E93323', @@ -318,7 +319,7 @@ image: sheep.$url.cdn(state.goodsInfo.picUrl), desc: state.goodsInfo.introduction, params: { - page: '2', + page: SharePageEnum.GOODS.value, query: state.goodsInfo.id, }, }, diff --git a/pages/goods/point.vue b/pages/goods/point.vue index 7709f1ad..e6e80cc9 100644 --- a/pages/goods/point.vue +++ b/pages/goods/point.vue @@ -129,7 +129,7 @@ import detailCommentCard from './components/detail/detail-comment-card.vue'; import detailContentCard from './components/detail/detail-content-card.vue'; import SpuApi from '@/sheep/api/product/spu'; - import { PromotionActivityTypeEnum } from '@/sheep/util/const'; + import { PromotionActivityTypeEnum, SharePageEnum } from '@/sheep/util/const'; import PointApi from '@/sheep/api/promotion/point'; const headerBg = sheep.$url.css('/static/img/shop/goods/score-bg.png'); @@ -180,8 +180,7 @@ title: activity.value.name, image: sheep.$url.cdn(state.goodsInfo.picUrl), params: { - // TODO @puhui:page 相关,要不搞个枚举,然后都弄过去; - page: '6', + page: SharePageEnum.POINT.value, query: activity.value.id, }, }, diff --git a/pages/goods/seckill.vue b/pages/goods/seckill.vue index 879f235d..9ccbf4b9 100644 --- a/pages/goods/seckill.vue +++ b/pages/goods/seckill.vue @@ -151,7 +151,7 @@ import detailProgress from './components/detail/detail-progress.vue'; import SeckillApi from '@/sheep/api/promotion/seckill'; import SpuApi from '@/sheep/api/product/spu'; - import { getTimeStatusEnum, TimeStatusEnum } from '@/sheep/util/const'; + import { getTimeStatusEnum, SharePageEnum, TimeStatusEnum } from '@/sheep/util/const'; const headerBg = sheep.$url.css('/static/img/shop/goods/seckill-bg.png'); const btnBg = sheep.$url.css('/static/img/shop/goods/seckill-btn.png'); @@ -206,7 +206,7 @@ title: activity.value.name, image: sheep.$url.cdn(state.goodsInfo.picUrl), params: { - page: '4', + page: SharePageEnum.SECKILL.value, query: activity.value.id, }, }, diff --git a/sheep/components/s-layout/s-layout.vue b/sheep/components/s-layout/s-layout.vue index 573a1c0d..df15c317 100644 --- a/sheep/components/s-layout/s-layout.vue +++ b/sheep/components/s-layout/s-layout.vue @@ -60,11 +60,11 @@ /** * 模板组件 - 提供页面公共组件,属性,方法 */ - import { computed } from 'vue'; + import { computed, onMounted } from 'vue'; import sheep from '@/sheep'; import { isEmpty } from 'lodash-es'; // #ifdef MP-WEIXIN - import { onShareAppMessage, onShareTimeline, onShow } from '@dcloudio/uni-app'; + import { onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app'; // #endif const props = defineProps({ @@ -198,7 +198,7 @@ onShareAppMessage(() => { return { title: shareInfo.value.title, - path: shareInfo.value.path, + path: shareInfo.value.forward.path, imageUrl: shareInfo.value.image, }; }); @@ -206,17 +206,18 @@ onShareTimeline(() => { return { title: shareInfo.value.title, - query: shareInfo.value.path, + query: shareInfo.value.forward.path, imageUrl: shareInfo.value.image, }; }); // #endif - onShow(() => { + // 组件中使用 onMounted 监听页面加载,不是页面组件不使用 onShow + onMounted(()=>{ if (!isEmpty(shareInfo.value)) { sheep.$platform.share.updateShareInfo(shareInfo.value); } - }); + })