Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
曹辉 2022-10-24 14:42:19 +08:00
commit f1f7033add
8 changed files with 289 additions and 293 deletions

View File

@ -15,9 +15,9 @@ export function getAppStationItemInfo(stationId, stationItemId, stationItemPrice
method: 'GET'
})
}
export function appointment(data) {
export function submitAppointment(data) {
return request({
url: `/nurseApplet/login/appointment`,
url: `/nurseApp/login/submitAppointment`,
method: 'post',
data
})

View File

@ -38,4 +38,20 @@ export function delnursingStation(id) {
url: '/nurseApplet/nursingStationGoods/' + id,
method: 'delete'
})
}
}
// 查询
export function getSubordinate(areaCode){
return request({
url: `/nurseApplet/nursingStationGoods/getSubordinateRegions?areaCode=${areaCode}`,
method: 'GET'
})
}
//区街道list
export function getSubordinateRegions(areaCode) {
return request({
url: `/nurseApplet/login/getRegionAndStreetInfo?areaCode=${areaCode}`,
method: 'GET'
})
}

View File

@ -10,12 +10,12 @@ export function introductionList(id) {
export function getPatientInfo(id) {
return request({
url: `/nurseApplet/login/getPatientInfo?openId=${id}`,
method: 'GET'
})
}
// export function getAppStationItemInfo(id) {
// return request({
// url: `/nurseApp/login/getAppStationItemInfo?patientId=${id}`,
// method: 'GET'
// })
// }
export function itemList(id,pageSize,pageNum) {
return request({

View File

@ -9,7 +9,7 @@ var request = function(config) {
url: baseurl + config.url,
data: config.data,
method: config.method,
timeout: 5000,
timeout: 10000,
// header: {
// token: uni.getStorageSync('token')
// },

View File

@ -16,8 +16,8 @@
</view>
<view class="selecttime" @tap='timeshow=true'>
<span>时间</span>
<text v-if="usertime==''">请选择时间</text>
<text v-else>{{usertime}}</text>
<text v-if="usertime==''" style="color: black;">请选择时间</text>
<text v-else style="color: black;">{{usertime}}</text>
<image src="../../static/jiantou.png"></image>
</view>
</view>
@ -55,12 +55,6 @@
<view class="queren" @tap='updata'>确认预约</view>
</view>
<u-toast ref="uToast" />
<!-- <u-picker @confirm='confirm2()' mode="time" v-model="timeshow2" start-year='2022' :params="params2">
</u-picker>
<u-picker @confirm='confirm3()' mode="time" v-model="timeshow3" start-year='2022' :params="params3">
</u-picker>
<u-picker @confirm='confirm4()' mode="time" v-model="timeshow4" start-year='2022' :params="params4">
</u-picker> -->
<upicker v-model="timeshow" mode="time" start-year='2022' :params="timeparams" @confirm='timeconfirm'></upicker>
</view>
</template>
@ -71,7 +65,7 @@
submitAppointment
} from '@/api/appointmenttime/appointmenttime.js'
import baseurl from '@/api/baseurl.js'
import upicker from '../u-picker/u-picker.vue'
import upicker from '../picker/picker.vue'
export default {
components: {
upicker
@ -88,9 +82,6 @@
endminute: true,
},
timeshow: false,
timeshow2: false,
timeshow3: false,
timeshow4: false,
maskshow: false,
orderlist: {
"patientId": '',
@ -112,29 +103,25 @@
},
maskshow: false,
userlist: [],
userid: '',
patientId: 46,
phone: '',
patientName: '',
address: '',
usertime: '',
maskshow: false,
radio1: 1,
stationId: 2,
stationItemId: 2,
stationItemPriceId: 3,
getinfolist: {}, //
listInfo: [],
username: "",
userAddress: "",
userphoneList: [],
useraddressList: [],
personInfo: [],
}
},
onLoad(options) {
console.log(options)
this.getInfo()
this.getPatientInfo()
//id
this.personInfo.patientId = options.patientId
this.orderlist.stationId = options.stationId
this.orderlist.stationItemId = options.stationItemId
this.orderlist.stationItemPriceId = options.stationItemPriceId
@ -143,26 +130,28 @@
},
methods: {
//
timeconfirm(e){
timeconfirm(e) {
console.log(e)
this.orderlist.serviceDate = e.year + '-' + e.month + '-' + e.day
this.orderlist.serviceStartTime = e.hour + ":" + e.minute
this.orderlist.serviceEndTime = e.endhour + ":" + e.endminute
this.usertime = e.year + '年' + e.month + '月' + e.day + '日' + e.hour + ":" + e.minute + '至' +e.endhour + ":" + e.endminute
console.log(this.orderlist,this.usertime)
},
getInfo() { //
getAppPatientList(this.patientId).then(res => {
this.personInfo = res.data[0]
console.log("this.personInfo", this.personInfo);
this.orderlist.patientId = res.data[0].patientId
this.orderlist.serviceAddress = res.data[0].address
})
},
//
getPatientInfo(stationId, stationItemId, stationItemPriceId) {
getAppStationItemInfo(stationId, stationItemId, stationItemPriceId).then(res => {
getAppStationItemInfo(this.stationId, this.stationItemId, this.stationItemPriceId).then(res => {
console.log(res)
this.orderlist = res.data
//
this.getInfo()
})
},
//
@ -175,44 +164,11 @@
)
},
confirm2(e) {
console.log(e);
this.timeshow3 = true;
this.orderlist.serviceDate = e.year + '-' + e.month + '-' + e.day
this.usertime = e.year + '年' + e.month + '月' + e.day + '日'
},
confirm4(e) {
console.log(e)
this.usertime = this.usertime + e.hour + ":" + e.minute
this.orderlist.serviceEndTime = e.hour + ":" + e.minute
},
confirm3(e) {
console.log(e)
var sep = '\xa0 \xa0';
this.usertime = this.usertime + sep + e.hour + ":" + e.minute + '至'
console.log(this.orderlist)
this.orderlist.serviceStartTime = e.hour + ":" + e.minute
console.log(this.orderlist)
this.timeshow4 = true;
},
changeRadio2() {
this.radio1 = 2;
// console.log("")
},
// changeRadio2() {
// this.radio1 = 2;
// // console.log("")
// this.maskshow = true;
// },
timeconfirm(e) {
console.log(e);
// this.orderlist.serviceDate = e.year + '-' + e.month + '-' + e.day
// this.usertime = e.year + '' + e.month + '' + e.day + ''
},
}
}
</script>
@ -270,6 +226,11 @@
background: #FFFFFF;
border-radius: 20rpx;
margin-top: 3%;
input {
margin-top: -6%;
margin-left: 15%;
}
}
.priceback {
@ -318,14 +279,6 @@
line-height: 2rpx;
font-size: 34rpx;
.radio {
width: 34rpx;
height: 34rpx;
border-radius: 70%;
border: 2rpx solid #178ffb;
margin: 6px 25px -10px -10px;
}
.agreement {
font-size: 34rpx;
color: #878987;
@ -335,17 +288,27 @@
.radio-right {
margin-left: 66rpx;
/* 同意协议 */
.radio-active {
width: 16rpx;
height: 16rpx;
border-radius: 50%;
background-color: #178ffb;
}
.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: 20%;
margin-top: 20%;
// margin: 0 auto;
}
}
}
}

View File

@ -1,18 +1,17 @@
<template>
<view class="CON">
<view class="app">
<view class="concent">
<view class="background">
<view class="picture">
<image src="/static/detailed.png" mode=""></image>
<view>
<view class="detailed">
<view>护理站是以维护社区人群健康满足社区 人群基本医疗护理需求为宗旨以护士为核心 的各类护理人员组成的团队在一定社区范围 为长期卧床老人患者残疾人临终患
者和其他需要护理服务者提供基础护理专科 护理临终护理消毒隔离技术指导营养指导社区康复指导健康宣教和其他护理服务 的医疗机构</view>
<view>护理站以遵医嘱的上门护理服务为主包括生活护理和医疗护理详情如下</view>
</view>
<image src="/static/detailed.png" mode=""></image>
<view>
<view class="detailed">
<view>护理站是以维护社区人群健康满足社区 人群基本医疗护理需求为宗旨以护士为核心 的各类护理人员组成的团队在一定社区范围 为长期卧床老人患者残疾人临终患
者和其他需要护理服务者提供基础护理专科 护理临终护理消毒隔离技术指导营养指导社区康复指导健康宣教和其他护理服务 的医疗机构</view>
<view>护理站以遵医嘱的上门护理服务为主包括生活护理和医疗护理详情如下</view>
</view>
</view>
</view>
</view>
<view class="concenta">
@ -22,7 +21,7 @@
</view>
</view>
<view class="concentb">
<view class="concentb">
<text class="life">医疗护理 </text>
<view class="lifeserve">
<image src="/static/yiliaohuli.png" mode=""></image>
@ -51,13 +50,51 @@
</script>
<style lang="scss">
.CON {
// position: relative;
width: 100%;
height: 100%;
// min-height: 100vh;
background-color:#F4F5F7;
padding-bottom: 20rpx;
.app {
// font-size: 36rpx;
padding-top: 10rpx;
.concent {
width: 701rpx;
height: 811rpx;
background: #4C7BC9;
box-shadow: 0px 9px 31px 9px rgba(0, 0, 0, 0.03);
border-radius: 20rpx;
margin-top: 5%;
// left: 50%;
// transform: translateX(-50%);
margin: 0 auto;
margin-bottom: 20px;
.background {
position: relative;
// display: flex;
width: 657rpx;
height: 727rpx;
background: #FFFFFF;
border-radius: 25rpx;
background-color: white;
margin: 0 auto;
top: 50%;
transform: translateY(-50%);
image {
width: 178rpx;
height: 84rpx;
background: #FFFFFF;
border-radius: 25px;
// float: right;
margin-left: 68%;
margin-top: 5%;
}
// text-align:center;
}
}
}
.life {
@ -72,20 +109,7 @@
}
.concent {
// position: absolute;
width: 701rpx;
height: 811rpx;
background: #4C7BC9;
box-shadow: 0px 9px 31px 9px rgba(0, 0, 0, 0.03);
border-radius: 20rpx;
margin-top: 5%;
// left: 50%;
// transform: translateX(-50%);
margin: 0 auto;
margin-bottom: 20px;
}
.lifeserve image {
width: 639rpx;
@ -112,7 +136,8 @@
border-radius: 25rpx;
// margin-bottom: 30rpx;
}
.concentb{
.concentb {
margin: 0 auto;
margin-bottom: 20px;
// position: absolute;
@ -126,25 +151,8 @@
}
.background {
position: relative;
// display: flex;
width: 657rpx;
height: 727rpx;
background: #FFFFFF;
border-radius: 25rpx;
background-color: white;
margin: 0 auto;
top: 50%;
transform: translateY(-50%);
// text-align:center;
}
.detailed {
// font-size: 29rpx;
width: 657rpx;
@ -157,14 +165,4 @@
// height: 100%;
text-indent: 2em;
}
.picture image {
width: 178rpx;
height: 84rpx;
background: #FFFFFF;
border-radius: 25px;
// float: right;
margin-left: 68%;
margin-top: 5%;
}
</style>

View File

@ -15,14 +15,9 @@
<view class="up" @tap='del(item)'>
删除
</view>
<!-- <u-modal width="50%" v-model="delshow" style='background-color: rgba(118, 118, 118, 0.6);'
@confirm='delconfirm' :content="content" show-cancel-button>
</u-modal> -->
</view>
</view>
</view>
<view class="ADDress" @tap='add()'>
<image src="../../static/add.png" mode=""></image>
<span class="ADDtext">
@ -32,25 +27,25 @@
<!-- 弹框 -->
<u-popup v-model="show" mode="center" width="80%" height="50%" border-radius="30">
<u-popup v-model="show" mode="center" width="80%" height="55%" border-radius="30">
<view class="payment">
添加收货地址
<span>{{shipAddress}}</span>
<view class="cencel" @tap="cencel()">
<image src="../../static/gb.png" mode=""></image>
</view>
<view class="addinfos">
<u-field v-model="list.receiveName" label="收货人" placeholder="姓名" class="items">
<u-field v-model="infolist.receiveName" label="收货人" placeholder="姓名" class="items" maxlength='30'>
</u-field>
<u-field v-model="list.receivePhone" label="手机号" placeholder="电话" class="items">
<u-field v-model="infolist.receivePhone" label="手机号" placeholder="电话" class="items" maxlength='11'>
</u-field>
<view class="area">
<u-field v-model="list.areaCode" label="地区" placeholder="请选择" class="items">
<view class="area" @tap='areashow=true'>
<u-field v-model="infolist.address" label="地区" placeholder="请选择" class="items" disabled>
</u-field>
<image src="../../static/jiantou.png" mode=""></image>
</view>
<u-field v-model="list.receiveAddress" label-width="170" label="详细地址" placeholder="如街道、门牌号、小区等"
class="items">
<u-field v-model="infolist.receiveAddress" label-width="170" label="详细地址" placeholder="如街道、门牌号、小区等"
class="items" maxlength='50'>
</u-field>
</view>
<view class="save" @tap='submit()'>
@ -60,6 +55,8 @@
</view>
</u-popup>
<u-select v-model="areashow" mode="mutil-column-auto" label-name='areaName' value-name='areaCode'
:list="arealist" @confirm="areaconfirm"></u-select>
</view>
</template>
@ -70,6 +67,8 @@
delnursingStation,
nursingStationGoodsinfo,
updatenursingStation,
getSubordinateRegions,
getSubordinate
} from '@/api/modifyAddress/modifyAddress.js';
import baseurl from '@/api/baseurl.js'
export default {
@ -79,24 +78,26 @@
delshow: false, //
content: '确认要删除信息吗?',
show: false, //
list: {
areashow: false, //
arealist: [], //list
areaCode: '',
shipAddress: '添加收货地址',
infolist: {
receiveName: '',
receivePhone: '',
receiveAddress: '',
areaCode: '',
patientId: 2,
address: '', //
},
goodPatient: [], //
patientId: 2,
// delId: '',
}
},
onLoad(options) {
//
this.goodsList()
this.areaInfo()
},
methods: {
//
@ -108,120 +109,126 @@
},
//
submit() {
let that=this
let that = this
if (that.isedit == true) {
addnursingStation(that.list).then(res => {
addnursingStation(that.infolist).then(res => {
if (res.code == 200) {
that.$refs.uToast.show({
title: '新增成功',
duration: 20000000
});
that.show = false;
// console.log(res)
that.goodsList()
that.list = {}
uni.showToast({
title: '新增成功',
duration: 1500
});
that.show = false;
setTimeout(e => {
that.goodsList()
}, 1500)
}
})
} else {
updatenursingStation(that.list).then(res => {
updatenursingStation(that.infolist).then(res => {
uni.showToast({
title: '修改成功',
duration: 2000
duration: 1500
});
that.show = false;
// console.log(res)
that.goodsList()
// this.list = {}
setTimeout(e => {
that.goodsList()
}, 1500)
})
}
},
//
updata(item) {
this.shipAddress = '修改收货地址'
this.isedit = false
nursingStationGoodsinfo(item.id).then(res => {
console.log(item)
this.list = res.data
this.show = true
this.infolist = res.data
getSubordinate(res.data.areaCode).then(res => {
this.infolist.address = res.data.regionName + res.data.streetName
console.log(this.infolist)
this.show = true
})
})
},
//
add() {
this.infolist = {
receiveName: '',
receivePhone: '',
receiveAddress: '',
areaCode: '',
patientId: 2,
}
this.isedit = true
this.show = true
},
// delconfirm() {
// // console.log(1111)
// delnursingStation(this.delId).then(res => {
// if (res.code == 200) {
// this.$refs.uToast.show({
// title: '',
// type: 'success',
// duration: 2000
// })
// this.delshow = false;
// console.log(res)
// this.goodsList()
// }
// })
// },
//
del(item) {
let that=this
let that = this
uni.showModal({
title: '提示',
content: '确认要删除信息吗',
success: function(res) {
if (res.confirm) {
delnursingStation(item.id).then(res => {
uni.showToast({
title: '删除成功',
duration: 2000,
});
console.log(111),
that.delshow = false;
that.goodsList()
// console.log(this)
uni.showToast({
title: '删除成功',
duration: 1500,
});
setTimeout(e => {
that.goodsList()
}, 1500)
that.delshow = false;
})
} else if (res.cancel) {
console.log('用户点击取消');
}
}
});
// this.delId = item.id
// this.delshow = true
},
//
cencel() {
this.show = false
this.list = {}
}
this.infolist = {}
// this.address=""
},
//
areaInfo() {
getSubordinateRegions(this.areaCode).then(res => {
//
res.data.forEach(e => {
if (e.children.length == 0) {
e.children.push({
areaCode: "",
areaName: "暂无街道",
children: null,
id: '',
})
}
})
this.arealist = res.data;
})
},
//
areaconfirm(e) {
this.infolist.areaCode = e[e.length - 1].value
this.address = e[0].label + '-' + e[1].label
},
}
}
</script>
<style lang="scss">
::v-deep .u-mask {
background-color: rgba(118, 118, 118, 0.6);
}
.app {
padding: 4%;
// height: 100%;
padding-bottom: 100rpx;
.address {
/* position: absolute; */
width: 99%;
height: 270rpx;
height: 280rpx;
background: #FFFFFF;
box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
border-radius: 20rpx;
@ -335,6 +342,5 @@
color: #030001;
line-height: 40rpx;
}
}
</style>

View File

@ -7,13 +7,16 @@
{{list.nurseStationName}}
</view>
<view class="address">{{list.address}} </view>
<view class="callme" @tap="gophone()">
<u-icon name="phone-fill" color="#ffffff" size="28"></u-icon>
联系我们
</view>
<view class="Navigation">
<image src="/static/daohang.png" mode="">导航</image>
<view class="call">
<view class="callme" @tap="gophone()">
<u-icon name="phone-fill" color="#ffffff" size="28"></u-icon>
联系我们
</view>
<view class="Navigation">
<image src="/static/daohang.png" mode="">导航</image>
</view>
</view>
</view>
<view class="detail">
<view class="Introduction">机构简介</view>
@ -28,24 +31,22 @@
<view class="measure">
<text>{{item.labelDescription}}</text>
</view>
</view>
</view>
</view>
<view class="tive">
<view class="tab-box">
<view class="tab-item" @tap="testTabClick(index)" :class="tabIndex == index?'active':''"
v-for="(item,index) in tabList" :key="index">
<view class="tab-item" @tap="testTabClick(index)" v-for="(item,index) in tabList" :key="index"
:class="tabIndex == index?'active':''">
{{item.name}}
</view>
</view>
<view class="item" v-for="(item,index) in servelist" :key="index" v-show='choicetab==false'>
<view class="item" v-for="item in servelist" :key="" v-show='choicetab==false'>
<image src="../../static/fuwutu.png"></image>
<view class="huanyao">{{item.nurseItemName}}
<view class="pingfen">
<u-rate :count="5" value="2"></u-rate>
</view>
</view>
<view class="servicetime">服务时长:{{item.serveDurationUnit}}</view>
<view class="appointment" @tap='goappointments(item)'>预约</view>
@ -107,8 +108,8 @@
this.productinfo()
},
methods: {
//
goappointments(item) {
console.log(item)
uni.navigateTo({
url: `/pages/appointmenttime/appointmenttime?stationId=${item.stationId}&stationItemId=${item.stationItemId}&stationItemPriceId=${item.stationItemPriceId}`,
@ -117,9 +118,12 @@
getInfo() {
introductionList(this.nurseStationId).then(res => {
this.list = res[0]
this.nurseStationLabelList = res[0].nurseStationLabelList
console.log(this.list)
if(res[0].nurseStationLabelList){
this.nurseStationLabelList = res[0].nurseStationLabelList
}
// this.nearbyNursingStationItemList = res[0].nearbyNursingStationItemList
console.log(this.nurseStationLabelList);
// (this.nurseStationLabelList);
})
},
serveinfo() {
@ -141,43 +145,43 @@
}
},
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);
// }
// });
// }
// }
// });
},
// },
}
</script>
<style lang="scss" scoped>
//
.app {
font-size: 36rpx;
padding-top: 10rpx;
.tive {
width: 94%;
background-color: #ffffff;
@ -347,39 +351,48 @@
margin-top: 5%;
}
.Navigation {
width: 103rpx;
height: 48rpx;
background: #00C176;
border-radius: 24px;
font-size: 21rpx;
color: #ffffff;
line-height: 48rpx;
margin-left: 60%;
text-align: center;
margin-top: -6%;
image {
width: 24rpx;
height: 24rpx;
}
}
.callme {
width: 149rpx;
height: 48rpx;
background: #D43953;
border-radius: 24px;
font-size: 21rpx;
color: #ffffff;
line-height: 48rpx;
margin-left: 35%;
margin-top: 3%;
text-align: center;
}
.title {
margin-left: 35%;
line-height: 49px;
font-size: 33rpx;
}
.call {
display: flex;
.Navigation {
width: 103rpx;
height: 48rpx;
background: #00C176;
border-radius: 24px;
font-size: 21rpx;
color: #ffffff;
line-height: 48rpx;
margin-left: 5%;
text-align: center;
margin-top: 3%;
image {
width: 24rpx;
height: 24rpx;
}
}
.callme {
width: 149rpx;
height: 48rpx;
background: #D43953;
border-radius: 24px;
font-size: 21rpx;
color: #ffffff;
line-height: 48rpx;
margin-left: 35%;
margin-top: 3%;
text-align: center;
}
}
.address {
font-size: 25rpx;
margin-left: 35%;