system-phone 3.1.31 → 3.1.32

package/src/components/LoginAppV4.vue

@@ -146,12 +146,19 @@ export default {
       imageurl: require('../assets/miwen.png'),
       deviceIemi: '无法获取该设备码，请联系管理员',
       loginSafe: false,
-      margintop: document.documentElement.clientHeight * 0.1
+      margintop: document.documentElement.clientHeight * 0.1,
+      config: null
     }
   },
 
   ready () {
     if (Vue.android) {
+      // 获取系统配置文件
+      let users = this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-system/logic/openapi/getLiuliConfiguration`, {
+        configName: 'webConfig'
+      }, {resolveMsg: null, rejectMsg: null}).then(res=>{
+        this.config = res.data
+      })
       const userCache = this.$androidUtil.getPreference('login_user_cache')
       this.showauto = this.$androidUtil.getPreference('auto_login')
       this.showauto = this.showauto ? this.showauto : '2'
@@ -219,128 +226,134 @@ export default {
       console.log('Vue.android：' + Vue.android)
       Vue.dataUrl = this.$androidUtil.getProxyUrl() + '/'
       let loginData = {}
-       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
+        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
+            }
+            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 {
-            loginData = ret.data.resources
+            throw {status: ret.data.code, message: ret.data.msg}
           }
-          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) {
-        if (Vue.android) {
-          this.loaderShow = false
-          this.$showMessage(e.message ? e.message : '登录失败!用户名或密码错误!')
+        } catch (e) {
+          if (Vue.android) {
+            this.loaderShow = false
+            this.$showMessage(e.message ? e.message : '登录失败!用户名或密码错误!')
+          }
+          return
         }
-        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
-        }, {resolveMsg: null, rejectMsg: null})
-        const rithtList = viewDetails.data
-        Vue.user.r = []
-        rithtList.forEach(x => Vue.user.r.push(x.name))
-      }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 = '正常'`
-            }
+        // 设置登录人
+        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
           }, {resolveMsg: null, rejectMsg: null})
-          console.log(`检测设备码存在是否：${result.data.length}`)
-          if (result.data.length == 0) {
-            HostApp.alert('设备码未绑定，请联系管理员！')
-            return
-          }
+          const rithtList = viewDetails.data
+          Vue.user.r = []
+          rithtList.forEach(x => Vue.user.r.push(x.name))
+        }catch (e) {
+          console.log('资源排序失败！暂时先不影响登录')
         }
-        if (this.showsave) {
-          userStr = `{'username':'${this.ename}','password':'${this.password}'}`
-        } else {
-          userStr = `{'username':'${this.ename}','password':''}`
+        // 功能排序
+        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 || '')
+          this.$androidUtil.setPreference('access_token', ret.data.access_token)
+          if(this.config && this.config.setting.requestEncrypt){
+            this.$androidUtil.setPreference('v4-session-key', this.RSADecrypt(ret.data.session))
+          }else{
+            this.$androidUtil.setPreference('v4-session-key', "")
+          }
+          console.log('自动登陆标识' + Util.f.f_role_name)
+          console.log(this.showauto)
+          this.$androidUtil.setPreference('auto_login', this.showauto)
         }
-        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)
+        Vue.$login = Vue.prototype.$login = {
+          jwt: loginData.id,
+          jwtNew: ret.data.access_token,
+          "v4-session-key": this.config && this.config.setting.requestEncrypt ? this.RSADecrypt(ret.data.session): null,
+          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())
+        const flag = await asyncReady(this, this.$androidUtil.getProxyUrl())
         if (!flag) {
+          this.loaderShow = false
+          console.log('获取参数异常')
+          return
+        }
+        console.log('获取参数结束')
         this.loaderShow = false
