修改

pages/administration/index.js

@@ -53,6 +53,10 @@ Page({
         id: '1', name: '朝阳区乒乓球比赛', week: '星期五', time: '13：00',
         state: '已结束', listbisai: [], date: '2022.01.15', address: '吉林省长春市远创国际A座'
       },
+      {
+        id: '1', name: '朝阳区乒乓球比赛', week: '星期五', time: '13：00',
+        state: '已结束', listbisai: [], date: '2022.01.15', address: '吉林省长春市远创国际A座'
+      },
     ],
   },
   tabPath(e) {

pages/administration/index.wxml

@@ -27,7 +27,7 @@
             <view class="name">{{item.name}}</view>
             <button class="button" size="mini">{{item.state}}</button>
             <view class="left1">
-              <view class="otherInfo">
+              <view class="otherInfos">
                 <text class="text1">{{item.date}}</text>
                 <text class="text1">{{item.week}}</text>
                 <text class="text1">{{item.time}}</text>
@@ -62,7 +62,7 @@
             <view class="name">{{item.name}}</view>
             <button class="buttonstart" size="mini">{{item.state}}</button>
             <view class="left1">
-              <view class="otherInfo">
+              <view class="otherInfos">
                 <text class="text1">{{item.date}}</text>
                 <text class="text1">{{item.week}}</text>
                 <text class="text1">{{item.time}}</text>
@@ -93,46 +93,11 @@
           </view>
         </van-tab>
         <van-tab title="已结束">
-          <view class="listend" wx:key="item" wx:for="{{listend}}">
-            <image src="/image/end.png" class="beiend"></image>
-            <view class="ends">
-              <view class="name-end">{{item.name}}</view>
-              <view class="left1">
-                <view class="otherInfo">
-                  <text class="text1">{{item.date}}</text>
-                  <text class="text1">{{item.week}}</text>
-                  <text class="text1">{{item.time}}</text>
-                </view>
-                <view class="otherInfo textOver"><text class="text3">{{item.address}}</text></view>
-              </view>
-              <view class="right1" wx:if="{{item.listbisai}}" wx:for="{{item.listbisai}}" wx:for-item="items">
-                <view class="right1_1">
-                  <text class="text4">{{items.match}}</text>
-                  <text class="text4">{{items.group}}</text>
-                </view>
-                <view class="right1_2">
-                  <view class="right1_2o">
-                    <image src="{{items.head1}}"></image>
-                  </view>
-                  <view class="right1_2t"><text>{{items.groupname1}}</text></view>
-                  <view class="right1_2i">
-                    <text class="text6">{{items.fraction1}}</text>
-                    <text class="text8">:</text>
-                    <text class="text7">{{items.fraction2}}</text>
-                  </view>
-                  <view class="right1_2t"><text>{{items.groupname2}}</text></view>
-                  <view class="right1_2o">
-                    <image src="{{items.head2}}"></image>
-                  </view>
-                </view>
-              </view>
-            </view>
-          </view>
           <view class="list" wx:key="item" wx:for="{{listend}}">
             <view class="name">{{item.name}}</view>
             <button class="buttonend" size="mini">{{item.state}}</button>
             <view class="left1">
-              <view class="otherInfo">
+              <view class="otherInfos">
                 <text class="text1">{{item.date}}</text>
                 <text class="text1">{{item.week}}</text>
                 <text class="text1">{{item.time}}</text>

pages/administration/index.wxss

@@ -2,11 +2,9 @@
   position: relative;
   width: 100%;
 }
-
 .van-tabs__wrap {
   background-color: #f1f1f1 !important;
 }
-
 .van-tabs__line {
   background-color: blue !important;
 }
