From 83515b4a900c35b13ea4812876dde1d8a0cee5e8 Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Tue, 23 Mar 2021 09:02:25 +0800
Subject: [PATCH] no message

---
 pages/article/allNewInfo/index.wxml | 14 +++++++++-----
 pages/article/newInfo/index.wxml    | 13 ++++++++-----
 pages/home/index/index.wxml         |  3 +--
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/pages/article/allNewInfo/index.wxml b/pages/article/allNewInfo/index.wxml
index ac63cc4..6f620da 100644
--- a/pages/article/allNewInfo/index.wxml
+++ b/pages/article/allNewInfo/index.wxml
@@ -9,8 +9,8 @@
 			<view>价格涨跌</view>
 			<image style="width:30rpx;height:30rpx" src="{{pximg}}"></image>
 		</view>
-		<view class="text-df text-gray" style="flex:1;text-align: center">纸厂排队</view>
-		<view class="text-df text-gray" style="flex:0.8;text-align:flex-start">最近扣点</view>
+		<view class="text-df text-gray" style="flex:0.8;text-align: center">纸厂排队</view>
+		<view class="text-df text-gray" style="flex:1;text-align:center">最近扣点</view>
 	</view>
 	<scroll-view scroll-y="true" style='height:{{height}}rpx;width:100%;background-color:white'>
 		<view class="img-nodata" style="height:{{height}}rpx" wx:if="{{!orderList.length}}">
@@ -24,7 +24,8 @@
 		<view class="bg-white">
 			<view wx:for="{{orderList}}" wx:key="index" class="tableStyle">
 				<view class="flex flex-justify" style="border-top:2rpx solid #f3f3f3;padding: 0rpx 32rpx;" id="toFactoryDetails" data-factoryId="{{item.paperMillId}}" catchtap="toPage">
-					<view class="text-df text-balck" style="flex:1">{{item.shortName}}
+					<view class="text-df text-balck" style="flex:1">
+						{{item.shortName}}
 						<view wx:if="{{item.hasFollowed==true}}" class="yesAttention">已关注</view>
 						<view wx:if="{{item.hasFollowed==false}}" class="noAttention">未关注</view>
 					</view>
@@ -32,9 +33,12 @@
 						<text style="margin-left:40rpx">{{ formate.formateDrice(item.unitPrice)}}</text>
 						<text wx:if="{{item.biggestFloatPrice != 0}}" style="margin-left: 12rpx">{{ item.biggestFloatPrice > 0 ? '+' : '' }}{{ formate.formateDrice(item.biggestFloatPrice)}}</text>
 					</view>
-					<view class="text-df text-balck" style="flex:1;text-align: center">{{item.yesterdayTotalQuantity || 0}}辆</view>
+					<view class="text-df text-balck" style="flex:0.8;text-align: center">{{item.yesterdayTotalQuantity || 0}}辆</view>
 					<view class="flex flex-center text-df text-balck" style="flex:1;text-align: center">
-						<view style="flex:1.5;text-align: center">{{formate.formateDescripe(item.minimumDeductionPoint)}}</view>
+						<view style="flex:1.5;text-align: center">
+							<view style="line-height:32rpx">{{formate.formateDescripe(item.minimumDeductionPoint)}}</view>
+							<view class="text-gray" style="font-size:24rpx;line-height:32rpx">{{formate.substring(item.priceDate, 0, 10)}}</view>
+						</view>
 						<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>
 					  </view>
diff --git a/pages/article/newInfo/index.wxml b/pages/article/newInfo/index.wxml
index 5a5af8e..c5d7b61 100644
--- a/pages/article/newInfo/index.wxml
+++ b/pages/article/newInfo/index.wxml
@@ -39,8 +39,8 @@
 				<text>价格涨跌</text>
 				<image style="width:24rpx;height:24rpx" src="{{pximg}}"></image>
 			</view>
-			<view class="text-df text-gray" style="flex:1;text-align: center">纸厂排队</view>
-			<view class="text-df text-gray" style="flex:0.8;text-align: center">最近扣点</view>
+			<view class="text-df text-gray" style="flex:0.8;text-align: center">纸厂排队</view>
+			<view class="text-df text-gray" style="flex:1;text-align: center">最近扣点</view>
 		</view>
 
 		<view class="img-nodata" style="height:{{height}}rpx" wx:if="{{!orderList.length}}">
@@ -58,9 +58,12 @@
 						<text style="margin-left:40rpx">{{ formate.formateDrice(item.unitPrice)}}</text>
 						<text wx:if="{{item.biggestFloatPrice != 0}}" style="margin-left: 12rpx">{{ item.biggestFloatPrice > 0 ? '+' : '' }}{{ formate.formateDrice(item.biggestFloatPrice)}}</text>
 					</view>
-					<view class="text-df text-balck" style="flex:1;text-align: center">{{item.yesterdayTotalQuantity || 0}}辆</view>
-					<view class="flex flex-center text-df text-balck" style="flex:0.8;text-align: center">
-						<view style="flex:1.5;text-align: center">{{formate.formateDescripe(item.minimumDeductionPoint)}}</view>
+					<view class="text-df text-balck" style="flex:0.8;text-align: center">{{item.yesterdayTotalQuantity || 0}}辆</view>
+					<view class="flex flex-center text-df text-balck" style="flex:1;text-align: center">
+						<view style="flex:1.5;text-align: center">
+							<view style="line-height:32rpx">{{formate.formateDescripe(item.minimumDeductionPoint)}}</view>
+							<view class="text-gray" style="font-size:24rpx;line-height:32rpx">{{formate.substring(item.priceDate, 0, 10)}}</view>
+						</view>
 						<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>
 					  </view>
diff --git a/pages/home/index/index.wxml b/pages/home/index/index.wxml
index d8caec2..3eadfcb 100644
--- a/pages/home/index/index.wxml
+++ b/pages/home/index/index.wxml
@@ -23,8 +23,7 @@
 			<view class="topIconRight">
 				<view class="topIconRightIcon1" id="message" is-link bindtap="toPage">
 					<image class="RightIcon1Img" src="/assets/myinfo/messageWhite.png"></image>
-					<wux-badge count="{{messageNumber}}" top="-56" right="4">
-					</wux-badge>
+					<wux-badge count="{{messageNumber}}" top="-56" right="4"></wux-badge>
 				</view>
 				<view class="topIconRightIcon2" id="setting" is-link bindtap="toPage">
 					<image class="RightIcon1Img" src="/assets/myinfo/seticon.png"></image>