From 01e6f99e9021ed3d37f8e2ed6db9e24f1ef9ec0f Mon Sep 17 00:00:00 2001
From: xingyy <64720302+Concur-max@users.noreply.github.com>
Date: Wed, 19 Feb 2025 18:19:57 +0800
Subject: [PATCH] =?UTF-8?q?feat(collectCode):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=AD=BE=E5=90=8D=E5=8A=9F=E8=83=BD=E5=B9=B6=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E7=AD=BE=E7=BD=B2=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 app/config/index.js 中添加新的路由名称
- 实现签名面板组件，支持签名、清空和确认功能
- 优化个人资料页面，支持国内外签署流程
- 更新签署协议页面，增加直接签署功能- 引入 vue-signature-pad 依赖
---
 app/config/index.js                           |   2 +-
 .../collectCode/signature/panel/index.vue     | 103 +++++++++++++++++-
 .../signature/personal-Info/index.vue         |  38 ++++---
 .../collectCode/signature/protocol/index.vue  |  23 ++--
 app/pages/signature/protocol/index.vue        |   5 +-
 package.json                                  |   3 +-
 pnpm-lock.yaml                                |  25 +++++
 7 files changed, 167 insertions(+), 32 deletions(-)

diff --git a/app/config/index.js b/app/config/index.js
index a14a5ce..a7a8a50 100644
--- a/app/config/index.js
+++ b/app/config/index.js
@@ -1,3 +1,3 @@
 
 export const useAppFooterRouteNames= ['index', 'profile']
-export const useAppHeaderRouteNames= ['index', 'profile','login','collectCode-login','collectCode-mine','payment-result']
+export const useAppHeaderRouteNames= ['index', 'profile','login','collectCode-login','collectCode-mine','payment-result','collectCode-signature-personal-Info']
diff --git a/app/pages/collectCode/signature/panel/index.vue b/app/pages/collectCode/signature/panel/index.vue
index c3f7297..33ebb19 100644
--- a/app/pages/collectCode/signature/panel/index.vue
+++ b/app/pages/collectCode/signature/panel/index.vue
@@ -1,18 +1,109 @@
 <script setup>
-const image = ref('');
+import { VueSignaturePad } from 'vue-signature-pad';
 import { showToast } from 'vant';
+import { onMounted } from 'vue';
+import {codeAuthStore} from "~/stores-collect-code/auth/index.js";
+import {signOffline} from "~/api/goods/index.js";
+const {formData,number}=codeAuthStore()
+const signaturePad = ref(null);
+definePageMeta({
+  layout: ''
+});
+const router = useRouter();
+const imgUrl = ref('');
+const show = ref(false);
 
