xinyilu/NurseStationPersonApp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
曹辉 2022-11-18 13:20:45 +08:00
parent 32821c9704
commit c61114b4e2
8 changed files with 115 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
api/request.js
View File

@ -14,29 +14,8 @@ var request = function(config) {
// token: uni.getStorageSync('token') // token: uni.getStorageSync('token')
// }, // },
success(res) { 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(); uni.hideLoading();
resolve(res.data) resolve(res.data)
// } else {
// uni.showToast({
// title: res.data.message,
// icon: "none"
// })
// }
// }
}, },
fail(err) { fail(err) {
uni.hideLoading(); uni.hideLoading();

10
manifest.json
View File

@ -1,5 +1,5 @@
{ {
"name" : "NurseStationPersonApp", "name" : "泉医到家护理员APP",
"appid" : "__UNI__EE607B0", "appid" : "__UNI__EE607B0",
"description" : "", "description" : "",
"versionName" : "1.0.0", "versionName" : "1.0.0",
@ -41,9 +41,13 @@
] ]
}, },
/* ios打包配置 */ /* ios打包配置 */
"ios" : {}, "ios" : {
"dSYMs" : false
},
/* SDK配置 */ /* SDK配置 */
"sdkConfigs" : {}, "sdkConfigs" : {
"ad" : {}
},
"icons" : { "icons" : {
"android" : { "android" : {
"hdpi" : "unpackage/res/icons/72x72.png", "hdpi" : "unpackage/res/icons/72x72.png",

14
pages/Modifyinformation/Modifyinformation.scss
View File

@ -4,11 +4,13 @@
height: 100vh; height: 100vh;
color: #000000; color: #000000;
padding: 3%; padding: 3%;
font-size: 36rpx; font-size: 34rpx;
.title{
font-size: 28rpx;
margin: 20rpx 20rpx 0;
}
.finish { .finish {
width: 217rpx; width: 217rpx;
font-size: 32rpx;
color: #FFFFFF; color: #FFFFFF;
height: 68rpx; height: 68rpx;
line-height: 68rpx; line-height: 68rpx;
@ -26,11 +28,9 @@
box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03); box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
border-radius: 20rpx; border-radius: 20rpx;
margin: 0 auto; margin: 0 auto;
padding-bottom: 10rpx;
.content { .content {
line-height: 100rpx; line-height: 100rpx;
.name { .name {
margin-left: 20rpx; margin-left: 20rpx;
height: 100rpx; height: 100rpx;
@ -50,7 +50,7 @@
line-height: 100rpx; line-height: 100rpx;
display: inline-block; display: inline-block;
width: 80%; width: 80%;
font-size: 36rpx; font-size: 34rpx;
} }
} }

34
pages/Modifyinformation/Modifyinformation.vue
View File

@ -7,25 +7,29 @@
<image class="pictureA" src="../../static/jiantou.png" mode=""></image> <image class="pictureA" src="../../static/jiantou.png" mode=""></image>
</view> </view>
<view class="content"> <view class="content">
<view class="name">
<span class="">
昵称：
</span>
<input type="text" maxlength="10" placeholder="请填写" v-model="appPersonallist.userName" />
</view>
<view class="name"> <view class="name">
<span>姓名:</span> <span>姓名:</span>
<input type="text" maxlength="10" placeholder="请输入" v-model="appPersonallist.nickName" /> <input type="text" maxlength="10" placeholder="请输入" v-model="appPersonallist.nickName" />
</view> </view>
<!-- <view class="name"> <view class="name">
<span class="">
账号：
</span>
<input type="text" disabled maxlength="10" placeholder="请填写" v-model="appPersonallist.userName" />
</view>
<view class="name">
<span>电话：</span> <span>电话：</span>
<input type="text" maxlength="11" placeholder="请输入" v-model="appPersonallist.phonenumber" /> <input disabled type="text" maxlength="11" placeholder="请输入"
</view> --> v-model="appPersonallist.phonenumber" />
<!-- <view class="nursetype name" style="border: none;" @tap='show=true'> </view>
<view class="nursetype name" style="border: none;line-height: 50rpx;margin: 20rpx 20rpx;">
护理站:{{getNurseStationName(appPersonallist)}} 护理站:{{getNurseStationName(appPersonallist)}}
</view> --> </view>
</view> </view>
</view> </view>
<view class="title">
注:只可修改姓名和头像
</view>
<view class="finish" @tap="gofinish()">完成 <view class="finish" @tap="gofinish()">完成
</view> </view>
<u-select v-model="show" mode="single-column" :list="NurseStationList" @confirm="confirm"></u-select> <u-select v-model="show" mode="single-column" :list="NurseStationList" @confirm="confirm"></u-select>
@ -88,12 +92,11 @@
var that = this; var that = this;
uni.chooseImage({ uni.chooseImage({
count: 1, count: 1,
sizeType: ['original'],
sourceType: ['album'], sourceType: ['album'],
success(res) { success(res) {
that.appPersonallist.avatar = res.tempFilePaths[0] that.appPersonallist.avatar = res.tempFilePaths[0]
that.img = res.tempFilePaths[0] that.img = res.tempFilePaths[0]
that.image = res.tempFilePaths[0] that.image = true
} }
}) })
}, },
@ -108,11 +111,14 @@
if (this.image) { if (this.image) {
uni.uploadFile({ uni.uploadFile({
url: baseurl + '/nurseApp/personLogin/updateHeadAvatarHead', url: baseurl + '/nurseApp/personLogin/updateHeadAvatarHead',
filePath: that.image, //file: 二进制(filePath) filePath: that.img, //file: 二进制(filePath)
name: 'file', name: 'file',
formData: { //多余值 formData: { //多余值
'userId': that.appPersonallist.userId, 'userId': that.appPersonallist.userId,
}, },
header: {
'content-type': 'multipart/form-data'
},
timeout: 5000, timeout: 5000,
success(res) { success(res) {
that.appPersonallist.avatar = JSON.parse(res.data).imgUrl that.appPersonallist.avatar = JSON.parse(res.data).imgUrl

149
pages/confirmCompletion/confirmCompletion.vue
View File

@ -6,7 +6,7 @@
</view> </view>
<view class="uppicture" @tap='uploadonDutyPictureUrl'> <view class="uppicture" @tap='uploadonDutyPictureUrl'>
<view class="choice" v-if="!onDutyPictureUrl"> <view class="choice" v-if="!onDutyPictureUrl">
选择图片 拍摄照片
</view> </view>
<image v-else :src="onDutyPictureUrl" mode=""></image> <image v-else :src="onDutyPictureUrl" mode=""></image>
<!-- <u-upload class="slot-btn" width="530" height="130" ></u-upload> --> <!-- <u-upload class="slot-btn" width="530" height="130" ></u-upload> -->
@ -30,13 +30,13 @@
</view> </view>
<view class="uppicture" @tap='uploadserviceEndPictureUrl'> <view class="uppicture" @tap='uploadserviceEndPictureUrl'>
<view class="choice" v-if="!serviceEndPictureUrl"> <view class="choice" v-if="!serviceEndPictureUrl">
选择图片 拍摄照片
</view> </view>
<image v-else :src="serviceEndPictureUrl" mode=""></image> <image v-else :src="serviceEndPictureUrl" mode=""></image>
<!-- <u-upload class="slot-btn" width="530" height="130" ></u-upload> --> <!-- <u-upload class="slot-btn" width="530" height="130" ></u-upload> -->
</view> </view>
</view> </view>
<view class="picture" style="height: 350rpx;"> <view class="picture" style="height: 730rpx;">
<view class="attendantImg" style="border-bottom: 1rpx solid #BAB7B8;"> <view class="attendantImg" style="border-bottom: 1rpx solid #BAB7B8;">
用户签名确认 用户签名确认
</view> </view>
@ -115,8 +115,7 @@
var that = this; var that = this;
uni.chooseImage({ uni.chooseImage({
count: 1, count: 1,
sizeType: ['original'], sourceType: ['camera'],
sourceType: ['album'],
success(res) { success(res) {
that.serviceEndPictureUrl = res.tempFilePaths[0] that.serviceEndPictureUrl = res.tempFilePaths[0]
} }
@ -126,8 +125,7 @@
var that = this; var that = this;
uni.chooseImage({ uni.chooseImage({
count: 1, count: 1,
sizeType: ['original'], sourceType: ['camera'],
sourceType: ['album'],
success(res) { success(res) {
that.onDutyPictureUrl = res.tempFilePaths[0] that.onDutyPictureUrl = res.tempFilePaths[0]
} }
@ -135,62 +133,71 @@
}, },
//完成 //完成
buyfinish() { buyfinish() {
let that = this if (this.serviceEndPictureUrl && this.userSignaturePictureUrl && this.onDutyPictureUrl) {
uni.uploadFile({ let that = this
url: baseurl + '/nurseApplet/uploadFile/uploadPictureUrl', uni.uploadFile({
filePath: that.serviceEndPictureUrl, url: baseurl + '/nurseApplet/uploadFile/uploadPictureUrl',
name: 'file', filePath: that.serviceEndPictureUrl,
formData: { name: 'file',
'orderNo': that.orderNo formData: {
}, 'orderNo': that.orderNo
timeout: 5000, },
success(res) { timeout: 5000,
that.list.serviceEndPictureUrl = JSON.parse(res.data).imgUrl success(res) {
uni.uploadFile({ that.list.serviceEndPictureUrl = JSON.parse(res.data).imgUrl
url: baseurl + '/nurseApplet/uploadFile/uploadPictureUrl', uni.uploadFile({
filePath: that.userSignaturePictureUrl, url: baseurl + '/nurseApplet/uploadFile/uploadPictureUrl',
name: 'file', filePath: that.userSignaturePictureUrl,
formData: { name: 'file',
'orderNo': that.orderNo formData: {
}, 'orderNo': that.orderNo
timeout: 5000, },
success(res) { timeout: 5000,
that.list.userSignaturePictureUrl = JSON.parse(res.data).imgUrl success(res) {
uni.uploadFile({ that.list.userSignaturePictureUrl = JSON.parse(res.data).imgUrl
url: baseurl + '/nurseApplet/uploadFile/uploadPictureUrl', uni.uploadFile({
filePath: that.onDutyPictureUrl, url: baseurl + '/nurseApplet/uploadFile/uploadPictureUrl',
name: 'file', filePath: that.onDutyPictureUrl,
formData: { name: 'file',
'orderNo': that.orderNo formData: {
}, 'orderNo': that.orderNo
timeout: 5000, },
success(res) { timeout: 5000,
that.list.onDutyPictureUrl = JSON.parse(res.data).imgUrl success(res) {
orderConfirm(that.list).then(res => { that.list.onDutyPictureUrl = JSON.parse(res.data)
if (res.code == 200) { .imgUrl
that.$refs.uToast.show({ orderConfirm(that.list).then(res => {
title: '服务完成', if (res.code == 200) {
type: 'success', that.$refs.uToast.show({
duration: '1500', title: '服务完成',
}) type: 'success',
setTimeout(e => { duration: '1500',
uni.navigateBack({
delta: 1
}) })
}, 1500) setTimeout(e => {
} else { uni.navigateBack({
that.$refs.uToast.show({ delta: 1
title: res.msg, })
type: 'error' }, 1500)
}) } else {
} that.$refs.uToast.show({
}) title: res.msg,
} type: 'error'
}) })
} }
}) })
} }
}) })
}
})
}
})
} else {
this.$refs.uToast.show({
title: '请上传全部照片并用户签名确认',
type: 'error'
})
}
}, },
}, },
onLoad(options) { onLoad(options) {
@ -202,20 +209,16 @@
<style lang="scss"> <style lang="scss">
.app { .app {
// height: 100%;
padding: 3%; padding: 3%;
font-size: 36rpx; font-size: 36rpx;
height: 100vh;
background-image: linear-gradient(to bottom, #F4F5F7, #ffffff);
.picture { .picture {
width: 95%; width: 95%;
height: 272rpx; height: 630rpx;
background: #FFFFFF; background: #FFFFFF;
box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03); box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
border-radius: 20px; border-radius: 20px;
margin: 0 auto; margin: 20rpx auto 0;
margin-bottom: 20rpx;
.attendantImg { .attendantImg {
color: #000000; color: #000000;
@ -231,13 +234,13 @@
.uppicture { .uppicture {
border: 1rpx dashed #818181; border: 1rpx dashed #818181;
width: 90%; width: 90%;
height: 150rpx; height: 500rpx;
margin: 0 auto; margin: 0 auto;
position: relative; position: relative;
image { image {
width: 100%; width: 100%;
height: 150rpx; height: 100%;
} }
.choice { .choice {
@ -280,6 +283,7 @@
} }
.submit { .submit {
width: 32%;
height: 68rpx; height: 68rpx;
font-size: 32rpx; font-size: 32rpx;
color: #FFFFFF; color: #FFFFFF;
@ -287,13 +291,12 @@
margin-left: 60%; margin-left: 60%;
.finish { .finish {
width: 217rpx; width: 100%;
height: 68rpx; height: 68rpx;
line-height: 68rpx; line-height: 68rpx;
background: #4C7BC9; background: #4C7BC9;
border-radius: 26rpx; border-radius: 26rpx;
margin-left: 30rpx; margin-top: 100rpx;
} }
} }
} }

4
pages/personal/personal.vue
View File

@ -25,7 +25,7 @@
<view class="item"> <view class="item">
电话：{{appPersonallist.phonenumber }} 电话：{{appPersonallist.phonenumber }}
</view> </view>
<view class="item" style="border:none;border-radius:0 0 20rpx 20rpx;" <view class="item" style="border:none;border-radius:0 0 20rpx 20rpx;line-height:50rpx;padding: 20rpx 3%;"
v-if="appPersonallist.nurseStationSysUserVOList"> v-if="appPersonallist.nurseStationSysUserVOList">
护理站: {{appPersonallist.nurseStationSysUserVOList[0].nurseStationName}} 护理站: {{appPersonallist.nurseStationSysUserVOList[0].nurseStationName}}
</view> </view>
@ -133,7 +133,7 @@
<style lang="scss"> <style lang="scss">
.app { .app {
padding: 0; padding: 0;
font-size: 35rpx; font-size: 32rpx;
height: 100vh; height: 100vh;
.signout { .signout {

6
pages/taskDetails/taskDetails.vue
View File

@ -25,19 +25,19 @@
地址：{{list.serviceAddress}} 地址：{{list.serviceAddress}}
</view> </view>
</view> </view>
<view class="img" v-if="list.COMPLETE=='COMPLETE'"> <view class="img" v-if="list.orderStatus=='COMPLETE'">
<view class=""> <view class="">
护理员到岗照片 护理员到岗照片
</view> </view>
<image :src="baseurl+list.onDutyPictureUrl" mode=""></image> <image :src="baseurl+list.onDutyPictureUrl" mode=""></image>
</view> </view>
<view class="img" v-if="list.COMPLETE=='COMPLETE'"> <view class="img" v-if="list.orderStatus=='COMPLETE'">
<view class="" > <view class="" >
服务结束照片 服务结束照片
</view> </view>
<image :src="baseurl+list.serviceEndPictureUrl" mode=""></image> <image :src="baseurl+list.serviceEndPictureUrl" mode=""></image>
</view> </view>
<view class="img" v-if="list.COMPLETE=='COMPLETE'"> <view class="img" v-if="list.orderStatus=='COMPLETE'">
<view class=""> <view class="">
签名 签名
</view> </view>

BIN
static/1024.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 180 KiB

After

Width:  |  Height:  |  Size: 121 KiB