yangjun
/
hldy_xcx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并代码

This commit is contained in:
Teng 2026-02-27 10:47:55 +08:00
parent a30d7ae346
commit 1b0f17f419
12 changed files with 116 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pages/addjigou/name.vue
View File

@ -22,7 +22,7 @@
<view class="white-photo" @click="selectphoto(0)"> <view class="white-photo" @click="selectphoto(0)">
<view class="photo-left"> <view class="photo-left">
<view class="photo-weight">人像面</view> <view class="photo-weight">人像面</view>
<view class="photo-font">请上传身份证人像面</view> <!-- <view class="photo-font">请上传身份证人像面</view> -->
</view> </view>
<view style="position: relative;"> <view style="position: relative;">
<image class="photo" <image class="photo"
@ -38,7 +38,7 @@
<view class="white-photo" style="margin-top: 30rpx;" @click="selectphoto(1)"> <view class="white-photo" style="margin-top: 30rpx;" @click="selectphoto(1)">
<view class="photo-left"> <view class="photo-left">
<view class="photo-weight">国徽面</view> <view class="photo-weight">国徽面</view>
<view class="photo-font">请上传身份证国徽面</view> <!-- <view class="photo-font">请上传身份证国徽面</view> -->
</view> </view>
<view style="position: relative;"> <view style="position: relative;">
<!-- <image class="photo" <!-- <image class="photo"

2
pages/addoldman/IDcard.vue
View File

@ -24,7 +24,7 @@
<view class="white-photo" @click="selectphoto()"> <view class="white-photo" @click="selectphoto()">
<view class="photo-left"> <view class="photo-left">
<view class="photo-weight">人像面</view> <view class="photo-weight">人像面</view>
<view class="photo-font">请上传身份证人像面</view> <!-- <view class="photo-font">请上传身份证人像面</view> -->
</view> </view>
<view style="position: relative;"> <view style="position: relative;">
<image class="photo" <image class="photo"

6
pages/addoldman/jianhurenall.vue
View File

