update topics and user

pages/topics/goodIdea/cell/index.js

@@ -4,15 +4,6 @@ Component({
    * 组件的属性列表
    */
   properties: {
-    // ideaId: String,
-    // articleImg: String,
-    // userIcon: String,
-    // userName: String,
-    // time: String,
-    // isGoodIdea:Number,
-    // detail:{
-    //   type: Object
-    // }
     itemData:Object
   },
 
@@ -28,8 +19,7 @@ Component({
    */
   methods: {
     onTap() {
-      console.log(this.properties)
+      this.triggerEvent('clickListItem', { itemData: this.properties.itemData })
-      // this.triggerEvent('clickListItem', { articleId: this.properties.articleId })
     }
   }
 })

pages/topics/goodIdea/cell/index.wxml

@@ -32,7 +32,7 @@
         </view>
         <view class="detail-userInfo-right">
           <view class="detail-comments-icon">
-            <image src=""></image>
+            <image src="/images/common/com_count.png"></image>
           </view>
           <view class="detail-commentNum">{{itemData.detail.commentNum}}</view>
         </view>

pages/topics/goodIdea/cell/index.wxss

@@ -35,6 +35,10 @@
   align-items: center;
   padding: 0 0 5px 0;
 }
+image{
+  width: 100%;
+  height: 100%;
+}
 .praise-icon{
   width: 15px;
   height: 15px;
@@ -99,11 +103,11 @@
   margin-right: 10px;
 }
 .detail-comments-icon{
-  width: 20px;
+  width: 15px;
-  height: 15px;
+  height: 12px;
+  line-height: 10px;
   margin-right: 5px;
   border-radius: 5px;
-  background-color: red;
 }
 .detail-commentNum,
 .praiseNum{

pages/topics/goodIdea/index.js

@@ -51,6 +51,9 @@ Component({
    * 组件的方法列表
    */
   methods: {
-
+    clickListItem(e){
+      const itemData = e.detail.itemData;
+      console.log(itemData);
+    }
   }
 })

pages/topics/index.js

@@ -6,7 +6,7 @@ Page({
    */
   data: {
     headerTitles: ['互动区', '金点子', '留言箱', '1', '2', '3', '4', '5', '6'],
-    selectedTitle: 1
+    selectedTitle: 0
   },
 
   /**

pages/topics/interactive/cell/index.js

@@ -29,7 +29,6 @@ Component({
    */
   methods: {
     onTap() {
-      console.log(this.properties)
       this.triggerEvent('clickListItem', { articleId: this.properties.articleId })
     }
   }

pages/topics/interactive/cell/index.wxml

@@ -16,7 +16,7 @@
 
       <view class="left-bottom-comments">
         <view class="comments-icon">
-          <image src=""></image>
+          <image src="/images/common/com_count.png"></image>
         </view>
         <view class="commentNum">{{commentNum}}</view>
       </view>
@@ -24,6 +24,6 @@
     </view>
   </view>
   <view class="right" wx:if="{{articleImg.length > 0}}">
-    <image src="./images/articleImg.png"></image>
+    <image class="articleImg" src="./images/articleImg.png"></image>
   </view>
 </view>

pages/topics/interactive/cell/index.wxss

@@ -44,11 +44,14 @@
   margin-right: 10px;
 }
 .comments-icon{
-  width: 20px;
+  width: 15px;
-  height: 15px;
+  height: 12px;
+  line-height: 10px;
   margin-right: 5px;
-  border-radius: 5px;
+}
-  background-color: red;
+.image_icon {
+  width: 100%;
+  height: 100%;
 }
 .commentNum{
   font-size: 12px;
@@ -60,7 +63,11 @@
   border-radius: 5px;
 }
 image{
-  width: 100%; 
+  width: 100%;
+  height: 100%;
+}
+.articleImg{
+  width: 100%;
   height: 100%;
   border-radius: 5px;
 }

pages/topics/interactive/index.js

@@ -46,6 +46,9 @@ Component({
    * 组件的方法列表
    */
   methods: {
-
+    clickListItem(e) {
+      const articleId = e.detail.articleId;
+      console.log(articleId);
+    }
   }
 })

pages/user/myActivity/index.js

@@ -5,7 +5,35 @@ Page({
    * 页面的初始数据
    */
   data: {
-
+    list: [
+      {
+        articleId: '1',
+        title: "市北区举行国际航运贸易金融创新中心核心区产业建设",
+        articleImg: "asdsad",
+        userIcon: "",
+        userName: "用户名",
+        time: "刚刚",
+        commentNum: "33",
+      },
+      {
+        articleId: "2",
+        title: "《大众日报》市北区举行国际航运贸易金融创新中心核心区产业建设",
+        articleImg: "",
+        userIcon: "",
+        userName: "用户名",
+        time: "1分钟前",
+        commentNum: "33",
+      },
+      {
+        articleId: "3",
+        title: "青岛医疗人工智能科技创新中心落户市北",
+        articleImg: "asdsadad",
+        userIcon: "",
+        userName: "用户名",
+        time: "1分钟前",
+        commentNum: "33",
+      }
+    ]
   },
 
   /**
@@ -62,5 +90,10 @@ Page({
    */
   onShareAppMessage: function () {
 
+  },
+
+  clickListItem(e) {
+    const articleId = e.detail.articleId;
+    console.log(articleId);
   }
 })

pages/user/myActivity/index.json

@@ -1,4 +1,6 @@
 {
   "navigationBarTitleText": "我的活动",
-  "usingComponents": {}
+  "usingComponents": {
+    "cell": "../myTopics/myParticipant/cell/index"
+  }
 }

pages/user/myActivity/index.wxml

@@ -1,2 +1,14 @@
 <!--pages/user/common/myActivity/index.wxml-->
-<text>pages/user/common/myActivity/index.wxml</text>
+<view class="container">
+  <block wx:for="{{list}}" wx:key="*this">
+    <cell 
+      articleId="{{item.articleId}}"
+      title="{{item.title}}" 
+      articleImg="{{item.articleImg}}"
+      userName="{{item.userName}}"
+      time="{{item.time}}" 
+      commentNum="{{item.commentNum}}"
+      showTop="{{item.showTop}}" 
+      bind:clickListItem="clickListItem"/>
+  </block>
+</view>

pages/user/myFavorite/index.js

@@ -5,7 +5,35 @@ Page({
    * 页面的初始数据
    */
   data: {
-
+    list: [
+      {
+        articleId: '1',
+        title: "市北区举行国际航运贸易金融创新中心核心区产业建设",
+        articleImg: "asdsad",
+        userIcon: "",
+        userName: "用户名",
+        time: "刚刚",
+        commentNum: "33",
+      },
+      {
+        articleId: "2",
+        title: "《大众日报》市北区举行国际航运贸易金融创新中心核心区产业建设",
+        articleImg: "",
+        userIcon: "",
+        userName: "用户名",
+        time: "1分钟前",
+        commentNum: "33",
+      },
+      {
+        articleId: "3",
+        title: "青岛医疗人工智能科技创新中心落户市北",
+        articleImg: "asdsadad",
+        userIcon: "",
+        userName: "用户名",
+        time: "1分钟前",
+        commentNum: "33",
+      }
+    ]
   },
 
   /**
@@ -62,5 +90,10 @@ Page({
    */
   onShareAppMessage: function () {
 
+  },
+
+  clickListItem(e) {
+    const articleId = e.detail.articleId;
+    console.log(articleId);
   }
 })

pages/user/myFavorite/index.json

@@ -1,4 +1,6 @@
 {
   "navigationBarTitleText": "我的收藏",
-  "usingComponents": {}
+  "usingComponents": {
+    "cell": "../myTopics/myParticipant/cell/index"
+  }
 }

pages/user/myFavorite/index.wxml

@@ -1,2 +1,14 @@
 <!--pages/user/common/myFavorite/index.wxml-->
-<text>pages/user/common/myFavorite/index.wxml</text>
+<view class="container">
+  <block wx:for="{{list}}" wx:key="*this">
+    <cell 
+      articleId="{{item.articleId}}"
+      title="{{item.title}}" 
+      articleImg="{{item.articleImg}}"
+      userName="{{item.userName}}"
+      time="{{item.time}}" 
+      commentNum="{{item.commentNum}}"
+      showTop="{{item.showTop}}" 
+      bind:clickListItem="clickListItem"/>
+  </block>
+</view>

pages/user/myIdea/index.js

@@ -5,7 +5,40 @@ Page({
    * 页面的初始数据
    */
   data: {
-
+    list: [
+      {
+        ideaId: '1',
+        userIcon: "",
+        userName: "用户名",
+        time: "刚刚",
+        isGoodIdea: 1,
+        praiseNum: "30",
+        detail: {
+          title: "习近平主持政治局第十七次集体... 拷贝",
+          userIcon: "",
+          userName: "用户名",
+          time: "刚刚",
+          commentNum: "33",
+          text: "【内容以实际活动为准】市北区位于青岛市主城区地理位置的中心，西部濒临胶州湾，东部与崂山区为邻，北部与李沧区接壤，南部与市南区毗"
+        }
+      },
+      {
+        ideaId: "2",
+        userIcon: "",
+        userName: "用户名",
+        time: "1分钟前",
+        isGoodIdea: 0,
+        praiseNum: "30",
+        detail: {
+          title: "习近平主持政治局第十七次集体... 拷贝",
+          userIcon: "",
+          userName: "用户名",
+          time: "刚刚",
+          commentNum: "33",
+          text: "市北区位于青岛市主城区地理位置的中心，西部濒临胶州湾，东部与崂山区为邻，北部与李沧区接壤，南部与市南区毗连，东西最大距离11. 拷贝 2"
+        }
+      }
+    ]
   },
 
   /**
@@ -62,5 +95,10 @@ Page({
    */
   onShareAppMessage: function () {
 
+  },
+
+  clickListItem(e) {
+    const itemData = e.detail.itemData;
+    console.log(itemData);
   }
 })

pages/user/myIdea/index.json

@@ -1,4 +1,6 @@
 {
   "navigationBarTitleText": "我的金点子",
-  "usingComponents": {}
+  "usingComponents": {
+    "cell": "../../topics/goodIdea/cell/index"
+  }
 }

pages/user/myIdea/index.wxml

@@ -1,2 +1,8 @@
 <!--pages/user/common/myIdea/index.wxml-->
-<text>pages/user/common/myIdea/index.wxml</text>
+<view class="container">
+  <block wx:for="{{list}}" wx:key="*this">
+    <cell 
+      itemData="{{item}}"
+      bind:clickListItem="clickListItem"/>
+  </block>
+</view>

pages/user/myMessage/cell/index.js

@@ -0,0 +1,36 @@
+// pages/user/myMessage/cell/index.js
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    itemData: Object
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    onTap() {
+      this.triggerEvent('clickListItem', { itemData: this.properties.itemData })
+    },
+
+    msgType_level(level){
+      switch (level){
+        case 0:
+          return "活动消息";
+        case 1:
+          return "消息提醒";
+        case 2:
+          return "系统消息";
+      }
+    }
+  }
+})

