Browse Source

Merge refs/remotes/origin/master into refs/heads/master

master
lqq 6 years ago
parent
commit
cb8d3b20e0
  1. 6
      app.json
  2. 35
      pages/topics/common/goodIdea/cell/index.js
  3. 102
      pages/topics/common/goodIdea/index.js
  4. 1
      pages/topics/common/goodIdea/index.wxss
  5. 98
      pages/topics/common/interactive/index.js
  6. 7
      pages/topics/common/interactive/index.json
  7. 1
      pages/topics/common/interactive/index.wxss
  8. 0
      pages/topics/goodIdea/cell/images/goodIdea.png
  9. 0
      pages/topics/goodIdea/cell/images/praise.png
  10. 25
      pages/topics/goodIdea/cell/index.js
  11. 0
      pages/topics/goodIdea/cell/index.json
  12. 2
      pages/topics/goodIdea/cell/index.wxml
  13. 10
      pages/topics/goodIdea/cell/index.wxss
  14. 59
      pages/topics/goodIdea/index.js
  15. 1
      pages/topics/goodIdea/index.json
  16. 2
      pages/topics/goodIdea/index.wxml
  17. 1
      pages/topics/goodIdea/index.wxss
  18. 2
      pages/topics/index.js
  19. 6
      pages/topics/index.json
  20. 0
      pages/topics/interactive/cell/images/articleImg.png
  21. 1
      pages/topics/interactive/cell/index.js
  22. 0
      pages/topics/interactive/cell/index.json
  23. 4
      pages/topics/interactive/cell/index.wxml
  24. 17
      pages/topics/interactive/cell/index.wxss
  25. 59
      pages/topics/interactive/index.js
  26. 6
      pages/topics/interactive/index.json
  27. 18
      pages/topics/interactive/index.wxml
  28. 13
      pages/topics/interactive/index.wxss
  29. 65
      pages/topics/interactive/submitTopic/index.js
  30. 4
      pages/topics/interactive/submitTopic/index.json
  31. 9
      pages/topics/interactive/submitTopic/index.wxml
  32. 35
      pages/topics/interactive/submitTopic/index.wxss
  33. 0
      pages/topics/message/index.js
  34. 0
      pages/topics/message/index.json
  35. 0
      pages/topics/message/index.wxml
  36. 1
      pages/topics/message/index.wxss
  37. 35
      pages/user/myActivity/index.js
  38. 4
      pages/user/myActivity/index.json
  39. 14
      pages/user/myActivity/index.wxml
  40. 35
      pages/user/myFavorite/index.js
  41. 4
      pages/user/myFavorite/index.json
  42. 14
      pages/user/myFavorite/index.wxml
  43. 40
      pages/user/myIdea/index.js
  44. 4
      pages/user/myIdea/index.json
  45. 8
      pages/user/myIdea/index.wxml
  46. 36
      pages/user/myMessage/cell/index.js
  47. 5
      pages/user/myMessage/cell/index.json
  48. 15
      pages/user/myMessage/cell/index.wxml
  49. 35
      pages/user/myMessage/cell/index.wxss
  50. 26
      pages/user/myMessage/index.js
  51. 4
      pages/user/myMessage/index.json
  52. 8
      pages/user/myMessage/index.wxml
  53. 11
      pages/user/myTopics/index.js
  54. 6
      pages/user/myTopics/index.json
  55. 6
      pages/user/myTopics/index.wxml
  56. BIN
      pages/user/myTopics/myParticipant/cell/images/articleImg.png
  57. 35
      pages/user/myTopics/myParticipant/cell/index.js
  58. 4
      pages/user/myTopics/myParticipant/cell/index.json
  59. 29
      pages/user/myTopics/myParticipant/cell/index.wxml
  60. 105
      pages/user/myTopics/myParticipant/cell/index.wxss
  61. 54
      pages/user/myTopics/myParticipant/index.js
  62. 6
      pages/user/myTopics/myParticipant/index.json
  63. 14
      pages/user/myTopics/myParticipant/index.wxml
  64. 1
      pages/user/myTopics/myParticipant/index.wxss
  65. 54
      pages/user/myTopics/myRelease/index.js
  66. 6
      pages/user/myTopics/myRelease/index.json
  67. 2
      pages/user/myTopics/myRelease/index.wxml
  68. 1
      pages/user/myTopics/myRelease/index.wxss

6
app.json

