From 0361e6caf90c81a7e5e03ceddbb04e2513e84a7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com> Date: Tue, 25 Oct 2022 08:58:53 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=84=E8=BF=91=E6=8A=A4=E7=90=86=E7=AB=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/site/site.js | 11 +- pages.json | 18 +- pages/appointmenttime/appointmenttime.scss | 10 +- pages/appointmenttime/appointmenttime.vue | 210 +-------------- pages/nursestation/nursestation.scss | 5 +- pages/nursestation/nursestation.vue | 287 +++------------------ 6 files changed, 56 insertions(+), 485 deletions(-) diff --git a/api/site/site.js b/api/site/site.js index b2376a0..0b6b740 100644 --- a/api/site/site.js +++ b/api/site/site.js @@ -1,16 +1,11 @@ import request from "../request.js" -// export function list() { -// return request({ -// url: `/nurseApplet/system/patientInfo/list`, -// method: 'GET' -// }) -// } -export function nearbyList(pageSize,pageNum,longitude, latitude, nurseStationType, nurseStationName) { + +export function nearbyList(pageSize,pageNum,longitude, latitude) { return request({ - url: `/nurseApplet/nearbyNursingStation/nearbyList?pageSize=${pageSize}&pageNum=${pageNum}&homeLongitude=${longitude}&homeLatitude=${latitude}&nurseStationType=${nurseStationType}&nurseStationName=${nurseStationName}`, + url: `/nurseApplet/nearbyNursingStation/nearbyList?pageSize=${pageSize}&pageNum=${pageNum}&homeLongitude=${longitude}&homeLatitude=${latitude}`, method: 'GET' }) } diff --git a/pages.json b/pages.json index b187281..c90de5f 100644 --- a/pages.json +++ b/pages.json @@ -10,6 +10,14 @@ "enablePullDownRefresh": false, "navigationBarBackgroundColor": "#ffffff" //背景颜色 } + },{ + "path": "pages/nursestation/nursestation", + "style": { + "navigationBarTitleText": "护理站详情", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#ffffff" + } + },{ "path": "pages/appointmenttime/appointmenttime", "style": { @@ -34,15 +42,7 @@ } }, - { - "path": "pages/nursestation/nursestation", - "style": { - "navigationBarTitleText": "护理站详情", - "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#ffffff" - } - - }, + diff --git a/pages/appointmenttime/appointmenttime.scss b/pages/appointmenttime/appointmenttime.scss index 8b9c953..d265d45 100644 --- a/pages/appointmenttime/appointmenttime.scss +++ b/pages/appointmenttime/appointmenttime.scss @@ -23,7 +23,7 @@ image { width: 18rpx; height: 27rpx; - margin-left:60%; + margin-left:50%; } } .item { @@ -54,15 +54,15 @@ height: 40rpx; background: #FFFFFF; // margin-top: 10rpx; - position:fixed; - bottom:0; + // position:fixed; + // bottom:0; display: flex; .prices { font-size: 54rpx; color: #D43953; - // line-height: 73rpx; - margin-top: 5%; + line-height: 73rpx; + // margin-top: 5%; } .xiugai { width: 205rpx; diff --git a/pages/appointmenttime/appointmenttime.vue b/pages/appointmenttime/appointmenttime.vue index 51d5516..497c4cc 100644 --- a/pages/appointmenttime/appointmenttime.vue +++ b/pages/appointmenttime/appointmenttime.vue @@ -16,9 +16,10 @@ 时间： - 请选择时间 + 请选择时间 + {{usertime}} - + @@ -65,7 +66,7 @@ submitAppointment } from '@/api/appointmenttime/appointmenttime.js' import baseurl from '@/api/baseurl.js' - import upicker from '../picker/picker.vue' + import upicker from './@/pages/u-picker/u-picker.vue' export default { components: { upicker @@ -173,206 +174,5 @@ } diff --git a/pages/nursestation/nursestation.scss b/pages/nursestation/nursestation.scss index 6e9d3f4..762c9dc 100644 --- a/pages/nursestation/nursestation.scss +++ b/pages/nursestation/nursestation.scss @@ -97,17 +97,14 @@ margin-left: -3%; margin-top: 3%; .config { - // display: flex; + display: flex; .measure { background: #F6F6F6; border-radius: 33rpx; - width: 193rpx; - height: 67rpx; text-align: center; line-height: 50rpx; // display: inline-block; margin-left: 10%; - // margin: 10rpx; } } } diff --git a/pages/nursestation/nursestation.vue b/pages/nursestation/nursestation.vue index 3f637b7..5fc3e64 100644 --- a/pages/nursestation/nursestation.vue +++ b/pages/nursestation/nursestation.vue @@ -84,7 +84,7 @@ servelist: [], //服务项目 productlist: [], //产品 stationid: '', //护理站id - nurseStationId: 2, + nurseStationId:'', nurseStationLabelList: [], //护理站配置 nearbyNursingStationItemList: [], patientId: 46, @@ -102,7 +102,9 @@ } }, - onLoad() { + onLoad(options) { + console.log(options) + this.list.stationId = options.stationId this.getInfo(), this.serveinfo(), this.productinfo() @@ -145,261 +147,38 @@ } }, - // gophone() { - // var that = this - // uni.getSystemInfo({ - // success: function(res) { - // // console.log(res) - // if (res.platform == 'ios') { - // uni.makePhoneCall({ - // phoneNumber: that.list.phone //仅为示例 - // }); - // } else { - // uni.showActionSheet({ - // itemList: ['呼叫', ], - // success: function(res) { - // if (res.tapIndex + 1 == 1) { - // uni.makePhoneCall({ - // phoneNumber: that.list.phone //仅为示例 - // }); - // } - // console.log('选中了第' + (res.tapIndex + 1) + '个按钮'); - // }, - // fail: function(res) { - // // console.log(res.errMsg); - // } - // }); - // } - // } - // }); + gophone() { + var that = this + uni.getSystemInfo({ + success: function(res) { + // console.log(res) + if (res.platform == 'ios') { + uni.makePhoneCall({ + phoneNumber: that.list.phone //仅为示例 + }); + } else { + uni.showActionSheet({ + itemList: ['呼叫', ], + success: function(res) { + if (res.tapIndex + 1 == 1) { + uni.makePhoneCall({ + phoneNumber: that.list.phone //仅为示例 + }); + } + console.log('选中了第' + (res.tapIndex + 1) + '个按钮'); + }, + fail: function(res) { + // console.log(res.errMsg); + } + }); + } + } + }); - // }, + }, }