From a54c6015c5d53e21ed9b5fa459c9ae8174bcf534 Mon Sep 17 00:00:00 2001 From: lucky Date: Tue, 20 Jul 2021 14:14:49 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E6=A0=8F=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 3 +- package-lock.json | 319 ++++-------------- package.json | 8 +- src/App.vue | 4 + src/common/styles/iconfont.scss | 24 ++ src/common/styles/iconfont.ttf | Bin 0 -> 2560 bytes src/components/Globals/index.vue | 11 +- src/components/Roles/Roles.vue | 52 +-- src/components/Roles/components/RoleList.vue | 183 ++++++++++ .../TimeLine/components/Barrier.vue | 2 +- .../TimeLine/components/TimeBox.vue | 17 +- .../TimeLine/components/TimeStatus.vue | 14 +- 12 files changed, 322 insertions(+), 315 deletions(-) create mode 100644 src/common/styles/iconfont.scss create mode 100644 src/common/styles/iconfont.ttf create mode 100644 src/components/Roles/components/RoleList.vue diff --git a/CHANGELOG.md b/CHANGELOG.md index 48b7d64..1f19f53 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# 0.1.0 (2021-07-19) +# 0.1.0 (2021-07-20) ### 🌟 新功能 范围|描述|commitId @@ -16,6 +16,7 @@ 范围|描述|commitId --|--|-- - | 更新代码 | [1f40a76](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/1f40a76) + - | 无基本变化 | [21ac4bb](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/21ac4bb) - | 组件新建 | [89c0035](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/89c0035) diff --git a/package-lock.json b/package-lock.json index 03735de..56fdd12 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2282,9 +2282,9 @@ "integrity": "sha1-W9Jir5Tp0lvR5xsF3u1Eh2oiLos=" }, "@nodelib/fs.walk": { - "version": "1.2.7", - "resolved": "https://registry.nlark.com/@nodelib/fs.walk/download/@nodelib/fs.walk-1.2.7.tgz", - "integrity": "sha1-lMI9sY7kZT4Smr0m+wb4cKyeHuI=", + "version": "1.2.8", + "resolved": "https://registry.nlark.com/@nodelib/fs.walk/download/@nodelib/fs.walk-1.2.8.tgz?cache=0&sync_timestamp=1625769855088&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40nodelib%2Ffs.walk%2Fdownload%2F%40nodelib%2Ffs.walk-1.2.8.tgz", + "integrity": "sha1-6Vc36LtnRt3t9pxVaVNJTxlv5po=", "requires": { "@nodelib/fs.scandir": "2.1.5", "fastq": "^1.6.0" @@ -2370,16 +2370,16 @@ "dev": true }, "@tailwindcss/postcss7-compat": { - "version": "2.2.0", - "resolved": "https://registry.nlark.com/@tailwindcss/postcss7-compat/download/@tailwindcss/postcss7-compat-2.2.0.tgz", - "integrity": "sha1-rcXDAfX9XvB5nx1nSZmvEuil/UA=", + "version": "2.2.4", + "resolved": "https://registry.nlark.com/@tailwindcss/postcss7-compat/download/@tailwindcss/postcss7-compat-2.2.4.tgz", + "integrity": "sha1-DltEbpTP34kuT3bOy3A8jWmAUPM=", "requires": { "@fullhuman/postcss-purgecss": "^3.1.3", "arg": "^5.0.0", "autoprefixer": "^9", "bytes": "^3.0.0", "chalk": "^4.1.1", - "chokidar": "^3.5.1", + "chokidar": "^3.5.2", "color": "^3.1.3", "cosmiconfig": "^7.0.0", "detective": "^5.2.0", @@ -2399,7 +2399,7 @@ "postcss": "^7", "postcss-functions": "^3", "postcss-js": "^2", - "postcss-load-config": "^3.0.1", + "postcss-load-config": "^3.1.0", "postcss-nested": "^4", "postcss-selector-parser": "^6.0.6", "postcss-value-parser": "^4.1.0", @@ -2410,20 +2410,6 @@ "tmp": "^0.2.1" }, "dependencies": { - "autoprefixer": { - "version": "9.8.6", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.6.tgz", - "integrity": "sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg==", - "requires": { - "browserslist": "^4.12.0", - "caniuse-lite": "^1.0.30001109", - "colorette": "^1.2.1", - "normalize-range": "^0.1.2", - "num2fraction": "^1.2.2", - "postcss": "^7.0.32", - "postcss-value-parser": "^4.1.0" - } - }, "chalk": { "version": "4.1.1", "resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.1.tgz?cache=0&sync_timestamp=1618995384030&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fchalk%2Fdownload%2Fchalk-4.1.1.tgz", @@ -2435,7 +2421,7 @@ }, "cosmiconfig": { "version": "7.0.0", - "resolved": "https://registry.nlark.com/cosmiconfig/download/cosmiconfig-7.0.0.tgz?cache=0&sync_timestamp=1618846820697&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcosmiconfig%2Fdownload%2Fcosmiconfig-7.0.0.tgz", + "resolved": "https://registry.npm.taobao.org/cosmiconfig/download/cosmiconfig-7.0.0.tgz?cache=0&sync_timestamp=1596312863119&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcosmiconfig%2Fdownload%2Fcosmiconfig-7.0.0.tgz", "integrity": "sha1-75tE13OVnK5j3ezRIt4jhTtg+NM=", "requires": { "@types/parse-json": "^4.0.0", @@ -2456,94 +2442,35 @@ } }, "glob-parent": { - "version": "6.0.0", - "resolved": "https://registry.nlark.com/glob-parent/download/glob-parent-6.0.0.tgz?cache=0&sync_timestamp=1620073245729&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fglob-parent%2Fdownload%2Fglob-parent-6.0.0.tgz", - "integrity": "sha1-+FG1mziOeI86RNY/q1A4KyhZwzw=", + "version": "6.0.1", + "resolved": "https://registry.nlark.com/glob-parent/download/glob-parent-6.0.1.tgz?cache=0&sync_timestamp=1626760200164&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fglob-parent%2Fdownload%2Fglob-parent-6.0.1.tgz", + "integrity": "sha1-QgVPaF62pE56fRialu+kClSXGqc=", "requires": { "is-glob": "^4.0.1" } }, "jsonfile": { "version": "6.1.0", - "resolved": "https://registry.npm.taobao.org/jsonfile/download/jsonfile-6.1.0.tgz?cache=0&sync_timestamp=1604161822397&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjsonfile%2Fdownload%2Fjsonfile-6.1.0.tgz", + "resolved": "https://registry.npm.taobao.org/jsonfile/download/jsonfile-6.1.0.tgz?cache=0&sync_timestamp=1604161933968&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjsonfile%2Fdownload%2Fjsonfile-6.1.0.tgz", "integrity": "sha1-vFWyY0eTxnnsZAMJTrE2mKbsCq4=", "requires": { "graceful-fs": "^4.1.6", "universalify": "^2.0.0" } }, - "parse-json": { - "version": "5.2.0", - "resolved": "https://registry.nlark.com/parse-json/download/parse-json-5.2.0.tgz", - "integrity": "sha1-x2/Gbe5UIxyWKyK8yKcs8vmXU80=", - "requires": { - "@babel/code-frame": "^7.0.0", - "error-ex": "^1.3.1", - "json-parse-even-better-errors": "^2.3.0", - "lines-and-columns": "^1.1.6" - } - }, "path-type": { "version": "4.0.0", - "resolved": "https://registry.npm.taobao.org/path-type/download/path-type-4.0.0.tgz?cache=0&sync_timestamp=1611752074264&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpath-type%2Fdownload%2Fpath-type-4.0.0.tgz", + "resolved": "https://registry.npm.taobao.org/path-type/download/path-type-4.0.0.tgz", "integrity": "sha1-hO0BwKe6OAr+CdkKjBgNzZ0DBDs=" }, - "postcss": { - "version": "7.0.36", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz", - "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==", - "requires": { - "chalk": "^2.4.2", - "source-map": "^0.6.1", - "supports-color": "^6.1.0" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "dependencies": { - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, "postcss-value-parser": { "version": "4.1.0", - "resolved": "https://registry.npm.taobao.org/postcss-value-parser/download/postcss-value-parser-4.1.0.tgz", + "resolved": "https://registry.npm.taobao.org/postcss-value-parser/download/postcss-value-parser-4.1.0.tgz?cache=0&sync_timestamp=1588083303810&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-value-parser%2Fdownload%2Fpostcss-value-parser-4.1.0.tgz", "integrity": "sha1-RD9qIM7WSBor2k+oUypuVdeJoss=" }, "universalify": { "version": "2.0.0", - "resolved": "https://registry.npm.taobao.org/universalify/download/universalify-2.0.0.tgz", + "resolved": "https://registry.npm.taobao.org/universalify/download/universalify-2.0.0.tgz?cache=0&sync_timestamp=1603180048005&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Funiversalify%2Fdownload%2Funiversalify-2.0.0.tgz", "integrity": "sha1-daSYTv7cSwiXXFrrc/Uw0C3yVxc=" } } @@ -4306,48 +4233,23 @@ "integrity": "sha1-bZUX654DDSQ2ZmZR6GvZ9vE1M8k=" }, "autoprefixer": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-8.0.0.tgz", - "integrity": "sha512-XBEqAoESCyGu3daYmWcTC37Dwmjvs0y40UtUO3MMX+Pd/w7jwNFfUKNtxoMFu0u0wcotP+arDpU3JVH54UV79Q==", - "dev": true, + "version": "9.8.6", + "resolved": "https://registry.nlark.com/autoprefixer/download/autoprefixer-9.8.6.tgz?cache=0&sync_timestamp=1626111053301&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fautoprefixer%2Fdownload%2Fautoprefixer-9.8.6.tgz", + "integrity": "sha1-O3NZTKG/kmYyDFrPFYjXTep0IQ8=", "requires": { - "browserslist": "^3.0.0", - "caniuse-lite": "^1.0.30000808", + "browserslist": "^4.12.0", + "caniuse-lite": "^1.0.30001109", + "colorette": "^1.2.1", "normalize-range": "^0.1.2", "num2fraction": "^1.2.2", - "postcss": "^6.0.17", - "postcss-value-parser": "^3.2.3" + "postcss": "^7.0.32", + "postcss-value-parser": "^4.1.0" }, "dependencies": { - "browserslist": { - "version": "3.2.8", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-3.2.8.tgz", - "integrity": "sha512-WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ==", - "dev": true, - "requires": { - "caniuse-lite": "^1.0.30000844", - "electron-to-chromium": "^1.3.47" - } - }, - "postcss": { - "version": "6.0.23", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz", - "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==", - "dev": true, - "requires": { - "chalk": "^2.4.1", - "source-map": "^0.6.1", - "supports-color": "^5.4.0" - } - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } + "postcss-value-parser": { + "version": "4.1.0", + "resolved": "https://registry.npm.taobao.org/postcss-value-parser/download/postcss-value-parser-4.1.0.tgz?cache=0&sync_timestamp=1588083303810&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-value-parser%2Fdownload%2Fpostcss-value-parser-4.1.0.tgz", + "integrity": "sha1-RD9qIM7WSBor2k+oUypuVdeJoss=" } } }, @@ -7552,7 +7454,7 @@ }, "defined": { "version": "1.0.0", - "resolved": "https://registry.nlark.com/defined/download/defined-1.0.0.tgz", + "resolved": "https://registry.npm.taobao.org/defined/download/defined-1.0.0.tgz", "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=" }, "del": { @@ -8856,9 +8758,9 @@ "dev": true }, "fast-glob": { - "version": "3.2.6", - "resolved": "https://registry.nlark.com/fast-glob/download/fast-glob-3.2.6.tgz", - "integrity": "sha1-Q03ZUphFF26gSazJND6CgnZcbho=", + "version": "3.2.7", + "resolved": "https://registry.nlark.com/fast-glob/download/fast-glob-3.2.7.tgz", + "integrity": "sha1-/Wy3otfpqnp4RhEehaGW1rL3ZqE=", "requires": { "@nodelib/fs.stat": "^2.0.2", "@nodelib/fs.walk": "^1.2.3", @@ -8869,7 +8771,7 @@ "dependencies": { "glob-parent": { "version": "5.1.2", - "resolved": "https://registry.nlark.com/glob-parent/download/glob-parent-5.1.2.tgz?cache=0&sync_timestamp=1620073245729&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fglob-parent%2Fdownload%2Fglob-parent-5.1.2.tgz", + "resolved": "https://registry.nlark.com/glob-parent/download/glob-parent-5.1.2.tgz?cache=0&sync_timestamp=1626760200164&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fglob-parent%2Fdownload%2Fglob-parent-5.1.2.tgz", "integrity": "sha1-hpgyxYA0/mikCTwX3BXoNA2EAcQ=", "requires": { "is-glob": "^4.0.1" @@ -8888,9 +8790,9 @@ "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=" }, "fastq": { - "version": "1.11.0", - "resolved": "https://registry.npm.taobao.org/fastq/download/fastq-1.11.0.tgz", - "integrity": "sha1-u5+5VaBxMKkY62PB9RYcwypdCFg=", + "version": "1.11.1", + "resolved": "https://registry.nlark.com/fastq/download/fastq-1.11.1.tgz?cache=0&sync_timestamp=1625393108958&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ffastq%2Fdownload%2Ffastq-1.11.1.tgz", + "integrity": "sha1-XYF1quF9thlH+LFiz8f2MmTSKAc=", "requires": { "reusify": "^1.0.4" } @@ -14728,14 +14630,23 @@ "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=" }, "postcss": { - "version": "8.3.5", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.5.tgz", - "integrity": "sha512-NxTuJocUhYGsMiMFHDUkmjSKT3EdH4/WbGF6GCi1NDGk+vbcUTun4fpbOqaPtD8IIsztA2ilZm2DhYCuyN58gA==", - "dev": true, + "version": "7.0.36", + "resolved": "https://registry.nlark.com/postcss/download/postcss-7.0.36.tgz", + "integrity": "sha1-BW+M/6k5ZiqPWQWVDAfVKFZE38s=", "requires": { - "colorette": "^1.2.2", - "nanoid": "^3.1.23", - "source-map-js": "^0.6.2" + "chalk": "^2.4.2", + "source-map": "^0.6.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.nlark.com/supports-color/download/supports-color-6.1.0.tgz", + "integrity": "sha1-B2Srxpxj1ayELdSGfo0CXogN+PM=", + "requires": { + "has-flag": "^3.0.0" + } + } } }, "postcss-calc": { @@ -15028,7 +14939,7 @@ }, "supports-color": { "version": "5.5.0", - "resolved": "https://registry.nlark.com/supports-color/download/supports-color-5.5.0.tgz?cache=0&sync_timestamp=1622293670728&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsupports-color%2Fdownload%2Fsupports-color-5.5.0.tgz", + "resolved": "https://registry.nlark.com/supports-color/download/supports-color-5.5.0.tgz", "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=", "requires": { "has-flag": "^3.0.0" @@ -15086,26 +14997,6 @@ "requires": { "camelcase-css": "^2.0.1", "postcss": "^7.0.18" - }, - "dependencies": { - "postcss": { - "version": "7.0.36", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz", - "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==", - "requires": { - "chalk": "^2.4.2", - "source-map": "^0.6.1", - "supports-color": "^6.1.0" - } - }, - "supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "requires": { - "has-flag": "^3.0.0" - } - } } }, "postcss-load-config": { @@ -15532,26 +15423,6 @@ "requires": { "postcss": "^7.0.32", "postcss-selector-parser": "^6.0.2" - }, - "dependencies": { - "postcss": { - "version": "7.0.36", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz", - "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==", - "requires": { - "chalk": "^2.4.2", - "source-map": "^0.6.1", - "supports-color": "^6.1.0" - } - }, - "supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "requires": { - "has-flag": "^3.0.0" - } - } } }, "postcss-normalize-charset": { @@ -18705,13 +18576,13 @@ } }, "tailwindcss": { - "version": "2.2.4", - "resolved": "https://registry.nlark.com/tailwindcss/download/tailwindcss-2.2.4.tgz", - "integrity": "sha1-ai4lmx4mElrqp83EeZY/0hfDCLA=", - "dev": true, + "version": "npm:@tailwindcss/postcss7-compat@2.2.4", + "resolved": "https://registry.nlark.com/@tailwindcss/postcss7-compat/download/@tailwindcss/postcss7-compat-2.2.4.tgz", + "integrity": "sha1-DltEbpTP34kuT3bOy3A8jWmAUPM=", "requires": { - "@fullhuman/postcss-purgecss": "^4.0.3", + "@fullhuman/postcss-purgecss": "^3.1.3", "arg": "^5.0.0", + "autoprefixer": "^9", "bytes": "^3.0.0", "chalk": "^4.1.1", "chokidar": "^3.5.2", @@ -18731,9 +18602,11 @@ "node-emoji": "^1.8.1", "normalize-path": "^3.0.0", "object-hash": "^2.2.0", - "postcss-js": "^3.0.3", + "postcss": "^7", + "postcss-functions": "^3", + "postcss-js": "^2", "postcss-load-config": "^3.1.0", - "postcss-nested": "5.0.5", + "postcss-nested": "^4", "postcss-selector-parser": "^6.0.6", "postcss-value-parser": "^4.1.0", "pretty-hrtime": "^1.0.3", @@ -18743,36 +18616,19 @@ "tmp": "^0.2.1" }, "dependencies": { - "@fullhuman/postcss-purgecss": { - "version": "4.0.3", - "resolved": "https://registry.npm.taobao.org/@fullhuman/postcss-purgecss/download/@fullhuman/postcss-purgecss-4.0.3.tgz", - "integrity": "sha1-VdcXEuwceojg0bpfEM5/tqoFvrQ=", - "dev": true, - "requires": { - "purgecss": "^4.0.3" - } - }, "chalk": { "version": "4.1.1", "resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.1.tgz?cache=0&sync_timestamp=1618995384030&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fchalk%2Fdownload%2Fchalk-4.1.1.tgz", "integrity": "sha1-yAs/qyi/Y3HmhjMl7uZ+YYt35q0=", - "dev": true, "requires": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, - "commander": { - "version": "6.2.1", - "resolved": "https://registry.nlark.com/commander/download/commander-6.2.1.tgz?cache=0&sync_timestamp=1624609570521&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcommander%2Fdownload%2Fcommander-6.2.1.tgz", - "integrity": "sha1-B5LraC37wyWZm7K4T93duhEKxzw=", - "dev": true - }, "cosmiconfig": { "version": "7.0.0", "resolved": "https://registry.npm.taobao.org/cosmiconfig/download/cosmiconfig-7.0.0.tgz?cache=0&sync_timestamp=1596312863119&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcosmiconfig%2Fdownload%2Fcosmiconfig-7.0.0.tgz", "integrity": "sha1-75tE13OVnK5j3ezRIt4jhTtg+NM=", - "dev": true, "requires": { "@types/parse-json": "^4.0.0", "import-fresh": "^3.2.1", @@ -18785,7 +18641,6 @@ "version": "10.0.0", "resolved": "https://registry.nlark.com/fs-extra/download/fs-extra-10.0.0.tgz", "integrity": "sha1-n/YbZV3eU/s0qC34S7IUzoAuF8E=", - "dev": true, "requires": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", @@ -18793,10 +18648,9 @@ } }, "glob-parent": { - "version": "6.0.0", - "resolved": "https://registry.nlark.com/glob-parent/download/glob-parent-6.0.0.tgz?cache=0&sync_timestamp=1620073245729&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fglob-parent%2Fdownload%2Fglob-parent-6.0.0.tgz", - "integrity": "sha1-+FG1mziOeI86RNY/q1A4KyhZwzw=", - "dev": true, + "version": "6.0.1", + "resolved": "https://registry.nlark.com/glob-parent/download/glob-parent-6.0.1.tgz?cache=0&sync_timestamp=1626760200164&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fglob-parent%2Fdownload%2Fglob-parent-6.0.1.tgz", + "integrity": "sha1-QgVPaF62pE56fRialu+kClSXGqc=", "requires": { "is-glob": "^4.0.1" } @@ -18805,7 +18659,6 @@ "version": "6.1.0", "resolved": "https://registry.npm.taobao.org/jsonfile/download/jsonfile-6.1.0.tgz?cache=0&sync_timestamp=1604161933968&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjsonfile%2Fdownload%2Fjsonfile-6.1.0.tgz", "integrity": "sha1-vFWyY0eTxnnsZAMJTrE2mKbsCq4=", - "dev": true, "requires": { "graceful-fs": "^4.1.6", "universalify": "^2.0.0" @@ -18814,51 +18667,17 @@ "path-type": { "version": "4.0.0", "resolved": "https://registry.npm.taobao.org/path-type/download/path-type-4.0.0.tgz", - "integrity": "sha1-hO0BwKe6OAr+CdkKjBgNzZ0DBDs=", - "dev": true - }, - "postcss-js": { - "version": "3.0.3", - "resolved": "https://registry.npm.taobao.org/postcss-js/download/postcss-js-3.0.3.tgz", - "integrity": "sha1-LwvTcKLoWZ1FQ59pcEA7WHOr2jM=", - "dev": true, - "requires": { - "camelcase-css": "^2.0.1", - "postcss": "^8.1.6" - } - }, - "postcss-nested": { - "version": "5.0.5", - "resolved": "https://registry.npm.taobao.org/postcss-nested/download/postcss-nested-5.0.5.tgz", - "integrity": "sha1-8KEH0zqfqxHXY3IF9TIeJyI+NgM=", - "dev": true, - "requires": { - "postcss-selector-parser": "^6.0.4" - } + "integrity": "sha1-hO0BwKe6OAr+CdkKjBgNzZ0DBDs=" }, "postcss-value-parser": { "version": "4.1.0", "resolved": "https://registry.npm.taobao.org/postcss-value-parser/download/postcss-value-parser-4.1.0.tgz?cache=0&sync_timestamp=1588083303810&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-value-parser%2Fdownload%2Fpostcss-value-parser-4.1.0.tgz", - "integrity": "sha1-RD9qIM7WSBor2k+oUypuVdeJoss=", - "dev": true - }, - "purgecss": { - "version": "4.0.3", - "resolved": "https://registry.npm.taobao.org/purgecss/download/purgecss-4.0.3.tgz", - "integrity": "sha1-gUe0KfnAnbcZ4F1kkI6otnKRN0I=", - "dev": true, - "requires": { - "commander": "^6.0.0", - "glob": "^7.0.0", - "postcss": "^8.2.1", - "postcss-selector-parser": "^6.0.2" - } + "integrity": "sha1-RD9qIM7WSBor2k+oUypuVdeJoss=" }, "universalify": { "version": "2.0.0", "resolved": "https://registry.npm.taobao.org/universalify/download/universalify-2.0.0.tgz?cache=0&sync_timestamp=1603180048005&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Funiversalify%2Fdownload%2Funiversalify-2.0.0.tgz", - "integrity": "sha1-daSYTv7cSwiXXFrrc/Uw0C3yVxc=", - "dev": true + "integrity": "sha1-daSYTv7cSwiXXFrrc/Uw0C3yVxc=" } } }, @@ -19061,7 +18880,7 @@ }, "tmp": { "version": "0.2.1", - "resolved": "https://registry.npm.taobao.org/tmp/download/tmp-0.2.1.tgz", + "resolved": "https://registry.npm.taobao.org/tmp/download/tmp-0.2.1.tgz?cache=0&sync_timestamp=1588178571895&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftmp%2Fdownload%2Ftmp-0.2.1.tgz", "integrity": "sha1-hFf8MDfc9HGcJRNnoa9lAO4czxQ=", "requires": { "rimraf": "^3.0.0" diff --git a/package.json b/package.json index af1c9d8..39bc353 100644 --- a/package.json +++ b/package.json @@ -59,15 +59,18 @@ "@dcloudio/uni-quickapp-native": "^2.0.0-31920210609001", "@dcloudio/uni-quickapp-webview": "^2.0.0-31920210609001", "@dcloudio/uni-stat": "^2.0.0-31920210609001", - "@tailwindcss/postcss7-compat": "^2.2.0", + "@tailwindcss/postcss7-compat": "^2.2.4", "@vue/shared": "^3.0.0", "alloyfinger": "^0.1.16", + "autoprefixer": "^9.8.6", "core-js": "^3.6.5", "dayjs": "^1.10.5", + "postcss": "^7.0.36", "postcss-loader": "^6.1.1", "regenerator-runtime": "^0.12.1", "register-service-worker": "^1.7.1", "right-pad": "^1.0.1", + "tailwindcss": "npm:@tailwindcss/postcss7-compat@^2.2.4", "uview-ui": "^1.8.4", "vue": "^2.6.11", "vuex": "^3.2.0" @@ -89,7 +92,6 @@ "@vue/cli-plugin-vuex": "~4.5.0", "@vue/cli-service": "~4.5.0", "@vue/eslint-config-prettier": "^6.0.0", - "autoprefixer": "^8.0.0", "babel-eslint": "^10.1.0", "babel-plugin-import": "^1.11.0", "commitizen": "^4.0.3", @@ -105,13 +107,11 @@ "mini-types": "*", "miniprogram-api-typings": "*", "node-sass": "^6.0.0", - "postcss": "^8.3.5", "postcss-class-rename": "^1.0.1", "postcss-comment": "^2.0.0", "prettier": "^2.2.1", "sass": "^1.35.1", "sass-loader": "10", - "tailwindcss": "^2.2.4", "vue-cli-plugin-commitlint": "~1.0.12", "vue-cli-plugin-mock": "^1.0.3", "vue-template-compiler": "^2.6.11" diff --git a/src/App.vue b/src/App.vue index 80d7dc9..8b07e34 100644 --- a/src/App.vue +++ b/src/App.vue @@ -12,6 +12,10 @@ export default { }; + + diff --git a/src/common/styles/iconfont.scss b/src/common/styles/iconfont.scss new file mode 100644 index 0000000..5980953 --- /dev/null +++ b/src/common/styles/iconfont.scss @@ -0,0 +1,24 @@ +@font-face { + font-family: "custom-icon"; /* Project id 2685595 */ + src: url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAVIAAsAAAAACgAAAAT8AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHFQGYACDHAqGfIV2ATYCJAMQCwoABCAFhQsHURurCMiemjwtI2pmiCwWUAUJlGuJ4HG/cl6SpewBK4QiWQZNKEwdsKoWvQqJCnX1H6rTZtX0UiiopKTEFmCawkkhn+jFAfxB9+3X9kyjpjkVIHEV0XTWkH3753TlyywWIqWRGiURCvFCf/6Pma4+rgS+DUCiEiOLBjaLtnyeedmUQnfgcsq3DK86yN24j0C1myf4OP9xwfLPMkmzCpReHETB8axww1mSkyoVxNAVtKFbiyw0AjDSR3gL8Mn7+fjHNiSBpJWBfqHLD64c9vtG8u1PRPRfJCU/0t5fGp6e0ELG9pnJ41G19o5IYNsOUYssUQcBytKV6LXty9vn/xuKvipu1/iXR5YE0QY6d4CA/Zy8YzSLRObXdRKJX8/pJ8AtZHYXHWInEM8RmP6WkOWTmpivmYVZ4wmKcM+ZELE9Jvu5+Vuv9l++vVu0yzhn07kLplvEZvnTUtG/WcSKrVThW8V54gvn5PfeJdp9+3L/VbP8k7SYapyaYgVi4hPMob5jAD3L6ZsA4AU7c5KbPQ0F51Z8TA5NYvaxYpnxU8zaNzHBjnPIWsmkVB8EFJvdX5uK2WJQWiDCp51PKN94cs0JZl13bLUJQcReIvgHKMsTlB0dsaRJeJ/SXtFZbXGaxPc70TSO/1GxzLkjNdnHOxQdVbNuQoZdJm22E+a7CD4VfEyfjCNpfK+Y8mSVzJbT+j2+j0VR+Fra6yTtREcdj9utEUfFU+E3mIR+lDVBxs1Y7zn6pEmrUesJiuh2dfZTz6VY0Nr3vPtgkbdYZ29vF5pS/xL3WYKxWdbwvplZmlZkKB7XYej4L/UEf+KX+nTGYPQs8Zblf/r97LG3V9DHM+s4OHdWMVr7vKp6rbokHq56XhvxR9zbPq3fa9eiY3wk3GOo+3/KbmD9ZKcTpnR9E2KOUMKcsu0knH/Cpd4oteKHhBqFIv6oWkIc6mXH2Bb77B0W8csowoyCP4LrwxNQyx8c998pNT+ihXzboc7T51fpm6pZJatrPMhEoIkJ9uj4XDkdwz8dNlrq3j/SuaHZxR8e6W1mX513EHzfHJX6n9UY5r7iseFvxy2vaKKcM8Jy+KTFb80zicsCiF2ZzPPYwwPHyrJ5JwWKhIbCTHj5X8PyLeDgKdkrc8izLbmH8zDmY+KvNy9xycS4NDQcb/TdF0zeqfrw+r5KEoVm4UaBP877e4cFLjGZQ6Na9V8+RT+gAkPzN88RKW/25zyKjDRNc3HKon9wmn+twna6nPt/ycz1N35VY40TJowH/iEamPrHeYByqOFkUwyU8pSoFgXAjZj2NUCwJaEaCn4xF2Oe9CEcf4+O0DcewaRjFmZ9K8gCdiNb4BiyDU7CapsoSm+zm0REWQVYNYxhmLIfJkM+w2zKfWQBXxEtbGDINlCD1c2wOa5vNbr9BMgJHciqh8Jso9dmFAkbkFFDrfMMN1ZyX0gPzSv0gx0uBRtL6wLnDWr0u1tRVbM5FQrXkCcwCvj9XgylNFAhMHsUNCoQkju1ssorepNRdrliF3yII8gBsnwChQRDWzuHiGAFiKEMK37PDNqwJM6vzqPAsoJ8jrsjgwE2LFnDkDdcDc06w1VV3mycEiJrYHH9dnrAn7MaScNmgIriSXtIICMFLSyuKStSKA/KHY3LVxe8Bir9piVgCIFQCAP1tpC42CrUlC0t1/gpjJQbvibjZ5FVJ4eCXMd+MAY=') format('woff2'); +} + +.custom-icon { + font-family: "custom-icon" !important; + font-size: 16px; + font-style: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.custom-icon-attachment:before { + content: "\e7e1"; +} + +.custom-icon-moneycollect:before { + content: "\e7cd"; +} + +.custom-icon-C-bxl-redux:before { + content: "\e608"; +} diff --git a/src/common/styles/iconfont.ttf b/src/common/styles/iconfont.ttf new file mode 100644 index 0000000000000000000000000000000000000000..9e533b80ea59d292ea8b7d60346623ff37366f38 GIT binary patch literal 2560 zcmd^B?Qc_67=NB~?!6r?bc}VktlQd4ySCf7HYErM42bcqblo~=duMwg zgAAOS_!3OOm>56s(JvT3m>B({5se?w#E+P$k;K3U-x3q!BC`6N+slgv{{qkLIsH9v zzjL1Fxwp4~0N{cZ;LtyPaAv1=K70lMw~_YHzJsas$nx$hB)>-TGx>6E@xwpDyGj0w z=B4@4={b*4`W%42O>?~%WeKW~gC08!&y?XQ)0EY&^&Mz7@^Z7F`ZUk8OF4-RgIy+yf zuK-9EtCSI%e+9~3Sq|TJc-{~|eAoZ1pOrFvg~TRcLQ6w1N$?`o zMGT>J(gjc#A`M}8LO*1I?V8$i2;8NdSpgr#G)5!-9>&tbe2(}Vkw|{R6G?-h*jh<) z<3*5ZyI0v4q`T1g#vdV#6v;qtoQ6#Q9Q)@cXW`QuO*gMw^>~7RLnm+SbkC8A4ew5? zVqz~V!+67lMJq3WW26-s#Oa%|CcOkY$xV$4(N169yk4hT+(Tq-@rXfZ%~EA6t%zkWn+qa?B?~xw7XD&Rs4j!sE+m9{2+J1Bne4W9H@8#sHQWR z#k8M!Na4mvG%}PyeQ+SHdYWyAG1P~mR)8BlewNln#88C0l4qBbYqvP>=1mOc&0~|< z0iSR4+Eve1y)_U(hs)jUab9CA%pLri-`}R|p0(9>pD#T=G2V__gW+!WQA*QNYkv_z zm~-Or`3AC+*>>XCu)!0U@ne(I)8)KI1YyRm1&#zfZnq#An;fUT1j*6dQBi^V&-``1 z5xO7bYlQRmW#Rr z+wLI`iD?QL6w45KZoP{#Iu+m|Q}}34=k3+bo>9(a8CP5`T#<3@**Z1iL`G&ae1^#x zE-@@_CkMV~kG0A?ElH0G_^7oG7g7G4@>iL!vxf+8s3`Lhg`JnA^Gq3GuRO{6Z-0gF zNtZ86T;W$_-XTd*S?b{Om|z)~1dLki6()-Z68PO;q&_$TFHlXg)b$wkSoONm;YMmH zeKL9`5>*^@c~!3;GioM_W8~-vHJtq@YLFRB3#(UEM4$*zy{ayX5Ov7HrNJF^5MkE( z=tQRm#QhYFgxt)bs9uHr>#_VS68N=HTV7N+t?P%i@j(E@b=&pxqhgy5OcDg>~$)uc`DCaRZNb>d~L~i;Bh@V6VbCAJA=)=jP0G;c4je# zp9Nx=7>~2bOZ$f_iBJ#2f#^;>?m52ik=_U&K9*g&bz+m~#wPgAejWi@Nfy70Vs(+! zzziJVw=pMu*v1m!ejCe#ci31VJY{1i#2Rlh;uMU_^hBVvj-&{^2^$zeg%51ZzztVz z%t`;XjU~dr+E@m<32m$p?y#{F4PT@b;SC#r>ZnE8`6(vp^MnxM)_TQ(SE>sHDJCwCk^J&wZ)8?v1S(_s6LaAhEi&f)z zA#Wy&rnxwrN{Ky%KAAVlFacF4Kn_e=XF;Ra&}mv1AP)vqV9r`il1@U6d<-Z<;;!`o z#mtkXMDf-C@Og0LVT!C0JFe-8GRowp2<~3$rJeEQY@U&qjsU literal 0 HcmV?d00001 diff --git a/src/components/Globals/index.vue b/src/components/Globals/index.vue index b0e7ef1..b1555ea 100644 --- a/src/components/Globals/index.vue +++ b/src/components/Globals/index.vue @@ -7,18 +7,19 @@ --> + diff --git a/src/components/Roles/components/RoleList.vue b/src/components/Roles/components/RoleList.vue new file mode 100644 index 0000000..d0c3445 --- /dev/null +++ b/src/components/Roles/components/RoleList.vue @@ -0,0 +1,183 @@ + + + + + diff --git a/src/components/TimeLine/components/Barrier.vue b/src/components/TimeLine/components/Barrier.vue index 23e7610..e00a1ca 100644 --- a/src/components/TimeLine/components/Barrier.vue +++ b/src/components/TimeLine/components/Barrier.vue @@ -28,7 +28,7 @@ export default { margin-bottom: 16rpx; background: #fafafc; color: $uni-text-color; - font-size: 14px; + font-size: 28rpx; position: sticky; top: -1px; left: 0; diff --git a/src/components/TimeLine/components/TimeBox.vue b/src/components/TimeLine/components/TimeBox.vue index 96e9178..6ca204f 100644 --- a/src/components/TimeLine/components/TimeBox.vue +++ b/src/components/TimeLine/components/TimeBox.vue @@ -7,20 +7,27 @@ -->