@toolspack/ttd-common 0.4.6 → 0.4.8

package/lib/ttd-common.common.js

@@ -158,17 +158,6 @@ exports.f = DESCRIPTORS ? nativeGetOwnPropertyDescriptor : function getOwnProper
 };
 
 
-/***/ }),
-
-/***/ "073f":
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony import */ var _node_modules_vue_style_loader_index_js_ref_10_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_3_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_4_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_WzhSign_vue_vue_type_style_index_0_id_26b63af1_lang_less_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("c532");
-/* harmony import */ var _node_modules_vue_style_loader_index_js_ref_10_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_3_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_4_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_WzhSign_vue_vue_type_style_index_0_id_26b63af1_lang_less_scoped_true___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_vue_style_loader_index_js_ref_10_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_3_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_4_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_WzhSign_vue_vue_type_style_index_0_id_26b63af1_lang_less_scoped_true___WEBPACK_IMPORTED_MODULE_0__);
-/* unused harmony reexport * */
-
-
 /***/ }),
 
 /***/ "0cb2":
@@ -860,6 +849,20 @@ if (v8) {
 module.exports = version && +version;
 
 
+/***/ }),
+
+/***/ "2e16":
+/***/ (function(module, exports, __webpack_require__) {
+
+// Imports
+var ___CSS_LOADER_API_IMPORT___ = __webpack_require__("24fb");
+exports = ___CSS_LOADER_API_IMPORT___(false);
+// Module
+exports.push([module.i, ".CryptoAgent-wrapper[data-v-cac4c7fc]{height:0;width:0;position:absolute;left:-5000px}", ""]);
+// Exports
+module.exports = exports;
+
+
 /***/ }),
 
 /***/ "342f":
@@ -1634,16 +1637,13 @@ module.exports = classof(global.process) == 'process';
 
 /***/ }),
 
-/***/ "61a6":
-/***/ (function(module, exports, __webpack_require__) {
+/***/ "6187":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-// Imports
-var ___CSS_LOADER_API_IMPORT___ = __webpack_require__("24fb");
-exports = ___CSS_LOADER_API_IMPORT___(false);
-// Module
-exports.push([module.i, ".CryptoAgent-wrapper[data-v-26b63af1]{height:0;width:0;position:absoute;left:-5000px}", ""]);
-// Exports
-module.exports = exports;
+"use strict";
+/* harmony import */ var _node_modules_vue_style_loader_index_js_ref_10_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_3_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_4_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_WzhSign_vue_vue_type_style_index_0_id_cac4c7fc_lang_less_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("935c");
+/* harmony import */ var _node_modules_vue_style_loader_index_js_ref_10_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_3_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_4_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_WzhSign_vue_vue_type_style_index_0_id_cac4c7fc_lang_less_scoped_true___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_vue_style_loader_index_js_ref_10_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_2_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_3_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_4_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_WzhSign_vue_vue_type_style_index_0_id_cac4c7fc_lang_less_scoped_true___WEBPACK_IMPORTED_MODULE_0__);
+/* unused harmony reexport * */
 
 
 /***/ }),
@@ -2315,6 +2315,21 @@ if (PATCH) {
 module.exports = patchedExec;
 
 
+/***/ }),
+
+/***/ "935c":
+/***/ (function(module, exports, __webpack_require__) {
+
+// style-loader: Adds some css to the DOM by adding a <style> tag
+
+// load the styles
+var content = __webpack_require__("2e16");
+if(typeof content === 'string') content = [[module.i, content, '']];
+if(content.locals) module.exports = content.locals;
+// add the styles to the DOM
+var add = __webpack_require__("499e").default
+var update = add("3a4a6758", content, true, {"sourceMap":false,"shadowMode":false});
+
 /***/ }),
 
 /***/ "94ca":
@@ -3587,21 +3602,6 @@ module.exports = function (input, PREFERRED_STRING) {
 module.exports = false;
 
 
-/***/ }),
-
-/***/ "c532":
-/***/ (function(module, exports, __webpack_require__) {
-
-// style-loader: Adds some css to the DOM by adding a <style> tag
-
-// load the styles
-var content = __webpack_require__("61a6");
-if(typeof content === 'string') content = [[module.i, content, '']];
-if(content.locals) module.exports = content.locals;
-// add the styles to the DOM
-var add = __webpack_require__("499e").default
-var update = add("26709a43", content, true, {"sourceMap":false,"shadowMode":false});
-
 /***/ }),
 
 /***/ "c6b6":
