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

pages/auditTeam/index.js

@@ -16,7 +16,7 @@ Page({
         // 团队队员
         members: [],
         //审核通过的团队队员
-        member:[],
+        member: [],
         //详情
         details: {},
         show: false,
@@ -50,71 +50,73 @@ Page({
         wx.showModal({
             content: `您确定提交${status == '1' ? '通过' : '驳回'}操作吗?`,
             title: '提示',
-            success: (result) => {
-                if (status == '1') {
-                    //修改状态-加入团队修改
-                    wx.request({
-                        url: `${app.globalData.publicUrl}/courtAdmin/api/joinapply/${id}`,
-                        method: "post",
-                        data: { status: status },
-                        header: {},
-                        success: res => {
-                            if (res.data.errcode === 0) {
-                                wx.showToast({ title: '审核成功', icon: 'success', duration: 2000 });
-                                that.watchLogin();
-                            } else {
-                                wx.showToast({ title: res.data.errmsg, icon: 'error', duration: 2000 })
+            success(result) {
+                if (result.confirm) {
+                    if (status == '1') {
+                        //修改状态-加入团队修改
+                        wx.request({
+                            url: `${app.globalData.publicUrl}/courtAdmin/api/joinapply/${id}`,
+                            method: "post",
+                            data: { status: status },
+                            header: {},
+                            success: res => {
+                                if (res.data.errcode === 0) {
+                                    wx.showToast({ title: '审核成功', icon: 'success', duration: 2000 });
+                                    that.watchLogin();
+                                } else {
+                                    wx.showToast({ title: res.data.errmsg, icon: 'error', duration: 2000 })
+                                }
+                            },
+                            error: err => {
+                            }
+                        })
+                        //用户详情
+                        wx.request({
+                            url: `${app.globalData.publicUrl}/courtAdmin/api/user/${userid}`, //接口地址
+                            method: "get",
+                            data: {},
+                            header: {},
+                            success: res => {
+                                let member = [];
+                                member.push({ id: res.data.data.id, nickname: res.data.data.nickname, icon: res.data.data.icon })
+                                that.setData({ member: member })
+                                let members = that.data.members;
+                                members = [...members, ...member];
+                                wx.request({
+                                    url: `${app.globalData.publicUrl}/courtAdmin/api/team/${id_1}`,
+                                    method: "post",
+                                    data: { members: members },
+                                    header: {},
+                                    success: res => {
+                                    },
+                                    error: err => {
+                                    }
+                                })
+                            },
+                            error: err => {
                             }
-                        },
-                        error: err => {
-                        }
-                    })
-                    //用户详情
-                    wx.request({
-                        url: `${app.globalData.publicUrl}/courtAdmin/api/user/${userid}`, //接口地址
-                        method: "get",
-                        data: {},
-                        header: {},
-                        success: res => {
-                            let member = [];
-                            member.push({ id: res.data.data.id, nickname: res.data.data.nickname, icon: res.data.data.icon })
-                            that.setData({ member: member })
-                            let members = that.data.members;
-                            members = [...members, ...member];
-                            wx.request({
-                                url: `${app.globalData.publicUrl}/courtAdmin/api/team/${id_1}`,
-                                method: "post",
-                                data: { members: members },
-                                header: {},
-                                success: res => {
-                                },
-                                error: err => {
+                        })
+                    } else {
+                        wx.request({
+                            url: `${app.globalData.publicUrl}/courtAdmin/api/joinapply/${id}`,
+                            method: "post",
+                            data: { status: status },
+                            header: {},
+                            success: res => {
+                                if (res.data.errcode === 0) {
+                                    wx.showToast({ title: '审核成功', icon: 'success', duration: 2000 });
+                                    that.watchLogin();
+                                } else {
+                                    wx.showToast({ title: res.data.errmsg, icon: 'error', duration: 2000 })
                                 }
-                            })
-                        },
-                        error: err => {
-                        }
-                    })
-                } else {
-                    wx.request({
-                        url: `${app.globalData.publicUrl}/courtAdmin/api/joinapply/${id}`,
-                        method: "post",
-                        data: { status: status },
-                        header: {},
-                        success: res => {
-                            if (res.data.errcode === 0) {
-                                wx.showToast({ title: '审核成功', icon: 'success', duration: 2000 });
-                                that.watchLogin();
-                            } else {
-                                wx.showToast({ title: res.data.errmsg, icon: 'error', duration: 2000 })
+                            },
+                            error: err => {
                             }
-                        },
-                        error: err => {
-                        }
-                    })
+                        })
 
-                }
-            },
+                    }
+                } else if (result.cancel) { }
+            }
         })
     },
     /**