Merge branch 'xingyy' into dev

# Conflicts:
#	app/pages/login/index.vue

app/pages/login/index.vue

@@ -110,6 +110,20 @@ loadingRef.value.loading1=true
     isShow.value=true
     loadingRef.value.loading1=false
   }
+//   loadingRef.value.loading1=true
+//  const res=await senCode({
+//    telNum:phoneNum.value,
+//    zone:selectedZone.value
+//  })
+//   loadingRef.value.loading1=false
+//   if (res.status===0){
+
+
+//   }
+//   pane.value = 1
+//   vanSwipeRef.value?.swipeTo(pane.value)
+ 
+//   startCountdown();
 }
 const goBack = () => {
   code.value = ''
@@ -163,7 +177,13 @@ onUnmounted(() => {
   window.removeEventListener('resize', () => {})
 })
 const isShow=ref(false)
-
+const onSuccess=()=>{
+  // userCaptchaValidate()
+  isShow.value=false
+}
+const onClose=()=>{
+  isShow.value=false
+}
 const onLeave =async (moveX, callback) => {
    loadingRef.value.loading1=true
  const res=await senCode({
@@ -178,7 +198,7 @@ const onLeave =async (moveX, callback) => {
   if (res.status===408){
   callback(false)
   getCode()
-  }else if([407,0].includes(res.status)){
+  }else{
     callback(true)
     setTimeout(() => {
         pane.value = 1
@@ -187,11 +207,6 @@ const onLeave =async (moveX, callback) => {
   isShow.value=false
     }, 1000)
 
-  }else{
-    setTimeout(() => {
-       
-  isShow.value=false
-    }, 1000)
   }
  
 
@@ -273,7 +288,7 @@ const onLeave =async (moveX, callback) => {
     </div>
     <van-popup v-model:show="isShow" round   teleport="body">
       <PuzzleComponent
-      v-if="isShow"
+          v-if="isShow"
       :options="captcha"
       @leave="onLeave"
     />