diff --git a/api/taskReturn/index.js b/api/taskReturn/index.js
new file mode 100644
index 0000000..386b64c
--- /dev/null
+++ b/api/taskReturn/index.js
@@ -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'
+ })
+}
diff --git a/manifest.json b/manifest.json
index c56ed02..3cf0a58 100644
--- a/manifest.json
+++ b/manifest.json
@@ -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"
+ }
+ }
+ }
}
},
/* 快应用特有相关 */
diff --git a/pages/Modifyinformation/Modifyinformation.vue b/pages/Modifyinformation/Modifyinformation.vue
index 4796a36..43d7bf4 100644
--- a/pages/Modifyinformation/Modifyinformation.vue
+++ b/pages/Modifyinformation/Modifyinformation.vue
@@ -17,10 +17,10 @@
姓名:
-
+
diff --git a/pages/Mymission/Mymission.vue b/pages/Mymission/Mymission.vue
index 1a60202..132edd8 100644
--- a/pages/Mymission/Mymission.vue
+++ b/pages/Mymission/Mymission.vue
@@ -88,7 +88,6 @@
methods: {
//去完成
goconfirmCompletion(item) {
- console.log(item)
uni.navigateTo({
url: `/pages/confirmCompletion/confirmCompletion?orderDetailsId=${item.id}&orderNo=${item.orderNo}`
})
diff --git a/pages/personal/personal.vue b/pages/personal/personal.vue
index 6cad0b6..7a88e82 100644
--- a/pages/personal/personal.vue
+++ b/pages/personal/personal.vue
@@ -25,9 +25,12 @@
电话：{{appPersonallist.phonenumber }}
-
+
护理站: {{appPersonallist.nurseStationSysUserVOList[0].nurseStationName}}
+
+ 退出账号
+
+
+
@@ -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 {
diff --git a/pages/taskDetails/taskDetails.vue b/pages/taskDetails/taskDetails.vue
index f53cd14..9c3de68 100644
--- a/pages/taskDetails/taskDetails.vue
+++ b/pages/taskDetails/taskDetails.vue
@@ -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)
+ },
}
diff --git a/pages/taskReturn/taskReturn.vue b/pages/taskReturn/taskReturn.vue
index 8a6c842..47849ea 100644
--- a/pages/taskReturn/taskReturn.vue
+++ b/pages/taskReturn/taskReturn.vue
@@ -5,27 +5,48 @@
退回原因
-
+
-
- 去完成
+
+ 确定
+
@@ -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;
-
+
}
}
}
diff --git a/static/1024.png b/static/1024.png
new file mode 100644
index 0000000..fcb4abb
Binary files /dev/null and b/static/1024.png differ