eoss-ui 0.5.62 → 0.5.64

package/lib/eoss-ui.common.js

@@ -2200,7 +2200,7 @@ var isLogined = function isLogined(_ref8) {
           });
         }
       }).catch(function (e) {});
-    } else if (token || to.path === '/' || to.path === '/404' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
+    } else if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
       if (redirect && (to.path === '/main' || to.path === '/login')) {
         window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
       } else {
@@ -2890,7 +2890,9 @@ var toFunction = function toFunction(str) {
  * @param {string} [$color] - 颜色值
  **/
 var updateTheme = function updateTheme(color, send) {
-  color = color && startWith(color, '#') ? color : '#409eff';
+  if (!color) {
+    return false;
+  }
 
   if (send === undefined) {
     send = true;
@@ -4175,8 +4177,8 @@ main.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_button = (main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/button-group/src/main.vue?vue&type=template&id=24005b83&
-var mainvue_type_template_id_24005b83_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/button-group/src/main.vue?vue&type=template&id=a336a590&
+var mainvue_type_template_id_a336a590_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4313,11 +4315,11 @@ var mainvue_type_template_id_24005b83_render = function () {
     2
   )
 }
-var mainvue_type_template_id_24005b83_staticRenderFns = []
-mainvue_type_template_id_24005b83_render._withStripped = true
+var mainvue_type_template_id_a336a590_staticRenderFns = []
+mainvue_type_template_id_a336a590_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/button-group/src/main.vue?vue&type=template&id=24005b83&
+// CONCATENATED MODULE: ./packages/button-group/src/main.vue?vue&type=template&id=a336a590&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/button-group/src/main.vue?vue&type=script&lang=js&
 var mainvue_type_script_lang_js_extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
@@ -4418,6 +4420,10 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
     size: {
       type: String,
       default: 'mini'
+    },
+    placement: {
+      type: String,
+      default: 'bottom'
     }
   },
   computed: {
@@ -4425,7 +4431,7 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
       return this.getBtns();
     },
     showBtns: function showBtns() {
-      return this.btns.slice(0, this.length - 1);
+      return this.btns.length > this.length ? this.btns.slice(0, this.length - 1) : this.btns;
     },
     other: function other() {
       var btns = this.length > 0 && (this.btns.length > this.length || this.length == 1) ? this.btns.slice(this.length - 1, this.btns.length) : [];
@@ -4510,8 +4516,8 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
 
 var src_main_component = normalizeComponent(
   packages_button_group_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_24005b83_render,
-  mainvue_type_template_id_24005b83_staticRenderFns,
+  mainvue_type_template_id_a336a590_render,
+  mainvue_type_template_id_a336a590_staticRenderFns,
   false,
   null,
   null,
@@ -13565,8 +13571,8 @@ error_page_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var error_page = (error_page_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/form/src/main.vue?vue&type=template&id=6983cacd&
-var mainvue_type_template_id_6983cacd_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/form/src/main.vue?vue&type=template&id=55faec94&
+var mainvue_type_template_id_55faec94_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -25022,11 +25028,11 @@ var mainvue_type_template_id_6983cacd_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_6983cacd_staticRenderFns = []
-mainvue_type_template_id_6983cacd_render._withStripped = true
+var mainvue_type_template_id_55faec94_staticRenderFns = []
+mainvue_type_template_id_55faec94_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/form/src/main.vue?vue&type=template&id=6983cacd&
+// CONCATENATED MODULE: ./packages/form/src/main.vue?vue&type=template&id=55faec94&
 
 // CONCATENATED MODULE: ./src/utils/rules.js
 // 手机号
@@ -25040,7 +25046,7 @@ var ip = { pattern: new RegExp('^(\\d{1,2}|1\\d\\d|2[0-4]\\d|25[0-5])\\.(\\d{1,2
 // 银行卡号
 var bankCard = { pattern: new RegExp('^([1-9]{1})(\\d{14}|\\d{18})$'), message: '银行卡号不合法' };
 
-/* harmony default export */ var rules = ({
+/* harmony default export */ var utils_rules = ({
   phone: phone,
   idCard: idCard,
   telephone: telephone,
@@ -29981,6 +29987,9 @@ function src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return function
       var type = arguments[2];
       var validate = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
 
+      if (this.readonly) {
+        return Promise.resolve();
+      }
       if (!handle) {
         handle = this.handles || {};
       }
@@ -30261,20 +30270,20 @@ function src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return function
       if (res.rules && !res.hide) {
         if (Array.isArray(res.rules)) {
           return res.rules.map(function (item) {
-            if (rules[item.type]) {
+            if (utils_rules[item.type]) {
               return {
-                pattern: rules[item.type]['pattern'],
-                message: item.message ? item.message : rules[item.type]['message'],
+                pattern: utils_rules[item.type]['pattern'],
+                message: item.message ? item.message : utils_rules[item.type]['message'],
                 trigger: item.trigger ? item.trigger : res.fetchSuggestions || res.url || res.data && res.data.length ? 'change' : 'blur'
               };
             }
             return item;
           });
         }
-        if (rules[res.rules.type]) {
+        if (utils_rules[res.rules.type]) {
           return {
-            pattern: rules[res.rules.type]['pattern'],
-            message: res.rules.message ? res.rules.message : rules[res.rules.type]['message'],
+            pattern: utils_rules[res.rules.type]['pattern'],
+            message: res.rules.message ? res.rules.message : utils_rules[res.rules.type]['message'],
             trigger: res.rules.trigger ? res.rules.trigger : res.fetchSuggestions || res.url || res.data && res.data.length ? 'change' : 'blur'
           };
         }
@@ -30321,8 +30330,8 @@ function src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return function
 
 var form_src_main_component = normalizeComponent(
   packages_form_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_6983cacd_render,
-  mainvue_type_template_id_6983cacd_staticRenderFns,
+  mainvue_type_template_id_55faec94_render,
+  mainvue_type_template_id_55faec94_staticRenderFns,
   false,
   null,
   null,
@@ -30339,8 +30348,8 @@ form_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_form = (form_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/main.vue?vue&type=template&id=66b44e7f&
-var mainvue_type_template_id_66b44e7f_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/main.vue?vue&type=template&id=4080350e&
+var mainvue_type_template_id_4080350e_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -32060,11 +32069,11 @@ var mainvue_type_template_id_66b44e7f_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_66b44e7f_staticRenderFns = []
-mainvue_type_template_id_66b44e7f_render._withStripped = true
+var mainvue_type_template_id_4080350e_staticRenderFns = []
+mainvue_type_template_id_4080350e_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=66b44e7f&
+// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=4080350e&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/component/CommonOpinions.vue?vue&type=template&id=28c062bc&
 var CommonOpinionsvue_type_template_id_28c062bc_render = function () {
@@ -33056,8 +33065,8 @@ var CommonOpinions_component = normalizeComponent(
 )
 
 /* harmony default export */ var CommonOpinions = (CommonOpinions_component.exports);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/processForm.vue?vue&type=template&id=aaac09fe&
-var processFormvue_type_template_id_aaac09fe_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/processForm.vue?vue&type=template&id=38d27a4e&
+var processFormvue_type_template_id_38d27a4e_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -33523,11 +33532,11 @@ var processFormvue_type_template_id_aaac09fe_render = function () {
     1
   )
 }
-var processFormvue_type_template_id_aaac09fe_staticRenderFns = []
-processFormvue_type_template_id_aaac09fe_render._withStripped = true
+var processFormvue_type_template_id_38d27a4e_staticRenderFns = []
+processFormvue_type_template_id_38d27a4e_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/processForm.vue?vue&type=template&id=aaac09fe&
+// CONCATENATED MODULE: ./packages/flow/src/processForm.vue?vue&type=template&id=38d27a4e&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/selectUser.vue?vue&type=template&id=db651118&
 var selectUservue_type_template_id_db651118_render = function () {
@@ -35310,6 +35319,7 @@ var processFormvue_type_script_lang_js_components;
           }
         }
       },
+      userModel: {},
       nextUserTabs: {},
       selectPresetUserList: [],
       presetOptions: [],
@@ -35354,12 +35364,39 @@ var processFormvue_type_script_lang_js_components;
       }
     }
   },
+  created: function created() {
+    this.getUserInfo();
+  },
   mounted: function mounted() {
     this.getStartFlow(this.processDefinitionId);
     this.newOpinion = this.opinion;
   },
 
   methods: {
+    getUserInfo: function getUserInfo() {
+      var _this = this;
+
+      var mainConfig = utils_util["a" /* default */].getStorage('mainConfig');
+      if (mainConfig) {
+        this.userModel = JSON.parse(mainConfig).userModel;
+      } else {
+        utils_util["a" /* default */].ajax({ url: api["cb" /* loginUserInfo */] }).then(function (res) {
+          var status = res.status,
+              data = res.data;
+
+          if (status == 'success') {
+            _this.userModel = data;
+          } else {
+            var msg = res.msg || '系统错误，请联系管理员！';
+            _this.$message.error(msg);
+          }
+        }).catch(function (err) {
+          if (err.message && err.message !== 'canceled') {
+            _this.$message.error(err.message);
+          }
+        });
+      }
+    },
     getIsShowNextUser: function getIsShowNextUser(val) {
       if (val == 7 || val == 8 || val == 9 || val == 10 || val == 11 || val == 12) {
         this.isShowNextUser = false;
@@ -35445,7 +35482,7 @@ var processFormvue_type_script_lang_js_components;
       this.mixOrgIdList = mixList;
     },
     getNodeType: function getNodeType() {
-      var _this = this;
+      var _this2 = this;
 
       utils_util["a" /* default */].ajax({
         url: api["u" /* findCodeValues */],
@@ -35458,19 +35495,19 @@ var processFormvue_type_script_lang_js_components;
             data = res.data;
 
         if (status === 'success') {
-          _this.nextNode.noticeList = data;
+          _this2.nextNode.noticeList = data;
         }
       }).catch(function (err) {
-        _this.loading = false;
+        _this2.loading = false;
         if (err.message && err.message !== 'canceled') {
-          _this.$message.error(err.message);
+          _this2.$message.error(err.message);
         }
       });
     },
 
     //获取通知信息
     getMessage: function getMessage() {
-      var _this2 = this;
+      var _this3 = this;
 
       var params = {
         processDefinitionId: this.processDefinitionId,
@@ -35479,12 +35516,12 @@ var processFormvue_type_script_lang_js_components;
       };
       utils_util["a" /* default */].ajax({ url: api["I" /* getNotificationMsg */], params: params, methods: 'post' }).then(function (res) {
         if (res.status === 'success') {
-          _this2.nextNode.noticeInfo = res.message;
+          _this3.nextNode.noticeInfo = res.message;
         }
       }).catch(function (err) {
-        _this2.loading = false;
+        _this3.loading = false;
         if (err.message && err.message !== 'canceled') {
-          _this2.$message.error(err.message);
+          _this3.$message.error(err.message);
         }
       });
     },
@@ -35494,11 +35531,11 @@ var processFormvue_type_script_lang_js_components;
       this.saveProcess(formName);
     },
     saveProcess: function saveProcess(formName) {
-      var _this3 = this;
+      var _this4 = this;
 
       this.$refs[formName].validate(function (valid) {
         if (valid) {
-          var _nextNode = _this3.nextNode,
+          var _nextNode = _this4.nextNode,
               nextNode = _nextNode.nextNode,
               nextUser = _nextNode.nextUser,
               noticeInfo = _nextNode.noticeInfo,
@@ -35510,20 +35547,20 @@ var processFormvue_type_script_lang_js_components;
               newOpinion = _nextNode.newOpinion;
 
           if (noticeType.length === 0) {
-            return _this3.$message.warning('请选择通知方式');
+            return _this4.$message.warning('请选择通知方式');
           }
-          if (_this3.isShowNextUser) {
-            if (nextUser == '' || _this3.multiple && nextUser.length == 0) {
-              return _this3.$message.warning('请选择下步办理人');
+          if (_this4.isShowNextUser) {
+            if (nextUser == '' || _this4.multiple && nextUser.length == 0) {
+              return _this4.$message.warning('请选择下步办理人');
             }
           } else {
-            if (nextOrgId == '' || _this3.multiple && nextOrgId.length == 0) {
-              return _this3.$message.warning('请选择办理对象');
+            if (nextOrgId == '' || _this4.multiple && nextOrgId.length == 0) {
+              return _this4.$message.warning('请选择办理对象');
             }
           }
-          _this3.loading = true;
+          _this4.loading = true;
           var newNextUser = [];
-          if (_this3.multiple) {
+          if (_this4.multiple) {
             nextUser && nextUser.map(function (item) {
               return newNextUser.push(item);
             });
@@ -35533,37 +35570,37 @@ var processFormvue_type_script_lang_js_components;
             newNoticeType = noticeType.join(',');
           }
           var params = {
-            processDefinitionId: _this3.processDefinitionId,
-            nextUserId: _this3.multiple ? newNextUser.join(',') : nextUser,
+            processDefinitionId: _this4.processDefinitionId,
+            nextUserId: _this4.multiple ? newNextUser.join(',') : nextUser,
             nextNodeId: nextNode,
-            businessId: _this3.businessId,
+            businessId: _this4.businessId,
             notificationType: newNoticeType,
             userId: utils_util["a" /* default */].getStorage('userId'),
             notificationMsg: noticeInfo,
-            customPresetUserJson: JSON.stringify(_this3.presetList),
-            presetUserJson: JSON.stringify(_this3.presetUserJson),
-            nextReadUserId: _this3.readMultiple ? _this3.mixReadList && _this3.mixReadList.join('|') : nextReadUserId,
-            nextOrgId: !_this3.isShowNextUser ? _this3.multiple ? _this3.mixOrgIdList && _this3.mixOrgIdList.join('|') : nextOrgId : '',
+            customPresetUserJson: JSON.stringify(_this4.presetList),
+            presetUserJson: JSON.stringify(_this4.presetUserJson),
+            nextReadUserId: _this4.readMultiple ? _this4.mixReadList && _this4.mixReadList.join('|') : nextReadUserId,
+            nextOrgId: !_this4.isShowNextUser ? _this4.multiple ? _this4.mixOrgIdList && _this4.mixOrgIdList.join('|') : nextOrgId : '',
             handleExplain: handleExplain,
-            presetReadUserId: _this3.mixPresetList && _this3.mixPresetList.length > 0 ? _this3.mixPresetList.join('|') : presetReadUserId.join(','),
-            opinion: _this3.newOpinion || newOpinion
+            presetReadUserId: _this4.mixPresetList && _this4.mixPresetList.length > 0 ? _this4.mixPresetList.join('|') : presetReadUserId.join(','),
+            opinion: _this4.newOpinion || newOpinion
           };
-          if (_this3.activeNames != '1') delete params.customPresetUserJson;
+          if (_this4.activeNames != '1') delete params.customPresetUserJson;
           utils_util["a" /* default */].ajax({ url: api["mb" /* register */], method: 'post', data: params }).then(function (res) {
             var status = res.status,
                 message = res.message;
 
-            _this3.loading = false;
+            _this4.loading = false;
             if (status === 'success') {
-              _this3.quit(true);
-              _this3.$message.success('操作成功');
+              _this4.quit(true);
+              _this4.$message.success('操作成功');
             } else {
-              _this3.$message.error(message || '系统错误，请联系管理员！');
+              _this4.$message.error(message || '系统错误，请联系管理员！');
             }
           }).catch(function (err) {
-            _this3.loading = false;
+            _this4.loading = false;
             if (err.message && err.message !== 'canceled') {
-              _this3.$message.error(err.message);
+              _this4.$message.error(err.message);
             }
           });
         } else {
@@ -35572,7 +35609,7 @@ var processFormvue_type_script_lang_js_components;
       });
     },
     getNodeInfos: function getNodeInfos(nodeId, index) {
-      var _this4 = this;
+      var _this5 = this;
 
       var params = {
         processDefinitionId: this.processDefinitionId,
@@ -35588,63 +35625,63 @@ var processFormvue_type_script_lang_js_components;
             countersignaturetypeText = _res$data.countersignaturetypeText,
             countersignaturetypeCode = _res$data.countersignaturetypeCode;
 
-        _this4.loading = false;
+        _this5.loading = false;
         if (status === 'success') {
-          _this4.nextNode.userInfo = nextUserList;
-          _this4.countersignaturetypeCode = countersignaturetypeCode;
-          _this4.nextNode.countersignaturetypeText = countersignaturetypeText;
-          _this4.isTaskread = nodeExtAttr.isTaskread;
-          _this4.isHandleExplain = nodeExtAttr.isHandleExplain;
-          _this4.isCustomUser = nodeExtAttr.isCustomUser; //是否展示选人组件按钮
-          _this4.presetEdit = nodeExtAttr.presetEdit; //是否展示备选人
-          _this4.isDefSelectedObj = nodeExtAttr.isDefSelectedObj; //是否默认选中
+          _this5.nextNode.userInfo = nextUserList;
+          _this5.countersignaturetypeCode = countersignaturetypeCode;
+          _this5.nextNode.countersignaturetypeText = countersignaturetypeText;
+          _this5.isTaskread = nodeExtAttr.isTaskread;
+          _this5.isHandleExplain = nodeExtAttr.isHandleExplain;
+          _this5.isCustomUser = nodeExtAttr.isCustomUser; //是否展示选人组件按钮
+          _this5.presetEdit = nodeExtAttr.presetEdit; //是否展示备选人
+          _this5.isDefSelectedObj = nodeExtAttr.isDefSelectedObj; //是否默认选中
           if (nodeExtAttr.userSelectionType == 7 || nodeExtAttr.userSelectionType == 8 || nodeExtAttr.userSelectionType == 9 || nodeExtAttr.userSelectionType == 10 || nodeExtAttr.userSelectionType == 11 || nodeExtAttr.userSelectionType == 12) {
-            _this4.getIsShowNextUser(nodeExtAttr && nodeExtAttr.userSelectionType);
+            _this5.getIsShowNextUser(nodeExtAttr && nodeExtAttr.userSelectionType);
           } else {
-            var _isMultiple = _this4.isMultiple(nodeExtAttr.userSelectionType),
+            var _isMultiple = _this5.isMultiple(nodeExtAttr.userSelectionType),
                 multiple = _isMultiple.multiple,
                 _params = _isMultiple.params;
 
-            _this4.multiple = multiple;
-            _this4.params = _params;
+            _this5.multiple = multiple;
+            _this5.params = _params;
           }
           // this.isReadMultiple(nodeExtAttr.userSelectionType);
 
           nextUserList.map(function (item) {
-            if (_this4.multiple && nodeExtAttr.isDefSelectedObj == 1 && nextUserList !== undefined) {
-              _this4.nextNode.nextUser.push(item.userId);
-              _this4.selectUserList.push({
+            if (_this5.multiple && nodeExtAttr.isDefSelectedObj == 1 && nextUserList !== undefined) {
+              _this5.nextNode.nextUser.push(item.userId);
+              _this5.selectUserList.push({
                 showname: item.username,
                 showid: item.userId
               });
             }
 
-            _this4.options.push({
+            _this5.options.push({
               showname: item.username,
               showid: item.userId
             });
           });
-          if (_this4.multiple) {
-            _this4.nextNode.nextReadUserId = [];
+          if (_this5.multiple) {
+            _this5.nextNode.nextReadUserId = [];
           } else {
-            _this4.nextNode.nextReadUserId = '';
+            _this5.nextNode.nextReadUserId = '';
           }
-          if (nextUserList.length > 0 && nodeExtAttr.isDefSelectedObj == 1 && !_this4.multiple) {
-            _this4.nextNode.nextUser = nextUserList[0].userId;
-            _this4.selectUserList.push({
+          if (nextUserList.length > 0 && nodeExtAttr.isDefSelectedObj == 1 && !_this5.multiple) {
+            _this5.nextNode.nextUser = nextUserList[0].userId;
+            _this5.selectUserList.push({
               showname: nextUserList[0].username,
               showid: nextUserList[0].userId
             });
           }
-          _this4.radioList = _this4.options;
+          _this5.radioList = _this5.options;
         } else {
-          _this4.$message.error(message || '系统错误，请联系管理员！');
+          _this5.$message.error(message || '系统错误，请联系管理员！');
         }
-        nodeId && _this4.$refs.selectUser[index].changeInfo();
+        nodeId && _this5.$refs.selectUser[index].changeInfo();
       }).catch(function (err) {
-        _this4.loading = false;
+        _this5.loading = false;
         if (err.message && err.message !== 'canceled') {
-          _this4.$message.error(err.message);
+          _this5.$message.error(err.message);
         }
       });
     },
@@ -35663,7 +35700,7 @@ var processFormvue_type_script_lang_js_components;
       this.$emit('cancel', false);
     },
     getFind: function getFind() {
-      var _this5 = this;
+      var _this6 = this;
 
       utils_util["a" /* default */].ajax({
         url: api["w" /* findSysCodes */]
@@ -35672,14 +35709,14 @@ var processFormvue_type_script_lang_js_components;
             message = res.message;
 
         if (status === 'success') {
-          _this5.nextNode.noticeType = message.split(',');
+          _this6.nextNode.noticeType = message.split(',');
         } else {
-          _this5.$message.error(message || '系统错误，请联系管理员！');
+          _this6.$message.error(message || '系统错误，请联系管理员！');
         }
       }).catch(function (err) {
-        _this5.loading = false;
+        _this6.loading = false;
         if (err.message && err.message !== 'canceled') {
-          _this5.$message.error(err.message);
+          _this6.$message.error(err.message);
         }
       });
     },
@@ -35697,15 +35734,15 @@ var processFormvue_type_script_lang_js_components;
         multiple = true;
       }
       if (val == 1 || val == 2 || val == 5) {
-        params.filid = utils_util["a" /* default */].getStorage('orgId');
+        params.filid = this.userModel.orgId;
         params.only_filid = true;
         if (choiceOrgId) {
           params.filid = choiceOrgId;
         }
       }
       if (val == 5 || val == 6) {
-        params.filid = utils_util["a" /* default */].getStorage('orgId');
-        params.deptid = utils_util["a" /* default */].getStorage('orgId');
+        params.filid = this.userModel.orgId;
+        params.deptid = this.userModel.orgId;
         if (choiceDeptId) {
           params.deptid = choiceDeptId;
         }
@@ -35714,7 +35751,7 @@ var processFormvue_type_script_lang_js_components;
         }
       }
       if (val == 15 || val == 16) {
-        params.filid = utils_util["a" /* default */].getStorage('orgId');
+        params.filid = this.userModel.orgId;
         if (pOrgId) {
           params.filid = pOrgId;
         }
@@ -35722,7 +35759,7 @@ var processFormvue_type_script_lang_js_components;
       return { multiple: multiple, params: params };
     },
     getStartFlow: function getStartFlow(processId) {
-      var _this6 = this;
+      var _this7 = this;
 
       if (!processId) {
         return false;
@@ -35742,80 +35779,80 @@ var processFormvue_type_script_lang_js_components;
             data = res.data;
 
         if (status == 'success') {
-          data.nodeInfoMap.nodeExtAttr.submitTipsMsg && _this6.$confirm(data.nodeInfoMap.nodeExtAttr.submitTipsMsg, '提示', {
+          data.nodeInfoMap.nodeExtAttr.submitTipsMsg && _this7.$confirm(data.nodeInfoMap.nodeExtAttr.submitTipsMsg, '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             type: 'warning'
           }).then(function () {}).catch(function () {
-            _this6.quit();
+            _this7.quit();
           });
-          _this6.customPresetHintMessage = data.customPresetHintMessage;
-          _this6.nextNode.nodeInfo = data.nextNodeList;
-          _this6.nextNode.nextNode = data.nextNodeList[0].nodeId;
-          _this6.isPreset = data.isPreset;
-          _this6.isHideDefaultOperation = data.nodeInfoMap.nodeExtAttr.isHideDefaultOperation;
-          _this6.defaultNextNode = data.nodeInfoMap.nodeExtAttr.defaultNextNode;
-          _this6.isChooseNextNode = data.nodeInfoMap.nodeExtAttr.isChooseNextNode;
-          _this6.isCdjxjTaskHandle = data.isCdjxjTaskHandle;
-          if (_this6.isChooseNextNode == 1) {
-            _this6.operationList = [{ key: 0, value: '默认', list: [] }, { key: 1, value: '自定义', list: [] }];
+          _this7.customPresetHintMessage = data.customPresetHintMessage;
+          _this7.nextNode.nodeInfo = data.nextNodeList;
+          _this7.nextNode.nextNode = data.nextNodeList[0].nodeId;
+          _this7.isPreset = data.isPreset;
+          _this7.isHideDefaultOperation = data.nodeInfoMap.nodeExtAttr.isHideDefaultOperation;
+          _this7.defaultNextNode = data.nodeInfoMap.nodeExtAttr.defaultNextNode;
+          _this7.isChooseNextNode = data.nodeInfoMap.nodeExtAttr.isChooseNextNode;
+          _this7.isCdjxjTaskHandle = data.isCdjxjTaskHandle;
+          if (_this7.isChooseNextNode == 1) {
+            _this7.operationList = [{ key: 0, value: '默认', list: [] }, { key: 1, value: '自定义', list: [] }];
             var arr = [];
             for (var key in data.taskNodeMap) {
               arr.push({ nodeName: data.taskNodeMap[key], nodeId: key });
             }
-            _this6.operationList[0].list = data.nextNodeList;
-            _this6.operationList[1].list = arr;
-            if (_this6.isHideDefaultOperation != 1) {
-              _this6.nextNode.nextOperate = 0;
-              _this6.nextNode.nodeInfo = _this6.operationList[0].list;
-              if (_this6.nextNode.nodeInfo.length > 0) {
-                _this6.nextNode.nextNode = _this6.defaultNextNode || data.nextNodeList[0].nodeId;
+            _this7.operationList[0].list = data.nextNodeList;
+            _this7.operationList[1].list = arr;
+            if (_this7.isHideDefaultOperation != 1) {
+              _this7.nextNode.nextOperate = 0;
+              _this7.nextNode.nodeInfo = _this7.operationList[0].list;
+              if (_this7.nextNode.nodeInfo.length > 0) {
+                _this7.nextNode.nextNode = _this7.defaultNextNode || data.nextNodeList[0].nodeId;
               }
             } else if (data.nodeInfoMap.nodeExtAttr.defaultNextOperate == 1 || data.nodeInfoMap.nodeExtAttr.isHideDefaultOperation == 1) {
               //  this.nextNode.nodeInfo = data.nextNodeList
-              _this6.nextNode.nextOperate = 1;
-              _this6.nextNode.nodeInfo = _this6.operationList[1].list;
-              if (_this6.nextNode.nodeInfo.length > 0) {
-                _this6.nextNode.nextNode = _this6.defaultNextNode || data.nextNodeList[0].nodeId;
+              _this7.nextNode.nextOperate = 1;
+              _this7.nextNode.nodeInfo = _this7.operationList[1].list;
+              if (_this7.nextNode.nodeInfo.length > 0) {
+                _this7.nextNode.nextNode = _this7.defaultNextNode || data.nextNodeList[0].nodeId;
               }
             }
           }
-          _this6.isCustomPreset = data.isCustomPreset;
-          _this6.presetTaskNodeKeyStr = data.presetTaskNodeKeyStr;
-          _this6.presetTaskNodeMap = data.presetTaskNodeMap;
-          _this6.isSinglePage = data.taskExamine.isSinglePage;
-          _this6.isSinglePage && (_this6.nextNode.opinion = data.taskExamine.opinion);
+          _this7.isCustomPreset = data.isCustomPreset;
+          _this7.presetTaskNodeKeyStr = data.presetTaskNodeKeyStr;
+          _this7.presetTaskNodeMap = data.presetTaskNodeMap;
+          _this7.isSinglePage = data.taskExamine.isSinglePage;
+          _this7.isSinglePage && (_this7.nextNode.opinion = data.taskExamine.opinion);
           // this.nextNode.noticeInfo = data.taskExamine.notificationMsg;
-          _this6.nextNode.nodeName = data.taskExamine.nodeName;
-          _this6.canPresetRead = data.canPresetRead;
+          _this7.nextNode.nodeName = data.taskExamine.nodeName;
+          _this7.canPresetRead = data.canPresetRead;
           if (data.canPresetRead) {
             var ids = data.nodeInfoMap.nodeExtAttr.presetReadCandinateIds.split(',');
             var names = data.nodeInfoMap.nodeExtAttr.presetReadCandinateNames.split(',');
             ids.map(function (item, index) {
-              _this6.presetReadUserId.push({
+              _this7.presetReadUserId.push({
                 showid: item,
                 showname: names[index]
               });
-              _this6.selectPresetUserList.push({
+              _this7.selectPresetUserList.push({
                 showid: item,
                 showname: names[index]
               });
-              _this6.nextNode.presetReadUserId.push(item);
+              _this7.nextNode.presetReadUserId.push(item);
             });
           }
-          _this6.getNodeInfos();
+          _this7.getNodeInfos();
           // this.getPresetFlowInfo();
-          _this6.isCustomPreset && _this6.$refs.customPreset.getPresetFlowInfo(_this6.nextNode.nextNode);
-          _this6.getFind();
-          _this6.getMessage();
-          _this6.getNodeType();
+          _this7.isCustomPreset && _this7.$refs.customPreset.getPresetFlowInfo(_this7.nextNode.nextNode);
+          _this7.getFind();
+          _this7.getMessage();
+          _this7.getNodeType();
         } else {
-          _this6.$message.error(message || '系统错误，请联系管理员！');
+          _this7.$message.error(message || '系统错误，请联系管理员！');
         }
       }).catch(function (err) {
-        _this6.loading = false;
+        _this7.loading = false;
         if (err.message && err.message !== 'canceled') {
-          _this6.$message.error(err.message);
+          _this7.$message.error(err.message);
         }
       });
     }
@@ -35833,8 +35870,8 @@ var processFormvue_type_script_lang_js_components;
 
 var processForm_component = normalizeComponent(
   src_processFormvue_type_script_lang_js_,
-  processFormvue_type_template_id_aaac09fe_render,
-  processFormvue_type_template_id_aaac09fe_staticRenderFns,
+  processFormvue_type_template_id_38d27a4e_render,
+  processFormvue_type_template_id_38d27a4e_staticRenderFns,
   false,
   null,
   null,
@@ -40682,7 +40719,7 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
       var _this20 = this;
 
       if (this.beforeSubmit != undefined) {
-        this.beforeSubmit().then(function (next) {
+        this.beforeSubmit(0).then(function (next) {
           _this20.taskReadType = 'transfer';
           _this20.showTaskRead = true;
         }).catch(function (e) {});
@@ -41556,8 +41593,8 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
 
 var flow_src_main_component = normalizeComponent(
   packages_flow_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_66b44e7f_render,
-  mainvue_type_template_id_66b44e7f_staticRenderFns,
+  mainvue_type_template_id_4080350e_render,
+  mainvue_type_template_id_4080350e_staticRenderFns,
   false,
   null,
   null,
@@ -45003,8 +45040,8 @@ handle_user_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var handle_user = (handle_user_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/handler/src/main.vue?vue&type=template&id=6f2ac1fb&
-var mainvue_type_template_id_6f2ac1fb_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/handler/src/main.vue?vue&type=template&id=352a790a&
+var mainvue_type_template_id_352a790a_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -45121,7 +45158,7 @@ var mainvue_type_template_id_6f2ac1fb_render = function () {
                                             class: [
                                               _vm.unicode(ele.icons)
                                                 ? ele.icons
-                                                : "es-icons",
+                                                : "es-icon",
                                               "es-sub-system-icon",
                                               {
                                                 "es-icon-yingyong": !ele.icons,
@@ -45202,11 +45239,11 @@ var mainvue_type_template_id_6f2ac1fb_render = function () {
     0
   )
 }
-var mainvue_type_template_id_6f2ac1fb_staticRenderFns = []
-mainvue_type_template_id_6f2ac1fb_render._withStripped = true
+var mainvue_type_template_id_352a790a_staticRenderFns = []
+mainvue_type_template_id_352a790a_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/handler/src/main.vue?vue&type=template&id=6f2ac1fb&
+// CONCATENATED MODULE: ./packages/handler/src/main.vue?vue&type=template&id=352a790a&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/handler/src/main.vue?vue&type=script&lang=js&
 //
@@ -45551,8 +45588,8 @@ mainvue_type_template_id_6f2ac1fb_render._withStripped = true
 
 var handler_src_main_component = normalizeComponent(
   packages_handler_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_6f2ac1fb_render,
-  mainvue_type_template_id_6f2ac1fb_staticRenderFns,
+  mainvue_type_template_id_352a790a_render,
+  mainvue_type_template_id_352a790a_staticRenderFns,
   false,
   null,
   null,
@@ -46003,20 +46040,20 @@ var input_src_mainvue_type_script_lang_js_typeof = typeof Symbol === "function"
       if (this.rules) {
         if (Array.isArray(this.rules)) {
           return this.rules.map(function (item) {
-            if (rules[item.type]) {
+            if (utils_rules[item.type]) {
               return {
-                pattern: rules[item.type]['pattern'],
-                message: item.message ? item.message : rules[item.type]['message'],
+                pattern: utils_rules[item.type]['pattern'],
+                message: item.message ? item.message : utils_rules[item.type]['message'],
                 trigger: item.trigger ? item.trigger : _this.fetchSuggestions || _this.url || _this.data.length > 0 ? 'change' : 'blur'
               };
             }
             return item;
           });
         }
-        if (rules[this.rules.type]) {
+        if (utils_rules[this.rules.type]) {
           return {
-            pattern: rules[this.rules.type]['pattern'],
-            message: this.rules.message ? this.rules.message : rules[this.rules.type]['message'],
+            pattern: utils_rules[this.rules.type]['pattern'],
+            message: this.rules.message ? this.rules.message : utils_rules[this.rules.type]['message'],
             trigger: this.rules.trigger ? this.rules.trigger : this.fetchSuggestions || this.url || this.data.length > 0 ? 'change' : 'blur'
           };
         }
@@ -46497,7 +46534,7 @@ var label_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
             }));
           } else if (this.icon.indexOf('&#') > -1) {
             doms.push(h('i', {
-              class: ['es-label-icon', 'es-icons', this.events && this.events['icon'] ? 'es-pointer' : ''],
+              class: ['es-label-icon', 'es-icon', this.events && this.events['icon'] ? 'es-pointer' : ''],
               on: {
                 click: function click(e) {
                   _this.handleClick(e, 'icon');
@@ -46594,7 +46631,7 @@ var label_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
                 }));
               } else if (this.contents[_i].indexOf('&#') > -1) {
                 doms.push(h('i', {
-                  class: ['es-label-icon', 'es-icons', this.events && this.events['icon'] ? 'es-pointer' : ''],
+                  class: ['es-label-icon', 'es-icon', this.events && this.events['icon'] ? 'es-pointer' : ''],
                   on: {
                     click: function click(e) {
                       _this.handleClick(e, 'icon');
@@ -47035,8 +47072,8 @@ layout_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var layout = (layout_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/main.vue?vue&type=template&id=1fd3e269&
-var mainvue_type_template_id_1fd3e269_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/main.vue?vue&type=template&id=44930eda&
+var mainvue_type_template_id_44930eda_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -47094,6 +47131,14 @@ var mainvue_type_template_id_1fd3e269_render = function () {
                   },
                 },
                 [
+                  _vm.loginTitleUrl
+                    ? _c("div", { staticClass: "es-login-title-image" }, [
+                        _c("img", {
+                          staticClass: "es-login-title-img",
+                          attrs: { src: _vm.loginTitleUrl },
+                        }),
+                      ])
+                    : _vm._e(),
                   _vm.switchs > 1
                     ? _c(
                         "div",
@@ -47147,13 +47192,22 @@ var mainvue_type_template_id_1fd3e269_render = function () {
                                 attrs: { model: _vm.formData },
                               },
                               [
-                                _c("div", { staticClass: "es-login-title" }, [
-                                  _c(
-                                    "span",
-                                    { staticClass: "es-login-title-content" },
-                                    [_vm._v(_vm._s(_vm.title))]
-                                  ),
-                                ]),
+                                !_vm.loginTitleUrl
+                                  ? _c(
+                                      "div",
+                                      { staticClass: "es-login-title" },
+                                      [
+                                        _c(
+                                          "span",
+                                          {
+                                            staticClass:
+                                              "es-login-title-content",
+                                          },
+                                          [_vm._v(_vm._s(_vm.title))]
+                                        ),
+                                      ]
+                                    )
+                                  : _vm._e(),
                                 _c(
                                   "el-form-item",
                                   {
@@ -47449,21 +47503,30 @@ var mainvue_type_template_id_1fd3e269_render = function () {
                               "div",
                               { staticClass: "es-login-qrcode" },
                               [
-                                _c("div", { staticClass: "es-login-title" }, [
-                                  _c(
-                                    "div",
-                                    { staticClass: "es-login-title-content" },
-                                    [
-                                      _vm._v(
-                                        "\n                " +
-                                          _vm._s(
-                                            _vm.iconfonts[_vm.active].name
-                                          ) +
-                                          "\n              "
-                                      ),
-                                    ]
-                                  ),
-                                ]),
+                                !_vm.loginTitleUrl
+                                  ? _c(
+                                      "div",
+                                      { staticClass: "es-login-title" },
+                                      [
+                                        _c(
+                                          "div",
+                                          {
+                                            staticClass:
+                                              "es-login-title-content",
+                                          },
+                                          [
+                                            _vm._v(
+                                              "\n                " +
+                                                _vm._s(
+                                                  _vm.iconfonts[_vm.active].name
+                                                ) +
+                                                "\n              "
+                                            ),
+                                          ]
+                                        ),
+                                      ]
+                                    )
+                                  : _vm._e(),
                                 _c(
                                   "div",
                                   { staticClass: "es-login-down-app" },
@@ -47527,7 +47590,10 @@ var mainvue_type_template_id_1fd3e269_render = function () {
                                 ),
                                 _vm.active == 3 && _vm.identifyingId
                                   ? _c("es-qr-code", {
-                                      attrs: { content: _vm.identifyingId },
+                                      attrs: {
+                                        content: _vm.identifyingId,
+                                        logo: _vm.qrimg,
+                                      },
                                     })
                                   : _vm._e(),
                                 _vm.active == 9
@@ -47564,17 +47630,28 @@ var mainvue_type_template_id_1fd3e269_render = function () {
                                 attrs: { model: _vm.formData },
                               },
                               [
-                                _c("div", { staticClass: "es-login-title" }, [
-                                  _c(
-                                    "span",
-                                    { staticClass: "es-login-title-content" },
-                                    [
-                                      _vm._v(
-                                        _vm._s(_vm.iconfonts[_vm.active].name)
-                                      ),
-                                    ]
-                                  ),
-                                ]),
+                                !_vm.loginTitleUrl
+                                  ? _c(
+                                      "div",
+                                      { staticClass: "es-login-title" },
+                                      [
+                                        _c(
+                                          "span",
+                                          {
+                                            staticClass:
+                                              "es-login-title-content",
+                                          },
+                                          [
+                                            _vm._v(
+                                              _vm._s(
+                                                _vm.iconfonts[_vm.active].name
+                                              )
+                                            ),
+                                          ]
+                                        ),
+                                      ]
+                                    )
+                                  : _vm._e(),
                                 _c(
                                   "el-form-item",
                                   {
@@ -47816,7 +47893,7 @@ var mainvue_type_template_id_1fd3e269_render = function () {
                   [_vm._v(_vm._s(_vm.icpInfo.copyright_unit))]
                 ),
                 _c(
-                  "span",
+                  "a",
                   {
                     staticClass: "es-login-icp-item",
                     style: _vm._copyrightStyle,
@@ -47915,11 +47992,11 @@ var mainvue_type_template_id_1fd3e269_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_1fd3e269_staticRenderFns = []
-mainvue_type_template_id_1fd3e269_render._withStripped = true
+var mainvue_type_template_id_44930eda_staticRenderFns = []
+mainvue_type_template_id_44930eda_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=1fd3e269&
+// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=44930eda&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/resetPassword.vue?vue&type=template&id=28f463b9&
 var resetPasswordvue_type_template_id_28f463b9_render = function () {
@@ -48056,7 +48133,7 @@ function resetPasswordvue_type_script_lang_js_objectWithoutProperties(obj, keys)
               required: true,
               message: '请输入手机号',
               trigger: 'blur'
-            }, resetPasswordvue_type_script_lang_js_extends({}, rules.phone, {
+            }, resetPasswordvue_type_script_lang_js_extends({}, utils_rules.phone, {
               trigger: 'blur'
             })]
           }, {
@@ -48822,6 +48899,10 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
 //
 //
 //
+//
+//
+//
+//
 
 
 
@@ -48857,8 +48938,12 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
     loginBackground: [String, Array],
     loginImage: [String, Array],
     loginLogo: String,
+    loginTitle: String,
     loginName: String,
-    type: String,
+    type: {
+      type: String,
+      default: '0'
+    },
     //是否加密传输
     isEncrypt: {
       type: Boolean,
@@ -48884,7 +48969,7 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
       default: function _default() {
         return {
           placeholder: '请输入手机号',
-          rules: [{ required: true, message: '手机号不能为空', trigger: 'change' }, login_src_mainvue_type_script_lang_js_extends({}, rules.phone, {
+          rules: [{ required: true, message: '手机号不能为空', trigger: 'change' }, login_src_mainvue_type_script_lang_js_extends({}, utils_rules.phone, {
             trigger: 'change'
           })]
         };
@@ -49020,6 +49105,13 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
   },
   computed: {
     transform: function transform() {
+      if (this.align.indexOf('%') > -1) {
+        return {
+          left: this.align,
+          top: '50%',
+          transform: 'translateY(-51%)'
+        };
+      }
       if (this.align === 'left') {
         return {
           left: '30%',
@@ -49056,26 +49148,20 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
     loginNameUrl: function loginNameUrl() {
       return this.loginNameImg ? this.loginNameImg : this.loginName;
     },
+    loginTitleUrl: function loginTitleUrl() {
+      return this.loginTitleImg ? this.loginTitleImg : this.loginTitle;
+    },
     loginLogoUrl: function loginLogoUrl() {
       return this.loginLogoImg ? this.loginLogoImg : this.loginLogo;
     },
     warnInfo: function warnInfo() {
       return this.warning === false ? false : typeof this.warning === 'string' ? this.warning : '本系统为非涉密系统，禁止上传和处理任何涉密文件';
     },
-    loginType: function loginType() {
-      if (this.type) {
-        return this.type;
-      }
-      if (this.loginModel) {
-        return this.loginModel;
-      }
-      return '0';
-    },
     switchs: function switchs() {
-      return Array.isArray(this.loginType) ? this.loginType.length : this.loginType.split(',').length;
+      return Array.isArray(this.loginModel) ? this.loginModel.length : this.loginModel.split(',').length;
     },
     iconfonts: function iconfonts() {
-      var types = this.loginType.split(',');
+      var types = this.loginModel.split(',');
       return types.length > 2 ? {
         0: { type: '0', icon: 'es-icon-shuru', name: '账号登录' },
         1: { type: '1', icon: 'es-icon-usb-key', name: '证书登录' },
@@ -49104,7 +49190,7 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
       var _this = this;
 
       var icon = [];
-      var types = this.loginType.split(',');
+      var types = this.loginModel.split(',');
       types.forEach(function (item) {
         icon.push(_this.iconfonts[item]);
       });
@@ -49121,7 +49207,7 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
     }
   },
   watch: {
-    loginType: {
+    loginModel: {
       immediate: true,
       handler: function handler(val) {
         this.active = val.split(',')[0];
@@ -49173,8 +49259,9 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
       loginBackgroundImg: null,
       loginMainImg: null,
       loginNameImg: null,
+      loginTitleImg: null,
       loginLogoImg: null,
-      loginModel: null,
+      loginModel: this.type,
       passModifyModel: null,
       active: 0,
       submit: false,
@@ -49378,7 +49465,7 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
       this.$emit('change-type', res, this.identifyingId);
     },
     isShow: function isShow(res) {
-      return this.loginType.indexOf(res) > -1;
+      return this.loginModel.indexOf(res) > -1;
     },
     getLogin: function getLogin() {
       var _this3 = this;
@@ -49416,8 +49503,11 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
       if (res.androidDownloadUrl) {
         downloads['android'] = res.androidDownloadUrl;
       }
-      if (res.iosDownloadUrl || res.iosDownloadUrl2) {
-        downloads['ios'] = res.iosDownloadUrl || res.iosDownloadUrl2;
+      if (res.iosDownloadUrl) {
+        downloads['ios'] = res.iosDownloadUrl;
+      }
+      if (res.iosDownloadUrl2) {
+        downloads['pad'] = res.iosDownloadUrl2;
       }
       if (res.macDownloadUrl) {
         downloads['mac'] = res.macDownloadUrl;
@@ -49434,8 +49524,12 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
       this.downloadSetup = res.downloadSetup;
       document.title = res.subsystemName;
       this.app = res.appName || res.subsystemName;
-      this.qrimg = res.qrimg || res.qrImg;
-      this.loginModel = res.loginModel;
+      if (res.qrimg || res.qrImg) {
+        this.qrimg = res.qrimg || res.qrImg;
+      }
+      if (res.loginModel) {
+        this.loginModel = res.loginModel;
+      }
       this.loginBackgroundImg = res.loginBackgroundUrl ? res.loginBackgroundUrl.split(',') : null;
       this.loginLogoImg = res.loginLogoUrl ? res.loginLogoUrl : null;
       res.loginPage && sessionStorage.setItem('loginPage', res.loginPage);
@@ -49449,8 +49543,15 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
         if (res.subsystemExtend.applicationName) {
           localStorage.setItem('appcode', res.subsystemExtend.applicationName);
         }
-        this.loginMainImg = res.subsystemExtend.loginBoxBackground ? res.subsystemExtend.loginBoxBackground.split(',') : null;
-        this.loginNameImg = res.subsystemExtend.loginBoxName ? res.subsystemExtend.loginBoxName.split(',') : null;
+        if (res.subsystemExtend.loginBoxBackgroun) {
+          this.loginMainImg = res.subsystemExtend.loginBoxBackground.split(',');
+        }
+        if (res.subsystemExtend.loginBoxTitle) {
+          this.loginTitleImg = res.subsystemExtend.loginBoxTitle;
+        }
+        if (res.subsystemExtend.loginBoxName) {
+          this.loginNameImg = res.subsystemExtend.loginBoxName;
+        }
         if (res.subsystemExtend.loginBoxAlign && this.useResults) {
           this.align = res.subsystemExtend.loginBoxAlign;
         }
@@ -49910,8 +50011,8 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
 
 var login_src_main_component = normalizeComponent(
   packages_login_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_1fd3e269_render,
-  mainvue_type_template_id_1fd3e269_staticRenderFns,
+  mainvue_type_template_id_44930eda_render,
+  mainvue_type_template_id_44930eda_staticRenderFns,
   false,
   null,
   null,
@@ -49928,8 +50029,8 @@ login_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var login = (login_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=template&id=fa469480&
-var mainvue_type_template_id_fa469480_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=template&id=5b54252b&
+var mainvue_type_template_id_5b54252b_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -50330,6 +50431,7 @@ var mainvue_type_template_id_fa469480_render = function () {
                   "userinfo",
                   _vm._b(
                     {
+                      attrs: { contents: _vm.userInfoContents },
                       on: {
                         change: _vm.handleUserModel,
                         reGetConfig: _vm.reGetConfig,
@@ -50355,14 +50457,14 @@ var mainvue_type_template_id_fa469480_render = function () {
     1
   )
 }
-var mainvue_type_template_id_fa469480_staticRenderFns = []
-mainvue_type_template_id_fa469480_render._withStripped = true
+var mainvue_type_template_id_5b54252b_staticRenderFns = []
+mainvue_type_template_id_5b54252b_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=fa469480&
+// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=5b54252b&
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/userinfo.vue?vue&type=template&id=fc09aaf8&
-var userinfovue_type_template_id_fc09aaf8_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/userinfo.vue?vue&type=template&id=75d533de&
+var userinfovue_type_template_id_75d533de_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -50378,13 +50480,15 @@ var userinfovue_type_template_id_fc09aaf8_render = function () {
     2
   )
 }
-var userinfovue_type_template_id_fc09aaf8_staticRenderFns = []
-userinfovue_type_template_id_fc09aaf8_render._withStripped = true
+var userinfovue_type_template_id_75d533de_staticRenderFns = []
+userinfovue_type_template_id_75d533de_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/userinfo.vue?vue&type=template&id=fc09aaf8&
+// CONCATENATED MODULE: ./packages/main/src/userinfo.vue?vue&type=template&id=75d533de&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/userinfo.vue?vue&type=script&lang=js&
+var userinfovue_type_script_lang_js_extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
+
 //
 //
 //
@@ -50413,6 +50517,102 @@ userinfovue_type_template_id_fc09aaf8_render._withStripped = true
     secret: {
       type: Boolean,
       default: true
+    },
+    contents: {
+      type: Array,
+      default: function _default() {
+        return [{
+          title: '用户信息',
+          contents: [{
+            type: 'upload',
+            name: 'userHeadUrl',
+            label: '头像',
+            portrait: true,
+            code: 'USER_IMG',
+            col: 12,
+            weixinQrcode: true,
+            class: 'es-flex-none'
+          }, {
+            type: 'select',
+            name: 'job',
+            label: '切换职务',
+            valueType: 'object',
+            class: 'es-user-info-job',
+            row: true,
+            col: 12
+          }, {
+            name: 'orgName',
+            label: '所属机构',
+            type: 'text',
+            disabled: true,
+            col: 6
+          }, {
+            name: 'depName',
+            label: '所属部门',
+            type: 'text',
+            disabled: true,
+            col: 6
+          }, {
+            name: 'idCard',
+            label: '身份证号',
+            type: 'text',
+            disabled: true,
+            col: 6
+          }, {
+            name: 'outCode',
+            label: '工号',
+            type: 'text',
+            disabled: true,
+            col: 6
+          }, {
+            name: 'phone',
+            placeholder: '联系电话',
+            label: '联系电话',
+            type: 'text',
+            col: 6
+          }, {
+            name: 'email',
+            placeholder: '电子邮箱',
+            label: '电子邮箱',
+            type: 'text',
+            rules: {
+              type: 'email',
+              message: '请输入正确的邮箱地址',
+              trigger: 'blur'
+            },
+            col: 6
+          }, {
+            name: 'officetel',
+            placeholder: '座机号',
+            label: '座机号',
+            type: 'text',
+            rules: {
+              type: 'telephone'
+              //message: '请输入正确的邮箱地址',
+              //trigger: 'blur'
+            },
+            col: 6
+          }, {
+            name: 'oldpassword',
+            placeholder: '旧密码',
+            label: '旧密码',
+            type: 'text',
+            col: 6
+          }, {
+            name: 'password',
+            placeholder: '新密码',
+            label: '新密码',
+            type: 'text',
+            col: 6
+          }, {
+            name: 'repassword',
+            placeholder: '确认新密码',
+            label: '确认新密码',
+            type: 'text',
+            col: 6
+          }]
+        }];
+      }
     }
   },
   data: function data() {
@@ -50441,123 +50641,52 @@ userinfovue_type_template_id_fc09aaf8_render._withStripped = true
 
   computed: {
     forms: function forms() {
-      var page = [{
-        title: '用户信息',
-        contents: [{
-          type: 'upload',
-          name: 'userHeadUrl',
-          label: '头像',
-          portrait: true,
-          code: 'USER_IMG',
-          ownId: utils_store.get('userModel').personId,
-          onSuccess: this.handleUploadSuccess,
-          col: 12,
-          class: 'es-flex-none',
-          inline: this.qrcode ? {
-            range: false,
-            class: 'weixinQrcode',
-            type: 'image',
-            url: this.qrcode,
-            event: this.getQrcode
-          } : ''
-        },
-        // {
-        //   type: 'upload',
-        //   name: 'userQrcode',
-        //   // label: '微信二维码',
-        //   portrait: true,
-        //   code: 'USER_IMG',
-        //   ownId: 'ddd',
-        //   class: 'es-qrcode',
-        //   col: 12
-        // },
-        {
-          type: 'select',
-          name: 'job',
-          label: '切换职务',
-          valueType: 'object',
-          data: utils_store.get('userModel').identityList,
-          class: 'es-user-info-job',
-          row: true,
-          col: 12
-        }, {
-          name: 'orgName',
-          label: '所属机构',
-          type: 'text',
-          disabled: true,
-          col: 6
-        }, {
-          name: 'depName',
-          label: '所属部门',
-          type: 'text',
-          disabled: true,
-          col: 6
-        }, {
-          name: 'idCard',
-          label: '身份证号',
-          type: 'text',
-          disabled: true,
-          row: true,
-          col: 12
-        }, {
-          name: 'phone',
-          placeholder: '联系电话',
-          label: '联系电话',
-          type: 'text',
-          col: 6
-        }, {
-          name: 'email',
-          placeholder: '电子邮箱',
-          label: '电子邮箱',
-          type: 'text',
-          rules: {
-            type: 'email',
-            message: '请输入正确的邮箱地址',
-            trigger: 'blur'
-          },
-          col: 6
-        }, {
-          name: 'officetel',
-          placeholder: '座机号',
-          label: '座机号',
-          type: 'text',
-          rules: {
-            type: 'telephone'
-            //message: '请输入正确的邮箱地址',
-            //trigger: 'blur'
-          },
-          col: 6
-        }, {
-          name: 'oldpassword',
-          placeholder: '旧密码',
-          label: '旧密码',
-          rules: this.values.password ? { required: true, message: '请输入旧密码' } : {},
-          type: 'text',
-          col: 6
-        }, {
-          name: 'password',
-          placeholder: '新密码',
-          label: '新密码',
-          type: 'text',
-          rules: [this.checkPassword ? {
-            pattern: this.checkPassword,
-            message: this.checkPasswordMsg ? this.checkPasswordMsg : '密码格式不合法',
-            trigger: 'blur'
-          } : {}],
-          col: 6
-        }, {
-          name: 'repassword',
-          placeholder: '确认新密码',
-          label: '确认新密码',
-          type: 'text',
-          rules: [this.checkPassword ? {
-            pattern: this.checkPassword,
-            message: this.checkPasswordMsg ? this.checkPasswordMsg : '密码格式不合法',
-            trigger: 'blur'
-          } : {}, { validator: this.repassword, trigger: 'blur' }],
-          col: 6
-        }]
-      }];
+      var page = JSON.parse(JSON.stringify(this.contents));
+      for (var i = 0; i < page.length; i++) {
+        for (var x = 0; x < page[i].contents.length; x++) {
+          var item = page[i].contents[x];
+          if (item.name == 'userHeadUrl') {
+            page[i].contents[x].ownId = utils_store.get('userModel').personId;
+            page[i].contents[x].onSuccess = this.handleUploadSuccess;
+            if (item.weixinQrcode && this.qrcode) {
+              page[i].contents[x].inline = {
+                range: false,
+                class: 'weixinQrcode',
+                type: 'image',
+                url: this.qrcode,
+                event: this.getQrcode
+              };
+            }
+          }
+          if (item.name == 'job') {
+            page[i].contents[x].data = utils_store.get('userModel').identityList;
+          }
+          if (item.name == 'oldpassword') {
+            page[i].contents[x].rules = {
+              required: true,
+              message: '请输入旧密码'
+            };
+          }
+          if (item.name == 'password' && this.checkPassword) {
+            page[i].contents[x].rules = {
+              pattern: this.checkPassword,
+              message: this.checkPasswordMsg ? this.checkPasswordMsg : '密码格式不合法',
+              trigger: 'blur'
+            };
+          }
+          if (item.name == 'repassword') {
+            var rules = [{ validator: this.repassword, trigger: 'blur' }];
+            if (this.checkPassword) {
+              rules.push({
+                pattern: this.checkPassword,
+                message: this.checkPasswordMsg ? this.checkPasswordMsg : '密码格式不合法',
+                trigger: 'blur'
+              });
+            }
+            page[i].contents[x].rules = rules;
+          }
+        }
+      }
       if (this.showNotify) {
         page.push({
           title: '接收消息类型',
@@ -50615,12 +50744,13 @@ userinfovue_type_template_id_fc09aaf8_render._withStripped = true
             _this2.checkPasswordMsg = results.checkPasswordMsg;
           }
           _this2.results = results.simpleUserInfo;
-          _this2.values.orgName = results.simpleUserInfo.orgName;
-          _this2.values.depName = results.simpleUserInfo.depName;
-          _this2.values.idCard = results.simpleUserInfo.idCard;
-          _this2.values.phone = results.simpleUserInfo.phone;
-          _this2.values.email = results.simpleUserInfo.email;
-          _this2.values.officeTel = results.simpleUserInfo.officeTel;
+          _this2.values = userinfovue_type_script_lang_js_extends({}, _this2.values, results.simpleUserInfo);
+          // this.values.orgName = results.simpleUserInfo.orgName;
+          // this.values.depName = results.simpleUserInfo.depName;
+          // this.values.idCard = results.simpleUserInfo.idCard;
+          // this.values.phone = results.simpleUserInfo.phone;
+          // this.values.email = results.simpleUserInfo.email;
+          // this.values.officeTel = results.simpleUserInfo.officeTel;
           if (results.userScanBindImgUrl) {
             _this2.userScanBindImgUrl = results.userScanBindImgUrl;
             _this2.qrcode = utils_util["a" /* default */].getStorage('host') + results.userScanBindImgUrl;
@@ -50802,8 +50932,8 @@ userinfovue_type_template_id_fc09aaf8_render._withStripped = true
 
 var userinfo_component = normalizeComponent(
   src_userinfovue_type_script_lang_js_,
-  userinfovue_type_template_id_fc09aaf8_render,
-  userinfovue_type_template_id_fc09aaf8_staticRenderFns,
+  userinfovue_type_template_id_75d533de_render,
+  userinfovue_type_template_id_75d533de_staticRenderFns,
   false,
   null,
   null,
@@ -52403,6 +52533,7 @@ var main_src_mainvue_type_script_lang_js_extends = Object.assign || function (ta
 //
 //
 //
+//
 
 
 
@@ -52438,10 +52569,7 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
     //菜单展开关闭
     icons: Object,
     //logo
-    logo: {
-      type: String,
-      default: 'errorlogo'
-    },
+    logo: String,
     //菜单显示类型
     scene: {
       type: String,
@@ -52780,6 +52908,7 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
       color: utils_util["a" /* default */].getStorage('theme') ? utils_util["a" /* default */].getStorage('theme') : this.theme,
       //显示用户信息
       showUserInfo: false,
+      userInfoContents: undefined,
       //是否展示侧边导航
       showMenu: true,
       props: {},
@@ -53065,6 +53194,9 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
             this.color = color;
           }
         }
+        if (i === 'subsystemExtend' && results[i].userInfoContents) {
+          this.userInfoContents = results[i].userInfoContents;
+        }
         if (i === 'subsystemExtend' && results[i].webPageWatermark) {
           try {
             utils_util["a" /* default */].win.top.webPageWatermark = results[i].webPageWatermark;
@@ -53724,13 +53856,13 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
         case 'user':
           this.showUserInfo = true;
           break;
-        case 'online':
-          this.dialog = {
-            title: '查看在线人员',
-            show: true,
-            url: '/main/sysuseronline/list.dhtml'
-          };
-          break;
+        // case 'online':
+        //   this.dialog = {
+        //     title: '查看在线人员',
+        //     show: true,
+        //     url: '/main/sysuseronline/list.dhtml'
+        //   };
+        //   break;
         case 'notice':
           this.showMsg = !this.showMsg;
           break;
@@ -53780,7 +53912,7 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
         utils_util["a" /* default */].win.open(page);
       } else if (type == 2) {
         location.href = page;
-      } else if (type == 3) {
+      } else if (type == 3 || this.loadWujie === false || this.downgrade && isIE) {
         this.method = 'iframe';
         this.refresh = false;
         this.page = utils_util["a" /* default */].handlerUrl(page, param);
@@ -54035,9 +54167,10 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
         clearTimeout(this.sysMsgOut);
       }
     },
-    handleDialog: function handleDialog(obj) {
-      this.dialog = obj;
-    },
+
+    // handleDialog(obj) {
+    //   this.dialog = obj;
+    // },
     handleUserModel: function handleUserModel(name, val) {
       this.$set(this.userModel, name, val);
     },
@@ -54168,8 +54301,8 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
 
 var main_src_main_component = normalizeComponent(
   packages_main_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_fa469480_render,
-  mainvue_type_template_id_fa469480_staticRenderFns,
+  mainvue_type_template_id_5b54252b_render,
+  mainvue_type_template_id_5b54252b_staticRenderFns,
   false,
   null,
   null,
@@ -54398,7 +54531,7 @@ var menu_src_mainvue_type_script_lang_js_extends = Object.assign || function (ta
         popper = this.popperClass !== undefined ? this.popperClass : ' es-menu-popper-' + this.mode;
       }
       var title = [h('i', {
-        class: [item.icons ? this.unicode(item.icons) ? item.icons : 'es-icons iconfont' : 'es-icon-application', 'es-menu-item-icon'],
+        class: [item.icons ? this.unicode(item.icons) ? item.icons : 'es-icon iconfont' : 'es-icon-application', 'es-menu-item-icon'],
         domProps: item.icons === '' || this.unicode(item.icons) ? {} : { innerHTML: item.icons }
       }), h('div', {
         class: ['es-menu-title-text es-menu-title-' + this.mode]
@@ -54489,7 +54622,7 @@ var menu_src_mainvue_type_script_lang_js_extends = Object.assign || function (ta
         doms = doms.concat(_this5.getSub(item, h, 'es-sub-menu'));
       } else {
         var title = [h('i', {
-          class: [item.icons ? _this5.unicode(item.icons) ? item.icons : 'es-icons iconfont' : 'es-icon-application', 'es-menu-item-icon'],
+          class: [item.icons ? _this5.unicode(item.icons) ? item.icons : 'es-icon iconfont' : 'es-icon-application', 'es-menu-item-icon'],
           domProps: item.icons === '' || _this5.unicode(item.icons) ? {} : { innerHTML: item.icons }
         }), h('div', {
           class: ['es-menu-title-text es-menu-title-' + _this5.mode]
@@ -56362,8 +56495,8 @@ player_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var player = (player_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/qr-code/src/main.vue?vue&type=template&id=31151606&
-var mainvue_type_template_id_31151606_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/qr-code/src/main.vue?vue&type=template&id=28375a46&
+var mainvue_type_template_id_28375a46_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -56376,13 +56509,6 @@ var mainvue_type_template_id_31151606_render = function () {
         staticClass: "es-qrcode-img",
         attrs: { width: _vm._width, height: _vm._height, alt: "二维码图片" },
       }),
-      _vm.logo
-        ? _c("img", {
-            ref: "qrcodeLogo",
-            staticClass: "es-qrcode-logo",
-            attrs: { src: _vm.logo, alt: "二维码logo" },
-          })
-        : _vm._e(),
       _c("canvas", {
         ref: "canvas",
         staticClass: "canvas",
@@ -56391,11 +56517,11 @@ var mainvue_type_template_id_31151606_render = function () {
     ]
   )
 }
-var mainvue_type_template_id_31151606_staticRenderFns = []
-mainvue_type_template_id_31151606_render._withStripped = true
+var mainvue_type_template_id_28375a46_staticRenderFns = []
+mainvue_type_template_id_28375a46_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/qr-code/src/main.vue?vue&type=template&id=31151606&
+// CONCATENATED MODULE: ./packages/qr-code/src/main.vue?vue&type=template&id=28375a46&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/qr-code/src/main.vue?vue&type=script&lang=js&
 //
@@ -56500,7 +56626,7 @@ var QRCode = __webpack_require__(24);
       var _this3 = this;
 
       var qrcodeImg = this.$refs.qrcodeImg;
-      var qrcodeLogo = this.$refs.qrcodeLogo;
+      //let qrcodeLogo = this.$refs.qrcodeLogo;
       var canvas = this.$refs.canvas;
       var option = utils_util["a" /* default */].extend({}, this.option, {
         width: this._width,
@@ -56518,6 +56644,8 @@ var QRCode = __webpack_require__(24);
             //获取图片
             ctx.drawImage(qrcodeImg, 0, 0, _this3._width, _this3._height);
             if (_this3.logo && _this3.logo.indexOf('.') > -1) {
+              var logo = new Image();
+              logo.src = _this3.logo;
               //设置logo大小
               var logoPosition = (_this3._width - 46) / 2; //logo相对于canvas居中定位
               //设置获取的logo将其变为圆角以及添加白色背景
@@ -56535,7 +56663,10 @@ var QRCode = __webpack_require__(24);
               ctx.arcTo(x, y, x + w, y, r);
               ctx.closePath();
               ctx.fill(); */
-              ctx.drawImage(qrcodeLogo, logoPosition, logoPosition, 46, 46);
+              logo.onload = function () {
+                ctx.drawImage(logo, logoPosition, logoPosition, 46, 46);
+                qrcodeImg.src = canvas.toDataURL();
+              };
             } else if (_this3.text) {
               //设置字体
               var fpadd = 10; //规定内间距
@@ -56571,8 +56702,8 @@ var QRCode = __webpack_require__(24);
 
 var qr_code_src_main_component = normalizeComponent(
   packages_qr_code_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_31151606_render,
-  mainvue_type_template_id_31151606_staticRenderFns,
+  mainvue_type_template_id_28375a46_render,
+  mainvue_type_template_id_28375a46_staticRenderFns,
   false,
   null,
   null,
@@ -71836,20 +71967,20 @@ var src_tablevue_type_script_lang_js_extends = Object.assign || function (target
             if (item.required) {
               _this2.required = item.required;
             }
-            if (rules[item.type]) {
+            if (utils_rules[item.type]) {
               return {
-                pattern: rules[item.type]['pattern'],
-                message: item.message ? item.message : rules[item.type]['message'],
+                pattern: utils_rules[item.type]['pattern'],
+                message: item.message ? item.message : utils_rules[item.type]['message'],
                 trigger: item.trigger ? item.trigger : res.fetchSuggestions || res.url || res.data && res.data.length ? 'change' : 'blur'
               };
             }
             return item;
           });
         }
-        if (rules[res.rules.type]) {
+        if (utils_rules[res.rules.type]) {
           return {
-            pattern: rules[res.rules.type]['pattern'],
-            message: res.rules.message ? res.rules.message : rules[res.rules.type]['message'],
+            pattern: utils_rules[res.rules.type]['pattern'],
+            message: res.rules.message ? res.rules.message : utils_rules[res.rules.type]['message'],
             trigger: res.rules.trigger ? res.rules.trigger : res.fetchSuggestions || res.url || res.data && res.data.length ? 'change' : 'blur'
           };
         }
@@ -73935,7 +74066,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-  version: '0.5.62',
+  version: '0.5.64',
   install: install,
   Button: packages_button,
   ButtonGroup: button_group,