perf: 合并分支

4 years ago · 0e4f5ccc96
17 changed files with 228 additions and 80 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -23,6 +23,7 @@
 ### 🐛 Bug 修复
 范围|描述|commitId
 --|--|--
+ - | 角色栏修改 | [19228d6](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/19228d6)
 - | 修改角色栏组件 | [a54c601](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/a54c601)
 - | 修改main | [749ae9a](http://gitea@dd.tall.wiki:wally/TALL-MUI-3/commits/749ae9a)

--- a/package-lock.json
+++ b/package-lock.json
@ -3256,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": {
@ -3265,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": {
@ -3410,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
        },
@ -4233,9 +4233,9 @@
      "integrity": "sha1-bZUX654DDSQ2ZmZR6GvZ9vE1M8k="
    },
    "autoprefixer": {
-      "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=",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-8.0.0.tgz",
+      "integrity": "sha512-XBEqAoESCyGu3daYmWcTC37Dwmjvs0y40UtUO3MMX+Pd/w7jwNFfUKNtxoMFu0u0wcotP+arDpU3JVH54UV79Q==",
      "requires": {
        "browserslist": "^4.12.0",
        "caniuse-lite": "^1.0.30001109",
@ -4246,10 +4246,32 @@
        "postcss-value-parser": "^4.1.0"
      },
      "dependencies": {
-        "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="
+        "browserslist": {
+          "version": "3.2.8",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-3.2.8.tgz",
+          "integrity": "sha512-WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ==",
+          "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==",
+          "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==",
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
        }
      }
    },
@ -7327,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",
@ -14641,13 +14663,9 @@
      "dependencies": {
        "supports-color": {
          "version": "6.1.0",
-          "resolved": "https://registry.nlark.com/supports-color/download/supports-color-6.1.0.tgz",
+          "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",
@ -18639,8 +18657,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==",
          "requires": {
            "graceful-fs": "^4.2.0",
            "jsonfile": "^6.0.1",
@ -18648,17 +18666,17 @@
          }
        },
        "glob-parent": {
-          "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=",
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.0.tgz",
+          "integrity": "sha512-Hdd4287VEJcZXUwv1l8a+vXC1GjOQqXe+VS30w/ypihpcnu9M1n3xeYeJu5CBpeEQj2nAab2xxz28GuA3vp4Ww==",
          "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=1604161933968&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==",
          "requires": {
            "graceful-fs": "^4.1.6",
            "universalify": "^2.0.0"
@ -18666,18 +18684,70 @@
        },
        "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="
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+          "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==",
+          "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==",
+          "requires": {
+            "postcss-selector-parser": "^6.0.4"
+          }
        },
        "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="
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
+          "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ=="
+        },
+        "purgecss": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/purgecss/-/purgecss-4.0.3.tgz",
+          "integrity": "sha512-PYOIn5ibRIP34PBU9zohUcCI09c7drPJJtTDAc0Q6QlRz2/CHQ8ywGLdE7ZhxU2VTqB7p5wkvj5Qcm05Rz3Jmw==",
+          "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.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="
+          "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+          "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="
        }
      }
    },
