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

pages/club/index.js

@@ -8,31 +8,12 @@ Page({
             { name: '宝藏俱乐部', founder: '宝藏', add: '长春市朝阳区前进大街1244号长春市朝阳区前进大街1244号', project: '羽毛球', time: '2000-02-01', tel: '0431-800-800-8800', logo: [{ url: '/image/club.png' }] },
             { name: '英语俱乐部', founder: '英语', time: '2000-02-01', add: '长春市朝阳区前进大街1244号', project: '羽毛球', tel: '0431-800-800-8800', logo: [{ url: '/image/club.png' }] },
         ],
-        total: 0,
-        page: 0,
-        skip: 0,
-        limit: 5,
     },
     // 跳转菜单
     tabPath(e) {
         let { route } = e.detail.detail;
         if (route) wx.redirectTo({ url: `/${route}` })
     },
-    // 分页
-    toPage: function () {
-        const that = this;
-        let list = that.data.list;
-        let limit = that.data.limit;
-        if (that.data.total > list.length) {
-            wx.showLoading({ title: '加载中', mask: true })
-            let page = that.data.page + 1;
-            that.setData({ page: page })
-            let skip = page * limit;
-            that.setData({ skip: skip })
-            that.watchLogin();
-            wx.hideLoading()
-        } else { wx.showToast({ title: '没有更多数据了', icon: 'none', duration: 2000 }) }
-    },
     /**
      * 生命周期函数--监听页面加载
      */

pages/club/index.wxml

@@ -9,7 +9,7 @@
             </view>
         </view>
         <view class="two">
-            <scroll-view scroll-y="true" class="scroll-view" bindscrolltolower="toPage">
+            <scroll-view scroll-y="true" class="scroll-view">
                 <view class="list-scroll-view">
                     <view class="list" wx:for="{{list}}" wx:key="item">
                         <view class="name">{{item.name}}</view>

pages/match/index.js

