下拉菜单采用 el-popover

build/webpack.base.conf.js

@@ -97,9 +97,9 @@ module.exports = webpackConfig
 // var vueLoaderConfig = require('./vue-loader.conf')
 const vuxLoader = require('vux-loader')
 
-module.exports = vuxLoader.merge(webpackConfig, {
-  plugins: ['vux-ui']
-})
+// module.exports = vuxLoader.merge(webpackConfig, {
+//   plugins: ['vux-ui']
+// })
 
 module.exports = vuxLoader.merge(webpackConfig, {
   plugins: [

package-lock.json

@@ -265,9 +265,9 @@
       }
     },
     "@types/node": {
-      "version": "10.12.2",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.2.tgz",
-      "integrity": "sha512-53ElVDSnZeFUUFIYzI8WLQ25IhWzb6vbddNp8UHlXQyU0ET2RhV5zg0NfubzU7iNMh5bBXb0htCzfvrSVNgzaQ==",
+      "version": "12.0.4",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.0.4.tgz",
+      "integrity": "sha512-j8YL2C0fXq7IONwl/Ud5Kt0PeXw22zGERt+HSSnwbKOJVsAGkEz3sFCYwaF9IOuoG1HOtE0vKCj6sXF7Q0+Vaw==",
       "dev": true
     },
     "@types/semver": {
@@ -399,6 +399,12 @@
         "json-schema-traverse": "^0.3.0"
       }
     },
+    "ajv-errors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
+      "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
+      "dev": true
+    },
     "ajv-keywords": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz",
