system-clients 3.3.3 → 3.3.4-v3

package/src/filiale/qianneng/ModifyPw.vue

@@ -1,68 +1,69 @@
 <template>
   <div>
     <validator name="v">
-      <modal :show.sync="show" v-ref:modal  backdrop="false">
+      <modal :show.sync="show" v-ref:modal backdrop="false">
         <header slot="modal-header" class="modal-header">
           <button type="button" class="close" @click="rest"><span>&times;</span></button>
           <h4 class="modal-title">修改密码</h4>
         </header>
         <article slot="modal-body" class="modal-body modifystyle auto form-horizontal">
+          <div class="password-alert">
+            {{ passwordRuleHint }}
+          </div>
           <div class="has-feedback form-group"
                :class="{'has-warning':$v.password.required,'has-error': $v.password.required,
           'has-success':!$v.password.required}">
-            <label for="password" class="col-sm-4 col-sm-offset-1 control-label">原始密码:&nbsp;&nbsp;</label>
-            <div class="col-sm-4">
+            <label for="password" class="col-sm-3 control-label">原始密码</label>
+            <div class="col-sm-8 password-field-wrap">
               <input type="password" v-model="deliver.password" class="form-control" id="password" v-validate:password="{ required: true}">
               <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.password.required"></span>
-              <span v-if="$v.password.required">不能为空</span>
+              <span class="field-error" v-if="$v.password.required">不能为空</span>
             </div>
           </div>
           <div class="has-feedback form-group"
-               :class="{'has-warning':$v.newpassword.required,'has-error':($v.newpassword.numbersAndLetter8to16 || $v.newpassword.minlength)&& !$v.newpassword.required && !$v.newpassword.chinesePassword,
-          'has-success': !$v.newpassword.required && !$v.newpassword.numbersAndLetter8to16&&!$v.newpassword.minlength  && !$v.newpassword.chinesePassword}">
-            <label for="newpassword" class="col-sm-4 col-sm-offset-1 control-label">新的密码:&nbsp;&nbsp;</label>
-            <div class="col-sm-4">
-              <input type="password" v-model="deliver.newpassword" class="form-control" id="newpassword" v-validate:newpassword='{required:true, numbersAndLetter8to16: true, minlength: 8,chinesePassword: true}'>
-              <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.newpassword.required && !$v.newpassword.minlength && !($v.newpassword.numbersAndLetter8to16 && !($v.newpassword.required)) && !($v.newpassword.chinesePassword) "></span>
-              <span v-if="$v.newpassword.required">不能为空</span>
-              <span v-if="($v.newpassword.numbersAndLetter8to16||$v.newpassword.minlength) && !($v.newpassword.required&&$v.newpassword.minlength)">密码必须是8~16位数字与大小字母外加特殊字符的组合，并且不能出现类似'123','abc'等连贯数字或者字母</span>
-              <span v-if="$v.newpassword.chinesePassword">密码不能包含中文</span>
+               :class="{'has-warning':$v.newpassword.required,'has-error':($v.newpassword.numbersAndLetter8to16 || $v.newpassword.chinesePassword) && !$v.newpassword.required,
+          'has-success': !$v.newpassword.required && !$v.newpassword.numbersAndLetter8to16 && !$v.newpassword.chinesePassword}">
+            <label for="newpassword" class="col-sm-3 control-label">新的密码</label>
+            <div class="col-sm-8 password-field-wrap">
+              <input type="password" v-model="deliver.newpassword" class="form-control" id="newpassword" v-validate:newpassword='{required:true, numbersAndLetter8to16: true, chinesePassword: true}'>
+              <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.newpassword.required && !$v.newpassword.numbersAndLetter8to16 && !$v.newpassword.chinesePassword"></span>
+              <span class="field-error" v-if="$v.newpassword.required">不能为空</span>
+              <span class="field-error" v-if="$v.newpassword.chinesePassword && !$v.newpassword.required">密码不能包含中文</span>
+              <div v-if="passwordStrength.visible" class="password-strength">
+                <span class="strength-label">密码强度</span>
+                <span class="strength-tag" :class="passwordStrength.type">{{ passwordStrength.label }}</span>
+                <span class="strength-desc">{{ passwordStrength.desc }}</span>
+              </div>
             </div>
           </div>
           <div class="has-feedback form-group"
                :class="{'has-warning':$v.affirmpassword.required,'has-error':$v.affirmpassword.equalValid && !($v.affirmpassword.required),
           'has-success': !$v.affirmpassword.required && !($v.affirmpassword.equalValid && !($v.affirmpassword.required))}">
