fixConflict

340b0f1b · Jennie Shi · 7eff53f8 · 8fd979ee · 340b0f1b · 340b0f1b
Commit 340b0f1b authored Jan 15, 2020 by Jennie Shi
17 changed files
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -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.5.1"',
+  currentVersion: '"1.5.3"',
 })
--- a/config/index.js
+++ b/config/index.js
@@ -27,7 +27,15 @@ module.exports = {
    // Paths
    assetsSubDirectory: 'static',
    assetsPublicPath: '/',
-    proxyTable: {},
+    proxyTable: {
+    //   '/xcmg_file': {
+    //   target: 'http://lichee.iask.in',
+    //   changeOrigin: true,
+    //   pathRewrite: {
+    //     '^/xcmg_file': '/xcmg_file'
+    //   }
+    // },
+  },

    // Various Dev Server settings
    host: 'localhost', // can be overwritten by process.env.HOST

--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -7,9 +7,9 @@ module.exports = {
  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_PROD&apiName="',
  rootPath: '"http://180.104.121.66:8088/r/api"',
-  filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_PROD&apiName=file_view&"',
+  filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_UAT&apiName=file_view&"',
  ocrPath:'"http://180.104.121.66:8088/r/api"',
-  fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_PROD&apiName="',
+  fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="',
  appId: '"com.xcmg.app"',
  currentVersion: '"0.0.1"'
 }
--- a/config/uat.env.js
+++ b/config/uat.env.js
@@ -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.1.3"'
+  currentVersion: '"1.5.7"'
 }
--- a/package-lock.json
+++ b/package-lock.json
@@ -169,7 +169,8 @@
    "abbrev": {
      "version": "1.1.1",
      "resolved": "https://registry.npm.taobao.org/abbrev/download/abbrev-1.1.1.tgz",
-      "integrity": "sha1-+PLIh60Qv2f2NPAFtph/7TF5qsg="
+      "integrity": "sha1-+PLIh60Qv2f2NPAFtph/7TF5qsg=",
+      "dev": true
    },
    "accepts": {
      "version": "1.3.7",
@@ -256,11 +257,6 @@
      "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=",
      "dev": true
    },
-    "ansi": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npm.taobao.org/ansi/download/ansi-0.3.1.tgz",
-      "integrity": "sha1-DELU+xcWDVqa8eSEus4cZpIsGyE="
-    },
    "ansi-escapes": {
      "version": "3.2.0",
      "resolved": "https://registry.npm.taobao.org/ansi-escapes/download/ansi-escapes-3.2.0.tgz",
@@ -1477,7 +1473,8 @@
    "balanced-match": {
      "version": "1.0.0",
      "resolved": "https://registry.npm.taobao.org/balanced-match/download/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+      "dev": true
    },
    "base": {
      "version": "0.11.2",
@@ -1573,11 +1570,6 @@
        "tryer": "^1.0.0"
      }
    },
-    "big-integer": {
-      "version": "1.6.48",
-      "resolved": "https://registry.npm.taobao.org/big-integer/download/big-integer-1.6.48.tgz",
-      "integrity": "sha1-j9iL0WMsukocjD49cVnwi7lbS54="
-    },
    "binary-extensions": {
      "version": "1.13.1",
      "resolved": "https://registry.npm.taobao.org/binary-extensions/download/binary-extensions-1.13.1.tgz",
@@ -1662,26 +1654,11 @@
        "hoek": "2.x.x"
      }
    },
-    "bplist-creator": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npm.taobao.org/bplist-creator/download/bplist-creator-0.0.8.tgz",
-      "integrity": "sha1-VrKm556a7D/DO/gx0JNH1zeU55w=",
-      "requires": {
-        "stream-buffers": "~2.2.0"
-      }
-    },
-    "bplist-parser": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npm.taobao.org/bplist-parser/download/bplist-parser-0.1.1.tgz",
-      "integrity": "sha1-1g1dzCDLptx+HymbNdPh+V2vuuY=",
-      "requires": {
-        "big-integer": "^1.6.7"
-      }
-    },
    "brace-expansion": {
      "version": "1.1.11",
      "resolved": "https://registry.npm.taobao.org/brace-expansion/download/brace-expansion-1.1.11.tgz",
      "integrity": "sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0=",
+      "dev": true,
      "requires": {
        "balanced-match": "^1.0.0",
        "concat-map": "0.0.1"
@@ -2363,7 +2340,8 @@
    "concat-map": {
      "version": "0.0.1",
      "resolved": "https://registry.npm.taobao.org/concat-map/download/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "dev": true
    },
    "concat-stream": {
      "version": "1.6.2",
@@ -2707,92 +2685,6 @@
        }
      }
    },
