Merge branch 'develop' into test

src/pages/Order/components/OrderTitle/OrderTitle.tsx

@@ -17,10 +17,10 @@ class OrderTitle extends Component {
     const { price } = this.props;
     return (
       <View className='OrderTitle'>
-        <View className='OrderTitle-name'>
+        {/* <View className='OrderTitle-name'>
           <Image className='OrderTitle-icon' src={comLogo} />
           <Text>成都多彩任意门科技有限公司</Text>
-        </View>
+        </View> */}
         <View className='OrderTitle-price'>-{price ? price : ''}</View>
       </View>
     );

src/pages/Shower/ShowerAppointment.tsx

@@ -18,6 +18,7 @@ import useAppointRecordsList from './hooks/useAppointRecordsList';
 import useCheckAppointable from './hooks/useCheckAppointable';
 import { ShowerState } from '@/store/rootReducers/shower';
 import AppBackButton from '@/components/AppBackButton/AppBackButton';
+import WaitPayOrderComponent from '@/components/WaitPayOrder/WaitPayOrder';
 
 function ShowerAppointment() {
   const userInfo = useSelector(
@@ -201,6 +202,7 @@ function ShowerAppointment() {
   return (
     <View className='ShowerAppointment'>
       <AppBackButton />
+      <WaitPayOrderComponent />
       {showState == 1 && (
         <View className='ShowerAppointment-Searchbox'>
           <Input