@ -8,9 +8,6 @@
"pages/billboards/park/index",
"pages/billboards/policy/index",
"pages/billboards/policy/policy-list/index",
"pages/topics/common/interactive/index",
"pages/topics/common/message/index",
"pages/topics/common/goodIdea/index",
"pages/article/index",
"pages/register/index",
"pages/user/myActivity/index",
@ -18,7 +15,8 @@
"pages/user/myIdea/index",
"pages/user/myMessage/index",
"pages/user/myTopics/index",
"pages/user/myInfo/index"
"pages/user/myInfo/index",
"pages/topics/interactive/submitTopic/index"
],
"window": {
"backgroundTextStyle": "light",

35
pages/topics/common/goodIdea/cell/index.js

@ -1,35 +0,0 @@
// pages/topics/common/goodIdea/cell/index.js
Component({
/**
* 组件的属性列表
*/
properties: {
// ideaId: String,
// articleImg: String,
// userIcon: String,
// userName: String,
// time: String,
// isGoodIdea:Number,
// detail:{
// type: Object
// }
itemData:Object
},
/**
* 组件的初始数据
*/
data: {
},
/**
* 组件的方法列表
*/
methods: {
onTap() {
console.log(this.properties)
// this.triggerEvent('clickListItem', { articleId: this.properties.articleId })
}
}
})

102
pages/topics/common/goodIdea/index.js

@ -1,102 +0,0 @@
// pages/topics/common/goodIdea/index.js
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"
}
}
]
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
},
clickListItem(e) {
console.log(e.detail)
}
})

1
pages/topics/common/goodIdea/index.wxss

@ -1 +0,0 @@
/* pages/topics/common/goodIdea/index.wxss */

98
pages/topics/common/interactive/index.js

@ -1,98 +0,0 @@
// pages/topics/common/interactive/index.js
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",
}
]
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
wx.showNavigationBarLoading();
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
},
clickListItem(e){
console.log(e.detail)
}
})

7
pages/topics/common/interactive/index.json

@ -1,7 +0,0 @@
{
"enablePullDownRefresh": true,
"backgroundTextStyle": "dark",
"usingComponents": {
"cell":"./cell/index"
}
}

1
pages/topics/common/interactive/index.wxss

@ -1 +0,0 @@
/* pages/topics/common/interactive/index.wxss */

0
pages/topics/common/goodIdea/cell/images/goodIdea.png → pages/topics/goodIdea/cell/images/goodIdea.png

Before

Width:  |  Height:  |  Size: 9.2 KiB

After

Width:  |  Height:  |  Size: 9.2 KiB

0
pages/topics/common/goodIdea/cell/images/praise.png → pages/topics/goodIdea/cell/images/praise.png

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

25
pages/topics/goodIdea/cell/index.js

@ -0,0 +1,25 @@
// pages/topics/common/goodIdea/cell/index.js
Component({
/**
* 组件的属性列表
*/
properties: {
itemData:Object
},
/**
* 组件的初始数据
*/
data: {
},
/**
* 组件的方法列表
*/
methods: {
onTap() {
this.triggerEvent('clickListItem', { itemData: this.properties.itemData })
}
}
})

0
pages/topics/common/goodIdea/cell/index.json → pages/topics/goodIdea/cell/index.json

2
pages/topics/common/goodIdea/cell/index.wxml → 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>

10
pages/topics/common/goodIdea/cell/index.wxss → 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;
height: 15px;
width: 15px;
height: 12px;
line-height: 10px;
margin-right: 5px;
border-radius: 5px;
background-color: red;
}
.detail-commentNum,
.praiseNum{

59
pages/topics/goodIdea/index.js

@ -0,0 +1,59 @@
// pages/topics/goodIdea/index.js
Component({
/**
* 组件的属性列表
*/
properties: {
},
/**
* 组件的初始数据
*/
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"
}
}
]
},
/**
* 组件的方法列表
*/
methods: {
clickListItem(e){
const itemData = e.detail.itemData;
console.log(itemData);
}
}
})

1
pages/topics/common/goodIdea/index.json → pages/topics/goodIdea/index.json

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

2
pages/topics/common/goodIdea/index.wxml → pages/topics/goodIdea/index.wxml

@ -1,4 +1,4 @@
<!--pages/topics/common/goodIdea/index.wxml-->
<!--pages/topics/goodIdea/index.wxml-->
<view class="container">
<block wx:for="{{list}}" wx:key="*this">
<cell

1
pages/topics/goodIdea/index.wxss

@ -0,0 +1 @@
/* pages/topics/goodIdea/index.wxss */

2
pages/topics/index.js

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

6
pages/topics/index.json

@ -1,8 +1,8 @@
{
"usingComponents": {
"e-segment":"/components/segment/index",
"message": "./common/message/index",
"interactive": "./common/interactive/index",
"goodIdea": "./common/goodIdea/index"
"message": "./message/index",
"interactive": "./interactive/index",
"goodIdea": "./goodIdea/index"
}
}

0
pages/topics/common/interactive/cell/images/articleImg.png → pages/topics/interactive/cell/images/articleImg.png

Before

Width:  |  Height:  |  Size: 76 KiB

After

Width:  |  Height:  |  Size: 76 KiB