-    "cordova-common": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npm.taobao.org/cordova-common/download/cordova-common-3.2.1.tgz",
-      "integrity": "sha1-9P2+tA2QSf4ooJ+pAXVu1m0kZmE=",
-      "requires": {
-        "ansi": "^0.3.1",
-        "bplist-parser": "^0.1.0",
-        "cross-spawn": "^6.0.5",
-        "elementtree": "0.1.7",
-        "endent": "^1.1.1",
-        "fs-extra": "^8.0.0",
-        "glob": "^7.1.2",
-        "minimatch": "^3.0.0",
-        "plist": "^3.0.1",
-        "q": "^1.4.1",
-        "strip-bom": "^3.0.0",
-        "underscore": "^1.8.3",
-        "which": "^1.3.0"
-      },
-      "dependencies": {
-        "cross-spawn": {
-          "version": "6.0.5",
-          "resolved": "https://registry.npm.taobao.org/cross-spawn/download/cross-spawn-6.0.5.tgz?cache=0&sync_timestamp=1570439926300&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcross-spawn%2Fdownload%2Fcross-spawn-6.0.5.tgz",
-          "integrity": "sha1-Sl7Hxk364iw6FBJNus3uhG2Ay8Q=",
-          "requires": {
-            "nice-try": "^1.0.4",
-            "path-key": "^2.0.1",
-            "semver": "^5.5.0",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
-          }
-        },
-        "fs-extra": {
-          "version": "8.1.0",
-          "resolved": "https://registry.npm.taobao.org/fs-extra/download/fs-extra-8.1.0.tgz",
-          "integrity": "sha1-SdQ8RaiM2Wd2aMt74bRu/bjS4cA=",
-          "requires": {
-            "graceful-fs": "^4.2.0",
-            "jsonfile": "^4.0.0",
-            "universalify": "^0.1.0"
-          }
-        },
-        "jsonfile": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npm.taobao.org/jsonfile/download/jsonfile-4.0.0.tgz",
-          "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
-          "requires": {
-            "graceful-fs": "^4.1.6"
-          }
-        },
-        "strip-bom": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npm.taobao.org/strip-bom/download/strip-bom-3.0.0.tgz",
-          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
-        }
-      }
-    },
-    "cordova-ios": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npm.taobao.org/cordova-ios/download/cordova-ios-5.1.1.tgz",
-      "integrity": "sha1-Mbio5aRbxgTkbatg+iX69QVDNW8=",
-      "requires": {
-        "cordova-common": "^3.1.0",
-        "ios-sim": "^8.0.1",
-        "nopt": "^4.0.1",
-        "plist": "^3.0.1",
-        "q": "^1.5.1",
-        "semver": "^6.3.0",
-        "shelljs": "^0.5.3",
-        "unorm": "^1.4.1",
-        "xcode": "^2.0.0",
-        "xml-escape": "^1.1.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npm.taobao.org/semver/download/semver-6.3.0.tgz",
-          "integrity": "sha1-7gpkyK9ejO6mdoexM3YeG+y9HT0="
-        },
-        "shelljs": {
-          "version": "0.5.3",
-          "resolved": "https://registry.npm.taobao.org/shelljs/download/shelljs-0.5.3.tgz",
-          "integrity": "sha1-xUmCuZbHbvDB5rWfvcWCX1txMRM="
-        }
-      }
-    },
    "cordova-plugin-camera": {
      "version": "2.4.1",
      "resolved": "https://registry.npm.taobao.org/cordova-plugin-camera/download/cordova-plugin-camera-2.4.1.tgz?cache=0&sync_timestamp=1562860479396&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcordova-plugin-camera%2Fdownload%2Fcordova-plugin-camera-2.4.1.tgz",
@@ -2808,14 +2700,6 @@
      "resolved": "https://registry.npm.taobao.org/cordova-plugin-device/download/cordova-plugin-device-2.0.3.tgz?cache=0&sync_timestamp=1562089310547&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcordova-plugin-device%2Fdownload%2Fcordova-plugin-device-2.0.3.tgz",
      "integrity": "sha1-wrQbfv0EVd0Jf4k1bYW/3V2t6w8="
    },
-    "cordova-plugin-hls-cloudroom": {
-      "version": "file:../../../Desktop/徐工/cordova-plugin-hls-cloudroom"
-    },
-    "cordova-plugin-themeablebrowser": {
-      "version": "0.2.18",
-      "resolved": "https://registry.npm.taobao.org/cordova-plugin-themeablebrowser/download/cordova-plugin-themeablebrowser-0.2.18.tgz",
-      "integrity": "sha1-IBvfFEHJb4tovZyjOcbv18xoCbQ="
-    },
    "cordova-plugin-whitelist": {
      "version": "1.3.4",
      "resolved": "https://registry.npm.taobao.org/cordova-plugin-whitelist/download/cordova-plugin-whitelist-1.3.4.tgz",
@@ -3402,15 +3286,11 @@
      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
      "dev": true
    },
-    "dedent": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npm.taobao.org/dedent/download/dedent-0.7.0.tgz",
-      "integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw="
-    },
    "deep-equal": {
      "version": "1.1.1",
      "resolved": "https://registry.npm.taobao.org/deep-equal/download/deep-equal-1.1.1.tgz",
      "integrity": "sha1-tcmMlCzv+vfLBR4k4UNKJaLmB2o=",
+      "dev": true,
      "requires": {
        "is-arguments": "^1.0.4",
        "is-date-object": "^1.0.1",
@@ -3430,6 +3310,7 @@
      "version": "1.1.3",
      "resolved": "https://registry.npm.taobao.org/define-properties/download/define-properties-1.1.3.tgz",
      "integrity": "sha1-z4jabL7ib+bbcJT2HYcMvYTO6fE=",
+      "dev": true,
      "requires": {
        "object-keys": "^1.0.12"
      }
@@ -3484,7 +3365,8 @@
    "defined": {
      "version": "1.0.0",
      "resolved": "https://registry.npm.taobao.org/defined/download/defined-1.0.0.tgz",
-      "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM="
+      "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=",
+      "dev": true
    },
    "del": {
      "version": "3.0.0",
@@ -3706,14 +3588,6 @@
        "is-obj": "^1.0.0"
      }
    },
-    "dotignore": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npm.taobao.org/dotignore/download/dotignore-0.1.2.tgz",
-      "integrity": "sha1-+ULyIA0ow6dvvdbw7p8yV8ii6QU=",
-      "requires": {
-        "minimatch": "^3.0.4"
-      }
-    },
    "draftlog": {
      "version": "1.0.12",
      "resolved": "https://registry.npm.taobao.org/draftlog/download/draftlog-1.0.12.tgz",
@@ -3767,21 +3641,6 @@
      "integrity": "sha1-/zZE+yFr3MwzsgY8NvZ53rUxbN4=",
      "dev": true
    },
-    "elementtree": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npm.taobao.org/elementtree/download/elementtree-0.1.7.tgz",
-      "integrity": "sha1-mskb5uUvtuYkTE5UpKw+2K6OKcA=",
-      "requires": {
-        "sax": "1.1.4"
-      },
-      "dependencies": {
-        "sax": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npm.taobao.org/sax/download/sax-1.1.4.tgz",
-          "integrity": "sha1-dLbTPJrh4AFRDxeakRaFiPGu2qk="
-        }
-      }
-    },
    "elliptic": {
      "version": "6.5.2",
      "resolved": "https://registry.npm.taobao.org/elliptic/download/elliptic-6.5.2.tgz",
@@ -3818,16 +3677,6 @@
        "once": "^1.4.0"
      }
    },
