system-clients 3.2.1-5 → 3.2.1-6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "system-clients",
-  "version": "3.2.1-5",
+  "version": "3.2.1-6",
   "description": "系统基础框架",
   "main": "src/index.js",
   "directories": {

package/src/components/server/Login.vue

@@ -122,19 +122,27 @@
 
   let saveGen = function *(self) {
     try {
-      yield self.$login.login(self.model.ename, self.model.password)
-      yield self.$appdata.load()
+      if(self.$login){
+        yield self.$login.login(self.model.ename, self.model.password)
+      }
+     if(self.$appdata){
+       yield self.$appdata.load()
 
+     }
       if (Vue.$heatCompatibility) {
         try {
-          yield self.$loginHeat.login(self.model.ename, self.model.password)
-          yield self.$appdataHeat.load()
+          if(self.$loginHeat){
+            yield self.$loginHeat.login(self.model.ename, self.model.password)
+          }
+          if(self.$appdataHeat){
+            yield self.$appdataHeat.load()
+          }
         } catch (e) {
           console.log('热力系统登陆失败!')
         }
       }
-
-      yield self.$getConfig(self, 'Login')
+        //吴小平
+      // yield self.$getConfig(self, 'Login')
       console.log('登录配置', self.config)
       if (self.config.isMac) {
         // 获取该登录人分公司下的mac配置
@@ -167,11 +175,12 @@
         }
       }
       // 弱口令验证
-      if (self.config.weakPassword && !(/^(?:(?=.*[a-zA-Z])(?=.*[0-9])(?=.*[^A-Za-z0-9])).*$/.test(self.model.password))) {
+      //跳转过来的不进行验证
+      if ((!this.otherLogin) && self.config.weakPassword && !(/^(?:(?=.*[a-zA-Z])(?=.*[0-9])(?=.*[^A-Za-z0-9])).*$/.test(self.model.password))) {
         self.$showMessage('登录系统: 此账户的密码过于简单，请修改密码后重新登陆！！！', ['confirm']).then((res) => {
           self.modifyPwShow = true
         })
-      } else if (self.config.depPrompt) {
+      } else if ((!this.otherLogin) && self.config.depPrompt) {
         self.depPromptShow = true
       } else {
         self.$goto('home-page', {functions: self.$login.f})
@@ -225,15 +234,18 @@
       $('#login-button').click(function (event) {
         event.preventDefault()
         $('form').fadeOut(500)
-      }),
-        this.createCode()
+      })
         if (window.location.search && window.location.search.indexOf('af_key') !== -1&& window.location.search.indexOf('af_n') !== -1) {
           const subUrl = window.location.search.replace('?af_key=','').split('&af_n=')
           console.log(subUrl)
           this.model.ename = window.atob(subUrl[0])
           this.model.password = window.atob(subUrl[1])
           console.log('this.model.ename',this.model.ename)
+          this.otherLogin = true
           this.confirm()
+        }else{
+          //跳转不需要验证码
+          this.createCode()
         }
     },
     data () {
@@ -254,6 +266,7 @@
           title: '燃气客服系统',
           distanceLogin: false
         },
+        otherLogin:false,
         login: false,
         depPromptShow: false,
         model: {},
@@ -305,7 +318,8 @@
         this.login = true
         // let gen = saveGen(this)
         // return co(gen)
-        if(this.$login.Verification){
+        if((!this.otherLogin) && this.$login && this.$login.Verification){
+          console.log('跳转过来的不走验证')
           if(this.picLyanzhengma == '') {
             this.$showMessage("请输入验证码！").then(()=>{
               this.login = false