Merge branch 'master' of http://121.42.41.42:7070/r/shibeirencai_wechat

pages/user/myFavorite/index.js

@@ -11,7 +11,7 @@ Page({
    */
   data: {
     list: [],
-    currentPage:1
+    currentPage: 1
   },
 
   /**
@@ -22,10 +22,10 @@ Page({
   },
 
 
-  fetchMyFavoriteList(){
+  fetchMyFavoriteList () {
     console.log('啦啦啦')
     let page = this.data.currentPage
-    userModel.getMyFavoriteList(page,res=>{
+    userModel.getMyFavoriteList(page, res => {
       console.log(res)
 
       const datas = res.result.list
@@ -38,8 +38,8 @@ Page({
           userIcon: item.groupAvator,
           userName: item.author,
           time: item.createTime,
-          commentNum: item.commentNum,
-          type:item.type
+          commentNum: item.commentNum || '',
+          type: item.type
         })
       })
       if (page == 1) {
@@ -67,34 +67,6 @@ Page({
       wx.stopPullDownRefresh()
     })
   },
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-
-  },
-
   /**
    * 页面相关事件处理函数--监听用户下拉动作
    */
@@ -109,29 +81,22 @@ Page({
    * 页面上拉触底事件的处理函数
    */
   onReachBottom: function () {
-    let page = this.data.currentPage+1
+    let page = this.data.currentPage + 1
     this.setData({
       currPage: page,
     })
     this.fetchMyFavoriteList()
   },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
-  },
-
-  clickListItem(e) {
-    const item = e.detail.item;
-    console.log(item);
-    let id = item.topicId
-    if(item.type === '1'){
+  clickListItem (e) {
+    console.log(e)
+    if (e.detail.id) {
+      let id = e.detail.id
       wx.navigateTo({
         url: `/pages/article/index?id=${id}`,
       })
-    }else {
+    } else {
+      const item = e.detail.item;
+      let id = item.topicId
       wx.navigateTo({
         url: `/pages/topics/interactive/topicArticle/index?topicId=${id}`,
       })

pages/user/myFavorite/index.json

@@ -2,6 +2,7 @@
   "enablePullDownRefresh": true,
   "navigationBarTitleText": "我的收藏",
   "usingComponents": {
-    "cell": "../myTopics/myParticipant/cell/index"
+    "cell": "../myTopics/myParticipant/cell/index",
+    "artice-cell": "/components/cell/index"
   }
 }

pages/user/myFavorite/index.wxml

@@ -1,15 +1,25 @@
 <!--pages/user/common/myFavorite/index.wxml-->
 <view class="container">
   <block wx:for="{{list}}" wx:key="{{index}}">
-    <cell 
-      topicId="{{item.topicId}}"
-      title="{{item.title}}" 
-      topicImg="{{item.topicImg}}"
-      userName="{{item.userName}}"
-      time="{{item.time}}" 
-      commentNum="{{item.commentNum}}"
-      type="{{item.type}}"
-      userIcon="{{item.userIcon}}"
-      bind:clickListItem="clickListItem"/>
+    <block wx:if="{{item.type === '1'}}"> 
+      <artice-cell 
+        cId="{{item.topicId}}"
+        title="{{item.title}}" 
+        time="{{item.time}}" 
+        bind:clickListItem="clickListItem"/>
+    </block>
+    <block wx:else>
+        <cell 
+        topicId="{{item.topicId}}"
+        title="{{item.title}}" 
+        topicImg="{{item.topicImg}}"
+        userName="{{item.userName}}"
+        time="{{item.time}}" 
+        commentNum="{{item.commentNum}}"
+        type="{{item.type}}"
+        userIcon="{{item.userIcon}}"
+        bind:clickListItem="clickListItem"/>
+    </block>
+
   </block>
 </view>