From 2b006ce94a839db6e11fe261b38a19ef303ad945 Mon Sep 17 00:00:00 2001
From: "DESKTOP-A1SENDA\\HUzy" <472860318@qq.com>
Date: Fri, 9 Apr 2021 09:43:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=83=85=E6=8A=A5=E9=A1=B5=E9=9D=A2UI=E5=AD=97?=
 =?UTF-8?q?=E4=BD=93=E5=A4=A7=E5=B0=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/article/allNewInfo/index.wxml | 135 ++++++++++++++++------------
 pages/article/newInfo/index.wxml    |  17 ++--
 2 files changed, 87 insertions(+), 65 deletions(-)

diff --git a/pages/article/allNewInfo/index.wxml b/pages/article/allNewInfo/index.wxml
index 5e21432..e89d48f 100644
--- a/pages/article/allNewInfo/index.wxml
+++ b/pages/article/allNewInfo/index.wxml
@@ -3,72 +3,93 @@
 <cu-custom bgColor="bg-white" isBack="{{true}}">
 	<view slot="content">全部纸厂</view>
 </cu-custom>
-	<view class="flex flex-justify" style="width:100%;height:80rpx;font-size: 28px;color: rgba(0,0,0,0.65);letter-spacing: 0;padding: 0rpx 32rpx;">
-		<view class="text-df text-gray" style="flex:1;overflow: hidden;">纸厂名称</view>
-		<view class="text-df text-gray flex flex-center" style="flex:1;text-align: center" bindtap="changeSort">
-			<view>价格涨跌</view>
-			<image style="width:30rpx;height:30rpx" src="{{pximg}}"></image>
-		</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 class="flex flex-justify"
+	style="width:100%;height:80rpx;font-size: 28px;color: rgba(0,0,0,0.65);letter-spacing: 0;padding: 0rpx 32rpx;">
+	<view class="text-df text-gray" style="flex:1;overflow: hidden;">纸厂名称</view>
+	<view class="text-df text-gray flex flex-center" style="flex:1;text-align: center" bindtap="changeSort">
+		<view>价格涨跌</view>
+		<image style="width:30rpx;height:30rpx" src="{{pximg}}"></image>
 	</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}}">
-			<view class="load-spinner text-gray" style="margin-bottom:24px" wx:if="{{loading}}" />
-			<image class="onDataImg" src="/assets/info/noData.png" wx:else></image>
-			<view style="font-family: PingFangSC-Medium;font-size: 40rpx;color: #000000;letter-spacing: 0;text-align: left;margin-top:30rpx">{{loading? '正在加载' : '暂无关注'}}</view>
-			<view class="top-nodata-text1">可前往纸厂列表添加关注</view>
-			<view wx:if="{{loading==false}}" class="top-nodata-text2" id="toAttentionFactory" bindtap="toPage">添加关注</view>
-		</view>
-		<!-- <view class="bg-white" wx:else> -->
-		<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 wx:if="{{item.hasFollowed==true}}" class="yesAttention">已关注</view>
-						<view wx:if="{{item.hasFollowed==false}}" class="noAttention">未关注</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}}">
+		<view class="load-spinner text-gray" style="margin-bottom:24px" wx:if="{{loading}}" />
+		<image class="onDataImg" src="/assets/info/noData.png" wx:else></image>
+		<view
+			style="font-family: PingFangSC-Medium;font-size: 40rpx;color: #000000;letter-spacing: 0;text-align: left;margin-top:30rpx">
+			{{loading? '正在加载' : '暂无关注'}}</view>
+		<view class="top-nodata-text1">可前往纸厂列表添加关注</view>
+		<view wx:if="{{loading==false}}" class="top-nodata-text2" id="toAttentionFactory" bindtap="toPage">添加关注</view>
+	</view>
+	<!-- <view class="bg-white" wx:else> -->
+	<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 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
+						style="margin-left:40rpx;">{{ formate.formateDrice(item.unitPrice)}}<text style="font-size: 32rpx;">{{item.biggestFloatPrice>0?'↑':(item.biggestFloatPrice<0?'↓':'')}}</text></text>
+					<text wx:if="{{item.biggestFloatPrice != 0}}"
+						style="margin-left: 12rpx;font-size:22rpx">{{ item.biggestFloatPrice > 0 ? '+' : '' }}{{ formate.formateDrice(item.biggestFloatPrice)}}</text>
+				</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 {{item.biggestFloatPrice>0?'text-red':(item.biggestFloatPrice<0?'text-green':'text-black')}}" style="flex:1">
-						<text style="margin-left:40rpx">{{ formate.formateDrice(item.unitPrice)}}{{item.biggestFloatPrice>0?'↑':(item.biggestFloatPrice<0?'↓':'')}}</text>
-						<text wx:if="{{item.biggestFloatPrice != 0}}" style="margin-left: 12rpx">{{ item.biggestFloatPrice > 0 ? '+' : '' }}{{ formate.formateDrice(item.biggestFloatPrice)}}</text>
+					<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>
-					<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>
-					  <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>
-					  </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/factoryDown.png"></image>
 					</view>
 				</view>
