xinyilu/NurseStationApp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
曹辉 2022-11-10 14:20:16 +08:00
parent 1dda746347
commit 4a8fa4b8f1
15 changed files with 259 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
api/site/site.js
View File

@ -9,3 +9,10 @@ export function nearbyList(pageSize,pageNum,longitude, latitude) {
method: 'GET' method: 'GET'
}) })
} }
//被护理人信息 经纬度
export function getPatientInfo(id) {
return request({
url: `/nurseApplet/login/getPatientInfo?patientId=${id}`,
method: 'GET'
})
}

115
pages/Aftersalesdetails/Aftersalesdetails.scss Normal file
View File

@ -0,0 +1,115 @@
.app {
padding: 3%;
height: 100vh;
font-size: 36rpx;
//按钮修改申请和撤销申请
.evaluate {
display: flex;
float: right;
margin-top: 40%;
font-size: 32rpx;
.cancelorder {
margin-left: 1%;
width: 216rpx;
height: 68rpx;
background: #E1AE3C;
border-radius: 26rpx;
text-align: center;
color: #ffffff;
line-height: 68rpx;
}
}
.content {
width: 95%;
height: 580rpx;
background: #FFFFFF;
box-shadow: 0px 9px 31px 9px rgba(0, 0, 0, 0.03);
border-radius: 20px;
margin: 10px auto;
.name {
width: 95%;
height: 90rpx;
font-size: 30rpx;
line-height: 90rpx;
border-bottom: 1rpx solid #D8D4D4;
margin: 0 auto;
}
.info {
font-size: 32rpx;
margin: 3%;
color: #969394;
line-height: 48rpx;
}
.details {
width: 95%;
height: 40%;
margin: 0 auto;
border-bottom: 1rpx solid #D8D4D4;
.detailslist {
display: flex;
image {
width: 182rpx;
height: 182rpx;
margin: 20rpx 0 0 20rpx;
}
.model {
width: 70%;
margin: 30rpx 0 0 20rpx;
span {
font-size: 32rpx;
color: #000000;
}
span:nth-child(1) {
display: inline-block;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
width: 70%;
}
span:nth-child(2) {
color: #969394;
float: right;
margin-right: 30rpx;
}
.bottom {
margin-top: 40rpx;
.box {
color: #969394;
font-size: 30rpx;
}
}
}
}
}
}
.elderly {
width: 95%;
height: 96rpx;
line-height: 96rpx;
color: #ffffff;
margin: 0 auto;
background: #4C7BC9;
box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
border-radius: 20rpx;
.wait {
margin-left: 3%;
}
}
}

120
pages/Aftersalesdetails/Aftersalesdetails.vue
View File

