小程序更新

icon/icon.wxss

@@ -21,7 +21,6 @@
 .icon-xiugaimima:before {
   content: "\e681";
   font-size: 22px;
-  margin-top: 10px;
 }
 
 .icon-ren_jiesantuandui_line:before {

pages/administration/index.js

@@ -20,9 +20,25 @@ Page({
         id: '1', name: '朝阳区乒乓球比赛', head2: '/image/head2.png', head1: '/image/head1.png',fraction2: '1', groupname2: '马尼拉老年组', group: '第一组', fraction1: '2', groupname1: '哈拉海队幼儿园', match: '循环赛', week: '星期五', time: '13：00',
         state: '进行中', date: '2022.01.15', address: '吉林省长春市远创国际A座'
       },
+      { id: '1', name: '经开区足球比赛', fraction2: '1', groupname2: '马尼拉老年组', group: '第二组', fraction1: '2', groupname1: '哈拉海队幼儿园', match: '循环赛',
+       week: '星期一', head2: '/image/head2.png', head1: '/image/head1.png', time: '09：00', state: '进行中', date: '2022.01.20', address: '吉林省长春市远创国际A座' },
+    ],
+    liststart: [
+      {
+        id: '1', name: '朝阳区乒乓球比赛', head2: '/image/head2.png', head1: '/image/head1.png',fraction2: '1', groupname2: '马尼拉老年组', group: '第一组', fraction1: '2', groupname1: '哈拉海队幼儿园', match: '循环赛', week: '星期五', time: '13：00',
+        state: '待比赛', date: '2022.01.15', address: '吉林省长春市远创国际A座'
+      },
       { id: '1', name: '经开区足球比赛', fraction2: '1', groupname2: '马尼拉老年组', group: '第二组', fraction1: '2', 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: '1', groupname2: '马尼拉老年组', group: '第一组', fraction1: '2', groupname1: '哈拉海队幼儿园', match: '循环赛', week: '星期五', time: '13：00',
+        state: '已结束', date: '2022.01.15', address: '吉林省长春市远创国际A座'
+      },
+      { id: '1', name: '经开区足球比赛', fraction2: '1', groupname2: '马尼拉老年组', group: '第二组', fraction1: '2', groupname1: '哈拉海队幼儿园', match: '循环赛',
+       week: '星期一', head2: '/image/head2.png', head1: '/image/head1.png', time: '09：00', state: '已结束', date: '2022.01.20', address: '吉林省长春市远创国际A座' },
+    ],
   },
   tabPath(e) {
     let query = e.detail.detail;

pages/administration/index.wxml

@@ -57,8 +57,72 @@
         </view>
       </view>
         </van-tab>
-        <van-tab title="未开始">内容 2</van-tab>
-        <van-tab title="已结束">内容 3</van-tab>
+        <van-tab title="未开始">  <view class="list" wx:key="item" wx:for="{{liststart}}">
+        <view class="name">{{item.name}}</view>
+        <button class="buttonstart" size="mini">{{item.state}}</button>
+        <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">
+          <view class="right1_1">
+            <text class="text4">{{item.match}}</text>
+            <text class="text4">{{item.group}}</text>
+          </view>
+          <view class="right1_2">
+            <view class="right1_2o">
+              <image src="{{item.head1}}"></image>
+            </view>
+            <view class="right1_2t"><text>{{item.groupname1}}</text></view>
+            <view class="right1_2i">
+              <text class="text6">{{item.fraction1}}</text>
+              <text class="text8">:</text>
+              <text class="text7">{{item.fraction2}}</text>
+            </view>
+            <view class="right1_2t"><text>{{item.groupname2}}</text></view>
+            <view class="right1_2o">
+              <image src="{{item.head2}}"></image>
+            </view>
+          </view>
+        </view>
+      </view></van-tab>
+        <van-tab title="已结束">  <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">
+            <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">
+          <view class="right1_1">
+            <text class="text4">{{item.match}}</text>
+            <text class="text4">{{item.group}}</text>
+          </view>
+          <view class="right1_2">
+            <view class="right1_2o">
+              <image src="{{item.head1}}"></image>
+            </view>
+            <view class="right1_2t"><text>{{item.groupname1}}</text></view>
+            <view class="right1_2i">
+              <text class="text6">{{item.fraction1}}</text>
+              <text class="text8">:</text>
+              <text class="text7">{{item.fraction2}}</text>
+            </view>
+            <view class="right1_2t"><text>{{item.groupname2}}</text></view>
+            <view class="right1_2o">
+              <image src="{{item.head2}}"></image>
+            </view>
+          </view>
+        </view>
+      </view></van-tab>
       </van-tabs>
     </view>
 

pages/administration/index.wxss

@@ -122,6 +122,20 @@
   font-size: 13px !important;
   color: #fff;
 }
+.buttonstart{
+  margin-top: 7px;
+  background-color: rgb(238, 88, 28);
+  border-radius: 15px;
+  font-size: 13px !important;
+  color: #fff;
+}
+.buttonend{
+  margin-top: 7px;
+  background-color: rgb(136, 136, 136);
+  border-radius: 15px;
+  font-size: 13px !important;
+  color: #fff;
+}
 .list{
   background-color: #fff;
   margin-bottom: 10px;

pages/search/index.js

@@ -19,6 +19,14 @@ Page({
       { 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座' },
+    ],
   },
   //标签页
   setup() {

pages/search/index.wxml

@@ -53,7 +53,7 @@
             </view>
           </van-tab>
           <van-tab title="历史比赛" name="b">
-            <view class="list" wx:key="item" wx:for="{{list}}">
+            <view class="list" wx:key="item" wx:for="{{listend}}">
               <view class="left1">
                 <view class="otherInfo">
                   <text class="text1">{{item.date}}</text>
@@ -88,7 +88,7 @@
             <view class="beijing">
               <view class="lists" wx:key="item" wx:for="{{list}}">
                 <view class="names">{{item.name}}</view>
-                <button class="button" size="mini">{{item.state}}</button>
+                <button class="buttonend" size="mini">{{item.state}}</button>
                 <view class="leftmueen">
                   <view class="otherInfo">
                     <text class="text9">{{item.date}}</text>

pages/search/index.wxss

@@ -101,6 +101,13 @@ button {
   font-size: 13px !important;
   color: #fff;
 }
+.buttonend{
+  margin-top: 7px;
+  background-color: rgb(136, 136, 136);
+  border-radius: 15px;
+  font-size: 13px !important;
+  color: #fff;
+}
 .leftmueen {
   margin: 5px;
   border-radius: 25px;