diff --git a/project.config.json b/project.config.json
index 1086aa5..b3a3d9b 100644
--- a/project.config.json
+++ b/project.config.json
@@ -4,7 +4,7 @@
"ignore": []
},
"setting": {
- "urlCheck": false,
+ "urlCheck": true,
"es6": true,
"postcss": true,
"preloadBackgroundData": false,
diff --git a/subpages/associationNew/images/copy@2x.png b/subpages/associationNew/images/copy@2x.png
new file mode 100644
index 0000000..9b12595
Binary files /dev/null and b/subpages/associationNew/images/copy@2x.png differ
diff --git a/subpages/associationNew/images/fire@2x.png b/subpages/associationNew/images/fire@2x.png
new file mode 100644
index 0000000..645be23
Binary files /dev/null and b/subpages/associationNew/images/fire@2x.png differ
diff --git a/subpages/associationNew/images/huatizhinan@2x.png b/subpages/associationNew/images/huatizhinan@2x.png
new file mode 100644
index 0000000..594ddb9
Binary files /dev/null and b/subpages/associationNew/images/huatizhinan@2x.png differ
diff --git a/subpages/associationNew/pages/community/community.js b/subpages/associationNew/pages/community/community.js
index 34362d7..1e51dd9 100644
--- a/subpages/associationNew/pages/community/community.js
+++ b/subpages/associationNew/pages/community/community.js
@@ -46,12 +46,6 @@ Page({
url: `/subpages/associationNew/pages/gMembersList/gMembersList?partyGroupId=${this.data.partyGroupId}`
})
},
- navToForumGuide (e) {
- console.log('前往论坛指南')
- wx.navigateTo({
- url: `/subpages/associationNew/pages/guideInfo/guideInfo?partyGroupId=${this.data.partyGroupId}`
- })
- },
navToNewPage (e) {
// console.log(e.currentTarget.dataset.page);
if (e.currentTarget.dataset.page === 'help') {
diff --git a/subpages/associationNew/pages/community/community.wxml b/subpages/associationNew/pages/community/community.wxml
index bc8fc0a..b5ca792 100644
--- a/subpages/associationNew/pages/community/community.wxml
+++ b/subpages/associationNew/pages/community/community.wxml
@@ -3,10 +3,6 @@
群成员
-
- 论坛指南
-
-
{
console.log(err)
})
+ },
+ /*
+ * 前往论坛指南页面
+ */
+ navToForumGuide (e) {
+ console.log('前往论坛指南')
+ wx.navigateTo({
+ url: `/subpages/associationNew/pages/guideInfo/guideInfo?partyGroupId=${this.data.partyGroupId}`
+ })
}
})
\ No newline at end of file
diff --git a/subpages/associationNew/pages/eventlist/eventlist.wxml b/subpages/associationNew/pages/eventlist/eventlist.wxml
index 855fd29..1a4f7ec 100644
--- a/subpages/associationNew/pages/eventlist/eventlist.wxml
+++ b/subpages/associationNew/pages/eventlist/eventlist.wxml
@@ -1,3 +1,7 @@
+
+ 话题指南
+
+
diff --git a/subpages/associationNew/pages/eventlist/eventlist.wxss b/subpages/associationNew/pages/eventlist/eventlist.wxss
index 2b4ae7e..35e2f53 100644
--- a/subpages/associationNew/pages/eventlist/eventlist.wxss
+++ b/subpages/associationNew/pages/eventlist/eventlist.wxss
@@ -7,6 +7,7 @@ page {
padding: 40rpx 29rpx 20rpx 29rpx;
background: #fff;
margin-top: 20rpx;
+ box-sizing: border-box;
}
.user-info {
@@ -41,6 +42,7 @@ page {
height: 28rpx;
width: 116rpx;
margin-left: 8rpx;
+ border-radius: 0px;
}
.user-info .name-date .date {
@@ -58,7 +60,8 @@ page {
}
.image-list {
- width: calc(100% - 58rpx);
+ /* width: calc(100% - 58rpx); */
+ width: 100%;
margin-top: 30rpx;
display: grid;
grid-template-columns: repeat(auto-fit, minmax(216rpx, 1fr));
@@ -234,4 +237,36 @@ page {
width: 100%;
height: 100%;
object-fit: cover;
+}
+
+.func-top{
+ height: 94rpx;
+ width: 750rpx;
+ position: relative;
+ background: rgba(255, 255, 255, 1);
+}
+.func-top text{
+ height: 94rpx;
+ font-size: 32rpx;
+ font-family: PingFang SC;
+ font-weight: bold;
+ color: rgba(51, 51, 51, 1);
+ line-height: 94rpx;
+ position: absolute;
+ left: 29rpx;
+}
+.func-top .top-right{
+ width: 40rpx;
+ height: 94rpx;
+ padding: 0;
+ border: none;
+ position: absolute;
+ right: 34rpx;
+}
+.func-top .top-right image{
+ width: 18rpx;
+ height: 24rpx;
+ margin: 0;
+ position: absolute;
+ top: 30rpx;
}
\ No newline at end of file
diff --git a/subpages/associationNew/pages/guideInfo/guideInfo.js b/subpages/associationNew/pages/guideInfo/guideInfo.js
index dfa88bb..a781649 100644
--- a/subpages/associationNew/pages/guideInfo/guideInfo.js
+++ b/subpages/associationNew/pages/guideInfo/guideInfo.js
@@ -2,14 +2,20 @@ import { getGuideInfo} from '../../utils/api'
Page({
data: {
partyGroupId: '',
- guideInfoData: ''
+ todayTopic: {},
+ guideInfoData: []
},
onLoad: function (options) {
this.data.partyGroupId = options.partyGroupId
getGuideInfo(this.data.partyGroupId).then(res => {
- this.setData({
- guideInfoData: res.data
- })
+ if (res.data.length > 0) {
+ this.todayTopic = {...res.data[0]}
+ res.data.shift()
+ this.setData({
+ todayTopic: this.todayTopic,
+ guideInfoData: res.data
+ })
+ }
})
}
})
diff --git a/subpages/associationNew/pages/guideInfo/guideInfo.json b/subpages/associationNew/pages/guideInfo/guideInfo.json
index 69f3c32..bae1a50 100644
--- a/subpages/associationNew/pages/guideInfo/guideInfo.json
+++ b/subpages/associationNew/pages/guideInfo/guideInfo.json
@@ -1,5 +1,5 @@
{
"usingComponents": {
},
- "navigationBarTitleText": "论坛指南"
+ "navigationBarTitleText": "话题指南"
}
\ No newline at end of file
diff --git a/subpages/associationNew/pages/guideInfo/guideInfo.wxml b/subpages/associationNew/pages/guideInfo/guideInfo.wxml
index 360b6e0..be61d40 100644
--- a/subpages/associationNew/pages/guideInfo/guideInfo.wxml
+++ b/subpages/associationNew/pages/guideInfo/guideInfo.wxml
@@ -1,5 +1,13 @@
+
- {{guideInfoData}}
+
+ {{todayTopic.showTime}}
+ {{todayTopic.content}}
+
+
+ {{item.showTime}}
+ {{item.content}}
+
-
+
\ No newline at end of file
diff --git a/subpages/associationNew/pages/guideInfo/guideInfo.wxss b/subpages/associationNew/pages/guideInfo/guideInfo.wxss
index 065f96f..63f19af 100644
--- a/subpages/associationNew/pages/guideInfo/guideInfo.wxss
+++ b/subpages/associationNew/pages/guideInfo/guideInfo.wxss
@@ -1,9 +1,78 @@
page {
width:100%;
height: auto;
+ min-height:100vh;
overflow-y: auto;
- background: #f7f7f7;
+ background: linear-gradient(to bottom, #db1a1f 0%,#e95027 50%,#db1a1f 100%);
+}
+.guide-info {
+ position: relative;
+}
+.topic-img{
+ width: 750rpx;
+ height: 306rpx;
+ position: absolute;
}
.guide-content {
- font-size: 34rpx;
+ display: flex;
+ flex-direction: column;
+ position: absolute;
+ top: 243rpx;
+ margin: 16rpx 30rpx;
+}
+
+.today-top {
+ position: relative;
+}
+.today-top image{
+ width: 232rpx;
+ height: 50rpx;
+}
+.today-top text{
+ height: 50rpx;
+ line-height: 50rpx;
+ font-size: 32rpx;
+ font-family: PingFang SC;
+ font-weight: bold;
+ color: rgba(255,255,255,1);
+ position: absolute;
+ left: 76rpx;
+ z-index: 999;
+}
+.topic-item, .today-item {
+ background-color: #ffffff;
+ border-radius: 10rpx;
+ display: flex;
+ flex-direction: column;
+ margin-bottom: 16rpx;
+ width: 690rpx;
+}
+.item-top {
+ position: relative;
+ display: flex;
+ align-items: center;
+ padding-left: 31rpx;
+ margin-top: 39rpx;
+}
+.item-top image{
+ width: 32rpx;
+ height: 32rpx;
+}
+.item-top text{
+ font-size: 32rpx;
+ font-family: PingFang SC;
+ font-weight: bold;
+ color: #BF1F1F;
+ margin-left: 18rpx;
+}
+.item-content, .today-content{
+ padding: 28rpx 32rpx;
+}
+.item-content text,.today-content text{
+ font-size:34rpx;
+ font-family:PingFang SC;
+ font-weight:500;
+ color:rgba(51,51,51,1);
+ line-height:52rpx;
+ height: 52rpx;
}
\ No newline at end of file