From 09e2d07e0284b6169885d9881aea41648102e962 Mon Sep 17 00:00:00 2001 From: shidongli Date: Sun, 8 Oct 2023 15:54:14 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AD=9B=E6=9F=A5=E7=BB=93=E6=9E=9C=20?= =?UTF-8?q?=E7=AD=9B=E6=9F=A5=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/pagesB/screeningRecord/screeningRecord.js | 8 ++ api/pagesB/screeningResult/screeningResult.js | 10 ++- pages.json | 38 +++++--- pages/medicalservice/medicalservice.vue | 16 ++-- pagesB/SelectItem/SelectItem.vue | 89 +++++++++++++++++++ pagesB/screeningRecord/screeningRecord.vue | 64 +++++++++++++ pagesB/screeningResult/screeningResult.vue | 7 +- 7 files changed, 209 insertions(+), 23 deletions(-) create mode 100644 api/pagesB/screeningRecord/screeningRecord.js create mode 100644 pagesB/SelectItem/SelectItem.vue create mode 100644 pagesB/screeningRecord/screeningRecord.vue diff --git a/api/pagesB/screeningRecord/screeningRecord.js b/api/pagesB/screeningRecord/screeningRecord.js new file mode 100644 index 0000000..607ab26 --- /dev/null +++ b/api/pagesB/screeningRecord/screeningRecord.js @@ -0,0 +1,8 @@ +import request from "../../request.js" +// 获取筛查结果列表 +export function screeningResultList(registerId) { + return request({ + url: `/screening/record?registerId=${registerId}`, + method: 'GET' + }) +} \ No newline at end of file diff --git a/api/pagesB/screeningResult/screeningResult.js b/api/pagesB/screeningResult/screeningResult.js index 354411c..d79c80a 100644 --- a/api/pagesB/screeningResult/screeningResult.js +++ b/api/pagesB/screeningResult/screeningResult.js @@ -1,13 +1,15 @@ import request from "../../request.js" // 获取最新的筛查结果 export function lastScreeningResult(registerId) { - return request.get({ - url: `/screening/last/${registerId}` + return request({ + url: `/screening/last/${registerId}`, + method: 'GET' }) } // 获取筛查结果详情 export function screeningResultDetail(screeningId) { - return request.get({ - url: `/screening/detail/${screeningId}` + return request({ + url: `/screening/detail/${screeningId}`, + method: 'GET' }) } diff --git a/pages.json b/pages.json index 39d0ba7..2c31c13 100644 --- a/pages.json +++ b/pages.json @@ -3,18 +3,19 @@ "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue" }, "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages + { + "path": "pages/startup/startup", + "style": { + "navigationStyle": "custom", + "enablePullDownRefresh": false + } + }, { "path": "pages/medicalservice/medicalservice", "style": { "enablePullDownRefresh": false, "navigationStyle": "custom" } - }, { - "path": "pages/startup/startup", - "style": { - "navigationStyle": "custom", - "enablePullDownRefresh": false - } }, { "path": "pages/myinformation/myinformation", "style": { @@ -339,12 +340,29 @@ } ,{ "path" : "screeningResult/screeningResult", - "style" : + "style" : { "navigationBarTitleText": "筛查结果", "enablePullDownRefresh": false } - + + } + ,{ + "path" : "screeningRecord/screeningRecord", + "style" : + { + "navigationBarTitleText": "筛查记录", + "enablePullDownRefresh": false + } + + },{ + "path" : "SelectItem/SelectItem", + "style" : + { + "navigationBarTitleText": "选择项目", + "enablePullDownRefresh": false + } + } ] }, { @@ -441,12 +459,12 @@ } ,{ "path" : "Mysigning/Mysigning", - "style" : + "style" : { "navigationBarTitleText": "我的签约", "enablePullDownRefresh": false } - + } ] }], diff --git a/pages/medicalservice/medicalservice.vue b/pages/medicalservice/medicalservice.vue index fc46dd7..561128b 100644 --- a/pages/medicalservice/medicalservice.vue +++ b/pages/medicalservice/medicalservice.vue @@ -112,11 +112,15 @@ }, // 筛查结果 result(){ - uni.navigateTo({ - url: '/pagesB/screeningResult/screeningResult' - }) - - + uni.navigateTo({ + url: '/pagesB/SelectItem/SelectItem' + }) + + // uni.navigateTo({ + // url: '/pagesB/screeningResult/screeningResult' + // }) + + }, //跳转商城 goshopping() { @@ -157,4 +161,4 @@ \ No newline at end of file + diff --git a/pagesB/SelectItem/SelectItem.vue b/pagesB/SelectItem/SelectItem.vue new file mode 100644 index 0000000..9984330 --- /dev/null +++ b/pagesB/SelectItem/SelectItem.vue @@ -0,0 +1,89 @@ + + + + + \ No newline at end of file diff --git a/pagesB/screeningRecord/screeningRecord.vue b/pagesB/screeningRecord/screeningRecord.vue new file mode 100644 index 0000000..d2709f2 --- /dev/null +++ b/pagesB/screeningRecord/screeningRecord.vue @@ -0,0 +1,64 @@ + + + + + diff --git a/pagesB/screeningResult/screeningResult.vue b/pagesB/screeningResult/screeningResult.vue index 6f3a7be..66f9de0 100644 --- a/pagesB/screeningResult/screeningResult.vue +++ b/pagesB/screeningResult/screeningResult.vue @@ -126,7 +126,7 @@ show2: false, Inv: 0, // items: ['眼底病变筛查', '血小板功能筛查', '动脉粥样筛查'], - //'糖尿病眼底病变筛查', '糖尿病血小板功能筛查', + //'糖尿病眼底病变筛查', '糖尿病血小板功能筛查', items: [], baseList: [{ src: '../../static/ydPic.png' @@ -149,7 +149,7 @@ }; }, onLoad(e) { - // console.log(e); + console.log(e); this.type = e.type if(e) { this.registerId= e.registerId @@ -221,7 +221,8 @@ }, goToScreeningRecord() { uni.navigateTo({ - url: `../screeningRecord/screeningRecord?registerId=${this.registerId}` + // url: `../screeningRecord/screeningRecord?registerId=${this.registerId}` + url: `/pagesB/screeningRecord/screeningRecord?registerId=${this.registerId}` }) } }