-const onSubmit = (data) => {
-  image.value = data.image;
+
+
+const goBack = () => {
+  router.back()
+  // 返回逻辑
 };
-const onClear = () => showToast('clear');
+
+const submitSignature = () => {
+  if (signaturePad.value?.isEmpty()) {
+    showToast('请先签名');
+    return;
+  }
+  const { data } = signaturePad.value?.saveSignature(); // 返回 base64 格式的图片数据
+  imgUrl.value = data;
+  show.value = true;
+};
+
+const clearSignature = () => {
+  signaturePad.value?.clearSignature();
+};
+const confirm=async ()=>{
+  const res=await signOffline({
+    userInfo:formData.value,
+    signOrder:Number(number.value),
+    signImgFileData:imgUrl.value
+  })
+  if (res.status===0){
+router.push('/collectCode/signature/result')
+  }
+}
 </script>
 
 <template>
-  <van-signature @submit="onSubmit" @clear="onClear" />
-  <van-image v-if="image" :src="image" />
+  <div class="signature-container">
+    <div class="flex flex-col h-100vh px-20px py-20px bg-gray">
+      <VueSignaturePad
+          width="100%"
+          class="signature bg-#fff rounded-10px mb-10px"
+          ref="signaturePad"
+      />
+      <div class="flex justify-evenly">
+        <van-button class="!h-40px mr-15px" type="primary" @click="goBack">
+          返回
+        </van-button>
+        <van-button class="!h-40px" type="warning" @click="clearSignature">
+          清空
+        </van-button>
+        <van-button class="!h-40px" type="primary" @click="submitSignature">
+          确认
+        </van-button>
+      </div>
+      <van-dialog v-model:show="show" show-cancel-button @confirm="confirm">
+        <img class="w-300px h-200px" :src="imgUrl" />
+      </van-dialog>
+    </div>
+  </div>
 </template>
 
 <style scoped>
+.signature-container {
+  width: 100%;
+  height: 100vh;
+  /* 强制竖屏显示 */
+  view-transition: none;
+  transform: rotate(0deg) !important;
+}
 
+:deep(.signature>canvas) {
+  height: 100%;
+}
+
+/* 横屏适配 */
+@media screen and (orientation: landscape) {
+  .signature-container {
+    /* 在横屏时保持竖屏宽度 */
+    max-width: 100vh;
+    margin: 0 auto;
+  }
+
+  .flex {
+    /* 确保在横屏时内容不会过宽 */
+    max-width: 100vh;
+    margin: 0 auto;
+  }
+}
+
+/* 确保签名板在各种屏幕尺寸下都能正常显示 */
+.signature {
+  flex: 1;
+  min-height: 60vh;
+  display: flex;
+  flex-direction: column;
+}
 </style>
\ No newline at end of file
diff --git a/app/pages/collectCode/signature/personal-Info/index.vue b/app/pages/collectCode/signature/personal-Info/index.vue
index a551fd6..952b086 100644
--- a/app/pages/collectCode/signature/personal-Info/index.vue
+++ b/app/pages/collectCode/signature/personal-Info/index.vue
@@ -58,22 +58,30 @@ const nextClick=async ()=>{
     message.warning('请填写完整信息')
     return
   }
- const res=await fddInfo({
-   phone:formData.value.phone
- })
-  if (res.status===0){
-if (res.data.status===2){
-  router.push('/collectCode/signature/protocol')
-}else {
-  const res1=await signOffline({
-    userInfo:formData.value,
-    signOrder:Number(number.value),
-  })
-  if (res1.status===0){
-    window.location.href=res1.data.fddVerifyUrl
-  }
-}
+  //国内签署要用法大大
+  if (formData.value.countryCode==='86'&&formData.value.cardType===1){
+    const res=await fddInfo({
+      phone:formData.value.phone
+    })
+    if (res.status===0){
+      if (res.data.status===2){
+        router.push('/collectCode/signature/protocol')
+      }else {
+        const res1=await signOffline({
+          userInfo:formData.value,
+          signOrder:Number(number.value),
+        })
+        if (res1.status===0){
+          window.location.href=res1.data.fddVerifyUrl
+        }
+
+      }
+    }
+    //国外签署直接去确认然后签字版
+  }else {
+    router.push('/collectCode/signature/protocol')
   }
+
   //
 /*  if (formData.value.countryCode==='86'&&formData.value.cardType===1){
 
diff --git a/app/pages/collectCode/signature/protocol/index.vue b/app/pages/collectCode/signature/protocol/index.vue
index 3c044a6..28d0723 100644
--- a/app/pages/collectCode/signature/protocol/index.vue
+++ b/app/pages/collectCode/signature/protocol/index.vue
@@ -1,19 +1,26 @@
 <script setup>
 import {codeAuthStore} from "~/stores-collect-code/auth/index.js";
 import {signOffline} from "~/api/goods/index.js";
-const show=ref(true)
+import {useRouter} from "#vue-router";
+const router = useRouter();
+definePageMeta({
+title:'签署'
+})
 const activeNames = ref(['1']);
 const {formData,number}=codeAuthStore()
 const confirm=async ()=>{
   if (formData.value.countryCode==='86'&&formData.value.cardType===1){
+    const res=await signOffline({
+      userInfo:formData.value,
+      signOrder:Number(number.value),
+    })
+    if (res.status===0){
+      window.location.href=res.data.fddVerifyUrl
+    }
+  }else {
+    router.push('/collectCode/signature/panel')
   }
- const res=await signOffline({
-    userInfo:formData.value,
-    signOrder:Number(number.value),
-  })
-  if (res.status===0){
-    window.location.href=res.data.fddVerifyUrl
-  }
+
 }
 </script>
 
diff --git a/app/pages/signature/protocol/index.vue b/app/pages/signature/protocol/index.vue
index 95c9583..fb0ba2c 100644
--- a/app/pages/signature/protocol/index.vue
+++ b/app/pages/signature/protocol/index.vue
@@ -1,9 +1,12 @@
 <script setup>
-const activeNames = ref(['1']);
+import {codeAuthStore} from "~/stores-collect-code/auth/index.js";
+
 definePageMeta({
   layout: 'default',
   title: '签署内容'
 })
+
+const activeNames = ref(['1']);
 const router = useRouter();
 const goSignature=()=>{
   router.push({
diff --git a/package.json b/package.json
index 58d0ef5..89247a3 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,8 @@
     "tslib": "^2.6.0",
     "vconsole": "^3.15.1",
     "vue": "^3.5.13",
-    "vue-router": "^4.5.0"
+    "vue-router": "^4.5.0",
+    "vue-signature-pad": "^3.0.2"
   },
   "devDependencies": {
     "@iconify-json/carbon": "^1.2.5",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 5aeab94..8b1fda1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -62,6 +62,9 @@ importers:
       vue-router:
         specifier: ^4.5.0
         version: 4.5.0(vue@3.5.13(typescript@5.7.3))
+      vue-signature-pad:
+        specifier: ^3.0.2
+        version: 3.0.2(vue@3.5.13(typescript@5.7.3))
     devDependencies:
       '@iconify-json/carbon':
         specifier: ^1.2.5
@@ -2994,6 +2997,9 @@ packages:
   mdn-data@2.12.2:
     resolution: {integrity: sha512-IEn+pegP1aManZuckezWCO+XZQDplx1366JoVhTpMpBB1sPey/SbveZQUosKiKiGYjg1wH4pMlNgXbCiYgihQA==}
 
+  merge-images@1.2.0:
+    resolution: {integrity: sha512-hEGvgnTdXr08uzGvEArxRsKpy7WmozM73YaSi4s5IYF4LxrhANpqfHaz9CgBZ5+0+s2NsjPnPdStz3aCc0Yulw==}
+
   merge-stream@2.0.0:
     resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==}
 
@@ -3833,6 +3839,9 @@ packages:
     resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==}
     engines: {node: '>=14'}
 
+  signature_pad@3.0.0-beta.4:
+    resolution: {integrity: sha512-cOf2NhVuTiuNqe2X/ycEmizvCDXk0DoemhsEpnkcGnA4kS5iJYTCqZ9As7tFBbsch45Q1EdX61833+6sjJ8rrw==}
+
   simple-git@3.27.0:
     resolution: {integrity: sha512-ivHoFS9Yi9GY49ogc6/YAi3Fl9ROnF4VyubNylgCkA+RVqLaKWnDSzXOVzya8csELIaWaYNutsEuAhZrtOjozA==}
 
@@ -4434,6 +4443,12 @@ packages:
     peerDependencies:
       vue: ^3.2.0
 
+  vue-signature-pad@3.0.2:
+    resolution: {integrity: sha512-o25o+lROfCmzASS2+fU8ZV801kV+D4/02zkZ+ez3NKeiUmbxW7kwlUf5oKQkvA+l7Ou9xGsGLsirBLch3jyX8A==}
+    engines: {node: '>=12'}
+    peerDependencies:
+      vue: ^3.2.0
+
   vue@3.5.13:
     resolution: {integrity: sha512-wmeiSMxkZCSc+PM2w2VRsOYAZC8GdipNFRTsLSfodVqI9mbejKeXEGr8SckuLnrQPGe3oJN5c3K0vpoU9q/wCQ==}
     peerDependencies:
@@ -7848,6 +7863,8 @@ snapshots:
 
   mdn-data@2.12.2: {}
 
+  merge-images@1.2.0: {}
+
   merge-stream@2.0.0: {}
 
   merge2@1.4.1: {}
@@ -8882,6 +8899,8 @@ snapshots:
 
   signal-exit@4.1.0: {}
 
+  signature_pad@3.0.0-beta.4: {}
+
   simple-git@3.27.0:
     dependencies:
       '@kwsites/file-exists': 1.1.1
@@ -9554,6 +9573,12 @@ snapshots:
       '@vue/devtools-api': 6.6.4
       vue: 3.5.13(typescript@5.7.3)
 
+  vue-signature-pad@3.0.2(vue@3.5.13(typescript@5.7.3)):
+    dependencies:
+      merge-images: 1.2.0
+      signature_pad: 3.0.0-beta.4
+      vue: 3.5.13(typescript@5.7.3)
+
   vue@3.5.13(typescript@5.7.3):
     dependencies:
       '@vue/compiler-dom': 3.5.13