From 674635d17ec3b63a75f86219356ea22e8edca81d Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Mon, 22 Mar 2021 13:57:20 +0800
Subject: [PATCH] no message

---
 pages/article/allNewInfo/index.wxml | 2 +-
 pages/article/newInfo/index.wxml    | 4 ++--
 pages/formate.wxs                   | 9 ++++++++-
 pages/withdrawal/vcheckout/index.js | 2 +-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/pages/article/allNewInfo/index.wxml b/pages/article/allNewInfo/index.wxml
index 96c48ce..ac63cc4 100644
--- a/pages/article/allNewInfo/index.wxml
+++ b/pages/article/allNewInfo/index.wxml
@@ -34,7 +34,7 @@
 					</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:1;text-align: center">
-						<view style="flex:1.5;text-align: center">{{item.minimumDeductionPoint || 0}}%</view>
+						<view style="flex:1.5;text-align: center">{{formate.formateDescripe(item.minimumDeductionPoint)}}</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 da17b94..5a5af8e 100644
--- a/pages/article/newInfo/index.wxml
+++ b/pages/article/newInfo/index.wxml
@@ -60,7 +60,7 @@
 					</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">{{item.minimumDeductionPoint || 0}}%</view>
+						<view style="flex:1.5;text-align: center">{{formate.formateDescripe(item.minimumDeductionPoint)}}</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>
@@ -82,7 +82,7 @@
 						<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.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.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">{{formate.formateDescripe(cell.curDeductionPoint)}}</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>
diff --git a/pages/formate.wxs b/pages/formate.wxs
index 7850f2c..ba36ad8 100644
--- a/pages/formate.wxs
+++ b/pages/formate.wxs
@@ -87,6 +87,12 @@ var numberUtil = {
       return str.substring(start, end)
     }
     return ''
+  },
+  formateDescripe: function (value) {
+    if (typeof(value) == 'number') {
+      return value + '%'
+    }
+    return '- -'
   }
 }
 
@@ -103,5 +109,6 @@ module.exports = {
   formatePrice2: numberUtil.formatePrice2,
   substring: numberUtil.substring,
   forWeight: numberUtil.forWeight,
-  formateDrice: numberUtil.formateDrice
+  formateDrice: numberUtil.formateDrice,
+  formateDescripe: numberUtil.formateDescripe,
 }
\ No newline at end of file
diff --git a/pages/withdrawal/vcheckout/index.js b/pages/withdrawal/vcheckout/index.js
index b0f5479..b7f36e1 100644
--- a/pages/withdrawal/vcheckout/index.js
+++ b/pages/withdrawal/vcheckout/index.js
@@ -64,7 +64,7 @@ Page({
       this.data.sumMoney = 0
       if(result.data.orderWithdrawalList){
         for (let index = 0; index < result.data.orderWithdrawalList.length; index++) {
-          const element = result.data[index]
+          const element = result.data.orderWithdrawalList[index]
           if(element.status == 0){
             this.data.sumMoney = math.plus(this.data.sumMoney, element.money)
           }