修改

icon/icon.wxss

@@ -1,9 +1,8 @@
 @font-face {
-  font-family: "iconfont";
-  /* Project id 3244772 */
-  src: url('//at.alicdn.com/t/font_3244772_rid04ak1xdb.woff2?t=1647400876671') format('woff2'),
-    url('//at.alicdn.com/t/font_3244772_rid04ak1xdb.woff?t=1647400876671') format('woff'),
-    url('//at.alicdn.com/t/font_3244772_rid04ak1xdb.ttf?t=1647400876671') format('truetype');
+  font-family: "iconfont"; /* Project id 3244772 */
+  src: url('//at.alicdn.com/t/font_3244772_9toijx5qznp.woff2?t=1647420224492') format('woff2'),
+       url('//at.alicdn.com/t/font_3244772_9toijx5qznp.woff?t=1647420224492') format('woff'),
+       url('//at.alicdn.com/t/font_3244772_9toijx5qznp.ttf?t=1647420224492') format('truetype');
 }
 
 .iconfont {
@@ -14,6 +13,12 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-C1:before {
+  content: "\e601";
+  color: rgb(212, 0, 0);
+  font-size: 20px;
+}
+
 .icon-dayuhao1:before {
   content: "\e600";
 }

pages/administration/index.js

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

pages/administration/index.wxml

@@ -93,6 +93,41 @@
           </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>

pages/administration/index.wxss

@@ -2,9 +2,11 @@
   position: relative;
   width: 100%;
 }
+
 .van-tabs__wrap {
   background-color: #f1f1f1 !important;
 }
+
 .van-tabs__line {
   background-color: blue !important;
 }
@@ -26,7 +28,7 @@
 
 .themes {
   position: absolute;
-  margin-top: 15%;
+  margin-top: 11%;
   margin-left: 15%;
   color: #fff;
   width: 100%;
@@ -45,7 +47,8 @@
   height: 180px;
   background-color: #eeeeee;
 }
