刘翔宇-旅管家 3 years ago
parent 0bd57bceb2
commit 254ffb427a

@ -3,8 +3,8 @@ const mode = process.env.NODE_ENV;
let ROOTPATH = ''; //域名
switch (mode) {
case 'development':
//ROOTPATH = "http://sstt.ali251.langye.net"
ROOTPATH = "https://sstt.115.langye.net"
ROOTPATH = "http://sstt.ali251.langye.net"
//ROOTPATH = "https://sstt.115.langye.net"
break;
case 'production':
ROOTPATH = "https://sstt.115.langye.net"

@ -0,0 +1,322 @@
<template>
<view>
<u-popup v-model="isShowIng" height="60%" mode="bottom" border-radius="14" closeable >
<view class="nursing-list">
<view v-if="nursingList && nursingList.length > 0">
<view v-for="(item,index) in nursingList" :key="index" class="list-item">
<view class="top">
<view class="time">{{item.start_time}}</view>
<view class="status">
<view class="status-icon"
:class="{icon1:item.status === 0,icon2:item.status === 2,icon3:item.status === 1}">
</view>
<view v-if="item.status === 1" class="status-text"></view>
<view v-else-if="item.status === 0" class="status-text">待护理</view>
<view v-else class="status-text">已护理</view>
</view>
</view>
<view class="line"></view>
<view class="center" @click="toDetail(item)">
<view class="avatar">
<u-image :src="item.customer.sex === '男' ? vuex_male_img : vuex_female_img" height="104"
width="104" shape="circle"></u-image>
</view>
<view class="user-info-pop">
<view class="name">{{item.customer.name}}</view>
<view class="tel">
<view>
<u-icon name="phone" size="28" color="#1479FF"></u-icon>
</view>
<view class="text">{{item.customer.phone || '无'}}</view>
</view>
<view class="address">
<view>
<u-icon name="map" size="28" color="#1479FF"></u-icon>
</view>
<view class="text">{{item.customer_address.address || '无'}}</view>
</view>
</view>
<view class="sex">
<view class="sex-text">
{{item.customer.sex || '无'}}
</view>
</view>
</view>
<view class="bottom">
<view class="to-there" @click="toThere(item)">
<view class="to-there-text">去那里</view>
<view class="to-there-icon">
<u-image src="/static/todayNursing/to-there.png" height="46" width="46"></u-image>
</view>
</view>
</view>
</view>
</view>
<view v-else>
<u-empty mode="list" text="暂无护理"></u-empty>
</view>
</view>
</u-popup>
</view>
</view>
</template>
<script>
export default {
name:"doingOrder",
data() {
return {
isShowIng:false,
nursingList:[],
ing:0,
};
},
methods:{
toThere(item) {
this.$u.throttle(() => {
uni.openLocation({
latitude: Number(item.customer.lat),
longitude: Number(item.customer.lng),
name: item.customer.address
})
})
},
//
toDetail(item) {
uni.$u.throttle(() => {
uni.navigateTo({
url: `/pages/detailNursing/detailNursing?id=${item.id}`
})
})
},
async getStatistic() {
let res = await this.$u.api.statistic()
this.ing = res.ing
},
async getIngList() {
let res = await this.$u.api.nurseList({
page:1,
page_size:999,
status:1
})
this.nursingList = res.data
}
},
async created() {
console.log("onShow","doorder")
await this.getStatistic();
if(this.ing > 0){
await this.getIngList()
this.isShowIng = true
}
}
}
</script>
<style scoped lang="scss">
.nursing-list {
margin-top: 88rpx;
.list-item {
width: 710rpx;
background: #FFFFFF;
filter: drop-shadow(0 0 10px rgba(219, 218, 218, 0.5));
margin: 0 20rpx 26rpx 22rpx;
.top {
display: flex;
justify-content: space-between;
align-items: center;
padding: 22rpx 0;
.time {
height: 40rpx;
font-size: 40rpx;
font-family: PingFang-SC-Medium, PingFang-SC;
font-weight: 500;
color: #36596A;
line-height: 40rpx;
padding-left: 20rpx;
}
.status {
display: flex;
align-items: center;
.status-icon {
margin-right: 10rpx;
}
.status-text {
width: 84rpx;
height: 40rpx;
font-size: 28rpx;
font-family: PingFang-SC-Medium, PingFang-SC;
font-weight: 500;
color: #36596A;
line-height: 40rpx;
margin-right: 20rpx;
}
}
}
.line {
width: 670rpx;
height: 2rpx;
border: 2rpx solid #EEEFF5;
margin: 0 auto;
}
.center {
display: flex;
justify-content: space-between;
padding-top: 24rpx;
.avatar {
padding-top: 4rpx;
padding-left: 20rpx;
}
.user-info-pop {
flex: 1;
padding-left: 24rpx;
.name {
width: 270rpx;
height: 48rpx;
font-size: 32rpx;
font-family: PingFang-SC-Medium, PingFang-SC;
font-weight: 500;
color: #333333;
}
.tel {
height: 40rpx;
font-size: 28rpx;
font-family: PingFang-SC-Medium, PingFang-SC;
font-weight: 500;
color: #36596A;
line-height: 40rpx;
display: flex;
margin-top: 18rpx;
.text {
margin-left: 10rpx;
}
}
.address {
font-size: 28rpx;
font-family: PingFang-SC-Medium, PingFang-SC;
font-weight: 500;
color: #36596A;
line-height: 40rpx;
display: flex;
margin-top: 14rpx;
.text {
margin-left: 10rpx;
}
}
}
.sex {
width: 40rpx;
height: 40rpx;
background: #FDECEC;
opacity: 0.5;
display: flex;
justify-content: center;
align-items: center;
margin-right: 20rpx;
.sex-text {
width: 28rpx;
height: 34rpx;
font-size: 28rpx;
font-family: PingFang-SC-Medium, PingFang-SC;
font-weight: 500;
color: #36596A;
line-height: 34rpx;
}
}
}
.bottom {
display: flex;
justify-content: flex-end;
align-items: center;
margin-top: 16rpx;
padding-bottom: 26rpx;
.distance {
align-items: center;
display: flex;
.distance-icon {
padding-left: 20rpx;
}
.distance-text {
height: 34rpx;
font-size: 24rpx;
font-family: PingFang-SC-Medium, PingFang-SC;
font-weight: 500;
color: #A7AFBC;
line-height: 34rpx;
padding-left: 20rpx;
}
}
.to-there {
display: flex;
align-items: center;
margin-right: 20rpx;
.to-there-text {
height: 34rpx;
font-size: 24rpx;
font-family: PingFang-SC-Medium, PingFang-SC;
font-weight: 500;
color: #A7AFBC;
line-height: 34rpx;
margin-right: 14rpx;
}
.to-there-icon {
margin-left: 3rpx;
}
}
}
}
}
</style>

@ -156,74 +156,17 @@
<view class="notice-content">{{detailNotice.content}}</view>
</u-popup>
<u-popup v-model="isShowIng" height="60%" mode="bottom" border-radius="14" closeable >
<view class="nursing-list">
<view v-if="nursingList && nursingList.length > 0">
<view v-for="(item,index) in nursingList" :key="index" class="list-item">
<view class="top">
<view class="time">{{item.start_time}}</view>
<view class="status">
<view class="status-icon"
:class="{icon1:item.status === 0,icon2:item.status === 2,icon3:item.status === 1}">
</view>
<view v-if="item.status === 1" class="status-text"></view>
<view v-else-if="item.status === 0" class="status-text">待护理</view>
<view v-else class="status-text">已护理</view>
</view>
</view>
<view class="line"></view>
<view class="center" @click="toDetail(item)">
<view class="avatar">
<u-image :src="item.customer.sex === '男' ? vuex_male_img : vuex_female_img" height="104"
width="104" shape="circle"></u-image>
</view>
<view class="user-info-pop">
<view class="name">{{item.customer.name}}</view>
<view class="tel">
<view>
<u-icon name="phone" size="28" color="#1479FF"></u-icon>
</view>
<view class="text">{{item.customer.phone || '无'}}</view>
</view>
<view class="address">
<view>
<u-icon name="map" size="28" color="#1479FF"></u-icon>
</view>
<view class="text">{{item.customer_address.address || '无'}}</view>
</view>
</view>
<view class="sex">
<view class="sex-text">
{{item.customer.sex || '无'}}
</view>
</view>
</view>
<view class="bottom">
<view class="to-there" @click="toThere(item)">
<view class="to-there-text">去那里</view>
<view class="to-there-icon">
<u-image src="/static/todayNursing/to-there.png" height="46" width="46"></u-image>
</view>
</view>
</view>
<doingOrder></doingOrder>
</view>
</view>
<view v-else>
<u-empty mode="list" text="暂无护理"></u-empty>
</view>
</view>
</u-popup>
</view>
</template>
<script>
import doingOrder from '../../components/doingOrder/doingOrder.vue'
import moment from "@/libs/moment.min.js"
export default {
components: {
doingOrder
},
data() {
return {
marginTop: 96,
@ -262,9 +205,7 @@
},
infoList: [],
isShowNotice: false,
detailNotice: {},
isShowIng:false,
nursingList:[],
detailNotice: {}
}
},
methods: {
@ -304,31 +245,6 @@
let res = await this.$u.api.noticeList()
this.infoList = res.data
},
async getIngList() {
let res = await this.$u.api.nurseList({
page:1,
page_size:999,
status:1
})
this.nursingList = res.data
},
toThere(item) {
this.$u.throttle(() => {
uni.openLocation({
latitude: Number(item.customer.lat),
longitude: Number(item.customer.lng),
name: item.customer.address
})
})
},
//
toDetail(item) {
uni.$u.throttle(() => {
uni.navigateTo({
url: `/pages/detailNursing/detailNursing?id=${item.id}`
})
})
},
},
computed: {
dateFormat() {
@ -342,10 +258,7 @@
async onShow() {
await this.getStatistic()
await this.getRemind()
if(this.status.ing > 0){
await this.getIngList()
this.isShowIng = true
}
},
created() {
const res = uni.getSystemInfoSync()
@ -802,201 +715,4 @@
padding: 0 10rpx;
}
.nursing-list {
margin-top: 88rpx;
.list-item {
width: 710rpx;
background: #FFFFFF;
filter: drop-shadow(0 0 10px rgba(219, 218, 218, 0.5));
margin: 0 20rpx 26rpx 22rpx;
.top {
display: flex;
justify-content: space-between;
align-items: center;
padding: 22rpx 0;
.time {
height: 40rpx;
font-size: 40rpx;
font-family: PingFang-SC-Medium, PingFang-SC;
font-weight: 500;
color: #36596A;
line-height: 40rpx;
padding-left: 20rpx;
}
.status {
display: flex;
align-items: center;
.status-icon {
margin-right: 10rpx;
}
.status-text {
width: 84rpx;
height: 40rpx;
font-size: 28rpx;
font-family: PingFang-SC-Medium, PingFang-SC;
font-weight: 500;
color: #36596A;
line-height: 40rpx;
margin-right: 20rpx;
}
}
}
.line {
width: 670rpx;
height: 2rpx;
border: 2rpx solid #EEEFF5;
margin: 0 auto;
}
.center {
display: flex;
justify-content: space-between;
padding-top: 24rpx;
.avatar {
padding-top: 4rpx;
padding-left: 20rpx;
}
.user-info-pop {
flex: 1;
padding-left: 24rpx;
.name {
width: 270rpx;
height: 48rpx;
font-size: 32rpx;
font-family: PingFang-SC-Medium, PingFang-SC;
font-weight: 500;
color: #333333;
}
.tel {
height: 40rpx;
font-size: 28rpx;
font-family: PingFang-SC-Medium, PingFang-SC;
font-weight: 500;
color: #36596A;
line-height: 40rpx;
display: flex;
margin-top: 18rpx;
.text {
margin-left: 10rpx;
}
}
.address {
font-size: 28rpx;
font-family: PingFang-SC-Medium, PingFang-SC;
font-weight: 500;
color: #36596A;
line-height: 40rpx;
display: flex;
margin-top: 14rpx;
.text {
margin-left: 10rpx;
}
}
}
.sex {
width: 40rpx;
height: 40rpx;
background: #FDECEC;
opacity: 0.5;
display: flex;
justify-content: center;
align-items: center;
margin-right: 20rpx;
.sex-text {
width: 28rpx;
height: 34rpx;
font-size: 28rpx;
font-family: PingFang-SC-Medium, PingFang-SC;
font-weight: 500;
color: #36596A;
line-height: 34rpx;
}
}
}
.bottom {
display: flex;
justify-content: flex-end;
align-items: center;
margin-top: 16rpx;
padding-bottom: 26rpx;
.distance {
align-items: center;
display: flex;
.distance-icon {
padding-left: 20rpx;
}
.distance-text {
height: 34rpx;
font-size: 24rpx;
font-family: PingFang-SC-Medium, PingFang-SC;
font-weight: 500;
color: #A7AFBC;
line-height: 34rpx;
padding-left: 20rpx;
}
}
.to-there {
display: flex;
align-items: center;
margin-right: 20rpx;
.to-there-text {
height: 34rpx;
font-size: 24rpx;
font-family: PingFang-SC-Medium, PingFang-SC;
font-weight: 500;
color: #A7AFBC;
line-height: 34rpx;
margin-right: 14rpx;
}
.to-there-icon {
margin-left: 3rpx;
}
}
}
}
}
</style>

@ -102,11 +102,16 @@
<u-calendar v-model="isShowCalendar" max-date="2100-01-01" mode="range" @change='datePick'>
</u-calendar>
<doingOrder></doingOrder>
</view>
</template>
<script>
import doingOrder from '../../components/doingOrder/doingOrder.vue'
export default {
components: {
doingOrder
},
data() {
return {
isShowCalendar: false,

@ -106,7 +106,7 @@
});
setTimeout(() => {
uni.switchTab({
url: "/pages/home/home"
url: "/pages/todayNursing/todayNursing"
});
}, 1500)
},

@ -80,7 +80,8 @@
<view class="select-user-list">
<scroll-view :scroll-y="true" style="height: 520rpx;position: relative;">
<view v-if="selectUserList && selectUserList.length > 0">
<view v-for="(item,index) in selectUserList" :key="index" class="user-item" @click="toDetail(item)">
<view v-for="(item,index) in selectUserList" :key="index" class="user-item"
@click="toDetail(item)">
<view class="left">
<u-image :src="item.customer.sex === '男' ? vuex_male_img : vuex_female_img" height="104"
width="104" shape="circle"></u-image>
@ -97,7 +98,7 @@
<view class="list-status-text">{{formatStatus(item.status)}}</view>
</view>
</view>
<view class="right" >
<view class="right">
<u-icon name="arrow-right" size="22"></u-icon>
</view>
</view>
@ -117,7 +118,9 @@
minute: false,
second: false
}" :default-time="`${select.year}-${select.month}-${select.date}`" @confirm='monthPick'></u-picker>
<doingOrder></doingOrder>
</view>
</template>
<script>
@ -125,7 +128,11 @@
import {
formatDate
} from 'common/util.js'
import doingOrder from '../../components/doingOrder/doingOrder.vue'
export default {
components: {
doingOrder
},
data() {
return {
showPicker: false,

@ -87,12 +87,18 @@
</scroll-view>
</view>
</view>
<doingOrder></doingOrder>
</view>
</template>
<script>
import moment from "@/libs/moment.min.js"
import doingOrder from '../../components/doingOrder/doingOrder.vue'
export default {
components: {
doingOrder
},
data() {
return {
refreshStatus: false,

Loading…
Cancel
Save