供需

pages/tabbar-pages/message/index.js

@@ -9,6 +9,7 @@ Page({
      */
     data: {
         tabsActive: 0, //tabs 下标
+        msgList: [],
     },
 
     /**
@@ -59,6 +60,9 @@ Page({
                 title: res.data,
                 icon: 'none'
             });
+            this.setData({
+                msgList: res.data
+            })
         })
     },
     /**

pages/tabbar-pages/message/index.wxml

@@ -4,143 +4,27 @@
 <van-tabs active="{{ tabsActive }}" color='#4DC2D4' title-active-color="#4DC2D4" title-inactive-color='rgba(0,0,0,.3)' tab-active-class='tab-active-class' tab-class="tab-class" nav-class='' line-width='60rpx' line-height='6rpx' swipeable bind:change="tabsOnChange">
     <view class="nav-class"></view>
     <van-tab title="公共消息">
-        <view class="msg-box">
-            <!-- 团队加入通知 -->
-            <navigator wx:for="{{5}}" url="#">
-                <view class="msgImg">
-                    <image src="/static/systematic-01.png"></image>
-                    <view class="red-dot"></view>
-                </view>
-               <view class="borTop">
-                    <view class="msgText">
-                        <view class="title u-line-1">系统消息</view>
-                        <view class="msg u-line-1">恭喜！注册成功！</view>
-                    </view>
-                    <view class="msgTime">
-                        上午9:34
-                    </view>
-                </view>
-            </navigator>
-        </view>
     </van-tab>
     <van-tab title="商户消息">
-        <view class="msg-box">
-            <!-- 商户审核通知 -->
-            <navigator url="#">
-                <view class="msgImg">
-                    <image src="https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/message/storeIcon-01.png"></image>
-                    <view class="red-dot"></view>
-                </view>
-               <view class="borTop">
-                    <view class="msgText">
-                        <view class="title u-line-1">商户审核通知</view>
-                        <view class="msg u-line-1">恭喜！注册成功！</view>
-                    </view>
-                    <view class="msgTime">
-                        上午9:34
-                    </view>
-                </view>
-            </navigator>
-            <!-- 加入通知 -->
-            <navigator url="#">
-                <view class="msgImg">
-                    <image src="https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/message/storeIcon-02.png"></image>
-                    <view class="red-dot"></view>
-                </view>
-               <view class="borTop">
-                    <view class="msgText">
-                        <view class="title u-line-1">加入通知</view>
-                        <view class="msg u-line-1">恭喜加入XXX</view>
-                    </view>
-                    <view class="msgTime">
-                        上午9:34
-                    </view>
-                </view>
-            </navigator>
-            <!-- 申请加入通知 -->
-            <navigator url="#">
-                <view class="msgImg">
-                    <image src="https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/message/storeIcon-03.png"></image>
-                    <view class="red-dot"></view>
-                </view>
-               <view class="borTop">
-                    <view class="msgText">
-                        <view class="title u-line-1">申请加入通知</view>
-                        <view class="msg u-line-1">xxx申请加入</view>
-                    </view>
-                    <view class="msgTime">
-                        上午9:34
-                    </view>
-                </view>
-            </navigator>
-            <!-- 新合作通知 -->
-            <navigator url="#">
-                <view class="msgImg">
-                    <image src="https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/message/storeIcon-04.png"></image>
-                    <view class="red-dot"></view>
-                </view>
-               <view class="borTop">
-                    <view class="msgText">
-                        <view class="title u-line-1">新合作通知</view>
-                        <view class="msg u-line-1">与xxx建立新合作成功</view>
-                    </view>
-                    <view class="msgTime">
-                        上午9:34
-                    </view>
-                </view>
-            </navigator>
-            <!-- 取消合作通知 -->
-            <navigator url="#">
-                <view class="msgImg">
-                    <image src="https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/message/storeIcon-05.png"></image>
-                    <view class="red-dot"></view>
-                </view>
-               <view class="borTop">
-                    <view class="msgText">
-                        <view class="title u-line-1">取消合作通知</view>
-                        <view class="msg u-line-1">和xxx取消合作成功</view>
-                    </view>
-                    <view class="msgTime">
-                        上午9:34
-                    </view>
-                </view>
-            </navigator>
-        </view>
     </van-tab>
     <van-tab title="团队消息">
-        <view class="msg-box">
-            <!-- 团队加入通知 -->
-            <navigator url="#">
-                <view class="msgImg">
-                    <image src="https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/message/groupIcon-01.png"></image>
-                    <view class="red-dot"></view>
-                </view>
-                <view class="borTop">
-                    <view class="msgText">
-                        <view class="title u-line-1">团队加入通知</view>
-                        <view class="msg u-line-1">恭喜加入xxx团队</view>
-                    </view>
-                    <view class="msgTime">
-                        上午9:34
-                    </view>
-                </view>
-            </navigator>
-            <!-- 团队账号权限变更通知 -->
-            <navigator url="#">
-                <view class="msgImg">
-                    <image src="https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/message/groupIcon-02.png"></image>
-                    <view class="red-dot"></view>
-                </view>
-               <view class="borTop">
-                    <view class="msgText">
-                        <view class="title u-line-1">团队账号权限变更通知</view>
-                        <view class="msg u-line-1">xxx权限变更为xx</view>
-                    </view>
-                    <view class="msgTime">
-                        上午9:34
-                    </view>
-                </view>
-            </navigator>
-        </view>
     </van-tab>
-</van-tabs>
+</van-tabs>
+
+<view class="msg-box">
+    <navigator url="#" wx:for="{{msgList}}">
+        <view class="msgImg">
+            <image src="https://bwj.obs.cn-east-2.myhuaweicloud.com/resources/message/storeIcon-05.png"></image>
+            <view class="red-dot"></view>
+        </view>
+        <view class="borTop">
+            <view class="msgText">
+                <view class="title u-line-1">{{item.ftitle}}</view>
+                <view class="msg u-line-1">{{item.fmessage}}</view>
+            </view>
+            <view class="msgTime">
+                上午9:34
+            </view>
+        </view>
+    </navigator>
+</view>

pages/tabbar-pages/message/index.wxss

@@ -1,5 +1,6 @@
 page {
     background-color: #fff !important;
+    padding-bottom: 50px;
 }
 
 .msg-box {

pages/tabbar-pages/supplyAndDemand/index.js

@@ -27,7 +27,6 @@ Page({
      * 生命周期函数--监听页面加载
      */
     onLoad: function (options) {
-
         /* 获取所有信息分类 */
         _Http.basic({
             "accesstoken": wx.getStorageSync('userData').token,
@@ -166,7 +165,9 @@ Page({
                 "where": where
             }
         }).then(res => {
-            if (res.msg != "成功") return;
+            if (res.msg != "成功") return wx.showToast({
+                title: res.data,
+            })
             this.returnList(res);
         })
     },
@@ -207,14 +208,16 @@ Page({
                 }
             }
         }).then(res => {
-            if (res.msg != "成功") return;
+            if (res.msg != "成功") return wx.showToast({
+                title: res.data,
+            })
             this.returnList(res);
         })
     },
     /* 返回列表 */
     returnList(res) {
-        const data = handleList.checkdate(res.data)
-        let productList = data;
+        let data = handleList.checkdate(res.data)
+        let productList = handleList.imageType(data, 'default');
         //替换或拼接
         if (res.pageNumber != 1) {
             productList = this.data.productList.concat(productList);

pages/tabbar-pages/supplyAndDemand/index.wxss

@@ -255,7 +255,7 @@
     color: #FFFFFF;
     box-shadow: 0px 6rpx 6rpx 0px rgba(0, 0, 0, 0.1);
     border-radius: 34rpx 0 0 34rpx;
-    top: 72%;
+    top: 65%;
     right: 0;
     z-index: 999;
     overflow: hidden;