From 86c2d61ba9d33f1886cfc904dcaf17f033e4c80a Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Sat, 17 Jan 2026 13:52:53 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web
---
uniapps/work-app/src/pages/user/index.vue | 114 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 61 insertions(+), 53 deletions(-)
diff --git a/uniapps/work-app/src/pages/user/index.vue b/uniapps/work-app/src/pages/user/index.vue
index 5874535..0ac0dc0 100644
--- a/uniapps/work-app/src/pages/user/index.vue
+++ b/uniapps/work-app/src/pages/user/index.vue
@@ -1,45 +1,48 @@
<!-- 我的 -->
<template>
<view class="page-wrap">
- <view class="userBox">
- <view class="flex items-center pb-30rpx pl-30rpx pr-20rpx">
- <view class="mr-20rpx">
- <u-avatar :src="user.avatar || defaultAvatar" size="70" />
- </view>
- <view class="flex-1">
- <view class="userName">{{user.nickName }}</view>
- <view class="departs">
- <image
- src="@/static/images/user/department.svg"
- alt=""
- />
- <span>{{ user?.sysDept?.deptName }}</span>
- </view>
- </view>
+<view class="pageUser">
+ <view class="userBox">
+ <view class="flex items-center pb-30rpx pl-30rpx pr-20rpx">
+ <view class="mr-20rpx">
+ <u-avatar :src="user.avatar || defaultAvatar" size="70" />
+ </view>
+ <view class="flex-1">
+ <view class="userName">{{user.nickName }}</view>
+ <view class="departs">
+ <image
+ src="@/static/images/user/department.svg"
+ alt=""
+ />
+ <span>{{ user?.sysDept?.deptName }}</span>
+ </view>
+ </view>
- </view>
- <view class="personalInformation">
- <div class="message">
- <div class="messagebox">个人信息</div>
- <div class="editInfo" @click="handelEdit(1)">
- 点击编辑
- <image :src="rightImage" alt="" />
- </div>
- </div>
- <div class="passwordBox">
- <div class="messagebox">修改密码</div>
- <div class="editInfo" @click="handelEdit(2)">
- 点击编辑
- <image :src="rightImage" alt="" />
- </div>
- </div>
- </view>
+ </view>
+ <view class="personalInformation">
+ <div class="message">
+ <div class="messagebox">个人资料</div>
+ <div class="editInfo" @click="handelEdit(1)">
+ 点击编辑
+ <image :src="rightImage" alt="" />
+ </div>
+ </div>
+ <div class="passwordBox">
+ <div class="messagebox">修改密码</div>
+ <div class="editInfo" @click="handelEdit(2)">
+ 点击编辑
+ <image :src="rightImage" alt="" />
+ </div>
+ </div>
+ </view>
- <view class="mt-20rpx">
- <div class="goOutStyle" @click="logOut">退出登录</div>
- </view>
+ <view class="goOutBtn">
+ <div class="goOutStyle" @click="logOut">退出登录</div>
+ </view>
- </view>
+ </view>
+
+</view>
</view>
</template>
@@ -51,10 +54,10 @@
import { onShow } from "@dcloudio/uni-app";
import { getDeviceRegionApi } from "@/api/map.js";
import defaultAvatar from '/static/images/defaultAvatar.svg'
+import rightImage from '@/static/images/user/rightBtn.svg';
const { setClipboardData, getClipboardData } = useClipboard();
-
-const rightImage = getAssetsImage("/images/user/rightBtn.svg");
-const logoImage = getAssetsImage("/images/user/logo1.png");
+//
+// const rightImage = getAssetsImage("/images/user/rightBtn.svg");
const userStore = useUserStore();
const user = ref("");
@@ -71,9 +74,6 @@
});
}
-function getDeviceRegion() {
- getDeviceRegionApi().then((res) => {});
-}
const handelEdit = (val) => {
if (val === 1) {
uni.navigateTo({
@@ -99,11 +99,11 @@
height: 100%;
}
.pageUser {
- background: url("@/static/images/user/userbg.svg") no-repeat center;
-
+ background: url("@/static/images/user/userbg.svg") no-repeat ;
+ background-size: 100% ;
}
.userBox {
- padding-top: 88rpx;
+ padding-top: 212rpx;
}
.userName {
font-weight: 700;
@@ -153,20 +153,28 @@
height: 52rpx;
}
}
-
+.goOutBtn {
+ display: flex;
+ justify-content: center;
+ position: absolute;
+ bottom: 72rpx;
+ left: 0;
+ right: 0;
+}
.goOutStyle {
- width: 590rpx;
- height: 76rpx;
- background: #1d6fe9;
- border-radius: 40rpx;
+ width: 670rpx;
+ height: 100rpx;
+ background: #1D6FE9;
+ border-radius: 8rpx 8rpx 8rpx 8rpx;
font-family: "Source Han Sans CN";
font-weight: 400;
- font-size: 28rpx;
+ font-size: 36rpx;
color: #ffffff;
text-align: center;
- line-height: 76rpx;
+ line-height: 100rpx;
margin: auto;
margin-top: 114rpx;
+
}
.personalInformation {
@@ -183,7 +191,7 @@
padding: 20rpx 40rpx;
font-family: "Source Han Sans CN";
font-weight: 500;
- font-size: 28rpx;
+ font-size: 32rpx;
color: #000000;
}
--
Gitblit v1.9.3