zhouyanli/property-manager-side
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://gitea.bugtc.com/zhouyanli/property-manager-side

Browse Source
This commit is contained in:
Zy
2026-06-23 08:12:30 +08:00
parent ce2f31d74c 1b2dd8d2f2
commit 6e0f0eda6f
7 changed files with 224 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

157
wuye-manager-uniapp/components/privacy-popup/privacy-popup.vue Normal file
View File

@@ -0,0 +1,157 @@
<template>
<view class="privacy-mask" v-if="show" @click="handleMaskClick">
<view class="privacy-popup" @click.stop>
<view class="popup-header">
<text class="popup-title">请先阅读并同意协议</text>
<view class="popup-close" @click="handleClose">✕</view>
</view>
<scroll-view class="popup-body" scroll-y>
<view class="popup-content">
<view class="section-text">
我已仔细阅读并同意
<text class="privacy-link" @click="goToPrivacy">《用户协议》和《隐私政策》</text>
全部内容。
</view>
</view>
</scroll-view>
<view class="popup-footer">
<button class="popup-btn disagree-btn" @click="handleDisagree">不同意</button>
<button class="popup-btn agree-btn" @click="handleAgree">同意</button>
</view>
</view>
</view>
</template>
<script setup>
defineProps({
show: {
type: Boolean,
default: false
}
})
const emit = defineEmits(['agree', 'disagree', 'close', 'update:show'])
const handleAgree = () => {
emit('agree')
}
const handleDisagree = () => {
emit('disagree')
}
const handleClose = () => {
emit('close')
emit('update:show', false)
}
const handleMaskClick = () => {
emit('close')
emit('update:show', false)
}
const goToPrivacy = () => {
uni.navigateTo({ url: '/pageSubPack/loginSub/privacy' })
}
</script>
<style scoped>
.privacy-mask {
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
background: rgba(0, 0, 0, 0.5);
z-index: 9999;
display: flex;
align-items: center;
justify-content: center;
}
.privacy-popup {
width: 640rpx;
max-height: 80vh;
background: #fff;
border-radius: 16rpx;
display: flex;
flex-direction: column;
overflow: hidden;
}
.popup-header {
display: flex;
align-items: center;
justify-content: space-between;
padding: 28rpx 30rpx 16rpx;
border-bottom: 1rpx solid #eee;
}
.popup-title {
font-size: 32rpx;
font-weight: 600;
color: #333;
}
.popup-close {
width: 48rpx;
height: 48rpx;
display: flex;
align-items: center;
justify-content: center;
font-size: 28rpx;
color: #999;
border-radius: 50%;
background: #f5f5f5;
}
.popup-body {
flex: 1;
padding: 24rpx 30rpx;
max-height: 50vh;
box-sizing: border-box;
}
.popup-content .section-text {
font-size: 26rpx;
line-height: 1.8;
color: #666;
text-align: justify;
}
.privacy-link {
color: #007aff;
}
.popup-footer {
display: flex;
padding: 20rpx 30rpx 30rpx;
gap: 20rpx;
border-top: 1rpx solid #eee;
}
.popup-btn {
flex: 1;
height: 80rpx;
line-height: 80rpx;
border-radius: 8rpx;
font-size: 28rpx;
border: none;
padding: 0;
margin: 0;
}
.popup-btn::after {
border: none;
}
.disagree-btn {
background: #f5f5f5;
color: #666;
}
.agree-btn {
background: #007aff;
color: #fff;
}
</style>

5
wuye-manager-uniapp/manifest.json
View File

