更新优化

package-lock.json

@@ -9,7 +9,6 @@
       "version": "0.1.0",
       "dependencies": {
         "babel-polyfill": "^6.26.0",
-<<<<<<< HEAD
         "browserslist": "^4.20.0",
         "caniuse": "^0.1.3",
         "caniuse-lite": "^1.0.30001313",
@@ -18,23 +17,18 @@
         "core-js": "^2.6.5",
         "dayjs": "^1.8.31",
         "e-icon-picker": "^1.1.7",
-=======
         "browserslist": "^4.16.6",
         "caniuse": "^0.1.3",
         "caniuse-lite": "^1.0.30001236",
         "clean-deep": "^3.4.0",
         "core-js": "^2.6.5",
         "dayjs": "^1.8.31",
->>>>>>> 03/18VipActive
         "es6-promise": "^4.2.8",
         "install": "^0.13.0",
         "js-storage": "^1.1.0",
         "lodash": "^4.17.21",
         "moment": "^2.29.1",
-<<<<<<< HEAD
-=======
         "plyr": "^3.7.2",
->>>>>>> 03/18VipActive
         "qs": "^6.8.0",
         "vant": "^2.12.21",
         "vconsole": "^3.3.4",
@@ -45,11 +39,6 @@
         "vuex": "^3.0.1"
       },
       "devDependencies": {
-<<<<<<< HEAD
-        "@babel/core": "^7.17.9",
-        "@babel/plugin-proposal-optional-chaining": "^7.16.7",
-=======
->>>>>>> 03/18VipActive
         "@vue/cli-plugin-babel": "^3.10.0",
         "@vue/cli-plugin-eslint": "^3.10.0",
         "@vue/cli-service": "^3.10.0",
@@ -62,8 +51,6 @@
         "less-loader": "^4.1.0",
         "vue-cli-plugin-axios": "0.0.4",
         "vue-template-compiler": "^2.6.10"
-<<<<<<< HEAD
-=======
       }
     },
     "node_modules/@babel/code-frame": {
@@ -14442,7 +14429,6 @@
       "dev": true,
       "requires": {
         "@babel/highlight": "^7.0.0"
->>>>>>> 03/18VipActive
       }
     },
     "node_modules/@ampproject/remapping": {
@@ -32289,15 +32275,9 @@
       }
     },
     "@vue/preload-webpack-plugin": {
-<<<<<<< HEAD
-      "version": "1.1.2",
-      "resolved": "https://registry.npmmirror.com/@vue/preload-webpack-plugin/-/preload-webpack-plugin-1.1.2.tgz",
-      "integrity": "sha512-LIZMuJk38pk9U9Ur4YzHjlIyMuxPlACdBIHH9/nGYVTsaGKOSnSuELiE8vS9wa+dJpIYspYUOqk+L1Q4pgHQHQ==",
-=======
       "version": "1.1.1",
       "resolved": "https://registry.npm.taobao.org/@vue/preload-webpack-plugin/download/@vue/preload-webpack-plugin-1.1.1.tgz",
       "integrity": "sha1-GHI1MNME9EMCHaIpLW7JUCgmEEo=",
->>>>>>> 03/18VipActive
       "dev": true,
       "requires": {}
     },
@@ -32543,26 +32523,15 @@
     },
     "ajv-errors": {
       "version": "1.0.1",
-<<<<<<< HEAD
-      "resolved": "https://registry.npmmirror.com/ajv-errors/-/ajv-errors-1.0.1.tgz",
-      "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
-=======
       "resolved": "https://registry.npm.taobao.org/ajv-errors/download/ajv-errors-1.0.1.tgz",
       "integrity": "sha1-81mGrOuRr63sQQL72FAUlQzvpk0=",
->>>>>>> 03/18VipActive
       "dev": true,
       "requires": {}
     },
     "ajv-keywords": {
-<<<<<<< HEAD
-      "version": "3.5.2",
-      "resolved": "https://registry.npmmirror.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-=======
       "version": "3.4.1",
       "resolved": "https://registry.npm.taobao.org/ajv-keywords/download/ajv-keywords-3.4.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv-keywords%2Fdownload%2Fajv-keywords-3.4.1.tgz",
       "integrity": "sha1-75FuJxxkrBIXH9g4TqrmsjRYVNo=",
->>>>>>> 03/18VipActive
       "dev": true,
       "requires": {}
     },
