Merge branch 'master' of http://121.42.41.42:7070/r/shibeirencai_wechat

pages/article/index.js

@@ -59,6 +59,9 @@ Page({
       console.log(res)
       const data = res.result
       const date = dayjs(data.createTime).format('MM月DD日')
+      wx.setNavigationBarTitle({
+        title: data.title,
+      })
       this.setData({
         nodes: data.content,
         title: data.title,

pages/article/index.json

@@ -1,4 +1,5 @@
 {
+  "navigationBarTitleText": "详情",
   "usingComponents": {
     "e-ibutton": "/components/image-button/index"
   }

pages/billboards/firm/index.json

@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "重点企业",
+  "navigationBarTitleText": "重点产业",
   "enablePullDownRefresh": true,
   "usingComponents": {
     "e-card": "/components/card/index",

pages/billboards/policy/index.js

@@ -29,7 +29,8 @@ Page({
   onSearchClear (e) {
     this.setData({
       currPage: 1,
-      searchKey: ''
+      searchKey: '',
+      // list: []
     })
     //console.log(e)
     this.fetchPolicyList()
@@ -39,6 +40,7 @@ Page({
     this.setData({
       searchKey: key,
       currPage: 1,
+      // list: []
     })
     //console.log(e)
     this.fetchPolicyList()
@@ -77,8 +79,13 @@ Page({
   fetchPolicyList () {
     const {searchKey} = this.data
     const page = this.data.currPage
+    if (searchKey.length > 0 && page == 1 ) {
+      this.setData({
+        list: []
+      })
+    }
     policy.fetchPolicyList(page, searchKey, res => {
-      //console.log(res)
+      console.log(res)
       const datas = res.list
       let tempDatas = []
       datas.forEach(item => {

pages/billboards/policy/policy-list/index.js

@@ -75,5 +75,9 @@ Page({
         })
       }
     })
+  },
+  maskTouchMove () {
+    return
   }
+
 })

pages/billboards/policy/policy-list/index.wxml

@@ -22,4 +22,5 @@
       <text bindtap="onClickAllBtnItem" data-index="{{index}}" class="pop_item">{{item}}</text>
     </block>
   </view>
+  <view bindtap="onHiddenPopView" class="mark" wx:if="{{show}}" catchtouchmove="maskTouchMove"></view>
 </view>

pages/billboards/policy/policy-list/index.wxss

@@ -53,12 +53,13 @@
   transform: scaleY(0);
 }
 .pop_view_layout {
+  z-index: 10;
     /* 布局 */
-  padding: 0 10px;
+  padding: 10px 10px;
   border-bottom: 2px solid #f7f7f7;
 }
 .pop_item {
-  color: #999999;
+  color: #333;
   font-size: 14px;
   margin-top: 10px;
   display: inline-block;
@@ -69,3 +70,12 @@
   border-radius: 14px;
   border: 1px solid #999999;
 }
+.mark {
+  position: fixed;
+  transition: 0.5 all ease-in-out;
+  top: 0;
+  height: 100vh;
+  left: 0;
+  right: 0;
+  background-color: rgba(0, 0, 0, 0.6);
+}