Skip to content

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

Merge branch 'liuxin' into develop

parents eea78b78 6416543b
Pipeline #4641 canceled with stages
      Show whitespace changes
      Inline Side-by-side
      Showing with 11 additions and 9 deletions
      config/dev.env.js
      View file @ b40a7b05
      ...@@ -13,5 +13,5 @@ module.exports = merge(prodEnv, { ...@@ -13,5 +13,5 @@ module.exports = merge(prodEnv, {
      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_DEV&apiName=file_view&"',
      ocrPath: '"http://180.104.121.66:8088/r/api"', ocrPath: '"http://180.104.121.66:8088/r/api"',
      appId: '"com.xcmg.app"', appId: '"com.xcmg.app"',
      currentVersion: '"1.6.0"', currentVersion: '"1.6.1"',
      }) })
      config/uat.env.js
      View file @ b40a7b05
      ...@@ -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.1.4"' currentVersion: '"1.1.7"'
      } }
      src/pages/contractStart/add-car.vue
      View file @ b40a7b05
      ...@@ -542,10 +542,10 @@ export default { ...@@ -542,10 +542,10 @@ export default {
      if (res.code === '00') { if (res.code === '00') {
      vm.hlsPopup.showSuccess('保存成功') vm.hlsPopup.showSuccess('保存成功')
      vm.savePicture() vm.savePicture()
      setTimeout(() => { // setTimeout(() => {
      vm.downNum = false // vm.downNum = false
      vm.getEquipment() // vm.getEquipment()
      }, 2000) // }, 2000)
      } else { } else {
      hlsPopup.showLongCenter(res.message) hlsPopup.showLongCenter(res.message)
      } }
      ...@@ -566,6 +566,8 @@ export default { ...@@ -566,6 +566,8 @@ export default {
      } }
      list.push(obj) list.push(obj)
      vm.save_picture(list) vm.save_picture(list)
      vm.downNum = false
      vm.getEquipment()
      }, },
      isSave () { isSave () {
      this.hlsPopup.showConfirm({ this.hlsPopup.showConfirm({
      ......
      src/pages/myInfo/my-info.vue
      View file @ b40a7b05
      ...@@ -137,10 +137,10 @@ ...@@ -137,10 +137,10 @@
      <img slot="left-icon" src="@/assets/myInfo/about.png" class="left-icon" > <img slot="left-icon" src="@/assets/myInfo/about.png" class="left-icon" >
      <div slot="name">关于徐工</div> <div slot="name">关于徐工</div>
      </item> </item>
      <item @click.native="updateVersion"> <!-- <item @click.native="updateVersion">
      <img slot="left-icon" src="@/assets/myInfo/refresh.png" class="left-icon" > <img slot="left-icon" src="@/assets/myInfo/refresh.png" class="left-icon" >
      <div slot="name">检查更新</div> <div slot="name">检查更新</div>
      </item> </item> -->
      <item @click.native="openTest"> <item @click.native="openTest">
      <img slot="left-icon" src="@/assets/myInfo/refresh.png" class="left-icon" > <img slot="left-icon" src="@/assets/myInfo/refresh.png" class="left-icon" >
      <div slot="name">当前版本</div> <div slot="name">当前版本</div>
      ......
      www/index.html
      View file @ b40a7b05
      <!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=o7fTnpVAGzXKN7SirV8xGU2xzWQS2NrI"></script><title>徐工金服</title><link href=./static/css/app.277dd614b0473916aa628d277e4ea436.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.b254b82016a9c2c023b0.js></script><script type=text/javascript src=./static/js/app.21e5a00ec612e3551f14.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=o7fTnpVAGzXKN7SirV8xGU2xzWQS2NrI"></script><title>徐工金服</title><link href=./static/css/app.dd9699e5d266332786eba3f70cb8b5d4.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.e1961bfdd043afa10023.js></script><script type=text/javascript src=./static/js/app.2d1ba638c5d8808b6b41.js></script></body></html>
      \ No newline at end of file \ 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