@@ -35471,12 +35440,6 @@
         "text-table": "^0.2.0"
       },
       "dependencies": {
-<<<<<<< HEAD
-        "ansi-regex": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-3.0.1.tgz",
-          "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
-=======
         "acorn": {
           "version": "6.2.1",
           "resolved": "https://registry.npm.taobao.org/acorn/download/acorn-6.2.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Facorn%2Fdownload%2Facorn-6.2.1.tgz",
@@ -35551,7 +35514,6 @@
           "version": "4.0.6",
           "resolved": "https://registry.npm.taobao.org/ignore/download/ignore-4.0.6.tgz",
           "integrity": "sha1-dQ49tYYgh7RzfrrIIH/9HvJ7Jfw=",
->>>>>>> 03/18VipActive
           "dev": true
         },
         "import-fresh": {
@@ -35600,12 +35562,6 @@
         "rimraf": "^2.6.1"
       },
       "dependencies": {
-<<<<<<< HEAD
-        "json5": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmmirror.com/json5/-/json5-1.0.1.tgz",
-          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-=======
         "acorn": {
           "version": "6.2.1",
           "resolved": "https://registry.npm.taobao.org/acorn/download/acorn-6.2.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Facorn%2Fdownload%2Facorn-6.2.1.tgz",
@@ -35623,7 +35579,6 @@
           "version": "4.1.0",
           "resolved": "https://registry.npm.taobao.org/espree/download/espree-4.1.0.tgz?cache=0&sync_timestamp=1561171239020&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fespree%2Fdownload%2Fespree-4.1.0.tgz",
           "integrity": "sha1-co1UUeD9FWwEOEp62J7VH/VOsl8=",
->>>>>>> 03/18VipActive
           "dev": true,
           "requires": {
             "minimist": "^1.2.0"
@@ -36419,9 +36374,6 @@
       "resolved": "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.2.tgz",
       "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
       "dev": true,
-<<<<<<< HEAD
-      "optional": true
-=======
       "optional": true,
       "requires": {
         "nan": "^2.12.1",
@@ -36964,7 +36916,6 @@
           "optional": true
         }
       }
->>>>>>> 03/18VipActive
     },
     "function-bind": {
       "version": "1.1.1",
@@ -42101,23 +42052,6 @@
     },
     "strict-uri-encode": {
       "version": "1.1.0",
-<<<<<<< HEAD
-      "resolved": "https://registry.npmmirror.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
-      "integrity": "sha512-R3f198pcvnB+5IpnBlRkphuE9n46WyVl8I39W/ZUTZLz4nqSP/oLYUrcnJrw462Ds8he4YKMov2efsTIw1BDGQ=="
-    },
-    "string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "requires": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
-    "string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-=======
       "resolved": "https://registry.npm.taobao.org/strict-uri-encode/download/strict-uri-encode-1.1.0.tgz",
       "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
       "dev": true
@@ -42184,7 +42118,6 @@
       "version": "5.2.0",
       "resolved": "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-5.2.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstrip-ansi%2Fdownload%2Fstrip-ansi-5.2.0.tgz",
       "integrity": "sha1-jJpTb+tq/JYr36WxBKUJHBrZwK4=",
->>>>>>> 03/18VipActive
       "dev": true,
       "requires": {
         "emoji-regex": "^8.0.0",
@@ -42656,11 +42589,6 @@
           "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-5.2.0.tgz",
           "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
           "dev": true,
-<<<<<<< HEAD
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
-=======
           "optional": true,
           "requires": {}
         },
@@ -42677,7 +42605,6 @@
           "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
           "dev": true,
           "optional": true
->>>>>>> 03/18VipActive
         }
       }
     },
@@ -43414,20 +43341,10 @@
         "requires-port": "^1.0.0"
       }
     },
-<<<<<<< HEAD
-    "url-slug": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmmirror.com/url-slug/-/url-slug-2.0.0.tgz",
-      "integrity": "sha512-aiNmSsVgrjCiJ2+KWPferjT46YFKoE8i0YX04BlMVDue022Xwhg/zYlnZ6V9/mP3p8Wj7LEp0myiTkC/p6sxew==",
-      "requires": {
-        "unidecode": "0.1.8"
-      }
-=======
     "url-polyfill": {
       "version": "1.1.12",
       "resolved": "https://registry.npmmirror.com/url-polyfill/-/url-polyfill-1.1.12.tgz",
       "integrity": "sha512-mYFmBHCapZjtcNHW0MDq9967t+z4Dmg5CJ0KqysK3+ZbyoNOWQHksGCTWwDhxGXllkWlOc10Xfko6v4a3ucM6A=="
->>>>>>> 03/18VipActive
     },
     "use": {
       "version": "3.1.1",