diff --git a/common/petrolVoucher.js b/common/petrolVoucher.js index d6a5418..4e878f7 100644 --- a/common/petrolVoucher.js +++ b/common/petrolVoucher.js @@ -1,10 +1,8 @@ // xuchao: 怀化石油汽油减免券——前端常量与工具(全写死,只服务这一个门店,决策 1/10/15) -// 价格真相在后端常量(20000 分),此处 200.00 仅展示用,两处改价必须同步 +// 价格真相=后端配置 hh.voucher.price-fen 经 latest 下发;此处 200.00 仅为接口未返回时的展示兜底 export const PETROL_SHOP_ID = '851219003520709' export const VOUCHER_PRICE_TEXT = '200.00' -// xuchao: 非云闪付环境豁免拦截的联调手机号(决策 13) -export const VOUCHER_PAY_WHITELIST_PHONE = '18684839400' export const VOUCHER_NAME = '怀化石油汽油电子券' @@ -35,12 +33,6 @@ export function injectUpSdk() { document.head.appendChild(s) } -// xuchao: 云闪付容器判定只看 UA——不能掺 window.upsdk 是否已加载(SDK 是异步注入的, -// 首屏点击时可能还没 load 完,会把云闪付内首点误判为站外)。UA 关键字真机实测后定稿。 -export function isUnionPayApp() { - if (typeof navigator === 'undefined' || !navigator.userAgent) return false - return /unionpay|upsdk|云闪付/i.test(navigator.userAgent) -} // xuchao: open-api/hhService/voucher/* 为双层壳:外层 errcode,内层 data.code 才是业务码 // (同 login.vue 的 isBizOk 判定,提到公共层复用) diff --git a/h5-release.sh b/h5-release.sh new file mode 100755 index 0000000..bc762ff --- /dev/null +++ b/h5-release.sh @@ -0,0 +1,14 @@ +#!/bin/bash +# xuchao: hhrs H5 发布脚本 —— HBuilderX 构建不吃项目根 index.html(静态标签会被丢), +# 云闪付控件(upsdk)必须静态标签加载才能注册控件桥(路线B,2026-09-28 定), +# 故构建后把标签注入产物 index.html 再打包上传。发布 = sh h5-release.sh +set -e +cd "$(dirname "$0")" +rm -rf unpackage/dist/build/web +/Applications/HBuilderX.app/Contents/MacOS/cli publish web --project hhrs +BUILT=unpackage/dist/build/web/index.html +# 注入云闪付 SDK 静态标签(幂等:已有则跳过) +grep -q "open.95516.com" "$BUILT" || sed -i '' 's#怀化人社#怀化人社#' "$BUILT" +grep -q "open.95516.com" "$BUILT" && echo "[h5-release] upsdk 静态标签已在产物 index.html" +tar czf /tmp/hh-voucher/web_release.tgz -C unpackage/dist/build/web . +echo "[h5-release] 产物就绪:/tmp/hh-voucher/web_release.tgz —— 用 expect rsh.exp scp 上传后原子切换" diff --git a/pages/petrol/orderConfirm.vue b/pages/petrol/orderConfirm.vue index 6f952e0..0d2b36c 100644 --- a/pages/petrol/orderConfirm.vue +++ b/pages/petrol/orderConfirm.vue @@ -53,7 +53,7 @@