@@ -21,7 +21,7 @@ Page({
                 title: '2021年中国中学生羽毛球总决赛',
                 time: '2022-8-12',
                 grade: '省市系列总决赛',
-                address: '吉林省长春市人民体育馆',
+                address: '吉林省长春市人民体育馆吉林省长春市人民体育馆',
                 type: '3',
                 logo: [{ url: '/image/beijing.jpeg' }],
                 status: '1'
@@ -31,7 +31,7 @@ Page({
                 title: '2021年中国中学生羽毛球总决赛',
                 time: '2022-8-12',
                 grade: '省市系列总决赛',
-                address: '吉林省长春市人民体育馆',
+                address: '吉林省长春市',
                 type: '1',
                 logo: [{ url: '/image/beijing.jpeg' }],
                 status: '2'
@@ -41,7 +41,7 @@ Page({
                 title: '2021年中国中学生羽毛球总决赛',
                 time: '2022-8-12',
                 grade: '省市系列总决赛',
-                address: '吉林省长春市人民体育馆',
+                address: '吉林省长春市',
                 type: '1',
                 logo: [{ url: '/image/beijing.jpeg' }],
                 status: '2'
@@ -51,7 +51,7 @@ Page({
                 title: '2021年中国中学生羽毛球总决赛',
                 time: '2022-8-12',
                 grade: '省市系列总决赛',
-                address: '吉林省长春市人民体育馆',
+                address: '吉林省长春市',
                 type: '1',
                 logo: [{ url: '/image/beijing.jpeg' }],
                 status: '2'

pages/match/index.less

@@ -81,11 +81,13 @@
                     .one_2 {
                         position: absolute;
                         top: 17vw;
+                        width: 86vw;
                         text-align: center;
-                        background-color: var(--mainColor);
+                        background-color: #ffffff9f;
                         margin: 1vw;
                         padding: 2vw;
                         border-radius: 10px;
+                        box-shadow: 0 0 1vw #cccccc;
 
                         .title {
                             font-size: var(--font18Szie);
@@ -98,11 +100,13 @@
                         .other {
                             display: flex;
                             flex-wrap: wrap;
+                            width: 86vw;
                             flex-direction: row;
-                            justify-content: space-between;
+                            justify-content: space-around;
                             margin: 0 0 2vw 0;
 
                             .other_1 {
+                                width: 43vw;
                                 margin: 0 0 1vw 0;
                                 font-size: var(--font16Size);
                                 color: var(--f85Color);
@@ -138,10 +142,6 @@
                     }
                 }
             }
-
-            .list:last-child {
-                border-bottom: none;
-            }
         }
 
         .scroll-view {

pages/match/index.wxml

@@ -11,10 +11,10 @@
         <view class="two">
             <view class="two_1">
                 <picker mode="selector" bindchange="typeChange" value="{{searchInfo.type}}" name="type" range-key='label' range="{{typeList}}">
-                    <view class="input">{{searchInfo.type=='0'?'其他':searchInfo.type=='1'?'羽毛球':searchInfo.type=='2'?'篮球':searchInfo.type=='3'?'足球':'请选择运动类型'}}</view>
+                    <view class="input">{{typeList[searchInfo.type].label||'请选择运动类型'}}</view>
                 </picker>
                 <picker mode="selector" bindchange="statusChange" value="{{searchInfo.status}}" name="status" range-key='label' range="{{statusList}}">
-                    <view class="input">{{searchInfo.status=='0'?'计划中':searchInfo.status=='1'?'报名中':searchInfo.status=='2'?'进行中':searchInfo.status=='3'?'已结束':'请选择比赛状态'}}</view>
+                    <view class="input">{{statusList[searchInfo.status].label||'请选择比赛状态'}}</view>
                 </picker>
             </view>
         </view>
@@ -30,10 +30,10 @@
                                 <view class="one_2">
                                     <view class="title">{{item.title}}</view>
                                     <view class="other">
-                                        <view class="other_1">时间：{{item.time}}</view>
-                                        <view class="other_1">等级：{{item.grade}}</view>
-                                        <view class="other_1">类型：{{item.type=='0'?'其他':item.type=='1'?'羽毛球':item.type=='2'?'篮球':'足球'}}</view>
-                                        <view class="other_1">地点：{{item.address}}</view>
+                                        <view class="other_1 textOver">时间：{{item.time}}</view>
+                                        <view class="other_1 textOver">等级：{{item.grade}}</view>
+                                        <view class="other_1 textOver">类型：{{item.type=='0'?'其他':item.type=='1'?'羽毛球':item.type=='2'?'篮球':'足球'}}</view>
+                                        <view class="other_1 textOver">地点：{{item.address}}</view>
                                     </view>
                                     <view class="status">
                                         <text class="text color{{item.status}}">{{item.status=='0'?'计划中':item.status=='1'?'报名中':item.status=='2'?'进行中':'已结束'}}</text>

pages/match/index.wxss

@@ -71,11 +71,13 @@
 .main .thr .thr_1 .list .list_1 .one_2 {
   position: absolute;
   top: 17vw;
+  width: 86vw;
   text-align: center;
-  background-color: var(--mainColor);
+  background-color: #ffffff9f;
   margin: 1vw;
   padding: 2vw;
   border-radius: 10px;
+  box-shadow: 0 0 1vw #cccccc;
 }
 .main .thr .thr_1 .list .list_1 .one_2 .title {
   font-size: var(--font18Szie);
@@ -86,11 +88,13 @@
 .main .thr .thr_1 .list .list_1 .one_2 .other {
   display: flex;
   flex-wrap: wrap;
+  width: 86vw;
   flex-direction: row;
-  justify-content: space-between;
+  justify-content: space-around;
   margin: 0 0 2vw 0;
 }
 .main .thr .thr_1 .list .list_1 .one_2 .other .other_1 {
+  width: 43vw;
   margin: 0 0 1vw 0;
   font-size: var(--font16Size);
   color: var(--f85Color);
@@ -115,9 +119,6 @@
 .main .thr .thr_1 .list .list_1 .one_2 .status .color3 {
   background-color: #808080;
 }
-.main .thr .thr_1 .list:last-child {
-  border-bottom: none;
-}
 .main .thr .scroll-view {
   position: absolute;
   top: 0;