Skip to content

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

add

parent 1427ac65
Pipeline #4738 canceled with stages
      Expand all Show whitespace changes
      Inline Side-by-side
      Showing with 17 additions and 19 deletions
      config/uat.env.js
      View file @ 0755db30
      ...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
      module.exports = { module.exports = {
      NODE_ENV: '"production"', NODE_ENV: '"production"',
      CONFIG_ENV: JSON.stringify(process.env.CONFIG_ENV), CONFIG_ENV: JSON.stringify(process.env.CONFIG_ENV),
      debug: false, debug: true,
      isMobilePlatform: true, isMobilePlatform: true,
      loginPath: '"http://180.104.121.66:8088/oauth/token?client_id=client2&client_secret=secret&grant_type=password&username=appadmin&password=" ', 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_UAT&apiName="',
      ...@@ -11,5 +11,5 @@ module.exports = { ...@@ -11,5 +11,5 @@ 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.dev"', appId: '"com.xcmg.app.dev"',
      currentVersion: '"1.2.5"' currentVersion: '"1.3.0"'
      } }
      src/pages/userBindNew/np/base-info.vue
      View file @ 0755db30
      ...@@ -1250,8 +1250,6 @@ export default { ...@@ -1250,8 +1250,6 @@ export default {
      hlsUtil.baiduOcr(fileUrl, url, function (res) { hlsUtil.baiduOcr(fileUrl, url, function (res) {
      hlsPopup.hideLoading() hlsPopup.hideLoading()
      let result = res.result.words_result let result = res.result.words_result
      alert(JSON.stringfy(res, '', 2))
      console.log(JSON.stringfy(res, '', 2))
      if (cardType === 'idCard') { if (cardType === 'idCard') {
      vm.baseInfo.bp_name = result.姓名.words vm.baseInfo.bp_name = result.姓名.words
      vm.baseInfo.id_card_no = result.公民身份号码.words vm.baseInfo.id_card_no = result.公民身份号码.words
      ......
      src/pages/userBindNew/org/baseInfo.vue
      View file @ 0755db30
      ...@@ -585,7 +585,14 @@ export default { ...@@ -585,7 +585,14 @@ export default {
      vm.getBpType() vm.getBpType()
      vm.getProvince() vm.getProvince()
      if (from.fullPath === '/tab/my-info') { /* || from.fullPath === '/margin-first-pay' */ if (from.fullPath === '/tab/my-info') { /* || from.fullPath === '/margin-first-pay' */
      vm.legal_personMsg = {} vm.legal_personMsg = {
      id_card_no: null,
      bp_legal_name: '',
      cell_phone: window.localStorage.getItem('user_phone'),
      living_address: '',
      id_card_date_from: '', // 法定代表人身份证有效期从
      id_card_date_to: '', // 法定代表人身份证有效期到
      }
      if (vm.$route.params.status === 'APPROVED') { if (vm.$route.params.status === 'APPROVED') {
      vm.isApproved = true vm.isApproved = true
      window.localStorage.setItem('isApproved', vm.isApproved) window.localStorage.setItem('isApproved', vm.isApproved)
      ...@@ -1671,7 +1678,7 @@ export default { ...@@ -1671,7 +1678,7 @@ export default {
      } }
      }) })
      // 查询图片 // 查询图片
      if(flag){ if (flag) {
      listTemp.forEach((item, index) => { listTemp.forEach((item, index) => {
      vm.load_picture(item.check_id, index, item.cdd_item) vm.load_picture(item.check_id, index, item.cdd_item)
      }) })
      ......
      src/scripts/hlsUtil.js
      View file @ 0755db30
      ...@@ -482,6 +482,7 @@ export default { ...@@ -482,6 +482,7 @@ export default {
      function uploadSuccess (message) { function uploadSuccess (message) {
      let res = JSON.parse(message.response) let res = JSON.parse(message.response)
      console.log(JSON.stringify(res, '', 2))
      success(res) success(res)
      } }
      ......
      www/1e37fad1fce0ebb3e0e5.worker.js
      View file @ 0755db30
      This diff is collapsed.
      www/1e37fad1fce0ebb3e0e5.worker.js.map
      View file @ 0755db30
      This diff is collapsed.
      www/index.html
      View file @ 0755db30
      <<<<<<< 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.f58ed53b77dd9688afcb4aac3ccef204.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.5b23605dc2d9cfefc737.js></script><script type=text/javascript src=./static/js/vendor.2b6d8679f4588e47d05c.js></script><script type=text/javascript src=./static/js/app.e6d07561780cc63dc20d.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.dfc178a48ebb0c8e421a6dfa34608c66.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.5b23605dc2d9cfefc737.js></script><script type=text/javascript src=./static/js/vendor.2b6d8679f4588e47d05c.js></script><script type=text/javascript src=./static/js/app.50b29fb3edbffef93c37.js></script></body></html> \ No newline at end of file
      =======
      <<<<<<< 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.bf12f36459a8557699346754da6efd18.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.5b23605dc2d9cfefc737.js></script><script type=text/javascript src=./static/js/vendor.64c4110c2ef75634c410.js></script><script type=text/javascript src=./static/js/app.dd5894f1024fda4ea85c.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.52a70966e6418a8b3b97c93ce2dec949.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.75679805cfd6269119a3.js></script><script type=text/javascript src=./static/js/vendor.7278d929ed3c1f5073ab.js></script><script type=text/javascript src=./static/js/app.721099b2f6b67e7c6383.js></script></body></html>
      >>>>>>> jeshi
      >>>>>>> 1cfe96f0a37cbc4e78b2746c2419e6ba9d4558b5
      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