Merge branch 'uat' into develop

config/dev.env.js

@@ -18,3 +18,5 @@ module.exports = merge(prodEnv, {
 
 
 
+
+

config/uat.env.js

@@ -11,6 +11,6 @@ module.exports = {
   ocrPath:'"http://180.104.121.66:8088/r/api"',
   fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="',
   appId: '"com.xcmg.app"',
-  currentVersion: '"1.7.7"'
+  currentVersion: '"1.7.9"'
 }
 

src/pages/carConfirm/confirm-detail.vue

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

src/pages/contractCreate/creat-rent-info.vue

@@ -653,7 +653,7 @@ export default {
         vm.saveInfo.down_payment_ratio = (vm.saveInfo.down_payment_ratio_n.replace('%', '') / 100).toFixed(2)
         vm.saveInfo.lease_charge_ratio = (vm.saveInfo.lease_charge_ratio_n.replace('%', '') / 100).toFixed(2)
         vm.saveInfo.deposit_ratio = (vm.saveInfo.deposit_ratio_n.replace('%', '') / 100).toFixed(2)
-        vm.saveInfo.int_rate = (vm.saveInfo.int_rate_n.replace('%', '') / 100).toFixed(2)
+        vm.saveInfo.int_rate = (vm.saveInfo.int_rate_n.replace('%', '') / 100)
         vm.saveInfo.finance_amount = vm.finance_amount
         vm.saveInfo.credit_id = window.localStorage.credit_id
         let param = {

src/pages/contractSigning/contract-detail.vue

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

src/pages/distributorSign/contract-details.vue

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

src/pages/home/home-page.vue

@@ -13,7 +13,7 @@
         <img class="locations" src="@/assets/homePage/location.png" alt="" @click="location">
         <span class="home-city">{{ city }}</span>
       </div>
-      <div slot="center" @click="getLocation">徐工租赁</div>
+      <div slot="center" @click="getLocation">徐工金服</div>
     </h-header>
     <h-content class="has-footer">
       <div class="top-wrap"/>

www/index.html

-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,width=device-width,viewport-fit=cover"><meta name=format-detection content="telephone=no"><meta name=format-detection content="email=no"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black><script type=text/javascript src=./static/vuePlatform.js></script><script type=text/javascript src=./static/prototype.js></script><script type=text/javascript src=cordova.js></script><script type=text/javascript src="http://api.map.baidu.com/api?v=2.0&ak=Eoo0EtfjYCdAy7r8D19gZ0vMojdZpHqU"></script><title>徐工金服</title><link href=./static/css/app.13dd33b9d73dd9675f640ae7274a2bec.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.6a178e8d77c32e3c385d.js></script><script type=text/javascript src=./static/js/vendor.8a1ae113e3b5262701ed.js></script><script type=text/javascript src=./static/js/app.6325e3d0db2ef363a8b7.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,width=device-width,viewport-fit=cover"><meta name=format-detection content="telephone=no"><meta name=format-detection content="email=no"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black><script type=text/javascript src=./static/vuePlatform.js></script><script type=text/javascript src=./static/prototype.js></script><script type=text/javascript src=cordova.js></script><script type=text/javascript src="http://api.map.baidu.com/api?v=2.0&ak=Eoo0EtfjYCdAy7r8D19gZ0vMojdZpHqU"></script><title>徐工金服</title><link href=./static/css/app.de9f5b148f5b4101fd8565168400476d.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.6a178e8d77c32e3c385d.js></script><script type=text/javascript src=./static/js/vendor.8a1ae113e3b5262701ed.js></script><script type=text/javascript src=./static/js/app.aa5c55427e7924882201.js></script></body></html>
\ No newline at end of file