-    "endent": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npm.taobao.org/endent/download/endent-1.3.0.tgz",
-      "integrity": "sha1-6oa1g9e3yv9cvuWtLHwyLrGQDHY=",
-      "requires": {
-        "dedent": "^0.7.0",
-        "fast-json-parse": "^1.0.3",
-        "objectorarray": "^1.0.3"
-      }
-    },
    "enhanced-resolve": {
      "version": "3.4.1",
      "resolved": "https://registry.npm.taobao.org/enhanced-resolve/download/enhanced-resolve-3.4.1.tgz?cache=0&sync_timestamp=1572993058578&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fenhanced-resolve%2Fdownload%2Fenhanced-resolve-3.4.1.tgz",
@@ -3877,6 +3726,7 @@
      "version": "1.17.0",
      "resolved": "https://registry.npm.taobao.org/es-abstract/download/es-abstract-1.17.0.tgz",
      "integrity": "sha1-9CpRfQA2pVkduyxGNZHci7UDCbE=",
+      "dev": true,
      "requires": {
        "es-to-primitive": "^1.2.1",
        "function-bind": "^1.1.1",
@@ -3895,6 +3745,7 @@
      "version": "1.2.1",
      "resolved": "https://registry.npm.taobao.org/es-to-primitive/download/es-to-primitive-1.2.1.tgz",
      "integrity": "sha1-5VzUyc3BiLzvsDs2bHNjI/xciYo=",
+      "dev": true,
      "requires": {
        "is-callable": "^1.1.4",
        "is-date-object": "^1.0.1",
@@ -4795,11 +4646,6 @@
      "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=",
      "dev": true
    },
-    "fast-json-parse": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npm.taobao.org/fast-json-parse/download/fast-json-parse-1.0.3.tgz",
-      "integrity": "sha1-Q+XGHuTvqSZWMwRrdw+2gqdXfE0="
-    },
    "fast-json-stable-stringify": {
      "version": "2.1.0",
      "resolved": "https://registry.npm.taobao.org/fast-json-stable-stringify/download/fast-json-stable-stringify-2.1.0.tgz?cache=0&sync_timestamp=1576340291001&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffast-json-stable-stringify%2Fdownload%2Ffast-json-stable-stringify-2.1.0.tgz",
@@ -4999,14 +4845,6 @@
        }
      }
    },
