diff --git a/app/pages/collectCode/signature/protocol/index.vue b/app/pages/collectCode/signature/protocol/index.vue
index 8f87bfe..277398b 100644
--- a/app/pages/collectCode/signature/protocol/index.vue
+++ b/app/pages/collectCode/signature/protocol/index.vue
@@ -4,22 +4,14 @@ import { contractView, signOffline } from "~/api/goods/index.js"
 import { codeAuthStore } from "~/stores-collect-code/auth/index.js"
 import { useI18n } from "vue-i18n"
 import { fddInfo } from "@/api-collect-code/goods/index.js"
-<<<<<<< HEAD
-
-=======
 import { showLoadingToast } from 'vant';
->>>>>>> xingyy
 definePageMeta({
   i18n: 'signature.protocol.title'
 })
 
 const { t } = useI18n()
 const { formData, number, qrData } = codeAuthStore() 
-<<<<<<< HEAD
-const activeNames = ref([])
-=======
 const activeNames = ref('')
->>>>>>> xingyy
 const router = useRouter()
 const pmblUrl = ref('') 
 
@@ -82,14 +74,11 @@ const handleCollapseChange = (name) => {
  *      - 其他用户: 走非大陆签署流程
  */
 const confirm = async () => {
-<<<<<<< HEAD
-=======
 const toast=  showLoadingToast({
   message: '加载中...',
   forbidClick: true,
 });
 
->>>>>>> xingyy
   try {
     const fddResponse = await fddInfo({ phone: formData.value.phone })
     
@@ -116,11 +105,8 @@ const toast=  showLoadingToast({
     }
   } catch (error) {
     console.error('签署确认失败:', error)
-<<<<<<< HEAD
-=======
   }finally{
     toast.close();
->>>>>>> xingyy
   }
 }