xinyilu/xinelu-doctor-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	pages.json
#	pages/myinformation/myinformation.vue
This commit is contained in:
闫晓茹 2023-10-24 16:36:20 +08:00
commit 23ca20d017
7 changed files with 525 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
api/taskReturn/taskReturn.js Normal file
View File

@ -0,0 +1,11 @@
import request from "../request.js"
export function orderFallback(data) {
return request({
url: `/nurseApp/personLogin/orderFallback`,
method: 'POST',
data
})
}

91
pages.json
View File

@ -3,36 +3,34 @@
"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
},
"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
{
"path": "pages/login/login",
"style": {
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
},
{
"path": "pages/Changepassword/Changepassword",
"style": {
"navigationBarTitleText": "修改密码",
"onReachBottomDistance": 20, //距离底部多远时触发 单位为px
"enablePullDownRefresh": true //设置参数为true
}
},
{
"path": "pages/Modifyphonenumber/Modifyphonenumber",
"style": {
"navigationBarTitleText": "修改手机号",
"onReachBottomDistance": 20, //距离底部多远时触发 单位为px
"enablePullDownRefresh": true //设置参数为true
}
},{
"path": "pages/homepage/homepage",
"style": {
"navigationBarTitleText": "工单",
"onReachBottomDistance": 20, //距离底部多远时触发 单位为px
"enablePullDownRefresh": true //设置参数为true
}
},
{
"path" : "pages/taskReturn/taskReturn",
"style" :
{
"navigationBarTitleText": "退回原因",
"enablePullDownRefresh": false
}
},
{
"path" : "pages/Completedwork/Completedwork",
"style" :
{
"navigationBarTitleText": "已完成工单",
"enablePullDownRefresh": false
}
},
{
"path": "pages/myinformation/myinformation",
"style": {
"navigationBarTitleText": "我的",
"enablePullDownRefresh": false
}
},
{
"path": "pages/ServiceSchedule/ServiceSchedule",
"style": {
@ -40,29 +38,25 @@
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#4ac4ab"
}
},
{
"path": "pages/seekadvicefrom/seekadvicefrom",
}, {
"path": "pages/login/login",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false,
"navigationStyle": "custom"
}
},
{
"path": "pages/myinformation/myinformation",
"path": "pages/homepage/homepage",
"style": {
"navigationBarTitleText": "我的",
"enablePullDownRefresh": false
// "navigationStyle": "custom"
"enablePullDownRefresh": false,
"navigationBarTitleText": "工单"
}
}, {
"path": "pages/taskDetails/taskDetails",
"style": {
"navigationBarTitleText": "工单详情",
"enablePullDownRefresh": false
}
}, {
}
, {
"path": "pages/Personalinfo/Personalinfo",
"style": {
"navigationBarTitleText": "个人信息",
@ -70,12 +64,15 @@
}
}
],
],
"globalStyle": {
"navigationBarTextStyle": "white",
"navigationBarTitleText": "",
"navigationBarBackgroundColor": "#18CBB3",
"backgroundColor": "#F8F8F8"
},
"uniIdRouter": {},
"tabBar": {
@ -97,4 +94,4 @@
}
]
}
}
}

197
pages/Completedwork/Completedwork.vue Normal file
View File

@ -0,0 +1,197 @@
<template>
<view class="app">
<view class="top">
<view class="text">
肚子不舒服
</view>
<view class="price">
￥200
</view>
</view>
<view class="bodys">
<view class="time">
时间
</view>
<view class="datatime">
<span>2023-09-21 13:30-14:00</span>
</view>
</view>
<view class="bottom">
<view class="time">
患者信息
</view>
<view class="info">
姓名：万鹏
</view>
<view class="info">
性别：男
</view>
<view class="info">
身份证号：372401199705254567
</view>
<view class="info">
手机号码：13454678907
</view>
<view class="info">
家庭住址：北京市昌平区振兴街幸福里
</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
}
},
methods: {
}
}
</script>
<style lang="scss">
.app {
background: #F1F1F1;
height: 100vh;
.top {
display: flex;
width: 96%;
height: 102rpx;
background: #FFFFFF;
border-radius: 14rpx;
position: relative;
left: 50%;
margin: 30rpx 0 30rpx 0;
line-height: 102rpx;
transform: translateX(-50%);
.text {
font-size: 32rpx;
font-family: SourceHanSansSC-Medium, SourceHanSansSC;
font-weight: 500;
color: #333333;
padding-left: 30rpx;
}
.price {
position: absolute;
right: 20rpx;
top: 50%;
transform: translateY(-50%);
font-size: 38rpx;
font-family: Adobe Heiti Std;
color: #EE2B2B;
}
}
.bodys {
width: 96%;
height: 200rpx;
background: #FFFFFF;
border-radius: 14rpx;
margin: 30rpx 0 30rpx 0;
left: 50%;
position: relative;
transform: translateX(-50%);
.time {
width: 96%;
padding-left: 30rpx;
border-bottom: 1rpx solid #E6E6E6;
height: 100rpx;
line-height: 100rpx;
font-size: 28rpx;
font-family: SourceHanSansSC-Medium, SourceHanSansSC;
font-weight: 500;
color: #333333;
left: 50%;
position: relative;
transform: translateX(-50%);
}
.datatime {
width: 690rpx;
height: 72rpx;
line-height: 72rpx;
background: #F7F9F8;
border-radius: 14rpx;
padding-left: 30rpx;
left: 50%;
top:18rpx;
position: relative;
transform: translateX(-50%);
}
}
.bottom {
width: 96%;
height: 470rpx;
background: #FFFFFF;
border-radius: 14rpx;
margin: 30rpx 0 30rpx 0;
left: 50%;
position: relative;
transform: translateX(-50%);
.time {
width: 96%;
padding-left: 30rpx;
border-bottom: 1rpx solid #E6E6E6;
height: 100rpx;
line-height: 100rpx;
font-size: 28rpx;
font-family: SourceHanSansSC-Medium, SourceHanSansSC;
font-weight: 500;
color: #333333;
left: 50%;
position: relative;
transform: translateX(-50%);
}
.datatime {
width: 690rpx;
height: 72rpx;
line-height: 72rpx;
background: #F7F9F8;
border-radius: 14rpx;
padding-left: 30rpx;
left: 50%;
position: relative;
transform: translateX(-50%);
}
.info {
width: 96%;
height: 72rpx;
line-height: 72rpx;
padding-left: 30rpx;
// background: red;
left: 50%;
position: relative;
transform: translateX(-50%);
font-size: 24rpx;
font-family: SourceHanSansSC-Medium, SourceHanSansSC;
font-weight: 500;
color: #333333;
}
}
}
</style>

