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

2026-08-20 09:31:38 +08:00
parent ab868f8180 62437fec8c
commit 0f01fce041
8 changed files with 261 additions and 140 deletions
--- a/wuye-manager-uniapp/pageSubPack/fault-reporting/fault-reporting.vue
+++ b/wuye-manager-uniapp/pageSubPack/fault-reporting/fault-reporting.vue
@@ -2,7 +2,9 @@
  <view class="form-container">
    <!-- 维修项目展示 -->
    <view class="form-item">
-      <text class="label">维修项目</text>
+      <view class="label">
+        	<text class="required">*</text>维修项目
+      </view>
      <view class="value" @click="goBackSelect">
        <view>
          <text v-if="!repairProject">请选择项目</text>
@@ -14,34 +16,43 @@

    <!-- 标题输入 -->
    <view class="form-item">
-      <text class="label">标题</text>
-      <!-- <input type="text" placeholder="请输入问题标题" v-model="form.title" /> -->
+        <text class="label">标题</text>
      <uni-easyinput
        v-model="form.title"
-        placeholder="请输入内容"
+        placeholder="请输入标题(最多30字符)"
        :inputBorder="false"
+        maxlength="30"
      ></uni-easyinput>
    </view>

    <!-- 问题描述 -->
    <view class="form-item-wenti">
-      <text class="label">问题描述</text>
-      <!-- <textarea placeholder="请输入问题内容" v-model="form.desc" rows="5" ></textarea> -->
-      <uni-easyinput
+      <!-- <text class="label">问题描述</text> -->
+      <view class="label">
+        	<text class="required">*</text>问题描述
+      </view>
+      <view class="textarea-wrap">
+      	<textarea v-model="form.desc" placeholder="请描述你的问题（最多200字）" maxlength="200" class="desc-textarea" />
+      	<text class="char-count">{{ form.desc.length }}/200</text>
+      </view>
+ <!--     <uni-easyinput
        v-model="form.desc"
        placeholder="请描述你的问题"
        type="textarea"
-      ></uni-easyinput>
+      ></uni-easyinput> -->
    </view>

    <!-- 手机号 -->
    <view class="form-item">
-      <text class="label">手机号</text>
+      <view class="label">
+          <text class="required">*</text>手机号
+      </view>
      <uni-easyinput
        type="number"
        v-model="form.phone"
        placeholder="请输入手机号"
        :inputBorder="false"
+        maxlength="11"
      ></uni-easyinput>
    </view>

@@ -60,7 +71,7 @@
          <!-- <uni-icons type="close" size="16" @click="deleteImage(index)"></uni-icons> -->
        </view>
        <!-- 上传按钮 -->
-        <view class="upload-btn" @click="chooseImage" v-if="form.images.length < 3">
+        <view class="upload-btn" @click="chooseImage" v-if="form.images.length < 9">
          <uni-icons type="plusempty" size="24"></uni-icons>
          <!-- <text>上传照片</text> -->
        </view>
@@ -69,6 +80,9 @@

    <!-- 提交按钮 -->
    <button class="submit-btn" @click="submitForm">提交</button>
+
+    <!-- 提交时遮罩，禁止页面点击 -->
+    <view class="submit-mask" v-if="submitting"></view>
  </view>
 </template>

@@ -90,6 +104,9 @@ const form = ref({
  images: [] // 图片列表
 })

+// 防止重复点击
+const submitting = ref(false)
+

 // ==========方法========
 // 页面加载
