diff --git a/pages.json b/pages.json
index 6801d3a..e67b836 100644
--- a/pages.json
+++ b/pages.json
@@ -21,7 +21,8 @@
{
"path": "pages/login/threeselectone",
"style": {
- "navigationBarTitleText": "选择角色"
+ "navigationBarTitleText": "选择角色",
+ "navigationStyle": "custom"
}
},
@@ -429,6 +430,13 @@
{
"navigationBarTitleText" : ""
}
+ },
+ {
+ "path" : "pages/oldmanindex/paybill",
+ "style" :
+ {
+ "navigationBarTitleText" : ""
+ }
}
],
"globalStyle": {
diff --git a/pages/addjigou/all.vue b/pages/addjigou/all.vue
index cbbf75e..333645e 100644
--- a/pages/addjigou/all.vue
+++ b/pages/addjigou/all.vue
@@ -136,19 +136,16 @@
机构信息
-
-
- 头像
-
-
-
-
-
-
-
+
+
+ 负责人头像
+
+
+
+
{{item}}
diff --git a/pages/addjigou/where.vue b/pages/addjigou/where.vue
index f4bb63f..b357360 100644
--- a/pages/addjigou/where.vue
+++ b/pages/addjigou/where.vue
@@ -63,7 +63,7 @@
机构信息
-
+
+
+
+ 负责人头像（选填）
+
+
+
机构位置
{
if (element==2) {
uni.previewImage({
- urls: [data.headPath], // 必填，所有要预览的图片地址数组
- current: data.headPath, // 可选，当前显示图片的地址，默认是 urls[0]
+ urls: [`${media_base_url}${form.headPath}`], // 必填，所有要预览的图片地址数组
+ current: `${media_base_url}${form.headPath}`, // 可选，当前显示图片的地址，默认是 urls[0]
indicator: 'default', // 可选，指示器样式，H5/App 有效，值为 'default'（圆点）或 'number'（数字）
longPressActions: { // 可选，仅 App 支持，长按图片时弹出的操作项
itemList: ['保存图片到相册'],
@@ -761,6 +771,7 @@
margin-left: 10rpx;
font-size: 30rpx;
width: 250rpx;
+ white-space: nowrap;
}
.one-right {
diff --git a/pages/addstaff/IDcard.vue b/pages/addstaff/IDcard.vue
index adc924a..f2d4f9a 100644
--- a/pages/addstaff/IDcard.vue
+++ b/pages/addstaff/IDcard.vue
@@ -85,10 +85,7 @@
确认并继续
-->
-
-
- 上一步
-
+
下一步
@@ -725,14 +722,15 @@
display: flex;
justify-content: center;
align-items: center;
- width: 44%;
+ width: 80%;
height: 90rpx;
- // margin: 0rpx auto;
+ margin: 0rpx auto;
margin-bottom: 80rpx;
+ margin-top: 20rpx;
background: linear-gradient(to bottom, #e7f4ff, #c5e5ff);
border: 2rpx solid #9AD1FF;
color: #007CFF;
- border-radius: 37rpx;
+ border-radius: 35rpx;
font-size: 33rpx;
}
diff --git a/pages/addstaff/healthcertificate.vue b/pages/addstaff/healthcertificate.vue
index ee1b720..e992efe 100644
--- a/pages/addstaff/healthcertificate.vue
+++ b/pages/addstaff/healthcertificate.vue
@@ -333,7 +333,7 @@
data.healthFmPath = imgArray[1]
data.qualificationPath = imgArray[2]
data.noCrimeCertificate = imgArray[3]
- data.headPath = imgArray[4]
+ data.headPath = data.headPath
if (data.endTime == '长期') {
data.endTime = swapLongTerm(data.endTime);
}
diff --git a/pages/addstaff/information.vue b/pages/addstaff/information.vue
index 260a7ec..18c4d72 100644
--- a/pages/addstaff/information.vue
+++ b/pages/addstaff/information.vue
@@ -136,11 +136,15 @@
-
+
+
+ 上一步
+
下一步
+
@@ -487,6 +491,7 @@
icon: 'none'
})
} else {
+ form.headPath = headPath.value;
const data = form
const merged2 = {
...uni.getStorageSync('backhuancun'),
@@ -499,12 +504,22 @@
});
}
-
-
}
const goBack = () => {
+ if (!uping.value) {
+ return
+ }
+ form.headPath = headPath.value;
+ const data = form
+ const merged2 = {
+ ...uni.getStorageSync('backhuancun'),
+ ...data
+ };
uni.navigateBack()
}
+ // const goBack = () => {
+ // uni.navigateBack()
+ // }
const sex = ref("")
onLoad(() => {
if (uni.getStorageSync('baddata')) {
@@ -524,8 +539,8 @@
"currentAddress",
'auditContent',
"applyStatus",
- "modifyStatus"
-
+ "modifyStatus",
+ "headPath"
]
keys.forEach(key => {
@@ -536,11 +551,11 @@
form.showheight = form.height + 'cm';
form.showweight = form.weight + 'kg';
sex.value = data.sex
+ headPath.value = data.headPath
} else {
uni.setStorageSync("isstaffchange", false)
form.tel = uni.getStorageSync('tel')
}
-
})
@@ -585,18 +600,27 @@
display: flex;
justify-content: center;
align-items: center;
- width: 80%;
+ width: 44%;
height: 90rpx;
- margin: 0rpx auto;
margin-bottom: 80rpx;
- margin-top: 20rpx;
background: linear-gradient(to bottom, #e7f4ff, #c5e5ff);
border: 2rpx solid #9AD1FF;
color: #007CFF;
border-radius: 35rpx;
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;
+ }
.title-back {
background-color: #F7F7F7;
width: 100%;
diff --git a/pages/login/threeselectone.vue b/pages/login/threeselectone.vue
index 482284a..a09c8f4 100644
--- a/pages/login/threeselectone.vue
+++ b/pages/login/threeselectone.vue
@@ -3,10 +3,10 @@
-
-
+
+
@@ -255,7 +255,7 @@
}
.title-back {
- background-color: #F7F7F7;
+ background-color: rgba(255, 255, 255, 0);
width: 100%;
height: 70rpx;
display: flex;
diff --git a/pages/oldmanindex/index.vue b/pages/oldmanindex/index.vue
index 33dce99..954d034 100644
--- a/pages/oldmanindex/index.vue
+++ b/pages/oldmanindex/index.vue
@@ -166,10 +166,10 @@
{{item0}}
-
+
@@ -334,7 +334,8 @@
const content = ref("");
- const buttonArray = ref(["护理服务", "医疗服务", "账单查询", "视频影像", "外出申请", "长者信息", "监护人"])
+ // const buttonArray = ref(["护理服务", "医疗服务", "账单查询", "视频影像", "外出申请", "长者信息", "监护人","缴费账单"])
+ const buttonArray = ref(["护理服务", "缴费账单", "账单查询", "视频影像", "外出申请", "长者信息", "监护人" ])
const statusarray = ["loading", "success", "fail"]
const which = ref(0);
@@ -413,6 +414,11 @@
const clickButton = (item, index) => {
switch (index) {
+ case 1:
+ uni.navigateTo({
+ url: `/pages/oldmanindex/paybill`
+ });
+ break
case 2:
// console.log("NNNN",item.orgCode)
uni.navigateTo({
diff --git a/pages/oldmanindex/paybill.vue b/pages/oldmanindex/paybill.vue
new file mode 100644
index 0000000..71952b2
--- /dev/null
+++ b/pages/oldmanindex/paybill.vue
@@ -0,0 +1,157 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 李富贵
+
+ 女 | 80岁 | 2025.01.01
+
+
+
+
+
+
+
+ 2026.03.01-2026.03.31
+
+ 计费
+
+
+
+
+
+
+
+
+
diff --git a/pages/supplierindex/material.vue b/pages/supplierindex/material.vue
index 0869e1d..9d9687a 100644
--- a/pages/supplierindex/material.vue
+++ b/pages/supplierindex/material.vue
@@ -28,10 +28,13 @@
品牌型号
规格型号
+ 生产厂家
+
{{v.brandType}}
{{v.specificationModel}}
+ {{v.manufacturer}}
@@ -52,9 +55,9 @@
src="https://www.focusnu.com/media/directive/index/none.png" mode="widthFix" lazy-load="false" />
暂无物料信息
-
+
@@ -158,7 +161,7 @@
}
}
.act{
- border: 2rpx dashed #0083FA !important;
+ border: 2px dashed #0083FA !important;
}
.box{
width: 700rpx;
@@ -168,7 +171,7 @@
border-radius: 25rpx;
overflow: hidden;
margin: 24rpx auto ;
- border: 2rpx solid #fff;
+ border: 2px solid #fff;
.xian{
width: 100%;
height: 1px;
diff --git a/pages/supplierindex/mtdetails.vue b/pages/supplierindex/mtdetails.vue
index 0435aad..41bbf49 100644
--- a/pages/supplierindex/mtdetails.vue
+++ b/pages/supplierindex/mtdetails.vue
@@ -16,6 +16,11 @@
规格型号
{{obj.specificationModel}}
+
+ 生产厂家
+ {{obj.manufacturer}}
+
+
品牌型号
{{obj.brandType}}
@@ -30,7 +35,7 @@
-
+
确定
@@ -88,7 +93,8 @@
let hom = {
id:obj.value.id,
salesUnitPrice:obj.value.salesUnitPrice,
- salesUnit:obj.value.salesUnit
+ salesUnit:obj.value.salesUnit,
+ suppliersId:obj.value.suppliersId
}
editSuppliersWlInfo(hom).then(res=>{
if(res.success){
diff --git a/request/index.js b/request/index.js
index 1564caa..ca39ebb 100644
--- a/request/index.js
+++ b/request/index.js
@@ -1,6 +1,6 @@
// 全局请求封装
-// export const base_url = 'http://192.168.2.18:8081/opeapi/'
-export const base_url = 'https://www.focusnu.com/opeapi'
+export const base_url = 'http://192.168.2.18:8081/opeapi/'
+// export const base_url = 'https://www.focusnu.com/opeapi'
export const media_base_url = 'https://www.focusnu.com/media/'
// export const base_url = 'http://192.168.2.24:8081/opeapi'