diff --git a/app.json b/app.json
index 397f712..a071b04 100644
--- a/app.json
+++ b/app.json
@@ -1,11 +1,11 @@
 {
   "pages": [
+    "pages/center/center",
     "pages/book/book",
     "pages/index/index",
     "pages/broadcast/broadcast",
     "pages/activityDialog/activityDialog",
     "pages/teamDetail/teamDetail",
-    "pages/center/center",
     "pages/volunteerRegister/volunteerRegister",
     "pages/volunteer/volunteer",
     "pages/heritage/heritage",
diff --git a/pages/myVolunteerTeam/myVolunteerTeam.js b/pages/myVolunteerTeam/myVolunteerTeam.js
index 840cbc1..94925b1 100644
--- a/pages/myVolunteerTeam/myVolunteerTeam.js
+++ b/pages/myVolunteerTeam/myVolunteerTeam.js
@@ -10,7 +10,6 @@ Page({
     otherTeamMap: {},
     type: '1',
     teamId: '',
-
   },
   getToken: function() {
     var self = this;
@@ -26,6 +25,12 @@ Page({
       })
     })
   },
+  toTeamDetail: function(e) {
+    var teamId = e.currentTarget.dataset.teamid;
+    wx.navigateTo({
+      url: '../teamDetail/teamDetail?teamId=' + teamId,
+    })
+  },
   newTeam: function () {
     wx.navigateTo({
       url: '../newTeam/newTeam',
diff --git a/pages/myVolunteerTeam/myVolunteerTeam.wxml b/pages/myVolunteerTeam/myVolunteerTeam.wxml
index 38740fc..536dfcc 100644
--- a/pages/myVolunteerTeam/myVolunteerTeam.wxml
+++ b/pages/myVolunteerTeam/myVolunteerTeam.wxml
@@ -1,5 +1,5 @@
 <view class="team">
-  <view class="team-box" wx:for="{{otherTeamMap}}" data-id="{{item.teamId}}">
+  <view class="team-box" bindtap="toTeamDetail" data-teamid="{{item.teamId}}" wx:for="{{otherTeamMap}}">
     <view class="name-join">
       <view class="name">{{item.teamName}}</view>
       <view class="join" wx:if="{{item.checkStatus == '' && type == 1}}" data-teamid="{{item.teamId}}" bindtap="joinOrOutTeam">申请加入</view>
diff --git a/pages/teamDetail/teamDetail.js b/pages/teamDetail/teamDetail.js
index aaf2ecc..036ad0c 100644
--- a/pages/teamDetail/teamDetail.js
+++ b/pages/teamDetail/teamDetail.js
@@ -1,18 +1,120 @@
 // pages/teamDetail/teamDetail.js
+var app = getApp();
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
+    token: '',
+    teamId: '',
+    dataMap: [],
+    memberData: {},
+    checkData: {}
+  },
+  getToken: function() {
+    var self = this;
+    return new Promise(resolve =>{
+      wx.getStorage({
+        key: 'token',
+        success(res) {
+          self.setData({
+            token: res.data
+          })
+          return resolve();
+        }
+      })
+    })
+  },
+  getDetail(teamId) {
+    var self = this;
+    app.restAjax.get(app.restAjax.path(app.volunteerUrl + 'wxminiapp/team/getteambyid/' + teamId, []), 
+      {}, {
+        headers: {
+          token: self.data.token
+        }
+      }, function(code, data) {
+        console.log(data)
+		    if('200' == code) {
+          self.setData({
+            dataMap: data
+          })
+        }
+    }, function() {
+
+    }, function() {
+      
+    })
+  },
+  getMember(teamId) {
+    var self = this;
+    app.restAjax.get(app.restAjax.path(app.volunteerUrl + 'wxminiapp/teammember/listteammember?teamId=' + teamId, []), 
+      {}, {
+        headers: {
+          token: self.data.token
+        }
+      }, function(code, data) {
+		    if('200' == code) {
+          var teamMember = [];
+          var checkMember = [];
+          for(var item of data) {
+            if('1' == item.status) {
+              teamMember.push(item);
+            }else {
+              checkMember.push(item);
+            }
+          }
+          self.setData({
+            memberData: teamMember,
+            checkData: checkMember
+          })
+        }
+    }, function() {
+
+    }, function() {
+      
+    })
+  },
+  agree(e) {
+    var self = this;
+    console.log(e)
+    var id = e.currentTarget.dataset.teammemberid;
+    var type = e.currentTarget.dataset.type;
+    app.restAjax.get(app.restAjax.path(app.volunteerUrl + 'wxminiapp/teammember/checkmember/'+id+'/' + type + '?teamId=' + self.data.teamId, []), 
+      {}, {
+        headers: {
+          token: self.data.token
+        }
+      }, function(code, data) {
+		    if('200' == code) {
+          if('1' == type) {
+            app.dialog.msg('审核通过！');
+          }else {
+           app.dialog.msg('审核驳回！');
+          }
+          wx.navigateTo({
+            url: '../myVolunteerTeam/myVolunteerTeam',
+          })
+        }
+    }, function() {
+
+    }, function() {
+      
+    })
 
   },
-
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-
+    var self = this;
+    self.setData({
+      teamId: options.teamId
+    })
+    this.getToken().then(result => {
+      this.getDetail(options.teamId);
+      this.getMember(options.teamId);
+    })
   },
 
   /**
diff --git a/pages/teamDetail/teamDetail.wxml b/pages/teamDetail/teamDetail.wxml
index 7f28701..5b09e1a 100644
--- a/pages/teamDetail/teamDetail.wxml
+++ b/pages/teamDetail/teamDetail.wxml
@@ -2,66 +2,55 @@
   <view class="team-info">
     <view class="row">
       <view class="title">团队名称：</view>
-      <view class="content">团队名称</view>
+      <view class="content">{{dataMap.teamName}}</view>
     </view>
     <view class="row">
       <view class="title">团队人数：</view>
-      <view class="content">1</view>
+      <view class="content">{{dataMap.count}}</view>
     </view>
     <view class="row">
       <view class="title">所属区域：</view>
-      <view class="content">所属区域</view>
+      <view class="content">{{dataMap.teamCityDictionaryName}} {{dataMap.teamCountyDictionaryName}} {{dataMap.teamAreaDictionaryName}}</view>
+    </view>
+    <view class="row">
+      <view class="title">团队口号：</view>
+      <view class="content intro">{{dataMap.teamWatchword}}</view>
     </view>
     <view class="row">
       <view class="title">团队介绍：</view>
-      <view class="content intro">团队介绍</view>
+      <view class="content intro">{{dataMap.content}}</view>
     </view>
   </view>
   <view class="team-member">
     <view class="member-title">团队成员</view>
-    <view class="member-box">
+    <view class="member-box" wx:for="{{memberData}}" data-teammemberid="{{item.teamMemberId}}">
       <view class="member-avatar">
         <image src="../../images/avatar.png"></image>
       </view>
       <view class="member-info">
-        <view class="name">名字<text class="post">队长</text></view>
-        <view class="join-time">加入时间：2020-02-02</view>
-      </view>
-    </view>
-    <view class="member-box">
-      <view class="member-avatar">
-        <image src="../../images/avatar.png"></image>
-      </view>
-      <view class="member-info">
-        <view class="name">名字<text class="post">队长</text></view>
-        <view class="join-time">加入时间：2020-02-02</view>
-      </view>
-    </view>
-    <view class="member-box">
-      <view class="member-avatar">
-        <image src="../../images/avatar.png"></image>
-      </view>
-      <view class="member-info">
-        <view class="name">名字<text class="post">队长</text></view>
-        <view class="join-time">加入时间：2020-02-02</view>
+        <view class="name">{{item.memberName}}
+          <text class="post" wx:if="{{item.memberType == '2'}}">队长</text>
+          <text class="post" wx:if="{{item.memberType == '1'}}">成员</text>
+        </view>
+        <view class="join-time">加入时间：{{item.inputTime}}</view>
       </view>
     </view>
   </view>
   <view class="team-member">
     <view class="member-title">申请人员</view>
-    <view class="member-box">
+    <view class="member-box" wx:for="{{checkData}}">
       <view class="member-avatar">
         <image src="../../images/avatar.png"></image>
       </view>
       <view class="member-info">
         <view class="name apply-member">
-          <view class="name-box">名字</view>
+          <view class="name-box">{{item.memberName}}</view>
           <view class="btn">
-            <view class="agree">通过</view>
-            <view class="refuse">拒绝</view>
+            <view class="agree" bindtap="agree" data-teammemberid="{{item.teamMemberId}}" data-type="1">通过</view>
+            <view class="refuse" bindtap="agree" data-teammemberid="{{item.teamMemberId}}" data-type="2">拒绝</view>
           </view>
         </view>
-        <view class="join-time">加入时间：2020-02-02</view>
+        <view class="join-time">加入时间：{{item.inputTime}}</view>
       </view>
     </view>
   </view>