订单取消的状态和退款的状态不显示倒计时

src/api/user.ts

@@ -180,4 +180,4 @@ export function updateUserAddressLocation(id: number) {
  */
 export function getUserAddressInfo(id: number) {
     return http.Post<any>('/teamapi/user/addressDetails', { id })
-}
+}

src/bundle/parten/pages/bank-card/add.vue

@@ -195,9 +195,9 @@
 
             await getVerificationCode({ scene: SMS_ENUM.BANK, mobile: String(form.mobile) })
             startCountDown.value = true
-            nextTick(() => {
+            setTimeout(() => {
-                countDown.value?.start()
+                countDown.value.start()
-            })
+            }, 100)
         },
 
         /**

src/bundle/profile/change-mobile.vue

@@ -149,14 +149,12 @@
                 return
             }
 
-            await getVerificationCode({ scene: SMS_ENUM.BGSJHM, mobile: String(model.mobile)})
+            await getVerificationCode({ scene: SMS_ENUM.BANK, mobile: String(model.mobile)})
 
             startCountDown.value = true
-            nextTick(() => {
+            setTimeout(() => {
-                countDown.value?.start()
+                countDown.value.start()
-
+            }, 100)
-                // 发送验证码请求
-            })
         },
 
         // 验证码倒计时结束

src/bundle/profile/change-password.vue

@@ -122,14 +122,12 @@
                 return
             }
 
-            await getVerificationCode({ scene: SMS_ENUM.ZHDLMM, mobile: String(model.mobile)})
+            await getVerificationCode({ scene: SMS_ENUM.BANK, mobile: String(model.mobile)})
 
             startCountDown.value = true
-            nextTick(() => {
+            setTimeout(() => {
-                countDown.value?.start()
+                countDown.value.start()
-
+            }, 100)
-                // 发送验证码请求
-            })
         },
 
         // 验证码倒计时结束

src/bundle/settle-in/parten.vue

@@ -184,11 +184,9 @@
         // 发送验证码
         handleCountDown: () => {
             startCountDown.value = true
-            nextTick(() => {
+            setTimeout(() => {
-                countDown.value?.start()
+                countDown.value.start()
-
+            }, 100)
-                // 发送验证码请求
-            })
         },
 
         // 验证码倒计时结束

src/bundle/settle-in/tea-room.vue

@@ -232,11 +232,9 @@
         // 发送验证码
         handleCountDown: () => {
             startCountDown.value = true
-            nextTick(() => {
+            setTimeout(() => {
-                countDown.value?.start()
+                countDown.value.start()
-
+            }, 100)
-                // 发送验证码请求
-            })
         },
 
         // 验证码倒计时结束

src/bundle/settle-in/tea-specialist.vue

@@ -338,11 +338,9 @@
         // 发送验证码
         handleCountDown: () => {
             startCountDown.value = true
-            nextTick(() => {
+            setTimeout(() => {
-                countDown.value?.start()
+                countDown.value.start()
-
+            }, 100)
-                // 发送验证码请求
-            })
         },
 
         // 验证码倒计时结束

src/pages/login/login.vue

@@ -76,7 +76,7 @@
         mobile: string
         passowrd: string
     }>({
-        mobile: '', // 13011223344
+        mobile: '', // 12322222222
         passowrd: ''
     })
 

src/pages/login/mobile.vue

@@ -149,11 +149,9 @@
             }
 
             startCountDown.value = true
-            nextTick(() => {
+            setTimeout(() => {
-                countDown.value?.start()
+                countDown.value.start()
-
+            }, 100)
-                // 发送验证码请求
-            })
         },
 
         // 验证码倒计时结束

src/pages/login/password.vue

@@ -80,6 +80,8 @@
     import {mobile as testMobile} from '@/utils/test'
     import { useToast  } from 'wot-design-uni'
     import { router } from '@/utils/tools'
+    import { getVerificationCode } from '@/api/user'
+    import { SMS_ENUM } from '@/enum/sms'
 
 	const OSS = inject('OSS')
     const toast = useToast()
@@ -130,7 +132,7 @@
         /**
          * 发送验证码
          */