@ -47,7 +47,7 @@
data() { data() {
return { return {
baseurl: '', baseurl: '',
Aftersalesorder:{}, Aftersalesorder: {},
patientId: '', //用户id patientId: '', //用户id
goodsOrderId: '', //订单id goodsOrderId: '', //订单id
orderStatus: '', //状态 不传 orderStatus: '', //状态 不传
@ -76,7 +76,7 @@
} catch (e) { } catch (e) {
// error // error
} }
// uni.getStorage({ // uni.getStorage({
// key: 'patientId', // key: 'patientId',
// success: function(res) { // success: function(res) {
@ -89,119 +89,5 @@
</script> </script>
<style lang="scss"> <style lang="scss">
.app { @import './Aftersalesdetails.scss';
padding: 3%;
height: 100vh;
font-size: 36rpx;
//按钮修改申请和撤销申请
.evaluate {
display: flex;
float: right;
margin-top: 40%;
font-size: 32rpx;
.cancelorder {
margin-left: 1%;
width: 216rpx;
height: 68rpx;
background: #E1AE3C;
border-radius: 26rpx;
text-align: center;
color: #ffffff;
line-height: 68rpx;
}
}
.content {
width: 95%;
height: 580rpx;
background: #FFFFFF;
box-shadow: 0px 9px 31px 9px rgba(0, 0, 0, 0.03);
border-radius: 20px;
margin: 10px auto;
.name {
width: 95%;
height: 90rpx;
font-size: 30rpx;
line-height: 90rpx;
border-bottom: 1rpx solid #D8D4D4;
margin: 0 auto;
}
.info {
font-size: 32rpx;
margin: 3%;
color: #969394;
line-height: 48rpx;
}
.details {
width: 95%;
height: 40%;
margin: 0 auto;
border-bottom: 1rpx solid #D8D4D4;
.detailslist {
display: flex;
image {
width: 182rpx;
height: 182rpx;
margin: 20rpx 0 0 20rpx;
}
.model {
width: 70%;
margin: 30rpx 0 0 20rpx;
span {
font-size: 32rpx;
color: #000000;
}
span:nth-child(1) {
display: inline-block;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
width: 70%;
}
span:nth-child(2) {
color: #969394;
float: right;
margin-right: 30rpx;
}
.bottom {
margin-top: 40rpx;
.box {
color: #969394;
font-size: 30rpx;
}
}
}
}
}
}
.elderly {
width: 95%;
height: 96rpx;
line-height: 96rpx;
color: #ffffff;
margin: 0 auto;
background: #4C7BC9;
box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
border-radius: 20rpx;
.wait {
margin-left: 3%;
}
}
}
</style> </style>

27
pages/CommodityDetails/CommodityDetails.vue
View File

@ -22,10 +22,10 @@
<view class="selected"> <view class="selected">
优惠 优惠
</view> </view>
<view class="content"> <!-- <view class="content">
购买最多可获得3积分 购买最多可获得3积分
</view> </view>
<image src="../../static/jiantou.png" mode=""></image> <image src="../../static/jiantou.png" mode=""></image> -->
</view> </view>
<view class="service common"> <view class="service common">
<view class="selected"> <view class="selected">
@ -37,7 +37,7 @@
<view class="content" style="display: block;"> <view class="content" style="display: block;">
· 仅工作日发货 · 仅工作日发货
</view> </view>
<image src="../../static/jiantou.png" mode=""></image> <!-- <image src="../../static/jiantou.png" mode=""></image> -->
</view> </view>
<view class="picture"> <view class="picture">
<view class="selected"> <view class="selected">
@ -132,6 +132,7 @@
data() { data() {
return { return {
usershow: false, //完善信息开关 usershow: false, //完善信息开关
image: null, //总图片
baseurl: '', //url baseurl: '', //url
goodsPrice: '', //页面价格 goodsPrice: '', //页面价格
goodsDetailslist: [], //商品list goodsDetailslist: [], //商品list
@ -246,11 +247,13 @@
this.updata.goodsPrice = 0 this.updata.goodsPrice = 0
this.updata.attributeDetailsId = '' this.updata.attributeDetailsId = ''
this.updata.goodsStock = 0 this.updata.goodsStock = 0
this.updata.img = this.image
} else { } else {
this.goodDetailsLists.forEach(e => { this.goodDetailsLists.forEach(e => {
e.isActive = false e.isActive = false
}) })
item.isActive = true item.isActive = true
this.updata.img = item.attributePitureUrl
this.updata.goodsAttributeName = item.attributeDetailsName this.updata.goodsAttributeName = item.attributeDetailsName
this.updata.goodsPrice = item.goodsPrice this.updata.goodsPrice = item.goodsPrice
this.updata.goodsPrice = this.updata.goodsPrice.toFixed(2) this.updata.goodsPrice = this.updata.goodsPrice.toFixed(2)
@ -290,25 +293,33 @@
goodsDetailsinfo(goodsInfoId) { goodsDetailsinfo(goodsInfoId) {
goodsDetails(goodsInfoId).then(res => { goodsDetails(goodsInfoId).then(res => {
res.data[0].goodsPictureUrl = this.baseurl + res.data[0].goodsPictureUrl res.data[0].goodsPictureUrl = this.baseurl + res.data[0].goodsPictureUrl
this.image = res.data[0].goodsPictureUrl
var obj = {
image: res.data[0].goodsPictureUrl,
}
this.info.push(obj)
if (res.data[0].goodDetailsLists == null) { if (res.data[0].goodDetailsLists == null) {
this.goodshow = false this.goodshow = false
} else if (res.data[0].goodDetailsLists.length == 0) { } else if (res.data[0].goodDetailsLists.length == 0) {
this.goodshow = false this.goodshow = false
} else { } else {
res.data[0].goodDetailsLists.forEach(e => { res.data[0].goodDetailsLists.forEach(e => {
e.attributePitureUrl = this.baseurl + e.attributePitureUrl
e.isActive = false e.isActive = false
var objs = {
image: e.attributePitureUrl,
}
this.info.push(objs)
}) })
this.goodDetailsLists = res.data[0].goodDetailsLists
this.goodshow = true this.goodshow = true
console.log(this.goodDetailsLists)
} }
var obj = {
image: res.data[0].goodsPictureUrl
}
this.info.push(obj)
this.goodsDetailslist = res.data[0] this.goodsDetailslist = res.data[0]
this.updata.goodsName = this.goodsDetailslist.goodsName this.updata.goodsName = this.goodsDetailslist.goodsName
this.updata.nurseStationId = this.goodsDetailslist.nurseStationId this.updata.nurseStationId = this.goodsDetailslist.nurseStationId
this.updata.img = res.data[0].goodsPictureUrl this.updata.img = res.data[0].goodsPictureUrl
this.goodDetailsLists = res.data[0].goodDetailsLists
// res.data[0].goodDetailsLists.forEach(e => { // res.data[0].goodDetailsLists.forEach(e => {
// e.goodAttributeDetailsLists.forEach(el => { // e.goodAttributeDetailsLists.forEach(el => {
// el.isActive = false // el.isActive = false

2
pages/ProductList/ProductList.vue
View File

@ -10,7 +10,7 @@
￥{{item.goodsPrice}} ￥{{item.goodsPrice}}
</view> </view>
</view> </view>
<view class="item" v-if="goodsList.length%2!=0"> <view style="width:45%" v-if="goodsList.length%2!=0">
</view> </view>
</view> </view>
</view> </view>

10
pages/ServiceDetails/ServiceDetails.vue
View File

@ -44,9 +44,9 @@
</view> </view>
</view> </view>
<view class="Consumablespackage" v-if='orderlist.itemConsumableList'>耗材包详情： <view class="Consumablespackage" v-if='orderlist.itemConsumableList'>耗材包详情：
<span>￥{{orderlist.itemConsumableList[0].consumablePrice}}</span> <span>￥{{orderlist.consumableTotalPrice}}</span>
<view class="detail"> <view class="detail" v-for='(item,index) in orderlist.itemConsumableList' :key="index">
·{{orderlist.itemConsumableList[0].consumableDetail}} ·{{item.consumableDetail}}
</view> </view>
</view> </view>
<view class="remarks"> <view class="remarks">
@ -94,8 +94,8 @@
this.getlist() this.getlist()
this.getPatientInfo() this.getPatientInfo()
}, },
onShow(){ onShow() {
}, },
methods: { methods: {
gophone() { gophone() {

2
pages/appointmenttime/appointmenttime.scss
View File

@ -1,7 +1,7 @@
.app { .app {
font-size: 34rpx; font-size: 34rpx;
padding-top: 10rpx; padding-top: 10rpx;
height: 100vh; height: 100%;
.addressitem{ .addressitem{
width: 97%; width: 97%;
border-bottom: 1rpx solid #D8D4D4; border-bottom: 1rpx solid #D8D4D4;

19
pages/appointmenttime/appointmenttime.vue
View File

@ -153,29 +153,10 @@
.cityName + response.data.regionName + response.data.streetName + .cityName + response.data.regionName + response.data.streetName +
response.data.address response.data.address
}) })
console.log(that.orderlist)
} }
} catch (e) { } catch (e) {
// error // error
} }
// uni.getStorage({
// key: 'patientId',
// success: function(res) {
// that.patientId = res.data
// //被护理人信息
// getAppPatientList(that.patientId).then(response => {
// that.personInfo = response.data
// that.personInfo.address = response.data.provinceName + response.data
// .cityName + response.data.regionName + response.data.streetName +
// response.data.address
// that.orderlist.patientId = response.data.patientId
// that.orderlist.serviceAddress = response.data.provinceName + response.data
// .cityName + response.data.regionName + response.data.streetName +
// response.data.address
// })
// }
// });
}, },
//获取耗材包详情 //获取耗材包详情
getPatientInfo(stationId, stationItemId, stationItemPriceId) { getPatientInfo(stationId, stationItemId, stationItemPriceId) {

6
pages/medicine/medicine.vue
View File

@ -25,9 +25,9 @@
methods: { methods: {
// 跳转预约医生界面 // 跳转预约医生界面
godoctorslist() { godoctorslist() {
uni.navigateTo({ // uni.navigateTo({
url: '/pages/doctorslist/doctorslist' // url: '/pages/doctorslist/doctorslist'
}) // })
}, },
}, },
} }

4
pages/nursestation/nursestation.scss
View File

@ -113,6 +113,10 @@
position: absolute; position: absolute;
top:10%; top:10%;
left:35%; left:35%;
width: 60%;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
} }
.pingfen { .pingfen {
float: right; float: right;

50
pages/nursestation/nursestation.vue
View File

@ -91,11 +91,11 @@
patientId: '', // patientId: '', //
usershow: false, //完善信息开关 usershow: false, //完善信息开关
choicetab: false, //切换 choicetab: false, //切换
list: [], //护理站list list: [], //护理站list
servelist: [], //服务项目 servelist: [], //服务项目
productlist: [], //产品 productlist: [], //产品
servetotal:0,//服务项目total servetotal: 0, //服务项目total
producttotal:0,//产品total producttotal: 0, //产品total
stationid: '', //护理站id stationid: '', //护理站id
nurseStationLabelList: [], //护理站配置 nurseStationLabelList: [], //护理站配置
nearbyNursingStationItemList: [], nearbyNursingStationItemList: [],
@ -110,34 +110,34 @@
}, ] }, ]
} }
}, },
onLoad(options) { onShow() {
this.usershow = false this.usershow = false
let that = this
try {
const value = uni.getStorageSync('patientId');
if (value) {
that.patientId = value
}
} catch (e) {
// error
}
this.nurseStationId = options.nurseStationId
this.getInfo() this.getInfo()
this.serveinfo() this.serveinfo()
this.productinfo() this.productinfo()
}, },
onLoad(options) {
this.nurseStationId = options.nurseStationId
},
methods: { methods: {
goappointments(item) { goappointments(item) {
AppIdentification(this.patientId).then(res => { let that = this
if (res.data.loginFlag) { try {
uni.navigateTo({ const value = uni.getStorageSync('patientId');
url: `/pages/appointmenttime/appointmenttime?stationId=${item.stationId}&stationItemId=${item.stationItemId}&stationItemPriceId=${item.stationItemPriceId}`, if (value) {
that.patientId = value
AppIdentification(this.patientId).then(res => {
if (res.data.loginFlag) {
uni.navigateTo({
url: `/pages/appointmenttime/appointmenttime?stationId=${item.stationId}&stationItemId=${item.stationItemId}&stationItemPriceId=${item.stationItemPriceId}`,
})
this.usershow = false
} else {
this.usershow = true
}
}) })
this.usershow = false
} else {
this.usershow = true
} }
}) } catch (e) {}
}, },
getInfo() { getInfo() {
introductionList(this.nurseStationId).then(res => { introductionList(this.nurseStationId).then(res => {
@ -154,7 +154,7 @@
e.itemPictureUrl = baseurl + e.itemPictureUrl e.itemPictureUrl = baseurl + e.itemPictureUrl
}) })
this.servelist = res.rows this.servelist = res.rows
this.servetotal=res.total this.servetotal = res.total
}) })
}, },
productinfo() { productinfo() {
@ -163,7 +163,7 @@
e.goodsPictureUrl = baseurl + e.goodsPictureUrl e.goodsPictureUrl = baseurl + e.goodsPictureUrl
}) })
this.productlist = res.rows this.productlist = res.rows
this.producttotal=res.total this.producttotal = res.total
}) })
}, },
testTabClick(index) { testTabClick(index) {
@ -234,7 +234,7 @@
}) })
}) })
} }
} }
}, },

