diff --git a/pages/agent/factory/index.js b/pages/agent/factory/index.js index 7ce7281..b264315 100644 --- a/pages/agent/factory/index.js +++ b/pages/agent/factory/index.js @@ -33,6 +33,7 @@ Page({ pageSize:15 }, visible: false, + disabled: false, hasFollowed: false }, /** @@ -62,7 +63,12 @@ Page({ this.data.visible = true } } - this.setData({ factoryDetail: result.data, hasFollowed:result.data.hasFollowed, visible: this.data.visible }) + var item = result.data.paperCategoryList[this.data.cateIndex] + var disabled = false + if(!item.isAllowOrder || util.isEmpty(item.unitPrice) || Number(item.unitPrice) <= 0){ + disabled = true + } + this.setData({ factoryDetail: result.data, hasFollowed:result.data.hasFollowed, visible: this.data.visible, disabled}) wx.hideLoading() }).catch(err => { wx.hideLoading() @@ -115,7 +121,13 @@ Page({ if (this.data.cateIndex == e.currentTarget.dataset.index) { return } - this.setData({ cateIndex: e.currentTarget.dataset.index }) + this.data.cateIndex = e.currentTarget.dataset.index + var item = this.data.factoryDetail.paperCategoryList[this.data.cateIndex] + var disabled = false + if(!item.isAllowOrder || util.isEmpty(item.unitPrice) || Number(item.unitPrice) <= 0){ + disabled = true + } + this.setData({ cateIndex: this.data.cateIndex, disabled }) }, saleGood: function (e) { if (!app.globalData.userInfo) { diff --git a/pages/agent/factory/index.wxml b/pages/agent/factory/index.wxml index 6088414..01563e5 100644 --- a/pages/agent/factory/index.wxml +++ b/pages/agent/factory/index.wxml @@ -167,7 +167,7 @@ - 我要卖货 + 我要卖货 diff --git a/pages/moment/fragment/index.js b/pages/moment/fragment/index.js index 83521a9..fcdde0d 100644 --- a/pages/moment/fragment/index.js +++ b/pages/moment/fragment/index.js @@ -122,6 +122,9 @@ Component({ // if(record.latestQuoteTime.indexOf(params.data) < 0){ // return // } + if(util.isEmpty(record.typicalFloatingQuotedPrice) || record.typicalFloatingQuotedPrice == 0){ + return + } if(record.typicalFloatingQuotedPrice > 0){ record.content = record.paperMillName + '上涨' + math.times(record.typicalFloatingQuotedPrice, 1000) + '元/吨' } else if(record.typicalFloatingQuotedPrice < 0){ diff --git a/pages/moment/info-item/index.wxss b/pages/moment/info-item/index.wxss index db79cf8..5d29448 100644 --- a/pages/moment/info-item/index.wxss +++ b/pages/moment/info-item/index.wxss @@ -22,6 +22,7 @@ } .type-tags { + z-index: 2; background: #33333366; border-radius: 28rpx; padding: 4rpx 12rpx;