-.thr{
+
+.thr {
   position: absolute;
   top: 40%;
   left: 1.5%;
@@ -59,6 +62,7 @@
   width: 46%;
   margin-right: 3%;
 }
+
 .right {
   float: left;
   width: 46%;
@@ -71,7 +75,8 @@
   margin-left: 2%;
   border-radius: 3%;
 }
-.imagx{
+
+.imagx {
   width: 5%;
   height: 25%;
   position: absolute;
@@ -79,6 +84,7 @@
   margin-left: 30%;
   color: #fff;
 }
+
 .th {
   position: absolute;
   margin-top: 6%;
@@ -86,7 +92,8 @@
   color: #fff;
   width: 100%;
 }
-.four{
+
+.four {
   margin-top: 34%;
   position: absolute;
   top: 32%;
@@ -94,6 +101,16 @@
   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%;
@@ -113,42 +130,63 @@
   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: #fff;
+  color: rgb(63, 63, 63);
+}
+
+.beiend {
+  margin-left: -14px;
+  width: 108%;
+  height: 120px;
+}
+.ends{
+ position: absolute;
+ top: 10%;
+ left: 2%;
+ width: 100%;
 }
-.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: #5e5e5e;
+  color: #868686;
   font-weight: 600;
 }
+
 .text6 {
   font-size: 23px;
   color: rgb(46, 46, 245);
@@ -160,12 +198,14 @@
   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;
@@ -173,6 +213,7 @@
   height: 80px;
   background-color: rgb(238, 236, 236);
 }
+
 .right1_2 {
   float: left;
   width: 100%
@@ -184,11 +225,13 @@
   height: 40px;
   overflow: hidden;
 }
+
 .right1_2 .right1_2o image {
   width: 100%;
   height: 36px;
   overflow: hidden;
 }
+
 .right1_2 .right1_2t {
   float: left;
   width: 33%;
@@ -206,6 +249,7 @@
   text-align: center;
   padding: 6px 0;
 }
-.right1_1{
+
+.right1_1 {
   text-align: center;
 }

pages/home/index.wxml

@@ -28,7 +28,7 @@
           </view>
           <view class="right1_2">
             <view class="right1_2o">
-              <image src="{{items.head1}}"></image>
+              <image class="head1" src="{{items.head1}}"></image>
             </view>
             <view class="right1_2t"><text>{{items.groupname1}}</text></view>
             <view class="right1_2i">
@@ -38,7 +38,7 @@
             </view>
             <view class="right1_2t"><text>{{items.groupname2}}</text></view>
             <view class="right1_2o">
-              <image src="{{items.head2}}"></image>
+              <image class="head2" src="{{items.head2}}"></image>
             </view>
           </view>
         </view>

pages/home/index.wxss

@@ -68,7 +68,7 @@ listbut{
 .text4 {
   font-size: 14px;
   margin: 5px;
-  color: #5e5e5e;
+  color: #868686;
   font-weight: 600;
 }
 
@@ -101,7 +101,7 @@ listbut{
 
 .right1_2 {
   float: left;
-  width: 100%
+  width: 101%
 }
 
 .right1_2 .right1_2o {
@@ -111,8 +111,13 @@ listbut{
   overflow: hidden;
 }
 
-.right1_2 .right1_2o image {
+.head1 {
   width: 100%;
+  height: 33px;
+  overflow: hidden;
+}
+.head2 {
+  width: 89%;
   height: 36px;
   overflow: hidden;
 }

pages/me/index.wxml

@@ -55,7 +55,7 @@
           </view>
           <view class="right1_2">
             <view class="right1_2o">
-              <image src="{{item.head1}}"></image>
+              <image class="head1" src="{{item.head1}}"></image>
             </view>
             <view class="right1_2t"><text>{{item.groupname1}}</text></view>
             <view class="right1_2i">
@@ -65,7 +65,7 @@
             </view>
             <view class="right1_2t"><text>{{item.groupname2}}</text></view>
             <view class="right1_2o">
-              <image src="{{item.head2}}"></image>
+              <image class="head2" src="{{item.head2}}"></image>
             </view>
           </view>
         </view>
@@ -94,6 +94,7 @@
             </view>
             <button class="ball" size="mini" wx:if="{{item.ball=='足球'}}" style="background-color:rgb(63, 127, 245);">{{item.ball}}</button>
             <button class="ball" size="mini" wx:if="{{item.ball=='篮球'}}" style="background-color:rgb(245, 172, 63);">{{item.ball}}</button>
+            <!-- <text class=" icon iconfont icon-C1" wx:if="{{item.grade}}"></text> -->
             <button class="grade" size="mini">{{item.grade}}</button>
           </view>
           <view class="dui-right"><text class="person">

pages/me/index.wxss

@@ -201,7 +201,7 @@
 }
 
 .right1_2 .right1_2t text {
-  font-size: 14px;
+  font-size: 13px;
   font-weight: 600;
 }
 
@@ -221,9 +221,12 @@
 
 .right1_2 {
   float: left;
-  width: 98%;
+  width: 100%;
   margin-top: 3px;
 }
+.iocns{
+  margin-top: -1px;
+}
 
 .right1_2 .right1_2o {
   float: left;
@@ -233,9 +236,14 @@
   margin-top: 2px;
 }
 
-.right1_2 .right1_2o image {
+.head1 {
   width: 100%;
-  height: 36px;
+  height: 33px;
+  overflow: hidden;
+}
+.head2 {
+  width: 89%;
+  height: 34px;
   overflow: hidden;
 }
 

pages/search/index.js

@@ -15,17 +15,13 @@ Page({
       {
         id: '1', name: '朝阳区乒乓球比赛', head2: '/image/head2.png', head1: '/image/head1.png',fraction2: '0', groupname2: '马尼拉组', group: '第一组', fraction1: '0', site: '第一场', groupname1: '哈拉海组', match: '循环赛', week: '星期五', time: '13：00',
         state: '待比赛', date: '2022.01.15', address: '吉林省长春市远创国际A座'
-      },
-      { id: '1', name: '经开区足球比赛', fraction2: '0', groupname2: '马尼拉组', group: '第二组', fraction1: '0', site: '第二场', groupname1: '哈拉海组', match: '循环赛',
-       week: '星期一', head2: '/image/head2.png', head1: '/image/head1.png', time: '09：00', state: '待比赛', date: '2022.01.20', address: '吉林省长春市远创国际A座' },
+      }
     ],
     listend: [
       {
         id: '1', name: '朝阳区乒乓球比赛', head2: '/image/head2.png', head1: '/image/head1.png',fraction2: '0', groupname2: '马尼拉组', group: '第一组', fraction1: '0', site: '第一场', groupname1: '哈拉海组', match: '循环赛', week: '星期五', time: '13：00',
         state: '已结束', date: '2022.01.15', address: '吉林省长春市远创国际A座'
-      },
-      { id: '1', name: '经开区足球比赛', fraction2: '0', groupname2: '马尼拉组', group: '第二组', fraction1: '0', site: '第二场', groupname1: '哈拉海组', match: '循环赛',
-       week: '星期一', head2: '/image/head2.png', head1: '/image/head1.png', time: '09：00', state: '已结束', date: '2022.01.20', address: '吉林省长春市远创国际A座' },
+      }
     ],
   },
   //标签页

pages/search/index.wxml

@@ -34,8 +34,12 @@
                 </view>
               </view>
             </view>
-            <view class="beijing">
-              <view class="lists" wx:key="item" wx:for="{{list}}">
+            <view class="beijing1" wx:key="item" wx:for="{{list}}">
+              <view style="margin-left: 10px;">
+                <text class="text1">{{item.date}}</text>
+                <text class="text1">{{item.week}}</text>
+              </view>
+              <view class="list1">
                 <view class="names">{{item.name}}</view>
                 <button class="button" size="mini">{{item.state}}</button>
                 <view class="leftmueen">
@@ -82,8 +86,12 @@
                 </view>
               </view>
             </view>
-            <view class="beijing">
-              <view class="lists" wx:key="item" wx:for="{{listend}}">
+            <view class="beijing1" wx:key="item" wx:for="{{listend}}">
+              <view style="margin-left: 10px;">
+                <text class="text1">{{item.date}}</text>
+                <text class="text1">{{item.week}}</text>
+              </view>
+              <view class="list1">
                 <view class="names">{{item.name}}</view>
                 <button class="buttonend" size="mini">{{item.state}}</button>
                 <view class="leftmueen">

pages/search/index.wxss

@@ -18,9 +18,7 @@
   width: 38.800003px !important;
   background-color: blue !important;
 }
-
-.lists {
-  margin-top: 10px;
+.list1 {
   background-color: white;
 }
 
@@ -128,7 +126,7 @@ button {
   background-color: rgb(136, 136, 136);
   border-radius: 15px;
   font-size: 13px !important;
-  color: #fff;
+  color: rgb(63, 63, 63);
 }
 
 .leftmueen {
@@ -147,9 +145,8 @@ button {
   font-size: 13px;
   color: #adadad;
 }
-
-.beijing {
-  margin-top: 90px;
+.beijing1{
+  margin-top: -7px;
 }
 
 .right1_2t {