Merge remote-tracking branch 'origin/dev20230131_android' into 202306_content

config/dev.env.js

 'use strict'
 module.exports = {
-  NODE_ENV: '"development"',
+  NODE_ENV: '"production"',
   CONFIG_ENV: JSON.stringify(process.env.CONFIG_ENV),
   debug: true,
   isMobilePlatform: true,
   loginPath: '"http://180.104.121.66:8088/oauth/token?client_id=client2&client_secret=secret&grant_type=password&username=appadmin&password=" ',
-  basePath: '"http://180.104.121.66:8088/r/api/interface?sysName=XCMG_DEV&apiName="',
+  basePath: '"http://180.104.121.66:8088/r/api/interface?sysName=XCMG_UAT&apiName="',
   rootPath: '"http://180.104.121.66:8088/r/api"',
-  filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_DEV&apiName=file_view&"',
+  filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_UAT&apiName=file_view&"',
   ocrPath:'"http://180.104.121.66:8088/r/api"',
-  fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_DEV&apiName="',
+  fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="',
   appId: '"com.xcmg.app.dev"',
-  currentVersion: '"3.7.8"'
+  currentVersion: '"4.1.2"'
 }

config/prod.env.js

@@ -11,5 +11,5 @@ module.exports = {
   ocrPath:'"http://www.xcmgfs.com:8087/r/api"',
   fileUploadSvcPath:'"http://www.xcmgfs.com:8087/r/api/app/fileUploadSvc?sysName=XCMG_PROD&apiName="',
   appId: '"com.xcmg.app"',
-  currentVersion: '"0.4.0"'
+  currentVersion: '"0.4.5"'
 }

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: '"4.0.9"'
+  currentVersion: '"4.1.9"'
 }

src/pages/userBindNew/np/accessory-info.vue

