Skip to content

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

Merge branch 'uat' into develop

parents c425d211 389fd705
Pipeline #4977 canceled with stages
      Hide whitespace changes
      Inline Side-by-side
      Showing with 8 additions and 8 deletions
      config/dev.env.js
      View file @ 71bf73b4
      ......@@ -16,3 +16,5 @@ module.exports = merge(prodEnv, {
      currentVersion: '"1.9.0"',
      })
      config/prod.env.js
      View file @ 71bf73b4
      ......@@ -2,7 +2,7 @@
      module.exports = {
      NODE_ENV: '"production"',
      CONFIG_ENV: JSON.stringify(process.env.CONFIG_ENV),
      debug: true,
      debug: false,
      isMobilePlatform: true,
      loginPath: '"http://www.xcmgfs.com:8087/oauth/token?client_id=client2&client_secret=secret&grant_type=password&username=appadmin&password=" ',
      basePath: '"http://www.xcmgfs.com:8087/r/api/interface?sysName=XCMG_PROD&apiName="',
      ......@@ -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.7"'
      currentVersion: '"0.0.8"'
      }
      config/uat.env.js
      View file @ 71bf73b4
      ......@@ -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"',
      currentVersion: '"1.7.6"'
      currentVersion: '"1.7.7"'
      }
      src/main.js
      View file @ 71bf73b4
      ......@@ -58,7 +58,7 @@ import Jpush from './scripts/jpushService'
      import Jmessage from './scripts/jmessageService'
      if (process.env.CONFIG_ENV === 'uat' || process.env.CONFIG_ENV === 'dev' || process.env.CONFIG_ENV === 'prod') {
      if (process.env.CONFIG_ENV === 'uat' || process.env.CONFIG_ENV === 'dev') {
      const VConsole = require('vconsole')
      new VConsole() // eslint-disable-line
      }
      ......
      src/pages/contractCreate/create-enclosure-info.vue
      View file @ 71bf73b4
      ......@@ -525,10 +525,8 @@ export default {
      listTemp.forEach((item, index) => {
      vm.load_picture(item.check_id, index, item.cdd_item)
      if (index === listTemp.length - 1) {
      debugger
      vm.hlsPopup.hideLoading()
      }
      console.log(index, listTemp.length - 1)
      })
      }
      })
      ......
      src/scripts/hlsHttp.js
      View file @ 71bf73b4
      ......@@ -105,7 +105,7 @@ axios.interceptors.response.use(response => {
      return Promise.resolve(err)
      })
      axios.defaults.baseURL = ''
      axios.defaults.timeout = 100000
      axios.defaults.timeout = 1000000
      // get请求
      export function get (url) {
      let param = {}
      ......
      www/index.html
      View file @ 71bf73b4
      <!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.13dd33b9d73dd9675f640ae7274a2bec.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.8a1ae113e3b5262701ed.js></script><script type=text/javascript src=./static/js/app.24fa7cbfb87bafa98dc2.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.13dd33b9d73dd9675f640ae7274a2bec.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.8a1ae113e3b5262701ed.js></script><script type=text/javascript src=./static/js/app.6325e3d0db2ef363a8b7.js></script></body></html>
      \ No newline at end of file
      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