显示点赞人员；显示本社区居民标识

app.json

@@ -63,6 +63,7 @@
       "pages": [
         "pages/associationlist/associationlist",
         "pages/community/community",
+        "pages/guideInfo/guideInfo",
         "pages/gMembersList/gMembersList",
         "pages/gOfficialsList/gOfficialsList",
         "pages/talklist/talklist",

project.config.json

@@ -22,7 +22,7 @@
 			"disablePlugins": [],
 			"outputPath": ""
 		},
-		"useCompilerModule": false,
+		"useCompilerModule": true,
 		"userConfirmedUseCompilerModuleSwitch": false
 	},
 	"compileType": "miniprogram",

subpages/associationNew/components/communityList/communityList.wxss

@@ -19,7 +19,7 @@
     width: 100%;
     height: 100%;
     position: absolute;
-    background: rgba(0, 0, 0, 0.1);
+    background: rgba(0, 0, 0, 0.2);
     border-radius: 10rpx;
     text-align: center;
     display: flex;

subpages/associationNew/components/membersList/membersList.wxml

@@ -8,7 +8,10 @@
     wx:key="index">
     <view class="item-top">
       <image class="head-icon" src="{{item.userAvatar}}"></image>
-      <text class="user-name">{{item.nickname}}</text><image wx:if="{{item.identityFlag === '0'}}" class="leader-logo" src="../../images/leader-logo.png"></image>
+      <text class="user-name">{{item.nickname}}</text>
+      <image wx:if="{{item.identityFlag === '0'}}" class="identity-logo identity0" src="../../images/leader-logo@2x.png"></image>
+      <image wx:if="{{item.identityFlag === '1'}}" class="identity-logo identity1" src="../../images/leader2-logo@2x.png"></image>
+      <image wx:if="{{item.thisCommunity === '1'}}" class="identity-logo this-community" src="../../images/resident@2x.png"></image>
     </view>
     <view class="line"></view>
     <view class="item-bottom">

subpages/associationNew/components/membersList/membersList.wxss

@@ -33,11 +33,19 @@
     color: rgba(0, 0, 0, 1);
     margin-left: 20rpx;
 }
