diff --git a/app.json b/app.json
index 9acb075..cda5787 100644
--- a/app.json
+++ b/app.json
@@ -61,14 +61,11 @@
       "name": "associationNew",
       "pages": [
         "pages/associationlist/associationlist",
-<<<<<<< HEAD
         "pages/community/community",
         "pages/gMembersList/gMembersList",
-        "pages/gOfficialsList/gOfficialsList"
-=======
+        "pages/gOfficialsList/gOfficialsList",
         "pages/talklist/talklist",
         "pages/eventlist/eventlist"
->>>>>>> 8cb094475e355feb09b2c52a944da0015316e0df
       ]
     },
     {
diff --git a/project.config.json b/project.config.json
index 8534479..1086aa5 100644
--- a/project.config.json
+++ b/project.config.json
@@ -22,7 +22,7 @@
 			"disablePlugins": [],
 			"outputPath": ""
 		},
-		"useCompilerModule": true,
+		"useCompilerModule": false,
 		"userConfirmedUseCompilerModuleSwitch": false
 	},
 	"compileType": "miniprogram",
diff --git a/subpages/associationNew/components/communityList/communityList.wxss b/subpages/associationNew/components/communityList/communityList.wxss
index 9333ff2..dddab1a 100644
--- a/subpages/associationNew/components/communityList/communityList.wxss
+++ b/subpages/associationNew/components/communityList/communityList.wxss
@@ -36,6 +36,7 @@
     text-align: left;
     padding: 0;
     margin-top: 32rpx;
