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

pages/club/index.js

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

@@ -36,23 +36,23 @@
         .list {
             display: flex;
             flex-direction: row;
-            height: 120px;
+            height: 130px;
             padding: 2vw;
             margin: 2vw 2vw 0;
             border-radius: 10px;
 
             .content {
                 flex-grow: 1;
-                z-index: 999;
 
                 .name {
                     font-size: var(--font18Szie);
                     text-align: center;
                     color: var(--whiteColor);
+                    margin: 0 0 5px 0;
                 }
 
                 .text1 {
-                    font-size: var(--font14Size);
+                    font-size: var(--font15Size);
 
                     text {
                         color: var(--whiteColor);
@@ -61,7 +61,7 @@
             }
 
             .logo {
-                margin: 5vw 0;
+                margin: 6vw 0;
 
                 image {
                     width: 80px;
@@ -70,12 +70,11 @@
         }
 
         .list:nth-child(1n) {
-            background-image: linear-gradient(to right, #9bd1fd,#44a2f0 );
+            background-image: linear-gradient(to right, #9bd1fd, #44a2f0);
         }
 
         .list:nth-child(2n) {
             background-image: linear-gradient(to right, #eb5299, #ffaed4);
-
         }
     }
 }

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="content">
@@ -21,7 +21,7 @@
                             <view class="text1">地址：<text>{{item.add}}</text></view>
                         </view>
                         <view class="logo">
-                            <image src="{{src}}" mode="widthFix">
+                            <image src="{{item.logo[0].url}}" mode="widthFix">
                             </image>
                         </view>
                     </view>

pages/club/index.wxss

@@ -31,28 +31,28 @@
 .main .two .list {
   display: flex;
   flex-direction: row;
-  height: 120px;
+  height: 130px;
   padding: 2vw;
   margin: 2vw 2vw 0;
   border-radius: 10px;
 }
 .main .two .list .content {
   flex-grow: 1;
-  z-index: 999;
 }
 .main .two .list .content .name {
   font-size: var(--font18Szie);
   text-align: center;
   color: var(--whiteColor);
+  margin: 0 0 5px 0;
 }
 .main .two .list .content .text1 {
-  font-size: var(--font14Size);
+  font-size: var(--font15Size);
 }
 .main .two .list .content .text1 text {
   color: var(--whiteColor);
 }
 .main .two .list .logo {
-  margin: 5vw 0;
+  margin: 6vw 0;
 }
 .main .two .list .logo image {
   width: 80px;

pages/match/index.less

@@ -142,10 +142,6 @@
                     }
                 }
             }
-
-            .list:last-child {
-                border-bottom: none;
-            }
         }
 
         .scroll-view {

pages/match/index.wxss

@@ -119,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;