diff --git a/app.js b/app.js index ade7531..6ddae6a 100644 --- a/app.js +++ b/app.js @@ -1,7 +1,7 @@ //app.js App({ //----------------------------------------------globalData-------------------------------------- - evn: 0,//0:开发环境，1：测试环境，2：生产环境 + evn: 1,//0:开发环境，1：测试环境，2：生产环境 tmplIds: ['SUjEgwDopCv9xkkSZ4KbS0L7XbAiVQor6GmPg14K760'], agentMsgIds: ['kG8DErWDpyzBHCFaLlSKYMF7xVy8UpgogCwV_WSNt10', 'oLbv-IyJOia2tenh64_Lc8xeAzwgzu3gh1vFJ1Se-ME'], version: 152, diff --git a/pages/article/allNewInfo/index.js b/pages/article/allNewInfo/index.js index 48f3b90..c9e802c 100644 --- a/pages/article/allNewInfo/index.js +++ b/pages/article/allNewInfo/index.js @@ -43,6 +43,12 @@ Page({ if(e.currentTarget.id == 'toAttentionPaperFctory'){ util.navigateTo('/pages/article/attentionPaperFactory/index') } + if(e.currentTarget.id == 'toFactoryDetails'){ + util.navigateTo('/pages/agent/factory/index?id='+e.currentTarget.dataset.factoryid) + } + if(e.currentTarget.id == 'toDmai'){ + util.navigateTo('/pages/agent/edit/index?id='+e.currentTarget.dataset.fcid+'&categoryId='+e.currentTarget.dataset.paperid) + } }, changeTable: function (e) { var a = e.currentTarget.id diff --git a/pages/article/allNewInfo/index.wxml b/pages/article/allNewInfo/index.wxml index 45148a2..52c62fe 100644 --- a/pages/article/allNewInfo/index.wxml +++ b/pages/article/allNewInfo/index.wxml @@ -24,16 +24,17 @@ - + - {{item.name}} + {{item.shortName}}已关注已取消 {{item.biggestFloatPrice*1000||0}} {{item.yesterdayRetainedQuantity || 0}}辆 {{item.minimumDeductionPoint || 0}}% - + - + @@ -51,7 +52,7 @@ {{cell.unitPrice*1000|| 0}} {{cell.floatPrice*1000|| 0}} {{cell.curDeductionPoint|| 0}} - + 代卖 diff --git a/pages/article/allNewInfo/index.wxss b/pages/article/allNewInfo/index.wxss index fdd85b3..569f7b9 100644 --- a/pages/article/allNewInfo/index.wxss +++ b/pages/article/allNewInfo/index.wxss @@ -116,6 +116,7 @@ page { display: flex; align-items: center; margin-right: 36.3rpx; + margin-top: 10rpx } .onDataImg { @@ -251,4 +252,32 @@ page { color: rgba(0, 0, 0, 0.60); letter-spacing: 2px; margin-right: 35rpx; +} + +.yesAttention { + width: 78rpx; + height: 26rpx; + background: rgb(204, 224, 245); + border-radius: 1px; + border-radius: 1px; + line-height: 26rpx; + text-align: center; + font-family: PingFangSC-Regular; + font-size: 18rpx; + color: #007AFF; + letter-spacing: 0; +} + +.noAttention { + width: 78rpx; + height: 26rpx; + background: #F4F4F4; + border-radius: 1px; + border-radius: 1px; + line-height: 26rpx; + text-align: center; + font-family: PingFangSC-Regular; + font-size: 18rpx; + color: rgb(150, 150, 150); + letter-spacing: 0; } \ No newline at end of file diff --git a/pages/article/newInfo/index.js b/pages/article/newInfo/index.js index 622d79c..4d36346 100644 --- a/pages/article/newInfo/index.js +++ b/pages/article/newInfo/index.js @@ -51,7 +51,15 @@ Component({ } if(e.currentTarget.id == 'tofeedback'){ util.navigateTo('/pages/article/feedback/index') - } + } + if(e.currentTarget.id == 'toFactoryDetails'){ + util.navigateTo('/pages/agent/factory/index?id='+e.currentTarget.dataset.factoryid) + } + if(e.currentTarget.id == 'toDmai'){ + util.navigateTo('/pages/agent/edit/index?id='+e.currentTarget.dataset.fcid+'&categoryId='+e.currentTarget.dataset.paperid) + } + + }, toPageDetails:function(e){ util.navigateTo('/pages/article/detail/index?id='+e.currentTarget.id) diff --git a/pages/article/newInfo/index.wxml b/pages/article/newInfo/index.wxml index 8b04ae9..76f68aa 100644 --- a/pages/article/newInfo/index.wxml +++ b/pages/article/newInfo/index.wxml @@ -4,26 +4,27 @@ - 情报 + 纸厂情报 + 全部纸厂> - + + - 纸厂情报 - - - - {{curDate}} - - - + + + {{curDate}} + + - - 全部纸厂> - - + + + + 反馈情报 + + @@ -48,16 +49,17 @@ - + - {{item.name}} + {{item.shortName}} {{item.biggestFloatPrice*1000||0}} {{item.yesterdayRetainedQuantity || 0}}辆 {{item.minimumDeductionPoint || 0}}% - + - + @@ -75,7 +77,7 @@ {{cell.unitPrice*1000|| 0}} {{cell.floatPrice*1000|| 0}} {{cell.curDeductionPoint|| 0}} - + 代卖 @@ -96,7 +98,7 @@ - + # {{item.millPaperName}} @@ -109,7 +111,7 @@ - + - + \ No newline at end of file diff --git a/pages/article/newInfo/index.wxss b/pages/article/newInfo/index.wxss index 3d3dea0..3d139cd 100644 --- a/pages/article/newInfo/index.wxss +++ b/pages/article/newInfo/index.wxss @@ -70,7 +70,7 @@ page { .topRight { width: 50%; - height: 60rpx; + height: 70rpx; } .topLeft { @@ -97,6 +97,7 @@ page { letter-spacing: 0; height: 60rpx; line-height: 60rpx; + padding-left: 32rpx; } .topRightText { @@ -106,10 +107,27 @@ page { letter-spacing: 0; height: 60rpx; line-height: 60rpx; + position: absolute; + left: 196rpx; +} +.topRight-text{ + height: 70rpx; + width: 112rpx; + text-align: right; + line-height: 70rpx; + float: right; + margin-right: 10rpx; + +} +.topRight-icon{ float: right; - margin-right: 38.5rpx; + height: 70rpx; + display: flex; + align-items: center; + margin-right: 35rpx; } + .topRightIcon { height: 60rpx; float: right; @@ -185,21 +203,46 @@ page { color: rgba(0, 0, 0, 0.85); letter-spacing: 0; } -.son-table-btn{ - width:120rpx;height:56rpx;line-height:56rpx;font-size: 26rpx;color: #007AFF;letter-spacing: 0;text-align: left;background: #FFFFFF;border: 1rpx solid #007AFF;border-radius: 28rpx;border-radius: 28rpx;text-align: center; + +.son-table-btn { + width: 120rpx; + height: 56rpx; + line-height: 56rpx; + font-size: 26rpx; + color: #007AFF; + letter-spacing: 0; + text-align: left; + background: #FFFFFF; + border: 1rpx solid #007AFF; + border-radius: 28rpx; + border-radius: 28rpx; + text-align: center; } -.bottomViewleft-top{ + +.bottomViewleft-top { width: 100%; height: 90rpx; } -.bottomViewleft-bottem{ + +.bottomViewleft-bottem { width: 100%; height: 33rpx; margin-top: 57rpx; } -.bottomViewRightImg{ + +.bottomViewRightImg { width: 240rpx; height: 180rpx; +} + +.piker { + height: 70rpx; + line-height: 70rpx; + font-family: PingFangSC-Medium; + font-size: 28rpx; + color: rgba(0, 0, 0, 0.40); + letter-spacing: 0; + padding-left: 20rpx; } \ No newline at end of file