Skip to content

H
hls-xcmg-vue-app
Commit a6532da7 authored by Jennie Shi's avatar Jennie Shi
Browse files
Options

fixConflict

parents 265b957c 1155b09a
Pipeline #4508 canceled with stages
      Show whitespace changes
      Inline Side-by-side
      Showing with 11 additions and 9 deletions
      config/dev.env.js
      View file @ a6532da7
      ...@@ -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.0.1"', currentVersion: '"1.0.2"',
      }) })
      config/prod.env.js
      View file @ a6532da7
      ...@@ -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"', appId: '"com.xcmg.app"',
      currentVersion: '"1.1.0"', currentVersion: '"1.0.2"',
      } }
      config/uat.env.js
      View file @ a6532da7
      ...@@ -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_DEV&apiName="', fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_DEV&apiName="',
      appId: '"com.xcmg.app.dev"', appId: '"com.xcmg.app.dev"',
      currentVersion: '"1.3.8"' currentVersion: '"1.3.9"'
      } }
      src/pages/contractCreate/sales-info.vue
      View file @ a6532da7
      ...@@ -220,9 +220,11 @@ export default { ...@@ -220,9 +220,11 @@ export default {
      bp_type: window.localStorage.bp_type, bp_type: window.localStorage.bp_type,
      project_id: '', project_id: '',
      } }
      vm.businessQuery() vm.businessQuery().then(res => {
      vm.agentQuery() vm.agentQuery().then(res => {
      vm.factoryQuery() vm.factoryQuery()
      })
      })
      } else if (from.name === 'CreateBaseInfo') { } else if (from.name === 'CreateBaseInfo') {
      vm.salesInfo.project_id = window.localStorage.project_id vm.salesInfo.project_id = window.localStorage.project_id
      } }
      ...@@ -262,7 +264,7 @@ export default { ...@@ -262,7 +264,7 @@ export default {
      let url = process.env.basePath + 'prj_business_type' let url = process.env.basePath + 'prj_business_type'
      let param = { } let param = { }
      vm.hlsPopup.showLoading('请稍候') vm.hlsPopup.showLoading('请稍候')
      vm.hlsHttp.post(url, param).then(function (res) { return vm.hlsHttp.post(url, param).then(function (res) {
      vm.hlsPopup.hideLoading() vm.hlsPopup.hideLoading()
      console.log('业务类型', res) console.log('业务类型', res)
      if (res.result === 'S') { if (res.result === 'S') {
      ...@@ -296,7 +298,7 @@ export default { ...@@ -296,7 +298,7 @@ export default {
      user_phone: window.localStorage.user_phone, user_phone: window.localStorage.user_phone,
      } }
      vm.hlsPopup.showLoading('请稍候') vm.hlsPopup.showLoading('请稍候')
      vm.hlsHttp.post(url, param).then(function (res) { return vm.hlsHttp.post(url, param).then(function (res) {
      vm.hlsPopup.hideLoading() vm.hlsPopup.hideLoading()
      console.log('经销商', res) console.log('经销商', res)
      if (res.result === 'S') { if (res.result === 'S') {
      ......
      www.zip 0 → 100644
      View file @ a6532da7
      File added
      www/index.html
      View file @ a6532da7
      <!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.8081e5faf8d7fba3578283b3e98b6bad.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.e547499500fbe65e7169.js></script><script type=text/javascript src=./static/js/app.d4d96507c73c4554f3c1.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.ecf999ef00c623db85c5cdf070de6140.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.6b67e0e03d53691d2979.js></script><script type=text/javascript src=./static/js/app.29f65d215d2a52ac2500.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