优化巡检提交的提示信息

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', // 积分
   }

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,6 +298,15 @@ 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();
   },
@@ -379,7 +388,9 @@ export default {
           page_size: 50,
         }).then((res) => {
           this.roomList = res.rows;
-          this.currentRoom = this.roomList[0];
+          if (!this.currentRoom.room_id) {
+            this.currentRoom  = this.roomList[0]
+          }
           this.selectedRoomId = this.currentRoom.room_id;
           this.getOrderList().then(() => {
             resolve();

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");
+      NavgateTo("../propertyPayment/index?item=" + encodeURIComponent(JSON.stringify(this.defaultName)));
     },
   },
 };

packages/customerService/index/index.vue

@@ -1,4 +1,3 @@
-packages/customerService/index/index
 <template>
   <view class="chat-container">
     <!-- 聊天头部 -->
@@ -32,8 +31,8 @@ packages/customerService/index/index
           'other': !message.isSelf,
           'loading': message.isLoading
         }" class="message-item">
-          <image :src="message.isSelf ? userAvatar : getAvatarUrl(message)" class="message-avatar"
+          <image :src="message.isSelf ? userAvatar : getAvatarUrl(message)" class="message-avatar" mode="aspectFill">
-                 mode="aspectFill"></image>
+          </image>
           <view class="message-content">
             {{ message.content }}
           </view>
@@ -44,10 +43,9 @@ packages/customerService/index/index
     <!-- 输入区域 -->
     <view class="chat-input-area">
       <view class="input-container">
-        <textarea v-model="inputMessage" :adjust-position="true" auto-height class="message-input"
+        <textarea v-model="inputMessage" :adjust-position="true" auto-height class="message-input" cursor-spacing="10"
-                  cursor-spacing="10" enable-keyboard-accessory-view="true" hold-keyboard="true" maxlength="500"
+          enable-keyboard-accessory-view="true" hold-keyboard="true" maxlength="500" placeholder="请输入消息..."
-                  placeholder="请输入消息..." @blur="onInputBlur" @confirm="sendMessage" @focus="onInputFocus"
+          @blur="onInputBlur" @confirm="sendMessage" @focus="onInputFocus" @input="handleInput"></textarea>
-                  @input="handleInput"></textarea>
         <button :disabled="inputMessage.trim() === ''" class="send-btn" @tap="sendMessage">
           发送
         </button>
@@ -119,7 +117,10 @@ export default {
         this.chatTarget = item
         console.log('客户找客服跳转:', this.chatTarget)
         this.chatTarget.title = this.chatTarget.employee_name
-        this.getMqttConfig()
+        this.getMqttConfig().then(() => {
+          // 获取配置后再初始化聊天
+          this.initChat()
+        })
       } else {
         // 客服选择聊天列表进来
         this.chatTarget = item
@@ -131,10 +132,10 @@ export default {
         } else {
           this.chatTarget.openId = this.chatTarget.client_id_one
         }
-      }
-    }
         // 初始化MQTT连接
         this.initChat()
+      }
+    }
     // 初始化用户头像
     this.userAvatar = picUrl + uni.getStorageSync('headPhoto')
   },
@@ -322,18 +323,16 @@ export default {
             return
           }
 
-          // 将获取到的历史消息添加到消息列表开头
+          // 处理历史消息，转换为需要的格式
-          // 这里需要根据消息的发送方判断是否是自己发送的消息
+          const formattedMessages = historyMessages.map(msg => ({
-          historyMessages.map(msg => (
-              this.messages = [{
             content: msg.content,
             time: new Date(msg.create_time).getTime(),
-                isSelf: msg.send_client === this.chatTarget.openId,
+            isSelf: msg.send_client === this.selfClientId, // 修正判断条件
             isLoading: false
-              }, ...this.messages])) // 因为是按时间降序获取的，所以需要反转
+          })).reverse(); // 反转消息顺序，确保最早的消息在最前面
 
-          // 添加到消息列表开头
+          // 将格式化后的历史消息添加到消息列表开头
-          // this.messages = [...formattedMessages, ...this.messages]
+          this.messages = [...formattedMessages, ...this.messages]
 
           // 增加页码
           this.pageNum++
@@ -347,8 +346,8 @@ export default {
 
     // 加载更多历史消息
     loadMoreHistory(e) {
-      // 只有当滚动到顶部时才加载更多历史消息
+      // 当滚动到顶部时加载更多历史消息
-      if (!e || e.detail.direction === 'top') {
+      if (e && e.detail.direction === 'top') {
         if (!this.isLoadingHistory && this.hasMoreHistory) {
           this.loadHistoryMessages()
         }
@@ -365,7 +364,7 @@ export default {
       console.log('需要发送的对象', this.chatTarget)
       // 按照用户提供的格式构建发送消息
       const msgData = {
-        bind_id: this.chatTarget.bindId, // 聊天列表的ID，这里暂时固定为1
+        bind_id: this.chatTarget.bindId, // 聊天列表的ID
         send_client: this.selfClientId, // 消息发送方open_id 
         receive_client: this.chatTarget.openId, // 消息接收方open_id
         type: 1, // 消息类型，1表示文字消息
@@ -498,7 +497,7 @@ export default {
   onUnload() {
     // 断开MQTT连接
     if (this.client) {
-      this.client.disconnect()
+      this.client.end()
     }
 
     // 停止心跳包

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">

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>

packages/workOrderDashboard/addRoutingInspection/index.vue

@@ -197,8 +197,10 @@ export default {
                     title: '提交成功',
                     icon: 'success'
                 })
-                // 提交成功后，重置表单
+                // 提交成功后，延迟1秒再重置表单
+                setTimeout(() => {
                     this.getInfo(this.taskId);
+                }, 1000);
             } catch (error) {
                 uni.hideLoading();
                 console.error('提交失败', error)

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>

pages/index/index.css

@@ -73,6 +73,14 @@ page {
 	background-color: #f5f5f5;
 }
 
+.search_input{
+	width: 55%;
+	height: 50rpx;
+	line-height: 50rpx;
+	padding: 0 15rpx;
+	color: #666;
+}
+
 .searchBox2 {
 	display: flex;
 	align-items: center;

pages/index/index.vue

@@ -33,8 +33,11 @@
                   </view>
                 </view>
               </view>
-              <input class="search_input" placeholder='请输入内容' confirm-type='search' @input="searchInput"
+              <view class="search_input" @click="goSearchView">
-                @confirm="searchInput" :value="selectKeyWord" @click="goSearchView"/>
+                请输入内容
+              </view>
+              <!-- <input class="search_input" placeholder='请输入内容' confirm-type='search' @input="searchInput"
+                @confirm="searchInput" :value="selectKeyWord" @click="goSearchView"/> -->
             </view>
           </view>
         </view>

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>