@ -348,10 +348,10 @@
.shu-img { .shu-img {
position: absolute; position: absolute;
right: 20rpx; right: 20rpx;
top: 40%; top: 48%;
transform: translateY(-40%); transform: translateY(-40%);
width: 150rpx; width: 130rpx;
height: 130rpx; height: 112rpx;
} }
.greenbgc { .greenbgc {

4
pages/addoldman/oldIDcard.vue
View File

@ -17,7 +17,7 @@
<view class="white-photo" @click="selectphoto(2)"> <view class="white-photo" @click="selectphoto(2)">
<view class="photo-left"> <view class="photo-left">
<view class="photo-weight">人像面</view> <view class="photo-weight">人像面</view>
<view class="photo-font">请上传身份证人像面</view> <!-- <view class="photo-font">请上传身份证人像面</view> -->
</view> </view>
<view style="position: relative;"> <view style="position: relative;">
<image class="photo" <image class="photo"
@ -75,7 +75,7 @@
<view class="white-photo" @click="selectphoto(0)"> <view class="white-photo" @click="selectphoto(0)">
<view class="photo-left"> <view class="photo-left">
<view class="photo-weight">人像面</view> <view class="photo-weight">人像面</view>
<view class="photo-font">请上传身份证人像面</view> <!-- <view class="photo-font">请上传身份证人像面</view> -->
</view> </view>
<view style="position: relative;"> <view style="position: relative;">
<image class="photo" <image class="photo"

4
pages/addstaff/IDcard.vue
View File

@ -23,7 +23,7 @@
<view class="white-photo" @click="selectphoto(0)"> <view class="white-photo" @click="selectphoto(0)">
<view class="photo-left"> <view class="photo-left">
<view class="photo-weight">人像面</view> <view class="photo-weight">人像面</view>
<view class="photo-font">请上传身份证人像面</view> <!-- <view class="photo-font">请上传身份证人像面</view> -->
</view> </view>
<view style="position: relative;"> <view style="position: relative;">
<image class="photo" <image class="photo"
@ -39,7 +39,7 @@
<view class="white-photo" style="margin-top: 30rpx;" @click="selectphoto(1)"> <view class="white-photo" style="margin-top: 30rpx;" @click="selectphoto(1)">
<view class="photo-left"> <view class="photo-left">
<view class="photo-weight">国徽面</view> <view class="photo-weight">国徽面</view>
<view class="photo-font">请上传身份证国徽面</view> <!-- <view class="photo-font">请上传身份证国徽面</view> -->
</view> </view>
<view style="position: relative;"> <view style="position: relative;">
<image class="photo" <image class="photo"

10
pages/addstaff/all.vue
View File

@ -277,7 +277,7 @@
</view> </view>
<view style="display: flex;width: 100%;padding: 0 10%;justify-content: space-between;margin-top: 20rpx;"> <view style="display: flex;width: 100%;padding: 0 10%;justify-content: space-between;margin-top: 20rpx;">
<view class="back-button" @click="dexcard = 2;gotop()"> <view class="back-button" @click="dexcard = 1;gotop()">
上一步 上一步
</view> </view>
<view class="finish-button" @click="goBack()"> <view class="finish-button" @click="goBack()">
@ -648,10 +648,10 @@
.shu-img { .shu-img {
position: absolute; position: absolute;
right: 20rpx; right: 20rpx;
top: 40%; top: 60%;
transform: translateY(-40%); transform: translateY(-50%);
width: 150rpx; width: 130rpx;
height: 130rpx; height: 112rpx;
} }
.greenbgc { .greenbgc {

13
pages/addstaff/bankcard.vue
View File

@ -225,18 +225,23 @@
}, },
formData: {}, formData: {},
success: uploadRes => { success: uploadRes => {
console.log("啥玩意啊",JSON.parse(uploadRes.data).success)
if (!JSON.parse(uploadRes.data).success) { if (!JSON.parse(uploadRes.data).success) {
uni.hideLoading() uni.hideLoading()
// uping.value = true; uping.value = true;
savephoto(filePath, targetphoto.value); // savephoto(filePath, targetphoto.value);
uni.showToast({
title: '请上传正确的银行卡',
icon: 'none'
})
return return
} }
// console.log("father",JSON.parse(JSON.parse(uploadRes.data).result.data).data)
if (JSON.parse(JSON.parse(uploadRes.data).result.data).data.bankName) { if (JSON.parse(JSON.parse(uploadRes.data).result.data).data.bankName) {
let father = JSON.parse(JSON.parse(uploadRes.data).result.data).data; let father = JSON.parse(JSON.parse(uploadRes.data).result.data).data;
textArray[0] = father.bankName; textArray[0] = father.bankName;
textArray[1] = father.cardNumber; textArray[1] = father.cardNumber;
savephoto(filePath, targetphoto.value); savephoto(filePath, targetphoto.value);
// uping.value = true; // uping.value = true;
} else { } else {

2
pages/addsupplier/successpush.vue
View File

@ -17,7 +17,7 @@
</view> </view>
<view class="normal"> <view class="normal">
<text> <text>
{{ uni.getStorageSync('isstaffchange')?`请等待审核`:`欢迎加入护理单元大家庭` }} {{ uni.getStorageSync('isstaffchange')?`请等待审核！`:`请等待审核！` }}
！ ！
</text> </text>
</view> </view>

89
pages/oldmanindex/all.vue
View File

@ -12,7 +12,7 @@
<view :style="{height:`${uni.getStorageSync('moveHeight') + 30}px`}"></view> <view :style="{height:`${uni.getStorageSync('moveHeight') + 30}px`}"></view>
<view style="width: 638rpx; <!-- <view style="width: 638rpx;
min-height: 80rpx; min-height: 80rpx;
border-radius: 10rpx; border-radius: 10rpx;
display: flex; display: flex;
@ -27,16 +27,34 @@
驳回原因：{{alldata.elderModifyContent}} 驳回原因：{{alldata.elderModifyContent}}
</text> </text>
<text style=" color:rgba(237, 72, 69, 1);white-space: nowrap;">审核驳回</text> <text style=" color:rgba(237, 72, 69, 1);white-space: nowrap;">审核驳回</text>
</view> -->
<view style="width: 638rpx;
min-height: 80rpx;
border-radius: 10rpx;
display: flex;
justify-content: space-between;
margin: 30rpx auto 0;
padding:20rpx;
background: RGBA(255, 240, 240, 1);
border: 1px solid RGBA(247, 175, 174, 1);"
v-if="alldata.modifyStatus==3||alldata.modifyStatus==5">
<view style="width: 35rpx;height: 35rpx;border-radius: 50%;background: RGBA(237, 72, 69, 1);color: #fff;text-align: center;line-height: 35rpx;margin-right: 10rpx;">i</view>
<text style="color: rgba(102, 102, 102, 1); width: 70%;word-break: break-all;">
驳回原因：{{alldata.auditContent}}
</text>
<text style=" color:rgba(237, 72, 69, 1);white-space: nowrap;">审核驳回</text>
</view> </view>
<view class="white-content"> <view class="white-content" v-show="!targetpage">
<view class="content-title" style="margin: 20rpx 0;justify-content: space-between;"> <view class="content-title" style="margin: 20rpx 0;justify-content: space-between;">
<view style="display: flex;"> <view style="display: flex;">
<view class="shu"></view> <view class="shu"></view>
<view class="content-weight" style="margin-top: -2rpx;">监护人信息</view> <view class="content-weight" style="margin-top: -2rpx;">监护人信息</view>
<image class="shu-img" <image class="shu-img" :style="alldata.modifyStatus==3?{top:`40%`}:{}"
:src="alldata.elderModifyStatus? `https://www.focusnu.com/media/directive/index/${statusarray[alldata.elderModifyStatus-1]}.png`:``" /> :src="alldata.modifyStatus? `https://www.focusnu.com/media/directive/index/${statusarray[alldata.modifyStatus-1]}.png`:``" />
</view> </view>
</view> </view>
<!-- <image class="shu-img"
:src="alldata.modifyStatus? `https://www.focusnu.com/media/directive/index/${statusarray[alldata.modifyStatus-1]}.png`:``" /> -->
<view class="white-photo" @click="getMessage(headImge0)"> <view class="white-photo" @click="getMessage(headImge0)">
<view class="photo-left"> <view class="photo-left">
<view class="photo-weight">人像面</view> <view class="photo-weight">人像面</view>
@ -61,9 +79,16 @@
</view> </view>
</view> </view>
</view> </view>
<view style="display: flex;width: 100%;padding: 0 10%;justify-content: center;" v-if="!targetpage">
<view class="white-content"> <!-- <view class="back-button" @click="dexcard = 0">
<view style="width: 638rpx; 上一步
</view> -->
<view class="finish-button" @click="targetpage = 1">
下一步
</view>
</view>
<view class="white-content" v-show="targetpage">
<!-- <view style="width: 638rpx;
min-height: 80rpx; min-height: 80rpx;
border-radius: 10rpx; border-radius: 10rpx;
display: flex; display: flex;
@ -78,13 +103,13 @@
驳回原因：{{alldata.auditContent}} 驳回原因：{{alldata.auditContent}}
</text> </text>
<text style=" color:rgba(237, 72, 69, 1);white-space: nowrap;">审核驳回</text> <text style=" color:rgba(237, 72, 69, 1);white-space: nowrap;">审核驳回</text>
</view> </view> -->
<view class="content-title" style="margin: 20rpx 0;justify-content: space-between;"> <view class="content-title" style="margin: 20rpx 0;justify-content: space-between;">
<view style="display: flex;"> <view style="display: flex;">
<view class="shu"></view> <view class="shu"></view>
<view class="content-weight" style="margin-top: -2rpx;">长者信息</view> <view class="content-weight" style="margin-top: -2rpx;">长者信息</view>
<image class="shu-img" <!-- <image class="shu-img"
:src="alldata.modifyStatus? `https://www.focusnu.com/media/directive/index/${statusarray[alldata.modifyStatus-1]}.png`:``" /> :src="alldata.modifyStatus? `https://www.focusnu.com/media/directive/index/${statusarray[alldata.modifyStatus-1]}.png`:``" /> -->
<!-- <view class="content-img" style="display: flex;align-items: center;justify-content: flex-end;color: red;"> <!-- <view class="content-img" style="display: flex;align-items: center;justify-content: flex-end;color: red;">
<text v-if="alldata.modifyStatus==1" >待审核</text> <text v-if="alldata.modifyStatus==1" >待审核</text>
<text v-if="alldata.modifyStatus==2" style="color: #0089FE;">审核通过</text> <text v-if="alldata.modifyStatus==2" style="color: #0089FE;">审核通过</text>
@ -95,7 +120,7 @@
</view> </view>
<view class="white-content"> <view class="white-content" v-show="targetpage">
<view class="white-photo" @click="getMessage(`${media_base_url}${specialImge}`)"> <view class="white-photo" @click="getMessage(`${media_base_url}${specialImge}`)">
<view class="photo-left"> <view class="photo-left">
@ -139,7 +164,14 @@
</view> </view>
</view> </view>
</view> </view>
<view style="display: flex;width: 100%;padding: 0 10%;justify-content: space-between;" v-if="targetpage">
<view class="back-button" @click="targetpage = 0">
上一步
</view>
<view class="finish-button" @click="goBack">
关闭
</view>
</view>
<view style="display: flex;width: 100%;margin-top: 40rpx;"></view> <view style="display: flex;width: 100%;margin-top: 40rpx;"></view>
</div> </div>
@ -168,6 +200,7 @@
const show = ref(false); const show = ref(false);
const content = ref(""); const content = ref("");
const targetpage = ref(0)
const statusarray = ["loading", "success", "fail"] const statusarray = ["loading", "success", "fail"]
@ -494,10 +527,10 @@
.shu-img { .shu-img {
position: absolute; position: absolute;
right: 20rpx; right: 20rpx;
top: 40%; top:48%;
transform: translateY(-40%); transform: translateY(-40%);
width: 150rpx; width: 130rpx;
height: 130rpx; height: 112rpx;
} }
.greenbgc { .greenbgc {
@ -539,4 +572,30 @@
font-size: 30rpx; font-size: 30rpx;
z-index: 2; z-index: 2;
} }
.finish-button {
display: flex;
justify-content: center;
align-items: center;
width: 44%;
height: 90rpx;
// margin: 0rpx auto;
margin-bottom: 80rpx;
border: 2rpx solid #9AD1FF;
color: #007CFF;
background: linear-gradient(to bottom, #e7f4ff, #c5e5ff);
border-radius: 37rpx;
font-size: 33rpx;
}
.back-button {
display: flex;
justify-content: center;
align-items: center;
width: 44%;
height: 90rpx;
margin-bottom: 80rpx;
border: 2rpx solid #c3cacd;
background: linear-gradient(to bottom, #f3f3f5, #dee4e9);
border-radius: 37rpx;
font-size: 33rpx;
}
</style> </style>

14
pages/oldmanindex/flushJobs.vue
View File

@ -366,14 +366,20 @@
width: 100%; width: 100%;
display: flex; display: flex;
align-items: center; align-items: center;
position: relative;
.gray-border{ .gray-border{
color: black; // color: black;
// padding: 5rpx; // padding: 5rpx;
position: absolute;
right: -18rpx;
top:50%;
transform: translateY(-50%);
padding: 5rpx 8rpx; padding: 5rpx 8rpx;
border: 2rpx solid black; border: 2rpx solid #0093FF;
margin-left: 20rpx; color: #0093FF;
font-size: 23rpx; // margin-left: 20rpx;
font-size: 22rpx;
border-radius: 13rpx; border-radius: 13rpx;
} }
} }

8
pages/oldmanindex/index.vue
View File

@ -22,7 +22,7 @@
v-if="item.applyStatus!=`-1`&& item.elderInfo"> v-if="item.applyStatus!=`-1`&& item.elderInfo">
<view class="two-card"> <view class="two-card">
<view class="left-card"> <view class="left-card">
NUID:{{ item.elderInfo && item.elderInfo.nuId }} <!-- NUID:{{ item.elderInfo && item.elderInfo.nuId }} -->
<view class="left-card-view"> <view class="left-card-view">
<image class="left-card-imge" src="https://www.focusnu.com/media/directive/index/uniicon.png" /> <image class="left-card-imge" src="https://www.focusnu.com/media/directive/index/uniicon.png" />
{{ item.nuName }} {{ item.nuName }}
@ -1218,13 +1218,13 @@
.left-card-view{ .left-card-view{
display: flex; display: flex;
align-items: center; align-items: center;
font-size: 23rpx; font-size: 26rpx;
margin-top: 10rpx; margin-top: 10rpx;
color: black; color: black;
.left-card-imge{ .left-card-imge{
width: 25rpx; width: 35rpx;
height: 25rpx; height: 35rpx;
margin-right: 10rpx; margin-right: 10rpx;
} }
} }

6
pages/yuangongindex/searchjigou.vue
View File

@ -19,10 +19,10 @@
<image <image
style="position: absolute;left: 20rpx;top: 50%;transform: translateY(-50%);width: 40rpx;height: 40rpx;" style="position: absolute;left: 20rpx;top: 50%;transform: translateY(-50%);width: 40rpx;height: 40rpx;"
src="https://www.focusnu.com/media/directive/index/search.png" /> src="https://www.focusnu.com/media/directive/index/search.png" />
<input style="font-size: 31rpx;" type="text" v-model="supervalue" placeholder="请输入入驻护理机构名称" <input style="font-size: 31rpx;" :style="supervalue?{width: `90%`}:{width: `100%`}" type="text" v-model="supervalue" placeholder="请输入入驻护理机构名称"
@confirm="search" @input="detectinput" /> @confirm="search" @input="detectinput" />
<view @click="clearvalue" v-if="supervalue" <view @click.stop="clearvalue" v-if="supervalue"
style="position: absolute;right: 20rpx;top: 50%;transform: translateY(-50%);width: 40rpx;height: 40rpx;display: flex;justify-content: center;align-items: center;border-radius: 50%;background-color: #EBEBEB;"> style="position: absolute;right: 20rpx;top: 50%;transform: translateY(-50%);width: 40rpx;height: 40rpx;display: flex;justify-content: center;align-items: center;border-radius: 50%;background-color: #EBEBEB;z-index: 10;">
<image style="width: 20rpx;height: 20rpx;" <image style="width: 20rpx;height: 20rpx;"
src="https://www.focusnu.com/media/directive/index/cha.png" /> src="https://www.focusnu.com/media/directive/index/cha.png" />
</view> </view>