diff --git a/CHANGELOG.md b/CHANGELOG.md index 1695c9f..c507a75 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - | 标题栏角色栏全局任务组件新建 | [0500cb4](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/0500cb4) - | 角色栏实现 | [94cd671](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/94cd671) - | 时间轴界面 | [33927e9](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/33927e9) + - | 时间轴修改状态时提示框增加 | [e841392](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/e841392) - | 提交到本地 | [9cbe411](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/9cbe411) - | db store | [6414c4f](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/6414c4f) - | indexedDB | [687394e](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/687394e) diff --git a/package-lock.json b/package-lock.json index 1493ff4..a429842 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=" } } @@ -4310,12 +4237,13 @@ "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-8.0.0.tgz", "integrity": "sha512-XBEqAoESCyGu3daYmWcTC37Dwmjvs0y40UtUO3MMX+Pd/w7jwNFfUKNtxoMFu0u0wcotP+arDpU3JVH54UV79Q==", "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": { @@ -7548,7 +7476,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": { @@ -8852,9 +8780,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", @@ -8865,7 +8793,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" @@ -8884,9 +8812,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" } @@ -14737,11 +14665,7 @@ "version": "6.1.0", "resolved": "https://registry.nlark.com/supports-color/download/supports-color-6.1.0.tgz?cache=0&sync_timestamp=1622293670728&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsupports-color%2Fdownload%2Fsupports-color-6.1.0.tgz", "integrity": "sha1-B2Srxpxj1ayELdSGfo0CXogN+PM=", - "requires": { - "has-flag": "^3.0.0" - } } - } }, "postcss-calc": { "version": "7.0.5", @@ -15033,7 +14957,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" @@ -15091,26 +15015,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": { @@ -15537,26 +15441,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": { @@ -18710,13 +18594,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", @@ -18736,9 +18620,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", @@ -18748,34 +18634,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.npmjs.org/commander/-/commander-6.2.1.tgz", - "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==" - }, "cosmiconfig": { "version": "7.0.0", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz", - "integrity": "sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==", + "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", "import-fresh": "^3.2.1", @@ -19079,7 +18950,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 b173962..d5cddc4 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "@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": "^8.0.0", @@ -92,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", @@ -108,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/common/styles/iconfont.scss b/src/common/styles/iconfont.scss index c2bc945..a1ba791 100644 --- a/src/common/styles/iconfont.scss +++ b/src/common/styles/iconfont.scss @@ -1,10 +1,11 @@ @font-face { - font-family: "custom-icon"; /* Project id 2685595 */ - src: url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAVsAAsAAAAACgAAAAUfAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHFQGYACDHAqGfIV2ATYCJAMQCwoABCAFhQsHURurCMiuMYUxPrWYbZJ11AENNuDWinu9B3343wTPy36/c+WrJmkq4NUbnswqIdo6oyVCh0pjZM3kN/Sb+9vabmY0s5OZwYtCdsO5QNnpi6ia8CLyL4qgGGt7b54+glfxrBKtmXWGqFaCp0B7SiATEr1ANPXvGzvOkmQsS994MvzlXijX3tRv70+uPsD5P2a6+rgS+DYAiUqMLBrYLNryeeZlUwrdgcsp3zK86iB34z4IiBvJJR7XVDYCxyMKmYEvKb1YEAXLkZ6hgJKT8gqiiArC0K2pSryAEPRW3AB48n5e/iSGEiqUpF9oa4fQglNvlF+/krv/O0w+Mra/NDxdQQgY6M1MLnvV2nOSwNYjES+ySM0BlCVK0Wvbz9vn/6foq+JGjX95YJRAMnRukoAZju0YzSLB8HWdBMXXc/oJcJ3MjoIIpAsgJwhUvkUYmwyUFcbgMUNP8NZs7bxRHjnzp3oxW69OvXx796hdkdpN5y5Ebxkdwyy0i/vNo9wbK1Xk1tF54gvn5PfeNWr37ctTr8YwJ4XR/NAFC9xLZaNP2FbujgGf9ZwyD3DnQc33oheKon7aLHNKrdlOcW+0bV5gW7ibN8+jySFrJfPtigKKzb6vTcXsU1BaIFpe6HwCu/HkmhO2hddjq6Os03jJqjnAq0/wSUKsCLT6KWyVajV+esn9acKTJM832i45UpN9vEPRUT/rJt1Vl7sTtltjd1k1fPmx0O7qFsi9o/lcd+Piclq/x9+580euFfJOCmlCHm/aHdDEN/PVN2zf9aPirdu0KH7P0SfDgoYGPQFri6pmqOdydenxe+I+WE4sH5ScnFTZJ+RLfZZHvhxl+quLBcFV4bqiUqj8l3pCPinq2zdJobhZQax0/jn2f2PJLqEkFUKCDGdd67Hz6D/QX4mH+54XSbEkO1wwcsrateiYAnm2zJj4XzyIP9iZJnPb2yQxR7jJ0iyxJGZOZNQb5edFksqISkmx1C8hrsyzYxI92fKrJEUZRVVE8EfIvDkhSo+Dj/vvmGKPBEm+ISJUYzGXqGI63CfMLYviAmXcHlXBldMNmsSZESsm7p81fsPwjGLxrMnDPa52Cvf9K/u+bBkq9nogPMTf6hWWem4in+r5+O+msp5NnqCxc74uZw8BPnaYGyL7iGpFM6qiCGYIzm4BL6ccX5slzxpOHy1i2UhUcchS+VJUpKlS3BzxfVT8lW8BEVPoJtfHVEeU/vg2X8xlNFB4xED/XyMHq8EtAARbEjtvdvYsqQWCpGk26h+cxt/IEQ39nbL/c1x/46efq5IwYTz+IRqY+sd54MMBnGyKATz1lKgWBcCVmPYRGLYoiBsK+MVckPekD2HhPTpEQiGCKqIGTUId6WCEDIFlZBiswbiuOkpvs4eRkFQeNMzEUJTthyrtDZqy+0gHXxEhbMiQYeAH4w4i4biERkws4iCFoBZrGYzpadasM6MQ3WlBrAnXOtdDptNIcUJ6aG6GnEWPS7EEdXyBswSaIdfdCksXk4iQDtNxrAnT9HsxaDSyWDvHtkEaqVsRas+Mi9MVvYmaZk2gCAeiIJAWpsVgGD0ay0znHEJonSwQlgle8XvqQYxORhSuOo8CSzOI47h6MhhMArV4GLKEa4ZmneEqiy6MRAiig1lcrp0eo5mzGjIaNhamvXhSG4iGqLW2sLTLFEcK6aBc9bh80wWvAeL0m3okIhmpSIuvI0TRrSZoRvYm1gwH06zRuOFr7IrwlkFGnIPazkEAAAA=') format('woff2'); + font-family: 'custom-icon'; /* Project id 2685595 */ + src: url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAVsAAsAAAAACgAAAAUfAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHFQGYACDHAqGfIV2ATYCJAMQCwoABCAFhQsHURurCMiuMYUxPrWYbZJ11AENNuDWinu9B3343wTPy36/c+WrJmkq4NUbnswqIdo6oyVCh0pjZM3kN/Sb+9vabmY0s5OZwYtCdsO5QNnpi6ia8CLyL4qgGGt7b54+glfxrBKtmXWGqFaCp0B7SiATEr1ANPXvGzvOkmQsS994MvzlXijX3tRv70+uPsD5P2a6+rgS+DYAiUqMLBrYLNryeeZlUwrdgcsp3zK86iB34z4IiBvJJR7XVDYCxyMKmYEvKb1YEAXLkZ6hgJKT8gqiiArC0K2pSryAEPRW3AB48n5e/iSGEiqUpF9oa4fQglNvlF+/krv/O0w+Mra/NDxdQQgY6M1MLnvV2nOSwNYjES+ySM0BlCVK0Wvbz9vn/6foq+JGjX95YJRAMnRukoAZju0YzSLB8HWdBMXXc/oJcJ3MjoIIpAsgJwhUvkUYmwyUFcbgMUNP8NZs7bxRHjnzp3oxW69OvXx796hdkdpN5y5Ebxkdwyy0i/vNo9wbK1Xk1tF54gvn5PfeNWr37ctTr8YwJ4XR/NAFC9xLZaNP2FbujgGf9ZwyD3DnQc33oheKon7aLHNKrdlOcW+0bV5gW7ibN8+jySFrJfPtigKKzb6vTcXsU1BaIFpe6HwCu/HkmhO2hddjq6Os03jJqjnAq0/wSUKsCLT6KWyVajV+esn9acKTJM832i45UpN9vEPRUT/rJt1Vl7sTtltjd1k1fPmx0O7qFsi9o/lcd+Piclq/x9+580euFfJOCmlCHm/aHdDEN/PVN2zf9aPirdu0KH7P0SfDgoYGPQFri6pmqOdydenxe+I+WE4sH5ScnFTZJ+RLfZZHvhxl+quLBcFV4bqiUqj8l3pCPinq2zdJobhZQax0/jn2f2PJLqEkFUKCDGdd67Hz6D/QX4mH+54XSbEkO1wwcsrateiYAnm2zJj4XzyIP9iZJnPb2yQxR7jJ0iyxJGZOZNQb5edFksqISkmx1C8hrsyzYxI92fKrJEUZRVVE8EfIvDkhSo+Dj/vvmGKPBEm+ISJUYzGXqGI63CfMLYviAmXcHlXBldMNmsSZESsm7p81fsPwjGLxrMnDPa52Cvf9K/u+bBkq9nogPMTf6hWWem4in+r5+O+msp5NnqCxc74uZw8BPnaYGyL7iGpFM6qiCGYIzm4BL6ccX5slzxpOHy1i2UhUcchS+VJUpKlS3BzxfVT8lW8BEVPoJtfHVEeU/vg2X8xlNFB4xED/XyMHq8EtAARbEjtvdvYsqQWCpGk26h+cxt/IEQ39nbL/c1x/46efq5IwYTz+IRqY+sd54MMBnGyKATz1lKgWBcCVmPYRGLYoiBsK+MVckPekD2HhPTpEQiGCKqIGTUId6WCEDIFlZBiswbiuOkpvs4eRkFQeNMzEUJTthyrtDZqy+0gHXxEhbMiQYeAH4w4i4biERkws4iCFoBZrGYzpadasM6MQ3WlBrAnXOtdDptNIcUJ6aG6GnEWPS7EEdXyBswSaIdfdCksXk4iQDtNxrAnT9HsxaDSyWDvHtkEaqVsRas+Mi9MVvYmaZk2gCAeiIJAWpsVgGD0ay0znHEJonSwQlgle8XvqQYxORhSuOo8CSzOI47h6MhhMArV4GLKEa4ZmneEqiy6MRAiig1lcrp0eo5mzGjIaNhamvXhSG4iGqLW2sLTLFEcK6aBc9bh80wWvAeL0m3okIhmpSIuvI0TRrSZoRvYm1gwH06zRuOFr7IrwlkFGnIPazkEAAAA=') + format('woff2'); } .custom-icon { - font-family: "custom-icon" !important; + font-family: 'custom-icon' !important; font-size: 16px; font-style: normal; -webkit-font-smoothing: antialiased; @@ -12,13 +13,13 @@ } .custom-icon-attachment:before { - content: "\e7e1"; + content: '\e7e1'; } .custom-icon-moneycollect:before { - content: "\e7cd"; + content: '\e7cd'; } .custom-icon-C-bxl-redux:before { - content: "\e608"; + content: '\e608'; } diff --git a/src/common/styles/iconfont.ttf b/src/common/styles/iconfont.ttf new file mode 100644 index 0000000..9e533b8 Binary files /dev/null and b/src/common/styles/iconfont.ttf differ diff --git a/src/components/Globals/index.vue b/src/components/Globals/Globals.vue similarity index 87% rename from src/components/Globals/index.vue rename to src/components/Globals/Globals.vue index cc975ee..8869917 100644 --- a/src/components/Globals/index.vue +++ b/src/components/Globals/Globals.vue @@ -1,13 +1,5 @@ - + - + diff --git a/src/components/Roles/component/RoleList.vue b/src/components/Roles/component/RoleList.vue new file mode 100644 index 0000000..261893c --- /dev/null +++ b/src/components/Roles/component/RoleList.vue @@ -0,0 +1,180 @@ + + + + + diff --git a/src/components/TimeLine/TimeLine.vue b/src/components/TimeLine/TimeLine.vue new file mode 100644 index 0000000..b26a662 --- /dev/null +++ b/src/components/TimeLine/TimeLine.vue @@ -0,0 +1,57 @@ + + + + diff --git a/src/components/TimeLine/components/Barrier.vue b/src/components/TimeLine/component/Barrier.vue similarity index 97% rename from src/components/TimeLine/components/Barrier.vue rename to src/components/TimeLine/component/Barrier.vue index 6b140a4..590e4f9 100644 --- a/src/components/TimeLine/components/Barrier.vue +++ b/src/components/TimeLine/component/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/component/TimeBox.vue similarity index 60% rename from src/components/TimeLine/components/TimeBox.vue rename to src/components/TimeLine/component/TimeBox.vue index 7b37490..4994319 100644 --- a/src/components/TimeLine/components/TimeBox.vue +++ b/src/components/TimeLine/component/TimeBox.vue @@ -6,8 +6,8 @@ * @LastEditTime: 2021-07-19 18:54:55 --> @@ -40,9 +41,29 @@ import TimeStatus from './TimeStatus.vue'; export default { name: 'TimeBox', + components: { TimeStatus }, + data() { - return { list: [0, 1, 2, 3] }; + return { list: [0, 1, 2, 0, 1, 2] }; + }, + + methods: { + addTopList() { + this.list.unshift(0, 0, 0); + console.log('this.list: ', this.list); + }, + + addBottomList() { + this.list.push(1, 1, 1); + console.log('this.list: ', this.list); + }, }, }; + + diff --git a/src/components/TimeLine/components/TimeStatus.vue b/src/components/TimeLine/component/TimeStatus.vue similarity index 99% rename from src/components/TimeLine/components/TimeStatus.vue rename to src/components/TimeLine/component/TimeStatus.vue index d51244c..71779ff 100644 --- a/src/components/TimeLine/components/TimeStatus.vue +++ b/src/components/TimeLine/component/TimeStatus.vue @@ -128,5 +128,3 @@ export default { }, }; - - diff --git a/src/components/TimeLine/components/Title.vue b/src/components/TimeLine/component/Title.vue similarity index 100% rename from src/components/TimeLine/components/Title.vue rename to src/components/TimeLine/component/Title.vue diff --git a/src/components/TimeLine/index.vue b/src/components/TimeLine/index.vue deleted file mode 100644 index a0d22a1..0000000 --- a/src/components/TimeLine/index.vue +++ /dev/null @@ -1,42 +0,0 @@ - - - diff --git a/src/components/Tips/index.vue b/src/components/Tips/Tips.vue similarity index 100% rename from src/components/Tips/index.vue rename to src/components/Tips/Tips.vue diff --git a/src/components/Title/Title.vue b/src/components/Title/Title.vue index d25de44..653dab2 100644 --- a/src/components/Title/Title.vue +++ b/src/components/Title/Title.vue @@ -1,21 +1,13 @@ -