Merge branch 'update' of http://git.shengws.com/zhangbj/xt_pad into update

build/webpack.base.conf.js

 // 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: [

config/prod.env.js

 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://api.xt.test.sgjyun.com"'
+  BASE_API: '"http://api.xt.kuyicloud.com"'
   // '"http://api.xt.kuyicloud.com"', //'"http://api.xt.kuyicloud.com"','"http://api.xt.test.sgjyun.com"'
 }

package-lock.json

       }
     },
     "@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": {
         "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",
     },
     "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": {
     },
     "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,
     },
     "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
     },
     },
     "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": {
     },
     "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": {
       "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": {
         },
         "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": {
     },
     "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
     },
     },
     "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,
     },
     "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
     },
     },
     "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": {
     },
     "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
     },
     },
     "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
     },
     },
     "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
     },
     },
     "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
     },
     "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",
     },
     "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
     },
       }
     },
     "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",
             "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",
     },
     "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
     },
       "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",
       "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": {
         },
         "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
         }
     },
     "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,
     },
     "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": {
       "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": {
     },
     "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": {
       "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",
     },
     "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": {
       "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": {
       "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,
         },
         "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,
         },
         "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,
         },
         "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,
         },
         "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": {
         },
         "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
         },
         "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,
         },
         "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
         },
         },
         "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": {
         },
         "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

     "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

 <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>
 
       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: {
           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 ||
   },
   methods: {
     handletimeType: function(index) {
+      this.sch_type_options_visible = false;
       this.schedual_type_selected = index;
       this.$emit("clear_search_keyword");
       this.$store.dispatch("SaveDialysisAreaSelectIndexs", {
       });
     },
     handleZoneChange: function(index) {
+      this.zone_options_visible = false;
       this.zone_selected = index;
       this.$emit("clear_search_keyword");
       this.$store.dispatch("SaveDialysisAreaSelectIndexs", {
               }
               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;
               }
             }
 
 .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;
     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

   <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>
       scheduals: [],
 
       zone_options: [{ value: 0, text: "全部分区" }],
-      zone_scheduals: []
+      zone_scheduals: [],
+
+      zone_options_visible: false,
     };
   },
   props: {
       this.zone_selected = 0;
     },
     handleZoneChange: function(index) {
+      this.zone_options_visible = false;
       this.zone_selected = index;
       this.select_index = -1;
     },

src/pages/main/add_urgent_schedule.vue

                     <van-col :span="9">
                         <span class="title">日期：</span>
                         <div class="field_panel">
-                            <van-field v-model="date" disabled class="field"></van-field>
+                            <van-field v-model="date"  class="field"></van-field>
                         </div>
                     </van-col>
                 </van-row>
                     <van-col :span="24">
                         <span class="title">&nbsp;</span>
                         <div class="field_panel">
-                            <van-button type="info" @click="submitAction">立即排班</van-button>
+                            <van-button type="info" size="normal" @click="submitAction">立即排班</van-button>
                         </div>
                     </van-col>
                 </van-row>
         background: #fff;
         min-height: calc(100vh - 2px);
         padding-top:55px; 
