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/manifest.json b/manifest.json
index 5b8053d..9532159 100644
--- a/manifest.json
+++ b/manifest.json
@@ -97,8 +97,14 @@
"key" : "08e138f3f5e8595453526cbbeed38124",
"securityJsCode" : "e50d5cf4e75c0a2b3f5cbfcc96cc4d8f",
"serviceHost" : ""
+ },
+ "qqmap" : {
+ "key" : "7NIBZ-PCVLJ-UEDFB-KUTCS-Z2O7Z-K6BHO"
}
}
+ },
+ "devServer" : {
+ "port" : ""
}
}
}
diff --git a/pages.json b/pages.json
index be4d74b..fb1e719 100644
--- a/pages.json
+++ b/pages.json
@@ -27,7 +27,7 @@
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#4C7BC9" ,//背景颜色
"navigationBarTextStyle": "white"
-
+
}
},
{
@@ -124,7 +124,7 @@
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#ffffff"
}
-
+
}, {
"path": "pages/site/site",
"style": {
@@ -141,7 +141,7 @@
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#ffffff"
}
-
+
}, {
"path": "pages/detail/detail",
"style": {
@@ -163,7 +163,7 @@
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#ffffff" //背景颜色
}
-
+
},
{
"path": "pages/Doctordetails/Doctordetails",
diff --git a/pages/appointmenttime/appointmenttime.scss b/pages/appointmenttime/appointmenttime.scss
new file mode 100644
index 0000000..4b80419
--- /dev/null
+++ b/pages/appointmenttime/appointmenttime.scss
@@ -0,0 +1,176 @@
+.app {
+
+ .money {
+ font-size: 32rpx;
+ color: #D43953;
+ margin-left: 90%;
+ }
+ font-size: 36rpx;
+ padding-top: 10rpx;
+ .user {
+ background: #FFFFFF;
+ width: 94%;
+ margin: 10rpx auto;
+ box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
+ border-radius: 20rpx;
+ line-height: 93rpx;
+ .selecttime {
+ height: 93rpx;
+ margin-left: 3%;
+ text {
+ font-size: 34rpx;
+ color: #878987;
+ }
+ image {
+ width: 18rpx;
+ height: 27rpx;
+ margin-left:50%;
+ }
+ }
+ .item {
+ width: 97%;
+ height: 93rpx;
+ border-bottom: 1rpx solid #D8D4D4;
+ margin-left: 3%;
+ }
+ }
+ .remarks {
+ width: 94%;
+ height: 382rpx;
+ margin: 10rpx auto;
+ padding: 3%;
+ font-size: 35rpx;
+ height: 96rpx;
+ background: #FFFFFF;
+ border-radius: 20rpx;
+ margin-top: 2%;
+
+ input {
+ margin-top: -6%;
+ margin-left: 15%;
+ }
+ }
+ .priceback {
+ width: 99%;
+ height: 40rpx;
+ background: #FFFFFF;
+ // margin-top: 10rpx;
+ // position:fixed;
+ // bottom:0;
+ display: flex;
+ .prices {
+ font-size: 54rpx;
+ color: #D43953;
+
+ line-height: 73rpx;
+ // margin-top: 5%;
+ }
+ .xiugai {
+ width: 205rpx;
+ height: 71rpx;
+ background: #E1AE3C;
+ border-radius: 26rpx;
+ margin-left: 20%;
+ margin-top: 5%;
+ line-height: 71rpx;
+ text-align: center;
+ color: #ffffff;
+ }
+ .queren {
+ width: 227rpx;
+ height: 71rpx;
+ background: #4C7BC9;
+ border-radius: 26rpx;
+ margin-top: 5%;
+ line-height: 71rpx;
+ text-align: center;
+ color: #ffffff;
+
+ }
+ }
+ .radio-content {
+ height: 80rpx;
+ line-height: 2rpx;
+ font-size: 34rpx;
+
+ .agreement {
+ font-size: 34rpx;
+ color: #878987;
+ margin-left: 14%;
+ }
+ .radio-right {
+ margin-left: 66rpx;
+ .radio-default {
+ border: 2rpx solid #0fbda6;
+ }
+ .radio {
+ width: 34rpx;
+ height: 34rpx;
+ border-radius: 70%;
+ border: 2rpx solid #178ffb;
+ margin: 6px 25px -10px -10px;
+
+ .radio-active {
+ width: 16rpx;
+ height: 16rpx;
+ border-radius: 50%;
+ background-color: #178ffb;
+ margin-left: 26%;
+ margin-top: 22%;
+ // margin: 0 auto;
+ }
+ }
+ }
+ }
+ /* 耗材包 */
+ .Consumablespackage {
+ width: 94%;
+ // height: 188rpx;
+ margin: 10rpx auto;
+ padding: 3%;
+ font-size: 35rpx;
+ height: 188rpx;
+ background: #FFFFFF;
+ border-radius: 20rpx;
+ margin-top: 2%;
+ .detail {
+ width: 301rpx;
+ height: 31rpx;
+ line-height: 31rpx;
+ font-size: 33rpx;
+ color: #666666;
+ line-height: 31rpx;
+ margin-left: 20%;
+ }
+ }
+ /* 套餐 */
+ .Package {
+ width: 94%;
+ // height: 243rpx;
+ margin: 10rpx auto;
+ padding: 3%;
+ font-size: 35rpx;
+ height: 243rpx;
+ background: #FFFFFF;
+ border-radius: 20rpx;
+ margin-top:2%;
+ .detail {
+ width: 301rpx;
+ height: 31rpx;
+ line-height: 31rpx;
+ font-size: 33rpx;
+ color: #666666;
+ line-height: 31rpx;
+ margin-left: 20%;
+ }
+ }
+ .message {
+ width: 94%;
+ // height: 96rpx;
+ background: white;
+ border-radius: 20rpx;
+ margin: 0 auto;
+ text-align: center;
+ line-height: 96rpx;
+ }
+ }
diff --git a/pages/appointmenttime/appointmenttime.vue b/pages/appointmenttime/appointmenttime.vue
index 4bffd61..8544298 100644
--- a/pages/appointmenttime/appointmenttime.vue
+++ b/pages/appointmenttime/appointmenttime.vue
@@ -16,9 +16,10 @@
时间：
- 请选择时间
+ 请选择时间
+
{{usertime}}
-
+
@@ -84,7 +85,7 @@
servelist: [], //服务项目
productlist: [], //产品
stationid: '', //护理站id
- nurseStationId: 2,
+ nurseStationId:'',
nurseStationLabelList: [], //护理站配置
nearbyNursingStationItemList: [],
patientId: 46,
@@ -102,7 +103,9 @@
}
},
- onLoad() {
+ onLoad(options) {
+ console.log(options)
+ this.list.stationId = options.stationId
this.getInfo(),
this.serveinfo(),
this.productinfo()
@@ -145,261 +148,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);
+ }
+ });
+ }
+ }
+ });
- // },
+ },
}
diff --git a/pages/picker/style.components.scss b/pages/picker/style.components.scss
new file mode 100644
index 0000000..6835876
--- /dev/null
+++ b/pages/picker/style.components.scss
@@ -0,0 +1,7 @@
+// 定义混入指令，用于在非nvue环境下的flex定义，因为nvue没有display属性，会报错
+@mixin vue-flex($direction: row) {
+ /* #ifndef APP-NVUE */
+ display: flex;
+ flex-direction: $direction;
+ /* #endif */
+}
\ No newline at end of file
diff --git a/pages/site/site.scss b/pages/site/site.scss
new file mode 100644
index 0000000..a42b249
--- /dev/null
+++ b/pages/site/site.scss
@@ -0,0 +1,176 @@
+ //护理站列表
+ .conNew {
+ width: 96%;
+ z-index: 999;
+ position: absolute;
+ top: 400rpx;
+ left: 2%;
+
+ .addressContent {
+ width: 100%;
+ }
+
+ .lists {
+ background-color: #ffffff;
+ width: 100%;
+ height: 240rpx;
+ margin-bottom: 14rpx;
+ border-radius: 20rpx;
+ position: relative;
+
+ .nurse {
+ font-size: 30rpx;
+ position: absolute;
+ top: 15%;
+ left: 35%;
+ }
+
+ .distance {
+ position: absolute;
+ top: 40%;
+ font-size: 14rpx;
+ margin-left: 35%;
+ color: #666666;
+ }
+
+ .background {
+ width: 180rpx;
+ height: 180rpx;
+ background-color: #4C7BC9;
+ position: absolute;
+ top: 12%;
+ left: 7%;
+ border-radius: 30rpx;
+
+ .qyttext {
+ margin-left: 28%;
+ display: block;
+ font-size: 25rpx;
+ color: #FFFFFF;
+ }
+
+ .lianmeng {
+ display: block;
+ margin-left: 5%;
+ font-size: 14rpx;
+ color: #FFFFFF;
+ }
+ }
+
+ .background image {
+ width: 99rpx;
+ height: 99rpx;
+ // margin: 0 auto;
+ text-align: center;
+ margin-top: 5%;
+ margin-left: 20%;
+ }
+
+ .understand {
+ color: #ffffff;
+ width: 170rpx;
+ height: 70rpx;
+ line-height: 70rpx;
+ text-align: center;
+ background-color: #4C7BC9;
+ position: absolute;
+ bottom: 10%;
+ right: 5%;
+ border-radius: 35rpx;
+ }
+ }
+ }
+
+ .masks {
+ height: 100%;
+ width: 100%;
+ position: absolute;
+ opacity: 0.9;
+ top: 0;
+ z-index: 999;
+
+ .mask {
+ width: 72%;
+ height: 348rpx;
+ background-color: #fff;
+ margin: 47% auto;
+ border-radius: 30rpx;
+ padding: 3%;
+
+ .picture {
+ margin: 0 auto;
+ width: 86rpx;
+
+ image {
+ height: 102rpx;
+ width: 86rpx;
+ }
+ }
+
+
+
+ .text {
+ font-size: 37rpx;
+ color: #000000;
+ line-height: 70rpx;
+ text-align: center;
+ }
+
+
+
+ .btns {
+ display: flex;
+ color: #fff;
+ text-align: center;
+ line-height: 62rpx;
+ justify-content: center;
+ margin-top: 5%;
+
+ .bt {
+ background: #C5BFBF;
+ width: 198rpx;
+ height: 62rpx;
+ border-radius: 23rpx;
+ margin: 25rpx;
+ }
+
+ .btn {
+ width: 198rpx;
+ height: 62rpx;
+ border-radius: 23rpx;
+ background: #4C7BC9;
+ margin: 25rpx;
+ }
+ }
+ }
+ }
+
+
+
+ //什么是护理站
+ .nursetation {
+ width: 80%;
+ position: absolute;
+ top: 20px;
+ left: 10%;
+ float: left;
+ border: 1px solid #f0f0f0;
+ border-radius: 20rpx;
+ background-color: #ffffff;
+ z-index: 100;
+ height: 85rpx;
+ line-height: 85rpx;
+ box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
+
+ .what {
+ margin-left: 10%;
+ display: inline-block;
+ }
+
+ .icon {
+ display: inline-block;
+ height: 85rpx;
+ line-height: 85rpx;
+ margin-left: 45%;
+ }
+ }
diff --git a/pages/site/site.vue b/pages/site/site.vue
index 4113b1f..c44ae60 100644
--- a/pages/site/site.vue
+++ b/pages/site/site.vue
@@ -1,43 +1,47 @@
-
-
- 什么是护理站？
-
-
-
-
-
+
+
+ 什么是护理站？
+
+
+
+
+
+
-
-
+
+
{{item.nurseStationName}}
- 距离您800米
+ 距离您{{item.distance}}米
+ 泉医通
+ 济卫护理联盟NO.1
-
+
点击了解
-
+
-
+
-
+
+
请打开系统定位
-
- 取消
- 去打开
+ 取消
+ 确定
+
@@ -50,8 +54,8 @@
export default {
data() {
return {
- nearbylist: [],
- locationmask: false,
+ nursestationlist: [],
+ mask: true,
pageNum: 1,
pageSize: 10,
//map地图所需
@@ -67,11 +71,11 @@
if (this.nurseTypeCode != undefined) {
nearbyList(this.pageSize, this.pageNum, this.longitude, this.latitude, this.nurseTypeCode, this.iptVal)
.then(res => {
- if (res.total == this.nearbylist.length) {
+ if (res.total == this.nursestationlist.length) {
} else {
res.rows.forEach(e => {
- this.nearbylist.push(e)
+ this.nursestationlist.push(e)
})
}
})
@@ -80,9 +84,9 @@
url: baseurl +
`/nurseApplet/nearbyNursingStation/nearbyList?pageSize=${this.pageSize}&pageNum=${this.pageNum}&homeLongitude=${this.longitude}&homeLatitude=${this.latitude}&nurseStationName=${this.iptVal}`, //仅为示例，并非真实接口地址。
success: (res) => {
- if (res.data.total == this.nearbylist.length) {} else {
+ if (res.data.total == this.nursestationlist.length) {} else {
res.data.rows.forEach(e => {
- this.nearbylist.push(e)
+ this.nursestationlist.push(e)
})
}
console.log(this.nearbylist)
@@ -102,26 +106,15 @@
},
methods: {
requestinfo() {
- if (this.nurseTypeCode != undefined) {
- nearbyList()
- .then(res => {
- this.nearbylist = res.rows
- console.log(this.nearbylist)
- })
- } else {
- uni.request({
- url: baseurl +
- `/nurseApplet/nearbyNursingStation/nearbyList`,
- success: (res) => {
- this.nearbylist = res.data.rows
- console.log(this.nearbylist)
- }
- });
- }
+ nearbyList(this.pageSize, this.pageNum, this.longitude, this.latitude, this.nurseTypeCode, ).then(res => {
+ this.nursestationlist = res.rows
+ // console.log(this.nursestationlist)
+ })
},
- godetails() {
+ godetails(item) {
+ console.log(item)
uni.navigateTo({
- url: `/pages/nursestation/nursestation`
+ url: `/pages/nursestation/nursestation?nurseStationId=${item.nurseStationId}`
})
},
detailed() {
@@ -137,101 +130,5 @@