From 0a9f1f2673e4b91bbf8aca529396b27997bfbe68 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Fri, 24 Oct 2025 14:42:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/pages/user/index.vue | 46 +++++++-------
src/App.vue | 19 +++---
src/subPackages/userDetail/password/index.vue | 43 ++++++-------
src/subPackages/userDetail/infos/index.vue | 30 +++++-----
4 files changed, 67 insertions(+), 71 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index 68615f8..8505618 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,13 +1,4 @@
-<!--
- * @Author : yuan
- * @Date : 2025-09-28 09:31:16
- * @LastEditors : yuan
- * @LastEditTime : 2025-09-28 10:07:55
- * @FilePath : \src\App.vue
- * @Description :
- * Copyright 2025 OBKoro1, All Rights Reserved.
- * 2025-09-28 09:31:16
--->
+
<script setup>
import { onHide, onLaunch, onShow } from "@dcloudio/uni-app";
import { useAppStore } from "@/store";
@@ -38,6 +29,14 @@
/* 每个页面公共css */
@import "uview-plus/index.scss";
@import "@/static/styles/common.scss";
+page {
+ background-image: url('~@/static/images/user/allBg.svg');
+ background-size: cover;
+ background-position: center;
+ background-repeat: no-repeat;
+ background-attachment: fixed;
+ min-height: 100vh;
+}
.uni-tabbar__item:nth-child(4) {
.uni-tabbar__bd {
.uni-tabbar__icon {
diff --git a/src/pages/user/index.vue b/src/pages/user/index.vue
index da779cd..ef5cae7 100644
--- a/src/pages/user/index.vue
+++ b/src/pages/user/index.vue
@@ -112,13 +112,13 @@
height: 100%;
background: url('/src/static/images/user/allBg.svg') no-repeat center center;
background-size: cover;
- padding-top: 44px;
+ padding-top: 88rpx;
}
.userName {
font-family: "Source Han Sans CN";
font-weight: 500;
- font-size: 18px;
+ font-size: 36rpx;
color: #000000;
}
@@ -126,71 +126,71 @@
.departs {
display: flex;
align-items: center;
- margin-top: 11px;
+ margin-top: 22rpx;
span {
font-family: "Source Han Sans CN";
font-weight: 400;
- font-size: 14px;
+ font-size: 28rpx;
color: rgba(0, 0, 0, 0.6);
- margin-left: 3px;
+ margin-left: 6rpx;
}
}
.rightLogo {
- width: 100px;
- height: 40px;
+ width: 200rpx;
+ height: 80rpx;
}
.bottomLogo {
position: absolute;
- bottom: 25px;
+ bottom:50rpx;
left: 0;
right: 0;
margin: 0 auto;
text-align: center;
}
.goOutStyle {
- width: 295px;
- height: 38px;
+ width: 590rpx;
+ height: 76rpx;
background: #1D6FE9;
- border-radius: 20px 20px 20px 20px;
+ border-radius: 40rpx;
font-family: "Source Han Sans CN";
font-weight: 400;
- font-size: 14px;
+ font-size: 28rpx;
color: #FFFFFF;
text-align: center;
- line-height: 38px;
+ line-height: 76rpx;
margin: auto;
- margin-top: 57px;
+ margin-top: 114rpx;
}
.personalInformation {
display: flex;
justify-content: space-between;
- padding: 0 12px;
+ padding: 0 24rpx;
.message,
.passwordBox {
- width: 170px;
- height: 80px;
+ width: 340rpx;
+ height:160rpx;
.messagebox{
- padding: 10px 12px;
+ padding: 20rpx 24rpx;
font-family: "Source Han Sans CN";
font-weight: 500;
- font-size: 14px;
+ font-size: 28rpx;
color: #000000;
}
.editInfo {
- padding: 10px 12px;
+ padding: 20rpx 24rpx;
color: rgba(0, 0, 0, 0.5);
font-family: "Source Han Sans CN";
font-weight: 400;
- font-size: 12px;
+ font-size: 24rpx;
display: flex;
align-items: center;
img{
- width: 14px;
- height: 14px;
+ width: 28rpx;
+ height: 28rpx;
}
}
}
diff --git a/src/subPackages/userDetail/infos/index.vue b/src/subPackages/userDetail/infos/index.vue
index 39b46d1..867c189 100644
--- a/src/subPackages/userDetail/infos/index.vue
+++ b/src/subPackages/userDetail/infos/index.vue
@@ -136,29 +136,29 @@
}
.avatarBox {
- width: 114px;
- height: 114px;
- margin: 38px 0;
+ width: 228rpx;
+ height: 228rpx;
+ margin:76rpx 0;
}
.detailBox {
- width: 351px;
- min-height: 215px;
+ width: 702rpx;
+ min-height: 430rpx;
background: #FFFFFF;
- border-radius: 6px;
- box-shadow: 0 2px 10px rgba(0, 0, 0, 0.05);
+ border-radius: 12rpx;
+ box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.05);
.orderRow {
display: flex;
justify-content: space-between;
align-items: center;
- height: 48px;
- border-bottom: 1px solid #f5f5f5;
+ height: 96rpx;
+ border-bottom: 2rpx solid #f5f5f5;
color: #7b7b7b;
- padding: 0 12px;
+ padding: 0 24rpx;
.rowTitle {
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 400;
- font-size: 15px;
+ font-size: 30rpx;
color: #222324;
white-space: nowrap;
}
@@ -182,14 +182,14 @@
.btngroup {
display: flex;
position: absolute;
- bottom:75px;
+ bottom:150rpx;
}
.u-button:first-child{
- margin-right: 15px;
+ margin-right: 30rpx;
}
.custom-style {
- width: 138px;
- height: 38px;
+ width: 276rpx;
+ height: 76rpx;
}
</style>
\ No newline at end of file
diff --git a/src/subPackages/userDetail/password/index.vue b/src/subPackages/userDetail/password/index.vue
index 4c766f2..c5f161e 100644
--- a/src/subPackages/userDetail/password/index.vue
+++ b/src/subPackages/userDetail/password/index.vue
@@ -109,32 +109,30 @@
}
.detailBox {
- margin-top: 20px;
- width: 351px;
+ margin-top: 40rpx;
+ width: 702rpx;
- min-height: 163px;
+ min-height: 326rpx;
background: #FFFFFF;
- border-radius: 6px;
-
- box-shadow: 0 2px 10px rgba(0, 0, 0, 0.05);
+ border-radius: 12rpx;
+ box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.05);
.orderRow {
- display: flex;
- justify-content: space-between;
- align-items: center;
- height: 48px;
- border-bottom: 1px solid #f5f5f5;
- color: #7b7b7b;
- padding: 0 12px;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ height: 96rpx;
+ border-bottom: 2rpx solid #f5f5f5;
+ color: #7b7b7b;
+ padding: 0 24rpx;
.rowTitle {
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 400;
- font-size: 15px;
+ font-size: 30rpx;
color: #222324;
white-space: nowrap;
}
-
::v-deep .u-input {
border: none !important;
background: transparent !important;
@@ -151,18 +149,17 @@
}
}
- .btngroup {
+.btngroup {
display: flex;
position: absolute;
- bottom:75px;
+ bottom:150rpx;
}
-
- .u-button:first-child {
- margin-right: 15px;
+ .u-button:first-child{
+ margin-right: 30rpx;
}
-
+
.custom-style {
- width: 138px;
- height: 38px;
+ width: 276rpx;
+ height: 76rpx;
}
</style>
\ No newline at end of file
--
Gitblit v1.9.3