From c5193d6dc8dd675377513b41e4dbde1a497a9546 Mon Sep 17 00:00:00 2001
From: Teng <461587751@qq.com>
Date: Mon, 9 Feb 2026 15:06:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B0=8F=E7=A8=8B=E5=BA=8Fbu?=
=?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/addjigou/where.vue | 31 ++-
pages/addoldman/IDcard.vue | 18 +-
pages/addoldman/hukou.vue | 2 +-
pages/addoldman/oldIDcard.vue | 29 ++-
pages/addoldman/yibao.vue | 2 +-
pages/addstaff/all.vue | 23 ++-
pages/addstaff/information.vue | 44 +++--
pages/addstaff/successpush.vue | 2 +-
pages/addsupplier/all.vue | 46 ++---
pages/addsupplier/information.vue | 293 ++++++++++++++++++----------
pages/addsupplier/successpush.vue | 2 +-
pages/index/index.vue | 2 +-
pages/login/callback.vue | 2 +-
pages/login/code.vue | 2 +-
pages/login/index.vue | 2 +-
pages/login/phonebumber.vue | 2 +-
pages/login/specialloginafther.vue | 2 +-
pages/login/specialsmall.vue | 2 +-
pages/login/threeselectone.vue | 2 +-
pages/login/workjoin.vue | 2 +-
pages/login/workjoinsuccess.vue | 2 +-
pages/oldmanindex/flushJobs.vue | 24 ++-
pages/oldmanindex/index.vue | 135 ++++++++-----
pages/oldmanindex/input.vue | 2 +-
pages/oldmanindex/mine.vue | 9 +-
pages/oldmanindex/oldmansuccess.vue | 60 ++++--
pages/oldmanindex/paysuccess.vue | 2 +-
pages/supplierindex/index.vue | 2 +-
pages/supplierindex/searchjigou.vue | 6 +-
pages/supplierindex/workjoin.vue | 2 +-
pages/yuangongindex/index.vue | 121 ++++++------
pages/yuangongindex/searchjigou.vue | 6 +-
pages/yuangongindex/workjoin.vue | 14 +-
33 files changed, 561 insertions(+), 334 deletions(-)
diff --git a/pages/addjigou/where.vue b/pages/addjigou/where.vue
index 400ec18..8269c2f 100644
--- a/pages/addjigou/where.vue
+++ b/pages/addjigou/where.vue
@@ -68,6 +68,7 @@
机构位置
+
@@ -75,6 +76,7 @@
详细地址
+
@@ -82,6 +84,7 @@
机构负责人
+
@@ -89,6 +92,7 @@
机构负责人电话
+
@@ -97,6 +101,7 @@
房屋性质
+
@@ -110,6 +115,7 @@
m²
+
@@ -475,7 +481,7 @@
form.orgLeaderPhone = data.orgLeaderPhone;
form.orgPropertyType = data.orgPropertyType;
form.orgBuildingArea = data.orgBuildingArea;
- console.log("111",form)
+ console.log("111", form)
} else if (uni.getStorageSync('baddata')) {
let data = uni.getStorageSync('baddata');
if (data.orgProvince_dictText) {
@@ -490,9 +496,9 @@
form.orgLeaderPhone = data.orgLeaderPhone;
form.orgPropertyType = data.orgPropertyType;
form.orgBuildingArea = data.orgBuildingArea;
- console.log("222",form)
- }else{
-
+ console.log("222", form)
+ } else {
+
form.orgLeaderPhone = uni.getStorageSync('tel');
}
})
@@ -580,6 +586,7 @@
display: flex;
align-items: center;
margin-bottom: 10rpx;
+ position: relative;
.one-left {
margin-left: 10rpx;
@@ -592,15 +599,21 @@
height: 100%;
color: #999999;
overflow: hidden;
- /* 隐藏超出内容 */
white-space: nowrap;
- /* 不换行 */
- // font-size: 25rpx;
text-overflow: ellipsis;
- max-width: 330rpx;
+ max-width: 300rpx;
display: flex;
}
+ .one-left-imge {
+ width: 35rpx;
+ height: 35rpx;
+ position: absolute;
+ top: 50%;
+ right: 8rpx;
+ transform: translateY(-50%);
+ }
+
}
}
}
@@ -771,7 +784,7 @@
position: absolute;
top: 50%;
transform: translateY(-50%);
- right: 26rpx;
+ right: 50rpx;
font-size: 30rpx;
color: #999999;
}
diff --git a/pages/addoldman/IDcard.vue b/pages/addoldman/IDcard.vue
index f26e59e..35dc6e2 100644
--- a/pages/addoldman/IDcard.vue
+++ b/pages/addoldman/IDcard.vue
@@ -46,24 +46,29 @@
姓名
+
电话
+
身份证号
+
家庭住址
+
工作单位
+
@@ -620,6 +625,7 @@
display: flex;
align-items: center;
margin-bottom: 10rpx;
+ position: relative;
.one-left {
margin-left: 10rpx;
@@ -639,8 +645,18 @@
white-space: nowrap;
/* 不换行 */
text-overflow: ellipsis;
- max-width: 330rpx;
+ max-width: 300rpx;
}
+
+ .one-left-imge {
+ width: 35rpx;
+ height: 35rpx;
+ position: absolute;
+ top: 50%;
+ right: 8rpx;
+ transform: translateY(-50%);
+ }
+
}
}
diff --git a/pages/addoldman/hukou.vue b/pages/addoldman/hukou.vue
index 1bb47d7..e35075c 100644
--- a/pages/addoldman/hukou.vue
+++ b/pages/addoldman/hukou.vue
@@ -105,7 +105,7 @@
flex-direction: column;
min-height: 100vh;
width: 100%;
- background-color: rgb(239, 241, 252);
+ background-color: #F7F7F7;
position: relative;
box-shadow: 2rpx 2rpx 4rpx rgba(0, 0, 0, 0.1);
diff --git a/pages/addoldman/oldIDcard.vue b/pages/addoldman/oldIDcard.vue
index 6fb8dbe..f50cca8 100644
--- a/pages/addoldman/oldIDcard.vue
+++ b/pages/addoldman/oldIDcard.vue
@@ -38,23 +38,28 @@
监护人姓名
+
监护人电话
+
身份证号
+
家庭住址
+
工作单位
+
@@ -115,6 +120,7 @@
医保类型
+
失能等级
+
+
+
+ 驳回原因:
+ {{contentred}}
+
婚否
+
@@ -35,35 +36,39 @@
联系电话
+
身高
-
+
cm
+
-
+
体重
+ v-model="form.weight" />
kg
+
健康状况
+
@@ -74,6 +79,7 @@
政治面貌
+
@@ -83,27 +89,31 @@
紧急联系人
+
紧急联系人电话
+
联系人与本人关系
+
户口性质
+
现住址
-
+
+
@@ -328,14 +338,12 @@
title: '请输入户口性质',
icon: 'error'
})
- }
- else if (!form.currentAddress) {
+ } else if (!form.currentAddress) {
uni.showToast({
title: '请输入现住址',
icon: 'error'
})
- }
- else {
+ } else {
const data = form
const merged2 = {
...uni.getStorageSync('backhuancun'),
@@ -501,6 +509,7 @@
display: flex;
align-items: center;
margin-bottom: 10rpx;
+ position: relative;
.one-left {
margin-left: 10rpx;
@@ -518,10 +527,19 @@
/* 不换行 */
// font-size: 25rpx;
text-overflow: ellipsis;
- width: 330rpx;
+ width: 300rpx;
display: flex;
}
+ .one-left-imge {
+ width: 35rpx;
+ height: 35rpx;
+ position: absolute;
+ top: 50%;
+ right: 8rpx;
+ transform: translateY(-50%);
+ }
+
.triangle-down {
position: absolute;
top: 50%;
@@ -536,7 +554,7 @@
position: absolute;
top: 50%;
transform: translateY(-50%);
- right: 26rpx;
+ right: 55rpx;
font-size: 30rpx;
color: #999999;
}
diff --git a/pages/addstaff/successpush.vue b/pages/addstaff/successpush.vue
index 7a0c797..0d50611 100644
--- a/pages/addstaff/successpush.vue
+++ b/pages/addstaff/successpush.vue
@@ -72,7 +72,7 @@
align-items: center;
flex-direction: column;
position: relative;
- background-color: rgb(239, 241, 252);
+ background-color: #F7F7F7;
.font-title {
margin-top: 0rpx;
diff --git a/pages/addsupplier/all.vue b/pages/addsupplier/all.vue
index 75ad53f..a899899 100644
--- a/pages/addsupplier/all.vue
+++ b/pages/addsupplier/all.vue
@@ -11,10 +11,10 @@
-
+
- 供应商信息
+ 营业执照
@@ -31,27 +31,10 @@
驳回原因:
{{datas.auditContent}}
-
-
-
- {{item}}
- {{textArray1[index] ? textArray1[index] : "自动获取" }}
-
-
-
-
-
-
-
- 营业执照
-
-
- 营业执照
-
+
+ 请上传营业执照
+
+
+
+
+
+
+ 供应商信息
+
+
+
+
+ {{item}}
+ {{textArray1[index] ? textArray1[index] : "自动获取" }}
+
+
+
-
-
-
- 供应商地址
-
-
-
- 负责人
-
-
-
- 联系电话
-
-
-
- 开户行
-
-
-
- 开户行账号
-
-
-
-
-
-
-
-
-
- 营业执照
- (必填)
+
+ 待审核
+ 审核通过
+ 审核驳回
+ 待审核
+ 审核驳回
+
+
+
+ 驳回原因:
+ {{form.auditContent}}
@@ -89,17 +45,74 @@
style="position: absolute;top: 50%;left: 50%;width: 70rpx;height: 60rpx;transform: translate(-50%,-50%);"
src="https://www.focusnu.com/media/directive/index/takephoto.png" />
-
+
+
+
-
-
- 信息变更中
+
+
+
+ 供应商信息
+ (必填)
+
+
+
+
+ 供应商名称
+
+
+
+
+ 供应商性质
+
+
+
+
+
+
+ 供应商地址
+
+
+
+ 负责人
+
+
+
+
+ 联系电话
+
+
+
+
+ 开户行
+
+
+
+
+ 开户行账号
+
+
+
+
+
+
+
+
+
+ 信息变更中
确认并提交
-
+
@@ -124,7 +137,9 @@
applySupOrg
} from './api/api.js'
import model from "@/compontent/public/model.vue"
-import { log } from 'three';
+ // import {
+ // log
+ // } from 'three';
const uping = ref(true);
@@ -145,14 +160,14 @@ import { log } from 'three';
]
)
const bottomlist = [{
- text: '拍照',
- fontSize: 40
- },{
- text: '从相册选择',
- fontSize: 40
- }, {
- text: '图片预览',
- fontSize: 40
+ text: '拍照',
+ fontSize: 40
+ }, {
+ text: '从相册选择',
+ fontSize: 40
+ }, {
+ text: '图片预览',
+ fontSize: 40
}]
@@ -172,7 +187,7 @@ import { log } from 'three';
// 负责人
personInCharge: "",
// 联系电话
- contactNumber: "",
+ contactNumber: uni.getStorageSync('tel'),
// 开户行
openingBank: "",
// 开户行账号
@@ -181,8 +196,8 @@ import { log } from 'three';
imgPath: "",
name: "",
openId: uni.getStorageSync('openid'),
- applyOrg:"",
- orgCode:"",
+ applyOrg: "",
+ orgCode: "",
})
const bottomshow = ref(false)
const selectphoto = () => {
@@ -200,7 +215,7 @@ import { log } from 'three';
}
const photoclick = (element) => {
console.log(element)
- if (element==2) {
+ if (element == 2) {
uni.previewImage({
urls: [`${media_base_url}${form.imgPath}`], // 必填,所有要预览的图片地址数组
// current: headImge.value, // 可选,当前显示图片的地址,默认是 urls[0]
@@ -212,7 +227,7 @@ import { log } from 'three';
} else {
uni.chooseImage({
count: 1,
- sourceType:element==0? ['camera']:['album'],
+ sourceType: element == 0 ? ['camera'] : ['album'],
success: chooseRes => {
// tempImagePath.value = chooseRes.tempFilePaths[0]
uni.navigateTo({
@@ -243,11 +258,66 @@ import { log } from 'three';
}
})
}
+ // 上传图片到服务器
+ function uploadImage(filePath) {
+ uping.value = false;
+ uni.showLoading()
+ uni.uploadFile({
+ url: `${base_url}/api/ocr/businessLicense`, // 替换为您的POST接口地址
+ filePath,
+ name: 'file', // 后端接收时的字段名
+ header: {
+ 'X-Access-Token': uni.getStorageSync('token') || '',
+ },
+ formData: {
+ biz: `temp`
+ },
+ success: uploadRes => {
+ if (!JSON.parse(uploadRes.data).success) {
+ uni.hideLoading()
+ uni.showToast({
+ title: '识别失败',
+ icon: 'error',
+ duration: 2000
+ })
+ uping.value = true;
+
+ return
+ }
+ if (JSON.parse(JSON.parse(uploadRes.data).result.data).data.companyName) {
+
+ let father = JSON.parse(JSON.parse(uploadRes.data).result.data).data;
+ console.log("8888", father)
+ form.suppliersName = father.companyName;
+ form.suppliersAddress = father.businessAddress;
+ // form.openingBankNo = Number(father.creditCode);
+ form.personInCharge = father.legalPerson;
+ savephoto(filePath);
+ } else {
+ uni.showToast({
+ title: '识别失败',
+ icon: 'error',
+ duration: 2000
+ })
+ uping.value = true;
+ uni.hideLoading()
+ }
+ },
+ fail: err => {
+ uni.showToast({
+ title: '上传出错',
+ icon: 'error'
+ })
+ uping.value = true;
+ uni.hideLoading()
+ }
+ })
+ }
onShow(() => {
const img = uni.getStorageSync('imgkey0')
if (img) {
- // uploadImage(img)
- savephoto(img)
+ uploadImage(img)
+ // savephoto(img)
uni.removeStorageSync('imgkey0')
}
})
@@ -307,7 +377,7 @@ import { log } from 'three';
return /^1[3-9]\d{9}$/.test(val);
}
const next = () => {
-
+
if (!uping.value) {
return
}
@@ -362,7 +432,7 @@ import { log } from 'three';
} else {
uni.showLoading({
- title:'正在加载~'
+ title: '正在加载~'
})
gotopush()
}
@@ -370,13 +440,13 @@ import { log } from 'three';
}
const gotopush = () => {
- if (form.id&&form.suppliersStatus!=3) {
- if(!form.orgCode ){
- uni.showToast({
+ if (form.id && form.suppliersStatus != 3) {
+ if (!form.orgCode) {
+ uni.showToast({
title: '请选择机构',
icon: 'none'
- })
- return
+ })
+ return
}
editSuppliers(form).then((res) => {
// console.log("res",res)
@@ -387,27 +457,27 @@ import { log } from 'three';
uni.reLaunch({
url: `/pages/addsupplier/successpush`
});
- }else if(res.code == 500){
+ } else if (res.code == 500) {
uni.showToast({
- title:res.message,
- icon:'none'
+ title: res.message,
+ icon: 'none'
})
return
}
})
} else {
- if(!uni.getStorageSync('nostaffmessage')){
- uni.showToast({
+ if (!uni.getStorageSync('nostaffmessage')) {
+ uni.showToast({
title: '请选择机构',
icon: 'none'
- })
- return
- }
+ })
+ return
+ }
addSuppliers(form).then((res) => {
- if(res.code == 500){
+ if (res.code == 500) {
uni.showToast({
- title:res.message,
- icon:'none'
+ title: res.message,
+ icon: 'none'
})
uni.hideLoading()
return
@@ -423,11 +493,11 @@ import { log } from 'three';
tmplIds: ['cWVzXm1C-iitx1gNFn1nZdijq9R_3fCv8vLbiqs9zww'],
success: (res) => {
- setTimeout(() =>
- {
+ setTimeout(() => {
uni.hideLoading()
uni.setStorageSync(
- 'isstaffchange', form.suppliersStatus==3?true:false);
+ 'isstaffchange', form
+ .suppliersStatus == 3 ? true : false);
uni.reLaunch({
url: `/pages/addsupplier/successpush`
});
@@ -508,6 +578,7 @@ import { log } from 'three';
width: 400rpx;
height: 100%;
}
+
.small-blue {
display: flex;
justify-content: center;
@@ -604,6 +675,8 @@ import { log } from 'three';
display: flex;
align-items: center;
margin-bottom: 10rpx;
+ position: relative;
+
.one-left {
margin-left: 10rpx;
@@ -617,15 +690,21 @@ import { log } from 'three';
height: 100%;
color: #999999;
overflow: hidden;
- /* 隐藏超出内容 */
white-space: nowrap;
- /* 不换行 */
- // font-size: 25rpx;
text-overflow: ellipsis;
- width: 330rpx;
+ width: 300rpx;
display: flex;
}
+ .one-left-imge {
+ width: 35rpx;
+ height: 35rpx;
+ position: absolute;
+ top: 50%;
+ right: 8rpx;
+ transform: translateY(-50%);
+ }
+
.triangle-down {
position: absolute;
top: 50%;
diff --git a/pages/addsupplier/successpush.vue b/pages/addsupplier/successpush.vue
index 33fd919..222e713 100644
--- a/pages/addsupplier/successpush.vue
+++ b/pages/addsupplier/successpush.vue
@@ -72,7 +72,7 @@
align-items: center;
flex-direction: column;
position: relative;
- background-color: rgb(239, 241, 252);
+ background-color: #F7F7F7;
.font-title {
margin-top: 0rpx;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 6f01110..6213ba1 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -507,7 +507,7 @@
flex-direction: column;
min-height: calc(100vh);
width: 100%;
- background-color: rgb(239, 241, 252);
+ background-color: #F7F7F7;
position: relative;
// padding-top: 550rpx;
}
diff --git a/pages/login/callback.vue b/pages/login/callback.vue
index 2a465c4..af09e71 100644
--- a/pages/login/callback.vue
+++ b/pages/login/callback.vue
@@ -156,7 +156,7 @@
flex-direction: column;
min-height: 100vh;
width: 100%;
- background-color: rgb(239, 241, 252);
+ background-color: #F7F7F7;
position: relative;
justify-content: center;
align-items: center;
diff --git a/pages/login/code.vue b/pages/login/code.vue
index 94488bd..8020975 100644
--- a/pages/login/code.vue
+++ b/pages/login/code.vue
@@ -257,7 +257,7 @@
flex-direction: column;
min-height: 100vh;
width: 100%;
- background-color: rgb(239, 241, 252);
+ background-color: #F7F7F7;
position: relative;
.photo-imge {
diff --git a/pages/login/index.vue b/pages/login/index.vue
index dc068a9..99ed650 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -196,7 +196,7 @@
flex-direction: column;
min-height: 100vh;
width: 100%;
- background-color: rgb(239, 241, 252);
+ background-color: #F7F7F7;
position: relative;
.title-imge {
diff --git a/pages/login/phonebumber.vue b/pages/login/phonebumber.vue
index 3165192..a92248f 100644
--- a/pages/login/phonebumber.vue
+++ b/pages/login/phonebumber.vue
@@ -96,7 +96,7 @@
flex-direction: column;
min-height: 100vh;
width: 100%;
- background-color: rgb(239, 241, 252);
+ background-color: #F7F7F7;
position: relative;
.title-imge {
diff --git a/pages/login/specialloginafther.vue b/pages/login/specialloginafther.vue
index 7ac38a4..4586f46 100644
--- a/pages/login/specialloginafther.vue
+++ b/pages/login/specialloginafther.vue
@@ -173,7 +173,7 @@
align-items: center;
flex-direction: column;
position: relative;
- background-color: rgb(239, 241, 252);
+ background-color: #F7F7F7;
.font-title {
margin-top: 0rpx;
diff --git a/pages/login/specialsmall.vue b/pages/login/specialsmall.vue
index c081c91..6e1d286 100644
--- a/pages/login/specialsmall.vue
+++ b/pages/login/specialsmall.vue
@@ -60,7 +60,7 @@
flex-direction: column;
min-height: 100vh;
width: 100%;
- background-color: rgb(239, 241, 252);
+ background-color: #F7F7F7;
justify-content: center;
align-items: center;
diff --git a/pages/login/threeselectone.vue b/pages/login/threeselectone.vue
index b9bb820..acb4a58 100644
--- a/pages/login/threeselectone.vue
+++ b/pages/login/threeselectone.vue
@@ -186,7 +186,7 @@
flex-direction: column;
min-height: 100vh;
width: 100%;
- background-color: rgb(239, 241, 252);
+ background-color: #F7F7F7;
position: relative;
.photo-imge {
diff --git a/pages/login/workjoin.vue b/pages/login/workjoin.vue
index cc0a7a3..c1238d7 100644
--- a/pages/login/workjoin.vue
+++ b/pages/login/workjoin.vue
@@ -131,7 +131,7 @@
flex-direction: column;
min-height: 100vh;
width: 100%;
- background-color: rgb(239, 241, 252);
+ background-color: #F7F7F7;
position: relative;
}
diff --git a/pages/login/workjoinsuccess.vue b/pages/login/workjoinsuccess.vue
index 5ea1aa0..1d740b8 100644
--- a/pages/login/workjoinsuccess.vue
+++ b/pages/login/workjoinsuccess.vue
@@ -163,7 +163,7 @@
flex-direction: column;
min-height: 100vh;
width: 100%;
- background-color: rgb(239, 241, 252);
+ background-color: #F7F7F7;
position: relative;
}
diff --git a/pages/oldmanindex/flushJobs.vue b/pages/oldmanindex/flushJobs.vue
index bf34afc..5dee7f1 100644
--- a/pages/oldmanindex/flushJobs.vue
+++ b/pages/oldmanindex/flushJobs.vue
@@ -1,12 +1,6 @@
-
@@ -48,6 +42,9 @@
{{item.createTime}}
+
+ {{item.modifyType===`zz`?`长者变更`:`监护人变更`}}
+
待审核
@@ -172,7 +169,7 @@
flex-direction: column;
min-height: 100vh;
width: 100%;
- background-color: rgb(239, 241, 252);
+ background-color: #F7F7F7;
position: relative;
}
@@ -363,11 +360,22 @@
}
.gray-font {
- // margin-left: 20rpx;
font-size: 32rpx;
margin-top: 20rpx;
color: #B1B1B1;
width: 100%;
+ display: flex;
+ align-items: center;
+
+ .gray-border{
+ color: black;
+ // padding: 5rpx;
+ padding: 5rpx 8rpx;
+ border: 2rpx solid black;
+ margin-left: 20rpx;
+ font-size: 23rpx;
+ border-radius: 13rpx;
+ }
}
.gray-bgc {
diff --git a/pages/oldmanindex/index.vue b/pages/oldmanindex/index.vue
index 0664c64..dbd42d6 100644
--- a/pages/oldmanindex/index.vue
+++ b/pages/oldmanindex/index.vue
@@ -23,75 +23,89 @@
NUID:{{ item.elderInfo && item.elderInfo.nuId }}
+
+
+ {{ item.nuName }}
+
+ style="font-size: 45rpx;font-weight: 600;margin-top: 70rpx;display: flex;justify-content: space-between;align-items: center;color: black;">
{{ timeText }}
-
-
+
{{ dateText }}
{{ weekdayText }}
-
-
-
-
-
- 湿度
-
-
- {{ (item.humidDeviceList && item.humidDeviceList[0] && item.humidDeviceList[0].humidity !== undefined && item.humidDeviceList[0].humidity !== null)
- ? item.humidDeviceList[0].humidity
- : '—' }}%
-
-
-
-
-
-
-
- 温度
-
-
- {{ (item.humidDeviceList && item.humidDeviceList[0] && item.humidDeviceList[0].temperature !== undefined && item.humidDeviceList[0].temperature !== null) ? item.humidDeviceList[0].temperature : '—' }}℃
-
-
-
-
+
-
-
- {{ (item.elderInfo && item.elderInfo.name) + '/' + getAge(item.elderInfo.dateOfBirth) + '岁' }}
+
+ {{ (item.elderInfo && item.elderInfo.name) }}
-
+
- {{ item.nuName }}
+ {{ item.elderInfo?.sex }}
+
+
+
+
+
+ {{ getAge(item.elderInfo.dateOfBirth) }}岁
+
+
+
+
+
+
+ {{ item.elderInfo?.dateOfBirth.replace('年', '.').replace('月', '.').replace('日', '') }}
-
- {{ item.departName }}
+ style="margin-top: 20rpx;padding: 0 30rpx;font-size: 25rpx;">
+
+
+
+
+ 湿度
+
+
+ {{ (item.humidDeviceList && item.humidDeviceList[0] && item.humidDeviceList[0].humidity !== undefined && item.humidDeviceList[0].humidity !== null)
+ ? item.humidDeviceList[0].humidity
+ : '—' }}%
+
+
+
+
+
+
+ 温度
+
+
+ {{ (item.humidDeviceList && item.humidDeviceList[0] && item.humidDeviceList[0].temperature !== undefined && item.humidDeviceList[0].temperature !== null) ? item.humidDeviceList[0].temperature : '—' }}℃
+
+
+
+
@@ -285,7 +299,7 @@
ref,
onMounted,
onUnmounted,
- nextTick
+ nextTick
} from 'vue';
import {
onLoad,
@@ -648,10 +662,10 @@
})
}
const hong = ref(0);
- const isred = ()=>{
+ const isred = () => {
hong.value = hong.value;
isRead().then(res => {
- nextTick(()=>{
+ nextTick(() => {
hong.value = res.result;
})
})
@@ -673,7 +687,7 @@
flex-direction: column;
min-height: calc(100vh);
width: 100%;
- background-color: rgb(239, 241, 252);
+ background-color: #F7F7F7;
position: relative;
}
@@ -1179,10 +1193,10 @@
.two-card {
position: absolute;
- top: -20rpx;
+ top: 8rpx;
left: 3%;
width: 94%;
- height: 340rpx;
+ height: 310rpx;
// background-color: red;
z-index: 1;
display: flex;
@@ -1192,10 +1206,24 @@
width: 50%;
background-color: #fff;
border-radius: 50rpx;
+ color: #5D5F66;
// display: flex;
- padding: 0 30rpx;
+ padding: 0 40rpx;
padding-top: 40rpx;
font-size: 21rpx;
+ .left-card-view{
+ display: flex;
+ align-items: center;
+ font-size: 23rpx;
+ margin-top: 10rpx;
+ color: black;
+
+ .left-card-imge{
+ width: 25rpx;
+ height: 25rpx;
+ margin-right: 10rpx;
+ }
+ }
}
.right-card {
@@ -1204,8 +1232,8 @@
.right-top-card {
width: 95%;
- margin-left: 4%;
- height: 163rpx;
+ margin-left: 5%;
+ height: 145.5rpx;
border-radius: 50rpx;
background-color: #fff;
display: flex;
@@ -1214,4 +1242,11 @@
}
}
}
+
+ .gray-shu {
+ height: 23rpx;
+ width: 3rpx;
+ background-color: #CDCDCD;
+ margin: auto 7rpx;
+ }
\ No newline at end of file
diff --git a/pages/oldmanindex/input.vue b/pages/oldmanindex/input.vue
index c21bc51..1974642 100644
--- a/pages/oldmanindex/input.vue
+++ b/pages/oldmanindex/input.vue
@@ -8,7 +8,7 @@
-
+ 绑定护理单元
diff --git a/pages/oldmanindex/mine.vue b/pages/oldmanindex/mine.vue
index 9d2f240..efb07c2 100644
--- a/pages/oldmanindex/mine.vue
+++ b/pages/oldmanindex/mine.vue
@@ -91,11 +91,8 @@
uni.navigateTo({
url: "/pages/oldmanindex/flushJobs"
})
- // changeData()
-
- // uni.navigateTo({
- // url: `/pages/login/workjoinsuccess`
- // });
+
+
break;
case 1:
// loadingData()
@@ -192,7 +189,7 @@
// min-height: 300rpx;
border-radius: 40rpx;
background-color: #fff;
- // padding: 30rpx 0;
+ padding: 30rpx 0;
z-index: 1;
.white-card {
diff --git a/pages/oldmanindex/oldmansuccess.vue b/pages/oldmanindex/oldmansuccess.vue
index d25bcb0..bc305c7 100644
--- a/pages/oldmanindex/oldmansuccess.vue
+++ b/pages/oldmanindex/oldmansuccess.vue
@@ -4,13 +4,16 @@
- 尊敬的用户,您已成功{{ ischange? '修改':"添加" }}{{ isjianhu?`监护人`: `长者` }}信息 {{ ischange? '请等待机构审核':"" }}
+ 尊敬的用户,您已成功{{ ischange? '修改':"添加" }}{{ isjianhu?`监护人`: `长者` }}信息
- {{ seconds }}秒后自动跳转到长者端 ...
-
+
+ {{ ischange? '请等待机构审核':"" }}
+
+ 我的长者
+
@@ -25,7 +28,7 @@
onUnload
} from '@dcloudio/uni-app';
- const seconds = ref(6)
+ // const seconds = ref(6)
const goBack = () => {
uni.navigateBack()
@@ -36,7 +39,7 @@
const isjianhu = ref(false)
onLoad((element) => {
// 保证每次进页面都从 6 开始
- seconds.value = 6
+ // seconds.value = 6
// console.log("????",element)
if(element.type){
ischange.value = true
@@ -45,23 +48,23 @@
isjianhu.value = true;
}
// 每 1 秒减 1,减到 0 清理计时器(不做其他动作)
- timer = setInterval(() => {
- if (seconds.value > 0) {
- seconds.value -= 1
- } else {
- clearInterval(timer)
- timer = null;
- goToBack()
- }
- }, 1000)
+ // timer = setInterval(() => {
+ // if (seconds.value > 0) {
+ // seconds.value -= 1
+ // } else {
+ // clearInterval(timer)
+ // timer = null;
+ // goToBack()
+ // }
+ // }, 1000)
})
// 页面卸载时清理(防止内存泄漏)
onUnload(() => {
- if (timer) {
- clearInterval(timer)
- timer = null
- }
+ // if (timer) {
+ // clearInterval(timer)
+ // timer = null
+ // }
})
const goToBack = () => {
uni.reLaunch({
@@ -76,7 +79,7 @@
flex-direction: column;
min-height: 100vh;
width: 100%;
- background-color: rgb(239, 241, 252);
+ background-color: #F7F7F7;
justify-content: center;
align-items: center;
@@ -109,4 +112,23 @@
}
}
}
+ .bottom-button {
+ position: absolute;
+ left: 50%;
+ transform: translateX(-50%);
+ bottom: 0rpx;
+ margin-top: 80rpx;
+ margin-bottom: 90rpx;
+ width: 80%;
+ height: 90rpx;
+ border-radius: 35rpx;
+ background: linear-gradient(to bottom, #e7f4ff, #c5e5ff);
+ border: 2rpx solid #9AD1FF;
+ color: #007CFF;
+ font-size: 33rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ z-index: 3;
+ }
\ No newline at end of file
diff --git a/pages/oldmanindex/paysuccess.vue b/pages/oldmanindex/paysuccess.vue
index 97e0ff8..c0c742a 100644
--- a/pages/oldmanindex/paysuccess.vue
+++ b/pages/oldmanindex/paysuccess.vue
@@ -68,7 +68,7 @@
flex-direction: column;
min-height: 100vh;
width: 100%;
- background-color: rgb(239, 241, 252);
+ background-color: #F7F7F7;
justify-content: center;
align-items: center;
diff --git a/pages/supplierindex/index.vue b/pages/supplierindex/index.vue
index 23cec9c..3b9e835 100644
--- a/pages/supplierindex/index.vue
+++ b/pages/supplierindex/index.vue
@@ -513,7 +513,7 @@
flex-direction: column;
min-height: calc(100vh);
width: 100%;
- background-color: rgb(239, 241, 252);
+ background-color: #F7F7F7;
position: relative;
}
diff --git a/pages/supplierindex/searchjigou.vue b/pages/supplierindex/searchjigou.vue
index def8710..99fd027 100644
--- a/pages/supplierindex/searchjigou.vue
+++ b/pages/supplierindex/searchjigou.vue
@@ -21,9 +21,9 @@
-
+
- 入住机构
+ 入驻机构
@@ -359,62 +359,69 @@
});
}
const again = (item) => {
-
- getMessageList().then(res => {
- console.log("这里面有啥", res.result[0])
- let data = res.result[0]
- data = {
- ...data,
- dateOfBirth: data.birthDate,
- marriedOrNot: data.maritalStatus,
- address: data.address,
- emergencyContact: data.contactName,
- emergencyTel: data.contactTel,
- emergencyRelationship: data.contactRelationship,
- hukouNature: data.hukouType,
- idCardPositive: data.cardZmPath,
- idCardNegative: data.cardFmPath,
- healthCertificatePositive: data.healthZmPath,
- healthCertificateNegative: data.healthFmPath,
- bankPositive: data.bankZmPath,
- bankNegative: data.bankFmPath,
- qualification: data.qualificationPath,
- noCrimeCertificate: data.noCrimeCertificate,
- houseAddress: data.idCardAddress,
- employeeId: data.id,
- id: null,
- createTime: null,
- updateBy: null,
- updateTime: null,
- orgCode: item.orgCode
+ getMessageList(item.orgCode).then(res => {
+ uni.setStorageSync("changeyuangongorgCode", item.orgCode)
+ if (res.success) {
+ uni.navigateTo({
+ url: `/pages/addstaff/all?element=${JSON.stringify(res.result[0])}&auditContent=${item.auditContent}`
+ });
}
- Apply(data).then((data) => {
- if (data.success) {
- uni.requestSubscribeMessage({
- // 这里填后台申请好的 templateId 数组
- tmplIds: ['cWVzXm1C-iitx1gNFn1nZdijq9R_3fCv8vLbiqs9zww'],
- success: (res) => {
- popupshow.value = true
- setTimeout(() => {
- loadingData()
- }, 1000)
- },
- fail: (err) => {
- console.error('订阅接口调用失败:', err);
- uni.showToast({
- title: '订阅失败',
- icon: 'none'
- });
- }
- });
-
-
- }
-
-
- })
-
})
+ // getMessageList().then(res => {
+ // console.log("这里面有啥", res.result[0])
+ // let data = res.result[0]
+ // data = {
+ // ...data,
+ // dateOfBirth: data.birthDate,
+ // marriedOrNot: data.maritalStatus,
+ // address: data.address,
+ // emergencyContact: data.contactName,
+ // emergencyTel: data.contactTel,
+ // emergencyRelationship: data.contactRelationship,
+ // hukouNature: data.hukouType,
+ // idCardPositive: data.cardZmPath,
+ // idCardNegative: data.cardFmPath,
+ // healthCertificatePositive: data.healthZmPath,
+ // healthCertificateNegative: data.healthFmPath,
+ // bankPositive: data.bankZmPath,
+ // bankNegative: data.bankFmPath,
+ // qualification: data.qualificationPath,
+ // noCrimeCertificate: data.noCrimeCertificate,
+ // houseAddress: data.idCardAddress,
+ // employeeId: data.id,
+ // id: null,
+ // createTime: null,
+ // updateBy: null,
+ // updateTime: null,
+ // orgCode: item.orgCode
+ // }
+ // Apply(data).then((data) => {
+ // if (data.success) {
+ // uni.requestSubscribeMessage({
+ // // 这里填后台申请好的 templateId 数组
+ // tmplIds: ['cWVzXm1C-iitx1gNFn1nZdijq9R_3fCv8vLbiqs9zww'],
+ // success: (res) => {
+ // popupshow.value = true
+ // setTimeout(() => {
+ // loadingData()
+ // }, 1000)
+ // },
+ // fail: (err) => {
+ // console.error('订阅接口调用失败:', err);
+ // uni.showToast({
+ // title: '订阅失败',
+ // icon: 'none'
+ // });
+ // }
+ // });
+
+
+ // }
+
+
+ // })
+
+ // })
}
const jumpTo = () => {
uni.navigateTo({
@@ -474,7 +481,7 @@
})
})
getMessageList().then(res => {
- console.log("special", res)
+ // console.log("special", res)
uni.setStorageSync("staff", res.result[0])
})
}
@@ -550,7 +557,7 @@
flex-direction: column;
min-height: calc(100vh);
width: 100%;
- background-color: rgb(239, 241, 252);
+ background-color: #F7F7F7;
position: relative;
}
diff --git a/pages/yuangongindex/searchjigou.vue b/pages/yuangongindex/searchjigou.vue
index d131d4d..83013a6 100644
--- a/pages/yuangongindex/searchjigou.vue
+++ b/pages/yuangongindex/searchjigou.vue
@@ -28,9 +28,9 @@
-
+
-
+
@@ -80,11 +75,12 @@
-
+
@@ -202,7 +198,7 @@
flex-direction: column;
min-height: 100vh;
width: 100%;
- background-color: rgb(239, 241, 252);
+ background-color: #F7F7F7;
position: relative;
}