Merge branch 'needNew-0723' into dev

src/pages/seizedReported/index.vue

@@ -750,15 +750,15 @@ export default {
         const curUserInfo = (res.data || []).find(item => {
           return item.userId === this.currentUser.id && (!item.checkOutTime || item.checkOutTime === '2000-01-01 00:00:00')
         }) || {}
-
+       
         this.formData.securityLocation = curUserInfo.channelCode || curUserInfo.regionalCode
         this.formData.securityLocationText = curUserInfo.channelName || curUserInfo.regionalName
 
         this.formData.team = curUserInfo.attendanceTeamId
         this.formData.reportTeam = curUserInfo.attendanceTeamId
         if (curUserInfo.attendanceStationName && curUserInfo.attendanceDepartmentName) {
-          this.formData.teamName = `${curUserInfo.attendanceStationName} / ${curUserInfo.attendanceDepartmentName} / ${curUserInfo.attendanceTeamName}`
-          this.formData.reportTeamText = `${curUserInfo.attendanceStationName} / ${curUserInfo.attendanceDepartmentName} / ${curUserInfo.attendanceTeamName}`
+          this.formData.teamName = `${curUserInfo.attendanceStationName} / ${curUserInfo.attendanceBrigadeName} / ${curUserInfo.attendanceDepartmentName} / ${curUserInfo.attendanceTeamName}`
+          this.formData.reportTeamText = `${curUserInfo.attendanceStationName} / ${curUserInfo.attendanceBrigadeName} / ${curUserInfo.attendanceDepartmentName} / ${curUserInfo.attendanceTeamName}`
         }
         console.log(this.formData);
         const locationResult = this.getParentLocation(this.formData.securityLocation)

src/utils/common.js

@@ -307,7 +307,7 @@ export async function showMessageTabRedDot() {
     if (total > 0) {
       // 消息tab在tabBar列表中的索引是1（从0开始）
       uni.showTabBarRedDot({
-        index: 1,
+        index: 0,
         success: () => {
           // console.log('消息tab红点显示成功')
         },
@@ -319,7 +319,7 @@ export async function showMessageTabRedDot() {
     } else {
       // 当total等于0时，取消消息tab上的红点显示
       uni.hideTabBarRedDot({
-        index: 1,
+        index: 0,
         success: () => {
           console.log('消息tab红点隐藏成功')
         },