zs hace 2 años
padre
commit
6281e1230e
Se han modificado 3 ficheros con 99 adiciones y 17 borrados
  1. 43 0
      pages/eliminate/add.less
  2. 21 17
      pages/eliminate/add.wxml
  3. 35 0
      pages/eliminate/add.wxss

+ 43 - 0
pages/eliminate/add.less

@@ -9,4 +9,47 @@
     .zero:last-child {
         margin: 0;
     }
+
+    .one {
+        width: 96vw;
+        text-align: center;
+
+        .race {
+            display: flex;
+            flex-direction: column;
+            height: 88.8vh;
+
+            .button {
+                display: flex;
+                flex-direction: row;
+                justify-content: space-around;
+                padding: 5px 0;
+            }
+
+            .list {
+                flex-grow: 1;
+                position: relative;
+                margin: 0 0 2vw 0;
+
+                .scroll-view {
+                    position: absolute;
+                    top: 0;
+                    left: 0;
+                    right: 0;
+                    bottom: 0;
+
+                    .list-scroll-view {
+                        display: flex;
+                        flex-direction: column;
+
+                        .name {
+                            text-align: center;
+                            margin: 2vw 0;
+                        }
+                    }
+                }
+            }
+        }
+
+    }
 }

+ 21 - 17
pages/eliminate/add.wxml

@@ -2,32 +2,36 @@
     <view slot="info" class="container main">
         <view class="zero one">
             <view wx:if="{{view==='graph'}}">
-                <view>
-                    <button bind:tap="toAutoInitData" wx:if="{{!arrangeData._id}}">自动生成</button>
-                    <button bind:tap="turnView" data-view="race">设置比赛</button>
+                <view class="button">
+                    <button type="primary" size="mini" bind:tap="toAutoInitData" wx:if="{{!arrangeData._id}}">自动生成</button>
+                    <button type="primary" size="mini" bind:tap="turnView" data-view="race">设置比赛</button>
                     <!-- <button>保存</button> -->
                 </view>
                 <f6-tree list="{{data}}" arrange="{{arrangeList}}" bind:tapNode="nodeTap"></f6-tree>
-                <view>
+                <view class="list">
                     <van-popup show="{{ show }}" bind:close="toClose" position="bottom" custom-style="height: 40%;">
                         <van-picker columns="{{ personList }}" bind:confirm="onChange" value-key="label" show-toolbar="{{true}}" bind:cancel="toClose" />
                     </van-popup>
                 </view>
             </view>
-            <view wx:if="{{view==='race'}}">
-                <view>
-                    <button bind:tap="turnView" data-view="graph">返回</button>
-                    <button bind:tap="toSubmit">保存</button>
+            <view wx:if="{{view==='race'}}" class="race">
+                <view class="button">
+                    <button type="primary" size="mini" bind:tap="turnView" data-view="graph">返回</button>
+                    <button type="primary" size="mini" bind:tap="toSubmit">保存</button>
                 </view>
-                <view>
-                    <view wx:for="{{raceList}}" wx:for-item="r" wx:key="node_one_id">
-                        {{r.player_name_one}} VS {{r.player_name_two}}
-                        <f-picker value="{{r.ground_id}}" label="场地" model="{{r.groundModelName}}" bind:selected="toSelected" columns="{{groundList}}" valueKey="_id" labelKey="name">
-                        </f-picker>
-                        <f-picker value="{{r.referee_id}}" label="裁判" model="{{r.refereeModelName}}" bind:selected="toSelected" columns="{{refereeList}}" valueKey="_id" labelKey="name">
-                        </f-picker>
-                        <f-time-picker label="比赛时间" model="{{r.timeModelName}}" value="{{r.match_time}}" bind:selected="toSelected" />
-                    </view>
+                <view class="list">
+                    <scroll-view scroll-y="true" class="scroll-view">
+                        <view class="list-scroll-view">
+                            <view wx:for="{{raceList}}" wx:for-item="r" wx:key="node_one_id">
+                                <view class="name"> {{r.player_name_one}} VS {{r.player_name_two}}</view>
+                                <f-picker value="{{r.ground_id}}" label="场地" model="{{r.groundModelName}}" bind:selected="toSelected" columns="{{groundList}}" valueKey="_id" labelKey="name">
+                                </f-picker>
+                                <f-picker value="{{r.referee_id}}" label="裁判" model="{{r.refereeModelName}}" bind:selected="toSelected" columns="{{refereeList}}" valueKey="_id" labelKey="name">
+                                </f-picker>
+                                <f-time-picker label="比赛时间" model="{{r.timeModelName}}" value="{{r.match_time}}" bind:selected="toSelected" />
+                            </view>
+                        </view>
+                    </scroll-view>
                 </view>
             </view>
         </view>

+ 35 - 0
pages/eliminate/add.wxss

@@ -8,3 +8,38 @@
 .main .zero:last-child {
   margin: 0;
 }
+.main .one {
+  width: 96vw;
+  text-align: center;
+}
+.main .one .race {
+  display: flex;
+  flex-direction: column;
+  height: 88.8vh;
+}
+.main .one .race .button {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-around;
+  padding: 5px 0;
+}
+.main .one .race .list {
+  flex-grow: 1;
+  position: relative;
+  margin: 0 0 2vw 0;
+}
+.main .one .race .list .scroll-view {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+.main .one .race .list .scroll-view .list-scroll-view {
+  display: flex;
+  flex-direction: column;
+}
+.main .one .race .list .scroll-view .list-scroll-view .name {
+  text-align: center;
+  margin: 2vw 0;
+}