From 890febc29970a1fd675081f417d38a6b1fded1c2 Mon Sep 17 00:00:00 2001
From: zhangjing1 <zhangjing@shopex.cn>
Date: Tue, 2 Dec 2025 10:29:22 +0800
Subject: [PATCH 1/2] fix: ECX-7502

---
 .env                                          | 27 +++++++++----------
 .../auth/comps/comp-password-input.js         |  3 +--
 src/subpages/auth/edit-password.js            |  3 +--
 3 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/.env b/.env
index 228da808c..d2b0055cb 100644
--- a/.env
+++ b/.env
@@ -1,16 +1,15 @@
-APP_BASE_URL=
-APP_WEBSOCKET=
-APP_COMPANY_ID=
-APP_PLATFORM=
-APP_CUSTOM_SERVER=
-APP_HOME_PAGE=
-APP_TRACK=
-APP_YOUSHU_TOKEN=
-APP_ID=
-APP_MAP_KEY=
-APP_MAP_NAME=
-APP_IMAGE_CDN=
-APP_DIANWU_URL=
+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=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=https://demo-ecshopx-dianwu.shopex123.com
 APP_MERCHANT_URL=
 APP_ADAPAY=
-
diff --git a/src/subpages/auth/comps/comp-password-input.js b/src/subpages/auth/comps/comp-password-input.js
index 9f8d67802..33360fb7c 100644
--- a/src/subpages/auth/comps/comp-password-input.js
+++ b/src/subpages/auth/comps/comp-password-input.js
@@ -8,7 +8,6 @@ import { View, Text } from '@tarojs/components'
 import { classNames } from '@/utils'
 import { useImmer } from 'use-immer'
 import { SpInput as AtInput } from '@/components'
-import { PASSWORD_TIP } from '../const'
 import './comp-password-input.scss'
 
 const initialValue = {
@@ -34,7 +33,7 @@ const CompPasswordInput = (props) => {
       <AtInput
         clear
         type={type}
-        placeholder={PASSWORD_TIP()}
+        placeholder='密码需由6-16位数字或字母组成'
         placeholderClass='input-placeholder'
         onChange={onChange}
         onFocus={onFocus}
diff --git a/src/subpages/auth/edit-password.js b/src/subpages/auth/edit-password.js
index ee813b97e..96fde98c9 100644
--- a/src/subpages/auth/edit-password.js
+++ b/src/subpages/auth/edit-password.js
@@ -12,7 +12,6 @@ import api from '@/api'
 import { useLogin } from '@/hooks'
 import { useImmer } from 'use-immer'
 import { setTokenAndRedirect, getToken, pushHistory, clearHistory } from './util'
-import { PASSWORD_TIP } from './const'
 import './edit-password.scss'
 
 const SYMBOL = 'login'
@@ -104,7 +103,7 @@ const PageEditPassword = () => {
               onChange={handleInputChange('repassword')}
             />
           </View>
-          <View className='form-tip'>{PASSWORD_TIP()}</View>
+          <View className='form-tip'>密码需由6-16位数字或字母组成</View>
 
           <View className='form-submit'>
             <AtButton

From d5e39563fe4279990cffe771ad99523bae02ed18 Mon Sep 17 00:00:00 2001
From: zhangjing1 <zhangjing@shopex.cn>
Date: Tue, 2 Dec 2025 10:29:47 +0800
Subject: [PATCH 2/2] fix: ECX-7502

---
 .env | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/.env b/.env
index d2b0055cb..228da808c 100644
--- a/.env
+++ b/.env
@@ -1,15 +1,16 @@
-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=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=https://demo-ecshopx-dianwu.shopex123.com
+APP_BASE_URL=
+APP_WEBSOCKET=
+APP_COMPANY_ID=
+APP_PLATFORM=
+APP_CUSTOM_SERVER=
+APP_HOME_PAGE=
+APP_TRACK=
+APP_YOUSHU_TOKEN=
+APP_ID=
+APP_MAP_KEY=
+APP_MAP_NAME=
+APP_IMAGE_CDN=
+APP_DIANWU_URL=
 APP_MERCHANT_URL=
 APP_ADAPAY=
+