system-clients 3.3.3 → 3.3.4-v3

package/src/components/server/ModifyPw.vue

@@ -1,73 +1,72 @@
 <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: 6,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 }, {resolveMsg: null,rejectMsg: null})
     self.$login.f.password = self.deliver.newpassword
     if (res.data) {
-      console.log("修改密码返回：" , res.data)
-      // 兼容旧版ldao，旧版不返回code
       if (res.data.code === 200) {
         self.deliver.password = ''
         self.deliver.newpassword = ''
@@ -75,7 +74,6 @@
         self.show = false
         self.$showAlert("修改密码成功", 'success', 2000)
       } else {
-        // 兼容旧版ldao，旧版不返回code
         self.deliver.password = ''
         self.deliver.newpassword = ''
         self.deliver.affirmpassword = ''
@@ -99,7 +97,13 @@
           newpassword: '',
           affirmpassword: ''
         },
-        functions: this.$login.f
+        functions: this.$login.f,
+        passwordRuleHint: PASSWORD_RULE_HINT
+      }
+    },
+    computed: {
+      passwordStrength () {
+        return getPasswordStrength(this.deliver.newpassword)
       }
     },
     props: ['show'],
@@ -116,11 +120,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/components/server/PcdBuildingSelect.vue

@@ -66,7 +66,7 @@
     self.arrays.pcd=[{label:'全部',value:''}]
     if(self.show.pcdShow){
       let HttpReset = new HttpResetClass()
-      var pcd = await HttpReset.load('POST', 'api/af-revenue/sql/singleTable_OrderBy', {
+      var pcd = await HttpReset.load('POST', 'rs/sql/singleTable_OrderBy', {
         data: {
           items: 'f_pcd',
           tablename: 't_pcd',
@@ -80,7 +80,7 @@
     }else if(self.show.streetShow){
       console.log("------------查街道")
       let HttpReset = new HttpResetClass()
-      var street = await HttpReset.load('POST', 'api/af-revenue/sql/singleTable_OrderBy', {
+      var street = await HttpReset.load('POST', 'rs/sql/singleTable_OrderBy', {
         data: {
           items: 'f_street',
           tablename: 't_street',
@@ -93,7 +93,7 @@
       }
     }else if(self.show.areaShow){
       let HttpReset = new HttpResetClass()
-      var area = await HttpReset.load('POST', 'api/af-revenue/sql/singleTable_OrderBy', {
+      var area = await HttpReset.load('POST', 'rs/sql/singleTable_OrderBy', {
         data: {
           items: 'f_residential_area',
           tablename: 't_area',
@@ -155,8 +155,7 @@
       async pcdChange(){
         this.arrays.street=[{label:'全部',value:''}]
         var condition = `f_filialeid = '${this.$login.f.orgid}' and f_street is not null group by f_street`
-        // todo v4
-        let street = await this.$resetpost('api/af-revenue/sql/singleTable_OrderBy', {
+        let street = await this.$resetpost('rs/sql/singleTable_OrderBy', {
           data: {
             items: 'f_street',
             tablename: 't_street',
@@ -172,7 +171,7 @@
       async streetChange(){
         this.arrays.area=[{label:'全部',value:''}]
         var condition = `f_street = '${this.model.f_street?this.model.f_street:null}' and f_residential_area is not null group by f_residential_area`
-        let area = await this.$resetpost('api/af-revenue/sql/singleTable_OrderBy', {
+        let area = await this.$resetpost('rs/sql/singleTable_OrderBy', {
           data: {
             items: 'f_residential_area',
             tablename: 't_area',
@@ -193,8 +192,7 @@
         }else{
           condition = `f_filialeid = '${this.$login.f.orgid}' and f_building is not null group by f_building`
         }
-        // todo v4
-        let build = await this.$resetpost('api/af-revenue/sql/singleTable_OrderBy', {
+        let build = await this.$resetpost('rs/sql/singleTable_OrderBy', {
           data: {
             items: 'f_building',
             tablename: 't_user_address',

package/src/components/server/ResSelect.vue

@@ -80,9 +80,6 @@
       //找到跟节点
       ergodicList (val,parentname) {
         if(val.children.length > 0 ){
-          if (val.name !== '组织机构' && parentname !== '资源管理'){
-            this.resoptions.push({label: parentname === '组织机构' ? val.name : val.name+' - '+parentname, value: val.id})
-          }
           parentname=parentname+val.name
           this.treetoList(val,parentname)
         }else {

package/src/components/server/ResSelectGroup.vue

@@ -167,7 +167,7 @@ export default {
           for (let row of this.$refs.department.resoptions) {
             depids.push(row.value)
           }
-          let depid = depids.length ? plugin.convertToIn(depids) : `('')`
+          let depid = depids.length ? plugin.convertToIn(depids) : ('')
           condition += " and f_depid in " + depid;
         }
       }

package/src/components/server/RoleSelector.vue

@@ -51,7 +51,6 @@
       }
     },
     ready() {
-      // todo v4
       this.$resetpost('/rs/search', {data: {source: this.source, userid: this.$login.f.id}}, {resolveMsg: null, rejectMsg: null})
         .then(res => {
           console.log('res-->' + JSON.stringify(res))
@@ -66,7 +65,7 @@
         this.$dispatch('re-res',obj)
       },
       filterUser(resids) {
-        // 处理第一次进入页面值异常问题
+        // 处理第一次进入页面值异常问题 
         if(resids.length > 0 && typeof resids[0] == "object"){
           resids = resids[0]
         }
@@ -87,4 +86,4 @@
 
 <style scoped>
 
-</style>
+</style>

package/src/components/server/TestResSelectGroup.vue

@@ -42,7 +42,7 @@
 
                   <export-excel :data="$parent.$parent.getCondition"
                                 :field="$parent.$parent.getfield"
-                                sqlurl="api/af-revenue/logic/exportfile" sql-name="chargeQuery" template-name='收费查询导出'
+                                sqlurl="rs/logic/exportfile" sql-name="chargeQuery" template-name='收费查询导出'
                                 :choose-col="true"></export-excel>
 
                   <print-data :model="$parent.model" :field="$parent.$parent.getfield"

package/src/filiale/baole/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')
 
@@ -175,7 +177,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
@@ -205,12 +206,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('展示预约信息')){
@@ -236,6 +240,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
@@ -262,19 +268,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) {
@@ -283,10 +289,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{
@@ -364,7 +368,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
         }}, {
@@ -440,7 +444,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/chengtou/Login.vue

@@ -140,9 +140,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')
 
@@ -173,7 +175,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
@@ -203,12 +204,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('展示预约信息')){
@@ -234,6 +238,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
@@ -260,19 +266,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) {
@@ -281,10 +287,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{
@@ -362,7 +366,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
         }}, {
@@ -438,7 +442,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/dongguan/Login.vue

@@ -146,9 +146,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')
 
@@ -179,7 +181,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
@@ -209,12 +210,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('展示预约信息')){
@@ -240,6 +244,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
@@ -264,19 +270,19 @@ export default {
   title: '登录',
   async ready () {
     this.titleShow = true
-    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) {
@@ -285,10 +291,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{
@@ -353,7 +357,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
         }}, {
@@ -429,7 +433,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){