zs 2 vuotta sitten
vanhempi
commit
da8f489128
3 muutettua tiedostoa jossa 36 lisäystä ja 26 poistoa
  1. 8 4
      pages/match/index.less
  2. 3 1
      pages/match/index.wxml
  3. 25 21
      pages/match/index.wxss

+ 8 - 4
pages/match/index.less

@@ -32,7 +32,6 @@
     .two {
     .two {
         width: 96vw;
         width: 96vw;
         margin: 2vw;
         margin: 2vw;
-
         .two_1 {
         .two_1 {
             display: flex;
             display: flex;
             flex-direction: row;
             flex-direction: row;
@@ -40,12 +39,17 @@
             padding: 2vw;
             padding: 2vw;
             background-color: var(--f1Color);
             background-color: var(--f1Color);
         }
         }
+    }
+
+    .thr {
+        width: 96vw;
+        margin: 2vw;
+        flex-grow: 1;
+        position: relative;
 
 
-        .two_2 {
+        .thr_1 {
             width: 96vw;
             width: 96vw;
             margin: 2vw 0;
             margin: 2vw 0;
-            min-height: 65vh;
-            position: relative;
             background-color: var(--mainColor);
             background-color: var(--mainColor);
 
 
             .list {
             .list {

+ 3 - 1
pages/match/index.wxml

@@ -17,7 +17,9 @@
                     <view class="input">{{searchInfo.status=='0'?'计划中':searchInfo.status=='1'?'报名中':searchInfo.status=='2'?'进行中':searchInfo.status=='3'?'已结束':'请选择比赛状态'}}</view>
                     <view class="input">{{searchInfo.status=='0'?'计划中':searchInfo.status=='1'?'报名中':searchInfo.status=='2'?'进行中':searchInfo.status=='3'?'已结束':'请选择比赛状态'}}</view>
                 </picker>
                 </picker>
             </view>
             </view>
-            <view class="two_2">
+        </view>
+        <view class="thr">
+            <view class="thr_1">
                 <scroll-view scroll-y="true" class="scroll-view" bindscrolltolower="toPage">
                 <scroll-view scroll-y="true" class="scroll-view" bindscrolltolower="toPage">
                     <view class="list-scroll-view">
                     <view class="list-scroll-view">
                         <view class="list" wx:for="{{list}}" wx:key="item">
                         <view class="list" wx:for="{{list}}" wx:key="item">

+ 25 - 21
pages/match/index.wxss

@@ -35,14 +35,18 @@
   padding: 2vw;
   padding: 2vw;
   background-color: var(--f1Color);
   background-color: var(--f1Color);
 }
 }
-.main .two .two_2 {
+.main .thr {
   width: 96vw;
   width: 96vw;
-  margin: 2vw 0;
-  min-height: 65vh;
+  margin: 2vw;
+  flex-grow: 1;
   position: relative;
   position: relative;
+}
+.main .thr .thr_1 {
+  width: 96vw;
+  margin: 2vw 0;
   background-color: var(--mainColor);
   background-color: var(--mainColor);
 }
 }
-.main .two .two_2 .list {
+.main .thr .thr_1 .list {
   display: flex;
   display: flex;
   flex-direction: column;
   flex-direction: column;
   justify-content: center;
   justify-content: center;
@@ -52,80 +56,80 @@
   padding: 2vw;
   padding: 2vw;
   margin: 0 0 2vw 0;
   margin: 0 0 2vw 0;
 }
 }
-.main .two .two_2 .list .list_1 {
+.main .thr .thr_1 .list .list_1 {
   position: relative;
   position: relative;
   width: 92vw;
   width: 92vw;
   height: 110px;
   height: 110px;
 }
 }
-.main .two .two_2 .list .list_1 .one_1 {
+.main .thr .thr_1 .list .list_1 .one_1 {
   height: 80px;
   height: 80px;
 }
 }
-.main .two .two_2 .list .list_1 .one_2 {
+.main .thr .thr_1 .list .list_1 .one_2 {
   position: absolute;
   position: absolute;
   top: 10vw;
   top: 10vw;
   width: 92vw;
   width: 92vw;
   text-align: center;
   text-align: center;
 }
 }
-.main .two .two_2 .list .list_1 .one_2 .image {
+.main .thr .thr_1 .list .list_1 .one_2 .image {
   width: 60px;
   width: 60px;
   height: 60px;
   height: 60px;
   border-radius: 90px;
   border-radius: 90px;
   background-color: var(--mainColor);
   background-color: var(--mainColor);
 }
 }
-.main .two .two_2 .list .list_2 {
+.main .thr .thr_1 .list .list_2 {
   width: 92vw;
   width: 92vw;
   text-align: center;
   text-align: center;
 }
 }
-.main .two .two_2 .list .list_2 .title {
+.main .thr .thr_1 .list .list_2 .title {
   font-size: var(--font18Szie);
   font-size: var(--font18Szie);
   font-weight: bold;
   font-weight: bold;
   margin: 0 0 2vw 0;
   margin: 0 0 2vw 0;
 }
 }
-.main .two .two_2 .list .list_3 {
+.main .thr .thr_1 .list .list_3 {
   display: flex;
   display: flex;
   flex-wrap: wrap;
   flex-wrap: wrap;
   flex-direction: row;
   flex-direction: row;
   justify-content: space-between;
   justify-content: space-between;
 }
 }
-.main .two .two_2 .list .list_3 .other {
+.main .thr .thr_1 .list .list_3 .other {
   margin: 0 0 1vw 0;
   margin: 0 0 1vw 0;
   font-size: var(--font16Size);
   font-size: var(--font16Size);
   color: var(--f85Color);
   color: var(--f85Color);
 }
 }
-.main .two .two_2 .list .list_4 {
+.main .thr .thr_1 .list .list_4 {
   width: 92vw;
   width: 92vw;
   text-align: center;
   text-align: center;
   padding: 2vw 0;
   padding: 2vw 0;
 }
 }
-.main .two .two_2 .list .list_4 .text {
+.main .thr .thr_1 .list .list_4 .text {
   padding: 1vw 2vw;
   padding: 1vw 2vw;
   color: var(--mainColor);
   color: var(--mainColor);
   border-radius: 15px;
   border-radius: 15px;
   font-size: var(--font14Size);
   font-size: var(--font14Size);
 }
 }
-.main .two .two_2 .list .list_4 .color0 {
+.main .thr .thr_1 .list .list_4 .color0 {
   background-color: #FFA500;
   background-color: #FFA500;
 }
 }
-.main .two .two_2 .list .list_4 .color1 {
+.main .thr .thr_1 .list .list_4 .color1 {
   background-color: #8B0000;
   background-color: #8B0000;
 }
 }
-.main .two .two_2 .list .list_4 .color2 {
+.main .thr .thr_1 .list .list_4 .color2 {
   background-color: #006400;
   background-color: #006400;
 }
 }
-.main .two .two_2 .list .list_4 .color3 {
+.main .thr .thr_1 .list .list_4 .color3 {
   background-color: #808080;
   background-color: #808080;
 }
 }
-.main .two .two_2 .list:last-child {
+.main .thr .thr_1 .list:last-child {
   border-bottom: none;
   border-bottom: none;
 }
 }
-.main .two .scroll-view {
+.main .thr .scroll-view {
   position: absolute;
   position: absolute;
   top: 0;
   top: 0;
   left: 0;
   left: 0;
   right: 0;
   right: 0;
   bottom: 0;
   bottom: 0;
 }
 }
-.main .two .scroll-view .list-scroll-view {
+.main .thr .scroll-view .list-scroll-view {
   display: flex;
   display: flex;
   flex-wrap: wrap;
   flex-wrap: wrap;
   align-content: flex-start;
   align-content: flex-start;