Browse Source

调整样式

bayi 2 years ago
parent
commit
4102914694

+ 16 - 11
components/activityList/index.less

@@ -24,7 +24,7 @@
         color: white;
 
         .icon {
-          width: 26rpx;
+          width: 28rpx;
           height: 30rpx;
         }
 
@@ -63,7 +63,7 @@
 
         .nickName {
           width: 140rpx;
-          font-size: 26rpx;
+          font-size: 28rpx;
           margin-top: 14rpx;
           text-align: center;
         }
@@ -93,7 +93,7 @@
           text-align: center;
 
           .avatar {
-            margin-top: 26rpx;
+            margin-top: 28rpx;
             width: 80rpx;
             height: 80rpx;
             border-radius: 50%;
@@ -110,7 +110,7 @@
           text-align: center;
 
           .avatar {
-            margin-top: 26rpx;
+            margin-top: 28rpx;
             width: 80rpx;
             height: 80rpx;
             background-color: #EBEBEB;
@@ -131,7 +131,7 @@
           align-items: center;
 
           .avatar {
-            margin-top: 26rpx;
+            margin-top: 28rpx;
             width: 80rpx;
             height: 80rpx;
             border-radius: 50%;
@@ -140,7 +140,7 @@
 
           .nickName {
             width: 120rpx;
-            font-size: 26rpx;
+            font-size: 28rpx;
             text-align: center;
             margin-top: 14rpx;
           }
@@ -170,7 +170,7 @@
         color: white;
 
         .icon {
-          width: 26rpx;
+          width: 28rpx;
           height: 30rpx;
         }
 
@@ -225,7 +225,7 @@
 
           .nickName {
             width: 210rpx;
-            font-size: 26rpx;
+            font-size: 28rpx;
           }
         }
 
@@ -319,7 +319,7 @@
         }
 
         .time {
-          font-size: 26rpx;
+          font-size: 28rpx;
         }
 
         .timeOut {
@@ -330,7 +330,7 @@
 
           .outNum {
             width: 42rpx;
-            font-size: 26rpx;
+            font-size: 28rpx;
             text-align: center;
             border-radius: 10rpx;
             background-color: #F62339;
@@ -401,13 +401,18 @@
         }
 
         .partake {
-          font-size: 27rpx;
+          font-size: 28rpx;
+
 
           text {
             color: #2FB1F1;
           }
         }
 
+        .time {
+          font-size: 28rpx;
+        }
+
         .btn {
           padding: 10rpx 48rpx;
           background-image: linear-gradient(270deg, #33C3FF 0%, #81C7FF 100%, #14C962 100%);

+ 2 - 2
components/activityList/index.wxml

@@ -97,7 +97,7 @@
         </view>
       </view>
     </view>
-    <view class="newActivityBox" wx:if="{{item.bannerType==5}}" data-info="{{item}}">
+    <view class="newActivityBox" wx:if="{{item.bannerType==5}}" data-info="{{item}}" bindtap="activityEvent">
       <image src="{{item.icon}}" class="cover" />
       <view class="footer">
         <view class="row">
@@ -110,7 +110,7 @@
           <view class="time">
             {{filters.formatDate(item.startTime,2)}}—{{filters.formatDate(item.endTime,2)}}
           </view>
-          <view class="btn" data-info='{{item}}' bindtap="activityEvent">
+          <view class="btn">
             立即参与
           </view>
         </view>

+ 14 - 11
components/activityList/index.wxss

@@ -24,7 +24,7 @@
   color: white;
 }
 .activityList .ranking-class-1 .header .left .icon {
-  width: 26rpx;
+  width: 28rpx;
   height: 30rpx;
 }
 .activityList .ranking-class-1 .header .left .title {
@@ -56,7 +56,7 @@
 }
 .activityList .ranking-class-1 .body .top .nickName {
   width: 140rpx;
-  font-size: 26rpx;
+  font-size: 28rpx;
   margin-top: 14rpx;
   text-align: center;
 }
@@ -82,7 +82,7 @@
   text-align: center;
 }
 .activityList .ranking-class-1 .body .top .secondUser .avatar {
-  margin-top: 26rpx;
+  margin-top: 28rpx;
   width: 80rpx;
   height: 80rpx;
   border-radius: 50%;
@@ -96,7 +96,7 @@
   text-align: center;
 }
 .activityList .ranking-class-1 .body .top .thirdUser .avatar {
-  margin-top: 26rpx;
+  margin-top: 28rpx;
   width: 80rpx;
   height: 80rpx;
   background-color: #EBEBEB;
@@ -114,7 +114,7 @@
   align-items: center;
 }
 .activityList .ranking-class-1 .body .btm .userBox .avatar {
-  margin-top: 26rpx;
+  margin-top: 28rpx;
   width: 80rpx;
   height: 80rpx;
   border-radius: 50%;
@@ -122,7 +122,7 @@
 }
 .activityList .ranking-class-1 .body .btm .userBox .nickName {
   width: 120rpx;
-  font-size: 26rpx;
+  font-size: 28rpx;
   text-align: center;
   margin-top: 14rpx;
 }
@@ -147,7 +147,7 @@
   color: white;
 }
 .activityList .ranking-class-2 .header .left .icon {
-  width: 26rpx;
+  width: 28rpx;
   height: 30rpx;
 }
 .activityList .ranking-class-2 .header .left .title {
@@ -194,7 +194,7 @@
 }
 .activityList .ranking-class-2 .body .row .left .nickName {
   width: 210rpx;
-  font-size: 26rpx;
+  font-size: 28rpx;
 }
 .activityList .ranking-class-2 .body .row .right {
   text-align: center;
@@ -261,7 +261,7 @@
   margin-bottom: 8rpx;
 }
 .activityList .activityBox .footer .info .time {
-  font-size: 26rpx;
+  font-size: 28rpx;
 }
 .activityList .activityBox .footer .info .timeOut {
   display: flex;
@@ -271,7 +271,7 @@
 }
 .activityList .activityBox .footer .info .timeOut .outNum {
   width: 42rpx;
-  font-size: 26rpx;
+  font-size: 28rpx;
   text-align: center;
   border-radius: 10rpx;
   background-color: #F62339;
@@ -328,11 +328,14 @@
   margin-bottom: 8rpx;
 }
 .activityList .newActivityBox .footer .row .partake {
-  font-size: 27rpx;
+  font-size: 28rpx;
 }
 .activityList .newActivityBox .footer .row .partake text {
   color: #2FB1F1;
 }
+.activityList .newActivityBox .footer .row .time {
+  font-size: 28rpx;
+}
 .activityList .newActivityBox .footer .row .btn {
   padding: 10rpx 48rpx;
   background-image: linear-gradient(270deg, #33C3FF 0%, #81C7FF 100%, #14C962 100%);

+ 0 - 40
pages/activity/index.js

@@ -1,9 +1,4 @@
-// pages/activity/index.js
 Page({
-
-  /**
-   * 页面的初始数据
-   */
   data: {
 
   },
@@ -14,39 +9,4 @@ Page({
       })
     }
   },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  }
 })

