system-phone 3.1.0 → 3.1.1

package/package.json

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

package/src/components/LoginAppV4.vue

@@ -59,7 +59,6 @@
  *
  */
 
-
 import Vue from 'vue'
 import * as Util from '../Util'
 import JSEncrypt from 'jsencrypt'
@@ -67,21 +66,22 @@ import JSEncrypt from 'jsencrypt'
 let asyncReady = async function (self, url) {
   // 获取配置信息
   try {
-    console.log("获取营收配置文件和参数【开始】")
+    console.log('获取营收配置文件和参数【开始】')
     await self.$appdata.load()
-    console.log("获取营收配置文件和参数【结束】，开始获取vue配置文件【开始】")
+    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
     // 判断是否需要弱密码校验
-    if (self.config && self.config.telephone && self.config.telephone.LoginApp && "undefined" != typeof self.config.telephone.LoginApp.weakPassword) {
+    if (self.config && self.config.telephone && self.config.telephone.LoginApp && 'undefined' != typeof self.config.telephone.LoginApp.weakPassword) {
       self.weakPassword = self.config.telephone.LoginApp.weakPassword
     }
-    console.log("手机端获取.json文件")
+    console.log('手机端获取.json文件')
     console.log(JSON.stringify(self.config))
     return true
   } catch (error) {
+    console.log(error)
     // 此处业务数据装载异常不做任何处理，理论上不会有任何异常
     self.$showMessage('登录系统: 获取配置文件失败，请检查网络后重新登陆！')
     return false
@@ -108,7 +108,7 @@ let asyncLoadData = async function (self, url) {
 
 export default {
   title: '登录系统',
-  data() {
+  data () {
     return {
       loaderShow: false,
       config: {},
@@ -127,7 +127,7 @@ export default {
     }
   },
 
-  ready() {
+  ready () {
     if (Vue.android) {
       const userCache = this.$androidUtil.getPreference('login_user_cache')
       this.showauto = this.$androidUtil.getPreference('auto_login')
@@ -146,20 +146,20 @@ export default {
     }
   },
   methods: {
-    success(val) {
+    success (val) {
       // 修改密码成功
       this.modifyPassword = false
       this.password = val
     },
     // 对资源菜单进行排序
-    sortFunctions(val) {
+    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;
+              val[j] = temp
             }
           }
         }
@@ -168,58 +168,68 @@ export default {
       return val
     },
     // 记住密码选中/未选中
-    showoff() {
+    showoff () {
       this.showsave = false
     },
-    showon() {
+    showon () {
       this.showsave = true
     },
-    showoff1() {
+    showoff1 () {
       this.showauto = '2'
     },
-    showon1() {
+    showon1 () {
       this.showauto = '1'
     },
-    changepass() {
+    changepass () {
       this.showpass = this.showpass ? false : true
       if (this.showpass) {
-        this.imageurl = require("../assets/mingwen.png")
+        this.imageurl = require('../assets/mingwen.png')
       } else {
-        this.imageurl = require("../assets/miwen.png")
+        this.imageurl = require('../assets/miwen.png')
       }
     },
-    async confirm() {
+    async confirm () {
       this.loaderShow = true
       // 判断用户状态
-      let users = await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`,{
-        data: {items: '*', tablename: 't_user', orderitem: 'id desc', condition:`ename = '${this.ename}' and (state='在职' or name like '%超级管理员%')`}
-      },{resolveMsg: null, rejectMsg: null})
+      let users = await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {
+        data: {
+          items: '*',
+          tablename: 't_user',
+          orderitem: 'id desc',
+          condition: `ename = '${this.ename}' and (state='在职' or name like '%超级管理员%')`
+        }
+      }, {resolveMsg: null, rejectMsg: null})
       if (users.data.length == 0) {
         this.loaderShow = false
-        this.$showMessage("登陆失败,用户不存在")
+        this.$showMessage('登陆失败,用户不存在')
         return
       }
       console.log('Vue.android：' + Vue.android)
-      const userData = {username: this.ename, password: this.password}
-      console.log('获取登陆信息：' + userData)
-      Vue.dataUrl = this.$androidUtil.getProxyUrl() + "/"
-      // rsa加密
-      let encrypt = new JSEncrypt();
-      encrypt.setPublicKey('MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCqPvovSfXcwBbW8cKMCgwqNpsYuzF8RPAPFb7LGsnVo44JhM/xxzDyzoYtdfNmtbIuKVi9PzIsyp6rg+09gbuI6UGwBZ5DWBDBMqv5MPdOF5dCQkB2Bbr5yPfURPENypUz+pBFBg41d+BC+rwRiXELwKy7Y9caD/MtJyHydj8OUwIDAQAB');
-      const userDataEncrypt = encrypt.encrypt(JSON.stringify(userData))
-      console.log("加密后的用户登录信息", userDataEncrypt)
+      Vue.dataUrl = this.$androidUtil.getProxyUrl() + '/'
+      let loginData = {}
       try {
         let ret = {}
         try {
-          ret = await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/user/userLogin/手机服务`, userDataEncrypt, {
+          ret = await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-auth/login`, {
+            username: this.ename, password: this.password,
+            resourceName: '手机服务'
+          }, {
             resolveMsg: null,
-            rejectMsg: null
+            rejectMsg: null,
+            headerConfig: {'Content-type': 'application/json'}
           })
-          this.$androidUtil.setPreference('siteId', ret.data.f_extend1 || users.data[0].f_extend1 || '')
-          this.$androidUtil.setPreference('flatId', ret.data.f_extend2 || users.data[0].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) {
+          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
+            }
+            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}
           }
         } catch (e) {
@@ -231,11 +241,7 @@ export default {
         }
 
         // 设置登录人
-        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
-        }
+        Vue.user = Util.f = loginData
 
         // 对资源菜单进行排序
         let viewDetails = await Vue.resetpost(`${this.$androidUtil.getProxyUrl()}/rs/search`, {
@@ -246,12 +252,7 @@ export default {
         Vue.user.r = []
         rithtList.forEach(x => Vue.user.r.push(x.name))
         // 功能排序
-        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)
-        }
-        console.log('登陆人信息', JSON.stringify(Vue.user))
+        Vue.functions = this.sortFunctions(loginData.functions)
         let userStr
         if (Vue.android) {
           console.log(`Device_IEMI:${this.$androidUtil.getPreference('Device_IEMI')}`)
@@ -283,45 +284,28 @@ export default {
           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('自动登陆标识' + Util.f.f_role_name)
           console.log(this.showauto)
           this.$androidUtil.setPreference('auto_login', this.showauto)
         }
-        // 设置当前登录人信息
-        if ((JSON.stringify(ret.data).startsWith("{") || JSON.stringify(ret.data).startsWith("[")) && ret.data.code && ret.data.msg && ret.data.code === 200) {
-          Vue.$login = Vue.prototype.$login  = {jwt: ret.data.data.id,
-            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)
-            }}
-        } else {
-          Vue.$login = Vue.prototype.$login = {jwt: ret.data.id,
-            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)
-            }}
+        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('获取参数system以及安检参数')
@@ -344,13 +328,13 @@ export default {
         if (Vue.android) {
           this.loaderShow = false
         }
-        console.error("登录异常，LoginApp的confirm函数错误", e)
-        this.$showMessage("登陆失败！,")
+        console.error('登录异常，LoginApp的confirm函数错误', e)
+        this.$showMessage('登陆失败！,')
       }
-    },
+    }
   },
   watch: {
-    'config'(val) {
+    'config' (val) {
       Vue.config = val
     }
   }

package/src/stores/AppData.js

@@ -13,18 +13,11 @@ let GetAppDataService = {
       url1 = `${Vue.androidUtil.getProxyUrl()}/api/af-system/logic/getInitData`
     }
     let result = await new HttpResetClass().load('POST',url1, {data: {f_filialeids: Vue.user.orgid}}, {resolveMsg: null, rejectMsg: null})
-    console.log('system加载参数')
     console.log(JSON.stringify(result))
     let newdata = {
       singleValues : result.data.singleValues,
       params: result.data.params
     }
-    if(Vue.isv4 && result.data.code == 200){
-      newdata = {
-        singleValues : result.data.data.singleValues,
-        params: result.data.data.params
-      }
-    }
     newdata.singleValues.forEach((item) => {
       this.singleValues[item.name] = item.value
     })
@@ -48,11 +41,6 @@ let GetAppDataService = {
       let newsaledata = {
         gasbrands : getParams.data.gasbrands
       }
-      if(Vue.isv4 && getParams.data.code == 200){
-        newsaledata = {
-          gasbrands : getParams.data.data.gasbrands
-        }
-      }
       if (newsaledata) {
         newsaledata.gasbrands.forEach((item, index) => {
           this.saleParams.gasbrands[index] = {}