-        console.log('获取参数异常')
-        return
+        // 弱口令验证
+        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.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')
+        this.$goto('nav-bottom')
       } catch (e) {
         if (Vue.android) {
           this.loaderShow = false
@@ -349,6 +362,23 @@ export default {
         this.$showMessage('登陆失败！,')
       }
     },
+    RSADecrypt(encryptedData) {
+      try {
+        const pk = this.$androidUtil.getPreference('v4PrivateKey')
+        const decryptor = new JSEncrypt();
+        decryptor.setPrivateKey(pk);
+        const decrypted = decryptor.decrypt(encryptedData);
+
+        if (!decrypted) {
+          throw new Error('解密失败：空结果');
+        }
+        return decrypted;
+      } catch (error) {
+        console.error('RSA解密错误:', error);
+        throw new Error('RSA解密失败，请检查私钥格式');
+      }
+    },
+
     delConfigKey(obj){
       // 从琉璃中获取的配置中会包含 $开头的一些额外描述新的key。为了兼容v3的代码逻辑在此函数中去掉
       Object.keys(obj).forEach(key =>{

package/src/components/PhoneSellInfo.vue

@@ -1,148 +1,148 @@
-<template >
-  <div class="panel panel-default auto repair-info-content">
-    <div class="panel-body" v-show="show">
-      <div class="panel panel-default well" v-for="row in model">
-        <div class="bg-info">
-          <div class="row form-group">
-            <div class="col-xs-12 col-sm-12 col-md-12">
-              <div class="row">
-                <div class="col-xs-6 col-sm-6 col-md-6">
-                  购气量: {{row.f_pregas}}
-                </div>
-                <div class="col-xs-6 col-sm-6 col-md-6">
-                  购气金额: {{row.f_preamount}}
-                </div>
-                <div class="col-xs-6 col-sm-6 col-md-6">
-                  收费状态: {{row.f_state}}
-                </div>
-                <div class="col-xs-6 col-sm-6 col-md-6">
-                  收款: {{row.f_collection}}
-                </div>
-                <div class="col-xs-12 col-sm-12 col-md-12">
-                  缴费方式: {{row.f_payment}}
-                </div>
-                <div class="col-xs-12 col-sm-12 col-md-12">
-                  营业网点: {{row.f_depname}}
-                </div>
-                <div class="col-xs-12 col-sm-12 col-md-12">
-                  操作员: {{row.f_operator}}
-                </div>
-                <div class="col-xs-12 col-sm-12 col-md-12">
-                  购气时间: {{row.f_operate_date}}
-                </div>
-
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div className="panel panel-default well">
-        <div className="bg-info">
-          <div className="row form-group">
-            <div className="col-xs-12 col-sm-12 col-md-12">
-              <div className="row">
-                <div className="col-xs-6 col-sm-6 col-md-6">
-                  总购气量: {{ f_pregas_count }}
-                </div>
-                <div className="col-xs-6 col-sm-6 col-md-6">
-                  总购气金额: {{ f_preamount_count }}
-                </div>
-                <div className="col-xs-6 col-sm-6 col-md-6">
-                  购气次数: {{ model.length }}
-                </div>
-              </div>
-            </div>
-            </div>
-        </div>
-      </div>
-      <p v-show="model.length == 0 ">此用户暂无购气记录</p>
-    </div>
-  </div>
-</template>
-
-<script>
-  import { PagedList } from 'vue-client'
-  import co from 'co'
-  export default {
-    title: '查询用户',
-    data () {
-      return {
-        model: [],
-        f_pregas_count: 0,
-        f_preamount_count: 0,
-        show: false,
-        row: Object
-      }
-    },
-    props: {
-      user: {
-        type: Object
-      },
-      f_userinfo_id:''
-    },
-    methods: {
-      getmodel () {
-        let userinfoid
-        if(this.f_userinfo_id){
-          userinfoid = this.f_userinfo_id
-        }else{
-          userinfoid = this.user.f_userinfo_id
-          console.log(this.user.f_userinfo_id)
-        }
-        console.log(userinfoid)
-        this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {data: {items: '*', tablename: 't_sellinggas', orderitem: 'f_operate_date desc', condition:`f_state = '有效' and f_userinfo_id = '${userinfoid}'`}},{resolveMsg : null,rejectMsg :null}).then((row) => {
-          this.model = row.data
-          row.data.forEach(item => {
-            this.f_pregas_count += item.f_pregas
-            this.f_preamount_count += item.f_preamount
-          })
-          this.show=true
-        })
-      },
-      back(){
-
-      }
-    },
-    watch: {
-      'user' (val) {
-        // this.model.search(`card_id = ${this.user.card_id}`)
-        if(this.user){
-          if (!(this.user.isNuN)) {
-            this.model= []
-            this.getmodel()
-          }
-        }
-      },
-      'f_userinfo_id'(){
-        if(this.f_userinfo_id){
-          this.model= []
-          this.getmodel()
-        }
-      }
-    },
-    ready () {
-      if (this.user && this.user.f_userinfo_id) {
-        // this.model.search(`card_id = ${this.user.card_id}`)
-        this.getmodel()
-      }
-      if(this.f_userinfo_id){
-        this.getmodel()
-      }
-    }
-  }
-</script>
-<style>
-  .app-botton {
-    position:fixed;
-    background: #87b2dd;
-    color: #FFF;
-    padding: 8px;
-    text-align: center;
-    font-size: 1.2em;
-    z-index: 10;
-    opacity:0.5;
-    bottom: 50px;
-    margin-top: -10px;
-    height: 40px;
-  }
-</style>
+<template >
+  <div class="panel panel-default auto repair-info-content">
+    <div class="panel-body" v-show="show">
+      <div class="panel panel-default well" v-for="row in model">
+        <div class="bg-info">
+          <div class="row form-group">
+            <div class="col-xs-12 col-sm-12 col-md-12">
+              <div class="row">
+                <div class="col-xs-6 col-sm-6 col-md-6">
+                  购气量: {{row.f_pregas}}
+                </div>
+                <div class="col-xs-6 col-sm-6 col-md-6">
+                  购气金额: {{row.f_preamount}}
+                </div>
+                <div class="col-xs-6 col-sm-6 col-md-6">
+                  收费状态: {{row.f_state}}
+                </div>
+                <div class="col-xs-6 col-sm-6 col-md-6">
+                  收款: {{row.f_collection}}
+                </div>
+                <div class="col-xs-12 col-sm-12 col-md-12">
+                  缴费方式: {{row.f_payment}}
+                </div>
+                <div class="col-xs-12 col-sm-12 col-md-12">
+                  营业网点: {{row.f_depname}}
+                </div>
+                <div class="col-xs-12 col-sm-12 col-md-12">
+                  操作员: {{row.f_operator}}
+                </div>
+                <div class="col-xs-12 col-sm-12 col-md-12">
+                  购气时间: {{row.f_operate_date}}
+                </div>
+
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div className="panel panel-default well">
+        <div className="bg-info">
+          <div className="row form-group">
+            <div className="col-xs-12 col-sm-12 col-md-12">
+              <div className="row">
+                <div className="col-xs-6 col-sm-6 col-md-6">
+                  总购气量: {{ f_pregas_count }}
+                </div>
+                <div className="col-xs-6 col-sm-6 col-md-6">
+                  总购气金额: {{ f_preamount_count }}
+                </div>
+                <div className="col-xs-6 col-sm-6 col-md-6">
+                  购气次数: {{ model.length }}
+                </div>
+              </div>
+            </div>
+            </div>
+        </div>
+      </div>
+      <p v-show="model.length == 0 ">此用户暂无购气记录</p>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { PagedList } from 'vue-client'
+  import co from 'co'
+  export default {
+    title: '查询用户',
+    data () {
+      return {
+        model: [],
+        f_pregas_count: 0,
+        f_preamount_count: 0,
+        show: false,
+        row: Object
+      }
+    },
+    props: {
+      user: {
+        type: Object
+      },
+      f_userinfo_id:''
+    },
+    methods: {
+      getmodel () {
+        let userinfoid
+        if(this.f_userinfo_id){
+          userinfoid = this.f_userinfo_id
+        }else{
+          userinfoid = this.user.f_userinfo_id
+          console.log(this.user.f_userinfo_id)
+        }
+        console.log(userinfoid)
+        this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {data: {items: '*', tablename: 't_sellinggas', orderitem: 'f_operate_date desc', condition:`f_state = '有效' and f_userinfo_id = '${userinfoid}'`}},{resolveMsg : null,rejectMsg :null}).then((row) => {
+          this.model = row.data
+          row.data.forEach(item => {
+            this.f_pregas_count += item.f_pregas
+            this.f_preamount_count += item.f_preamount
+          })
+          this.show=true
+        })
+      },
+      back(){
+
+      }
+    },
+    watch: {
+      'user' (val) {
+        // this.model.search(`card_id = ${this.user.card_id}`)
+        if(this.user){
+          if (!(this.user.isNuN)) {
+            this.model= []
+            this.getmodel()
+          }
+        }
+      },
+      'f_userinfo_id'(){
+        if(this.f_userinfo_id){
+          this.model= []
+          this.getmodel()
+        }
+      }
+    },
+    ready () {
+      if (this.user && this.user.f_userinfo_id) {
+        // this.model.search(`card_id = ${this.user.card_id}`)
+        this.getmodel()
+      }
+      if(this.f_userinfo_id){
+        this.getmodel()
+      }
+    }
+  }
+</script>
+<style>
+  .app-botton {
+    position:fixed;
+    background: #87b2dd;
+    color: #FFF;
+    padding: 8px;
+    text-align: center;
+    font-size: 1.2em;
+    z-index: 10;
+    opacity:0.5;
+    bottom: 50px;
+    margin-top: -10px;
+    height: 40px;
+  }
+</style>

package/src/components/Test.vue

@@ -1,14 +1,14 @@
-<template>
-  <div>
-    <h1>Hello Test {{msg}}</h1>
-  </div>
-</template>
-<script>
-  export default {
-    title: "test",
-    props: ['msg'],
-    data () {
-      return {}
-    }
-  }
-</script>
+<template>
+  <div>
+    <h1>Hello Test {{msg}}</h1>
+  </div>
+</template>
+<script>
+  export default {
+    title: "test",
+    props: ['msg'],
+    data () {
+      return {}
+    }
+  }
+</script>

package/src/plugins/GetStringData.js

@@ -1,18 +1,18 @@
-
-let GetStringdatas = {
-
-  install (Vue, options) {
-    // 给vue增添对话框显示方法
-    Vue.$getString = Vue.prototype.$getString = GetStringdatas
-  },
-  getSubStr (String) {
-    if(String.endsWith('phone')){
-      let oldStr = String
-      let index = oldStr.lastIndexOf("/")
-      return oldStr.substring(0, index)
-    }
-    return String
-  }
-}
-
-export default GetStringdatas
+
+let GetStringdatas = {
+
+  install (Vue, options) {
+    // 给vue增添对话框显示方法
+    Vue.$getString = Vue.prototype.$getString = GetStringdatas
+  },
+  getSubStr (String) {
+    if(String.endsWith('phone')){
+      let oldStr = String
+      let index = oldStr.lastIndexOf("/")
+      return oldStr.substring(0, index)
+    }
+    return String
+  }
+}
+
+export default GetStringdatas