Merge branch '消息添加仅显示未读' into preview

pages/tabbar/message/index.js

@@ -12,6 +12,13 @@ Page({
             where: {}
         },
         total: 0,
+        isread: false
+    },
+    onSwitchChange({
+        detail
+    }) {
+        this.data.isread = detail;
+        this.getlist(true)
     },
     //切换tab选项
     tabChange({
@@ -23,18 +30,21 @@ Page({
         this.getlist(true);
     },
     onReady() {
-        this.selectComponent("#ListBox").setHeight("#tabs", this);
+        this.selectComponent("#ListBox").setHeight(".headline", this);
     },
     getlist(init = false) {
         if (init.detail != undefined) init = init.detail;
-        if (init) this.setData({
-            ['content.pageNumber']: 1
-        })
-        if (this.data.content.pageNumber > this.data.content.pageTotal) return;
+        let content = this.data.content;
+        if (init) {
+            content.pageNumber = 1
+            content.pageTotal = 1
+        }
+        if (content.pageNumber > content.pageTotal) return;
+        content.isread = this.data.isread ? 0 : ""
         _Http.basic({
             "classname": "system.message.Message",
             "method": "queryMessage",
-            content: this.data.content
+            content
         }).then(res => {
             this.selectComponent('#ListBox').RefreshToComplete();
             if (res.msg != '成功') return wx.showToast({
@@ -62,11 +72,12 @@ Page({
                 }
                 return v
             })
+            content.pageNumber = res.pageNumber + 1;
+            content.pageTotal = res.pageTotal;
             this.setData({
                 total: res.total,
                 list: (res.pageNumber == 1) ? res.data : this.data.list.concat(res.data),
-                ['content.pageNumber']: res.pageNumber + 1,
-                ['content.pageTotal']: res.pageTotal
+                content
             })
         })
     },

pages/tabbar/message/index.scss

@@ -21,7 +21,7 @@ page {
     border-radius: 16rpx;
     overflow: hidden;
     background: #ffffff;
-    margin: 20rpx auto 0;
+    margin: 0 auto 20rpx;
     padding: 30rpx;
 
     .title {

pages/tabbar/message/index.wxml

@@ -2,8 +2,9 @@
     <van-tab title="应用消息" name='应用' />
     <van-tab title="系统消息" name='系统' />
 </van-tabs>
+<Yl_Headline class="headline" title="{{'总计:'+ total}}" type='switch' switchLabel='只看未读' switch='{{isread}}' bind:callBack='onSwitchChange' />
 <Yl_ListBox id="ListBox" bind:getlist='getlist'>
-    <view class="unread">总共{{total}}条</view>
+    <!-- <view class="unread">总共{{total}}条</view> -->
     <navigator url="#" class='list' wx:for="{{list}}" data-item="{{item}}" bindtap="toDetails">
         <view class="title line-1">{{item.title}}</view>
         <view class="content line-3">{{item.message}}</view>