开发官方活动页面

components/activityList/index.js

@@ -43,7 +43,6 @@ Component({
     activityTimeOut(oTime,index) {
       let inputTime = new Date(oTime)
       let dsq = setInterval(() => {
-        console.log('执行呢');
         var nowTime = new Date();
         //把剩余时间毫秒数转化为秒
         var times = (inputTime - nowTime) / 1000;
@@ -55,7 +54,6 @@ Component({
           })
           return clearInterval(dsq)
         }
-        console.log(times);
         //计算小时数 转化为整数
         var h = parseInt(times / 60 / 60 % 24);
         //如果小时数小于 10，要变成 0 + 数字的形式 赋值给盒子

components/activityList/index.less

@@ -313,6 +313,16 @@
             color: #F62339;
           }
         }
+
+        .closing {
+          .outNum {
+            background-color: #BAC7D0;
+          }
+
+          .outSplit {
+            color: #BAC7D0
+          }
+        }
       }
 
       .btn {
@@ -323,6 +333,11 @@
         color: white;
         font-size: 32rpx;
       }
+
+      .closingBtn {
+        background-image: linear-gradient(270deg, #BAC7D0 0%, #C9D3DC 100%, #D5DFE3 100%);
+        box-shadow: none;
+      }
     }
   }
 }

components/activityList/index.wxml

@@ -4,7 +4,7 @@
     <view class="footer">
       <view class="info">
         <view class="title">{{item.name}}</view>
-        <view class="timeOut" wx:if="{{item.second}}">距活动结束：
+        <view class="timeOut {{item.second=='00'?'closing':''}}" wx:if="{{item.second}}">距活动结束：
           <view class="outNum">{{item.hour}}</view>
           <view class="outSplit">:</view>
           <view class="outNum">{{item.minute}}</view>
@@ -12,7 +12,7 @@
           <view class="outNum">{{item.second}}</view>
         </view>
       </view>
-      <view class="btn">立即参与</view>
+      <view class="btn {{item.second=='00'?'closingBtn':''}}">立即参与</view>
     </view>
   </view>
   <view class="ranking-class-1">

components/activityList/index.wxss

@@ -255,6 +255,12 @@
   margin: 0rpx 2rpx;
   color: #F62339;
 }
+.activityList .activityBox .footer .info .closing .outNum {
+  background-color: #BAC7D0;
+}
+.activityList .activityBox .footer .info .closing .outSplit {
+  color: #BAC7D0;
+}
 .activityList .activityBox .footer .btn {
   padding: 10rpx 48rpx;
   background-image: linear-gradient(270deg, #33C3FF 0%, #81C7FF 100%, #14C962 100%);
@@ -263,3 +269,7 @@
   color: white;
   font-size: 32rpx;
 }
+.activityList .activityBox .footer .closingBtn {
+  background-image: linear-gradient(270deg, #BAC7D0 0%, #C9D3DC 100%, #D5DFE3 100%);
+  box-shadow: none;
+}

pages/index/index.js

@@ -20,7 +20,7 @@ Page({
   data: {
     navBarHeight: app.globalData.navBarHeight,
     background: ['demo-text-1', 'demo-text-2', 'demo-text-3'],
-    currentType: '3',
+    currentType: '1',
     // 控制一级分类是否固定
     isFixed: false,
     categoryList: []

pages/medalStore/index.less

@@ -29,7 +29,7 @@
 
   .body {
     background-color: #F2F6FC;
-
+    padding-bottom: 4rpx;
     .medalsBox {
       width: 100%;
       margin-bottom: 22rpx;

pages/medalStore/index.wxss

@@ -21,6 +21,7 @@
 }
 .medalStore .body {
   background-color: #F2F6FC;
+  padding-bottom: 4rpx;
 }
 .medalStore .body .medalsBox {
   width: 100%;

pages/pkPage/index.js

@@ -30,7 +30,6 @@ Page({
     wx.setNavigationBarTitle({
       title: videoInfo.userRead.title
     })
-
     this.setData({
       videoInfo
     })