pages/user/myMessage/cell/index.json

@@ -0,0 +1,5 @@
+{
+  "component": true,
+  "usingComponents": {
+  }
+}

pages/user/myMessage/cell/index.wxml

@@ -0,0 +1,15 @@
+<!--pages/user/myMessage/cell/index.wxml-->
+<view class="cell" id="cell" bindtap="onTap">
+  <view class="item-left">
+    <image wx:if="{{itemData.msgType === 0}}" src="/images/user/activity_icon.png"></image>
+    <image wx:if="{{itemData.msgType === 1}}" src="/images/user/msg_icon.png"></image>
+    <image wx:if="{{itemData.msgType === 2}}" src="/images/user/system_icon.png"></image>
+  </view>
+  <view class="item-right">
+    <view class="item-text">
+      <view>{{itemData.msgName}}</view>
+      <view>{{itemData.title}}</view>
+    </view>
+    <view class="item-time">{{itemData.time}}</view>
+  </view>
+</view>

pages/user/myMessage/cell/index.wxss

@@ -0,0 +1,35 @@
+/* pages/user/myMessage/cell/index.wxss */
+.cell{
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  padding: 5px 10px 5px 10px;
+}
+.item-left{
+  width: 40px;
+  height: 40px;
+}
+image{
+  width: 40px;
+  height: 40px;
+}
+.item-right{
+  display: flex;
+  width: 100%;
+  flex-direction: row;
+  justify-content: space-between;
+  padding: 10px;
+  border-bottom: 1px solid #E7E7E7;
+}
+.item-text :first-child{
+  font-size: 15px;
+  color: #171717;
+}
+.item-text :last-child{
+  font-size: 13px;
+  color: #999999;
+}
+.item-time{
+  font-size: 13px;
+  color: #ABABAB;
+}

