zs 3 years ago
parent
commit
a2d1370976
6 changed files with 12 additions and 17 deletions
  1. 0 1
      app.json
  2. 4 1
      pages/dissolution/detail.js
  3. 1 2
      pages/dissolution/detail.wxss
  4. 0 7
      pages/me/index.js
  5. 5 4
      pages/team/apply.js
  6. 2 2
      pages/team/apply.wxml

+ 0 - 1
app.json

@@ -1,6 +1,5 @@
 {
   "pages": [
-    
     "pages/home/index",
     "pages/login/index", 
     "pages/index/index",

+ 4 - 1
pages/dissolution/detail.js

@@ -37,6 +37,7 @@ Page({
   // 监听用户是否登录
   watchLogin: function () {
     const that = this;
+    var team_id = that.ids;
     wx.getStorage({
       key: 'token',
       success: res => {
@@ -44,7 +45,9 @@ Page({
         wx.request({
           url: `${app.globalData.publicUrl}/courtAdmin/api/dismissapply`, //接口地址
           method: 'get',
-          data: {},
+          data: {
+            "team_id":team_id
+          },
           success(res) {
             if (res.data.errcode == 0) {
               let datas = res.data.data

+ 1 - 2
pages/dissolution/detail.wxss

@@ -14,7 +14,6 @@
 .list{
   float: left;
   width: 100%;
-  margin-top: 5%;
 }
 .two{
   width: 93%;
@@ -40,7 +39,7 @@
 }
 .rightt{
 margin-top: 5%;
-
+margin-bottom: 5%;
 }
 .button{
   margin-top: 0 !important;

+ 0 - 7
pages/me/index.js

@@ -97,13 +97,6 @@ Page({
       url: `/pages/auditTeam/index`,
     })
   },
-  // //解散申请
-  // apply: function (e) {
-  //   let id = e.currentTarget.dataset.id;
-  //   wx.navigateTo({
-  //     url: `/pages/dissolution/index?id=` + id,
-  //   })
-  // },
   //解散团队弹窗
   clickme: function (e) {
     let id = e.currentTarget.dataset.id;

+ 5 - 4
pages/team/apply.js

@@ -10,6 +10,7 @@ Page({
   data: {
     frameStyle: { useTop: false, name: '团队审核', leftArrow: true, useBar: false },
     user_id: '',
+    user_name: '',
     apply_time: '',
     ids: '',
     src: '/image/adimges.jpg',
@@ -30,9 +31,8 @@ Page({
       team_id: obj.id,
       team_name: obj.name,
       apply_time: this.data.apply_time,
-      apply_user: obj.user,
-      // apply_id: '1'
-      apply_id: obj.cid
+      apply_user: this.data.user_id,
+      apply_id: this.data.user_name
     }
     wx.showModal({
       title: '',
@@ -108,7 +108,7 @@ Page({
     });
     // 计算高度
     this.searchHeight()
-    this.ids=options.id;
+    this.ids = options.id;
     // 监听用户是否登录
     this.watchLogin();
   },
@@ -121,6 +121,7 @@ Page({
       success: res => {
         this.setData({
           user_id: res.data.id,
+          user_name: res.data.nickname
         })
         //查询数据
         wx.request({

+ 2 - 2
pages/team/apply.wxml

@@ -50,8 +50,8 @@
       </view>
     </view>
     <view class="four">
-      <button class="button" data-id="{{list._id}}" data-name="{{list.name}}" data-cid="{{list.create_id}}" data-user="{{list.create_user}}" bindtap='add' >待通过</button>
-      <button class="button" data-id="{{list._id}}" data-name="{{list.name}}" data-cid="{{list.create_id}}" data-user="{{list.create_user}}" bindtap='add'>申请加入</button>
+      <button class="button" data-id="{{list._id}}" data-name="{{list.name}}" bindtap='add' >待通过</button>
+      <button class="button" data-id="{{list._id}}" data-name="{{list.name}}" bindtap='add'>申请加入</button>
       <button class="button" bindtap='out'>退出团队</button>
     </view>
   </view>