diff --git a/CHANGELOG.md b/CHANGELOG.md index dc2a37a..de0cefb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -82,6 +82,7 @@ - | 修改角色样式 | [73e268e](https://dd.tall.wiki/gitea/wally/tall-mui-3-project/commits/73e268e) - | 修改选择检查人样式 | [4c2de55](https://dd.tall.wiki/gitea/wally/tall-mui-3-project/commits/4c2de55) - | 删除calendar中多余的console | [e339eec](https://dd.tall.wiki/gitea/wally/tall-mui-3-project/commits/e339eec) + - | 删除console.log | [a9ead1a](https://dd.tall.wiki/gitea/wally/tall-mui-3-project/commits/a9ead1a) - | 删除console.log | [5064a38](https://dd.tall.wiki/gitea/wally/tall-mui-3-project/commits/5064a38) - | 删除index中没用的alert代码 | [9c9eec7](https://dd.tall.wiki/gitea/wally/tall-mui-3-project/commits/9c9eec7) - | 删除mock,console;upload添加loading | [99d42e2](https://dd.tall.wiki/gitea/wally/tall-mui-3-project/commits/99d42e2) diff --git a/rest/project.http b/rest/project.http index cbddcbd..24f1392 100644 --- a/rest/project.http +++ b/rest/project.http @@ -1,14 +1,14 @@ ### 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 { "client": 1, "data": { - "credential": "999999", - "identifier": "song" + "credential": "123456", + "identifier": "mazhuang" }, "scene": 0, "type": 3 diff --git a/src/App.vue b/src/App.vue index c938c47..747558e 100644 --- a/src/App.vue +++ b/src/App.vue @@ -3,7 +3,6 @@ import { mapActions, mapMutations, mapState, mapGetters } from 'vuex'; export default { async onLaunch(options) { - console.log('options: ', options); this.checkNetwork(); // 监听网络状态 /* #ifdef MP-WEIXIN */ @@ -19,7 +18,7 @@ export default { if (!options.query.share) { if (!options.query || !options.query.u) { // 参数里没有u (userId)提示 - this.$t.ui.showToast(`缺少用户信息参数+${options.query.share}`); + this.$t.ui.showToast('缺少用户信息参数'); } else { const data = await this.getToken(options.query.u); this.noPhone(data.phone); diff --git a/src/components/Title/Title.vue b/src/components/Title/Title.vue index 456a6da..543c707 100644 --- a/src/components/Title/Title.vue +++ b/src/components/Title/Title.vue @@ -117,9 +117,9 @@ export default { }, // 回到首页 openIndex() { - this.$u.route('/pages/index/index', { u: this.userId }); - console.log(this.$route); + uni.redirectTo({ url: `/pages/index/index?u=${this.userId}` }); }, + //操作 operation() { // this.$t.ui.showToast('操作'); diff --git a/src/components/Title/components/ShareProject.vue b/src/components/Title/components/ShareProject.vue index 9d0f1f7..ddb9a4b 100644 --- a/src/components/Title/components/ShareProject.vue +++ b/src/components/Title/components/ShareProject.vue @@ -21,7 +21,7 @@ @@ -68,7 +68,9 @@ export default { allRolesName: [], index: 0, links: '', //复制的链接 + copyText: '', checked: false, //全选按钮是否选中 + roleName: '观众', // 多选框列表 list: [ { @@ -103,6 +105,7 @@ export default { computed: { ...mapState('role', ['visibleRoles', 'invisibleRoles']), + ...mapState('project', ['project']), ...mapGetters('project', ['projectId']), }, @@ -133,6 +136,7 @@ export default { // 选择角色 async changeRole(e) { this.index = e.target.value; + this.roleName = this.allRolesName[this.index].name; const { path, projectId } = this; const params = { path, projectId, roleId: this.allRolesName[this.index].id }; await this.creatShare(params); @@ -157,6 +161,7 @@ export default { try { const data = await this.$u.api.createShare(params); this.links = data.path; + this.copyText = `邀请您加入${this.project.name}的项目,角色为${this.roleName},链接为${data.path}&url=${this.$t.domain}`; } catch (error) { console.error('error: ', error); } diff --git a/src/pages/project/project.vue b/src/pages/project/project.vue index ea8f16c..887e026 100644 --- a/src/pages/project/project.vue +++ b/src/pages/project/project.vue @@ -37,6 +37,7 @@ export default { }, onLoad(options) { + console.log('options: ', options); if (options.share && options.share === '1') { this.shareInit(options); } else { @@ -286,7 +287,7 @@ export default { // 不论有没有token都直接从userId获取token // token有过期时间 从本地获取可能是过期 干脆直接从userId获取 if (!options || !options.u) { - this.$t.ui.showToast('缺少用户信息参数2'); // 参数里没有u (userId)提示 + this.$t.ui.showToast('缺少用户信息参数'); // 参数里没有u (userId)提示 } else { this.getToken(options.u); } @@ -296,7 +297,7 @@ export default { options && options.pname && this.setProjectName(options.pname); if (!options || !options.p) { - this.$t.ui.showToast('缺少项目信息参数3'); // 没有项目id参数 + this.$t.ui.showToast('缺少项目信息参数'); // 没有项目id参数 } else { this.getProjectById({ projectId: options.p }); // 根据项目id获取项目信息 }