+ 2 - 2
pages/activity/index.wxml

@@ -1,5 +1,5 @@
-<navigationBar bind:reload='resetData'></navigationBar>
+<navigationBar></navigationBar>
 <view class="activityBox">
   <banner classify='3' />
-  <activityList class="activityList"/>
+  <activityList class="activityList" />
 </view>

+ 2 - 2
pages/my/index.less

@@ -102,7 +102,7 @@
 
       .title {
         margin-top: 8rpx;
-        font-size: 22rpx;
+        font-size: 26rpx;
         color: #333;
       }
 
@@ -130,7 +130,7 @@
 
   .iosVip {
     margin: 4rpx 0px 0px 6rpx;
-    font-size: 20rpx;
+    font-size: 24rpx;
     color: #333;
   }
 

+ 2 - 2
pages/my/index.wxss

@@ -87,7 +87,7 @@
 }
 .container .below .sBox .title {
   margin-top: 8rpx;
-  font-size: 22rpx;
+  font-size: 26rpx;
   color: #333;
 }
 .container .below .sBox .noticeTips {
@@ -110,7 +110,7 @@
 }
 .container .iosVip {
   margin: 4rpx 0px 0px 6rpx;
-  font-size: 20rpx;
+  font-size: 24rpx;
   color: #333;
 }
 .container .medalBox {