3 Commits 204c01f1f0 ... f1fcc7e274

Author SHA1 Message Date
  huoyi f1fcc7e274 Merge branch 'needNew-0723' into dev 3 days ago
  huoyi a7aee3ebe9 fix(seizedReported): 在团队名称中添加大队名称 3 days ago
  huoyi ea96d18f09 fix: 修正消息tab红点索引 3 days ago
2 changed files with 5 additions and 5 deletions
  1. 3 3
      src/pages/seizedReported/index.vue
  2. 2 2
      src/utils/common.js

+ 3 - 3
src/pages/seizedReported/index.vue

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

+ 2 - 2
src/utils/common.js

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