修改
This commit is contained in:
parent
16859e855b
commit
26447ed240
9
api/taskReturn/index.js
Normal file
9
api/taskReturn/index.js
Normal file
@ -0,0 +1,9 @@
|
||||
import request from "../request.js"
|
||||
|
||||
|
||||
export function orderFallback(orderNo, taskReturnReason) {
|
||||
return request({
|
||||
url: `/nurseApp/personLogin/orderFallback?orderNo=${orderNo}&taskReturnReason=${taskReturnReason}`,
|
||||
method: 'POST'
|
||||
})
|
||||
}
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name" : "NursingrecipientAPP",
|
||||
"appid" : "",
|
||||
"name" : "NurseStationPersonApp",
|
||||
"appid" : "__UNI__EE607B0",
|
||||
"description" : "",
|
||||
"versionName" : "1.0.0",
|
||||
"versionCode" : "100",
|
||||
@ -43,7 +43,39 @@
|
||||
/* ios打包配置 */
|
||||
"ios" : {},
|
||||
/* SDK配置 */
|
||||
"sdkConfigs" : {}
|
||||
"sdkConfigs" : {},
|
||||
"icons" : {
|
||||
"android" : {
|
||||
"hdpi" : "unpackage/res/icons/72x72.png",
|
||||
"xhdpi" : "unpackage/res/icons/96x96.png",
|
||||
"xxhdpi" : "unpackage/res/icons/144x144.png",
|
||||
"xxxhdpi" : "unpackage/res/icons/192x192.png"
|
||||
},
|
||||
"ios" : {
|
||||
"appstore" : "unpackage/res/icons/1024x1024.png",
|
||||
"ipad" : {
|
||||
"app" : "unpackage/res/icons/76x76.png",
|
||||
"app@2x" : "unpackage/res/icons/152x152.png",
|
||||
"notification" : "unpackage/res/icons/20x20.png",
|
||||
"notification@2x" : "unpackage/res/icons/40x40.png",
|
||||
"proapp@2x" : "unpackage/res/icons/167x167.png",
|
||||
"settings" : "unpackage/res/icons/29x29.png",
|
||||
"settings@2x" : "unpackage/res/icons/58x58.png",
|
||||
"spotlight" : "unpackage/res/icons/40x40.png",
|
||||
"spotlight@2x" : "unpackage/res/icons/80x80.png"
|
||||
},
|
||||
"iphone" : {
|
||||
"app@2x" : "unpackage/res/icons/120x120.png",
|
||||
"app@3x" : "unpackage/res/icons/180x180.png",
|
||||
"notification@2x" : "unpackage/res/icons/40x40.png",
|
||||
"notification@3x" : "unpackage/res/icons/60x60.png",
|
||||
"settings@2x" : "unpackage/res/icons/58x58.png",
|
||||
"settings@3x" : "unpackage/res/icons/87x87.png",
|
||||
"spotlight@2x" : "unpackage/res/icons/80x80.png",
|
||||
"spotlight@3x" : "unpackage/res/icons/120x120.png"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
/* 快应用特有相关 */
|
||||
|
||||
@ -17,10 +17,10 @@
|
||||
<span>姓名:</span>
|
||||
<input type="text" maxlength="10" placeholder="请输入" v-model="appPersonallist.nickName" />
|
||||
</view>
|
||||
<view class="name">
|
||||
<!-- <view class="name">
|
||||
<span>电话:</span>
|
||||
<input type="text" maxlength="11" placeholder="请输入" v-model="appPersonallist.phonenumber" />
|
||||
</view>
|
||||
</view> -->
|
||||
<!-- <view class="nursetype name" style="border: none;" @tap='show=true'>
|
||||
护理站:{{getNurseStationName(appPersonallist)}}
|
||||
</view> -->
|
||||
|
||||
@ -88,7 +88,6 @@
|
||||
methods: {
|
||||
//去完成
|
||||
goconfirmCompletion(item) {
|
||||
console.log(item)
|
||||
uni.navigateTo({
|
||||
url: `/pages/confirmCompletion/confirmCompletion?orderDetailsId=${item.id}&orderNo=${item.orderNo}`
|
||||
})
|
||||
|
||||
@ -25,9 +25,12 @@
|
||||
<view class="item">
|
||||
电话:{{appPersonallist.phonenumber }}
|
||||
</view>
|
||||
<view class="item" style="border:none;" v-if="appPersonallist.nurseStationSysUserVOList">
|
||||
<view class="item" style="border:none;border-radius:0 0 20rpx 20rpx;" v-if="appPersonallist.nurseStationSysUserVOList">
|
||||
护理站: {{appPersonallist.nurseStationSysUserVOList[0].nurseStationName}}
|
||||
</view>
|
||||
<view class="signout" @tap='remove'>
|
||||
退出账号
|
||||
</view>
|
||||
</view>
|
||||
<!-- <view class="External" style="margin: 100rpx auto 0;">
|
||||
<view class="lefttext">
|
||||
@ -41,6 +44,8 @@
|
||||
</view>
|
||||
<image src="../../static/jiantou.png" mode=""></image>
|
||||
</view> -->
|
||||
|
||||
<u-toast ref="uToast" />
|
||||
</view>
|
||||
</template>
|
||||
|
||||
@ -81,6 +86,37 @@
|
||||
},
|
||||
onLoad(options) {},
|
||||
methods: {
|
||||
//退出
|
||||
remove() {
|
||||
let that = this
|
||||
uni.showModal({
|
||||
title: '提示',
|
||||
content: '确认要退出此账号吗',
|
||||
success: function(res) {
|
||||
if (res.confirm) {
|
||||
uni.removeStorageSync("phonenumber")
|
||||
uni.removeStorageSync("password")
|
||||
uni.removeStorageSync("nursePersonId")
|
||||
that.$refs.uToast.show({
|
||||
title: '退出账号成功',
|
||||
type: 'success',
|
||||
duration: '1000'
|
||||
})
|
||||
setTimeout(e => {
|
||||
uni.reLaunch({
|
||||
url: '/pages/login/login'
|
||||
})
|
||||
}, 1000)
|
||||
} else if (res.cancel) {
|
||||
that.$refs.uToast.show({
|
||||
title: '退出账号失败',
|
||||
type: 'error',
|
||||
duration: '1000'
|
||||
})
|
||||
}
|
||||
}
|
||||
});
|
||||
},
|
||||
myInfo() {
|
||||
nursePerson(this.phonenumber, this.password).then(res => {
|
||||
this.appPersonallist = res.data
|
||||
@ -103,6 +139,19 @@
|
||||
font-size: 35rpx;
|
||||
height: 100vh;
|
||||
|
||||
.signout {
|
||||
// position: absolute;
|
||||
// bottom: 60rpx;
|
||||
// width: 94%;
|
||||
background: #FFFFFF;
|
||||
margin-top: 50rpx;
|
||||
height: 80rpx;
|
||||
line-height: 80rpx;
|
||||
// left:3%;
|
||||
border-radius: 20rpx;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.External {
|
||||
width: 94%;
|
||||
height: 100rpx;
|
||||
@ -130,21 +179,21 @@
|
||||
}
|
||||
|
||||
.information {
|
||||
width: 94%;
|
||||
background: #FFFFFF;
|
||||
box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
|
||||
width: 98%;
|
||||
border-radius: 20rpx;
|
||||
position: absolute;
|
||||
top: 18%;
|
||||
left: 3%;
|
||||
top: 20%;
|
||||
left: 1%;
|
||||
color: #000000;
|
||||
padding-left: 5%;
|
||||
overflow: hidden;
|
||||
font-size: 35rpx;
|
||||
|
||||
.item {
|
||||
// height: 110rpx;
|
||||
line-height: 110rpx;
|
||||
background: #FFFFFF;
|
||||
padding-left: 3%;
|
||||
box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
|
||||
border-bottom: 1rpx solid #D8D4D4;
|
||||
|
||||
.address {
|
||||
|
||||
@ -51,6 +51,7 @@
|
||||
return {
|
||||
baseurl: '',
|
||||
list: {},
|
||||
orderDetailsId: null,
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
@ -63,19 +64,22 @@
|
||||
},
|
||||
goreturn() {
|
||||
uni.navigateTo({
|
||||
url: '/pages/taskReturn/taskReturn'
|
||||
url: `/pages/taskReturn/taskReturn?orderNo=${this.list.orderNo}`
|
||||
})
|
||||
},
|
||||
gocomplete() {
|
||||
uni.navigateTo({
|
||||
url: '/pages/confirmCompletion/confirmCompletion'
|
||||
url: `/pages/confirmCompletion/confirmCompletion?orderDetailsId=${this.list.orderDetailsId}&orderNo=${this.list.orderNo}`
|
||||
})
|
||||
},
|
||||
},
|
||||
onLoad(options) {
|
||||
this.baseurl = baseurl
|
||||
this.taskDetailsinfo(options.orderDetailsId)
|
||||
}
|
||||
this.orderDetailsId = options.orderDetailsId
|
||||
},
|
||||
onShow() {
|
||||
this.taskDetailsinfo(this.orderDetailsId)
|
||||
},
|
||||
}
|
||||
</script>
|
||||
|
||||
|
||||
@ -5,27 +5,48 @@
|
||||
退回原因
|
||||
</view>
|
||||
<view class="reason" style="border: none;margin: 20rpx 0 0 50rpx;">
|
||||
<input type="text" placeholder="请填写" />
|
||||
<input type="text" placeholder="请填写" v-model="taskReturnReason" />
|
||||
</view>
|
||||
</view>
|
||||
<view class="submit">
|
||||
<view class="finish">
|
||||
去完成
|
||||
<view class="finish" @tap='taskreturn'>
|
||||
确定
|
||||
</view>
|
||||
</view>
|
||||
<u-toast ref="uToast" />
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {
|
||||
orderFallback
|
||||
} from '@/api/taskReturn/index.js'
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
|
||||
orderNo: null,
|
||||
taskReturnReason: null,
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
|
||||
}
|
||||
taskreturn() {
|
||||
orderFallback(this.orderNo, this.taskReturnReason).then(res => {
|
||||
this.$refs.uToast.show({
|
||||
title: '任务退回成功',
|
||||
type: 'success',
|
||||
duration: '1500'
|
||||
})
|
||||
setTimeout(() => {
|
||||
uni.navigateBack({
|
||||
delta: 1
|
||||
})
|
||||
}, 1500);
|
||||
})
|
||||
},
|
||||
},
|
||||
onLoad(options) {
|
||||
this.orderNo = options.orderNo
|
||||
},
|
||||
}
|
||||
</script>
|
||||
|
||||
@ -54,7 +75,8 @@
|
||||
margin: 0 auto;
|
||||
}
|
||||
}
|
||||
.submit{
|
||||
|
||||
.submit {
|
||||
height: 68rpx;
|
||||
font-size: 32rpx;
|
||||
color: #FFFFFF;
|
||||
@ -62,14 +84,15 @@
|
||||
position: fixed;
|
||||
bottom: 80rpx;
|
||||
left: 60%;
|
||||
.finish{
|
||||
|
||||
.finish {
|
||||
width: 217rpx;
|
||||
height: 68rpx;
|
||||
line-height: 68rpx;
|
||||
background: #4C7BC9;
|
||||
border-radius: 26rpx;
|
||||
margin-left: 30rpx;
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
BIN
static/1024.png
Normal file
BIN
static/1024.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 180 KiB |
Loading…
Reference in New Issue
Block a user