@@ -1,6 +1,6 @@
{
"name" : "花开管家",
"appid" : "__UNI__29C3D60",
"appid" : "__UNI__5F224F3",
"description" : "智慧社区管家端，专为小区物业管理人员打造，支持多小区灵活切换管理。集成账号密码、手机号密码双重登录模式，内置忘记密码找回功能，保障账号安全。涵盖消息通知、日常巡检、故障报修、一键开门、工单流转、投诉处理等核心办公功能，物业人员可在线完成巡检打卡、问题上报、工单派发跟进、投诉对接处理等日常工作，同时支持查看个人上报记录、巡检历史，便捷修改账号信息与登录密码。高效简化社区物业办公流程，提升小区服务与管理效率，打造便捷智能的社区管理服务平台。",
"versionName" : "1.0.0",
"versionCode" : "100",
@@ -60,8 +60,7 @@
"push" : {
"unipush" : {
"version" : "2",
"offline" : true,
"hms" : {},
"offline" : false,
"oppo" : {},
"vivo" : {},
"mi" : {},

37
wuye-manager-uniapp/pageSubPack/loginSub/login.vue
View File

@@ -67,10 +67,14 @@
<uni-icons type="checkbox" size="24" color="#999" v-else></uni-icons>
</view>
<text class="agreement-text" @click.stop="goToPrivacy"
<!-- <text class="agreement-text" @click.stop="goToPrivacy"
>我已阅读并同意
<text class="agreePrivacy">《用户隐私政策》</text>
</text>
</text> -->
<text class="agreement-text" >我已阅读并同意
<text class="agreePrivacy" @click.stop="">《用户协议》</text>和
<text class="agreePrivacy" @click.stop="goToPrivacy">《隐私政策》</text>
</text>
</view>
<!-- 登录按钮 -->
@@ -81,12 +85,16 @@
<navigator class="link-item" url="/pageSubPack/loginSub/pwd-login">账号密码登录</navigator>
<!-- <navigator class="link-item" url="/pageSubPack/loginSub/register-new-user">注册新用户</navigator> -->
</view>
<!-- 隐私协议弹窗 -->
<privacy-popup v-model:show="showPrivacyPopup" @agree="agreePrivacy" @disagree="disagreePrivacy" />
</view>
</template>
<script setup>
import { ref, computed, onUnmounted } from 'vue'
import { getLoginBySms, getSendCode } from '../../api/api.js'
import PrivacyPopup from '@/components/privacy-popup/privacy-popup.vue'
// ========== 响应式数据 ==========
// 手机号
@@ -96,6 +104,7 @@ const verifyCode = ref('')
const placeholderStyle = ref('font-size:24rpx')
// 是否同意协议
const agreeAgreement = ref(false) // 默认勾选
const showPrivacyPopup = ref(false)
// 倒计时（秒）
const countDown = ref(0)
// 定时器
@@ -130,13 +139,16 @@ const checkForm = () => {
const toggleAgreement = () => {
agreeAgreement.value = !agreeAgreement.value
}
// 跳转隐私协议
// 打开隐私协议弹窗
const goToPrivacy = () => {
// 点击变色
// isClicked.value = true
uni.navigateTo({
url: '/pageSubPack/loginSub/privacy'
})
showPrivacyPopup.value = true
}
// 不同意隐私协议
const disagreePrivacy = () => {
agreeAgreement.value = false
showPrivacyPopup.value = false
}
// 获取验证码
@@ -201,7 +213,7 @@ const handleLogin = () => {
return
}
if (!agreeAgreement.value) {
uni.showToast({ title: '请勾选协议', icon: 'none' })
showPrivacyPopup.value = true
return
}
uni.showLoading({
@@ -260,6 +272,13 @@ const handleLogin = () => {
})
}
// 同意隐私协议（弹窗中点击同意 → 直接登录）
const agreePrivacy = () => {
agreeAgreement.value = true
showPrivacyPopup.value = false
handleLogin()
}
// ========== 生命周期 ==========
// 页面卸载时清除定时器
onUnmounted(() => {

41
wuye-manager-uniapp/pageSubPack/loginSub/pwd-login.vue
View File

@@ -45,9 +45,10 @@
<uni-icons type="checkbox-filled" size="24" color="#4D5DFA" v-if="agreeAgreement"></uni-icons>
<uni-icons type="checkbox" size="24" color="#999" v-else></uni-icons>
</view>
<text class="agreement-text" @click.stop="goToPrivacy">我已阅读并同意
<text class="agreePrivacy">《用户隐私政策》</text>
</text>
<text class="agreement-text" >我已阅读并同意
<text class="agreePrivacy" @click.stop="">《用户协议》</text>和
<text class="agreePrivacy" @click.stop="goToPrivacy">《隐私政策》</text>
</text>
</view>
<navigator class="forget-pwd" url="/pageSubPack/loginSub/forget-pwd">忘记密码？</navigator>
</view>
@@ -63,6 +64,8 @@
<!-- <navigator class="link-item" url="/pageSubPack/loginSub/register-new-user">注册新用户</navigator> -->
</view>
</view>
<!-- 隐私协议弹窗 -->
<privacy-popup v-model:show="showPrivacyPopup" @agree="agreePrivacy" @disagree="disagreePrivacy" @close="showPrivacyPopup = false" />
</template>
<script setup>
@@ -76,6 +79,7 @@
import {
getLoginPassword
} from '../../api/api.js'
import PrivacyPopup from '@/components/privacy-popup/privacy-popup.vue'
// 响应式数据
const phoneNumber = ref('');
@@ -83,8 +87,7 @@
const agreeAgreement = ref(false); // 默认勾选
const rememberPwd = ref(false);
const placeholderStyle = ref('font-size:24rpx')
// 控制点击变色
// const isClicked = ref(false)
const showPrivacyPopup = ref(false)
// 计算属性：是否可登录（帐号+密码+协议都满足）
const canLogin = computed(() => {
@@ -101,13 +104,16 @@
const toggleRemember = () => {
rememberPwd.value = !rememberPwd.value;
};
// 跳转隐私协议
// 打开隐私协议弹窗
const goToPrivacy = () => {
showPrivacyPopup.value = true
}
// isClicked.value = true
uni.navigateTo({
url:'/pageSubPack/loginSub/privacy',
})
// 不同意隐私协议
const disagreePrivacy = () => {
agreeAgreement.value = false
showPrivacyPopup.value = false
}
// 检查表单
@@ -146,7 +152,7 @@
return;
}
if(!agreeAgreement.value){
uni.showToast({ title: '请勾选协议', icon: 'none' });
showPrivacyPopup.value = true;
return;
}
uni.showLoading({ title: '登录中...', mask: true });
@@ -198,6 +204,13 @@
};
// 同意隐私协议（弹窗中点击同意 → 直接登录）
const agreePrivacy = () => {
agreeAgreement.value = true
showPrivacyPopup.value = false
handleLogin()
}
</script>
<style scoped>
@@ -292,12 +305,15 @@
.agreement-item {
display: flex;
align-items: center;
flex: 1;
min-width: 0;
}
.agreement-text {
font-size: 24rpx;
color: #666;
margin-left: 10rpx;
line-height: 1.5;
}
.agreePrivacy{
color: #4D5DFA;
@@ -310,6 +326,9 @@
font-size: 24rpx;
color: #666;
text-decoration: none;
flex-shrink: 0;
margin-left: 16rpx;
line-height: 1.5;
}
.login-btn {

4
wuye-manager-uniapp/pageSubPack/notice-list/notice-list.vue
View File

@@ -172,6 +172,10 @@ onShow(() => {
border-radius: 8rpx;
padding: 20rpx;
margin-bottom: 20rpx;
word-break: break-all;
/* 按高度截断，避免 line-clamp 导致文字重叠 */
max-height: 160rpx;
overflow: hidden;
.content-text {
font-size: 28rpx;
color: #333;

3
wuye-manager-uniapp/pages/index/index.vue
View File

@@ -312,8 +312,7 @@ const getNoticeData = () => {
}
// 获取bannar图
function getbannarData() {
getBannarList()
.then(res => {
getBannarList().then(res => {
if (res.code === 200 && res.data) {
// 只有数据真正变化时才更新，避免 swiper 重新渲染导致闪动
const newData = res.data

4
wuye-manager-uniapp/pages/my/my.vue
View File

@@ -4,7 +4,7 @@
<uni-nav-bar title="我的" backgroundColor="transparent" :border="false" />
<scroll-view class="page" scroll-y>
<view class="user-card">
<image :src="avatar || defaultAvatar" class="avatar" />
<image src="https://wuyeadmin.bugtc.com/images/logo-app.png" class="avatar" />
<view class="user-info">
<text class="user-name">{{ loginName }}</text>
<text class="user-phone">{{ phoneNum }}</text>
@@ -31,7 +31,7 @@ import { ref } from 'vue'
import { onShow } from '@dcloudio/uni-app'
import { getSettingInfo } from '../../api/api.js'
const defaultAvatar = 'https://wuyeadmin.bugtc.com/images/imgs/default-avatar.png'
// const defaultAvatar = 'https://wuyeadmin.bugtc.com/images/imgs/default-avatar.png'
const list = ref([
{ icon: 'https://wuyeadmin.bugtc.com/images/imgs/shangbao.png', title: '上报记录' },