diff --git a/.env b/.env index 0a6b145..2cd1130 100644 --- a/.env +++ b/.env @@ -26,7 +26,7 @@ SHOPRO_VERSION=v2.4.1 SHOPRO_DEV_BASE_URL=https://yougoutest.api.riananyoumu.com # 本地 -#SHOPRO_DEV_BASE_URL=http://8.136.55.200:48090 +# SHOPRO_DEV_BASE_URL=http://8.136.55.200:48090 ### SHOPRO_DEV_BASE_URL=http://10.171.1.188:48090 ### SHOPRO_DEV_BASE_URL = http://yunai.natapp1.cc diff --git a/CHANGELOG.md b/CHANGELOG.md index 88cc853..4113177 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,11 +2,11 @@ 所有版本改动记录在此文件中。 -## [Unreleased] -- - ## [1.3.9] - 2026-06-05 +### 新增 - 添加“会员优选”标签下列表api - 我的订单添加`店铺订单`列 - 添加商城订单列type为5(开通ai店铺订单)详情接口api - 首页`会员优选`分类兜底(已开通ai店铺不展示) +- 首页`会员优选`分类点击购买直接跳转到购买页、支付完成返回首页 +- 我的社员ui重构 diff --git a/components/goods/goods.vue b/components/goods/goods.vue index 3d632d7..ca35948 100644 --- a/components/goods/goods.vue +++ b/components/goods/goods.vue @@ -61,6 +61,12 @@ if (mescrollItems.length > n) mescrollItems.splice(n); }; + const { tabIndex } = useMescrollMore( + mescrollItems, + onPageScroll, + onReachBottom, + ); + const refreshDisplay = () => { const next = computeDisplayList(); displayList.value = next; @@ -90,12 +96,6 @@ }, { immediate: true, deep: true }, ); - - const { tabIndex } = useMescrollMore( - mescrollItems, - onPageScroll, - onReachBottom, - ); // let tabIndex = ref(0); const navChange = (i) => { // scrollToLastY() diff --git a/components/goodsItem/card_goods.vue b/components/goodsItem/card_goods.vue index 6750bf1..ec5fbea 100644 --- a/components/goodsItem/card_goods.vue +++ b/components/goodsItem/card_goods.vue @@ -67,11 +67,11 @@ - + - + @@ -101,6 +101,10 @@ return {}; }, }, + memberPreferred: { + type: Boolean, + default: false, + }, type: { //1:首页 2:分类 3:搜索 type: Number, @@ -120,6 +124,18 @@ }, ); let showSelectSku = ref(false); + const buyMemberGoods = () => { + uni.navigateTo({ + url: `/pages/AI/giftOrder?id=${props.data.id}`, + }); + }; + const onShopIconClick = () => { + if (props.memberPreferred) { + buyMemberGoods(); + return; + } + changeSelectSku(); + }; const changeSelectSku = async () => { let res = await getData(); showSelectSku.value = true; diff --git a/components/goodsItem/goodsItem.vue b/components/goodsItem/goodsItem.vue index 5376dd6..b27ff4b 100644 --- a/components/goodsItem/goodsItem.vue +++ b/components/goodsItem/goodsItem.vue @@ -12,7 +12,7 @@ > - + @@ -20,7 +20,7 @@