diff --git a/.env.production b/.env.production index f42162e..95e8e61 100644 --- a/.env.production +++ b/.env.production @@ -1,4 +1,4 @@ ENV = 'production' -#VUE_APP_BASE_API = 'http://www.xbzt.cc' -VUE_APP_BASE_API = 'http://local.medical-record.host' \ No newline at end of file +VUE_APP_BASE_API = 'http://www.xbzt.cc' +#VUE_APP_BASE_API = 'http://local.medical-record.host' \ No newline at end of file diff --git a/src/pages.json b/src/pages.json index ecca73b..6ebc3b8 100644 --- a/src/pages.json +++ b/src/pages.json @@ -30,6 +30,12 @@ "navigationBarTitleText": "账户信息" } }, + { + "path": "pages/patient/detail", + "style": { + "navigationBarTitleText": "初诊信息" + } + }, { "path": "pages/record/index", "style": { diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 9fab9cd..531f67a 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -56,7 +56,7 @@ }, itemClick(e) { uni.navigateTo({ - url: `/pages/record/index?type_id=${e}` + url: `/pages/patient/detail?id=${e}` }) }, logout() { diff --git a/src/pages/patient/detail.vue b/src/pages/patient/detail.vue new file mode 100644 index 0000000..6b5c7ee --- /dev/null +++ b/src/pages/patient/detail.vue @@ -0,0 +1,96 @@ + + + + + diff --git a/src/pages/record/detail.vue b/src/pages/record/detail.vue index 525541f..706ea76 100644 --- a/src/pages/record/detail.vue +++ b/src/pages/record/detail.vue @@ -5,9 +5,6 @@ - - - @@ -64,12 +61,6 @@ export default { uni.stopPullDownRefresh() if (res.status == 0) { this.info = res.data - // this.info = { - // ...res.data, - // treat_at: res.data.treat_at ? res.data.treat_at.replaceAll('-', '/') : '', - // next_treat_at: res.data.next_treat_at ? res.data.next_treat_at.replaceAll('-', '/') : '', - // notify_at: res.data.notify_at ? res.data.notify_at.replaceAll('-', '/') : '', - // } this.type.text = this.info.type.name } diff --git a/src/pages/record/index.vue b/src/pages/record/index.vue index 84e8855..dca6c75 100644 --- a/src/pages/record/index.vue +++ b/src/pages/record/index.vue @@ -6,13 +6,13 @@ 医师: {{ item.doctor ? item.doctor.name : '' }} - + 时间: {{ item.treat_at }} @@ -28,10 +28,10 @@ export default { data() { return { - type: '', + patient_id: '', + patient: {}, page: 1, perPage: 20, - typeList: [], list: [], option: { id: '', @@ -46,11 +46,11 @@ export default { swipeOption: [ { text: '删除', style: {backgroundColor: '#dd524d'} } ], - listHeight: 0 + listHeight: 0, } }, onLoad(e) { - this.type = e.type + this.patient_id = e.patient uni.getSystemInfo({ success: (res) => { this.listHeight = res.safeArea.height - 20 @@ -68,7 +68,7 @@ export default { this.page = 1 } uni.showLoading() - const params = { page: this.page, perPage: this.perPage, type_id: this.type } + const params = { page: this.page, perPage: this.perPage, patient_id: this.patient_id } this.$ajax.get('/api/client/record', { params }).then(res => { uni.stopPullDownRefresh() if (res.status == 0) { @@ -93,6 +93,9 @@ export default { .page { padding-top: 20px; } + .page .info { + background: white; + } .list { background: white; } diff --git a/src/pages/user/index.vue b/src/pages/user/index.vue index 69ef977..1e9091f 100644 --- a/src/pages/user/index.vue +++ b/src/pages/user/index.vue @@ -9,6 +9,7 @@ + - +