diff --git a/CHANGELOG.md b/CHANGELOG.md index ba39ac2..4e04775 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# 0.1.0 (2021-09-08) +# 0.1.0 (2021-09-09) ### 🌟 新功能 范围|描述|commitId @@ -213,6 +213,7 @@ - | 整理代码 | [7a55315](https://dd.tall.wiki/gitea/wally/tall-mui-3-project/commits/7a55315) - | 新建任务界面完善 | [2033b55](https://dd.tall.wiki/gitea/wally/tall-mui-3-project/commits/2033b55) - | 日历的更改 | [7353ac8](https://dd.tall.wiki/gitea/wally/tall-mui-3-project/commits/7353ac8) + - | 日常任务样式修改 | [4628301](https://dd.tall.wiki/gitea/wally/tall-mui-3-project/commits/4628301) - | 测试接口 | [215e074](https://dd.tall.wiki/gitea/wally/tall-mui-3-project/commits/215e074) - | 添加弹框动画 | [8903854](https://dd.tall.wiki/gitea/wally/tall-mui-3-project/commits/8903854) - | 组件文件夹新建 | [22bfe7b](https://dd.tall.wiki/gitea/wally/tall-mui-3-project/commits/22bfe7b) diff --git a/rest/project.http b/rest/project.http index cbddcbd..48179b8 100644 --- a/rest/project.http +++ b/rest/project.http @@ -1,7 +1,7 @@ ### login # @name login -POST https://www.tall.wiki/gateway/tall/v1.0/users/signin +POST https://test.tall.wiki/gateway/tall/v1.0/users/signin content-type: application/json;charset=utf-8 { @@ -18,7 +18,7 @@ content-type: application/json;charset=utf-8 ### 导入插件 # POST http://127.0.0.1:7220/plugin/import -POST http://www.tall.wiki/gateway/pluginshop/plugin/import +POST http://test.tall.wiki/gateway/pluginshop/plugin/import Content-Type: multipart/form-data; boundary=----WebKitFormBoundary7MA4YWxkTrZu0gW Authorization: Bearer {{login.response.body.$.data.token}} @@ -34,6 +34,6 @@ Content-Type: xlsx ### 更新redis内的插件信息 -POST http://www.tall.wiki/gateway/pluginshop/plugin/updatePluginOfRedis +POST http://test.tall.wiki/gateway/pluginshop/plugin/updatePluginOfRedis content-type: application/json;charset=utf-8 Authorization: Bearer {{login.response.body.$.data.token}} diff --git a/src/App.vue b/src/App.vue index ccee2d3..3fecd9a 100644 --- a/src/App.vue +++ b/src/App.vue @@ -19,7 +19,7 @@ export default { if (!options.query.share) { if (!options.query || !options.query.u) { // 参数里没有u (userId)提示 - this.$t.ui.showToast('缺少用户信息参数'); + this.$t.ui.showToast(`缺少用户信息参数+${options.query.share}`); } else { const data = await this.getToken(options.query.u); this.noPhone(data.phone); @@ -90,4 +90,5 @@ export default { @import './common/styles/iconfont.scss'; @import 'uview-ui/index.scss'; @import './common/styles/app.scss'; +// @import './common/styles/uni.css'; diff --git a/src/common/styles/app.scss b/src/common/styles/app.scss index dbb6945..8eb73dd 100644 --- a/src/common/styles/app.scss +++ b/src/common/styles/app.scss @@ -4,3 +4,152 @@ .border-b-1 { border-bottom-width: 1px; } + +/* 列表 */ +.uni-list { + background-color: #ffffff; + position: relative; + width: 100%; + display: flex; + flex-direction: column; + border: 1px solid #afbed1; + height: 80rpx; + line-height: 80rpx; +} +.uni-list-cell { + position: relative; + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; +} +.uni-list-cell-hover { + background-color: #eee; +} +.uni-list-cell-pd { + padding: 22rpx 30rpx; +} +.uni-list-cell-left { + white-space: nowrap; + font-size: 28rpx; + padding: 0 30rpx; +} +.uni-list-cell-db, +.uni-list-cell-right { + flex: 1; +} +.uni-list-cell::after { + position: absolute; + z-index: 3; + right: 0; + bottom: 0; + left: 30rpx; + height: 1px; + content: ''; + -webkit-transform: scaleY(0.5); + transform: scaleY(0.5); + background-color: #c8c7cc; +} +.uni-list .uni-list-cell:last-child::after { + height: 0rpx; +} +.uni-list-cell-last.uni-list-cell::after { + height: 0rpx; +} +.uni-list-cell-divider { + position: relative; + display: flex; + color: #999; + background-color: #f7f7f7; + padding: 15rpx 20rpx; +} +.uni-list-cell-divider::before { + position: absolute; + right: 0; + top: 0; + left: 0; + height: 1px; + content: ''; + -webkit-transform: scaleY(0.5); + transform: scaleY(0.5); + background-color: #c8c7cc; +} +.uni-list-cell-divider::after { + position: absolute; + right: 0; + bottom: 0; + left: 0rpx; + height: 1px; + content: ''; + -webkit-transform: scaleY(0.5); + transform: scaleY(0.5); + background-color: #c8c7cc; +} +.uni-list-cell-navigate { + font-size: 30rpx; + padding: 22rpx 30rpx; + line-height: 48rpx; + position: relative; + display: flex; + box-sizing: border-box; + width: 100%; + flex: 1; + justify-content: space-between; + align-items: center; +} +.uni-list-cell-navigate { + padding-right: 36rpx; +} +.uni-navigate-badge { + padding-right: 50rpx; +} +.uni-list-cell-navigate.uni-navigate-right:after { + font-family: uniicons; + content: '\e583'; + position: absolute; + right: 24rpx; + top: 50%; + color: #bbb; + -webkit-transform: translateY(-50%); + transform: translateY(-50%); +} +.uni-list-cell-navigate.uni-navigate-bottom:after { + font-family: uniicons; + content: '\e581'; + position: absolute; + right: 24rpx; + top: 50%; + color: #bbb; + -webkit-transform: translateY(-50%); + transform: translateY(-50%); +} +.uni-list-cell-navigate.uni-navigate-bottom.uni-active::after { + font-family: uniicons; + content: '\e580'; + position: absolute; + right: 24rpx; + top: 50%; + color: #bbb; + -webkit-transform: translateY(-50%); + transform: translateY(-50%); +} +.uni-collapse.uni-list-cell { + flex-direction: column; +} +.uni-list-cell-navigate.uni-active { + background: #eee; +} +.uni-list.uni-collapse { + box-sizing: border-box; + height: 0; + overflow: hidden; +} +.uni-collapse .uni-list-cell { + padding-left: 20rpx; +} +.uni-collapse .uni-list-cell::after { + left: 52rpx; +} +.uni-list.uni-active { + height: auto; +} diff --git a/src/components/Title/Title.vue b/src/components/Title/Title.vue index 24835cf..65313b0 100644 --- a/src/components/Title/Title.vue +++ b/src/components/Title/Title.vue @@ -117,6 +117,7 @@ export default { }, // 回到首页 openIndex() { + console.log(this.$route); this.$u.route('/', { u: this.userId }); }, //操作 diff --git a/src/components/Title/components/ShareProject.vue b/src/components/Title/components/ShareProject.vue index b39b6b5..70e4ae9 100644 --- a/src/components/Title/components/ShareProject.vue +++ b/src/components/Title/components/ShareProject.vue @@ -5,9 +5,16 @@ 用户以什么角色加入项目 - - - + + + + + {{ allRolesName[index].name }} + + + + + {{ links }} @@ -22,7 +29,6 @@ 复制链接 -