diff --git a/CHANGELOG.md b/CHANGELOG.md index 6afff90..2a8ab1d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# 0.1.0 (2021-12-14) +# 0.1.0 (2021-12-16) ### 🌟 新功能 范围|描述|commitId @@ -278,6 +278,7 @@ - | 解决error | [cacbe7f](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/cacbe7f) - | 解决error | [1a6e513](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/1a6e513) - | 解决警告 | [c932b09](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/c932b09) + - | 设置页面样式调整 | [641dcd1](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/641dcd1) ### chore diff --git a/rest/燕园.http b/rest/燕园.http index 033538b..773bd27 100644 --- a/rest/燕园.http +++ b/rest/燕园.http @@ -121,7 +121,7 @@ Authorization: Bearer {{login.response.body.$.data.token}} { "param":{ - "id":"3" + "id":"2" } } ###体验账号升级 @@ -172,7 +172,7 @@ Authorization: Bearer {{login.response.body.$.data.token}} "param":{ "code":"NLCP", "reportId": "1464155290781618176", - "num": "17" + "num": "22" } } diff --git a/src/components/Info/Info.vue b/src/components/Info/Info.vue index 9bf01a1..fcd2df7 100644 --- a/src/components/Info/Info.vue +++ b/src/components/Info/Info.vue @@ -314,6 +314,23 @@ :area-code="colItem.defaultValue" > + + + + {{ colItem.value }} + + + {{ colItem.placeholder }} + + + @@ -377,6 +394,23 @@ export default { }, methods: { + changeVal(e, index, itemIndex) { + const info = this.infoList[index][itemIndex]; + info.value += e; + if (this.isEdit) { + this.updateTrainee(info); + } + }, + // 退格键被点击 + backspace(e, index, itemIndex) { + const info = this.infoList[index][itemIndex]; + // 删除value的最后一个字符 + if (info.value.length) info.value = info.value.substr(0, info.value.length - 1); + if (this.isEdit) { + this.updateTrainee(info); + } + }, + changeShow(index, itemIndex) { this.infoList[index][itemIndex].show = !this.infoList[index][itemIndex].show; }, @@ -431,6 +465,11 @@ export default { info.defaultValue = [e.province.value, e.city.value]; break; } + case 15: { + // 带小数点的数字键盘 + info.show = !info.show; + break; + } case 99: { // 其他 info.otherValue = e; diff --git a/src/components/Upload/Upload.vue b/src/components/Upload/Upload.vue index 1e15230..efdc46a 100644 --- a/src/components/Upload/Upload.vue +++ b/src/components/Upload/Upload.vue @@ -151,7 +151,8 @@ export default { */ async submit(toolCode) { try { - const params = { toolCode }; + const code = toolCode.substring(toolCode.length - 10); + const params = { toolCode: code }; await this.getBindTool(params); setTimeout(() => { this.$t.ui.showToast('工具箱绑定成功'); diff --git a/src/config/yyInfo.js b/src/config/yyInfo.js index c5e5dcc..cfb1d27 100644 --- a/src/config/yyInfo.js +++ b/src/config/yyInfo.js @@ -25,7 +25,8 @@ const educateYears = () => { /** * 基本信息 * 展示类型: showType: 1 标题+折叠, 2 直接展示 - * 试题类型, type:1 单选,2 日期(年月日),3 数字输入框,4 单列下拉框,5 多选,6 日期(年月日时),7 多列下拉选框, 8 文本输入框, 9 多列地区选择, 11 吸烟，11 饮酒，12 饮茶, 13 失眠, 14 有id的单选 99 其他 + * 试题类型, type:1 单选,2 日期(年月日),3 数字输入框,4 单列下拉框,5 多选,6 日期(年月日时),7 多列下拉选框, 8 文本输入框, + * 9 多列地区选择, 10 吸烟，11 饮酒，12 饮茶, 13 失眠, 14 有id的单选, 15 带小数点的数字键盘 99 其他 */ export const infoList = [ [ @@ -159,9 +160,10 @@ export const infoList = [ name: '血脂（低密度脂蛋白）', label: 'bloodFat', showType: 2, - type: 3, + type: 15, value: null, show: false, + placeholder: '请输入', }, ], [ diff --git a/src/mixins/tool.js b/src/mixins/tool.js index 048a8d9..5616f7e 100644 --- a/src/mixins/tool.js +++ b/src/mixins/tool.js @@ -80,15 +80,15 @@ export default { becomeFamily(bindUserId) { console.log('判断是否成为家属'); this.$t.ui - .showModal('提示', '是否申请成为家属？') + .showModal('提示', '工具箱已经被绑定，是否申请成为家属？') .then(async () => { const params = { bindUserId }; const res = await this.getCreateTrainee(params); if (!res.length) { - this.$t.ui.showToast('提醒工具箱拥有者添加使用者信息'); + this.$t.ui.showToast('您的亲属还没有添加老人信息，提醒他添加老人信息进行使用吧。'); setTimeout(() => { uni.redirectTo({ url: '/pages/index/index' }); - }, 2000); + }, 3000); } else { this.showElder = true; // this.setShowChooseElder(true); diff --git a/src/pagesProject/project/components/ConfigInfo/ConfigInfo.vue b/src/pagesProject/project/components/ConfigInfo/ConfigInfo.vue index 607ca15..df19cf6 100644 --- a/src/pagesProject/project/components/ConfigInfo/ConfigInfo.vue +++ b/src/pagesProject/project/components/ConfigInfo/ConfigInfo.vue @@ -4,8 +4,8 @@ - - + + {{ item.head }} @@ -16,8 +16,8 @@ - - + + @@ -53,7 +53,7 @@ export default { data() { return { itemList: [ - { head: '基本信息', open: true, img: 'https://www.tall.wiki/staticrec/yanyuan/menu1.png' }, + { head: '长者信息', open: true, img: 'https://www.tall.wiki/staticrec/yanyuan/menu1.png' }, { head: '药物使用记录', open: false, img: 'https://www.tall.wiki/staticrec/yanyuan/menu2.png' }, { head: 'Zarit照顾者负担量表', open: false, img: 'https://www.tall.wiki/staticrec/yanyuan/menu3.png' }, { head: '家属成员', open: false, img: 'https://www.tall.wiki/staticrec/yanyuan/menu4.png' }, diff --git a/src/pagesProject/project/components/ConfigInfo/components/FamilyDetail.vue b/src/pagesProject/project/components/ConfigInfo/components/FamilyDetail.vue index a2b16cf..8d2f2be 100644 --- a/src/pagesProject/project/components/ConfigInfo/components/FamilyDetail.vue +++ b/src/pagesProject/project/components/ConfigInfo/components/FamilyDetail.vue @@ -1,24 +1,35 @@ @@ -36,6 +47,14 @@ export default { computed: mapGetters('project', ['projectId']), + watch: { + detail(val) { + if (val && val.familyId) { + this.setDate(this.detail); + } + }, + }, + mounted() { if (this.detail && this.detail.familyId) { this.setDate(this.detail); diff --git a/src/pagesProject/project/components/Evaluated/EvaluatedNLCP.vue b/src/pagesProject/project/components/Evaluated/EvaluatedNLCP.vue index b33388e..e970769 100644 --- a/src/pagesProject/project/components/Evaluated/EvaluatedNLCP.vue +++ b/src/pagesProject/project/components/Evaluated/EvaluatedNLCP.vue @@ -18,7 +18,7 @@ - + - 开始测评 + 开始测评 注：每两个周可进行一次测评 @@ -15,11 +15,13 @@ diff --git a/src/pagesYanyuan/assess/components/Test/components/TitlePosition.vue b/src/pagesYanyuan/assess/components/Test/components/TitlePosition.vue index 5cf96d1..4e65371 100644 --- a/src/pagesYanyuan/assess/components/Test/components/TitlePosition.vue +++ b/src/pagesYanyuan/assess/components/Test/components/TitlePosition.vue @@ -3,15 +3,15 @@ - {{ con.content }} + {{ con.content }} - - + + @@ -26,6 +26,24 @@ export default { default: () => {}, }, }, + + methods: { + clickImg(src) { + wx.previewImage({ + urls: [src], //需要预览的图片http链接列表，多张的时候，url直接写在后面就行了 + current: '', // 当前显示图片的http链接，默认是第一个 + success: function (res) { + console.log('success res: ', res); + }, + fail: function (res) { + console.log('fail res: ', res); + }, + complete: function (res) { + console.log('complete res: ', res); + }, + }); + }, + }, }; diff --git a/src/pagesYanyuan/assess/components/Test/promptPage.vue b/src/pagesYanyuan/assess/components/Test/promptPage.vue index 25f97a8..b343739 100644 --- a/src/pagesYanyuan/assess/components/Test/promptPage.vue +++ b/src/pagesYanyuan/assess/components/Test/promptPage.vue @@ -3,7 +3,7 @@ - + {{ questionInfo.num }}.{{ con.content }} diff --git a/src/pagesYanyuan/transfer-page/transfer-page.vue b/src/pagesYanyuan/transfer-page/transfer-page.vue index 9ee81df..00a4ca7 100644 --- a/src/pagesYanyuan/transfer-page/transfer-page.vue +++ b/src/pagesYanyuan/transfer-page/transfer-page.vue @@ -18,7 +18,7 @@ export default { onLoad(options) { if (options.type === 'manyuan') { - this.content = '工具已绑定'; + this.content = '工具箱已绑定'; } if (options.type === 'jiashu') { this.openApplyModal(); diff --git a/src/store/yanyuan/actions.js b/src/store/yanyuan/actions.js index a506ea2..8aa851b 100644 --- a/src/store/yanyuan/actions.js +++ b/src/store/yanyuan/actions.js @@ -52,6 +52,7 @@ const actions = { async handleQuestion({ commit }, params) { try { const data = await uni.$u.api.getQuestion(params); + console.log('试题查询data: ', data); commit('setQuestionInfo', data); return data; } catch (error) {