From 5de7f8d471edac62704528a2c2b548602573dc1f Mon Sep 17 00:00:00 2001 From: lukaijie Date: Fri, 20 Mar 2026 15:53:31 +0800 Subject: [PATCH 1/5] chore(release): 4.3.3 --- CHANGELOG.md | 2 ++ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a1c9c97bc..91e676e83 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [4.3.3](https://git.ishopex.cn/ecshopx/ecshopx-vshop/compare/v4.3.2...v4.3.3) (2026-03-20) + ### [4.3.2](https://git.ishopex.cn/ecshopx/ecshopx-vshop/compare/v4.3.1...v4.3.2) (2026-03-19) ### [4.3.1](https://git.ishopex.cn/ecshopx/ecshopx-vshop/compare/v4.3.0...v4.3.1) (2026-03-19) diff --git a/package-lock.json b/package-lock.json index 7637f4830..32d6bb5fd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "ecshopx-vshop", - "version": "4.3.2", + "version": "4.3.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "ecshopx-vshop", - "version": "4.3.2", + "version": "4.3.3", "dependencies": { "@babel/runtime": "^7.14.5", "@lucky-canvas/taro": "^0.0.15", diff --git a/package.json b/package.json index 34a9b5d8f..73a436f98 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ecshopx-vshop", "app_name": "ecshopx", - "version": "4.3.2", + "version": "4.3.3", "private": true, "description": "taro app for bbc", "scripts": { From 38b7ff09db466bd177bfd8bda7b3a65d7ca720a4 Mon Sep 17 00:00:00 2001 From: lukaijie Date: Fri, 20 Mar 2026 15:55:33 +0800 Subject: [PATCH 2/5] chore(release): 4.3.5 --- CHANGELOG.md | 2 ++ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 91e676e83..35acccadd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [4.3.5](https://git.ishopex.cn/ecshopx/ecshopx-vshop/compare/v4.3.3...v4.3.5) (2026-03-20) + ### [4.3.3](https://git.ishopex.cn/ecshopx/ecshopx-vshop/compare/v4.3.2...v4.3.3) (2026-03-20) ### [4.3.2](https://git.ishopex.cn/ecshopx/ecshopx-vshop/compare/v4.3.1...v4.3.2) (2026-03-19) diff --git a/package-lock.json b/package-lock.json index 32d6bb5fd..0aa8e0aa2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "ecshopx-vshop", - "version": "4.3.3", + "version": "4.3.5", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "ecshopx-vshop", - "version": "4.3.3", + "version": "4.3.5", "dependencies": { "@babel/runtime": "^7.14.5", "@lucky-canvas/taro": "^0.0.15", diff --git a/package.json b/package.json index 73a436f98..737cc5d58 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ecshopx-vshop", "app_name": "ecshopx", - "version": "4.3.3", + "version": "4.3.5", "private": true, "description": "taro app for bbc", "scripts": { From 9880f5f808331e09a67ffa499e8f214008058117 Mon Sep 17 00:00:00 2001 From: zhangjing1 Date: Fri, 20 Mar 2026 16:10:41 +0800 Subject: [PATCH 3/5] style(home): refine slider pagination layout and active color - Center .slider-pagination with left 50% + translateX(-50%); drop full width - Use var(--color-primary) for active dots (rectangle/circle) instead of fixed red - Minor SCSS formatting Made-with: Cursor --- src/pages/home/wgts/slider/index.scss | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/src/pages/home/wgts/slider/index.scss b/src/pages/home/wgts/slider/index.scss index 2c762fa5b..673fd95ed 100644 --- a/src/pages/home/wgts/slider/index.scss +++ b/src/pages/home/wgts/slider/index.scss @@ -7,10 +7,12 @@ box-sizing: border-box; position: relative; width: 100%; + .slider-img { width: 100%; height: 100%; } + .slider-item { position: relative; @@ -30,6 +32,7 @@ height: 100%; display: block; background-color: transparent; + video { background-color: transparent; } @@ -71,14 +74,17 @@ } } } + .slider-pagination { position: absolute; + left: 50%; + transform: translateX(-50%); bottom: 20px; z-index: 200; - width: 100%; box-sizing: border-box; padding: 20px; display: flex; + &.cover { position: initial; } @@ -86,9 +92,11 @@ &.left { justify-content: flex-start; } + &.center { justify-content: center; } + &.right { justify-content: flex-end; } @@ -97,15 +105,18 @@ .dot-item { background: rgba(0, 0, 0, 0.4); } + .pagination-count { background: rgba(0, 0, 0, 0.4); color: #fff; } } + &.light { .dot-item { background: rgba(255, 255, 255, 0.7); } + .pagination-count { background: rgba(255, 255, 255, 0.7); color: #555; @@ -118,10 +129,12 @@ height: 4px; margin: 0 4px; border-radius: 2px; + &.active { - background: #d42f29; + background: var(--color-primary); } } + .pagination-count { height: 40px; font-size: 24px; @@ -137,10 +150,12 @@ border-radius: 8px; background: rgba(0, 0, 0, 0.4); margin: 0 6px; + &.active { - background: #d42f29; + background: var(--color-primary); } } + .pagination-count { width: 50px; height: 50px; From 10cbe1817bea49ecf4b2e8b69fb945b074d776c1 Mon Sep 17 00:00:00 2001 From: lukaijie Date: Fri, 20 Mar 2026 16:28:33 +0800 Subject: [PATCH 4/5] chore(release): 4.3.6 --- CHANGELOG.md | 2 ++ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 35acccadd..6c58d8e6f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [4.3.6](https://git.ishopex.cn/ecshopx/ecshopx-vshop/compare/v4.3.5...v4.3.6) (2026-03-20) + ### [4.3.5](https://git.ishopex.cn/ecshopx/ecshopx-vshop/compare/v4.3.3...v4.3.5) (2026-03-20) ### [4.3.3](https://git.ishopex.cn/ecshopx/ecshopx-vshop/compare/v4.3.2...v4.3.3) (2026-03-20) diff --git a/package-lock.json b/package-lock.json index 0aa8e0aa2..1b04d0eae 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "ecshopx-vshop", - "version": "4.3.5", + "version": "4.3.6", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "ecshopx-vshop", - "version": "4.3.5", + "version": "4.3.6", "dependencies": { "@babel/runtime": "^7.14.5", "@lucky-canvas/taro": "^0.0.15", diff --git a/package.json b/package.json index 737cc5d58..3d3a41d75 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ecshopx-vshop", "app_name": "ecshopx", - "version": "4.3.5", + "version": "4.3.6", "private": true, "description": "taro app for bbc", "scripts": { From d5da39af21ec3b62be928f3cba27577bc3912b44 Mon Sep 17 00:00:00 2001 From: zhangjing1 Date: Mon, 23 Mar 2026 10:43:21 +0800 Subject: [PATCH 5/5] feat(custom-page): align top nav with home, ScrollView scroll sync - Pass pageConfig, immersive, nearbyText to SpPage; filter page widget from wgts - Wrap HomeWgts in ScrollView with handlePageScroll and scrollIntoView context - Store bodyHeight/navbarHeight from onReady; hide powered-by; remove fixed SpSearch - SpPage: use Taro.pxTransform(0) when no footer for consistent onReady footerHeight - Home: remove debug log and redundant home-body-content wrapper Made-with: Cursor --- src/components/sp-page/index.js | 2 +- src/pages/custom/custom-page.js | 86 +++++++++++++++++---------------- src/pages/index.js | 8 --- 3 files changed, 45 insertions(+), 51 deletions(-) diff --git a/src/components/sp-page/index.js b/src/components/sp-page/index.js index aeec8d2bb..4160a3ce5 100644 --- a/src/components/sp-page/index.js +++ b/src/components/sp-page/index.js @@ -160,7 +160,7 @@ const SpPage = memo( const _height = props.renderFooter ? Taro.pxTransform(props.footerHeight + (isIphoneX() ? DEFAULT_SAFE_AREA_HEIGHT : 0)) - : 0 + : Taro.pxTransform(0) props.onReady({ gNavbarH: _gNavbarH, diff --git a/src/pages/custom/custom-page.js b/src/pages/custom/custom-page.js index 45e08461a..8ca40c6fc 100644 --- a/src/pages/custom/custom-page.js +++ b/src/pages/custom/custom-page.js @@ -9,8 +9,9 @@ import Taro, { useRouter, getCurrentInstance, useShareAppMessage, - useShareTimeline + useShareTimeline, } from '@tarojs/taro' +import { ScrollView } from '@tarojs/components' import api from '@/api' import doc from '@/doc' import qs from 'qs' @@ -18,7 +19,6 @@ import { SpPage, SpSearch, SpSkuSelect, SpTabbar, SpLogin } from '@/components' import { WgtsContext } from '@/pages/home/wgts/wgts-context' import { getDistributorId, log, entryLaunch, pickBy, showToast, buildSharePath } from '@/utils' import { platformTemplateName } from '@/utils/platform' -import { useNavigation } from '@/hooks' import req from '@/api/req' import HomeWgts from '@/pages/home/comps/home-wgts' import './custom-page.scss' @@ -31,16 +31,21 @@ const initialState = { skuPanelOpen: false, selectType: 'picker', isShowTabBar: false, - footerHeight: 0 + footerHeight: 0, + bodyHeight: 0, + scrollIntoView: null, + navbarHeight: 0 } function CustomPage(props) { const $instance = getCurrentInstance() const [state, setState] = useImmer(initialState) - const { wgts, loading, shareInfo, skuPanelOpen, selectType, info, isShowTabBar } = state + const { wgts, loading, shareInfo, skuPanelOpen, selectType, info, isShowTabBar, scrollIntoView, navbarHeight } = state const MSpSkuSelect = React.memo(SpSkuSelect) const pageRef = useRef() const loginRef = useRef() const router = useRouter() + const { location, address } = useSelector((state) => state.user) + const nearbyText = address?.city || location?.city || '' useEffect(() => { fetch() @@ -83,28 +88,6 @@ function CustomPage(props) { return getAppShareInfo() }) - const onAddToCart = async ({ itemId, distributorId }) => { - Taro.showLoading() - try { - const itemDetail = await api.item.detail(itemId, { - showError: false, - distributor_id: distributorId - }) - Taro.hideLoading() - setState((draft) => { - draft.info = pickBy(itemDetail, doc.goods.GOODS_INFO) - draft.skuPanelOpen = true - draft.selectType = 'addcart' - }) - } catch (e) { - Taro.hideLoading({ - success: () => { - showToast(e.message) - } - }) - } - } - const getAppShareInfo = async () => { const { id } = await entryLaunch.getRouteParams($instance.router.params) const { userId } = Taro.getStorageSync('userinfo') @@ -123,39 +106,58 @@ function CustomPage(props) { } const searchComp = wgts.find((wgt) => wgt.name == 'search') - let filterWgts = [] - if (searchComp && searchComp.config.fixTop) { - filterWgts = wgts.filter((wgt) => wgt.name !== 'search') - } else { - filterWgts = wgts - } - const fixedTop = searchComp && searchComp.config.fixTop const pageData = wgts.find((wgt) => wgt.name == 'page') + let filterWgts = [] + if (searchComp && searchComp.config && searchComp.config.fixTop) { + filterWgts = wgts.filter((wgt) => wgt.name !== 'search' && wgt.name != 'page') + } else { + filterWgts = wgts.filter((wgt) => wgt.name != 'page') + } return ( } - fixedTopContainer={fixedTop && } - onReady={({ footerHeight }) => { + onReady={({ footerHeight, height, gNavbarH }) => { setState((draft) => { draft.footerHeight = footerHeight + draft.bodyHeight = height + draft.navbarHeight = gNavbarH }) }} > - { + pageRef.current.handlePageScroll(e?.detail) }} + scrollIntoView={scrollIntoView} + style={{ height: state.bodyHeight }} > - - + { + setState((draft) => { + draft.scrollIntoView = view + }) + } + }} + > + + + {/* Sku选择器 */} 0 && } renderFooter={} onScrollToTop={() => { - console.log('onScrollToTop') // 先设置为一个很小的非0值，确保触发滚动变化 setState((draft) => { draft.backTopScrollTop = 0.1 @@ -321,11 +320,6 @@ function Home() { })} > <> - - {filterWgts.length > 0 && ( )} - {/* If you remove or alter Shopex brand identifiers, you must obtain a branding removal license from Shopex. Contact us at: http://www.shopex.cn to purchase a branding removal license. */} {/* Powered by @@ -358,7 +351,6 @@ function Home() { mode='contain' /> */} - {/* 小程序收藏提示 */} {isWeixin && }