From d22879178dfd4164cf41fc783fd376ce7b7528cd Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Thu, 08 Jan 2026 16:11:54 +0800
Subject: [PATCH] feat:demo
---
uniapps/work-app/src/pages/login/index.vue | 11 +++++++----
uniapps/work-app/src/pages/voiceCall/index.vue | 5 +++--
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/uniapps/work-app/src/pages/login/index.vue b/uniapps/work-app/src/pages/login/index.vue
index 8e97a3e..c470cbb 100644
--- a/uniapps/work-app/src/pages/login/index.vue
+++ b/uniapps/work-app/src/pages/login/index.vue
@@ -27,6 +27,7 @@
</checkbox-group>
记住密码
</label>
+ <div>忘记密码？</div>
</div>
<button class="login-btn" :style="[inputStyle]" @tap="submit">登录</button>
@@ -133,9 +134,11 @@
});
} catch (error) {
const errorMsg =
- error.data?.error_description !== "Bad credentials"
- ? error.data?.error_description
- : "登录失败，请重试";
+ error.data?.msg
+ ? error.data.msg
+ : (error.data?.error_description && error.data.error_description !== "Bad credentials")
+ ? error.data.error_description
+ : "登录失败，请重试";
uni.showToast({
title: errorMsg,
icon: "none",
@@ -241,7 +244,7 @@
.remember-password {
display: flex;
- justify-content: flex-end;
+ justify-content:space-between;
align-items: center;
margin-left: 62rpx;
margin-right: 58rpx;
diff --git a/uniapps/work-app/src/pages/voiceCall/index.vue b/uniapps/work-app/src/pages/voiceCall/index.vue
index ccba838..6ddbf36 100644
--- a/uniapps/work-app/src/pages/voiceCall/index.vue
+++ b/uniapps/work-app/src/pages/voiceCall/index.vue
@@ -1,5 +1,5 @@
<template>
- <div class="voiceCallContainer">
+ <div class="voiceCallContainer" :style="{ paddingTop: topMargin + 'px' }">
<!-- 顶部搜索栏 -->
<div class="searchBar">
<up-search placeholder="请输入关键字搜索" :animation="true" :show-action="false"></up-search>
@@ -36,7 +36,8 @@
</template>
<script setup>
-import { ref, computed } from 'vue'
+import { getStatusBarHeight } from '@/utils/common';
+const topMargin = getStatusBarHeight()
// 搜索关键字
const searchKeyword = ref('')
--
Gitblit v1.9.3