update

pages/index/index.vue

@@ -17,8 +17,8 @@
       <view class="other">
         <view v-if="user.Membership_Id" >
           <view class="topTitle">
-            <p class="title">对客营收:</p>
+            <p class="title">对客营收</p>
-            <span class="text">门店上传 <text style="margin-left: 4px" :style="{color:isBig?'red':''}">{{showHeadMsg.uploadState?showHeadMsg.uploadState:''}}</text></span>
+            <span class="text">门店上传: <text style="margin-left: 4px" :style="{color:isBig?'red':''}">{{showHeadMsg.uploadState?showHeadMsg.uploadState:''}}</text></span>
           </view>
           <view class="box" @click="handlePage">
             <p class="allPrice">{{showHeadMsg.totalMoneyShow|| '0.00'}}</p> 
@@ -936,7 +936,7 @@ export default {
        let index = this.showHeadMsg.uploadState.indexOf('/')
        let first = this.showHeadMsg.uploadState.slice(0,index)
        let second = this.showHeadMsg.uploadState.slice(index+1,1000)
-       if (Number(first)-Number(second)>0){
+       if (Number(first)-Number(second)<0){
          this.isBig = true
        }
         _this.$forceUpdate()

pages/userCenter/userCenter.vue

@@ -192,7 +192,7 @@ import Tabbar from "../../components/tabbar/tabbar.vue";
                 imagePath: '/static/images/user/authorityApproval.svg',
               },
               {
-                id:'',
+                id:'b0b63a75-56c9-4f1d-aacb-a26e62b47e3e',
                 name: '数据校验',
                 homeUrl: '/pages/dataSummary/dataSummary',
                 notice:0,
@@ -258,33 +258,47 @@ import Tabbar from "../../components/tabbar/tabbar.vue";
 					let phoneStr = state.userData.Membership_Phone
 					if(phoneStr){
 						return phoneStr.substr(0,3)+' **** '+phoneStr.substr(phoneStr.length-2,phoneStr.length-1)
-					
 					}else {
 						return ''
 					}
-				}
+				},
-			}),
-			getPhone(){
 
-      }
+			})
 		},
     onLoad(){
       let systemInfo = uni.getSystemInfoSync()
       this.statusBarHeight = Number(systemInfo.statusBarHeight)
       this.menu = uni.getMenuButtonBoundingClientRect()
-      console.log('toDoMsg',this.toDoMsg)
         this.dataList[2].list.forEach(item=>{
-          for(let key in this.toDoMsg){
+          for(let key in this.user.AuthorityInfo){
             if (key === item.id){
-              item.isNotice = true
+              if (this.user.AuthorityInfo[key]===1){
-              item.notice = this.toDoMsg[key]
+                item.isNotice = true
+              }
             }
           }
         })
+      this.dataList[3].list.forEach(item=>{
+        for(let key in this.user.AuthorityInfo){
+          if (key === item.id){
+            if (this.user.AuthorityInfo[key]===1){
+              item.isNotice = true
+            }
+
+          }
+        }
+      })
+
+      this.dataList[2].list.forEach(item=>{
+        for(let key in this.toDoMsg){
+          if (key === item.id){
+            item.notice = this.toDoMsg[key]
+          }
+        }
+      })
       this.dataList[3].list.forEach(item=>{
         for(let key in this.toDoMsg){
           if (key === item.id){
-            item.isNotice = true
             item.notice = this.toDoMsg[key]
           }
         }
@@ -413,7 +427,7 @@ import Tabbar from "../../components/tabbar/tabbar.vue";
             font-weight: 400;
             color: #782717;
             line-height: 36rpx;
-            width: 98%;
+            width: 100%;
             display: -webkit-box;
             -webkit-box-orient: vertical;
             -webkit-line-clamp: 2;