From 8b1e05edc24c6a0d3b024b3221c426c4c9d74f87 Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Wed, 13 Oct 2021 20:39:36 +0800
Subject: [PATCH] no message

---
 pages/agent/agent-item/index.wxml | 18 +++++-------------
 pages/agent/edit/index.js         |  3 +++
 pages/agent/factory/index.wxml    | 14 ++++++--------
 3 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/pages/agent/agent-item/index.wxml b/pages/agent/agent-item/index.wxml
index 263b8a3..7cc5025 100644
--- a/pages/agent/agent-item/index.wxml
+++ b/pages/agent/agent-item/index.wxml
@@ -21,19 +21,11 @@
 				wx:if="{{item.yesterdayTotalQuantity && item.yesterdayTotalQuantity >= 0}}">昨日排队：{{item.yesterdayTotalQuantity}}辆</text>
 			<text wx:else>昨日排队：--</text>
 		</view>
-		<view class="flex flex-justify text-df" style="margin-top:4rpx">
-			<text class="flex">
-				<text class="text-black" wx:if="{{item.proxypaySurcharge}}">代卖费：</text>
-				<text class="text-red" style="font-size:26rpx"
-					wx:if="{{item.proxypaySurcharge}}">{{formate.formatePrice2(item.proxypaySurcharge, kg)}}</text>
-				<text class="text-black" style="margin-left:12rpx" wx:if="{{item.foreignPaybackIntervalString}}">纸厂账期：</text>
-				<text class="text-red" style="font-size:26rpx"
-					wx:if="{{item.foreignPaybackIntervalString}}">{{item.foreignPaybackIntervalString}}</text>
-			</text>
-			<!-- <text class="flex" wx:if="{{item.foreignPaybackIntervalString}}">
-				<text class="text-black">纸厂账期：</text>
-				<text class="text-red">{{item.foreignPaybackIntervalString}}</text>
-			</text> -->
+		<view class="flex text-df" style="margin-top:4rpx;align-items: flex-start">
+			<text class="text-black" wx:if="{{item.proxypaySurcharge}}">代卖费：</text>
+			<text class="text-red" wx:if="{{item.proxypaySurcharge}}">{{formate.formatePrice2(item.proxypaySurcharge, kg)}}</text>
+			<text class="text-black" style="margin-left:32rpx" wx:if="{{item.foreignPaybackIntervalString}}">纸厂账期：</text>
+			<text class="text-red" wx:if="{{item.foreignPaybackIntervalString}}">{{item.foreignPaybackIntervalString}}天</text>
 		</view>
 	</view>
 	<text class="cuIcon-right text-gray" style="font-size:18px"></text>
diff --git a/pages/agent/edit/index.js b/pages/agent/edit/index.js
index 77383cb..6d2dd2a 100644
--- a/pages/agent/edit/index.js
+++ b/pages/agent/edit/index.js
@@ -59,6 +59,9 @@ Page({
         if(result.data.paperCategoryList && result.data.paperCategoryList.length){
           for (let index = 0; index < result.data.paperCategoryList.length; index++) {
             const element = result.data.paperCategoryList[index]
+            if(!element.isAllowOrder || util.isEmpty(element.unitPrice) || Number(element.unitPrice) <= 0){
+              continue
+            }
             if(element.categoryId == options.categoryId){
               if(options.unitPrice){
                 this.data.form.unitPrice = Number(options.unitPrice)
diff --git a/pages/agent/factory/index.wxml b/pages/agent/factory/index.wxml
index 01563e5..57691f2 100644
--- a/pages/agent/factory/index.wxml
+++ b/pages/agent/factory/index.wxml
@@ -19,16 +19,14 @@
 				<text class="text-gray" style="margin: 0rpx 8rpx" wx:if="{{factoryDetail.cumulativeWeight > 0}}">|</text>
 				<text wx:if="{{factoryDetail.cumulativeWeight > 0}}">已代卖：{{factoryDetail.cumulativeWeight}}吨</text>
 				<text class="text-gray" style="margin: 0rpx 8rpx">|</text>
-				<text wx:if="{{factoryDetail.yesterdayTotalQuantity &&factoryDetail.yesterdayTotalQuantity >= 0}}">昨日排队：{{factoryDetail.yesterdayTotalQuantity}}辆</text>
+				<text wx:if="{{factoryDetail.yesterdayTotalQuantity >= 0}}">昨日排队：{{factoryDetail.yesterdayTotalQuantity}}辆</text>
 				<text wx:else>昨日排队：--</text>
 			</view>
-			<view class="flex text-df" style="margin-top:4rpx">
-				<view class="flex" >
-					<text class="text-black" wx:if="{{factoryDetail.proxypaySurcharge}}">代卖费：</text>
-					<text class="text-red" style="font-size:26rpx" wx:if="{{factoryDetail.proxypaySurcharge}}">{{formate.formatePrice2(factoryDetail.proxypaySurcharge, kg)}}</text>
-					<text class="text-black" style="margin-left:12rpx"  wx:if="{{factoryDetail.foreignPaybackIntervalString}}">纸厂账期：</text>
-					<text class="text-red" style="font-size:26rpx"  wx:if="{{factoryDetail.foreignPaybackIntervalString}}">{{factoryDetail.foreignPaybackIntervalString}}</text>
-				</view>
+			<view class="flex text-df flex-justify" style="margin-top:4rpx;align-items: flex-start">
+				<text class="text-black" wx:if="{{factoryDetail.proxypaySurcharge}}">代卖费：</text>
+				<text class="text-red" wx:if="{{factoryDetail.proxypaySurcharge}}">{{formate.formatePrice2(factoryDetail.proxypaySurcharge, kg)}}</text>
+				<text class="text-black" style="margin-left:32rpx"  wx:if="{{factoryDetail.foreignPaybackIntervalString}}">纸厂账期：</text>
+				<text class="text-red" wx:if="{{factoryDetail.foreignPaybackIntervalString}}">{{factoryDetail.foreignPaybackIntervalString}}天</text>
 			</view>
 		</view>
 	</view>