From fe98567b88eb4fbaebc4cd51cf7c6eca0902bec0 Mon Sep 17 00:00:00 2001
From: huziyuan <huziyuan@qniao.cn>
Date: Sat, 6 Feb 2021 14:21:30 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BA=B8=E5=8E=82id=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/article/allNewInfo/index.wxml | 8 ++++----
 pages/article/newInfo/index.wxml    | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pages/article/allNewInfo/index.wxml b/pages/article/allNewInfo/index.wxml
index 9f5bc13..45148a2 100644
--- a/pages/article/allNewInfo/index.wxml
+++ b/pages/article/allNewInfo/index.wxml
@@ -19,7 +19,7 @@
 			<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 class="top-nodata-text2" id="toAttentionFactory" bindtap="toPage">添加关注</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">
@@ -30,15 +30,15 @@
 					<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.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}}" bindtap="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}}" bindtap="changeTable" wx:if="{{tableSgin !== item.paperMillid}}">
+					<view class="text-df text-balck" style="flex:0.5;text-align: center" id="{{item.paperMillId}}" bindtap="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 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>
diff --git a/pages/article/newInfo/index.wxml b/pages/article/newInfo/index.wxml
index 0a65884..8b04ae9 100644
--- a/pages/article/newInfo/index.wxml
+++ b/pages/article/newInfo/index.wxml
@@ -43,7 +43,7 @@
 			<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 class="top-nodata-text2" id="toAttentionFactory" bindtap="toPage">添加关注</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">
@@ -54,15 +54,15 @@
 					<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.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}}" bindtap="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}}" bindtap="changeTable" wx:if="{{tableSgin !== item.paperMillid}}">
+					<view class="text-df text-balck" style="flex:0.5;text-align: center" id="{{item.paperMillId}}" bindtap="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 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>