From 3027c7472929742d7bc8d5b3610badbecaee3689 Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Wed, 13 Oct 2021 16:53:14 +0800
Subject: [PATCH] no message

---
 pages/moment/fragment/index.js      |  2 +-
 pages/moment/index.wxs              | 10 +++++++++-
 pages/moment/moment-item/index.wxml | 20 ++++++++++----------
 pages/moment/moment-item/index.wxss |  4 ++++
 4 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/pages/moment/fragment/index.js b/pages/moment/fragment/index.js
index cc04b35..ef9bcaa 100644
--- a/pages/moment/fragment/index.js
+++ b/pages/moment/fragment/index.js
@@ -39,7 +39,7 @@ Component({
   methods: {
     onRestart: function () {
       if(!this.data.firstShow){
-        setTimeout(() => { this.setData({ tabIndex: this.data.tabIndex, tabList: [ '推荐', '关注', '全部' , '资讯'] }) }, 100)
+        setTimeout(() => { this.setData({ tabIndex: this.data.tabIndex, tabList: [ '推荐', '关注', '全部' , '行情'] }) }, 100)
         params.date = util.formatDate(new Date(), 'Y-M-D')
       }
       this.data.firstShow = true
diff --git a/pages/moment/index.wxs b/pages/moment/index.wxs
index 6c2827c..72cd8c1 100644
--- a/pages/moment/index.wxs
+++ b/pages/moment/index.wxs
@@ -83,11 +83,19 @@ function infoColor(time){
   }
 }
 
+function checkPrice(price){
+  if (isEmpty(time)) {
+    return false
+  }
+  return Number(price) !== 0
+}
+
 module.exports = {
   formateDate: formateDate,
   formateText: formateText,
   colorText: colorText,
   floatImage: floatImage,
   infoTime: infoTime,
-  infoColor: infoColor
+  infoColor: infoColor,
+  checkPrice: checkPrice
 }
\ No newline at end of file
diff --git a/pages/moment/moment-item/index.wxml b/pages/moment/moment-item/index.wxml
index fa875f1..a4e083c 100644
--- a/pages/moment/moment-item/index.wxml
+++ b/pages/moment/moment-item/index.wxml
@@ -12,7 +12,7 @@
 	<view style="width: 40%;" bindtap="lookItem">
 	  <view class="flex flex-center">
 		  <text class="text-lg {{moment.colorText(item.typicalFloatingQuotedPrice)}}">{{formate.formatePrice(item.typicalFloatingQuotedPrice, 0) || '- -'}}</text>
-			<image style="height: 24rpx;width: 24rpx;margin-left: 4rpx" src="{{moment.floatImage(item.typicalFloatingQuotedPrice)}}" wx:if="{{item.typicalFloatingQuotedPrice !== 0}}"></image>
+			<image class="float-image" src="{{moment.floatImage(item.typicalFloatingQuotedPrice)}}" wx:if="{{moment.checkPrice(item.typicalFloatingQuotedPrice)}}"></image>
 		</view>
 		<view class="text-gray text-sm" style="margin-top: 4rpx;text-align: center">更新时间:{{moment.formateText(item.latestQuoteTime, 10)}}</view>
 	</view>
@@ -30,25 +30,25 @@
 	</view>
 	<view wx:else>
 		<view class="flex" style="padding-bottom: 16rpx;">
-			<view style="width: 30%;padding-left: 32rpx;">品类</view>
-			<view style="width: 20%;text-align: center">
+			<view style="width: 25%;padding-left: 32rpx;">品类</view>
+			<view style="width: 25%;text-align: center">
 				<text class="text-df" style="color: #555555;">价格</text>
 				<text style="color: #555555;font-size: 20rpx;">(元/吨)</text>
 			</view>
-			<view style="width: 20%;padding-left: 40rpx;">涨跌</view>
+			<view style="width: 20%;padding-left: 24rpx;">涨跌</view>
 			<view style="width: 30%;">
 				<text class="text-df" style="color: #555555;">平均扣点</text>
 				<text style="color: #555555;font-size: 20rpx;">(最近7天)</text>
 			</view>
 		</view>
 		<view class="flex flex-center bg-white item-content" wx:for="{{itemList}}" wx:key="index">
-			<view class="text-df text-black" style="width: 25%;">{{item.categoryName}}</view>
-			<view class="flex flex-center" style="width: 25%;">
-				<text class="text-lg text-red">{{formate.formatePrice(item.quotedPrice, 0) || '- -'}}</text>
-				<text class="cuIcon-refresharrow text-red" style="font-size:12px;margin-left: 4rpx;"></text>
+			<view class="text-df text-black" style="width: 20%;">{{item.categoryName}}</view>
+			<view class="flex flex-center" style="width: 30%;">
+				<text class="text-lg {{moment.colorText(item.floatingQuotedPrice)}}">{{formate.formatePrice(item.quotedPrice, 0) || '- -'}}</text>
+				<image class="float-image" src="{{moment.floatImage(item.floatingQuotedPrice)}}" wx:if="{{moment.checkPrice(item.floatingQuotedPrice)}}"></image>
 			</view>
-			<view class="text-df text-green" style="width: 20%;padding-left: 24rpx;">{{item.floatingQuotedPrice || '- -'}}</view>
-			<view class="text-df text-green" style="width: 10%;">{{item.averageDeductionPoints || '- -'}}</view>
+			<view class="text-df {{moment.colorText(item.floatingQuotedPrice)}}" style="width: 20%;padding-left: 24rpx;">{{item.floatingQuotedPrice || '- -'}}</view>
+			<view class="text-df text-black" style="width: 10%;">{{item.averageDeductionPoints || '- -'}}</view>
 			<wux-button outline round type="positive" size="cate" data-index="{{index}}" bind:click="agentOrder">代卖</wux-button>
 		</view>
 	</view>
diff --git a/pages/moment/moment-item/index.wxss b/pages/moment/moment-item/index.wxss
index 35099ed..cdb43e0 100644
--- a/pages/moment/moment-item/index.wxss
+++ b/pages/moment/moment-item/index.wxss
@@ -22,4 +22,8 @@
 .item-content{
   padding:16rpx 24rpx;
   border-bottom: 1rpx solid #f3f3f3;
+}
+
+.float-image{
+  height: 24rpx;width: 24rpx;margin-left: 4rpx
 }
\ No newline at end of file