eoss-ui 0.6.21 → 0.6.22

package/lib/login.js

@@ -4026,7 +4026,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=3086e0dc&
+// 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=5b545408&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -4538,8 +4538,8 @@ var render = function () {
                                               {
                                                 name: "show",
                                                 rawName: "v-show",
-                                                value: _vm.forget,
-                                                expression: "forget",
+                                                value: _vm.showForget,
+                                                expression: "showForget",
                                               },
                                             ],
                                             staticClass: "es-password-forget",
@@ -4550,7 +4550,7 @@ var render = function () {
                                               {
                                                 on: { click: _vm.handleForget },
                                               },
-                                              [_vm._v("修改密码")]
+                                              [_vm._v("忘记密码")]
                                             ),
                                           ]
                                         ),
@@ -4934,8 +4934,8 @@ var render = function () {
                                               {
                                                 name: "show",
                                                 rawName: "v-show",
-                                                value: _vm.forget,
-                                                expression: "forget",
+                                                value: _vm.showForget,
+                                                expression: "showForget",
                                               },
                                             ],
                                             staticClass: "es-password-forget",
@@ -4943,7 +4943,7 @@ var render = function () {
                                           },
                                           [
                                             _vm._v(
-                                              "\n                  修改密码\n                "
+                                              "\n                  忘记密码\n                "
                                             ),
                                           ]
                                         ),
