兼容 IE11

953814e5 · 严立 · 741c565f · 953814e5 · 953814e5 · 953814e5
Commit 953814e5 authored Jul 21, 2020 by 严立
Showing with 108 additions and 120 deletions
build/webpack.base.conf.js
config/index.js
package-lock.json
package.json
src/assets/NotoSansHans-Light.ttf
src/assets/NotoSansHans-Light.woff
src/common/css/reset.css
src/common/js/host.js
src/common/js/request/request.js
src/components/currency-footer.vue
src/components/currency-header.vue
src/components/notice-progress.vue
src/components/notice-project.vue
src/main.js
src/view/home.vue
src/view/personal/supplier-home.vue
src/view/personal/supplier-notice.vue
src/view/public/bid-buy.vue
src/view/public/bid-notice.vue
src/view/public/policy-list.vue
--- a/build/webpack.base.conf.js
+++ b/build/webpack.base.conf.js
@@ -8,8 +8,6 @@ function resolve (dir) {
    return path.join(__dirname, '..', dir)
 }
 module.exports = {
    context: path.resolve(__dirname, '../'),
    entry: {
@@ -39,10 +37,13 @@ module.exports = {
            {
                test: /\.js$/,
                loader: 'babel-loader',
+                options:{
+                    presets: ['es2015']
+                },
                include: [
                    resolve('src'), resolve('test'), resolve('node_modules/webpack-dev-server/client'),
                    resolve('src'), resolve('test'), resolve('node_modules/element-ui/src'),
-                    resolve('src'), resolve('test'), resolve('node_modules/element-ui/packages/input/src'),
+                    resolve('src'), resolve('test'), resolve('node_modules/element-ui/packages'),
                ]
            },
            {

--- a/config/index.js
+++ b/config/index.js
@@ -21,9 +21,10 @@ module.exports = {
        },
        // Various Dev Server settings
-        host: 'localhost', // can be overwritten by process.env.HOST
+        host: '127.0.0.1', // can be overwritten by process.env.HOST
        port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
        autoOpenBrowser: false,
+        disableHostCheck: true,
        errorOverlay: true,
        notifyOnErrors: true,
        poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions-

--- a/package-lock.json
+++ b/package-lock.json
@@ -1253,8 +1253,7 @@
    "ansi-regex": {
      "version": "2.1.1",
      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
-      "dev": true
    },
    "ansi-styles": {
      "version": "3.2.1",
@@ -1642,7 +1641,6 @@
      "version": "6.26.0",
      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
      "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
-      "dev": true,
      "requires": {
        "chalk": "^1.1.3",
        "esutils": "^2.0.2",
@@ -1652,14 +1650,12 @@
        "ansi-styles": {
          "version": "2.2.1",
          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
-          "dev": true
        },
        "chalk": {
          "version": "1.1.3",
          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
          "requires": {
            "ansi-styles": "^2.2.1",
            "escape-string-regexp": "^1.0.2",
@@ -1671,8 +1667,7 @@
        "supports-color": {
          "version": "2.0.0",
          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
-          "dev": true
        }
      }
    },
@@ -1775,7 +1770,6 @@
      "version": "6.24.1",
      "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz",
      "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=",
-      "dev": true,
      "requires": {
        "babel-helper-hoist-variables": "^6.24.1",
        "babel-runtime": "^6.22.0",
@@ -1787,7 +1781,6 @@
      "version": "6.26.0",
      "resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz",
      "integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=",
-      "dev": true,
      "requires": {
        "babel-helper-function-name": "^6.24.1",
        "babel-runtime": "^6.26.0",
@@ -1822,7 +1815,6 @@
      "version": "6.24.1",
      "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz",
      "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=",
-      "dev": true,
      "requires": {
        "babel-helper-get-function-arity": "^6.24.1",
        "babel-runtime": "^6.22.0",
@@ -1835,7 +1827,6 @@
      "version": "6.24.1",
      "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz",
      "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=",
-      "dev": true,
      "requires": {
        "babel-runtime": "^6.22.0",
        "babel-types": "^6.24.1"
@@ -1845,7 +1836,6 @@
      "version": "6.24.1",
      "resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz",
      "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=",
-      "dev": true,
      "requires": {
        "babel-runtime": "^6.22.0",
        "babel-types": "^6.24.1"
@@ -1855,7 +1845,6 @@
      "version": "6.24.1",
      "resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz",
      "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=",
-      "dev": true,
      "requires": {
        "babel-runtime": "^6.22.0",
        "babel-types": "^6.24.1"
@@ -1865,7 +1854,6 @@
      "version": "6.26.0",
      "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz",
      "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=",
-      "dev": true,
      "requires": {
        "babel-runtime": "^6.26.0",
        "babel-types": "^6.26.0",
@@ -1889,7 +1877,6 @@
      "version": "6.24.1",
      "resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz",
      "integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=",
-      "dev": true,
      "requires": {
        "babel-helper-optimise-call-expression": "^6.24.1",
        "babel-messages": "^6.23.0",
@@ -1930,7 +1917,6 @@
      "version": "6.23.0",
      "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
      "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
-      "dev": true,
      "requires": {
        "babel-runtime": "^6.22.0"
      }
@@ -1939,7 +1925,6 @@
      "version": "6.22.0",
      "resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz",
      "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=",
-      "dev": true,
      "requires": {
        "babel-runtime": "^6.22.0"
      }
@@ -2058,7 +2043,6 @@
      "version": "6.22.0",
      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz",
      "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=",
-      "dev": true,
      "requires": {
        "babel-runtime": "^6.22.0"
      }
@@ -2067,7 +2051,6 @@
      "version": "6.22.0",
      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz",
      "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=",
-      "dev": true,
      "requires": {
        "babel-runtime": "^6.22.0"
      }
@@ -2076,7 +2059,6 @@
      "version": "6.26.0",
      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz",
      "integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=",
-      "dev": true,
      "requires": {
        "babel-runtime": "^6.26.0",
        "babel-template": "^6.26.0",
@@ -2089,7 +2071,6 @@
      "version": "6.24.1",
      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz",
      "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=",
-      "dev": true,
      "requires": {
        "babel-helper-define-map": "^6.24.1",
        "babel-helper-function-name": "^6.24.1",
@@ -2106,7 +2087,6 @@
      "version": "6.24.1",
      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz",
      "integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=",
-      "dev": true,
      "requires": {
        "babel-runtime": "^6.22.0",
        "babel-template": "^6.24.1"
@@ -2116,7 +2096,6 @@
      "version": "6.23.0",
      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz",
      "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=",
-      "dev": true,
      "requires": {
        "babel-runtime": "^6.22.0"
      }
@@ -2125,7 +2104,6 @@
      "version": "6.24.1",
      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz",
      "integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=",
-      "dev": true,
      "requires": {
        "babel-runtime": "^6.22.0",
        "babel-types": "^6.24.1"
@@ -2135,7 +2113,6 @@
      "version": "6.23.0",
      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz",
      "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=",
-      "dev": true,
      "requires": {
        "babel-runtime": "^6.22.0"
      }
@@ -2144,7 +2121,6 @@
      "version": "6.24.1",
      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz",
      "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=",
-      "dev": true,
      "requires": {
        "babel-helper-function-name": "^6.24.1",
        "babel-runtime": "^6.22.0",
@@ -2155,7 +2131,6 @@
      "version": "6.22.0",
      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz",
      "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=",
-      "dev": true,
      "requires": {
        "babel-runtime": "^6.22.0"
      }
@@ -2164,7 +2139,6 @@
      "version": "6.24.1",
      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz",
      "integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=",
-      "dev": true,
      "requires": {
        "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1",
        "babel-runtime": "^6.22.0",
@@ -2175,7 +2149,6 @@
      "version": "6.26.2",
      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz",
      "integrity": "sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==",
-      "dev": true,
      "requires": {
        "babel-plugin-transform-strict-mode": "^6.24.1",
        "babel-runtime": "^6.26.0",
@@ -2187,7 +2160,6 @@
      "version": "6.24.1",
      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz",
      "integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=",
-      "dev": true,
      "requires": {
        "babel-helper-hoist-variables": "^6.24.1",
        "babel-runtime": "^6.22.0",
@@ -2198,7 +2170,6 @@
      "version": "6.24.1",
      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz",
      "integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=",
-      "dev": true,
      "requires": {
        "babel-plugin-transform-es2015-modules-amd": "^6.24.1",
        "babel-runtime": "^6.22.0",
@@ -2209,7 +2180,6 @@
      "version": "6.24.1",
      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz",
      "integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=",
-      "dev": true,
      "requires": {
        "babel-helper-replace-supers": "^6.24.1",
        "babel-runtime": "^6.22.0"
@@ -2219,7 +2189,6 @@
      "version": "6.24.1",
      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz",
      "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=",
-      "dev": true,
      "requires": {
        "babel-helper-call-delegate": "^6.24.1",
        "babel-helper-get-function-arity": "^6.24.1",
@@ -2233,7 +2202,6 @@
      "version": "6.24.1",
      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz",
      "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=",
-      "dev": true,
      "requires": {
        "babel-runtime": "^6.22.0",
        "babel-types": "^6.24.1"
@@ -2243,7 +2211,6 @@
      "version": "6.22.0",
      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz",
      "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=",
-      "dev": true,
      "requires": {
        "babel-runtime": "^6.22.0"
      }
@@ -2252,7 +2219,6 @@
      "version": "6.24.1",
      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz",
      "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=",
-      "dev": true,
      "requires": {
        "babel-helper-regex": "^6.24.1",
        "babel-runtime": "^6.22.0",
@@ -2263,7 +2229,6 @@
      "version": "6.22.0",
      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz",
      "integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=",
-      "dev": true,
      "requires": {
        "babel-runtime": "^6.22.0"
      }
@@ -2272,7 +2237,6 @@
      "version": "6.23.0",
      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz",
      "integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=",
-      "dev": true,
      "requires": {
        "babel-runtime": "^6.22.0"
      }
@@ -2281,7 +2245,6 @@
      "version": "6.24.1",
      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz",
      "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=",
-      "dev": true,
      "requires": {
        "babel-helper-regex": "^6.24.1",
        "babel-runtime": "^6.22.0",
@@ -2313,7 +2276,6 @@
      "version": "6.26.0",
      "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz",
      "integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=",
-      "dev": true,
      "requires": {
        "regenerator-transform": "^0.10.0"
      }
@@ -2331,7 +2293,6 @@
      "version": "6.24.1",
      "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz",
      "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=",
-      "dev": true,
      "requires": {
        "babel-runtime": "^6.22.0",
        "babel-types": "^6.24.1"
@@ -2415,6 +2376,37 @@
        }
      }
    },
+    "babel-preset-es2015": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz",
+      "integrity": "sha1-1EBQ1rwsn+6nAqrzjXJ6AhBTiTk=",
+      "requires": {
+        "babel-plugin-check-es2015-constants": "^6.22.0",
+        "babel-plugin-transform-es2015-arrow-functions": "^6.22.0",
+        "babel-plugin-transform-es2015-block-scoped-functions": "^6.22.0",
+        "babel-plugin-transform-es2015-block-scoping": "^6.24.1",
+        "babel-plugin-transform-es2015-classes": "^6.24.1",
+        "babel-plugin-transform-es2015-computed-properties": "^6.24.1",
+        "babel-plugin-transform-es2015-destructuring": "^6.22.0",
+        "babel-plugin-transform-es2015-duplicate-keys": "^6.24.1",
+        "babel-plugin-transform-es2015-for-of": "^6.22.0",
+        "babel-plugin-transform-es2015-function-name": "^6.24.1",
+        "babel-plugin-transform-es2015-literals": "^6.22.0",
+        "babel-plugin-transform-es2015-modules-amd": "^6.24.1",
+        "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1",
+        "babel-plugin-transform-es2015-modules-systemjs": "^6.24.1",
+        "babel-plugin-transform-es2015-modules-umd": "^6.24.1",
+        "babel-plugin-transform-es2015-object-super": "^6.24.1",
+        "babel-plugin-transform-es2015-parameters": "^6.24.1",
+        "babel-plugin-transform-es2015-shorthand-properties": "^6.24.1",
+        "babel-plugin-transform-es2015-spread": "^6.22.0",
+        "babel-plugin-transform-es2015-sticky-regex": "^6.24.1",
+        "babel-plugin-transform-es2015-template-literals": "^6.22.0",
+        "babel-plugin-transform-es2015-typeof-symbol": "^6.22.0",
+        "babel-plugin-transform-es2015-unicode-regex": "^6.24.1",
+        "babel-plugin-transform-regenerator": "^6.24.1"
+      }
+    },
    "babel-preset-stage-2": {
      "version": "6.24.1",
      "resolved": "https://registry.npmjs.org/babel-preset-stage-2/-/babel-preset-stage-2-6.24.1.tgz",
@@ -2459,7 +2451,6 @@
      "version": "6.26.0",
      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
-      "dev": true,
      "requires": {
        "core-js": "^2.4.0",
        "regenerator-runtime": "^0.11.0"
@@ -2469,7 +2460,6 @@
      "version": "6.26.0",
      "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
      "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
-      "dev": true,
      "requires": {
        "babel-runtime": "^6.26.0",
        "babel-traverse": "^6.26.0",
@@ -2482,7 +2472,6 @@
      "version": "6.26.0",
      "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
      "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
-      "dev": true,
      "requires": {
        "babel-code-frame": "^6.26.0",
        "babel-messages": "^6.23.0",
@@ -2499,7 +2488,6 @@
      "version": "6.26.0",
      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
      "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
-      "dev": true,
      "requires": {
        "babel-runtime": "^6.26.0",
        "esutils": "^2.0.2",
@@ -2510,8 +2498,7 @@
    "babylon": {
      "version": "6.18.0",
      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
-      "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
+      "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ=="
-      "dev": true
    },
    "bach": {
      "version": "1.2.0",
@@ -3592,8 +3579,7 @@
    "core-js": {
      "version": "2.6.10",
      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.10.tgz",
-      "integrity": "sha512-I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA==",
+      "integrity": "sha512-I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA=="
-      "dev": true
    },
    "core-js-compat": {
      "version": "3.6.5",
@@ -4672,7 +4658,6 @@
      "version": "2.6.9",
      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
      "requires": {
        "ms": "2.0.0"
      }
@@ -5270,8 +5255,7 @@
    "escape-string-regexp": {
      "version": "1.0.5",
      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
-      "dev": true
    },
    "escope": {
      "version": "3.6.0",
@@ -5315,8 +5299,7 @@
    "esutils": {
      "version": "2.0.3",
      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="
-      "dev": true
    },
    "etag": {
      "version": "1.8.1",
@@ -6800,8 +6783,7 @@
    "globals": {
      "version": "9.18.0",
      "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
-      "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
+      "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ=="
-      "dev": true
    },
    "globby": {
      "version": "7.1.1",
@@ -7141,7 +7123,6 @@
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-      "dev": true,
      "requires": {
        "ansi-regex": "^2.0.0"
      }
@@ -7610,7 +7591,6 @@
      "version": "2.2.4",
      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
-      "dev": true,
      "requires": {
        "loose-envify": "^1.0.0"
      }
@@ -7979,8 +7959,7 @@
    "js-tokens": {
      "version": "3.0.2",
      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
+      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls="
-      "dev": true
    },
    "js-yaml": {
      "version": "3.7.0",
@@ -8317,8 +8296,7 @@
    "lodash": {
      "version": "4.17.15",
      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
+      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
-      "dev": true
    },
    "lodash.camelcase": {
      "version": "4.3.0",
@@ -8363,7 +8341,6 @@
      "version": "1.4.0",
      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "dev": true,
      "requires": {
        "js-tokens": "^3.0.0 || ^4.0.0"
      }
@@ -8867,8 +8844,7 @@
    "ms": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-      "dev": true
    },
    "multicast-dns": {
      "version": "6.2.3",
@@ -12096,8 +12072,7 @@
    "private": {
      "version": "0.1.8",
      "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
-      "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
+      "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg=="
-      "dev": true
    },
    "process": {
      "version": "0.11.10",
@@ -12483,8 +12458,7 @@
    "regenerate": {
      "version": "1.4.0",
      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz",
-      "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==",
+      "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg=="
-      "dev": true
    },
    "regenerate-unicode-properties": {
      "version": "8.2.0",
@@ -12498,14 +12472,12 @@
    "regenerator-runtime": {
      "version": "0.11.1",
      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
+      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
-      "dev": true
    },
    "regenerator-transform": {
      "version": "0.10.1",
      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz",
      "integrity": "sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==",
-      "dev": true,
      "requires": {
        "babel-runtime": "^6.18.0",
        "babel-types": "^6.19.0",
@@ -12535,7 +12507,6 @@
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz",
      "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=",
-      "dev": true,
      "requires": {
        "regenerate": "^1.2.1",
        "regjsgen": "^0.2.0",
@@ -12545,14 +12516,12 @@
    "regjsgen": {
      "version": "0.2.0",
      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
-      "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=",
+      "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc="
-      "dev": true
    },
    "regjsparser": {
      "version": "0.1.5",
      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz",
      "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
-      "dev": true,
      "requires": {
        "jsesc": "~0.5.0"
      },
@@ -12560,8 +12529,7 @@
        "jsesc": {
          "version": "0.5.0",
          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
+          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0="
-          "dev": true
        }
      }
    },
@@ -13641,7 +13609,6 @@
      "version": "3.0.1",
      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "dev": true,
      "requires": {
        "ansi-regex": "^2.0.0"
      }
@@ -13863,8 +13830,7 @@
    "to-fast-properties": {
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
-      "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
+      "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc="
-      "dev": true
    },
    "to-object-path": {
      "version": "0.3.0",

--- a/package.json
+++ b/package.json
@@ -10,6 +10,7 @@
    "build": "node build/build.js"
  },
  "dependencies": {
+    "babel-preset-es2015": "^6.24.1",
    "miment": "0.0.9",
    "vue": "^2.6.11",
    "vue-router": "^3.3.4"

--- a/src/assets/NotoSansHans-Light.ttf
+++ b/src/assets/NotoSansHans-Light.ttf
--- a/src/assets/NotoSansHans-Light.woff
+++ b/src/assets/NotoSansHans-Light.woff
--- a/src/common/css/reset.css
+++ b/src/common/css/reset.css
 /*声明 WebFont*/
 @font-face {
    font-family: 'siyuanyahei';
+    src: url('../../assets/NotoSansHans-Light.ttf');
+    font-weight: normal;
+    font-style: normal;
+}
+@font-face {
+    font-family: 'siyuanyahei';
    src: url('../../assets/NotoSansHans-Light.otf');
    font-weight: normal;
    font-style: normal;
 }
+@font-face {
+    font-family: 'siyuanyahei';
+    src: url('../../assets/NotoSansHans-Light.woff');
+    font-weight: normal;
+    font-style: normal;
+}
 html,body, div, span, applet, object, iframe,
 h1, h2, h3, h4, h5, h6, p, blockquote, pre,
 a, abbr, acronym, address, big, cite, code,

--- a/src/common/js/host.js
+++ b/src/common/js/host.js
 let output = {
    // 开发路径
-    base: 'http://bid-server.meiqicloud.com/',
+    // base: 'http://bid-server.meiqicloud.com/',
-    resources: 'http://bid-web.meiqicloud.com/',
+    // resources: 'http://bid-web.meiqicloud.com/',
-    agentSignIn: 'http://bid-vue.meiqicloud.com/'
+    // agentSignIn: 'http://bid-vue.meiqicloud.com/'
    // 正式路径
-    // base: '/Api/',
+    base: '/Api/',
-    // resources: 'http://bid-web.meiqicloud.com',
+    resources: 'http://bid-web.meiqicloud.com',
-    // agentSignIn: 'http://bid-vue.meiqicloud.com/'
+    agentSignIn: 'http://bid-vue.meiqicloud.com/'
 }
 output.uploadFile = output.base + 'bid/common/webupload/upload'

--- a/src/common/js/request/request.js
+++ b/src/common/js/request/request.js
@@ -38,7 +38,6 @@ let output = {
            funcData = iDataform(funcData, 'url')
            let funcPromise = new Promise(function (funcResolve, funcReject) {
                let funcXMLHttpRequest = new XMLHttpRequest()
-                funcXMLHttpRequest.timeout = funcConfigure.timeout
                funcXMLHttpRequest.open(funcConfigure.method, funcUrl + funcData, true)
                // 请求之前修改
@@ -78,16 +77,13 @@ let output = {
        if (funcConfigure.method === 'post') {
            // 设置数据类型
            funcData = iDataform(funcData, funcConfigure.sendType)
            let funcPromise = new Promise(function (funcResolve, funcReject) {
                let funcXMLHttpRequest = new XMLHttpRequest()
-                funcXMLHttpRequest.timeout = funcConfigure.timeout
                funcXMLHttpRequest.open(funcConfigure.method, funcUrl, true)
                // 请求之前修改
                iHeader(funcXMLHttpRequest, funcConfigure)
                iInterceptors.request(funcXMLHttpRequest, funcConfigure, funcUrl)
                funcXMLHttpRequest.send(funcData)
                funcXMLHttpRequest.onreadystatechange = function () {
                    if (funcXMLHttpRequest.readyState !== 4) {

--- a/src/components/currency-footer.vue
+++ b/src/components/currency-footer.vue
@@ -5,7 +5,7 @@
        <div class="global-maxwidth row con-b align-s">
            <div class="company-info">
                <div class="logo">
-                    <el-image :src="imageLogo" fit="fit"></el-image>
+                    <img src="../assets/logo@2x.png" alt="">
                </div>
                <div>
                    <p>地址：厦门市思明区吕岭路1733号创想中心1801单元</p>

--- a/src/components/currency-header.vue
+++ b/src/components/currency-header.vue
@@ -4,7 +4,7 @@
        <div class="global-maxwidth row con-b">
            <div class="about row align-c">
                <el-dropdown>
-                    <span class="global-cursor" @click="$router.push('/about')">关注我们</span>
+                    <span class="global-cursor">关注我们</span>
                    <el-dropdown-menu class="about-code" slot="dropdown">
                        <el-dropdown-item>
                            <img src="../assets/code.png" alt="">
@@ -334,7 +334,7 @@
            }
            span:nth-child(2) {
-                width: 38px;
+                width: 52px;
                padding-left: 14px;
                font-size: @fontSize00;
                color: #333333;

--- a/src/components/notice-progress.vue
+++ b/src/components/notice-progress.vue
@@ -229,6 +229,7 @@
             *  @returns
             */
            onDocument: function () {
+                console.log('onDocument')
                // 公告为预览状态禁止操作
                if (this.$route.query.preview) return
                this.$emit('document')

--- a/src/components/notice-project.vue
+++ b/src/components/notice-project.vue
@@ -40,7 +40,11 @@
                    <el-table-column prop="object" label="标的" min-width="140"></el-table-column>
                    <el-table-column prop="requirement" label="参数要求" min-width="230"></el-table-column>
                    <el-table-column prop="quantity" label="数量" min-width="120" align="center"></el-table-column>
-                    <el-table-column prop="budget" label="限价（元）" min-width="180" align="center"></el-table-column>
+                    <el-table-column prop="budget" label="限价（元）" min-width="180" align="center">
+                        <template slot-scope="scope">
+                            <span>{{scope.row.budget === 0 ? '无' : scope.row.budget}}</span>
+                        </template>
+                    </el-table-column>
                </el-table>
            </div>
        </div>

--- a/src/main.js
+++ b/src/main.js
@@ -25,7 +25,4 @@ let output = new Vue({
    'components': { App },
    'template': '<App/>'
 })
-console.log('test')
-console.log(window.XMLHttpRequest)
 export default output
\ No newline at end of file
--- a/src/view/home.vue
+++ b/src/view/home.vue
@@ -3,7 +3,7 @@
        <componentHeader></componentHeader>
        <componentNavigation></componentNavigation>
        <div class="home-banner">
-            <el-carousel v-if="listBanner.length > 0" class="home-carousel" trigger="click" height="400px" :autoplay="false">
+            <el-carousel v-if="listBanner.length > 0" class="home-carousel" trigger="click" height="400px" :autoplay="true">
                <el-carousel-item v-for="(item, index) in listBanner" :key="index">
                    <img :src="listBanner[index].url" alt="" :class="item.isLink ? 'global-cursor' : ''"  @click="onBanner(item)">
                </el-carousel-item>

--- a/src/view/personal/supplier-home.vue
+++ b/src/view/personal/supplier-home.vue
@@ -74,7 +74,7 @@
                                </div>
                                <div class="row con-b align-c">
                                    <span class="global-color-grey">{{item.projectNumber}}</span>
-                                    <span class="global-color-green">{{item.isWin ? '中标' : ''}}</span>
+                                    <span class="global-color-green">{{item.isWin ? '成交' : ''}}</span>
                                </div>
                            </div>
                            <div class="bid-item-bottom row con-b align-c">

--- a/src/view/personal/supplier-notice.vue
+++ b/src/view/personal/supplier-notice.vue
@@ -66,7 +66,11 @@
                <el-table-column prop="object" label="标的"></el-table-column>
                <el-table-column prop="requirement" label="参数要求"></el-table-column>
                <el-table-column prop="quantity" label="数量" align="center"></el-table-column>
-                <el-table-column prop="budget" label="限价（元）" align="center"></el-table-column>
+                <el-table-column prop="budget" label="限价（元）" align="center">
+                    <template slot-scope="scope">
+                            <span>{{scope.row.budget === 0 ? '无' : scope.row.budget}}</span>
+                        </template>
+                </el-table-column>
                <el-table-column align="center">
                    <template slot-scope="scope">
                        <div class="global-cursor row">
@@ -224,7 +228,11 @@
                            <el-table-column prop="object" label="标的" min-width="200"></el-table-column>
                            <el-table-column prop="requirement" label="参数要求" min-width="300"></el-table-column>
                            <el-table-column prop="quantity" label="数量" width="120"></el-table-column>
-                            <el-table-column prop="budget" label="限价（元）" min-width="100"></el-table-column>
+                            <el-table-column prop="budget" label="限价（元）" min-width="100">
+                                <template slot-scope="scope">
+                                    <span>{{scope.row.budget === 0 ? '无' : scope.row.budget}}</span>
+                                </template>
+                            </el-table-column>
                        </el-table>
                    </div>
                    <div>

--- a/src/view/public/bid-buy.vue
+++ b/src/view/public/bid-buy.vue
@@ -191,6 +191,7 @@
                }
            },
            queryPayCode: function () {
+                console.log('payway', this.payCode[Number(this.payway)])
                if (this.payCode[Number(this.payway)]) {
                    clearInterval(this.payTimer)
                    this.queryPayState()
@@ -356,8 +357,8 @@
                clearInterval(this.payTimer)
            },
            onChangeRadio: function (funcRadio) {
-                // this.payway = funcRadio
+                this.payway = funcRadio
-                // this.queryPayCode()
+                this.queryPayCode()
            },
        }
    }

--- a/src/view/public/bid-notice.vue
+++ b/src/view/public/bid-notice.vue
@@ -759,8 +759,6 @@
                    }
                    this.tableQuote.push(funcItem)
                }
-                // console.log(JSON.stringify(funcSelection))
            },
            onQuoteNote: function (funcItem, funcIndex) {
@@ -787,14 +785,12 @@
                if (!iRuleAtom.isMoney(funcValue)) {
                    funcItem.tip = '请输入正确金额格式'
                    this.tableQuote[funcIndex].price = ''
-                    console.log(JSON.stringify(this.tableQuote))
                    return
                }
                if (!funcValue) {
                    funcItem.tip = '请输入报价金额'
                    this.tableQuote[funcIndex].price = ''
-                    console.log(JSON.stringify(this.tableQuote))
                    return
                }
@@ -807,7 +803,6 @@
                if (funcValue > this.maxQuote) {
                    funcItem.tip = '不能超过一百亿元'
                    this.tableQuote[funcIndex].price = ''
-                    console.log(JSON.stringify(this.tableQuote))
                    return
                }
@@ -829,7 +824,12 @@
                        funcChildEnd = funcChildEnd + 1
                    }
                    this.tableQuote[funcChildStart].price = Number(funcPrice) + Number(funcItem.price)
-                    // console.log(JSON.stringify(this.tableQuote))
+                    // 在主包价格设置完成后进行一次预算判断
+                    if (this.tableQuote[funcChildStart].price > this.tableQuote[funcChildStart].budget && this.tableQuote[funcChildStart].budget !== 0) {
+                        this.tableQuote[funcChildStart].tip = '超过 ' + this.tableQuote[funcChildStart].budget + ' 元限价'
+                    } else {
+                        this.tableQuote[funcChildStart].tip = ''
+                    }
                }
            },
@@ -839,7 +839,6 @@
             *  @returns
             */
            onQuoteSubmit: function () {
-                console.log(JSON.stringify(this.tableQuote))
                if (this.tableQuote.length === 0) {
                    this.$message.error('请填写完整报价信息')
                    return

--- a/src/view/public/policy-list.vue
+++ b/src/view/public/policy-list.vue
@@ -131,7 +131,7 @@
                    }
                    span:nth-child(1) {
-                        max-width: 870px;
+                        width: 870px;
                        flex-grow: 1;
                    }

--- a/src/view/public/question-list.vue
+++ b/src/view/public/question-list.vue
@@ -217,7 +217,7 @@
                            }
                            span:nth-child(1) {
-                                max-width: 90%;
+                                width: 870px;
                                padding-right: 80px;
                                flex-grow: 1;
                            }

--- a/src/view/public/trends-list.vue
+++ b/src/view/public/trends-list.vue
@@ -130,7 +130,7 @@
                    }
                    span:nth-child(1) {
-                        max-width: 870px;
+                        width: 870px;
                        flex-grow: 1;
                    }