@@ -4632,12 +4632,12 @@ if (typeof window !== 'undefined') {
 // Indicate to webpack that this file can be concatenated
 /* harmony default export */ var setPublicPath = (null);
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"1a7da50c-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/packages/cfca/CfcaPdf.vue?vue&type=template&id=617e260b&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"1896a228-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/packages/cfca/CfcaPdf.vue?vue&type=template&id=cd924424&
 var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"cfca-pdf"},[(_vm.isIE)?[_c('div',{staticClass:"cfca-pdf-wrapper",style:({visibility: _vm.visible})},[_c('div',{class:{'cfca-left': true, 'active': _vm.active==='left', 'disabled': _vm.pageNo <= 1},on:{"click":function($event){return _vm.GoToPrevPage()}}},[_c('span',{staticClass:"el-icon-arrow-left"})]),_c('div',{staticClass:"cfca-content"},[_c('div',{staticClass:"cfca-page"},[_c('div',{staticClass:"fl cfca-title"},[_c('h2',[_vm._v(_vm._s(_vm.title))])]),_c('div',{staticClass:"fr"},[_vm._v(" "+_vm._s(_vm.pageNo)+"/"+_vm._s(_vm.pageCount)+" "),_c('span',{staticClass:"di"},[_vm._v("第")]),_c('el-input',{staticClass:"page-num",attrs:{"size":"mini"},on:{"change":_vm.GoToPage},nativeOn:{"keyup":function($event){if(!$event.type.indexOf('key')&&_vm._k($event.keyCode,"enter",13,$event.key,"Enter")){ return null; }return _vm.GoToPage($event)}},model:{value:(_vm.inputPage),callback:function ($$v) {_vm.inputPage=$$v},expression:"inputPage"}}),_vm._v("页 ")],1)]),_c('div',{ref:"PDFCtrlPlaceHolder",staticClass:"cfca-object"},[_c('div',{staticClass:"obj-wrapper",on:{"dragenter":_vm.onDragEnter,"dragover":_vm.onDragOver,"drop":_vm.onDrop}},[(this.idstr)?[_c('object',{ref:"pdfCtrl",staticClass:"PDFCtrlObject",staticStyle:{"position":"relative","z-Index":"1"},attrs:{"id":'PDFCtrl' + this.idstr,"tabindex":0,"codebase":_vm.publicPath + _vm.codebase,"classid":"clsid:6F60FE31-F827-4295-8AC4-775EF7478A6A","width":"100%","height":"100%"}},[_c('param',{attrs:{"name":"wmode","value":"transparent"}}),_c('param',{attrs:{"name":"showToolbar","value":"false"}})])]:[_c('object',{ref:"pdfCtrl",staticClass:"PDFCtrlObject",staticStyle:{"position":"relative","z-Index":"1"},attrs:{"tabindex":0,"codebase":_vm.publicPath + _vm.codebase,"classid":"clsid:6F60FE31-F827-4295-8AC4-775EF7478A6A","width":"100%","height":"100%"}},[_c('param',{attrs:{"name":"wmode","value":"transparent"}}),_c('param',{attrs:{"name":"showToolbar","value":"false"}})])]],2)]),_c('div',{staticClass:"cfca-control"},[_vm._t("default")],2)]),_c('div',{class:{'cfca-right': true, 'active': _vm.active==='right', 'disabled': _vm.pageNo >= _vm.pageCount},on:{"click":function($event){return _vm.GoToNextPage()}}},[_c('span',{staticClass:"el-icon-arrow-right"})])])]:[_c('div',{staticClass:"red",staticStyle:{"height":"350px","padding":"20px","position":"relative","margin-bottom":"20px"}},[_vm._v(" 提示：当前浏览器不支持控件预览，请切换IE浏览器进行查看 "),_c('div',{staticClass:"tc",staticStyle:{"position":"absolute","bottom":"0","left":"0","right":"0"}},[_vm._t("default")],2)])]],2)}
 var staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./src/packages/cfca/CfcaPdf.vue?vue&type=template&id=617e260b&