@@ -5030,7 +5030,7 @@ var render = function () {
             "es-dialog",
             {
               attrs: {
-                title: "修改密码",
+                title: _vm.operationCheckCode ? "修改密码" : "密码重置",
                 width: "680px",
                 height: "auto",
                 visible: _vm.showResetPassword,
@@ -5044,7 +5044,7 @@ var render = function () {
             [
               _vm.showResetPassword
                 ? _vm._t(
-                    "user",
+                    "resetPassword",
                     [
                       _c("reset-password", {
                         attrs: {
@@ -5165,7 +5165,7 @@ var staticRenderFns = [
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=3086e0dc&
+// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=5b545408&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(13);
@@ -5174,8 +5174,8 @@ var regenerator_default = /*#__PURE__*/__webpack_require__.n(regenerator_);
 // EXTERNAL MODULE: external "throttle-debounce"
 var external_throttle_debounce_ = __webpack_require__(11);
 
-// 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=cab38660&
-var resetPasswordvue_type_template_id_cab38660_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/resetPassword.vue?vue&type=template&id=45dccfdc&
+var resetPasswordvue_type_template_id_45dccfdc_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -5221,7 +5221,7 @@ var resetPasswordvue_type_template_id_cab38660_render = function () {
           },
         ],
         ref: "pwdForm",
-        staticClass: "es-user-info",
+        staticClass: "es-rest-password",
         attrs: {
           "element-loading-text": "修改中...",
           "element-loading-spinner": "el-icon-loading",
@@ -5236,11 +5236,11 @@ var resetPasswordvue_type_template_id_cab38660_render = function () {
     1
   )
 }
-var resetPasswordvue_type_template_id_cab38660_staticRenderFns = []
-resetPasswordvue_type_template_id_cab38660_render._withStripped = true
+var resetPasswordvue_type_template_id_45dccfdc_staticRenderFns = []
+resetPasswordvue_type_template_id_45dccfdc_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/login/src/resetPassword.vue?vue&type=template&id=cab38660&
+// CONCATENATED MODULE: ./packages/login/src/resetPassword.vue?vue&type=template&id=45dccfdc&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -5529,14 +5529,21 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
     };
   },
   created: function created() {
+    var _this = this;
+
     this.getInitModifyPassword();
     if (this.type) {
       var types = this.type.split(',');
       if (types.length) {
-        this.activeIndex = types[0];
+        types.forEach(function (item) {
+          if (item != '0' && (item == '11' || item == '6')) {
+            _this.activeIndex = item;
+            return;
+          }
+        });
       }
     } else {
-      this.activeIndex = '0';
+      this.activeIndex = this.operationCheckCode ? '0' : '';
     }
   },
   destroyed: function destroyed() {
@@ -5553,7 +5560,7 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
       }
     },
     getInitModifyPassword: function getInitModifyPassword() {
-      var _this = this;
+      var _this2 = this;
 
       util["a" /* default */].ajax({
         url: api["Y" /* initModifyPassword */]
@@ -5561,23 +5568,23 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
         if (res.rCode === 0) {
           var results = JSON.parse(JSON.stringify(res.results));
           if (results.checkPassword) {
-            _this.checkPassword = new RegExp(results.checkPassword);
+            _this2.checkPassword = new RegExp(results.checkPassword);
           }
           if (results.checkPasswordMsg) {
-            _this.checkPasswordMsg = results.checkPasswordMsg;
+            _this2.checkPasswordMsg = results.checkPasswordMsg;
           }
         } else {
           var msg = res.msg || '系统错误，请联系管理员！';
-          _this.$message.error(msg);
+          _this2.$message.error(msg);
         }
       }).catch(function (err) {
         if (err.message && err.message !== 'canceled') {
-          _this.$message.error(err.message);
+          _this2.$message.error(err.message);
         }
       });
     },
     getVerificationCode: function getVerificationCode() {
-      var _this2 = this;
+      var _this3 = this;
 
       if (this.countdown) {
         return false;
@@ -5600,45 +5607,45 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
         this.countdown = 60;
         this.getCode(data);
         this.timer = setInterval(function () {
-          if (_this2.countdown > 0) {
-            _this2.countdown--;
-            _this2.disabled = true;
-            _this2.btnText = '重新获取' + _this2.countdown + 's';
+          if (_this3.countdown > 0) {
+            _this3.countdown--;
+            _this3.disabled = true;
+            _this3.btnText = '重新获取' + _this3.countdown + 's';
           } else {
-            _this2.btnText = '获取验证码';
-            _this2.disabled = false;
-            clearInterval(_this2.timer);
+            _this3.btnText = '获取验证码';
+            _this3.disabled = false;
+            clearInterval(_this3.timer);
           }
         }, 1000);
       }
     },
     getCode: function getCode(params) {
-      var _this3 = this;
+      var _this4 = this;
 
       util["a" /* default */].ajax({
         url: api["G" /* getModifyPassCode */],
         params: params
       }).then(function (res) {
         if (res.rCode === 0) {
-          _this3.$message.success(res.msg);
+          _this4.$message.success(res.msg);
         } else {
           var msg = res.msg || '系统错误，请联系管理员！';
           if (res.rCode === 2) {
-            _this3.btnText = '获取验证码';
-            _this3.disabled = false;
-            _this3.countdown = 0;
-            clearInterval(_this3.timer);
+            _this4.btnText = '获取验证码';
+            _this4.disabled = false;
+            _this4.countdown = 0;
+            clearInterval(_this4.timer);
           }
-          _this3.$message.error(msg);
+          _this4.$message.error(msg);
         }
       }).catch(function (err) {
         if (err.message && err.message !== 'canceled') {
-          _this3.$message.error(err.message);
+          _this4.$message.error(err.message);
         }
       });
     },
     handleSubmit: function handleSubmit(res) {
-      var _this4 = this;
+      var _this5 = this;
 
       this.submit = true;
 
@@ -5664,20 +5671,20 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
           url: api["cb" /* loginModifyPassword */],
           data: data
         }).then(function (res) {
-          _this4.submit = false;
+          _this5.submit = false;
           if (res.rCode === 0) {
-            _this4.$message.success(res.msg);
-            _this4.$emit('success');
+            _this5.$message.success(res.msg);
+            _this5.$emit('success');
           } else {
             var msg = res.msg || '系统错误，请联系管理员！';
-            _this4.$message.error(msg);
-            _this4.disabled = false;
-            delete _this4.formData.verificationCode;
-            clearInterval(_this4.timer);
+            _this5.$message.error(msg);
+            _this5.disabled = false;
+            delete _this5.formData.verificationCode;
+            clearInterval(_this5.timer);
           }
         }).catch(function (err) {
           if (err.message && err.message !== 'canceled') {
-            _this4.$message.error(err.message);
+            _this5.$message.error(err.message);
           }
         });
       } else {
@@ -5691,21 +5698,21 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
           url: api["d" /* codeModifyPass */],
           data: data
         }).then(function (res) {
-          _this4.submit = false;
+          _this5.submit = false;
           if (res.rCode === 0) {
-            _this4.$message.success(res.msg);
-            _this4.$emit('success');
+            _this5.$message.success(res.msg);
+            _this5.$emit('success');
           } else {
             var msg = res.msg || '系统错误，请联系管理员！';
-            _this4.btnText = '获取验证码';
-            _this4.disabled = false;
-            clearInterval(_this4.timer);
-            delete _this4.formData.verificationCode;
-            _this4.$message.error(msg);
+            _this5.btnText = '获取验证码';
+            _this5.disabled = false;
+            clearInterval(_this5.timer);
+            delete _this5.formData.verificationCode;
+            _this5.$message.error(msg);
           }
         }).catch(function (err) {
           if (err.message && err.message !== 'canceled') {
-            _this4.$message.error(err.message);
+            _this5.$message.error(err.message);
           }
         });
       }
@@ -5734,8 +5741,8 @@ var componentNormalizer = __webpack_require__(3);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_resetPasswordvue_type_script_lang_js_,
-  resetPasswordvue_type_template_id_cab38660_render,
-  resetPasswordvue_type_template_id_cab38660_staticRenderFns,
+  resetPasswordvue_type_template_id_45dccfdc_render,
+  resetPasswordvue_type_template_id_45dccfdc_staticRenderFns,
   false,
   null,
   null,
@@ -6528,6 +6535,9 @@ var ceshi = util["a" /* default */].getParams('ceshi');
     _launchImage: function _launchImage() {
       var img = util["a" /* default */].isObject(this.launchImages) ? this.launchImages[this.launchKey] : this.launchImages;
       return { 'background-image': 'url(' + img + ')' };
+    },
+    showForget: function showForget() {
+      return this.forget === true && (this.loginModel.indexOf('11') > -1 || this.loginModel.indexOf('6') > -1);
     }
   },
   watch: {

package/lib/main.js

@@ -6850,8 +6850,8 @@ uservue_type_template_id_edaa0dc4_scoped_true_render._withStripped = true
 
 // CONCATENATED MODULE: ./packages/main/src/simplicity/user.vue?vue&type=template&id=edaa0dc4&scoped=true&
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/userinfo.vue?vue&type=template&id=9a76ed7c&
-var userinfovue_type_template_id_9a76ed7c_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/simplicity/userinfo.vue?vue&type=template&id=9d115418&
+var userinfovue_type_template_id_9d115418_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -6867,11 +6867,11 @@ var userinfovue_type_template_id_9a76ed7c_render = function () {
     2
   )
 }
-var userinfovue_type_template_id_9a76ed7c_staticRenderFns = []
-userinfovue_type_template_id_9a76ed7c_render._withStripped = true
+var userinfovue_type_template_id_9d115418_staticRenderFns = []
+userinfovue_type_template_id_9d115418_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/simplicity/userinfo.vue?vue&type=template&id=9a76ed7c&
+// CONCATENATED MODULE: ./packages/main/src/simplicity/userinfo.vue?vue&type=template&id=9d115418&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/userinfo.vue?vue&type=script&lang=js&
 //
@@ -6963,7 +6963,7 @@ userinfovue_type_template_id_9a76ed7c_render._withStripped = true
         },
         col: 6
       }, {
-        name: 'officetel',
+        name: 'officeTel',
         placeholder: '座机号',
         label: '座机号',
         type: 'text',
@@ -7101,6 +7101,8 @@ userinfovue_type_template_id_9a76ed7c_render._withStripped = true
                 util["a" /* default */].win.postMessage({ type: 1 }, '*');
               }
             }).catch(function (e) {});
+          } else {
+            _this2.$message.success(res.msg);
           }
         } else {
           var msg = res.msg || '系统错误，请联系管理员！';
@@ -7130,8 +7132,8 @@ userinfovue_type_template_id_9a76ed7c_render._withStripped = true
 
 var userinfo_component = Object(componentNormalizer["a" /* default */])(
   simplicity_userinfovue_type_script_lang_js_,
-  userinfovue_type_template_id_9a76ed7c_render,
-  userinfovue_type_template_id_9a76ed7c_staticRenderFns,
+  userinfovue_type_template_id_9d115418_render,
+  userinfovue_type_template_id_9d115418_staticRenderFns,
   false,
   null,
   null,