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

package/src/filiale/furuike/Main.vue

@@ -174,11 +174,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}${self.$login.f.ename}`);
@@ -327,10 +323,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) => {
@@ -400,12 +393,8 @@ export default {
     },
     async workorderOverRemind(){
       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}'`
-          }
+        let res = await new HttpResetClass().load('POST', '/rs/sql/safeOrganizationQueryByParentId', {
+          parentid: this.functions.orgid
         }, {resolveMsg: null, rejectMsg: null})
         const f_filialeids = [this.functions.orgid]
         for (const f of res.data) {
@@ -413,7 +402,8 @@ export default {
         }
 
         const data = {
-          condition: `f_filiale_id in (${f_filialeids.join(',')}) and overday >= 0`
+          f_filiale_ids: f_filialeids.join(','),
+          overday: 0
         }
         new HttpResetClass().load('POST','rs/sql/serviceDetails/n', {data}, {resolveMsg: null, rejectMsg: null}).then(res=>{
           if(res.data && res.data.n !== 0){
@@ -425,7 +415,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() {

package/src/filiale/gehua/Main.vue

@@ -147,11 +147,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}${self.$login.f.ename}`);
@@ -291,10 +287,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) => {
@@ -363,7 +356,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/konggang/Login.vue

@@ -134,6 +134,7 @@
   import $ from 'jquery'
   import Vue from 'vue'
   import {HttpResetClass} from 'vue-client'
+  import {isPasswordModificationExpired} from '../../components/Util'
 
 
 
@@ -191,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('展示预约信息')){
@@ -217,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
@@ -240,19 +246,19 @@
   export default {
     title: '登录',
     async ready () {
-      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) {
@@ -261,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{
@@ -320,37 +324,28 @@
     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=>{
-            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: {
-            orgid: this.$login.f.orgid,
-            id: this.$login.f.id
-          }
         }
-        await http.load('POST', '/rs/sql/checkuser', {data: data}, {
+        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(', ')}`
+        }
+      },
           resolveMsg: null,
           rejectMsg: null
         }).then((res) => {

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')
@@ -204,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('展示预约信息')){
@@ -230,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
@@ -258,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', '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) {
@@ -294,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{
@@ -371,37 +375,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 data = {
-        condition: '1 = 1',
-        data: {
-          orgid: this.$login.f.orgid,
-          id: this.$login.f.id
-        }
       }
-      await http.load('POST', '/rs/sql/checkuser', {data: data}, {
+      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(', ')}`
+      }
+    },
         resolveMsg: null,
         rejectMsg: null
       }).then((res) => {

package/src/filiale/qianneng/Main.vue

@@ -157,11 +157,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}${self.$login.f.ename}`);
@@ -300,10 +296,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) => {
@@ -372,7 +365,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/rizhao/Login.vue

@@ -124,6 +124,7 @@ import co from 'co'
 import $ from 'jquery'
 import Vue from 'vue'
 import {HttpResetClass} from 'vue-client'
+import {isPasswordModificationExpired} from '../../components/Util'
 
 
 
@@ -182,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 {
@@ -204,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
@@ -227,19 +233,19 @@ let saveGen = function *(self) {
 export default {
   title: '登录',
   async ready () {
-    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) {
@@ -248,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{

package/src/filiale/rizhao/Main.vue

@@ -64,11 +64,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);
@@ -216,7 +212,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() {

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')
 
@@ -203,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('展示预约信息')){
@@ -229,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
@@ -257,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', '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) {
@@ -278,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{
@@ -353,37 +357,28 @@
       },
       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 data = {
-          condition: '1 = 1',
-          data: {
-            orgid: this.$login.f.orgid,
-            id: this.$login.f.id
-          }
         }
-        await http.load('POST', '/rs/sql/checkuser', {data: data}, {
+        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(', ')}`
+        }
+      },
           resolveMsg: null,
           rejectMsg: null
         }).then((res) => {