-            <label for="affirmpassword" class="col-sm-4 col-sm-offset-1 control-label">确认密码:&nbsp;&nbsp;</label>
-            <div class="col-sm-4">
+            <label for="affirmpassword" class="col-sm-3 control-label">确认密码</label>
+            <div class="col-sm-8 password-field-wrap">
               <input type="password" v-model="deliver.affirmpassword" class="form-control" id="affirmpassword" v-validate:affirmpassword="{ required: true, equalValid: deliver.newpassword }">
               <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.affirmpassword.required && !($v.affirmpassword.equalValid && !($v.affirmpassword.required))"></span>
-              <span v-if="$v.affirmpassword.required">不能为空</span>
-              <span v-if="$v.affirmpassword.equalValid && !($v.affirmpassword.required)">两次密码不一致 !!</span>
+              <span class="field-error" v-if="$v.affirmpassword.required">不能为空</span>
+              <span class="field-error" v-if="$v.affirmpassword.equalValid && !($v.affirmpassword.required)">两次密码不一致</span>
             </div>
           </div>
         </article>
 
         <footer slot="modal-footer" class="modal-footer">
-          <button  type="button" class="btn btn-success" @click='confirm' :disabled="!$v.valid">确认</button>
-          <button  type="button" class="btn btn-default" @click='rest'>取消</button>
+          <button type="button" class="btn btn-success" @click='confirm' :disabled="!$v.valid">确认</button>
+          <button type="button" class="btn btn-default" @click='rest'>取消</button>
         </footer>
       </modal>
     </validator>
   </div>
-
-
 </template>
 <script>
   import co from 'co'
-  import validator from '../../plugins/validation';
+  import validator from '../../plugins/validation'
+  import { getPasswordStrength, PASSWORD_RULE_HINT } from '../../util/password-validation'
 
   let saveGen = function * (self) {
     self.deliver.ename = self.functions.ename
-    // let res = yield self.$post('rs/user/entity', {data: self.deliver})
-    // let res = yield self.$post('rs/db/modifypassword', {data: self.deliver})
-    // let res = yield self.$resetpost('/rs/db/modifypwd', {data: self.deliver})
-    //  Util.f.password = self.deliver.newpassword
-    // todo v4
     let res = yield self.$resetpost('/rs/user/modifypwd', {data: self.deliver })
     self.$login.f.password = self.deliver.newpassword
     if (res.data) {
@@ -81,7 +82,13 @@
           newpassword: '',
           affirmpassword: ''
         },
-        functions: this.$login.f
+        functions: this.$login.f,
+        passwordRuleHint: PASSWORD_RULE_HINT
+      }
+    },
+    computed: {
+      passwordStrength () {
+        return getPasswordStrength(this.deliver.newpassword)
       }
     },
     props: ['show'],
@@ -98,11 +105,77 @@
   }
 </script>
 <style>
-  /*修改密码body界面样式*/
   .modifystyle {
-    background: #FCFEEE;
+    background: #fff;
+    padding: 10px 20px 20px;
+  }
+
+  .modifystyle .control-label {
+    color: #333;
+    font-weight: normal;
+    padding-top: 7px;
+  }
+
+  .password-field-wrap {
+    padding-left: 0;
+    padding-right: 0;
+  }
+
+  .password-field-wrap .form-control {
+    width: 100%;
+  }
+
+  .password-alert {
+    margin: 0 0 16px;
+    padding: 10px 12px;
+    border-radius: 4px;
+    background: #f5f7fa;
+    border: 1px solid #e4e7ed;
+    color: #606266;
+    font-size: 13px;
+    line-height: 1.6;
   }