1
pages/topics/common/interactive/cell/index.js → pages/topics/interactive/cell/index.js

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

0
pages/topics/common/interactive/cell/index.json → pages/topics/interactive/cell/index.json

4
pages/topics/common/interactive/cell/index.wxml → 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>

17
pages/topics/common/interactive/cell/index.wxss → pages/topics/interactive/cell/index.wxss

@ -44,11 +44,14 @@
margin-right: 10px;
}
.comments-icon{
width: 20px;
height: 15px;
width: 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;
}

59
pages/topics/interactive/index.js

@ -0,0 +1,59 @@
// pages/topics/interactive/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: {
onTap(){
wx.navigateTo({
url: `/pages/topics/interactive/submitTopic/index`,
})
},
clickListItem(e) {
const articleId = e.detail.articleId;
console.log(articleId);
}
}
})

6
pages/topics/interactive/index.json

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

18
pages/topics/interactive/index.wxml

@ -0,0 +1,18 @@
<!--pages/topics/interactive/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 class="publish" bindtap="onTap">
<image src="/images/topic/publish.png"></image>
</view>
</view>

13
pages/topics/interactive/index.wxss

@ -0,0 +1,13 @@
/* pages/topics/interactive/index.wxss */
.publish{
position: fixed;
width: 40px;
height: 40px;
right: 20px;
bottom: 40px;
}
image{
width: 100%;
height: 100%;
}

65
pages/topics/interactive/submitTopic/index.js

@ -0,0 +1,65 @@
// pages/topics/interactive/submitTopic/index.js
Page({
/**
* 页面的初始数据
*/
data: {
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})

4
pages/topics/interactive/submitTopic/index.json

@ -0,0 +1,4 @@
{
"navigationBarTitleText": "新建议题",
"usingComponents": {}
}

9
pages/topics/interactive/submitTopic/index.wxml

@ -0,0 +1,9 @@
<!--pages/topics/interactive/submitTopic/index.wxml-->
<view class="container">
<input class="title" bindinput="bindTextInput" placeholder="议题"></input>
<view class="line-view"></view>
<textarea class="textArea" bindinput="bindTextAreaInput" placeholder="详情内容" />
<view class="btnView">
<button class="submitBtn" bindtap="submit">提交</button>
</view>
</view>

35
pages/topics/interactive/submitTopic/index.wxss

@ -0,0 +1,35 @@
/* pages/topics/interactive/submitTopic/index.wxss */
.container{
padding: 20px;
}
.title{
font-size: 15px;
}
.textArea{
font-size: 14px;
}
.line-view{
height: 1px;
background-color: #F1F1F1;
margin: 10px 0 10px 0;
}
.btnView{
position: fixed;
width: 90%;
height: 45px;
bottom: 10px;
}
.submitBtn{
/* background-image: url("/images/common/btn_bg.png"); */
height: 45px;
line-height: 40px;
border-radius: 5px;
color: white;
font-size: 14px;
background-image: linear-gradient(
to right,
#FD6553 30%,
#D70403 100%
);
}

0
pages/topics/common/message/index.js → pages/topics/message/index.js

0
pages/topics/common/message/index.json → pages/topics/message/index.json

0
pages/topics/common/message/index.wxml → pages/topics/message/index.wxml

1
pages/topics/common/message/index.wxss → pages/topics/message/index.wxss

@ -17,7 +17,6 @@
width: 90%;
height: 45px;
bottom: 10px;
background-color: white;
}
.submitBtn{
/* width: 100%; */

35
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);
}
})

4
pages/user/myActivity/index.json

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

14
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>

35
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);
}
})

4
pages/user/myFavorite/index.json

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

14
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>

40
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);
}
})

4
pages/user/myIdea/index.json

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

8
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>

36
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 "系统消息";
}
}
}
})

5
pages/user/myMessage/cell/index.json

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

15
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>

35
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;
}

26
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);
}
})

4
pages/user/myMessage/index.json

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

8
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>

11
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
});
}
})

6
pages/user/myTopics/index.json

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

6
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>

BIN
pages/user/myTopics/myParticipant/cell/images/articleImg.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 76 KiB

35
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 })
}
}
})

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

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

29
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>

105
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;
}

54
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);
}
}
})

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

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

14
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>

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

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

54
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);
}
}
})

6
pages/user/myTopics/myRelease/index.json

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

2
pages/topics/common/interactive/index.wxml → pages/user/myTopics/myRelease/index.wxml

@ -1,4 +1,4 @@
<!--pages/topics/common/interactive/index.wxml-->
<!--pages/user/myTopics/myRelease/index.wxml-->
<view class="container">
<block wx:for="{{list}}" wx:key="*this">
<cell

1
pages/user/myTopics/myRelease/index.wxss

@ -0,0 +1 @@
/* pages/user/myTopics/myRelease/index.wxss */
Loading…
Cancel
Save