From 1f4506f60b1acffb6268cd432c8ceef607772dc4 Mon Sep 17 00:00:00 2001 From: jacy <18049821889@163.com> Date: Wed, 26 Aug 2026 07:13:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + apps/mini-user/package.json | 2 +- apps/mini-user/src/lib/client-version.ts | 2 +- .../src/pages/product-detail/index.tsx | 19 ------------------- .../src/pages/store-detail/index.tsx | 10 ++++------ apps/mini-user/src/styles/product-detail.css | 8 -------- 6 files changed, 7 insertions(+), 35 deletions(-) diff --git a/.gitignore b/.gitignore index 4a392d1..9713a70 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ server/dukang-api/assets/fonts/*.ttc server/dukang-api/assets/fonts/*.otf deploy/auto-release.env deploy/backups/ +.playwright-mcp/ diff --git a/apps/mini-user/package.json b/apps/mini-user/package.json index 17a9102..3918eff 100644 --- a/apps/mini-user/package.json +++ b/apps/mini-user/package.json @@ -1,6 +1,6 @@ { "name": "@dukang/mini-user", - "version": "3.5.4", + "version": "3.5.10", "private": true, "description": "杜康好客 · C 端用户微信小程序(Taro)", "scripts": { diff --git a/apps/mini-user/src/lib/client-version.ts b/apps/mini-user/src/lib/client-version.ts index fa52011..98000b8 100644 --- a/apps/mini-user/src/lib/client-version.ts +++ b/apps/mini-user/src/lib/client-version.ts @@ -2,7 +2,7 @@ import Taro from '@tarojs/taro'; import { fetchClientConfig } from './pay-wechat'; /** 与 package.json version 同步,供服务端 minClientVersion 比对 */ -export const APP_VERSION = '3.5.4'; +export const APP_VERSION = '3.5.10'; export const APP_VERSION_LABEL = `v${APP_VERSION}`; diff --git a/apps/mini-user/src/pages/product-detail/index.tsx b/apps/mini-user/src/pages/product-detail/index.tsx index 7d08fa7..4f9ee8c 100644 --- a/apps/mini-user/src/pages/product-detail/index.tsx +++ b/apps/mini-user/src/pages/product-detail/index.tsx @@ -14,7 +14,6 @@ import PageNavBar from '../../components/PageNavBar'; import ProductCarousel from '../../components/ProductCarousel'; import WechatShareReady from '../../components/WechatShareReady'; import BenefitFigure from '../../components/BenefitFigure'; -import DeliveryHintHtml from '../../components/DeliveryHintHtml'; import { goLogin } from '../../lib/auth-nav'; import { ensurePayReady } from '../../lib/pay-ready'; import { isLoggedIn, request, toast } from '../../lib/api'; @@ -29,8 +28,6 @@ import { canPickupOnSite, normalizeFulfillmentFlags, } from '../../lib/product-fulfillment'; -import { loadLocalDeliveries, matchLocalDelivery, resolveLocalDeliveryHintHtml } from '../../lib/local-delivery'; -import { getCityCodeForCatalog, resolveUserCity } from '../../lib/user-location'; import { buildSceneSharePayload, toWeappShareMessage, @@ -93,7 +90,6 @@ export default function ProductDetailPage() { const [product, setProduct] = useState(null); const [headerSolid, setHeaderSolid] = useState(false); const [selected, setSelected] = useState>({}); - const [localHintHtml, setLocalHintHtml] = useState(''); usePageScroll(({ scrollTop }) => { setHeaderSolid(scrollTop > 100); @@ -140,17 +136,6 @@ export default function ProductDetailPage() { useDidShow(() => { loadProduct(); - void resolveUserCity() - .then((city) => - loadLocalDeliveries().then((list) => { - const row = matchLocalDelivery(list, { - cityCode: getCityCodeForCatalog(city), - cityName: city.cityName || city.displayCity || city.city, - }); - setLocalHintHtml(resolveLocalDeliveryHintHtml(row)); - }), - ) - .catch(() => setLocalHintHtml(resolveLocalDeliveryHintHtml(null))); }); const attrs = product?.specAttrs ?? []; @@ -332,10 +317,6 @@ export default function ProductDetailPage() { ) : null} - {allowOnline && localHintHtml ? ( - - ) : null} - diff --git a/apps/mini-user/src/pages/store-detail/index.tsx b/apps/mini-user/src/pages/store-detail/index.tsx index f8c36ab..f9e9ce3 100644 --- a/apps/mini-user/src/pages/store-detail/index.tsx +++ b/apps/mini-user/src/pages/store-detail/index.tsx @@ -405,13 +405,11 @@ export default function StoreDetailPage() { ) : null} - - {store.category?.name ? ( + {store.category?.name ? ( + {store.category.name} - ) : null} - 可核销 - 好客门店 - + + ) : null} {marqueeLines.length > 0 ? ( diff --git a/apps/mini-user/src/styles/product-detail.css b/apps/mini-user/src/styles/product-detail.css index 0638269..c5844bf 100644 --- a/apps/mini-user/src/styles/product-detail.css +++ b/apps/mini-user/src/styles/product-detail.css @@ -128,14 +128,6 @@ margin-bottom: 24px; } -.product-detail-fulfillment { - display: block; - margin: 0 0 16px; - font-size: 13px; - line-height: 20px; - color: var(--color-on-surface-variant); -} - .product-detail-promo { position: relative; margin-top: 8px;