From 6df724cace8bc2620fbaa44cd4c8ff321f2cd271 Mon Sep 17 00:00:00 2001 From: zhangjing1 Date: Mon, 17 Nov 2025 11:26:07 +0800 Subject: [PATCH] bug(custom): eCX-7464 --- .env | 16 ++++++++-------- src/components/sp-checkbox/index.js | 7 ++++--- src/components/sp-page/index.js | 4 ---- src/subpages/member/settings.jsx | 1 + 4 files changed, 13 insertions(+), 15 deletions(-) diff --git a/.env b/.env index fc800b56d..f53bd29e3 100644 --- a/.env +++ b/.env @@ -1,16 +1,16 @@ -APP_BASE_URL=https://{域名}/api/h5app/wxapp -APP_WEBSOCKET=wss://{域名}/ws -APP_COMPANY_ID={company_id} -APP_PLATFORM={version} -APP_CUSTOM_SERVER=https://{域名} +APP_BASE_URL=https://demo-ecshopx.ishopex.cn/api/h5app/wxapp +APP_WEBSOCKET=wss://demo-ecshopx.ishopex.cn/ws +APP_COMPANY_ID=38 +APP_PLATFORM=standard +APP_CUSTOM_SERVER=https://ecshopx-h5.ex-sandbox.com/ APP_HOME_PAGE=/pages/index APP_TRACK=youshu APP_YOUSHU_TOKEN=bi281e87ab2424481a -APP_ID={小程序APPID} -APP_MAP_KEY={高德地图key} +APP_ID=wx1e25e45145b70faa +APP_MAP_KEY=PSPBZ-KQ5CW-CSGRF-ON2S4-K2HQJ-XEBQG APP_MAP_NAME=oneX新零售门店定位 APP_IMAGE_CDN=https://b-img-cdn.yuanyuanke.cn/ecshopx-vshop -APP_DIANWU_URL= +APP_DIANWU_URL=https://demo-ecshopx-dianwu.shopex123.com APP_MERCHANT_URL= APP_ADAPAY= diff --git a/src/components/sp-checkbox/index.js b/src/components/sp-checkbox/index.js index c19df6951..8e20cca1e 100644 --- a/src/components/sp-checkbox/index.js +++ b/src/components/sp-checkbox/index.js @@ -27,21 +27,22 @@ function SpCheckboxNew(props) { checked = false, label, onChange = () => {}, - disabled = false + disabled = false, + canCancel = false } = props const [isChecked, setChecked] = useState(checked) const onChangeCheckbox = (e) => { e.stopPropagation() - if (disabled) return + if (disabled || canCancel) return setChecked(!isChecked) onChange && onChange(!isChecked) } useEffect(() => { setChecked(props.checked) - }, []) + }, [props.checked]) return ( {props.children} - - Powered by - - )} diff --git a/src/subpages/member/settings.jsx b/src/subpages/member/settings.jsx index 6ac42aff2..0fac7a6c1 100644 --- a/src/subpages/member/settings.jsx +++ b/src/subpages/member/settings.jsx @@ -101,6 +101,7 @@ const Settings = () => { { setState((draft) => { draft.selectLang = item.key