pages/user/myMessage/index.js

@@ -5,7 +5,26 @@ Page({
    * 页面的初始数据
    */
   data: {
-
+    list:[
+      {
+        msgName:"活动提醒",
+        msgType:0,
+        title:"您的报名活动还有两天开始，立即查看",
+        time:"11:58"
+      },
+      {
+        msgName: "消息提醒",
+        msgType: 1,
+        title: "您的评论被点赞，立即查看",
+        time: "11:58"
+      },
+      {
+        msgName: "系统提醒",
+        msgType: 2,
+        title: "您的报名活动还有两天开始，查看详情",
+        time: "11:58"
+      }
+    ]
   },
 
   /**
@@ -62,5 +81,10 @@ Page({
    */
   onShareAppMessage: function () {
 
+  },
+
+  clickListItem(e) {
+    const itemData = e.detail.itemData;
+    console.log(itemData);
   }
 })

pages/user/myMessage/index.json

@@ -1,4 +1,6 @@
 {
   "navigationBarTitleText": "我的消息",
-  "usingComponents": {}
+  "usingComponents": {
+    "cell": "./cell/index"
+  }
 }

pages/user/myMessage/index.wxml

@@ -1,2 +1,8 @@
 <!--pages/user/common/myMessage/index.wxml-->
-<text>pages/user/common/myMessage/index.wxml</text>
+<view class="container">
+  <block wx:for="{{list}}" wx:key="*this">
+    <cell 
+      itemData="{{item}}"
+      bind:clickListItem="clickListItem"/>
+  </block>
+</view>