-    "for-each": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npm.taobao.org/for-each/download/for-each-0.3.3.tgz",
-      "integrity": "sha1-abRH6IoKXTLD5whPPxcQA0shN24=",
-      "requires": {
-        "is-callable": "^1.1.3"
-      }
-    },
    "for-in": {
      "version": "1.0.2",
      "resolved": "https://registry.npm.taobao.org/for-in/download/for-in-1.0.2.tgz",
@@ -5138,7 +4976,8 @@
    "fs.realpath": {
      "version": "1.0.0",
      "resolved": "https://registry.npm.taobao.org/fs.realpath/download/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
    },
    "fsevents": {
      "version": "1.2.11",
@@ -5701,7 +5540,8 @@
    "function-bind": {
      "version": "1.1.1",
      "resolved": "https://registry.npm.taobao.org/function-bind/download/function-bind-1.1.1.tgz",
-      "integrity": "sha1-pWiZ0+o8m6uHS7l3O3xe3pL0iV0="
+      "integrity": "sha1-pWiZ0+o8m6uHS7l3O3xe3pL0iV0=",
+      "dev": true
    },
    "functional-red-black-tree": {
      "version": "1.0.1",
@@ -5756,6 +5596,7 @@
      "version": "7.1.6",
      "resolved": "https://registry.npm.taobao.org/glob/download/glob-7.1.6.tgz?cache=0&sync_timestamp=1577792826619&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fglob%2Fdownload%2Fglob-7.1.6.tgz",
      "integrity": "sha1-FB8zuBp8JJLhJVlDB0gMRmeSeKY=",
+      "dev": true,
      "requires": {
        "fs.realpath": "^1.0.0",
        "inflight": "^1.0.4",
@@ -5817,7 +5658,8 @@
    "graceful-fs": {
      "version": "4.2.3",
      "resolved": "https://registry.npm.taobao.org/graceful-fs/download/graceful-fs-4.2.3.tgz",
-      "integrity": "sha1-ShL/G2A3bvCYYsIJPt2Qgyi+hCM="
+      "integrity": "sha1-ShL/G2A3bvCYYsIJPt2Qgyi+hCM=",
+      "dev": true
    },
    "growly": {
      "version": "1.3.0",
@@ -5876,6 +5718,7 @@
      "version": "1.0.3",
      "resolved": "https://registry.npm.taobao.org/has/download/has-1.0.3.tgz",
      "integrity": "sha1-ci18v8H2qoJB8W3YFOAR4fQeh5Y=",
+      "dev": true,
      "requires": {
        "function-bind": "^1.1.1"
      }
@@ -5906,7 +5749,8 @@
    "has-symbols": {
      "version": "1.0.1",
      "resolved": "https://registry.npm.taobao.org/has-symbols/download/has-symbols-1.0.1.tgz?cache=0&sync_timestamp=1573950719586&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhas-symbols%2Fdownload%2Fhas-symbols-1.0.1.tgz",
-      "integrity": "sha1-n1IUdYpEGWxAbZvXbOv4HsLdMeg="
+      "integrity": "sha1-n1IUdYpEGWxAbZvXbOv4HsLdMeg=",
+      "dev": true
    },
    "has-value": {
      "version": "1.0.0",
@@ -6339,6 +6183,7 @@
      "version": "1.0.6",
      "resolved": "https://registry.npm.taobao.org/inflight/download/inflight-1.0.6.tgz",
      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
      "requires": {
        "once": "^1.3.0",
        "wrappy": "1"
@@ -6347,7 +6192,8 @@
    "inherits": {
      "version": "2.0.4",
      "resolved": "https://registry.npm.taobao.org/inherits/download/inherits-2.0.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Finherits%2Fdownload%2Finherits-2.0.4.tgz",
-      "integrity": "sha1-D6LGT5MpF8NDOg3tVTY6rjdBa3w="
+      "integrity": "sha1-D6LGT5MpF8NDOg3tVTY6rjdBa3w=",
+      "dev": true
    },
    "inline-manifest-webpack-plugin": {
      "version": "3.0.1",
@@ -6427,32 +6273,6 @@
      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
      "dev": true
    },
-    "ios-sim": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npm.taobao.org/ios-sim/download/ios-sim-8.0.2.tgz",
-      "integrity": "sha1-4jlKy220N4919MP/hhC79PR5XEM=",
-      "requires": {
-        "bplist-parser": "^0.0.6",
-        "nopt": "1.0.9",
-        "plist": "^3.0.1",
-        "simctl": "^2"
-      },
-      "dependencies": {
-        "bplist-parser": {
-          "version": "0.0.6",
-          "resolved": "https://registry.npm.taobao.org/bplist-parser/download/bplist-parser-0.0.6.tgz",
-          "integrity": "sha1-ONo0cYF9+dRKs4kuJ3B7u9daEbk="
-        },
-        "nopt": {
-          "version": "1.0.9",
-          "resolved": "https://registry.npm.taobao.org/nopt/download/nopt-1.0.9.tgz",
-          "integrity": "sha1-O8DXy6e/sNWmdtvtfA6+SKT9RU4=",
-          "requires": {
-            "abbrev": "1"
-          }
-        }
-      }
-    },
    "ip": {
      "version": "1.1.5",
      "resolved": "https://registry.npm.taobao.org/ip/download/ip-1.1.5.tgz",
@@ -6493,7 +6313,8 @@
    "is-arguments": {
      "version": "1.0.4",
      "resolved": "https://registry.npm.taobao.org/is-arguments/download/is-arguments-1.0.4.tgz",
-      "integrity": "sha1-P6+WbHy6D/Q3+zH2JQCC/PBEjPM="
+      "integrity": "sha1-P6+WbHy6D/Q3+zH2JQCC/PBEjPM=",
+      "dev": true
    },
    "is-arrayish": {
      "version": "0.2.1",
@@ -6519,7 +6340,8 @@
    "is-callable": {
      "version": "1.1.5",
      "resolved": "https://registry.npm.taobao.org/is-callable/download/is-callable-1.1.5.tgz",
-      "integrity": "sha1-9+RrWWiQRW23Tn9ul2yzJz0G+qs="
+      "integrity": "sha1-9+RrWWiQRW23Tn9ul2yzJz0G+qs=",
+      "dev": true
    },
    "is-color-stop": {
      "version": "1.1.0",
@@ -6547,7 +6369,8 @@
    "is-date-object": {
      "version": "1.0.2",
      "resolved": "https://registry.npm.taobao.org/is-date-object/download/is-date-object-1.0.2.tgz?cache=0&sync_timestamp=1576729182289&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-date-object%2Fdownload%2Fis-date-object-1.0.2.tgz",
-      "integrity": "sha1-vac28s2P0G0yhE53Q7+nSUw7/X4="
+      "integrity": "sha1-vac28s2P0G0yhE53Q7+nSUw7/X4=",
+      "dev": true
    },
    "is-descriptor": {
      "version": "0.1.6",
@@ -6674,6 +6497,7 @@
      "version": "1.0.5",
      "resolved": "https://registry.npm.taobao.org/is-regex/download/is-regex-1.0.5.tgz",
      "integrity": "sha1-OdWJo1i/GJZ/cmlnEguPwa7XTq4=",
+      "dev": true,
      "requires": {
        "has": "^1.0.3"
      }
@@ -6724,6 +6548,7 @@
      "version": "1.0.3",
      "resolved": "https://registry.npm.taobao.org/is-symbol/download/is-symbol-1.0.3.tgz?cache=0&sync_timestamp=1574296409833&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-symbol%2Fdownload%2Fis-symbol-1.0.3.tgz",
      "integrity": "sha1-OOEBS55jKb4N6dJKQU/XRB7GGTc=",
+      "dev": true,
      "requires": {
        "has-symbols": "^1.0.1"
      }
@@ -6771,7 +6596,8 @@
    "isexe": {
      "version": "2.0.0",
      "resolved": "https://registry.npm.taobao.org/isexe/download/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "dev": true
    },
    "isobject": {
      "version": "3.0.1",
@@ -7443,6 +7269,7 @@
      "version": "3.0.4",
      "resolved": "https://registry.npm.taobao.org/minimatch/download/minimatch-3.0.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fminimatch%2Fdownload%2Fminimatch-3.0.4.tgz",
      "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
+      "dev": true,
      "requires": {
        "brace-expansion": "^1.1.7"
      }
@@ -7450,7 +7277,8 @@
    "minimist": {
      "version": "1.2.0",
      "resolved": "https://registry.npm.taobao.org/minimist/download/minimist-1.2.0.tgz",
-      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+      "dev": true
    },
    "mississippi": {
      "version": "2.0.0",
@@ -7620,11 +7448,6 @@
      "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
      "dev": true
    },
-    "nice-try": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npm.taobao.org/nice-try/download/nice-try-1.0.5.tgz",
-      "integrity": "sha1-ozeKdpbOfSI+iPybdkvX7xCJ42Y="
-    },
    "no-case": {
      "version": "2.3.2",
      "resolved": "https://registry.npm.taobao.org/no-case/download/no-case-2.3.2.tgz?cache=0&sync_timestamp=1576721505371&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fno-case%2Fdownload%2Fno-case-2.3.2.tgz",
@@ -7707,15 +7530,6 @@
        }
      }
    },
-    "nopt": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npm.taobao.org/nopt/download/nopt-4.0.1.tgz",
-      "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
-      "requires": {
-        "abbrev": "1",
-        "osenv": "^0.1.4"
-      }
-    },
    "normalize-package-data": {
      "version": "2.5.0",
      "resolved": "https://registry.npm.taobao.org/normalize-package-data/download/normalize-package-data-2.5.0.tgz",
@@ -7826,17 +7640,20 @@
    "object-inspect": {
      "version": "1.7.0",
      "resolved": "https://registry.npm.taobao.org/object-inspect/download/object-inspect-1.7.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fobject-inspect%2Fdownload%2Fobject-inspect-1.7.0.tgz",
-      "integrity": "sha1-9Pa9GBrXfwBrXs5gvQtvOY/3Smc="
+      "integrity": "sha1-9Pa9GBrXfwBrXs5gvQtvOY/3Smc=",
+      "dev": true
    },
    "object-is": {
      "version": "1.0.2",
      "resolved": "https://registry.npm.taobao.org/object-is/download/object-is-1.0.2.tgz?cache=0&sync_timestamp=1576479714417&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fobject-is%2Fdownload%2Fobject-is-1.0.2.tgz",
-      "integrity": "sha1-a4DrhP5FFJj2UAeYLwNaW0Re3sQ="
+      "integrity": "sha1-a4DrhP5FFJj2UAeYLwNaW0Re3sQ=",
+      "dev": true
    },
    "object-keys": {
      "version": "1.1.1",
      "resolved": "https://registry.npm.taobao.org/object-keys/download/object-keys-1.1.1.tgz",
-      "integrity": "sha1-HEfyct8nfzsdrwYWd9nILiMixg4="
+      "integrity": "sha1-HEfyct8nfzsdrwYWd9nILiMixg4=",
+      "dev": true
    },
    "object-visit": {
      "version": "1.0.1",
@@ -7851,6 +7668,7 @@
      "version": "4.1.0",
      "resolved": "https://registry.npm.taobao.org/object.assign/download/object.assign-4.1.0.tgz",
      "integrity": "sha1-lovxEA15Vrs8oIbwBvhGs7xACNo=",
+      "dev": true,
      "requires": {
        "define-properties": "^1.1.2",
        "function-bind": "^1.1.1",
@@ -7889,14 +7707,6 @@
        "has": "^1.0.3"
      }
    },
-    "objectorarray": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npm.taobao.org/objectorarray/download/objectorarray-1.0.3.tgz",
-      "integrity": "sha1-0qLekJfAakjX13Jk/XFAZRnnx3I=",
-      "requires": {
-        "tape": "^4.8.0"
-      }
-    },
    "obuf": {
      "version": "1.1.2",
      "resolved": "https://registry.npm.taobao.org/obuf/download/obuf-1.1.2.tgz",
@@ -7922,6 +7732,7 @@
      "version": "1.4.0",
      "resolved": "https://registry.npm.taobao.org/once/download/once-1.4.0.tgz",
      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
      "requires": {
        "wrappy": "1"
      }
@@ -8506,7 +8317,8 @@
    "os-homedir": {
      "version": "1.0.2",
      "resolved": "https://registry.npm.taobao.org/os-homedir/download/os-homedir-1.0.2.tgz",
-      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+      "dev": true
    },
    "os-locale": {
      "version": "1.4.0",
@@ -8520,16 +8332,8 @@
    "os-tmpdir": {
      "version": "1.0.2",
      "resolved": "https://registry.npm.taobao.org/os-tmpdir/download/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
-    },
-    "osenv": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npm.taobao.org/osenv/download/osenv-0.1.5.tgz",
-      "integrity": "sha1-hc36+uso6Gd/QW4odZK18/SepBA=",
-      "requires": {
-        "os-homedir": "^1.0.0",
-        "os-tmpdir": "^1.0.0"
-      }
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+      "dev": true
    },
    "p-finally": {
      "version": "1.0.0",
@@ -8667,7 +8471,8 @@
    "path-is-absolute": {
      "version": "1.0.1",
      "resolved": "https://registry.npm.taobao.org/path-is-absolute/download/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "dev": true
    },
    "path-is-inside": {
      "version": "1.0.2",
@@ -8678,12 +8483,14 @@
    "path-key": {
      "version": "2.0.1",
      "resolved": "https://registry.npm.taobao.org/path-key/download/path-key-2.0.1.tgz?cache=0&sync_timestamp=1574441322626&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpath-key%2Fdownload%2Fpath-key-2.0.1.tgz",
-      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A="
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+      "dev": true
    },
    "path-parse": {
      "version": "1.0.6",
      "resolved": "https://registry.npm.taobao.org/path-parse/download/path-parse-1.0.6.tgz",
-      "integrity": "sha1-1i27VnlAXXLEc37FhgDp3c8G0kw="
+      "integrity": "sha1-1i27VnlAXXLEc37FhgDp3c8G0kw=",
+      "dev": true
    },
    "path-to-regexp": {
      "version": "0.1.7",
@@ -8771,23 +8578,6 @@
        }
      }
    },
-    "plist": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npm.taobao.org/plist/download/plist-3.0.1.tgz",
-      "integrity": "sha1-qbkx0XwwTokS7wujvdYYK68uH4w=",
-      "requires": {
-        "base64-js": "^1.2.3",
-        "xmlbuilder": "^9.0.7",
-        "xmldom": "0.1.x"
-      },
-      "dependencies": {
-        "base64-js": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npm.taobao.org/base64-js/download/base64-js-1.3.1.tgz",
-          "integrity": "sha1-WOzoy3XdB+ce0IxzarxfrE2/jfE="
-        }
-      }
-    },
    "pluralize": {
      "version": "7.0.0",
      "resolved": "https://registry.npm.taobao.org/pluralize/download/pluralize-7.0.0.tgz",
@@ -11172,7 +10962,8 @@
    "q": {
      "version": "1.5.1",
      "resolved": "https://registry.npm.taobao.org/q/download/q-1.5.1.tgz",
-      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc="
+      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
+      "dev": true
    },
    "qs": {
      "version": "6.7.0",
@@ -11416,6 +11207,7 @@
      "version": "1.3.0",
      "resolved": "https://registry.npm.taobao.org/regexp.prototype.flags/download/regexp.prototype.flags-1.3.0.tgz?cache=0&sync_timestamp=1576388141321&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fregexp.prototype.flags%2Fdownload%2Fregexp.prototype.flags-1.3.0.tgz",
      "integrity": "sha1-erqJs8E6ZFCdq888qNn7ub31y3U=",
+      "dev": true,
      "requires": {
        "define-properties": "^1.1.3",
        "es-abstract": "^1.17.0-next.1"
@@ -11593,6 +11385,7 @@
      "version": "1.14.2",
      "resolved": "https://registry.npm.taobao.org/resolve/download/resolve-1.14.2.tgz?cache=0&sync_timestamp=1578362210740&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fresolve%2Fdownload%2Fresolve-1.14.2.tgz",
      "integrity": "sha1-2/MdD6mLHymqUWl4O5wpDLhl/qI=",
+      "dev": true,
      "requires": {
        "path-parse": "^1.0.6"
      }
@@ -11628,14 +11421,6 @@
        "signal-exit": "^3.0.2"
      }
    },
-    "resumer": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npm.taobao.org/resumer/download/resumer-0.0.0.tgz",
-      "integrity": "sha1-8ej0YeQGS6Oegq883CqMiT0HZ1k=",
-      "requires": {
-        "through": "~2.3.4"
-      }
-    },
    "ret": {
      "version": "0.1.15",
      "resolved": "https://registry.npm.taobao.org/ret/download/ret-0.1.15.tgz",
@@ -11796,7 +11581,8 @@
    "semver": {
      "version": "5.7.1",
      "resolved": "https://registry.npm.taobao.org/semver/download/semver-5.7.1.tgz",
-      "integrity": "sha1-qVT5Ma66UI0we78Gnv8MAclhFvc="
+      "integrity": "sha1-qVT5Ma66UI0we78Gnv8MAclhFvc=",
+      "dev": true
    },
    "send": {
      "version": "0.17.1",
@@ -11941,6 +11727,7 @@
      "version": "1.2.0",
      "resolved": "https://registry.npm.taobao.org/shebang-command/download/shebang-command-1.2.0.tgz",
      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "dev": true,
      "requires": {
        "shebang-regex": "^1.0.0"
      }
@@ -11948,7 +11735,8 @@
    "shebang-regex": {
      "version": "1.0.0",
      "resolved": "https://registry.npm.taobao.org/shebang-regex/download/shebang-regex-1.0.0.tgz",
-      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+      "dev": true
    },
    "shelljs": {
      "version": "0.7.8",
@@ -11973,42 +11761,6 @@
      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
      "dev": true
    },
-    "simctl": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npm.taobao.org/simctl/download/simctl-2.0.0.tgz",
-      "integrity": "sha1-4/HGkIc1lp4j4JIrDLEWGEPdDFk=",
-      "requires": {
-        "shelljs": "^0.2.6",
-        "tail": "^0.4.0"
-      },
-      "dependencies": {
-        "shelljs": {
-          "version": "0.2.6",
-          "resolved": "https://registry.npm.taobao.org/shelljs/download/shelljs-0.2.6.tgz",
-          "integrity": "sha1-kEktcv/MgVmXa6umL7D2iE8MM3g="
-        }
-      }
-    },
-    "simple-plist": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npm.taobao.org/simple-plist/download/simple-plist-1.1.0.tgz?cache=0&sync_timestamp=1573092569394&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsimple-plist%2Fdownload%2Fsimple-plist-1.1.0.tgz",
-      "integrity": "sha1-g1SrY+s5IqBUx4zpbCCcUy6QeiM=",
-      "requires": {
-        "bplist-creator": "0.0.8",
-        "bplist-parser": "0.2.0",
-        "plist": "^3.0.1"
-      },
-      "dependencies": {
-        "bplist-parser": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npm.taobao.org/bplist-parser/download/bplist-parser-0.2.0.tgz",
-          "integrity": "sha1-Q6nRg+W/nVRSAM6sPnEveeu+jQ4=",
-          "requires": {
-            "big-integer": "^1.6.44"
-          }
-        }
-      }
-    },
    "simple-swizzle": {
      "version": "0.2.2",
      "resolved": "https://registry.npm.taobao.org/simple-swizzle/download/simple-swizzle-0.2.2.tgz",
@@ -12441,11 +12193,6 @@
        "readable-stream": "^2.0.2"
      }
    },
-    "stream-buffers": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npm.taobao.org/stream-buffers/download/stream-buffers-2.2.0.tgz",
-      "integrity": "sha1-kdX1Ew0c75bc+n9yaUUYh0HQnuQ="
-    },
    "stream-each": {
      "version": "1.2.3",
      "resolved": "https://registry.npm.taobao.org/stream-each/download/stream-each-1.2.3.tgz",
@@ -12508,20 +12255,11 @@
        }
      }
    },
-    "string.prototype.trim": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npm.taobao.org/string.prototype.trim/download/string.prototype.trim-1.2.1.tgz",
-      "integrity": "sha1-FBIz3/Msgr+tgGhNfl8Iae4Pt4I=",
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1",
-        "function-bind": "^1.1.1"
-      }
-    },
    "string.prototype.trimleft": {
      "version": "2.1.1",
      "resolved": "https://registry.npm.taobao.org/string.prototype.trimleft/download/string.prototype.trimleft-2.1.1.tgz",
      "integrity": "sha1-m9uKxqvW1gKxek7TIYcNL43O/HQ=",
+      "dev": true,
      "requires": {
        "define-properties": "^1.1.3",
        "function-bind": "^1.1.1"
@@ -12531,6 +12269,7 @@
      "version": "2.1.1",
      "resolved": "https://registry.npm.taobao.org/string.prototype.trimright/download/string.prototype.trimright-2.1.1.tgz",
      "integrity": "sha1-RAMUsVmWyGbOigNBiU1FGGIAxdk=",
+      "dev": true,
      "requires": {
        "define-properties": "^1.1.3",
        "function-bind": "^1.1.1"
@@ -12771,39 +12510,12 @@
        }
      }
    },