6
pages/ServiceSchedule/ServiceSchedule.vue
View File

@ -149,7 +149,7 @@
display: flex;
position: absolute;
right: 2%;
top: 13%;
top: 20%;
flex-wrap: wrap;
width: 400rpx;
@ -299,7 +299,7 @@
width: 100%;
position: fixed;
}
.imageitem {
@ -318,4 +318,4 @@
}
}
}
</style>
</style>

6
pages/homepage/homepage.vue
View File

@ -254,7 +254,13 @@
})
},
tabschange(index) {
console.log(index)
this.tabscurrent = index;
if(this.tabscurrent==2){
uni.navigateTo({
url:'/pages/Completedwork/Completedwork'
})
}
this.query.orderStatus = this.tabslist[index].value
this.optionname = '全部'
this.info();

23
pages/myinformation/myinformation.vue
View File

@ -1,13 +1,7 @@
<template>
<view class="app">
<!-- 家医 -->
<view class="Familydoctor" v-if="status=='1'">
<div class="imgs">
<image src="../../static/top.png" mode=""></image>
<view class="my">
我的
</view>
</div>
<!-- <view class="Familydoctor">
<view class="Familybody">
<view class="myorder titles">
<view class="title">
@ -55,10 +49,6 @@
<!-- 泉医 -->
<view class="Quanyi" v-if="status=='2'">
<div class="imgs">
<image src="../../static/top.png" mode=""></image>
<!-- <view class="my">
我的
</view> -->
</div>
<image src="/static/headsculpture.png" mode="" class="headsculpture">
</image>
@ -173,6 +163,7 @@
.Familydoctor {
.imgs {
// background: red;
// height: 335rpx;
width: 100%;
@ -259,7 +250,8 @@
.imgs {
width: 100%;
height: 100rpx;
height: 345rpx;
background-color: #18CBB3;
image {
position: absolute;
@ -288,6 +280,7 @@
opacity: 1;
overflow: hidden;
position: relative;
top: -160rpx;
.name {
height: 38rpx;
@ -316,7 +309,7 @@
height: 54rpx;
position: relative;
left: 72%;
top: 7%;
top: 5%;
}
.myorder {
@ -365,7 +358,7 @@
.headsculpture {
position: absolute;
top: 25rpx;
top: 104rpx;
left: 50%;
transform: translateX(-50%);
width: 150rpx;
@ -374,4 +367,4 @@
}
}
}
</style>
</style>

256
pages/taskReturn/taskReturn.vue Normal file
View File

@ -0,0 +1,256 @@
<template>
<view class="app">
<view class="top">
<view class="title">
<view class="text">
1111
<!-- {{tasklist.nurseItemName}} -->
</view>
<view class="righttext">
<!-- <span v-if="tasklist.orderCommissionAmount&&tasklist.orderCommissionAmount>=0">
￥{{tasklist.orderCommissionAmount}}
</span>
<span v-else>
￥ 0
</span> -->
<span>￥200</span>
</view>
</view>
<view class="content">
<view class="time" style="line-height: 60rpx;padding-top: 15rpx;">
时间：111
<!-- 时间：{{tasklist.serviceDate}}
<span style='padding-left: 10rpx;'>{{tasklist.serviceStartTime}}</span> -->
</view>
<view class="time">
地点：2032
<!-- 地点：{{tasklist.serviceAddress}} -->
</view>
</view>
</view>
<view class="bottom">
<view class="title">
<view class="text">
拒绝原因（多选）
</view>
</view>
<view class="checkboxs">
<u-checkbox-group @change="checkboxGroupChange" :wrap='true'>
<u-checkbox active-color="#18CBB3" @change="checkboxChange" v-model="item.checked" v-for="(item, index) in list"
:key="index" :name="item.name" shape='circle'>{{item.name}}</u-checkbox>
</u-checkbox-group>
</view>
<u-input v-model="value" type="text" :border="true" border-color='#E6E6E6' placeholder='请输入退回原因'
v-if="list[4].checked" />
</view>
<view class="btn" @tap='taskreturn'>
立即提交
</view>
<u-toast ref="uToast" />
</view>
</template>
<script>
import {
taskDetails
} from '@/api/taskDetails/index.js'
import {
orderFallback
} from '@/api/taskReturn/taskReturn.js'
export default {
data() {
return {
baseurl: null,
tasklist: null, //传值item
nursePersonId: null, //护理员id
taskReturnReason: '',
value: null, //input绑定
list: [{
name: '与其他工单时间冲突',
checked: false,
}, {
name: '服务要求较高，当前资质无法完成',
checked: false,
}, {
name: '距离较远无法到达',
checked: false,
}, {
name: '价格不合理',
checked: false,
}, {
name: '其它',
checked: false,
}]
}
},
methods: {
// 选中某个复选框时，由checkbox时触发
checkboxChange(e) {},
// 选中任一checkbox时，由checkbox-group触发
// checkboxGroupChange(e) {
// this.taskReturnReason = ''
// e.forEach(el => {
// if (el != '其它') {
// this.taskReturnReason += el + ';'
// }
// })
// },
// taskreturn() {
// if (this.list[4].checked && this.value) {
// this.taskReturnReason += this.value + ';'
// }
// if (!this.tasklist.id) {
// this.tasklist.id = this.tasklist.orderDetailsId
// }
// var obj = {
// "appointmentOrderId": this.tasklist.id,
// "stationPersonId": this.nursePersonId,
// "appointmentOrderNo": this.tasklist.orderNo,
// "taskReturnReason": this.taskReturnReason,
// }
// orderFallback(obj).then(res => {
// if (res.code == 200) {
// this.$refs.uToast.show({
// title: '任务退回成功',
// type: 'success',
// duration: '1500'
// })
// setTimeout(() => {
// uni.navigateBack({
// delta: 1
// })
// }, 1500);
// } else {
// this.$refs.uToast.show({
// title: res.msg,
// type: 'error',
// duration: '1500'
// })
// }
// })
// },
},
// onLoad(options) {
// this.tasklist = JSON.parse(options.item)
// var that = this
// const value = uni.getStorageSync('nursePersonId');
// if (value) {
// that.nursePersonId = value
// } else {}
// },
}
</script>
<style lang="scss">
::v-deep .u-input {
border: 1rpx solid #E6E6E6;
width: 85%;
display: block;
margin: 20rpx auto;
background: #F2F2F4;
}
::v-deep .u-checkbox {
height: 80rpx !important;
}
::v-deep .u-checkbox__label{
font-size: 24rpx !important;
font-family: SourceHanSansSC-Medium, SourceHanSansSC;
font-weight: 500 !important;
color: #333333 !important;
}
.app {
padding: 0;
.btn {
width: 496rpx;
height: 70rpx;
background: #18CBB3;
border-radius: 50rpx;
text-align: center;
line-height: 70rpx;
color: #fff;
position: fixed;
bottom: 60rpx;
left: 50%;
transform: translateX(-50%);
}
.checkboxs {
padding-left: 50rpx;
}
.bottom {
padding-bottom: 40rpx;
}
.bottom,
.top {
background-color: #fff;
width: 96%;
margin: 30rpx auto 0;
color: #333333;
border-radius: 14rpx;
}
.top {
// padding-bottom: 40rpx;
.content {
padding: 0 50rpx;
font-size: 30rpx;
.time {
line-height: 90rpx;
font-size: 24rpx;
font-family: SourceHanSansSC-Medium, SourceHanSansSC;
font-weight: 500;
color: #333333;
}
.address {}
}
}
.title {
border-bottom: 1rpx solid #E6E6E6;
display: flex;
height: 100rpx;
line-height: 100rpx;
width: 96%;
position: relative;
left: 50%;
transform: translateX(-50%);
.righttext {
position: absolute;
right: 20rpx;
top: 50%;
transform: translateY(-50%);
font-size: 38rpx;
font-family: Adobe Heiti Std;
color: #EE2B2B;
}
.text {
line-height: 100rpx;
padding-left: 34rpx;
font-size: 32rpx;
font-family: SourceHanSansSC-Medium, SourceHanSansSC;
font-weight: 500;
color: #333333;
}
}
}
</style>