|
@@ -3,9 +3,6 @@ const { getProductCategoryList } = require('../../api/common')
|
|
const { getLunboList } = require('./api/index')
|
|
const { getLunboList } = require('./api/index')
|
|
const app = getApp()
|
|
const app = getApp()
|
|
const tmplIds = 'uc9ztDw9ZscpNkMr52XUcB7YrDBk5AzjrRtNSu8Dq-4'
|
|
const tmplIds = 'uc9ztDw9ZscpNkMr52XUcB7YrDBk5AzjrRtNSu8Dq-4'
|
|
-let leftHeight = 0
|
|
|
|
-let rightHeight = 0
|
|
|
|
-let query = null
|
|
|
|
|
|
|
|
Page({
|
|
Page({
|
|
|
|
|
|
@@ -59,9 +56,7 @@ Page({
|
|
}
|
|
}
|
|
this.fetchLunboList()
|
|
this.fetchLunboList()
|
|
await this.fetchProductCategoryList()
|
|
await this.fetchProductCategoryList()
|
|
- if (this.data.searchForm.category_id) {
|
|
|
|
- this.fetchOrderList()
|
|
|
|
- }
|
|
|
|
|
|
+ this.fetchOrderList()
|
|
},
|
|
},
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -182,32 +177,18 @@ Page({
|
|
leftList,
|
|
leftList,
|
|
rightList
|
|
rightList
|
|
} = this.data
|
|
} = this.data
|
|
- query = wx.createSelectorQuery().in(this)
|
|
|
|
- for (const item of list) {
|
|
|
|
- if (leftHeight < rightHeight) {
|
|
|
|
|
|
+
|
|
|
|
+ list.forEach((item, index) => {
|
|
|
|
+ if (index % 2 === 0) {
|
|
leftList.push(item)
|
|
leftList.push(item)
|
|
- } else if (leftHeight === rightHeight) {
|
|
|
|
- leftList.length <= rightList ? leftList.push(item) : rightList.push(item)
|
|
|
|
} else {
|
|
} else {
|
|
rightList.push(item)
|
|
rightList.push(item)
|
|
}
|
|
}
|
|
- await this.getBoxHeight(leftList, rightList)
|
|
|
|
- }
|
|
|
|
- },
|
|
|
|
- getBoxHeight(leftList, rightList) {
|
|
|
|
- return new Promise((resolve, reject) => {
|
|
|
|
- this.setData({
|
|
|
|
- leftList,
|
|
|
|
- rightList
|
|
|
|
- }, () => {
|
|
|
|
- query.select('.waterfall-left').boundingClientRect()
|
|
|
|
- query.select('.waterfall-right').boundingClientRect()
|
|
|
|
- query.exec((res) => {
|
|
|
|
- leftHeight = res[0].height
|
|
|
|
- rightHeight = res[1].height
|
|
|
|
- resolve()
|
|
|
|
- })
|
|
|
|
- })
|
|
|
|
|
|
+ })
|
|
|
|
+
|
|
|
|
+ this.setData({
|
|
|
|
+ leftList,
|
|
|
|
+ rightList
|
|
})
|
|
})
|
|
},
|
|
},
|
|
jumpLeavingAMessage() {
|
|
jumpLeavingAMessage() {
|