17
pages/shopping/shopping.vue
View File

@ -3,12 +3,12 @@
<view class="cards"> <view class="cards">
<view class="item" :style="{background:listcolor[index]}" @tap='goProductList(item)' <view class="item" :style="{background:listcolor[index]}" @tap='goProductList(item)'
v-for="(item,index) in goodsCategoryList" :key="index"> v-for="(item,index) in goodsCategoryList" :key="index">
<image :src="item.goodsCatrgoryPicture" mode=""></image> <image :src="listimg[index].img" mode=""></image>
<view class="title" style="font-size:42rpx"> <view class="title" style="font-size:42rpx">
{{item.goodsCategoryName}} {{item.goodsCategoryName}}
</view> </view>
</view> </view>
<view class="item" v-if="goodsCategoryList.length%2!=0"> <view style="width:43%" v-if="goodsCategoryList.length%2!=0">
</view> </view>
</view> </view>
</view> </view>
@ -25,6 +25,19 @@
pageSize: 10, //列 pageSize: 10, //列
total: 0, //list总长度 total: 0, //list总长度
goodsCategoryList: [], //商品列表list goodsCategoryList: [], //商品列表list
listimg: [{
img: '../../static/sp.png',
},
{
img: '../../static/yyss.png',
},
{
img: '../../static/znsb.png',
},
{
img: '../../static/cp.png',
},
],
listcolor: ['#00C176', '#D43953', '#E1AE3C', '#4C7BC9', '#00C176', '#D43953', '#E1AE3C', '#4C7BC9'], //颜色随动 listcolor: ['#00C176', '#D43953', '#E1AE3C', '#4C7BC9', '#00C176', '#D43953', '#E1AE3C', '#4C7BC9'], //颜色随动
}; };
}, },

