|
@@ -188,7 +188,6 @@ export default {
|
|
|
getCollectList() {
|
|
getCollectList() {
|
|
|
//just for test
|
|
//just for test
|
|
|
if(this.tabAct_id===99999) {
|
|
if(this.tabAct_id===99999) {
|
|
|
- this.loadTimeLine = true
|
|
|
|
|
Reports.getArticleList({
|
|
Reports.getArticleList({
|
|
|
PageSize: this.pageSize,
|
|
PageSize: this.pageSize,
|
|
|
CurrentIndex: this.page_no,
|
|
CurrentIndex: this.page_no,
|
|
@@ -196,6 +195,7 @@ export default {
|
|
|
IndustrialManagementId: this.industrialManagementId,
|
|
IndustrialManagementId: this.industrialManagementId,
|
|
|
}).then((res)=>{
|
|
}).then((res)=>{
|
|
|
if(res.Ret===200){
|
|
if(res.Ret===200){
|
|
|
|
|
+ this.loadTimeLine = true
|
|
|
this.status = this.page_no < res.Data.Paging.Pages ? "loadmore" : "nomore"
|
|
this.status = this.page_no < res.Data.Paging.Pages ? "loadmore" : "nomore"
|
|
|
this.totalPage = res.Data.Paging.Pages
|
|
this.totalPage = res.Data.Paging.Pages
|
|
|
let list = res.Data.List||[]
|
|
let list = res.Data.List||[]
|
|
@@ -229,7 +229,7 @@ export default {
|
|
|
})
|
|
})
|
|
|
setTimeout(()=>{
|
|
setTimeout(()=>{
|
|
|
this.getConentsHeight()
|
|
this.getConentsHeight()
|
|
|
- },300)
|
|
|
|
|
|
|
+ },0)
|
|
|
})
|
|
})
|
|
|
return
|
|
return
|
|
|
}
|
|
}
|
|
@@ -320,6 +320,7 @@ export default {
|
|
|
const query = wx.createSelectorQuery()
|
|
const query = wx.createSelectorQuery()
|
|
|
query.selectAll(".rich-text").boundingClientRect()
|
|
query.selectAll(".rich-text").boundingClientRect()
|
|
|
query.exec(res=>{
|
|
query.exec(res=>{
|
|
|
|
|
+ /* console.log(res[0][0].height) */
|
|
|
//根据timeLine的第一项确定当前手机三行文字的高度
|
|
//根据timeLine的第一项确定当前手机三行文字的高度
|
|
|
const standardHeight = res[0][0].height
|
|
const standardHeight = res[0][0].height
|
|
|
this.richTextHeight = standardHeight
|
|
this.richTextHeight = standardHeight
|
cxmo