From f697a734b260f78487f7ad6fbc276d1f14be12e4 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Wed, 18 Oct 2023 09:09:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B2=E6=9D=AF=E8=AE=AE=E4=BA=8B,=E5=8F=8C?=
 =?UTF-8?q?=E8=82=A9=E8=B5=B0=E6=A0=BC=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../subpages/fingertipYushan/pages/index/index.js    | 12 ++++++------
 .../subpages/mediateHypermarket/page/index/index.js  |  5 +++--
 .../mediateHypermarket/page/index/index.wxml         | 12 ++++++------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/epdc-resident-mp-yushan/subpages/fingertipYushan/pages/index/index.js b/epdc-resident-mp-yushan/subpages/fingertipYushan/pages/index/index.js
index 120781b..17f810d 100644
--- a/epdc-resident-mp-yushan/subpages/fingertipYushan/pages/index/index.js
+++ b/epdc-resident-mp-yushan/subpages/fingertipYushan/pages/index/index.js
@@ -24,13 +24,12 @@ Page({
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad: function (options) {
+  onLoad: async function (options) {
     // this.modulelist()
     // wx.setNavigationBarTitle({
     //   title: options.title
     // })
-    this.getModuleList()
-    this.getNoticelist()
+   this.getModuleList()
   },
   // modulelist() {
   //   let that = this;
@@ -53,8 +52,10 @@ Page({
       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
+        loadMoreVisible: res.data.length === this.data.pageSize ? false : true,
+        typeId:res.data[0].id
       })
+      this.getNoticelist()
       if (this.data.modulelist.length == 0) {//没有值
         this.setData({
           nodata: true,
@@ -80,16 +81,15 @@ Page({
         pageSize: this.data.pageSize,
         typeId: this.data.typeId,
     }
+    console.log(params);
     contentList(params).then(res => {
       let list = [ ...res.data ]
-      console.log(list)
       that.setData({
         noticelist: that.data.noticelist.concat(list),
         loadMoreType: res.data.length === that.data.pageSize ? 'loading' : 'none',
         loadMoreVisible: res.data.length === that.data.pageSize ? false : true,
         preloadVisible: false
       })
-      console.log(this.data.noticelist);
       if (that.data.noticelist.length == 0) {
         that.setData({
           nodata: true,
diff --git a/epdc-resident-mp-yushan/subpages/mediateHypermarket/page/index/index.js b/epdc-resident-mp-yushan/subpages/mediateHypermarket/page/index/index.js
index 1a34b94..6318a2d 100644
--- a/epdc-resident-mp-yushan/subpages/mediateHypermarket/page/index/index.js
+++ b/epdc-resident-mp-yushan/subpages/mediateHypermarket/page/index/index.js
@@ -19,6 +19,7 @@ Page({
     moduleInfo: {
       style:'4'
     }, 
+    typeId:''
   },
 
   /**
@@ -30,7 +31,6 @@ Page({
     //   title: options.title
     // })
     this.getModuleList()
-    this.getNoticelist()
   },
   // modulelist() {
   //   let that = this;
@@ -49,12 +49,13 @@ Page({
       typeCode: this.data.typeCode
     }
     api.getModuleList(params).then(res => {
-      console.log(res.data)
       this.setData({
         modulelist: this.data.modulelist.concat(res.data),
+        typeId:res.data[0].id,
         loadMoreType: res.data.length === this.data.pageSize ? 'loading' : 'none',
         loadMoreVisible: res.data.length === this.data.pageSize ? false : true
       })
+      this.getNoticelist()
       if (this.data.modulelist.length == 0) {//没有值
         this.setData({
           nodata: true,
diff --git a/epdc-resident-mp-yushan/subpages/mediateHypermarket/page/index/index.wxml b/epdc-resident-mp-yushan/subpages/mediateHypermarket/page/index/index.wxml
index 4f54eaa..4ed57bd 100644
--- a/epdc-resident-mp-yushan/subpages/mediateHypermarket/page/index/index.wxml
+++ b/epdc-resident-mp-yushan/subpages/mediateHypermarket/page/index/index.wxml
@@ -8,16 +8,16 @@
 <view class="dept-list">
  
   <!-- 1. 图标、模块类别名称 -->
-  <view class="type-1" wx:if="{{modulelist.length > 0 && moduleInfo.style == '1'}}">
+  <!-- <view class="type-1" wx:if="{{modulelist.length > 0 && moduleInfo.style == '1'}}">
     <block wx:for="{{modulelist}}" wx:for-index="index" wx:for-item="item" wx:key="index">
       <view class="list-item" bindtap="navigateToType" data-info="{{item}}">
         <image class="list-icon" src="{{item.imgUrl}}"/>
         <view class="list-name">{{item.name}}</view>
       </view>
     </block>
-  </view>
+  </view> -->
   <!-- 2. 图片、标题、部门、浏览次数 -->
-  <view class="type-2" wx:if="{{noticelist.length > 0 && moduleInfo.style == '2'}}">
+  <!-- <view class="type-2" wx:if="{{noticelist.length > 0 && moduleInfo.style == '2'}}">
       <view class="list-item" wx:for="{{noticelist}}" data-id="{{item.id}}" bindtap="toDetail" wx:for-index="index" wx:for-item="item" wx:key="index">
         <view class="item-info">
           <view class="item-info-title">{{item.noticeTitle}}</view>
@@ -28,14 +28,14 @@
         </view>
         <image class="list-img" src="{{item.imgUrl}}"></image>
       </view>
-  </view>
+  </view> -->
   <!-- 3. 模块标题、内容、背景图 -->
-  <view class="type-3" wx:if="{{modulelist.length > 0 && moduleInfo.style == '3'}}">
+  <!-- <view class="type-3" wx:if="{{modulelist.length > 0 && moduleInfo.style == '3'}}">
     <view class="list-item color-{{index%6}}" wx:for="{{modulelist}}" bindtap="navigateToType" data-info="{{item}}" wx:for-index="index" wx:for-item="item" wx:key="index">
       <view class="title">{{item.name}}</view>
       
     </view>
-  </view>
+  </view> -->
   <!-- 4. 标题、部门、时间 -->
   <view class="type-4" wx:if="{{noticelist.length > 0 && moduleInfo.style == '4'}}">
     <view class="list-item" wx:for="{{noticelist}}" bindtap="toDetail" data-id="{{item.id}}" wx:for-index="index" wx:for-item="item" wx:key="index">