-.members-item .item-top .leader-logo{
+.members-item .item-top .identity-logo{
-    width: 59rpx;
     height: 28rpx;
     margin-left: 8rpx;
 }
+.members-item .item-top .identity0{
+    width: 59rpx;
+}
+.members-item .item-top .identity1{
+    width: 76rpx;
+}
+.members-item .item-top .this-community{
+    width: 116rpx;
+}
 .members-item .item-bottom{
     height: 100rpx;
     width: 750rpx;

subpages/associationNew/pages/community/community.js

@@ -39,13 +39,19 @@ Page({
   onShareAppMessage: function () {
 
   },
-  //跳转页面 
+  //跳转页面-群成员 
   navToGroupMembers (e) {
     console.log(this.data.partyGroupId)
     wx.navigateTo({
       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') {
@@ -53,7 +59,6 @@ Page({
         url: `/subpages/associationNew/pages/gOfficialsList/gOfficialsList?partyGroupId=${this.data.partyGroupId}`
       })        
     } else if (e.currentTarget.dataset.page === 'gather') {
-      console.log('/subpages/associationNew/pages/community/community.js')
       wx.navigateTo({
         url:`/subpages/associationNew/pages/eventlist/eventlist?partyGroupId=${this.data.partyGroupId}&topicType=1` //`#/话对捧个场`
       })        

subpages/associationNew/pages/community/community.wxml

@@ -3,6 +3,10 @@
     <text>群成员</text>
     <button hover-class="hover-class" class="top-right" bindtap="navToGroupMembers" plain='true'><image src="../../images/next.png"/></button>
   </view>
+  <view class="func-top">
+    <text>论坛指南</text>
+    <button hover-class="hover-class" class="top-right" bindtap="navToForumGuide" plain='true'><image src="../../images/next.png"/></button>
+  </view>
   <view class="func-item"
     wx:for="{{imageUrlList}}"
     wx:for-index="index"

subpages/associationNew/pages/eventlist/eventlist.wxml

@@ -3,6 +3,7 @@
 		<image src="{{item.userFace}}"></image>
 		<view class="name-date">
 			<view class="name">{{item.nickname}}</view>
+			<image class="community-logo" wx:if="{{item.thisCommunity === '1'}}" src="../../images/resident@2x.png"></image>
 			<view class="date">{{item.createdTime}}</view>
 		</view>
 	</view>
@@ -31,6 +32,12 @@
 			<view class="give-data">评论</view>
 		</view>
 	</view>
+	<view wx:if="{{item.likes.length > 0}}"  class="likes">
+		<block wx:for="{{item.likes}}" wx:key="index" wx:for-index="index" wx:for-item="likesItem">
+			<text>{{likesItem.nickname}}</text><text wx:if="{{index < item.likes.length - 1}}">,</text>
+		</block>
+	</view>
+	<view wx:if="{{item.likes.length > 0 && item.comments.length > 0}}" class="line"></view>
 	<view wx:if="{{item.comments.length > 0}}" class="comment">
 		<view wx:for="{{item.comments}}" wx:key="index" wx:for-index="index" wx:for-item="item_"
 			class="comment-list"><text>{{item_.username}}：</text>{{item_.content}}</view>

subpages/associationNew/pages/eventlist/eventlist.wxss

@@ -35,6 +35,12 @@ page {
   color: rgba(51, 51, 51, 1);
 }
 
+.user-info .name-date .community-logo {
+  height: 28rpx;
+  width: 116rpx;
+  margin-left: 8rpx;
+}
+
 .user-info .name-date .date {
   font-size: 20rpx;
   font-weight: 500;
@@ -66,7 +72,7 @@ page {
 
 .attitude {
   width: calc(100% - 300rpx);
-  margin-top: 21rpx;
+  margin: 21rpx 0rpx;
   display: flex;
   align-items: center;
   justify-content: space-between;
@@ -81,12 +87,12 @@ page {
 }
 
 .attitude .all image {
-  width: 28rpx;
+  width: 30rpx;
-  height: 28rpx;
+  height: 30rpx;
 }
 
 .attitude .all .give-data {
-  font-size: 24rpx;
+  font-size: 26rpx;
   font-weight: 500;
   color: rgba(51, 51, 51, 1);
   margin-left: 9rpx;
@@ -97,12 +103,27 @@ page {
   color: #FFB103;
 }
 
-.comment {
+.likes {
   width: calc(100% - 98rpx);
-  padding: 26rpx 20rpx;
+  padding: 24rpx 20rpx 12rpx 20rpx;
   background: #F2F2F2;
   border-radius: 8rpx;
   margin-top: 25rpx;
+  font-size: 28rpx;
+  color: #333333;
+}
+.line {
+  width: calc(100% - 60rpx);
+  height: 1px;
+  background-color: #999999;
+}
+
+.comment {
+  width: calc(100% - 98rpx);
+  padding: 12rpx 20rpx 24rpx 20rpx;
+  background: #F2F2F2;
+  border-radius: 8rpx;
+  /* margin-top: 25rpx; */
 }
 
 .comment .comment-list {

subpages/associationNew/pages/guideInfo/guideInfo.js

@@ -0,0 +1,15 @@
+import { getGuideInfo} from '../../utils/api' 
+Page({
+  data: {
+    partyGroupId: '',
+    guideInfoData: ''
+  },
+  onLoad: function (options) {
+    this.data.partyGroupId = options.partyGroupId
+    getGuideInfo(this.data.partyGroupId).then(res => {
+      this.setData({
+        guideInfoData: res.data
+      })
+    })
+  }
+})

subpages/associationNew/pages/guideInfo/guideInfo.json

@@ -0,0 +1,5 @@
+{
+  "usingComponents": {
+  },
+  "navigationBarTitleText": "论坛指南"
+}

subpages/associationNew/pages/guideInfo/guideInfo.wxml

@@ -0,0 +1,5 @@
+<view class="guide-info">
+  <view class="guide-content">
+    {{guideInfoData}}
+  </view>
+</view>

subpages/associationNew/pages/guideInfo/guideInfo.wxss

@@ -0,0 +1,9 @@
+page {
+  width:100%;
+  height: auto;
+  overflow-y: auto;
+  background: #f7f7f7;
+}
+.guide-content {
+  font-size: 34rpx;
+}

subpages/associationNew/utils/api.js

@@ -123,6 +123,13 @@ export function statement({attitude, topicId}) {
   })
 }
 
+/**
+ * 获取论坛指南
+ */
+export function getGuideInfo(partyGroupId) {
+  return request.get('partyGroup/group/guideInfo/'+partyGroupId)
+}
+
 
 
 

utils/config.js

@@ -7,13 +7,13 @@ module.exports = {
 
 function BASEURL() {
   // return 'https://eug-test.elinkit.com.cn/js/epdc-api/api/' //党群1+1
-  // return 'https://eug-test.elinkit.com.cn/js/epdc-api/api/' // 锦水测试环境
+  return 'https://eug-test.elinkit.com.cn/js/epdc-api/api/' // 锦水测试环境
   // return 'https://eug-test.elinkit.com.cn/epdc-api/api/' // 测试环境 接口地址
   // return "http://219.146.91.110:9094/epdc-api/api/"  // 测试环境 ip接口地址
   // return "https://epdc.elinkservice.cn/epdc-api/api/" // 正式环境 接口地址
   // return 'https://epdc-app.qingdaoshibei.cn/epdc-api/api/' // 电政办 正式环境 接口地址
   //  return 'https://epdc-shibei.elinkservice.cn/epdc-api/api/' // 电政办 正式环境 接口地址
-  return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址
+  // return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址
 }
 
 function WEBROOT() {