+    border: 0px;
 }
 .community-item .cover-image .community-add image{
     width: 100%;
diff --git a/subpages/associationNew/components/membersList/membersList.js b/subpages/associationNew/components/membersList/membersList.js
index 9d19060..7b79713 100644
--- a/subpages/associationNew/components/membersList/membersList.js
+++ b/subpages/associationNew/components/membersList/membersList.js
@@ -31,15 +31,15 @@ Component({
       wx.showActionSheet({
         itemList: ['取消禁言','禁言1天', '禁言1周', '禁言1月', '永久禁言'],
         success (res) {
-          console.log(e.currentTarget.dataset.userId,res.tapIndex)
+          // console.log(e.currentTarget.dataset.groupUserId,res.tapIndex)
           let data = {
-            userId: e.currentTarget.dataset.userId,
+            groupUserId: e.currentTarget.dataset.groupUserId,
             bannedFlag: res.tapIndex.toString()
           }
           _this.triggerEvent('bannedChange',data)
         },
         fail (res) {
-          console.log(e.currentTarget.dataset.userId,res.errMsg)
+          console.log(e.currentTarget.dataset.groupUserId,res.errMsg)
         }
       })
     },
@@ -81,18 +81,18 @@ Component({
       })
     },
     gLevelUp (e) {
-      console.log(e.currentTarget.dataset.userId)
+      console.log(e.currentTarget.dataset.groupUserId)
       let parm = {
-        groupUserId: e.currentTarget.dataset.userId,
-        identityFlag: '2'
+        groupUserId: e.currentTarget.dataset.groupUserId,
+        identityFlag: '1'
       }
       this.triggerEvent('modifyIdentity',parm)
     },
     gLevelDown (e) {
-      console.log(e.currentTarget.dataset.userId)
+      console.log(e.currentTarget.dataset.groupUserId)
       let parm = {
-        groupUserId: e.currentTarget.dataset.userId,
-        identityFlag: '0'
+        groupUserId: e.currentTarget.dataset.groupUserId,
+        identityFlag: '2'
       }
       this.triggerEvent('modifyIdentity',parm)     
     }
diff --git a/subpages/associationNew/components/membersList/membersList.wxml b/subpages/associationNew/components/membersList/membersList.wxml
index 4b7222a..5b82e93 100644
--- a/subpages/associationNew/components/membersList/membersList.wxml
+++ b/subpages/associationNew/components/membersList/membersList.wxml
@@ -12,11 +12,11 @@
     </view>
     <view class="line"></view>
     <view class="item-bottom">
-      <button bindtap="gLevelUp" data-user-id="{{item.userId}}" class="levelup-btn" plain='true' hover-class="hover-btn" wx:if="{{filters.getIdentity(0,currentUser.identityFlag,item.identityFlag)}}">
+      <button bindtap="gLevelUp" data-group-user-id="{{item.id}}" class="levelup-btn" plain='true' hover-class="hover-btn" wx:if="{{filters.getIdentity(0,currentUser.identityFlag,item.identityFlag)}}">
         <text>升级副群主</text>
         <image src="../../images/btn1.png"/>
       </button>
-      <button bindtap="gLevelDown" data-user-id="{{item.userId}}" class="levelup-btn" plain='true' hover-class="hover-btn" wx:if="{{filters.getIdentity(1,currentUser.identityFlag,item.identityFlag)}}">
+      <button bindtap="gLevelDown" data-group-user-id="{{item.id}}" class="levelup-btn" plain='true' hover-class="hover-btn" wx:if="{{filters.getIdentity(1,currentUser.identityFlag,item.identityFlag)}}">
         <text>降为群成员</text>
         <image src="../../images/btn1.png"/>
       </button>
@@ -24,18 +24,10 @@
         <text>踢出群</text>
         <image src="../../images/btn2.png"/>
       </button> -->
-      <block wx:if="{{item.bannedFlag==='0'}}">
-        <button bindtap="onNoSpeak" data-user-id="{{item.userId}}" class="forbidden-btn disForbidden-btn" plain='true' hover-class="hover-btn" wx:if="{{filters.getIdentity(2,currentUser.identityFlag,item.identityFlag)}}">
-          <text space="ensp"> 未禁言</text>
-          <image src="../../images/arrowd2.png"/>
-        </button>
-      </block>
-      <block wx:else>
-        <button bindtap="onNoSpeak" data-user-id="{{item.userId}}" class="forbidden-btn" plain='true' hover-class="hover-btn" wx:if="{{filters.getIdentity(2,currentUser.identityFlag,item.identityFlag)}}">
-          <text>{{filters.getBanned(item.bannedFlag)}}</text>
-          <image src="../../images/arrowd.png"/>
-        </button>
-      </block>      
+      <button disabled="{{!filters.disabledBanned(currentUser.identityFlag,item.identityFlag)}}" bindtap="onNoSpeak" data-group-user-id="{{item.id}}" class="forbidden-btn {{filters.forbiddenClass(currentUser.identityFlag,item.identityFlag)?'disForbidden-btn':''}}" plain='true' hover-class="hover-btn" wx:if="{{item.identityFlag!=='0'}}">
+        <text space="ensp">{{filters.getBanned(item.bannedFlag)}}</text>
+        <image src="../../images/{{filters.forbiddenClass(currentUser.identityFlag,item.identityFlag)?'arrowd2.png':'arrowd.png'}}"/>
+      </button>
     </view>
   </view>
   </block>
diff --git a/subpages/associationNew/pages/gMembersList/gMembersList.js b/subpages/associationNew/pages/gMembersList/gMembersList.js
index 7b39c7e..f6d95b4 100644
--- a/subpages/associationNew/pages/gMembersList/gMembersList.js
+++ b/subpages/associationNew/pages/gMembersList/gMembersList.js
@@ -1,8 +1,7 @@
 import { 
   getPartyUserList, 
   postUserBanned, 
-  postModifyIdentity,
-  getCurrentUserInfo
+  postModifyIdentity
 } from '../../utils/api' 
 Page({
 
@@ -25,11 +24,7 @@ Page({
    */
   onLoad: function (options) {
     this.data.partyGroupId = options.partyGroupId
-    this.getCurrentUserInfo().then(res => {
-      if (res) {
-        this.getPartyUserList();
-      }
-    })
+    this.getPartyUserList()
   },
 
   /**
@@ -53,22 +48,6 @@ Page({
       this.getPartyUserList()
     }
   },
-  //获取当前用户信息
-  getCurrentUserInfo () {
-    return new Promise ((resolve,reject) => {
-      getCurrentUserInfo (this.data.partyGroupId).then(res => {
-        console.log('获取当前用户信息', res)
-        this.setData({
-          currentUser: {...res.data}
-        })
-        resolve(true)
-      }).catch(err =>{
-        console.log(err)
-        this.data.currentUser = {}
-        reject(false)
-      })
-    })
-  },
  // 获取群成员列表
   getPartyUserList () {
     const para = {
@@ -76,14 +55,18 @@ Page({
       pageSize: this.data.pageSize,
       partyGroupId: this.data.partyGroupId
     }
+    wx.showLoading({
+      title:''
+    })
     getPartyUserList(para).then(res => {
       console.log('获取群成员列表', res)
       this.setData({
-        // currentUser: {...res.data.currentUser},
-        gMembersList: [...this.data.gMembersList, ...res.data],
+        currentUser: {...res.data.currentUser},
+        gMembersList: [...this.data.gMembersList, ...res.data.otherUsers],
         loadMoreType: res.data.length === this.data.pageSize ? 'loading': 'none',
         preloadVisible: false
       })
+      wx.hideLoading()
     }).catch(err => {
       console.log(err)
       this.setData({
@@ -98,11 +81,10 @@ Page({
     const para = {...e.detail}
     postUserBanned(para).then(res => {
       console.log('用户禁言', res)
-      this.data.gMembersList = this.data.gMembersList.map( item => {
-        if (item.userId === e.detail.userId) {
+      this.data.gMembersList.forEach(item => {
+        if (item.id === e.detail.groupUserId) {
           item.bannedFlag = e.detail.bannedFlag
         }
-        return item
       })
       this.setData({
         gMembersList: this.data.gMembersList
@@ -116,6 +98,10 @@ Page({
     const para = {...e.detail}   
     postModifyIdentity(para).then(res => {
       console.log('修改用户身份', res)
+      this.setData({
+        gMembersList: [],
+        currentUser: {}
+      })
       this.getPartyUserList();
     }).catch(err => {
       console.log(err)
diff --git a/subpages/associationNew/pages/gMembersList/gMembersList.json b/subpages/associationNew/pages/gMembersList/gMembersList.json
index 8c338b2..60ea339 100644
--- a/subpages/associationNew/pages/gMembersList/gMembersList.json
+++ b/subpages/associationNew/pages/gMembersList/gMembersList.json
@@ -1,7 +1,8 @@
 {
   "usingComponents": {
     "load-more": "../../../../components/loadMore/loadMore",
-    "members-list": "../../components/membersList/membersList"
+    "members-list": "../../components/membersList/membersList",
+    "no-data": "../../../../components/nodata/nodata"
   },
   "navigationBarTitleText": "群成员"
 }
\ No newline at end of file
diff --git a/subpages/associationNew/pages/gMembersList/gMembersList.wxml b/subpages/associationNew/pages/gMembersList/gMembersList.wxml
index 198fdc0..cf553f4 100644
--- a/subpages/associationNew/pages/gMembersList/gMembersList.wxml
+++ b/subpages/associationNew/pages/gMembersList/gMembersList.wxml
@@ -5,6 +5,7 @@
     bind:modifyIdentity="modifyIdentityCallBack"
     bind:bannedChange="bannedChangeCallBack">
   </members-list>
+  <no-data isShow="{{gMembersList.length == 0}}"></no-data>
   <load-more
     loadMoreVisible="{{loadMoreVisible}}"
     loadMoreType="{{loadMoreType}}">
diff --git a/subpages/associationNew/pages/gOfficialsList/gOfficialsList.json b/subpages/associationNew/pages/gOfficialsList/gOfficialsList.json
index 8c338b2..38bcac3 100644
--- a/subpages/associationNew/pages/gOfficialsList/gOfficialsList.json
+++ b/subpages/associationNew/pages/gOfficialsList/gOfficialsList.json
@@ -1,7 +1,8 @@
 {
   "usingComponents": {
     "load-more": "../../../../components/loadMore/loadMore",
+    "no-data": "../../../../components/nodata/nodata",
     "members-list": "../../components/membersList/membersList"
   },
-  "navigationBarTitleText": "群成员"
+  "navigationBarTitleText": "官小带个长"
 }
\ No newline at end of file
diff --git a/subpages/associationNew/pages/gOfficialsList/gOfficialsList.wxml b/subpages/associationNew/pages/gOfficialsList/gOfficialsList.wxml
index ebbdb96..262051a 100644
--- a/subpages/associationNew/pages/gOfficialsList/gOfficialsList.wxml
+++ b/subpages/associationNew/pages/gOfficialsList/gOfficialsList.wxml
@@ -1,7 +1,7 @@
 <view class="gmembers-list">
-  <members-list 
-  gOfficialsList="{{gOfficialsList}}">
+  <members-list gOfficialsList="{{gOfficialsList}}">
   </members-list>
+  <no-data isShow="{{gOfficialsList.length == 0}}"></no-data>
   <load-more
     loadMoreVisible="{{loadMoreVisible}}"
     loadMoreType="{{loadMoreType}}">
diff --git a/subpages/associationNew/utils/filters.wxs b/subpages/associationNew/utils/filters.wxs
index 88accf4..47cfb1c 100644
--- a/subpages/associationNew/utils/filters.wxs
+++ b/subpages/associationNew/utils/filters.wxs
@@ -35,7 +35,31 @@ var getBanned = function (code) {
     '永久禁言'
   ][index]
 }
+var disabledBanned = function (identity,uIdentity) {
+  if (identity === GROUP_LEADER) {
+    return true
+  } else if (identity === GROUP_LEADER_2) {
+    if (uIdentity !== GROUP_MEMBER) {
+      return false
+    } else {
+      return true
+    }
+  } else {
+    return false
+  }
+}
+var forbiddenClass = function(identity,uIdentity){
+  if (identity === GROUP_LEADER_2 && uIdentity === GROUP_LEADER_2) {
+    return true
+  } else if (identity === GROUP_MEMBER) {
+    return true
+  } else {
+    return false
+  }
+}
 module.exports = {
   getIdentity: getIdentity,
-  getBanned: getBanned
+  getBanned: getBanned,
+  disabledBanned:disabledBanned,
+  forbiddenClass:forbiddenClass
 }
\ No newline at end of file
diff --git a/utils/config.js b/utils/config.js
index 66f23bc..8aab460 100644
--- a/utils/config.js
+++ b/utils/config.js
@@ -6,7 +6,7 @@ module.exports = {
 };
 
 function BASEURL() {
-  return 'https://eug-test.elinkit.com.cn/kc/epdc-api/api/' //党群1+1
+  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/epdc-api/api/' // 测试环境 接口地址
   // return "http://219.146.91.110:9094/epdc-api/api/"  // 测试环境 ip接口地址