zs 3 years ago
parent
commit
a77925ea18

BIN
image/hhh.png


+ 53 - 23
pages/competition/index.wxss

@@ -2,15 +2,17 @@
   position: relative;
   width: 100%;
 }
-.page1{
+
+.page1 {
   float: left;
   width: 40%;
-  padding-left:15px;
+  padding-left: 15px;
   font-size: 14px;
   line-height: 80rpx;
   background-color: white;
   font-weight: 500;
 }
+
 /* 日期选择 */
 .picker_group {
   background-color: white;
@@ -28,87 +30,115 @@
   padding: 0 2%;
   border-radius: 30rpx;
 }
+
 .van-cell {
   margin-top: -1px;
   font-weight: 500;
   color: #000 !important;
 }
-.adress{
+
+.adress {
   font-size: 14px;
   font-weight: 600;
 }
-.section{
+
+.section {
   font-size: 14px;
   font-weight: 500;
   width: 100%;
   margin-top: 0.8px;
-  padding-left:13px;
+  padding-left: 13px;
   line-height: 80rpx;
   background-color: white;
 }
-.section__title{
+
+.section__title {
   float: left;
   width: 61%;
 }
-.picker{
+
+.picker {
   font-weight: 500;
 }
-.picker1{
+
+.picker1 {
   float: left;
   width: 22%;
 }
-.team{
+
+.team {
   margin-top: 12%;
   background-color: white;
 }
-.one{
+
+.one {
   padding: 10px 5px 15px 5px;
 }
+
 .tuan {
   margin-left: 11px;
   font-size: 16px;
   font-weight: 550;
   margin-right: 10px;
 }
-.two{
+
+.two {
   position: absolute;
   bottom: 9%;
   left: 9%;
 }
-.button{
+
+.button {
   width: 300px !important;
   background-color: rgb(247, 189, 102);
-  background-image: linear-gradient(to right, rgb(247, 124, 53) , rgb(255, 153, 0));
-  border-radius: 30px; 
-  color:#ffffff; 
+  background-image: linear-gradient(to right, rgb(247, 124, 53), rgb(255, 153, 0));
+  border-radius: 30px;
+  color: #ffffff;
   text-align: center;
   font-size: small;
 }
-.mult{
+
+.mult {
   float: left;
   width: 65%;
-  padding-left:15px;
+  padding-left: 15px;
   font-size: 14px;
   line-height: 80rpx;
   background-color: white;
   font-weight: 500;
 }
-.mult11{
-  float: left;
-  width: 15%;
-  padding-left:15px;
+
+.mult11 {
+  padding-left: 15px;
   font-size: 14px;
   line-height: 80rpx;
   background-color: white;
   font-weight: 500;
 }
-.mults{
+
+.mults {
   margin-top: -1px;
   background-color: white;
   line-height: 80rpx;
   text-align: center;
 }
-.multone{
+
+.multone {
   margin-bottom: 1.8px;
   font-size: 14px;
+}
+
+.mult88 {
+  float: left;
+  width: 33%;
+  line-height: 80rpx;
+  background-color: white;
+}
+
+.mult00 {
+  padding-left: 15px;
+  float: left;
+  width: 30%;
+  line-height: 80rpx;
+  background-color: white;
 }

+ 66 - 2
pages/list/index.js

@@ -8,13 +8,77 @@ Page({
    */
   data: {
     src: '/image/yun.jpg',
-    frameStyle: { useTop: false, name: '比赛列表', leftArrow: false, useBar: true, tabSelectid: '0' },
+    frameStyle: { useTop: false, name: '比赛列表', leftArrow: false, useBar: false, tabSelectid: '0' },
     // 主体高度
     infoHeight: '',
     active: 1,
     list: [
       {
-        id: '1', name: '经开区足球比赛', fraction2: '1', groupname2: '马尼拉老年组', group: '第二组', fraction1: '2', groupname1: '哈拉海队幼儿园', match: '循环淘汰赛', listbisai: [], head2: '/image/head2.png', head1: '/image/head1.png', state: '报名中', datestart: '2022.01.20',dateend: '2022.01.22', address: '吉林省长春市远创国际A座'
+        id: '1', name: '经开区足球比赛', fraction2: '1', groupname2: '马尼拉老年组', group: '第二组', fraction1: '2', groupname1: '哈拉海队幼儿园', match: '循环淘汰赛', listbisai: [], head2: '/image/head2.png', head1: '/image/head1.png', state: '报名中', datestart: '2022.01.20', dateend: '2022.01.22', address: '吉林省长春市远创国际A座'
+      }
+    ],
+    lists: [
+      {
+        id: '1', name: '参赛队伍名称', person: '20', head: '/image/tou.png'
+      },
+      {
+        id: '1', name: '参赛队伍名称', person: '20', head: '/image/tou.png'
+      },
+      {
+        id: '1', name: '参赛队伍名称', person: '20', head: '/image/tou.png'
+      },
+      {
+        id: '1', name: '参赛队伍名称', person: '20', head: '/image/tou.png'
+      },
+      {
+        id: '1', name: '参赛队伍名称', person: '20', head: '/image/tou.png'
+      },
+      {
+        id: '1', name: '参赛队伍名称', person: '20', head: '/image/tou.png'
+      },
+      {
+        id: '1', name: '参赛队伍名称', person: '20', head: '/image/tou.png'
+      },
+
+      {
+        id: '1', name: '参赛队伍名称', person: '20', head: '/image/tou.png'
+      }
+    ],
+    listbang: [{
+      id: 1,
+      name: "哈拉海队幼儿组",
+      head: '/image/head2.png',
+      score1: "9",
+      score2: "0",
+      score0: "1"
+    }, {
+      id: 2,
+      name: "哈拉海队幼儿组",
+      head: '/image/head2.png',
+      score1: "1",
+      score2: "0",
+      score0: "1"
+    }, {
+      id: 3,
+      name: "哈拉海队幼儿组",
+      head: '/image/head2.png',
+      score1: "1",
+      score2: "0",
+      score0: "1"
+    }, {
+      id: 4,
+      name: "哈拉海队幼儿组",
+      head: '/image/head2.png',
+      score1: "1",
+      score2: "1",
+      score0: "1"
+    }],
+    listbisai: [
+      {
+        id: '1', head2: '/image/head2.png', head1: '/image/head1.png', fraction2: '0', groupname2: '马尼拉组', fraction1: '0', site: '第一场', groupname1: '哈拉海组', time: '13:00', date: '01.15', start: '未开始'
+      },
+      {
+        id: '1', head2: '/image/head2.png', head1: '/image/head1.png', fraction2: '0', groupname2: '马尼拉组', fraction1: '0', site: '第一场', groupname1: '哈拉海组', time: '13:00', date: '01.15', start: '已结束'
       }
     ],
   },

+ 344 - 16
pages/list/index.wxss

@@ -4,6 +4,7 @@
   background-color: #f1f1f1;
   overflow-y: auto;
 }
+
 .back {
   width: 40rpx;
   height: 40rpx;
@@ -11,7 +12,8 @@
   width: 40rpx;
   height: 40rpx;
 }
-.onea{
+
+.onea {
   font-weight: 600;
   position: absolute;
   top: 5%;
@@ -25,7 +27,7 @@
 
 .two {
   position: absolute;
-  top: 28%;
+  top: 25%;
   left: 2.5%;
   width: 95%;
 }
@@ -34,7 +36,8 @@
   text-align: left;
   padding: 0 0 10px 5px;
 }
-.otherInfoq{
+
+.otherInfoq {
   padding: 0 0 0 5px;
 }
 
@@ -48,6 +51,10 @@
   font-weight: bold;
 }
 
+.van-tabs__line {
+  background-color: blue !important;
+}
+
 .left1 {
   margin: 5px;
   border-radius: 25px;
@@ -104,11 +111,13 @@
   margin-right: 5px;
   margin-left: 5px;
 }
+
 .otherInfo {
   text-align: left;
   padding: 0 0 15px 5px;
 }
-.otherInfos{
+
+.otherInfos {
   padding: 0 0 0px 5px;
 }
 
@@ -132,17 +141,6 @@
   overflow: hidden;
 }
 
-.head1 {
-  width: 100%;
-  height: 33px;
-  overflow: hidden;
-}
-.head2 {
-  width: 89%;
-  height: 36px;
-  overflow: hidden;
-}
-
 .right1_2 .right1_2t {
   float: left;
   width: 33%;
@@ -164,12 +162,342 @@
 .right1_1 {
   text-align: center;
 }
-.thr{
+
+.thr {
   float: left;
   width: 95%;
   margin-top: 15%;
   margin-left: 2.5%;
 }
+
 .van-tabs__wrap {
   background-color: #f1f1f1 !important;
+}
+
+.tuan {
+  margin-left: 11px;
+  font-size: 16px;
+  font-weight: 500;
+  margin-right: 10px;
+}
+
+.thr-left {
+  width: 79%;
+  height: 56.31px;
+}
+
+.img {
+  width: 100%;
+  height: 56.31px;
+}
+
+.thr-1 {
+  margin-left: 2%;
+  margin-bottom: 2%;
+  padding-top: 15px;
+  padding-left: 10px;
+  padding-bottom: 5px;
+  float: left;
+  width: 20%;
+  background-color: #ffffff;
+}
+
+.thr1 {
+  background-color: #ffffff;
+}
+
+.thrsss {
+  padding-top: 5%;
+}
+
+.thr-2 {
+  padding-top: 10px;
+  padding-left: 8px;
+  float: left;
+  width: 18%;
+  height: 75px;
+  background-color: #ffffff;
+  /* border: 1px solid red; */
+}
+
+.thr2 {
+  float: left;
+  width: 50px;
+  height: 50px;
+  border: 2px solid #dddcdc;
+}
+
+.thrname {
+  margin-left: -6px;
+  font-size: 12px;
+  color: #727272;
+}
+
+.thrperson {
+  margin-left: 15px;
+  margin-bottom: 10px;
+  font-size: 12px;
+  color: #727272;
+  text-align: center;
+}
+
+.thr3 {
+  margin-top: 22%;
+  margin-left: 23%;
+}
+
+.head {
+  background-color: rgb(43, 43, 43);
+  color: white;
+  width: 94%;
+  margin-left: 2.5%;
+  margin-bottom: -1px;
+  border-top-left-radius: 0.5em;
+  border-top-right-radius: 0.5em;
+  border-bottom-right-radius: 0em;
+  border-bottom-left-radius: 0em;
+  padding: 0 0 32px 3.5px;
+  margin-top: 2%;
+}
+
+.head1 {
+  float: left;
+  width: 20%;
+  font-size: 14px;
+  margin-left: 19px;
+  margin-top: 6px;
+}
+
+.head2 {
+  float: left;
+  width: 26%;
+  font-size: 13px;
+  margin-left: 5px;
+  margin-top: 6px;
+}
+
+.head3 {
+  float: left;
+  width: 16%;
+  font-size: 14px;
+  margin-left: 29px;
+  margin-top: 6px;
+}
+
+.head4 {
+  float: left;
+  width: 9%;
+  font-size: 14px;
+  margin-left: 29px;
+  margin-top: 6px;
+}
+
+.listbang:nth-child(2) {
+  background-color: rgba(247, 31, 67);
+}
+
+.listbang:nth-child(3) {
+  background-color: rgba(245, 96, 133);
+}
+
+.listbang:nth-child(4) {
+  background-color: rgb(252, 172, 198);
+}
+
+.listbang {
+  width: 95%;
+  margin-left: 2.5%;
+  margin-bottom: 0.2%;
+}
+
+.sortContent {
+  width: 88%;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-left: 3.5%;
+  margin-bottom: 0.2%;
+  padding: 5px 10px 10px 10px;
+}
+
+.header {
+  font-size: 26upx;
+  margin-top: 20upx;
+}
+
+.headtou {
+  float: left;
+  margin-left: 20px;
+  width: 17%;
+  height: 33px;
+  overflow: hidden;
+}
+
+.dui {
+  float: left;
+  width: 68%;
+  font-size: 14px;
+  margin-left: 5px;
+}
+
+.fen {
+  float: left;
+  width: 54%;
+  font-weight: 500;
+}
+
+.fens {
+  float: left;
+  width: 9%;
+  font-weight: 500;
+}
+
+.pai {
+  margin-left: 5px;
+}
+
+.select-item {
+  color: #ffff;
+}
+
+.dis-select-item {
+  margin-top: 3px;
+  background-color: white;
+  color: #000;
+}
+
+.pai1 {
+  font-size: 20px;
+  font-style: italic;
+}
+
+.scorea {
+  color: white;
+}
+
+.scoreb {
+  color: red;
+}
+
+.scorec {
+  color: black;
+}
+
+.lists:nth-child(even) {
+  background-color: rgb(255, 250, 250);
+}
+
+.lists {
+  font-weight: 500;
+  font-size: 14px;
+}
+
+.background-image {
+  position: relative;
+  width: 100%;
+  height: 70px;
+  border-radius: 10px;
+}
+
+.content {
+  position: absolute;
+  padding-top: 5%;
+  width: 100%;
+  left: 0px;
+  top: -2px;
+}
+
+.four1 {
+  float: left;
+  width: 100%;
+}
+
+.fourhead1 {
+  margin-left: 25%;
+  width: 67%;
+  height: 33px;
+  overflow: hidden;
+}
+
+.fourhead2 {
+  margin-left: 5%;
+  width: 55%;
+  height: 34px;
+  overflow: hidden;
+}
+.four {
+  margin-bottom: 20%;
+}
+
+.fourtext5 {
+  position: absolute;
+  padding-top: 3px;
+  padding-left: 20px;
+  color: #fff;
+  font-size: 13px;
+}
+
+.root {
+  padding-top: 5%;
+}
+
+.fourtext6 {
+  padding-left: 260px;
+  color: #fff;
+  font-size: 13px;
+  margin-top: -1px;
+}
+
+.fourright1_2 {
+  margin-top: 2%;
+}
+
+.fourright1_2o {
+  float: left;
+  width: 20%;
+  height: 36px;
+  overflow: hidden;
+  margin-top: 2px;
+}
+
+.fourright1_2t {
+  float: left;
+  width: 25%;
+  text-align: center;
+  padding: 10px 0;
+  font-size: 14px;
+  font-weight: 500;
+}
+
+.fourtext6-1 {
+  background-color: rgb(228, 226, 226);
+  text-align: center;
+  color: #00427b;
+  font-size: 20px;
+  font-weight: bold;
+  text-decoration: line-through;
+  text-decoration-color: #fff;
+}
+
+.fourtext8-1 {
+  font-size: 20px;
+  font-weight: bold;
+  margin: 0 5px;
+}
+
+.fourtext7-1 {
+  background-color: rgb(228, 226, 226);
+  text-align: center;
+  color: #e70000;
+  font-size: 20px;
+  font-weight: bold;
+  /* text-decoration: line-through; */
+  text-decoration-color: #fff;
+}
+
+.fourright1_2i {
+  float: left;
+  width: 10%;
+  text-align: center;
+  padding: 6px 0;
 }

+ 4 - 2
pages/match/index.js

@@ -71,7 +71,7 @@ Page({
     // 当设置 mutiple 为 true 时, file 为数组格式,否则为对象格式app.globalData.fileUrl:
     console.log(file);
     wx.uploadFile({
-      url:`${app.globalData.imageUrl}/files/court/elimg/upload`,
+      url: `${app.globalData.imageUrl}/files/court/elimg/upload`,
       filePath: file.url,
       name: 'file',
       formData: {},
@@ -79,7 +79,9 @@ Page({
         console.log(res);
         if (res.statusCode == '200') {
           let data = [{ name: JSON.parse(res.data).name, url: `${app.globalData.imageUrl}` + JSON.parse(res.data).uri }]
-          this.setData({ fileList: data })
+          const { fileList = [] } = this.data;
+          fileList.push({ ...file, url: res.data });
+          this.setData({ fileList });
         } else {
           wx.showToast({ title: `${res.data.errmsg}`, icon: 'fail', duration: 2000 })
         }

+ 2 - 2
pages/match/index.wxml

@@ -43,11 +43,11 @@
     </view>
     <view class="upload">
       <view class="upload_1">
-        <van-uploader  file-list="{{fileList}}"  max-count="4" bind:after-read="afterRead" />
+        <van-uploader file-list="{{fileList}}" preview-image="true" max-count="4" bind:after-read="afterRead" />
       </view>
     </view>
     <view class="five">
-      <button class="button" form-type="submit">待通过</button>
+      <button class="button" form-type="submit">上传比分</button>
     </view>
 
   </view>

+ 0 - 2
pages/match/index.wxss

@@ -188,8 +188,6 @@
 
 .upload .upload_1 {
   margin-left: 5%;
-  width: 100px;
-  height: 100px;
 }
 .one{
   float: left;

+ 1 - 1
pages/me/index.wxml

@@ -87,7 +87,7 @@
           <text class="chuang">创建团队</text>
         </view>
         <view class="weui-cells mgt-0 {{!showMore? 'hiddenmore' : 'showmore'}}">
-          <view wx:key="item" wx:for="{{list3}}" wx:for-index="idx" wx:key="" class="list3 {{idx>1 ? 'more-item' : ''}}">
+          <view wx:key="item" wx:for="{{list3}}" wx:for-index="idx" wx:key="key" class="list3 {{idx>1 ? 'more-item' : ''}}">
             <view class="dui-left">
               <view class="dui-left1">
                 <image src="{{item.head}}" class="dui-image"></image>