Skip to content

H
hls-xcmg-vue-app
Commit a3a8541b authored by linxin's avatar linxin
Browse files
Options

Merge branch 'uat' into develop

parents 71bf73b4 7f429a3e
Pipeline #5007 canceled with stages
      Show whitespace changes
      Inline Side-by-side
      Showing with 39 additions and 37 deletions
      config/dev.env.js
      View file @ a3a8541b
      ...@@ -18,3 +18,5 @@ module.exports = merge(prodEnv, { ...@@ -18,3 +18,5 @@ module.exports = merge(prodEnv, {
      config/uat.env.js
      View file @ a3a8541b
      ...@@ -11,6 +11,6 @@ module.exports = { ...@@ -11,6 +11,6 @@ module.exports = {
      ocrPath:'"http://180.104.121.66:8088/r/api"', ocrPath:'"http://180.104.121.66:8088/r/api"',
      fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="', fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="',
      appId: '"com.xcmg.app"', appId: '"com.xcmg.app"',
      currentVersion: '"1.7.7"' currentVersion: '"1.7.9"'
      } }
      src/pages/carConfirm/confirm-detail.vue
      View file @ a3a8541b
      ...@@ -445,7 +445,7 @@ export default { ...@@ -445,7 +445,7 @@ export default {
      if (res.success && res.result.result.score) { if (res.success && res.result.result.score) {
      vm.save_picture(vm.faceListUpload) vm.save_picture(vm.faceListUpload)
      let identifyScore = res.result.result.score.toFixed(0) let identifyScore = res.result.result.score.toFixed(0)
      if (identifyScore >= 50) { // if (identifyScore >= 50) {
      hlsPopup.showPopup({ hlsPopup.showPopup({
      title: '提示', title: '提示',
      content: `识别分数为${identifyScore},请进行活体检测`, content: `识别分数为${identifyScore},请进行活体检测`,
      ...@@ -454,9 +454,9 @@ export default { ...@@ -454,9 +454,9 @@ export default {
      vm.goBodyCheck(vm.confirm_id) vm.goBodyCheck(vm.confirm_id)
      }, },
      }) })
      } else { // } else {
      hlsPopup.showLongCenter('比对失败,请保证和绑定时是同一个人') // hlsPopup.showLongCenter('比对失败,请保证和绑定时是同一个人')
      } // }
      } else { } else {
      hlsPopup.showLongCenter('比对失败,请保证和绑定时是同一个人') hlsPopup.showLongCenter('比对失败,请保证和绑定时是同一个人')
      } }
      ......
      src/pages/contractCreate/creat-rent-info.vue
      View file @ a3a8541b
      ...@@ -653,7 +653,7 @@ export default { ...@@ -653,7 +653,7 @@ export default {
      vm.saveInfo.down_payment_ratio = (vm.saveInfo.down_payment_ratio_n.replace('%', '') / 100).toFixed(2) 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.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.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.finance_amount = vm.finance_amount
      vm.saveInfo.credit_id = window.localStorage.credit_id vm.saveInfo.credit_id = window.localStorage.credit_id
      let param = { let param = {
      ......
      src/pages/contractSigning/contract-detail.vue
      View file @ a3a8541b
      ...@@ -704,7 +704,7 @@ export default { ...@@ -704,7 +704,7 @@ export default {
      if (res.success && res.result.result.score) { if (res.success && res.result.result.score) {
      vm.save_picture(vm.faceListUpload) vm.save_picture(vm.faceListUpload)
      let identifyScore = res.result.result.score.toFixed(0) let identifyScore = res.result.result.score.toFixed(0)
      if (identifyScore > 50) { // if (identifyScore > 50) {
      hlsPopup.showPopup({ hlsPopup.showPopup({
      title: '提示', title: '提示',
      content: `识别分数为${identifyScore},请进行活体检测`, content: `识别分数为${identifyScore},请进行活体检测`,
      ...@@ -713,9 +713,9 @@ export default { ...@@ -713,9 +713,9 @@ export default {
      vm.goBodyCheck(vm.confirm_id) vm.goBodyCheck(vm.confirm_id)
      }, },
      }) })
      } else { // } else {
      hlsPopup.showLongCenter('比对失败,请保证和绑定时是同一个人') // hlsPopup.showLongCenter('比对失败,请保证和绑定时是同一个人')
      } // }
      } else { } else {
      hlsPopup.showLongCenter('比对失败,请保证和绑定时是同一个人') hlsPopup.showLongCenter('比对失败,请保证和绑定时是同一个人')
      } }
      ......
      src/pages/distributorSign/contract-details.vue
      View file @ a3a8541b
      ...@@ -522,7 +522,7 @@ export default { ...@@ -522,7 +522,7 @@ export default {
      if (res.success && res.result.result.score) { if (res.success && res.result.result.score) {
      vm.save_picture(vm.faceListUpload) vm.save_picture(vm.faceListUpload)
      let identifyScore = res.result.result.score.toFixed(0) let identifyScore = res.result.result.score.toFixed(0)
      if (identifyScore >= 50) { // if (identifyScore >= 50) {
      vm.hlsPopup.showPopup({ vm.hlsPopup.showPopup({
      title: '提示', title: '提示',
      content: `识别分数为${identifyScore},请进行活体检测`, content: `识别分数为${identifyScore},请进行活体检测`,
      ...@@ -531,9 +531,9 @@ export default { ...@@ -531,9 +531,9 @@ export default {
      vm.goBodyCheck() vm.goBodyCheck()
      }, },
      }) })
      } else { // } else {
      vm.hlsPopup.showLongCenter('比对失败,请保证和绑定时是同一个人') // vm.hlsPopup.showLongCenter('比对失败,请保证和绑定时是同一个人')
      } // }
      } else { } else {
      vm.hlsPopup.showLongCenter('比对失败,请保证和绑定时是同一个人') vm.hlsPopup.showLongCenter('比对失败,请保证和绑定时是同一个人')
      } }
      ......
      src/pages/home/home-page.vue
      View file @ a3a8541b
      ...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
      <img class="locations" src="@/assets/homePage/location.png" alt="" @click="location"> <img class="locations" src="@/assets/homePage/location.png" alt="" @click="location">
      <span class="home-city">{{ city }}</span> <span class="home-city">{{ city }}</span>
      </div> </div>
      <div slot="center" @click="getLocation">徐工租赁</div> <div slot="center" @click="getLocation">徐工金服</div>
      </h-header> </h-header>
      <h-content class="has-footer"> <h-content class="has-footer">
      <div class="top-wrap"/> <div class="top-wrap"/>
      ......
      www/index.html
      View file @ a3a8541b
      <!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 \ No newline at end of file
      Markdown is supported
      0% or
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment