Merge branch 'develop' into test

src/app.tsx

@@ -32,7 +32,7 @@ class App extends Component {
       'pages/BarCode/BarCode',
       'pages/Announcement/Announcement',
       'pages/UserSetting/UserSetting',
-      'pages/PassWord/ResetPwd',
+      'pages/Password/ResetPwd',
       'pages/Register/Register',
       'pages/Login/Login',
       'pages/Feedback/Feedback',
@@ -44,9 +44,9 @@ class App extends Component {
       'pages/Shower/ShowerAppointment',
       'pages/WaterDispenser/WaterDispenser',
       'pages/Account/Account',
-      'pages/PassWord/ChangePwd',
-      'pages/PassWord/ChangeHardwareAccount',
-      'pages/PassWord/ChangeTelAccount',
+      'pages/Password/ChangePwd',
+      'pages/Password/ChangeHardwareAccount',
+      'pages/Password/ChangeTelAccount',
     ],
     window: {
       backgroundTextStyle: 'light',

src/pages/Login/Login.tsx

@@ -160,7 +160,7 @@ class Login extends Component {
           </View>
           <Navigator
             className='Login-regist-btn'
-            url='/pages/PassWord/ResetPwd'>
+            url='/pages/Password/ResetPwd'>
             忘记密码
           </Navigator>
         </View>

src/pages/PassWord/ChangePwd.tsx → src/pages/Password/ChangePwd.tsx

@@ -71,7 +71,7 @@ const ChangePwd = () => {
 
   const goResetpwd = () => {
     Taro.navigateTo({
-      url: '/pages/PassWord/ResetPwd',
+      url: '/pages/Password/ResetPwd',
     });
   };
 

src/pages/PassWord/ChangeTelAccount.tsx → src/pages/Password/ChangeTelAccount.tsx

@@ -21,7 +21,7 @@ const ChangeTelAccount = () => {
 
   const goResetpwd = () => {
     Taro.navigateTo({
-      url: '/pages/PassWord/ResetPwd',
+      url: '/pages/Password/ResetPwd',
     });
   };
   const changeAccountHandle = () => {

src/pages/UserSetting/CustomerSetting.tsx

@@ -3,8 +3,8 @@ import Taro from '@tarojs/taro';
 import { View, Text, Switch } from '@tarojs/components';
 import { useSelector } from '@tarojs/redux';
 import { Customer } from '@/types/Customer/Customer';
-import useAccountLogin from '../PassWord/useAccountLogin';
-import useBalanceState from '../PassWord/useBalanceState';
+import useAccountLogin from '../Password/useAccountLogin';
+import useBalanceState from '../Password/useBalanceState';
 
 const CustomerSetting = () => {
   const userinfo = useSelector(
@@ -13,19 +13,19 @@ const CustomerSetting = () => {
 
   const goChangePwd = () => {
     Taro.navigateTo({
-      url: '/pages/PassWord/ChangePwd',
+      url: '/pages/Password/ChangePwd',
     });
   };
 
   const goChangeAccount = () => {
     Taro.navigateTo({
-      url: '/pages/PassWord/ChangeHardwareAccount',
+      url: '/pages/Password/ChangeHardwareAccount',
     });
   };
 
   const goChangePhoneAccount = () => {
     Taro.navigateTo({
-      url: '/pages/PassWord/ChangeTelAccount',
+      url: '/pages/Password/ChangeTelAccount',
     });
   };