pages/user/myTopics/index.js

@@ -5,7 +5,8 @@ Page({
    * 页面的初始数据
    */
   data: {
-
+    headerTitles: ['我参与的', '我发布的'],
+    selectedTitle: 0
   },
 
   /**
@@ -62,5 +63,13 @@ Page({
    */
   onShareAppMessage: function () {
 
+  },
+
+  // 定义点击标题的事件处理函数，将选中标题的id赋值给selectedTitle
+  tapSegment: function (e) {
+    const item = e.detail;
+    this.setData({
+      selectedTitle: item.index
+    });
   }
 })

pages/user/myTopics/index.json

@@ -1,4 +1,8 @@
 {
   "navigationBarTitleText": "我的议题",
-  "usingComponents": {}
+  "usingComponents": {
+    "e-segment": "/components/segment/index",
+    "myParticipant": "./myParticipant/index",
+    "myRelease": "./myRelease/index"
+  }
 }

pages/user/myTopics/index.wxml

@@ -1,2 +1,6 @@
 <!--pages/user/common/myTopics/index.wxml-->
-<text>pages/user/common/myTopics/index.wxml</text>
+<view class="content-wrapper">
+  <e-segment bind:tapSegment="tapSegment" headerTitles="{{headerTitles}}" defaultSelectIndex="{{selectedTitle}}"/>
+  <myParticipant wx:if="{{selectedTitle==0}}" />
+  <myRelease wx:if="{{selectedTitle==1}}" />
+</view>

