11 changed files with 89 additions and 112 deletions
--- a/api/v2User.js
+++ b/api/v2User.js
@ -1,6 +1,6 @@
 export const apiArr = {
    getUserInfo: '/api/v2/wechat/mpuser-crud/info', // 获取城市列表
    userInfoUpdate: '/api/v2/wechat/mpuser-crud/update', // 会员信息更新
-    getAccumulationFund: '/api/v2/wechat/government-housing-fund-flow-crud/page', // 物业费
+    getAccumulationFund: '/api/v2/wechat/government-housing-fund-flow-crud/page', // 物业费公积金
    getPoints: '/api/v2/wechat/member-points-flow-crud/page', // 积分
  }
--- a/packages/community/propertyPayment/index.vue
+++ b/packages/community/propertyPayment/index.vue
@ -172,7 +172,7 @@
        </view>

        <view class="row">
-          <view class="row_label">物业费抵扣金额</view>
+          <view class="row_label">物业费公积金抵扣金额</view>
          <view class="row_con4">-￥{{ item.property_housing_fund }}</view>
        </view>

@ -298,15 +298,6 @@ export default {
    this.localHeight = meun.height;
    this.currentCommunity = uni.getStorageSync("changeCommData");
    this.currentCommunityAddr = uni.getStorageSync("currentCommunityAddr");
-    // 解析从providentFund页面传递过来的房源信息
-    if (options.item) {
-      try {
-        const item = JSON.parse(decodeURIComponent(options.item));
-        this.currentRoom = item;
-      } catch (error) {
-        console.error("解析房源信息失败:", error);
-      }
-    }
    this.getRoomSelect();
    this.getUserGovenmentMoney();
  },
@ -388,9 +379,7 @@ export default {
          page_size: 50,
        }).then((res) => {
          this.roomList = res.rows;
-          if (!this.currentRoom.room_id) {
-            this.currentRoom  = this.roomList[0]
-          }
+          this.currentRoom = this.roomList[0];
          this.selectedRoomId = this.currentRoom.room_id;
          this.getOrderList().then(() => {
            resolve();
--- a/packages/community/providentFund/index.vue
+++ b/packages/community/providentFund/index.vue
@ -49,7 +49,7 @@
        </view>
        <view class="item">
          <view class="label fix">
-            <text>物业费总余额</text>
+            <text>物业费公积金总余额</text>
            <u-icon
              name="info-circle-fill"
              size="30rpx"
@ -219,7 +219,7 @@ export default {
      });
    },
    goPay() {
-      NavgateTo("../propertyPayment/index?item=" + encodeURIComponent(JSON.stringify(this.defaultName)));
+      NavgateTo("../propertyPayment/index");
    },
  },
 };
--- a/packages/customerService/index/index.vue
+++ b/packages/customerService/index/index.vue
@ -1,3 +1,4 @@
+packages/customerService/index/index
 <template>
  <view class="chat-container">
    <!-- 聊天头部 -->
@ -16,7 +17,7 @@

    <!-- 聊天消息区域 -->
    <scroll-view :scroll-into-view="scrollToView" class="chat-messages" lower-threshold="100" scroll-y="true"
-      upper-threshold="100" @scrolltolower="loadMoreHistory" @scrolltoupper="loadMoreHistory">
+                 upper-threshold="100" @scrolltolower="loadMoreHistory" @scrolltoupper="loadMoreHistory">
      <!-- 加载历史消息提示 -->
      <view v-if="isLoadingHistory" class="message-time">加载历史消息...</view>

@ -31,8 +32,8 @@
          'other': !message.isSelf,
          'loading': message.isLoading
        }" class="message-item">
-          <image :src="message.isSelf ? userAvatar : getAvatarUrl(message)" class="message-avatar" mode="aspectFill">
-          </image>
+          <image :src="message.isSelf ? userAvatar : getAvatarUrl(message)" class="message-avatar"
+                 mode="aspectFill"></image>
          <view class="message-content">
            {{ message.content }}
          </view>
@ -43,9 +44,10 @@
    <!-- 输入区域 -->
    <view class="chat-input-area">
      <view class="input-container">
-        <textarea v-model="inputMessage" :adjust-position="true" auto-height class="message-input" cursor-spacing="10"
-          enable-keyboard-accessory-view="true" hold-keyboard="true" maxlength="500" placeholder="请输入消息..."
-          @blur="onInputBlur" @confirm="sendMessage" @focus="onInputFocus" @input="handleInput"></textarea>
+        <textarea v-model="inputMessage" :adjust-position="true" auto-height class="message-input"
+                  cursor-spacing="10" enable-keyboard-accessory-view="true" hold-keyboard="true" maxlength="500"
+                  placeholder="请输入消息..." @blur="onInputBlur" @confirm="sendMessage" @focus="onInputFocus"
+                  @input="handleInput"></textarea>
        <button :disabled="inputMessage.trim() === ''" class="send-btn" @tap="sendMessage">
          发送
        </button>
