From eb39f2e5dcb3d95eec0e70f31d0015ee025dbff0 Mon Sep 17 00:00:00 2001 From: chenxin <398275325@qq。> Date: Wed, 28 May 2025 10:09:59 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E8=82=A1=E4=B8=9C?= =?UTF-8?q?=E6=8A=A5=E5=90=8D=E5=AE=8C=E6=88=90=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/marketing/pages/reservation/goods-reservate-result.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/marketing/pages/reservation/goods-reservate-result.js b/src/marketing/pages/reservation/goods-reservate-result.js index 7882ed625..681fd946d 100644 --- a/src/marketing/pages/reservation/goods-reservate-result.js +++ b/src/marketing/pages/reservation/goods-reservate-result.js @@ -50,10 +50,10 @@ function GoodReservateResult(props) { return ( - + {/* 股东您好，报名已填报完成！ - + */} {info?.joinTips && {info.joinTips}} From 6c9d2a6581034e1591b3c34a990390198a092369 Mon Sep 17 00:00:00 2001 From: chenxin <398275325@qq。> Date: Tue, 3 Jun 2025 10:45:45 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=95=86=E5=93=81=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/item/espier-detail.js | 47 +++++++++++++++++++++--- src/pages/item/espier-detail.scss | 61 +++++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+), 5 deletions(-) diff --git a/src/pages/item/espier-detail.js b/src/pages/item/espier-detail.js index 6fa1cccba..b88f65a40 100644 --- a/src/pages/item/espier-detail.js +++ b/src/pages/item/espier-detail.js @@ -8,7 +8,7 @@ import Taro, { } from '@tarojs/taro' import { View, Text, Swiper, SwiperItem, Video, ScrollView } from '@tarojs/components' import { useImmer } from 'use-immer' -import { AtCountdown } from 'taro-ui' +import { AtFloatLayout , AtButton } from 'taro-ui' import { SpPrice, SpCell, @@ -107,7 +107,8 @@ const initialState = { showCancel: true, onCancel: null, onConfirm: null - } + }, + isParameter: false } function EspierDetail(props) { @@ -177,7 +178,8 @@ function EspierDetail(props) { curItem, recommendList, policyModal, - modalDivided + modalDivided, + isParameter } = state // 添加一个 ref 来追踪是否是首次渲染 @@ -232,12 +234,12 @@ function EspierDetail(props) { }, [play]) useEffect(() => { - if (packageOpen || skuPanelOpen || sharePanelOpen || posterModalOpen || promotionOpen) { + if (packageOpen || skuPanelOpen || sharePanelOpen || posterModalOpen || promotionOpen || isParameter) { pageRef.current.pageLock() } else { pageRef.current.pageUnLock() } - }, [packageOpen, skuPanelOpen, sharePanelOpen, posterModalOpen, promotionOpen]) + }, [packageOpen, skuPanelOpen, sharePanelOpen, posterModalOpen, promotionOpen,isParameter]) // 添加一个新的 useEffect 来监听 dtid 变化 useEffect(() => { @@ -763,6 +765,12 @@ function EspierDetail(props) { }) } + const handleClose = () => { + setState((draft) => { + draft.isParameter = !isParameter + }) + } + // 领券 const handleReceiveCoupon = () => { const { itemId, distributorId } = info @@ -1042,6 +1050,23 @@ function EspierDetail(props) { } + + + 参数 + + + + + 60瓦 + + + 近光功率 + + + + + + {/* 商品评价 */} @@ -1179,6 +1204,18 @@ function EspierDetail(props) { onCancel={modalDivided.onCancel} onConfirm={modalDivided.onConfirm} />} + + + + + + 近光功率 + 60瓦 + + + 确认 + + ) } diff --git a/src/pages/item/espier-detail.scss b/src/pages/item/espier-detail.scss index 5fe31b5eb..9f3a50f79 100644 --- a/src/pages/item/espier-detail.scss +++ b/src/pages/item/espier-detail.scss @@ -293,4 +293,65 @@ // @include text-overflow(); } } + + .goods-params-flat{ + margin: 0 16px 24px; + padding: 16px 24px; + background: #fff; + display: flex; + align-items: center; + width: 670px; + .parameter{ + font-weight: 600; + font-size: 28px; + width: 100px; + text-align: center; + white-space:nowrap; + } + .parameter-content{ + display: flex; + align-items: center; + white-space:nowrap; + flex: 1; + overflow-y: auto; + .parameter-item{ + text-align: center; + width: 164px; + flex-shrink: 0; + .configuration{ + color: #999; + } + } + } + .icon-arrowRight{ + font-size: 36px; + } + } + + .at-float-layout .layout-header__title { + text-align: center; + } + + .product-parameter{ + height: 700px; + padding: 0 24px; + &-all{ + margin-bottom: 24px; + height: 560px; + overflow-x: auto; + .product-parameter-item{ + height: 80px; + .title{ + color: #999; + width: 260px; + display: inline-block; + } + .content{ + font-weight: 600; + } + } + } + + } + } From 59ba6a1458231ff7e546a0cb1ea268446051f9a3 Mon Sep 17 00:00:00 2001 From: chenxin <398275325@qq。> Date: Wed, 4 Jun 2025 16:58:54 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=95=86=E5=93=81=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/doc/goods.js | 12 +++---- src/pages/item/espier-detail.js | 57 +++++++++++++++++++++------------ 2 files changed, 43 insertions(+), 26 deletions(-) diff --git a/src/doc/goods.js b/src/doc/goods.js index b7cef81a6..e61a2cf3d 100644 --- a/src/doc/goods.js +++ b/src/doc/goods.js @@ -327,12 +327,12 @@ export const ESPIER_DETAIL_GOODS_INFO = { // 如果 regions 不是数组，可以将它转换成数组 把 regions 转换成只包含一个元素的数组 regions = [regions] } - if (item_unit) { - res.push({ attribute_name: '计量单位', attribute_value_name: item_unit }) - } - if (regions) { - res.push({ attribute_name: '产地', attribute_value_name: regions.join(' ') }) - } + // if (item_unit) { + // res.push({ attribute_name: '计量单位', attribute_value_name: item_unit }) + // } + // if (regions) { + // res.push({ attribute_name: '产地', attribute_value_name: regions.join(' ') }) + // } return res.concat(item_params) }, groupsList: 'groups_list', diff --git a/src/pages/item/espier-detail.js b/src/pages/item/espier-detail.js index b88f65a40..2e4dd487b 100644 --- a/src/pages/item/espier-detail.js +++ b/src/pages/item/espier-detail.js @@ -1038,7 +1038,7 @@ function EspierDetail(props) { )} - {info.itemParams.length > 0 && + {/* {info.itemParams.length > 0 && 商品参数 {info.itemParams.map((item, index) => ( @@ -1048,24 +1048,35 @@ function EspierDetail(props) { ))} - } + } */} - - - 参数 - - - - - 60瓦 - - - 近光功率 - + { + info.itemParams.length > 0 && + + + 参数 + + { + info.itemParams.map((item, index) => { + return( + + + {item.attribute_value_name} + + + {item.attribute_name} + + + ) + }) + } + + - - + } + + {/* 商品评价 */} @@ -1208,10 +1219,16 @@ function EspierDetail(props) { - - 近光功率 - 60瓦 - + { + info?.itemParams?.map((item,index)=>{ + return( + + {item.attribute_name} + {item.attribute_value_name} + + ) + }) + } 确认 From 605511f6855793a5406762442331b1f3b5deaeb4 Mon Sep 17 00:00:00 2001 From: chenxin <398275325@qq。> Date: Wed, 4 Jun 2025 18:16:20 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/item/espier-detail.js | 2 +- src/pages/item/espier-detail.scss | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/pages/item/espier-detail.js b/src/pages/item/espier-detail.js index bc5c42621..64cf45174 100644 --- a/src/pages/item/espier-detail.js +++ b/src/pages/item/espier-detail.js @@ -1013,7 +1013,7 @@ function EspierDetail(props) { info.itemParams.map((item, index) => { return( - + {item.attribute_value_name} diff --git a/src/pages/item/espier-detail.scss b/src/pages/item/espier-detail.scss index 9f3a50f79..285f26d00 100644 --- a/src/pages/item/espier-detail.scss +++ b/src/pages/item/espier-detail.scss @@ -317,6 +317,12 @@ .parameter-item{ text-align: center; width: 164px; + .attribute{ + width: 160px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } flex-shrink: 0; .configuration{ color: #999; From 7f9341931a223f1e6392d72d15c93e28511e3734 Mon Sep 17 00:00:00 2001 From: lukaijie Date: Mon, 9 Jun 2025 15:02:39 +0800 Subject: [PATCH 5/8] chore(release): 3.21.3 --- CHANGELOG.md | 8 ++++++++ package-lock.json | 2 +- package.json | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d060bfb5a..a50c9ae2f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ 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. +### [3.21.3](https://git.ishopex.cn/ecshopx/ecshopx-vshop/compare/v3.21.0...v3.21.3) (2025-06-09) + + +### Bug Fixes + +* 导购欢迎语参数兼容处理 ([a2a062c](https://git.ishopex.cn/ecshopx/ecshopx-vshop/commit/a2a062c43fc9f2f456f9e1d449c4ede5cd3c7cb3)) +* 购物车输入框bug ([29f5893](https://git.ishopex.cn/ecshopx/ecshopx-vshop/commit/29f5893d76f58dbc8d103b7947915a88dd9fadcd)) + ### [3.21.2](https://git.ishopex.cn/ecshopx/ecshopx-vshop/compare/v3.20.7...v3.21.2) (2025-06-05) diff --git a/package-lock.json b/package-lock.json index a3b05d8c6..7b95f0c86 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "ecshopx-vshop", - "version": "3.21.2", + "version": "3.21.3", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 4390357c8..95abe444c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ecshopx-vshop", "app_name": "ecshopx", - "version": "3.21.2", + "version": "3.21.3", "private": true, "description": "taro app for bbc", "scripts": { From 57ac99a82017189838f6599872757801d8e8ed59 Mon Sep 17 00:00:00 2001 From: lukaijie Date: Mon, 9 Jun 2025 15:35:50 +0800 Subject: [PATCH 6/8] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=B4=AD=E7=89=A9?= =?UTF-8?q?=E8=BD=A6=E7=8C=9C=E4=BD=A0=E5=96=9C=E6=AC=A2=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E4=B8=8D=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/cart/espier-index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/cart/espier-index.js b/src/pages/cart/espier-index.js index af1b6e6dc..2b9aadfaf 100644 --- a/src/pages/cart/espier-index.js +++ b/src/pages/cart/espier-index.js @@ -94,12 +94,12 @@ function CartIndex() { const params = { shop_type: type } - + await dispatch(fetchCartList(params)) await dispatch(updateCount(params)) let cartRemindres = await api.cart.getCartRemind(params) - setState({ - cartRemind: cartRemindres + setState((draft) => { + draft.cartRemind = cartRemindres }) Taro.hideLoading() } From fa81736962bbf844242577122bab490caf22af39 Mon Sep 17 00:00:00 2001 From: maqian Date: Thu, 19 Jun 2025 14:13:20 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E8=BE=89=E7=BB=AE-=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- companys.conf | 14 +++++++++++ src/pages/home/comps/home-wgts.js | 2 +- src/subpages/member/comps/comp-menu.js | 33 +++++++++++++++----------- src/subpages/member/index.js | 24 +++++++++---------- 4 files changed, 45 insertions(+), 28 deletions(-) diff --git a/companys.conf b/companys.conf index a530e56d5..3756c7274 100644 --- a/companys.conf +++ b/companys.conf @@ -1046,3 +1046,17 @@ map_key = cc3fdf0c665f265009ed5f338188cd25 map_name = oneX新零售门店定位 image_cdn = https://b-img-cdn.yuanyuanke.cn/ecshopx-vshop dianwu_url=https://dw.xsdaojia.com + +[辉绮-测试] +appid = wx27fc041381fe1e0d +base_url = https://test-dtc.amandax.com.cn/api/h5app/wxapp +app_name = 通用小程序 +websocket = wss://test-dtc.amandax.com.cn/ws +company_id = 1 +platform = standard +custom_server = https://test-dtc.amandax.com.cn +home_page = /pages/index +map_key = NWBBZ-NKJ6J-LMOFT-D3LBD-IEYKE-JRFOY +map_name = oneX新零售门店定位 +image_cdn = https://b-img-cdn.yuanyuanke.cn/ecshopx-vshop +dianwu_url= \ No newline at end of file diff --git a/src/pages/home/comps/home-wgts.js b/src/pages/home/comps/home-wgts.js index e9b97025f..32453bac0 100644 --- a/src/pages/home/comps/home-wgts.js +++ b/src/pages/home/comps/home-wgts.js @@ -31,7 +31,7 @@ const initialState = { searchMethod: null } function HomeWgts(props) { - const { wgts, dtid, onLoad = () => { }, children ,copywriting = true} = props + const { wgts, dtid, onLoad = () => { }, children ,copywriting = false} = props const [state, setState] = useImmer(initialState) const { localWgts, searchMethod } = state const wgtsRef = useRef() diff --git a/src/subpages/member/comps/comp-menu.js b/src/subpages/member/comps/comp-menu.js index 27a62db47..910f69800 100644 --- a/src/subpages/member/comps/comp-menu.js +++ b/src/subpages/member/comps/comp-menu.js @@ -13,6 +13,7 @@ import { VERSION_B2C } from '@/utils' import { SG_APP_CONFIG } from '@/consts' +import CompPanel from './comp-panel' import './comp-menu.scss' @@ -179,21 +180,25 @@ function CompMenu(props) { ]) } + if (menus.length == 0) return null + return ( - - {menus.map((item, index) => ( - - - - {item.key == 'popularize' ? (isPromoter ? item.name : '我要推广') : item.name} - - - ))} - + + + {menus.map((item, index) => ( + + + + {item.key == 'popularize' ? (isPromoter ? item.name : '我要推广') : item.name} + + + ))} + + ) } diff --git a/src/subpages/member/index.js b/src/subpages/member/index.js index 01ce73bd1..d5baabef9 100644 --- a/src/subpages/member/index.js +++ b/src/subpages/member/index.js @@ -651,19 +651,17 @@ function MemberIndex(props) { - - - + From 81b1d0dfbf3100db8abb9fd019c78ca7766d1439 Mon Sep 17 00:00:00 2001 From: maqian Date: Thu, 19 Jun 2025 14:14:34 +0800 Subject: [PATCH 8/8] chore(release): 3.21.4 --- CHANGELOG.md | 7 +++++++ package-lock.json | 2 +- package.json | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a50c9ae2f..8a4488316 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ 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. +### [3.21.4](https://git.ishopex.cn/ecshopx/ecshopx-vshop/compare/v3.21.3...v3.21.4) (2025-06-19) + + +### Bug Fixes + +* 修复购物车猜你喜欢列表不展示 ([57ac99a](https://git.ishopex.cn/ecshopx/ecshopx-vshop/commit/57ac99a82017189838f6599872757801d8e8ed59)) + ### [3.21.3](https://git.ishopex.cn/ecshopx/ecshopx-vshop/compare/v3.21.0...v3.21.3) (2025-06-09) diff --git a/package-lock.json b/package-lock.json index 7b95f0c86..c619888b7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "ecshopx-vshop", - "version": "3.21.3", + "version": "3.21.4", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 95abe444c..70ad997a3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "ecshopx-vshop", "app_name": "ecshopx", - "version": "3.21.3", + "version": "3.21.4", "private": true, "description": "taro app for bbc", "scripts": {