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

解决冲突

Browse Source
This commit is contained in:
zhouyanli
2026-04-29 09:36:44 +08:00
parent df58b7cf41
commit e0ff09374c
2 changed files with 360 additions and 653 deletions
Download Patch File Download Diff File Expand all files Collapse all files

194
wuye-manager-uniapp/pages.json
View File

@@ -1,192 +1,4 @@
{ {
<<<<<<< HEAD
"pages": [
{
"path": "pages/guide/guide",
"style": {
"navigationBarTitleText": "引导页",
"navigationStyle": "custom"
}
},
{
"path": "pages/index/index",
"style": {
"navigationBarTitleText": "工作台",
"navigationStyle": "custom"
}
},
{
"path": "pages/my/my",
"style": {
"navigationBarTitleText": "我的",
"navigationStyle": "custom"
}
}
],
"subPackages": [
{
"root": "pageSubPack/loginSub",
"pages": [
{
"path": "pwd-login",
"style": {
"navigationBarTitleText": "账号登录",
"navigationStyle": "custom"
}
},
{
"path": "login",
"style": {
"navigationBarTitleText": "手机号登录",
"navigationStyle": "custom"
}
},
{
"path": "privacy",
"style": {
"navigationBarTitleText": "用户隐私政策"
}
},
{
"path": "register-new-user",
"style": {
"navigationBarTitleText": "注册新用户",
"navigationStyle": "custom"
}
},
{
"path": "forget-pwd",
"style": {
"navigationBarTitleText": "忘记密码",
"navigationStyle": "custom"
}
},
{
"path": "change-pwd",
"style": {
"navigationBarTitleText": "修改密码",
"navigationStyle": "custom"
}
}
]
},
{
"root": "pageSubPack/notice-list",
"pages": [
{
"path": "select-community",
"style": {
"navigationBarTitleText": "选择小区"
}
},
{
"path": "notice-list",
"style": {
"navigationBarTitleText": "通知公告"
}
},
{
"path": "noticeListDetails",
"style": {
"navigationBarTitleText": "公告详情"
}
}
]
},
{
"root": "pageSubPack/oneClickOpen",
"pages": [
{
"path": "oneClickOpen",
"style": {
"navigationBarTitleText": "一键开门",
"navigationStyle": "custom"
}
}
]
},
{
"root": "pageSubPack/report-record",
"pages": [
{
"path": "report-record",
"style": {
"navigationBarTitleText": "填写维修信息"
}
},
{
"path": "repairSelect",
"style": {
"navigationBarTitleText": "维修项目"
}
}
]
},
{
"root": "pageSubPack/setting",
"pages": [
{
"path": "setting",
"style": {
"navigationBarTitleText": "设置",
"navigationStyle": "custom"
}
},
{
"path": "change-phone",
"style": {
"navigationBarTitleText": "更改手机号码"
}
},
{
"path": "change -password",
"style": {
"navigationBarTitleText": "修改密码"
}
}
]
}
],
"easycom": {
"autoscan": true,
"custom": {
"^uni-(.*)": "@/components/uni-$1.vue"
}
},
"tabBar": {
"color": "#333333",
"backgroundColor": "#F5F6F6",
"borderStyle": "white",
"selectedColor": "#666666",
"list": [
{
"pagePath": "pages/index/index",
"iconPath": "/static/imgs/index.png",
"selectedIconPath": "/static/imgs/index-lan.png",
"text": "工作台"
},
{
"pagePath": "pages/my/my",
"iconPath": "/static/imgs/my.png",
"selectedIconPath": "/static/imgs/my-lan.png",
"text": "我的"
}
]
},
"globalStyle": {
"navigationBarTextStyle": "black",
"navigationBarTitleText": "uni-app",
"navigationBarBackgroundColor": "#F8F8F8",
"backgroundColor": "#F8F8F8"
},
"uniIdRouter": {}
"pages": [{ "pages": [{
"path": "pages/guide/guide", "path": "pages/guide/guide",
"style": { "style": {
@@ -349,12 +161,6 @@
"^uni-(.*)": "@/components/uni-$1.vue" "^uni-(.*)": "@/components/uni-$1.vue"
} }
}, },
"condition": {
"list": [{
"name": "巡检记录",
"path": "pageSubPack/inspection/inspection_record"
}]
},
"tabBar": { "tabBar": {
"color": "#333333", "color": "#333333",
"backgroundColor": "#F5F6F6", "backgroundColor": "#F5F6F6",

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

@@ -26,15 +26,11 @@
</view> </view>
</view> </view>
</view> </view>
</view>
<!-- banner --> <!-- banner -->
<view class="bannarClass"> <view class="bannarClass">
<uni-swiper-dot class="uni-swiper-dot-box" @clickItem=clickItem :info="bannerList" :current="current" :mode="mode"> <uni-swiper-dot class="uni-swiper-dot-box" @clickItem="clickItem" :info="bannerList" :current="current" mode="round">
<swiper class="swiper-box" :current="swiperDotIndex" :autoplay="true"> <swiper class="swiper-box" :current="current" autoplay>
<swiper-item v-for="(item, index) in bannerList" :key="index"> <swiper-item v-for="(item, index) in bannerList" :key="index">
<view class="swiper-item"> <view class="swiper-item">
<image :src="item.img" style="width: 100%;height: 100%;"></image> <image :src="item.img" style="width: 100%;height: 100%;"></image>
@@ -43,82 +39,7 @@
</swiper> </swiper>
</uni-swiper-dot> </uni-swiper-dot>
</view> </view>
<!-- 巡检 -->
<view class="inspectionClass">
<!-- 消息通知栏 -->
<view class="noticeClass">
<!-- 左侧消息通知文字 -->
<view class="notice-left">
<image src="/static/imgs/notice.png" class="notice-icon"></image>
</view>
<!-- 右侧滚动公告 -->
<view class="notice-right" @click="getNoticeMore">
<uni-notice-bar :text="noticeText" type="line" :showIcon="false" show-get-more scrollable color="#fff"
background-color="transparent" moreColor="#fff" no-border>
</uni-notice-bar>
</view>
</view>
<!-- 巡检数据统计区 -->
<view class="statistics-wrap">
<view class="statistics-item">
<text class="num">25</text>
<text class="label">巡检点</text>
</view>
<view class="statistics-item">
<text class="num">5</text>
<text class="label">巡检点</text>
</view>
<view class="statistics-item">
<text class="num">25</text>
<text class="label">巡检点</text>
</view>
</view>
</view>
<!-- 网格布局功能 -->
<view class="function-container">
<!-- 第一行功能：故障上报、一键开门、工单大厅、我的工单 -->
<view class="function-row">
<view class="function-item" @click="goToReport">
<image class="item-icon" src="/static/imgs/fault-report.png" mode="aspectFit"></image>
<text class="item-text">故障上报</text>
</view>
<view class="function-item" @click="goToOneOpenDoor">
<image class="item-icon" src="/static/imgs/open.png" mode="aspectFit"></image>
<text class="item-text">一键开门</text>
</view>
<view class="function-item">
<image class="item-icon" src="/static/imgs/work-order.png" mode="aspectFit"></image>
<text class="item-text">工单大厅</text>
</view>
<view class="function-item">
<image class="item-icon" src="/static/imgs/my-work.png" mode="aspectFit"></image>
<text class="item-text">我的工单</text>
</view>
</view>
<!-- 2 -->
<view class="function-row" style="margin-top: 2px;">
<view class="function-item">
<image class="item-icon" src="/static/imgs/complaint.png" mode="aspectFit"></image>
<text class="item-text">投诉处理</text>
</view>
</view>
</view>
<!-- banner -->
<view class="bannarClass">
<uni-swiper-dot class="uni-swiper-dot-box" @clickItem="clickItem" :info="bannerList" :current="current"
:mode="mode">
<swiper class="swiper-box" :current="swiperDotIndex" :autoplay="true">
<swiper-item v-for="(item, index) in bannerList" :key="index">
<view class="swiper-item">
<image :src="item.img" style="width: 100%; height: 100%"></image>
</view>
</swiper-item>
</swiper>
</uni-swiper-dot>
</view>
<!-- 巡检 --> <!-- 巡检 -->
<view class="inspectionClass"> <view class="inspectionClass">
<!-- 消息通知栏 --> <!-- 消息通知栏 -->
@@ -151,6 +72,7 @@
</view> </view>
</view> </view>
</view> </view>
<!-- 网格布局功能 --> <!-- 网格布局功能 -->
<view class="function-container"> <view class="function-container">
<!-- 第一行功能：故障上报、一键开门、工单大厅、我的工单 --> <!-- 第一行功能：故障上报、一键开门、工单大厅、我的工单 -->
@@ -172,7 +94,7 @@
<text class="item-text">我的工单</text> <text class="item-text">我的工单</text>
</view> </view>
</view> </view>
<!-- 2 --> <!-- 第二行 -->
<view class="function-row" style="margin-top: 2px"> <view class="function-row" style="margin-top: 2px">
<view class="function-item"> <view class="function-item">
<image class="item-icon" src="/static/imgs/complaint.png" mode="aspectFit"></image> <image class="item-icon" src="/static/imgs/complaint.png" mode="aspectFit"></image>
@@ -180,27 +102,18 @@
</view> </view>
</view> </view>
</view> </view>
</view>
</template> </template>
<script setup> <script setup>
import { import { ref } from 'vue'
ref import { onLoad, onUnload } from '@dcloudio/uni-app'
} from 'vue'
import {
onLoad,
onUnload
} from '@dcloudio/uni-app'
// 列表数据状态 // 列表数据状态
const current = ref(0) const current = ref(0)
const currentCommunity = ref('碧桂园小区') const currentCommunity = ref('碧桂园小区')
const bannerList = ref([{ const bannerList = ref([
img: '/static/imgs/banner1.png' { img: '/static/imgs/banner1.png' },
},
{
img: '/static/bannar2.png'
}
]) ])
const noticeText = ref('公告公告本小区今天安装了摄像头') const noticeText = ref('公告公告本小区今天安装了摄像头')
@@ -223,7 +136,6 @@
url: '/pageSubPack/oneClickOpen/oneClickOpen' url: '/pageSubPack/oneClickOpen/oneClickOpen'
}) })
} }
// 跳转到 今日巡检 // 跳转到 今日巡检
const goToDaysInspection = () => { const goToDaysInspection = () => {
uni.navigateTo({ uni.navigateTo({
@@ -236,7 +148,6 @@
url: '/pageSubPack/inspection/inspection_record' url: '/pageSubPack/inspection/inspection_record'
}) })
} }
// 故障上报 // 故障上报
const goToReport = () => { const goToReport = () => {
uni.navigateTo({ uni.navigateTo({
@@ -245,36 +156,33 @@
} }
// 接收选择小区返回的参数 // 接收选择小区返回的参数
const slelctHomeData = (data) => { const slelctHomeData = (data) => {
// console.log('收到B页面返回的数据：', data)
currentCommunity.value = data.name currentCommunity.value = data.name
} }
onLoad(() => { onLoad(() => {
// 绑定全局事件监听
uni.$on('confirm', slelctHomeData) uni.$on('confirm', slelctHomeData)
}) })
// 页面销毁时移除监听（防止内存泄漏）
onUnload(() => { onUnload(() => {
uni.$off('confirm', slelctHomeData) uni.$off('confirm', slelctHomeData)
}) })
const clickItem = (index) => {
current.value = index
}
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.content-class { .content-class {
// margin: 0 20rpx;
// padding: 2rpx;
background-color: #f9f9f9; background-color: #f9f9f9;
padding-bottom: 100rpx; padding-bottom: 100rpx;
box-sizing: border-box; box-sizing: border-box;
/* 保证padding不会撑大容器 */
min-height: 110vh; min-height: 110vh;
overflow-y: auto; overflow-y: auto;
.nar-top { .nar-top {
height: 400rpx; height: 400rpx;
width: 100%; width: 100%;
// background-color: #C0E4FB;
background: repeating-linear-gradient(to right, #edf4fa, #c0e4fb); background: repeating-linear-gradient(to right, #edf4fa, #c0e4fb);
position: absolute; position: absolute;
} }
@@ -302,7 +210,6 @@
justify-content: space-between; justify-content: space-between;
padding: 4rpx 30rpx; padding: 4rpx 30rpx;
box-sizing: border-box; box-sizing: border-box;
// border-bottom: 1rpx solid #f0f0f0;
position: absolute; position: absolute;
top: 85px; top: 85px;
left: 0; left: 0;
@@ -376,7 +283,6 @@
top: 107px; top: 107px;
left: 0; left: 0;
margin: 0 40rpx; margin: 0 40rpx;
// height: 236rpx;
background: linear-gradient(to right, #7b87fa, #4d5dfa); background: linear-gradient(to right, #7b87fa, #4d5dfa);
border-radius: 25rpx; border-radius: 25rpx;
box-sizing: border-box; box-sizing: border-box;
@@ -407,11 +313,11 @@
// 右侧公告滚动区 // 右侧公告滚动区
.notice-right { .notice-right {
flex: 1; // 占满剩余宽度 flex: 1;
} }
// 深度修改uni-notice-bar样式 // 深度修改uni-notice-bar样式
::v-deep .uni-noticebar { :deep(.uni-noticebar) {
background-color: transparent !important; background-color: transparent !important;
height: 100% !important; height: 100% !important;
line-height: 80rpx !important; line-height: 80rpx !important;
@@ -420,23 +326,23 @@
} }
// 公告文字样式 // 公告文字样式
::v-deep .uni-noticebar__content { :deep(.uni-noticebar__content) {
font-size: 26rpx !important; font-size: 26rpx !important;
color: #fff !important; color: #fff !important;
padding: 0 !important; padding: 0 !important;
} }
// 右侧箭头按钮 // 右侧箭头按钮
::v-deep .uni-noticebar__more { :deep(.uni-noticebar__more) {
color: #fff !important; color: #fff !important;
font-size: 24rpx !important; font-size: 24rpx !important;
padding: 0 0 0 10rpx !important; padding: 0 0 0 10rpx !important;
} }
// 隐藏默认滚动动画的多余样式 // 隐藏默认滚动动画的多余样式
::v-deep .uni-noticebar__content-wrapper--scrollable { :deep(.uni-noticebar__content-wrapper--scrollable) {
left: 0 !important; left: 0 !important;
width: calc(100% - 30rpx) !important; // 给箭头留空间 width: calc(100% - 30rpx) !important;
} }
// 统计区布局 // 统计区布局
@@ -494,13 +400,8 @@
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
width: 25%; // 一行4个，每个占25% width: 25%;
padding: 10rpx 0; padding: 10rpx 0;
// 第二行只有1个，单独调整宽度
.function-row:nth-child(2) & {
width: 25%; // 和第一行图标宽度保持一致
}
} }
// 功能图标样式 // 功能图标样式