system-phone 3.1.11 → 3.1.14

package/src/components/LoginAppNew.vue

@@ -118,21 +118,24 @@
     },
       methods: {
       // 对资源菜单进行排序
-      sortFunctions(val){
-          if(val && val.length > 0){
-            for(var i = 0;i<val.length-1;i++){
-              for(var j = 0;j<val.length-1-i;j++){
-                  if(val[j].position > val[j+1].position){
-                    var temp = val[j+1]
-                    val[j+1] = val[j]
-                    val[j] = temp;
-                  }
-              }
+        sortFunctions (val) {
+          this.sortArr(val)
+          val.forEach((item)=>{
+            if(item.children && Array.isArray(item.children)){
+              this.sortArr(item.children)
             }
-            return val
-          }
+          })
           return val
-      },
+        },
+        sortArr(val){
+          val.sort((itemA, itemB)=>{
+            if(itemA.position !== itemB.position){
+              return itemA.position - itemB.position
+            }else{
+              return itemA.id - itemB.id
+            }
+          })
+        },
       // 记住密码选中/未选中
       showoff(){
         this.showsave = false

package/src/components/LoginAppV4.vue

@@ -39,7 +39,7 @@
       <header slot="modal-header" class="modal-header">
       </header>
       <article slot="modal-body" class="modal-body">
-        <modify-pass-word :sourse="login" :weak-password="weakPassword" v-if="modifyPassword"
+        <modify-pass-word :sourse="login"  :weak-password="weakPassword" v-if="modifyPassword"
                           v-on:success="success"></modify-pass-word>
       </article>
       <footer slot="modal-footer" class="modal-footer">
@@ -70,9 +70,24 @@ let asyncReady = async function (self, url) {
     await self.$appdata.load()
     console.log('获取营收配置文件和参数【结束】，开始获取vue配置文件【开始】')
     let that = self
-    let res = await Vue.resetget(`${url}/phone/rs/vue`, {data: {}}, {resolveMsg: null, rejectMsg: null})
-    that.$set('config', res.data)
-    Vue.config2 = res.data
+    const vueConfig={}
+    const res = await Vue.resetget(`${url}/api/af-safecheck/vue`, {data: {}}, {resolveMsg: null, rejectMsg: null})
+    self.delConfigKey(res.data)
+    vueConfig.safecheck = res.data
+    const dir_module = res.data.global.dir_module
+    for(let mod in dir_module) {
+      if (dir_module[mod].name !== 'af-safecheck') {
+        let mod_url = `${url}/api/${dir_module[mod].name}/vue`
+        if (!dir_module[mod].name.startsWith('af-')) {
+          mod_url = `${url}/${dir_module[mod].name}/rs/vue`
+        }
+        const config = await Vue.resetget(mod_url, {data: {}}, {resolveMsg: null, rejectMsg: null})
+        self.delConfigKey(config.data)
+        vueConfig[dir_module[mod].name] = config.data;
+      }
+    }
+    that.$set('config', vueConfig)
+    Vue.config2 = vueConfig
     // 判断是否需要弱密码校验
     if (self.config && self.config.telephone && self.config.telephone.LoginApp && 'undefined' != typeof self.config.telephone.LoginApp.weakPassword) {
       self.weakPassword = self.config.telephone.LoginApp.weakPassword
@@ -153,20 +168,23 @@ export default {
     },
     // 对资源菜单进行排序
     sortFunctions (val) {
-      if (val && val.length > 0) {
-        for (var i = 0; i < val.length - 1; i++) {
-          for (var j = 0; j < val.length - 1 - i; j++) {
-            if (val[j].position > val[j + 1].position) {
-              var temp = val[j + 1]
-              val[j + 1] = val[j]
-              val[j] = temp
-            }
-          }
+      this.sortArr(val)
+      val.forEach((item)=>{
+        if(item.children && Array.isArray(item.children)){
+          this.sortArr(item.children)
         }
-        return val
-      }
+      })
       return val
     },
+    sortArr(val){
+      val.sort((itemA, itemB)=>{
+        if(itemA.position !== itemB.position){
+          return itemA.position - itemB.position
+        }else{
+          return itemA.id - itemB.id
+        }
+      })
+    },
     // 记住密码选中/未选中
     showoff () {
       this.showsave = false
@@ -191,7 +209,7 @@ export default {
     async confirm () {
       this.loaderShow = true
       // 判断用户状态
-      let users = await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {
+      let users = await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/af-telephone/rs/sql/tel_singleTable_OrderBy`, {
         data: {
           items: '*',
           tablename: 't_user',
@@ -207,62 +225,44 @@ export default {
       console.log('Vue.android：' + Vue.android)
       Vue.dataUrl = this.$androidUtil.getProxyUrl() + '/'
       let loginData = {}
-      let jwtNew= ''
+       try {
+      let ret = {}
       try {
-        let ret = {}
-        try {
-          ret = await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-auth/login`, {
-            username: this.ename, password: this.password,
-            resourceName: '手机服务'
-          }, {
-            resolveMsg: null,
-            rejectMsg: null,
-            headerConfig: {'Content-type': 'application/json'}
-          })
-          console.log(ret, '==')
-          if (ret.data) {
-            if (ret.data.resources.data && ret.data.resources.data.id) {
-              loginData = ret.data.resources.data
-            } else {
-              loginData = ret.data.resources
-            }
-            jwtNew = ret.data.access_token
-            this.$androidUtil.setPreference('siteId', loginData.f_extend1 || '')
-            this.$androidUtil.setPreference('flatId', loginData.f_extend2 || '')
-            this.$androidUtil.setPreference('name', loginData.name || '')
-            this.$androidUtil.setPreference('ename', loginData.ename || '')
+        ret = await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-auth/login`, {
+          username: this.ename, password: this.password,
+          resourceName: '手机服务'
+        }, {
+          resolveMsg: null,
+          rejectMsg: null,
+          headerConfig: {'Content-type': 'application/json'}
+        })
+        console.log(ret, '==')
+        if (ret.data) {
+          if (ret.data.resources.data && ret.data.resources.data.id) {
+            loginData = ret.data.resources.data
           } else {
-            throw {status: ret.data.code, message: ret.data.msg}
+            loginData = ret.data.resources
           }
-        } catch (e) {
-          if (Vue.android) {
-            this.loaderShow = false
-            this.$showMessage(e.message ? e.message : '登录失败!用户名或密码错误!')
-          }
-          return
+          this.$androidUtil.setPreference('siteId', loginData.f_extend1 || '')
+          this.$androidUtil.setPreference('flatId', loginData.f_extend2 || '')
+          this.$androidUtil.setPreference('name', loginData.name || '')
+          this.$androidUtil.setPreference('ename', loginData.ename || '')
+        } else {
+          throw {status: ret.data.code, message: ret.data.msg}
         }
-        // 设置登录人
-        Vue.user = Util.f = loginData
-        Vue.$login = Vue.prototype.$login = {
-          jwt: loginData.id,
-          jwtNew: jwtNew,
-          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)
-          }
+      } catch (e) {
+        if (Vue.android) {
+          this.loaderShow = false
+          this.$showMessage(e.message ? e.message : '登录失败!用户名或密码错误!')
         }
-        // 对资源菜单进行排序
+        return
+      }
+
+      // 设置登录人
+      Vue.user = Util.f = loginData
+
+      // 对资源菜单进行排序
+      try{
         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
@@ -270,60 +270,83 @@ export default {
         const rithtList = viewDetails.data
         Vue.user.r = []
         rithtList.forEach(x => Vue.user.r.push(x.name))
-        // 功能排序
-        Vue.functions = this.sortFunctions(loginData.functions)
-        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
+      }catch (e) {
+        console.log('资源排序失败！暂时先不影响登录')
+      }
+      // 功能排序
+      Vue.functions = this.sortFunctions(loginData.functions)
+      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 (this.showsave) {
-            userStr = `{'username':'${this.ename}','password':'${this.password}'}`
-          } else {
-            userStr = `{'username':'${this.ename}','password':''}`
-          }
-          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)
-          console.log(this.showauto)
-          this.$androidUtil.setPreference('auto_login', this.showauto)
         }
-        // 获取参数
-        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.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 || '')
+        this.$androidUtil.setPreference('access_token', ret.data.access_token)
+        console.log('自动登陆标识' + Util.f.f_role_name)
+        console.log(this.showauto)
+        this.$androidUtil.setPreference('auto_login', this.showauto)
+      }
+      Vue.$login = Vue.prototype.$login = {
+        jwt: loginData.id,
+        jwtNew: ret.data.access_token,
+        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('获取参数结束')
+      }
+      // 获取参数
+      console.log('获取参数system以及安检参数')
+      const flag = await asyncReady(this, this.$androidUtil.getProxyUrl())
+        if (!flag) {
         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('获取参数异常')
+        return
         }
-        this.$goto('nav-bottom')
+      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')
       } catch (e) {
         if (Vue.android) {
           this.loaderShow = false
@@ -331,6 +354,18 @@ export default {
         console.error('登录异常，LoginApp的confirm函数错误', e)
         this.$showMessage('登陆失败！,')
       }
+    },
+    delConfigKey(obj){
+      // 从琉璃中获取的配置中会包含 $开头的一些额外描述新的key。为了兼容v3的代码逻辑在此函数中去掉
+      Object.keys(obj).forEach(key =>{
+        Object.keys(obj[key]).forEach(col => {
+          // 检查键是否以$开头
+          if (col.startsWith('$')) {
+            // 使用delete操作符删除键
+            delete obj[key][col];
+          }
+        })
+      })
     }
   },
   watch: {