-    "tail": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npm.taobao.org/tail/download/tail-0.4.0.tgz",
-      "integrity": "sha1-0p3nJ1DMmdseBTr/E8NZ7PtxMAI="
-    },
    "tapable": {
      "version": "0.2.9",
      "resolved": "https://registry.npm.taobao.org/tapable/download/tapable-0.2.9.tgz",
      "integrity": "sha1-ry2LvJsE907hevK02QSPgHrNGKg=",
      "dev": true
    },
-    "tape": {
-      "version": "4.13.0",
-      "resolved": "https://registry.npm.taobao.org/tape/download/tape-4.13.0.tgz?cache=0&sync_timestamp=1578530139350&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftape%2Fdownload%2Ftape-4.13.0.tgz",
-      "integrity": "sha1-4vWB/18Sp8vXh+n4PHbChReC/OI=",
-      "requires": {
-        "deep-equal": "~1.1.1",
-        "defined": "~1.0.0",
-        "dotignore": "~0.1.2",
-        "for-each": "~0.3.3",
-        "function-bind": "~1.1.1",
-        "glob": "~7.1.6",
-        "has": "~1.0.3",
-        "inherits": "~2.0.4",
-        "is-regex": "~1.0.5",
-        "minimist": "~1.2.0",
-        "object-inspect": "~1.7.0",
-        "resolve": "~1.14.2",
-        "resumer": "~0.0.0",
-        "string.prototype.trim": "~1.2.1",
-        "through": "~2.3.8"
-      }
-    },
    "text-table": {
      "version": "0.2.0",
      "resolved": "https://registry.npm.taobao.org/text-table/download/text-table-0.2.0.tgz",
@@ -12813,7 +12525,8 @@
    "through": {
      "version": "2.3.8",
      "resolved": "https://registry.npm.taobao.org/through/download/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
+      "dev": true
    },
    "through2": {
      "version": "2.0.5",
@@ -13111,7 +12824,8 @@
    "underscore": {
      "version": "1.9.2",
      "resolved": "https://registry.npm.taobao.org/underscore/download/underscore-1.9.2.tgz",
-      "integrity": "sha1-DI1vU21vN4pa8mSnL3vsUP63zy8="
+      "integrity": "sha1-DI1vU21vN4pa8mSnL3vsUP63zy8=",
+      "dev": true
    },
    "union-value": {
      "version": "1.0.1",
@@ -13155,16 +12869,6 @@
        "imurmurhash": "^0.1.4"
      }
    },
-    "universalify": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npm.taobao.org/universalify/download/universalify-0.1.2.tgz",
-      "integrity": "sha1-tkb2m+OULavOzJ1mOcgNwQXvqmY="
-    },
-    "unorm": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npm.taobao.org/unorm/download/unorm-1.6.0.tgz",
-      "integrity": "sha1-ApsolmH7pxTxqa9DnrUdmxbCBa8="
-    },
    "unpipe": {
      "version": "1.0.0",
      "resolved": "https://registry.npm.taobao.org/unpipe/download/unpipe-1.0.0.tgz",
@@ -13352,7 +13056,8 @@
    "uuid": {
      "version": "3.3.3",
      "resolved": "https://registry.npm.taobao.org/uuid/download/uuid-3.3.3.tgz",
-      "integrity": "sha1-RWjwIW54dg7h2/Ok0s9T4iQRKGY="
+      "integrity": "sha1-RWjwIW54dg7h2/Ok0s9T4iQRKGY=",
+      "dev": true
    },
    "validate-npm-package-license": {
      "version": "3.0.4",
@@ -14160,6 +13865,7 @@
      "version": "1.3.1",
      "resolved": "https://registry.npm.taobao.org/which/download/which-1.3.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwhich%2Fdownload%2Fwhich-1.3.1.tgz",
      "integrity": "sha1-pFBD1U9YBTFtqNYvn1CRjT2nCwo=",
+      "dev": true,
      "requires": {
        "isexe": "^2.0.0"
      }
@@ -14223,7 +13929,8 @@
    "wrappy": {
      "version": "1.0.2",
      "resolved": "https://registry.npm.taobao.org/wrappy/download/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
    },
    "write": {
      "version": "0.2.1",
@@ -14252,30 +13959,6 @@
        }
      }
    },
