Skip to content

H
hls-xcmg-vue-app
Commit d13e924c authored by JingChao's avatar JingChao
Browse files
Options

uat 1.1.2

parent 35d60547
Pipeline #4581 canceled with stages
      Hide whitespace changes
      Inline Side-by-side
      Showing with 3 additions and 224 deletions
      config/dev.env.js
      View file @ d13e924c
      ......@@ -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&"',
      ocrPath: '"http://180.104.121.66:8088/r/api"',
      appId: '"com.xcmg.app"',
      currentVersion: '"1.0.2"',
      currentVersion: '"1.4.6"',
      })
      config/prod.env.js
      View file @ d13e924c
      ......@@ -11,5 +11,5 @@ 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.1.1"'
      currentVersion: '"1.1.2"'
      }
      config/uat.env.js
      View file @ d13e924c
      ......@@ -11,5 +11,5 @@ module.exports = {
      ocrPath:'"http://180.104.121.66:8088/r/api"',
      fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_DEV&apiName="',
      appId: '"com.xcmg.app.dev"',
      currentVersion: '"1.4.5"'
      currentVersion: '"1.4.6"'
      }
      plugins/android.json deleted 100644 → 0
      View file @ 35d60547
      {
      "prepare_queue": {
      "installed": [],
      "uninstalled": []
      },
      "config_munge": {
      "files": {}
      },
      "installed_plugins": {
      "com.handmobile.cordovaplugin.hotpatch": {
      "PACKAGE_NAME": "com.xcmg.app.dev"
      },
      "cordova-plugin-baidumaplocation": {
      "ANDROID_KEY": "YCDrAzwghWe3Ghps2QkIPBWANkDsgkOP",
      "IOS_KEY": "q0niXfvEg9ToZSD1DvTvGTfeN2b6AbKT",
      "IOS_LOCATION_DESC": "请点击'好'以允许访问。",
      "PACKAGE_NAME": "com.xcmg.app.dev"
      },
      "cordova-plugin-camera": {
      "PACKAGE_NAME": "com.xcmg.app.dev"
      },
      "cordova-plugin-compat": {
      "PACKAGE_NAME": "com.xcmg.app.dev"
      },
      "cordova-plugin-hls-cloudroom": {
      "PACKAGE_NAME": "com.xcmg.app.dev"
      }
      },
      "dependent_plugins": {
      "cordova-plugin-3dtouch": {
      "PACKAGE_NAME": "com.xcmg.app.dev"
      },
      "cordova-plugin-contacts": {
      "PACKAGE_NAME": "com.xcmg.app.dev"
      }
      }
      }
      plugins/ios.json deleted 100644 → 0
      View file @ 35d60547
      {
      <<<<<<< HEAD
      "prepare_queue": {
      "installed": [],
      "uninstalled": []
      },
      "config_munge": {
      "files": {}
      },
      "installed_plugins": {
      "com.handmobile.cordovaplugin.hotpatch": {
      "PACKAGE_NAME": "com.xcmg.app.dev"
      },
      "cordova-plugin-baidumaplocation": {
      "ANDROID_KEY": "YCDrAzwghWe3Ghps2QkIPBWANkDsgkOP",
      "IOS_KEY": "q0niXfvEg9ToZSD1DvTvGTfeN2b6AbKT",
      "IOS_LOCATION_DESC": "请点击'好'以允许访问。",
      "PACKAGE_NAME": "com.xcmg.app.dev"
      },
      "cordova-plugin-camera": {
      "PACKAGE_NAME": "com.xcmg.app.dev"
      },
      "cordova-plugin-compat": {
      "PACKAGE_NAME": "com.xcmg.app.dev"
      },
      "cordova-plugin-crosswalk-webview": {
      "PACKAGE_NAME": "com.xcmg.app.dev"
      },
      "cordova-plugin-datepicker": {
      "PACKAGE_NAME": "com.xcmg.app.dev"
      },
      "cordova-plugin-device": {
      "PACKAGE_NAME": "com.xcmg.app.dev"
      },
      "cordova-plugin-dialogs": {
      "PACKAGE_NAME": "com.xcmg.app.dev"
      },
      "cordova-plugin-file": {
      "PACKAGE_NAME": "com.xcmg.app.dev"
      },
      "cordova-plugin-file-transfer": {
      "PACKAGE_NAME": "com.xcmg.app.dev"
      },
      "cordova-plugin-hrms-faceidentify": {
      "PACKAGE_NAME": "com.xcmg.app.dev"
      },
      "cordova-plugin-image-picker": {
      "PACKAGE_NAME": "com.xcmg.app.dev"
      },
      "cordova-plugin-inappbrowser": {
      "PACKAGE_NAME": "com.xcmg.app.dev"
      },
      "cordova-plugin-jcore": {
      "PACKAGE_NAME": "com.xcmg.app.dev"
      },
      "cordova-plugin-media-capture": {
      "PACKAGE_NAME": "com.xcmg.app.dev"
      },
      "cordova-plugin-network-information": {
      "PACKAGE_NAME": "com.xcmg.app.dev"
      },
      "cordova-plugin-splashscreen": {
      "PACKAGE_NAME": "com.xcmg.app.dev"
      },
      "cordova-plugin-statusbar": {
      "PACKAGE_NAME": "com.xcmg.app.dev"
      },
      "cordova-plugin-touch-id": {
      "FACEID_USAGE_DESCRIPTION": " ",
      "PACKAGE_NAME": "com.xcmg.app.dev"
      },
      "cordova-plugin-whitelist": {
      "PACKAGE_NAME": "com.xcmg.app.dev"
      },
      "ionic-plugin-keyboard": {
      "PACKAGE_NAME": "com.xcmg.app.dev"
      },
      "jmessage-phonegap-plugin": {
      "APP_KEY": "7675edf5efa043a1ce9449a2",
      "PACKAGE_NAME": "com.xcmg.app.dev"
      },
      "jpush-phonegap-plugin": {
      "APP_KEY": "7675edf5efa043a1ce9449a2",
      "PACKAGE_NAME": "com.xcmg.app.dev"
      }
      },
      "dependent_plugins": {
      "cordova-plugin-3dtouch": {
      "PACKAGE_NAME": "com.xcmg.app.dev"
      },
      "cordova-plugin-contacts": {
      "CONTACTS_USAGE_DESCRIPTION": "我们将在通讯功能读取您的联系人，为你提供便捷服务",
      "PACKAGE_NAME": "com.xcmg.app.dev"
      },
      "cordova-plugin-fingerprint": {
      "PACKAGE_NAME": "com.xcmg.app.dev"
      },
      "cordova-plugin-x-toast": {
      "PACKAGE_NAME": "com.xcmg.app.dev"
      },
      "es6-promise-plugin": {
      "PACKAGE_NAME": "com.xcmg.app.dev"
      }
      =======
      "prepare_queue": {
      "installed": [],
      "uninstalled": []
      },
      "config_munge": {
      "files": {}
      },
      "installed_plugins": {
      "com.handmobile.cordovaplugin.hotpatch": {
      "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)"
      },
      "cordova-plugin-baidumaplocation": {
      "ANDROID_KEY": "YCDrAzwghWe3Ghps2QkIPBWANkDsgkOP",
      "IOS_KEY": "q0niXfvEg9ToZSD1DvTvGTfeN2b6AbKT",
      "IOS_LOCATION_DESC": "请点击'好'以允许访问。",
      "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)"
      },
      "cordova-plugin-camera": {
      "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)"
      },
      "cordova-plugin-compat": {
      "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)"
      },
      "cordova-plugin-crosswalk-webview": {
      "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)"
      },
      "cordova-plugin-datepicker": {
      "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)"
      },
      "cordova-plugin-device": {
      "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)"
      },
      "cordova-plugin-dialogs": {
      "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)"
      },
      "cordova-plugin-file": {
      "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)"
      },
      "cordova-plugin-file-transfer": {
      "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)"
      },
      "cordova-plugin-hrms-faceidentify": {
      "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)"
      },
      "cordova-plugin-image-picker": {
      "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)"
      },
      "cordova-plugin-inappbrowser": {
      "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)"
      },
      "cordova-plugin-jcore": {
      "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)"
      },
      "cordova-plugin-hls-cloudroom": {
      "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)"
      }
      },
      "dependent_plugins": {
      "cordova-plugin-3dtouch": {
      "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)"
      },
      "cordova-plugin-contacts": {
      "CONTACTS_USAGE_DESCRIPTION": "我们将在通讯功能读取您的联系人，为你提供便捷服务",
      "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)"
      },
      "cordova-plugin-fingerprint": {
      "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)"
      >>>>>>> jeshi
      }
      }
      }
      www/index.html deleted 100644 → 0
      View file @ 35d60547
      <<<<<<< HEAD
      <<<<<<< 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=o7fTnpVAGzXKN7SirV8xGU2xzWQS2NrI"></script><title>徐工融租</title><link href=./static/css/app.486eb393b1929813a88cd1e17a0b75ae.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.347d8a64f0016023e186.js></script><script type=text/javascript src=./static/js/app.cf0b522c85816b556395.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.1fba01d4acb1ed0185103a92c1363a7a.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.737b66774b6e80545073.js></script><script type=text/javascript src=./static/js/app.b55aa48989ca8151b595.js></script></body></html>
      >>>>>>> 9acbe89d947ec7fd32a726a05985fc405fef6acb
      =======
      <!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.a1bf5c012e0d37c257e22ffbcd1475db.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.3f20fa93928dc721ea21.js></script><script type=text/javascript src=./static/js/app.2e1cb6fea43cbdb7228e.js></script></body></html>
      >>>>>>> jeshi
      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