bug fix

package-lock.json

@@ -1417,7 +1417,7 @@
     },
     "amdefine": {
       "version": "1.0.1",
-      "resolved": "http://registry.npm.taobao.org/amdefine/download/amdefine-1.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
       "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
       "dev": true
     },
@@ -1521,7 +1521,7 @@
     },
     "array-find-index": {
       "version": "1.0.2",
-      "resolved": "http://registry.npm.taobao.org/array-find-index/download/array-find-index-1.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
       "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
       "dev": true
     },
@@ -1648,7 +1648,7 @@
     },
     "async-foreach": {
       "version": "0.1.3",
-      "resolved": "http://registry.npm.taobao.org/async-foreach/download/async-foreach-0.1.3.tgz",
+      "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz",
       "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=",
       "dev": true
     },
@@ -1952,7 +1952,7 @@
     },
     "block-stream": {
       "version": "0.0.9",
-      "resolved": "http://registry.npm.taobao.org/block-stream/download/block-stream-0.0.9.tgz",
+      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
       "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
       "dev": true,
       "requires": {
@@ -2334,7 +2334,7 @@
     },
     "camelcase-keys": {
       "version": "2.1.0",
-      "resolved": "http://registry.npm.taobao.org/camelcase-keys/download/camelcase-keys-2.1.0.tgz",
+      "resolved": "http://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
       "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
       "dev": true,
       "requires": {
@@ -2344,7 +2344,7 @@
       "dependencies": {
         "camelcase": {
           "version": "2.1.1",
-          "resolved": "http://registry.npm.taobao.org/camelcase/download/camelcase-2.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
           "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
           "dev": true
         }
@@ -2770,7 +2770,7 @@
     },
     "console-control-strings": {
       "version": "1.1.0",
-      "resolved": "http://registry.npm.taobao.org/console-control-strings/download/console-control-strings-1.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
       "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
       "dev": true
     },
@@ -3225,7 +3225,7 @@
     },
     "currently-unhandled": {
       "version": "0.4.1",
-      "resolved": "http://registry.npm.taobao.org/currently-unhandled/download/currently-unhandled-0.4.1.tgz",
+      "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
       "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
       "dev": true,
       "requires": {
@@ -3438,7 +3438,7 @@
     },
     "delegates": {
       "version": "1.0.0",
-      "resolved": "http://registry.npm.taobao.org/delegates/download/delegates-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
       "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
       "dev": true
     },
@@ -4579,7 +4579,7 @@
     },
     "for-own": {
       "version": "1.0.0",
-      "resolved": "http://registry.npm.taobao.org/for-own/download/for-own-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
       "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
       "dev": true,
       "requires": {
@@ -5247,7 +5247,7 @@
     },
     "fstream": {
       "version": "1.0.11",
-      "resolved": "http://registry.npm.taobao.org/fstream/download/fstream-1.0.11.tgz",
+      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
       "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
       "dev": true,
       "requires": {
@@ -5271,7 +5271,7 @@
     },
     "gauge": {
       "version": "2.7.4",
-      "resolved": "http://registry.npm.taobao.org/gauge/download/gauge-2.7.4.tgz",
+      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
       "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
       "dev": true,
       "requires": {
@@ -5287,13 +5287,13 @@
       "dependencies": {
         "ansi-regex": {
           "version": "2.1.1",
-          "resolved": "http://registry.npm.taobao.org/ansi-regex/download/ansi-regex-2.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
           "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
           "dev": true
         },
         "is-fullwidth-code-point": {
           "version": "1.0.0",
-          "resolved": "http://registry.npm.taobao.org/is-fullwidth-code-point/download/is-fullwidth-code-point-1.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "dev": true,
           "requires": {
@@ -5302,7 +5302,7 @@
         },
         "string-width": {
           "version": "1.0.2",
-          "resolved": "http://registry.npm.taobao.org/string-width/download/string-width-1.0.2.tgz",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "dev": true,
           "requires": {
@@ -5313,7 +5313,7 @@
         },
         "strip-ansi": {
           "version": "3.0.1",
-          "resolved": "http://registry.npm.taobao.org/strip-ansi/download/strip-ansi-3.0.1.tgz",
+          "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "dev": true,
           "requires": {
@@ -5339,7 +5339,7 @@
     },
     "get-stdin": {
       "version": "4.0.1",
-      "resolved": "http://registry.npm.taobao.org/get-stdin/download/get-stdin-4.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
       "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
       "dev": true
     },
@@ -5518,7 +5518,7 @@
     },
     "has-unicode": {
       "version": "2.0.1",
-      "resolved": "http://registry.npm.taobao.org/has-unicode/download/has-unicode-2.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
       "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
       "dev": true
     },
@@ -6004,13 +6004,13 @@
     },
     "in-publish": {
       "version": "2.0.0",
-      "resolved": "http://registry.npm.taobao.org/in-publish/download/in-publish-2.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz",
       "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=",
       "dev": true
     },
     "indent-string": {
       "version": "2.1.0",
-      "resolved": "http://registry.npm.taobao.org/indent-string/download/indent-string-2.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
       "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
       "dev": true,
       "requires": {
@@ -6260,7 +6260,7 @@
     },
     "is-finite": {
       "version": "1.0.2",
-      "resolved": "http://registry.npm.taobao.org/is-finite/download/is-finite-1.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
       "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
       "dev": true,
       "requires": {
@@ -6394,7 +6394,7 @@
     },
     "is-utf8": {
       "version": "0.2.1",
-      "resolved": "http://registry.npm.taobao.org/is-utf8/download/is-utf8-0.2.1.tgz",
+      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
       "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
       "dev": true
     },
@@ -6639,7 +6639,7 @@
     },
     "load-json-file": {
       "version": "1.1.0",
-      "resolved": "http://registry.npm.taobao.org/load-json-file/download/load-json-file-1.1.0.tgz",
+      "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
       "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
       "dev": true,
       "requires": {
@@ -6652,7 +6652,7 @@
       "dependencies": {
         "parse-json": {
           "version": "2.2.0",
-          "resolved": "http://registry.npm.taobao.org/parse-json/download/parse-json-2.2.0.tgz",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
           "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
           "dev": true,
           "requires": {
@@ -6661,7 +6661,7 @@
         },
         "pify": {
           "version": "2.3.0",
-          "resolved": "http://registry.npm.taobao.org/pify/download/pify-2.3.0.tgz",
+          "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
           "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
           "dev": true
         }
@@ -6761,13 +6761,13 @@
     },
     "lodash.assign": {
       "version": "4.2.0",
-      "resolved": "http://registry.npm.taobao.org/lodash.assign/download/lodash.assign-4.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
       "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=",
       "dev": true
     },
     "lodash.clonedeep": {
       "version": "4.5.0",
-      "resolved": "http://registry.npm.taobao.org/lodash.clonedeep/download/lodash.clonedeep-4.5.0.tgz",
+      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
       "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
       "dev": true
     },
@@ -6803,7 +6803,7 @@
     },
     "lodash.tail": {
       "version": "4.1.1",
-      "resolved": "http://registry.npm.taobao.org/lodash.tail/download/lodash.tail-4.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/lodash.tail/-/lodash.tail-4.1.1.tgz",
       "integrity": "sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=",
       "dev": true
     },
@@ -6845,7 +6845,7 @@
     },
     "loud-rejection": {
       "version": "1.6.0",
-      "resolved": "http://registry.npm.taobao.org/loud-rejection/download/loud-rejection-1.6.0.tgz",
+      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
       "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
       "dev": true,
       "requires": {
@@ -6895,7 +6895,7 @@
     },
     "map-obj": {
       "version": "1.0.1",
-      "resolved": "http://registry.npm.taobao.org/map-obj/download/map-obj-1.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
       "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
       "dev": true
     },
@@ -6954,7 +6954,7 @@
     },
     "meow": {
       "version": "3.7.0",
-      "resolved": "http://registry.npm.taobao.org/meow/download/meow-3.7.0.tgz",
+      "resolved": "http://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
       "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
       "dev": true,
       "requires": {
@@ -6972,7 +6972,7 @@
       "dependencies": {
         "decamelize": {
           "version": "1.2.0",
-          "resolved": "http://registry.npm.taobao.org/decamelize/download/decamelize-1.2.0.tgz",
+          "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
           "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
           "dev": true
         }
@@ -7181,7 +7181,7 @@
     },
     "mixin-object": {
       "version": "2.0.1",
-      "resolved": "http://registry.npm.taobao.org/mixin-object/download/mixin-object-2.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz",
       "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=",
       "dev": true,
       "requires": {
@@ -7191,7 +7191,7 @@
       "dependencies": {
         "for-in": {
           "version": "0.1.8",
-          "resolved": "http://registry.npm.taobao.org/for-in/download/for-in-0.1.8.tgz",
+          "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz",
           "integrity": "sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=",
           "dev": true
         }
@@ -7342,7 +7342,7 @@
       "dependencies": {
         "semver": {
           "version": "5.3.0",
-          "resolved": "http://registry.npm.taobao.org/semver/download/semver-5.3.0.tgz",
+          "resolved": "http://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
           "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
           "dev": true
         }
@@ -7436,19 +7436,19 @@
       "dependencies": {
         "ansi-regex": {
           "version": "2.1.1",
-          "resolved": "http://registry.npm.taobao.org/ansi-regex/download/ansi-regex-2.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
           "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
           "dev": true
         },
         "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": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
           "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
           "dev": true,
           "requires": {
@@ -7461,7 +7461,7 @@
         },
         "cross-spawn": {
           "version": "3.0.1",
-          "resolved": "http://registry.npm.taobao.org/cross-spawn/download/cross-spawn-3.0.1.tgz",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz",
           "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
           "dev": true,
           "requires": {
@@ -7471,7 +7471,7 @@
         },
         "strip-ansi": {
           "version": "3.0.1",
-          "resolved": "http://registry.npm.taobao.org/strip-ansi/download/strip-ansi-3.0.1.tgz",
+          "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "dev": true,
           "requires": {
@@ -7480,7 +7480,7 @@
         },
         "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
         }
@@ -7488,7 +7488,7 @@
     },
     "nopt": {
       "version": "3.0.6",
-      "resolved": "http://registry.npm.taobao.org/nopt/download/nopt-3.0.6.tgz",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
       "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
       "dev": true,
       "requires": {
@@ -7776,7 +7776,7 @@
     },
     "os-homedir": {
       "version": "1.0.2",
-      "resolved": "http://registry.npm.taobao.org/os-homedir/download/os-homedir-1.0.2.tgz",
+      "resolved": "http://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
       "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
       "dev": true
     },
@@ -8843,7 +8843,7 @@
     },
     "read-pkg-up": {
       "version": "1.0.1",
-      "resolved": "http://registry.npm.taobao.org/read-pkg-up/download/read-pkg-up-1.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
       "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
       "dev": true,
       "requires": {
@@ -8853,7 +8853,7 @@
       "dependencies": {
         "find-up": {
           "version": "1.1.2",
-          "resolved": "http://registry.npm.taobao.org/find-up/download/find-up-1.1.2.tgz",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
           "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
           "dev": true,
           "requires": {
@@ -8863,7 +8863,7 @@
         },
         "path-exists": {
           "version": "2.1.0",
-          "resolved": "http://registry.npm.taobao.org/path-exists/download/path-exists-2.1.0.tgz",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
           "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
           "dev": true,
           "requires": {
@@ -8872,7 +8872,7 @@
         },
         "path-type": {
           "version": "1.1.0",
-          "resolved": "http://registry.npm.taobao.org/path-type/download/path-type-1.1.0.tgz",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
           "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
           "dev": true,
           "requires": {
@@ -8883,13 +8883,13 @@
         },
         "pify": {
           "version": "2.3.0",
-          "resolved": "http://registry.npm.taobao.org/pify/download/pify-2.3.0.tgz",
+          "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
           "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
           "dev": true
         },
         "read-pkg": {
           "version": "1.1.0",
-          "resolved": "http://registry.npm.taobao.org/read-pkg/download/read-pkg-1.1.0.tgz",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
           "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
           "dev": true,
           "requires": {
@@ -8928,7 +8928,7 @@
     },
     "redent": {
       "version": "1.0.0",
-      "resolved": "http://registry.npm.taobao.org/redent/download/redent-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
       "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
       "dev": true,
       "requires": {
@@ -8938,7 +8938,7 @@
       "dependencies": {
         "strip-indent": {
           "version": "1.0.1",
-          "resolved": "http://registry.npm.taobao.org/strip-indent/download/strip-indent-1.0.1.tgz",
+          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
           "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
           "dev": true,
           "requires": {
@@ -9108,7 +9108,7 @@
     },
     "repeating": {
       "version": "2.0.1",
-      "resolved": "http://registry.npm.taobao.org/repeating/download/repeating-2.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
       "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
       "dev": true,
       "requires": {
@@ -9347,7 +9347,7 @@
     },
     "sass-graph": {
       "version": "2.2.4",
-      "resolved": "http://registry.npm.taobao.org/sass-graph/download/sass-graph-2.2.4.tgz",
+      "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz",
       "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=",
       "dev": true,
       "requires": {
@@ -9359,19 +9359,19 @@
       "dependencies": {
         "ansi-regex": {
           "version": "2.1.1",
-          "resolved": "http://registry.npm.taobao.org/ansi-regex/download/ansi-regex-2.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
           "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
           "dev": true
         },
         "camelcase": {
           "version": "3.0.0",
-          "resolved": "http://registry.npm.taobao.org/camelcase/download/camelcase-3.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
           "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
           "dev": true
         },
         "cliui": {
           "version": "3.2.0",
-          "resolved": "http://registry.npm.taobao.org/cliui/download/cliui-3.2.0.tgz",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
           "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
           "dev": true,
           "requires": {
@@ -9382,19 +9382,19 @@
         },
         "decamelize": {
           "version": "1.2.0",
-          "resolved": "http://registry.npm.taobao.org/decamelize/download/decamelize-1.2.0.tgz",
+          "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
           "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
           "dev": true
         },
         "invert-kv": {
           "version": "1.0.0",
-          "resolved": "http://registry.npm.taobao.org/invert-kv/download/invert-kv-1.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
           "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
           "dev": true
         },
         "is-fullwidth-code-point": {
           "version": "1.0.0",
-          "resolved": "http://registry.npm.taobao.org/is-fullwidth-code-point/download/is-fullwidth-code-point-1.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "dev": true,
           "requires": {
@@ -9403,7 +9403,7 @@
         },
         "lcid": {
           "version": "1.0.0",
-          "resolved": "http://registry.npm.taobao.org/lcid/download/lcid-1.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
           "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
           "dev": true,
           "requires": {
@@ -9412,7 +9412,7 @@
         },
         "os-locale": {
           "version": "1.4.0",
-          "resolved": "http://registry.npm.taobao.org/os-locale/download/os-locale-1.4.0.tgz",
+          "resolved": "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
           "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
           "dev": true,
           "requires": {
@@ -9421,7 +9421,7 @@
         },
         "string-width": {
           "version": "1.0.2",
-          "resolved": "http://registry.npm.taobao.org/string-width/download/string-width-1.0.2.tgz",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "dev": true,
           "requires": {
@@ -9432,7 +9432,7 @@
         },
         "strip-ansi": {
           "version": "3.0.1",
-          "resolved": "http://registry.npm.taobao.org/strip-ansi/download/strip-ansi-3.0.1.tgz",
+          "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "dev": true,
           "requires": {
@@ -9441,19 +9441,19 @@
         },
         "which-module": {
           "version": "1.0.0",
-          "resolved": "http://registry.npm.taobao.org/which-module/download/which-module-1.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
           "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
           "dev": true
         },
         "y18n": {
           "version": "3.2.1",
-          "resolved": "http://registry.npm.taobao.org/y18n/download/y18n-3.2.1.tgz",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
           "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
           "dev": true
         },
         "yargs": {
           "version": "7.1.0",
-          "resolved": "http://registry.npm.taobao.org/yargs/download/yargs-7.1.0.tgz",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
           "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
           "dev": true,
           "requires": {
@@ -9474,7 +9474,7 @@
         },
         "yargs-parser": {
           "version": "5.0.0",
-          "resolved": "http://registry.npm.taobao.org/yargs-parser/download/yargs-parser-5.0.0.tgz",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",
           "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
           "dev": true,
           "requires": {
@@ -9523,7 +9523,7 @@
     },
     "scss-tokenizer": {
       "version": "0.2.3",
-      "resolved": "http://registry.npm.taobao.org/scss-tokenizer/download/scss-tokenizer-0.2.3.tgz",
+      "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz",
       "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
       "dev": true,
       "requires": {
@@ -9533,7 +9533,7 @@
       "dependencies": {
         "source-map": {
           "version": "0.4.4",
-          "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.4.4.tgz",
+          "resolved": "http://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
           "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
           "dev": true,
           "requires": {
@@ -10288,7 +10288,7 @@
     },
     "strip-bom": {
       "version": "2.0.0",
-      "resolved": "http://registry.npm.taobao.org/strip-bom/download/strip-bom-2.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
       "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
       "dev": true,
       "requires": {
@@ -10416,7 +10416,7 @@
     },
     "tar": {
       "version": "2.2.1",
-      "resolved": "http://registry.npm.taobao.org/tar/download/tar-2.2.1.tgz",
+      "resolved": "http://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
       "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
       "dev": true,
       "requires": {
@@ -10759,7 +10759,7 @@
     },
     "trim-newlines": {
       "version": "1.0.0",
-      "resolved": "http://registry.npm.taobao.org/trim-newlines/download/trim-newlines-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
       "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
       "dev": true
     },

src/components/music.vue

@@ -73,7 +73,7 @@ export default {
     width: 0.35rem;
     height: 0.35rem;
     border-radius: 50%;
-    z-index: 10;
+    z-index: 130;
 
     .on {
       animation: rotate 3s linear infinite;

src/views/vote/list.vue

@@ -9,40 +9,44 @@
     </div>
     <img class="informationimg" :src="activity.Desc">
     <span class="box"></span>
-    <div class="VoteListBox">
-      <div class="VoteList">
-        <van-tabs type="card" @click="finished = false">
-          <van-tab>
-            <div slot="title">
-              <span :class="{ [`theme${theme}`]: true, 'active': active }">最新上传</span>
-            </div>
-            <van-list
-              v-model="loading"
-              :finished="finished"
-              finished-text="没有更多了"
-              @load="loadNewList"
-            >
-              <div class="LatestUpload">
-                <div class="LatestUploadList" v-for="(item,index) in newList" :key="index">
-                  <div class="ActivePersonnelBox" @click="gotovotingdetails(item.MemberId)">
-                    <img :src="item.Photo">
-                  </div>
-                  <span class="ballot">NO.{{item.MemberId}}</span>
-                  <span class="ActivePersonnelName">{{item.Name}}</span>
-                  <button class="VoteBtn" @click="Vote(item.MemberId)">投TA一票</button>
-                  <div class="VoteNumber">
-                    <span>已获投票数：</span>
-                    <p>{{item.Vote}}票</p>
-                  </div>
+    <div class="VoteList">
+      <van-tabs type="card" @click="finished = false">
+        <van-tab>
+          <div slot="title">
+            <span :class="{ [`theme${theme}`]: true, 'active': active }">最新上传</span>
+          </div>
+          <van-list
+            v-model="loading"
+            :finished="finished"
+            finished-text="没有更多了"
+            @load="loadNewList"
+          >
+            <div class="LatestUpload">
+              <div class="LatestUploadList" v-for="(item,index) in newList" :key="index">
+                <div class="ActivePersonnelBox" @click="gotovotingdetails(item.MemberId)">
+                  <img :src="item.Photo">
+                </div>
+                <span class="ballot">NO.{{item.MemberId}}</span>
+                <span class="ActivePersonnelName">{{item.Name}}</span>
+                <button class="VoteBtn" @click="Vote(item.MemberId)">投TA一票</button>
+                <div class="VoteNumber">
+                  <span>已获投票数：</span>
+                  <p>{{item.Vote}}票</p>
                 </div>
               </div>
-            </van-list>
-          </van-tab>
-          <van-tab title="TOP50">
-            <div slot="title">
-              <span :class="{ [`theme${theme}`]: true, 'active': !active }">Top50</span>
             </div>
-            <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="loadTopList">
+          </van-list>
+        </van-tab>
+        <van-tab title="TOP50">
+          <div slot="title">
+            <span :class="{ [`theme${theme}`]: true, 'active': !active }">Top50</span>
+          </div>
+          <van-list
+            v-model="loading"
+            :finished="finished"
+            finished-text="没有更多了"
+            @load="loadTopList"
+          >
             <div class="LatestUpload">
               <div class="LatestUploadList" v-for="(item,index) in topList" :key="index">
                 <div class="ActivePersonnelBox" @click="gotovotingdetails(item.MemberId)">
@@ -57,10 +61,9 @@
                 </div>
               </div>
             </div>
-            </van-list>
-          </van-tab>
-        </van-tabs>
-      </div>
+          </van-list>
+        </van-tab>
+      </van-tabs>
     </div>
     <button :class="signupBtn?'signupBtnOne':'signupBtnTwo'" @click="signup">{{ myprofile && myprofile.MemberId ? '我的上传' : '投TA一票' }}</button>
     <toast v-if="show" :url="activity.AfterVote" @close="close" @confirmbtn="tolink"></toast>
@@ -68,9 +71,9 @@
 </template>
 
 <script>
-import { createNamespacedHelpers } from "vuex"
-import wxsdk from '../../util/share.js'
-import toast from '../../components/toast.vue'
+import { createNamespacedHelpers } from "vuex";
+import wxsdk from "../../util/share.js";
+import toast from "../../components/toast.vue";
 import BgImg from "../../assets/bgimg.jpg";
 import BgImage from "../../assets/yttjbg.png";
 // import toast from "../../components/toast.vue";
@@ -114,7 +117,7 @@ export default {
       newpage: 1,
       toppage: 1,
       show: false,
-      pageSize: 10,
+      pageSize: 10
     };
   },
   components: {
@@ -134,8 +137,8 @@ export default {
     }),
   },
   created() {
-    this.pageSize = this.$store.state.pageSize
-    this.actid = this.$route.params.actid
+    this.pageSize = this.$store.state.pageSize;
+    this.actid = this.$route.params.actid;
     if (this.actid == 1) {
       this.coverImgUrl = true;
       this.signupBtn = true;
@@ -146,18 +149,24 @@ export default {
       this.isOK = false;
     }
     this.getActivity({
-      actid: this.actid,
-    }).then((act) => {
+      actid: this.actid
+    }).then(act => {
       wxsdk(
-        { url: window.encodeURIComponent(`${window.location.origin}${window.location.pathname}`) },
+        {
+          url: window.encodeURIComponent(
+            `${window.location.origin}${window.location.pathname}`
+          )
+        },
         {
           title: act.ShareTitle,
           desc: act.ShareDesc,
-          link: `${window.location.origin}${window.location.pathname}${window.location.hash}`,
-          thu_image: act.ShareIcon,
+          link: `${window.location.origin}${window.location.pathname}${
+            window.location.hash
+          }`,
+          thu_image: act.ShareIcon
         }
-      )
-    })
+      );
+    });
     this.getMine({
       actid: this.actid,
       openid: this.user.openid,
@@ -177,11 +186,11 @@ export default {
   },
   methods: {
     ...mapactivityActions([
-      'getList',
-      'getTopList',
-      'getActivity',
-      'vote',
-      'getMine',
+      "getList",
+      "getTopList",
+      "getActivity",
+      "vote",
+      "getMine"
     ]),
     handleScroll() {
       // 页面滚动距顶部距离
@@ -204,10 +213,8 @@ export default {
       //   }
       //   // 加载状态结束
       //   this.loading = false;
-
       // // var scroll = scrollTop - this.i;
       // this.i = scrollTop;
-     
       // if (scroll < 0) {
       //   this.isFixed =false;
       //   console.log("up");
@@ -234,7 +241,7 @@ export default {
       });
     },
     Vote(memberid) {
-      this.$dialog.confirm({ message: '确定投票给当前用户?' }).then(() => {
+      this.$dialog.confirm({ message: "确定投票给当前用户?" }).then(() => {
         this.vote({
           actid: this.actid,
           memberid: memberid,
@@ -256,36 +263,38 @@ export default {
           this.topList = toplist;
 
           if (this.activity.AfterVote) {
-            this.$dialog.alert({ title: '投票成功', message: '恭喜您获得一次抽奖机会!' }).then(() => {
-              window.location.href = this.activity.AfterVote
-            })
+            this.$dialog
+              .alert({ title: "投票成功", message: "恭喜您获得一次抽奖机会!" })
+              .then(() => {
+                window.location.href = this.activity.AfterVote;
+              });
           } else {
-            this.$dialog.alert({ message: '投票成功' })
+            this.$dialog.alert({ message: "投票成功" });
           }
         });
-      })
+      });
     },
     loadNewList() {
-      this.newlist().then((res) => {
+      this.newlist().then(res => {
         if ((res || []).length === this.pageSize) {
-          this.newpage += 1
+          this.newpage += 1;
         } else {
-          this.finished = true
+          this.finished = true;
         }
 
-        this.loading = false
-      })
+        this.loading = false;
+      });
     },
     loadTopList() {
-      this.toplist().then((res) => {
+      this.toplist().then(res => {
         if ((res || []).length === this.pageSize) {
-          this.toppage += 1
+          this.toppage += 1;
         } else {
-          this.finished = true
+          this.finished = true;
         }
 
-        this.loading = false
-      })
+        this.loading = false;
+      });
     },
     signup() {
       if (this.myprofile && this.myprofile.MemberId) {
@@ -318,8 +327,22 @@ export default {
 </script>
 
 <style>
-.van-list {
-  width: 100%;
+.van-tabs--card .van-tabs__wrap {
+  margin-bottom: 0.28rem;
+  height: 0.6rem;
+}
+.van-tabs__nav--card {
+  margin: 0 15px;
+  border-radius: 2px;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  border: none;
+}
+.van-tabs__nav--card .van-tab.van-tab--active {
+  background-color: rgba(255, 255, 255, 0);
+}
+.van-tabs__nav--card .van-tab {
+  border-right: none;
 }
 </style>
 
@@ -327,7 +350,6 @@ export default {
 <style lang="scss" scoped>
 .context {
   width: 100%;
-  // background-color: rgba(209, 220, 228, 1);
   display: flex;
   flex-direction: column;
   justify-content: center;
@@ -344,6 +366,7 @@ export default {
     position: absolute;
     top: 2.8rem;
     left: calc(5%);
+    z-index: 120;
 
     .searchb {
       width: 100%;
@@ -357,7 +380,6 @@ export default {
       align-items: center;
 
       input {
-        // padding: 0.11rem 1.2rem 0.11rem 0.13rem;
         background-color: rgba(255, 255, 255, 0);
         color: rgba(255, 255, 255, 1);
         font-size: 0.16rem;
@@ -388,6 +410,7 @@ export default {
     position: fixed;
     top: 0.11rem;
     left: calc(5%);
+    z-index: 120;
 
     .searchb {
       width: 100%;
@@ -432,6 +455,7 @@ export default {
     position: absolute;
     top: 2.8rem;
     left: calc(3.1%);
+    z-index: 120;
 
     .searchs {
       width: 100%;
@@ -477,6 +501,7 @@ export default {
     position: fixed;
     top: 0.11rem;
     left: calc(3.1%);
+    z-index: 120;
 
     .searchs {
       width: 100%;
@@ -528,232 +553,110 @@ export default {
     background-color: rgba(255, 255, 255, 0.29);
     border-radius: 0.06rem 0.06rem 0 0;
   }
-  .VoteListBox {
-    width: 93.6%;
-    background-color: rgba(255, 255, 255, 1);
+  .VoteList {
+    width: 3.51rem;
+    background: rgba(255, 255, 255, 1);
     border-radius: 0.06rem;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
+    padding-top: 0.26rem;
     margin-bottom: 1rem;
 
-    .VoteList {
-      margin: 0.26rem 0;
-      width: 90%;
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-
-
-      .theme1 {
-          width: 2rem;
-          font-size: 0.16rem;
-          font-family: PingFangSC-Medium;
-          font-weight: bolder;
-          color: rgba(255, 255, 255, 1);
-          background: rgba(217, 226, 233, 1);
-          line-height: 0.22rem;
-          border-radius: 0.06rem;
-          text-align: center;
-          padding: 0.09rem 0;
+    .theme1 {
+      // width: 2rem;
+      font-size: 0.16rem;
+      font-weight: bolder;
+      color: rgba(255, 255, 255, 1);
+      background: rgba(217, 226, 233, 1);
+      line-height: 0.22rem;
+      border-radius: 0.06rem;
+      text-align: center;
+      padding: 0.09rem 0;
 
-          &.active {
-            background: rgba(166, 184, 201, 1);
-          }
+      &.active {
+        background: rgba(166, 184, 201, 1);
       }
+    }
 
-      .sortlist1 {
-        width: 94%;
+    .LatestUpload {
+      width: 90%;
+      display: flex;
+      flex-direction: row;
+      justify-content: space-between;
+      flex-wrap: wrap;
+      margin: 0.28rem auto;
+
+      .LatestUploadList {
+        width: 48%;
+        height: 3.1rem;
+        background: rgba(255, 255, 255, 1);
+        box-shadow: 0px 4px 8px 0px rgba(166, 184, 201, 0.18);
+        border-radius: 0.08rem;
+        margin-bottom: 0.25rem;
         display: flex;
-        flex-direction: row;
-        justify-content: space-between;
+        flex-direction: column;
+        align-items: center;
+        position: relative;
+
+        .ActivePersonnelBox {
+          width: 90%;
+          height: 1.83rem;
+          border-radius: 0.15rem;
+          margin-bottom: 0.11rem;
+          border: 0.04rem solid rgba(166, 184, 201, 1);
+
+          img {
+            width: 100%;
+            height: 100%;
+            border-radius: 0.1rem;
+          }
+        }
 
-        .newly1 {
-          width: 47.5%;
-          font-size: 0.16rem;
-          font-family: PingFangSC-Medium;
-          font-weight: bolder;
-          color: rgba(255, 255, 255, 1);
-          line-height: 0.22rem;
+        .ballot {
+          position: absolute;
+          top: 0;
           background: rgba(166, 184, 201, 1);
-          border-radius: 0.06rem;
-          text-align: center;
-          padding: 0.09rem 0;
-        }
-        .newly2 {
-          width: 47.5%;
-          font-size: 0.16rem;
-          font-family: PingFangSC-Medium;
+          border-radius: 0 0 0.08rem 0.08rem;
+          padding: 0.02rem 0.12rem;
+          font-size: 0.14rem;
           font-weight: bolder;
           color: rgba(255, 255, 255, 1);
-          line-height: 0.22rem;
-          background: rgba(217, 226, 233, 1);
-          border-radius: 0.06rem;
-          text-align: center;
-          padding: 0.09rem 0;
+          line-height: 0.2rem;
         }
-      }
-
-      .sortlist2 {
-        width: 94%;
-        display: flex;
-        flex-direction: row;
-        justify-content: space-between;
 
-        .newlyone {
-          width: 47.5%;
+        .ActivePersonnelName {
           font-size: 0.16rem;
-          font-family: PingFangSC-Medium;
-          font-weight: bolder;
-          color: rgba(255, 255, 255, 1);
+          font-weight: bold;
+          color: rgba(0, 0, 0, 1);
           line-height: 0.22rem;
-          background: rgba(126, 100, 86, 1);
-          border-radius: 0.06rem;
-          text-align: center;
-          padding: 0.09rem 0;
+          padding-bottom: 0.11rem;
         }
-        .newlytwo {
-          width: 47.5%;
-          font-size: 0.16rem;
-          font-family: PingFangSC-Medium;
+
+        .VoteBtn {
+          width: 56%;
+          height: 0.23rem;
+          border-radius: 0.25rem;
+          background-color: rgba(166, 184, 201, 1);
+          border: none;
+          font-size: 0.14rem;
           font-weight: bolder;
           color: rgba(255, 255, 255, 1);
-          line-height: 0.22rem;
-          background: rgba(173, 145, 129, 0.62);
-          border-radius: 0.06rem;
-          text-align: center;
-          padding: 0.09rem 0;
+          line-height: 0.2rem;
+          margin-bottom: 0.14rem;
         }
-      }
-
-
-
-      .LatestUpload {
-        width: 100%;
-        display: flex;
-        flex-direction: row;
-        justify-content: space-between;
-        flex-wrap: wrap;
-        margin-top: 0.28rem;
-
-        .LatestUploadList {
-          width: 48%;
-          height: 3.1rem;
-          background: rgba(255, 255, 255, 1);
-          box-shadow: 0px 4px 8px 0px rgba(166, 184, 201, 0.18);
-          border-radius: 0.08rem;
-          margin-bottom: 0.25rem;
+        .VoteNumber {
           display: flex;
-          flex-direction: column;
-          align-items: center;
-          position: relative;
-
-          .ActivePersonnelBox1 {
-            width: 90%;
-            height: 1.83rem;
-            border-radius: 0.15rem;
-            margin-bottom: 0.11rem;
-            border: 0.04rem solid rgba(166, 184, 201, 1);
-
-            img {
-              width: 100%;
-              height: 100%;
-              border-radius: 0.1rem;
-            }
-          }
-          .ActivePersonnelBox2 {
-            width: 90%;
-            height: 1.83rem;
-            border-radius: 0.15rem;
-            margin-bottom: 0.11rem;
-            border: 0.04rem solid rgba(126, 100, 86, 1);
-
-            img {
-              width: 100%;
-              height: 100%;
-              border-radius: 0.1rem;
-            }
-          }
+          flex-direction: row;
 
-          .ballot1 {
-            position: absolute;
-            top: 0;
-            background: rgba(166, 184, 201, 1);
-            border-radius: 0 0 0.08rem 0.08rem;
-            padding: 0.02rem 0.12rem;
-            font-size: 0.14rem;
-            font-family: PingFangSC-Medium;
+          span {
+            font-size: 0.12rem;
             font-weight: bolder;
-            color: rgba(255, 255, 255, 1);
-            line-height: 0.2rem;
-          }
-          .ballot2 {
-            position: absolute;
-            top: 0;
-            background: rgba(126, 100, 86, 1);
-            border-radius: 0 0 0.08rem 0.08rem;
-            padding: 0.02rem 0.12rem;
-            font-size: 0.14rem;
-            font-family: PingFangSC-Medium;
-            font-weight: bolder;
-            color: rgba(255, 255, 255, 1);
-            line-height: 0.2rem;
-          }
-
-          .ActivePersonnelName {
-            font-size: 0.16rem;
-            font-family: PingFangSC-Regular;
-            font-weight: bold;
             color: rgba(0, 0, 0, 1);
-            line-height: 0.22rem;
-            padding-bottom: 0.11rem;
+            line-height: 0.17rem;
           }
-
-          .VoteBtn1 {
-            width: 56%;
-            height: 0.23rem;
-            border-radius: 0.25rem;
-            background-color: rgba(166, 184, 201, 1);
-            border: none;
-            font-size: 0.14rem;
-            font-family: PingFangSC-Medium;
+          p {
+            font-size: 0.12rem;
             font-weight: bolder;
-            color: rgba(255, 255, 255, 1);
-            line-height: 0.2rem;
-            margin-bottom: 0.14rem;
-          }
-          .VoteBtn2 {
-            width: 56%;
-            height: 0.23rem;
-            border-radius: 0.25rem;
-            background-color: rgba(126, 100, 86, 1);
-            border: none;
-            font-size: 0.14rem;
-            font-family: PingFangSC-Medium;
-            font-weight: bolder;
-            color: rgba(255, 255, 255, 1);
-            line-height: 0.2rem;
-            margin-bottom: 0.14rem;
-          }
-
-          .VoteNumber {
-            display: flex;
-            flex-direction: row;
-
-            span {
-              font-size: 0.12rem;
-              font-family: PingFangSC-Medium;
-              font-weight: bolder;
-              color: rgba(0, 0, 0, 1);
-              line-height: 0.17rem;
-            }
-            p {
-              font-size: 0.12rem;
-              font-family: PingFangSC-Medium;
-              font-weight: bolder;
-              color: #f0737e;
-              line-height: 0.17rem;
-            }
+            color: #f0737e;
+            line-height: 0.17rem;
           }
         }
       }
@@ -766,13 +669,13 @@ export default {
     background: rgba(166, 184, 201, 1);
     border: none;
     font-size: 0.2rem;
-    font-family: PingFangSC-Medium;
     font-weight: bold;
     color: rgba(255, 255, 255, 1);
     line-height: 0.28rem;
     position: fixed;
     bottom: 0.19rem;
     left: calc(4.25%);
+    z-index: 100;
   }
   .signupBtnTwo {
     width: 91%;
@@ -781,13 +684,13 @@ export default {
     background: rgba(173, 145, 129, 1);
     border: none;
     font-size: 0.2rem;
-    font-family: PingFangSC-Medium;
     font-weight: bold;
     color: rgba(255, 255, 255, 1);
     line-height: 0.28rem;
     position: fixed;
     bottom: 0.19rem;
     left: calc(4.25%);
+    z-index: 100;
   }
 }
 </style>

src/views/vote/signup.vue

@@ -196,7 +196,6 @@ export default {
 
       .desc1 {
         font-size: 0.16rem;
-        font-family: PingFangSC-Medium;
         font-weight: bolder;
         color: rgba(112, 125, 138, 1);
         line-height: 0.22rem;
@@ -204,7 +203,6 @@ export default {
       }
       .desc2 {
         font-size: 0.16rem;
-        font-family: PingFangSC-Medium;
         font-weight: bolder;
         color: rgba(112, 84, 75, 1);
         line-height: 0.22rem;
@@ -229,7 +227,6 @@ export default {
       }
       .desc1 {
         font-size: 0.16rem;
-        font-family: PingFangSC-Medium;
         font-weight: bolder;
         color: rgba(112, 125, 138, 1);
         line-height: 0.22rem;
@@ -237,7 +234,6 @@ export default {
       }
       .desc2 {
         font-size: 0.16rem;
-        font-family: PingFangSC-Medium;
         font-weight: bolder;
         color: rgba(112, 84, 75, 1);
         line-height: 0.22rem;