样式修改

components/pullDownRefresh/pullDownRefresh.wxss

@@ -1,5 +1,6 @@
 .pulldown-refresh {
-  width:100%;
+  /* width:calc(100% - 40rpx); */
+  /* margin-left: 20rpx; */
   background: #f7f7f7;
 }
 .pulldown-refresh .pulldown-state {

pages/discussion/components/issueItem/issueItem.wxss

@@ -1,11 +1,11 @@
 .issue-item {
   width:100%;
   background: #fff;
-  border-radius: 16rpx;
+  /* border-radius: 16rpx; */
   box-sizing: border-box;
-  padding: 0 25rpx;
+  padding: 0 30rpx;
   overflow: hidden;
-  margin-bottom: 20rpx;
+  margin-bottom: 15rpx;
 }
 
 .issue-item .header {

pages/discussion/components/issueList/issueList.wxml

@@ -1,8 +1,13 @@
 <view class="issue-list">
   <view class="search">
-    <view class="left">
+    <!-- <view class="left">
       <image src="../../../../images/discussion/search.png" />
       <input bindtap="navigateToSearchDiscussion" disabled placeholder-class="input-placeholder" type="text" placeholder="搜索"/>
+    </view> -->
+    <view class="left-v2">
+      <!-- <button bindtap="onButtonChange" hover-class="hover-btn" data-type="{{item.type}}" id="item-{{ item.type }}" class="{{item.select ? 'font-w' : 'font-b'}}">
+        {{item.name}}
+      </button> -->
     </view>
     <view class="right {{issueType === 'hot' ? 'reserve': ''}}" bindtap="changeIssueType">
       <view class="front">

pages/discussion/components/issueList/issueList.wxss

@@ -3,13 +3,19 @@
   height:100%;
 }
 .issue-list .search {
+  margin-top: 2rpx;
   width: 100%;
-  height: 60rpx;
+  height: 80rpx;
-  margin-bottom:16rpx;
+  background: #fff;
+  margin-bottom:19rpx;
   display: flex;
   align-items: center;
   justify-content: space-between;
 }
+.issue-list .search .left-v2{
+  height: 100%;
+  width: calc(100% - 130rpx);
+}
 .issue-list .search .left {
   background: #fff;
   border-radius: 8rpx;
@@ -35,6 +41,8 @@
 }
 
 .issue-list .search .right {
+  margin-right: 30rpx;
+  background: #fff;
   height:100%;
   display: flex;
   align-items: center;
@@ -56,7 +64,7 @@
   left: 0;
   height: 100%;
   width: 100%;
-  background: #f7f7f7;
+  background: #fff;
 }
 .issue-list .search .right .back {
   transform: rotateY(-180deg);

pages/discussion/components/projectItem/projectItem.wxss

@@ -1,11 +1,11 @@
 .project-item {
   width:100%;
   background: #fff;
-  border-radius: 16rpx;
+  /* border-radius: 16rpx; */
   box-sizing: border-box;
   padding: 0 25rpx;
   overflow: hidden;
-  margin-bottom: 20rpx;
+  margin-bottom: 15rpx;
 }
 
 .project-item .header {

pages/discussion/components/projectList/projectList.wxml

@@ -1,9 +1,9 @@
 <view class="project-list">
   <view class="search">
-    <view class="left">
+    <!-- <view class="left">
       <image src="../../../../images/discussion/search.png" />
       <input bindtap="navigateToSearchDiscussion" disabled placeholder-class="input-placeholder" type="text" placeholder="搜索"/>
-    </view>
+    </view> -->
   </view>
 
   <pulldown-refresh id="pulldown-refresh" bind:pullDownRefresh="getProjectList">

pages/discussion/components/projectList/projectList.wxss

@@ -3,9 +3,11 @@
   height:100%;
 }
 .project-list .search {
+  margin-top: 2rpx;
   width: 100%;
-  height: 60rpx;
+  height: 80rpx;
-  margin-bottom:16rpx;
+  background: #fff;
+  margin-bottom:19rpx;
   display: flex;
   align-items: center;
   justify-content: space-between;

pages/discussion/discussion.js

@@ -5,7 +5,18 @@ Page({
     discussionType: 'issue',
     completeInfoDialogVisible: false,
     infoCompleted: 0,
-    gridName: ''
+    gridName: '',
+    typeList: [{ //排名方式：0-周，1-月
+      type: '0',
+      name: '议题',
+      select: true
+    },
+    {
+      type: '1',
+      name: '项目',
+      select: false
+    }
+  ],
   },
   onLoad () {
     this.setData({
@@ -43,6 +54,31 @@ Page({
       })
     }
   },
+  // 议题、项目切换 v2
+  onButtonChange: function(e) {
+    const list = this.data.typeList
+    let that = this;
+    list.forEach(item => {
+      if (item.type === e.currentTarget.dataset.type) {
+        item.select = true
+      } else {
+        item.select = false
+      }
+    })
+    that.setData({
+      typeList: list,
+    })
+    if(e.currentTarget.dataset.type == 0){
+      this.setData({
+        discussionType: 'issue'
+      })
+    }else{
+      this.setData({
+        discussionType: 'project'
+      })
+    }
+  
+  },
   // 触底函数
   onReachBottom () {
     if (this.data.discussionType === 'issue') {

pages/discussion/discussion.wxml

@@ -5,11 +5,16 @@
       <image class="dang-logo" src="../../images/discussion/ic_dang@3x.png" />
       <view class="grid-name">{{gridName}}</view>
     </view>
-    <view class="right">
+    <!-- <view class="right">
       <view hover-class="hover-view" class="issue {{ discussionType === 'issue' ? 'select' : ''}}" data-type="issue" bindtap="changeDiscussionType">议题</view>
       <view hover-class="hover-view" class="project {{ discussionType === 'project' ? 'select' : ''}}" data-type="project" bindtap="changeDiscussionType">项目</view>
       <view class="select-tab {{discussionType === 'issue' ? 'issue-select' : 'project-select'}}"></view>
+    </view> -->
   </view>
+  <view class="tab-v2">
+    <button wx:for="{{typeList}}" wx:key="index" wx:for-index="index" bindtap="onButtonChange" hover-class="hover-btn" data-type="{{item.type}}" id="item-{{ item.type }}" class="{{item.select ? 'font-w' : 'font-b'}}">
+      {{item.name}}
+    </button>
   </view>
 
   <view class="issue-list" wx:if="{{discussionType === 'issue'}}">
@@ -20,7 +25,7 @@
   </view>
 
   <view class="addIssue" bindtap="addIssue">
-    <image src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/07/rBAB7169F0iAZRy4AAFoQ8TqHw4789.png" />
+    <image src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/09/rBAB717LnkmAK5OyAAF05Azead8157.png" />
   </view>
 </view>
 

pages/discussion/discussion.wxss

@@ -91,13 +91,13 @@ page {
 .discussion .issue-list {
   width: 100%;
   box-sizing: border-box;
-  padding: 30rpx 20rpx 0;
+  /* padding: 30rpx 20rpx 0; */
 }
 
 .discussion .project-list {
   width: 100%;
   box-sizing: border-box;
-  padding: 30rpx 20rpx 0;
+  /* padding: 30rpx 20rpx 0; */
 }
 
 .addIssue {
@@ -113,3 +113,50 @@ page {
   height: 100%;
   object-fit: cover;
 }
+
+/* 新增tab切换 */
+.tab-v2 {
+  padding-left: 30rpx;
+  width: calc(100% - 130rpx);
+  height: 80rpx;
+  position: absolute;
+  display: flex;
+  align-items: center;
+}
+
+.tab-v2 button {
+  position: relative;
+  display: inline-block;
+  margin: 0 42rpx 0 0;
+  flex-shrink: 0;
+  /* width: auto !important; */
+  width: 208rpx;
+  height: 52rpx;
+  min-height: 52rpx !important;
+  line-height: 52rpx;
+  border-radius: 30rpx;
+  padding: 0 20rpx;
+}
+
+button::after {
+  border: 0rpx;
+}
+
+.tab-v2 .font-w {
+  font-size: 30rpx;
+  font-weight: bold;
+  color: #fff;
+  background: linear-gradient(to right, #e95027, #db1a1f);
+}
+
+.tab-v2 .font-b {
+  background: #fff;
+  font-size: 30rpx;
+  font-weight: 500;
+  color: #333;
+  border: 1rpx solid #dbdbdb;
+}
+
+.tab-v2 .hover-btn {
+  box-shadow: 0px 0px 10px 0px rgba(188, 0, 5, 0.22);
+}