-				<view wx:if="{{tableSgin==item.paperMillId}}" style="width:100%;background-color:#f3f3f3;padding-left:10rpx;padding:10rpx 24rpx 15rpx 24rpx">
-					<view class="flex flex-justify" style="">
-						<view class="text-df text-gray" style="flex:1;text-align: center">品类</view>
-						<view class="text-df text-gray" style="flex:1;text-align: center">价格</view>
-						<view class="text-df text-gray" style="flex:1;text-align: center">涨跌</view>
-						<view class="text-df text-gray" style="flex:1;text-align: center">最近扣点</view>
-						<view class="text-df text-gray" style="flex:1;text-align: center">操作</view>
-					</view>
-					<view class="flex flex-justify" style="margin-top:20rpx" wx:for="{{ item.paperCategoryList }}" wx:for-item="cell" wx:key="index" style="background-color:white;margin-top:10rpx">
-						<view class="text-df {{cell.categoryName>0?'text-red':(cell.categoryName<0?'text-green':'text-black')}}" style="flex:1;text-align: center">{{cell.categoryName|| '---'}}</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">{{formate.formatePrice(cell.unitPrice)}}{{cell.floatPrice>0?'↑':(cell.floatPrice<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">{{formate.formatePrice(cell.floatPrice)}}</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" id="toDmai" data-fcId="{{item.paperMillId}}" data-paperId="{{cell.categoryId}}" catchtap="toPage">
-							<view class="son-table-btn">代卖</view>
-						</view>
+			</view>
+			<view wx:if="{{tableSgin==item.paperMillId}}"
+				style="width:100%;background-color:#f3f3f3;padding-left:10rpx;padding:10rpx 24rpx 15rpx 24rpx">
+				<view class="flex flex-justify" style="">
+					<view class="text-df text-gray" style="flex:1;text-align: center">品类</view>
+					<view class="text-df text-gray" style="flex:1;text-align: center">价格</view>
+					<view class="text-df text-gray" style="flex:1;text-align: center">涨跌</view>
+					<view class="text-df text-gray" style="flex:1;text-align: center">最近扣点</view>
+					<view class="text-df text-gray" style="flex:1;text-align: center">操作</view>
+				</view>
+				<view class="flex flex-justify" style="margin-top:20rpx" wx:for="{{ item.paperCategoryList }}"
+					wx:for-item="cell" wx:key="index" style="background-color:white;margin-top:10rpx">
+					<view class="text-df {{cell.categoryName>0?'text-red':(cell.categoryName<0?'text-green':'text-black')}}"
+						style="flex:1;text-align: center">{{cell.categoryName|| '---'}}</view>
+					<view class="text-df {{cell.floatPrice>0?'text-red':(cell.floatPrice<0?'text-green':'text-black')}}"
+						style="flex:1;text-align: center;">
+						{{formate.formatePrice(cell.unitPrice)}}<text style="font-size:32rpx">{{cell.floatPrice>0?'↑':(cell.floatPrice<0?'↓':'')}}</text></view>
+					<view class="text-df {{cell.floatPrice>0?'text-red':(cell.floatPrice<0?'text-green':'text-black')}}"
+						style="flex:1;text-align: center;font-size:26rpx">{{formate.formatePrice(cell.floatPrice)}}</view>
+					<view
+						class="text-df {{cell.curDeductionPoint>0?'text-red':(cell.curDeductionPoint<0?'text-green':'text-black')}}"
+						style="flex:1;text-align: center">{{cell.curDeductionPoint|| 0}}</view>
+					<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>
 				</view>
 			</view>
 		</view>