+// CONCATENATED MODULE: ./src/packages/cfca/CfcaPdf.vue?vue&type=template&id=cd924424&
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.concat.js
 var es_array_concat = __webpack_require__("99af");
@@ -4879,13 +4879,13 @@ var getUrl = function getUrl(str) {
     var codebase = '';
 
     if (window.navigator.cpuClass === 'x86') {
-      codebase = 'cfca/TrustSignPDFPlugin.ttd.x86.cab#version=3,2,1,4';
+      codebase = 'TrustSignPDFPlugin.ttd.x86.cab#version=3,2,1,4';
     } else {
-      codebase = 'cfca/TrustSignPDFPlugin.ttd.x64.cab#version=3,2,1,4';
+      codebase = 'TrustSignPDFPlugin.ttd.x64.cab#version=3,2,1,4';
     }
 
     return {
-      publicPath: 'https://wsp.totodi.com/jz/',
+      publicPath: 'https://wsp.totodi.com/cfca_plug/',
       // 为了获取public下的静态文件
       PDFCtrl: '',
       codebase: codebase,
@@ -4984,7 +4984,7 @@ var getUrl = function getUrl(str) {
       } catch (e) {
         if (this.PDFCtrl.GetLastErrorDesc) {
           var LastErrorDesc = this.PDFCtrl.GetLastErrorDesc();
-          alert(LastErrorDesc);
+          alert(LastErrorDesc + e);
         }
       }
     },
@@ -5004,7 +5004,7 @@ var getUrl = function getUrl(str) {
 
         if (this.PDFCtrl && this.PDFCtrl.GetLastErrorDesc) {
           var LastErrorDesc = this.PDFCtrl.GetLastErrorDesc();
-          alert(LastErrorDesc);
+          alert(LastErrorDesc + e);
         }
       }
     },
@@ -5025,7 +5025,7 @@ var getUrl = function getUrl(str) {
       } catch (e) {
         if (this.PDFCtrl && this.PDFCtrl.GetLastErrorDesc) {
           var LastErrorDesc = this.PDFCtrl.GetLastErrorDesc();
-          alert(LastErrorDesc);
+          alert(LastErrorDesc + e);
         }
       }
     },
@@ -5035,7 +5035,7 @@ var getUrl = function getUrl(str) {
       } catch (e) {
         if (this.PDFCtrl && this.PDFCtrl.GetLastErrorDesc) {
           var LastErrorDesc = this.PDFCtrl.GetLastErrorDesc();
-          alert(LastErrorDesc);
+          alert(LastErrorDesc + e);
         }
       }
     },
@@ -5052,7 +5052,7 @@ var getUrl = function getUrl(str) {
       } catch (e) {
         if (this.PDFCtrl && this.PDFCtrl.GetLastErrorDesc) {
           var LastErrorDesc = this.PDFCtrl.GetLastErrorDesc();
-          alert(LastErrorDesc);
+          alert(LastErrorDesc + e);
         }
       }
     },
@@ -5069,7 +5069,7 @@ var getUrl = function getUrl(str) {
       } catch (e) {
         if (this.PDFCtrl && this.PDFCtrl.GetLastErrorDesc) {
           var LastErrorDesc = this.PDFCtrl.GetLastErrorDesc();
-          alert(LastErrorDesc);
+          alert(LastErrorDesc + e);
         }
       }
     },
@@ -5080,7 +5080,7 @@ var getUrl = function getUrl(str) {
       } catch (e) {
         if (this.PDFCtrl && this.PDFCtrl.GetLastErrorDesc) {
           var LastErrorDesc = this.PDFCtrl.GetLastErrorDesc();
-          alert(LastErrorDesc);
+          alert(LastErrorDesc + e);
         }
       }
     },
@@ -5102,7 +5102,7 @@ var getUrl = function getUrl(str) {
       } catch (e) {
         if (this.PDFCtrl && this.PDFCtrl.GetLastErrorDesc) {
           var LastErrorDesc = this.PDFCtrl.GetLastErrorDesc();
-          alert(LastErrorDesc);
+          alert(LastErrorDesc + e);
         }
       }
     },
