bug修改

models/topic.js

@@ -324,11 +324,11 @@ class TopicModel extends HTTP {
   //促招引
   getAttractList(typeCode, page, pageSize, success) {
     let params = {
-      url: TopicBaseUrl.attract_list_url + "?pageNo=" + page,
+      url: TopicBaseUrl.attract_list_url + "?pageNo=" + page+"&pageSize="+pageSize,
       method: Method.POST,
       data: {
         typeCode: typeCode,
-        pageSize: pageSize
+        // pageSize: pageSize
       },
       success: success
     }

pages/article/index.wxml

@@ -21,8 +21,7 @@
       <view class="collect_num">收藏：{{collectNum}}</view>
     </view>
   </view>
-  <view class="page_footer">
+  <!-- <view class="page_footer">
-    <!-- <e-ibutton title="{{disable ? '已报名' : '在线报名'}}" bind:onTap="onlineSubmit" disable="{{disable}}"/> -->
     <block wx:if="{{ flag == 0 }}">
       <e-ibutton title="在线报名" bind:onTap="onlineSubmit" disable="{{disable}}"/>
     </block>
@@ -35,6 +34,6 @@
     <block wx:if="{{ flag == 3 }}">
       <e-ibutton title="在线报名" bind:onTap="onlineSubmit" disable="true"/>
     </block>
-  </view>
+  </view> -->
   
 </view>

pages/home/index.js

@@ -82,6 +82,7 @@ Page({
           image: item.titlePic,
           showTop: item.isTop == 1 ? true : false,
           time: dayjs(item.createTime).toNow(),
+          type:item.type,
           readed: item.isRead == 0 ? false : true
         })
       })
