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

pages/auditTeam/index.js

@@ -123,6 +123,7 @@ Page({
                     header: {},
                     success: res => {
                         that.setData({ list: res.data.data })
+                        console.log(res.data.data);
                     },
                     error: err => {
                     }

pages/layNew/index.js

@@ -1,30 +1,40 @@
 // pages/login/login.js
 import WxValidate from '../../utils/wxValidate'
 const app = getApp()
+var type = "";//用来保存picker组件选中的类别id
 Page({
     /**
      * 页面的初始数据
      */
     data: {
-        // 主体高度
+        // 主体高度
         infoHeight: '',
         frameStyle: { useTop: true, name: '新增赛程编排', leftArrow: true, useBar: false },
         form: {
         },
-        // 上传图片
+        // 上传图片
         fileList: [],
         //比赛id
         id: '',
-        select: false,
-        select1: false,
-        grade_name: '--请选择--',
-        grade_name1: '--请选择--',
         grades: [],
+        cateArray: [],
+        cateIndex: 0,
+        objectArray: [],
+        index: 0,
         date: '2022-05-01',
         time: '08:00',
         red: {},
         blue: {},
     },
+    //当用户点击确定时，执行的事件
+    bindCatePickerChange: function (e) {
+        var cid = this.data.cateArray[e.detail.value].id;
+        type = cid
+        //下面重新赋值必须有，页面显示的信息才会改为刚刚选中的值
+        this.setData({
+            cateIndex: e.detail.value,
+        })
+    },
     //蓝方
     bindShowMsg() {
         this.setData({
@@ -83,7 +93,7 @@ Page({
     back: function () {
         wx.navigateBack({ url: '/pages/me/index' })
     },
-  //提交
+    //提交
     formSubmit: function (e) {
         var match_time = this.data.date + '  ' + this.data.time;
         const value = e.detail.value;
@@ -129,6 +139,9 @@ Page({
      * 生命周期函数--监听页面加载
      */
     onLoad: function (options) {
+        //选择器
+        var cindex = this.data.cateIndex
+        type = this.data.cateArray[cindex].id
         this.setData({ id: options.id })
         // 计算高度
         this.searchHeight();
@@ -137,7 +150,7 @@ Page({
         //验证规则函数
         this.initValidate();
     },
-    // 监听用户是否登录
+    // 监听用户是否登录
     watchLogin: function () {
         const that = this;
         let id = that.data.id;
@@ -145,7 +158,7 @@ Page({
             key: 'token',
             success: res => {
                 wx.request({
-                    url: `${app.globalData.publicUrl}/courtAdmin/api/match/${id}`, //接口地址
+                    url: `${app.globalData.publicUrl}/courtAdmin/api/match/${id}`, //接口地址
                     method: 'get',
                     data: {},
                     success(res) {
@@ -153,11 +166,13 @@ Page({
                     }
                 })
                 wx.request({
-                    url: `${app.globalData.publicUrl}/courtAdmin/api/matchteam`, //接口地址
+                    url: `${app.globalData.publicUrl}/courtAdmin/api/matchteam`, //接口地址
                     method: 'get',
-                    data: { match_id: that.data.id },
+                    data: { match_id: id },
                     success(res) {
-                        that.setData({ grades: res.data.data })
+                        let datas = res.data.data;
+                        console.log(datas);
+                        that.setData({ cateArray: datas })
                     }
                 })
             },
@@ -173,7 +188,7 @@ Page({
         const messages = { match_name: { required: '请输入比赛名称' }, };
         this.WxValidate = new WxValidate(rules, messages)
     },
-  
+
     // 计算高度
     searchHeight: function () {
         let frameStyle = this.data.frameStyle;

pages/layNew/index.wxml

@@ -8,15 +8,9 @@
                 </view>
                 <view class="one">
                     <view class="text">蓝方</view>
-                    <view class='input' bindtap='bindShowMsg'>
-                        <text>{{grade_name}}</text>
-                    </view>
-                    <!-- 下拉需要显示的列表 -->
-                    <view class="select_box" wx:if="{{select}}">
-                        <view wx:for="{{grades}}" wx:key="item">
-                            <view class="select_one" bindtap="mySelect" data-data="{{item}}"  data-name="{{item.team_name}}">{{item.team_name}}</view>
-                        </view>
-                    </view>
+                    <picker mode="selector" bindchange="bindCatePickerChange" value="{{cateIndex}}" range-key="team_name" range="{{cateArray}}">
+                        <view class="input">{{cateArray[cateIndex].team_name}}</view>
+                    </picker>
                 </view>
                 <view class="one">
                     <view class="text">红方</view>
@@ -32,7 +26,7 @@
                 </view>
                 <view class="one">
                     <view class="text">比赛时间</view>
-                    <picker  mode="date" value="{{date}}" start="2015-09-01" end="3017-09-01" bindchange="bindDateChange">
+                    <picker mode="date" value="{{date}}" start="2015-09-01" end="3017-09-01" bindchange="bindDateChange">
                         <view class="input1">{{date}}</view>
                     </picker>
                     <picker mode="time" value="{{time}}" start="00:00" end="23:59" bindchange="bindTimeChange">

pages/team/apply.js

@@ -15,9 +15,11 @@ Page({
     ids: '',
     src: '/image/adimges.jpg',
     src1: '/image/head1.png',
+    isshow: true,
     // 主体高度
     infoHeight: '',
     teamlist: [],
+    addlist: [],
   },
   tabPath(e) {
     let query = e.detail.detail;
@@ -121,6 +123,7 @@ Page({
           user_id: res.data.id,
           user_name: res.data.nickname
         })
+        let user_id = res.data.id;
         //查询数据
         wx.request({
           url: `${app.globalData.publicUrl}/courtAdmin/api/team/` + id, //接口地址
@@ -129,9 +132,29 @@ Page({
           success(res) {
             if (res.data.errcode == 0) {
               let datas = res.data.data
+              let members = datas.members
+              for (let i = 0; i < members.length; i++) {
+                if (user_id == members[i].id) {
+                  that.setData({
+                    isshow: false,
+                  });
+                }
+              }
               that.setData({
                 teamlist: datas,
               });
+              //加入团队列表
+              wx.request({
+                url: `${app.globalData.publicUrl}/courtAdmin/api/joinapply`, //接口地址
+                method: "get",
+                data: { team_id: id },
+                header: {},
+                success: res => {
+                  that.setData({ addlist: res.data.data })
+                },
+                error: err => {
+                }
+              })
             } else {
               wx.showToast({
                 title: res.data.errmsg,

pages/team/apply.wxml

@@ -50,9 +50,9 @@
       </view>
     </view>
     <view class="four">
-      <button class="button" data-id="{{teamlist._id}}" data-name="{{teamlist.name}}" bindtap='add' >待通过</button>
-      <button class="button" data-id="{{teamlist._id}}" data-name="{{teamlist.name}}" bindtap='add'>申请加入</button>
-      <button class="button" bindtap='out'>退出团队</button>
+      <button wx:if="{{isshow && addlist[0].status == '0'}}" class="button" data-id="{{teamlist._id}}" data-name="{{teamlist.name}}" bindtap='add' >待通过</button>
+      <button wx:if="{{isshow}}" class="button" data-id="{{teamlist._id}}" data-name="{{teamlist.name}}" bindtap='add'>申请加入</button>
+      <button wx:if="{{!isshow}}" class="button" bindtap='out'>退出团队</button>
     </view>
   </view>
 </mobile-main>

pages/team/apply.wxss

@@ -33,9 +33,7 @@
 .one-3{
   position: absolute;
   margin-top: -25%;
-  margin-left: 41%;
-  width: 23%;
-  height: 63.78px;
+  margin-left: 40%;
 }
 .imgs{
   margin-top: 4px;
@@ -131,7 +129,7 @@
 }
 .four{
   background-color: white;
-  padding-top: 180px;
+  padding-top: 80px;
   padding-bottom: 20px;
 }
 .image {