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

pages/auditTeam/index.wxml

@@ -3,17 +3,17 @@
         <view class="one" wx:key="item" wx:for="{{list}}">
             <view class="two">
                 <view class="two_l">
-                    <image class="icon" src="{{item.icon[0].url}}"></image>
-                </view>
-                <view class="two_r">
                     <view class="text1">{{item.apply_user}}
                         <text class="text3">{{item.status=='1'?'已通过':item.status=='0'?'待通过':'已驳回'}}</text>
                     </view>
                     <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}}" class="btn2">通过</button>
                 </view>
+
+            </view>
         </view>
     </view>
 </mobile-main>

pages/auditTeam/index.wxss

@@ -8,17 +8,23 @@
 .one {
     margin: 0 12px 10px 12px;
     background-color: #fff;
-    height: 110px;
+    height: 96px;
+}
+
+.two {
+    background-color: #fff;
 }
 
 .two_l {
-    width: 25%;
+    width: 70%;
     float: left;
+    margin: 10px 0 0 12px;
 }
 
 .two_r {
-    width: 70%;
+    width: 20%;
     float: left;
+    padding: 13px 0 0 0;
 }
 
 .icon {
@@ -29,7 +35,6 @@
 
 .text1 {
     margin: 10px 0 10px 0;
-    /* width: 50px; */
 }
 
 .text2 {
@@ -38,28 +43,22 @@
     color: #666;
 }
 
-/* .btn {
-    width: 100%;
-    height: 40px;
-} */
-
 .btn1 {
-    width: 80px !important;
+    width: 70px !important;
     height: 30px !important;
     background-color: rgba(136, 136, 136, 0.4);
     border-radius: 30px;
     color: #5e5e5e;
-    margin: 4px 0px 4px -45px;
 }
 
 .btn2 {
-    width: 80px !important;
+    width: 70px !important;
     height: 30px !important;
     background-image: linear-gradient(to right, #f43f3f, #ce4bd2);
     border-radius: 30px;
     color: #ffffff;
     text-align: center;
-    margin: 4px 0 4px 100px;
+    margin: 10px 0 0 0;
 }
 
 .text3 {

pages/createTeam/index.wxml

@@ -25,7 +25,7 @@
                     </view>
                     <view class="one">
                         <view class="text">创建时间</view>
-                        <picker name="create_time" mode="date"  value="{{form.create_time}}" start="2015-09-01" end="2017-09-01" bindchange="bindDateChange">
+                        <picker name="create_time" mode="date"  value="{{form.create_time}}" start="2015-09-01" end="3017-09-01" bindchange="bindDateChange">
                             <view class="input">
                                 {{form.create_time}}<image class="back" src="/image/back.png"></image>
                             </view>

pages/layNew/index.wxml

@@ -32,10 +32,10 @@
                 </view>
                 <view class="one">
                     <view class="text">比赛时间</view>
-                    <picker  mode="date" value="{{date}}" start="2015-09-01" end="2017-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="09:01" end="21:01" bindchange="bindTimeChange">
+                    <picker mode="time" value="{{time}}" start="00:00" end="23:59" bindchange="bindTimeChange">
                         <view class="input2">{{time}}</view>
                     </picker>
                 </view>

pages/layNew/index.wxss

@@ -32,7 +32,7 @@
   text-align: right;
   left: 85px;
   top: -10px;
-  width: 60%;
+  width: 50%;
   font-size: 14px;
 }
 
@@ -40,7 +40,7 @@
   width: 50px;
   position: relative;
   text-align: right;
-  left: 280px;
+  left: 260px;
   top: -27px;
   font-size: 14px;
 }

pages/me/index.js

@@ -3,7 +3,6 @@ import WxValidate from '../../utils/wxValidate'
 const app = getApp()
 var url = app.globalData.url
 Page({
-
   /**
    * 页面的初始数据
    */
@@ -73,19 +72,7 @@ Page({
       url: `/pages/teamDetails/index?id=` + id,
     })
   },
-  //比赛管理
-  Administration: function (e) {
-    var list = JSON.stringify(this.data.list3[0])
-    wx.navigateTo({
-      url: `/pages/meMatch/index?list=${list}`,
-    })
-  },
-  //比赛管理
-  manage: function (e) {
-    wx.navigateTo({
-      url: `/pages/meMatch/detail`,
-    })
-  },
+
   //已上传图片
   Uploaded: function () {
     wx.navigateTo({
@@ -105,19 +92,42 @@ Page({
       url: `/pages/auditTeam/index?id=` + id,
     })
   },
-  //解散团队弹窗
+  //解散团队
   clickme: function (e) {
     let id = e.currentTarget.dataset.id;
     wx.navigateTo({
       url: `/pages/dissolution/detail?id=` + id,
     })
   },
-  preventTouchMove: function () {
+  //退出登录
+  tui() {
+    wx.showModal({
+      title: '',
+      content: '是否确认退出登录',
+      success(res) {
+        if (res.confirm) {
+          wx.removeStorage({
+            key: 'token',
+            success(res) {
+              return wx.redirectTo({ url: '/pages/index/index', })
+            }
+          })
+        } else if (res.cancel) {
+        }
+      }
+    })
   },
-  //关闭弹窗
-  go: function () {
-    this.setData({
-      showModal: false
+  //团队创建人-比赛管理
+  Administration: function (e) {
+    var list = JSON.stringify(this.data.list3[0])
+    wx.navigateTo({
+      url: `/pages/meMatch/index?list=${list}`,
+    })
+  },
+  //管理员-比赛管理
+  manage: function (e) {
+    wx.navigateTo({
+      url: `/pages/meMatch/detail`,
     })
   },
   /**
@@ -181,24 +191,7 @@ Page({
       }
     })
   },
-  //退出登录
-  tui() {
-    wx.showModal({
-      title: '',
-      content: '是否确认退出登录',
-      success(res) {
-        if (res.confirm) {
-          wx.removeStorage({
-            key: 'token',
-            success(res) {
-              return wx.redirectTo({ url: '/pages/index/index', })
-            }
-          })
-        } else if (res.cancel) {
-        }
-      }
-    })
-  },
+
   // 计算高度
   searchHeight: function () {
     let frameStyle = this.data.frameStyle;

pages/me/index.wxml

@@ -1,8 +1,10 @@
 <mobile-main frameStyle="{{frameStyle}}" bind:tabPath="tabPath">
   <view slot="info" class="main" style="height:{{infoHeight}}px;">
+    <!-- 背景图片 -->
     <view class="one">
       <image src="{{src}}" class="images"></image>
     </view>
+    <!-- 用户详情 -->
     <view class="two">
       <view class="list">
         <view class="left1">
@@ -19,19 +21,13 @@
           <image src="{{icon}}" class="tou"></image>
         </view>
         <view class="otherInfo1 textOver">
-          <view class="biao">
-            <text class=" icon iconfont icon-qi" wx:if="{{item1.name}}"></text>
-          </view>
-          <view class="qian">
-            <text class="text3" wx:if="{{item1.type=='1'||item1.type=='2'}}">{{item1.name}}</text>
-          </view>
           <view class="icon_arrow" bindtap="modify">
             <van-icon name="arrow" color="rgb(177, 177, 177)" />
           </view>
         </view>
       </view>
     </view>
-
+    <!-- 上传比分 -->
     <view class="four" wx:if="{{item1.type=='1'}}">
       <view class="thr">
         <view class="left2">
@@ -73,6 +69,7 @@
         </view>
       </view>
     </view>
+    <!-- 上传比分-无比赛 -->
     <view class="four-zan" wx:if="{{listbisai.length==0}}" wx:key="item" wx:for="{{listbisai}}">
       <view class="zan-left">
         <text>暂无比赛</text>
@@ -81,6 +78,7 @@
         <image src="{{src4}}" class="zan"></image>
       </view>
     </view>
+    <!-- 团队创建人-团队列表 -->
     <view class="five">
       <view class="listtuan" wx:if="{{item1.type=='1'}}">
         <view class="otherInfo">
@@ -118,8 +116,8 @@
             </view>
           </block>
         </view>
-
       </view>
+      <!-- 管理员-团队列表 -->
       <view class="list0" wx:if="{{item1.type=='0'}}">
         <view class="otherInfo">
           <text class="tuan">我的团队</text>
@@ -130,6 +128,7 @@
         </view>
       </view>
     </view>
+    <!-- 个人用户=所在团队列表 -->
     <view class="five_1">
       <view class="listtuan" wx:if="{{item1.type=='2'}}">
         <view class="otherInfo">

pages/meMatch/index.wxml

@@ -7,10 +7,8 @@
             <view class="beijing1" wx:key="item" wx:for="{{list}}">
               <view class="list1">
                 <view class="list_l">
-                  <view>
                     <view class="names">{{item.name}}</view>
                     <button class="button" size="mini">{{item.status=='0'?'未开始':item.status=='1'?'报名中':item.status=='2'?'待比赛':item.status=='3'?'进行中':'已结束'}}</button>
-                  </view>
                   <view class="leftmueen">
                     <view class="otherInfos">
                       <text class="text9">{{item.single_time}}</text>
@@ -27,11 +25,11 @@
           <van-tab title="已申请" name="b" style="font-weight: 500;">
             <view class="thr" wx:key="item" wx:for="{{alreadyList}}">
               <view class="thr_1">
-                <image class="img" src="{{item.logo[0].url}}"></image>
+                <image class="img1" src="{{item.logo[0].url}}"></image>
                 <text class="group">{{item.team_name}}</text>
                 <text class="person">共{{item.match_num}}人</text>
                 <text class="text4">{{item.status=='1'?'已通过':item.status=='0'?'待通过':'已驳回'}}</text>
-                <view class="fou"><text>创建人：{{item.create_user}}</text></view>
+                <view class="fou"><text class="name">创建人：{{item.create_user}}</text></view>
                 <view class="time"><text class="date">{{item.create_time}}创建</text></view>
               </view>
             </view>

pages/meMatch/index.wxss

@@ -167,15 +167,13 @@
 .left {
   width: 80%;
   float: left;
-
 }
 
-.img {
+.img1 {
   float: left;
-  margin: 7px 0 0 7px;
+  margin: 7px;
   width: 50px;
   height: 50px;
-  overflow: hidden;
 }
 .group{
   margin: 0 20px 0 0 ;
@@ -191,4 +189,11 @@
 }
 .text4{
   color: red;
+}
+.name{
+  font-size: 14px;
+}
+.date{
+  font-size: 12px;
+  color:#999;
 }

pages/photo/index.js

@@ -52,10 +52,10 @@ Page({
             list: list
         })
     },
-    //点击减号删除
+    //删除
     delList: function () {
         var list = this.data.list;
-        list.pop();      //实质是删除lists数组内容，使for循环少一次
+        list.pop();    
         this.setData({
             list: list,
         })

pages/score/index.wxss

@@ -111,7 +111,7 @@
   background-color: #ffffff;
   /* height: 320px; */
   /* margin-bottom: 20px; */
-  padding: 10px 20px;
+  padding: 10px 0 10px 15px;
 }
 
 .two_title {

pages/teamDetails/detail.wxml

@@ -38,7 +38,7 @@
         </view>
       </view>
     </view>
-    <view class="thr">
+    <view class="thr" style="height:{{infoHeight-390}}px;">
       <view><text class="tuan">队员信息</text></view>
       <view class="thr-1" wx:key="item" wx:for="{{list.members}}">
         <view class="thr1">

pages/teamDetails/index.wxml

@@ -38,7 +38,7 @@
         </view>
       </view>
     </view>
-    <view class="thr">
+    <view class="thr" style="height:{{infoHeight-390}}px;">
       <view><text class="tuan">队员信息</text></view>
       <view class="thr-1" wx:key="item" wx:for="{{list.members}}">
         <view class="thr1">