-  .modifystyle span{
-    color: red;
+
+  .field-error {
+    display: block;
+    margin-top: 6px;
+    color: #e74c3c;
+    font-size: 12px;
+    line-height: 1.4;
+  }
+
+  .password-strength {
+    margin-top: 8px;
+    font-size: 12px;
+    line-height: 1.6;
+    color: #606266;
+  }
+
+  .password-strength .strength-label {
+    margin-right: 6px;
+    color: #909399;
+  }
+
+  .password-strength .strength-tag {
+    display: inline-block;
+    margin-right: 8px;
+    padding: 1px 8px;
+    border-radius: 3px;
+    font-size: 12px;
+    line-height: 1.5;
+  }
+
+  .password-strength .strength-tag.success {
+    color: #2e7d32;
+    background: #e8f5e9;
+  }
+
+  .password-strength .strength-tag.error {
+    color: #c62828;
+    background: #ffebee;
+  }
+
+  .password-strength .strength-desc {
+    color: #606266;
   }
 </style>

package/src/filiale/rizhao/Login.vue

@@ -121,13 +121,14 @@
 
 <script>
 import co from 'co'
+import { isStrongPassword } from '../../util/password-validation'
 import $ from 'jquery'
 import Vue from 'vue'
 import {HttpResetClass} from 'vue-client'
+import {isPasswordModificationExpired} from '../../components/Util'
 
 
 
-// todo v4
 let saveGen = function *(self) {
   try {
     if(self.$login){
@@ -183,12 +184,15 @@ let saveGen = function *(self) {
       }
     }
     console.log(self.$login.depPrompt)
-    // 弱口令验证
-    //跳转过来的不进行验证
-    if ((!self.otherLogin) && self.config.weakPassword && !(/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/.test(self.model.password))) {
+    // 弱口令验证（默认开启，跳转过来的不进行验证）
+    if ((!self.otherLogin) && !isStrongPassword(self.model.password)) {
       self.$showMessage('登录系统: 此账户的密码过于简单，请修改密码后重新登陆！！！', ['confirm']).then((res) => {
         self.modifyPwShow = true
       })
+    } else if ((!self.otherLogin) && isPasswordModificationExpired(self.$login.f.f_last_modification_time)) {
+      self.$showMessage('登录系统: 您的密码已超过两个半月未修改，请修改密码后重新登录！！！', ['confirm']).then((res) => {
+        self.modifyPwShow = true
+      })
     } else if ((!self.otherLogin) && self.$login.depPrompt) {
       self.depPromptShow = true
     } else {
@@ -205,6 +209,8 @@ let saveGen = function *(self) {
 
   } catch (ret) {
     console.error('登录失败', ret)
+    self.$login.s = null
+    self.$login['v3-session-key'] = null
     let msg
     if (ret instanceof Error) {
       msg = ret
@@ -228,19 +234,19 @@ let saveGen = function *(self) {
 export default {
   title: '登录',
   async ready () {
-    try{
-      let http = new HttpResetClass()
-      let res = await http.load('POST', 'api/af-system/sql/singleTable',
-        {data:{
-            tablename: 't_changedeclare',
-            condition: ` f_type ='变更通知' `
-          }
-        }, {resolveMsg: null, rejectMsg: null})
-      if(res.data.length>0){
-        console.log("---------------获取通知",res.data[0].f_change_message)
-        this.notice=res.data[0].f_change_message
-      }
-    }catch(e){}
+    // try{
+    //   let http = new HttpResetClass()
+    //   let res = await http.load('POST', 'rs/sql/singleTable',
+    //     {data:{
+    //         tablename: 't_changedeclare',
+    //         condition: ` f_type ='变更通知' `
+    //       }
+    //     }, {resolveMsg: null, rejectMsg: null})
+    //   if(res.data.length>0){
+    //     console.log("---------------获取通知",res.data[0].f_change_message)
+    //     this.notice=res.data[0].f_change_message
+    //   }
+    // }catch(e){}
 
     this.loginother();
     $('#login-button').click(function (event) {
@@ -249,10 +255,8 @@ export default {
     })
     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{
@@ -299,7 +303,6 @@ export default {
       if (this.config.distanceLogin) {
         if (this.$login && this.$login.getUrlParames('name') ) {
           let ename = this.$login.getUrlParames('name');
-          // todo v4
           let logininfo = await this.$resetpost('rs/logic/getLoginData',{data:{ename:ename}},{resolveMsg: null, rejectMsg: null});
           if(logininfo.data){
             if(logininfo.data.ename && logininfo.data.password){

package/src/filiale/rizhao/Main.vue

@@ -68,7 +68,7 @@ let getwartermakr = async function (self) {
     tablename: 't_singlevalue',
     condition: " 1=1 and name=\'水印内容\'"
   };
-  let result = await self.$resetpost('api/af-revenue/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: null});
+  let result = await self.$resetpost('rs/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: null});
   if (result && result.data.length > 0) {
     self.showwatermakeflag = true;
     createWaterMark(result.data[0].value);
@@ -216,7 +216,7 @@ export default {
       }
     },
     openUrl() {
-      var url = `http://123.60.214.109:8406/submitTicket?contact=${this.$login.f.name}&orgName=${this.$login.f.orgs}&phone=${this.$login.f.f_user_telephone}`
+      var url = `https://liuli.aofengcloud.com:31467`
       window.open(url, '_blank')
     },
     hindsetting() {
@@ -295,7 +295,7 @@ export default {
             username: this.$login.f.name,
             usertelephone: this.$login.f.f_user_telephone
           }
-          await this.$resetpost('api/af-system/user/logout', data, {resolveMsg: '退出成功', rejectMsg: null})
+          await this.$resetpost('rs/logic/logOut', data, {resolveMsg: '退出成功', rejectMsg: null})
           window.location.reload()
         }
       })

package/src/filiale/shiquan/Login.vue

@@ -142,9 +142,11 @@
 
 <script>
   import co from 'co'
+  import { isStrongPassword } from '../../util/password-validation'
   import $ from 'jquery'
   import Vue from 'vue'
   import {HttpResetClass} from 'vue-client'
+  import {isPasswordModificationExpired} from '../../components/Util'
 
   let daibanJson = require('../../util/Daiban.json')
 
@@ -174,7 +176,6 @@
       console.log('登录配置', self.config)
       if (self.config.isMac) {
         // 获取该登录人分公司下的mac配置
-        // todo v4
         let getMacs = yield self.$resetpost('rs/sql/equipmentQuery', {data: {condition: `f_filialeids like '%${self.$login.f.f_orgids}%'`}}, {
           resolveMsg: null,
           rejectMsg: null
@@ -204,12 +205,15 @@
         }
       }
       console.log(self.$login.depPrompt)
-      // 弱口令验证
-      //跳转过来的不进行验证
-      if ((!self.otherLogin) && self.config.weakPassword && !(/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/.test(self.model.password))) {
+      // 弱口令验证（默认开启，跳转过来的不进行验证）
+      if ((!self.otherLogin) && !isStrongPassword(self.model.password)) {
         self.$showMessage('登录系统: 此账户的密码过于简单，请修改密码后重新登陆！！！', ['confirm']).then((res) => {
           self.modifyPwShow = true
         })
+      } else if ((!self.otherLogin) && isPasswordModificationExpired(self.$login.f.f_last_modification_time)) {
+        self.$showMessage('登录系统: 您的密码已超过两个半月未修改，请修改密码后重新登录！！！', ['confirm']).then((res) => {
+          self.modifyPwShow = true
+        })
       } else if ((!self.otherLogin) && self.$login.depPrompt) {
         self.depPromptShow = true
         if (self.$login.showDaiBan && self.$login.r.includes('展示预约信息')){
@@ -230,6 +234,8 @@
       }
     } catch (ret) {
       console.error('登录失败', ret)
+      self.$login.s = null
+    self.$login['v3-session-key'] = null
       let msg
       if (ret instanceof Error) {
         msg = ret
@@ -258,19 +264,19 @@
       this.titleShow = this.$appdata.getSingleValue('关于我们')
       window.versionTime = window.versionTime ? window.versionTime : new Date().getTime()
       this.vTime = this.format(new Date(window.versionTime));
-      try{
-        let http = new HttpResetClass()
-        let res = await http.load('POST', 'api/af-system/sql/singleTable',
-          {data:{
-              tablename: 't_changedeclare',
-              condition: ` f_type ='变更通知' `
-            }
-          }, {resolveMsg: null, rejectMsg: null})
-        if(res.data.length>0){
-          console.log("---------------获取通知",res.data[0].f_change_message)
-          this.notice=res.data[0].f_change_message
-        }
-      }catch(e){}
+      // try{
+      //   let http = new HttpResetClass()
+      //   let res = await http.load('POST', 'rs/sql/singleTable',
+      //     {data:{
+      //         tablename: 't_changedeclare',
+      //         condition: ` f_type ='变更通知' `
+      //       }
+      //     }, {resolveMsg: null, rejectMsg: null})
+      //   if(res.data.length>0){
+      //     console.log("---------------获取通知",res.data[0].f_change_message)
+      //     this.notice=res.data[0].f_change_message
+      //   }
+      // }catch(e){}
 
       this.loginother();
       $('#login-button').click(function (event) {
@@ -279,10 +285,8 @@
       })
       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{
@@ -360,7 +364,7 @@
         } else {
           condition =` f_orderstate is null and (f_address in( select f_address from t_user_address where f_slice_area='柠条塔') or f_address like '%柠条塔%') `
         }
-        await http.load('POST', '/api/af-system/sql/singleTable', {data: {
+        await http.load('POST', '/rs/sql/singleTable', {data: {
             tablename:'t_order_center',
             condition:condition
           }}, {
@@ -436,7 +440,6 @@
         if (this.config.distanceLogin) {
           if (this.$login && this.$login.getUrlParames('name') ) {
             let ename = this.$login.getUrlParames('name');
-            // todo v4
             let logininfo = await this.$resetpost('rs/logic/getLoginData',{data:{ename:ename}},{resolveMsg: null, rejectMsg: null});
             if(logininfo.data){
               if(logininfo.data.ename && logininfo.data.password){

package/src/filiale/tianyi/Login.vue

@@ -145,9 +145,11 @@
 
 <script>
 import co from 'co'
+import { isStrongPassword } from '../../util/password-validation'
 import $ from 'jquery'
 import Vue from 'vue'
 import {HttpResetClass} from 'vue-client'
+import {isPasswordModificationExpired} from '../../components/Util'
 
 let daibanJson = require('../../util/Daiban.json')
 
@@ -178,7 +180,6 @@ let saveGen = function *(self) {
     console.log('登录配置', self.config)
     if (self.config.isMac) {
       // 获取该登录人分公司下的mac配置
-      // todo v4
       let getMacs = yield self.$resetpost('rs/sql/equipmentQuery', {data: {condition: `f_filialeids like '%${self.$login.f.f_orgids}%'`}}, {
         resolveMsg: null,
         rejectMsg: null
@@ -208,12 +209,15 @@ let saveGen = function *(self) {
       }
     }
     console.log(self.$login.depPrompt)
-    // 弱口令验证
-    //跳转过来的不进行验证
-    if ((!self.otherLogin) && self.config.weakPassword && !(/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/.test(self.model.password))) {
+    // 弱口令验证（默认开启，跳转过来的不进行验证）
+    if ((!self.otherLogin) && !isStrongPassword(self.model.password)) {
       self.$showMessage('登录系统: 此账户的密码过于简单，请修改密码后重新登陆！！！', ['confirm']).then((res) => {
         self.modifyPwShow = true
       })
+    } else if ((!self.otherLogin) && isPasswordModificationExpired(self.$login.f.f_last_modification_time)) {
+      self.$showMessage('登录系统: 您的密码已超过两个半月未修改，请修改密码后重新登录！！！', ['confirm']).then((res) => {
+        self.modifyPwShow = true
+      })
     } else if ((!self.otherLogin) && self.$login.depPrompt) {
       self.depPromptShow = true
       if (self.$login.showDaiBan && self.$login.r.includes('展示预约信息')){
@@ -239,6 +243,8 @@ let saveGen = function *(self) {
 
   } catch (ret) {
     console.error('登录失败', ret)
+    self.$login.s = null
+    self.$login['v3-session-key'] = null
     let msg
     if (ret instanceof Error) {
       msg = ret
@@ -265,19 +271,19 @@ export default {
     this.titleShow = this.$appdata.getSingleValue('关于我们')
     window.versionTime = window.versionTime ? window.versionTime : new Date().getTime()
     this.vTime = this.format(new Date(window.versionTime));
-    try{
-      let http = new HttpResetClass()
-      let res = await http.load('POST', 'api/af-system/sql/singleTable',
-        {data:{
-            tablename: 't_changedeclare',
-            condition: ` f_type ='变更通知' `
-          }
-        }, {resolveMsg: null, rejectMsg: null})
-      if(res.data.length>0){
-        console.log("---------------获取通知",res.data[0].f_change_message)
-        this.notice=res.data[0].f_change_message
-      }
-    }catch(e){}
+    // try{
+    //   let http = new HttpResetClass()
+    //   let res = await http.load('POST', 'rs/sql/singleTable',
+    //     {data:{
+    //         tablename: 't_changedeclare',
+    //         condition: ` f_type ='变更通知' `
+    //       }
+    //     }, {resolveMsg: null, rejectMsg: null})
+    //   if(res.data.length>0){
+    //     console.log("---------------获取通知",res.data[0].f_change_message)
+    //     this.notice=res.data[0].f_change_message
+    //   }
+    // }catch(e){}
 
     this.loginother();
     $('#login-button').click(function (event) {
@@ -286,10 +292,8 @@ export default {
     })
     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{
@@ -367,7 +371,7 @@ export default {
       } else {
         condition =` f_orderstate is null and (f_address in( select f_address from t_user_address where f_slice_area='柠条塔') or f_address like '%柠条塔%') `
       }
-      await http.load('POST', '/api/af-system/sql/singleTable', {data: {
+      await http.load('POST', '/rs/sql/singleTable', {data: {
           tablename:'t_order_center',
           condition:condition
         }}, {
@@ -443,7 +447,6 @@ export default {
       if (this.config.distanceLogin) {
         if (this.$login && this.$login.getUrlParames('name') ) {
           let ename = this.$login.getUrlParames('name');
-          // todo v4
           let logininfo = await this.$resetpost('rs/logic/getLoginData',{data:{ename:ename}},{resolveMsg: null, rejectMsg: null});
           if(logininfo.data){
             if(logininfo.data.ename && logininfo.data.password){

package/src/filiale/tongchuan/Login.vue

@@ -138,9 +138,11 @@
 
 <script>
 import co from 'co'
+import { isStrongPassword } from '../../util/password-validation'
 import $ from 'jquery'
 import Vue from 'vue'
 import {HttpResetClass} from 'vue-client'
+import {isPasswordModificationExpired} from '../../components/Util'
 
 let daibanJson = require('../../util/Daiban.json')
 
@@ -171,7 +173,6 @@ let saveGen = function *(self) {
     console.log('登录配置', self.config)
     if (self.config.isMac) {
       // 获取该登录人分公司下的mac配置
-      // todo v4
       let getMacs = yield self.$resetpost('rs/sql/equipmentQuery', {data: {condition: `f_filialeids like '%${self.$login.f.f_orgids}%'`}}, {
         resolveMsg: null,
         rejectMsg: null
@@ -201,12 +202,15 @@ let saveGen = function *(self) {
       }
     }
     console.log(self.$login.depPrompt)
-    // 弱口令验证
-    //跳转过来的不进行验证
-    if ((!self.otherLogin) && self.config.weakPassword && !(/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/.test(self.model.password))) {
+    // 弱口令验证（默认开启，跳转过来的不进行验证）
+    if ((!self.otherLogin) && !isStrongPassword(self.model.password)) {
       self.$showMessage('登录系统: 此账户的密码过于简单，请修改密码后重新登陆！！！', ['confirm']).then((res) => {
         self.modifyPwShow = true
       })
+    } else if ((!self.otherLogin) && isPasswordModificationExpired(self.$login.f.f_last_modification_time)) {
+      self.$showMessage('登录系统: 您的密码已超过两个半月未修改，请修改密码后重新登录！！！', ['confirm']).then((res) => {
+        self.modifyPwShow = true
+      })
     } else if ((!self.otherLogin) && self.$login.depPrompt) {
       self.depPromptShow = true
       if (self.$login.showDaiBan && self.$login.r.includes('展示预约信息')){
@@ -232,6 +236,8 @@ let saveGen = function *(self) {
 
   } catch (ret) {
     console.error('登录失败', ret)
+    self.$login.s = null
+    self.$login['v3-session-key'] = null
     let msg
     if (ret instanceof Error) {
       msg = ret
@@ -256,19 +262,19 @@ export default {
   title: '登录',
   async ready () {
     this.titleShow = this.$appdata.getSingleValue('关于我们')
-    try{
-      let http = new HttpResetClass()
-      let res = await http.load('POST', 'api/af-system/sql/singleTable',
-        {data:{
-            tablename: 't_changedeclare',
-            condition: ` f_type ='变更通知' `
-          }
-        }, {resolveMsg: null, rejectMsg: null})
-      if(res.data.length>0){
-        console.log("---------------获取通知",res.data[0].f_change_message)
-        this.notice=res.data[0].f_change_message
-      }
-    }catch(e){}
+    // try{
+    //   let http = new HttpResetClass()
+    //   let res = await http.load('POST', 'rs/sql/singleTable',
+    //     {data:{
+    //         tablename: 't_changedeclare',
+    //         condition: ` f_type ='变更通知' `
+    //       }
+    //     }, {resolveMsg: null, rejectMsg: null})
+    //   if(res.data.length>0){
+    //     console.log("---------------获取通知",res.data[0].f_change_message)
+    //     this.notice=res.data[0].f_change_message
+    //   }
+    // }catch(e){}
 
     this.loginother();
     $('#login-button').click(function (event) {
@@ -277,10 +283,8 @@ export default {
     })
     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{
@@ -372,7 +376,7 @@ export default {
       } else {
         condition =` f_orderstate is null and (f_address in( select f_address from t_user_address where f_slice_area='柠条塔') or f_address like '%柠条塔%') `
       }
-      await http.load('POST', '/api/af-system/sql/singleTable', {data: {
+      await http.load('POST', '/rs/sql/singleTable', {data: {
           tablename:'t_order_center',
           condition:condition
         }}, {
@@ -448,7 +452,6 @@ export default {
       if (this.config.distanceLogin) {
         if (this.$login && this.$login.getUrlParames('name') ) {
           let ename = this.$login.getUrlParames('name');
-          // todo v4
           let logininfo = await this.$resetpost('rs/logic/getLoginData',{data:{ename:ename}},{resolveMsg: null, rejectMsg: null});
           if(logininfo.data){
             if(logininfo.data.ename && logininfo.data.password){