更新ocr字段

config/uat.env.js

@@ -11,5 +11,5 @@ 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.dev"',
-  currentVersion: '"2.6.6"'
+  currentVersion: '"2.6.8"'
 }

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

 <template>
-  <h-view id="create-rent-info">
+  <h-view id="create-rent-info" class="public-style">
     <transition name="trans">
       <div v-show="downNum" class="modal-show">
         <div class="down">
@@ -862,12 +862,18 @@ export default {
           vm.rentInfo.engine = result.EngineNo // 发动机号
           vm.rentInfo.vehicle_model = result.VinNo // 车辆型号
           vm.rentInfo.certificate_number = result.CertificationNo // 合格证编号
-        } else if (vm.certificationType === 'DAOLU' || vm.certificationType === 'CHANYUN') {
+        } else if (vm.certificationType === 'DAOLU') {
           let result = res.result.data
           vm.rentInfo.frame_number = result.vehicle_number.word // 车架号
           vm.rentInfo.engine = result.engine_number.word // 发动机号
           vm.rentInfo.vehicle_model = result.car_model.word // 车辆型号
           vm.rentInfo.certificate_number = ''
+        } else if (vm.certificationType === 'CHANYUN') {
+          let result = res.result.data
+          vm.rentInfo.frame_number = result.vehicle_number.word // 车架号
+          vm.rentInfo.engine = result.engine_number.word // 发动机号
+          vm.rentInfo.vehicle_model = result.car_type.word // 车辆型号
+          vm.rentInfo.certificate_number = result.vechicle_ok_no.word
         }
         vm.rentInfo.project_lease_item_id = ''
         vm.rentInfo.departure_date = ''

src/pages/contractCreate/sales-info.vue

-<!--
- * @Author: your name
- * @Date: 2019-09-29 10:02:11
- * @LastEditTime : 2019-12-26 12:05:03
- * @LastEditors  : Please set LastEditors
- * @Description: In User Settings Edit
- -->
+
 <template>
-  <h-view id="sales-info">
+  <h-view id="sales-info" class="public-style">
     <h-header :proportion="[5,1,1]" class="bar-custom">
       <div slot="left" class="h-header-btn">
         <img src="@/assets/userBind/arrow.png" @click="$routeGo()">
         <span>合同创建</span>
       </div>
     </h-header>
-    <h-content>
+    <h-content class="scroll-content">
       <list-item :item-height="44" class="second-part">
         <item :showArrow="true" @click.native="picker">
           <div slot="name" class="font-color required">承租人</div>
@@ -30,11 +24,11 @@
             @click="selectBusiness"
           >
         </item>
-<!--        <item>-->
-<!--          <div slot="name" class="font-color required">经销商</div>-->
-<!--          <input v-if="(user_bp_type === 'AGENT'&&!multiple)||(multiple==='AGENT')" slot="content" v-model="bp_agent_name" readonly>-->
-<!--          <input v-if="(user_bp_type === 'OFFICE'&&!multiple)||(multiple==='OFFICE')" slot="content" placeholder="直销" readonly>-->
-<!--        </item>-->
+        <!--        <item>-->
+        <!--          <div slot="name" class="font-color required">经销商</div>-->
+        <!--          <input v-if="(user_bp_type === 'AGENT'&&!multiple)||(multiple==='AGENT')" slot="content" v-model="bp_agent_name" readonly>-->
+        <!--          <input v-if="(user_bp_type === 'OFFICE'&&!multiple)||(multiple==='OFFICE')" slot="content" placeholder="直销" readonly>-->
+        <!--        </item>-->
         <item v-if="(user_bp_type === 'AGENT'&&!multiple)||(multiple==='AGENT')">
           <div slot="name" class="font-color required">经销商</div>
           <input slot="content" v-model="bp_agent_name" type="text" readonly>
@@ -565,7 +559,7 @@ export default {
             vm.$router.push({
               name: 'CreateBaseInfo',
             })
-          }else{
+          } else {
             hlsPopup.showLongCenter(res.message)
           }
         })
