Merge branch 'dev' of gitlab.33.cn:chenqikuai/fns_front_2 into dev

package-lock.json

@@ -1279,8 +1279,13 @@
     },
     "@nodelib/fs.scandir": {
       "version": "2.1.5",
+<<<<<<< HEAD
       "resolved": "https://registry.nlark.com/@nodelib/fs.scandir/download/@nodelib/fs.scandir-2.1.5.tgz?cache=0&sync_timestamp=1622792738877&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40nodelib%2Ffs.scandir%2Fdownload%2F%40nodelib%2Ffs.scandir-2.1.5.tgz",
       "integrity": "sha1-dhnC6yGyVIP20WdUi0z9WnSIw9U=",
+=======
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
       "dev": true,
       "requires": {
         "@nodelib/fs.stat": "2.0.5",
@@ -1289,8 +1294,13 @@
       "dependencies": {
         "@nodelib/fs.stat": {
           "version": "2.0.5",
+<<<<<<< HEAD
           "resolved": "https://registry.nlark.com/@nodelib/fs.stat/download/@nodelib/fs.stat-2.0.5.tgz?cache=0&sync_timestamp=1622792616417&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40nodelib%2Ffs.stat%2Fdownload%2F%40nodelib%2Ffs.stat-2.0.5.tgz",
           "integrity": "sha1-W9Jir5Tp0lvR5xsF3u1Eh2oiLos=",
+=======
+          "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+          "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
           "dev": true
         }
       }
@@ -1303,8 +1313,13 @@
     },
     "@nodelib/fs.walk": {
       "version": "1.2.8",
+<<<<<<< HEAD
       "resolved": "https://registry.nlark.com/@nodelib/fs.walk/download/@nodelib/fs.walk-1.2.8.tgz",
       "integrity": "sha1-6Vc36LtnRt3t9pxVaVNJTxlv5po=",
+=======
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
       "dev": true,
       "requires": {
         "@nodelib/fs.scandir": "2.1.5",
@@ -1545,8 +1560,8 @@
     },
     "@types/parse-json": {
       "version": "4.0.0",
-      "resolved": "https://registry.nlark.com/@types/parse-json/download/@types/parse-json-4.0.0.tgz",
-      "integrity": "sha1-L4u0QUNNFjs1+4/9zNcTiSf/uMA=",
+      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
+      "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
       "dev": true
     },
     "@types/q": {
@@ -1938,8 +1953,13 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
+<<<<<<< HEAD
           "resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1618995588464&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz",
           "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
+=======
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
           "dev": true,
           "optional": true,
           "requires": {
@@ -1948,8 +1968,13 @@
         },
         "chalk": {
           "version": "4.1.2",
+<<<<<<< HEAD
           "resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.2.tgz?cache=0&sync_timestamp=1627646655305&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fchalk%2Fdownload%2Fchalk-4.1.2.tgz",
           "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
+=======
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
           "dev": true,
           "optional": true,
           "requires": {
@@ -1959,8 +1984,13 @@
         },
         "color-convert": {
           "version": "2.0.1",
+<<<<<<< HEAD
           "resolved": "https://registry.nlark.com/color-convert/download/color-convert-2.0.1.tgz",
           "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
+=======
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
           "dev": true,
           "optional": true,
           "requires": {
@@ -1969,15 +1999,25 @@
         },
         "color-name": {
           "version": "1.1.4",
+<<<<<<< HEAD
           "resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz",
           "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
+=======
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
           "dev": true,
           "optional": true
         },
         "fork-ts-checker-webpack-plugin-v5": {
           "version": "npm:fork-ts-checker-webpack-plugin@5.2.1",
+<<<<<<< HEAD
           "resolved": "https://registry.nlark.com/fork-ts-checker-webpack-plugin/download/fork-ts-checker-webpack-plugin-5.2.1.tgz",
           "integrity": "sha1-eTJthpeXkG+osk4qvPlCH8gFRQ0=",
+=======
+          "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-5.2.1.tgz",
+          "integrity": "sha512-SVi+ZAQOGbtAsUWrZvGzz38ga2YqjWvca1pXQFUArIVXqli0lLoDQ8uS0wg0kSpcwpZmaW5jVCZXQebkyUQSsw==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
           "dev": true,
           "optional": true,
           "requires": {
@@ -1996,8 +2036,13 @@
         },
         "fs-extra": {
           "version": "9.1.0",
+<<<<<<< HEAD
           "resolved": "https://registry.nlark.com/fs-extra/download/fs-extra-9.1.0.tgz",
           "integrity": "sha1-WVRGDHZKjaIJS6NVS/g55rmnyG0=",
+=======
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+          "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
           "dev": true,
           "optional": true,
           "requires": {
@@ -2009,15 +2054,25 @@
         },
         "has-flag": {
           "version": "4.0.0",
+<<<<<<< HEAD
           "resolved": "https://registry.nlark.com/has-flag/download/has-flag-4.0.0.tgz?cache=0&sync_timestamp=1626715907927&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-flag%2Fdownload%2Fhas-flag-4.0.0.tgz",
           "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
+=======
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
           "dev": true,
           "optional": true
         },
         "jsonfile": {
           "version": "6.1.0",
+<<<<<<< HEAD
           "resolved": "https://registry.npm.taobao.org/jsonfile/download/jsonfile-6.1.0.tgz?cache=0&sync_timestamp=1604161876665&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjsonfile%2Fdownload%2Fjsonfile-6.1.0.tgz",
           "integrity": "sha1-vFWyY0eTxnnsZAMJTrE2mKbsCq4=",
+=======
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+          "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
           "dev": true,
           "optional": true,
           "requires": {
@@ -2027,8 +2082,13 @@
         },
         "lru-cache": {
           "version": "6.0.0",
+<<<<<<< HEAD
           "resolved": "https://registry.npm.taobao.org/lru-cache/download/lru-cache-6.0.0.tgz",
           "integrity": "sha1-bW/mVw69lqr5D8rR2vo7JWbbOpQ=",
+=======
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
           "dev": true,
           "optional": true,
           "requires": {
@@ -2037,8 +2097,13 @@
         },
         "schema-utils": {
           "version": "2.7.0",
+<<<<<<< HEAD
           "resolved": "https://registry.nlark.com/schema-utils/download/schema-utils-2.7.0.tgz?cache=0&sync_timestamp=1626694835325&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fschema-utils%2Fdownload%2Fschema-utils-2.7.0.tgz",
           "integrity": "sha1-FxUfdtjq5n+793lgwzxnatn078c=",
+=======
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz",
+          "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
           "dev": true,
           "optional": true,
           "requires": {
@@ -2049,8 +2114,13 @@
         },
         "semver": {
           "version": "7.3.5",
+<<<<<<< HEAD
           "resolved": "https://registry.nlark.com/semver/download/semver-7.3.5.tgz?cache=0&sync_timestamp=1618846864940&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsemver%2Fdownload%2Fsemver-7.3.5.tgz",
           "integrity": "sha1-C2Ich5NI2JmOSw5L6Us/EuYBjvc=",
+=======
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
           "dev": true,
           "optional": true,
           "requires": {
@@ -2059,8 +2129,13 @@
         },
         "supports-color": {
           "version": "7.2.0",
+<<<<<<< HEAD
           "resolved": "https://registry.nlark.com/supports-color/download/supports-color-7.2.0.tgz",
           "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
+=======
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
           "dev": true,
           "optional": true,
           "requires": {
@@ -2069,15 +2144,25 @@
         },
         "universalify": {
           "version": "2.0.0",
+<<<<<<< HEAD
           "resolved": "https://registry.npm.taobao.org/universalify/download/universalify-2.0.0.tgz?cache=0&sync_timestamp=1603180004159&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Funiversalify%2Fdownload%2Funiversalify-2.0.0.tgz",
           "integrity": "sha1-daSYTv7cSwiXXFrrc/Uw0C3yVxc=",
+=======
+          "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+          "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
           "dev": true,
           "optional": true
         },
         "yallist": {
           "version": "4.0.0",
+<<<<<<< HEAD
           "resolved": "https://registry.nlark.com/yallist/download/yallist-4.0.0.tgz",
           "integrity": "sha1-m7knkNnA7/7GO+c1GeEaNQGaOnI=",
+=======
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
           "dev": true,
           "optional": true
         }
@@ -2161,8 +2246,13 @@
         },
         "ansi-styles": {
           "version": "4.3.0",
+<<<<<<< HEAD
           "resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1618995588464&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz",
           "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
+=======
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
           "dev": true,
           "optional": true,
           "requires": {
@@ -2171,8 +2261,13 @@
         },
         "chalk": {
           "version": "4.1.2",
+<<<<<<< HEAD
           "resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.2.tgz?cache=0&sync_timestamp=1627646655305&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fchalk%2Fdownload%2Fchalk-4.1.2.tgz",
           "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
+=======
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
           "dev": true,
           "optional": true,
           "requires": {
@@ -2182,8 +2277,13 @@
         },
         "color-convert": {
           "version": "2.0.1",
+<<<<<<< HEAD
           "resolved": "https://registry.nlark.com/color-convert/download/color-convert-2.0.1.tgz",
           "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
+=======
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
           "dev": true,
           "optional": true,
           "requires": {
@@ -2192,8 +2292,13 @@
         },
         "color-name": {
           "version": "1.1.4",
+<<<<<<< HEAD
           "resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz",
           "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
+=======
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
           "dev": true,
           "optional": true
         },
@@ -2219,15 +2324,25 @@
         },
         "has-flag": {
           "version": "4.0.0",
+<<<<<<< HEAD
           "resolved": "https://registry.nlark.com/has-flag/download/has-flag-4.0.0.tgz?cache=0&sync_timestamp=1626715907927&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-flag%2Fdownload%2Fhas-flag-4.0.0.tgz",
           "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
+=======
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
           "dev": true,
           "optional": true
         },
         "loader-utils": {
           "version": "2.0.0",
+<<<<<<< HEAD
           "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz",
           "integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=",
+=======
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
           "dev": true,
           "optional": true,
           "requires": {
@@ -2253,8 +2368,13 @@
         },
         "supports-color": {
           "version": "7.2.0",
+<<<<<<< HEAD
           "resolved": "https://registry.nlark.com/supports-color/download/supports-color-7.2.0.tgz",
           "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
+=======
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
           "dev": true,
           "optional": true,
           "requires": {
@@ -2263,8 +2383,13 @@
         },
         "vue-loader-v16": {
           "version": "npm:vue-loader@16.8.1",
+<<<<<<< HEAD
           "resolved": "https://registry.npmmirror.com/vue-loader/download/vue-loader-16.8.1.tgz?cache=0&sync_timestamp=1632350159599&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fvue-loader%2Fdownload%2Fvue-loader-16.8.1.tgz",
           "integrity": "sha1-NU8SvAiXlUFYtxWQ+AApVxOneS0=",
+=======
+          "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.1.tgz",
+          "integrity": "sha512-V53TJbHmzjBhCG5OYI2JWy/aYDspz4oVHKxS43Iy212GjGIG1T3EsB3+GWXFm/1z5VwjdjLmdZUFYM70y77vtQ==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
           "dev": true,
           "optional": true,
           "requires": {
@@ -2683,8 +2808,8 @@
     },
     "acorn-node": {
       "version": "1.8.2",
-      "resolved": "https://registry.npm.taobao.org/acorn-node/download/acorn-node-1.8.2.tgz",
-      "integrity": "sha1-EUyV1kU55T3t4j3oudlt98euKvg=",
+      "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-1.8.2.tgz",
+      "integrity": "sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==",
       "dev": true,
       "requires": {
         "acorn": "^7.0.0",
@@ -2694,8 +2819,8 @@
       "dependencies": {
         "acorn": {
           "version": "7.4.1",
-          "resolved": "https://registry.nlark.com/acorn/download/acorn-7.4.1.tgz",
-          "integrity": "sha1-/q7SVZc9LndVW4PbwIhRpsY1IPo=",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+          "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
           "dev": true
         }
       }
@@ -2883,8 +3008,8 @@
     },
     "arg": {
       "version": "5.0.1",
-      "resolved": "https://registry.nlark.com/arg/download/arg-5.0.1.tgz?cache=0&sync_timestamp=1629166537485&other_urls=https%3A%2F%2Fregistry.nlark.com%2Farg%2Fdownload%2Farg-5.0.1.tgz",
-      "integrity": "sha1-6wyaj3d4bK0q+P8rhiiZhC17ats=",
+      "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.1.tgz",
+      "integrity": "sha512-e0hDa9H2Z9AwFkk2qDlwhoMYE4eToKarchkQHovNdLTCYMHZHeRjI71crOh+dio4K6u1IcwubQqo79Ga4CyAQA==",
       "dev": true
     },
     "argparse": {
@@ -3840,8 +3965,13 @@
     },
     "callsites": {
       "version": "3.1.0",
+<<<<<<< HEAD
       "resolved": "https://registry.nlark.com/callsites/download/callsites-3.1.0.tgz",
       "integrity": "sha1-s2MKvYlDQy9Us/BRkjjjPNffL3M=",
+=======
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
       "dev": true
     },
     "camel-case": {
@@ -3862,8 +3992,8 @@
     },
     "camelcase-css": {
       "version": "2.0.1",
-      "resolved": "https://registry.npm.taobao.org/camelcase-css/download/camelcase-css-2.0.1.tgz",
-      "integrity": "sha1-7pePaUeRTMMMa0R0G27R338EP9U=",
+      "resolved": "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz",
+      "integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==",
       "dev": true
     },
     "camelcase-keys": {
@@ -4821,8 +4951,13 @@
     },
     "css-unit-converter": {
       "version": "1.1.2",
+<<<<<<< HEAD
       "resolved": "https://registry.nlark.com/css-unit-converter/download/css-unit-converter-1.1.2.tgz",
       "integrity": "sha1-THf1oZVObb/2BpXsshTjJwQ2qyE=",
+=======
+      "resolved": "https://registry.npmjs.org/css-unit-converter/-/css-unit-converter-1.1.2.tgz",
+      "integrity": "sha512-IiJwMC8rdZE0+xiEZHeru6YoONC4rfPMqGm2W85jMIbkFvv5nFTwJVFHam2eFrN6txmoUYFAFXiv8ICVeTO0MA==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
       "dev": true
     },
     "css-what": {
@@ -5268,7 +5403,7 @@
     },
     "defined": {
       "version": "1.0.0",
-      "resolved": "https://registry.npm.taobao.org/defined/download/defined-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",
       "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=",
       "dev": true
     },
@@ -5361,8 +5496,8 @@
     },
     "detective": {
       "version": "5.2.0",
-      "resolved": "https://registry.npm.taobao.org/detective/download/detective-5.2.0.tgz",
-      "integrity": "sha1-/rKnfoW5BOzepFmtiXzJCpm9Kns=",
+      "resolved": "https://registry.npmjs.org/detective/-/detective-5.2.0.tgz",
+      "integrity": "sha512-6SsIx+nUUbuK0EthKjv0zrdnajCCXVYGmbYYiYjFVpzcjwEs/JMDZ8tPRG29J/HhN56t3GJp2cGSWDRjjot8Pg==",
       "dev": true,
       "requires": {
         "acorn-node": "^1.6.1",
@@ -5377,8 +5512,13 @@
     },
     "didyoumean": {
       "version": "1.2.2",
+<<<<<<< HEAD
       "resolved": "https://registry.nlark.com/didyoumean/download/didyoumean-1.2.2.tgz?cache=0&sync_timestamp=1624543452248&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdidyoumean%2Fdownload%2Fdidyoumean-1.2.2.tgz",
       "integrity": "sha1-mJNG/+noObRVXs9WZu3qDT6K0Dc=",
+=======
+      "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz",
+      "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
       "dev": true
     },
     "diff": {
@@ -5444,8 +5584,8 @@
     },
     "dlv": {
       "version": "1.1.3",
-      "resolved": "https://registry.npm.taobao.org/dlv/download/dlv-1.1.3.tgz",
-      "integrity": "sha1-XBmKihFFNZbnUUlNSYdLx3MvLnk=",
+      "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz",
+      "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==",
       "dev": true
     },
     "dns-equal": {
@@ -6111,8 +6251,8 @@
     },
     "fastq": {
       "version": "1.13.0",
-      "resolved": "https://registry.nlark.com/fastq/download/fastq-1.13.0.tgz",
-      "integrity": "sha1-YWdg+Ip1Jr38WWt8q4wYk4w2uYw=",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
+      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
       "dev": true,
       "requires": {
         "reusify": "^1.0.4"
@@ -7194,8 +7334,13 @@
     },
     "import-fresh": {
       "version": "3.3.0",
+<<<<<<< HEAD
       "resolved": "https://registry.npm.taobao.org/import-fresh/download/import-fresh-3.3.0.tgz?cache=0&sync_timestamp=1608469579940&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fimport-fresh%2Fdownload%2Fimport-fresh-3.3.0.tgz",
       "integrity": "sha1-NxYsJfy566oublPVtNiM4X2eDCs=",
+=======
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
       "dev": true,
       "requires": {
         "parent-module": "^1.0.0",
@@ -8005,8 +8150,8 @@
     },
     "lilconfig": {
       "version": "2.0.3",
-      "resolved": "https://registry.nlark.com/lilconfig/download/lilconfig-2.0.3.tgz",
-      "integrity": "sha1-aPMAXpIdr70qKvtIN5mGqm0lef0=",
+      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.3.tgz",
+      "integrity": "sha512-EHKqr/+ZvdKCifpNrJCKxBTgk5XupZA3y/aCPY9mxfgBzmgh93Mt/WqjjQ38oMxXuvDokaKiM3lAgvSH2sjtHg==",
       "dev": true
     },
     "lines-and-columns": {
@@ -8126,7 +8271,7 @@
     },
     "lodash.topath": {
       "version": "4.5.2",
-      "resolved": "https://registry.npm.taobao.org/lodash.topath/download/lodash.topath-4.5.2.tgz",
+      "resolved": "https://registry.npmjs.org/lodash.topath/-/lodash.topath-4.5.2.tgz",
       "integrity": "sha1-NhY1Hzu6YZlKCTGYlmC9AyVP0Ak=",
       "dev": true
     },
@@ -8564,8 +8709,13 @@
     },
     "modern-normalize": {
       "version": "1.1.0",
+<<<<<<< HEAD
       "resolved": "https://registry.nlark.com/modern-normalize/download/modern-normalize-1.1.0.tgz",
       "integrity": "sha1-2o6AFA2SIUJr1PclxuESg9NPkLc=",
+=======
+      "resolved": "https://registry.npmjs.org/modern-normalize/-/modern-normalize-1.1.0.tgz",
+      "integrity": "sha512-2lMlY1Yc1+CUy0gw4H95uNN7vjbpoED7NNRSBHE25nWfLBdmMzFCsPshlzbxHz+gYMcBEUN8V4pU16prcdPSgA==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
       "dev": true
     },
     "move-concurrently": {
@@ -8632,8 +8782,13 @@
     },
     "nanocolors": {
       "version": "0.2.9",
+<<<<<<< HEAD
       "resolved": "https://registry.npmmirror.com/nanocolors/download/nanocolors-0.2.9.tgz?cache=0&sync_timestamp=1632653708031&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fnanocolors%2Fdownload%2Fnanocolors-0.2.9.tgz",
       "integrity": "sha1-MZxeenNXGr1g5NJzFQwsuVAXrFs=",
+=======
+      "resolved": "https://registry.npmjs.org/nanocolors/-/nanocolors-0.2.9.tgz",
+      "integrity": "sha512-aymgS4Xe0LMqHOHl7jSUEkFh/6O/pcF0j61dBtreQZ1nmbyYdYjSYSJzz0iPLbKPkMtSmdRgyBGywNZGjKOEfw==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
       "dev": true
     },
     "nanoid": {
@@ -8727,8 +8882,13 @@
     },
     "node-emoji": {
       "version": "1.11.0",
+<<<<<<< HEAD
       "resolved": "https://registry.nlark.com/node-emoji/download/node-emoji-1.11.0.tgz?cache=0&sync_timestamp=1628672555671&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnode-emoji%2Fdownload%2Fnode-emoji-1.11.0.tgz",
       "integrity": "sha1-aaAVDmlG4vEV6dfqTfeXHiYoMBw=",
+=======
+      "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.11.0.tgz",
+      "integrity": "sha512-wo2DpQkQp7Sjm2A0cq+sN7EHKO6Sl0ctXeBdFZrL9T9+UywORbufTcTZxom8YqpLQt/FqNMUkOpkZrJVYSKD3A==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
       "dev": true,
       "requires": {
         "lodash": "^4.17.21"
@@ -9095,8 +9255,8 @@
     },
     "object-hash": {
       "version": "2.2.0",
-      "resolved": "https://registry.nlark.com/object-hash/download/object-hash-2.2.0.tgz",
-      "integrity": "sha1-WtUYWB7vxEO9djRyuP8unCwNVKU=",
+      "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-2.2.0.tgz",
+      "integrity": "sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw==",
       "dev": true
     },
     "object-inspect": {
@@ -9418,8 +9578,8 @@
     },
     "parent-module": {
       "version": "1.0.1",
-      "resolved": "https://registry.npm.taobao.org/parent-module/download/parent-module-1.0.1.tgz",
-      "integrity": "sha1-aR0nCeeMefrjoVZiJFLQB2LKqqI=",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
       "dev": true,
       "requires": {
         "callsites": "^3.0.0"
@@ -9534,8 +9694,13 @@
     },
     "path-type": {
       "version": "4.0.0",
+<<<<<<< HEAD
       "resolved": "https://registry.nlark.com/path-type/download/path-type-4.0.0.tgz",
       "integrity": "sha1-hO0BwKe6OAr+CdkKjBgNzZ0DBDs=",
+=======
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
       "dev": true
     },
     "pause-stream": {
@@ -9776,7 +9941,11 @@
     },
     "postcss-functions": {
       "version": "3.0.0",
+<<<<<<< HEAD
       "resolved": "https://registry.npm.taobao.org/postcss-functions/download/postcss-functions-3.0.0.tgz",
+=======
+      "resolved": "https://registry.npmjs.org/postcss-functions/-/postcss-functions-3.0.0.tgz",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
       "integrity": "sha1-DpTQFERwCkgd4g3k1V+yZAVkJQ4=",
       "dev": true,
       "requires": {
@@ -9788,8 +9957,13 @@
       "dependencies": {
         "postcss": {
           "version": "6.0.23",
+<<<<<<< HEAD
           "resolved": "https://registry.npmmirror.com/postcss/download/postcss-6.0.23.tgz?cache=0&sync_timestamp=1632555261973&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss%2Fdownload%2Fpostcss-6.0.23.tgz",
           "integrity": "sha1-YcgswyisYOZ3ZF+XkFTrmLwOMyQ=",
+=======
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
           "dev": true,
           "requires": {
             "chalk": "^2.4.1",
@@ -9799,16 +9973,26 @@
         },
         "postcss-value-parser": {
           "version": "3.3.1",
+<<<<<<< HEAD
           "resolved": "https://registry.nlark.com/postcss-value-parser/download/postcss-value-parser-3.3.1.tgz",
           "integrity": "sha1-n/giVH4okyE88cMO+lGsX9G6goE=",
+=======
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
           "dev": true
         }
       }
     },
     "postcss-js": {
       "version": "2.0.3",
+<<<<<<< HEAD
       "resolved": "https://registry.nlark.com/postcss-js/download/postcss-js-2.0.3.tgz",
       "integrity": "sha1-qW8PI/89CM7H3FsRvxHF+Ad82rk=",
+=======
+      "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-2.0.3.tgz",
+      "integrity": "sha512-zS59pAk3deu6dVHyrGqmC3oDXBdNdajk4k1RyxeVXCrcEDBUBHoIhE4QTsmhxgzXxsaqFDAkUZfmMa5f/N/79w==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
       "dev": true,
       "requires": {
         "camelcase-css": "^2.0.1",
@@ -10065,8 +10249,13 @@
     },
     "postcss-nested": {
       "version": "4.2.3",
+<<<<<<< HEAD
       "resolved": "https://registry.nlark.com/postcss-nested/download/postcss-nested-4.2.3.tgz?cache=0&sync_timestamp=1627468122159&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-nested%2Fdownload%2Fpostcss-nested-4.2.3.tgz",
       "integrity": "sha1-xvJVsKcgVJd20iDQDEtwzSRBNvY=",
+=======
+      "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-4.2.3.tgz",
+      "integrity": "sha512-rOv0W1HquRCamWy2kFl3QazJMMe1ku6rCFoAAH+9AcxdbpDeBr6k968MLWuLjvjMcGEip01ak09hKOEgpK9hvw==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
       "dev": true,
       "requires": {
         "postcss": "^7.0.32",
@@ -10560,7 +10749,11 @@
     },
     "pretty-hrtime": {
       "version": "1.0.3",
+<<<<<<< HEAD
       "resolved": "https://registry.nlark.com/pretty-hrtime/download/pretty-hrtime-1.0.3.tgz",
+=======
+      "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
       "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=",
       "dev": true
     },
@@ -10727,8 +10920,13 @@
     },
     "purgecss": {
       "version": "4.0.3",
+<<<<<<< HEAD
       "resolved": "https://registry.npm.taobao.org/purgecss/download/purgecss-4.0.3.tgz",
       "integrity": "sha1-gUe0KfnAnbcZ4F1kkI6otnKRN0I=",
+=======
+      "resolved": "https://registry.npmjs.org/purgecss/-/purgecss-4.0.3.tgz",
+      "integrity": "sha512-PYOIn5ibRIP34PBU9zohUcCI09c7drPJJtTDAc0Q6QlRz2/CHQ8ywGLdE7ZhxU2VTqB7p5wkvj5Qcm05Rz3Jmw==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
       "dev": true,
       "requires": {
         "commander": "^6.0.0",
@@ -10739,14 +10937,24 @@
       "dependencies": {
         "commander": {
           "version": "6.2.1",
+<<<<<<< HEAD
           "resolved": "https://registry.nlark.com/commander/download/commander-6.2.1.tgz",
           "integrity": "sha1-B5LraC37wyWZm7K4T93duhEKxzw=",
+=======
+          "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
+          "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
           "dev": true
         },
         "postcss": {
           "version": "8.3.8",
+<<<<<<< HEAD
           "resolved": "https://registry.npmmirror.com/postcss/download/postcss-8.3.8.tgz?cache=0&sync_timestamp=1632555261973&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fpostcss%2Fdownload%2Fpostcss-8.3.8.tgz",
           "integrity": "sha1-nr4qEnOWtLRXCun3dw5/uD2yusE=",
+=======
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.8.tgz",
+          "integrity": "sha512-GT5bTjjZnwDifajzczOC+r3FI3Cu+PgPvrsjhQdRqa2kTJ4968/X9CUce9xttIB0xOs5c6xf0TCWZo/y9lF6bA==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
           "dev": true,
           "requires": {
             "nanocolors": "^0.2.2",
@@ -10813,14 +11021,14 @@
     },
     "queue-microtask": {
       "version": "1.2.3",
-      "resolved": "https://registry.npm.taobao.org/queue-microtask/download/queue-microtask-1.2.3.tgz?cache=0&sync_timestamp=1616391471040&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fqueue-microtask%2Fdownload%2Fqueue-microtask-1.2.3.tgz",
-      "integrity": "sha1-SSkii7xyTfrEPg77BYyve2z7YkM=",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
       "dev": true
     },
     "quick-lru": {
       "version": "5.1.1",
-      "resolved": "https://registry.nlark.com/quick-lru/download/quick-lru-5.1.1.tgz",
-      "integrity": "sha1-NmST5rPkKjpoheLpnRj4D7eoyTI=",
+      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
+      "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
       "dev": true
     },
     "randombytes": {
@@ -10981,8 +11189,8 @@
     },
     "reduce-css-calc": {
       "version": "2.1.8",
-      "resolved": "https://registry.npm.taobao.org/reduce-css-calc/download/reduce-css-calc-2.1.8.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Freduce-css-calc%2Fdownload%2Freduce-css-calc-2.1.8.tgz",
-      "integrity": "sha1-fvh2GijWFJgNwMmC93LJP3qZ3gM=",
+      "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-2.1.8.tgz",
+      "integrity": "sha512-8liAVezDmUcH+tdzoEGrhfbGcP7nOV4NkGE3a74+qqvE7nt9i4sKLGBuZNOnpI4WiGksiNPklZxva80061QiPg==",
       "dev": true,
       "requires": {
         "css-unit-converter": "^1.1.1",
@@ -10991,8 +11199,13 @@
       "dependencies": {
         "postcss-value-parser": {
           "version": "3.3.1",
+<<<<<<< HEAD
           "resolved": "https://registry.nlark.com/postcss-value-parser/download/postcss-value-parser-3.3.1.tgz",
           "integrity": "sha1-n/giVH4okyE88cMO+lGsX9G6goE=",
+=======
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
           "dev": true
         }
       }
@@ -11313,8 +11526,13 @@
     },
     "resolve-from": {
       "version": "4.0.0",
+<<<<<<< HEAD
       "resolved": "https://registry.nlark.com/resolve-from/download/resolve-from-4.0.0.tgz",
       "integrity": "sha1-SrzYUq0y3Xuqv+m0DgCjbbXzkuY=",
+=======
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
       "dev": true
     },
     "resolve-url": {
@@ -11347,8 +11565,8 @@
     },
     "reusify": {
       "version": "1.0.4",
-      "resolved": "https://registry.npm.taobao.org/reusify/download/reusify-1.0.4.tgz",
-      "integrity": "sha1-kNo4Kx4SbvwCFG6QhFqI2xKSXXY=",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
       "dev": true
     },
     "rgb-regex": {
@@ -11382,8 +11600,13 @@
     },
     "run-parallel": {
       "version": "1.2.0",
+<<<<<<< HEAD
       "resolved": "https://registry.nlark.com/run-parallel/download/run-parallel-1.2.0.tgz",
       "integrity": "sha1-ZtE2jae9+SHrnZW9GpIp5/IaQ+4=",
+=======
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
       "dev": true,
       "requires": {
         "queue-microtask": "^1.2.2"
@@ -12577,8 +12800,8 @@
     },
     "tailwindcss": {
       "version": "npm:@tailwindcss/postcss7-compat@2.2.16",
-      "resolved": "https://registry.npmmirror.com/@tailwindcss/postcss7-compat/download/@tailwindcss/postcss7-compat-2.2.16.tgz",
-      "integrity": "sha1-ukFD4l4JJvxdsKK0WaOzTb+BWP8=",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/postcss7-compat/-/postcss7-compat-2.2.16.tgz",
+      "integrity": "sha512-k+f6DL1KxG0d2dEUILxytWpHRBPMagQ8wUdH5bJUzbmv7TPd3yriR+nSOXy2Hcvt79cP3Lgc5J6oPjO4PNyRLg==",
       "dev": true,
       "requires": {
         "arg": "^5.0.1",
@@ -12620,14 +12843,24 @@
       "dependencies": {
         "@nodelib/fs.stat": {
           "version": "2.0.5",
+<<<<<<< HEAD
           "resolved": "https://registry.nlark.com/@nodelib/fs.stat/download/@nodelib/fs.stat-2.0.5.tgz?cache=0&sync_timestamp=1622792616417&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40nodelib%2Ffs.stat%2Fdownload%2F%40nodelib%2Ffs.stat-2.0.5.tgz",
           "integrity": "sha1-W9Jir5Tp0lvR5xsF3u1Eh2oiLos=",
+=======
+          "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+          "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
           "dev": true
         },
         "ansi-styles": {
           "version": "4.3.0",
+<<<<<<< HEAD
           "resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1618995588464&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz",
           "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
+=======
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
           "dev": true,
           "requires": {
             "color-convert": "^2.0.1"
@@ -12635,8 +12868,13 @@
         },
         "braces": {
           "version": "3.0.2",
+<<<<<<< HEAD
           "resolved": "https://registry.nlark.com/braces/download/braces-3.0.2.tgz",
           "integrity": "sha1-NFThpGLujVmeI23zNs2epPiv4Qc=",
+=======
+          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
           "dev": true,
           "requires": {
             "fill-range": "^7.0.1"
@@ -12644,8 +12882,13 @@
         },
         "chalk": {
           "version": "4.1.2",
+<<<<<<< HEAD
           "resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.2.tgz?cache=0&sync_timestamp=1627646655305&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fchalk%2Fdownload%2Fchalk-4.1.2.tgz",
           "integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
+=======
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -12654,8 +12897,13 @@
         },
         "color": {
           "version": "4.0.1",
+<<<<<<< HEAD
           "resolved": "https://registry.nlark.com/color/download/color-4.0.1.tgz?cache=0&sync_timestamp=1628104040071&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcolor%2Fdownload%2Fcolor-4.0.1.tgz",
           "integrity": "sha1-Id9EzRAkWpGxzPW6AxYJsOEOfWc=",
+=======
+          "resolved": "https://registry.npmjs.org/color/-/color-4.0.1.tgz",
+          "integrity": "sha512-rpZjOKN5O7naJxkH2Rx1sZzzBgaiWECc6BYXjeCE6kF0kcASJYbUq02u7JqIHwCb/j3NhV+QhRL2683aICeGZA==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
           "dev": true,
           "requires": {
             "color-convert": "^2.0.1",
@@ -12664,8 +12912,13 @@
         },
         "color-convert": {
           "version": "2.0.1",
+<<<<<<< HEAD
           "resolved": "https://registry.nlark.com/color-convert/download/color-convert-2.0.1.tgz",
           "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
+=======
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
           "dev": true,
           "requires": {
             "color-name": "~1.1.4"
@@ -12673,14 +12926,19 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz",
-          "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
         "cosmiconfig": {
           "version": "7.0.1",
+<<<<<<< HEAD
           "resolved": "https://registry.nlark.com/cosmiconfig/download/cosmiconfig-7.0.1.tgz?cache=0&sync_timestamp=1629586119976&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcosmiconfig%2Fdownload%2Fcosmiconfig-7.0.1.tgz",
           "integrity": "sha1-cU11ZSLKzoZ4Z8y0R0xdAbuuXW0=",
+=======
+          "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
+          "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
           "dev": true,
           "requires": {
             "@types/parse-json": "^4.0.0",
@@ -12692,8 +12950,8 @@
         },
         "fast-glob": {
           "version": "3.2.7",
-          "resolved": "https://registry.nlark.com/fast-glob/download/fast-glob-3.2.7.tgz",
-          "integrity": "sha1-/Wy3otfpqnp4RhEehaGW1rL3ZqE=",
+          "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz",
+          "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==",
           "dev": true,
           "requires": {
             "@nodelib/fs.stat": "^2.0.2",
@@ -12705,8 +12963,13 @@
           "dependencies": {
             "glob-parent": {
               "version": "5.1.2",
+<<<<<<< HEAD
               "resolved": "https://registry.nlark.com/glob-parent/download/glob-parent-5.1.2.tgz?cache=0&sync_timestamp=1626760165717&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fglob-parent%2Fdownload%2Fglob-parent-5.1.2.tgz",
               "integrity": "sha1-hpgyxYA0/mikCTwX3BXoNA2EAcQ=",
+=======
+              "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+              "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
               "dev": true,
               "requires": {
                 "is-glob": "^4.0.1"
@@ -12716,8 +12979,8 @@
         },
         "fill-range": {
           "version": "7.0.1",
-          "resolved": "https://registry.npm.taobao.org/fill-range/download/fill-range-7.0.1.tgz",
-          "integrity": "sha1-GRmmp8df44ssfHflGYU12prN2kA=",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
           "dev": true,
           "requires": {
             "to-regex-range": "^5.0.1"
@@ -12725,8 +12988,8 @@
         },
         "fs-extra": {
           "version": "10.0.0",
-          "resolved": "https://registry.nlark.com/fs-extra/download/fs-extra-10.0.0.tgz",
-          "integrity": "sha1-n/YbZV3eU/s0qC34S7IUzoAuF8E=",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
+          "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
           "dev": true,
           "requires": {
             "graceful-fs": "^4.2.0",
@@ -12736,8 +12999,13 @@
         },
         "glob-parent": {
           "version": "6.0.1",
+<<<<<<< HEAD
           "resolved": "https://registry.nlark.com/glob-parent/download/glob-parent-6.0.1.tgz?cache=0&sync_timestamp=1626760165717&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fglob-parent%2Fdownload%2Fglob-parent-6.0.1.tgz",
           "integrity": "sha1-QgVPaF62pE56fRialu+kClSXGqc=",
+=======
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.1.tgz",
+          "integrity": "sha512-kEVjS71mQazDBHKcsq4E9u/vUzaLcw1A8EtUeydawvIWQCJM0qQ08G1H7/XTjFUulla6XQiDOG6MXSaG0HDKog==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
           "dev": true,
           "requires": {
             "is-glob": "^4.0.1"
@@ -12745,14 +13013,24 @@
         },
         "has-flag": {
           "version": "4.0.0",
+<<<<<<< HEAD
           "resolved": "https://registry.nlark.com/has-flag/download/has-flag-4.0.0.tgz?cache=0&sync_timestamp=1626715907927&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-flag%2Fdownload%2Fhas-flag-4.0.0.tgz",
           "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
+=======
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
           "dev": true
         },
         "import-cwd": {
           "version": "3.0.0",
+<<<<<<< HEAD
           "resolved": "https://registry.nlark.com/import-cwd/download/import-cwd-3.0.0.tgz",
           "integrity": "sha1-IIRVR3GAFRJuqbNna3WS+4vUz5I=",
+=======
+          "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-3.0.0.tgz",
+          "integrity": "sha512-4pnzH16plW+hgvRECbDWpQl3cqtvSofHWh44met7ESfZ8UZOWWddm8hEyDTqREJ9RbYHY8gi8DqmaelApoOGMg==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
           "dev": true,
           "requires": {
             "import-from": "^3.0.0"
@@ -12760,8 +13038,8 @@
         },
         "import-from": {
           "version": "3.0.0",
-          "resolved": "https://registry.nlark.com/import-from/download/import-from-3.0.0.tgz",
-          "integrity": "sha1-BVz+w4zVon2AV8pRN219O/CJGWY=",
+          "resolved": "https://registry.npmjs.org/import-from/-/import-from-3.0.0.tgz",
+          "integrity": "sha512-CiuXOFFSzkU5x/CR0+z7T91Iht4CXgfCxVOFRhh2Zyhg5wOpWvvDLQUsWl+gcN+QscYBjez8hDCt85O7RLDttQ==",
           "dev": true,
           "requires": {
             "resolve-from": "^5.0.0"
@@ -12769,14 +13047,19 @@
         },
         "is-number": {
           "version": "7.0.0",
-          "resolved": "https://registry.npm.taobao.org/is-number/download/is-number-7.0.0.tgz",
-          "integrity": "sha1-dTU0W4lnNNX4DE0GxQlVUnoU8Ss=",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
           "dev": true
         },
         "jsonfile": {
           "version": "6.1.0",
+<<<<<<< HEAD
           "resolved": "https://registry.npm.taobao.org/jsonfile/download/jsonfile-6.1.0.tgz?cache=0&sync_timestamp=1604161876665&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjsonfile%2Fdownload%2Fjsonfile-6.1.0.tgz",
           "integrity": "sha1-vFWyY0eTxnnsZAMJTrE2mKbsCq4=",
+=======
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+          "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
           "dev": true,
           "requires": {
             "graceful-fs": "^4.1.6",
@@ -12785,8 +13068,13 @@
         },
         "micromatch": {
           "version": "4.0.4",
+<<<<<<< HEAD
           "resolved": "https://registry.nlark.com/micromatch/download/micromatch-4.0.4.tgz",
           "integrity": "sha1-iW1Rnf6dsl/OlM63pQCRm/iB6/k=",
+=======
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
+          "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
           "dev": true,
           "requires": {
             "braces": "^3.0.1",
@@ -12795,8 +13083,8 @@
         },
         "postcss-load-config": {
           "version": "3.1.0",
-          "resolved": "https://registry.nlark.com/postcss-load-config/download/postcss-load-config-3.1.0.tgz",
-          "integrity": "sha1-05xHCRxK7Df1AnI3OmpkjvXpeCk=",
+          "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.0.tgz",
+          "integrity": "sha512-ipM8Ds01ZUophjDTQYSVP70slFSYg3T0/zyfII5vzhN6V57YSxMgG5syXuwi5VtS8wSf3iL30v0uBdoIVx4Q0g==",
           "dev": true,
           "requires": {
             "import-cwd": "^3.0.0",
@@ -12806,14 +13094,24 @@
         },
         "resolve-from": {
           "version": "5.0.0",
+<<<<<<< HEAD
           "resolved": "https://registry.nlark.com/resolve-from/download/resolve-from-5.0.0.tgz",
           "integrity": "sha1-w1IlhD3493bfIcV1V7wIfp39/Gk=",
+=======
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+          "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
           "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
+<<<<<<< HEAD
           "resolved": "https://registry.nlark.com/supports-color/download/supports-color-7.2.0.tgz",
           "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
+=======
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
           "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
@@ -12821,8 +13119,13 @@
         },
         "to-regex-range": {
           "version": "5.0.1",
+<<<<<<< HEAD
           "resolved": "https://registry.nlark.com/to-regex-range/download/to-regex-range-5.0.1.tgz",
           "integrity": "sha1-FkjESq58jZiKMmAY7XL1tN0DkuQ=",
+=======
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
           "dev": true,
           "requires": {
             "is-number": "^7.0.0"
@@ -12830,8 +13133,13 @@
         },
         "universalify": {
           "version": "2.0.0",
+<<<<<<< HEAD
           "resolved": "https://registry.npm.taobao.org/universalify/download/universalify-2.0.0.tgz?cache=0&sync_timestamp=1603180004159&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Funiversalify%2Fdownload%2Funiversalify-2.0.0.tgz",
           "integrity": "sha1-daSYTv7cSwiXXFrrc/Uw0C3yVxc=",
+=======
+          "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+          "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
           "dev": true
         }
       }
@@ -13058,8 +13366,13 @@
     },
     "tmp": {
       "version": "0.2.1",
+<<<<<<< HEAD
       "resolved": "https://registry.nlark.com/tmp/download/tmp-0.2.1.tgz",
       "integrity": "sha1-hFf8MDfc9HGcJRNnoa9lAO4czxQ=",
+=======
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
+      "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
       "dev": true,
       "requires": {
         "rimraf": "^3.0.0"
@@ -13067,8 +13380,8 @@
       "dependencies": {
         "rimraf": {
           "version": "3.0.2",
-          "resolved": "https://registry.npm.taobao.org/rimraf/download/rimraf-3.0.2.tgz",
-          "integrity": "sha1-8aVAK6YiCtUswSgrrBrjqkn9Bho=",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+          "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
           "dev": true,
           "requires": {
             "glob": "^7.1.3"
@@ -13745,6 +14058,11 @@
       "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
       "dev": true
     },
+    "vconsole": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/vconsole/-/vconsole-3.0.0.tgz",
+      "integrity": "sha1-VMo4cmd+j69uQv37YREQkkLj8Js="
+    },
     "vendors": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.4.tgz",
@@ -14736,8 +15054,13 @@
     },
     "yaml": {
       "version": "1.10.2",
+<<<<<<< HEAD
       "resolved": "https://registry.nlark.com/yaml/download/yaml-1.10.2.tgz",
       "integrity": "sha1-IwHF/78StGfejaIzOkWeKeeSDks=",
+=======
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+>>>>>>> c7a57c715e8d4d1b498324c7ad8b337758429aad
       "dev": true
     },
     "yargs": {

package.json

@@ -25,6 +25,7 @@
     "secp256k1": "^4.0.2",
     "uuid": "^8.3.2",
     "vant": "^3.2.0",
+    "vconsole": "^3.0.0",
     "vue": "^3.0.0",
     "vue-cropperjs": "^5.0.0",
     "vue-router": "^4.0.0-0",

src/App.vue

 <template>
-  <van-config-provider :theme-vars="themeVars">
+  <van-config-provider :theme-vars="{ skeletonRowBackgroundColor: '#bfbfbf', }">
     <div id="nav" class="bg-app-bg min-h-screen">
       <router-view />
     </div>
@@ -13,7 +13,6 @@ import FzmMessageProtocol from "@/utils/fzm-message-protocol";
 import { generateToken } from "./utils/generateToken/generate-token";
 import { defineComponent, onBeforeUnmount, onMounted, watch } from "vue";
 import decodeChatMessage from "./utils/fzm-message-protocol-chat/decodeChatMessage";
-import { messageStore } from "./store/messagesStore";
 import ChatDBService from "@/db/ChatDBService"
 import { getMasterIdFromDisplayMsg, getTargetIdFromDisplayMsg } from "./utils/chatutils";
 import isChattingWith from "./utils/isChattingWith";
@@ -27,7 +26,6 @@ import router from "./router";
 import { useRoute } from "vue-router";
 
 
-
 export default defineComponent({
   setup() {
 
@@ -104,7 +102,7 @@ export default defineComponent({
         };
 
         console.log(displayMsg, 'in receive');
-        
+
         msg && displayMsg && (ChatDBService.getInstance().handleEveryReceive({
           msg: displayMsg,
           masterId: getMasterIdFromDisplayMsg(displayMsg),
@@ -126,9 +124,6 @@ export default defineComponent({
       connectionState.connection?.disconnect();
     });
     return {
-      themeVars: {
-        skeletonRowBackgroundColor: '#bfbfbf',
-      },
     }
   }
 })

src/components/Mine/Branch/branch.vue

@@ -77,34 +77,12 @@
       <p class="w-1/2 border-r border-gray-300 mb-0" @click="handleClickChatWithClientManager">联系客服</p>
       <p class="w-1/2 mb-0" :class="isOpen ? 'text-app-blue' : 'text-gray-800'" @click="toCall">电话咨询</p>
     </div>
-    <van-popup v-model:show="show" round teleport="body" :style="{ width: '90%', top: '80%' }">
-      <div class="text-center py-4" @click="handleClickCall">
-        <icon
-          name="icon-a-dianhua"
-          color="#3E4FAF"
-          size="17"
-          class="inline-block pr-3 align-text-bottom"
-        />
-        <span class="text-app-blue text-sm align-middle font-semibold">呼叫95533</span>
-      </div>
-    </van-popup>
-    <van-popup
-      v-model:show="show"
-      round
-      :style="{ width: '90%', margin: '60px auto 0px auto', top: '80%' }"
-      teleport="body"
-      :overlay="false"
-    >
-      <div
-        class="text-app-blue text-sm font-semibold border-t border-gray-200 text-center py-4"
-        @click="show = false"
-      >取消</div>
-    </van-popup>
+    <show-call :show="show" :phone="phone" @hidden="hidden" />
   </div>
 </template>
 
 <script lang="ts" setup>
-import { computed, PropType, ref } from 'vue'
+import { computed, defineComponent, PropType, ref } from 'vue'
 import Icon from "@/components/common/Icon.vue"
 import { transfterStrToDate } from '@/utils/transfer'
 import AddressService from '@/service/AddressService'
@@ -114,9 +92,14 @@ import jsBridge from "@/utils/jsBridge2"
 import UserService from '@/service/UserService'
 import { authCheck } from '@/utils/authCheck'
 import router from '@/router'
+import ShowCall from '@/components/showCall/index.vue'
 
 const addressService = new AddressService()
 
+const components = defineComponent({
+  ShowCall
+})
+
 const props = defineProps({
   changeable: {
     type: Boolean,
@@ -207,23 +190,24 @@ const getErrorNote = () => {
 getErrorNote()
 
 let show = ref(false)
+const phone = ref('')
 const toCall = () => {
-  if (isOpen) {
-    show.value = true
-  }
+  authCheck(async () => {
+    const ret = await UserService.getInstance().contact_custom_service({
+      outLetID: props.outlet_id as number
+    })
+    if (ret.code === 200) {
+      phone.value = ret.data.phone
+      show.value = true
+    }
+  })
 }
 
-const handleClickCall = async () => {
-  const ret = await UserService.getInstance().contact_custom_service({
-    outLetID: props.outlet_id as number
-  })
-  if (ret.code === 200) {
-    new jsBridge().bridge_call(ret.data.phone, () => {
-      show.value = false;
-    })
-  }
+const hidden = (v: boolean) => {
+  show.value = v
 }
 
+
 const handleClickNagigate = () => {
   new jsBridge().bridge_navigate(`${props.longitude},${props.latitude}`, () => {
     show.value = false;

src/components/showCall/index.vue

+<template>
+  <div>
+    <van-popup v-model:show="show" round teleport="body" :style="{ width: '90%', top: '80%' }" @click-overlay="hide">
+    <div class="text-center py-4" @click="handleClickCall">
+      <icon
+        name="icon-a-dianhua"
+        color="#3E4FAF"
+        size="17"
+        class="inline-block pr-3 align-text-bottom"
+      />
+      <span class="text-app-blue text-sm align-middle font-semibold">呼叫{{ phone }}</span>
+    </div>
+  </van-popup>
+  <van-popup
+      v-model:show="show"
+      round
+      :style="{ width: '90%', margin: '60px auto 0px auto', top: '80%' }"
+      teleport="body"
+      :overlay="false"
+      @click-overlay="hide"
+    >
+      <div
+        class="text-app-blue text-sm font-semibold border-t border-gray-200 text-center py-4"
+        @click="hide"
+      >取消</div>
+    </van-popup>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import Vue, { ComponentInternalInstance, getCurrentInstance } from 'vue'
+import jsBridge from "@/utils/jsBridge2"
+
+const { ctx } = getCurrentInstance() as any
+
+console.log(ctx)
+
+const props = defineProps({
+  show: {
+    type: Boolean,
+    default: false,
+  },
+  phone: {
+    type: String,
+  }
+})
+
+const hide = () => {
+  console.log(ctx, 'ctx')
+  ctx.$emit('hidden', false)
+}
+
+const handleClickCall = async () => {
+  console.log(props.phone)
+  new jsBridge().bridge_call(props.phone, () => {
+    ctx.$emit('hidden', false)
+  })
+}
+
+</script>
\ No newline at end of file

src/db/ChatMessageDB.ts

 import { DisplayMessage, messageStore } from '@/store/messagesStore'
+import { getTargetIdFromDisplayMsg } from '@/utils/chatutils'
 import { MyAppDatabase } from './index'
 
 export default class ChatMessageDB extends MyAppDatabase {
@@ -28,11 +29,32 @@ export default class ChatMessageDB extends MyAppDatabase {
     })
   }
 
-  deleteMsg({ uuid, logid }: { uuid?: string; logid?: string }) {
+  async deleteMsg({ uuid, logid }: { uuid?: string; logid?: string }) {
+    const updateChatList = async (masterId: string, target: string) => {
+      const latestedMsg = await this.getLatestedMessage(masterId, target)
+
+      if (latestedMsg) {
+        /* 如果和target还有聊天消息 */
+        // latestedMsg.content.content
+        this.chatListCard
+          .filter((i) => i.masterId === masterId && i.targetId === target)
+          .modify((i) => (i.content = latestedMsg.content.content as string))
+      } else {
+        /* 如果和target没有聊天消息 */
+        this.chatListCard
+          .filter((i) => i.masterId === masterId && i.targetId === target)
+          .modify((i) => (i.content = ''))
+      }
+    }
+
     if (uuid) {
-      return this.chatMessage.where('uuid').equals(uuid).delete()
+      const item = await this.chatMessage.where('uuid').equals(uuid).first()
+      await this.chatMessage.where('uuid').equals(uuid).delete()
+      item && updateChatList(item?.masterId, getTargetIdFromDisplayMsg(item))
     } else if (logid) {
-      return this.chatMessage.where('logid').equals(logid).delete()
+      const item = await this.chatMessage.where('logid').equals(logid).first()
+      await this.chatMessage.where('logid').equals(logid).delete()
+      item && updateChatList(item?.masterId, getTargetIdFromDisplayMsg(item))
     } else {
       throw new Error('没有uuid或者logid')
     }
@@ -63,6 +85,30 @@ export default class ChatMessageDB extends MyAppDatabase {
       .toArray()
   }
 
+  /* wo获取和ta之间最新的消息 */
+  async getLatestedMessage(from: string, target: string) {
+    const ret = await this.chatMessage
+      .filter((item) => {
+        return (
+          item.masterId === from &&
+          ((item.state === null && target === item.from) ||
+            (item.state !== null && target === item.target))
+        )
+      })
+      .count()
+    console.log(ret, 'show count')
+
+    return this.chatMessage
+      .filter((item) => {
+        return (
+          item.masterId === from &&
+          ((item.state === null && target === item.from) ||
+            (item.state !== null && target === item.target))
+        )
+      })
+      .last()
+  }
+
   deleteMsgGroup(masterId: string, targetId: string) {
     this.chatMessage
       .filter((item) => {

src/db/UserInfoService.ts

+import { iUserinfo } from '@/service/UserService/types'
+import { MyAppDatabase } from './index'
+
+export default class UserInfoDBService {
+  static instance: UserInfoDBService
+  private userInfo: Dexie.Table<iUserinfo, number>
+  static getInstance() {
+    if (!UserInfoDBService.instance) {
+      UserInfoDBService.instance = new UserInfoDBService()
+    }
+    return UserInfoDBService.instance
+  }
+
+  constructor() {
+    const db = new MyAppDatabase()
+    this.userInfo = db.userInfo
+  }
+
+  save(list: iUserinfo[]) {
+    return this.userInfo.bulkAdd(list)
+  }
+
+  async findByList(addressList: string[]) {
+    const list = await this.userInfo
+      .filter((i) => {
+        return addressList.includes(i.addr)
+      })
+      .toArray()
+
+    const notFoundList = addressList.filter(
+      (i) => list.findIndex((item) => item?.addr === i) === -1,
+    )
+    return {
+      foundList: list,
+      notFoundList,
+    }
+  }
+}

src/db/index.ts

 import Dexie from 'dexie'
 import { DisplayMessage } from '@/store/messagesStore'
-import { iContact } from '@/service/UserService/types'
+import { iContact, iUserinfo } from '@/service/UserService/types'
 
 export interface iChatMessage extends DisplayMessage {
-  masterId: string
+  masterId: string // 这条消息展示在谁的页面上
 }
 
 export interface iChatListCard {
@@ -17,19 +17,23 @@ export class MyAppDatabase extends Dexie {
   chatMessage: Dexie.Table<iChatMessage, number>
   chatListCard: Dexie.Table<iChatListCard, number>
   contactPerson: Dexie.Table<iContact, number>
+  userInfo: Dexie.Table<iUserinfo, number>
 
   constructor() {
     super('MyAppDatabase')
 
-    this.version(1).stores({
+    this.version(1.2).stores({
       chatMessage:
         '++id, content, from, uuid, state, uploadProgress, type, datetime, hideDatetime, logid, masterId, readed',
       chatListCard: '++id, masterId, targetId, unreadMsgCount, content',
       contactPerson: '++id, addr, bank, phone, user_name',
+      userInfo: '++id, created_at, phone, remark, user_name, uuid, addr',
     })
 
+
     this.chatMessage = this.table('chatMessage')
     this.chatListCard = this.table('chatListCard')
     this.contactPerson = this.table('contactPerson')
+    this.userInfo = this.table('userInfo')
   }
 }

src/filter/index.ts

@@ -7,7 +7,7 @@ export default {
   filterDistance(distance: string){
     if(!distance) return ''
     const m = Number(distance)
-    const k = (m / 1000).toFixed(2)
+    const k = (m).toFixed(2)
     return `${k}km`
   }
 } as { [key: string]: (...args: any) => any }

src/main.ts

@@ -32,6 +32,8 @@ import '@quasar/extras/eva-icons/eva-icons.css'
 import longPress from '@/plugins/longPress'
 import { format } from '@/utils/time'
 
+
+
 const app = createApp(App)
 app.config.globalProperties.$format = format
 

src/router/index.ts

@@ -35,6 +35,9 @@ const routes: Array<RouteRecordRaw> = [
       {
         path: '/chatList',
         name: 'ChatList',
+        meta: {
+          needAuth: true
+        },
         component: () =>
           import(
             /* webpackChunkName: "chatList" */ '@/views/withMenu/ChatList/index.vue'

src/service/AddressService/index.ts

 import { Toast } from 'vant'
 import baseAxios, { iRet } from '../index'
 import { iNearbyOutLet } from './types'
+import Bridge from '@/utils/jsBridge2'
 class AddressService {
   static instance: AddressService
   static getInstance() {
@@ -11,13 +12,44 @@ class AddressService {
   }
 
   getNearby(data: { bank_code: number; number: number }) {
+    // return baseAxios<iNearbyOutLet[]>({
+    //   method: 'post',
+    //   url: '/address/nearby',
+    //   data: {
+    //     ...data,
+    //     longitude: '120.194393',
+    //     latitude: '30.244417',
+    //   },
+    // })
     return new Promise<iRet<iNearbyOutLet[]>>((resolve) => {
+      function getGps() {
+        new Bridge().bridge_getGps(null, (params: any) => {
+          console.log(params, 'show params')
+
+          const list = params.split(',')
+
+          resolve(
+            baseAxios<iNearbyOutLet[]>({
+              method: 'post',
+              url: '/address/nearby',
+              data: {
+                ...data,
+                longitude: list[0],
+                latitude: list[1],
+              },
+            }),
+          )
+        })
+      }
+
       if ('geolocation' in window.navigator) {
         window.navigator.geolocation.getCurrentPosition(
           (position) => {
             const la = position.coords.latitude.toString()
             const lo = position.coords.longitude.toString()
+            console.log(position, 'position')
             resolve(
+
               baseAxios<iNearbyOutLet[]>({
                 method: 'post',
                 url: '/address/nearby',
@@ -30,11 +62,12 @@ class AddressService {
             )
           },
           (error) => {
-            Toast(error.message)
+            console.log(error)
+            getGps()
           },
         )
       } else {
-        Toast('不支持获取GPS')
+        getGps()
       }
     })
   }

src/service/UserService/index.ts

 import baseAxios from '../index'
-import { iContact } from './types'
+import { iContact, iUserinfo } from './types'
 class UserService {
   static instance: UserService
   static getInstance() {
@@ -23,7 +23,19 @@ class UserService {
       method: 'get',
       params: data,
       paramsSerializer: (data: { addrs: string[] }) => {
-        console.log(data);
+        console.log(data)
+        return `addrs=${data.addrs.toString()}`
+      },
+    })
+  }
+
+  userInfo(data: { addrs: string[] }) {
+    return baseAxios<iUserinfo[]>({
+      url: '/user/user_info',
+      method: 'get',
+      params: data,
+      paramsSerializer: (data: { addrs: string[] }) => {
+        console.log(data)
         return `addrs=${data.addrs.toString()}`
       },
     })

src/service/UserService/types.ts

@@ -4,3 +4,12 @@ export interface iContact {
   phone: string
   user_name: string
 }
+
+export interface iUserinfo {
+  addr: string
+  created_at: number
+  phone: string
+  remark: string
+  user_name: string
+  uuid: string
+}

src/service/index.ts

+import router from '@/router'
 import { getUserMsg } from '@/utils/userMsg'
 import axios, { AxiosRequestConfig } from 'axios'
 import { Toast } from 'vant'
@@ -9,7 +10,13 @@ const baseAxios = axios.create({
 baseAxios.interceptors.response.use(
   (baseRet: AxiosRequestConfig) => {
     const ret = baseRet.data as iRet
-    if (ret.code !== 200) {
+    if ([504, 503].includes(ret.code)) {
+      Toast.fail(ret.msg)
+      localStorage.clear()
+      router.push({
+        name: 'Login',
+      })
+    } else if (ret.code !== 200) {
       Toast.fail(ret.msg)
     }
     return baseRet.data

src/utils/displayName.ts

 import ContactPersonService from '@/db/ContactPersonService'
+import UserInfoDBService from '@/db/UserInfoService'
 import UserService from '@/service/UserService'
 import { iContact } from '@/service/UserService/types'
+import { eRole } from '@/types/roleType'
+import { getUserMsg } from './userMsg'
 
 export const getDisplayNamesFromAddress = async (
   addressList: string[],
 ): Promise<string[]> => {
   /* 数据库查 有结果拿 没结果网上查且存 */
+  const user = getUserMsg()
 
-  const {
-    foundList,
-    notFoundList,
-  } = await ContactPersonService.getInstance().findByList(addressList)
+  let foundList = [] as any[]
+  let notFoundList = [] as any[]
 
-  const fullList = foundList
+  if (user?.role === eRole.user) {
+    const ret = await ContactPersonService.getInstance().findByList(addressList)
+    foundList = ret.foundList
+    notFoundList = ret.notFoundList
+  } else if (user?.role === eRole.staff) {
+    const ret = await UserInfoDBService.getInstance().findByList(addressList)
+    foundList = ret.foundList
+    notFoundList = ret.notFoundList
+  }
+
+  const fullList = (foundList as unknown) as any
 
   if (notFoundList.length !== 0) {
-    const ret = await UserService.getInstance().staffInfo({
-      addrs: notFoundList,
-    })
-    if (ret.code === 200) {
-      const theoseNotFoundList = ret.data.item
-      ContactPersonService.getInstance().save(theoseNotFoundList)
-      fullList.push(...theoseNotFoundList)
+    if (user?.role === eRole.user) {
+      const ret = await UserService.getInstance().staffInfo({
+        addrs: notFoundList,
+      })
+      if (ret.code === 200) {
+        const theoseNotFoundList = ret.data.item
+        ContactPersonService.getInstance().save(theoseNotFoundList)
+        fullList.push(...theoseNotFoundList)
+      }
+    } else if (user?.role === eRole.staff) {
+      const ret = await UserService.getInstance().userInfo({
+        addrs: notFoundList,
+      })
+      if (ret.code === 200) {
+        const theoseNotFoundList = ret.data
+        UserInfoDBService.getInstance().save(theoseNotFoundList)
+        fullList.push(...theoseNotFoundList)
+      }
     }
   }
 
   return addressList.map((item) => {
-    return fullList.find((i) => i?.addr === item)?.user_name || '未知用户'
+    const msg = fullList.find((i: any) => i?.addr === item)
+    return msg?.user_name || msg?.phone
   })
 }

src/utils/jsBridge2.js

@@ -511,5 +511,15 @@ jsBridge.prototype.bridge_navigate = function (params, success) {
     }
 }
 
+/* 跳到导航软件 */
+jsBridge.prototype.bridge_getGps = function (params, success) {
+    if (this.curApp == ANDROID) {
+        dsBridge.call('bridge_getGps', params, success)
+    }
+    else if (this.curApp == IOS) {
+        this.callHandler('bridge_getGps', params, success)
+    }
+}
+
 
 export default jsBridge;

src/utils/transfer.ts

@@ -6,8 +6,8 @@ export function transfterStrToDate(str: string) {
     start = start.replace('：', ':').replace('早上', '').replace('下午', '')
     end = end.replace('：', ':').replace('早上', '').replace('下午', '')
     const d = new Date()
-    start = `${d.getFullYear()} ${d.getMonth() + 1} ${d.getDate()} ${start}`
-    end = `${d.getFullYear()} ${d.getMonth() + 1} ${d.getDate()} ${end}`
+    start = `${d.getFullYear()}/${d.getMonth() + 1}/${d.getDate()} ${start}`
+    end = `${d.getFullYear()}/${d.getMonth() + 1}/${d.getDate()} ${end}`
     const startDate = new Date(start)
     const endDate = new Date(end)
     return [startDate, endDate]

src/views/Chat/Chat.vue

@@ -69,6 +69,8 @@ export default defineComponent({
 
     const optionList = [
       { name: '常用问题', id: 1 },
+      { name: '人工服务', id: 2 },
+      { name: '电话咨询', id: 3 },
     ];
 
     const setShowSentences = (show: boolean) =>
@@ -92,6 +94,10 @@ export default defineComponent({
       } else {
         setShowSentences(false)
       }
+
+      if (selectedChatOption.value === 3) {
+
+      }
     })
 
     const useSentence = (content: string) => {
@@ -150,8 +156,6 @@ export default defineComponent({
     })
 
 
-
-
     return {
       connectionState,
       selected,

src/views/Chat/ChatContentMessage.vue

@@ -12,11 +12,7 @@
 
       <!-- 消息气泡 -->
       <div :class="[{ 'flex-row-reverse': fromMyself }]">
-        <div
-          :class="{ 'text-right': fromMyself }"
-          style="font-size: 12px;font-family: PingFangSC-Regular, PingFang SC;font-weight: 400;color: #adadad;
-          "
-        ></div>
+        <div :class="{ 'text-right': fromMyself }" class="message_"></div>
         <div
           :class="[{ 'flex-row-reverse': fromMyself }]"
           class="flex items-center max-w-chat-msg-bubble"
@@ -157,7 +153,7 @@ export default defineComponent({
 
     const textMsgActions = [
       {
-        text: '删除', cb(data: { content: any, uuid: string, logid?: string }) {
+        text: '删除', cb(data: { content: any, uuid: string, logid?: string, }) {
           ChatMessageDB.getInstance().deleteMsg({ uuid: data.uuid, logid: data.logid });
           const index = messageStore.messages.findIndex(i => {
             return i.uuid === data.uuid
@@ -201,4 +197,12 @@ export default defineComponent({
   },
 });
 
-</script>
\ No newline at end of file
+</script>
+<style scoped>
+.message_ {
+  font-size: 12px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  color: #adadad;
+  font-weight: 400;
+}
+</style>
\ No newline at end of file

src/views/withMenu/tabList.ts

@@ -13,6 +13,7 @@ export default [
     routeName: 'ChatList',
     icon: 'icon-liaotian-dianji',
     roles: [eRole.staff, eRole.user],
+    showNotLogin: true,
   },
   {
     name: '贷款',