From c765c26eee1249b0a8d72d2b203b2ed124c2bbf6 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期五, 26 八月 2022 17:16:47 +0800
Subject: [PATCH] 2022.8.26(2)
---
/dev/null | 97 ----------------
pages/module_consult/consultdetailitem/consultdetailitem.js | 50 ++++++++
pages/module_consult/behaviors/behConsultItem.js | 98 ++++++++--------
pages/module_consult/consultresultmore/consultresultmore.js | 18 +-
pages/module_consult/consultresult/consultresult.wxml | 97 ++++++++-------
5 files changed, 160 insertions(+), 200 deletions(-)
diff --git a/pages/learn/learn.js b/pages/learn/learn.js
deleted file mode 100644
index 7529990..0000000
--- a/pages/learn/learn.js
+++ /dev/null
@@ -1,219 +0,0 @@
-// pages/learn/learn.js
-const lawservice = require("../../service/lawservice")
-const moment = require('../../utils/moment.min')
-const app = getApp()
-
-Page({
-
- /**
- * 椤甸潰鐨勫垵濮嬫暟鎹�
- */
- data: {
- currentTab: 0,
- tabList: [{
- "name": "VOCs鎺掓斁"
- },
- {
- "name": "鍙拌处"
- },
- {
- "name": "娌荤悊璁炬柦璁惧"
- },
- {
- "name": "鍦ㄧ嚎鐩戞祴璁惧"
- }
- ],
- pageList: [
-
- ],
- banners: [
- {
- pic: '',
- url: '',
- fileType: ''
- },
- ],
- resources: [],
- text2: [{
- title: "鍥犺繚绔犲缓绛戝鑷存墽娉�",
- content: "鎵ф硶鎻忚堪锛氱幆淇濅富绠￠儴闂ㄥ彲璋冮槄骞朵綔涓烘墽娉曟函婧愪緷鎹箣涓�鐜繚涓荤閮ㄩ棬鍙皟闃呭苟浣滀负鎵ф硶婧簮渚濇嵁涔嬩竴",
- tags: ['杩濇硶鎼缓', '渚濇硶鎷嗛櫎'],
- views: 123,
- time: '2021骞�3鏈�2鏃�',
- likes: 233
- }, {
- title: "鍥犺繚绔犲缓绛戝鑷存墽娉�",
- content: "鎵ф硶鎻忚堪锛氱幆淇濅富绠￠儴闂ㄥ彲璋冮槄骞朵綔涓烘墽娉曟函婧愪緷鎹箣涓�鐜繚涓荤閮ㄩ棬鍙皟闃呭苟浣滀负鎵ф硶婧簮渚濇嵁涔嬩竴",
- tags: ['杩濇硶鎼缓', '渚濇硶鎷嗛櫎'],
- views: 123,
- time: '2021骞�3鏈�2鏃�',
- likes: 233
- }, {
- title: "鍥犺繚绔犲缓绛戝鑷存墽娉�",
- content: "鎵ф硶鎻忚堪锛氱幆淇濅富绠￠儴闂ㄥ彲璋冮槄骞朵綔涓烘墽娉曟函婧愪緷鎹箣涓�鐜繚涓荤閮ㄩ棬鍙皟闃呭苟浣滀负鎵ф硶婧簮渚濇嵁涔嬩竴",
- tags: ['杩濇硶鎼缓', '渚濇硶鎷嗛櫎'],
- views: 123,
- time: '2021骞�3鏈�2鏃�',
- likes: 233
- }, {
- title: "鍥犺繚绔犲缓绛戝鑷存墽娉�",
- content: "鎵ф硶鎻忚堪锛氱幆淇濅富绠￠儴闂ㄥ彲璋冮槄骞朵綔涓烘墽娉曟函婧愪緷鎹箣涓�鐜繚涓荤閮ㄩ棬鍙皟闃呭苟浣滀负鎵ф硶婧簮渚濇嵁涔嬩竴",
- tags: ['杩濇硶鎼缓', '渚濇硶鎷嗛櫎'],
- views: 123,
- time: '2021骞�3鏈�2鏃�',
- likes: 233
- }]
- },
- //璁＄畻swiper楂樺害鏂规硶锛堝湪鍒囨崲鐨勬椂鍊欒皟鐢級
- tabsHeight(element) {
- let that = this;
- let query = wx.createSelectorQuery(); //蹇呴』瑕佸厛鍒涘缓涓�涓煡璇�
- query.select(element).boundingClientRect(function (rect) {
- that.setData({
- pageheight: rect.height + 'px'
- });
- }).exec();
- },
- swichNav: function (e) {
- var that = this;
- if (this.data.currentTab === e.target.dataset.current) {
- return false;
- } else {
- that.setData({
- currentTab: e.target.dataset.current,
- navScrollLeft: e.target.dataset.current >= 4 ? ((e.target.dataset.current) * 60) : 0 //鍒ゆ柇褰撳墠閫変腑鐨勪釜鏁版槸鍚︽槸绗�5涓�
- })
- that.tabsHeight('.page' + e.target.dataset.current); //鏌ヨ鍝竴涓厓绱�
- }
- },
- bindChange: function (e) {
- var that = this;
- that.setData({
- currentTab: e.detail.current,
- navScrollLeft: e.detail.current >= 4 ? ((e.detail.current) * 60) : 0 //鍒ゆ柇褰撳墠閫変腑鐨勪釜鏁版槸鍚︽槸绗�5涓�
- });
- // that.tabsHeight('.page'+e.target.dataset.current); //鏌ヨ鍝竴涓厓绱�
- },
-
- /**
- * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
- */
- onLoad: function (options) {
- // this.tabsHeight('.page0');
- this.getResources()
- },
-
- onReachBottom () {
- console.log('onReachBottom');
- if (this.cPage && this.tPage) {
- if (this.cPage < this.tPage) {
- this.getResources(this.cPage + 1)
- }
- }
- },
-
- getBanner() {
- let banners = []
- for (let i = 0; i < 6; i++) {
- const d = this.data.resources[i]
- banners.push({
- pic: d.lrPicurl,
- url: d.lrBodyurl,
- fileType: d.lrResourcefiletype,
- })
- }
- this.setData({
- banners
- })
- },
-
- getResources(cPage = 1) {
- var that = this
- let user = app.globalData.userInfo
- lawservice.getLawRegulations(user.guid, cPage, {sceneTypeId: user.extension2}, {
- onHead(header) {
- that.cPage = parseInt(header.currentPage)
- that.tPage = parseInt(header.totalPage)
- console.log(`cPage:${that.cPage}, tPage:${that.tPage}`);
- },
- success(data) {
- let resources = that.data.resources
- data.forEach(d => {
- d.views = parseInt(Math.random() * 1000 + 10)
- d.lrPublishdate = moment(d.lrPublishdate).format('YYYY骞碝M鏈圖D鏃�')
- });
- resources = resources.concat(data)
- that.setData({
- resources
- })
- if (that.cPage == 1) {
- that.getBanner()
- }
- }
- }, 10)
- },
-
- gotoBanner(e) {
- var index = e.currentTarget.dataset.index
- let f = this.data.resources[index]
- this.goto(f)
- },
- gotoResource(e) {
- var index = e.currentTarget.dataset.index
- let f = this.data.resources[index]
- this.goto(f)
- },
- /**
- * 椤甸潰璺宠浆
- */
- goto: function (f) {
- var url = ""
- switch (f.lrResourcefiletype) {
- //鏂囨。
- case "1":
- let bodyUrl = f.lrBodyurl
- wx.showLoading({
- title: ' 鏂囦欢涓嬭浇涓�',
- mask: true,
- })
- wx.downloadFile({
- url: bodyUrl,
- success: function (res) {
- wx.hideLoading()
- const filePath = res.tempFilePath
- wx.openDocument({
- filePath: filePath,
- success: function (res) {
- console.log('鎵撳紑鏂囨。鎴愬姛')
- },
- fail(error) {
- console.log(error);
- }
- })
- }
- })
- break;
- //閾炬帴
- case 2:
- url = ""
- break;
- //鍥剧墖
- case 3:
- url = ""
- break;
- //瑙嗛
- case 4:
- url = "/pages/module_common/pagevideo/pagevideo"
- break;
- }
- if (url != "") {
- wx.navigateTo({
- url: url,
- success: (res) => {
- // 閫氳繃 eventChannel 鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
- res.eventChannel.emit('acceptDataFromOpenerPage', f)
- },
- })
- }
- }
-})
\ No newline at end of file
diff --git a/pages/learn/learn.json b/pages/learn/learn.json
deleted file mode 100644
index c8fcfef..0000000
--- a/pages/learn/learn.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "navigationBarTitleText": "瀹堟硶瀛︿範",
- "navigationBarBackgroundColor": "#65EAD2",
- "navigationBarTextStyle": "white",
- "usingComponents": {
- "mp-icon": "/component/icon/icon"
- }
-}
\ No newline at end of file
diff --git a/pages/learn/learn.wxml b/pages/learn/learn.wxml
deleted file mode 100644
index 33599d4..0000000
--- a/pages/learn/learn.wxml
+++ /dev/null
@@ -1,112 +0,0 @@
-<!--pages/learn/learn.wxml-->
-<view class="page ">
-
- <!-- <view class="swiper-tab">
- <scroll-view scroll-left="{{navScrollLeft}}" scroll-x="true" show-scrollbar="false" scroll-with-animation="true">
- <block wx:for="{{tabList}}" wx:key="i">
- <view class="swiper-tab-list {{currentTab==index ? 'on' : ''}}" data-current="{{index}}" bindtap="swichNav">{{item.name}}</view>
- </block>
- </scroll-view>
- </view> -->
- <!-- <swiper current="{{currentTab}}" class="swiper-box" duration="300" bindchange="bindChange" style="height: {{pageheight}};">
- <block wx:for="{{pageList}}" wx:for-item="page" wx:key="n">
-
- <swiper-item>
-
- <view class="page{{index}}">
-
- </view>
- </swiper-item>
- </block>
- </swiper> -->
-
- <view class="page__bd ">
- <view class="fyui-panel">
- <swiper indicator-dots="true" autoplay="true" circular="true" interval="2000" duration="500" previous-margin="0px" next-margin="0px">
- <block wx:for='{{banners}}' wx:key='u'>
- <swiper-item>
- <image src='{{item.pic}}' mode="aspectFill" class='swiper-item-images' data-index="{{index}}" bindtap="gotoBanner" />
- </swiper-item>
- </block>
- </swiper>
- </view>
-
- <view class="flex-h" style="padding: 8px 10px;">
- <view class="image-btn" bindtap="goto" data-index="0">
- <image src="../../res/icons/btn_bg_3.png" class="image-btn__1" />
- </view>
- <view class="flex-v">
- <view class="image-btn" bindtap="goto">
- <image src="../../res/icons/btn_bg_4.png" class="image-btn__2" />
- </view>
- <view class="image-btn" bindtap="goto" data-index="2">
- <image src="../../res/icons/btn_bg_5.png" class="image-btn__2" />
- </view>
- </view>
- </view>
-
- <!-- <view class="fyui-cell fyui-cell_select title">
- <view class="fyui-cell__bd">鐜繚瀹堟硶</view>
- <view class="fyui-cell__ft">鏇村</view>
- </view> -->
- <view wx:for="{{resources}}" wx:key="index" wx:item="item" bindtap="gotoResource" data-index="{{index}}">
- <view wx:if="{{item.lrResourcefiletype != 4}}" class="fyui-box fyui-panel">
- <view class="fyui-box__hd">
- <image src="{{item.lrPicurl}}" class="" mode="aspectFill" />
- </view>
- <view class="fyui-box__bd">
- <view class="fyui-box__content">{{item.lrResourcetitle}}</view>
- <view class="fyui-box__tag">
- <view>{{item.lrPublishdate}}</view>
- <view class="flex-h">
- <image src="/res/icons/view.png" class="icon"></image>{{item.views}}
- </view>
- </view>
- </view>
- </view>
- <view wx:else class="fyui-panel fyui-panel_video">
- <view style="position: relative;">
- <image src="{{item.lrPicurl}}" class="video-poster" mode="aspectFit" />
- <mp-icon class="video-play" icon="play" color="white" size="50" type="filled"></mp-icon>
- </view>
- <view class="video-title">{{item.lrResourcetitle}}</view>
- <view class="tag">
- <view>{{item.lrPublishdate}}</view>
- <view class="flex-h">
- <image src="/res/icons/view.png" class="icon"></image>{{item.views}}
- </view>
- </view>
- </view>
- </view>
-
- <!-- <view class="fyui-cell fyui-cell_select title">
- <view class="fyui-cell__bd">鎵ф硶妗堜緥</view>
- <view class="fyui-cell__ft">鏇村</view>
- </view>
- <view wx:for="{{text2}}" wx:key="index" data-index="index" wx:for-item="item">
- <view class="fyui-box fyui-panel fyui-box__text">
- <view class="fyui-box__hd">
- {{item.title}}
- </view>
- <view class="fyui-box__bd">
- <view class="fyui-box__content">{{item.content}}</view>
- <view class="fyui-box__tag">
- <view wx:for="{{item.tags}}" wx:key="i" data-index="i" wx:for-item="tag">{{tag}}</view>
- </view>
- </view>
- <view class="fyui-box__ft">
- <view class="flex-h">
- <image src="/res/icons/view.png" class="icon"></image>{{item.views}}
- </view>
- <view class="flex-h">
- <image src="/res/icons/like.png" class="icon"></image>{{item.likes}}
- </view>
- <view>{{item.time}}</view>
- </view>
- </view>
- </view> -->
-
- </view>
-
- <view class="page__ft"></view>
-</view>
\ No newline at end of file
diff --git a/pages/learn/learn.wxss b/pages/learn/learn.wxss
deleted file mode 100644
index ab84bef..0000000
--- a/pages/learn/learn.wxss
+++ /dev/null
@@ -1,97 +0,0 @@
-/* pages/learn/learn.wxss */
-.swiper-tab{
- position: fixed;
- width: 100%;
- text-align: center;
- line-height: 80rpx;
- white-space: nowrap;
- z-index: 2;
- background-color: #65EAD2;
-}
-
-.swiper-tab-list{
- font-size: 30rpx;
- display: inline-block;
- min-width: 18%;
- padding: 0 1%;
- color: rgba(255, 255, 255, 0.658);
-}
-
-.on{
- color: white;
- font-weight: bold;
- border-bottom: 4rpx solid white;
-}
-
-.swiper-box{
- position: absolute;
- display: block;
- top: 80rpx;
- width: 100%;
- margin-top: 10px;
- background-color: var(--fyui-BG_1);
-}
-
-.city-item{
- width: 100%;
- display: flex;
- flex-flow: row nowrap;
- margin-bottom: 10px;
-}
-
-.img{
- width: 40%;
- height: 100px;
-}
-
-.text{
- width: 60%;
- display: flex;
- justify-content: center;
- align-items: center;
- font-size: 24px;
- border: 1px solid #ddd;
- box-sizing: border-box;
-}
-
-.swiper-item-images{
- width: 100%;
- height: 300rpx;
-}
-
-.image-btn__1 {
- width: 46vw;
- height: 42vw;
-}
-
-.image-btn__2 {
- width: 46vw;
- height: 20vw;
-}
-
-.fyui-panel_video .video-poster {
- width: 100%;
- background-color: black;
-}
-
-.fyui-panel_video .video-title{
- padding: 2px 16px;
- font-size: 16px;
-}
-
-.fyui-panel_video .video-play {
- position: absolute;
- top: calc(50% - 25px);
- left: calc(50% - 25px);
- z-index: 10;
- background-color: rgba(138, 138, 138, 0.712);
- border-radius: 50%;
-}
-
-.fyui-panel_video .tag{
- display: flex;
- justify-content: space-between;
- font-size: 12px;
- color: var(--fyui-text-color_2);
- padding: 4px 16px;
-}
\ No newline at end of file
diff --git a/pages/module_consult/behaviors/behConsultItem.js b/pages/module_consult/behaviors/behConsultItem.js
index 7a8e5c4..00445f1 100644
--- a/pages/module_consult/behaviors/behConsultItem.js
+++ b/pages/module_consult/behaviors/behConsultItem.js
@@ -9,55 +9,55 @@
result: []
},
methods:{
- onReachBottom () {
- console.log('onReachBottom');
- if (this.cPage && this.tPage) {
- if (this.cPage < this.tPage) {
- this.searchMore(this.cPage + 1)
- }
- }
- },
- searchMore (cPage = 1) {
- var that = this
- wx.showLoading({
- title: '鎼滅储涓�',
- mask: true,
- success: (res) => {},
- fail: (res) => {},
- complete: (res) => {},
- })
- setTimeout(() => {
- wx.hideLoading()
- }, 20000);
- consultservice.searchLaw(app.globalData.accessToken.userId, '澶ф皵姹℃煋', cPage, 5, {
- onPage(head){
- that.cPage = head.page
- that.tPage = head.totalPage
- },
- success (res) {
- let result = that.data.result
- res.forEach(r => {
- r.des = r.des.replace('\\n', '<br/>')
- if (result.length === 0) {
- result.push({
- typeId: r.typeId,
- typeName: r.typeName,
- contents: [r]
- })
- } else {
- result[0].contents.push(r)
- }
- });
- that.setData({
- result
- })
- console.log(result);
- },
- complete (res) {
- wx.hideLoading()
- }
- }, 2)
- },
+ // onReachBottom () {
+ // console.log('onReachBottom');
+ // if (this.cPage && this.tPage) {
+ // if (this.cPage < this.tPage) {
+ // this.searchMore(this.cPage + 1)
+ // }
+ // }
+ // },
+ // searchMore (cPage = 1) {
+ // var that = this
+ // wx.showLoading({
+ // title: '鎼滅储涓�',
+ // mask: true,
+ // success: (res) => {},
+ // fail: (res) => {},
+ // complete: (res) => {},
+ // })
+ // setTimeout(() => {
+ // wx.hideLoading()
+ // }, 20000);
+ // consultservice.searchLaw(app.globalData.accessToken.userId, '澶ф皵姹℃煋', cPage, 5, {
+ // onPage(head){
+ // that.cPage = head.page
+ // that.tPage = head.totalPage
+ // },
+ // success (res) {
+ // let result = that.data.result
+ // res.forEach(r => {
+ // r.des = r.des.replace('\\n', '<br/>')
+ // if (result.length === 0) {
+ // result.push({
+ // typeId: r.typeId,
+ // typeName: r.typeName,
+ // contents: [r]
+ // })
+ // } else {
+ // result[0].contents.push(r)
+ // }
+ // });
+ // that.setData({
+ // result
+ // })
+ // console.log(result);
+ // },
+ // complete (res) {
+ // wx.hideLoading()
+ // }
+ // }, 2)
+ // },
/**
* 鏌ョ湅鏌ヨ缁撴灉璇︽儏
*/
diff --git a/pages/module_consult/consultdetailitem/consultdetailitem.js b/pages/module_consult/consultdetailitem/consultdetailitem.js
index ad78e52..365f089 100644
--- a/pages/module_consult/consultdetailitem/consultdetailitem.js
+++ b/pages/module_consult/consultdetailitem/consultdetailitem.js
@@ -28,6 +28,56 @@
this.searchMore(1)
},
+ onReachBottom () {
+ console.log('onReachBottom');
+ if (this.cPage && this.tPage) {
+ if (this.cPage < this.tPage) {
+ this.searchMore(this.cPage + 1)
+ }
+ }
+ },
+ searchMore (cPage = 1) {
+ var that = this
+ wx.showLoading({
+ title: '鎼滅储涓�',
+ mask: true,
+ success: (res) => {},
+ fail: (res) => {},
+ complete: (res) => {},
+ })
+ setTimeout(() => {
+ wx.hideLoading()
+ }, 20000);
+ consultservice.searchLaw(app.globalData.accessToken.userId, '澶ф皵姹℃煋', cPage, 5, {
+ onPage(head){
+ that.cPage = head.page
+ that.tPage = head.totalPage
+ },
+ success (res) {
+ let result = that.data.result
+ res.forEach(r => {
+ r.des = r.des.replace('\\n', '<br/>')
+ if (result.length === 0) {
+ result.push({
+ typeId: r.typeId,
+ typeName: r.typeName,
+ contents: [r]
+ })
+ } else {
+ result[0].contents.push(r)
+ }
+ });
+ that.setData({
+ result
+ })
+ console.log(result);
+ },
+ complete (res) {
+ wx.hideLoading()
+ }
+ }, 2)
+ },
+
getItem () {
var that = this
wx.showLoading({
diff --git a/pages/module_consult/consultresult/consultresult.wxml b/pages/module_consult/consultresult/consultresult.wxml
index 29c8d0c..ae22988 100644
--- a/pages/module_consult/consultresult/consultresult.wxml
+++ b/pages/module_consult/consultresult/consultresult.wxml
@@ -1,54 +1,59 @@
<!--pages/module_consult/consultresult/consultresult.wxml-->
-<view class="page">
- <block wx:for="{{result}}" wx:key="i1" wx:for-item="catagory" wx:for-index="i1">
- <view class="page__hd">
- <view><text style="color: #57E4CB;">{{keyword}}</text>鐨剓{catagory.typeName}} ></view>
- </view>
- <view class="page__bd">
- <view class="fyui-panel">
- <block wx:if="{{catagory.typeId === 1}}">
- <view wx:for="{{catagory.contents}}" wx:key="i2" wx:for-index="i2" data-index="{{i1}},{{i2}}" bindtap="gotoDetail">
- <view class="fyui-box fyui-box__text">
- <view class="fyui-box__hd">
- {{item.name}}
- </view>
- <view class="fyui-box__bd">
- <view class="fyui-box__content tag">鐩稿叧琛屼笟 -> {{item.fileIndustry}}</view>
- <view class="fyui-box__content des">{{item.des}}</view>
- </view>
- <view class="fyui-box__ft">
- <text class="keyword">鍏抽敭璇嶏細</text>
- <view class="keyword-item"><text wx:for="{{item.keywords}}" wx:for-index="i" wx:for-item="word" wx:key="i">{{word}}</text></view>
- </view>
- </view>
- </view>
+<import src="/template/nodata.wxml"></import>
- </block>
- <block wx:else="{{catagory.typeId === 2}}">
- <view wx:for="{{catagory.contents}}" wx:key="i2" wx:for-index="i2" data-index="{{i1}},{{i2}}" bindtap="gotoDetail">
- <view class="fyui-box fyui-box__text">
- <view class="fyui-box__hd">
- <rich-text nodes="{{item.des}}" class="fyui-box__content des subtitle"></rich-text>
- </view>
- <view class="fyui-box__bd">
- <!-- <view class="fyui-box__content tag">鐩稿叧琛屼笟 -> {{item.fileIndustry}}</view> -->
- <text class="tag2">鎵�灞炵珷鑺傦細{{item.chapterName}} {{item.name ? ' ' + item.name : ''}}</text>
- <text class="tag2">鎵�灞炴枃浠讹細銆妠{item.fileName}}銆�</text>
- <text class="tag2" wx:if="{{item.referenceNumber}}">鎵�灞炴枃鍙凤細{{item.referenceNumber}}</text>
- </view>
- <view class="fyui-box__ft">
- <text class="tag3 {{item.effective? '' : 'tag3_disable'}}">{{item.effective ? '鐢熸晥涓�':'宸插け鏁�' }}</text>
- <text class="tag3 {{item.relatedItems? '' : 'tag3_disable'}}">{{item.relatedItems ? '鍏宠仈鏉＄洰' + item.relatedItems + '涓� >':'鏃犲叧鑱旀潯鐩�' }}</text>
- <text class="tag3 {{item.relatedCases? '' : 'tag3_disable'}}">{{item.relatedCases ? '鍏宠仈妗堜緥' + item.relatedCases + '涓� >':'鏃犲叧鑱旀渚�' }}</text>
- <!-- <text class="keyword">鍏抽敭璇嶏細</text>
- <view class="keyword-item"><text wx:for="{{item.keywords}}" wx:for-index="i" wx:for-item="word" wx:key="i">{{word}}</text></view> -->
+<view class="page">
+ <block wx:if="{{result.length > 0}}">
+ <block wx:for="{{result}}" wx:key="i1" wx:for-item="catagory" wx:for-index="i1">
+ <view class="page__hd">
+ <view><text style="color: #57E4CB;">{{keyword}}</text>鐨剓{catagory.typeName}} ></view>
+ </view>
+ <view class="page__bd">
+ <view class="fyui-panel">
+ <block wx:if="{{catagory.typeId === 1}}">
+ <view wx:for="{{catagory.contents}}" wx:key="i2" wx:for-index="i2" data-index="{{i1}},{{i2}}" bindtap="gotoDetail">
+ <view class="fyui-box fyui-box__text">
+ <view class="fyui-box__hd">
+ {{item.name}}
+ </view>
+ <view class="fyui-box__bd">
+ <view class="fyui-box__content tag">鐩稿叧琛屼笟 -> {{item.fileIndustry}}</view>
+ <view class="fyui-box__content des">{{item.des}}</view>
+ </view>
+ <view class="fyui-box__ft">
+ <text class="keyword">鍏抽敭璇嶏細</text>
+ <view class="keyword-item"><text wx:for="{{item.keywords}}" wx:for-index="i" wx:for-item="word" wx:key="i">{{word}}</text></view>
+ </view>
</view>
</view>
- </view>
- </block>
+
+ </block>
+ <block wx:else="{{catagory.typeId === 2}}">
+ <view wx:for="{{catagory.contents}}" wx:key="i2" wx:for-index="i2" data-index="{{i1}},{{i2}}" bindtap="gotoDetail">
+ <view class="fyui-box fyui-box__text">
+ <view class="fyui-box__hd">
+ <rich-text nodes="{{item.des}}" class="fyui-box__content des subtitle"></rich-text>
+ </view>
+ <view class="fyui-box__bd">
+ <!-- <view class="fyui-box__content tag">鐩稿叧琛屼笟 -> {{item.fileIndustry}}</view> -->
+ <text class="tag2">鎵�灞炵珷鑺傦細{{item.chapterName}} {{item.name ? ' ' + item.name : ''}}</text>
+ <text class="tag2">鎵�灞炴枃浠讹細銆妠{item.fileName}}銆�</text>
+ <text class="tag2" wx:if="{{item.referenceNumber}}">鎵�灞炴枃鍙凤細{{item.referenceNumber}}</text>
+ </view>
+ <view class="fyui-box__ft">
+ <text class="tag3 {{item.effective? '' : 'tag3_disable'}}">{{item.effective ? '鐢熸晥涓�':'宸插け鏁�' }}</text>
+ <text class="tag3 {{item.relatedItems? '' : 'tag3_disable'}}">{{item.relatedItems ? '鍏宠仈鏉＄洰' + item.relatedItems + '涓� >':'鏃犲叧鑱旀潯鐩�' }}</text>
+ <text class="tag3 {{item.relatedCases? '' : 'tag3_disable'}}">{{item.relatedCases ? '鍏宠仈妗堜緥' + item.relatedCases + '涓� >':'鏃犲叧鑱旀渚�' }}</text>
+ <!-- <text class="keyword">鍏抽敭璇嶏細</text>
+ <view class="keyword-item"><text wx:for="{{item.keywords}}" wx:for-index="i" wx:for-item="word" wx:key="i">{{word}}</text></view> -->
+ </view>
+ </view>
+ </view>
+ </block>
+ </view>
+ <view class="btn-more" data-typeid="{{catagory.typeId}}" bindtap="gotoMore">鏌ョ湅鏇村</view>
</view>
- <view class="btn-more" data-typeid="{{catagory.typeId}}" bindtap="gotoMore">鏌ョ湅鏇村</view>
- </view>
+ </block>
</block>
+ <template wx:else is="nodataPage"></template>
<view class="page__ft"></view>
</view>
\ No newline at end of file
diff --git a/pages/module_consult/consultresultmore/consultresultmore.js b/pages/module_consult/consultresultmore/consultresultmore.js
index 43ba971..bd1699b 100644
--- a/pages/module_consult/consultresultmore/consultresultmore.js
+++ b/pages/module_consult/consultresultmore/consultresultmore.js
@@ -18,6 +18,8 @@
onLoad(options) {
var that = this
this.getOpenerEventChannel().on('acceptDataFromOpenerPage', function (data) {
+ console.log('getOpenerEventChannel:');
+ console.log(data);
that.setData({
keyword: data.keyword,
typeId: data.typeId,
@@ -27,14 +29,14 @@
})
},
- // onReachBottom () {
- // console.log('onReachBottom');
- // if (this.cPage && this.tPage) {
- // if (this.cPage < this.tPage) {
- // this.search(this.cPage + 1)
- // }
- // }
- // },
+ onReachBottom () {
+ console.log('onReachBottom');
+ if (this.cPage && this.tPage) {
+ if (this.cPage < this.tPage) {
+ this.search(this.cPage + 1)
+ }
+ }
+ },
search (cPage = 1) {
var that = this
--
Gitblit v1.9.3