@@ -5113,7 +5113,7 @@ var getUrl = function getUrl(str) {
       } catch (e) {
         if (this.PDFCtrl && this.PDFCtrl.GetLastErrorDesc) {
           var LastErrorDesc = this.PDFCtrl.GetLastErrorDesc();
-          alert(LastErrorDesc);
+          alert(LastErrorDesc + e);
         }
       }
     },
@@ -5123,7 +5123,7 @@ var getUrl = function getUrl(str) {
       } catch (e) {
         if (this.PDFCtrl && this.PDFCtrl.GetLastErrorDesc) {
           var LastErrorDesc = this.PDFCtrl.GetLastErrorDesc();
-          alert(LastErrorDesc);
+          alert(LastErrorDesc + e);
         }
       }
     },
@@ -5133,7 +5133,7 @@ var getUrl = function getUrl(str) {
       } catch (e) {
         if (this.PDFCtrl && this.PDFCtrl.GetLastErrorDesc) {
           var LastErrorDesc = this.PDFCtrl.GetLastErrorDesc();
-          alert(LastErrorDesc);
+          alert(LastErrorDesc + e);
         }
       }
     },
@@ -5153,7 +5153,7 @@ var getUrl = function getUrl(str) {
         this.$emit('cfca-point', nPageNo, x, y);
       } catch (e) {
         var LastErrorDesc = this.PDFCtrl.GetLastErrorDesc();
-        alert(LastErrorDesc);
+        alert(LastErrorDesc + e);
       }
     },
     // 外部打开dialog 调用
@@ -5208,7 +5208,7 @@ var getUrl = function getUrl(str) {
 
         var _errorDesc = this.PDFCtrl.GetLastErrorDesc();
 
-        alert(_errorDesc);
+        alert(_errorDesc + e);
       }
     },
 
@@ -5236,6 +5236,7 @@ var getUrl = function getUrl(str) {
         return true;
       } catch (e) {
         console.log('PDFCtrl.SelectSignCert ', e);
+        alert("\u9009\u62E9\u8BC1\u4E66\u5931\u8D25\uFF01".concat(e));
         return false;
       }
     },
@@ -5253,7 +5254,7 @@ var getUrl = function getUrl(str) {
       } catch (e) {
         var LastErrorDesc = this.PDFCtrl.GetLastErrorDesc();
         console.log('PDFCtrl 文件上传：', LastErrorDesc);
-        alert("PDFCtrl \u6587\u4EF6\u4E0A\u4F20\uFF1A".concat(LastErrorDesc));
+        alert("PDFCtrl \u6587\u4EF6\u4E0A\u4F20\uFF1A".concat(LastErrorDesc).concat(e));
       }
 
       return false;
@@ -5291,15 +5292,20 @@ var getUrl = function getUrl(str) {
       } catch (e) {
         var LastErrorDesc = this.PDFCtrl.GetLastErrorDesc();
         console.log('signFileKeyImage', e);
-        alert(LastErrorDesc);
+        alert("".concat(LastErrorDesc, " ").concat(e));
         return false;
       }
     },
     // 用3.2.1.7 的api 写的一印多签, 调研阶段，暂时不得用