@@ -172,17 +173,31 @@ Page({
   //点击列表cell获取id，进入页面
   clickListItem (e) {
     //console.log(e.detail)
-    const {id, index} = e.detail
+    console.log('点击---',e)
+    const {id, index,type} = e.detail
     this.setData({
       [`list[${index}].readed`]: true
     })
+    //type 文章/活动标识0-文章,1-活动
+   if(type==0){
     this.gotoArticePage(id)
+   }
+   else{
+    this.gotoActivityPage(id)
+   }
   },
+  //文章  0
   gotoArticePage (id) {
     wx.navigateTo({
       url: `/pages/article/index?id=${id}`,
     })
   },
+  //活动  1
+  gotoActivityPage (id) {
+    wx.navigateTo({
+      url: `/pages/topics/activity/activityDetail/index?activityId=${id}`,
+    })
+  },
   onClose(){
     this.setData({
       show:false

pages/home/index.wxml

@@ -11,6 +11,7 @@
       title="{{item.title}}" 
       time="{{item.time}}" 
       showTop="{{item.showTop}}" 
+      type="{{item.type}}"
       bind:clickListItem="clickListItem"/>
   </block>
   <e-empty loading="{{loading}}"/>

pages/topics/activity/activityDetail/index.wxml

@@ -53,9 +53,9 @@
       </view>
     </view>
   </view>
+  <view class="standView"></view>
   <!--活动报名-->
   <view class="page_footer">
-    <!-- <e-ibutton title="{{disable ? '已报名' : '在线报名'}}" bind:onTap="onlineSubmit" disable="{{disable}}"/> -->
     <block wx:if="{{ flag == 0 }}">
       <e-ibutton title="在线报名" bind:onTap="onlineSubmit" disable="{{disable}}" />
     </block>

pages/topics/activity/activityDetail/index.wxss

@@ -214,3 +214,10 @@
 .read_num, .collect_num {
   color: #999;
 }
+
+
+/* 占位view */
+.standView{
+  width: 100%;
+  height: 160rpx;
+}

pages/topics/activity/cell/index.js

@@ -12,6 +12,10 @@ Component({
     time: String,
     commentNum: Number,
     dataIndex:Number,
+    readed: {
+      type:Boolean,
+      value: false,
+    },
   },
 
   /**

pages/topics/attract/index.js

@@ -40,7 +40,8 @@ Component({
             image: item.titlePic,
             showTop: item.isTop == 1 ? true : false,
             time: item.createTime,
-            readed: item.isRead == 0 ? false : true
+            readed: item.isRead == 0 ? false : true,
+            type: item.type
           })
         })
         th.setData({
@@ -58,7 +59,8 @@ Component({
             image: item.titlePic,
             showTop: item.isTop == 1 ? true : false,
             time: item.createTime,
-            readed: item.isRead == 0 ? false : true
+            readed: item.isRead == 0 ? false : true,
+            type: item.type
           })
         })
         th.setData({
@@ -68,31 +70,32 @@ Component({
     },
     //海洋人才赋能中心详情
     clickListItem(e) {
-      //console.log(e.detail)
       const {
         id,
-        index
+        index,
-      } = e.detail
+        type
-      this.setData({
-        [`oceanList[${index}].readed`]: true
-      })
-      this.goOceanDetail(id)
-    },
-    clickListItemSpace(e) {
-      const {
-        id,
-        index
       } = e.detail
       this.setData({
         [`oceanList[${index}].readed`]: true
       })
+      //type 文章/活动标识0-文章,1-活动
+      if (type == 0) {
         this.goOceanDetail(id)
+      } else {
+        this.gotoActivityPage(id)
+      }
     },
     goOceanDetail(id) {
       wx.navigateTo({
         url: `/pages/topics/attract/oceanDetail/index?id=${id}`,
       })
     },
+    //活动  1
+    gotoActivityPage(id) {
+      wx.navigateTo({
+        url: `/pages/topics/activity/activityDetail/index?activityId=${id}`,
+      })
+    },
     //海洋人才赋能中心更多
     goOceanMore() {
       wx.navigateTo({
@@ -105,12 +108,18 @@ Component({
       //console.log(e.detail)
       const {
         id,
-        index
+        index,
+        type
       } = e.detail
       this.setData({
         [`spaceList[${index}].readed`]: true
       })
+      //type 文章/活动标识0-文章,1-活动
+      if (type == 0) {
         this.goSpacenDetail(id)
+      } else {
+        this.gotoActivityPage(id)
+      }
     },
     goSpacenDetail(id) {
       wx.navigateTo({

pages/topics/attract/index.wxml

@@ -8,7 +8,7 @@
       <view class="more"  bindtap="goOceanMore">更多></view>
     </view>
     <block wx:for="{{oceanList}}" wx:key="index">
-      <e-cell index="{{index}}" readed="{{item.readed}}" image="{{item.image}}" cId="{{item.id}}" title="{{item.title}}" time="{{item.time}}" showTop="{{item.showTop}}" bind:clickListItem="clickListItem" />
+      <e-cell index="{{index}}" readed="{{item.readed}}" image="{{item.image}}" cId="{{item.id}}" title="{{item.title}}" time="{{item.time}}" showTop="{{item.showTop}}"  type="{{item.type}}" bind:clickListItem="clickListItem" />
     </block>
     <e-empty loading="{{loading}}" />
   </view>
@@ -21,7 +21,7 @@
       <view class="more" bindtap="goSpaceMore">更多></view>
     </view>
     <block wx:for="{{spaceList}}" wx:key="index">
-      <e-cell index="{{index}}" readed="{{item.readed}}" image="{{item.image}}" cId="{{item.id}}" title="{{item.title}}" time="{{item.time}}" showTop="{{item.showTop}}" bind:clickListItem="clickListItemSpace" />
+      <e-cell index="{{index}}" readed="{{item.readed}}" image="{{item.image}}" cId="{{item.id}}" title="{{item.title}}" time="{{item.time}}" showTop="{{item.showTop}}"  type="{{item.type}}" bind:clickListItem="clickListItemSpace" />
     </block>
     <e-empty loading="{{loading}}" />
   </view>

pages/topics/attract/ocean/index.js

@@ -94,7 +94,8 @@ Page({
           image: item.titlePic,
           showTop: item.isTop == 1 ? true : false,
           time: item.createTime,
-          readed: item.isRead == 0 ? false : true
+          readed: item.isRead == 0 ? false : true,
+          type:item.type
         })
       })
       if (page == 1) {
@@ -120,19 +121,32 @@ Page({
   },
   //海洋人才赋能中心点击列表cell获取id，进入页面
   clickListItem(e) {
-    console.log(e)
+    console.log('海洋人才赋能中心点击-->',e)
     const {
       id,
-      index
+      index,
+      type
     } = e.detail
     this.setData({
       [`list[${index}].readed`]: true
     })
+    // this.goOceanDetail(id)
+    //type 文章/活动标识0-文章,1-活动
+    if (type == 0) {
       this.goOceanDetail(id)
+    } else {
+      this.gotoActivityPage(id)
+    }
   },
   goOceanDetail(id) {
     wx.navigateTo({
       url: `/pages/topics/attract/oceanDetail/index?id=${id}`,
     })
   },
+  //活动  1
+  gotoActivityPage(id) {
+    wx.navigateTo({
+      url: `/pages/topics/activity/activityDetail/index?activityId=${id}`,
+    })
+  },
 })

pages/topics/attract/ocean/index.wxml

@@ -1,7 +1,7 @@
 <!--pages/topics/attract/ocean/index.wxml-->
 <view class="container">
   <block wx:for="{{list}}" wx:key="index">
-    <e-cell index="{{index}}" readed="{{item.readed}}" image="{{item.image}}" cId="{{item.id}}" title="{{item.title}}" time="{{item.time}}" showTop="{{item.showTop}}" bind:clickListItem="clickListItem" />
+    <e-cell index="{{index}}" readed="{{item.readed}}" image="{{item.image}}" cId="{{item.id}}" title="{{item.title}}" time="{{item.time}}" showTop="{{item.showTop}}" type="{{item.type}}" bind:clickListItem="clickListItem" />
   </block>
   <e-empty loading="{{loading}}"/>
 </view>

pages/topics/attract/space/index.js

@@ -94,7 +94,8 @@ Page({
           image: item.titlePic,
           showTop: item.isTop == 1 ? true : false,
           time: item.createTime,
-          readed: item.isRead == 0 ? false : true
+          readed: item.isRead == 0 ? false : true,
+          type:item.type
         })
       })
       if (page == 1) {
@@ -114,7 +115,6 @@ Page({
           })
         }
       }
-      console.log(res)
       wx.stopPullDownRefresh()
     })
   },
@@ -123,16 +123,29 @@ Page({
     //console.log(e.detail)
     const {
       id,
-      index
+      index,
+      type
     } = e.detail
     this.setData({
       [`list[${index}].readed`]: true
     })
+    // this.goSpacenDetail(id)
+    //type 文章/活动标识0-文章,1-活动
+    if (type == 0) {
       this.goSpacenDetail(id)
+    } else {
+      this.gotoActivityPage(id)
+    }
   },
   goSpacenDetail(id) {
     wx.navigateTo({
       url: `/pages/topics/attract/spaceDetail/index?id=${id}`,
     })
   },
+  //活动  1
+  gotoActivityPage(id) {
+    wx.navigateTo({
+      url: `/pages/topics/activity/activityDetail/index?activityId=${id}`,
+    })
+  },
 })

pages/topics/attract/space/index.wxml

@@ -1,7 +1,7 @@
 <!--pages/topics/attract/space/index.wxml-->
 <view class="container">
   <block wx:for="{{list}}" wx:key="index">
-    <e-cell index="{{index}}" readed="{{item.readed}}" image="{{item.image}}" cId="{{item.id}}" title="{{item.title}}" time="{{item.time}}" showTop="{{item.showTop}}" bind:clickListItem="clickListItem" />
+    <e-cell index="{{index}}" readed="{{item.readed}}" image="{{item.image}}" cId="{{item.id}}" title="{{item.title}}" time="{{item.time}}" showTop="{{item.showTop}}" type="{{item.type}}" bind:clickListItem="clickListItem" />
   </block>
   <e-empty loading="{{loading}}"/>
 </view>

pages/topics/index.js

@@ -405,7 +405,7 @@ Page({
           page: page - 1
         })
       }
-
+       console.log('活动列表封装--->',th.data.activityList)
     })
   },
   changeActivityStatus:function(e){