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

commpents/pagesMatchs/achieve/achieve-1.less

@@ -12,7 +12,7 @@
 
     .view_1 {
         width: 96vw;
-        margin: 0 0 2vw 0;
+        margin: 0 2vw 2vw 2vw;
     }
 }
 
@@ -21,7 +21,8 @@
     border: 1px solid #dadada;
     border-right: 0;
     border-bottom: 0;
-    width: 95.6vw;
+    width: 96vw;
+    margin: 0 2vw 2vw 2vw;
 }
 
 .tr {
@@ -61,4 +62,17 @@
     font-size: 13px;
     overflow: hidden;
     word-break: break-all;
+}
+
+.scroll-view {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+
+    .list-scroll-view {
+        display: flex;
+        flex-direction: column;
+    }
 }

commpents/pagesMatchs/achieve/achieve-1.wxml

@@ -1,28 +1,29 @@
 <view class='history-table-wrap'>
-    <view class="ranking" wx:for="{{teamList}}" wx:for-item="t" wx:key="team_id">
-        <view class="name">{{t.team_name}}</view>
-        <view class="view_1">
-            <view class="tr" wx:for="{{t.table}}" wx:for-item="i">
-                <view class="th th1" wx:if="{{index===0}}"></view>
-                <view class="th th1" wx:for="{{i}}" wx:for-item="ii" wx:key="ii">{{ii||''}}</view>
+    <scroll-view scroll-y="true" class="scroll-view">
+        <view class="list-scroll-view">
+            <view class="ranking" wx:for="{{teamList}}" wx:for-item="t" wx:key="team_id">
+                <view class="name">{{t.team_name}}</view>
+                <view class="view_1">
+                    <view class="tr" wx:for="{{t.table}}" wx:for-item="i">
+                        <view class="th th1" wx:if="{{index===0}}"></view>
+                        <view class="th th1" wx:for="{{i}}" wx:for-item="ii" wx:key="ii">{{ii||''}}</view>
+                    </view>
+                </view>
+                <view class="table">
+                    <view class="tr">
+                        <view class="th th1">排名</view>
+                        <view class="th th2">选手</view>
+                        <view class="th th3">胜场</view>
+                        <view class="th th3">净胜球</view>
+                    </view>
+                    <view class="tr" wx:for="{{t.score}}" wx:for-item="tp" wx:key="player_id">
+                        <view class="td td1">{{index+1}}</view>
+                        <view class="td td2">{{tp.player_name}}</view>
+                        <view class="td td3">{{tp.win}}</view>
+                        <view class="td td3">{{tp.score}}</view>
+                    </view>
+                </view>
             </view>
         </view>
-
-
-        <view class="table">
-            <view class="tr">
-                <view class="th th1">排名</view>
-                <view class="th th2">选手</view>
-                <view class="th th3">胜场</view>
-                <view class="th th3">净胜球</view>
-            </view>
-            <view class="tr" wx:for="{{t.score}}" wx:for-item="tp" wx:key="player_id">
-                <view class="td td1">{{index+1}}</view>
-                <view class="td td2">{{tp.player_name}}</view>
-                <view class="td td3">{{tp.win}}</view>
-                <view class="td td3">{{tp.score}}</view>
-            </view>
-        </view>
-    </view>
-
+    </scroll-view>
 </view>

commpents/pagesMatchs/achieve/achieve-1.wxss

@@ -1,57 +1,68 @@
 .ranking {
-    margin: 0 0 2vw 0;
-  }
-  .ranking .name {
-    font-size: 14px;
-    font-weight: bold;
-    padding: 2vw;
-    background-color: #39434d;
-    color: #fff;
-    text-align: center;
-  }
-  .ranking .view_1 {
-    width: 96vw;
-    margin: 0 0 2vw 0;
-  }
-  /* 表格代码   */
-  .table {
-    border: 1px solid #dadada;
-    border-right: 0;
-    border-bottom: 0;
-    width: 95.6vw;
-  }
-  .tr {
-    width: 100%;
-    display: flex;
-    justify-content: space-between;
-    overflow-x: scroll;
-  }
-  .th,
-  .td {
-    padding: 10px;
-    border-bottom: 1px solid #dadada;
-    border-right: 1px solid #dadada;
-    border-left: 1px solid #dadada;
-    text-align: center;
-    width: 100%;
-  }
-  .th1,
-  .th2,
-  .td1,
-  .td2 {
-    width: 50%;
-  }
-  .th {
-    width: 20vw;
-    font-size: 13px;
-    font-weight: 800;
-    overflow: hidden;
-    word-break: break-all;
-  }
-  .td {
-    width: 20vw;
-    font-size: 13px;
-    overflow: hidden;
-    word-break: break-all;
-  }
-  
+  margin: 0 0 2vw 0;
+}
+.ranking .name {
+  font-size: 14px;
+  font-weight: bold;
+  padding: 2vw;
+  background-color: #39434d;
+  color: #fff;
+  text-align: center;
+}
+.ranking .view_1 {
+  width: 96vw;
+  margin: 0 2vw 2vw 2vw;
+}
+/* 表格代码   */
+.table {
+  border: 1px solid #dadada;
+  border-right: 0;
+  border-bottom: 0;
+  width: 96vw;
+  margin: 0 2vw 2vw 2vw;
+}
+.tr {
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  overflow-x: scroll;
+}
+.th,
+.td {
+  padding: 10px;
+  border-bottom: 1px solid #dadada;
+  border-right: 1px solid #dadada;
+  border-left: 1px solid #dadada;
+  text-align: center;
+  width: 100%;
+}
+.th1,
+.th2,
+.td1,
+.td2 {
+  width: 50%;
+}
+.th {
+  width: 20vw;
+  font-size: 13px;
+  font-weight: 800;
+  overflow: hidden;
+  word-break: break-all;
+}
+.td {
+  width: 20vw;
+  font-size: 13px;
+  overflow: hidden;
+  word-break: break-all;
+}
+.scroll-view {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+.scroll-view .list-scroll-view {
+  display: flex;
+  flex-direction: column;
+}