@@ -122,10 +139,10 @@ const goBackSelect = () => {
 // 选择图片
 const chooseImage = () => {
  // 计算还能选几张
-  const remainCount = 3 - form.value.images.length
+  const remainCount = 9 - form.value.images.length
  if (remainCount <= 0) {
    uni.showToast({
-      title: '最多只能上传3张图片',
+      title: '最多只能上传9张图片',
      icon: 'none'
    })
    return
@@ -171,15 +188,13 @@ const deleteImage = index => {

 // 表单提交
 const submitForm = async () => {
+  // 防止重复提交
+  if (submitting.value) return
  // 表单校验
  if (!repairProject.value) {
    uni.showToast({ title: '请选择维修项目', icon: 'none' })
    return
  }
-  if (!form.value.title) {
-    uni.showToast({ title: '请输入问题标题', icon: 'none' })
-    return
-  }
  if (!form.value.desc) {
    uni.showToast({ title: '请输入问题描述', icon: 'none' })
    return
@@ -189,6 +204,7 @@ const submitForm = async () => {
    return
  }
  // 提交数据
+  submitting.value = true
  uni.showLoading({ title: '提交中...' ,mask:true})
  try {
    // 先上传图片
@@ -219,6 +235,7 @@ const submitForm = async () => {
  } catch (e) {
    uni.showToast({ title:  e.msg || '网络异常', icon: 'none' })
  } finally {
+    submitting.value = false
    uni.hideLoading()
  }

@@ -244,11 +261,15 @@ const submitForm = async () => {
  border-bottom: 1px solid #eee;
 }
 .label {
-  width: 140rpx;
+  width: 180rpx;
  font-size: 28rpx;
  color: #333;
  line-height: 80rpx;
 }
+.required {
+	color: red;
+	margin-right: 4rpx;
+}

 .value {
  flex: 1;
@@ -259,6 +280,27 @@ const submitForm = async () => {
  display: flex;
  justify-content: space-between;
 }
+.textarea-wrap {
+  flex: 1;
+  position: relative;
+}
+.desc-textarea {
+  width: 100%;
+  height: 160rpx;
+  font-size: 28rpx;
+  padding: 10rpx 0;
+  box-sizing: border-box;
+  border: 1px solid #eee;
+  border-radius: 4px;
+  padding: 5px;
+}
+.char-count {
+  position: absolute;
+  right: 10rpx;
+  bottom: 10rpx;
+  font-size: 24rpx;
+  color: #999;
+}
 .input,
 .textarea {
  font-size: 14px;
@@ -318,4 +360,12 @@ const submitForm = async () => {
  line-height: 44px;
  font-size: 16px;
 }
+.submit-mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 9999;
+}
 </style>
--- a/wuye-manager-uniapp/pageSubPack/instrument/revenue_statistics.vue
+++ b/wuye-manager-uniapp/pageSubPack/instrument/revenue_statistics.vue
@@ -1,11 +1,5 @@
 <template>
    <view class="page_padding">
-        <!-- 状态栏 -->
-        <view class="status-bar" :style="{ height: statusBarHeight + 'px' }"></view>
-
-        <!-- 导航栏 -->
-        <uni-nav-bar title="实收统计" backgroundColor="transparent" :border="false" left-icon="left" @click-left="goBack" />
-
        <!-- 筛选条件 -->
        <view class="filter-section">
            <view class="filter-row">
@@ -53,7 +47,14 @@
        </view>

        <!-- 统计表格列表 -->
-        <scroll-view class="table-scroll" scroll-y show-scrollbar="false">
+        <scroll-view
+            class="table-scroll"
+            scroll-y
+            show-scrollbar="false"
+            refresher-enabled
+            :refresher-triggered="refresherTriggered"
+            @refresherrefresh="onPullRefresh"
+        >
            <!-- 循环渲染每个表格 -->
            <view v-for="(table, index) in tableConfigs" :key="index" class="table-wrapper">
                <!-- 标题独立于卡片外 -->
@@ -102,9 +103,6 @@
    import { onShow } from '@dcloudio/uni-app'
    import { getVillageList,getFeeTypes,getTableList} from '../../api/api.js'

-    // ============ 系统信息 ============
-    const statusBarHeight = ref(uni.getSystemInfoSync().statusBarHeight || 0)
-
    // ============ 筛选数据 ============
    // 项目选项（从接口获取）
    const projectOptions = ref([])
@@ -119,6 +117,9 @@
    // 日期范围
    const datetimerange = ref([])

+    // 下拉刷新触发状态
+    const refresherTriggered = ref(false)
+
    // ============ 表格数据 ============
    const tableConfigs = reactive([
        {
@@ -143,7 +144,7 @@

    // ============ 获取小区列表 ============
    const fetchVillageList = () => {
-        getVillageList()
+        return getVillageList()
            .then((res) => {
                if (res.code === 200 && res.data) {
                    const list = res.data.map((item) => ({
@@ -164,7 +165,7 @@

    // ============ 获取收费类型列表 ============
    const fetchFeeTypes = () => {
-        getFeeTypes()
+        return getFeeTypes()
            .then((res) => {
                if (res.code === 200 && res.data) {
                    const list = res.data.map((item) => ({
@@ -198,7 +199,7 @@
            params.startDate = datetimerange.value[0]
            params.endDate = datetimerange.value[1]
        }
-        getTableList(params)
+        return getTableList(params)
            .then((res) => {
                if (res.code === 200 && res.data) {
                    // 项目总览
@@ -250,11 +251,19 @@
        fetchTableList()
    })

-    // ============ 事件处理 ============
-    const goBack = () => {
-        uni.navigateBack()
+    // 下拉刷新
+    const onPullRefresh = () => {
+        refresherTriggered.value = true
+        Promise.allSettled([
+            fetchVillageList(),
+            fetchFeeTypes(),
+            fetchTableList()
+        ]).finally(() => {
+            refresherTriggered.value = false
+        })
    }

+    // ============ 事件处理 ============
    const onProjectChange = (e) => {
        const index = e.detail.value
        const option = projectOptions.value[index]
@@ -295,11 +304,6 @@
        flex-direction: column;
        height: 100vh;

-        .status-bar {
-            width: 100%;
-            flex-shrink: 0;
-        }
-
        // ===== 筛选区域（取消背景） =====
        .filter-section {
            padding: 24rpx 0 16rpx;
--- a/wuye-manager-uniapp/pageSubPack/notice-list/notice-list.vue
+++ b/wuye-manager-uniapp/pageSubPack/notice-list/notice-list.vue
@@ -2,18 +2,17 @@
  <view class="news-detail-page">
    <!-- 循环渲染通知列表 -->
    <view class="news-card" v-for="item in noticeList" :key="item.id">
+      <view class="news-meta">
+          <text class="author">{{item.notice}}</text>
+        <!-- <text class="author">{{ item.residentName || '管理员' }}</text> -->
+        <!-- <text class="publish-time">{{ item.createTime }}</text> -->
+      </view>
      <view class="news-header">
        <text class="news-title">{{ item.item || '暂无标题' }}</text>
        <view class="unread-dot" v-if="item.isCheckStr === '未读'"></view>
      </view>
-
-      <view class="news-meta">
-        <text class="author">{{ item.residentName || '管理员' }}</text>
-        <text class="publish-time">{{ item.createTime }}</text>
-      </view>
-
      <view class="news-content">
-        <text class="content-text">{{ item.notice || item.problem }}</text>
+        <text class="content-text">{{ item.problem}}</text>
      </view>

      <view class="detail-btn" @click="goToDetail(item)">
--- a/wuye-manager-uniapp/pageSubPack/report-record/report-record.vue
+++ b/wuye-manager-uniapp/pageSubPack/report-record/report-record.vue
@@ -1,14 +1,14 @@
 <template>
  <view class="report-record-page">
-    <view class="status-bar" :style="{ height: statusBarHeight + 'px' }"></view>
+    <!-- <view class="status-bar" :style="{ height: statusBarHeight + 'px' }"></view> -->
    <!-- 顶部导航栏 -->
-    <uni-nav-bar
+ <!--   <uni-nav-bar
      left-icon="back"
      title="上报记录"
      backgroundColor="transparent"
      :border="false"
      @clickLeft="navBack"
-    />
+    /> -->

    <!-- 状态筛选标签 -->
    <view class="status-tabs">
@@ -40,7 +40,9 @@
    <scroll-view
      class="record-list"
      scroll-y
-      :style="{ height: `calc(100vh - ${navHeight + statusTabHeight + typeTabHeight}px)` }"
+      refresher-enabled
+      :refresher-triggered="refresherTriggered"
+      @refresherrefresh="onPullRefresh"
    >
      <!-- 记录卡片 -->
      <view v-for="record in reportRecords" :key="record.id" class="record-card">
@@ -86,20 +88,15 @@

 <script setup>
 import { ref } from 'vue'
-import { onReady, onReachBottom, onPullDownRefresh, onShow } from '@dcloudio/uni-app'
+import { onShow } from '@dcloudio/uni-app'
 import { getMyOrderList } from '../../api/api.js'
-
-// 导航栏/标签高度（适配不同设备）
-const navHeight = ref(44)
-const statusTabHeight = ref(88)
-const typeTabHeight = ref(88)
-const statusBarHeight = ref(uni.getSystemInfoSync().statusBarHeight || 0)
 // 分页
 const pageNum = ref(1) // 当前页
-const pageSize = ref(5) // 每页条数
+const pageSize = ref(10) // 每页条数
 const total = ref(0) // 总条数
 const loading = ref(false) // 加载状态
 const noMore = ref(false) // 是否没有更多
+const refresherTriggered = ref(false) // 下拉刷新触发状态
 // 筛选状态
 const activeStatus = ref('all') // 全部/待分配/待解决/已完成
 const activeType = ref('all') // 全部/公共报修/个人报修
@@ -107,7 +104,7 @@ const activeType = ref('all') // 全部/公共报修/个人报修
 // 状态筛选选项
 const statusTabs = ref([
  { label: '全部', value: 'all' },
-  // { label: '待分配', value: 'pending' },
+  { label: '待分配', value: '0' },
  { label: '待解决', value: '1' },
  { label: '已完成', value: '2' }
 ])
@@ -161,23 +158,17 @@ const getReportList = (isRefresh = false) => {
    .finally(() => {
      loading.value = false
      if (isRefresh) {
-        uni.stopPullDownRefresh()
+        refresherTriggered.value = false
      }
    })
 }
-// 上拉加载更多
-onReachBottom(() => {
-  if (noMore.value || loading.value) return
-  pageNum.value++
-  getReportList()
-})
-
 // 下拉刷新
-onPullDownRefresh(() => {
+const onPullRefresh = () => {
+  refresherTriggered.value = true
  pageNum.value = 1
  noMore.value = false
  getReportList(true)
-})
+}

 // 筛选/分页重置后重新拉数据
 const reloadList = () => {
@@ -211,7 +202,7 @@ const navBack = () => {
 // 获取状态文本
 const getStatusText = status => {
  const statusMap = {
-    // "pending": '已分配',
+    0: '待分配',
    1: '待解决',
    2: '已完成'
  }
@@ -220,6 +211,7 @@ const getStatusText = status => {
 // 获取状态标签样式类名
 const getStatusClass = status => {
  const classMap = {
+    0:'pending',
    1: 'processing',
    2: 'completed'
  }
@@ -230,26 +222,15 @@ onShow(() => {
  noMore.value = false
  getReportList()
 })
-
-// 页面渲染完成后适配高度
-onReady(() => {
-  // 可根据实际设备调整高度
-  uni.getSystemInfo({
-    success: res => {
-      if (res.platform === 'ios') {
-        navHeight.value = 44
-      } else {
-        navHeight.value = 48
-      }
-    }
-  })
-})
 </script>

 <style scoped>
 .report-record-page {
  width: 100%;
  height: 100vh;
+  display: flex;
+  flex-direction: column;
+  box-sizing: border-box;
  background: linear-gradient(to left bottom, #e2efff 0%, #f9f9f9 50%);
 }
 .status-bar {
@@ -265,6 +246,7 @@ onReady(() => {
  padding: 0 40rpx;
  height: 88rpx;
  align-items: center;
+  flex-shrink: 0;
 }

 .status-tab-item {
@@ -304,6 +286,7 @@ onReady(() => {
  padding: 20rpx 40rpx;
  margin-top: 10rpx;
  justify-content: flex-start;
+  flex-shrink: 0;
  /* gap: 20rpx; */
 }

@@ -325,6 +308,8 @@ onReady(() => {

 /* 记录列表 */
 .record-list {
+  flex: 1;
+  min-height: 0;
  padding: 20rpx 40rpx;
  box-sizing: border-box;
 }
@@ -346,14 +331,18 @@ onReady(() => {
 }

 .card-title {
+  flex: 1;
  font-size: 32rpx;
  font-weight: 500;
  color: #333;
  margin-right: 20rpx;
+  word-break: break-all;
 }

 /* 状态标签 */
 .status-tag {
+  flex-shrink: 0;
+  white-space: nowrap;
  padding: 6rpx 16rpx;
  font-size: 20rpx;
  border-radius: 12rpx;
--- a/wuye-manager-uniapp/pageSubPack/statistics/statistics.vue
+++ b/wuye-manager-uniapp/pageSubPack/statistics/statistics.vue
@@ -71,7 +71,7 @@

 <script setup>
 import { ref } from 'vue'
-import { onShow } from '@dcloudio/uni-app'
+import { onShow, onPullDownRefresh } from '@dcloudio/uni-app'
 import { getVillageList, getFeeTypes } from '@/api/api.js'
 import FeeOverviewCard from './components/FeeOverviewCard.vue'
 import ParkingFeeCard from './components/ParkingFeeCard.vue'
@@ -158,7 +158,7 @@ const fetchVillageList = () => {
 }

 const fetchManagedArea = (villageId) => {
-  getManagedArea({ villageId: villageId || '' }).then(res => {
+  return getManagedArea({ villageId: villageId || '' }).then(res => {
    if (res.code === 200 && res.data) {
      manageArea.value = res.data.manageArea
      serviceHouseholds.value = res.data.serviceHouseCount
@@ -167,7 +167,7 @@ const fetchManagedArea = (villageId) => {
 }

 const fetchRate = (villageId) => {
-  getRate({ villageId: villageId || '' }).then(res => {
+  return getRate({ villageId: villageId || '' }).then(res => {
    if (res.code === 200 && res.data) {
      occupancyRate.value = res.data.occupancyRate
      rentalRate.value = res.data.rentalRate
@@ -176,7 +176,7 @@ const fetchRate = (villageId) => {
 }
 // 车位收费总览
 const fetchParkingFee = (villageId) => {
-  getParkingFee({ villageId: villageId || '' }).then(res => {
+  return getParkingFee({ villageId: villageId || '' }).then(res => {
    if (res.code === 200 && res.data) {
      const d = res.data
      parkingCount.value = Number(d.parkingCount) || 0
@@ -189,7 +189,7 @@ const fetchParkingFee = (villageId) => {

 // 收费总览
 const fetchFeeSummary = () => {
-  getFeeSummary({
+  return getFeeSummary({
    villageId: selectedProject.value || '',
    chargeTypeId: selectedFeeType.value || '',
    timeScope: activeTab.value
@@ -226,7 +226,7 @@ const fetchFeeTypes = () => {
 }
 // 押金余额统计
 const fetchDepositBalance = (villageId) => {
-  getDepositBalance({ villageId: villageId}).then(res => {
+  return getDepositBalance({ villageId: villageId}).then(res => {
    if (res.code === 200 && res.data) {
      const d = res.data
      depositBalance.value = d.totalBalance
@@ -236,7 +236,7 @@ const fetchDepositBalance = (villageId) => {
 }
 // 巡检总览
 const fetchInspection = (villageId) => {
-  getInspection({ villageId: villageId || '' }).then(res => {
+  return getInspection({ villageId: villageId || '' }).then(res => {
    if (res.code === 200 && res.data) {
      const d = res.data
      inspectionList.value = [
@@ -249,15 +249,30 @@ const fetchInspection = (villageId) => {
  }).catch(() => {})
 }

-onShow(() => {
-  Promise.all([fetchVillageList(), fetchFeeTypes()]).then(() => {
-    fetchManagedArea(selectedProject.value)
-    fetchRate(selectedProject.value)
-    fetchFeeSummary()
-    fetchParkingFee(selectedProject.value)
-    fetchDepositBalance(selectedProject.value)
-    fetchInspection(selectedProject.value)
+// 加载全部数据（首屏 / 下拉刷新共用）
+const loadAll = () => {
+  return Promise.all([fetchVillageList(), fetchFeeTypes()]).then(() => {
+    return Promise.allSettled([
+      fetchManagedArea(selectedProject.value),
+      fetchRate(selectedProject.value),
+      fetchFeeSummary(),
+      fetchParkingFee(selectedProject.value),
+      fetchDepositBalance(selectedProject.value),
+      fetchInspection(selectedProject.value)
+    ])
  })
+}
+
+onShow(() => {
+  loadAll()
+})
+
+onPullDownRefresh(async () => {
+  try {
+    await loadAll()
+  } finally {
+    uni.stopPullDownRefresh()
+  }
 })
 </script>