master
xy 3 years ago
parent 2994b2930b
commit a30c101bc3

@ -259,7 +259,8 @@
longitude: this.location.lng longitude: this.location.lng
}, },
success: (res) => { success: (res) => {
this.location.address = res.result.address console.log('mapjs',res);
this.location.address = res.result.address + res.result.formatted_addresses.recommend
this.form.address = this.location.address this.form.address = this.location.address
resolve(res) resolve(res)
}, },

@ -155,6 +155,69 @@
<view class="notice-title">{{detailNotice.title}}</view> <view class="notice-title">{{detailNotice.title}}</view>
<view class="notice-content">{{detailNotice.content}}</view> <view class="notice-content">{{detailNotice.content}}</view>
</u-popup> </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>
</view>
</view>
<view v-else>
<u-empty mode="list" text="暂无护理"></u-empty>
</view>
</view>
</u-popup>
</view> </view>
</template> </template>
@ -200,6 +263,8 @@
infoList: [], infoList: [],
isShowNotice: false, isShowNotice: false,
detailNotice: {}, detailNotice: {},
isShowIng:false,
nursingList:[],
} }
}, },
methods: { methods: {
@ -238,7 +303,32 @@
async getRemind() { async getRemind() {
let res = await this.$u.api.noticeList() let res = await this.$u.api.noticeList()
this.infoList = res.data 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: { computed: {
dateFormat() { dateFormat() {
@ -249,9 +339,13 @@
} }
} }
}, },
onShow() { async onShow() {
this.getStatistic() await this.getStatistic()
this.getRemind() await this.getRemind()
if(this.status.ing > 0){
await this.getIngList()
this.isShowIng = true
}
}, },
created() { created() {
const res = uni.getSystemInfoSync() const res = uni.getSystemInfoSync()
@ -707,4 +801,202 @@
padding: 0 10rpx; 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> </style>

@ -6,7 +6,7 @@
<!-- 搜索 --> <!-- 搜索 -->
<view class="search"> <view class="search">
<view class="input-content"> <view class="input-content">
<u-input :value="select.keyword" placeholder="请输入要搜索的内容" height="30" :custom-style="inputStyle" <u-input :clearable="false" :value="select.keyword" placeholder="请输入要搜索的内容" height="30" :custom-style="inputStyle"
@input="searchInput"></u-input> @input="searchInput"></u-input>
</view> </view>
<view class="icon"> <view class="icon">
@ -68,7 +68,7 @@
</view> </view>
<view class="sex"> <view class="sex">
<view class="sex-text"> <view class="sex-text">
{{item.customer.sex}} {{item.customer.sex || '无'}}
</view> </view>
</view> </view>
</view> </view>
@ -369,7 +369,7 @@
.time { .time {
height: 40rpx; height: 40rpx;
font-size: 28rpx; font-size: 40rpx;
font-family: PingFang-SC-Medium, PingFang-SC; font-family: PingFang-SC-Medium, PingFang-SC;
font-weight: 500; font-weight: 500;
color: #36596A; color: #36596A;

Loading…
Cancel
Save