干杯议事,双肩走格,个人中心左上角我的e家跳转

epdc-resident-mp-yushan/app.json

@@ -229,7 +229,8 @@
             "name": "mediateHypermarket",
             "pages": [
                 "page/index/index",
-                "page/dotGeneral/dotGeneral"
+                "page/dotGeneral/dotGeneral",
+                "page/mtct/mtct"
             ]
         },
         {

epdc-resident-mp-yushan/pages/index/index.js

@@ -45,8 +45,7 @@ Page({
    
           //志愿服务
           {
-            icon:
-              '../../images/home/sjzg.png',
+            icon:'../../images/home/sjzg.png',
             tip: '双肩走格',
             module: 'mediateHypermarket',
           },
@@ -57,10 +56,21 @@ Page({
           },
     //   {
     //     icon:
-    //       'https://epdc-yushan.elinkservice.cn/files-pro/20220324/1083316800d948b4a8a4206dcb857722.png',
-    //     tip: '个人中心',
-    //     module: 'personalCenter',
+    //       '../../images/home/mtcs.png',
+    //     tip: '矛调超市',
+    //     module: 'mediateHypermarket',
     //   },
+    // {
+    //     icon:'../../images/home/jifen.png',
+    //     tip: '积分排行',
+    //     module: 'mediateHypermarket',
+    // },
+      // {
+      //   icon:
+      //     'https://epdc-yushan.elinkservice.cn/files-pro/20220324/1083316800d948b4a8a4206dcb857722.png',
+      //   tip: '个人中心',
+      //   module: 'personalCenter',
+      // },
       // {
       //   icon:
       //     'https://epdc-yushan.elinkservice.cn/files-pro/20211009/ccbab2a8a4a847548a72972770009576.png',
@@ -368,9 +378,7 @@ Page({
       .then((res) => {
         // console.log('用户信息', res)
         wx.navigateTo({
-          url:
-            '/subpages/integralCentre/pages/index/index?points=' +
-            res.data.points,
+          url:'/subpages/mediateHypermarket/page/index/index',
         })
       })
       .catch((err) => {
@@ -481,9 +489,10 @@ Page({
         //     url: '/subpages/family/pages/index/index',
         //   })
         } else if (module === 'mediateHypermarket') {
-          wx.navigateTo({
-            url: '/subpages/mediateHypermarket/page/index/index',
-          })
+        //   wx.navigateTo({
+        //     url: '/subpages/mediateHypermarket/page/index/index',
+        //   })
+            this.navigateToIntegral()
         } else if (module === 'societyOrg') {
           wx.navigateTo({
             url: '/subpages/societyOrg/pages/orgList/orgList',

epdc-resident-mp-yushan/pages/index/index.wxml

@@ -5,6 +5,7 @@
         <view class="header-left" bindtap="navigateToMine"> 
             <image src="../../images/icon_user.png"></image> 个人中心
         </view>
+        <!-- <view></view> -->
         <view class="hedaer-center">
             <image src="https://epdc-yushan.elinkservice.cn/files-pro/20220324/9be8371ee12d40f79be7974cdc6d79f5.png" />
         </view>

epdc-resident-mp-yushan/pages/index/index.wxss

@@ -48,6 +48,7 @@ justify-content: center;
 } */
 .header .navigation .header-left {
  justify-content: left;
+ width: fit-content !important;
 }
 .header .navigation  hedaer-center image{
     width: 150rpx;

epdc-resident-mp-yushan/project.private.config.json

@@ -125,7 +125,14 @@
                 },
                 {
                     "name": "",
-                    "pathName": "subpages/communityNews/pages/detail/detail",
+                    "pathName": "pages/index/index",
+                    "query": "",
+                    "launchMode": "default",
+                    "scene": null
+                },
+                {
+                    "name": "矛盾解了",
+                    "pathName": "subpages/mediateHypermarket/page/index/index",
                     "query": "",
                     "launchMode": "default",
                     "scene": null
@@ -135,5 +142,5 @@
     },
     "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
     "projectname": "%252525E7%2525258E%252525B0%252525E4%252525BB%252525A3%252525E6%252525A6%25252586%252525E5%252525B1%252525B1-%252525E5%252525B1%25252585%252525E6%252525B0%25252591%252525E7%252525AB%252525AF",
-    "libVersion": "2.10.4"
+    "libVersion": "2.33.0"
 }

epdc-resident-mp-yushan/subpages/family/pages/index/index.js

@@ -181,9 +181,15 @@ chooseTabBar(e) {
         if (e.currentTarget.dataset.type === 'resiNew') {
         //   this.getresiNewList()
         } else if (e.currentTarget.dataset.type === 'housePrice') {
-          this.data.pageNo = 1
-          this.data.pageSize = 10
-          this.getHousesalerentinfo()
+        //   this.data.pageNo = 1
+        //   this.data.pageSize = 10
+        //   this.getHousesalerentinfo()
+          // wx.navigateTo({
+          //    url:  '/subpages/mediateHypermarket/page/index/index' ,
+          // })
+          wx.navigateTo({
+            url: '/subpages/mediateHypermarket/page/mtct/mtct',
+          })
         } else if (e.currentTarget.dataset.type === 'groupPrice') {
 
         }else if (e.currentTarget.dataset.type === 'integral'){

epdc-resident-mp-yushan/subpages/family/pages/index/index.wxml

@@ -1,5 +1,5 @@
 <view class="f-container">
-    <!-- 恢复  -->
+    <!-- 恢复 wx:if="{{familyInfo.roomCodeShow}}"-->
     <block  wx:if="{{familyInfo.roomCodeShow}}">
         <view class="f-top">
             <view class="f-card">
@@ -36,17 +36,17 @@
                 <view class="type {{selectedTabBar === 'resiNew' ? 'selected-resiNew' : ''}}" data-type="resiNew" hover-class="hover-tabbar" hover-stay-time="300" bindtap="chooseTabBar">
                     成员新了
                 </view>
-                <view class="type {{selectedTabBar === 'housePrice' ? 'selected-housePrice' : ''}}" data-type="housePrice" hover-class="hover-tabbar" hover-stay-time="300" bindtap="chooseTabBar">
-                    房价涨了
-                </view>
+              
                 <view class="type {{selectedTabBar === 'groupPrice' ? 'selected-groupPrice' : ''}}" data-type="groupPrice" hover-class="hover-tabbar" hover-stay-time="300" bindtap="navToMiniprogram">
                     团购火了
                 </view>
-                <view class="type {{selectedTabBar === 'integral' ? 'selected-integral' : ''}}" data-type="integral" hover-class="hover-tabbar" hover-stay-time="300" bindtap="chooseTabBar">
+                <view class="type {{selectedTabBar === 'housePrice' ? 'selected-integral' : ''}}" data-type="housePrice" hover-class="hover-tabbar" hover-stay-time="300" bindtap="chooseTabBar">
+                      矛盾解了
+                </view>
+                <view class="type {{selectedTabBar === 'integral' ? 'selected-housePrice' : ''}}" data-type="integral" hover-class="hover-tabbar" hover-stay-time="300" bindtap="chooseTabBar">
                     积分多了
                 </view>
-
-                <view class="select-bar {{selectedTabBar === 'resiNew' ? 'selected-resiNew' : selectedTabBar === 'housePrice' ? 'selected-housePrice' : selectedTabBar === 'groupPrice' ? 'selected-groupPrice' :selectedTabBar === 'integral' ? 'selected-integral':''}}"></view>
+                <view class="select-bar {{selectedTabBar === 'resiNew' ? 'selected-resiNew' : selectedTabBar === 'housePrice' ? 'selected-groupPrice' : selectedTabBar === 'groupPrice' ? 'selected-groupPrice' :selectedTabBar === 'integral' ? 'selected-integral':''}}"></view>
             </view>
             <!-- 成员新了 -->
             <view class="resiNew-list" wx:if="{{selectedTabBar === 'resiNew'}}">
@@ -77,7 +77,7 @@
             </view>
 
             <!-- 房价涨了 -->
-            <view class="housePrice-list" wx:if="{{selectedTabBar === 'housePrice'}}">
+            <view class="housePrice-list" wx:if="{{false}}">
                 <view class="housePrice-hader">
                     <view class="{{houseFlag==='1'?'active_btn':''}}" data-status="1" bindtap="handleActiveHouse"> 我要买房</view>
                     <view style="margin-left:20rpx" class="{{houseFlag === '2'?'active_btn':''}}" data-status="2" bindtap="handleActiveHouse"> 我要租房 </view>
@@ -142,7 +142,6 @@
 
     <image src="../../../../images/family/plus.png" class="img_btn" bind:tap="handleTo"></image>
 
-
 </view>
 
 <view class="m-fm" hidden="{{ showQr }}">

epdc-resident-mp-yushan/subpages/family/wxss/family.wxss

@@ -112,7 +112,97 @@ page {
     box-sizing: border-box;
     padding: 100rpx 0 0
 }
+.f-wr .housePrice-list {
+    overflow-y: scroll;
+}
+.f-wr .housePrice-list .housePrice-hader{
+    display: flex;
+    padding: 20rpx 61rpx;
+    background-color: #fff;
 
+}
+.f-wr .housePrice-list .housePrice-hader .active_btn{
+    background: #dc1e20;
+    color: #fff;
+    border: 1px solid #dc1e20;
+    opacity: 1;
+}
+.f-wr .housePrice-list .search-box{
+    display: flex;
+    margin-top: 20rpx;
+    height: 60rpx;
+    line-height: 60rpx;
+    align-items: center;
+    padding: 0 30rpx;
+    position: relative;
+}
+.f-wr .housePrice-list  .housePrice-content{
+   width: 100%;
+   height: 440rpx;
+   border-radius: 5%;
+   margin-top: 20rpx;
+   box-sizing: border-box;
+   background-color: #fff;
+}
+.f-wr .housePrice-list  .housePrice-content view{
+    background-color: #fff;
+}
+.f-wr .housePrice-list  .housePrice-content .housePrice-header{
+    display: flex;
+    background-color: #fff;
+    box-sizing: border-box;
+    padding: 10rpx 0 10rpx 0;
+    border-radius: 5rpx 5rpx 0 0 ;
+}
+.f-wr .housePrice-list  .housePrice-content  .housePrice-body{
+    padding: 0 20rpx;
+}
+.f-wr .housePrice-list  .housePrice-content .housePrice-header image{
+    width: 100rpx;
+    height: 100rpx;
+    border-radius: 50%;
+}
+.f-wr .housePrice-list  .housePrice-content .housePrice-header .housePrice-header-name {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    padding:0 20rpx;
+    flex: 1;
+}
+.f-wr .housePrice-list .search-img{
+    width:40rpx;
+    height:40rpx;
+    object-fit: cover;
+    margin: 0 7rpx 0 25rpx;
+    position: absolute;
+    z-index: 5;
+}
+.f-wr .housePrice-list .search-box .search-input{
+    background: #fff;
+    border-radius: 25rpx;
+    padding-left: 24rpx;
+    width:100%;
+    height: 100%;
+}
+.f-wr .housePrice-list .search-box .search-img{
+    position: absolute;
+    right: 38rpx;
+    width: 29rpx;
+    height: 32rpx;
+    top:12rpx ;
+}
+.f-wr .housePrice-list .housePrice-hader view{
+    width: 166rpx;
+    height: 56rpx;
+    line-height: 56rpx;
+    background: #FFFFFF;
+    border: 1px solid #828282a9;
+    border-radius: 28rpx;
+    text-align: center;
+    color: #333333;
+    font-family: PingFang SC;
+    font-weight: bold;
+}
 .title-right,
 .title-wr {
     display: flex;
@@ -408,38 +498,7 @@ page {
       left: 75%;
       transition: left 0.5s ease;
 }
-.f-wr .housePrice-list {
-    overflow-y: scroll;
-}
-.f-wr .housePrice-list .housePrice-hader{
-    display: flex;
-    padding: 20rpx 61rpx;
-    background-color: #fff;
 
-}
-.f-wr .housePrice-list .housePrice-hader .active_btn{
-    background: #dc1e20;
-    color: #fff;
-    border: 1px solid #dc1e20;
-    opacity: 1;
-}
-.f-wr .housePrice-list .search-box{
-    display: flex;
-    margin-top: 20rpx;
-    height: 60rpx;
-    line-height: 60rpx;
-    align-items: center;
-    padding: 0 30rpx;
-    position: relative;
-}
-.f-wr .housePrice-list  .housePrice-content{
-   width: 100%;
-   height: 440rpx;
-   border-radius: 5%;
-   margin-top: 20rpx;
-   box-sizing: border-box;
-   background-color: #fff;
-}
 .housePrice-images{
     display: flex;
     justify-content: left;
@@ -455,31 +514,7 @@ page {
     height: 207rpx;
     width: 202rpx;
 }
-.f-wr .housePrice-list  .housePrice-content view{
-    background-color: #fff;
-}
-.f-wr .housePrice-list  .housePrice-content .housePrice-header{
-    display: flex;
-    background-color: #fff;
-    box-sizing: border-box;
-    padding: 10rpx 0 10rpx 0;
-    border-radius: 5rpx 5rpx 0 0 ;
-}
-.f-wr .housePrice-list  .housePrice-content  .housePrice-body{
-    padding: 0 20rpx;
-}
-.f-wr .housePrice-list  .housePrice-content .housePrice-header image{
-    width: 100rpx;
-    height: 100rpx;
-    border-radius: 50%;
-}
-.f-wr .housePrice-list  .housePrice-content .housePrice-header .housePrice-header-name {
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    padding:0 20rpx;
-    flex: 1;
-}
+
 .housePrice-header-top{
     display: flex;
     justify-content: space-between;
@@ -518,40 +553,7 @@ page {
 .housePrice-header-name .price{
     color: #e74636;
 }
-.f-wr .housePrice-list .search-img{
-    width:40rpx;
-    height:40rpx;
-    object-fit: cover;
-    margin: 0 7rpx 0 25rpx;
-    position: absolute;
-    z-index: 5;
-}
-.f-wr .housePrice-list .search-box .search-input{
-    background: #fff;
-    border-radius: 25rpx;
-    padding-left: 24rpx;
-    width:100%;
-    height: 100%;
-}
-.f-wr .housePrice-list .search-box .search-img{
-    position: absolute;
-    right: 38rpx;
-    width: 29rpx;
-    height: 32rpx;
-    top:12rpx ;
-}
-.f-wr .housePrice-list .housePrice-hader view{
-    width: 166rpx;
-    height: 56rpx;
-    line-height: 56rpx;
-    background: #FFFFFF;
-    border: 1px solid #828282a9;
-    border-radius: 28rpx;
-    text-align: center;
-    color: #333333;
-    font-family: PingFang SC;
-    font-weight: bold;
-}
+
 .img_btn{
     width: 134rpx;
     height: 134rpx;

epdc-resident-mp-yushan/subpages/mediateHypermarket/page/mtct/mtct.js

@@ -0,0 +1,104 @@
+const api = require('../../utils/mediateHypermarket')
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    pageIndex: 1,
+    pageSize: 10,
+    nodata: false,
+    loadMoreType: 'none',
+    loadMoreVisible: false,
+    isLoadMore: false,
+    modulelist: [],
+    pid: '1438320938730868737',
+    typeCode: 'MTCS'
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    // this.modulelist()
+    // wx.setNavigationBarTitle({
+    //   title: options.title
+    // })
+    this.getModuleList()
+  },
+  // modulelist() {
+  //   let that = this;
+  //   api.modulelist(that.data.moduleCategory).then(function (res) {
+  //     that.setData({
+  //       modulelist: res.data,
+  //     })
+  //     console.log(that.data.modulelist)
+  //   })
+  // },
+  getModuleList() {
+    let params = {
+      pageIndex: this.data.pageIndex,
+      pageSize: this.data.pageSize,
+      // pid: this.data.pid
+      typeCode: this.data.typeCode
+    }
+    api.getModuleList(params).then(res => {
+      const customOrder = ["有话说", "点将台", "联动轴", "闪光灯"];
+      res.data.sort((a, b) => {
+        return customOrder.indexOf(a.name) - customOrder.indexOf(b.name);
+      });
+      this.setData({
+        modulelist: this.data.modulelist.concat(res.data),
+        loadMoreType: res.data.length === this.data.pageSize ? 'loading' : 'none',
+        loadMoreVisible: res.data.length === this.data.pageSize ? false : true
+      })
+      if (this.data.modulelist.length == 0) {//没有值
+        this.setData({
+          nodata: true,
+          loadMoreType: 'none',
+          loadMoreVisible: false,
+        })
+      }
+    }).catch(err => {
+      this.setData({
+        modulelist: [],
+        nodata: true,
+        loadMoreType: 'none',
+        loadMoreVisible: false,
+      })
+      console.log(err)
+    })
+  },
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+    this.setData({
+      loadMoreVisible: true
+    })
+    if (this.data.loadMoreType === 'loading') {
+      this.setData({
+        pageIndex: this.data.pageIndex + 1,
+        pageSize: this.data.pageSize,
+      })
+      this.getModuleList()
+    }
+  },
+  goDetails (e) {
+      console.log(e);
+      if(e.currentTarget.dataset.module.typeCode == '01'){
+        wx.redirectTo({
+          url: '/pages/discussion/discussion',
+        })
+        return
+      }else if(e.currentTarget.dataset.module.typeCode == 'DJT'){
+        wx.navigateTo({
+          url: '/subpages/mediateHypermarket/page/dotGeneral/dotGeneral',
+        })
+        return
+      }
+    wx.navigateTo({
+      url: `/subpages/workTodo/pages/moduleList/moduleList?pid=${e.currentTarget.dataset.module.id}&typeCode=${e.currentTarget.dataset.module.typeCode}&name=${e.currentTarget.dataset.module.name}&style=${e.currentTarget.dataset.module.moduleStyle}`,
+    })
+  }
+})

epdc-resident-mp-yushan/subpages/mediateHypermarket/page/mtct/mtct.json

@@ -0,0 +1,9 @@
+{
+    "navigationBarTitleText": "矛调超市",
+    "navigationBarTextStyle": "white",
+    "navigationBarBackgroundColor": "#bb0300",
+    "usingComponents": {
+      "load-more": "/components/loadMore/loadMore",
+      "no-data":"/components/nodata/nodata"
+    }
+  }

epdc-resident-mp-yushan/subpages/mediateHypermarket/page/mtct/mtct.wxml

@@ -0,0 +1,16 @@
+<!--subpages/mediateHypermarket/page/index/index.wxml-->
+<button class="index top" 
+        hover-class="hover-btn"  
+        bindtap="goDetails"  
+        wx:for-item="item" 
+        wx:key="index" 
+        wx:for-index="index" 
+        wx:for="{{modulelist}}"
+        data-module="{{item}}">
+  <image class="img-bj" src="{{item.imgUrl}}"></image>
+  <!-- {{item.name}} -->
+</button>
+
+<!-- <load-more loadMoreType="{{loadMoreType}}" loadMoreVisible="{{loadMoreVisible && isLoadMore}}"></load-more> -->
+
+<no-data isShow="{{nodata}}"></no-data>

epdc-resident-mp-yushan/subpages/mediateHypermarket/page/mtct/mtct.wxss

@@ -0,0 +1,37 @@
+/* subpages/mediateHypermarket/page/index/index.wxss */
+.index {
+    width: calc(100% - 60rpx);
+    /* margin-top: 28rpx; */
+    height: 300rpx;
+    line-height: 300rpx;
+    margin-left: 30rpx;
+    border-radius: 10rpx;
+    position: relative;
+    margin-bottom: 28rpx;
+    padding: 0;
+    background: #fff;
+    box-shadow: 0rpx 4rpx 14rpx 0rpx rgba(5, 5, 5, 0.4);
+  }
+  
+  button::after {
+    border: none;
+  }
+  
+  .hover-btn {
+    box-shadow: 0 0 10rpx rgba(63, 63, 63, 0.1);
+  }
+  
+  .index.top {
+    margin-top: 28rpx;
+  }
+  
+  .index .img-bj {
+    border-radius: 10rpx;
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    top: 0;
+    left: 0;
+    z-index: 10;
+  }
+