pages/user/myTopics/myParticipant/cell/index.js

@@ -0,0 +1,35 @@
+// pages/topics/common/interactive/common/imageCell/index.js
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    articleId: String,
+    title: String,
+    articleImg:String,
+    userIcon:String,
+    userName:String,
+    time: String,
+    commentNum: String,
+    showTop: {
+      type: Boolean,
+      value: false,
+    }
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    onTap() {
+      this.triggerEvent('clickListItem', { articleId: this.properties.articleId })
+    }
+  }
+})

pages/user/myTopics/myParticipant/cell/index.json

@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}

pages/user/myTopics/myParticipant/cell/index.wxml

@@ -0,0 +1,29 @@
+<!--pages/topics/common/interactive/common/imageCell/index.wxml-->
+<view class="cell" id="cell" bindtap="onTap">
+  <view class="left {{articleImg === '' ? 'leftActive' : ''}}">
+    <view class="left-top">
+      <view class="cell_title">{{title}}</view>
+    </view>
+    <view class="left-bottom">
+    
+      <view class="left-bottom-userInfo">
+        <view class="user-icon">
+          <image src="{{userIcon}}"></image>
+        </view>
+        <view class="userName">{{userName}}</view>
+        <view class="cell_info_meta">{{time}}</view>
+      </view>
+
+      <view class="left-bottom-comments">
+        <view class="comments-icon">
+          <image class="image_icon" src="/images/common/com_count.png"></image>
+        </view>
+        <view class="commentNum">{{commentNum}}</view>
+      </view>
+
+    </view>
+  </view>
+  <view class="right" wx:if="{{articleImg.length > 0}}">
+    <image class="articleImg" src="./images/articleImg.png"></image>
+  </view>
+</view>

pages/user/myTopics/myParticipant/cell/index.wxss

@@ -0,0 +1,105 @@
+/* pages/topics/common/interactive/common/imageCell/index.wxss */
+.cell {
+  
+  display: flex;
+  flex-direction: row;
+  padding: 10px 20px;
+  box-sizing: border-box;
+  align-items: center;
+  position: relative;
+}
+.cell:after {
+  content: "";
+  position: absolute;
+  bottom: 1px;
+  left: 20px;
+  right: 20px;
+  border-bottom: 1px solid #E7E7E7;
+}
+.left{
+  display: flex;
+  flex-direction: column;
+  width: 70%;
+}
+.leftActive{
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+}
+.left-bottom{
+  display: flex;
+  flex: row;
+  justify-content: space-between;
+}
+.left-bottom-userInfo{
+  display: flex;
+  flex: row;
+  align-items: center;
+}
+.user-icon{
+  width: 20px;
+  height: 20px;
+  border-radius: 50%;
+  background-color: #EEEEEE;
+}
+.userName{
+  margin: 0 5px 0 5px;
+  font-size: 12px;
+  color: #3B3B3B;
+}
+.left-bottom-comments{
+  display: flex;
+  flex: row;
+  align-items: center;
+  margin-right: 10px;
+}
+.comments-icon{
+  width: 15px;
+  height: 12px;
+  line-height: 10px;
+  margin-right: 5px;
+}
+.image_icon {
+  width: 100%;
+  height: 100%;
+}
+.commentNum{
+  font-size: 12px;
+  color: #3B3B3B;
+}
+.right{
+  width: 30%;
+  height: 70px;
+  border-radius: 5px;
+}
+image{
+  width: 100%; 
+  height: 100%;
+}
+.articleImg{
+  width: 100%;
+  height: 100%;
+  border-radius: 5px;
+}
+.cell_title {
+  font-weight: 300;
+  font-size: 17px;
+  color: #000;
+}
+.cell_title_selected {
+  color: #9C9C9C;
+}
+.cell_info_meta {
+  padding-top: 10rpx;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  font-size: 12px;
+  line-height: 12px;
+  color: #D4D4D4;
+}
+.cell_info_top {
+  padding: 0 10px;
+  width: 20px;
+  height: 12px;
+}