@@ -2244,7 +2250,7 @@
     },
     "boom": {
       "version": "2.10.1",
-      "resolved": "http://registry.npm.taobao.org/boom/download/boom-2.10.1.tgz",
+      "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
       "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
       "dev": true,
       "requires": {
@@ -3440,7 +3446,7 @@
     },
     "cryptiles": {
       "version": "2.0.5",
-      "resolved": "http://registry.npm.taobao.org/cryptiles/download/cryptiles-2.0.5.tgz",
+      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
       "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
       "dev": true,
       "optional": true,
@@ -4227,7 +4233,7 @@
     },
     "draftlog": {
       "version": "1.0.12",
-      "resolved": "http://registry.npm.taobao.org/draftlog/download/draftlog-1.0.12.tgz",
+      "resolved": "https://registry.npmjs.org/draftlog/-/draftlog-1.0.12.tgz",
       "integrity": "sha1-fbajxbYhBrsy3Uo11nvMy2x9naA=",
       "dev": true
     },
@@ -4888,7 +4894,7 @@
     },
     "esprima-extract-comments": {
       "version": "0.2.1",
-      "resolved": "http://registry.npm.taobao.org/esprima-extract-comments/download/esprima-extract-comments-0.2.1.tgz",
+      "resolved": "https://registry.npmjs.org/esprima-extract-comments/-/esprima-extract-comments-0.2.1.tgz",
       "integrity": "sha1-kBjY3zf/2V3WFQFajF8Ede10NCM=",
       "dev": true,
       "requires": {
@@ -5141,7 +5147,7 @@
     },
     "extract-comments": {
       "version": "0.10.1",
-      "resolved": "http://registry.npm.taobao.org/extract-comments/download/extract-comments-0.10.1.tgz",
+      "resolved": "https://registry.npmjs.org/extract-comments/-/extract-comments-0.10.1.tgz",
       "integrity": "sha1-i2AxgIovX94c1nv4MXuRggQwRAg=",
       "dev": true,
       "requires": {
@@ -5153,7 +5159,7 @@
       "dependencies": {
         "define-property": {
           "version": "0.2.5",
-          "resolved": "http://registry.npm.taobao.org/define-property/download/define-property-0.2.5.tgz",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
           "requires": {
@@ -5162,7 +5168,7 @@
         },
         "extend-shallow": {
           "version": "2.0.1",
-          "resolved": "http://registry.npm.taobao.org/extend-shallow/download/extend-shallow-2.0.1.tgz",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
@@ -6476,7 +6482,7 @@
     },
     "has-symbols": {
       "version": "1.0.0",
-      "resolved": "http://registry.npm.taobao.org/has-symbols/download/has-symbols-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz",
       "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=",
       "dev": true
     },
@@ -6574,7 +6580,7 @@
     },
     "hawk": {
       "version": "3.1.3",
-      "resolved": "http://registry.npm.taobao.org/hawk/download/hawk-3.1.3.tgz",
+      "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
       "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
       "dev": true,
       "optional": true,
@@ -6604,7 +6610,7 @@
     },
     "hoek": {
       "version": "2.16.3",
-      "resolved": "http://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+      "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
       "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
       "dev": true
     },
@@ -6998,7 +7004,7 @@
     },
     "inline-manifest-webpack-plugin": {
       "version": "3.0.1",
-      "resolved": "http://registry.npm.taobao.org/inline-manifest-webpack-plugin/download/inline-manifest-webpack-plugin-3.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/inline-manifest-webpack-plugin/-/inline-manifest-webpack-plugin-3.0.1.tgz",
       "integrity": "sha1-yiFRBjEVKY4v2UtmmrdsfdY+RK0=",
       "dev": true,
       "requires": {
@@ -7333,7 +7339,7 @@
     },
     "is-regexp": {
       "version": "1.0.0",
-      "resolved": "http://registry.npm.taobao.org/is-regexp/download/is-regexp-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz",
       "integrity": "sha1-/S2INUXEa6xaYz57mgnof6LLUGk=",
       "dev": true
     },
@@ -8490,7 +8496,7 @@
     },
     "lodash.differencewith": {
       "version": "4.5.0",
-      "resolved": "http://registry.npm.taobao.org/lodash.differencewith/download/lodash.differencewith-4.5.0.tgz",
+      "resolved": "https://registry.npmjs.org/lodash.differencewith/-/lodash.differencewith-4.5.0.tgz",
       "integrity": "sha1-uvr7yRi1UVTheRdqALsK76rIVLc=",
       "dev": true
     },
@@ -8508,7 +8514,7 @@
     },
     "lodash.isequal": {
       "version": "4.5.0",
-      "resolved": "http://registry.npm.taobao.org/lodash.isequal/download/lodash.isequal-4.5.0.tgz",
+      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
       "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=",
       "dev": true
     },
@@ -8578,7 +8584,7 @@
     },
     "lodash.unionwith": {
       "version": "4.6.0",
-      "resolved": "http://registry.npm.taobao.org/lodash.unionwith/download/lodash.unionwith-4.6.0.tgz",
+      "resolved": "https://registry.npmjs.org/lodash.unionwith/-/lodash.unionwith-4.6.0.tgz",
       "integrity": "sha1-dNFAtcqBRubGQ8NyT1FSU42awfA=",
       "dev": true
     },
@@ -9082,13 +9088,9 @@
     "nan": {
       "version": "2.11.0",
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.11.0.tgz",
-<<<<<<< .mine
       "integrity": "sha512-F4miItu2rGnV2ySkXOQoA8FKz/SR2Q2sWP0sbTxNxz/tuokeC8WxOhPMcwi0qIyGtVn/rrSeLbvVkznqCdwYnw==",
+      "dev": true,
       "optional": true
-=======
-      "integrity": "sha512-F4miItu2rGnV2ySkXOQoA8FKz/SR2Q2sWP0sbTxNxz/tuokeC8WxOhPMcwi0qIyGtVn/rrSeLbvVkznqCdwYnw==",
-      "dev": true
->>>>>>> .theirs
     },
     "nanomatch": {
       "version": "1.2.13",
@@ -9229,7 +9231,7 @@
     },
     "node-cli-config": {
       "version": "0.0.1",
-      "resolved": "http://registry.npm.taobao.org/node-cli-config/download/node-cli-config-0.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/node-cli-config/-/node-cli-config-0.0.1.tgz",
       "integrity": "sha1-r3d02FQCprfLlsH5G7JP3VjXwLA=",
       "dev": true
     },
@@ -9326,15 +9328,9 @@
       }
     },
     "node-sass": {
-<<<<<<< .mine
       "version": "4.12.0",
       "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.12.0.tgz",
       "integrity": "sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ==",
-=======
-      "version": "4.11.0",
-      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.11.0.tgz",
-      "integrity": "sha512-bHUdHTphgQJZaF1LASx0kAviPH7sGlcyNhWade4eVIpFp6tsn7SV8xNMTbsQFpEV9VXpnwTTnNYlfsZXgGgmkA==",
->>>>>>> .theirs
       "dev": true,
       "requires": {
         "async-foreach": "^0.1.3",
@@ -9385,33 +9381,12 @@
             "which": "^1.2.9"
           }
         },