-    multipleSign7: function multipleSign7(labels, fileOss, serialNo, image, text) {
+    multipleSign7: function multipleSign7(labels, fileOss, serialNo, image, isOffset) {
       for (var index = 0; index < labels.length; index++) {
         var item = labels[index];
 
+        if (typeof isOffset === 'number') {
+          // 印章统一向下偏移
+          item.Y -= isOffset;
+        }
+
         try {
           var lacotionX = '';
           var lacotionY = '';
@@ -5319,7 +5325,7 @@ var getUrl = function getUrl(str) {
         } catch (e) {
           var LastErrorDesc = this.PDFCtrl.GetLastErrorDesc();
           console.log(' multipleSign7', e);
-          alert(LastErrorDesc);
+          alert(LastErrorDesc + e);
         }
       } // 如果服务端图片 传进来就用，没有用ukey图片，无需单独再获取
 
@@ -5331,7 +5337,7 @@ var getUrl = function getUrl(str) {
       }
     },
     // 用3.2.1.5 的api 写的一印多签
-    multipleSign5: function multipleSign5(labels, fileOss, serialNo, image, text) {
+    multipleSign5: function multipleSign5(labels, fileOss, serialNo, image, isOffset) {
       console.log('multipleSign  循环签的begin ', serialNo);
       var serialNoBegin = this.PDFCtrl.GetSignCertInfo('SerialNumber');
       console.log('serialNoBegin ', serialNoBegin);
@@ -5341,7 +5347,13 @@ var getUrl = function getUrl(str) {
 
       for (var index = 0; index < labels.length; index++) {
         var item = labels[index];
-        console.log('item=', item); // this.$message.success(`签署 [${text}] 位于第${label.pageIndex}页的位置，[总共:${index + 1}/${labels.length}个位置]`)
+        console.log('item=', item);
+
+        if (typeof isOffset === 'number') {
+          // 印章统一向下偏移
+          item.Y -= isOffset;
+        } // this.$message.success(`签署 [${text}] 位于第${label.pageIndex}页的位置，[总共:${index + 1}/${labels.length}个位置]`)
+
 
         if (index > 0) {
           var serialNoAgain = this.PDFCtrl.GetSignCertInfo('SerialNumber');
@@ -5371,17 +5383,19 @@ var getUrl = function getUrl(str) {
       return result;
     },
     // 循环调用签章(一印多签) fileOss  没用，可以传空
-    multipleSign: function multipleSign(labels, fileOss, serialNo, image, text) {
+    multipleSign: function multipleSign(labels, fileOss, serialNo, image) {
+      var isOffset = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 0;
+
       if (!image) {
         this.PDFCtrl.SetPKCS11Module('UyeePKCS11.Enterprise.dll|UlanPKCS11.Enterprise.dll|UlanPKCS11.dll|CFCA_UKEY_P11.dll');
       }
 
       if (this.PDFCtrl.AddSignaturePosition) {
         console.log('新版插件');
-        return this.multipleSign7(labels, fileOss, serialNo, image, text);
+        return this.multipleSign7(labels, fileOss, serialNo, image, isOffset);
       }
 
-      return this.multipleSign5(labels, fileOss, serialNo, image, text);
+      return this.multipleSign5(labels, fileOss, serialNo, image, isOffset);
     },
     GetSignatureInfo: function GetSignatureInfo() {
       // 查询文件上的，签章信息, 据此验证，一印多签，是否签署成功
@@ -5553,7 +5567,7 @@ var component = normalizeComponent(
 )
 
 /* harmony default export */ var CfcaPdf = (component.exports);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"1a7da50c-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/packages/ukey/Ukey.vue?vue&type=template&id=22a309ec&scoped=true&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"1896a228-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/packages/ukey/Ukey.vue?vue&type=template&id=22a309ec&scoped=true&
 var Ukeyvue_type_template_id_22a309ec_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"CryptoAgent-wrapper"},[(_vm.isIE)?[_c('object',{ref:"CryptoAgent",attrs:{"codebase":_vm.publicPath + _vm.codebase,"classid":_vm.classid}})]:[_c('embed',{ref:"CryptoAgent",staticStyle:{"height":"0px","width":"0px"},attrs:{"type":"application/npCryptoKit.Ultimate.x86"}})]],2)}
 var Ukeyvue_type_template_id_22a309ec_scoped_true_staticRenderFns = []
 
@@ -5777,12 +5791,12 @@ var Ukey_component = normalizeComponent(
 )
 
 /* harmony default export */ var Ukey = (Ukey_component.exports);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"1a7da50c-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/packages/ukey/WzhSign.vue?vue&type=template&id=26b63af1&scoped=true&
-var WzhSignvue_type_template_id_26b63af1_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"CryptoAgent-wrapper"},[(_vm.isIE)?[_c('object',{ref:"CryptoAgent",attrs:{"codebase":_vm.publicPath+_vm.codebase,"classid":_vm.classid}})]:[_c('embed',{ref:"CryptoAgent",staticStyle:{"height":"0px","width":"0px"},attrs:{"type":"application/npCryptoKit.Paperless.x86"}})]],2)}
-var WzhSignvue_type_template_id_26b63af1_scoped_true_staticRenderFns = []
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"1896a228-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/packages/ukey/WzhSign.vue?vue&type=template&id=cac4c7fc&scoped=true&
+var WzhSignvue_type_template_id_cac4c7fc_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"CryptoAgent-wrapper"},[(_vm.isIE)?[_c('object',{ref:"CryptoAgent",attrs:{"codebase":_vm.publicPath+_vm.codebase,"classid":_vm.classid}})]:[_c('embed',{ref:"CryptoAgent",staticStyle:{"height":"0px","width":"0px"},attrs:{"type":"application/npCryptoKit.Paperless.x86"}})]],2)}
+var WzhSignvue_type_template_id_cac4c7fc_scoped_true_staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./src/packages/ukey/WzhSign.vue?vue&type=template&id=26b63af1&scoped=true&
+// CONCATENATED MODULE: ./src/packages/ukey/WzhSign.vue?vue&type=template&id=cac4c7fc&scoped=true&
 
 // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/packages/ukey/WzhSign.vue?vue&type=script&lang=js&
 
