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

pages/match/detail.js

@@ -47,15 +47,49 @@ Page({
   imgUpload: function (e) {
     const that = this;
     let data = that.data.fileList;
+    let id = that.data.id;
     data.push(e.detail)
-    that.setData({ fileList: data })
+    wx.request({
+      url: `${app.globalData.publicUrl}/courtAdmin/api/schedule/${id}`, //接口地址
+      method: 'post',
+      data: { match_file: data },
+      success(res) {
+        if (res.data.errcode == 0) {
+          wx.showToast({
+            title: '添加成功',
+            duration: 2000,
+            icon: 'success',
+          })
+          that.setData({ fileList: data })
+        } else {
+          wx.showToast({ title: res.data.errmsg, icon: 'error', duration: 2000 })
+        }
+      }
+    })
   },
   //删除图片
   imgDel: function (e) {
     const that = this;
     let data = that.data.fileList;
+    let id = that.data.id;
     let arr = data.filter((i, index) => index != e.detail.index)
-    that.setData({ fileList: arr })
+    wx.request({
+      url: `${app.globalData.publicUrl}/courtAdmin/api/schedule/${id}`, //接口地址
+      method: 'post',
+      data: { match_file: arr },
+      success(res) {
+        if (res.data.errcode == 0) {
+          wx.showToast({
+            title: '删除成功',
+            duration: 2000,
+            icon: 'success',
+          })
+          that.setData({ fileList: arr })
+        } else {
+          wx.showToast({ title: res.data.errmsg, icon: 'error', duration: 2000 })
+        }
+      }
+    })
   },
   // 提交登录
   formSubmit: function (e) {
@@ -114,6 +148,7 @@ Page({
           data: {},
           success(res) {
             let fileList = res.data.data.match_file;
+            console.log(res.data.data);
             that.setData({
               schedulelist: res.data.data,
               fileList: fileList,

pages/match/detail.wxml

@@ -18,7 +18,7 @@
             <text class="text3">{{schedulelist.red_branch||0}}</text>
           </view>
           <view class="one_2_2">
-            <text class="text">{{item.status=='0'?'未开始':item.status=='1'?'报名中':item.status=='2'?'待比赛':item.status=='3'?'进行中':'已结束'}}</text>
+            <text class="text">{{schedulelist.status=='0'?'未开始':schedulelist.status=='1'?'报名中':schedulelist.status=='2'?'待比赛':schedulelist.status=='3'?'进行中':'已结束'}}</text>
           </view>
         </view>
         <view class="one_3">
@@ -35,14 +35,14 @@
       <view class="tworight">
         <view class="two-1">
           <image class="imgs" src="{{schedulelist.blue_logo[0].url}}"></image>
-          <text class="thrs">{{schedulelist.blue_name}}</text>
+          <text class="thrs textOver">{{schedulelist.blue_name}}</text>
         </view>
         <view class="two-2" wx:key="item" wx:for="{{schedulelist.blue_members}}">
           <view class="two2">
             <view class="two-left">
-              <image class="img" src="{{item.head}}"></image>
+              <image class="img" src="{{item.icon[0].url}}"></image>
             </view>
-            <view class="two-right"><text class="name">{{item.name}}</text> </view>
+            <view class="two-right"><text class="name textOver">{{item.nickname}}</text> </view>
           </view>
         </view>
       </view>
@@ -53,14 +53,14 @@
           <view class="two-9">
             <image class="imgss" src="{{schedulelist.red_logo[0].url}}"></image>
           </view>
-          <text class="thrss">{{schedulelist.red_name}}</text>
+          <text class="thrss textOver">{{schedulelist.red_name}}</text>
         </view>
         <view class="thr-1" wx:key="item" wx:for="{{schedulelist.red_members}}">
           <view class="thr1">
             <view class="thr-left">
-              <image class="img" src="{{item.head}}"></image>
+              <image class="img" src="{{item.icon[0].url}}"></image>
             </view>
-            <view class="thr-right"><text class="names">{{item.name}}</text> </view>
+            <view class="thr-right"><text class="names textOver">{{item.nickname}}</text> </view>
           </view>
         </view>
       </view>

pages/match/detail.wxss

@@ -32,13 +32,17 @@
 }
 
 .imgs {
-  width: 85%;
-  height: 40.83px;
+  margin-left: 12%;
+  border-radius: 48.78px;
+  width: 50%;
+  height: 48.78px;
 }
 
 .imgss {
+  margin-left: 20%;
+  border-radius: 49.98px;
   width: 85%;
-  height: 40.83px;
+  height: 49.98px;
 }
 
 .img {
@@ -46,11 +50,17 @@
   height: 50.64px;
 }
 
+.thrs {
+  float: left;
+  width: 100%;
+  font-size: 14px;
+}
+
 .two-1 {
   padding-top: 17px;
   padding-left: 5px;
   float: left;
-  width: 15%;
+  width: 26%;
   background-color: #ffffff;
 }
 
@@ -73,7 +83,6 @@
 }
 
 .name {
-  margin-left: 10px;
   font-size: 13px;
   color: #727272;
 }
@@ -130,7 +139,6 @@
 }
 
 .names {
-  margin-left: 7px;
   font-size: 13px;
   color: #727272;
 }
@@ -142,7 +150,7 @@
 
 .thrleft {
   float: left;
-  padding-top: 38px;
+  padding-top: 15px;
   padding-left: 10px;
   padding-right: 2px;
   background-color: #ffffff;
@@ -311,6 +319,7 @@
   margin-left: 22%;
   width: 80px;
   height: 80px;
+  border-radius: 40px;
 }
 
 .one_3_img {
@@ -318,6 +327,7 @@
 }
 
 .one_logo2 {
+  border-radius: 40px;
   width: 80px;
   height: 80px;
 }