Browse Source

refactor: 解决冲突

develop
aBin 4 years ago
parent
commit
d23b7f7f1d
  1. 1
      CHANGELOG.md
  2. 213
      package-lock.json
  3. 5
      package.json
  4. 13
      src/common/styles/iconfont.scss
  5. BIN
      src/common/styles/iconfont.ttf
  6. 13
      src/components/Globals/Globals.vue
  7. 6
      src/components/Project/Project.vue
  8. 0
      src/components/Project/component/TimeBar.vue
  9. 0
      src/components/Project/component/TimeLine.vue
  10. 21
      src/components/Roles/Roles.vue
  11. 180
      src/components/Roles/component/RoleList.vue
  12. 57
      src/components/TimeLine/TimeLine.vue
  13. 2
      src/components/TimeLine/component/Barrier.vue
  14. 35
      src/components/TimeLine/component/TimeBox.vue
  15. 2
      src/components/TimeLine/component/TimeStatus.vue
  16. 0
      src/components/TimeLine/component/Title.vue
  17. 42
      src/components/TimeLine/index.vue
  18. 0
      src/components/Tips/Tips.vue
  19. 23
      src/components/Title/Title.vue
  20. 5
      src/pages.json
  21. 19
      src/pages/index/index.vue
  22. 6
      src/pages/rich-text/rich-text.vue
  23. 2
      src/uni.scss

1
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)

213
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"

5
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"

13
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';
}

BIN
src/common/styles/iconfont.ttf

Binary file not shown.

13
src/components/Globals/index.vue → src/components/Globals/Globals.vue

