From b5d1008b5a6a0d326e35fd314b392e1a88e7fcd3 Mon Sep 17 00:00:00 2001
From: zx <604444282@qq.com>
Date: Mon, 26 Sep 2022 09:56:51 +0800
Subject: [PATCH] zx

---
 .../pages/brandInsight/brandDataList/index.js |  7 ++-
 .../brandInsight/brandDataList/index.wxml     | 14 +++---
 .../brandInsight/brandDataList/index.wxss     | 26 +++++++++++
 .../pages/eventInsight/evDatalist/index.js    |  7 ++-
 .../pages/eventInsight/evDatalist/index.wxml  | 14 +++---
 .../pages/eventInsight/evDatalist/index.wxss  | 26 +++++++++++
 .../pages/modalInsight/modalDataList/index.js |  7 ++-
 .../modalInsight/modalDataList/index.wxml     | 14 +++---
 .../modalInsight/modalDataList/index.wxss     | 26 +++++++++++
 pages/insight/pages/themeList/index.js        |  6 +--
 pages/insight/pages/themeList/index.wxml      | 32 +++++++------
 pages/insight/pages/themeList/index.wxss      | 46 +++++++++++++++++++
 12 files changed, 188 insertions(+), 37 deletions(-)

diff --git a/pages/insight/pages/brandInsight/brandDataList/index.js b/pages/insight/pages/brandInsight/brandDataList/index.js
index 32e3716..f3e34be 100644
--- a/pages/insight/pages/brandInsight/brandDataList/index.js
+++ b/pages/insight/pages/brandInsight/brandDataList/index.js
@@ -119,7 +119,12 @@ Page({
         this.getData();
     },
     changeWeiJi(event) {this.setData({ sCrisis: event.detail });this.getData()},
-    iTimeTypeByChange(event) {this.setData({ iTimeType: event.detail });this.getData()},
+    iTimeTypeChange(event) {
+        this.setData({
+            iTimeType: this.data.iTimeType == 1?0:1,
+        });
+        this.getData()
+    },
     changeTime(result) {
         this.setData({
             sTimeType: result.detail.sTimeType,
diff --git a/pages/insight/pages/brandInsight/brandDataList/index.wxml b/pages/insight/pages/brandInsight/brandDataList/index.wxml
index 6067dc1..215f77b 100644
--- a/pages/insight/pages/brandInsight/brandDataList/index.wxml
+++ b/pages/insight/pages/brandInsight/brandDataList/index.wxml
@@ -40,12 +40,14 @@
                 </view>
             </van-dropdown-item>
             <van-dropdown-item id="back" title="更多筛选">
-                <view style="margin: 16rpx 32rpx 16rpx 32rpx;">
-                    <view>排序方式</view>
-                    <van-radio-group value="{{ iTimeType }}" bind:change="iTimeTypeByChange">
-                        <van-radio name="0"><view style="margin: 12rpx;">发布时间</view></van-radio>
-                        <van-radio name="1"><view style="margin: 12rpx;">入库时间</view></van-radio>
-                    </van-radio-group>
+                <view style="margin: 0rpx 32rpx 32rpx 32rpx;">
+                    <view style="margin-top: 32rpx">排序方式</view>
+                    <view class="filter">
+                        <view wx:if="{{iTimeType == 0}}" class="more-item-active">发布时间</view>
+                        <view wx:else bindtap="iTimeTypeChange" class="more-item">发布时间</view>
+                        <view wx:if="{{iTimeType == 1}}" class="more-item-active">入库时间</view>
+                        <view wx:else bindtap="iTimeTypeChange"  class="more-item">入库时间</view>
+                    </view>
                 </view>
             </van-dropdown-item>
         </van-dropdown-menu>
diff --git a/pages/insight/pages/brandInsight/brandDataList/index.wxss b/pages/insight/pages/brandInsight/brandDataList/index.wxss
index 263a0ba..8b84ae3 100644
--- a/pages/insight/pages/brandInsight/brandDataList/index.wxss
+++ b/pages/insight/pages/brandInsight/brandDataList/index.wxss
@@ -35,4 +35,30 @@
     font-weight: 400;
     color: #999999;
     margin: 18rpx 32rpx 0 32rpx;
+}
+/* 筛选项 */
+.filter {
+    display: flex;
+    flex-wrap: wrap;
+    width: 100%;
+}
+.more-item {
+    width: 296rpx;
+    height: 72rpx;
+    margin: 16rpx;
+    background: #F9F9F9;
+    text-align: center;
+    line-height: 72rpx;
+    font-size: 12px;
+    color: #111111;
+}
+.more-item-active {
+    width: 296rpx;
+    height: 72rpx;
+    margin: 16rpx;
+    background: #F0F5FF;
+    text-align: center;
+    line-height: 72rpx;
+    font-size: 12px;
+    color: #0084FF;
 }
\ No newline at end of file
diff --git a/pages/insight/pages/eventInsight/evDatalist/index.js b/pages/insight/pages/eventInsight/evDatalist/index.js
index 54ed53b..e4f6ba3 100644
--- a/pages/insight/pages/eventInsight/evDatalist/index.js
+++ b/pages/insight/pages/eventInsight/evDatalist/index.js
@@ -71,7 +71,12 @@ Component({
         changeSource(event) {this.setData({ sQuDao: event.detail });this.getData()},
         changeQingGan(event) {this.setData({ sQingGan: event.detail });this.getData()},
         changeWeiJi(event) {this.setData({ sCrisis: event.detail });this.getData()},
-        iTimeTypeByChange(event) {this.setData({iTimeType: event.detail});this.getData()},
+        iTimeTypeChange(event) {
+            this.setData({
+                iTimeType: this.data.iTimeType == 1?0:1,
+            });
+            this.getData()
+        },
         toEventDetail(e) {
             let id = e.currentTarget.dataset.id._id;
             wx.navigateTo({
diff --git a/pages/insight/pages/eventInsight/evDatalist/index.wxml b/pages/insight/pages/eventInsight/evDatalist/index.wxml
index 57e25a0..58ef778 100644
--- a/pages/insight/pages/eventInsight/evDatalist/index.wxml
+++ b/pages/insight/pages/eventInsight/evDatalist/index.wxml
@@ -30,12 +30,14 @@
                 </view>
             </van-dropdown-item>
             <van-dropdown-item id="back" title="更多筛选">
-                <view style="padding: 16rpx 32rpx 16rpx 32rpx;">
-                    <view>排序方式</view>
-                    <van-radio-group value="{{ iTimeType }}" bind:change="iTimeTypeByChange">
-                        <van-radio name="0"><view style="margin: 12rpx;">发布时间</view></van-radio>
-                        <van-radio name="1"><view style="margin: 12rpx;">入库时间</view></van-radio>
-                    </van-radio-group>
+                <view style="margin: 0rpx 32rpx 32rpx 32rpx;">
+                    <view style="margin-top: 32rpx">排序方式</view>
+                    <view class="filter">
+                        <view wx:if="{{iTimeType == 0}}" class="more-item-active">发布时间</view>
+                        <view wx:else bindtap="iTimeTypeChange" class="more-item">发布时间</view>
+                        <view wx:if="{{iTimeType == 1}}" class="more-item-active">入库时间</view>
+                        <view wx:else bindtap="iTimeTypeChange"  class="more-item">入库时间</view>
+                    </view>
                 </view>
             </van-dropdown-item>
         </van-dropdown-menu>
diff --git a/pages/insight/pages/eventInsight/evDatalist/index.wxss b/pages/insight/pages/eventInsight/evDatalist/index.wxss
index d5bfdbc..e3a8813 100644
--- a/pages/insight/pages/eventInsight/evDatalist/index.wxss
+++ b/pages/insight/pages/eventInsight/evDatalist/index.wxss
@@ -36,4 +36,30 @@
     color: #999999;
     margin-top: 18rpx;
     margin: 0 32rpx 0 32rpx;
+}
+/* 筛选项 */
+.filter {
+    display: flex;
+    flex-wrap: wrap;
+    width: 100%;
+}
+.more-item {
+    width: 296rpx;
+    height: 72rpx;
+    margin: 16rpx;
+    background: #F9F9F9;
+    text-align: center;
+    line-height: 72rpx;
+    font-size: 12px;
+    color: #111111;
+}
+.more-item-active {
+    width: 296rpx;
+    height: 72rpx;
+    margin: 16rpx;
+    background: #F0F5FF;
+    text-align: center;
+    line-height: 72rpx;
+    font-size: 12px;
+    color: #0084FF;
 }
\ No newline at end of file
diff --git a/pages/insight/pages/modalInsight/modalDataList/index.js b/pages/insight/pages/modalInsight/modalDataList/index.js
index 14cb12f..5056e0c 100644
--- a/pages/insight/pages/modalInsight/modalDataList/index.js
+++ b/pages/insight/pages/modalInsight/modalDataList/index.js
@@ -113,7 +113,12 @@ Page({
         this.getData();
     },
     changeWeiJi(event) {this.setData({ sCrisis: event.detail });this.getData()},
-    iTimeTypeByChange(event) {this.setData({ iTimeType: event.detail });this.getData()},
+    iTimeTypeChange(event) {
+        this.setData({
+            iTimeType: this.data.iTimeType == 1?0:1,
+        });
+        this.getData()
+    },
     changeTime(result) {
         this.setData({
             sTimeType: result.detail.sTimeType,
diff --git a/pages/insight/pages/modalInsight/modalDataList/index.wxml b/pages/insight/pages/modalInsight/modalDataList/index.wxml
index f9c5679..4455b07 100644
--- a/pages/insight/pages/modalInsight/modalDataList/index.wxml
+++ b/pages/insight/pages/modalInsight/modalDataList/index.wxml
@@ -40,12 +40,14 @@
                 </view>
             </van-dropdown-item>
             <van-dropdown-item id="back" title="更多筛选">
-                <view style="padding: 16rpx 32rpx 16rpx 32rpx;">
-                    <view>排序方式</view>
-                    <van-radio-group value="{{ iTimeType }}" bind:change="iTimeTypeByChange">
-                        <van-radio name="0"><view style="margin: 12rpx;">发布时间</view></van-radio>
-                        <van-radio name="1"><view style="margin: 12rpx;">入库时间</view></van-radio>
-                    </van-radio-group>
+                <view style="margin: 0rpx 32rpx 32rpx 32rpx;">
+                    <view style="margin-top: 32rpx">排序方式</view>
+                    <view class="filter">
+                        <view wx:if="{{iTimeType == 0}}" class="more-item-active">发布时间</view>
+                        <view wx:else bindtap="iTimeTypeChange" class="more-item">发布时间</view>
+                        <view wx:if="{{iTimeType == 1}}" class="more-item-active">入库时间</view>
+                        <view wx:else bindtap="iTimeTypeChange"  class="more-item">入库时间</view>
+                    </view>
                 </view>
             </van-dropdown-item>
         </van-dropdown-menu>
diff --git a/pages/insight/pages/modalInsight/modalDataList/index.wxss b/pages/insight/pages/modalInsight/modalDataList/index.wxss
index 8a5fe13..1cf24b0 100644
--- a/pages/insight/pages/modalInsight/modalDataList/index.wxss
+++ b/pages/insight/pages/modalInsight/modalDataList/index.wxss
@@ -35,4 +35,30 @@
     font-weight: 400;
     color: #999999;
     margin: 18rpx 32rpx 0 32rpx
+}
+/* 筛选项 */
+.filter {
+    display: flex;
+    flex-wrap: wrap;
+    width: 100%;
+}
+.more-item {
+    width: 296rpx;
+    height: 72rpx;
+    margin: 16rpx;
+    background: #F9F9F9;
+    text-align: center;
+    line-height: 72rpx;
+    font-size: 12px;
+    color: #111111;
+}
+.more-item-active {
+    width: 296rpx;
+    height: 72rpx;
+    margin: 16rpx;
+    background: #F0F5FF;
+    text-align: center;
+    line-height: 72rpx;
+    font-size: 12px;
+    color: #0084FF;
 }
\ No newline at end of file
diff --git a/pages/insight/pages/themeList/index.js b/pages/insight/pages/themeList/index.js
index e4ce467..420cfa5 100644
--- a/pages/insight/pages/themeList/index.js
+++ b/pages/insight/pages/themeList/index.js
@@ -257,19 +257,19 @@ Page({
     },
     iGroupByChange(event) {
         this.setData({
-            iGroupBy: event.detail
+            iGroupBy: this.data.iGroupBy == 1?0:1,
         });
         this.getData()
     },
     iTimeTypeChange(event) {
         this.setData({
-            iTimeType: event.detail
+            iTimeType: this.data.iTimeType == 1?0:1,
         });
         this.getData()
     },
     listTypeChange(event) {
         this.setData({
-            listType: event.detail
+            listType: this.data.listType == 1?0:1,
         });
         this.getData()
     },
diff --git a/pages/insight/pages/themeList/index.wxml b/pages/insight/pages/themeList/index.wxml
index 6468db7..49c6043 100644
--- a/pages/insight/pages/themeList/index.wxml
+++ b/pages/insight/pages/themeList/index.wxml
@@ -57,23 +57,29 @@
                 </view>
             </van-dropdown-item>
             <van-dropdown-item id="back" title="更多筛选">
-                <view style="margin: 32rpx;">
+                <view style="margin: 32rpx 32rpx 0 32rpx;">
                     <view>去重方式</view>
-                    <van-radio-group value="{{ iGroupBy }}" bind:change="iGroupByChange">
-                        <van-radio name="0">不去重</van-radio>
-                        <van-radio name="1">相似度去重</van-radio>
-                    </van-radio-group>
+                    <view class="filter">
+                        <view wx:if="{{iGroupBy == 0}}" class="more-item-active">不去重</view>
+                        <view wx:else bindtap="iGroupByChange" class="more-item">不去重</view>
+                        <view wx:if="{{iGroupBy == 1}}" class="more-item-active">相似度去重</view>
+                        <view wx:else bindtap="iGroupByChange"  class="more-item">相似度去重</view>
+                    </view>
                 </view>
                 <view style="margin: 0rpx 32rpx 32rpx 32rpx;">
                     <view>排序方式</view>
-                    <van-radio-group value="{{ listType }}" bind:change="listTypeChange">
-                        <van-radio name="0">默认</van-radio>
-                        <van-radio name="1">影响力倒序</van-radio>
-                    </van-radio-group>
-                    <van-radio-group value="{{ iTimeType }}" bind:change="iTimeTypeByChange">
-                        <van-radio name="0">发布时间</van-radio>
-                        <van-radio name="1">入库时间</van-radio>
-                    </van-radio-group>
+                    <view class="filter">
+                        <view wx:if="{{listType == 0}}" class="more-item-active">默认</view>
+                        <view wx:else bindtap="listTypeChange" class="more-item">默认</view>
+                        <view wx:if="{{listType == 1}}" class="more-item-active">影响力倒序</view>
+                        <view wx:else bindtap="listTypeChange"  class="more-item">影响力倒序</view>
+                    </view>
+                    <view class="filter">
+                        <view wx:if="{{iTimeType == 0}}" class="more-item-active">发布时间</view>
+                        <view wx:else bindtap="iTimeTypeChange" class="more-item">发布时间</view>
+                        <view wx:if="{{iTimeType == 1}}" class="more-item-active">入库时间</view>
+                        <view wx:else bindtap="iTimeTypeChange"  class="more-item">入库时间</view>
+                    </view>
                 </view>
             </van-dropdown-item>
         </van-dropdown-menu>
diff --git a/pages/insight/pages/themeList/index.wxss b/pages/insight/pages/themeList/index.wxss
index 011080d..8295017 100644
--- a/pages/insight/pages/themeList/index.wxss
+++ b/pages/insight/pages/themeList/index.wxss
@@ -61,4 +61,50 @@
 .top-time .van-checkbox{
     display: inline-block !important;
     margin-bottom: -3px
+}
+/* 筛选项 */
+.filter {
+    display: flex;
+    flex-wrap: wrap;
+    width: 100%;
+}
+.filter-item {
+    width: 208rpx;
+    height: 72rpx;
+    margin: 16rpx;
+    background: #F9F9F9;
+    text-align: center;
+    line-height: 72rpx;
+    font-size: 12px;
+    color: #111111;
+}
+.filter-item-active {
+    width: 208rpx;
+    height: 72rpx;
+    margin: 16rpx;
+    background: #F0F5FF;
+    text-align: center;
+    line-height: 72rpx;
+    font-size: 12px;
+    color: #0084FF;
+}
+.more-item {
+    width: 296rpx;
+    height: 72rpx;
+    margin: 16rpx;
+    background: #F9F9F9;
+    text-align: center;
+    line-height: 72rpx;
+    font-size: 12px;
+    color: #111111;
+}
+.more-item-active {
+    width: 296rpx;
+    height: 72rpx;
+    margin: 16rpx;
+    background: #F0F5FF;
+    text-align: center;
+    line-height: 72rpx;
+    font-size: 12px;
+    color: #0084FF;
 }
\ No newline at end of file