libo
/
ztb-mini
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

--UI调整--

featrue/v4.3
huziyuan 5 years ago
parent
b3173cb663
commit
53fa26c808
7 changed files with 125 additions and 36 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      app.js
  2. 6
      pages/article/allNewInfo/index.js
  3. 11
      pages/article/allNewInfo/index.wxml
  4. 29
      pages/article/allNewInfo/index.wxss
  5. 10
      pages/article/newInfo/index.js
  6. 46
      pages/article/newInfo/index.wxml
  7. 57
      pages/article/newInfo/index.wxss

2
app.js
View File

@ -1,7 +1,7 @@
//app.js //app.js
App({ App({
//----------------------------------------------globalData-------------------------------------- //----------------------------------------------globalData--------------------------------------
evn: 0,//0:开发环境，1：测试环境，2：生产环境
evn: 1,//0:开发环境，1：测试环境，2：生产环境
tmplIds: ['SUjEgwDopCv9xkkSZ4KbS0L7XbAiVQor6GmPg14K760'], tmplIds: ['SUjEgwDopCv9xkkSZ4KbS0L7XbAiVQor6GmPg14K760'],
agentMsgIds: ['kG8DErWDpyzBHCFaLlSKYMF7xVy8UpgogCwV_WSNt10', 'oLbv-IyJOia2tenh64_Lc8xeAzwgzu3gh1vFJ1Se-ME'], agentMsgIds: ['kG8DErWDpyzBHCFaLlSKYMF7xVy8UpgogCwV_WSNt10', 'oLbv-IyJOia2tenh64_Lc8xeAzwgzu3gh1vFJ1Se-ME'],
version: 152, version: 152,

6
pages/article/allNewInfo/index.js
View File

@ -43,6 +43,12 @@ Page({
if(e.currentTarget.id == 'toAttentionPaperFctory'){ if(e.currentTarget.id == 'toAttentionPaperFctory'){
util.navigateTo('/pages/article/attentionPaperFactory/index') 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) { changeTable: function (e) {
var a = e.currentTarget.id var a = e.currentTarget.id

11
pages/article/allNewInfo/index.wxml
View File

@ -24,16 +24,17 @@
<!-- <view class="bg-white" wx:else> --> <!-- <view class="bg-white" wx:else> -->
<view class="bg-white"> <view class="bg-white">
<view wx:for="{{orderList}}" wx:key="index" class="tableStyle"> <view wx:for="{{orderList}}" wx:key="index" class="tableStyle">
<view class="flex flex-justify" style="border-top:2rpx solid #f3f3f3;margin-top:20rpx;padding: 0rpx 40rpx 0rpx 40rpx;">
<view class="flex flex-justify" style="border-top:2rpx solid #f3f3f3;margin-top:20rpx;padding: 0rpx 40rpx 0rpx 40rpx;"
id="toFactoryDetails" data-factoryId="{{item.paperMillId}}" catchtap="toPage">
<!-- <text class="text-df text-balck" style="flex:1;text-align: center">{{item.yesterdayTotalQuantity || 0}}%</text> --> <!-- <text class="text-df text-balck" style="flex:1;text-align: center">{{item.yesterdayTotalQuantity || 0}}%</text> -->
<view class="text-df text-balck" style="flex:1.2">{{item.name}}</view>
<view class="text-df text-balck" style="flex:1.2">{{item.shortName}}<view wx:if="{{item.hasFollowed==true}}" class="yesAttention">已关注</view><view wx:if="{{item.hasFollowed==false}}" class="noAttention">已取消</view></view>
<view class="text-df {{item.biggestFloatPrice>0?'text-red':(item.biggestFloatPrice<0?'text-green':'text-black')}}" style="flex:1;text-align: center">{{item.biggestFloatPrice*1000||0}} </view> <view class="text-df {{item.biggestFloatPrice>0?'text-red':(item.biggestFloatPrice<0?'text-green':'text-black')}}" style="flex:1;text-align: center">{{item.biggestFloatPrice*1000||0}} </view>
<view class="text-df text-balck" style="flex:1;text-align: center">{{item.yesterdayRetainedQuantity || 0}}辆</view> <view class="text-df text-balck" style="flex:1;text-align: center">{{item.yesterdayRetainedQuantity || 0}}辆</view>
<view class="text-df text-balck" style="flex:1;text-align: center">{{item.minimumDeductionPoint || 0}}%</view> <view class="text-df text-balck" style="flex:1;text-align: center">{{item.minimumDeductionPoint || 0}}%</view>
<view class="text-df text-balck" style="flex:0.5;text-align: center" id="{{item.paperMillId}}" bindtap="changeTable" wx:if="{{tableSgin==item.paperMillId}}">
<view class="text-df text-balck" style="flex:0.5;text-align: center" id="{{item.paperMillId}}" catchtap="changeTable" wx:if="{{tableSgin==item.paperMillId}}">
<image style="width:28rpx;height:28rpx;" src="/assets/info/factoryUp.png"></image> <image style="width:28rpx;height:28rpx;" src="/assets/info/factoryUp.png"></image>
</view> </view>
<view class="text-df text-balck" style="flex:0.5;text-align: center" id="{{item.paperMillId}}" bindtap="changeTable" wx:if="{{tableSgin !== item.paperMillId}}">
<view class="text-df text-balck" style="flex:0.5;text-align: center" id="{{item.paperMillId}}" catchtap="changeTable" wx:if="{{tableSgin !== item.paperMillId}}">
<image style="width:28rpx;height:28rpx;" src="/assets/info/factoryDown.png"></image> <image style="width:28rpx;height:28rpx;" src="/assets/info/factoryDown.png"></image>
</view> </view>
</view> </view>
@ -51,7 +52,7 @@
<view class="text-df {{cell.unitPrice>0?'text-red':(cell.unitPrice<0?'text-green':'text-black')}}" style="flex:1;text-align: center" style="flex:1;text-align: center">{{cell.unitPrice*1000|| 0}}</view> <view class="text-df {{cell.unitPrice>0?'text-red':(cell.unitPrice<0?'text-green':'text-black')}}" style="flex:1;text-align: center" style="flex:1;text-align: center">{{cell.unitPrice*1000|| 0}}</view>
<view class="text-df {{cell.floatPrice>0?'text-red':(cell.floatPrice<0?'text-green':'text-black')}}" style="flex:1;text-align: center" style="flex:1;text-align: center">{{cell.floatPrice*1000|| 0}}</view> <view class="text-df {{cell.floatPrice>0?'text-red':(cell.floatPrice<0?'text-green':'text-black')}}" style="flex:1;text-align: center" style="flex:1;text-align: center">{{cell.floatPrice*1000|| 0}}</view>
<view class="text-df {{cell.curDeductionPoint>0?'text-red':(cell.curDeductionPoint<0?'text-green':'text-black')}}" style="flex:1;text-align: center" style="flex:1;text-align: center">{{cell.curDeductionPoint|| 0}}</view> <view class="text-df {{cell.curDeductionPoint>0?'text-red':(cell.curDeductionPoint<0?'text-green':'text-black')}}" style="flex:1;text-align: center" style="flex:1;text-align: center">{{cell.curDeductionPoint|| 0}}</view>
<view class="text-df text-balck" style="flex:1;text-align: center">
<view class="text-df text-balck" style="flex:1;text-align: center" id="toDmai" data-fcId="{{item.paperMillId}}" data-paperId="{{cell.categoryId}}" catchtap="toPage">
<view class="son-table-btn">代卖</view> <view class="son-table-btn">代卖</view>
</view> </view>
</view> </view>

29
pages/article/allNewInfo/index.wxss
View File

@ -116,6 +116,7 @@ page {
display: flex; display: flex;
align-items: center; align-items: center;
margin-right: 36.3rpx; margin-right: 36.3rpx;
margin-top: 10rpx
} }
.onDataImg { .onDataImg {
@ -251,4 +252,32 @@ page {
color: rgba(0, 0, 0, 0.60); color: rgba(0, 0, 0, 0.60);
letter-spacing: 2px; letter-spacing: 2px;
margin-right: 35rpx; 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;
} }

10
pages/article/newInfo/index.js
View File

@ -51,7 +51,15 @@ Component({
} }
if(e.currentTarget.id == 'tofeedback'){ if(e.currentTarget.id == 'tofeedback'){
util.navigateTo('/pages/article/feedback/index') 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){ toPageDetails:function(e){
util.navigateTo('/pages/article/detail/index?id='+e.currentTarget.id) util.navigateTo('/pages/article/detail/index?id='+e.currentTarget.id)

46
pages/article/newInfo/index.wxml
View File

@ -4,26 +4,27 @@
<view class="cu-custom" style="height:{{CustomBar}}px;z-index: 99"> <view class="cu-custom" style="height:{{CustomBar}}px;z-index: 99">
<view class="cu-bar fixed " style="height:{{CustomBar}}px;padding-top:{{StatusBar}}rpx;border-bottom:none"> <view class="cu-bar fixed " style="height:{{CustomBar}}px;padding-top:{{StatusBar}}rpx;border-bottom:none">
<view class="content" style="top:{{StatusBar}}rpx;color:black;font-size:36rpx"> <view class="content" style="top:{{StatusBar}}rpx;color:black;font-size:36rpx">
<view slot="content" class="text-white">情报</view>
</view> </view>
<view class="topLeftText" style="margin-top:15rpx">纸厂情报</view>
<view class="topRightText" style="margin-top:15rpx" id="toAllFactory" bindtap="toPage">全部纸厂></view>
</view> </view>
</view> </view>
<view style="width:100%;height:60rpx;" class="topTitle">
<view style="height:15rpx;width:100%"></view>
<view style="width:100%;height:70rpx;background-color:#F4F4F4;" class="topTitle">
<view class="topLeft"> <view class="topLeft">
<view class="topLeftText">纸厂情报</view>
<view class="topLeftTime">
<picker mode="date" value="{{curDate}}" start="2015-09-01" end="2020-09-01" bindchange="curDateChange">
<view class="picker">
{{curDate}}
</view>
</picker>
</view>
<picker mode="date" value="{{curDate}}" start="2015-09-01" end="2020-09-01" bindchange="curDateChange">
<view class="piker">
{{curDate}}
</view>
</picker>
</view> </view>
<view class="topRight">
<view class="topRightText" id="toAllFactory" bindtap="toPage">全部纸厂></view>
<view class="topRightIcon" id='tofeedback' bindtap="toPage">
<image style="width:31.3rpx;height:32.4rpx" src="/assets/info/feedback-white.png"></image>
<view class="topRight" style="color:rgba(0,0,0,0.40);" id='tofeedback' bindtap="toPage">
<view class="topRight-icon">
<image style="width:31.3rpx;height:32.4rpx" src="/assets/info/feedback.png"></image>
</view> </view>
<view class="topRight-text">反馈情报
</view>
</view> </view>
</view> </view>
</view> </view>
@ -48,16 +49,17 @@
<!-- <view class="bg-white" wx:else> --> <!-- <view class="bg-white" wx:else> -->
<view class="bg-white"> <view class="bg-white">
<view wx:for="{{orderList}}" wx:key="index" class="tableStyle"> <view wx:for="{{orderList}}" wx:key="index" class="tableStyle">
<view class="flex flex-justify" style="border-top:2rpx solid #f3f3f3;margin-top:20rpx;padding: 0rpx 40rpx 0rpx 40rpx;">
<view class="flex flex-justify" style="border-top:2rpx solid #f3f3f3;margin-top:20rpx;padding: 0rpx 40rpx 0rpx 40rpx;"
id="toFactoryDetails" data-factoryId="{{item.paperMillId}}" catchtap="toPage">
<!-- <text class="text-df text-balck" style="flex:1;text-align: center">{{item.yesterdayTotalQuantity || 0}}%</text> --> <!-- <text class="text-df text-balck" style="flex:1;text-align: center">{{item.yesterdayTotalQuantity || 0}}%</text> -->
<view class="text-df text-balck" style="flex:1.2">{{item.name}}</view>
<view class="text-df text-balck" style="flex:1.2">{{item.shortName}}</view>
<view class="text-df {{item.biggestFloatPrice>0?'text-red':(item.biggestFloatPrice<0?'text-green':'text-black')}}" style="flex:1;text-align: center">{{item.biggestFloatPrice*1000||0}} </view> <view class="text-df {{item.biggestFloatPrice>0?'text-red':(item.biggestFloatPrice<0?'text-green':'text-black')}}" style="flex:1;text-align: center">{{item.biggestFloatPrice*1000||0}} </view>
<view class="text-df text-balck" style="flex:1;text-align: center">{{item.yesterdayRetainedQuantity || 0}}辆</view> <view class="text-df text-balck" style="flex:1;text-align: center">{{item.yesterdayRetainedQuantity || 0}}辆</view>
<view class="text-df text-balck" style="flex:1;text-align: center">{{item.minimumDeductionPoint || 0}}%</view> <view class="text-df text-balck" style="flex:1;text-align: center">{{item.minimumDeductionPoint || 0}}%</view>
<view class="text-df text-balck" style="flex:0.5;text-align: center" id="{{item.paperMillId}}" bindtap="changeTable" wx:if="{{tableSgin==item.paperMillId}}">
<view class="text-df text-balck" style="flex:0.5;text-align: center" id="{{item.paperMillId}}" catchtap="changeTable" wx:if="{{tableSgin==item.paperMillId}}">
<image style="width:28rpx;height:28rpx;" src="/assets/info/factoryUp.png"></image> <image style="width:28rpx;height:28rpx;" src="/assets/info/factoryUp.png"></image>
</view> </view>
<view class="text-df text-balck" style="flex:0.5;text-align: center" id="{{item.paperMillId}}" bindtap="changeTable" wx:if="{{tableSgin !== item.paperMillId}}">
<view class="text-df text-balck" style="flex:0.5;text-align: center" id="{{item.paperMillId}}" catchtap="changeTable" wx:if="{{tableSgin !== item.paperMillId}}">
<image style="width:28rpx;height:28rpx;" src="/assets/info/factoryDown.png"></image> <image style="width:28rpx;height:28rpx;" src="/assets/info/factoryDown.png"></image>
</view> </view>
</view> </view>
@ -75,7 +77,7 @@
<view class="text-df {{cell.unitPrice>0?'text-red':(cell.unitPrice<0?'text-green':'text-black')}}" style="flex:1;text-align: center" style="flex:1;text-align: center">{{cell.unitPrice*1000|| 0}}</view> <view class="text-df {{cell.unitPrice>0?'text-red':(cell.unitPrice<0?'text-green':'text-black')}}" style="flex:1;text-align: center" style="flex:1;text-align: center">{{cell.unitPrice*1000|| 0}}</view>
<view class="text-df {{cell.floatPrice>0?'text-red':(cell.floatPrice<0?'text-green':'text-black')}}" style="flex:1;text-align: center" style="flex:1;text-align: center">{{cell.floatPrice*1000|| 0}}</view> <view class="text-df {{cell.floatPrice>0?'text-red':(cell.floatPrice<0?'text-green':'text-black')}}" style="flex:1;text-align: center" style="flex:1;text-align: center">{{cell.floatPrice*1000|| 0}}</view>
<view class="text-df {{cell.curDeductionPoint>0?'text-red':(cell.curDeductionPoint<0?'text-green':'text-black')}}" style="flex:1;text-align: center" style="flex:1;text-align: center">{{cell.curDeductionPoint|| 0}}</view> <view class="text-df {{cell.curDeductionPoint>0?'text-red':(cell.curDeductionPoint<0?'text-green':'text-black')}}" style="flex:1;text-align: center" style="flex:1;text-align: center">{{cell.curDeductionPoint|| 0}}</view>
<view class="text-df text-balck" style="flex:1;text-align: center">
<view class="text-df text-balck" style="flex:1;text-align: center" id="toDmai" data-fcId="{{item.paperMillId}}" data-paperId="{{cell.categoryId}}" catchtap="toPage">
<view class="son-table-btn">代卖</view> <view class="son-table-btn">代卖</view>
</view> </view>
</view> </view>
@ -96,7 +98,7 @@
<view class="bottomViewleft"> <view class="bottomViewleft">
<view class="bottomViewleft-top"> <view class="bottomViewleft-top">
<view style="height41rpx;line-height:41rpx;font-size: 24rpx;color: #007AFF;"> <view style="height41rpx;line-height:41rpx;font-size: 24rpx;color: #007AFF;">
<wux-tag id="{{item.millPaperId}}" catchtap="toMill" >
<wux-tag id="{{item.millPaperId}}" catchtap="toMill">
<text style="background-color:#ddd;border-radius: 32rpx;text-align: center;width:25rpx;height:32rpx;line-height:32rpx">#</text> <text style="background-color:#ddd;border-radius: 32rpx;text-align: center;width:25rpx;height:32rpx;line-height:32rpx">#</text>
<text class="text-df" style="margin-left:10rpx">{{item.millPaperName}}</text> <text class="text-df" style="margin-left:10rpx">{{item.millPaperName}}</text>
</wux-tag> </wux-tag>
@ -109,7 +111,7 @@
</view> </view>
</view> </view>
<view class="bottomViewRight"> <view class="bottomViewRight">
<image class="bottomViewRightImg" src="{{item.creatorAvatarUrl}}"></image>
<image class="bottomViewRightImg" src="{{item.imageUrlList[0]}}"></image>
</view> </view>
</view> </view>
</scroll-view>
</scroll-view>

57
pages/article/newInfo/index.wxss
View File

@ -70,7 +70,7 @@ page {
.topRight { .topRight {
width: 50%; width: 50%;
height: 60rpx;
height: 70rpx;
} }
.topLeft { .topLeft {
@ -97,6 +97,7 @@ page {
letter-spacing: 0; letter-spacing: 0;
height: 60rpx; height: 60rpx;
line-height: 60rpx; line-height: 60rpx;
padding-left: 32rpx;
} }
.topRightText { .topRightText {
@ -106,10 +107,27 @@ page {
letter-spacing: 0; letter-spacing: 0;
height: 60rpx; height: 60rpx;
line-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; float: right;
margin-right: 38.5rpx;
height: 70rpx;
display: flex;
align-items: center;
margin-right: 35rpx;
} }
.topRightIcon { .topRightIcon {
height: 60rpx; height: 60rpx;
float: right; float: right;
@ -185,21 +203,46 @@ page {
color: rgba(0, 0, 0, 0.85); color: rgba(0, 0, 0, 0.85);
letter-spacing: 0; 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%; width: 100%;
height: 90rpx; height: 90rpx;
} }
.bottomViewleft-bottem{
.bottomViewleft-bottem {
width: 100%; width: 100%;
height: 33rpx; height: 33rpx;
margin-top: 57rpx; margin-top: 57rpx;
} }
.bottomViewRightImg{
.bottomViewRightImg {
width: 240rpx; width: 240rpx;
height: 180rpx; 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;
} }
Write Preview
Loading…
Cancel
Save