system-phone 3.1.67 → 3.1.68

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "system-phone",
-  "version": "3.1.67",
+  "version": "3.1.68",
   "description": "手机模块 前端组件",
   "author": "何宁社 <524395609@qq.com>",
   "license": "ISC",

package/src/components/LoginApp.vue

@@ -205,8 +205,8 @@ export default {
         password: this.password,
         resourceName: '手机服务'
       }
+      let ret = {}
       if(Vue.isafsystem){
-        let ret = {}
         try {
           ret = await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-auth/login`, loginData, {
             resolveMsg: null,
@@ -238,130 +238,129 @@ export default {
           return
         }
       }else{
-        // rsa加密
         let encrypt = new JSEncrypt();
         encrypt.setPublicKey('MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCqPvovSfXcwBbW8cKMCgwqNpsYuzF8RPAPFb7LGsnVo44JhM/xxzDyzoYtdfNmtbIuKVi9PzIsyp6rg+09gbuI6UGwBZ5DWBDBMqv5MPdOF5dCQkB2Bbr5yPfURPENypUz+pBFBg41d+BC+rwRiXELwKy7Y9caD/MtJyHydj8OUwIDAQAB');
         const userDataEncrypt = encrypt.encrypt(JSON.stringify(userData))
         console.log("加密后的用户登录信息", userDataEncrypt)
-          let ret = {}
-          try {
-            ret = await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/user/userLogin/手机服务`, userDataEncrypt, {
-              resolveMsg: null,
-              rejectMsg: null
-            })
-            this.$androidUtil.setPreference('siteId', ret.data.f_extend1 || '')
-            this.$androidUtil.setPreference('flatId', ret.data.f_extend2 || '')
-            this.$androidUtil.setPreference('name', ret.data.name || '')
-            this.$androidUtil.setPreference('ename', ret.data.ename || '')
-            if ((JSON.stringify(ret.data).startsWith("{") || JSON.stringify(ret.data).data.startsWith("[")) && ret.data.code && ret.data.msg && ret.data.code !== 200) {
-              throw {status: ret.data.code, message: ret.data.msg}
-            }
-            // 设置登录人
-            if ((JSON.stringify(ret.data).startsWith("{") || JSON.stringify(ret.data).data.startsWith("[")) && ret.data.code && ret.data.msg && ret.data.code === 200) {
-              Vue.user = Util.f = ret.data.data
-            } else {
-              Vue.user = Util.f = ret.data
-            }
-            // 功能排序
-            if ((JSON.stringify(ret.data).startsWith("{") || JSON.stringify(ret.data).data.startsWith("[")) && ret.data.code && ret.data.msg && ret.data.code === 200) {
-              Vue.functions = this.sortFunctions(ret.data.data.functions)
-            } else {
-              Vue.functions = this.sortFunctions(ret.data.functions)
-            }
-          }catch (e) {
-            if (Vue.android) {
-              this.loaderShow = false
-              this.$showMessage(e.message ? e.message : '登录失败!用户名或密码错误!')
-            }
-            return
+        try {
+          ret = await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/user/userLogin/手机服务`, userDataEncrypt, {
+            resolveMsg: null,
+            rejectMsg: null
+          })
+          this.$androidUtil.setPreference('siteId', ret.data.f_extend1 || '')
+          this.$androidUtil.setPreference('flatId', ret.data.f_extend2 || '')
+          this.$androidUtil.setPreference('name', ret.data.name || '')
+          this.$androidUtil.setPreference('ename', ret.data.ename || '')
+          if ((JSON.stringify(ret.data).startsWith("{") || JSON.stringify(ret.data).data.startsWith("[")) && ret.data.code && ret.data.msg && ret.data.code !== 200) {
+            throw {status: ret.data.code, message: ret.data.msg}
           }
-         }
-        // 对资源菜单进行排序
-        let viewDetails = await Vue.resetpost(`${this.$androidUtil.getProxyUrl()}/rs/search`, {
-          source: 'this.getRights().where(row.getType()==$function$ && row.getPath($name$).indexOf($功能权限$) != -1)',
-          userid: Vue.user.id
-        }, {resolveMsg: null, rejectMsg: null})
-        const rithtList = viewDetails.data
-        Vue.user.r = []
-        rithtList.forEach(x => Vue.user.r.push(x.name))
-        console.log('登陆人信息', JSON.stringify(Vue.user))
-        let userStr
-        if (Vue.android) {
-          console.log(`Device_IEMI:${this.$androidUtil.getPreference('Device_IEMI')}`)
-          // 判断是否需要验证 设备码
-          if (this.$androidUtil.getPreference('Device_IEMI')) {
-            console.log(`手机设备码：${this.deviceIemi}`)
-            let result = await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {
-              data: {
-                items: '*',
-                tablename: 't_equipment',
-                orderitem: 'id desc',
-                condition: `f_terminal_number = '${this.deviceIemi}' and f_state = '正常'`
-              }
-            }, {resolveMsg: null, rejectMsg: null})
-            console.log(`检测设备码存在是否：${result.data.length}`)
-            if (result.data.length == 0) {
-              HostApp.alert('设备码未绑定，请联系管理员！')
-              return
-            }
+          // 设置登录人
+          if ((JSON.stringify(ret.data).startsWith("{") || JSON.stringify(ret.data).data.startsWith("[")) && ret.data.code && ret.data.msg && ret.data.code === 200) {
+            Vue.user = Util.f = ret.data.data
+          } else {
+            Vue.user = Util.f = ret.data
           }
-          if (this.showsave) {
-            userStr = `{'username':'${this.ename}','password':'${this.password}'}`
+          // 功能排序
+          if ((JSON.stringify(ret.data).startsWith("{") || JSON.stringify(ret.data).data.startsWith("[")) && ret.data.code && ret.data.msg && ret.data.code === 200) {
+            Vue.functions = this.sortFunctions(ret.data.data.functions)
           } else {
-            userStr = `{'username':'${this.ename}','password':''}`
+            Vue.functions = this.sortFunctions(ret.data.functions)
+          }
+        }catch (e) {
+          if (Vue.android) {
+            this.loaderShow = false
+            this.$showMessage(e.message ? e.message : '登录失败!用户名或密码错误!')
           }
-          console.log(this.showauto)
-          this.$androidUtil.setPreference('login_user_cache', userStr)
-          this.$androidUtil.setPreference('f_repairman_id', Util.f.id)
-          this.$androidUtil.setPreference('f_repairman_name', Util.f.name)
-          this.$androidUtil.setPreference('f_orgid', Util.f.orgid)
-          this.$androidUtil.setPreference('f_role_name', Util.f.f_role_name || '')
-          console.log("自动登陆标识" + Util.f.f_role_name)
-          this.$androidUtil.setPreference('auto_login', this.showauto)
+          return
         }
-        let jwt = ''
-        if(Vue.isafsystem){
-          jwt = loginData.id
-        }else{
-          if ((JSON.stringify(ret.data).startsWith("{") || JSON.stringify(ret.data).startsWith("[")) && ret.data.code && ret.data.msg && ret.data.code === 200) {
-            jwt = ret.data.data.id
-          }else{
-            jwt = ret.data.id
+      }
+      // 对资源菜单进行排序
+      let viewDetails = await Vue.resetpost(`${this.$androidUtil.getProxyUrl()}/rs/search`, {
+        source: 'this.getRights().where(row.getType()==$function$ && row.getPath($name$).indexOf($功能权限$) != -1)',
+        userid: Vue.user.id
+      }, {resolveMsg: null, rejectMsg: null})
+      const rithtList = viewDetails.data
+      Vue.user.r = []
+      rithtList.forEach(x => Vue.user.r.push(x.name))
+      console.log('登陆人信息', JSON.stringify(Vue.user))
+      let userStr
+      if (Vue.android) {
+        console.log(`Device_IEMI:${this.$androidUtil.getPreference('Device_IEMI')}`)
+        // 判断是否需要验证 设备码
+        if (this.$androidUtil.getPreference('Device_IEMI')) {
+          console.log(`手机设备码：${this.deviceIemi}`)
+          let result = await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {
+            data: {
+              items: '*',
+              tablename: 't_equipment',
+              orderitem: 'id desc',
+              condition: `f_terminal_number = '${this.deviceIemi}' and f_state = '正常'`
+            }
+          }, {resolveMsg: null, rejectMsg: null})
+          console.log(`检测设备码存在是否：${result.data.length}`)
+          if (result.data.length == 0) {
+            HostApp.alert('设备码未绑定，请联系管理员！')
+            return
           }
         }
-          Vue.$login = Vue.prototype.$login = {jwt: jwt,
-            toStandardDateString () {
-              let dt = new Date()
-              let month = dt.getMonth() + 1
-              let date = dt.getDate()
-              return dt.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (date < 10 ? '0' + date : date)
-            }, toStandardTimeString () {
-              let dt = new Date()
-              let month = dt.getMonth()+1
-              let date = dt.getDate()
-              let hour = dt.getHours()
-              let min = dt.getMinutes()
-              let sec = dt.getSeconds()
-              return dt.getFullYear() + '-' + (month<10? '0'+ month : month) + '-' + (date<10? '0'+ date : date)
-                + ' ' + (hour<10? '0'+ hour : hour) + ':' + (min<10? '0'+ min : min) + ':' + (sec<10? '0'+ sec : sec)
-            }}
-        // 获取参数
-        console.log('获取参数system以及安检参数')
-        const flag = await asyncReady(this, this.$androidUtil.getProxyUrl())
-        if (!flag) {
-          this.loaderShow = false
-          console.log('获取参数异常')
-          return
+        if (this.showsave) {
+          userStr = `{'username':'${this.ename}','password':'${this.password}'}`
+        } else {
+          userStr = `{'username':'${this.ename}','password':''}`
         }
-        console.log('获取参数结束')
-        this.loaderShow = false
-        // 弱口令验证
-        if (this.weakPassword && !(/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?!.*(123|321|abc|cba))[a-zA-Z\d!@#$%^&*()_+-=<>?]{8,16}$/.test(this.password))) {
-          await this.$showMessage('登录系统: 此账户的密码过于简单，请修改密码后重新登陆！！！', ['confirm'])
-          this.modifyPassword = true
-          return
+        console.log(this.showauto)
+        this.$androidUtil.setPreference('login_user_cache', userStr)
+        this.$androidUtil.setPreference('f_repairman_id', Util.f.id)
+        this.$androidUtil.setPreference('f_repairman_name', Util.f.name)
+        this.$androidUtil.setPreference('f_orgid', Util.f.orgid)
+        this.$androidUtil.setPreference('f_role_name', Util.f.f_role_name || '')
+        console.log("自动登陆标识" + Util.f.f_role_name)
+        this.$androidUtil.setPreference('auto_login', this.showauto)
+      }
+      let jwt = ''
+      if(Vue.isafsystem){
+        jwt = loginData.id
+      }else{
+        console.log("ret", ret)
+        if ((JSON.stringify(ret.data).startsWith("{") || JSON.stringify(ret.data).startsWith("[")) && ret.data.code && ret.data.msg && ret.data.code === 200) {
+          jwt = ret.data.data.id
+        }else{
+          jwt = ret.data.id
         }
-        this.$goto('nav-bottom')
+      }
+      Vue.$login = Vue.prototype.$login = {jwt: jwt,
+        toStandardDateString () {
+          let dt = new Date()
+          let month = dt.getMonth() + 1
+          let date = dt.getDate()
+          return dt.getFullYear() + '-' + (month < 10 ? '0' + month : month) + '-' + (date < 10 ? '0' + date : date)
+        }, toStandardTimeString () {
+          let dt = new Date()
+          let month = dt.getMonth()+1
+          let date = dt.getDate()
+          let hour = dt.getHours()
+          let min = dt.getMinutes()
+          let sec = dt.getSeconds()
+          return dt.getFullYear() + '-' + (month<10? '0'+ month : month) + '-' + (date<10? '0'+ date : date)
+            + ' ' + (hour<10? '0'+ hour : hour) + ':' + (min<10? '0'+ min : min) + ':' + (sec<10? '0'+ sec : sec)
+        }}
+      // 获取参数
+      console.log('获取参数system以及安检参数')
+      const flag = await asyncReady(this, this.$androidUtil.getProxyUrl())
+      if (!flag) {
+        this.loaderShow = false
+        console.log('获取参数异常')
+        return
+      }
+      console.log('获取参数结束')
+      this.loaderShow = false
+      // 弱口令验证
+      if (this.weakPassword && !(/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?!.*(123|321|abc|cba))[a-zA-Z\d!@#$%^&*()_+-=<>?]{8,16}$/.test(this.password))) {
+        await this.$showMessage('登录系统: 此账户的密码过于简单，请修改密码后重新登陆！！！', ['confirm'])
+        this.modifyPassword = true
+        return
+      }
+      this.$goto('nav-bottom')
     },
   },
   watch: {