Merge branch 'develop' into test

src/pages/Shower/ShowerAppointment.tsx

@@ -88,7 +88,6 @@ function ShowerAppointment() {
             }, intervalTime);
           } else {
             setLoopResultState(false);
-            setRecordId(0);
             if (res.data === AppointResultRes.appointFail) {
               Taro.showToast({
                 title: res.msg || '预约失败',
@@ -119,6 +118,12 @@ function ShowerAppointment() {
   };
 
   useEffect(() => {
+    if (recordId && showState === 2) {
+      resetRecordList();
+      setRecordId(0);
+    }
+  }, [recordId, showState]);
+  useEffect(() => {
     let timer: NodeJS.Timeout | null = null;
     if (recordId) {
       setLoopResultState(true);