-    "xcode": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npm.taobao.org/xcode/download/xcode-2.1.0.tgz",
-      "integrity": "sha1-urZKfpVLtQyo0Z2n4JUxxlpD7P4=",
-      "requires": {
-        "simple-plist": "^1.0.0",
-        "uuid": "^3.3.2"
-      }
-    },
-    "xml-escape": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npm.taobao.org/xml-escape/download/xml-escape-1.1.0.tgz",
-      "integrity": "sha1-OQTBQ/qOs6ADDsZG0pAqLxtwbEQ="
-    },
-    "xmlbuilder": {
-      "version": "9.0.7",
-      "resolved": "https://registry.npm.taobao.org/xmlbuilder/download/xmlbuilder-9.0.7.tgz",
-      "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0="
-    },
-    "xmldom": {
-      "version": "0.1.31",
-      "resolved": "https://registry.npm.taobao.org/xmldom/download/xmldom-0.1.31.tgz?cache=0&sync_timestamp=1576802605842&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fxmldom%2Fdownload%2Fxmldom-0.1.31.tgz",
-      "integrity": "sha1-t2yaG9nwqXN+WnLcNyMc84N14v8="
-    },
    "xtend": {
      "version": "4.0.2",
      "resolved": "https://registry.npm.taobao.org/xtend/download/xtend-4.0.2.tgz",

--- a/package.json
+++ b/package.json
@@ -19,11 +19,15 @@
    "cordova-plugin-camera": "^2.4.1",
    "cordova-plugin-crosswalk-webview": "^2.2.0",
    "cordova-plugin-device": "^2.0.2",
+    "cordova-plugin-splashscreen": "5.0.2",
+    "cordova-plugin-statusbar": "2.4.2",
    "cordova-plugin-whitelist": "^1.3.3",
    "crypto-js": "^3.1.9-1",
    "fastclick": "https://hel.hand-china.com/easyUI/fastclick.git",
    "hls-easy-ui": "https://hel.hand-china.com/easyUI/hls-easy-ui.git#keyboard",
    "ionic-plugin-keyboard": "^2.2.1",
+    "js-base64": "^2.5.1",
+    "pdfjs-dist": "^2.2.228",
    "vue": "^2.5.2",
    "vue-router": "^3.0.1",
    "vuex": "^2.1.1",

--- a/src/assets/login/reg-logo.png
+++ b/src/assets/login/reg-logo.png
--- a/src/assets/login/title.png
+++ b/src/assets/login/title.png
--- a/src/components/pdf/index.js
+++ b/src/components/pdf/index.js
+
+import PDF from './PDF'
+
+var $vm
+export default {
+  install (Vue, options) {
+    if (!$vm) {
+      const PDFPlugin = Vue.extend(PDF)
+      $vm = new PDFPlugin().$mount()
+      document.body.appendChild($vm.$el)
+    }
+    Vue.prototype.$showPDF = function (url) {
+      $vm.showPDF(url)
+    }
+  },
+}
--- a/src/components/pdf/pdf.vue
+++ b/src/components/pdf/pdf.vue
+<template>
+  <div id="containers" class="containers">
+    <!-- <div class='pdf-page'> -->
+    <canvas id="the-canvas"/>
+    <div v-if="pdfDoc" class="foot">
+      <button v-if="pageNum>1" class="left" @click="onPrevPage">上一页</button>
+      <button v-if="pageNum<pdfDoc.numPages" class="right" @click="onNextPage">下一页</button>
+    </div>
+    <!-- </div> -->
+  </div>
+</template>
+<script>
+import PDFJS from 'pdfjs-dist'
+
+export default {
+  data () {
+    return {
+      pdfDoc: null,
+      pageNum: 1,
+      pageRendering: false,
+      pageNumPending: null,
+      scale: 0.9,
+    }
+  },
+  methods: {
+    showPDF (url) {
+      let _this = this
+      PDFJS.getDocument(url).then(function (pdf) {
+        _this.pdfDoc = pdf
+        _this.renderPage(1)
+      })
+    },
+    renderPage (num) {
+      this.pageRendering = true
+      let _this = this
+      this.pdfDoc.getPage(num).then(function (page) {
+        var viewport = page.getViewport(_this.scale)
+        let canvas = document.getElementById('the-canvas')
+        canvas.height = viewport.height
+        canvas.width = viewport.width
+
+        // Render PDF page into canvas context
+        var renderContext = {
+          canvasContext: canvas.getContext('2d'),
+          viewport: viewport,
+        }
+        var renderTask = page.render(renderContext)
+
+        // Wait for rendering to finish
+        renderTask.promise.then(function () {
+          _this.pageRendering = false
+          if (_this.pageNumPending !== null) {
+            // New page rendering is pending
+            this.renderPage(_this.pageNumPending)
+            _this.pageNumPending = null
+          }
+        })
+      })
+    },
+    queueRenderPage (num) {
+      if (this.pageRendering) {
+        this.pageNumPending = num
+      } else {
+        this.renderPage(num)
+      }
+    },
+    onPrevPage () {
+      if (this.pageNum <= 1) {
+        return
+      }
+      this.pageNum--
+      this.queueRenderPage(this.pageNum)
+    },
+    onNextPage () {
+      if (this.pageNum >= this.pdfDoc.numPages) {
+        return
+      }
+      this.pageNum++
+      this.queueRenderPage(this.pageNum)
+    },
+  },
+}
+</script>
+
+<style scoped>
+#containers.containers {
+  /* background-color: rgba(0,0,0,0.75); */
+  position:fixed;
+  width: 100%;
+  height: 100%;
+  top: 0;
+  left: 0;
+  text-align: center;
+  padding: 5px;
+}
+
+.pdf-page {
+
+}
+
+.foot {
+  position: fixed;
+  transform: translate(-50%,0);
+  left: 50%;
+}
+</style>
--- a/src/main.js
+++ b/src/main.js
@@ -62,7 +62,6 @@ if (process.env.CONFIG_ENV === 'uat') {
  const VConsole = require('vconsole')
  new VConsole() // eslint-disable-line
 }
