Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev

src/components/Verifition/src/Verify/VerifySlide.vue

@@ -277,7 +277,7 @@ const end = () => {
   endMovetime.value = +new Date()
   endMovetime.value = +new Date()
   //判断是否重合
   //判断是否重合
   if (status.value && isEnd.value == false) {
   if (status.value && isEnd.value == false) {
-    var moveLeftDistance = parseInt((moveBlockLeft.value || '').replace('px', ''))
+    var moveLeftDistance = parseInt((moveBlockLeft.value || '0').replace('px', ''))
     moveLeftDistance = (moveLeftDistance * 310) / parseInt(setSize.imgWidth)
     moveLeftDistance = (moveLeftDistance * 310) / parseInt(setSize.imgWidth)
     let data = {
     let data = {
       captchaType: captchaType.value,
       captchaType: captchaType.value,

src/views/Profile/components/UserSocial.vue

@@ -66,7 +66,6 @@ const bindSocial = () => {
   socialBind(type, code, state).then(() => {
   socialBind(type, code, state).then(() => {
     message.success('绑定成功')
     message.success('绑定成功')
     emit('update:activeName', 'userSocial')
     emit('update:activeName', 'userSocial')
-    initSocial()
   })
   })
 }
 }