system-phone 3.1.8-1-t7 → 3.1.8-1-t9

package/package.json

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

package/src/components/LoginAppV4.vue

@@ -72,15 +72,17 @@ let asyncReady = async function (self, url) {
     let that = self
     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 = `/api/${dir_module[mod].name}/vue`
+        let mod_url = `${url}/api/${dir_module[mod].name}/vue`
         if (!dir_module[mod].name.startsWith('af-')) {
-          mod_url = `/${dir_module[mod].name}/rs/vue`
+          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;
       }
     }
@@ -349,6 +351,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: {

package/src/components/info/FindUserInfo.vue

@@ -4,6 +4,14 @@
   <!--  </div>-->
   <div class="select-overspread auto" style="padding-bottom:5px;">
     <div class="auto repair-info-content compatible">
+      <div class="row" style="display: flex;align-items: center">
+        <div class="col-xs-3 col-sm-3 col-md-3 form-input-group">
+          模糊查询:
+        </div>
+        <div class="col-xs-9 col-sm-9 col-md-9 form-input-group mg8">
+          <input type="text" class="form-control" v-model="model.f_userinfo"  placeholder='模糊查询'>
+        </div>
+      </div>
       <div class="row" style="display: flex;align-items: center">
         <div class="col-xs-3 col-sm-3 col-md-3 form-input-group">
           用户编号:
@@ -92,6 +100,9 @@ export default {
       condition += this.model.f_userid ? ` and ti.f_userinfo_code = '${this.model.f_userid}'` : ' and 1=1'
       condition += this.model.f_username ? ` and ti.f_user_name like '%${this.model.f_username}%'` : ' and 1=1'
       condition += this.model.f_address ? ` and tua.f_address like '%${this.model.f_address}%'` : ' and 1=1'
+      if (this.model.f_userinfo){
+        condition += ` and (ti.f_userinfo_code like '%${this.model.f_userinfo}%' or ti.f_user_name like '%${this.model.f_userinfo}%' or ti.f_user_phone like '%${this.model.f_userinfo}%' or f_meternumber like '%${this.model.f_userinfo}%' or tua.f_address like '%${this.model.f_userinfo}%')`
+      }
       console.log(condition)
       this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/tel_UserInfo`, {
         data: {