From e1234a681c4cd88a471dcbb4129c0e8a32ca4bbd Mon Sep 17 00:00:00 2001 From: song Date: Tue, 14 Dec 2021 14:10:04 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=89=AB=E7=A0=81?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 3 +- src/App.vue | 38 +-------- src/components/ChooseElder/ChooseElder.vue | 18 +++-- src/components/ChooseUser/ChooseUser.vue | 18 +++-- src/components/Upload/Upload.vue | 34 +++++++- src/mixins/tool.js | 7 +- src/pages/index/index.vue | 77 ++++++++++++++++++- .../components/Evaluated/EvaluatedNLCP.vue | 6 +- .../components/Evaluated/EvaluatedXLJH.vue | 6 +- .../git-phone-power/git-phone-power.vue | 39 ++++++++-- src/pagesYanyuan/input-code/input-code.vue | 13 +--- src/pagesYanyuan/scan-code/scan-code.vue | 13 +--- .../transfer-page/transfer-page.vue | 10 ++- 13 files changed, 193 insertions(+), 89 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a62b829..5196f76 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# 0.1.0 (2021-12-13) +# 0.1.0 (2021-12-14) ### 🌟 新功能 范围|描述|commitId @@ -187,6 +187,7 @@ - | 时间轴滚动位置修改 | [551da63](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/551da63) - | 时间轴骨架屏修改 | [ca78d02](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/ca78d02) - | 添加canvas | [9bc13c7](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/9bc13c7) + - | 添加绑定WiFi | [c523022](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/c523022) - | 监听时间基本点 | [033fca0](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/033fca0) - | 答题时记录做到第几题 | [547eb6e](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/547eb6e) - | 绘制canvas | [3c9d471](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/3c9d471) diff --git a/src/App.vue b/src/App.vue index c56bba4..d7933eb 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,9 +1,9 @@ diff --git a/src/components/ChooseElder/ChooseElder.vue b/src/components/ChooseElder/ChooseElder.vue index 557c779..6052b12 100644 --- a/src/components/ChooseElder/ChooseElder.vue +++ b/src/components/ChooseElder/ChooseElder.vue @@ -3,13 +3,15 @@ + + {{ item.userName }} + {{ item.sex === 1 ? '男' : item.sex === 2 ? '女' : '' }} + - {{ item.userName }} - {{ item.sex === 1 ? '男' : item.sex === 2 ? '女' : '' }} @@ -26,8 +28,14 @@ export default { watch: { elderlyInfo(val) { if (val && val.length) { - val.forEach(item => { - item.checked = false; + val.forEach((item, index) => { + if (index === 0) { + item.checked = true; + this.ids.push(item.keyUserId); + this.setKeyUserIds(this.ids); + } else { + item.checked = false; + } }); this.list = val; } diff --git a/src/components/ChooseUser/ChooseUser.vue b/src/components/ChooseUser/ChooseUser.vue index 61b8e11..f9d4b41 100644 --- a/src/components/ChooseUser/ChooseUser.vue +++ b/src/components/ChooseUser/ChooseUser.vue @@ -3,13 +3,15 @@ + + {{ item.userName }} + {{ item.sex === 1 ? '男' : item.sex === 2 ? '女' : '' }} + - {{ item.userName }} - {{ item.sex === 1 ? '男' : item.sex === 2 ? '女' : '' }} @@ -26,8 +28,14 @@ export default { watch: { elderlyInfo(val) { if (val && val.length) { - val.forEach(item => { - item.checked = false; + val.forEach((item, index) => { + if (index === 0) { + item.checked = true; + this.ids.push(item.keyUserId); + this.setKeyUserIds(this.ids); + } else { + item.checked = false; + } }); this.list = val; } diff --git a/src/components/Upload/Upload.vue b/src/components/Upload/Upload.vue index 621a317..34a34fb 100644 --- a/src/components/Upload/Upload.vue +++ b/src/components/Upload/Upload.vue @@ -36,6 +36,28 @@ @click="openPage('/pagesYanyuan/hold-all/hold-all')" > + + + + + + + + + + + + + + + @@ -98,10 +120,11 @@ export default { uni.scanCode({ onlyFromCamera: true, success(res) { - that.$t.ui.showToast('扫码成功'); const arr = res.path.split('='); const toolCode = arr && arr.length ? arr[arr.length - 1] : ''; - that.submit(toolCode); + if (toolCode) { + that.submit(toolCode); + } }, fail() { that.failMsg('扫码失败'); @@ -130,9 +153,12 @@ export default { try { const params = { toolCode }; await this.getBindTool(params); - this.initTool(); + setTimeout(() => { + this.$t.ui.showToast('工具箱绑定成功'); + this.initTool(); + }, 2000); } catch (error) { - console.error('error: ', error); + console.error('error: ', error.msg || '工具箱绑定失败'); } }, }, diff --git a/src/mixins/tool.js b/src/mixins/tool.js index 6a4b9ed..4318def 100644 --- a/src/mixins/tool.js +++ b/src/mixins/tool.js @@ -84,14 +84,17 @@ export default { .showModal('提示', '是否申请成为家属？') .then(async () => { const params = { bindUserId }; + console.log('params: ', params); const res = await this.getCreateTrainee(params); + console.log('res: ', res); if (!res.length) { this.$t.ui.showToast('提醒工具箱拥有者添加使用者信息'); setTimeout(() => { uni.redirectTo({ url: '/pages/index/index' }); }, 2000); } else { - this.setShowChooseElder(true); + this.showElder = true; + // this.setShowChooseElder(true); } }) .catch(() => { @@ -117,7 +120,7 @@ export default { if (!this.keyUserIds.length) { this.setShowChooseElder(true); this.$t.ui.showToast('请先选择老人！'); - this.$refs.uModal.clearLoading(); + // this.$refs.uModal.clearLoading(); return; } this.setShowChooseElder(false); diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 1b713e1..b983d15 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -14,23 +14,49 @@ + + + + + + + + + + + + diff --git a/src/pagesProject/project/components/Evaluated/EvaluatedNLCP.vue b/src/pagesProject/project/components/Evaluated/EvaluatedNLCP.vue index 343ca10..ebf358a 100644 --- a/src/pagesProject/project/components/Evaluated/EvaluatedNLCP.vue +++ b/src/pagesProject/project/components/Evaluated/EvaluatedNLCP.vue @@ -1,6 +1,6 @@