-	</scroll-view>
-	<!-- <view class="gzBtn" id="toAttentionPaperFctory" bindtap="toPage">
+	</view>
+</scroll-view>
+<!-- <view class="gzBtn" id="toAttentionPaperFctory" bindtap="toPage">
 		<view class="gzBtnIcon"><image style="width:36rpx;height:36rpx" src="/assets/info/addgzicon.png"></image></view>
 		<view class="gzBtnText">关注纸厂</view>
 	</view> -->
\ No newline at end of file
diff --git a/pages/article/newInfo/index.wxml b/pages/article/newInfo/index.wxml
index 03e90fc..f7f95c4 100644
--- a/pages/article/newInfo/index.wxml
+++ b/pages/article/newInfo/index.wxml
@@ -61,17 +61,17 @@
 					<view
 						class="text-df {{item.biggestFloatPrice>0?'text-red':(item.biggestFloatPrice<0?'text-green':'text-black')}}"
 						style="flex:1">
-						<text
-							style="margin-left:40rpx">{{ formate.formateDrice(item.unitPrice)}}{{item.biggestFloatPrice>0?'↑':(item.biggestFloatPrice<0?'↓':'')}}</text>
+						<text style="margin-left:40rpx">{{ formate.formateDrice(item.unitPrice)}}</text><text
+							style="font-size: 32rpx;">{{item.biggestFloatPrice>0?'↑':(item.biggestFloatPrice<0?'↓':'')}}</text>
 						<text wx:if="{{item.biggestFloatPrice != 0}}"
-							style="margin-left: 12rpx font-size:9rpx">{{ item.biggestFloatPrice > 0 ? '+' : '' }}{{ formate.formateDrice(item.biggestFloatPrice)}}</text>
+							style="margin-left: 12rpx;font-size:22rpx">{{ item.biggestFloatPrice > 0 ? '+' : '-' }}{{ formate.formateDrice(item.biggestFloatPrice)}}</text>
 					</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
-								class="text-df {{item.biggestFloatPrice>0?'text-red':(item.biggestFloatPrice<0?'text-green':'text-black')}}"
+								class="text-df text-balck"
 								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>
@@ -102,11 +102,12 @@
 							style="flex:1;text-align: center">{{cell.categoryName|| '---'}}</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">
-							{{formate.formatePrice(cell.unitPrice)}}{{cell.floatPrice>0?'↑':(cell.floatPrice<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">
-							{{formate.formatePrice(cell.floatPrice)}}</view>
+							{{formate.formatePrice(cell.unitPrice)}}<text
+								style="font-size:32rpx">{{cell.floatPrice>0?'↑':(cell.floatPrice<0?'↓':'')}}</text></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;font-size:24rpx">
+							{{cell.floatPrice>0?'+':'-'}}{{formate.formatePrice(cell.floatPrice)}}</view>
+						<view class="text-df text-balck"
 							style="flex:1;text-align: center" style="flex:1;text-align: center">
 							{{formate.formateDescripe(cell.curDeductionPoint)}}</view>
 						<view class="text-df text-balck" style="flex:1;text-align: center" id="toDmai"