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

pages/club/index.js

@@ -3,7 +3,7 @@ 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: [] },
+            { 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号长春市朝阳区前进大街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

@@ -52,7 +52,9 @@
                 flex-direction: row;
 
                 .cont {
-                    .text1 {
+                    width: 70vw;
+
+                    .other {
                         font-size: var(--font15Size);
 
                         text {
@@ -62,10 +64,11 @@
                 }
 
                 .logo {
-                    height: 80px;
+                    height: 100px;
+                    width: 80px;
 
                     image {
-                        width: 80px;
+                        width: 100%;
                     }
                 }
             }

pages/club/index.wxml

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

pages/club/index.wxss

@@ -45,17 +45,21 @@
   display: flex;
   flex-direction: row;
 }
-.main .two .list .content .cont .text1 {
+.main .two .list .content .cont {
+  width: 70vw;
+}
+.main .two .list .content .cont .other {
   font-size: var(--font15Size);
 }
-.main .two .list .content .cont .text1 text {
+.main .two .list .content .cont .other text {
   color: var(--whiteColor);
 }
 .main .two .list .content .logo {
-  height: 80px;
+  height: 100px;
+  width: 80px;
 }
 .main .two .list .content .logo image {
-  width: 80px;
+  width: 100%;
 }
 .main .two .list:nth-child(1n) {
   background-image: linear-gradient(to right, #9bd1fd, #44a2f0);