From c61114b4e2bcd3b1672615c0a72aba70b26a3b40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Fri, 18 Nov 2022 13:20:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/request.js | 21 ---
manifest.json | 10 +-
.../Modifyinformation/Modifyinformation.scss | 14 +-
pages/Modifyinformation/Modifyinformation.vue | 34 ++--
pages/confirmCompletion/confirmCompletion.vue | 149 +++++++++---------
pages/personal/personal.vue | 4 +-
pages/taskDetails/taskDetails.vue | 6 +-
static/1024.png | Bin 184800 -> 124358 bytes
8 files changed, 115 insertions(+), 123 deletions(-)
diff --git a/api/request.js b/api/request.js
index 5638e9d..77c0197 100644
--- a/api/request.js
+++ b/api/request.js
@@ -14,29 +14,8 @@ var request = function(config) {
// token: uni.getStorageSync('token')
// },
success(res) {
- // if (res.data.code == 20002) {
- // uni.showModal({
- // title: "登录提示",
- // content: res.data.message,
- // success(res1) {
- // if (res1.confirm) {
- // uni.navigateTo({
- // url: '/pages/user/login/login'
- // })
- // }
- // }
- // })
- // } else {
- // if (res.data.success) {
uni.hideLoading();
resolve(res.data)
- // } else {
- // uni.showToast({
- // title: res.data.message,
- // icon: "none"
- // })
- // }
- // }
},
fail(err) {
uni.hideLoading();
diff --git a/manifest.json b/manifest.json
index 3cf0a58..f2173b4 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,5 +1,5 @@
{
- "name" : "NurseStationPersonApp",
+ "name" : "泉医到家护理员APP",
"appid" : "__UNI__EE607B0",
"description" : "",
"versionName" : "1.0.0",
@@ -41,9 +41,13 @@
]
},
/* ios打包配置 */
- "ios" : {},
+ "ios" : {
+ "dSYMs" : false
+ },
/* SDK配置 */
- "sdkConfigs" : {},
+ "sdkConfigs" : {
+ "ad" : {}
+ },
"icons" : {
"android" : {
"hdpi" : "unpackage/res/icons/72x72.png",
diff --git a/pages/Modifyinformation/Modifyinformation.scss b/pages/Modifyinformation/Modifyinformation.scss
index 97d28d1..c0d3efa 100644
--- a/pages/Modifyinformation/Modifyinformation.scss
+++ b/pages/Modifyinformation/Modifyinformation.scss
@@ -4,11 +4,13 @@
height: 100vh;
color: #000000;
padding: 3%;
- font-size: 36rpx;
-
+ font-size: 34rpx;
+ .title{
+ font-size: 28rpx;
+ margin: 20rpx 20rpx 0;
+ }
.finish {
width: 217rpx;
- font-size: 32rpx;
color: #FFFFFF;
height: 68rpx;
line-height: 68rpx;
@@ -26,11 +28,9 @@
box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
border-radius: 20rpx;
margin: 0 auto;
-
-
+ padding-bottom: 10rpx;
.content {
line-height: 100rpx;
-
.name {
margin-left: 20rpx;
height: 100rpx;
@@ -50,7 +50,7 @@
line-height: 100rpx;
display: inline-block;
width: 80%;
- font-size: 36rpx;
+ font-size: 34rpx;
}
}
diff --git a/pages/Modifyinformation/Modifyinformation.vue b/pages/Modifyinformation/Modifyinformation.vue
index d83a12c..a571a8f 100644
--- a/pages/Modifyinformation/Modifyinformation.vue
+++ b/pages/Modifyinformation/Modifyinformation.vue
@@ -7,25 +7,29 @@
-
-
- 昵称：
-
-
-
姓名:
-
-
+
+
+ 注:只可修改姓名和头像
+
完成
@@ -88,12 +92,11 @@
var that = this;
uni.chooseImage({
count: 1,
- sizeType: ['original'],
sourceType: ['album'],
success(res) {
that.appPersonallist.avatar = res.tempFilePaths[0]
that.img = res.tempFilePaths[0]
- that.image = res.tempFilePaths[0]
+ that.image = true
}
})
},
@@ -108,11 +111,14 @@
if (this.image) {
uni.uploadFile({
url: baseurl + '/nurseApp/personLogin/updateHeadAvatarHead',
- filePath: that.image, //file: 二进制(filePath)
+ filePath: that.img, //file: 二进制(filePath)
name: 'file',
formData: { //多余值
'userId': that.appPersonallist.userId,
},
+ header: {
+ 'content-type': 'multipart/form-data'
+ },
timeout: 5000,
success(res) {
that.appPersonallist.avatar = JSON.parse(res.data).imgUrl
diff --git a/pages/confirmCompletion/confirmCompletion.vue b/pages/confirmCompletion/confirmCompletion.vue
index 3318b1a..de2324b 100644
--- a/pages/confirmCompletion/confirmCompletion.vue
+++ b/pages/confirmCompletion/confirmCompletion.vue
@@ -6,7 +6,7 @@
- 选择图片
+ 拍摄照片
@@ -30,13 +30,13 @@
- 选择图片
+ 拍摄照片
-
+
用户签名确认
@@ -115,8 +115,7 @@
var that = this;
uni.chooseImage({
count: 1,
- sizeType: ['original'],
- sourceType: ['album'],
+ sourceType: ['camera'],
success(res) {
that.serviceEndPictureUrl = res.tempFilePaths[0]
}
@@ -126,8 +125,7 @@
var that = this;
uni.chooseImage({
count: 1,
- sizeType: ['original'],
- sourceType: ['album'],
+ sourceType: ['camera'],
success(res) {
that.onDutyPictureUrl = res.tempFilePaths[0]
}
@@ -135,62 +133,71 @@
},
//完成
buyfinish() {
- let that = this
- uni.uploadFile({
- url: baseurl + '/nurseApplet/uploadFile/uploadPictureUrl',
- filePath: that.serviceEndPictureUrl,
- name: 'file',
- formData: {
- 'orderNo': that.orderNo
- },
- timeout: 5000,
- success(res) {
- that.list.serviceEndPictureUrl = JSON.parse(res.data).imgUrl
- uni.uploadFile({
- url: baseurl + '/nurseApplet/uploadFile/uploadPictureUrl',
- filePath: that.userSignaturePictureUrl,
- name: 'file',
- formData: {
- 'orderNo': that.orderNo
- },
- timeout: 5000,
- success(res) {
- that.list.userSignaturePictureUrl = JSON.parse(res.data).imgUrl
- uni.uploadFile({
- url: baseurl + '/nurseApplet/uploadFile/uploadPictureUrl',
- filePath: that.onDutyPictureUrl,
- name: 'file',
- formData: {
- 'orderNo': that.orderNo
- },
- timeout: 5000,
- success(res) {
- that.list.onDutyPictureUrl = JSON.parse(res.data).imgUrl
- orderConfirm(that.list).then(res => {
- if (res.code == 200) {
- that.$refs.uToast.show({
- title: '服务完成',
- type: 'success',
- duration: '1500',
- })
- setTimeout(e => {
- uni.navigateBack({
- delta: 1
+ if (this.serviceEndPictureUrl && this.userSignaturePictureUrl && this.onDutyPictureUrl) {
+ let that = this
+ uni.uploadFile({
+ url: baseurl + '/nurseApplet/uploadFile/uploadPictureUrl',
+ filePath: that.serviceEndPictureUrl,
+ name: 'file',
+ formData: {
+ 'orderNo': that.orderNo
+ },
+ timeout: 5000,
+ success(res) {
+ that.list.serviceEndPictureUrl = JSON.parse(res.data).imgUrl
+ uni.uploadFile({
+ url: baseurl + '/nurseApplet/uploadFile/uploadPictureUrl',
+ filePath: that.userSignaturePictureUrl,
+ name: 'file',
+ formData: {
+ 'orderNo': that.orderNo
+ },
+ timeout: 5000,
+ success(res) {
+ that.list.userSignaturePictureUrl = JSON.parse(res.data).imgUrl
+ uni.uploadFile({
+ url: baseurl + '/nurseApplet/uploadFile/uploadPictureUrl',
+ filePath: that.onDutyPictureUrl,
+ name: 'file',
+ formData: {
+ 'orderNo': that.orderNo
+ },
+ timeout: 5000,
+ success(res) {
+ that.list.onDutyPictureUrl = JSON.parse(res.data)
+ .imgUrl
+ orderConfirm(that.list).then(res => {
+ if (res.code == 200) {
+ that.$refs.uToast.show({
+ title: '服务完成',
+ type: 'success',
+ duration: '1500',
})
- }, 1500)
- } else {
- that.$refs.uToast.show({
- title: res.msg,
- type: 'error'
- })
- }
- })
- }
- })
- }
- })
- }
- })
+ setTimeout(e => {
+ uni.navigateBack({
+ delta: 1
+ })
+ }, 1500)
+ } else {
+ that.$refs.uToast.show({
+ title: res.msg,
+ type: 'error'
+ })
+ }
+ })
+ }
+ })
+ }
+ })
+ }
+ })
+ } else {
+ this.$refs.uToast.show({
+ title: '请上传全部照片并用户签名确认',
+ type: 'error'
+ })
+ }
+
},
},
onLoad(options) {
@@ -202,20 +209,16 @@