19
pages/site/site.scss
View File

@ -31,7 +31,7 @@
position: relative; position: relative;
.nurse { .nurse {
font-size: 30rpx; font-size: 28rpx;
position: absolute; position: absolute;
top: 15%; top: 15%;
left: 35%; left: 35%;
@ -39,9 +39,9 @@
.distance { .distance {
position: absolute; position: absolute;
top: 40%; bottom: 20%;
font-size: 28rpx; font-size: 24rpx;
margin-left: 35%; left: 35%;
color: #666666; color: #666666;
} }
@ -77,15 +77,16 @@
} }
.understand { .understand {
font-size: 28rpx;
color: #ffffff; color: #ffffff;
width: 170rpx; width: 160rpx;
height: 70rpx; height: 60rpx;
line-height: 70rpx; line-height: 60rpx;
text-align: center; text-align: center;
background-color: #4C7BC9; background-color: #4C7BC9;
position: absolute; position: absolute;
bottom: 10%; bottom: 10%;
right: 5%; right: 1%;
border-radius: 35rpx; border-radius: 35rpx;
} }
} }
@ -98,7 +99,7 @@
opacity: 0.9; opacity: 0.9;
top: 0; top: 0;
z-index: 999; z-index: 999;
background-color: #f0f0f0;
.mask { .mask {
width: 72%; width: 72%;
height: 348rpx; height: 348rpx;

55
pages/site/site.vue
View File

@ -38,7 +38,8 @@
</template> </template>
<script> <script>
import { import {
nearbyList nearbyList,
getPatientInfo
} from '@/api/site/site.js'; } from '@/api/site/site.js';
import baseurl from '@/api/baseurl.js' import baseurl from '@/api/baseurl.js'
export default { export default {
@ -64,9 +65,16 @@
uni.getLocation({ uni.getLocation({
type: 'gcj02', type: 'gcj02',
success: res => { success: res => {
console.log(res)
this.latitude = res.latitude this.latitude = res.latitude
this.longitude = res.longitude this.longitude = res.longitude
this.markers.push({
id: 3,
latitude: res.latitude,
longitude: res.longitude,
width: 20,
height: 25,
iconPath: "../../static/locatinsmall.png"
})
this.requestinfo(); this.requestinfo();
}, },
fail: error => { fail: error => {
@ -124,6 +132,9 @@
}, },
cancel() { cancel() {
this.mask = false this.mask = false
uni.switchTab({
url: '/pages/homepage/homepage',
})
}, },
}, },
onReachBottom() { onReachBottom() {
@ -138,15 +149,49 @@
}) })
} }
}, },
onPullDownRefresh() { //下拉刷新
this.pageNum = 1;
nearbyList(this.pageSize, this.pageNum, this.longitude, this.latitude, this.nurseTypeCode, this.iptVal)
.then(res => {
this.nursestationlist = res.rows
})
setTimeout(function() {
uni.stopPullDownRefresh();
}, 1000);
},
watch: { watch: {
iptVal() { iptVal() {
// this.requestinfo() // this.requestinfo()
}, },
}, },
onShow() {}, onShow() {
onLoad() { var that = this
this.requestinfo() try {
const value = uni.getStorageSync('patientId');
if (value) {
getPatientInfo(value).then(res => {
if (res.data.homeLatitude && res.data.homeLongitude) {
that.latitude = res.data.homeLatitude
that.longitude = res.data.homeLongitude
that.markers.push({
id: 3,
latitude: res.data.homeLatitude,
longitude: res.data.homeLongitude,
width: 20,
height: 25,
iconPath: "../../static/locatinsmall.png"
})
that.requestinfo();
} else {
that.getlocation()
}
})
} else {
that.getlocation()
}
} catch (e) {}
}, },
onLoad() {},
} }
</script> </script>
<style lang="scss"> <style lang="scss">

2
pages/startup/startup.vue
View File

@ -14,7 +14,7 @@
}; };
}, },
onLoad() { onShow() {
let that = this let that = this
try { try {
const value = uni.getStorageSync('patientId'); const value = uni.getStorageSync('patientId');