@ -1,13 +1,5 @@
<!--
* @Author: your name
* @Date: 2021-07-19 10:52:05
* @LastEditTime: 2021-07-20 15:18:41
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \TALL-MUI-3\src\components\Globals\index.vue
-->
<template>
<view>
<view class="m-2">
<u-card margin="0" :show-head="false" :show-foot="false" border-radius="25" :style="{ height: isShrink ? '96rpx' : '300rpx' }">
<!-- <u-card margin="0" :show-head="false" :show-foot="false" border-radius="25" style="height: 300rpx"> -->
<view slot="body">
@ -29,9 +21,10 @@
</scroll-view>
</view>
</u-card>
<u-skeleton :loading="true" :animation="true" bgColor="#fff"></u-skeleton>
<!-- <u-skeleton :animation="true" :loading="true" bgcolor="#fff"></u-skeleton> -->
</view>
</template>
<script>
import { mapState } from 'vuex';
export default {

6
src/components/Project/Project.vue

@ -1,15 +1,15 @@
<template>
<view class="wrap">
<time-bar />
<view class="container p-4">
<view class="container p-2">
<time-line />
</view>
</view>
</template>
<script>
import TimeBar from './components/TimeBar';
import TimeLine from './components/TimeLine';
import TimeBar from './component/TimeBar';
import TimeLine from './component/TimeLine';
export default {
name: 'Project',

0
src/components/Project/components/TimeBar.vue → src/components/Project/component/TimeBar.vue

0
src/components/Project/components/TimeLine.vue → src/components/Project/component/TimeLine.vue

21
src/components/Roles/Roles.vue

@ -1,20 +1,11 @@
<!--
* @Author: aBin
* @email: binbin0314@126.com
* @Date: 2021-07-19 10:52:05
* @LastEditors: Please set LastEditors
* @LastEditTime: 2021-07-20 15:12:16
-->
<template>
<view class="wrap">
<view class="rolebar">
<role-list />
</view>
<view class="wrap bg-white px-2">
<role-list />
</view>
</template>
<script>
import RoleList from './components/RoleList.vue';
import RoleList from './component/RoleList';
export default {
name: 'Roles',
@ -26,8 +17,4 @@ export default {
};
</script>
<style scoped lang="scss">
.container {
padding: 0 20rpx;
}
</style>
<style scoped lang="scss"></style>

180
src/components/Roles/component/RoleList.vue

@ -0,0 +1,180 @@
<template>
<view class="wrap">
<view class="homeBox">
<scroll-view :enable-flex="true" :scroll-left="scrollLeft" :throttle="false" scroll-with-animation scroll-x>
<view class="tabBox">
<view :key="index" @click="changeIndex(index)" class="tab-item" v-for="(item, index) in roles">
<view :class="setColor(item.mine, tabIndex, index)" class="tab-children u-skeleton-rect">{{ item.name }}</view>
</view>
</view>
<u-skeleton :animation="true" :loading="loading" bgcolor="#fff"></u-skeleton>
</scroll-view>
</view>
</view>
</template>
<script>
export default {
name: 'RoleList',
data() {
return {
tabIndex: 0, //访 index 0
tabList: [], //tab dom
scrollLeft: 0, //scrollview
roles: [
{ id: 1, name: '项目经理', mine: 0, pm: 1, sequence: 1 },
{ id: 2, name: '运维', mine: 0, pm: 0, sequence: 2 },
{ id: 3, name: '导师一', mine: 1, pm: 0, sequence: 3 },
{ id: 4, name: '导师二', mine: 1, pm: 0, sequence: 4 },
{ id: 5, name: '导师三', mine: 1, pm: 0, sequence: 5 },
{ id: 6, name: '导师四', mine: 1, pm: 0, sequence: 6 },
{ id: 7, name: '导师五', mine: 1, pm: 0, sequence: 7 },
{ id: 8, name: '导师六', mine: 1, pm: 0, sequence: 8 },
{ id: 9, name: '导师七', mine: 1, pm: 0, sequence: 9 },
{ id: 10, name: '导师八', mine: 1, pm: 0, sequence: 10 },
],
loading: true, //
};
},
mounted() {
this.init();
setTimeout(() => {
this.loading = false;
console.log('this.loading: ', this.loading);
}, 5000);
},
methods: {
init() {
const data = document.getElementsByClassName('tab-children');
// TODO tabList
data.forEach(item => {
this.tabList.push({ width: item.clientWidth, left: item.offsetLeft });
});
},
changeIndex(index) {
//index
this.tabIndex = index;
//
let left = 0;
let screenWidth = window.screen.width;
for (let i = 0; i < index; i++) {
left += this.tabList[i].width + this.tabList[i].left * 2;
}
left += this.tabList[index].width;
this.scrollLeft = left - screenWidth / 2;
},
//
setColor(mine, tabIndex, index) {
if (mine === 1 && tabIndex === index) {
return 'default-tab-choice';
}
if (mine === 1 && tabIndex !== index) {
return 'default-tab-item';
}
if (mine === 0 && tabIndex === index) {
return 'tab-choice';
}
},
},
};
</script>
<style lang="scss" scoped>
//
.wrap {
position: relative;
background: #f7f7f7;
}
.homeBox {
// sticky
position: sticky;
top: 0;
background: #fff; //
/* #ifdef H5 */
// h5 44px
top: 88rpx;
/* #endif */
.tabBox {
position: relative;
white-space: nowrap;
// height: 88rpx;
/* #ifdef MP-TOUTIAO */
/* #endif */
.tab-item {
padding: 20rpx 24rpx;
position: relative;
display: inline-block;
text-align: center;
font-size: 30rpx;
transition-property: background-color, width;
}
.default-tab-item {
color: $roleChoiceColor;
}
.default-tab-choice {
//
position: relative;
color: $roleChoiceColor;
font-weight: 600;
}
.default-tab-choice:before {
content: '';
position: absolute;
left: 0;
bottom: -20rpx;
width: 100%;
height: 6rpx;
border-radius: 2rpx;
background: $roleChoiceColor;
}
.tab-choice {
//
position: relative;
color: $uni-color-primary;
font-weight: 600;
}
.tab-choice:before {
content: '';
position: absolute;
left: 0;
bottom: -20rpx;
width: 100%;
height: 6rpx;
border-radius: 2rpx;
background: $uni-color-primary;
}
}
}
// //
/* #ifndef APP-NVUE */
::-webkit-scrollbar,
::-webkit-scrollbar,
::-webkit-scrollbar {
display: none;
width: 0 !important;
height: 0 !important;
-webkit-appearance: none;
background: transparent;
}
/* #endif */
/* #ifdef H5 */
// 穿H5scroll-view
scroll-view ::v-deep ::-webkit-scrollbar {
display: none;
}
/* #endif */
</style>

57
src/components/TimeLine/TimeLine.vue

@ -0,0 +1,57 @@
<!--
* @Author: aBin
* @email: binbin0314@126.com
* @Date: 2021-07-19 14:15:35
* @LastEditors: aBin
* @LastEditTime: 2021-07-20 14:22:11
-->
<template>
<!-- <Barrier /> -->
<scroll-view
:lower-threshold="300"
:scrollTop="scrollTop"
:scrollY="true"
:upper-threshold="300"
@scroll="scroll"
@scrolltolower="handleScrollBottom"
@scrolltoupper="handleScrollTop"
>
<TimeBox ref="child" />
</scroll-view>
</template>
<script>
// import Barrier from './component/Barrier.vue';
import { mapState, mapMutations } from 'vuex';
import TimeBox from './component/TimeBox.vue';
export default {
name: 'TimeLine',
components: { TimeBox },
data() {
return { scrollTop: 0, top: 0 };
},
computed: mapState('home', ['scrollTop', 'showTips']),
methods: {
...mapMutations('home', ['setScrollTop', 'setShrink']),
//
scroll(e) {
console.log(e.detail.scrollTop);
this.top = e.detail.scrollTop;
this.setShrink(this.top > this.scrollTop);
this.setScrollTop(this.top);
},
//
handleScrollTop() {
console.log('滚动到顶部');
this.$refs.child.addTopList();
},
//
handleScrollBottom() {
console.log('滚动到底部');
this.$refs.child.addBottomList();
},
},
};
</script>

2
src/components/TimeLine/components/Barrier.vue → 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;

35
src/components/TimeLine/components/TimeBox.vue → src/components/TimeLine/component/TimeBox.vue

@ -6,8 +6,8 @@
* @LastEditTime: 2021-07-19 18:54:55
-->
<template>
<view class="px-4">
<view v-for="item in list" :key="item" class="mt-2">
<view class="px-3 pb-10">
<view :key="index" v-for="(item, index) in list">
<view class="flex items-center">
<TimeStatus :status="item" :content="JSON.stringify(item)" />
<view class="flex-1 ml-2 flex justify-between">
@ -21,18 +21,19 @@
</view>
</view>
</view>
<view class="border-l-2 border-gray-300 ml-3.5">
<view class="ml-4 shadow-lg">
<u-card margin="0" :show-head="false" :show-foot="false" border-radius="25" class="h-16">
<view class="border-l-2 border-gray-300 ml-3.5 my-2">
<view class="ml-4 shadow-lg task-box overflow-hidden">
<u-card :show-foot="false" :show-head="false" class="h-16" margin="0">
<view slot="body">
<view class="u-col-between p-0 u-skeleton">
<view class="u-skeleton-rect"> 瓶身描绘的牡丹一如你初妆</view>
<view class="u-skeleton-rect">瓶身描绘的牡丹一如你初妆</view>
</view>
</view>
</u-card>
</view>
</view>
</view>
<Tips />
</view>
</template>
@ -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);
},
},
};
</script>
<style scoped lang="scss">
.task-box {
border-radius: 24rpx;
}
</style>

