From cf5b1343cc7f4ce0a23450175541878ef027b86f Mon Sep 17 00:00:00 2001
From: lqq <jesus_lqq@163.com>
Date: Tue, 29 Oct 2019 14:00:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E6=89=8D=E6=94=BF=E7=AD=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/segment/index.wxss                 |   3 +-
 images/billboard/arrow-down.png               | Bin 0 -> 234 bytes
 pages/billboards/policy/policy-list/index.js  |  22 ++++++-
 .../billboards/policy/policy-list/index.wxml  |  21 ++++--
 .../billboards/policy/policy-list/index.wxss  |  61 +++++++++++++++++-
 5 files changed, 96 insertions(+), 11 deletions(-)
 create mode 100644 images/billboard/arrow-down.png

diff --git a/components/segment/index.wxss b/components/segment/index.wxss
index 7a1b6db..248d591 100644
--- a/components/segment/index.wxss
+++ b/components/segment/index.wxss
@@ -7,6 +7,7 @@
 }
 .title {
   min-width: 150rpx;
+  white-space: nowrap;
   display: flex;
   align-items: center;
   justify-content: center;
@@ -21,7 +22,7 @@
   transition: 0.5s all ease-in-out;
 }
 .title-selected {
-  font-size: 16px;
+  font-size: 15px;
   color: #292E3E;
 }
 .select-line{
diff --git a/images/billboard/arrow-down.png b/images/billboard/arrow-down.png
new file mode 100644
index 0000000000000000000000000000000000000000..72ee786bbb9fa30f0b53dd08181581c223343a85
GIT binary patch
literal 234
zcmV<G02Tj<P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800027Nkl<ZSV!%Y
z!3}^g3<J$Zun|lK8^K5@QjtmpBo2>$%#+IT)k!m;^EY(%hX9m-5>NtO0%KWJM{;4g
z`Y!+z@5Oilu#pfmfVF5Q0FRf50$3deqBb{e3c!SIp$G(}@n(R9pv<j!1Rx4Qn==3&
zM9Q26c!RM2*R-?48g4=T0^8fxXOSVjz2@i)v@75Vf;P{z;4O)i`CkCjyQ|jQp4k?7
kb;IWZPy$Lo33N~31nsaSAugFWmH+?%07*qoM6N<$g4aV@8vp<R

literal 0
HcmV?d00001

diff --git a/pages/billboards/policy/policy-list/index.js b/pages/billboards/policy/policy-list/index.js
index c5b98ae..ab1763b 100644
--- a/pages/billboards/policy/policy-list/index.js
+++ b/pages/billboards/policy/policy-list/index.js
@@ -11,7 +11,8 @@ Page({
     nodes: '',
     navs: [], 
     tags: [], // 导航的原始数据
-    curCode: ''
+    curCode: '',
+    show: false,
   },
 
   /**
@@ -31,11 +32,28 @@ Page({
     })
     this.fetchPolicyArtice()
   },
+  onShowAllButton () {
+    console.log('show All tbn')
+    const show = this.data.show
+    this.setData({
+      show: !show
+    })
+  },
+  onClickAllBtnItem (e) {
+    const index = e.currentTarget.dataset.index
+    this.setData({
+      navSelectIndex: index,
+      curCode: this.data.tags[index].code,
+      show: false,
+    })
+    this.fetchPolicyArtice()
+  },
   tapSegemnt (e) {
     //console.log(e.detail)
     const index = e.detail.index
     this.setData({
-      curCode: this.data.tags[index].code
+      curCode: this.data.tags[index].code,
+      show: false
     })
     this.fetchPolicyArtice()
   },
diff --git a/pages/billboards/policy/policy-list/index.wxml b/pages/billboards/policy/policy-list/index.wxml
index 017dda3..e4f9a35 100644
--- a/pages/billboards/policy/policy-list/index.wxml
+++ b/pages/billboards/policy/policy-list/index.wxml
@@ -1,14 +1,25 @@
 <!--pages/billboards/policy/policy-list/index.wxml-->
 <view class="container">
   <view class="page_hd">
-    <e-segment 
-      headerTitles="{{navs}}" 
-      defaultSelectIndex="{{navSelectIndex}}"
-      bind:tapSegment="tapSegemnt"
-      />
+    <view class="page_segment">
+      <e-segment 
+        headerTitles="{{navs}}" 
+        defaultSelectIndex="{{navSelectIndex}}"
+        bind:tapSegment="tapSegemnt"
+        />
+    </view>
+    <view class="page_btn_all" bindtap="onShowAllButton">
+      <image class="arrow_btn" src="/images/billboard/arrow-down.png"></image>
+    </view>
   </view>
   <view class="page_bd">
     <rich-text nodes="{{nodes}}"></rich-text>
   </view>
   <e-empty empty="{{nodes.length <= 0}}" message="暂无数据"/>
+  
+  <view class="pop_view pop_view_layout {{show ? 'pop_show': 'pop_hidden'}}">
+    <block wx:for="{{navs}}" wx:key="pop_{{index}}">
+      <text bindtap="onClickAllBtnItem" data-index="{{index}}" class="pop_item">{{item}}</text>
+    </block>
+  </view>
 </view>
diff --git a/pages/billboards/policy/policy-list/index.wxss b/pages/billboards/policy/policy-list/index.wxss
index 1898fc9..99037ab 100644
--- a/pages/billboards/policy/policy-list/index.wxss
+++ b/pages/billboards/policy/policy-list/index.wxss
@@ -1,15 +1,70 @@
 /* pages/billboards/policy/policy-list/index.wxss */
+.container {
+  position: relative;
+}
 .page_hd {
   position: fixed;
   border-bottom: 1px solid #f7f7f7;
   top: 0;
-  height: 48px;
-  width: 100%;
+  height: 40px;
+  right: 0;
   left: 0;
   z-index: 10;
   background-color: white;
+  display: flex;
+  flex-direction: row;
+}
+
+.page_segment {
+  width: 90vw;
+}
+
+.page_btn_all {
+  width: 10vw;
+  background-color: white;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.arrow_btn {
+  width: 30px;
+  height: 30px;
 }
 .page_bd {
   padding: 10px 10px 0 10px;
-  margin-top: 48px;
+  margin-top: 40px;
+}
+/* 弹出视图 */
+.pop_view {
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: 0px;
+  height: 150px;
+  overflow: scroll;
+  background-color: white;
+  transition: 0.2s all ease-in-out;
+}
+.pop_show {
+  top: 0;
+}
+.pop_hidden {
+  top: -150px;
+}
+.pop_view_layout {
+    /* 布局 */
+  padding: 0 10px;
+  border-bottom: 2px solid #f7f7f7;
+}
+.pop_item {
+  color: #999999;
+  font-size: 14px;
+  margin-top: 10px;
+  display: inline-block;
+  height: 20px;
+  margin-right: 10px;
+  white-space: nowrap;
+  padding: 8rpx 15rpx;
+  border-radius: 14px;
+  border: 1px solid #999999;
 }
\ No newline at end of file