safecheck-client 3.0.35-53 → 3.0.35-55

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "safecheck-client",
   "//": "主分支版本别乱升，测试包的版本直接发包(建议使用1.XX.XX-XXX格式作为测试包，不要频繁升级第三位版本号)，别提交版本号。切了分支切记把主分支版本升了，保证主分支始终是最高版本！！！！！",
-  "version": "3.0.35-53",
+  "version": "3.0.35-55",
   "description": "安检模块 前端组件",
   "author": "丁新 <417755458@qq.com>",
   "license": "ISC",

package/src/components/android/Insurance/PhoneInsurancePurchaseDetail.vue

@@ -165,18 +165,16 @@
     ready() {
       new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {
         data: {
-          items: '*',
-          tablename: 't_userinfo',
-          condition: `f_userinfo_id  = '${this.model.f_userinfo_id}'`,
+          items: 'tu.*',
+          tablename: 't_userinfo ui left join t_userfees tu on tu.f_userinfo_id=ui.f_userinfo_id and tu.f_state = \'有效\'',
+          condition: `ui.f_userinfo_id  = '${this.model.f_userinfo_id}'`,
           orderitem: '1'
         }
       }).then(response => {
-        this.model = Object.assign({}, this.model, response.data[0])
-        // if(response.data[0].f_ins_stop_date && new Date(response.data[0].f_ins_stop_date) >= new Date() && response.data[0].f_ins_stop_date != Util.toStandardDateString()){
-        //   this.$showMessage('当前保险未过期,请核验后再处理。')
-        //   this.isCommit = true
-        // }
-        this.model.f_last_insexpiration_date = response.data[0].f_ins_stop_date
+        if (response.data.length > 0) {
+          this.model = Object.assign({}, this.model, response.data[0])
+          this.model.f_last_insexpiration_date = response.data[0].f_expiration_date
+        }
       })
       this.model.f_money = ''
       this.model.f_fee_type = ''