2
src/components/TimeLine/components/TimeStatus.vue → src/components/TimeLine/component/TimeStatus.vue

@ -128,5 +128,3 @@ export default {
},
};
</script>
<style scoped lang="scss"></style>

0
src/components/TimeLine/components/Title.vue → src/components/TimeLine/component/Title.vue

42
src/components/TimeLine/index.vue

@ -1,42 +0,0 @@
<!--
* @Author: aBin
* @email: binbin0314@126.com
* @Date: 2021-07-19 14:15:35
* @LastEditors: Please set LastEditors
* @LastEditTime: 2021-07-20 15:01:45
-->
<template>
<view class="main">
<Barrier />
<scroll-view :scrollY="true" :scrollTop="top" :style="{ height: height }" @scroll="scroll">
<!-- <scroll-view scroll-y="true" style="height: 400px"> -->
<TimeBox />
</scroll-view>
<Tips />
</view>
</template>
<script>
import { mapState, mapMutations } from 'vuex';
import Barrier from './components/Barrier.vue';
import TimeBox from './components/TimeBox.vue';
import Tips from 'components/Tips/index.vue';
export default {
name: 'TimeLine',
components: { Barrier, TimeBox, Tips },
data() {
return { height: '', top: 0 };
},
computed: mapState('home', ['scrollTop', 'showTips']),
mounted() {
this.height = document.getElementsByClassName('main')[0].clientHeight - 30 + 'px';
},
methods: {
...mapMutations('home', ['setScrollTop', 'setShrink']),
scroll(e) {
this.top = e.detail.scrollTop;
this.setShrink(this.top > this.scrollTop);
this.setScrollTop(this.top);
},
},
};
</script>