pages/user/myTopics/myParticipant/index.js

@@ -0,0 +1,54 @@
+// pages/user/myTopics/myParticipant/index.js
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    list: [
+      {
+        articleId: '1',
+        title: "市北区举行国际航运贸易金融创新中心核心区产业建设",
+        articleImg: "asdsad",
+        userIcon: "",
+        userName: "用户名",
+        time: "刚刚",
+        commentNum: "33",
+      },
+      {
+        articleId: "2",
+        title: "《大众日报》市北区举行国际航运贸易金融创新中心核心区产业建设",
+        articleImg: "",
+        userIcon: "",
+        userName: "用户名",
+        time: "1分钟前",
+        commentNum: "33",
+      },
+      {
+        articleId: "3",
+        title: "青岛医疗人工智能科技创新中心落户市北",
+        articleImg: "asdsadad",
+        userIcon: "",
+        userName: "用户名",
+        time: "1分钟前",
+        commentNum: "33",
+      }
+    ]
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    clickListItem(e) {
+      const articleId = e.detail.articleId;
+      console.log(articleId);
+    }
+  }
+})

pages/user/myTopics/myParticipant/index.json

@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "cell": "./cell/index"
+  }
+}

pages/user/myTopics/myParticipant/index.wxml

@@ -0,0 +1,14 @@
+<!--pages/user/myTopics/myParticipant/index.wxml-->
+<view class="container">
+  <block wx:for="{{list}}" wx:key="*this">
+    <cell 
+      articleId="{{item.articleId}}"
+      title="{{item.title}}" 
+      articleImg="{{item.articleImg}}"
+      userName="{{item.userName}}"
+      time="{{item.time}}" 
+      commentNum="{{item.commentNum}}"
+      showTop="{{item.showTop}}" 
+      bind:clickListItem="clickListItem"/>
+  </block>
+</view>

pages/user/myTopics/myParticipant/index.wxss

@@ -0,0 +1 @@
+/* pages/user/myTopics/myParticipant/index.wxss */

pages/user/myTopics/myRelease/index.js

@@ -0,0 +1,54 @@
+// pages/user/myTopics/myRelease/index.js
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    list: [
+      {
+        articleId: '1',
+        title: "市北区举行国际航运贸易金融创新中心核心区产业建设",
+        articleImg: "",
+        userIcon: "",
+        userName: "用户名",
+        time: "刚刚",
+        commentNum: "33",
+      },
+      {
+        articleId: "2",
+        title: "《大众日报》市北区举行国际航运贸易金融创新中心核心区产业建设",
+        articleImg: "",
+        userIcon: "",
+        userName: "用户名",
+        time: "1分钟前",
+        commentNum: "33",
+      },
+      {
+        articleId: "3",
+        title: "青岛医疗人工智能科技创新中心落户市北",
+        articleImg: "",
+        userIcon: "",
+        userName: "用户名",
+        time: "1分钟前",
+        commentNum: "33",
+      }
+    ]
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    clickListItem(e) {
+      const articleId = e.detail.articleId;
+      console.log(articleId);
+    }
+  }
+})

pages/user/myTopics/myRelease/index.json

@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "cell": "../myParticipant/cell/index"
+  }
+}

pages/user/myTopics/myRelease/index.wxml

@@ -0,0 +1,14 @@
+<!--pages/user/myTopics/myRelease/index.wxml-->
+<view class="container">
+  <block wx:for="{{list}}" wx:key="*this">
+    <cell 
+      articleId="{{item.articleId}}"
+      title="{{item.title}}" 
+      articleImg="{{item.articleImg}}"
+      userName="{{item.userName}}"
+      time="{{item.time}}" 
+      commentNum="{{item.commentNum}}"
+      showTop="{{item.showTop}}" 
+      bind:clickListItem="clickListItem"/>
+  </block>
+</view>

pages/user/myTopics/myRelease/index.wxss

@@ -0,0 +1 @@
+/* pages/user/myTopics/myRelease/index.wxss */