@@ -28,7 +26,7 @@
 
 .themes {
   position: absolute;
-  margin-top: 11%;
+  margin-top: 10%;
   margin-left: 15%;
   color: #fff;
   width: 100%;
@@ -36,7 +34,7 @@
 
 .imags {
   width: 95%;
-  height: 107px;
+  height: 105px;
   background-color: #eeeeee;
   margin-left: 2.5%;
   border-radius: 3%;
@@ -47,8 +45,7 @@
   height: 180px;
   background-color: #eeeeee;
 }
-
-.thr {
+.thr{
   position: absolute;
   top: 40%;
   left: 1.5%;
@@ -62,7 +59,6 @@
   width: 46%;
   margin-right: 3%;
 }
-
 .right {
   float: left;
   width: 46%;
@@ -75,8 +71,7 @@
   margin-left: 2%;
   border-radius: 3%;
 }
-
-.imagx {
+.imagx{
   width: 5%;
   height: 25%;
   position: absolute;
@@ -84,7 +79,6 @@
   margin-left: 30%;
   color: #fff;
 }
-
 .th {
   position: absolute;
   margin-top: 6%;
@@ -92,8 +86,7 @@
   color: #fff;
   width: 100%;
 }
-
-.four {
+.four{
   margin-top: 34%;
   position: absolute;
   top: 32%;
@@ -101,20 +94,11 @@
   width: 93%;
   border-radius: 10%;
 }
-.name-end{
-  float: left;
-  width: 100%;
-  margin: 5px;
-  margin-bottom: 10px;
-  font-size: 16px;
-  color: #fff;
-  font-weight: bold;
-}
-
 .name {
   float: left;
   width: 40%;
   margin: 6px;
+  margin-left: 10px;
   font-size: 16px;
   color: #0034cf;
   font-weight: bold;
@@ -130,63 +114,49 @@
   font-size: 14px;
   color: #5e5e5e;
 }
-
-.button {
+.button{
   margin-top: 4px;
   background-color: rgb(238, 147, 28);
   border-radius: 15px;
   font-size: 13px !important;
   color: #fff;
 }
-
-.buttonstart {
+.buttonstart{
   margin-top: 4px;
   background-color: rgb(238, 88, 28);
   border-radius: 15px;
   font-size: 13px !important;
   color: #fff;
 }
-
-.buttonend {
+.buttonend{
   margin-top: 4px;
   background-color: rgb(136, 136, 136);
   border-radius: 15px;
   font-size: 13px !important;
-  color: rgb(63, 63, 63);
+  color: #fff;
 }
-
-.beiend {
-  margin-left: -14px;
-  width: 108%;
-  height: 120px;
+.otherInfo {
+  text-align: left;
+  padding: 0 0 15px 5px;
 }
-.ends{
- position: absolute;
- top: 10%;
- left: 2%;
- width: 100%;
+.otherInfos{
+  padding: 0 0 0px 5px;
 }
-
-.list {
+.list{
   background-color: #fff;
   margin-bottom: 10px;
   border-radius: 10px;
 }
-.listend {
-  border-radius: 10px;
-}
 .text3 {
   font-size: 13px;
   color: #adadad;
 }
-
 .text4 {
   font-size: 14px;
   margin: 5px;
-  color: #868686;
+  color: #5e5e5e;
   font-weight: 600;
 }
-
 .text6 {
   font-size: 23px;
   color: rgb(46, 46, 245);
@@ -198,22 +168,19 @@
   color: rgb(243, 19, 19);
   font-weight: 500;
 }
-
 .text8 {
   font-size: 23px;
   font-weight: 500;
   margin-right: 5px;
   margin-left: 5px;
 }
-
 .right1 {
   border-radius: 5px;
   position: relative;
   width: 100%;
   height: 80px;
-  background-color: rgb(238, 236, 236);
+  background-color: #e9e9e9;
 }
-
 .right1_2 {
   float: left;
   width: 100%
@@ -225,13 +192,11 @@
   height: 40px;
   overflow: hidden;
 }
-
 .right1_2 .right1_2o image {
   width: 100%;
   height: 36px;
   overflow: hidden;
 }
-
 .right1_2 .right1_2t {
   float: left;
   width: 33%;
@@ -249,7 +214,6 @@
   text-align: center;
   padding: 6px 0;
 }
-
-.right1_1 {
+.right1_1{
   text-align: center;
 }

pages/home/index.wxml

@@ -14,7 +14,7 @@
           </view>
         </view>
         <view class="left1">
-          <view class="otherInfo">
+          <view class="otherInfos">
             <text class="text1">{{item.date}}</text>
             <text class="text1">{{item.week}}</text>
             <text class="text1">{{item.time}}</text>

pages/home/index.wxss

@@ -26,6 +26,7 @@
   float: left;
   width: 38%;
   margin: 6px;
+  margin-left: 10px;
   font-size: 16px;
   color: #0034cf;
   font-weight: bold;
@@ -90,6 +91,13 @@ listbut{
   margin-right: 5px;
   margin-left: 5px;
 }
+.otherInfo {
+  text-align: left;
+  padding: 0 0 15px 5px;
+}
+.otherInfos{
+  padding: 0 0 0px 5px;
+}
 
 .right1 {
   border-radius: 5px;

pages/me/index.wxml

@@ -81,9 +81,11 @@
     </view>
     <view class="five">
       <view class="listtuan" wx:if="{{total!=''}}">
-        <text class="tuan">我的团队</text>
-        <text class="total">共参加{{total}}个队伍</text>
-        <text class="chuang">创建团队</text>
+        <view class="otherInfo">
+          <text class="tuan">我的团队</text>
+          <text class="total">共参加{{total}}个队伍</text>
+          <text class="chuang">创建团队</text>
+        </view>
         <view class="list3" wx:key="item" wx:for="{{list3}}">
           <view class="dui-left">
             <view class="dui-left1">
@@ -109,9 +111,11 @@
         </view>
       </view>
       <view class="list0" wx:if="{{total==''}}">
-        <text class="tuan">我的团队</text>
-        <text class="total">暂无加入任何团队</text>
-        <text class="chuang">创建团队</text>
+        <view class="otherInfo">
+          <text class="tuan">我的团队</text>
+          <text class="total">暂无加入任何团队</text>
+          <text class="chuang">创建团队</text>
+        </view>
         <view class="jian">
           <view class="viewjian"><text class="jiantext">创建或加入一个团队进行比赛</text></view>
         </view>

pages/me/index.wxss

@@ -51,9 +51,8 @@
 
 .tou {
   position: absolute;
-  width: 30%;
-  height: 93px;
-  border-radius: 25px;
+  width: 28%;
+  height: 100%;
   margin-left: 60%;
   margin-top: -80px;
 }
@@ -74,7 +73,8 @@
 }
 
 .otherInfo {
-  margin: 10px;
+  text-align: left;
+  padding: 10px 10px 10px 5px;
 }
 
 .buttons {
@@ -273,7 +273,7 @@
   margin-top: 13%;
   margin-left: 5%;
   width: 91%;
-  height: 200px;
+  height: 220px;
   border-radius: 5px;
   background-color: #fff;
 }
@@ -417,18 +417,19 @@
   border-radius: 5px;
   background-color: #fff;
   margin-bottom: 15%;
+  padding: 0 0 10px 0;
 }
 
 .six-11 {
   font-size: 16px;
   font-weight: 550;
+  padding: 10px 10px 1px 5px;
   margin: 12px;
 }
 
 .six-0 {
   float: left;
   width: 25%;
-
 }
 
 .six-1 {

pages/search/index.wxml

@@ -43,7 +43,7 @@
                 <view class="names">{{item.name}}</view>
                 <button class="button" size="mini">{{item.state}}</button>
                 <view class="leftmueen">
-                  <view class="otherInfo">
+                  <view class="otherInfos">
                     <text class="text9">{{item.date}}</text>
                     <text class="text10">{{item.week}}</text>
                     <text class="text10">{{item.time}}</text>
@@ -56,7 +56,7 @@
           <van-tab title="历史比赛" name="b" style="font-weight: 500;">
             <view class="list" wx:key="item" wx:for="{{listend}}">
               <view class="left1">
-                <view class="otherInfo">
+                <view class="otherInfoss">
                   <text class="text1">{{item.date}}</text>
                   <text class="text1">{{item.week}}</text>
                 </view>
@@ -95,12 +95,12 @@
                 <view class="names">{{item.name}}</view>
                 <button class="buttonend" size="mini">{{item.state}}</button>
                 <view class="leftmueen">
-                  <view class="otherInfo">
+                  <view class="otherInfos">
                     <text class="text9">{{item.date}}</text>
                     <text class="text10">{{item.week}}</text>
                     <text class="text10">{{item.time}}</text>
                   </view>
-                  <view class="otherInfo textOver"><text class="text3">{{item.address}}</text></view>
+                  <view class="otherInfo"><text class="text3">{{item.address}}</text></view>
                 </view>
               </view>
             </view>

pages/search/index.wxss

@@ -108,6 +108,7 @@
   float: left;
   width: 38%;
   margin: 6px;
+  margin-left: 10px;
   font-size: 16px;
   color: #0034cf;
   font-weight: bold;
@@ -130,7 +131,6 @@ button {
 }
 
 .leftmueen {
-  margin: 5px;
   border-radius: 25px;
 }
 
@@ -138,6 +138,10 @@ button {
   float: left;
   width: 50%;
 }
+.otherInfo {
+  text-align: left;
+  padding: 0 0 15px 0px;
+}
 
 .text3 {
   margin-left: 10px;