@@ -5925,7 +5939,7 @@ var WzhSignvue_type_template_id_26b63af1_scoped_true_staticRenderFns = []
         if (!InfoContent) {
           var errorDesc = this.CryptoAgent.GetLastErrorDesc();
           alert(errorDesc);
-          return;
+          return false;
         }
 
         return InfoContent;
@@ -5934,7 +5948,7 @@ var WzhSignvue_type_template_id_26b63af1_scoped_true_staticRenderFns = []
 
         var _errorDesc = this.CryptoAgent.GetLastErrorDesc();
 
-        alert(_errorDesc);
+        alert(_errorDesc + e);
       }
     },
     SelectCertificateOnClick: function SelectCertificateOnClick() {
@@ -5958,7 +5972,7 @@ var WzhSignvue_type_template_id_26b63af1_scoped_true_staticRenderFns = []
           var errorDesc = this.CryptoAgent.GetLastErrorDesc();
           console.log('wzh SelectCertResult 不存在', errorDesc);
           alert(errorDesc);
-          return;
+          return false;
         }
 
         console.log('wzh SelectCertResult', bSelectCertResult);
@@ -5966,7 +5980,7 @@ var WzhSignvue_type_template_id_26b63af1_scoped_true_staticRenderFns = []
       } catch (e) {
         var errorDesc2 = this.CryptoAgent.GetLastErrorDesc();
         console.log('wzh SelectCertResult catch error: ', errorDesc2);
-        alert(errorDesc2);
+        alert(errorDesc2 + e);
         return false;
       }
     },
@@ -5974,6 +5988,11 @@ var WzhSignvue_type_template_id_26b63af1_scoped_true_staticRenderFns = []
       var CertContent = this.CryptoAgent.GetSignCertInfo('CertContent');
       this.$emit('getImg', sealImage);
 
