Skip to content

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

add

parents 8c9d8bf2 82ca24b1
Pipeline #5135 canceled with stages
      Show whitespace changes
      Inline Side-by-side
      Showing with 16 additions and 9 deletions
      config/dev.env.js
      View file @ e716161c
      ......@@ -19,3 +19,7 @@ module.exports = merge(prodEnv, {
      config/uat.env.js
      View file @ e716161c
      ......@@ -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.dev"',
      currentVersion: '"1.8.5"'
      currentVersion: '"1.8.8"'
      }
      src/pages/contractSigning/previewPdf.vue
      View file @ e716161c
      ......@@ -78,7 +78,7 @@ export default {
      console.log('URL ==== ' + url)
      PDFJS.getDocument(url).then((pdf) => {
      this.pdfDoc = pdf
      debugger
      // debugger
      console.log('pdf ==== ' + pdf)
      this.pages = this.pdfDoc.numPages
      this.$nextTick(() => {
      ......
      src/pages/contractStart/add-car.vue
      View file @ e716161c
      ......@@ -479,6 +479,8 @@ export default {
      } else {
      vm.isUpload = true
      vm.vehicleImg = hlsUtil.convertImageUrl(imgUrl[0])
      console.log('$$$$$$$$$$$$$$$1' + imgUrl[0])
      console.log('$$$$$$$$$$$$$$$2' + vm.vehicleImg)
      vm.vehicleIdentify(imgUrl[0])
      }
      }
      ......
      src/pages/distributorSign/contract-details.vue
      View file @ e716161c
      ......@@ -433,7 +433,7 @@ export default {
      name: 'previewPdf',
      params: { attachUrl: vm.attachUrl },
      })
      vm.attachArray.splice(vm.attachArray[index], 1, temp)
      vm.attachArray.splice(index, 1, temp)
      } else {
      vm.hlsPopup.showLongCenter(res.message)
      }
      ......
      src/pages/myInfo/my-info.vue
      View file @ e716161c
      ......@@ -750,7 +750,7 @@ export default {
      quality: 100,
      }
      let success = function (imgdata) {
      obj.picture = imgdata
      obj.picture = hlsUtil.convertImageUrl(imgdata)
      obj.filePath = imgdata
      vm.upLoadObj = obj.picture
      vm.save_picture(obj)
      ......@@ -776,9 +776,10 @@ export default {
      quality: 100,
      }
      let success = function (imgUrl) {
      obj.picture = imgUrl[0]
      obj.picture = hlsUtil.convertImageUrl(imgUrl[0])
      obj.filePath = imgUrl[0]
      vm.upLoadObj = obj.picture
      console.log('$$$$$$$$$$$$$$$1' + imgUrl[0])
      // 拍完一张立马执行保存图片逻辑
      vm.save_picture(obj)
      }
      ......
      src/scripts/hlsUtil.js
      View file @ e716161c
      ......@@ -398,7 +398,9 @@ export default {
      * @param success
      */
      fileUploadSvc: function (file, success) {
      console.log('file',file)
      if(file.pkvalue && file.source_type){
      console.log('file1',file)
      let path = file.filePath
      var name = path.substr(path.lastIndexOf('/') + 1)
      let url = encodeURI(process.env.fileUploadSvcPath + 'attachment_upload')
      ......@@ -436,6 +438,7 @@ export default {
      ft.upload(path, url, uploadSuccess, fileError, options)
      }
      else{
      console.log('file2',file)
      hlsPopup.showLongCenter('上传失败！')
      }
      },
      ......
      www/index.html
      View file @ e716161c
      <<<<<<< HEAD
      <!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>
      =======
      <!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.9f4f2cf3c5b6e0677e0a.js></script></body></html>
      >>>>>>> 1782b93126109a088d416eb49f3f73e9c49f8adf
      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