diff --git a/CHANGELOG.md b/CHANGELOG.md index a9cb344..f23346b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,18 +8,41 @@ - | 标题栏角色栏全局任务组件新建 | [0500cb4](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/0500cb4) pinch | alloy finger实现图片的pinch放大缩小 | [de01343](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/de01343) 富文本插件 | 富文本插件demo测试 | [ed3d644](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/ed3d644) + - | 标题栏变化 | [c0fcd9d](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/c0fcd9d) + - | 标题栏角色栏全局任务组件新建 | [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) + - | 添加时间轴上下滚动 | [2b81bbc](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/2b81bbc) + - | 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) + 富文本插件 | 富文本插件demo测试 | [ed3d644](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/ed3d644) + pinch | alloy finger实现图片的pinch放大缩小 | [de01343](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/de01343) ### 🎨 代码样式 范围|描述|commitId --|--|-- - | 组件新建 | [89c0035](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/89c0035) + - | 更新代码 | [8c27e68](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/8c27e68) + - | 更新代码 | [1f40a76](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/1f40a76) + - | 任务快捷方式图标增加 | [4aba872](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/4aba872) + - | 日常任务修改 | [dfa7ee2](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/dfa7ee2) + - | 图标修改 | [54bca09](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/54bca09) + - | 无基本变化 | [21ac4bb](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/21ac4bb) + - | 组件新建 | [89c0035](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/89c0035) ### 🐛 Bug 修复 范围|描述|commitId --|--|-- - | 修改main | [749ae9a](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/749ae9a) + - | 角色栏修改 | [19228d6](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/19228d6) + - | 上下滚动时间轴 | [d533a01](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/d533a01) + - | 时间轴上下滑动 | [4d0ae46](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/4d0ae46) + - | 修改角色栏组件 | [a54c601](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/a54c601) + - | 修改main | [749ae9a](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/749ae9a) ### 📝 文档 @@ -40,6 +63,10 @@ - | 组件文件夹新建 | [22bfe7b](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/22bfe7b) - | 组件文件夹新建 | [17bb8c9](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/17bb8c9) - | 组件文件夹新建 | [1421504](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/1421504) + - | 角色栏文字颜色修改 | [215c6b3](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/215c6b3) + - | 组件文件夹新建 | [22bfe7b](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/22bfe7b) + - | 组件文件夹新建 | [17bb8c9](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/17bb8c9) + - | 组件文件夹新建 | [1421504](https://dd.tall.wiki/gitea/wally/TALL-MUI-3/commits/1421504) ### chore @@ -54,4 +81,3 @@ --|--|-- - | !2 基础模板v1.1.0 | [f5e61dd](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/f5e61dd) - | init | [c0f1deb](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/c0f1deb) - diff --git a/package-lock.json b/package-lock.json index 514426c..a429842 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1364,11 +1364,6 @@ } } }, - "@dcloudio/uni-helper-json": { - "version": "1.0.13", - "resolved": "https://registry.npm.taobao.org/@dcloudio/uni-helper-json/download/@dcloudio/uni-helper-json-1.0.13.tgz", - "integrity": "sha1-ToqgYtqu+zDZiXPANaewq2KDKcc=" - }, "@dcloudio/uni-i18n": { "version": "2.0.0-31920210609001", "resolved": "https://registry.nlark.com/@dcloudio/uni-i18n/download/@dcloudio/uni-i18n-2.0.0-31920210609001.tgz?cache=0&sync_timestamp=1624507203745&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40dcloudio%2Funi-i18n%2Fdownload%2F%40dcloudio%2Funi-i18n-2.0.0-31920210609001.tgz", @@ -2287,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" @@ -2375,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", @@ -2404,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", @@ -2415,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", @@ -2440,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", @@ -2461,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=" } } @@ -3334,7 +3256,7 @@ }, "import-cwd": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz", + "resolved": "https://registry.npm.taobao.org/import-cwd/download/import-cwd-2.1.0.tgz", "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=", "dev": true, "requires": { @@ -3343,7 +3265,7 @@ }, "import-from": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz", + "resolved": "https://registry.nlark.com/import-from/download/import-from-2.1.0.tgz", "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=", "dev": true, "requires": { @@ -3488,7 +3410,7 @@ }, "resolve-from": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz", + "resolved": "https://registry.nlark.com/resolve-from/download/resolve-from-3.0.0.tgz", "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", "dev": true }, @@ -4314,21 +4236,20 @@ "version": "8.0.0", "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-8.0.0.tgz", "integrity": "sha512-XBEqAoESCyGu3daYmWcTC37Dwmjvs0y40UtUO3MMX+Pd/w7jwNFfUKNtxoMFu0u0wcotP+arDpU3JVH54UV79Q==", - "dev": true, "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" @@ -4338,7 +4259,6 @@ "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", @@ -4349,7 +4269,6 @@ "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" } @@ -7430,9 +7349,9 @@ "dev": true }, "dayjs": { - "version": "1.10.5", - "resolved": "https://registry.nlark.com/dayjs/download/dayjs-1.10.5.tgz?cache=0&sync_timestamp=1622012271727&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdayjs%2Fdownload%2Fdayjs-1.10.5.tgz", - "integrity": "sha1-VgDfRUj8JFOz8WPrsqu+llzPuYY=" + "version": "1.10.6", + "resolved": "https://registry.nlark.com/dayjs/download/dayjs-1.10.6.tgz", + "integrity": "sha1-KIsqqC8thBimydTfWJjAc3rQKmM=" }, "de-indent": { "version": "1.0.2", @@ -7557,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": { @@ -8861,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", @@ -8874,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" @@ -8893,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" } @@ -14733,15 +14652,20 @@ "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?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=", + } }, "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.npmjs.org/tailwindcss/-/tailwindcss-2.2.4.tgz", - "integrity": "sha512-OdBCPgazNNsknSP+JfrPzkay9aqKjhKtFhbhgxHgvEFdHy/GuRPo2SCJ4w1SFTN8H6FPI4m6qD/Jj20NWY1GkA==", - "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,36 +18634,19 @@ "tmp": "^0.2.1" }, "dependencies": { - "@fullhuman/postcss-purgecss": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/@fullhuman/postcss-purgecss/-/postcss-purgecss-4.0.3.tgz", - "integrity": "sha512-/EnQ9UDWGGqHkn1UKAwSgh+gJHPKmD+Z+5dQ4gWT4qq2NUyez3zqAfZNwFH3eSgmgO+wjTXfhlLchx2M9/K+7Q==", - "dev": true, - "requires": { - "purgecss": "^4.0.3" - } - }, "chalk": { "version": "4.1.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz", - "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==", - "dev": true, + "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=", "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==", - "dev": true - }, "cosmiconfig": { "version": "7.0.0", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz", - "integrity": "sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==", - "dev": true, + "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", @@ -18790,7 +18659,6 @@ "version": "10.0.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz", "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==", - "dev": true, "requires": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", @@ -18801,7 +18669,6 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.0.tgz", "integrity": "sha512-Hdd4287VEJcZXUwv1l8a+vXC1GjOQqXe+VS30w/ypihpcnu9M1n3xeYeJu5CBpeEQj2nAab2xxz28GuA3vp4Ww==", - "dev": true, "requires": { "is-glob": "^4.0.1" } @@ -18810,7 +18677,6 @@ "version": "6.1.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", - "dev": true, "requires": { "graceful-fs": "^4.1.6", "universalify": "^2.0.0" @@ -18819,24 +18685,33 @@ "path-type": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", - "dev": true + "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==" }, "postcss-js": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-3.0.3.tgz", "integrity": "sha512-gWnoWQXKFw65Hk/mi2+WTQTHdPD5UJdDXZmX073EY/B3BWnYjO4F4t0VneTCnCGQ5E5GsCdMkzPaTXwl3r5dJw==", - "dev": true, "requires": { "camelcase-css": "^2.0.1", "postcss": "^8.1.6" + }, + "dependencies": { + "postcss": { + "version": "8.3.5", + "resolved": "https://registry.nlark.com/postcss/download/postcss-8.3.5.tgz", + "integrity": "sha1-mCIWsRNBK8IKhiiekeuZSVKltwk=", + "requires": { + "colorette": "^1.2.2", + "nanoid": "^3.1.23", + "source-map-js": "^0.6.2" + } + } } }, "postcss-nested": { "version": "5.0.5", "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-5.0.5.tgz", "integrity": "sha512-GSRXYz5bccobpTzLQZXOnSOfKl6TwVr5CyAQJUPub4nuRJSOECK5AqurxVgmtxP48p0Kc/ndY/YyS1yqldX0Ew==", - "dev": true, "requires": { "postcss-selector-parser": "^6.0.4" } @@ -18844,26 +18719,35 @@ "postcss-value-parser": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz", - "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==", - "dev": true + "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==" }, "purgecss": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/purgecss/-/purgecss-4.0.3.tgz", "integrity": "sha512-PYOIn5ibRIP34PBU9zohUcCI09c7drPJJtTDAc0Q6QlRz2/CHQ8ywGLdE7ZhxU2VTqB7p5wkvj5Qcm05Rz3Jmw==", - "dev": true, "requires": { "commander": "^6.0.0", "glob": "^7.0.0", "postcss": "^8.2.1", "postcss-selector-parser": "^6.0.2" + }, + "dependencies": { + "postcss": { + "version": "8.3.5", + "resolved": "https://registry.nlark.com/postcss/download/postcss-8.3.5.tgz", + "integrity": "sha1-mCIWsRNBK8IKhiiekeuZSVKltwk=", + "requires": { + "colorette": "^1.2.2", + "nanoid": "^3.1.23", + "source-map-js": "^0.6.2" + } + } } }, "universalify": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", - "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", - "dev": true + "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==" } } }, @@ -19066,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 9f56697..5b02301 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,6 @@ "dependencies": { "@dcloudio/uni-app-plus": "^2.0.0-31920210609001", "@dcloudio/uni-h5": "^2.0.0-31920210609001", - "@dcloudio/uni-helper-json": "*", "@dcloudio/uni-i18n": "^2.0.0-31920210609001", "@dcloudio/uni-mp-360": "^2.0.0-31920210609001", "@dcloudio/uni-mp-alipay": "^2.0.0-31920210609001", @@ -61,16 +60,19 @@ "@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", "core-js": "^3.6.5", - "dayjs": "^1.10.5", "lodash": "^4.17.21", + "dayjs": "^1.10.6", + "postcss": "^7", "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" @@ -92,7 +94,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 +109,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..9013b26 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,3 +1,10 @@ + diff --git a/src/common/styles/iconfont.scss b/src/common/styles/iconfont.scss new file mode 100644 index 0000000..a1ba791 --- /dev/null +++ b/src/common/styles/iconfont.scss @@ -0,0 +1,25 @@ +@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'); +} + +.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 0000000..9e533b8 Binary files /dev/null and b/src/common/styles/iconfont.ttf differ diff --git a/src/components/Globals/Globals.vue b/src/components/Globals/Globals.vue new file mode 100644 index 0000000..8869917 --- /dev/null +++ b/src/components/Globals/Globals.vue @@ -0,0 +1,58 @@ + + + + + diff --git a/src/components/Globals/index.vue b/src/components/Globals/index.vue deleted file mode 100644 index cd00b56..0000000 --- a/src/components/Globals/index.vue +++ /dev/null @@ -1,47 +0,0 @@ - - - - - diff --git a/src/components/Project/Project.vue b/src/components/Project/Project.vue new file mode 100644 index 0000000..6d9bdf1 --- /dev/null +++ b/src/components/Project/Project.vue @@ -0,0 +1,22 @@ + + + diff --git a/src/components/Project/component/TimeBar.vue b/src/components/Project/component/TimeBar.vue new file mode 100644 index 0000000..07e8824 --- /dev/null +++ b/src/components/Project/component/TimeBar.vue @@ -0,0 +1,37 @@ + + + + + diff --git a/src/components/Project/component/TimeLine.vue b/src/components/Project/component/TimeLine.vue new file mode 100644 index 0000000..ea53320 --- /dev/null +++ b/src/components/Project/component/TimeLine.vue @@ -0,0 +1,80 @@ + + + + + diff --git a/src/components/Roles/.gitkeep b/src/components/Roles/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/src/components/Roles/Roles.vue b/src/components/Roles/Roles.vue new file mode 100644 index 0000000..56f7575 --- /dev/null +++ b/src/components/Roles/Roles.vue @@ -0,0 +1,20 @@ + + + + + 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/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/TimeLine.vue b/src/components/TimeLine/TimeLine.vue new file mode 100644 index 0000000..dafa767 --- /dev/null +++ b/src/components/TimeLine/TimeLine.vue @@ -0,0 +1,56 @@ + + + + diff --git a/src/components/TimeLine/component/Barrier.vue b/src/components/TimeLine/component/Barrier.vue new file mode 100644 index 0000000..590e4f9 --- /dev/null +++ b/src/components/TimeLine/component/Barrier.vue @@ -0,0 +1,42 @@ + + + + diff --git a/src/components/TimeLine/component/TimeBox.vue b/src/components/TimeLine/component/TimeBox.vue new file mode 100644 index 0000000..4994319 --- /dev/null +++ b/src/components/TimeLine/component/TimeBox.vue @@ -0,0 +1,69 @@ + + + + + + diff --git a/src/components/TimeLine/component/TimeStatus.vue b/src/components/TimeLine/component/TimeStatus.vue new file mode 100644 index 0000000..71779ff --- /dev/null +++ b/src/components/TimeLine/component/TimeStatus.vue @@ -0,0 +1,130 @@ + + + diff --git a/src/components/TimeLine/component/Title.vue b/src/components/TimeLine/component/Title.vue new file mode 100644 index 0000000..fafec0b --- /dev/null +++ b/src/components/TimeLine/component/Title.vue @@ -0,0 +1,7 @@ + diff --git a/src/components/Tips/Tips.vue b/src/components/Tips/Tips.vue new file mode 100644 index 0000000..18b290f --- /dev/null +++ b/src/components/Tips/Tips.vue @@ -0,0 +1,73 @@ + + + diff --git a/src/components/Title/.gitkeep b/src/components/Title/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/src/components/Title/Title.vue b/src/components/Title/Title.vue new file mode 100644 index 0000000..653dab2 --- /dev/null +++ b/src/components/Title/Title.vue @@ -0,0 +1,43 @@ + + + + diff --git a/src/main.js b/src/main.js index 4b88c18..7b87349 100644 --- a/src/main.js +++ b/src/main.js @@ -1,7 +1,15 @@ +/* + * @Author: aBin + * @email: binbin0314@126.com + * @Date: 2021-07-19 10:09:22 + * @LastEditors: Please set LastEditors + * @LastEditTime: 2021-07-20 14:52:23 + */ import Vue from 'vue'; import App from './App'; import uView from 'uview-ui'; import './common/styles/index.css'; +import store from './store'; //#ifdef H5 import './registerServiceWorker'; @@ -18,7 +26,7 @@ Vue.use(uView); App.mpType = 'app'; -const app = new Vue({ ...App }); +const app = new Vue({ ...App, store }); import request from '@/utils/request.js'; Vue.use(request, app); diff --git a/src/pages.json b/src/pages.json index b9f624f..c6ca2cf 100644 --- a/src/pages.json +++ b/src/pages.json @@ -1,43 +1,48 @@ -{ - "pages": [ - { - "path": "pages/index/index", - "style": { - "navigationBarTitleText": "uni-app" - } - }, - { - "path": "pages/plugin-test/plugin-test", - "style": { - "navigationBarTitleText": "iframe-测试" - } - }, - { - "path": "pages/rich-text/rich-text", - "style": { - "navigationBarTitleText": "rich-text 测试" - } - }, - { - "path": "pages/pinch/pinch", - "style": { - "navigationBarTitleText": "pinch 测试" - } - }, - { - "path": "pages/test/test", - "style": { - "navigationBarTitleText": "test" - } - } - ], - "globalStyle": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "uni-app", - "navigationBarBackgroundColor": "#F8F8F8", - "backgroundColor": "#F8F8F8" - }, - "easycom": { - "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue" - } -} +{ + "pages": [ + { + "path": "pages/index/index", + "style": { + "navigationStyle": "custom" , + "navigationBarTextStyle": "white" + } + }, + { + "path": "pages/plugin-test/plugin-test", + "style": { + "navigationBarTitleText": "iframe-测试" + } + }, + { + "path": "pages/rich-text/rich-text", + "style": { + "navigationBarTitleText": "rich-text 测试" + } + }, + { + "path": "pages/pinch/pinch", + "style": { + "navigationBarTitleText": "pinch 测试" + } + }, + { + "path": "components/Title/Title", + "style": { + "navigationStyle": "custom" , + "navigationBarTextStyle": "white" + } + } + ], + "globalStyle": { + "navigationBarTextStyle": "black", + "navigationBarTitleText": "uni-app", + "navigationBarBackgroundColor": "#F8F8F8", + "backgroundColor": "#F8F8F8" + }, + "easycom": { + "autoscan": true, + "custom": { + "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue" + } + } +} diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index ceb0454..802fd76 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -1,9 +1,19 @@ +