add

config/dev.env.js

@@ -8,10 +8,10 @@ module.exports = merge(prodEnv, {
   debug: true,
   isMobilePlatform: false,
   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_UAT&apiName="',
+  basePath: '"http://180.104.121.66:8088/r/api/interface?sysName=XCMG_DEV&apiName="',
   rootPath: '"http://180.104.121.66:8088/r/api"',
-  filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_UAT&apiName=file_view&"',
-  fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="',
+  filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_DEV&apiName=file_view&"',
+  fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_DEV&apiName="',
   ocrPath: '"http://180.104.121.66:8088/r/api"',
   appId: '"com.xcmg.app.dev"',
   currentVersion: '"1.9.0"',
@@ -19,7 +19,10 @@ module.exports = merge(prodEnv, {
 
 
 
+<<<<<<< HEAD
 
 
 
 
+=======
+>>>>>>> develop

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.0.8"'
+  currentVersion: '"0.0.3"'
 }

config/uat.env.js

@@ -5,12 +5,12 @@ module.exports = {
   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_UAT&apiName="',
+  basePath: '"http://180.104.121.66:8088/r/api/interface?sysName=XCMG_PROD&apiName="',
   rootPath: '"http://180.104.121.66:8088/r/api"',
-  filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_UAT&apiName=file_view&"',
+  filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_PROD&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_UAT&apiName="',
-  appId: '"com.xcmg.app"',
-  currentVersion: '"1.7.9"'
+  fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_PROD&apiName="',
+  appId: '"com.xcmg.app.dev"',
+  currentVersion: '"1.8.3"'
 }
 

src/pages/carConfirm/body-check.vue

@@ -76,6 +76,7 @@ export default {
       file: '',
       sessionId: '',
       codeList: [],
+      videoListUpload: [],
       showFlag: false,
     }
   },

src/pages/carConfirm/confirm-detail.vue

@@ -189,6 +189,7 @@ export default {
       num: null,
       downNum: false,
       attachArray: [],
+      faceListUpload: [],
       show: false,
       flag: false, // 判断是否为已确认
       vehicleImg: '', // 查询到的合格证
@@ -444,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('比对失败,请保证和绑定时是同一个人')
         }
@@ -505,6 +506,7 @@ export default {
           }
           if (!list[i].attachment_id) {
             attLength++
+            // alert('list[i] = ' + list[i])
             hlsUtil.fileUploadSvc(list[i], uploadSuccess)
           }
         }

src/pages/carConfirm/confirm-list.vue

@@ -140,6 +140,7 @@ export default {
       this.$refs.scroll.scrollToTop()
     },
     changePage (e) {
+      debugger
       this.$router.push({
         name: 'ConfirmDetail',
         params: {

src/pages/contractSigning/body-check.vue

@@ -76,6 +76,7 @@ export default {
       file: '',
       sessionId: '',
       codeList: [],
+      videoListUpload: [],
       showFlag: false,
     }
   },

src/pages/contractSigning/contract-detail.vue

@@ -702,18 +702,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/contractSigning/contract-signing.vue

@@ -335,6 +335,7 @@ export default {
     },
 
     goDetails (item) {
+      debugger
       this.$router.push({
         name: 'ContractDetail',
         params: {

src/pages/distributorSign/body-check.vue

@@ -76,6 +76,7 @@ export default {
       file: '',
       sessionId: '',
       codeList: [],
+      videoListUpload: [],
       showFlag: false,
     }
   },

src/pages/distributorSign/contract-details.vue

@@ -521,18 +521,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/scripts/hlsUtil.js

@@ -398,41 +398,46 @@ export default {
    * @param success
    */
   fileUploadSvc: function (file, success) {
-    let path = file.filePath
-    var name = path.substr(path.lastIndexOf('/') + 1)
-    let url = encodeURI(process.env.fileUploadSvcPath + 'attachment_upload')
-    let options = new FileUploadOptions() // eslint-disable-line
-    options.fileKey = 'file'
-    options.headers = {
-      'Authorization': 'Bearer ' + window.localStorage.access_token,
-    }
-    options.params = {
-      'source_type': file.source_type,
-      'pkvalue': file.pkvalue,
-      'user_id': file.user_id,
-      'check_id': file.check_id,
-      'access_token': window.localStorage.access_token,
-      'filePath': path,
-    }
-    if(file.fileName){
-      options.fileName = encodeURI(file.fileName) + name.substr(name.lastIndexOf('.'))
+    if(file.pkvalue && file.source_type){
+      let path = file.filePath
+      var name = path.substr(path.lastIndexOf('/') + 1)
+      let url = encodeURI(process.env.fileUploadSvcPath + 'attachment_upload')
+      let options = new FileUploadOptions() // eslint-disable-line
+      options.fileKey = 'file'
+      options.headers = {
+        'Authorization': 'Bearer ' + window.localStorage.access_token,
+      }
+      options.params = {
+        'source_type': file.source_type,
+        'pkvalue': file.pkvalue,
+        'user_id': file.user_id,
+        'check_id': file.check_id,
+        'access_token': window.localStorage.access_token,
+        'filePath': path,
+      }
+      if(file.fileName){
+        options.fileName = encodeURI(file.fileName) + name.substr(name.lastIndexOf('.'))
+      }
+      else{
+        options.fileName = name
+      }
+      options.mimeType = 'multipart/form-date'
+      let ft = new FileTransfer() // eslint-disable-line
+      function uploadSuccess (result) {
+        success(JSON.parse(result.response))
+      }
+  
+      function fileError () {
+        window.hlsPopup.hideLoading()
+        console.log('upload error source ' + error.source)
+        console.log('upload error target ' + error.target)
+      }
+  
+      ft.upload(path, url, uploadSuccess, fileError, options)
     }
     else{
-      options.fileName = name
-    }
-    options.mimeType = 'multipart/form-date'
-    let ft = new FileTransfer() // eslint-disable-line
-    function uploadSuccess (result) {
-      success(JSON.parse(result.response))
-    }
-
-    function fileError () {
-      window.hlsPopup.hideLoading()
-      console.log('upload error source ' + error.source)
-      console.log('upload error target ' + error.target)
+      hlsPopup.showLongCenter('上传失败！')
     }
-
-    ft.upload(path, url, uploadSuccess, fileError, options)
   },
   /**
    * 汉王识别

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.3e4289c3a03bc2b076ec4d914dfb4bba.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.d56dec0015f4cf7e8b3b.js></script><script type=text/javascript src=./static/js/app.da2cdd7ca6ffd4a9106e.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.4df5bfd4df456db4bc580b0772f120e7.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.adf9b230a1046c0fc990.js></script><script type=text/javascript src=./static/js/app.b1b90efe22b1d77d9c11.js></script></body></html>