From 8885c74fcb11ccd417ff82a1d9a0653f64453da3 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Tue, 22 Apr 2025 17:39:56 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=BF=AE=E6=94=B9=E7=94=A8?=
=?UTF-8?q?=E6=88=B7=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/system/user.js | 2 +-
pages/index.vue | 68 ++++++----------------------
pages/mine/evaluate/index.vue | 7 ++-
pages/mine/index.vue | 11 +----
pages/mine/me/basicInfo.vue | 85 ++++++++++++++++++++---------------
pages/mine/me/index.vue | 16 +++----
pages/mine/me/myAddress.vue | 3 ++
pages/survey/details.vue | 73 +++++++++++++++---------------
pages/work/index.vue | 14 +++---
9 files changed, 123 insertions(+), 156 deletions(-)
diff --git a/api/system/user.js b/api/system/user.js
index 37bb135..18983f0 100644
--- a/api/system/user.js
+++ b/api/system/user.js
@@ -43,7 +43,7 @@ export function saveUserHeaderPhoto(data) {
// 修改用户个人信息
export function updateUserProfile(data) {
return request({
- url: '/smart-canteen/custCasual/updateDetailInfoCasualForApp',
+ url: '/system/user/edit',
method: 'post',
data: data
})
diff --git a/pages/index.vue b/pages/index.vue
index 84c6984..7a0f593 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -35,13 +35,13 @@
-->
-
+
@@ -50,7 +50,7 @@
个人余额
¥
- {{ (walletBal/100).toFixed(2) }}
+ {{ (walletBal/100).toFixed(2) }}
元
@@ -69,51 +69,8 @@
预定餐
智能、预定、鲜活
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -372,15 +329,16 @@ view {
width: 100%;
height: auto;
display: flex;
+ justify-content: center;
flex-wrap: wrap;
margin-bottom: 30rpx;
.handle-box-item {
- width: 44%;
- margin: 3%;
+ width: 28%;
+ margin: 2%;
background-color: #ffffff;
border-radius: 12rpx;
- padding: 30rpx 20rpx;
+ padding: 20rpx 10rpx;
display: flex;
flex-direction: column;
justify-content: center;
@@ -388,9 +346,9 @@ view {
box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.04);
.image-box{
- width: 80px;
- height: 70px;
- margin-bottom: 20rpx;
+ width: 60px;
+ height: 40px;
+ margin-bottom: 10rpx;
}
.box-title{
font-size: 32rpx;
@@ -398,7 +356,7 @@ view {
margin-bottom: 20rpx;
}
.box-subtitle{
- font-size: 28rpx;
+ font-size: 24rpx;
// font-weight: bold;
}
diff --git a/pages/mine/evaluate/index.vue b/pages/mine/evaluate/index.vue
index 8794805..978d5ec 100644
--- a/pages/mine/evaluate/index.vue
+++ b/pages/mine/evaluate/index.vue
@@ -1,6 +1,9 @@
-
+
+
+
+
@@ -68,7 +71,7 @@ export default {
const res = await canteenEvaluateListAPI(param)
console.log(res)
// this.messageList = res.rows
- this.total = res.total;
+ this.total = Number(res.total);
if(this.pageNum==1){
this.messageList = res.rows
}else{
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index 55ca9c9..3c39afe 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -126,17 +126,10 @@
walletBal: 0 ,// 钱包余额
}
},
- onLoad() {
- this.getUserInfo()
+ onLoad() {
this.getWalletBalance()
},
methods: {
- //获取用户信息
- getUserInfo(){
- this.$store.dispatch('GetInfo').then(res => {
- console.log(res)
- })
- },
// 获取钱包余额
async getWalletBalance(userId) {
let param = {
@@ -160,8 +153,6 @@
// })
})
},
-
-
avatarClick() {
this.avatarShow = true
},
diff --git a/pages/mine/me/basicInfo.vue b/pages/mine/me/basicInfo.vue
index 6466e46..b30091d 100644
--- a/pages/mine/me/basicInfo.vue
+++ b/pages/mine/me/basicInfo.vue
@@ -34,19 +34,21 @@
手机号
- {{userInfo.mobile}}
+
+
+
-
+
@@ -58,38 +60,35 @@
-
+
-
+
-
-
+ -->
-
+
-
+
-
+ -->
@@ -101,7 +100,7 @@
-
+
import Cookies from "js-cookie";
- import {
- getUserProfile,
+ import {
uploadAvatar,
updateUserProfile,
saveUserHeaderPhoto
@@ -155,12 +153,18 @@
},
methods: {
getUserInfo() {
- getUserProfile({'userId':Cookies.get('userId'),"sourceType":7}).then(res => {
- this.userInfo = res.data;
- this.userInfo.sex = this.userInfo.sex-1
- this.userInfo.sexStr = this.columns[0][this.userInfo.sex]
- console.log('this.userInfo',this.userInfo)
+ this.$store.dispatch('GetInfo').then(res => {
+ console.log(res)
+ this.userInfo = res.user;
+ this.userInfo.postIds = res.postIds||[]
+ this.userInfo.roleIds = res.roleIds||[]
})
+ // getUserProfile({'userId':Cookies.get('userId'),"sourceType":7}).then(res => {
+ // this.userInfo = res.data;
+ // this.userInfo.sex = this.userInfo.sex-1
+ // this.userInfo.sexStr = this.columns[0][this.userInfo.sex]
+ // console.log('this.userInfo',this.userInfo)
+ // })
},
goBack() {
@@ -184,20 +188,19 @@
},
saveUserInfo(){
console.log(this.userInfo)
- let param = {
- "userId":Cookies.get('userId'),
- "mobile":this.userInfo.mobile,
- "sex":this.userInfo.sex+1,
- "birthday":this.userInfo.birthday,
- "age":this.userInfo.age,
- "idCard":this.userInfo.idCard,
- "email":this.userInfo.email,
- "homeAddr":this.userInfo.homeAddr,
- "pwd":Cookies.get('pwd'),
- "sourceType":7
- }
- console.log(param)
- updateUserProfile(param).then(res => {
+ // let param = {
+ // "userId":Cookies.get('userId'),
+ // "phonenumber":this.userInfo.phonenumber,
+ // "sex":this.userInfo.sex+1,
+ // "birthday":this.userInfo.birthday,
+ // "age":this.userInfo.age,
+ // "idCard":this.userInfo.idCard,
+ // "email":this.userInfo.email,
+ // "homeAddr":this.userInfo.homeAddr,
+ // "pwd":Cookies.get('pwd'),
+ // "sourceType":7
+ // }
+ updateUserProfile(this.userInfo).then(res => {
if(res.code==200){
uni.showToast({
title: '保存成功',
@@ -319,6 +322,7 @@
.container {
min-height: 100vh;
background-color: #FBFCFF;
+ position: relative;
}
.form-container {
@@ -399,4 +403,13 @@
}
}
}
+
+ .fs32{
+ & :nth-child(1){
+ font-size: 32rpx;
+ }
+ & :nth-child(2){
+ font-size: 32rpx;
+ }
+ }
\ No newline at end of file
diff --git a/pages/mine/me/index.vue b/pages/mine/me/index.vue
index 8330c4c..49d41dd 100644
--- a/pages/mine/me/index.vue
+++ b/pages/mine/me/index.vue
@@ -51,10 +51,10 @@ export default {
title: '基本信息',
path: '/pages/mine/me/basicInfo'
},
- // {
- // title: '我的地址',
- // path: '/pages/mine/me/myAddress'
- // },
+ {
+ title: '我的地址',
+ path: '/pages/mine/me/myAddress'
+ },
{
title: '健康信息',
path: '/pages/mine/me/healthInformation'
@@ -67,10 +67,10 @@ export default {
title: '修改密码',
path: '/pages/mine/me/changePassword'
},
- {
- title: '绑定手机号',
- path: '/pages/mine/me/bindingPhone'
- },
+ // {
+ // title: '绑定手机号',
+ // path: '/pages/mine/me/bindingPhone'
+ // },
{
title: '挂失解绑',
path: '/pages/mine/me/carteenCard'
diff --git a/pages/mine/me/myAddress.vue b/pages/mine/me/myAddress.vue
index b53ed0f..37ea99a 100644
--- a/pages/mine/me/myAddress.vue
+++ b/pages/mine/me/myAddress.vue
@@ -2,6 +2,9 @@
+
+
+
{{ item.addrFullName }} {{item.detailAddr}}
diff --git a/pages/survey/details.vue b/pages/survey/details.vue
index f89913c..eb5838b 100644
--- a/pages/survey/details.vue
+++ b/pages/survey/details.vue
@@ -1,25 +1,26 @@
-
+
+
- 体检日期
+ 体检日期
- {{medicalDate || '请选择体检日期'}}
+
+ {{medicalDate || '请选择体检日期'}}
- 体检机构
-
-
+ 体检机构
+
+
-
-
+
-
+
@@ -31,14 +32,14 @@
({{ dItem.medicalProjectDetailUnit }})
-
+
-
+
保存
-
-
+
@@ -73,7 +73,7 @@ export default {
paramsData:{},
medicalTemplateId:"",
reportList:[],
- sumbitStaus:true
+ sumbitStaus:false
}
},
onLoad(opt) {
@@ -119,9 +119,9 @@ export default {
this.reportList = res
console.log(res, '详情--------')
},
- async saveReport() {
- if(this.sumbitStaus){
- this.sumbitStaus=false
+ saveReport() {
+ if(!this.sumbitStaus){
+ this.sumbitStaus=true
let param = {}
if(this.paramsData.medicalId&&this.paramsData.medicalId!=""){
param = {
@@ -141,19 +141,17 @@ export default {
"reportProjectVOS":this.reportList
}
}
- const res = await editMedicalReportApi(param)
- if(res.code==200){
- this.sumbitStaus=true
- uni.showToast({
- title: '提交成功',
- icon: 'none'
- });
- setTimeout(()=>{
- uni.navigateBack()
- },800)
- }else{
- this.sumbitStaus=true
- }
+ editMedicalReportApi(param).then((res)=>{
+ if(res.code==200){
+ this.sumbitStaus=false
+ uni.navigateBack()
+ }else{
+ this.sumbitStaus=false
+ }
+ }).catch(()=>{
+ this.sumbitStaus=false
+ })
+
}
},
@@ -198,23 +196,24 @@ export default {
}
.label {
+ width: 25%;
font-size: 32rpx;
color: #333;
- margin-right: 20rpx;
+ margin-right: 10rpx;
}
.value-wrapper {
display: flex;
align-items: center;
- border: 1px solid #999;
+ border: 1px solid rgb(229, 229, 229);
border-radius: 10rpx;
width: 70%;
- height: 60rpx;
+ height: 70rpx;
.value {
- font-size: 32rpx;
+ font-size: 28rpx;
color: #333;
- margin-right: 16rpx;
+ padding-left: 16rpx;
&.placeholder {
color: #999;
}
@@ -251,8 +250,8 @@ export default {
.value-wrapper {
display: flex;
align-items: center;
- /* border: 1px solid #999;
- border-radius: 10rpx; */
+ border: 1px solid rgb(229, 229, 229);
+ border-radius: 10rpx;
width: 60%;
height: 60rpx;
}
diff --git a/pages/work/index.vue b/pages/work/index.vue
index c5f1c06..23be9ce 100644
--- a/pages/work/index.vue
+++ b/pages/work/index.vue
@@ -98,7 +98,7 @@
v-for="(item, index) in dateOptions"
:key="index"
class="date-option"
- :class="{ active: currentDateOption === index }"
+ :class="{ active: currentDateOption == index }"
@click="selectDateOption(index)"
>
{{ item.label }}
@@ -407,13 +407,13 @@ export default {
},
// 选择日期区间
selectDateOption(index) {
- this.currentDateOption = index
- const months = this.dateOptions[index].value
- const end = new Date()
- const start = new Date()
+ this.currentDateOption = Number(index)
+ const months = Number(this.dateOptions[index].value)
+ const end = new Date()
+ const start = new Date()
start.setMonth(start.getMonth() - months)
- this.startDate = this.formatDate(start)
- this.endDate = this.formatDate(end)
+ this.startDate = this.formatDate(start)
+ this.endDate = this.formatDate(end)
},
selectStartDate(e) {
console.log('selectStartDate', e)