diff --git a/app.json b/app.json
index 118cedb..c5208eb 100644
--- a/app.json
+++ b/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",
diff --git a/pages/topics/common/goodIdea/cell/index.js b/pages/topics/common/goodIdea/cell/index.js
deleted file mode 100644
index 07c4608..0000000
--- a/pages/topics/common/goodIdea/cell/index.js
+++ /dev/null
@@ -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 })
- }
- }
-})
diff --git a/pages/topics/common/goodIdea/index.js b/pages/topics/common/goodIdea/index.js
deleted file mode 100644
index 58bf3c8..0000000
--- a/pages/topics/common/goodIdea/index.js
+++ /dev/null
@@ -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)
- }
-})
\ No newline at end of file
diff --git a/pages/topics/common/goodIdea/index.wxss b/pages/topics/common/goodIdea/index.wxss
deleted file mode 100644
index 70e56bc..0000000
--- a/pages/topics/common/goodIdea/index.wxss
+++ /dev/null
@@ -1 +0,0 @@
-/* pages/topics/common/goodIdea/index.wxss */
\ No newline at end of file
diff --git a/pages/topics/common/interactive/index.js b/pages/topics/common/interactive/index.js
deleted file mode 100644
index 2efd82c..0000000
--- a/pages/topics/common/interactive/index.js
+++ /dev/null
@@ -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)
- }
-})
\ No newline at end of file
diff --git a/pages/topics/common/interactive/index.json b/pages/topics/common/interactive/index.json
deleted file mode 100644
index 6177863..0000000
--- a/pages/topics/common/interactive/index.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "enablePullDownRefresh": true,
- "backgroundTextStyle": "dark",
- "usingComponents": {
- "cell":"./cell/index"
- }
-}
\ No newline at end of file
diff --git a/pages/topics/common/interactive/index.wxss b/pages/topics/common/interactive/index.wxss
deleted file mode 100644
index 831b94e..0000000
--- a/pages/topics/common/interactive/index.wxss
+++ /dev/null
@@ -1 +0,0 @@
-/* pages/topics/common/interactive/index.wxss */
\ No newline at end of file
diff --git a/pages/topics/common/goodIdea/cell/images/goodIdea.png b/pages/topics/goodIdea/cell/images/goodIdea.png
similarity index 100%
rename from pages/topics/common/goodIdea/cell/images/goodIdea.png
rename to pages/topics/goodIdea/cell/images/goodIdea.png
diff --git a/pages/topics/common/goodIdea/cell/images/praise.png b/pages/topics/goodIdea/cell/images/praise.png
similarity index 100%
rename from pages/topics/common/goodIdea/cell/images/praise.png
rename to pages/topics/goodIdea/cell/images/praise.png
diff --git a/pages/topics/goodIdea/cell/index.js b/pages/topics/goodIdea/cell/index.js
new file mode 100644
index 0000000..8df8667
--- /dev/null
+++ b/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 })
+ }
+ }
+})
diff --git a/pages/topics/common/goodIdea/cell/index.json b/pages/topics/goodIdea/cell/index.json
similarity index 100%
rename from pages/topics/common/goodIdea/cell/index.json
rename to pages/topics/goodIdea/cell/index.json
diff --git a/pages/topics/common/goodIdea/cell/index.wxml b/pages/topics/goodIdea/cell/index.wxml
similarity index 96%
rename from pages/topics/common/goodIdea/cell/index.wxml
rename to pages/topics/goodIdea/cell/index.wxml
index b88ad9a..154e1f3 100644
--- a/pages/topics/common/goodIdea/cell/index.wxml
+++ b/pages/topics/goodIdea/cell/index.wxml
@@ -32,7 +32,7 @@
diff --git a/pages/topics/common/goodIdea/cell/index.wxss b/pages/topics/goodIdea/cell/index.wxss
similarity index 95%
rename from pages/topics/common/goodIdea/cell/index.wxss
rename to pages/topics/goodIdea/cell/index.wxss
index f3016ca..5ad1789 100644
--- a/pages/topics/common/goodIdea/cell/index.wxss
+++ b/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{
diff --git a/pages/topics/goodIdea/index.js b/pages/topics/goodIdea/index.js
new file mode 100644
index 0000000..a5cbfe4
--- /dev/null
+++ b/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);
+ }
+ }
+})
diff --git a/pages/topics/common/goodIdea/index.json b/pages/topics/goodIdea/index.json
similarity index 71%
rename from pages/topics/common/goodIdea/index.json
rename to pages/topics/goodIdea/index.json
index 93fc6f3..d61ba3a 100644
--- a/pages/topics/common/goodIdea/index.json
+++ b/pages/topics/goodIdea/index.json
@@ -1,4 +1,5 @@
{
+ "component": true,
"usingComponents": {
"cell": "./cell/index"
}
diff --git a/pages/topics/common/goodIdea/index.wxml b/pages/topics/goodIdea/index.wxml
similarity index 78%
rename from pages/topics/common/goodIdea/index.wxml
rename to pages/topics/goodIdea/index.wxml
index 2ab206e..4a7a164 100644
--- a/pages/topics/common/goodIdea/index.wxml
+++ b/pages/topics/goodIdea/index.wxml
@@ -1,4 +1,4 @@
-
+
@@ -24,6 +24,6 @@
-
+
diff --git a/pages/topics/common/interactive/cell/index.wxss b/pages/topics/interactive/cell/index.wxss
similarity index 89%
rename from pages/topics/common/interactive/cell/index.wxss
rename to pages/topics/interactive/cell/index.wxss
index a0f70b8..98035e1 100644
--- a/pages/topics/common/interactive/cell/index.wxss
+++ b/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;
}
diff --git a/pages/topics/interactive/index.js b/pages/topics/interactive/index.js
new file mode 100644
index 0000000..0e7b4fa
--- /dev/null
+++ b/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);
+ }
+ }
+})
diff --git a/pages/topics/interactive/index.json b/pages/topics/interactive/index.json
new file mode 100644
index 0000000..d61ba3a
--- /dev/null
+++ b/pages/topics/interactive/index.json
@@ -0,0 +1,6 @@
+{
+ "component": true,
+ "usingComponents": {
+ "cell": "./cell/index"
+ }
+}
\ No newline at end of file
diff --git a/pages/topics/interactive/index.wxml b/pages/topics/interactive/index.wxml
new file mode 100644
index 0000000..09a121b
--- /dev/null
+++ b/pages/topics/interactive/index.wxml
@@ -0,0 +1,18 @@
+
+
+
+ |
+
+
+
+
+
+
diff --git a/pages/topics/interactive/index.wxss b/pages/topics/interactive/index.wxss
new file mode 100644
index 0000000..75fc54f
--- /dev/null
+++ b/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%;
+}
\ No newline at end of file
diff --git a/pages/topics/interactive/submitTopic/index.js b/pages/topics/interactive/submitTopic/index.js
new file mode 100644
index 0000000..30bd674
--- /dev/null
+++ b/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 () {
+
+ }
+})
diff --git a/pages/topics/interactive/submitTopic/index.json b/pages/topics/interactive/submitTopic/index.json
new file mode 100644
index 0000000..f485038
--- /dev/null
+++ b/pages/topics/interactive/submitTopic/index.json
@@ -0,0 +1,4 @@
+{
+ "navigationBarTitleText": "新建议题",
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/topics/interactive/submitTopic/index.wxml b/pages/topics/interactive/submitTopic/index.wxml
new file mode 100644
index 0000000..56316dd
--- /dev/null
+++ b/pages/topics/interactive/submitTopic/index.wxml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/pages/topics/interactive/submitTopic/index.wxss b/pages/topics/interactive/submitTopic/index.wxss
new file mode 100644
index 0000000..503810b
--- /dev/null
+++ b/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%
+ );
+}
diff --git a/pages/topics/common/message/index.js b/pages/topics/message/index.js
similarity index 100%
rename from pages/topics/common/message/index.js
rename to pages/topics/message/index.js
diff --git a/pages/topics/common/message/index.json b/pages/topics/message/index.json
similarity index 100%
rename from pages/topics/common/message/index.json
rename to pages/topics/message/index.json
diff --git a/pages/topics/common/message/index.wxml b/pages/topics/message/index.wxml
similarity index 100%
rename from pages/topics/common/message/index.wxml
rename to pages/topics/message/index.wxml
diff --git a/pages/topics/common/message/index.wxss b/pages/topics/message/index.wxss
similarity index 95%
rename from pages/topics/common/message/index.wxss
rename to pages/topics/message/index.wxss
index ba3cd0a..30144d6 100644
--- a/pages/topics/common/message/index.wxss
+++ b/pages/topics/message/index.wxss
@@ -17,7 +17,6 @@
width: 90%;
height: 45px;
bottom: 10px;
- background-color: white;
}
.submitBtn{
/* width: 100%; */
diff --git a/pages/user/myActivity/index.js b/pages/user/myActivity/index.js
index 4c85d1e..5a50b6d 100644
--- a/pages/user/myActivity/index.js
+++ b/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);
}
})
\ No newline at end of file
diff --git a/pages/user/myActivity/index.json b/pages/user/myActivity/index.json
index 8a76df5..87a053d 100644
--- a/pages/user/myActivity/index.json
+++ b/pages/user/myActivity/index.json
@@ -1,4 +1,6 @@
{
"navigationBarTitleText": "我的活动",
- "usingComponents": {}
+ "usingComponents": {
+ "cell": "../myTopics/myParticipant/cell/index"
+ }
}
\ No newline at end of file
diff --git a/pages/user/myActivity/index.wxml b/pages/user/myActivity/index.wxml
index bfeccd1..cc7e607 100644
--- a/pages/user/myActivity/index.wxml
+++ b/pages/user/myActivity/index.wxml
@@ -1,2 +1,14 @@
-pages/user/common/myActivity/index.wxml
+
+
+ |
+
+
diff --git a/pages/user/myFavorite/index.js b/pages/user/myFavorite/index.js
index f2001ab..63a546f 100644
--- a/pages/user/myFavorite/index.js
+++ b/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);
}
})
\ No newline at end of file
diff --git a/pages/user/myFavorite/index.json b/pages/user/myFavorite/index.json
index c1b3d78..c53089a 100644
--- a/pages/user/myFavorite/index.json
+++ b/pages/user/myFavorite/index.json
@@ -1,4 +1,6 @@
{
"navigationBarTitleText": "我的收藏",
- "usingComponents": {}
+ "usingComponents": {
+ "cell": "../myTopics/myParticipant/cell/index"
+ }
}
\ No newline at end of file
diff --git a/pages/user/myFavorite/index.wxml b/pages/user/myFavorite/index.wxml
index 741ff6e..b98ee7d 100644
--- a/pages/user/myFavorite/index.wxml
+++ b/pages/user/myFavorite/index.wxml
@@ -1,2 +1,14 @@
-pages/user/common/myFavorite/index.wxml
+
+
+ |
+
+
diff --git a/pages/user/myIdea/index.js b/pages/user/myIdea/index.js
index 5979a5c..6e3c39b 100644
--- a/pages/user/myIdea/index.js
+++ b/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);
}
})
\ No newline at end of file
diff --git a/pages/user/myIdea/index.json b/pages/user/myIdea/index.json
index 05966b3..63df80b 100644
--- a/pages/user/myIdea/index.json
+++ b/pages/user/myIdea/index.json
@@ -1,4 +1,6 @@
{
"navigationBarTitleText": "我的金点子",
- "usingComponents": {}
+ "usingComponents": {
+ "cell": "../../topics/goodIdea/cell/index"
+ }
}
\ No newline at end of file
diff --git a/pages/user/myIdea/index.wxml b/pages/user/myIdea/index.wxml
index 17d5687..a433f1b 100644
--- a/pages/user/myIdea/index.wxml
+++ b/pages/user/myIdea/index.wxml
@@ -1,2 +1,8 @@
-pages/user/common/myIdea/index.wxml
+
+
+ |
+
+
diff --git a/pages/user/myMessage/cell/index.js b/pages/user/myMessage/cell/index.js
new file mode 100644
index 0000000..7cc0a7d
--- /dev/null
+++ b/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 "系统消息";
+ }
+ }
+ }
+})
diff --git a/pages/user/myMessage/cell/index.json b/pages/user/myMessage/cell/index.json
new file mode 100644
index 0000000..78013bd
--- /dev/null
+++ b/pages/user/myMessage/cell/index.json
@@ -0,0 +1,5 @@
+{
+ "component": true,
+ "usingComponents": {
+ }
+}
\ No newline at end of file
diff --git a/pages/user/myMessage/cell/index.wxml b/pages/user/myMessage/cell/index.wxml
new file mode 100644
index 0000000..d0d33ba
--- /dev/null
+++ b/pages/user/myMessage/cell/index.wxml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+ {{itemData.msgName}}
+ {{itemData.title}}
+
+ {{itemData.time}}
+
+
diff --git a/pages/user/myMessage/cell/index.wxss b/pages/user/myMessage/cell/index.wxss
new file mode 100644
index 0000000..b3389d9
--- /dev/null
+++ b/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;
+}
\ No newline at end of file
diff --git a/pages/user/myMessage/index.js b/pages/user/myMessage/index.js
index de580d6..ee3e3a0 100644
--- a/pages/user/myMessage/index.js
+++ b/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);
}
})
\ No newline at end of file
diff --git a/pages/user/myMessage/index.json b/pages/user/myMessage/index.json
index 211820b..f207f34 100644
--- a/pages/user/myMessage/index.json
+++ b/pages/user/myMessage/index.json
@@ -1,4 +1,6 @@
{
"navigationBarTitleText": "我的消息",
- "usingComponents": {}
+ "usingComponents": {
+ "cell": "./cell/index"
+ }
}
\ No newline at end of file
diff --git a/pages/user/myMessage/index.wxml b/pages/user/myMessage/index.wxml
index 6818a29..a02dbf8 100644
--- a/pages/user/myMessage/index.wxml
+++ b/pages/user/myMessage/index.wxml
@@ -1,2 +1,8 @@
-pages/user/common/myMessage/index.wxml
+
+
+ |
+
+
diff --git a/pages/user/myTopics/index.js b/pages/user/myTopics/index.js
index 0971905..29c8aa0 100644
--- a/pages/user/myTopics/index.js
+++ b/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
+ });
}
})
\ No newline at end of file
diff --git a/pages/user/myTopics/index.json b/pages/user/myTopics/index.json
index 2e71a09..b692be3 100644
--- a/pages/user/myTopics/index.json
+++ b/pages/user/myTopics/index.json
@@ -1,4 +1,8 @@
{
"navigationBarTitleText": "我的议题",
- "usingComponents": {}
+ "usingComponents": {
+ "e-segment": "/components/segment/index",
+ "myParticipant": "./myParticipant/index",
+ "myRelease": "./myRelease/index"
+ }
}
\ No newline at end of file
diff --git a/pages/user/myTopics/index.wxml b/pages/user/myTopics/index.wxml
index 4f13f93..db1c98d 100644
--- a/pages/user/myTopics/index.wxml
+++ b/pages/user/myTopics/index.wxml
@@ -1,2 +1,6 @@
-pages/user/common/myTopics/index.wxml
+
+
+
+
+
diff --git a/pages/user/myTopics/myParticipant/cell/images/articleImg.png b/pages/user/myTopics/myParticipant/cell/images/articleImg.png
new file mode 100644
index 0000000..548a1c4
Binary files /dev/null and b/pages/user/myTopics/myParticipant/cell/images/articleImg.png differ
diff --git a/pages/user/myTopics/myParticipant/cell/index.js b/pages/user/myTopics/myParticipant/cell/index.js
new file mode 100644
index 0000000..e1c62a5
--- /dev/null
+++ b/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 })
+ }
+ }
+})
diff --git a/pages/user/myTopics/myParticipant/cell/index.json b/pages/user/myTopics/myParticipant/cell/index.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/pages/user/myTopics/myParticipant/cell/index.json
@@ -0,0 +1,4 @@
+{
+ "component": true,
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/pages/user/myTopics/myParticipant/cell/index.wxml b/pages/user/myTopics/myParticipant/cell/index.wxml
new file mode 100644
index 0000000..b9fa71a
--- /dev/null
+++ b/pages/user/myTopics/myParticipant/cell/index.wxml
@@ -0,0 +1,29 @@
+
+
+
+
+ {{title}}
+
+
+
+
+
+
+
+ {{userName}}
+ {{time}}
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/user/myTopics/myParticipant/cell/index.wxss b/pages/user/myTopics/myParticipant/cell/index.wxss
new file mode 100644
index 0000000..49f827e
--- /dev/null
+++ b/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;
+}
\ No newline at end of file
diff --git a/pages/user/myTopics/myParticipant/index.js b/pages/user/myTopics/myParticipant/index.js
new file mode 100644
index 0000000..85e7da9
--- /dev/null
+++ b/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);
+ }
+ }
+})
diff --git a/pages/user/myTopics/myParticipant/index.json b/pages/user/myTopics/myParticipant/index.json
new file mode 100644
index 0000000..d61ba3a
--- /dev/null
+++ b/pages/user/myTopics/myParticipant/index.json
@@ -0,0 +1,6 @@
+{
+ "component": true,
+ "usingComponents": {
+ "cell": "./cell/index"
+ }
+}
\ No newline at end of file
diff --git a/pages/user/myTopics/myParticipant/index.wxml b/pages/user/myTopics/myParticipant/index.wxml
new file mode 100644
index 0000000..394e4ee
--- /dev/null
+++ b/pages/user/myTopics/myParticipant/index.wxml
@@ -0,0 +1,14 @@
+
+
+
+ |
+
+
diff --git a/pages/user/myTopics/myParticipant/index.wxss b/pages/user/myTopics/myParticipant/index.wxss
new file mode 100644
index 0000000..fe063c7
--- /dev/null
+++ b/pages/user/myTopics/myParticipant/index.wxss
@@ -0,0 +1 @@
+/* pages/user/myTopics/myParticipant/index.wxss */
\ No newline at end of file
diff --git a/pages/user/myTopics/myRelease/index.js b/pages/user/myTopics/myRelease/index.js
new file mode 100644
index 0000000..2a53c33
--- /dev/null
+++ b/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);
+ }
+ }
+})
diff --git a/pages/user/myTopics/myRelease/index.json b/pages/user/myTopics/myRelease/index.json
new file mode 100644
index 0000000..0b682a5
--- /dev/null
+++ b/pages/user/myTopics/myRelease/index.json
@@ -0,0 +1,6 @@
+{
+ "component": true,
+ "usingComponents": {
+ "cell": "../myParticipant/cell/index"
+ }
+}
\ No newline at end of file
diff --git a/pages/topics/common/interactive/index.wxml b/pages/user/myTopics/myRelease/index.wxml
similarity index 88%
rename from pages/topics/common/interactive/index.wxml
rename to pages/user/myTopics/myRelease/index.wxml
index 050efee..011e49e 100644
--- a/pages/topics/common/interactive/index.wxml
+++ b/pages/user/myTopics/myRelease/index.wxml
@@ -1,4 +1,4 @@
-
+