diff --git a/CHANGELOG.md b/CHANGELOG.md index 3457d39..9c28b13 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -36,6 +36,7 @@ - | 填写用户信息调接口 | [a8f8267](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/a8f8267) - | 字体大小更改 | [82cfdd4](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/82cfdd4) - | 存token | [b8a178d](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/b8a178d) + - | 完善家属成员接口 | [dcd8110](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/dcd8110) - | 定期任务面板骨架屏添加 | [b2698c0](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/b2698c0) 富文本插件 | 富文本插件demo测试 | [ed3d644](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/ed3d644) - | 对接测评相关api | [21451e0](https://dd.tall.wiki/gitea/binbin0314/yanyuan_js/commits/21451e0) diff --git a/src/App.vue b/src/App.vue index 2395f53..3773fa9 100644 --- a/src/App.vue +++ b/src/App.vue @@ -25,7 +25,7 @@ export default { this.$t.ui.showToast('缺少用户信息参数'); } else { const data = await this.getToken(options.query.u); - this.noPhone(data.phone); + this.noPhone(data); } } /* #endif */ @@ -50,7 +50,7 @@ export default { if (data && data.token) { this.setUser(data); this.setToken(data.token); - this.noPhone(data.phone); + this.noPhone(data); } else { this.$t.ui.showToast('返回数据异常'); } @@ -64,8 +64,8 @@ export default { * 没有手机号 跳转绑定手机号的界面 * @param {string} phone */ - async noPhone(phone) { - if (!phone) { + async noPhone(data) { + if (!data.wxInfo || !data.wxInfo.nickname || !data.phone) { this.$u.route('/pagesUser/git-phone-power/git-phone-power'); } }, diff --git a/src/apis/tall.js b/src/apis/tall.js index 4ee48cf..e127b4a 100644 --- a/src/apis/tall.js +++ b/src/apis/tall.js @@ -28,6 +28,8 @@ const install = (Vue, vm) => { vm.$u.api.getSmsCode = params => vm.$u.get(`${tall}/users/smscode`, params); // 根据userId获取token vm.$u.api.getToken = userId => vm.$u.get(`${tall}/users/userId`, { userId }); + // 绑定手机号(不用验证码) + vm.$u.api.bindPhone = params => vm.$u.http.post(`${tall}/users/bindingNoCode`, params); // 绑定手机号 vm.$u.api.phoneBind = (phone, smsCode) => vm.$u.http.post(`${tall}/users/binding`, { phone, smsCode }); // 是否合并账号 diff --git a/src/apis/yanyuan.js b/src/apis/yanyuan.js index 0bbfe74..7e71198 100644 --- a/src/apis/yanyuan.js +++ b/src/apis/yanyuan.js @@ -14,6 +14,10 @@ const install = (Vue, vm) => { vm.$u.api.relationTrainee = param => vm.$u.post(`${yanyuan}/trainee/relation`, param); // 体验账号升级 vm.$u.api.upgradeTrainee = param => vm.$u.post(`${yanyuan}/trainee/upgrade`, param); + // 查询用户信息 + vm.$u.api.queryTrainee = param => vm.$u.post(`${yanyuan}/trainee/query`, param); + // 修改用户信息 + vm.$u.api.updateTrainee = param => vm.$u.post(`${yanyuan}/trainee/update`, param); // 绑定工具箱 vm.$u.api.bindTool = param => vm.$u.post(`${yanyuan}/tool/bind`, param); diff --git a/src/components/Info/Info.vue b/src/components/Info/Info.vue index 5cd2b14..2af08f4 100644 --- a/src/components/Info/Info.vue +++ b/src/components/Info/Info.vue @@ -217,6 +217,20 @@ + + + + + {{ radioItem.value }} + + + @@ -322,19 +336,15 @@ diff --git a/src/config/yyInfo.js b/src/config/yyInfo.js index e283818..19475f9 100644 --- a/src/config/yyInfo.js +++ b/src/config/yyInfo.js @@ -14,7 +14,7 @@ const bloodPressure = () => { /** * 基本信息 * 展示类型: showType: 1 标题+折叠, 2 直接展示 - * 试题类型, type:1 单选,2 日期(年月日),3 数字输入框,4 单列下拉框,5 多选,6 日期(年月日时),7 多列下拉选框, 8 文本输入框, 9 多列地区选择, 11 吸烟,11 饮酒,12 饮茶, 13 失眠, 99 其他 + * 试题类型, type:1 单选,2 日期(年月日),3 数字输入框,4 单列下拉框,5 多选,6 日期(年月日时),7 多列下拉选框, 8 文本输入框, 9 多列地区选择, 11 吸烟,11 饮酒,12 饮茶, 13 失眠, 14 有id的单选 99 其他 */ export const infoList = [ [ @@ -30,8 +30,12 @@ export const infoList = [ name: '性别', label: 'sex', showType: 1, - type: 1, - radioList: ['男', '女', '未知'], + type: 14, + radioList: [ + { id: 1, value: '男' }, + { id: 2, value: '女' }, + { id: 0, value: '未知' }, + ], value: null, show: false, }, @@ -193,8 +197,12 @@ export const infoList = [ name: 'APOE基因', label: 'apoeGene', showType: 1, - type: 1, - radioList: ['是', '否', '不知道'], + type: 14, + radioList: [ + { id: '0', value: '否' }, + { id: '1', value: '是' }, + { id: '2', value: '不知道' }, + ], value: '否', show: false, }, @@ -303,8 +311,11 @@ export const infoList = [ name: '饮食是否重口', label: 'isStrongFlavour', showType: 1, - type: 1, - radioList: ['是', '否'], + type: 14, + radioList: [ + { id: 0, value: '否' }, + { id: 1, value: '是' }, + ], value: '否', show: false, }, @@ -312,8 +323,11 @@ export const infoList = [ name: '饮食喜好', label: 'isLikeMeat', showType: 1, - type: 1, - radioList: ['素菜', '荤菜'], + type: 14, + radioList: [ + { id: 0, value: '素菜' }, + { id: 1, value: '荤菜' }, + ], value: null, show: false, }, @@ -321,8 +335,11 @@ export const infoList = [ name: '炒菜放油多少', label: 'isMoreOil', showType: 1, - type: 1, - radioList: ['是', '否'], + type: 14, + radioList: [ + { id: 0, value: '否' }, + { id: 1, value: '是' }, + ], value: '否', show: false, }, diff --git a/src/pagesProject/project/components/ConfigInfo/ConfigInfo.vue b/src/pagesProject/project/components/ConfigInfo/ConfigInfo.vue index f7e7802..7ebbbc5 100644 --- a/src/pagesProject/project/components/ConfigInfo/ConfigInfo.vue +++ b/src/pagesProject/project/components/ConfigInfo/ConfigInfo.vue @@ -10,7 +10,9 @@ {{ item.head }} - {{ patientName }} + + {{ personalInfo.userName }} + @@ -21,7 +23,7 @@ - + @@ -39,6 +41,7 @@ diff --git a/src/pagesProject/project/components/ConfigInfo/components/MedicineDetail.vue b/src/pagesProject/project/components/ConfigInfo/components/MedicineDetail.vue index 1b3ba7f..308ca39 100644 --- a/src/pagesProject/project/components/ConfigInfo/components/MedicineDetail.vue +++ b/src/pagesProject/project/components/ConfigInfo/components/MedicineDetail.vue @@ -335,6 +335,7 @@ export default { const params = { id: this.detail.id }; params[item.label] = item.value; await this.$u.api.updateMedicine(params); + this.$emit('showToast', 'success', '修改成功'); } catch (error) { console.error('error: ', error); this.$emit('showToast', 'error', '修改失败'); diff --git a/src/pagesProject/project/components/Evaluated/EvaluatedNLCP.vue b/src/pagesProject/project/components/Evaluated/EvaluatedNLCP.vue index bab8b9b..f2c49a1 100644 --- a/src/pagesProject/project/components/Evaluated/EvaluatedNLCP.vue +++ b/src/pagesProject/project/components/Evaluated/EvaluatedNLCP.vue @@ -1,7 +1,7 @@