Merge branch 'liuin' into uat

src/pages/carConfirm/confirm-detail.vue

@@ -442,17 +442,21 @@ export default {
       let url = process.env.ocrPath + '/baidu/ocr/face'
       hlsUtil.baiduOcrFace(obj, url, function (res) {
         hlsPopup.hideLoading()
-        if (res.success) {
+        if (res.success && res.result.result.score) {
           vm.save_picture(vm.faceListUpload)
           let identifyScore = res.result.result.score.toFixed(0)
-          hlsPopup.showPopup({
-            title: '提示',
-            content: `识别分数为${identifyScore},请进行活体检测`,
-            onConfirm: () => {
+          if (identifyScore >= 50) {
+            hlsPopup.showPopup({
+              title: '提示',
+              content: `识别分数为${identifyScore},请进行活体检测`,
+              onConfirm: () => {
               // 进入活体检测页面
-              vm.goBodyCheck(vm.confirm_id)
-            },
-          })
+                vm.goBodyCheck(vm.confirm_id)
+              },
+            })
+          } else {
+            hlsPopup.showLongCenter('比对失败,请保证和绑定时是同一个人')
+          }
         } else {
           hlsPopup.showLongCenter('比对失败,请保证和绑定时是同一个人')
         }

src/pages/contractSigning/contract-detail.vue

@@ -701,17 +701,21 @@ export default {
       let url = process.env.ocrPath + '/baidu/ocr/face'
       hlsUtil.baiduOcrFace(obj, url, function (res) {
         hlsPopup.hideLoading()
-        if (res.success) {
+        if (res.success && res.result.result.score) {
           vm.save_picture(vm.faceListUpload)
           let identifyScore = res.result.result.score.toFixed(0)
-          hlsPopup.showPopup({
-            title: '提示',
-            content: `识别分数为${identifyScore},请进行活体检测`,
-            onConfirm: () => {
+          if (identifyScore > 50) {
+            hlsPopup.showPopup({
+              title: '提示',
+              content: `识别分数为${identifyScore},请进行活体检测`,
+              onConfirm: () => {
               // 进入活体检测页面
-              vm.goBodyCheck(vm.confirm_id)
-            },
-          })
+                vm.goBodyCheck(vm.confirm_id)
+              },
+            })
+          } else {
+            hlsPopup.showLongCenter('比对失败,请保证和绑定时是同一个人')
+          }
         } else {
           hlsPopup.showLongCenter('比对失败,请保证和绑定时是同一个人')
         }

src/pages/distributorSign/contract-details.vue

@@ -519,17 +519,21 @@ export default {
       let url = process.env.ocrPath + '/baidu/ocr/face'
       vm.hlsUtil.baiduOcrFace(obj, url, function (res) {
         vm.hlsPopup.hideLoading()
-        if (res.success) {
+        if (res.success && res.result.result.score) {
           vm.save_picture(vm.faceListUpload)
           let identifyScore = res.result.result.score.toFixed(0)
-          vm.hlsPopup.showPopup({
-            title: '提示',
-            content: `识别分数为${identifyScore},请进行活体检测`,
-            onConfirm: () => {
+          if (identifyScore >= 50) {
+            vm.hlsPopup.showPopup({
+              title: '提示',
+              content: `识别分数为${identifyScore},请进行活体检测`,
+              onConfirm: () => {
               // 进入活体检测页面
-              vm.goBodyCheck()
-            },
-          })
+                vm.goBodyCheck()
+              },
+            })
+          } else {
+            vm.hlsPopup.showLongCenter('比对失败,请保证和绑定时是同一个人')
+          }
         } else {
           vm.hlsPopup.showLongCenter('比对失败,请保证和绑定时是同一个人')
         }

src/scripts/hlsPopup.js

@@ -59,7 +59,7 @@ export default {
           position: 'middle',
         }) */
       }
-    }, 60000)
+    }, 120000)
   },
   /**
    * 隐藏