zs 3 gadi atpakaļ
vecāks
revīzija
f63a579189

+ 1 - 2
app.json

@@ -1,5 +1,5 @@
 {
-  "pages": [
+  "pages": [ 
     "pages/home/index",
     "pages/login/index",
     "pages/index/index",
@@ -28,7 +28,6 @@
     "pages/match/index",
     "pages/dissolution/index",
     "pages/match/detail",
-    "pages/teamDetails/detail",
     "pages/logs/logs"
   ],
   "usingComponents": {

+ 1 - 1
pages/administration/detail.wxss

@@ -153,7 +153,7 @@
 }
 
 .name {
-  margin-left: 10px;
+  margin-left: 5px;
   font-size: 13px;
   color: #727272;
 }

+ 1 - 1
pages/administration/details.wxss

@@ -153,7 +153,7 @@
 }
 
 .name {
-  margin-left: 10px;
+  margin-left: 5px;
   font-size: 13px;
   color: #727272;
 }

+ 0 - 2
pages/administration/index.js

@@ -34,10 +34,8 @@ Page({
           for (let i = 0; i < datas.length; i++) {
             if (datas[i].status == 0) {
               datas[i].status = '未开始'
-              datastart.push(datas[i])
             } else if (datas[i].status == 1) {
               datas[i].status = '报名中'
-              datastart.push(datas[i])
             } else if (datas[i].status == 2) {
               datas[i].status = '待比赛'
               datastart.push(datas[i])

+ 2 - 0
pages/competition/index.js

@@ -28,6 +28,8 @@ Page({
     ],
     // 赛制储存信息
     szList: [],
+    // 赛制储存信息
+    ztList: [],
   },
   // 提交创建
   onSubmit: function (e) {

+ 0 - 1
pages/manage/index.wxml

@@ -41,7 +41,6 @@
               <view class="two">
                 <view class="left">
                   <text class="group" data-id="{{item._id}}" data-name="{{item.team_id}}" bindtap='shen'>{{item.team_name}}</text>
-                  <text class="person">共{{item.members.length||0}}人</text>
                   <view class="fou"><text>创建人:{{item.create_user}}</text></view>
                   <view class="time"><text class="date">申请时间:{{item.apply_time}}</text></view>
                   <view class="time"><text class="date">解散团队原因:{{item.resaon}}</text></view>

+ 1 - 1
pages/me/index.js

@@ -113,7 +113,7 @@ Page({
   },
   // 监听用户是否登录
   watchLogin: function () {
-    const that = this;
+    const that = this;a
     wx.getStorage({
       key: 'token',
       success: res => {

+ 1 - 1
pages/me/index.wxml

@@ -88,7 +88,7 @@
           <view class="otherInfo_1">
             <text class="tuan">我的团队</text>
             <text class="total">共参加{{list3.length||0}}个队伍</text>
-            <text class="chuang" bindtap="create" wx:if="{{list3.length<1&&item1.type=='1'}}">创建团队</text>
+            <text class="chuang" bindtap="create" wx:if="{{list3.length<2&&item1.type=='1'}}">创建团队</text>
           </view>
         </view>
         <view class="weui-cells mgt-0 {{!showMore? 'hiddenmore' : 'showmore'}}">

+ 1 - 1
pages/team/apply.js

@@ -108,7 +108,7 @@ Page({
     });
     // 计算高度
     this.searchHeight()
-    this.setData({ ids: options.id });
+    this.ids=options.id;
     // 监听用户是否登录
     this.watchLogin();
   },

+ 4 - 4
pages/team/apply.wxss

@@ -24,16 +24,16 @@
 }
 .one-2{
   position: absolute;
-  top: 18%;
-  left: 41%;
+  margin-top: -42%;
+  margin-left: 42%;
   width: 18%;
   height: 63.78px;
   border-radius: 50%; 
 }
 .one-3{
   position: absolute;
-  top: 29%;
-  left: 40%;
+  margin-top: -25%;
+  margin-left: 41%;
   width: 23%;
   height: 63.78px;
 }

+ 4 - 4
pages/team/examine.wxss

@@ -28,16 +28,16 @@
 
 .one-2 {
   position: absolute;
-  top: 18%;
-  left: 41%;
+  margin-top: -41%;
+  margin-left: 42%;
   width: 18%;
   height: 63.78px;
   border-radius: 50%;
 }
 .one-3{
   position: absolute;
-  top: 29%;
-  left: 37.5%;
+  margin-top: -22%;
+  margin-left: 40%;
   width: 23%;
   height: 63.78px;
 }

+ 8 - 8
pages/teamDetails/detail.js

@@ -20,18 +20,15 @@ Page({
     wx.navigateBack({ url: '/pages/home/index' })
   },
   //点击减号删除队员
-  delList: function (e) {
-    console.log(e.currentTarget.dataset.id);
+  delList: function () {
     var list = this.data.list.members;
     var that = this;
     wx.showModal({
       title: '是否删除该名队员',
       success(res) {
         if (res.confirm) {
-          let list1 = list.find((i) => i.id == e.currentTarget.dataset.id)
-          console.log(list1);
-          list1.pop();
-          that.setData({ ['list.members']: list1, })
+          list.pop();
+          that.setData({ ['list.members']: list, })
         } else if (res.cancel) { }
       }
     })
@@ -43,20 +40,23 @@ Page({
   onLoad: function (options) {
     // 计算高度
     this.searchHeight()
-    this.setData({ ids: options.id })
+    this.ids = options.id;
     console.log(options.id);
     // 监听用户是否登录
     this.watchLogin();
+
   },
   // 监听用户是否登录
   watchLogin: function () {
     const that = this;
+    let id = that.ids
+    console.log(that.ids);
     wx.getStorage({
       key: 'token',
       success: res => {
         //查询数据
         wx.request({
-          url: `${app.globalData.publicUrl}/courtAdmin/api/team/${this.data.ids}`, //接口地址
+          url: `${app.globalData.publicUrl}/courtAdmin/api/team/` + id, //接口地址
           method: 'get',
           data: '',
           success(res) {

+ 2 - 2
pages/teamDetails/detail.wxml

@@ -44,14 +44,14 @@
         <view class="thr1">
           <view class="thr-left">
             <image class="img" src="{{item.icon[0].url}}"></image>
-            <image bindtap='delList' data-id="{{item.id}}" class="two_jian" src="/image/jian.png"></image>
+            <image bindtap='delList' class="two_jian" src="/image/jian.png"></image>
           </view>
           <view class="thr-right"><text class="name textOver">{{item.nickname}}</text> </view>
         </view>
       </view>
     </view>
     <view class="four">
-      <button class="button" bindtap='preservation'>保存</button>
+      <button class="button" bindtap='out'>退出团队</button>
     </view>
   </view>
 </mobile-main>