@ -19523,7 +19593,7 @@
        },
        "hash-sum": {
          "version": "2.0.0",
-          "resolved": "https://registry.npm.taobao.org/hash-sum/download/hash-sum-2.0.0.tgz",
+          "resolved": "https://registry.nlark.com/hash-sum/download/hash-sum-2.0.0.tgz",
          "integrity": "sha1-gdAbtd6OpKIUrV1urRtSNGCwtFo=",
          "dev": true,
          "optional": true
--- a/package.json
+++ b/package.json
@ -62,10 +62,10 @@
    "@tailwindcss/postcss7-compat": "^2.2.4",
    "@vue/shared": "^3.0.0",
    "alloyfinger": "^0.1.16",
-    "autoprefixer": "^9.8.6",
+    "autoprefixer": "^8.0.0",
    "core-js": "^3.6.5",
-    "dayjs": "^1.10.5",
-    "postcss": "^7.0.36",
+    "dayjs": "^1.10.6",
+    "postcss": "^7",
    "postcss-loader": "^6.1.1",
    "regenerator-runtime": "^0.12.1",
    "register-service-worker": "^1.7.1",
--- a/src/App.vue
+++ b/src/App.vue
@ -1,3 +1,10 @@
+<!--
+ * @Author: aBin
+ * @email: binbin0314@126.com
+ * @Date: 2021-07-20 09:20:54
+ * @LastEditors: aBin
+ * @LastEditTime: 2021-07-20 09:40:53
+-->
 <script>
 export default {
  onLaunch: function () {
@ -17,5 +24,6 @@ export default {
 </style>

 <style lang="scss">
+@import './common/styles/iconfont.scss';
@import 'uview-ui/index.scss';
 </style>
--- 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,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');
+  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';
 }
--- a/src/components/Globals/index.vue
+++ b/src/components/Globals/index.vue
@ -3,7 +3,7 @@
 * @email: binbin0314@126.com
 * @Date: 2021-07-19 10:52:05
 * @LastEditors: aBin
- * @LastEditTime: 2021-07-19 16:37:35
+ * @LastEditTime: 2021-07-20 14:20:46
 -->
 <template>
  <view>
--- a/src/components/Roles/Roles.vue
+++ b/src/components/Roles/Roles.vue
@ -3,16 +3,12 @@
 * @email: binbin0314@126.com
 * @Date: 2021-07-19 10:52:05
 * @LastEditors: aBin
- * @LastEditTime: 2021-07-19 18:02:10
+ * @LastEditTime: 2021-07-20 10:54:27
 -->
 <template>
-  <view class="wrap">
-    <view class="rolebar">
-      <view>
-        <view class="container">
-          <role-list />
-        </view>
-      </view>
+  <view class="wrap bg-white">
+    <view class="px-4">
+      <role-list />
    </view>
  </view>
 </template>
@ -30,8 +26,4 @@ export default {
 };
 </script>

-<style scoped lang="scss">
-.container {
-  padding: 0 20rpx;
-}
-</style>
+<style scoped lang="scss"></style>
--- a/src/components/Roles/components/RoleList.vue
+++ b/src/components/Roles/components/RoleList.vue
@ -2,7 +2,7 @@
  <view class="wrap">
    <view class="homeBox">
      <scroll-view :enable-flex="true" :scroll-left="scrollLeft" :throttle="false" scroll-with-animation scroll-x>
-        <view class="tabBox u-skeleton">
+        <view class="tabBox">
          <view :key="index" @click="changeIndex(index)" class="tab-item" v-for="(item, index) in roles">
            <view :class="setColor(item.isMine, tabIndex, index)" class="tab-children u-skeleton-rect">{{ item.value }}</view>
          </view>
@ -111,7 +111,7 @@ $max: 100%;
    /* #ifdef MP-TOUTIAO */
    /* #endif */
    .tab-item {
-      padding: 15rpx 24rpx;
+      padding: 20rpx 24rpx;
      position: relative;
      display: inline-block;
      text-align: center;
@ -133,7 +133,7 @@ $max: 100%;
      content: '';
      position: absolute;
      left: 0;
-      bottom: -14rpx;
+      bottom: -20rpx;
      width: 100%;
      height: 6rpx;
      border-radius: 2rpx;
@ -151,7 +151,7 @@ $max: 100%;
      content: '';
      position: absolute;
      left: 0;
-      bottom: -14rpx;
+      bottom: -20rpx;
      width: 100%;
      height: 6rpx;
      border-radius: 2rpx;
--- a/src/components/TimeLine/components/Barrier.vue
+++ b/src/components/TimeLine/components/Barrier.vue
@ -3,7 +3,7 @@
 * @email: binbin0314@126.com
 * @Date: 2021-07-19 14:22:54
 * @LastEditors: aBin
- * @LastEditTime: 2021-07-19 17:01:58
+ * @LastEditTime: 2021-07-20 11:46:04
 -->
 <template>
  <view class>
--- a/src/components/TimeLine/components/TimeBox.vue
+++ b/src/components/TimeLine/components/TimeBox.vue
@ -3,7 +3,7 @@
 * @email: binbin0314@126.com
 * @Date: 2021-07-19 15:36:28
 * @LastEditors: aBin
- * @LastEditTime: 2021-07-19 17:44:18
+ * @LastEditTime: 2021-07-19 18:54:55
 -->
 <template>
  <view class="px-4">
@ -14,7 +14,6 @@
          <view>任务时间栏</view>
          <view>
            <view class="flex justify-between" style="min-width: 180rpx">
-              <!-- <text class="custom-icon custom-icon-attachment"></text> -->
              <u-icon custom-prefix="custom-icon" name="C-bxl-redux" size="34"></u-icon>
              <u-icon custom-prefix="custom-icon" name="attachment" size="42"></u-icon>
              <u-icon custom-prefix="custom-icon" name="moneycollect" size="40"></u-icon>
--- a/src/components/TimeLine/components/TimeStatus.vue
+++ b/src/components/TimeLine/components/TimeStatus.vue
@ -3,7 +3,7 @@
 * @email: binbin0314@126.com
 * @Date: 2021-07-19 15:47:38
 * @LastEditors: aBin
- * @LastEditTime: 2021-07-19 18:01:59
+ * @LastEditTime: 2021-07-19 19:39:36
 -->
 <template>
  <view>
--- a/src/components/TimeLine/index.vue
+++ b/src/components/TimeLine/index.vue
@ -3,15 +3,14 @@
 * @email: binbin0314@126.com
 * @Date: 2021-07-19 14:15:35
 * @LastEditors: aBin
- * @LastEditTime: 2021-07-19 16:44:12
+ * @LastEditTime: 2021-07-20 14:22:11
 -->
 <template>
-  <view>
+  <view class="main">
    <Barrier />
-    <scroll-view scroll-y="true" style="height: 1000rpx">
-      <view style="position: relative">
-        <TimeBox />
-      </view>
+    <scroll-view :scrollY="true" :scrollTop="scrollTop" :style="{ height: height }" @scroll="scroll">
+      <!-- <scroll-view scroll-y="true" style="height: 400px"> -->
+      <TimeBox />
    </scroll-view>
  </view>
 </template>
@ -22,7 +21,16 @@ export default {
  name: 'TimeLine',
  components: { Barrier, TimeBox },
  data() {
-    return {};
+    return { height: '', scrollTop: 0 };
+  },
+  mounted() {
+    this.height = document.getElementsByClassName('main')[0].clientHeight - 30 + 'px';
+    console.log(this.height);
+  },
+  methods: {
+    scroll(e) {
+      console.log(e.detail.scrollTop);
+    },
  },
 };
 </script>
--- a/src/components/Title/.gitkeep
+++ b/src/components/Title/.gitkeep
--- a/src/components/Title/Title.vue
+++ b/src/components/Title/Title.vue
@ -0,0 +1,44 @@
+<!--
+ * @Author: your name
+ * @Date: 2021-07-19 11:35:03
+ * @LastEditTime: 2021-07-20 10:12:34
+ * @LastEditors: aBin
+ * @Description: In User Settings Edit
+ * @FilePath: \TALL-MUI-3\src\components\Title\titleBar.vue
+-->
+<template>
+  <view>
+    <u-navbar back-text="返回">
+      <view class="flex justify-center flex-1">
+        <view v-if="true">{{ title }}</view>
+        <view v-else>{{ titleBar }}</view>
+      </view>
+      <view class="mr-2" slot="right">
+        <u-icon class="m-1" name="checkmark-circle"></u-icon>
+        <u-icon class="m-1" name="reload"> </u-icon>
+        <u-icon class="m-1" name="home"></u-icon>
+        <u-icon class="m-1" name="more-dot-fill"></u-icon>
+      </view>
+    </u-navbar>
+  </view>
+</template>
+<script>
+export default {
+  name: 'Title',
+  data() {
+    return {
+      title: '加载中...',
+      titleBar: '项目名称',
+      Istrue: 'false',
+    };
+  },
+  methods: {},
+};
+</script>
+
+<style scoped lang="scss">
+.slot-warp {
+  display: flex;
+  justify-content: flex-end;
+}
+</style>
--- a/src/main.js
+++ b/src/main.js
@ -1,3 +1,10 @@
+/*
+ * @Author: aBin
+ * @email: binbin0314@126.com
+ * @Date: 2021-07-19 10:09:22
+ * @LastEditors: aBin
+ * @LastEditTime: 2021-07-19 18:54:17
+ */
 import Vue from 'vue';
 import App from './App';
 import uView from 'uview-ui';
--- a/src/pages.json
+++ b/src/pages.json
@ -3,7 +3,8 @@
    {
      "path": "pages/index/index",
      "style": {
-        "navigationBarTitleText": "uni-app"
+        "navigationStyle": "custom" ,
+			  "navigationBarTextStyle": "white"
      }
    },
    {
@ -23,6 +24,13 @@
      "style": {
        "navigationBarTitleText": "pinch 测试"
      }
+    },
+    {
+      "path": "components/Title/Title",
+      "style": {
+        "navigationStyle": "custom" ,
+			  "navigationBarTextStyle": "white"
+      }
    }
  ],
  "globalStyle": {
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@ -3,14 +3,15 @@
 * @email: binbin0314@126.com
 * @Date: 2021-07-19 10:09:22
 * @LastEditors: aBin
- * @LastEditTime: 2021-07-19 16:36:17
+ * @LastEditTime: 2021-07-20 11:55:27
 -->
 <template>
-  <view>
-    <Roles />
-    <view class="container bg-gray-100">
+  <view :style="{ height: height }" class="flex flex-col overflow-hidden">
+    <Title />
+    <view class="flex flex-col flex-1 container bg-gray-100">
+      <Roles />
      <Globals class="p-4" />
-      <TimeLine />
+      <TimeLine class="flex-1" />
      <!-- <view class="mt-5">
    <view class="mt-5">
      <u-button type="primary" size="default" @click="$u.route('/pages/plugin-test/plugin-test')">iframe 验证</u-button>
@ -28,16 +29,25 @@

 <script>
 import Globals from 'components/Globals/index.vue';
+import Title from 'components/Title/Title.vue';
 import Roles from 'components/Roles/Roles.vue';
-// import Project from 'components/Project/Project.vue';
 import TimeLine from 'components/TimeLine/index.vue';

+// import Project from 'components/Project/Project.vue';
+
 export default {
-  components: { Globals, TimeLine, Roles },
+  components: { Globals, TimeLine, Roles, Title },
  data() {
-    return { title: 'Hello' };
+    return { title: 'Hello', height: '' };
+  },
+  onLoad() {
+    console.log(this.$u.config.v);
+    // this.openPage();
+  },
+  mounted() {
+    this.height = window.screen.height + 'px';
+    console.log(this.height);
  },
-  onLoad() {},
  methods: {
    openPage() {
      console.log('open');