From 137f7ff0e203bbfe40e2e71e0d16432cdd4060d9 Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Tue, 7 Dec 2021 15:17:19 +0800 Subject: [PATCH 1/8] 25245 --- src/apps/AppAskForm/AppAskForm.vue | 13 -- src/apps/AppAskForm/components/AddList.vue | 211 ++++++++++++--------- src/apps/AppAskForm/components/List.vue | 14 +- src/apps/AppAskForm/components/Tabbar.vue | 17 +- src/components/AiTopFixed.vue | 9 +- 5 files changed, 147 insertions(+), 117 deletions(-) diff --git a/src/apps/AppAskForm/AppAskForm.vue b/src/apps/AppAskForm/AppAskForm.vue index e16aaca9..089176ef 100644 --- a/src/apps/AppAskForm/AppAskForm.vue +++ b/src/apps/AppAskForm/AppAskForm.vue @@ -31,13 +31,6 @@ }, onLoad () { - uni.$on('reload', () => { - if (this.currIndex === 0) { - this.$refs.list.reload() - } else { - this.$refs.addList.getList() - } - }) }, methods: { @@ -45,12 +38,6 @@ this.params = e.params this.component = e.type }, - }, - - onReachBottom() { - if (this.currIndex === 0) { - this.$refs.list.getList() - } } } diff --git a/src/apps/AppAskForm/components/AddList.vue b/src/apps/AppAskForm/components/AddList.vue index a2f43815..6530b547 100644 --- a/src/apps/AppAskForm/components/AddList.vue +++ b/src/apps/AppAskForm/components/AddList.vue @@ -1,5 +1,5 @@ @@ -29,7 +29,11 @@ export default { return !!this.$route.query?.id && this.access }, errMsg() { - return this.err || (this.access ? "表单不存在" : "无法获取用户信息") + this.access && (this.err = "表单不存在") + return this.err || "数据读取中..." + }, + errStatus() { + return !!this.err ? "error" : "loading" }, isPreview() { return !!this.$route.query?.preview @@ -64,7 +68,7 @@ export default { }, created() { this.checkAccess() - document.title = "调查问卷" + document.title = "问卷调查" } } diff --git a/src/components/AiResult.vue b/src/components/AiResult.vue index f634921e..fe5bf54e 100644 --- a/src/components/AiResult.vue +++ b/src/components/AiResult.vue @@ -30,6 +30,9 @@ export default { if (this.status == "error") { obj.image = this.$cdn + "result/fail.png" obj.tips = this.tips || "提交失败!" + } else if (this.status == "loading") { + obj.image = "https://cdn.cunwuyun.cn/wxAdmin/img/message.png" + obj.tips = this.tips || "数据读取中..." } return obj } From bf6f29bbb6c954c9a64f68509e6ce0dc4b09765d Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Wed, 8 Dec 2021 09:08:28 +0800 Subject: [PATCH 6/8] 25275 --- src/apps/AppAskForm/components/AddForm.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/apps/AppAskForm/components/AddForm.vue b/src/apps/AppAskForm/components/AddForm.vue index 9c3d342d..deae26b3 100644 --- a/src/apps/AppAskForm/components/AddForm.vue +++ b/src/apps/AppAskForm/components/AddForm.vue @@ -213,7 +213,6 @@ export default { }) uni.$on('filedConfig', res => { - console.log(33) if (res.index === '-1') { this.targetList.push(res.config) } else { @@ -343,7 +342,7 @@ export default { type: 'Result', params: { linkUrl: res.data.linkUrl, - tableExplain: this.form.title, + title: this.form.title, tableExplain: this.form.tableExplain, headPicture: this.form.headPicture } From d0a981a703a938487e789d851cb9bd42797a0ce7 Mon Sep 17 00:00:00 2001 From: aixianling Date: Wed, 8 Dec 2021 09:17:01 +0800 Subject: [PATCH 7/8] BUG 25276 --- .../AppMeetingNotice/components/addMeeting.vue | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/apps/AppMeetingNotice/components/addMeeting.vue b/src/apps/AppMeetingNotice/components/addMeeting.vue index 6b5f40cd..ef83e1e1 100644 --- a/src/apps/AppMeetingNotice/components/addMeeting.vue +++ b/src/apps/AppMeetingNotice/components/addMeeting.vue @@ -95,8 +95,8 @@ import {mapActions} from "vuex"; export default { name: "addMeeting", components: {AiBack, AiUploader}, - props:{ - params:{ + props: { + params: { type: [Number, String] } }, @@ -126,9 +126,10 @@ export default { files: [], }, userSelect: false, + clickedUserSelect: false } }, - created(){ + created() { document.title = "新增会议"; if (this.params) { this.form.id = this.params; @@ -159,12 +160,15 @@ export default { methods: { ...mapActions(['selectEnterpriseContact']), handleSelectUser() { + if (this.clickedUserSelect) return this.$u.toast("正在打开人员选择器") + this.clickedUserSelect = true this.selectEnterpriseContact({ - fromDepartmentId:0, - type:["user"], - selectedUserIds: this.form.attendees?.map(e=>e.id) + fromDepartmentId: 0, + type: ["user"], + selectedUserIds: this.form.attendees?.map(e => e.id) }).then(res => { this.change(res?.userList || []) + this.clickedUserSelect = false }) }, fileList(e) { From 8f7d0c3a8423fc069ebc61121b94ffea56163c80 Mon Sep 17 00:00:00 2001 From: aixianling Date: Wed, 8 Dec 2021 09:24:04 +0800 Subject: [PATCH 8/8] BUG 25277 --- src/components/AiOpenData.vue | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/components/AiOpenData.vue b/src/components/AiOpenData.vue index 8a311a46..98674d0a 100644 --- a/src/components/AiOpenData.vue +++ b/src/components/AiOpenData.vue @@ -17,15 +17,21 @@ export default { } }, methods: { - ...mapActions(['injectJWeixin']) + ...mapActions(['injectJWeixin']), + bindWWOpenData() { + if (window?.WWOpenData) WWOpenData.bind(this.$el) + else this.injectJWeixin().then(() => { + this.$nextTick(() => { + WWOpenData.bind(this.$el) + WWOpenData.on('update', () => { + WWOpenData.bind(this.$el) + }) + }) + }) + } }, mounted() { - if (window?.WWOpenData) WWOpenData.bind(this.$el) - else this.injectJWeixin().then(() => { - this.$nextTick(() => { - WWOpenData.bind(this.$el) - }) - }) + this.bindWWOpenData() } }