@@ -898,6 +898,9 @@ export default {
       let url = process.env.ocrPath + '/baidu/ocr/house'
       hlsUtil.baiduOcr(fileUrl, url, function (res) {
         hlsPopup.hideLoading()
+        if (res.result.error_msg) {
+          hlsPopup.showLongCenter(res.result.error_msg)
+        }
         let result = res.result.data
         vm.hauseInfo[index].house_owner = result.house_owner.word
         vm.hauseInfo[index].public_situation = result.public_situation.word
@@ -912,6 +915,7 @@ export default {
         vm.hauseInfo[index].land_number = result.land_number.word
         vm.hauseInfo[index].land_get_method = result.land_get_method.word
         vm.hauseInfo[index].land_use_limit = result.land_use_limit.word
+        vm.$forceUpdate()
       })
     },
     carIdentify (fileUrl, index) {
@@ -920,6 +924,9 @@ export default {
       let url = process.env.ocrPath + '/baidu/ocr/vehicleLicense'
       hlsUtil.baiduOcr(fileUrl, url, function (res) {
         hlsPopup.hideLoading()
+        if (res.result.error_msg) {
+          hlsPopup.showLongCenter(res.result.error_msg)
+        }
         let result = res.result.words_result
         vm.carInfo[index].vehicle_identify_num = result.车辆识别代号.words
         vm.carInfo[index].address = result.住址.words
@@ -932,6 +939,7 @@ export default {
         vm.carInfo[index].regist_date = result.注册日期.words
         vm.carInfo[index].plate_number = result.号牌号码.words
         vm.carInfo[index].success = res.success
+        vm.$forceUpdate()
       })
     },
     estateIdentify (fileUrl, index) {
@@ -940,6 +948,9 @@ export default {
       let url = process.env.ocrPath + '/baidu/ocr/houseRight'
       hlsUtil.baiduOcr(fileUrl, url, function (res) {
         hlsPopup.hideLoading()
+        if (res.result.error_msg) {
+          hlsPopup.showLongCenter(res.result.error_msg)
+        }
         let result = res.result.data
         vm.propertyInfo[index].right_person = result.right_person.word
         vm.propertyInfo[index].public_situation = result.public_situation.word
@@ -951,6 +962,7 @@ export default {
         vm.propertyInfo[index].house_area = result.house_area.word
         vm.propertyInfo[index].land_use_limit = result.land_use_limit.word
         vm.propertyInfo[index].right_others = result.right_others.word
+        vm.$forceUpdate()
       })
     },
     takePicture (ocrType, type, index) {

src/pages/userBindNew/org/enclosure.vue

@@ -15,9 +15,10 @@
     </h-header>
     <h-content>
       <div v-for="(list, index) in cddItemList" :key="index" class="card2">
-        <div style="display:flex">
+        <div style="display:flex;position:relative">
           <span class="descript-color">{{ list.description }}</span>
-          <span @click="addFile(list.cdd_item)">添加</span>
+          <Icon v-if="['HOUSE_CARD','CAR_CARD','REAL_EST_CERTIFICATE'].indexOf(list.cdd_item) !==-1" style="position: absolute;right: 45px;top: 5px;" name="add-o" size="20px" color="blue" @click="addFile(list.cdd_item)" />
+          <!-- <Icon name="add-o" size="0.4rem" color="blue" @click="addFile(list.cdd_item)" style="margin-left: 20px;line-height: 0.36rem;padding-top: 0.12rem"/> -->
         </div>
         <div class="img-content">
           <!-- 房产 -->
@@ -391,13 +392,14 @@
   </h-view>
 </template>
 <script>
-import { Collapse, CollapseItem } from 'vant'
+import { Collapse, CollapseItem, Icon } from 'vant'
 import 'vant/lib/collapse/style'
 import 'vant/lib/collapse-item/style'
+import 'vant/lib/icon/style'
 
 export default {
   components: {
-    Collapse, CollapseItem},
+    Collapse, CollapseItem, Icon},
   data () {
     return {
       activeNames_h: [0],
@@ -1042,6 +1044,9 @@ export default {
       let url = process.env.ocrPath + '/baidu/ocr/house'
       hlsUtil.baiduOcr(fileUrl, url, function (res) {
         hlsPopup.hideLoading()
+        if (res.result.error_msg) {
+          hlsPopup.showLongCenter(res.result.error_msg)
+        }
         let result = res.result.data
         vm.hauseInfo[index].house_owner = result.house_owner.word
         vm.hauseInfo[index].public_situation = result.public_situation.word
@@ -1056,6 +1061,7 @@ export default {
         vm.hauseInfo[index].land_number = result.land_number.word
         vm.hauseInfo[index].land_get_method = result.land_get_method.word
         vm.hauseInfo[index].land_use_limit = result.land_use_limit.word
+        vm.$forceUpdate()
       })
     },
     // 行驶证识别
@@ -1065,6 +1071,9 @@ export default {
       let url = process.env.ocrPath + '/baidu/ocr/vehicleLicense'
       hlsUtil.baiduOcr(fileUrl, url, function (res) {
         hlsPopup.hideLoading()
+        if (res.result.error_msg) {
+          hlsPopup.showLongCenter(res.result.error_msg)
+        }
         let result = res.result.words_result
         vm.carInfo[index].vehicle_identify_num = result.车辆识别代号.words
         vm.carInfo[index].address = result.住址.words
@@ -1078,6 +1087,7 @@ export default {
         vm.carInfo[index].regist_date = result.注册日期.words
         vm.carInfo[index].words_result_num = res.result.words_result_num
         vm.carInfo[index].success = res.success
+        vm.$forceUpdate()
       })
     },
     // 不动产证识别
@@ -1087,6 +1097,9 @@ export default {
       let url = process.env.ocrPath + '/baidu/ocr/houseRight'
       hlsUtil.baiduOcr(fileUrl, url, function (res) {
         hlsPopup.hideLoading()
+        if (res.result.error_msg) {
+          hlsPopup.showLongCenter(res.result.error_msg)
+        }
         let result = res.result.data
         vm.propertyInfo[index].right_person = result.right_person.word
         vm.propertyInfo[index].public_situation = result.public_situation.word
@@ -1098,6 +1111,7 @@ export default {
         vm.propertyInfo[index].house_area = result.house_area.word
         vm.propertyInfo[index].land_use_limit = result.land_use_limit.word
         vm.propertyInfo[index].right_others = result.right_others.word
+        vm.$forceUpdate()
       })
     },
     loadItemList (flag) {

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.fb52dd271f35e6cb942abb94eb5f18bb.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.16dc3c74f4e0c838ce1f.js></script><script type=text/javascript src=./static/js/vendor.a2bd9868e7885d7ce8da.js></script><script type=text/javascript src=./static/js/app.279bb6618e94708c8fd3.js></script></body></html>
\ No newline at end of file
+<!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.fb52dd271f35e6cb942abb94eb5f18bb.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.ebdda770529abbdf59a4.js></script><script type=text/javascript src=./static/js/vendor.6fb9a8a9e3d7464e35f7.js></script><script type=text/javascript src=./static/js/app.7e7cbcc92f7463151cf8.js></script></body></html>
\ No newline at end of file