+      if (!CertContent) {
+        alert('获取证书公钥失败！');
+        return Promise.reject();
+      }
+
       if (fileOss.bucketName && fileOss.objectKey) {
         return this.api.getSignHash({
           jsonData: {
@@ -6025,7 +6044,6 @@ var WzhSignvue_type_template_id_26b63af1_scoped_true_staticRenderFns = []
                 _yield$_this$getHashV = _context.sent;
                 code = _yield$_this$getHashV.code;
                 data = _yield$_this$getHashV.data;
-                console.log('getSignHashValue', data);
 
                 if (code === 0) {
                   if ("".concat(data.bean.code) === '200') {
@@ -6034,19 +6052,19 @@ var WzhSignvue_type_template_id_26b63af1_scoped_true_staticRenderFns = []
                 }
 
                 if (sourceHashData) {
-                  _context.next = 12;
+                  _context.next = 11;
                   break;
                 }
 
                 alert("CFCA\u8BA1\u7B97HASH\u503C\u5931\u8D25\uFF01( ".concat(data.bean.msg || '', ")"));
                 return _context.abrupt("return", false);
 
-              case 12:
+              case 11:
                 // 将原文Hash值的Base64编码解码后，对其进行PKCS#7分离式签名
                 signature = _this.CryptoAgent.SignHashMsgPKCS7Detached(sourceHashData, 'SHA-1');
 
                 if (signature) {
-                  _context.next = 17;
+                  _context.next = 16;
                   break;
                 }
 
@@ -6054,32 +6072,32 @@ var WzhSignvue_type_template_id_26b63af1_scoped_true_staticRenderFns = []
                 alert(errorDesc);
                 return _context.abrupt("return", false);
 
-              case 17:
+              case 16:
                 return _context.abrupt("return", {
                   signature: signature,
                   id: data.bean.id
                 });
 
-              case 20:
-                _context.prev = 20;
+              case 19:
+                _context.prev = 19;
                 _context.t0 = _context["catch"](0);
                 errorDesc2 = _this.CryptoAgent.GetLastErrorDesc();
                 console.log('getSignHashValue', _context.t0);
-                alert(errorDesc2);
+                alert(errorDesc2 + _context.t0);
 
-              case 25:
+              case 24:
               case "end":
                 return _context.stop();
             }
           }
-        }, _callee, null, [[0, 20]]);
+        }, _callee, null, [[0, 19]]);
       }))();
     },
     signFileKeyImage: function signFileKeyImage(item, fileItem, image) {
       var _this2 = this;
 
       return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
-        var res, _yield$_this2$api$mer, data, code;
+        var res, errorMsg, _yield$_this2$api$mer, data, code;
 
         return regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) {
@@ -6090,13 +6108,14 @@ var WzhSignvue_type_template_id_26b63af1_scoped_true_staticRenderFns = []
 
               case 2:
                 res = _context2.sent;
+                errorMsg = '计算Hash 失败！';
 
                 if (!res) {
-                  _context2.next = 11;
+                  _context2.next = 17;
                   break;
                 }
 
-                _context2.next = 6;
+                _context2.next = 7;
                 return _this2.api.mergeHash({
                   jsonData: {
                     source: 'TTDFUND',
@@ -6110,24 +6129,37 @@ var WzhSignvue_type_template_id_26b63af1_scoped_true_staticRenderFns = []
                   }
                 });
 
-              case 6:
+              case 7:
                 _yield$_this2$api$mer = _context2.sent;
                 data = _yield$_this2$api$mer.data;
                 code = _yield$_this2$api$mer.code;
 
-                if (!(code === 0 && data.bean.url)) {
-                  _context2.next = 11;
+                if (!(code === 0)) {
+                  _context2.next = 16;
+                  break;
+                }
+
+                if (!data.bean.url) {
+                  _context2.next = 13;
                   break;
                 }
 
                 return _context2.abrupt("return", data.bean);
 
-              case 11:
-                _this2.$message.error('计算Hash 失败！');
+              case 13:
+                errorMsg = data.bean.msg;
+                _context2.next = 17;
+                break;
+
+              case 16:
+                errorMsg = data.msg;
+
+              case 17:
+                _this2.$message.error(errorMsg || 'error计算Hash失败！');
 
                 return _context2.abrupt("return", false);
 
-              case 13:
+              case 19:
               case "end":
                 return _context2.stop();
             }
@@ -6147,83 +6179,85 @@ var WzhSignvue_type_template_id_26b63af1_scoped_true_staticRenderFns = []
           while (1) {
             switch (_context3.prev = _context3.next) {
               case 0:
-                isOffset = _arguments.length > 4 && _arguments[4] !== undefined ? _arguments[4] : 26;
-                console.log('multipleSign  循环签的begin ', serialNo);
+                isOffset = _arguments.length > 4 && _arguments[4] !== undefined ? _arguments[4] : 18;
                 serialNoBegin = _this3.CryptoAgent.GetSignCertInfo('SerialNumber');
-                console.log('serialNoBegin', serialNoBegin);
                 result = '';
-                index = 0;
+
+                if (image) {
+                  _context3.next = 6;
+                  break;
+                }
+
+                alert('印章图片缺失！');
+                return _context3.abrupt("return", false);
 
               case 6:
+                index = 0;
+
+              case 7:
                 if (!(index < labels.length)) {
-                  _context3.next = 32;
+                  _context3.next = 29;
                   break;
                 }
 
                 item = getUrl(labels[index]); // 此处for循环多个文件时候以前签署，所以提示无意义
                 // const message = `签署 [${text}] 位于第${label.pageIndex}页的位置，[总共:${index + 1}/${labels.length}个位置]`
 
-                if (isOffset !== null && isOffset !== false) {
-                  // 印章统一向下便宜30像素
+                if (typeof isOffset === 'number') {
+                  // 印章统一向下偏移
                   item.Y -= isOffset;
                 }
 
                 if (!(index > 0)) {
-                  _context3.next = 24;
+                  _context3.next = 22;
                   break;
                 }
 
-                console.log('无需重新验签：index=', index);
                 serialNoAgain = _this3.CryptoAgent.GetSignCertInfo('SerialNumber');
-                console.log('本次获得的序列号serialNoAgain：', serialNoAgain);
 
                 if (!(serialNoBegin !== serialNoAgain)) {
-                  _context3.next = 16;
+                  _context3.next = 15;
                   break;
                 }
 
                 alert('签署过程中，请不要更换ukey!');
                 return _context3.abrupt("return", false);
 
-              case 16:
-                console.log('resutl=', result); // 这里签署第二个章，需要在第一个签好的文件上签署 所以用result中是文件
-
+              case 15:
                 if (!result) {
-                  _context3.next = 21;
+                  _context3.next = 19;
                   break;
                 }
 
-                _context3.next = 20;
+                _context3.next = 18;
                 return _this3.signFileKeyImage(item, result, image);
 
-              case 20:
+              case 18:
                 result = _context3.sent;
 
-              case 21:
+              case 19:
                 console.log("iterateSign \u7B7E\u7AE0\u7ED3\u679C".concat(index, "---result----"), result);
-                _context3.next = 29;
+                _context3.next = 26;
                 break;
 
-              case 24:
-                console.log('第一个章，不用验签', index); // eslint-disable-next-line
-
-                _context3.next = 27;
+              case 22:
+                _context3.next = 24;
                 return _this3.signFileKeyImage(item, fileOss, image);
 
-              case 27:
+              case 24:
                 result = _context3.sent;
                 console.log('第一个章 签章结果', result);
 
-              case 29:
+              case 26:
                 index++;
-                _context3.next = 6;
+                _context3.next = 7;
                 break;
 
-              case 32:
+              case 29:
                 console.log('multipleSign 签章的结果', result);
                 return _context3.abrupt("return", result);
 
-              case 34:
+              case 31:
               case "end":
                 return _context3.stop();
             }
@@ -6235,8 +6269,8 @@ var WzhSignvue_type_template_id_26b63af1_scoped_true_staticRenderFns = []
 });
 // CONCATENATED MODULE: ./src/packages/ukey/WzhSign.vue?vue&type=script&lang=js&
  /* harmony default export */ var ukey_WzhSignvue_type_script_lang_js_ = (WzhSignvue_type_script_lang_js_); 
-// EXTERNAL MODULE: ./src/packages/ukey/WzhSign.vue?vue&type=style&index=0&id=26b63af1&lang=less&scoped=true&
-var WzhSignvue_type_style_index_0_id_26b63af1_lang_less_scoped_true_ = __webpack_require__("073f");
+// EXTERNAL MODULE: ./src/packages/ukey/WzhSign.vue?vue&type=style&index=0&id=cac4c7fc&lang=less&scoped=true&
+var WzhSignvue_type_style_index_0_id_cac4c7fc_lang_less_scoped_true_ = __webpack_require__("6187");
 
 // CONCATENATED MODULE: ./src/packages/ukey/WzhSign.vue
 
@@ -6249,11 +6283,11 @@ var WzhSignvue_type_style_index_0_id_26b63af1_lang_less_scoped_true_ = __webpack
 
 var WzhSign_component = normalizeComponent(
   ukey_WzhSignvue_type_script_lang_js_,
-  WzhSignvue_type_template_id_26b63af1_scoped_true_render,
-  WzhSignvue_type_template_id_26b63af1_scoped_true_staticRenderFns,
+  WzhSignvue_type_template_id_cac4c7fc_scoped_true_render,
+  WzhSignvue_type_template_id_cac4c7fc_scoped_true_staticRenderFns,
   false,
   null,
-  "26b63af1",
+  "cac4c7fc",
   null
   
 )