Merge branch 'feature/ECX-7502'

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}

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