From 4c67b4c392963bb7cb27cf5b0b41250de416d6c6 Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Tue, 9 Jun 2020 10:40:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../membersListNew/membersListNew.js          | 106 ++++++++++++++++++
 .../membersListNew/membersListNew.json        |   4 +
 .../membersListNew/membersListNew.wxml        |  13 +++
 .../membersListNew/membersListNew.wxss        |  49 ++++++++
 .../pages/gOfficialsList/gOfficialsList.json  |   3 +-
 .../pages/gOfficialsList/gOfficialsList.wxml  |   5 +-
 6 files changed, 177 insertions(+), 3 deletions(-)
 create mode 100644 subpages/associationNew/components/membersListNew/membersListNew.js
 create mode 100644 subpages/associationNew/components/membersListNew/membersListNew.json
 create mode 100644 subpages/associationNew/components/membersListNew/membersListNew.wxml
 create mode 100644 subpages/associationNew/components/membersListNew/membersListNew.wxss

diff --git a/subpages/associationNew/components/membersListNew/membersListNew.js b/subpages/associationNew/components/membersListNew/membersListNew.js
new file mode 100644
index 0000000..a32f426
--- /dev/null
+++ b/subpages/associationNew/components/membersListNew/membersListNew.js
@@ -0,0 +1,106 @@
+Component({
+  data: {
+  },
+  properties: {
+    currentUser: {
+      type: Object,
+      value: {}
+    },
+    gMembersList: {
+      type: Array,
+      value: [],
+      observer: function (value) {
+        if (value.length > 0) {
+          console.log(value)
+        }
+      }
+    },
+    gOfficialsList: {
+      type: Array,
+      value: [],
+      observer: function (value) {
+        if (value.length > 0) {
+          console.log(value)
+        }
+      }
+    }
+  },
+  methods: {
+    onNoSpeak (e) {
+      var _this = this;
+      wx.showActionSheet({
+        itemList: ['取消禁言','禁言1天', '禁言1周', '禁言1月', '永久禁言'],
+        success (res) {
+          // console.log(e.currentTarget.dataset.groupUserId,res.tapIndex)
+          let data = {
+            groupUserId: e.currentTarget.dataset.groupUserId,
+            bannedFlag: res.tapIndex.toString()
+          }
+          _this.triggerEvent('bannedChange',data)
+        },
+        fail (res) {
+          console.log(e.currentTarget.dataset.groupUserId,res.errMsg)
+        }
+      })
+    },
+    onPhone (e) {
+      if (this.getSysInfo()){
+        wx.showModal({
+          title: '拨打电话',
+          content: `您确定拨打${e.currentTarget.dataset.number}`,
+          cancelColor: '#29B9A5',
+          confirmColor: '#29B9A5',
+          success: (res) => {
+            if (res.confirm) {
+              console.log('用户点击确定')
+              wx.makePhoneCall({
+                phoneNumber: e.currentTarget.dataset.number
+              })
+            } else if (res.cancel) {
+              console.log('用户点击取消')
+            }
+          }
+        })        
+      } else {
+        wx.makePhoneCall({
+          phoneNumber: e.currentTarget.dataset.number
+        })        
+      }
+    },
+    getSysInfo () {
+      wx.getSystemInfo({
+        success:function(res){
+          if(res.platform == "devtools"){
+              return false
+          }else if(res.platform == "ios"){
+              return false
+          }else if(res.platform == "android"){
+              return true
+          }
+        }
+      })
+    },
+    gLevelUp (e) {
+      console.log(e.currentTarget.dataset.groupUserId)
+      let parm = {
+        groupUserId: e.currentTarget.dataset.groupUserId,
+        identityFlag: '1'
+      }
+      this.triggerEvent('modifyIdentity',parm)
+    },
+    gLevelDown (e) {
+      console.log(e.currentTarget.dataset.groupUserId)
+      let parm = {
+        groupUserId: e.currentTarget.dataset.groupUserId,
+        identityFlag: '2'
+      }
+      this.triggerEvent('modifyIdentity',parm)     
+    },
+    preViewImage(e) {
+      wx.previewImage({
+        urls: [e.currentTarget.dataset.src],
+        current: e.currentTarget.dataset.src
+      })
+    }
+  }
+})
\ No newline at end of file
diff --git a/subpages/associationNew/components/membersListNew/membersListNew.json b/subpages/associationNew/components/membersListNew/membersListNew.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/subpages/associationNew/components/membersListNew/membersListNew.json
@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/subpages/associationNew/components/membersListNew/membersListNew.wxml b/subpages/associationNew/components/membersListNew/membersListNew.wxml
new file mode 100644
index 0000000..9762195
--- /dev/null
+++ b/subpages/associationNew/components/membersListNew/membersListNew.wxml
@@ -0,0 +1,13 @@
+<view class="volunteer-box">
+  <view class="item" 
+  wx:for="{{gOfficialsList}}"
+  wx:for-index="index"
+  wx:for-item="item"
+  wx:key="index">
+    <image data-src="{{item.faceImg}}" bindtap="preViewImage" src="{{item.faceImg}}" />
+    <view class="name">{{item.name}}</view>
+    <view class="autograph">{{item.motto}}</view>
+
+    <view bindtap="onPhone" data-number="{{item.mobile}}" class="autograph">{{item.mobile}}</view>
+  </view>
+</view>
diff --git a/subpages/associationNew/components/membersListNew/membersListNew.wxss b/subpages/associationNew/components/membersListNew/membersListNew.wxss
new file mode 100644
index 0000000..f79e86f
--- /dev/null
+++ b/subpages/associationNew/components/membersListNew/membersListNew.wxss
@@ -0,0 +1,49 @@
+
+.item {
+  width: 320rpx;
+  height: 318rpx;
+  margin-top: 20rpx;
+  background: #fff;
+  border-radius: 20rpx;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+.item image {
+  width: 110rpx;
+  height: 110rpx;
+  border-radius: 50%;
+  margin-top: 40rpx;
+}
+
+.item .name {
+  margin-top: 11rpx;
+  font-size: 30rpx;
+  font-weight: bold;
+  color: rgba(51, 51, 51, 1);
+}
+
+.item .autograph {
+  margin-top: 10rpx;
+  font-size:26rpx;
+  font-weight:500;
+  color:rgba(193,193,193,1);
+  padding: 0 20rpx;
+}
+
+.show {
+  padding: 0rpx 40rpx;
+  height: 24rpx;
+  font-size: 24rpx;
+  line-height: 24rpx;
+  font-weight: 500;
+  color: #C5C5C5;
+}
+.volunteer-box {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  flex-wrap: wrap;
+  padding: 0rpx 40rpx 19rpx 40rpx;
+}
\ No newline at end of file
diff --git a/subpages/associationNew/pages/gOfficialsList/gOfficialsList.json b/subpages/associationNew/pages/gOfficialsList/gOfficialsList.json
index 38bcac3..edc27a8 100644
--- a/subpages/associationNew/pages/gOfficialsList/gOfficialsList.json
+++ b/subpages/associationNew/pages/gOfficialsList/gOfficialsList.json
@@ -2,7 +2,8 @@
   "usingComponents": {
     "load-more": "../../../../components/loadMore/loadMore",
     "no-data": "../../../../components/nodata/nodata",
-    "members-list": "../../components/membersList/membersList"
+    "members-list": "../../components/membersList/membersList",
+    "members-list-New": "../../components/membersListNew/membersListNew"
   },
   "navigationBarTitleText": "官小带个长"
 }
\ No newline at end of file
diff --git a/subpages/associationNew/pages/gOfficialsList/gOfficialsList.wxml b/subpages/associationNew/pages/gOfficialsList/gOfficialsList.wxml
index 262051a..de6cdb6 100644
--- a/subpages/associationNew/pages/gOfficialsList/gOfficialsList.wxml
+++ b/subpages/associationNew/pages/gOfficialsList/gOfficialsList.wxml
@@ -1,6 +1,7 @@
 <view class="gmembers-list">
-  <members-list gOfficialsList="{{gOfficialsList}}">
-  </members-list>
+  <!-- <members-list gOfficialsList="{{gOfficialsList}}">
+  </members-list> -->
+  <members-list-New gOfficialsList="{{gOfficialsList}}"></members-list-New>
   <no-data isShow="{{gOfficialsList.length == 0}}"></no-data>
   <load-more
     loadMoreVisible="{{loadMoreVisible}}"