Merge branch 'M_2.5_1122' into test

src/views/entry/fillMainInf.vue

@@ -187,7 +187,7 @@
     <el-dialog title="提示" :visible.sync="isReadFailVisible" class="read-fail-dialog" width="600px" center
                :close-on-click-modal="false" :show-close="false">
       <p>未能识别有效信息，请重新上传正确的图片或者手动输入相关信息</p>
-      <p>改弹窗显示<span class="read-time-m">{{ readTime }}</span>S后自动关闭，无需手动关闭</p>
+      <p>该弹窗<span class="read-time-m">{{ readTime }}</span>S后自动关闭，无需手动关闭</p>
     </el-dialog>
   </div>
 </template>
@@ -467,8 +467,24 @@
         let data = {img: fileList[0].url}
         getIdcardImgInfoData(data).then(res=> {
           if (res.code == 1 ) {
+            if (res.data.words_result) {
+              try {
                 this.mainForm.real_name = res.data.words_result['姓名'].words ? res.data.words_result['姓名'].words : '';
                 this.mainForm.idcard_number = res.data.words_result['公民身份号码'].words ? res.data.words_result['公民身份号码'].words : '';
+              } catch (e) {
+                this.isReadFailVisible = true;
+                this.readTime = 5;
+                this.TIMER = setInterval(() => {
+                  if (this.readTime && 0 < this.readTime <= 5 ) {
+                    this.readTime--
+                  } else {
+                    this.readTime = 0;
+                    this.isReadFailVisible = false;
+                  }
+                }, 1000)
+              }
+
+            }
           }else {
             this.isReadFailVisible = true;
             this.readTime = 5;