From 8fdf0b1b4f86263526cdb2df923d5232cb3e92c6 Mon Sep 17 00:00:00 2001 From: fenjoyoung Date: Sun, 13 Sep 2026 14:50:39 +0800 Subject: [PATCH] =?UTF-8?q?feat(r3-order-pay):=20=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E4=B8=8E=E8=AE=A2=E5=8D=95=E6=94=AF=E4=BB=98=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E3=80=81=E6=94=AF=E4=BB=98=E5=80=92=E8=AE=A1=E6=97=B6/?= =?UTF-8?q?=E5=95=86=E5=93=81=E5=9B=BE=E7=BB=84=E4=BB=B6=EF=BC=8C=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=9C=B0=E5=9D=80=E6=94=B9=E4=B8=BA=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E6=9C=9F=E6=B3=A8=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 PaymentCountdown、ProductImage 组件 - 完善 checkout/orders/orderDetail 订单支付链路与地址、商品、设计数据 - request 接口地址改为构建期注入并保留真实网络错误,默认兜底线上地址 - 同步重新构建 dist 产物 --- config/index.js | 10 + dist/base.wxml | 8 + dist/common.js | 2 +- dist/pages/address/index.js | 2 +- dist/pages/checkout/index.js | 2 +- dist/pages/designList/index.js | 2 +- dist/pages/diy/index.js | 2 +- dist/pages/diy/index.wxss | 2 +- dist/pages/diy/stickerEdit/index.js | 2 +- dist/pages/diy/stickerEdit/index.wxss | 2 +- dist/pages/index/index.js | 2 +- dist/pages/orderDetail/index.js | 2 +- dist/pages/orderDetail/index.wxss | 2 +- dist/pages/orders/index.js | 2 +- dist/pages/orders/index.wxss | 2 +- dist/pages/product/index.js | 2 +- dist/pages/profile/index.js | 2 +- dist/pages/shop/detail/index.js | 2 +- dist/pages/shop/index.js | 2 +- dist/pages/wordcloud/index.js | 2 +- dist/taro.js | 2 +- docs/design-data-contract-v1.md | 8 - docs/routes/README.md | 4 - src/components/PaymentCountdown/index.tsx | 42 +++ src/components/ProductImage/index.tsx | 46 +++ src/pages/address/index.tsx | 59 ++-- src/pages/checkout/index.tsx | 78 ++++- src/pages/designList/index.tsx | 22 +- src/pages/diy/index.scss | 3 - src/pages/diy/index.tsx | 241 ++++---------- src/pages/diy/stickerEdit/index.scss | 37 --- src/pages/diy/stickerEdit/index.tsx | 384 ++++++++++++++-------- src/pages/index/index.tsx | 33 +- src/pages/orderDetail/index.scss | 9 + src/pages/orderDetail/index.tsx | 77 +++-- src/pages/orders/index.scss | 9 + src/pages/orders/index.tsx | 50 ++- src/pages/product/index.tsx | 49 +-- src/pages/profile/index.tsx | 24 +- src/pages/shop/detail/index.tsx | 14 +- src/pages/shop/index.tsx | 17 +- src/types/index.ts | 28 +- src/utils/api/address.ts | 98 ++---- src/utils/api/design.ts | 139 +++----- src/utils/api/order.ts | 52 ++- src/utils/api/product.ts | 34 +- src/utils/request.ts | 39 ++- src/utils/store/address.ts | 7 - src/utils/store/design.ts | 7 - src/utils/store/keys.ts | 6 +- 50 files changed, 895 insertions(+), 777 deletions(-) create mode 100644 src/components/PaymentCountdown/index.tsx create mode 100644 src/components/ProductImage/index.tsx diff --git a/config/index.js b/config/index.js index 23216fc..2233637 100644 --- a/config/index.js +++ b/config/index.js @@ -1,5 +1,14 @@ const path = require('path') require('dotenv').config({ path: path.resolve(__dirname, '../.env') }) +// Taro 构建配置运行在 Node 中;把小程序运行时需要的地址在构建期注入, +// 避免把 process.env 原样带入微信小程序运行时(小程序没有 Node 的 process)。 +// dev:weapp 时 NODE_ENV=development,默认读 .env.development 走本地联调; +// build:weapp 时 NODE_ENV=production,默认读 .env.production/.env 走线上。 +// 仍可用 TARO_APP_ENV 显式覆盖。默认必须安全(线上),避免队友构建出连本机的包。 +const appEnv = process.env.TARO_APP_ENV || (process.env.NODE_ENV === 'development' ? 'development' : 'production') +const envName = appEnv === 'production' ? '.env.production' : '.env.development' +// 环境专用文件必须覆盖 .env 中的默认值,否则本地构建会误用线上 API 地址。 +require('dotenv').config({ path: path.resolve(__dirname, `../${envName}`), override: true }) const config = { projectName: 'smart-engraving-miniapp', date: '2026-7-20', @@ -14,6 +23,7 @@ const config = { plugins: [], defineConstants: { __OSS_BASE_URL__: JSON.stringify(process.env.OSS_BASE_URL || ''), + __API_BASE_URL__: JSON.stringify(process.env.TARO_APP_API_BASE_URL || 'https://wxbackend.tokenleaping.com'), }, copy: { patterns: [ diff --git a/dist/base.wxml b/dist/base.wxml index 77b9e93..19dcfc8 100644 --- a/dist/base.wxml +++ b/dist/base.wxml @@ -133,6 +133,14 @@ +