@ -60,7 +62,7 @@ import { apiArr } from '@/api/customerService'
 import mqttTool from '@/utils/mqtt'

 export default {
-  data() {
+  data(){
    return {
      localHeight: '',
      top: '',
@ -104,7 +106,7 @@ export default {
      scrollToBottomFlag: false
    }
  },
-  onLoad(options) {
+  onLoad(options){
    const meun = menuButtonInfo()
    this.top = meun.top
    this.localHeight = meun.height
@ -117,10 +119,7 @@ export default {
        this.chatTarget = item
        console.log('客户找客服跳转:', this.chatTarget)
        this.chatTarget.title = this.chatTarget.employee_name
-        this.getMqttConfig().then(() => {
-          // 获取配置后再初始化聊天
-          this.initChat()
-        })
+        this.getMqttConfig()
      } else {
        // 客服选择聊天列表进来
        this.chatTarget = item
@ -132,20 +131,20 @@ export default {
        } else {
          this.chatTarget.openId = this.chatTarget.client_id_one
        }
-        // 初始化MQTT连接
-        this.initChat()
      }
    }
+    // 初始化MQTT连接
+    this.initChat()
    // 初始化用户头像
    this.userAvatar = picUrl + uni.getStorageSync('headPhoto')
  },
-  onShow() {
+  onShow(){
  },
  methods: {
-    getAvatarUrl(record) {
+    getAvatarUrl(record){
      return this.chatTarget.employee_image ? this.chatTarget.employee_image : 'https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/defaultTx.png'
    },
-    async connect() {
+    async connect(){
      this.client = null
      const options = {
        clientId: this.selfClientId
@ -197,7 +196,7 @@ export default {
        }
      })
    },
-    async subscribe() {
+    async subscribe(){
      if (this.isConnected && this.client) {
        this.client.subscribe('contact/message/receive_msg', { qos: 0 }, (err) => {
          if (!err) {
@ -214,7 +213,7 @@ export default {
      }
    },
    // 初始化聊天
-    async initChat() {
+    async initChat(){
      try {
        // 显示连接状态
        this.connectingStatus = '正在连接客服...'
@ -235,7 +234,7 @@ export default {
    },

    // 获取MQTT连接配置
-    async getMqttConfig() {
+    async getMqttConfig(){
      console.log('🚀 ~ onLoad ~ this.chatTarget.open_id:', this.chatTarget.open_id)
      try {
        // 如果没有已创建的实例或clientId，则通过API获取
@ -271,7 +270,7 @@ export default {
    },

    // MQTT断开连接回调
-    onDisconnect(packet) {
+    onDisconnect(packet){
      console.log('MQTT连接断开', packet)
      this.isConnected = false
      this.client = null
@ -290,7 +289,7 @@ export default {
    },

    // 加载历史消息
-    async loadHistoryMessages() {
+    async loadHistoryMessages(){
      if (!this.hasMoreHistory || this.isLoadingHistory) {
        return
      }
@ -323,16 +322,18 @@ export default {
            return
          }

-          // 处理历史消息，转换为需要的格式
-          const formattedMessages = historyMessages.map(msg => ({
-            content: msg.content,
-            time: new Date(msg.create_time).getTime(),
-            isSelf: msg.send_client === this.selfClientId, // 修正判断条件
-            isLoading: false
-          })).reverse(); // 反转消息顺序，确保最早的消息在最前面
+          // 将获取到的历史消息添加到消息列表开头
+          // 这里需要根据消息的发送方判断是否是自己发送的消息
+          historyMessages.map(msg => (
+              this.messages = [{
+                content: msg.content,
+                time: new Date(msg.create_time).getTime(),
+                isSelf: msg.send_client === this.chatTarget.openId,
+                isLoading: false
+              }, ...this.messages])) // 因为是按时间降序获取的，所以需要反转

-          // 将格式化后的历史消息添加到消息列表开头
-          this.messages = [...formattedMessages, ...this.messages]
+          // 添加到消息列表开头
+          // this.messages = [...formattedMessages, ...this.messages]

          // 增加页码
          this.pageNum++
@ -345,9 +346,9 @@ export default {
    },

    // 加载更多历史消息
-    loadMoreHistory(e) {
-      // 当滚动到顶部时加载更多历史消息
-      if (e && e.detail.direction === 'top') {
+    loadMoreHistory(e){
+      // 只有当滚动到顶部时才加载更多历史消息
+      if (!e || e.detail.direction === 'top') {
        if (!this.isLoadingHistory && this.hasMoreHistory) {
          this.loadHistoryMessages()
        }
@ -355,7 +356,7 @@ export default {
    },

    // 发送消息
-    sendMessage() {
+    sendMessage(){
      const content = this.inputMessage.trim()
      console.log('发送消息', content)
      if (!content || !this.client || !this.isConnected) return
@ -364,7 +365,7 @@ export default {
      console.log('需要发送的对象', this.chatTarget)
      // 按照用户提供的格式构建发送消息
      const msgData = {
-        bind_id: this.chatTarget.bindId, // 聊天列表的ID
+        bind_id: this.chatTarget.bindId, // 聊天列表的ID，这里暂时固定为1
        send_client: this.selfClientId, // 消息发送方open_id 
        receive_client: this.chatTarget.openId, // 消息接收方open_id
        type: 1, // 消息类型，1表示文字消息
@ -373,17 +374,17 @@ export default {
      }
      console.log('发送消息', msgData)
      this.client.publish(
-        'contact/message/send_msg', // 使用指定的发送消息主题
-        JSON.stringify(msgData),
-        { Qos: 0 },
-        (err) => {
-          if (err) {
-            console.error('发送消息失败', err)
-            // 可以在这里添加消息发送失败的处理逻辑
-          } else {
-            console.log('发送消息成功')
+          'contact/message/send_msg', // 使用指定的发送消息主题
+          JSON.stringify(msgData),
+          { Qos: 0 },
+          (err) => {
+            if (err) {
+              console.error('发送消息失败', err)
+              // 可以在这里添加消息发送失败的处理逻辑
+            } else {
+              console.log('发送消息成功')
+            }
          }
-        }
      )

      // 清空输入框
@ -391,11 +392,11 @@ export default {
    },

    // 处理输入事件
-    handleInput() {
+    handleInput(){
      this.canSend = this.inputMessage.trim().length > 0
    },

-    onInputFocus() {
+    onInputFocus(){
      // 输入框获取焦点时，设置滚动到底部的标记
      this.scrollToBottomFlag = true
      setTimeout(() => {
@ -405,13 +406,13 @@ export default {
      }, 300)
    },

-    onInputBlur() {
+    onInputBlur(){
      // 输入框失去焦点时，重置滚动标记
      this.scrollToBottomFlag = false
    },

    // 是否需要显示时间分割线
-    needShowTime(index) {
+    needShowTime(index){
      if (index === 0) return true

      const currentMsg = this.messages[index]
@ -422,28 +423,28 @@ export default {
    },

    // 格式化时间
-    formatTime(time) {
+    formatTime(time){
      const date = new Date(time)
      const hours = date.getHours().toString().padStart(2, '0')
      const minutes = date.getMinutes().toString().padStart(2, '0')

-      return `${hours}:${minutes}`
+      return `${ hours }:${ minutes }`
    },

    // 滚动到底部
-    scrollToBottom() {
+    scrollToBottom(){
      setTimeout(() => {
        this.scrollToView = 'msg-' + (this.messages.length - 1)
      }, 100)
    },

    // 返回上一页
-    goBack() {
+    goBack(){
      uni.navigateBack()
    },

    // 启动心跳包 - 增强版：添加错误处理和状态检查
-    startKeepalive() {
+    startKeepalive(){
      // 停止之前的定时器
      this.stopKeepalive()

@ -455,20 +456,20 @@ export default {
          }

          this.client.publish(
-            'contact/message/keep_time',
-            JSON.stringify(keepaliveData),
-            {},
-            (err) => {
-              if (err) {
-                console.error('发送心跳包失败', err)
-                // 心跳包发送失败可能表示连接有问题，可以考虑触发重连
-                if (!this.isConnected) {
-                  return
+              'contact/message/keep_time',
+              JSON.stringify(keepaliveData),
+              {},
+              (err) => {
+                if (err) {
+                  console.error('发送心跳包失败', err)
+                  // 心跳包发送失败可能表示连接有问题，可以考虑触发重连
+                  if (!this.isConnected) {
+                    return
+                  }
+                  console.log('心跳包发送失败，尝试检查连接状态')
+                  // 这里可以添加额外的连接检查逻辑
                }
-                console.log('心跳包发送失败，尝试检查连接状态')
-                // 这里可以添加额外的连接检查逻辑
              }
-            }
          )
        } else {
          console.warn('MQTT未连接，停止心跳包')
@ -478,7 +479,7 @@ export default {
    },

    // 停止心跳包
-    stopKeepalive() {
+    stopKeepalive(){
      if (this.keepaliveTimer) {
        clearInterval(this.keepaliveTimer)
        this.keepaliveTimer = null
@ -486,7 +487,7 @@ export default {
    },

    // 跳转到切换客服页面
-    goToChangeService() {
+    goToChangeService(){
      uni.navigateTo({
        url: '/packages/customerService/changeService/index?currentMchId=' + this.chatTarget.mchId
      })
@ -494,10 +495,10 @@ export default {
  },

  // 页面卸载时停止心跳包
-  onUnload() {
+  onUnload(){
    // 断开MQTT连接
    if (this.client) {
-      this.client.end()
+      this.client.disconnect()
    }

    // 停止心跳包
--- a/packages/localLife/houseProvident/index.vue
+++ b/packages/localLife/houseProvident/index.vue
@ -5,12 +5,12 @@
                <u-icon bold color="#fff" size="40" name="arrow-left" @click="back"></u-icon>
            </view>
        </view>
-        <div class="text1">物业费</div>
+        <div class="text1">物业费公积金</div>
        <div class="text2">￥{{banlance}}</div>
        <div class="total">全部房源合计</div>
        <div class="text3">
            <span>全部房源</span>
-            物业费流水
+            物业费公积金流水
        </div>

        <div class="orderList">
--- a/packages/localLife/pay/index.vue
+++ b/packages/localLife/pay/index.vue
@ -58,7 +58,7 @@

        <view class="btnList">
            <view class="btnItem" @click="payList">付款记录</view>
-            <!-- <view class="btnItem" @click="homeMoneList">物业费</view> -->
+            <!-- <view class="btnItem" @click="homeMoneList">物业费公积金</view> -->
            <view class="line"></view>
            <view class="btnItem" @click="home">首页</view>
            <view class="line"></view>
--- a/packages/workOrderDashboard/addRoutingInspection/index.vue
+++ b/packages/workOrderDashboard/addRoutingInspection/index.vue
@ -197,10 +197,8 @@ export default {
                    title: '提交成功',
                    icon: 'success'
                })
-                // 提交成功后，延迟1秒再重置表单
-                setTimeout(() => {
-                    this.getInfo(this.taskId);
-                }, 1000);
+                // 提交成功后，重置表单
+                this.getInfo(this.taskId);
            } catch (error) {
                uni.hideLoading();
                console.error('提交失败', error)
--- a/packages/workOrderDashboard/wallet/index.vue
+++ b/packages/workOrderDashboard/wallet/index.vue
@ -24,7 +24,7 @@

        <!-- 余额变动记录 -->
        <view class="records-container">
-            <view class="records-title" v-if="topVal == '待收物业费'">物业费变动记录</view>
+            <view class="records-title" v-if="topVal == '待收物业费'">物业费公积金变动记录</view>
            <view v-if="records.length == 0">
                <view class="records-list">暂无变动记录</view>
            </view>
--- a/pages/index/index.css
+++ b/pages/index/index.css
@ -73,14 +73,6 @@ page {
 	background-color: #f5f5f5;
 }

-.search_input{
-	width: 55%;
-	height: 50rpx;
-	line-height: 50rpx;
-	padding: 0 15rpx;
-	color: #666;
-}
-
 .searchBox2 {
 	display: flex;
 	align-items: center;
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@ -33,11 +33,8 @@
                  </view>
                </view>
              </view>
-              <view class="search_input" @click="goSearchView">
-                请输入内容
-              </view>
-              <!-- <input class="search_input" placeholder='请输入内容' confirm-type='search' @input="searchInput"
-                @confirm="searchInput" :value="selectKeyWord" @click="goSearchView"/> -->
+              <input class="search_input" placeholder='请输入内容' confirm-type='search' @input="searchInput"
+                @confirm="searchInput" :value="selectKeyWord" @click="goSearchView"/>
            </view>
          </view>
        </view>
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@ -38,7 +38,7 @@
 			</view>
 			<view class="section_label" @click="goWallet(2, userInfo)">
 				<view>{{ userInfo.property_housing_fund }}元</view>
-				<view>物业费</view>
+				<view>物业费公积金</view>
 			</view>
 			<view class="section_label" @click="goWallet(3)">
 				<view>0元</view>