+        padding-left: 20px;
         .row {
             padding: 5px 0;
             .title {

src/pages/main/dialysis/AdviceTable.vue

 .AdviceTable{
   padding-top:0; 
   background: #fff;
-  min-height: calc(100vh - 180px);
+  min-height: calc(100vh - 230px);
 }
 }
 

src/pages/main/dialysis/CheckTab.vue

     border-bottom: 1px #e5e5e5 solid;
     background: #fff;
      position: fixed;
-    top: 115px;
+    top: 116px;
     right: 0;
-    z-index: 66;
+    z-index: 55;
     left: 1.58rem;
     background: #fff;
     ul {

src/pages/main/dialysis/InspectionItemTable.vue

 <style style="stylesheet/scss" lang="scss" scoped>
 .top {
   padding: 0.28rem 0.3rem;
-  // @include display-flex;
-  // @include align-items-center;
   @include text-align;
-  // @include justify-content-between;
   font-size: 0.3rem;
   border-bottom: 1px #e5e5e5 solid;
   position: relative;
-
   .title {
     font-size: 0.3rem;
     font-weight: bold;

src/pages/main/dialysis/RecordTable.vue

   background: #fff;
   min-height: calc(100vh - 180px);
 }
+.popover-demo-content{
+  max-height: 400px;
+  overflow-y: scroll;
+}
 </style>
 

src/pages/main/today/TodayTab.vue

 <template>
-  <div v-loading="loading">
+  <div v-loading="loading" id="today_panel">
 
     <div class="grid">
       <div class="list">
     <dialysis-prescription id="prescription" :prescription="prescription" :solution="solution" title="透析处方"
                            :device_number_map="device_map"></dialysis-prescription>
 
-    <!-- <div class="blueBorder"></div>
-    <past-data class="往期数据"></past-data> -->
-
     <div class="blueBorder"></div>
     <accepts-assessment id="accepts_assessment" :record="receiver_treatment_access" title="接诊评估"></accepts-assessment>
 
                         @close="closeTreatmentOf" ref="treatment_dialog"></treatment-dialog>
     </van-popup>
 
-    <div class="fixedNav" ref="fixed_nav" v-show="show_fixed_nav">
+    <!-- <div class="fixedNav" ref="fixed_nav" v-show="show_fixed_nav">
       <ul>
         <li @click="menuClick(1)">透析处方</li>
         <li @click="menuClick(2)">接诊评估</li>
         <li @click="menuClick(8)">透后评估</li>
         <li @click="menuClick(9)">治疗小结</li>
       </ul>
-    </div>
+    </div> -->
+ 
+   <el-button class="goTop" v-show="goTopShow" @click="goTop"  type="primary" icon="el-icon-arrow-up" circle style="position:fixed;right:20px;bottom:20px;"></el-button>
 
-  </div>
+   </div>
 </template>
 
 <script>
 
 import { dialysisGlobalConfig, getDialysisRecord } from "@/api/dialysis";
 import { parseTime } from "@/utils";
-import Vue from 'vue'
 
 export default {
   name: "TodayTab",
   data() {
     return {
       loading: true,
-      show_fixed_nav: false,
+      // show_fixed_nav: false,
       patient_id: 0,
       date: 0,
       menuList: [
       monitor_records: [], // 透析监测
       last_monitor_record: {
         id: 0,
-        operate_time: (new Date()).getTime(),
+        operate_time: new Date().getTime(),
         sodium_concentration: "",
         dialysate_temperature: ""
       }, // 上一次透析的监测记录
       admin_users: [], //系统用户列表
       devices: [], //设备
       device_numbers: [], // 床位号
-
       admin_user_map: {}, // {user_id: admin_user object}
       device_map: {}, // {device_id: device}
-      device_number_map: {} // {device_number_id: device_number}
+      device_number_map: {}, // {device_number_id: device_number}
+      scrollTop: "",
+      goTopShow: false
     };
   },
   computed: {
     },
 
     $route: "requestDialysisRecord"
-
   },
   methods: {
-    handleScroll: function() {
-      var scrollTop =
-        window.pageYOffset ||
-        document.documentElement.scrollTop ||
-        document.body.scrollTop;
-      this.show_fixed_nav = scrollTop > 160;
-    },
+    // handleScroll: function() {
+    //   var scrollTop =
+    //     window.pageYOffset ||
+    //     document.documentElement.scrollTop ||
+    //     document.body.scrollTop;
+    //   this.show_fixed_nav = scrollTop > 160;
+    // },
 
     didAddMonitor(monitor) {
-      this.monitor_records.push(monitor)
+      this.monitor_records.push(monitor);
 
-      this.monitor_records.sort((a,b)=>b.operate_time-a.operate_time)
+      this.monitor_records.sort((a, b) => b.operate_time - a.operate_time);
 
       // for (let index = 0; index < this.monitor_records.length; index++) {
       //   const record = this.monitor_records[index];
       //   }
       // }
       this.monitor_records.reverse();
-      this.last_monitor_record = monitor
-
+      this.last_monitor_record = monitor;
     },
 
     didEditMonitor(monitor) {
         }
       }
 
-      console.log(monitor)
-      console.log(this.monitor_records[monitor_index])
-
-
-      this.monitor_records[monitor_index].arterial_pressure = monitor.arterial_pressure
-      this.monitor_records[monitor_index].blood_flow_volume = monitor.blood_flow_volume
-      this.monitor_records[monitor_index].breathing_rate = monitor.breathing_rate
-      this.monitor_records[monitor_index].dialysate_temperature = monitor.dialysate_temperature
-      this.monitor_records[monitor_index].diastolic_bp = monitor.diastolic_bp
-      this.monitor_records[monitor_index].displacement_quantity = monitor.displacement_quantity
-      this.monitor_records[monitor_index].dispose = monitor.dispose
-      this.monitor_records[monitor_index].ktv = monitor.ktv
-      this.monitor_records[monitor_index].monitor_date = monitor.monitor_date
-      this.monitor_records[monitor_index].monitoring_nurse = monitor.monitoring_nurse
-      this.monitor_records[monitor_index].operate_time = monitor.operate_time
-      this.monitor_records[monitor_index].pulse_frequency = monitor.pulse_frequency
-      this.monitor_records[monitor_index].replacement_rate = monitor.replacement_rate
-      this.monitor_records[monitor_index].result = monitor.result
-      this.monitor_records[monitor_index].sodium_concentration = monitor.sodium_concentration
-      this.monitor_records[monitor_index].symptom = monitor.symptom
-      this.monitor_records[monitor_index].systolic_bp = monitor.systolic_bp
-      this.monitor_records[monitor_index].transmembrane_pressure = monitor.transmembrane_pressure
-      this.monitor_records[monitor_index].ultrafiltration_rate = monitor.ultrafiltration_rate
-      this.monitor_records[monitor_index].ultrafiltration_volume = monitor.ultrafiltration_volume
-      this.monitor_records[monitor_index].venous_pressure = monitor.venous_pressure
-      this.monitor_records[monitor_index].diastolic_blood_pressure = monitor.diastolic_blood_pressure
-      this.monitor_records[monitor_index].systolic_blood_pressure = monitor.systolic_blood_pressure
-
-      this.monitor_records.sort((a,b)=>b.operate_time-a.operate_time)
+      console.log(monitor);
+      console.log(this.monitor_records[monitor_index]);
+
+      this.monitor_records[monitor_index].arterial_pressure =
+        monitor.arterial_pressure;
+      this.monitor_records[monitor_index].blood_flow_volume =
+        monitor.blood_flow_volume;
+      this.monitor_records[monitor_index].breathing_rate =
+        monitor.breathing_rate;
+      this.monitor_records[monitor_index].dialysate_temperature =
+        monitor.dialysate_temperature;
+      this.monitor_records[monitor_index].diastolic_bp = monitor.diastolic_bp;
+      this.monitor_records[monitor_index].displacement_quantity =
+        monitor.displacement_quantity;
+      this.monitor_records[monitor_index].dispose = monitor.dispose;
+      this.monitor_records[monitor_index].ktv = monitor.ktv;
+      this.monitor_records[monitor_index].monitor_date = monitor.monitor_date;
+      this.monitor_records[monitor_index].monitoring_nurse =
+        monitor.monitoring_nurse;
+      this.monitor_records[monitor_index].operate_time = monitor.operate_time;
+      this.monitor_records[monitor_index].pulse_frequency =
+        monitor.pulse_frequency;
+      this.monitor_records[monitor_index].replacement_rate =
+        monitor.replacement_rate;
+      this.monitor_records[monitor_index].result = monitor.result;
+      this.monitor_records[monitor_index].sodium_concentration =
+        monitor.sodium_concentration;
+      this.monitor_records[monitor_index].symptom = monitor.symptom;
+      this.monitor_records[monitor_index].systolic_bp = monitor.systolic_bp;
+      this.monitor_records[monitor_index].transmembrane_pressure =
+        monitor.transmembrane_pressure;
+      this.monitor_records[monitor_index].ultrafiltration_rate =
+        monitor.ultrafiltration_rate;
+      this.monitor_records[monitor_index].ultrafiltration_volume =
+        monitor.ultrafiltration_volume;
+      this.monitor_records[monitor_index].venous_pressure =
+        monitor.venous_pressure;
+      this.monitor_records[monitor_index].diastolic_blood_pressure =
+        monitor.diastolic_blood_pressure;
+      this.monitor_records[monitor_index].systolic_blood_pressure =
+        monitor.systolic_blood_pressure;
+
+      this.monitor_records.sort((a, b) => b.operate_time - a.operate_time);
 
       // if (monitor_index >= 0) {
       //   var record = this.monitor_records[monitor_index]
     closeDialog(index) {
       this.index = -1;
       this.menuList[index].showPopup = false;
-    },refresh(){
-
-
-
+    },
+    refresh() {
       var dateStr = parseTime(this.$route.query.date, "{y}-{m}-{d}");
       var params = {
         patient_id: this.$route.query.patient_id,
 
           this.doctor_advices = doctor_advices == null ? [] : doctor_advices;
           if (this.doctor_advices.length > 0) {
-            var group = this.newAdviceGroupObject()
+            var group = this.newAdviceGroupObject();
             var initGroupBlock = function(group, advice) {
-              group.group_no = advice.groupno
+              group.group_no = advice.groupno;
               // group.start_time = advice.start_time
               // group.advice_doctor = advice.advice_doctor
               // group.exec_staff = advice.execution_staff
               // group.exec_time = advice.execution_time
               // group.checker = advice.checker
-            }
+            };
             for (let index = 0; index < this.doctor_advices.length; index++) {
               const advice = this.doctor_advices[index];
-              if (advice.groupno == 0) { // 老版本的医嘱没有分组的概念，所以这一个 if 是解决这个问题的，将每个无分组的医嘱各自归为一组
+              if (advice.groupno == 0) {
+                // 老版本的医嘱没有分组的概念，所以这一个 if 是解决这个问题的，将每个无分组的医嘱各自归为一组
                 if (advice.parent_id > 0) {
                   if (this.advice_groups.length > 0) {
-                    var parent_group = this.advice_groups[this.advice_groups.length - 1]
+                    var parent_group = this.advice_groups[
+                      this.advice_groups.length - 1
+                    ];
                     if (parent_group.advices.length > 0) {
                       if (parent_group.advices[0].id == advice.parent_id) {
-                        parent_group.advices.push(advice)
+                        parent_group.advices.push(advice);
                       }
                     }
                   }
-                  continue
-
+                  continue;
                 } else {
                   if (group.group_no > 0) {
-                    this.advice_groups.push(group)
-                    group = this.newAdviceGroupObject()
+                    this.advice_groups.push(group);
+                    group = this.newAdviceGroupObject();
                   }
 
-                  initGroupBlock(group, advice)
-                  group.advices.push(advice)
-                  this.advice_groups.push(group)
-                  group = this.newAdviceGroupObject()
-                  continue
+                  initGroupBlock(group, advice);
+                  group.advices.push(advice);
+                  this.advice_groups.push(group);
+                  group = this.newAdviceGroupObject();
+                  continue;
                 }
               }
 
               if (group.group_no > 0 && group.group_no != advice.groupno) {
-                this.advice_groups.push(group)
-                group = this.newAdviceGroupObject()
+                this.advice_groups.push(group);
+                group = this.newAdviceGroupObject();
               }
               if (group.group_no == 0) {
-                initGroupBlock(group, advice)
+                initGroupBlock(group, advice);
               }
               if (group.group_no == advice.groupno) {
-                group.advices.push(advice)
+                group.advices.push(advice);
               }
             }
-            if (group.group_no > 0) { // 上述的算法会导致最后一组没有加到advice_groups，这里要手动加上
-              this.advice_groups.push(group)
+            if (group.group_no > 0) {
+              // 上述的算法会导致最后一组没有加到advice_groups，这里要手动加上
+              this.advice_groups.push(group);
             }
 
             // console.log(this.advice_groups)
           this.loading = false;
         }
       });
-
     },
 
     requestDialysisRecord() {
 
           this.doctor_advices = doctor_advices == null ? [] : doctor_advices;
           if (this.doctor_advices.length > 0) {
-            var group = this.newAdviceGroupObject()
+            var group = this.newAdviceGroupObject();
             var initGroupBlock = function(group, advice) {
-              group.group_no = advice.groupno
+              group.group_no = advice.groupno;
               // group.start_time = advice.start_time
               // group.advice_doctor = advice.advice_doctor
               // group.exec_staff = advice.execution_staff
               // group.exec_time = advice.execution_time
               // group.checker = advice.checker
-            }
+            };
             for (let index = 0; index < this.doctor_advices.length; index++) {
               const advice = this.doctor_advices[index];
-              if (advice.groupno == 0) { // 老版本的医嘱没有分组的概念，所以这一个 if 是解决这个问题的，将每个无分组的医嘱各自归为一组
+              if (advice.groupno == 0) {
+                // 老版本的医嘱没有分组的概念，所以这一个 if 是解决这个问题的，将每个无分组的医嘱各自归为一组
                 if (advice.parent_id > 0) {
                   if (this.advice_groups.length > 0) {
-                    var parent_group = this.advice_groups[this.advice_groups.length - 1]
+                    var parent_group = this.advice_groups[
+                      this.advice_groups.length - 1
+                    ];
                     if (parent_group.advices.length > 0) {
                       if (parent_group.advices[0].id == advice.parent_id) {
-                        parent_group.advices.push(advice)
+                        parent_group.advices.push(advice);
                       }
                     }
                   }
-                  continue
-
+                  continue;
                 } else {
                   if (group.group_no > 0) {
-                    this.advice_groups.push(group)
-                    group = this.newAdviceGroupObject()
+                    this.advice_groups.push(group);
+                    group = this.newAdviceGroupObject();
                   }
-                    
-                  initGroupBlock(group, advice)
-                  group.advices.push(advice)
-                  this.advice_groups.push(group)
-                  group = this.newAdviceGroupObject()
-                  continue
+
+                  initGroupBlock(group, advice);
+                  group.advices.push(advice);
+                  this.advice_groups.push(group);
+                  group = this.newAdviceGroupObject();
+                  continue;
                 }
               }
 
               if (group.group_no > 0 && group.group_no != advice.groupno) {
-                this.advice_groups.push(group)
-                group = this.newAdviceGroupObject()
+                this.advice_groups.push(group);
+                group = this.newAdviceGroupObject();
               }
               if (group.group_no == 0) {
-                initGroupBlock(group, advice)
+                initGroupBlock(group, advice);
               }
               if (group.group_no == advice.groupno) {
-                group.advices.push(advice)
+                group.advices.push(advice);
               }
             }
-            if (group.group_no > 0) { // 上述的算法会导致最后一组没有加到advice_groups，这里要手动加上
-              this.advice_groups.push(group)
+            if (group.group_no > 0) {
+              // 上述的算法会导致最后一组没有加到advice_groups，这里要手动加上
+              this.advice_groups.push(group);
             }
-            
+
             // console.log(this.advice_groups)
           }
 
       });
     },
     newAdviceGroupObject: function() {
-      return Object.assign({}, {
-        group_no: 0,
-        // advice_doctor: 0,
-        // start_time: 0,
-        advices: [],
-        // exec_staff: 0,
-        // exec_time: 0,
-        // checker: 0,
-      })
+      return Object.assign(
+        {},
+        {
+          group_no: 0,
+          // advice_doctor: 0,
+          // start_time: 0,
+          advices: []
+          // exec_staff: 0,
+          // exec_time: 0,
+          // checker: 0,
+        }
+      );
     },
 
     closePrescriptionDialog: function() {
         document.querySelector("#" + id).offsetTop - 100;
       document.documentElement.scrollTop =
         document.querySelector("#" + id).offsetTop - 100;
+    },
+    handleScroll() {
+      this.scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop;
+      if (this.scrollTop > 50) {
+        this.goTopShow = true;
+      }else{
+        this.goTopShow = false;
+      }
+    },
+    goTop() {
+      let timer = null,
+        _that = this;
+    cancelAnimationFrame(timer);
+      timer = requestAnimationFrame(function fn() {
+        if (_that.scrollTop > 0) {
+          _that.scrollTop -= 50;
+          document.body.scrollTop = document.documentElement.scrollTop =
+            _that.scrollTop;
+          timer = requestAnimationFrame(fn);
+        } else {
+          cancelAnimationFrame(timer);
+          _that.goTopShow = false;
+        }
+      });
+    },
+    destroyed() {
+      window.removeEventListener("scroll", this.handleScroll);
     }
   }
 };
 </script>
 
 <style style="stylesheet/scss" lang="scss" scoped>
+.today_panel {
+  height: calc(100% - 63px);
+}
+
 .mainContent {
   position: relative;
   .grid {
     padding: 0.1rem 0 0.25rem 0;
-    margin: 0.2rem 0.2rem 0 0.2rem;
+    margin: 0.2rem 0 0 0;
     background: #fff;
     .list {
       ul {
         li {
           font-size: 0.24rem;
           color: #5d6b7a;
-          margin-top:0.35rem;
+          margin-top: 0.35rem;
           p {
             line-height: 0.6rem;
             color: #34495e;
       }
     }
   }
-  .fixedNav {
-    position: fixed;
-    right: 0;
-    top: 0;
-    left: 1.58rem;
-    background: #f18f68;
-    color: #fff;
-    font-size: 0.24rem;
-    z-index: 99;
-    padding: 0 0.1rem;
-    margin-top: 1.17rem;
-    ul {
-      @include display-flex;
-      @include align-items-center;
-      @include text-align;
-      @include box-sizing;
-      @include justify-content-between;
-      margin: 0.3rem 0;
-      li {
-        height: 0.6rem;
-        line-height: 0.6rem;
-        padding: 0 0.2rem;
-        border-radius: 30px;
-        font-size: 0.32rem;
-        cursor: pointer;
-        background: #f4aa8c;
-        &.active {
-          background: #f4aa8c;
-        }
-      }
-    }
-  }
 }
 </style>
 

src/pages/main/today/detailsInfo.vue

 <style rel="stylesheet/scss" lang="scss" scoped>
 .info {
   background: $text-color;
-  margin: 0 0.2rem;
   ul {
     padding: 0.4rem 0.8rem;
     li {

src/styles/style.scss

 .plate-box {
   background: $text-color;
   padding: 0 0 0.3rem 0;
-  margin:  0 0.2rem;
   .title {
     border-bottom: 1px $border-color solid;
     line-height: 1rem;
   box-shadow: 0 0 15px #eee;
   .popover-demo-content {
     ul {
-      width: 6.4rem;
+      // width: 6.4rem;
       padding: 0.28rem;
       li {
         font-size: 0.32rem;
   min-height: calc(100vh - 2px);
   padding-left: 0.45rem;
 }
+
+

src/styles/vux.less

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