1.活动部分热区放大2.翻色

components/activityList/index.wxml

@@ -17,7 +17,7 @@
     </view>
   </view> -->
   <block wx:for="{{activityList}}" wx:key="id">
-    <view class="activityBox" wx:if="{{item.bannerType==1}}">
+    <view class="activityBox" wx:if="{{item.bannerType==1}}" bindtap="activityEvent" data-info="{{item}}">
       <image src="{{item.icon}}" class="cover" />
       <view class="footer">
         <view class="info">
@@ -25,7 +25,7 @@
           <view class="time">{{filters.formatDate(item.startTime,2)}}—{{filters.formatDate(item.endTime,2)}}
           </view>
         </view>
-        <view class="btn" bindtap="activityEvent" data-info="{{item}}">立即参与</view>
+        <view class="btn">立即参与</view>
       </view>
     </view>
     <view class="ranking-class-1" wx:if="{{item.bannerType==2}}">
@@ -37,24 +37,21 @@
       </view>
       <view class="body">
         <view class="top">
-          <view class="userBox">
+          <view class="userBox" bindtap="jumpUserInfo" data-uid='{{item.userList[1].uid}}'>
             <view class="secondUser">
-              <image src="{{item.userList[1].avatar||'/static/nullAvatar.png'}}" class="avatar" bindtap="jumpUserInfo"
-                data-uid='{{item.userList[1].uid}}' />
+              <image src="{{item.userList[1].avatar||'/static/nullAvatar.png'}}" class="avatar" />
             </view>
             <view class="nickName textOver">{{item.userList[1].nickName||item.userList[1].eid}}</view>
           </view>
-          <view class="userBox">
+          <view class="userBox" bindtap="jumpUserInfo" data-uid='{{item.userList[0].uid}}'>
             <view class="firstUser">
-              <image src="{{item.userList[0].avatar||'/static/nullAvatar.png'}}" class="avatar" bindtap="jumpUserInfo"
-                data-uid='{{item.userList[0].uid}}' />
+              <image src="{{item.userList[0].avatar||'/static/nullAvatar.png'}}" class="avatar" />
             </view>
             <view class="nickName textOver">{{item.userList[0].nickName||item.userList[0].eid}}</view>
           </view>
-          <view class="userBox">
+          <view class="userBox" bindtap="jumpUserInfo" data-uid='{{item.userList[2].uid}}'>
             <view class="thirdUser">
-              <image src="{{item.userList[2].avatar||'/static/nullAvatar.png'}}" class="avatar" bindtap="jumpUserInfo"
-                data-uid='{{item.userList[2].uid}}' />
+              <image src="{{item.userList[2].avatar||'/static/nullAvatar.png'}}" class="avatar" />
             </view>
             <view class="nickName textOver">{{item.userList[2].nickName||item.userList[2].eid}}</view>
           </view>
@@ -82,11 +79,11 @@
         </view>
       </view>
       <view class="body">
-        <view class="row" wx:for="{{3}}" wx:key="index" wx:for-item='items'>
+        <view class="row" wx:for="{{3}}" wx:key="index" wx:for-item='items' bindtap="jumpUserInfo"
+          data-uid='{{item.userList[index].uid}}'>
           <view class="left">
             <image src="/static/{{index+1}}-1.png" class="stand" />
-            <image src="{{item.userList[index].avatar||'/static/nullAvatar.png'}}" class="avatar" bindtap="jumpUserInfo"
-              data-uid='{{item.userList[index].uid}}' />
+            <image src="{{item.userList[index].avatar||'/static/nullAvatar.png'}}" class="avatar" />
             <view class="nickName textOver">{{item.userList[index].nickName||item.userList[index].eid}}
             </view>
           </view>

pages/editUser/index.js

@@ -102,7 +102,7 @@ Page({
       itemList: ['学生', '家长', '老师'],
       success: (res) => {
         console.log(res);
-        if (res.tapIndex == this.data.userInfo.gender) {
+        if (['学生', '家长', '老师'][res.tapIndex] == this.data.userInfo.profession) {
           return
         }
         this.setUserInfo({

pages/match/index.less

@@ -5,7 +5,6 @@
   .headerImg {
     width: 100%;
     height: 216rpx;
-    background-color: #5DE0C0;
   }
 
   .rule {
@@ -17,7 +16,7 @@
     border-top-left-radius: 25rpx;
     border-bottom-left-radius: 25rpx;
     color: white;
-    background-color: rgba(0, 0, 0, 0.15);
+    background-color: rgba(0, 0, 0, 0.4);
   }
 
   .kaka {

pages/match/index.wxml

@@ -1,6 +1,6 @@
 <wxs src="../../utils/filter.wxs" module="filters" />
 <view class="matchBox">
-  <image src="" class="headerImg" />
+  <image src="http://reader-wx.ai160.com/images/reader/v3/enter_banner.jpg" class="headerImg" />
   <view class="rule" bindtap="jumpIntro">
     比赛规则
   </view>

pages/match/index.wxss

@@ -5,7 +5,6 @@
 .matchBox .headerImg {
   width: 100%;
   height: 216rpx;
-  background-color: #5DE0C0;
 }
 .matchBox .rule {
   position: absolute;
@@ -16,7 +15,7 @@
   border-top-left-radius: 25rpx;
   border-bottom-left-radius: 25rpx;
   color: white;
-  background-color: rgba(0, 0, 0, 0.15);
+  background-color: rgba(0, 0, 0, 0.4);
 }
 .matchBox .kaka {
   position: fixed;

pages/works/index.wxss

@@ -18,7 +18,8 @@
 .worksBox .selectType .currentType {
   border: none;
   box-shadow: rgba(0, 0, 0, 0.1) 0px 4px 6px -1px, rgba(0, 0, 0, 0.06) 0px 2px 4px -1px;
-  background-color: white;
+  color: white;
+  background-color: #00C657;
   font-weight: bold;
 }
 .worksBox .selectType .search {