From 93fdf10cf1cb4caacc4fcbbf01a9a94757289639 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Fri, 23 Jan 2026 14:46:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
uniapps/work-app/src/pages/login/index.vue | 29 ++++-------------------------
uniapps/work-app/src/pages/voiceCall/index.vue | 6 +++---
uniapps/work-app/src/subPackages/workDetail/index.vue | 12 +++++++-----
3 files changed, 14 insertions(+), 33 deletions(-)
diff --git a/uniapps/work-app/src/pages/login/index.vue b/uniapps/work-app/src/pages/login/index.vue
index b4b4a41..94a7f89 100644
--- a/uniapps/work-app/src/pages/login/index.vue
+++ b/uniapps/work-app/src/pages/login/index.vue
@@ -31,13 +31,6 @@
</div>
<button class="login-btn" :style="[inputStyle]" @tap="submit">登录</button>
- <button class="login-btn" :style="[inputStyle]" @tap="submit1">登录1</button>
- <!-- <view class="agreement">
- <label>
- <checkbox :checked="agreed" @click="agreed = !agreed" />
- 同意《用户协议》与《隐私政策》
- </label>
- </view> -->
</view>
</template>
@@ -92,11 +85,7 @@
username: "admin",
password: "admin",
});
-function submit1() {
- gdLogin();
-}
async function submit() {
- // 调用工单登录接口
if (!loginForm.value.username.trim()) {
uni.showToast({
@@ -163,7 +152,8 @@
console.error('处理位置服务失败:', error);
}
-
+ // 调用工单登录接口
+ await gdLogin()
uni.reLaunch({
url: "/pages/work/index",
@@ -227,7 +217,6 @@
// 从本地存储加载记住的密码
onMounted(() => {
const savedUserInfo = uni.getStorageSync("rememberedUser");
- console.log("记住密码", savedUserInfo);
if (savedUserInfo) {
loginForm.value.username = savedUserInfo.username;
loginForm.value.password = savedUserInfo.password;
@@ -370,10 +359,10 @@
background: #1d6fe9;
color: white;
width: 670rpx;
- height: 100rpx;
+ height: 76rpx;
border-radius: 8rpx 8rpx 8rpx 8rpx;
margin-top: 184rpx;
- font-size: 36rpx;
+ font-size: 28rpx;
font-weight: 400;
font-family: Source Han Sans CN, Source Han Sans CN;
&::after {
@@ -418,16 +407,6 @@
.link {
color: $u-warning;
}
-}
-.agreement {
- position: absolute;
- bottom: 40rpx;
- left: 0;
- right: 0;
- display: flex;
- justify-content: center;
- align-items: center;
- text-align: center;
}
.forgotPassword {
font-family: PingFang SC, PingFang SC;
diff --git a/uniapps/work-app/src/pages/voiceCall/index.vue b/uniapps/work-app/src/pages/voiceCall/index.vue
index b018ccc..80a3506 100644
--- a/uniapps/work-app/src/pages/voiceCall/index.vue
+++ b/uniapps/work-app/src/pages/voiceCall/index.vue
@@ -151,7 +151,7 @@
}
.searchBar {
- padding: 20rpx;
+ padding: 20rpx 20rpx 0 20rpx;
display: flex;
align-items: center;
height: 108rpx;
@@ -166,7 +166,7 @@
}
.contactList {
- margin: 0 24rpx;
+ margin: 0 20rpx 20rpx 20rpx;
background: #fff;
border-radius: 12rpx;
overflow-y: auto;
@@ -178,7 +178,7 @@
.contactItem {
display: flex;
align-items: center;
- padding: 0 24rpx;
+ padding: 0 20rpx;
}
diff --git a/uniapps/work-app/src/subPackages/workDetail/index.vue b/uniapps/work-app/src/subPackages/workDetail/index.vue
index 102ea91..035f5c9 100644
--- a/uniapps/work-app/src/subPackages/workDetail/index.vue
+++ b/uniapps/work-app/src/subPackages/workDetail/index.vue
@@ -4,7 +4,7 @@
<!-- 自定义导航栏 -->
<u-navbar title="工单详情" :is-back="true" back-text="" :back-icon-size="40" @left-click="onBackClick">
<template #right>
- <div class="share-btn" @click="onShareClick"><img src="@/static/images/work/share.svg" alt=""></div>
+ <div class="share-btn" @click="onShareClick"></div>
</template>
</u-navbar>
<div class="detailTop">
@@ -296,10 +296,12 @@
padding-top: 88rpx;
// 分享按钮样式
.share-btn {
- img {
- width: 40rpx;
- height: 40rpx;
- }
+ width: 40rpx;
+ height: 40rpx;
+ background-image: url('/static/images/work/share.svg');
+ background-size: contain;
+ background-repeat: no-repeat;
+ background-position: center;
}
.detailTop {
.image-container {
--
Gitblit v1.9.3