@@ -578,6 +572,9 @@ export default {
 
 <style lang="less" type="text/less">
 #sales-info {
+  .scroll-content{
+    margin-top:60px;
+  }
     .date-pic {
       height: 17px;
       width: 17px;
@@ -677,7 +674,7 @@ export default {
       top:0;
     }
     .scrollContent{
-     padding-top: 1.92rem;
+      padding-top: 0 !important;
       padding-bottom: 20px;
     }
   }

src/pages/contractSigning/contract-detail.vue

@@ -618,13 +618,17 @@ export default {
     },
     takePhonto () {
       let vm = this
+      // cordova.plugins.IdCardPlugin.idCardIdentify({'idNum': '341181199602016223', 'idName': '史蒙蒙', 'timeout': 10000}, function (success) {
+      //   vm.hlsPopup.showLongCenter(success)
+      // }, function (reason) {
+      //   vm.hlsPopup.showLongCenter('认证失败: ' + reason)
+      // })
       hlsPopup.showConfirm({
         title: '提示',
         content: '请自拍一张',
         onConfirm: function (index) {
           if (index === 1) {
             vm.takePhontoOpenCamera()
-          } else {
           }
         },
       })
@@ -980,9 +984,8 @@ export default {
       vm.hlsHttp.post(url, param).then(function (res) {
         // vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
-          console.log(res)
           console.log(res.info.bank_full_name === ' ')
-          if (res.info.bank_full_name === ' ') {
+          if (res.info.bank_full_name === undefined || res.info.bank_full_name === ' ') {
             vm.bank_flag = false
             vm.bankPic = vm.unRead
           } else {

src/pages/contractSigning/contract-signing.vue

-<!--
- * @Author: your name
- * @Date: 2019-09-29 10:02:11
- * @LastEditTime : 2019-12-26 13:39:32
- * @LastEditors  : Please set LastEditors
- * @Description: In User Settings Edit
- -->
 <template>
   <h-view id="contract-signing">
     <h-header :proportion="[5,1,1]" class="bar-custom">
@@ -128,16 +121,15 @@ export default {
         vm.user_bp_type = vm.$route.params.user_bp_type
         vm.$refs.scroll.update(false)
         vm.$refs.scroll.scrollToTop()
-        vm.contractList()
       } else if (from.name === 'ContractDetail') {
         if (window.localStorage.backFlag === 'true') {
           vm.searchInput = ''
           vm.submitPagenum = 1
           vm.approvedPagenum = 1
           vm.approvedFlag = false
-          vm.contractList()
         }
       }
+      vm.contractList()
     })
   },
   methods: {

src/pages/contractStart/add-car.vue

@@ -531,12 +531,18 @@ export default {
           vm.info.engine = result.EngineNo // 发动机号
           vm.vehicle_model = result.VinNo // 车辆型号
           vm.info.certificate_number = result.CertificationNo // 合格证编号
-        } else if (vm.certificationType === 'DAOLU' || vm.certificationType === 'CHANYUN') {
+        } else if (vm.certificationType === 'DAOLU') {
           let result = res.result.data
           vm.info.frame_number = result.vehicle_number.word // 车架号
           vm.info.engine = result.engine_number.word // 发动机号
           vm.info.vehicle_model = result.car_model.word // 车辆型号
           vm.info.certificate_number = ''
+        } else if (vm.certificationType === 'CHANYUN') {
+          let result = res.result.data
+          vm.info.frame_number = result.vehicle_number.word // 车架号
+          vm.info.engine = result.engine_number.word // 发动机号
+          vm.info.vehicle_model = result.car_type.word // 车辆型号
+          vm.info.certificate_number = result.vechicle_ok_no.word
         }
         vm.info.project_lease_item_id = ''
         vm.info.departure_date = ''

src/pages/myInfo/ContactUs.vue

@@ -7,32 +7,32 @@
       </div>
     </h-header>
     <h-content>
-        <div class="contact-us">
-            <p class="title">徐工金融服务事业部</p>
-            <div class="Address">
-                <ul>
-                    <li>地址：江苏省徐州市经济开发区驮蓝山1-1号</li>
-                    <li>邮编：221004</li>
-                    <li>网址：http://www.xcmg.com/xgjr/</li>
-                </ul>
-            </div>
-            <div class="RentCentral">
-                <ul>
-                    <li>融资租赁业务中心</li>
-                    <li>电话：0516-83466800</li>
-                </ul>
-            </div>
-            <div class="Ercode">
-                <ul>
-                    <li><img src="@/assets/myInfo/xugongFinancial.jpg"></li>
-                    <li>徐工金融<br>微信公众号</li>
-                </ul>
-                <ul>
-                    <li><img src="@/assets/myInfo/xugongRent.jpg"></li>
-                    <li>徐工租赁<br>微信公众号</li>
-                </ul>
-            </div>
+      <div class="contact-us">
+        <p class="title">徐工金融服务事业部</p>
+        <div class="Address">
+          <ul>
+            <li>地址：江苏省徐州市经济开发区驮蓝山1-1号</li>
+            <li>邮编：221004</li>
+            <li>网址：http://www.xcmg.com/xgjr/</li>
+          </ul>
         </div>
+        <div class="RentCentral">
+          <ul>
+            <li>融资租赁业务中心</li>
+            <li>电话：0516-83466800</li>
+          </ul>
+        </div>
+        <div class="Ercode">
+          <ul>
+            <li><img src="@/assets/myInfo/xugongFinancial.jpg"></li>
+            <li>徐工金融<br>微信公众号</li>
+          </ul>
+          <ul>
+            <li><img src="@/assets/myInfo/xugongRent.jpg"></li>
+            <li>徐工租赁<br>微信公众号</li>
+          </ul>
+        </div>
+      </div>
     </h-content>
   </h-view>
 </template>
@@ -45,8 +45,8 @@ export default {
     }
   },
   methods: {
-     
-  }
+
+  },
 }
 </script>
 

src/router/index.js

@@ -257,7 +257,7 @@ export default new Router({
     {path: '/financing-details', component: FinancingDetails, name: 'FinancingDetails', meta: {keepAlive: true}},
     {path: '/trial-repay-plan', component: TrialRepayPlan, name: 'TrialRepayPlan', meta: {keepAlive: true}},
     // 合同签约
-    {path: '/contract-signing', component: ContractSigning, name: 'ContractSigning', meta: {keepAlive: true}},
+    {path: '/contract-signing', component: ContractSigning, name: 'ContractSigning', meta: {keepAlive: false}},
     {path: '/contract-detail', component: ContractDetail, name: 'ContractDetail', meta: {keepAlive: true}},
     {path: '/contract-content', component: ContractContent, name: 'ContractContent', meta: {keepAlive: true}},
     {path: '/entry-info', component: EntryInfo, name: 'EntryInfo', meta: {keepAlive: true}},

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.10e2a1c052ab479339a0d0d8b3e6c83f.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.0a4e11017ea45af58444.js></script><script type=text/javascript src=./static/js/app.52b46817f414a3e1002b.js></script></body></html>
\ No newline at end of file