eoss-ui 0.6.95 → 0.6.96

package/lib/input.js

@@ -4028,7 +4028,7 @@ var phone = { pattern: new RegExp('^[1][3, 4, 5, 6, 7, 8, 9][0-9]{9}$'), message
 // 身份证
 var idCard = { pattern: new RegExp('(^\\d{15}$)|(^\\d{18}$)|(^\\d{17}(\\d|X|x)$)'), message: '身份证号不合法' };
 // 座机号
-var telephone = { pattern: new RegExp('^(\\d{3,4}-)?\\d{7,8}$'), message: '座机号不合法' };
+var telephone = { pattern: new RegExp('^(?:\\(?0([1-9]\\d{1,2})\\)?[- ]?)?([2-9]\\d{6,7})$'), message: '座机号不合法' };
 // IP
 var ip = { pattern: new RegExp('^(\\d{1,2}|1\\d\\d|2[0-4]\\d|25[0-5])\\.(\\d{1,2}|1\\d\\d|2[0-4]\\d|25[0-5])\\.(\\d{1,2}|1\\d\\d|2[0-4]\\d|25[0-5])\\.(\\d{1,2}|1\\d\\d|2[0-4]\\d|25[0-5])$'), message: 'IP地址不合法' };
 // 银行卡号

package/lib/login.js

@@ -4329,7 +4329,7 @@ var phone = { pattern: new RegExp('^[1][3, 4, 5, 6, 7, 8, 9][0-9]{9}$'), message
 // 身份证
 var idCard = { pattern: new RegExp('(^\\d{15}$)|(^\\d{18}$)|(^\\d{17}(\\d|X|x)$)'), message: '身份证号不合法' };
 // 座机号
-var telephone = { pattern: new RegExp('^(\\d{3,4}-)?\\d{7,8}$'), message: '座机号不合法' };
+var telephone = { pattern: new RegExp('^(?:\\(?0([1-9]\\d{1,2})\\)?[- ]?)?([2-9]\\d{6,7})$'), message: '座机号不合法' };
 // IP
 var ip = { pattern: new RegExp('^(\\d{1,2}|1\\d\\d|2[0-4]\\d|25[0-5])\\.(\\d{1,2}|1\\d\\d|2[0-4]\\d|25[0-5])\\.(\\d{1,2}|1\\d\\d|2[0-4]\\d|25[0-5])\\.(\\d{1,2}|1\\d\\d|2[0-4]\\d|25[0-5])$'), message: 'IP地址不合法' };
 // 银行卡号
@@ -4378,7 +4378,7 @@ var nightImg = 'data:image/jpeg;base64,/9j/2wCEAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBA
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// 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=8146921c&
+// 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=53be147b&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -5672,7 +5672,7 @@ var staticRenderFns = [
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=8146921c&
+// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=53be147b&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(4);
@@ -7320,7 +7320,6 @@ var ceshi = util["a" /* default */].getParams('ceshi');
           _this3.$message({
             message: msg || '系统错误，请联系管理员！',
             type: 'error',
-            duration: 1500,
             onClose: function onClose() {
               window.location.href = util["a" /* default */].delUrlParam({ key: 'code' });
               if (window.location.hash) {
@@ -7542,8 +7541,7 @@ var ceshi = util["a" /* default */].getParams('ceshi');
                   } else {
                     _this6.$message({
                       message: res.msg || '系统错误，请联系管理员！',
-                      type: 'error',
-                      duration: 2000
+                      type: 'error'
                     });
                   }
                 }).catch(function (err) {
@@ -7767,7 +7765,7 @@ var ceshi = util["a" /* default */].getParams('ceshi');
       }).then(function (res) {
         _this7.$message({
           message: res.msg,
-          duration: 2000,
+          duration: res.rCode == 0 ? 2000 : 3000,
           type: res.rCode == 0 ? 'success' : 'error'
         });
 
@@ -7863,7 +7861,6 @@ var ceshi = util["a" /* default */].getParams('ceshi');
           _this9.$message({
             message: msg || '系统错误，请联系管理员！',
             type: 'error',
-            duration: 1500,
             onClose: function onClose() {
               _this9.btnText = '获取验证码';
               _this9.disabled = false;
@@ -7902,7 +7899,6 @@ var ceshi = util["a" /* default */].getParams('ceshi');
           _this10.$message({
             message: msg || '系统错误，请联系管理员！',
             type: 'error',
-            duration: 1500,
             onClose: function onClose() {
               _this10.getImgCode();
               _this10.loginInfo(_this10.active == 3);
@@ -8083,7 +8079,6 @@ var ceshi = util["a" /* default */].getParams('ceshi');
             this.$message({
               message: results.msg,
               type: 'error',
-              duration: 1500,
               onClose: function onClose() {
                 if (_this13.code) {
                   window.location.href = util["a" /* default */].delUrlParam({ key: 'code' });