-<<<<<<< .mine
-        "lodash": {
-          "version": "4.17.11",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-          "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
-          "dev": true
-        },
         "nan": {
           "version": "2.14.0",
           "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
           "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
           "dev": true
         },
-=======
-
-
-
-
-
-
-
-
-
-
-
-
->>>>>>> .theirs
         "supports-color": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
@@ -9904,7 +9879,7 @@
     },
     "parse-code-context": {
       "version": "0.2.2",
-      "resolved": "http://registry.npm.taobao.org/parse-code-context/download/parse-code-context-0.2.2.tgz",
+      "resolved": "https://registry.npmjs.org/parse-code-context/-/parse-code-context-0.2.2.tgz",
       "integrity": "sha1-FEuK+3IZSC1+iMHranZVlvOmrA0=",
       "dev": true
     },
@@ -12262,9 +12237,9 @@
       "dev": true
     },
     "progress-bar-webpack-plugin": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/progress-bar-webpack-plugin/-/progress-bar-webpack-plugin-1.11.0.tgz",
-      "integrity": "sha512-XT6r8strD6toU0ZVip25baJINo7uE4BD4H8d4vhOV4GIK5PvNNky8GYJ2wMmVoYP8eo/sSmtNWn0Vw7zWDDE3A==",
+      "version": "1.12.1",
+      "resolved": "https://registry.npmjs.org/progress-bar-webpack-plugin/-/progress-bar-webpack-plugin-1.12.1.tgz",
+      "integrity": "sha512-tVbPB5xBbqNwdH3mwcxzjL1r1Vrm/xGu93OsqVSAbCaXGoKFvfWIh0gpMDpn2kYsPVRSAIK0pBkP9Vfs+JJibQ==",
       "dev": true,
       "requires": {
         "chalk": "^1.1.1",
@@ -12274,13 +12249,13 @@
       "dependencies": {
         "ansi-styles": {
           "version": "2.2.1",
-          "resolved": "http://registry.npm.taobao.org/ansi-styles/download/ansi-styles-2.2.1.tgz",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
           "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
           "dev": true
         },
         "chalk": {
           "version": "1.1.3",
-          "resolved": "http://registry.npm.taobao.org/chalk/download/chalk-1.1.3.tgz",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
@@ -12293,13 +12268,13 @@
         },
         "progress": {
           "version": "1.1.8",
-          "resolved": "http://registry.npm.taobao.org/progress/download/progress-1.1.8.tgz",
+          "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz",
           "integrity": "sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74=",
           "dev": true
         },
         "supports-color": {
           "version": "2.0.0",
-          "resolved": "http://registry.npm.taobao.org/supports-color/download/supports-color-2.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
           "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
           "dev": true
         }
@@ -13903,7 +13878,7 @@
     },
     "sntp": {
       "version": "1.0.9",
-      "resolved": "http://registry.npm.taobao.org/sntp/download/sntp-1.0.9.tgz",
+      "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
       "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
       "dev": true,
       "optional": true,
@@ -14323,7 +14298,7 @@
     },
     "strip-comments": {
       "version": "0.4.4",
-      "resolved": "http://registry.npm.taobao.org/strip-comments/download/strip-comments-0.4.4.tgz",
+      "resolved": "https://registry.npmjs.org/strip-comments/-/strip-comments-0.4.4.tgz",
       "integrity": "sha1-ucqvxP6QX5bAkd+J+achXyqmKcY=",
       "dev": true,
       "requires": {
@@ -14333,7 +14308,7 @@
       "dependencies": {
         "extend-shallow": {
           "version": "2.0.1",
-          "resolved": "http://registry.npm.taobao.org/extend-shallow/download/extend-shallow-2.0.1.tgz",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
           "requires": {
@@ -14344,7 +14319,7 @@
     },
     "strip-css-comments": {
       "version": "3.0.0",
-      "resolved": "http://registry.npm.taobao.org/strip-css-comments/download/strip-css-comments-3.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/strip-css-comments/-/strip-css-comments-3.0.0.tgz",
       "integrity": "sha1-elYl7/iisibPiUehElTaluE9rok=",
       "dev": true,
       "requires": {
@@ -14372,6 +14347,59 @@
       "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
       "dev": true
     },
+    "style-loader": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.23.1.tgz",
+      "integrity": "sha512-XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg==",
+      "dev": true,
+      "requires": {
+        "loader-utils": "^1.1.0",
+        "schema-utils": "^1.0.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.10.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
+          "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^2.0.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ajv-keywords": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.0.tgz",
+          "integrity": "sha512-aUjdRFISbuFOl0EIZc+9e4FfZp0bDZgAdOOf30bJmw8VM9v84SHyVyxDfbWxpGYbdZD/9XoKxfHVNmxPkhwyGw==",
+          "dev": true
+        },
+        "fast-deep-equal": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
+          "dev": true
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+          "dev": true
+        },
+        "schema-utils": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+          "dev": true,
+          "requires": {
+            "ajv": "^6.1.0",
+            "ajv-errors": "^1.0.0",
+            "ajv-keywords": "^3.1.0"
+          }
+        }
+      }
+    },
     "supports-color": {
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -14628,7 +14656,7 @@
     },
     "touch": {
       "version": "1.0.0",
-      "resolved": "http://registry.npm.taobao.org/touch/download/touch-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/touch/-/touch-1.0.0.tgz",
       "integrity": "sha1-RJy+LbrlqMgDjjDXH6D/RklHxN4=",
       "dev": true,
       "requires": {
@@ -14637,7 +14665,7 @@
       "dependencies": {
         "nopt": {
           "version": "1.0.10",
-          "resolved": "http://registry.npm.taobao.org/nopt/download/nopt-1.0.10.tgz",
+          "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz",
           "integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=",
           "dev": true,
           "requires": {
@@ -15463,7 +15491,7 @@
       "dependencies": {
         "ajv": {
           "version": "4.11.8",
-          "resolved": "http://registry.npm.taobao.org/ajv/download/ajv-4.11.8.tgz",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
           "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
           "dev": true,
           "optional": true,
@@ -15474,21 +15502,21 @@
         },
         "assert-plus": {
           "version": "0.2.0",
-          "resolved": "http://registry.npm.taobao.org/assert-plus/download/assert-plus-0.2.0.tgz",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
           "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=",
           "dev": true,
           "optional": true
         },
         "aws-sign2": {
           "version": "0.6.0",
-          "resolved": "http://registry.npm.taobao.org/aws-sign2/download/aws-sign2-0.6.0.tgz",
+          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
           "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
           "dev": true,
           "optional": true
         },
         "form-data": {
           "version": "2.1.4",
-          "resolved": "http://registry.npm.taobao.org/form-data/download/form-data-2.1.4.tgz",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
           "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
           "dev": true,
           "optional": true,
@@ -15500,14 +15528,14 @@
         },
         "har-schema": {
           "version": "1.0.5",
-          "resolved": "http://registry.npm.taobao.org/har-schema/download/har-schema-1.0.5.tgz",
+          "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
           "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=",
           "dev": true,
           "optional": true
         },
         "har-validator": {
           "version": "4.2.1",
-          "resolved": "http://registry.npm.taobao.org/har-validator/download/har-validator-4.2.1.tgz",
+          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
           "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
           "dev": true,
           "optional": true,
@@ -15518,7 +15546,7 @@
         },
         "http-signature": {
           "version": "1.1.1",
-          "resolved": "http://registry.npm.taobao.org/http-signature/download/http-signature-1.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
           "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
           "dev": true,
           "optional": true,
@@ -15546,7 +15574,7 @@
         },
         "loader-utils": {
           "version": "0.2.17",
-          "resolved": "http://registry.npm.taobao.org/loader-utils/download/loader-utils-0.2.17.tgz",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz",
           "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
           "dev": true,
           "requires": {
@@ -15558,7 +15586,7 @@
         },
         "oauth-sign": {
           "version": "0.8.2",
-          "resolved": "http://registry.npm.taobao.org/oauth-sign/download/oauth-sign-0.8.2.tgz",
+          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
           "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
           "dev": true,
           "optional": true
@@ -15574,21 +15602,21 @@
         },
         "performance-now": {
           "version": "0.2.0",
-          "resolved": "http://registry.npm.taobao.org/performance-now/download/performance-now-0.2.0.tgz",
+          "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
           "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=",
           "dev": true,
           "optional": true
         },
         "qs": {
           "version": "6.4.0",
-          "resolved": "http://registry.npm.taobao.org/qs/download/qs-6.4.0.tgz",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
           "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=",
           "dev": true,
           "optional": true
         },
         "request": {
           "version": "2.81.0",
-          "resolved": "http://registry.npm.taobao.org/request/download/request-2.81.0.tgz",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
           "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
           "dev": true,
           "optional": true,
@@ -15619,13 +15647,13 @@
         },
         "source-list-map": {
           "version": "0.1.8",
-          "resolved": "http://registry.npm.taobao.org/source-list-map/download/source-list-map-0.1.8.tgz",
+          "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz",
           "integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=",
           "dev": true
         },
         "source-map": {
           "version": "0.5.7",
-          "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
           "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
           "dev": true
         },
@@ -15641,7 +15669,7 @@
         },
         "webpack-merge": {
           "version": "1.1.2",
-          "resolved": "http://registry.npm.taobao.org/webpack-merge/download/webpack-merge-1.1.2.tgz",
+          "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-1.1.2.tgz",
           "integrity": "sha1-SfKmi6X9NLsTwzjBhMcCjZOENDI=",
           "dev": true,
           "requires": {
@@ -15656,7 +15684,7 @@
         },
         "webpack-sources": {
           "version": "0.1.5",
-          "resolved": "http://registry.npm.taobao.org/webpack-sources/download/webpack-sources-0.1.5.tgz",
+          "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.1.5.tgz",
           "integrity": "sha1-qh86vw8NdNtxEcQOUAuE+WZkB1A=",
           "dev": true,
           "requires": {

package.json

@@ -87,6 +87,7 @@
     "selenium-server": "^3.0.1",
     "semver": "^5.3.0",
     "shelljs": "^0.7.6",
+    "style-loader": "^0.23.1",
     "uglifyjs-webpack-plugin": "^1.1.1",
     "url-loader": "^0.5.8",
     "vue-jest": "^1.0.2",

src/pages/main/DialysisArea.vue

@@ -1,47 +1,72 @@
 <template>
-    <div>
-       <div class="screening">
-           <ul>
-              <popover placement="bottom" >
-                <div slot="content" class="popover-demo-content">
-                  <ul>
-                    <li v-for="(zone, index) in zones" :key="zone.value" @click="handleZoneChange(index)"  :class="zone_selected == index ? 'tick' : ''">{{zone.text}}</li>
-                  </ul>
-                </div>
-               <li>{{ zones.length <= 1 && zone_selected > 0 ? "全部分区" : zones[zone_selected].text }}<span class="iconfont">&#xe74a;</span></li>
-               </popover>
-               
-               <popover placement="bottom" >  
-                <div slot="content" class="popover-demo-content">
-                  <ul>
-                    <li v-for="schedualType in schedual_types" :key="schedualType.value" @click="handletimeType(schedualType.value)" :class="schedual_type_selected == schedualType.value ? 'tick' : ''" >{{schedualType.text}}</li>
-                  </ul> 
-                </div>
-                <li>{{ schedual_types[schedual_type_selected].text}}<span class="iconfont">&#xe74a;</span></li>
-               </popover>
+  <div>
+    <div class="screening">
+      <ul>
+        <el-popover
+          v-model="zone_options_visible"
+          placement="bottom"
+          trigger="click">
+          <li slot="reference">
+            {{ zones.length <= 1 && zone_selected > 0 ? "全部分区" : zones[zone_selected].text }}
+            <span class="iconfont">&#xe74a;</span>
+          </li>
+          <div class="popover-demo-content">
+            <ul>
+              <li
+                v-for="(zone, index) in zones"
+                :key="zone.value"
+                @click="handleZoneChange(index)"
+                :class="zone_selected == index ? 'tick' : ''"
+              >{{zone.text}}</li>
+            </ul>
+          </div>
+        </el-popover>
 
-              
-               <li @click="openPicker()">{{selected_date_str}}<span class="iconfont">&#xe74a;</span></li>
-           </ul>
-       </div>
-      <div class="stateBox ">
-        <div v-for="(item, index) in filtedScheduals" :key="index" >
-          <h2 class="title" >{{item.zone_name}}</h2>
-          <patient-box class="clearfix" :patients="item.scheduals"></patient-box>
-        </div>
-        <div class="NoData" v-show="filtedScheduals.length == 0"><img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt=""></div>
+        <el-popover
+          v-model="sch_type_options_visible"
+          placement="bottom"
+          trigger="click">
+          <li slot="reference">
+            {{ schedual_types[schedual_type_selected].text}}
+            <span class="iconfont">&#xe74a;</span>
+          </li>
+          <div class="popover-demo-content">
+            <ul>
+              <li
+                v-for="schedualType in schedual_types"
+                :key="schedualType.value"
+                @click="handletimeType(schedualType.value)"
+                :class="schedual_type_selected == schedualType.value ? 'tick' : ''"
+              >{{schedualType.text}}</li>
+            </ul>
+          </div>
+        </el-popover>
 
+        <li @click="openPicker()">
+          {{selected_date_str}}
+          <span class="iconfont">&#xe74a;</span>
+        </li>
+      </ul>
+    </div>
+    <div class="stateBox">
+      <div v-for="(item, index) in filtedScheduals" :key="index">
+        <h2 class="title">{{item.zone_name}}</h2>
+        <patient-box class="clearfix" :patients="item.scheduals"></patient-box>
       </div>
-      <mt-datetime-picker
-        v-model="selected_date"
-        ref="picker"
-        type="date"
-        year-format="{value} "
-        month-format="{value} "
-        date-format="{value} "
-        @confirm="handleScheduleDateChange">
-      </mt-datetime-picker>
-    </div>  
+      <div class="NoData" v-show="filtedScheduals.length == 0">
+        <img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt>
+      </div>
+    </div>
+    <mt-datetime-picker
+      v-model="selected_date"
+      ref="picker"
+      type="date"
+      year-format="{value} "
+      month-format="{value} "
+      date-format="{value} "
+      @confirm="handleScheduleDateChange"
+    ></mt-datetime-picker>
+  </div>
 </template>
 
 <script>
@@ -72,7 +97,10 @@ export default {
 
       zone_selected: this.$store.getters.app.dialysis_area.zone_select_index,
       zones: [{ value: 0, text: "全部分区", select: true }],
-      dialysis_scheduals: []
+      dialysis_scheduals: [],
+
+      zone_options_visible: false,
+      sch_type_options_visible: false,
     };
   },
   props: {
@@ -140,7 +168,8 @@ export default {
           const schedule = originSchedules[s_i];
           if (
             zone_name.length == 0 ||
-            (zone_name.length > 0 && zone_name == schedule.device_number.zone.name)
+            (zone_name.length > 0 &&
+              zone_name == schedule.device_number.zone.name)
           ) {
             if (
               timetype_selected == 0 ||
@@ -165,6 +194,7 @@ export default {
   },
   methods: {
     handletimeType: function(index) {
+      this.sch_type_options_visible = false;
       this.schedual_type_selected = index;
       this.$emit("clear_search_keyword");
       this.$store.dispatch("SaveDialysisAreaSelectIndexs", {
@@ -174,6 +204,7 @@ export default {
       });
     },
     handleZoneChange: function(index) {
+      this.zone_options_visible = false;
       this.zone_selected = index;
       this.$emit("clear_search_keyword");
       this.$store.dispatch("SaveDialysisAreaSelectIndexs", {
@@ -214,7 +245,8 @@ export default {
               }
               schedualMap[schedual.device_number.zone.name].push(schedual);
               if (zoneMap[schedual.device_number.zone.name] == null) {
-                zoneMap[schedual.device_number.zone.name] = schedual.device_number.zone;
+                zoneMap[schedual.device_number.zone.name] =
+                  schedual.device_number.zone;
               }
             }
 
@@ -261,11 +293,11 @@ export default {
 .screening {
   border-bottom: 1px #e5e5e5 solid;
   position: fixed;
-    top: 63px;
-    right: 0;
-    z-index: 66;
-    left: 1.58rem;
-    background: #fff;
+  top: 63px;
+  right: 0;
+  z-index: 66;
+  left: 1.58rem;
+  background: #fff;
   ul {
     @include display-flex;
     @include align-items-center;
@@ -292,7 +324,7 @@ export default {
     font-size: 0.34rem;
     font-weight: 600;
     color: $title-color;
-    height:1rem;
+    height: 1rem;
     line-height: 0.8rem;
     display: inline-block;
   }

src/pages/main/WaitingArea.vue

@@ -2,15 +2,20 @@
   <div>
     <div class="screening">
       <ul>
-       
-        <popover placement="bottom" >
-          <div slot="content" class="popover-demo-content">
+        <el-popover
+          v-model="zone_options_visible"
+          placement="bottom"
+          trigger="click">
+          <li slot="reference">
+            {{ zone_options[zone_selected].text }}<span class="iconfont">&#xe74a;</span>
+          </li>
+          <div class="popover-demo-content">
             <ul>
               <li v-for="(option, index) in zone_options" :key="index" @click="handleZoneChange(index)" :class="zone_selected == index ? 'tick' : ''">{{ option.text }}</li>
             </ul>
           </div>
-          <li>{{ zone_options[zone_selected].text }}<span class="iconfont">&#xe74a;</span></li>
-        </popover>
+        </el-popover>
+
          <li v-for="(item,i) in menuList" :class="select_index == i ? 'active' : ''" @click="menuTabClick(i)" 
         :key="i">{{ item.label + (item.count > 0 ? '(' + item.count + ')' : '') }}</li>
       </ul>
@@ -52,7 +57,9 @@ export default {
       scheduals: [],
 
       zone_options: [{ value: 0, text: "全部分区" }],
-      zone_scheduals: []
+      zone_scheduals: [],
+
+      zone_options_visible: false,
     };
   },
   props: {
@@ -126,6 +133,7 @@ export default {
       this.zone_selected = 0;
     },
     handleZoneChange: function(index) {
+      this.zone_options_visible = false;
       this.zone_selected = index;
       this.select_index = -1;
     },

src/styles/vux.less

@@ -297,8 +297,3 @@
 * loadmore
 */
 @load-more-line-color: #E5E5E5;
-
-作者：yundGo
-链接：https://www.jianshu.com/p/936c2a2481f8
-來源：简书
-简书著作权归作者所有，任何形式的转载都请联系作者获得授权并注明出处。