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

pagesMatch/matchAdmin/match/add.less

@@ -11,10 +11,6 @@
             padding: 2vw 0;
             margin: 0 2vw 2vw 2vw;
 
-            .label {
-                color: var(--f85Color);
-            }
-
             .value {
                 flex-grow: 1;
                 color: var(--blackColor);
@@ -28,26 +24,11 @@
 
         .btn {
             text-align: center;
-            margin: 5vw 0;
+            margin: 3vw 0;
 
             button {
-                width: 40vw;
                 margin: 0 2vw;
-                padding: 1vw 0;
             }
         }
     }
-}
-
-.scroll-view {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-
-    .list-scroll-view {
-        display: flex;
-        flex-direction: column;
-    }
 }

pagesMatch/matchAdmin/match/add.wxss

@@ -9,9 +9,6 @@
   padding: 2vw 0;
   margin: 0 2vw 2vw 2vw;
 }
-.main .one .content .label {
-  color: var(--f85Color);
-}
 .main .one .content .value {
   flex-grow: 1;
   color: var(--blackColor);
@@ -22,21 +19,8 @@
 }
 .main .one .btn {
   text-align: center;
-  margin: 5vw 0;
+  margin: 3vw 0;
 }
 .main .one .btn button {
-  width: 40vw;
   margin: 0 2vw;
-  padding: 1vw 0;
-}
-.scroll-view {
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-}
-.scroll-view .list-scroll-view {
-  display: flex;
-  flex-direction: column;
 }

pagesMatch/matchAdmin/match/list.less

@@ -7,43 +7,45 @@
     .one {
         display: flex;
         flex-direction: row;
-        width: 96vw;
         padding: 2vw;
+        border-bottom: 1px solid var(--f1Color);
 
         .one_1 {
             flex-grow: 1;
 
             input {
-                padding: 1vw 2vw 2vw 2vw;
-                border-radius: 2px;
-                font-size: var(--font16Size);
+                padding: 1vw 0 2vw 2vw;
                 background-color: var(--f1Color);
+                border-radius: 5px;
             }
         }
 
         .one_2 {
-            width: 15vw;
+            width: 20vw;
 
             button {
                 width: 100%;
-                font-size: var(--font14Size);
                 padding: 2vw;
+                font-size: var(--font14Size);
             }
         }
     }
 
     .two {
-        flex-grow: 1;
         position: relative;
-        width: 100vw;
+        flex-grow: 1;
+        background-color: var(--whiteColor);
+        padding: 0 2vw;
 
         .list {
             background-color: var(--f9Color);
+            margin: 0 0 2vw 0;
             padding: 2vw;
             margin: 0 2vw 2vw 2vw;
+            border-radius: 5px;
 
             .name {
-                font-size: var(--font18Szie);
+                font-size: var(--font16Szie);
                 font-weight: bold;
                 margin: 0 0 1vw 0;
             }
@@ -52,42 +54,27 @@
                 margin: 0 0 1vw 0;
 
                 .other_1 {
-                    font-size: var(--font16Size);
                     margin: 0 0 1vw 0;
+                    font-size: var(--font14Size);
 
-                    text {
+                    text:first-child {
                         color: var(--f85Color);
                     }
-
-                    text:last-child {
-                        color: var(--blackColor);
-                    }
                 }
             }
 
             .btn {
-                display: flex;
-                flex-direction: row;
-                justify-content: center;
                 text-align: center;
-                flex-wrap: wrap;
-
-                .btn_1 {
-                    width: 25vw;
-                    margin: 0 1vw 1vw 1vw;
 
-                    button {
-                        width: 100%;
-                        font-size: var(--font14Size);
-                        padding: 1vw 2vw;
-                    }
+                button {
+                    margin: 0 2vw;
+                    font-size: var(--font14Size);
                 }
             }
         }
     }
 }
 
-
 .scroll-view {
     position: absolute;
     top: 0;

pagesMatch/matchAdmin/match/list.wxml

@@ -32,12 +32,8 @@
                             </view>
                         </view>
                         <view class="btn">
-                            <view class="btn_1">
-                                <button type="primary" size="mini" bindtap="toEdit" data-item="{{item}}">信息维护</button>
-                            </view>
-                            <view class="btn_1">
-                                <button type="warn" size="mini" bindtap="toDel" data-item="{{item}}">赛事删除</button>
-                            </view>
+                            <button type="primary" size="mini" bindtap="toEdit" data-item="{{item}}">信息维护</button>
+                            <button type="warn" size="mini" bindtap="toDel" data-item="{{item}}">赛事删除</button>
                         </view>
                     </view>
                 </view>

pagesMatch/matchAdmin/match/list.wxss

@@ -6,38 +6,40 @@
 .main .one {
   display: flex;
   flex-direction: row;
-  width: 96vw;
   padding: 2vw;
+  border-bottom: 1px solid var(--f1Color);
 }
 .main .one .one_1 {
   flex-grow: 1;
 }
 .main .one .one_1 input {
-  padding: 1vw 2vw 2vw 2vw;
-  border-radius: 2px;
-  font-size: var(--font16Size);
+  padding: 1vw 0 2vw 2vw;
   background-color: var(--f1Color);
+  border-radius: 5px;
 }
 .main .one .one_2 {
-  width: 15vw;
+  width: 20vw;
 }
 .main .one .one_2 button {
   width: 100%;
-  font-size: var(--font14Size);
   padding: 2vw;
+  font-size: var(--font14Size);
 }
 .main .two {
-  flex-grow: 1;
   position: relative;
-  width: 100vw;
+  flex-grow: 1;
+  background-color: var(--whiteColor);
+  padding: 0 2vw;
 }
 .main .two .list {
   background-color: var(--f9Color);
+  margin: 0 0 2vw 0;
   padding: 2vw;
   margin: 0 2vw 2vw 2vw;
+  border-radius: 5px;
 }
 .main .two .list .name {
-  font-size: var(--font18Szie);
+  font-size: var(--font16Szie);
   font-weight: bold;
   margin: 0 0 1vw 0;
 }
@@ -45,30 +47,18 @@
   margin: 0 0 1vw 0;
 }
 .main .two .list .other .other_1 {
-  font-size: var(--font16Size);
   margin: 0 0 1vw 0;
+  font-size: var(--font14Size);
 }
-.main .two .list .other .other_1 text {
+.main .two .list .other .other_1 text:first-child {
   color: var(--f85Color);
 }
-.main .two .list .other .other_1 text:last-child {
-  color: var(--blackColor);
-}
 .main .two .list .btn {
-  display: flex;
-  flex-direction: row;
-  justify-content: center;
   text-align: center;
-  flex-wrap: wrap;
 }
-.main .two .list .btn .btn_1 {
-  width: 25vw;
-  margin: 0 1vw 1vw 1vw;
-}
-.main .two .list .btn .btn_1 button {
-  width: 100%;
+.main .two .list .btn button {
+  margin: 0 2vw;
   font-size: var(--font14Size);
-  padding: 1vw 2vw;
 }
 .scroll-view {
   position: absolute;

utils/httpUtil.js

@@ -36,7 +36,6 @@ const $post = (uri, data, type) => {
     });
 };
 const $delete = (uri, data, type) => {
-    console.log(uri, data, type);
     let app = getApp();
     let baseUrl = getDomain(uri, type);
     return new Promise((resolve, reject) => {