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

pages/club/index.js

@@ -3,9 +3,9 @@ Page({
     data: {
         frameStyle: { useTop: true, name: '俱乐部', leftArrow: false, useBar: true },
         list: [
-            { name: '宝藏俱乐部', founder: '宝藏', add: '长春市朝阳区前进大街1244号', project: '羽毛球', time: '2000-02-01', tel: '0431-800-800-8800', logo: [{ url: '/image/club.png' }] },
+            { name: '宝藏俱乐部宝藏俱乐部宝藏俱乐部宝藏俱乐部宝藏俱乐部', founder: '宝藏', add: '长春市朝阳区前进大街1244号', project: '羽毛球', time: '2000-02-01', tel: '0431-800-800-8800', logo: [] },
             { name: '英语俱乐部', founder: '英语', time: '2000-02-01', add: '长春市朝阳区前进大街1244号', project: '羽毛球', tel: '0431-800-800-8800', logo: [{ url: '/image/club.png' }] },
-            { name: '宝藏俱乐部', founder: '宝藏', add: '长春市朝阳区前进大街1244号', project: '羽毛球', time: '2000-02-01', tel: '0431-800-800-8800', logo: [{ url: '/image/club.png' }] },
+            { 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' }] },
         ],
     },

pages/club/index.less

@@ -35,38 +35,46 @@
 
         .list {
             display: flex;
-            flex-direction: row;
-            height: 130px;
+            flex-direction: column;
             padding: 2vw;
             margin: 2vw 2vw 0;
             border-radius: 10px;
 
+            .name {
+                font-size: var(--font18Szie);
+                text-align: center;
+                color: var(--whiteColor);
+                margin: 0 0 5px 0;
+            }
+
             .content {
-                flex-grow: 1;
+                display: flex;
+                flex-direction: row;
+
 
-                .name {
-                    font-size: var(--font18Szie);
-                    text-align: center;
-                    color: var(--whiteColor);
-                    margin: 0 0 5px 0;
-                }
 
-                .text1 {
-                    font-size: var(--font15Size);
+                .cont {
+                    .text1 {
+                        width: 70vw;
+                        font-size: var(--font15Size);
 
-                    text {
-                        color: var(--whiteColor);
+                        text {
+                            width: 60vw;
+                            color: var(--whiteColor);
+                        }
                     }
                 }
-            }
 
-            .logo {
-                margin: 6vw 0;
+                .logo {
+                    height: 80px;
 
-                image {
-                    width: 80px;
+                    image {
+                        width: 80px;
+                    }
                 }
             }
+
+
         }
 
         .list:nth-child(1n) {

pages/club/index.wxml

@@ -12,17 +12,19 @@
             <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>
                         <view class="content">
-                            <view class="name">{{item.name}}</view>
-                            <view class="text1">创始人：<text>{{item.founder}}</text></view>
-                            <view class="text1">创建时间：<text>{{item.time}}</text></view>
-                            <view class="text1">项目：<text>{{item.project}}</text></view>
-                            <view class="text1">电话：<text>{{item.tel}}</text></view>
-                            <view class="text1">地址：<text>{{item.add}}</text></view>
-                        </view>
-                        <view class="logo">
-                            <image src="{{item.logo[0].url}}" mode="widthFix">
-                            </image>
+                            <view class="cont">
+                                <view class="text1">创始人：<text>{{item.founder}}</text></view>
+                                <view class="text1">创建时间：<text>{{item.time}}</text></view>
+                                <view class="text1">项目：<text>{{item.project}}</text></view>
+                                <view class="text1">电话：<text>{{item.tel}}</text></view>
+                                <view class="text1 ">地址：<text>{{item.add}}</text></view>
+                            </view>
+                            <view class="logo">
+                                <image src="{{item.logo&&item.logo.length>0?item.logo[0].url:''}}" mode="widthFix">
+                                </image>
+                            </view>
                         </view>
                     </view>
                 </view>

pages/club/index.wxss

@@ -30,31 +30,33 @@
 }
 .main .two .list {
   display: flex;
-  flex-direction: row;
-  height: 130px;
+  flex-direction: column;
   padding: 2vw;
   margin: 2vw 2vw 0;
   border-radius: 10px;
 }
-.main .two .list .content {
-  flex-grow: 1;
-}
-.main .two .list .content .name {
+.main .two .list .name {
   font-size: var(--font18Szie);
   text-align: center;
   color: var(--whiteColor);
   margin: 0 0 5px 0;
 }
-.main .two .list .content .text1 {
+.main .two .list .content {
+  display: flex;
+  flex-direction: row;
+}
+.main .two .list .content .cont .text1 {
+  width: 70vw;
   font-size: var(--font15Size);
 }
-.main .two .list .content .text1 text {
+.main .two .list .content .cont .text1 text {
+  width: 60vw;
   color: var(--whiteColor);
 }
-.main .two .list .logo {
-  margin: 6vw 0;
+.main .two .list .content .logo {
+  height: 80px;
 }
-.main .two .list .logo image {
+.main .two .list .content .logo image {
   width: 80px;
 }
 .main .two .list:nth-child(1n) {

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);

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);