system-clients 3.3.3-old → 3.3.3-v3-test

package/src/components/server/PcdBuildingSelect.vue

@@ -66,41 +66,20 @@
     self.arrays.pcd=[{label:'全部',value:''}]
     if(self.show.pcdShow){
       let HttpReset = new HttpResetClass()
-      var pcd = await HttpReset.load('POST', 'rs/sql/singleTable_OrderBy', {
-        data: {
-          items: 'f_pcd',
-          tablename: 't_pcd',
-          condition: `f_pcd is not null group by f_pcd`,
-          orderitem: 'f_pcd'
-        }
-      }, {resolveMsg: null, rejectMsg: '获取省市区出错!'})
+      var pcd = await HttpReset.load('POST', 'rs/sql/safePcdQuery', {}, {resolveMsg: null, rejectMsg: '获取省市区出错!'})
       for(var i=0;i<pcd.data.length;i++){
         self.arrays.pcd.push({label:pcd.data[i].f_pcd,value:pcd.data[i].f_pcd})
       }
     }else if(self.show.streetShow){
       console.log("------------查街道")
       let HttpReset = new HttpResetClass()
-      var street = await HttpReset.load('POST', 'rs/sql/singleTable_OrderBy', {
-        data: {
-          items: 'f_street',
-          tablename: 't_street',
-          condition: `f_filialeid = '${self.$login.f.orgid}' and f_street is not null group by f_street`,
-          orderitem: 'f_street'
-        }
-      }, {resolveMsg: null, rejectMsg: '获取街道出错!'})
+      var street = await HttpReset.load('POST', 'rs/sql/safeStreetQueryByFiliale', {f_filialeid: self.$login.f.orgid}, {resolveMsg: null, rejectMsg: '获取街道出错!'})
       for(var i=0;i<street.data.length;i++){
         self.arrays.street.push({label:street.data[i].f_street,value:street.data[i].f_street})
       }
     }else if(self.show.areaShow){
       let HttpReset = new HttpResetClass()
-      var area = await HttpReset.load('POST', 'rs/sql/singleTable_OrderBy', {
-        data: {
-          items: 'f_residential_area',
-          tablename: 't_area',
-          condition: `f_filialeid = '${self.$login.f.orgid}' and f_residential_area is not null group by f_residential_area`,
-          orderitem: 'f_residential_area'
-        }
-      }, {resolveMsg: null, rejectMsg: '获取小区出错!'})
+      var area = await HttpReset.load('POST', 'rs/sql/safeAreaQueryByFiliale', {f_filialeid: self.$login.f.orgid}, {resolveMsg: null, rejectMsg: '获取小区出错!'})
       for(var i=0;i<area.data.length;i++){
         self.arrays.area.push({label:area.data[i].f_residential_area,value:area.data[i].f_residential_area})
       }
@@ -154,15 +133,7 @@
     methods:{
       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`
-        let street = await this.$resetpost('rs/sql/singleTable_OrderBy', {
-          data: {
-            items: 'f_street',
-            tablename: 't_street',
-            condition: condition,
-            orderitem: 'f_street'
-          }
-        }, {resolveMsg: null, rejectMsg: '获取街道出错'})
+        let street = await this.$resetpost('rs/sql/safeStreetQueryByFiliale', {f_filialeid: this.$login.f.orgid}, {resolveMsg: null, rejectMsg: '获取街道出错'})
         for(var i=0;i<street.data.length;i++){
           this.arrays.street.push({label:street.data[i].f_street,value:street.data[i].f_street})
         }
@@ -170,15 +141,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('rs/sql/singleTable_OrderBy', {
-          data: {
-            items: 'f_residential_area',
-            tablename: 't_area',
-            condition: condition,
-            orderitem: 'f_residential_area'
-          }
-        }, {resolveMsg: null, rejectMsg: '获取小区出错'})
+        let area = await this.$resetpost('rs/sql/safeAreaQueryByStreet', {f_street: this.model.f_street}, {resolveMsg: null, rejectMsg: '获取小区出错'})
         for(var i=0;i<area.data.length;i++){
           this.arrays.area.push({label:area.data[i].f_residential_area,value:area.data[i].f_residential_area})
         }
@@ -186,20 +149,12 @@
       },
       async areaChange(){
         this.building = [{label:'全部',value:''}]
-        var condition=''
+        let build
         if(this.show.areaShow){
-          condition = `f_residential_area = '${this.model.f_residential_area?this.model.f_residential_area:null}' and f_building is not null group by f_building`
+          build = await this.$resetpost('rs/sql/safeBuildingQueryByArea', {f_residential_area: this.model.f_residential_area}, {resolveMsg: null, rejectMsg: '获取楼栋出错'})
         }else{
-          condition = `f_filialeid = '${this.$login.f.orgid}' and f_building is not null group by f_building`
+          build = await this.$resetpost('rs/sql/safeBuildingQueryByFiliale', {f_filialeid: this.$login.f.orgid}, {resolveMsg: null, rejectMsg: '获取楼栋出错'})
         }
-        let build = await this.$resetpost('rs/sql/singleTable_OrderBy', {
-          data: {
-            items: 'f_building',
-            tablename: 't_user_address',
-            condition: condition,
-            orderitem: 'f_building'
-          }
-        }, {resolveMsg: null, rejectMsg: '获取楼栋出错'})
         for(var i=0;i<build.data.length;i++){
           this.arrays.building.push({label:build.data[i].f_building,value:build.data[i].f_building})
         }

package/src/filiale/baole/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'
 
 let daibanJson = require('../../util/Daiban.json')
 
@@ -204,12 +205,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
       if (self.$login.showDaiBan && self.$login.r.includes('展示预约信息')){
@@ -235,6 +239,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
@@ -261,19 +267,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', '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){}
+    // 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) {
@@ -282,10 +288,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{
@@ -357,21 +361,20 @@ export default {
     },
     async getDaiBan(){
       let http = new HttpResetClass()
-      let condition = ''
+      let res
       if(this.$login.f.deps!=='柠条塔'){
-        condition = `  (f_orderstate != '预约成功' and f_orderstate != '预约失败' ) or f_orderstate is null `
+        res = await http.load('POST', '/rs/sql/safeOrderCenterQuery', {}, {
+        resolveMsg: null,
+        rejectMsg: null
+      })
       } 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', '/rs/sql/singleTable', {data: {
-          tablename:'t_order_center',
-          condition:condition
-        }}, {
+        res = await http.load('POST', '/rs/sql/safeOrderCenterQueryBySliceArea', {f_slice_area: '柠条塔'}, {
         resolveMsg: null,
         rejectMsg: null
-      }).then((res) => {
-        let OrderDaiBan = {}
-        res.data.forEach(item=>{
+      })
+      }
+      let OrderDaiBan = {}
+      res.data.forEach(item=>{
         OrderDaiBan[item.f_ordertype] = OrderDaiBan[item.f_ordertype] || []
         OrderDaiBan[item.f_ordertype].push(item)
       })
@@ -379,7 +382,7 @@ export default {
       if (res.data.length> 0){
         this.OrderDaiBan += `其中 ${Object.keys(OrderDaiBan).map(key=>`${key}：${OrderDaiBan[key].length}条`).join(', ')}`
       }
-    })
+    },
       let data = {
         condition: '1 = 1',
         data: {

package/src/filiale/chengtou/Login.vue

@@ -143,6 +143,7 @@ import co from 'co'
 import $ from 'jquery'
 import Vue from 'vue'
 import {HttpResetClass} from 'vue-client'
+import {isPasswordModificationExpired} from '../../components/Util'
 
 let daibanJson = require('../../util/Daiban.json')
 
@@ -202,12 +203,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
       if (self.$login.showDaiBan && self.$login.r.includes('展示预约信息')){
@@ -233,6 +237,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 +265,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', '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){}
+    // 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) {
@@ -280,10 +286,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{
@@ -355,21 +359,20 @@ export default {
     },
     async getDaiBan(){
       let http = new HttpResetClass()
-      let condition = ''
+      let res
       if(this.$login.f.deps!=='柠条塔'){
-        condition = `  (f_orderstate != '预约成功' and f_orderstate != '预约失败' ) or f_orderstate is null `
+        res = await http.load('POST', '/rs/sql/safeOrderCenterQuery', {}, {
+        resolveMsg: null,
+        rejectMsg: null
+      })
       } 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', '/rs/sql/singleTable', {data: {
-          tablename:'t_order_center',
-          condition:condition
-        }}, {
+        res = await http.load('POST', '/rs/sql/safeOrderCenterQueryBySliceArea', {f_slice_area: '柠条塔'}, {
         resolveMsg: null,
         rejectMsg: null
-      }).then((res) => {
-        let OrderDaiBan = {}
-        res.data.forEach(item=>{
+      })
+      }
+      let OrderDaiBan = {}
+      res.data.forEach(item=>{
         OrderDaiBan[item.f_ordertype] = OrderDaiBan[item.f_ordertype] || []
         OrderDaiBan[item.f_ordertype].push(item)
       })
@@ -377,15 +380,7 @@ export default {
       if (res.data.length> 0){
         this.OrderDaiBan += `其中 ${Object.keys(OrderDaiBan).map(key=>`${key}：${OrderDaiBan[key].length}条`).join(', ')}`
       }
-    })
-      let data = {
-        condition: '1 = 1',
-        data: {
-          orgid: this.$login.f.orgid,
-          id: this.$login.f.id
-        }
-      }
-      await http.load('POST', '/rs/sql/checkuser', {data: data}, {
+    },
         resolveMsg: null,
         rejectMsg: null
       }).then((res) => {

package/src/filiale/dongguan/Login.vue

@@ -149,6 +149,7 @@ import co from 'co'
 import $ from 'jquery'
 import Vue from 'vue'
 import {HttpResetClass} from 'vue-client'
+import {isPasswordModificationExpired} from '../../components/Util'
 
 let daibanJson = require('../../util/Daiban.json')
 
@@ -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) && !(/^(?![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('展示预约信息')){
@@ -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
@@ -263,19 +269,19 @@ export default {
   title: '登录',
   async ready () {
     this.titleShow = true
-    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){}
+    // 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) {
@@ -284,10 +290,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{
@@ -346,21 +350,20 @@ export default {
   methods: {
     async getDaiBan(){
       let http = new HttpResetClass()
-      let condition = ''
+      let res
       if(this.$login.f.deps!=='柠条塔'){
-        condition = `  (f_orderstate != '预约成功' and f_orderstate != '预约失败' ) or f_orderstate is null `
+        res = await http.load('POST', '/rs/sql/safeOrderCenterQuery', {}, {
+        resolveMsg: null,
+        rejectMsg: null
+      })
       } 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', '/rs/sql/singleTable', {data: {
-          tablename:'t_order_center',
-          condition:condition
-        }}, {
+        res = await http.load('POST', '/rs/sql/safeOrderCenterQueryBySliceArea', {f_slice_area: '柠条塔'}, {
         resolveMsg: null,
         rejectMsg: null
-      }).then((res) => {
-        let OrderDaiBan = {}
-        res.data.forEach(item=>{
+      })
+      }
+      let OrderDaiBan = {}
+      res.data.forEach(item=>{
         OrderDaiBan[item.f_ordertype] = OrderDaiBan[item.f_ordertype] || []
         OrderDaiBan[item.f_ordertype].push(item)
       })
@@ -368,7 +371,7 @@ export default {
       if (res.data.length> 0){
         this.OrderDaiBan += `其中 ${Object.keys(OrderDaiBan).map(key=>`${key}：${OrderDaiBan[key].length}条`).join(', ')}`
       }
-    })
+    },
       let data = {
         condition: '1 = 1',
         data: {

package/src/filiale/dongguan/Main.vue

@@ -93,11 +93,7 @@ import co from 'co'
 import {HttpResetClass} from "vue-client";
 
 let getwartermakr = async function (self) {
-  let param = {
-    tablename: 't_singlevalue',
-    condition: " 1=1 and name=\'水印内容\'"
-  };
-  let result = await self.$resetpost('rs/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: null});
+  let result = await self.$resetpost('rs/sql/safeWatermarkQuery', {}, {resolveMsg: null, rejectMsg: null});
   if (result && result.data.length > 0) {
     self.showwatermakeflag = true;
     createWaterMark(result.data[0].value);
@@ -241,10 +237,7 @@ export default {
       this.OrderDaiBan  = ''
       this.AppDaiBan  = ''
       let http = new HttpResetClass()
-      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`
-        }}, {
+      await http.load('POST', '/rs/sql/safeOrderCenterQueryByOrgStr', {f_orgstr: this.$login.f.orgid}, {
         resolveMsg: null,
         rejectMsg: null
       }).then((res) => {
@@ -313,7 +306,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() {

package/src/filiale/furuike/Login.vue

@@ -136,6 +136,7 @@ import co from 'co'
 import $ from 'jquery'
 import Vue from 'vue'
 import {HttpResetClass} from 'vue-client'
+import {isPasswordModificationExpired} from '../../components/Util'
 
 let daibanJson = require('../../util/Daiban.json')
 
@@ -195,12 +196,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
       if (self.$login.showDaiBan && self.$login.r.includes('展示预约信息')){
@@ -227,6 +231,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
@@ -267,8 +273,7 @@ export default {
         // this.$showMessage("re----" + JSON.stringify(re))
         if (re.data.code === 200) {
           this.showlogin = false
-          let condition = `ename = '${re.data.data.userName}'`
-          this.$resetpost('rs/sql/singleTable', {data: { items: '*', tablename: 't_user', condition: condition}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+          this.$resetpost('rs/sql/safeUserQueryByEname', {ename: re.data.data.userName}, {resolveMsg: null, rejectMsg: null}).then((res) => {
             if (res.data && res.data.length > 0) {
               this.model.ename = res.data[0].ename
               this.model.password = res.data[0].password
@@ -292,19 +297,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', '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){}
+      // 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) {
@@ -313,10 +318,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{
@@ -392,29 +395,28 @@ export default {
     },
     async getDaiBan(){
       let http = new HttpResetClass()
-      let condition = ''
+      let res
       if(this.$login.f.deps!=='柠条塔'){
-        condition = `  (f_orderstate != '预约成功' and f_orderstate != '预约失败' ) or f_orderstate is null `
+        res = await http.load('POST', '/rs/sql/safeOrderCenterQuery', {}, {
+        resolveMsg: null,
+        rejectMsg: null
+      })
       } 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', '/rs/sql/singleTable', {data: {
-          tablename:'t_order_center',
-          condition:condition
-        }}, {
+        res = await http.load('POST', '/rs/sql/safeOrderCenterQueryBySliceArea', {f_slice_area: '柠条塔'}, {
         resolveMsg: null,
         rejectMsg: null
-      }).then((res) => {
-        let OrderDaiBan = {}
-        res.data.forEach(item=>{
-          OrderDaiBan[item.f_ordertype] = OrderDaiBan[item.f_ordertype] || []
-          OrderDaiBan[item.f_ordertype].push(item)
-        })
-        this.OrderDaiBan = `您有${res.data.length}条需要处理的微信预约业务！`
-        if (res.data.length> 0){
-          this.OrderDaiBan += `其中 ${Object.keys(OrderDaiBan).map(key=>`${key}：${OrderDaiBan[key].length}条`).join(', ')}`
-        }
       })
+      }
+      let OrderDaiBan = {}
+      res.data.forEach(item=>{
+        OrderDaiBan[item.f_ordertype] = OrderDaiBan[item.f_ordertype] || []
+        OrderDaiBan[item.f_ordertype].push(item)
+      })
+      this.OrderDaiBan = `您有${res.data.length}条需要处理的微信预约业务！`
+      if (res.data.length> 0){
+        this.OrderDaiBan += `其中 ${Object.keys(OrderDaiBan).map(key=>`${key}：${OrderDaiBan[key].length}条`).join(', ')}`
+      }
+    },
       let data = {
         condition: '1 = 1',
         data: {