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

pages/team/apply.js

@@ -17,7 +17,9 @@ Page({
     isshow: true,
     // 主体高度
     infoHeight: '',
+    //团队详情
     teamlist: [],
+    //加入团队列表
     addlist: [],
   },
   tabPath(e) {
@@ -100,6 +102,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    this.setData({ ids: options.id });
     //获取当前时间
     let apply_time = moment().format('YYYY-MM-DD HH:mm:ss');
     this.setData({
@@ -107,25 +110,24 @@ Page({
     });
     // 计算高度
     this.searchHeight()
-    this.ids = options.id;
     // 监听用户是否登录
     this.watchLogin();
   },
   // 监听用户是否登录
   watchLogin: function () {
     var that = this;
-    let id = that.ids
+    let id = that.data.ids
     wx.getStorage({
       key: 'token',
       success: res => {
-        this.setData({
+        that.setData({
           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, //接口地址
+          url: `${app.globalData.publicUrl}/courtAdmin/api/team/${id}`, //接口地址
           method: 'get',
           data: '',
           success(res) {

pages/team/apply.wxml

@@ -45,7 +45,7 @@
           <view class="thr-left">
             <image class="img" src="{{item.icon[0].url}}"></image>
           </view>
-          <view class="thr-right"><text class="name textOver">{{item.nickname}}</text> </view>
+          <view class="thr-right textOver"><text class="name">{{item.nickname}}</text> </view>
         </view>
       </view>
     </view>

pages/team/apply.wxss

@@ -22,7 +22,7 @@
   font-weight: 600;
   position: absolute;
   top: 5%;
-  left: 42%;
+  left: 43%;
   color: #ffffff;
 }
 
@@ -37,22 +37,20 @@
 
 .one-3 {
   position: absolute;
-  margin-top: -22%;
-  margin-left: 40%;
+  margin-top: -23%;
+  margin-left: 32.5%;
   width: 38%;
   height: 63.78px;
 }
 
 .imgs {
   border-radius: 50%;
-  margin-top: 4px;
-  margin-left: 2px;
   width: 70px;
   height: 70px;
 }
 
 .person {
-  margin-left: 21%;
+  text-align: center;
   font-size: 13px;
   color: #ffffff;
   font-weight: 300;
@@ -187,6 +185,7 @@
 
 .group {
   width: 100%;
+  text-align: center;
   color: #ffffff;
   margin-top: 20px;
   margin-left: 2px;

pages/team/examine.js

@@ -59,7 +59,6 @@ Page({
         var that = this;
         var list = that.data.teamlist;
         var match_id = that.data.ids;
-        debugger
         var match_name = list.name;
         wx.request({
           url: `${app.globalData.publicUrl}/courtAdmin/api/matchteam`, //接口地址