system-clients 3.3.2 → 3.3.3-v3

package/src/filiale/furuike/Main.vue

@@ -178,8 +178,7 @@ let getwartermakr = async function (self) {
     tablename: 't_singlevalue',
     condition: " 1=1 and name=\'水印内容\'"
   };
-  // todo v4
-  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}${self.$login.f.ename}`);
@@ -328,7 +327,7 @@ export default {
       this.OrderDaiBan  = ''
       this.AppDaiBan  = ''
       let http = new HttpResetClass()
-      await http.load('POST', '/api/af-system/sql/singleTable', {data: {
+      await http.load('POST', '/rs/sql/singleTable', {data: {
           tablename:'t_order_center',
           condition:` (f_orderstate != '预约成功' and f_orgstr ='${this.$login.f.orgid}' and f_orderstate != '预约失败' ) or f_orderstate is null`
         }}, {
@@ -400,44 +399,33 @@ export default {
       }
     },
     async workorderOverRemind(){
-      var   f_filialeids=this.$login.f.orgid
-      const data = {
-        condition: `f_filiale_id in ('${f_filialeids}') and overday >= 0`
-      }
-      new HttpResetClass().load('POST','rs/sql/serviceDetails/n', {data}, {resolveMsg: null, rejectMsg: null}).then(res=>{
-        if(res.data && res.data.n !== 0){
-          // this.$showMessage('你有'+res.data.n+'个工单已逾期，请尽快处理')
-          this.yuqitishi = true
-          this.num = res.data.n
+      if(this.functions && this.functions.f_role_name && this.functions.f_role_name.indexOf('管理员') !== -1 && this.functions.f_role_name.indexOf('管理人员') == -1){
+        let res = await new HttpResetClass().load('POST', '/rs/sql/tel_singleTable', {
+          "data": {
+            "items": "*",
+            "tablename": "t_organization",
+            "condition": `parentid = '${this.functions.orgid}'`
+          }
+        }, {resolveMsg: null, rejectMsg: null})
+        const f_filialeids = [this.functions.orgid]
+        for (const f of res.data) {
+          f_filialeids.push(f.id)
         }
-      })
-      // if(this.functions && this.functions.f_role_name && this.functions.f_role_name.indexOf('管理员') !== -1 && this.functions.f_role_name.indexOf('管理人员') == -1){
-      //   let res = await new HttpResetClass().load('POST', '/rs/sql/tel_singleTable', {
-      //     "data": {
-      //       "items": "*",
-      //       "tablename": "t_organization",
-      //       "condition": `parentid = '${this.functions.orgid}'`
-      //     }
-      //   }, {resolveMsg: null, rejectMsg: null})
-      //   const f_filialeids = [this.functions.orgid]
-      //   for (const f of res.data) {
-      //     f_filialeids.push(f.id)
-      //   }
-      //
-      //   const data = {
-      //     condition: `f_filiale_id in (${f_filialeids.join(',')}) and overday >= 0`
-      //   }
-      //   new HttpResetClass().load('POST','rs/sql/serviceDetails/n', {data}, {resolveMsg: null, rejectMsg: null}).then(res=>{
-      //     if(res.data && res.data.n !== 0){
-      //       /*this.$showMessage('你有'+res.data.n+'个工单已逾期，请尽快处理')*/
-      //       this.yuqitishi = true
-      //       this.num = res.data.n
-      //     }
-      //   })
-      // }
+
+        const data = {
+          condition: `f_filiale_id in (${f_filialeids.join(',')}) and overday >= 0`
+        }
+        new HttpResetClass().load('POST','rs/sql/serviceDetails/n', {data}, {resolveMsg: null, rejectMsg: null}).then(res=>{
+          if(res.data && res.data.n !== 0){
+            /*this.$showMessage('你有'+res.data.n+'个工单已逾期，请尽快处理')*/
+            this.yuqitishi = true
+            this.num = res.data.n
+          }
+        })
+      }
     },
     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() {
@@ -516,7 +504,6 @@ export default {
             username: this.$login.f.name,
             usertelephone: this.$login.f.f_user_telephone
           }
-          // todo v4
           await this.$resetpost('rs/logic/logOut', data, {resolveMsg: '退出成功', rejectMsg: null})
           window.location.reload()
         }

package/src/filiale/gehua/Main.vue

@@ -151,8 +151,7 @@ let getwartermakr = async function (self) {
     tablename: 't_singlevalue',
     condition: " 1=1 and name=\'水印内容\'"
   };
-  // todo v4
-  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}${self.$login.f.ename}`);
@@ -292,7 +291,7 @@ export default {
       this.OrderDaiBan  = ''
       this.AppDaiBan  = ''
       let http = new HttpResetClass()
-      await http.load('POST', '/api/af-system/sql/singleTable', {data: {
+      await http.load('POST', '/rs/sql/singleTable', {data: {
           tablename:'t_order_center',
           condition:` (f_orderstate != '预约成功' and f_orgstr ='${this.$login.f.orgid}' and f_orderstate != '预约失败' ) or f_orderstate is null`
         }}, {
@@ -364,7 +363,7 @@ export default {
       }
     },
     openUrl() {
-      var url = `http://123.60.214.109:8406/submitTicket?personName=${this.$login.f.name}&orgName=${this.$login.f.orgs}`
+      var url = `https://liuli.aofengcloud.com:31467`
       window.open(url, '_blank')
     },
     hindsetting() {
@@ -423,7 +422,6 @@ export default {
             username: this.$login.f.name,
             usertelephone: this.$login.f.f_user_telephone
           }
-          // todo v4
           await this.$resetpost('rs/logic/logOut', data, {resolveMsg: '退出成功', rejectMsg: null})
           window.location.reload()
         }

package/src/filiale/konggang/Login.vue

@@ -134,6 +134,7 @@
   import $ from 'jquery'
   import Vue from 'vue'
   import {HttpResetClass} from 'vue-client'
+  import {isPasswordModificationExpired} from '../../components/Util'
 
 
 
@@ -162,7 +163,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
@@ -192,12 +192,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) && !(/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/.test(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('展示预约信息')){
@@ -218,6 +221,8 @@
 
     } catch (ret) {
       console.error('登录失败', ret)
+      self.$login.s = null
+    self.$login['v3-session-key'] = null
       let msg
       if (ret instanceof Error) {
         msg = ret
@@ -241,19 +246,19 @@
   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) {
@@ -262,10 +267,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{
@@ -327,7 +330,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
           }}, {
@@ -371,7 +374,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/qianneng/Login.vue

@@ -145,6 +145,7 @@ import co from 'co'
 import $ from 'jquery'
 import Vue from 'vue'
 import {HttpResetClass} from 'vue-client'
+import {isPasswordModificationExpired} from '../../components/Util'
 import cryptJS from "../../plugins/EncryptUtil";
 
 let daibanJson = require('../../util/Daiban.json')
@@ -175,7 +176,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 +205,15 @@ let saveGen = function *(self) {
       }
     }
     console.log(self.$login.depPrompt)
-    // 弱口令验证
-    //跳转过来的不进行验证
-    if ((!self.otherLogin) && self.config.weakPassword && !(/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?!.*(.)(\1)+)(?!.*(123|321|abc|cba))[a-zA-Z\d!@#$%^&*()_+-=<>?]{8,16}$/.test(self.model.password))) {
+    // 弱口令验证（默认开启，跳转过来的不进行验证）
+    if ((!self.otherLogin) && !(/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?!.*(.)(\1)+)(?!.*(123|321|abc|cba))[a-zA-Z\d!@#$%^&*()_+-=<>?]{8,16}$/.test(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('展示预约信息')){
@@ -231,6 +234,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
@@ -259,19 +264,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) {
@@ -295,10 +300,8 @@ export default {
       this.confirm()
     } else 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{
@@ -378,7 +381,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
         }}, {
@@ -454,7 +457,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/qianneng/Main.vue

@@ -161,8 +161,7 @@ let getwartermakr = async function (self) {
     tablename: 't_singlevalue',
     condition: " 1=1 and name=\'水印内容\'"
   };
-  // todo v4
-  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}${self.$login.f.ename}`);
@@ -301,7 +300,7 @@ export default {
       this.OrderDaiBan  = ''
       this.AppDaiBan  = ''
       let http = new HttpResetClass()
-      await http.load('POST', '/api/af-system/sql/singleTable', {data: {
+      await http.load('POST', '/rs/sql/singleTable', {data: {
           tablename:'t_order_center',
           condition:` (f_orderstate != '预约成功' and f_orgstr ='${this.$login.f.orgid}' and f_orderstate != '预约失败' ) or f_orderstate is null`
         }}, {
@@ -373,7 +372,7 @@ export default {
       }
     },
     openUrl() {
-      var url = `http://123.60.214.109:8406/submitTicket?personName=${this.$login.f.name}&orgName=${this.$login.f.orgs}`
+      var url = `https://liuli.aofengcloud.com:31467`
       window.open(url, '_blank')
     },
     hindsetting() {
@@ -432,7 +431,6 @@ export default {
             username: this.$login.f.name,
             usertelephone: this.$login.f.f_user_telephone
           }
-          // todo v4
           await this.$resetpost('rs/logic/logOut', data, {resolveMsg: '退出成功', rejectMsg: null})
           window.location.reload()
         }

package/src/filiale/qianneng/ModifyPw.vue

@@ -62,7 +62,6 @@
     // 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) {

package/src/filiale/rizhao/Login.vue

@@ -124,10 +124,10 @@ import co from 'co'
 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 +183,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) && !(/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/.test(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 +208,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 +233,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 +254,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 +302,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

@@ -145,6 +145,7 @@
   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 +175,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 +204,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) && !(/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/.test(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 +233,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 +263,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 +284,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 +363,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 +439,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){