0
src/components/Tips/index.vue → src/components/Tips/Tips.vue

23
src/components/Title/Title.vue

@ -1,21 +1,13 @@
<!--
* @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-if="Istrue">{{ 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="reload"></u-icon>
<u-icon class="m-1" name="home"></u-icon>
<u-icon class="m-1" name="more-dot-fill"></u-icon>
</view>
@ -29,10 +21,17 @@ export default {
return {
title: '加载中...',
titleBar: '项目名称',
Istrue: 'false',
Istrue: true,
};
},
methods: {},
mounted() {
this.getTitle();
},
methods: {
getTitle() {
this.Istrue = !this.Istrue;
},
},
};
</script>

5
src/pages.json

@ -40,6 +40,9 @@
"backgroundColor": "#F8F8F8"
},
"easycom": {
"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
"autoscan": true,
"custom": {
"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
}
}
}

19
src/pages/index/index.vue

@ -8,10 +8,10 @@
<template>
<view :style="{ height: height }" class="flex flex-col overflow-hidden">
<Title />
<view class="flex flex-col flex-1 container bg-gray-100">
<view class="flex flex-col flex-1 overflow-hidden container bg-gray-100">
<Roles />
<Globals class="p-4" />
<TimeLine class="flex-1" />
<Globals />
<TimeLine class="flex-1 overflow-hidden" />
<!-- <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,17 +28,17 @@
</template>
<script>
import Globals from 'components/Globals/index.vue';
import Title from 'components/Title/Title.vue';
import Roles from 'components/Roles/Roles.vue';
import TimeLine from 'components/TimeLine/index.vue';
// import Globals from 'components/Globals/index.vue';
// import Title from 'components/Title/Title.vue';
// import Roles from 'components/Roles/Roles.vue';
// import TimeLine from 'components/TimeLine/index.vue';
// import Project from 'components/Project/Project.vue';
export default {
components: { Globals, TimeLine, Roles, Title },
// components: { Globals, TimeLine, Roles, Title },
data() {
return { title: 'Hello', height: '' };
return { title: 'Hello', height: '', scrollHeight: null };
},
onLoad() {
console.log(this.$u.config.v);
@ -46,7 +46,6 @@ export default {
},
mounted() {
this.height = window.screen.height + 'px';
console.log(this.height);
},
methods: {
openPage() {

6
src/pages/rich-text/rich-text.vue

@ -1,8 +1,8 @@
<template>
<view class="p-3">
<view class="p-2">
<!-- <view v-if="!plugins">加载中...</view>
<template v-else> -->
<view id="container" class="my-3"></view>
<template v-else>-->
<view class="my-3" id="container"></view>
<!-- </template> -->
</view>
</template>

2
src/uni.scss

@ -27,12 +27,14 @@ $uni-text-color-inverse: #fff; //反色
$uni-text-color-grey: #999; //辅助灰色如加载更多的提示信息
$uni-text-color-placeholder: #808080;
$uni-text-color-disable: #c0c0c0;
$roleChoiceColor: #f59e0b;
/* 背景颜色 */
$uni-bg-color: #ffffff;
$uni-bg-color-grey: #f8f8f8;
$uni-bg-color-hover: #f1f1f1; //点击状态颜色
$uni-bg-color-mask: rgba(0, 0, 0, 0.4); //遮罩颜色
$uni-bg-color-transparent: rgba(255, 255, 255, 0); //透明色
/* 边框颜色 */
$uni-border-color: #c8c7cc;

Loading…
Cancel
Save