Merge branch 'master' of http://git.cc-lotus.info/ball-court/court-mobile

pages/auditTeam/index.js

@@ -1,4 +1,3 @@
-// pages/login/login.js
 import WxValidate from '../../utils/wxValidate'
 const app = getApp()
 Page({
@@ -13,19 +12,37 @@ Page({
         //加入团队列表
         list: [],
         menbers: [],
-        id: ''
+        id: '',
+        show: false,
+        show1: false
     },
 
     back: function () {
         wx.navigateBack({ url: '/pages/me/index' })
     },
+    chickme: function (e) {
+        this.setData({ 
+            show: true ,
+            id1:e.currentTarget.dataset.id1
+        })
+        
+    },
+    chickme1: function (e) {
+        this.setData({
+             show1: true,
+             id1:e.currentTarget.dataset.id1
+            })
+    },
+    onClose() {
+        this.setData({ show: false })
+    },
     //通过
     adopt: function (e) {
         const that = this;
         let id = e.currentTarget.dataset.id;
         //修改状态-加入团队修改
         wx.request({
-            url: `${app.globalData.publicUrl}/courtAdmin/api/joinapply/${id}`, 
+            url: `${app.globalData.publicUrl}/courtAdmin/api/joinapply/${id}`,
             method: "post",
             data: { status: '1' },
             header: {},
@@ -49,12 +66,12 @@ Page({
             data: {},
             header: {},
             success: res => {
-                let id_1 = this.data.id
+                let id_1 = that.data.id
                 let members = [];
                 members.push({ id: res.data.data.id, nickname: res.data.data.nickname, icon: res.data.data.icon })
                 that.setData({ members: members })
                 wx.request({
-                    url: `${app.globalData.publicUrl}/courtAdmin/api/team/${id_1}`, 
+                    url: `${app.globalData.publicUrl}/courtAdmin/api/team/${id_1}`,
                     method: "post",
                     data: { members: members },
                     header: {},
@@ -74,13 +91,12 @@ Page({
             error: err => {
             }
         })
-
     },
     //驳回
     reject: function (e) {
         let { id } = e.currentTarget.dataset;
         wx.request({
-            url: `${app.globalData.publicUrl}/courtAdmin/api/joinapply/${id}`, 
+            url: `${app.globalData.publicUrl}/courtAdmin/api/joinapply/${id}`,
             method: "post",
             data: { status: '-1' },
             header: {},
@@ -132,17 +148,17 @@ Page({
             }
         })
     },
-   // 计算高度
-   searchHeight: function () {
-    let frameStyle = this.data.frameStyle;
-    let client = app.globalData.client;
-    let infoHeight = client.windowHeight;
-    // 是否去掉状态栏
-    if (frameStyle.useTop) infoHeight = infoHeight - (client.statusBarHeight + client.getMenu.height + (client.getMenu.top - client.statusBarHeight) * 2);
-    // 是否减去底部菜单
-    if (frameStyle.useBar) infoHeight = infoHeight - 50;
-    if (infoHeight) this.setData({ infoHeight: infoHeight })
-},
+    // 计算高度
+    searchHeight: function () {
+        let frameStyle = this.data.frameStyle;
+        let client = app.globalData.client;
+        let infoHeight = client.windowHeight;
+        // 是否去掉状态栏
+        if (frameStyle.useTop) infoHeight = infoHeight - (client.statusBarHeight + client.getMenu.height + (client.getMenu.top - client.statusBarHeight) * 2);
+        // 是否减去底部菜单
+        if (frameStyle.useBar) infoHeight = infoHeight - 50;
+        if (infoHeight) this.setData({ infoHeight: infoHeight })
+    },
     /**
      * 生命周期函数--监听页面初次渲染完成
      */

pages/auditTeam/index.wxml

@@ -9,10 +9,15 @@
                     <view class="text2">申请时间：{{item.apply_time}}</view>
                 </view>
                 <view class="two_r">
-                    <button size="mini" wx:if="{{item.status=='0'}}" bindtap="reject" data-id="{{item._id}}" class="btn1">驳回</button>
-                    <button size="mini" wx:if="{{item.status=='0'}}"  bindtap="adopt" data-id="{{item._id}}" data-id1="{{item.apply_id}}" class="btn2">通过</button>
+                    <!-- <button size="mini" wx:if="{{item.status=='0'}}" bindtap="reject" data-id="{{item._id}}" data-id1="{{item.apply_id}}" class="btn1">驳回</button>
+                    <button size="mini" wx:if="{{item.status=='0'}}" bindtap="adopt" data-id="{{item._id}}" data-id1="{{item.apply_id}}" class="btn2">通过</button> -->
+                    <button size="mini" bindtap="chickme" data-id1="{{item.apply_id}}" class="btn1">驳回</button>
+                    <van-dialog use-solt show="{{show}}" title="是否驳回" message="id为{{id1}}的申请" show-cancel-button bind:close="onClose" bind:confirm="reject" data-id="{{item._id}}" data-id1="{{item.apply_id}}">
+                    </van-dialog>
+                    <button size="mini" bindtap="chickme1" data-id1="{{item.apply_id}}" class="btn2">通过</button>
+                    <van-dialog use-solt show="{{show1}}" title="是否通过" message="id为{{id1}}的申请" show-cancel-button bind:close="onClose" data-id="{{item._id}}" bind:confirm="adopt" data-id1="{{item.apply_id}}">
+                    </van-dialog>
                 </view>
-
             </view>
         </view>
     </view>

pages/auditTeam/index.wxss

@@ -65,4 +65,10 @@
     font-size: 12px;
     margin: 0 0 0 20px;
     color: #f18080;
+}
+.van-dialog__header {
+    padding-top: 20px;
+    font-weight: 500;
+    line-height: 24px;
+    text-align: center;
 }