-        handleCountDown: () => {
+        handleCountDown: async () => {
             if (disabled.value) {
                 toast.show({
                     iconClass: 'info-circle',
@@ -140,12 +142,12 @@
                 return
             }
 
-            startCountDown.value = true
+            await getVerificationCode({ scene: SMS_ENUM.BANK, mobile: String(model.mobile) })
-            nextTick(() => {
-                countDown.value?.start()
 
-                // 发送验证码请求
+            startCountDown.value = true
-            })
+            setTimeout(() => {
+                countDown.value.start()
+            }, 100)
         },
 
         /**
@@ -176,7 +178,7 @@
                 return
             }
 
-            router.navigateTo(`/pages/login/set-password?type=${pageType}&mobile=${model.mobile}&userId=${userId.value}`)
+            router.navigateTo(`/pages/login/set-password?type=${pageType}&mobile=${model.mobile}&code=${model.code}&userId=${userId.value}`)
         },
 
         // 获取手机号

src/pages/login/set-password.vue

@@ -48,7 +48,7 @@
             </wd-form>
         </view>
 
-        <view class="h-90rpx leading-90rpx mx-60rpx rounded-8rpx text-center mt-112rpx bg-[#4C9F44] text-[#fff]" :class="disabled ? 'opacity-40' : ''" @click="Mobile.handleToLogin">确定</view>
+        <view class="h-90rpx leading-90rpx mx-60rpx rounded-8rpx text-center mt-112rpx bg-[#4C9F44] text-[#fff]" @click="SetPassword.handleToConfirm">确定</view>
 
         <!-- 手机号修改成功 -->
         <wd-popup v-model="showEditSuccessPopup" lock-scroll custom-style="border-radius: 32rpx 32rpx 0rpx 0rpx;" position="bottom">
@@ -87,27 +87,31 @@
         password_confirm: ''
     })
 
+    // 手机和验证码
+    const mobile = ref<string>('')
+    const code = ref<string>('')
 
     onLoad((args) => {
-
+        mobile.value = args.mobile || ''
+        code.value = args.code || ''
     })
 
-    const Mobile = {
+    const SetPassword = {
         // 重置密码
-        handleToLogin: async () => {
+        handleToConfirm: async () => {
-            if (!mobile(model.value.mobile)) {
+            if (!mobile) {
                 toast.show({
                     iconClass: 'info-circle',
-                    msg: '手机号码错误请重新输入',
+                    msg: '手机号异常，请重新操作',
                     direction: 'vertical'
                 })
                 return
             }
 
-            if (!model.value.code) {
+            if (!code) {
                 toast.show({
                     iconClass: 'info-circle',
-                    msg: '验证码不存在',
+                    msg: '验证码异常，请重新操作',
                     direction: 'vertical'
                 })
                 return
@@ -132,8 +136,8 @@
             }
 
             const res = await resetPassword({
-                mobile: model.value.mobile,
+                mobile: mobile.value,
-                code: model.value.code,
+                code: code.value,
                 password: model.value.password,
                 password_confirm: model.value.password_confirm
             })

src/pages/order/order.vue

@@ -52,7 +52,7 @@
 							<view class="order-status" :class="Order.handleGetStatusClass(order.order_status)">
 								{{ TeaSpecialistManageStatusTextValue[order.order_status].title }}
 							</view>
-							<view class="mt-4rpx" v-if="order.timekeeping > 0 && (order.order_status != TeaSpecialistOrderStatus.Cancelled && order.order_status != TeaSpecialistOrderStatus.SpecialistRefund && order.order_status != TeaSpecialistOrderStatus.CustomerRefundBeforeAccept && order.order_status != TeaSpecialistOrderStatus.CustomerRefundAfterDepart && order.order_status != TeaSpecialistOrderStatus.CustomerRefundAfterArrive)">
+							<view class="mt-4rpx" v-if="order.timekeeping > 0 && (order.order_status != TeaSpecialistOrderStatus.Completed && order.order_status != TeaSpecialistOrderStatus.Cancelled && order.order_status != TeaSpecialistOrderStatus.SpecialistRefund && order.order_status != TeaSpecialistOrderStatus.CustomerRefundBeforeAccept && order.order_status != TeaSpecialistOrderStatus.CustomerRefundAfterDepart && order.order_status != TeaSpecialistOrderStatus.CustomerRefundAfterArrive)">
 								<wd-count-down :time="Number(order.timekeeping) * 1000" custom-class="!text-[#FF5951]"	/>
 							</view>
 						</view>