unify-external-plugin-platform 0.0.2-60 → 0.0.2-62

package/dist/external-plugin.common.js

@@ -84755,6 +84755,32 @@ class JieYueService {
     console.log('读取二代身份证结果==>', IDCardData);
     return IDCardData;
   }
+  static async mergeImage(signImageBase64, fingerImageBase64) {
+    return new Promise((resolve, reject) => {
+      let canvas = document.createElement("canvas");
+      canvas.width = 600;
+      canvas.height = 360;
+      let context = canvas.getContext("2d");
+      context.rect(0, 0, canvas.width, canvas.height);
+      context.fillStyle = "#fff";
+      context.fill();
+      let signImage = new Image();
+      signImage.src = 'data:image/png;base64,' + signImageBase64; //背景图片 你自己本地的图片或者在线图片
+      signImage.crossOrigin = 'Anonymous';
+      signImage.onload = function () {
+        context.drawImage(signImage, 0, 0, 500, 360);
+        let fingerImage = new Image();
+        fingerImage.src = 'data:image/png;base64,' + fingerImageBase64; //你自己本地的图片或者在线图片
+        fingerImage.crossOrigin = 'Anonymous';
+        fingerImage.onload = function () {
+          context.drawImage(fingerImage, 320, 0, 256, 360);
+          let base64 = canvas.toDataURL("image/png"); //"image/png" 这里注意一下
+          base64 = base64.replace("data:image/png;base64,", "");
+          resolve(base64);
+        };
+      };
+    });
+  }
 }
 _defineProperty(JieYueService, "scannerCameraUrl", 'ws://127.0.0.1:1818');
 _defineProperty(JieYueService, "interactiveTerminalUrl", 'ws://127.0.0.1:1919');
@@ -85364,8 +85390,8 @@ id_card_reader_eloam.install = Vue => {
   Vue.component(id_card_reader_eloam.name, id_card_reader_eloam);
 };
 /* harmony default export */ var id_card_reader_id_card_reader_eloam = (id_card_reader_eloam);
-;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/id-card-reader/id-card-reader-button/src/id-card-reader-button.vue?vue&type=template&id=5ba8415b&scoped=true&
-var id_card_reader_buttonvue_type_template_id_5ba8415b_scoped_true_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[4]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/id-card-reader/id-card-reader-button/src/id-card-reader-button.vue?vue&type=template&id=5b90b226&scoped=true&
+var id_card_reader_buttonvue_type_template_id_5b90b226_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _vm.tip ? _c('el-tooltip', {
@@ -85398,7 +85424,16 @@ var id_card_reader_buttonvue_type_template_id_5ba8415b_scoped_true_render = func
     class: _vm._className
   }, false), [_vm._t("default", function () {
     return [_vm._v(_vm._s(_vm.label))];
-  })], 2)], 1) : _c('el-button', _vm._b({
+  })], 2), _c('canvas', {
+    staticStyle: {
+      "display": "none"
+    },
+    attrs: {
+      "id": "canvas",
+      "width": "500",
+      "height": "360"
+    }
+  })], 1) : _c('el-button', _vm._b({
     on: {
       "click": _vm.handleClick
     }
@@ -85422,9 +85457,18 @@ var id_card_reader_buttonvue_type_template_id_5ba8415b_scoped_true_render = func
     }
   }) : _vm._e(), _vm._t("default", function () {
     return [_vm._v(_vm._s(_vm.label))];
+  }), _c('canvas', {
+    staticStyle: {
+      "display": "none"
+    },
+    attrs: {
+      "id": "canvas",
+      "width": "500",
+      "height": "360"
+    }
   })], 2);
 };
-var id_card_reader_buttonvue_type_template_id_5ba8415b_scoped_true_staticRenderFns = [];
+var id_card_reader_buttonvue_type_template_id_5b90b226_scoped_true_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./packages/service/external-plugins/default-plugin-socket.service.ts
 
@@ -87446,8 +87490,20 @@ var default_take_photo_dialog_component = normalizeComponent(
           const SignNameBase64 = data.SignNameBase64 ? JSON.parse(data.SignNameBase64) : {
             SignName0: ''
           };
+          const FingerPrintBase64 = data.FingerPrintBase64 ? JSON.parse(data.FingerPrintBase64) : {
+            FingerPrint0: ''
+          };
           const SignName0 = SignNameBase64.SignName0.split(';')[0];
-          userSignature = SignName0;
+          const FingerPrint0 = FingerPrintBase64.FingerPrint0.split(';')[0];
+          console.log('签字&指纹', SignName0, FingerPrint0);
+          // 将SignName0和FingerPrint0这两张图片合并成一张图片
+          if (FingerPrint0) {
+            // 签名指纹都有
+            userSignature = await JieYueService.mergeImage(SignName0, FingerPrint0);
+            console.log(userSignature);
+          } else {
+            userSignature = SignName0;
+          }
           break;
       }
       // 返回base64编码内容，无前缀
@@ -87552,11 +87608,11 @@ var default_take_photo_dialog_component = normalizeComponent(
 ;
 var id_card_reader_button_component = normalizeComponent(
   src_id_card_reader_buttonvue_type_script_lang_js_,
-  id_card_reader_buttonvue_type_template_id_5ba8415b_scoped_true_render,
-  id_card_reader_buttonvue_type_template_id_5ba8415b_scoped_true_staticRenderFns,
+  id_card_reader_buttonvue_type_template_id_5b90b226_scoped_true_render,
+  id_card_reader_buttonvue_type_template_id_5b90b226_scoped_true_staticRenderFns,
   false,
   null,
-  "5ba8415b",
+  "5b90b226",
   null
   
 )