Przeglądaj źródła

优化消息显示

凉纪 1 rok temu
rodzic
commit
de291ebbfe

+ 2 - 2
src/components/TabBar.vue

@@ -2,7 +2,7 @@
   <div>
     <van-tabbar route v-model="active" @change="handleChange">
       <van-tabbar-item  to="/works" icon="home-o" >待办</van-tabbar-item>
-      <van-tabbar-item  :badge="dotNum" to="/message" icon="comment-o" >消息</van-tabbar-item>
+      <van-tabbar-item  :badge="dotNum || ''" to="/message" icon="comment-o" >消息</van-tabbar-item>
       <van-tabbar-item  to="/menu" icon="apps-o" >菜单</van-tabbar-item>
       <van-tabbar-item  to="/isMy" icon="user-o" >我的</van-tabbar-item>
     </van-tabbar>
@@ -15,7 +15,7 @@ export default {
   data() {
     return {
       active: 0,
-      dot:0,
+      dot:null,
     }
   },
   computed:{

+ 4 - 5
src/components/TopBar.vue

@@ -31,9 +31,9 @@
       </div>
       <div class="top-card-line">
         <van-image
-          width="0.6rem"
+          width="0.7rem"
           height="0.6rem"
-          style="margin-left: 10px;float: left"
+          style="float: left"
           :src="require('@/assets/img/my/org.png')"
         />
         <p style="line-height: 28px;">
@@ -44,7 +44,7 @@
         <van-image
           width="0.7rem"
           height="0.7rem"
-          style="margin-left: 7px;float: left"
+          style="float: left"
           :src="require('@/assets/img/my/role.png')"
         />
         <p class="van-multi-ellipsis&#45;&#45;l2 introduce-info " style="line-height: 28px;">
@@ -96,8 +96,7 @@
     margin-right: 6%;
     border-radius: 10px;
     .top-card-line{
-      padding-top: 2vw;
-      padding-left: 4vw;
+      padding: 20px 40px 0 40px;
     }
   }
   .user-name{

+ 3 - 6
src/components/waterCom.vue

@@ -1,6 +1,5 @@
 <template>
   <div id="water" >
-   
     <canvas id="canvas"></canvas>
   </div>
 </template>
@@ -17,7 +16,7 @@ export default {
         date:newDateDay()
     }
   },
-  
+
   created(){
     this.name=JSON.parse(window.sessionStorage.getItem('SET_USER_ORGNAME'))
     this.userName=JSON.parse(window.sessionStorage.getItem('SET_USER_NAME'))
@@ -25,20 +24,18 @@ export default {
   mounted() {
     this.getWater()
   },
- 
+
 
   methods: {
     getWater(type=0) {
       let orgName=JSON.parse(sessionStorage.getItem('SET_USER_ORGNAME'))
       let userName=JSON.parse(sessionStorage.getItem('SET_USER_NAME'))
-      console.log(userName,'userName');
-      console.log(orgName,'orgName');
       const canvas = document.getElementById('canvas') //获取canvas
       // canvas.width = 800 //设置画布宽度
       canvas.height = 200 //设置画布高度
       canvas.style.display = 'none' //隐藏画布本身
        //加层级权重
-     
+
       const ctx = canvas.getContext('2d') //获取画笔
       ctx.font = '18px -apple-system'
     //   设置文字大小

+ 1 - 1
src/views/home/isMy.vue

@@ -99,7 +99,7 @@ export default {
 .about-container {
   /* 你的命名空间 */
   .item-list {
-    height: calc(100vh - 778px);
+    height: calc(100vh - 858px);
     overflow: auto;
     -border:1px solid red;
   }

+ 2 - 2
src/views/menu/message/index.vue

@@ -1,6 +1,6 @@
 <template>
 <div class="message">
-  <div v-if="!show" class="page-container">
+  <div v-show="!show" class="page-container">
     <van-tabs v-model="query.type" @change="refreshData">
       <van-tab title="通知公告" name="1"></van-tab>
       <van-tab title="业务提醒" name="2"></van-tab>
@@ -31,7 +31,7 @@
   </div>
 
   <!-- 消息详情 -->
-  <div v-else class="message-detail">
+  <div v-if="show" class="message-detail">
     <van-nav-bar
       title="消息详情"
       left-arrow