-
 Vue.use(componentInstall)
 Vue.use(components)
 Vue.use(appStyle)

--- a/src/pages/carConfirm/confirm-detail.vue
+++ b/src/pages/carConfirm/confirm-detail.vue
@@ -175,7 +175,7 @@
              <img v-if="item.read_status === 'N'" class="unread" src="@/assets/constractSigning/unread.png" >
              <img v-if="item.read_status === 'Y'" class="unread" src="@/assets/constractSigning/read.png" >
            </div>
-            <div slot="content" class="in-detail" @click="goContent(item)">
+            <div slot="content" class="in-detail" @click="goContent(item,index)">
              <img src="@/assets/constractSigning/detail.png" alt >
            </div>
          </item>
@@ -195,6 +195,7 @@
 <script>
 import Tab from '@/pages/carConfirm/tab'
 import bodyCheck from './body-check'
+
 export default {
  components: {
    Tab,
@@ -298,7 +299,7 @@ export default {
        }
      })
    },
-    goContent (item) {
+    goContent (item, index) {
      // 详情
      // 合同状态更新保存
      let vm = this
@@ -317,7 +318,10 @@ export default {
      vm.hlsHttp.post(url, param).then(res => {
        hlsPopup.hideLoading()
        if (res.result === 'S') {
+          let temp = vm.attachArray[index]
+          temp.read_status = 'Y'
          vm.$router.push({name: 'previewPdf', params: {attachUrl: vm.attachUrl}})
+          vm.attachArray.splice(vm.attachArray[index], 1, temp)
        } else {
          vm.hlsPopup.showLongCenter(res.message)
        }

--- a/src/pages/contractSigning/contract-detail.vue
+++ b/src/pages/contractSigning/contract-detail.vue
@@ -126,7 +126,7 @@
            <img v-if="item.read_status === 'N'" class="unread" src="@/assets/constractSigning/unread.png" >
            <img v-if="item.read_status === 'Y'" class="unread" src="@/assets/constractSigning/read.png" >
          </div>
-          <div slot="content" class="in-detail" @click="goContent(item)">
+          <div slot="content" class="in-detail" @click="goContent(item,index)">
            <img src="@/assets/constractSigning/detail.png" alt >
          </div>
        </item>
@@ -435,7 +435,7 @@ export default {
        // vm.hlsPopup.showLongCenter(res.message)
      }
    },
-    goContent (item) {
+    goContent (item, index) {
      // 详情
      // 合同状态更新保存
      let vm = this
@@ -454,7 +454,10 @@ export default {
      vm.hlsHttp.post(url, param).then(res => {
        hlsPopup.hideLoading()
        if (res.result === 'S') {
+          let temp = vm.attachArray[index]
+          temp.read_status = 'Y'
          vm.$router.push({name: 'previewPdf', params: {attachUrl: vm.attachUrl}})
+          vm.attachArray.splice(vm.attachArray[index], 1, temp)
        } else {
          vm.hlsPopup.showLongCenter(res.message)
        }

--- a/src/pages/contractSigning/previewPdf.vue
+++ b/src/pages/contractSigning/previewPdf.vue
@@ -6,19 +6,73 @@
        <span>合同预览</span>
      </div>
    </h-header>
-    <iframe
-      :src="attachUrl"
-      frameborder="0" scrolling="yes" width="100%"
-      height="100%" />
+    <h-content>
+      <canvas v-for="page in pages" :id="'the-canvas'+page" :key="page"/>
+    </h-content>
  </h-view>
 </template>
 <script>
+import PDFJS from 'pdfjs-dist'
+// const Base64 = require('js-base64').Base64
+
 export default {
  data () {
    return {
      attachUrl: this.$route.params.attachUrl,
+      pages: 0,
+      pdfDoc: null,
    }
  },
+  mounted () {
+    let vm = this
+    // let attachUrl = vm.attachUrl.substr(vm.attachUrl.indexOf('/xcmg_file'))
+    vm.hlsPopup.showLoading('请稍候...')
+    // debugger
+    // let url = Base64.decode(vm.attachUrl)
+    console.log('vm.attachUrl === ' + vm.attachUrl)
+    vm._loadFile(vm.attachUrl)
+    vm.hlsPopup.hideLoading()
+  },
+  methods: {
+    _renderPage (num) {
+      this.pdfDoc.getPage(num).then((page) => {
+        let canvas = document.getElementById('the-canvas' + num)
+        let ctx = canvas.getContext('2d')
+        let dpr = window.devicePixelRatio || 1
+        let bsr = ctx.webkitBackingStorePixelRatio ||
+                  ctx.mozBackingStorePixelRatio ||
+                  ctx.msBackingStorePixelRatio ||
+                  ctx.oBackingStorePixelRatio ||
+                  ctx.backingStorePixelRatio || 1
+        let ratio = dpr / bsr
+        let viewport = page.getViewport(screen.availWidth / page.getViewport(1).width)
+        canvas.width = viewport.width * ratio
+        canvas.height = viewport.height * ratio
+        canvas.style.width = viewport.width + 'px'
+        canvas.style.height = viewport.height + 'px'
+        ctx.setTransform(ratio, 0, 0, ratio, 0, 0)
+        let renderContext = {
+          canvasContext: ctx,
+          viewport: viewport,
+        }
+        page.render(renderContext)
+        if (this.pages > num) {
+          this._renderPage(num + 1)
+        }
+      })
+    },
+    _loadFile (url) {
+      console.log('URL ==== ' + url)
+      PDFJS.getDocument(url).then((pdf) => {
+        this.pdfDoc = pdf
+        console.log('pdf ==== ' + pdf)
+        this.pages = this.pdfDoc.numPages
+        this.$nextTick(() => {
+          this._renderPage(1)
+        })
+      })
+    },
+  },
 }
 </script>
 <style lang="less" rel="stylesheet">

--- a/src/scripts/hlsUtil.js
+++ b/src/scripts/hlsUtil.js
+
 export default {

  city: {

--- a/www.zip
+++ b/www.zip
--- a/www/index.html
+++ b/www/index.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.319a48f0ae278016467a36c7c8fdc1b9.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.edf254bec46da36c7032.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=o7fTnpVAGzXKN7SirV8xGU2xzWQS2NrI"></script><title>徐工金服</title><link href=./static/css/app.c5a0a4712f1e7c4b252de740728ebea8.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.8e9b41cc6bccffe5885b.js></script><script type=text/javascript src=./static/js/app.8182be05992a1744e71e.js></script></body></html>
\ No newline at end of file