From 33b7f328ca612c933d91950cf759476b8798dabd Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Tue, 8 Jun 2021 10:07:41 +0800
Subject: [PATCH] no message

---
 pages/process/order-info/index.wxml   |  2 +-
 pages/process/outside-info/index.js   |  7 +++++--
 pages/process/outside-info/index.wxml |  2 +-
 pages/process/template/index.wxml     | 26 +++++++++++++-------------
 pages/storage/index/index.wxml        |  4 ++--
 5 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/pages/process/order-info/index.wxml b/pages/process/order-info/index.wxml
index 16f97ab..bb30e95 100644
--- a/pages/process/order-info/index.wxml
+++ b/pages/process/order-info/index.wxml
@@ -38,7 +38,7 @@
     <image style="height:42rpx;width:42rpx" src="/assets/image/icon_close.png"></image>
     <view class="text-white text-sg" style="margin-left:12rpx">已关闭</view>
   </view>
-  <template is="agent-info" data="{{form}}" wx:if="{{true}}"></template>
+  <template is="agent-info" data="{{form}}" wx:if="{{agent}}"></template>
   <van-cell>
     <view slot="title" class="flex flex-justify">
       <view class="text-black">客户姓名</view>
diff --git a/pages/process/outside-info/index.js b/pages/process/outside-info/index.js
index 28b1dad..24a1cbb 100644
--- a/pages/process/outside-info/index.js
+++ b/pages/process/outside-info/index.js
@@ -12,6 +12,7 @@ Scene({
    * 页面的初始数据
    */
   data: {
+    agent: 0,
     id: null,
     form: null
   },
@@ -23,6 +24,9 @@ Scene({
       this.data.id = options.id
       this.fetchOrderInfo()
     }
+    if(options.agent){
+      this.data.agent = Number(options.agent)
+    }
     event.on('OrderMessage', this, this.onEvent)
   },
   onEvent: function(message){
@@ -50,10 +54,9 @@ Scene({
           result.data.settleTotalWeight = math.plus(result.data.settleTotalWeight, element.settleWeight)
         }
       }
-      this.setData({ form: result.data, admin: app.userInfo.type && app.userInfo.type.indexOf('ADMIN') >= 0 })
+      this.setData({ form: result.data, admin: app.userInfo.type && app.userInfo.type.indexOf('ADMIN') >= 0, agent: this.data.agent })
     }).catch(err => {
       wx.hideLoading()
-      console.log(err)
       util.showToast(err)
     })
   },
diff --git a/pages/process/outside-info/index.wxml b/pages/process/outside-info/index.wxml
index 20a2cab..18326f8 100644
--- a/pages/process/outside-info/index.wxml
+++ b/pages/process/outside-info/index.wxml
@@ -34,7 +34,7 @@
     <!-- <image style="height:42rpx;width:42rpx" src="/assets/image/icon_close.png"></image> -->
     <view class="text-white text-sg" style="margin-left:12rpx">已取消</view>
   </view>
-  <template is="agent-info" data="{{form}}" wx:if="{{true}}"></template>
+  <template is="agent-info" data="{{form}}" wx:if="{{agent}}"></template>
   <van-cell clickable center>
     <view slot="title" class="flex flex-justify">
       <view class="text-black">客户姓名</view>
diff --git a/pages/process/template/index.wxml b/pages/process/template/index.wxml
index a71494f..d1bea1a 100644
--- a/pages/process/template/index.wxml
+++ b/pages/process/template/index.wxml
@@ -2,8 +2,8 @@
 <wxs module="formate" src="../../formate.wxs"></wxs>
 <template name="agent-info">
   <view class="flex flex-column bg-white" style="height:240rpx;align-items: center">
-    <view class="text-black text-sg" style="margin-top:36rpx">付款金额(元)</view>
-    <view class="text-black text-sl text-bold" style="margin-top:16rpx">{{formate.formateAmount(2000, 2)}}</view>
+    <view class="text-black text-sg" style="margin-top:36rpx">应付总金额(元)</view>
+    <view class="text-black text-sl text-bold" style="margin-top:16rpx">{{formate.formateAmount(receivablePrice, 2)}}</view>
   </view>
   <view class="flex flex-justify bg-white" style="padding: 24rpx 32rpx;border-bottom:1rpx solid #f3f3f3">
     <view class="flex flex-center">
@@ -16,55 +16,55 @@
   <van-cell>
     <view slot="title" class="flex flex-justify">
       <view class="text-black">结算方式</view>
-      <view class="text-gray">固定金额</view>
+      <view class="text-gray">{{settlementMethod == 0 ? '固定金额' : '年化率'}}</view>
     </view>
   </van-cell>
   <van-cell>
     <view slot="title" class="flex flex-justify">
       <view class="text-black">账期(天)</view>
-      <view class="text-gray">8</view>
+      <view class="text-gray">{{settlementPeriod}}</view>
     </view>
   </van-cell>
   <van-cell>
     <view slot="title" class="flex flex-justify">
-      <view class="text-black">账期结算单价(元/吨)</view>
-      <view class="text-gray">固定金额</view>
+      <view class="text-black">{{settlementMethod == 0 ? '账期结算单价(元/吨)' : '账期年化率(%)'}}</view>
+      <view class="text-gray">{{settlementInAccountPeriod}}</view>
     </view>
   </van-cell>
   <van-cell>
     <view slot="title" class="flex flex-justify">
       <view class="text-black">账期费用(元)</view>
-      <view class="text-gray">固定金额</view>
+      <view class="text-gray">{{accountPeriodReceivePrice}}</view>
     </view>
   </van-cell>
   <van-cell>
     <view slot="title" class="flex flex-justify">
-      <view class="text-black">逾期结算单价(元/吨)</view>
-      <view class="text-gray">固定金额</view>
+      <view class="text-black">{{settlementMethod == 0 ? '逾期结算单价(元/吨)' : '逾期年化率(%)'}}</view>
+      <view class="text-gray">{{overdueSettlement}}</view>
     </view>
   </van-cell>
   <van-cell>
     <view slot="title" class="flex flex-justify">
       <view class="text-black">逾期天数(天)</view>
-      <view class="text-gray">8</view>
+      <view class="text-gray">{{overdueDays}}</view>
     </view>
   </van-cell>
   <van-cell>
     <view slot="title" class="flex flex-justify">
       <view class="text-black">逾期金额(元)</view>
-      <view class="text-gray">固定金额</view>
+      <view class="text-gray">{{overduePrice}}</view>
     </view>
   </van-cell>
   <van-cell>
     <view slot="title" class="flex flex-justify">
       <view class="text-black">订单金额(元)</view>
-      <view class="text-gray">固定金额</view>
+      <view class="text-gray">{{formate.formateAmount(form.settleTotalAmount, 2)}}</view>
     </view>
   </van-cell>
   <van-cell>
     <view slot="title" class="flex flex-justify">
       <view class="text-black">应付总金额(元)</view>
-      <view class="text-gray">固定金额</view>
+      <view class="text-gray">{{receivablePrice}}</view>
     </view>
   </van-cell>
   <view style="height:16rpx"></view>
diff --git a/pages/storage/index/index.wxml b/pages/storage/index/index.wxml
index b8152af..7417461 100644
--- a/pages/storage/index/index.wxml
+++ b/pages/storage/index/index.wxml
@@ -2,7 +2,7 @@
 <wxs module="formate" src="../../formate.wxs"></wxs>
 <scroll-view scroll-y style="height: {{height}}rpx;">
  
-  <view style="padding: 0rpx 28rpx;margin-top:24rpx">
+  <!-- <view style="padding: 0rpx 28rpx;margin-top:24rpx">
     <view class="bg-white" style="border-radius: 20rpx;padding: 24rpx 0rpx 8rpx 0rpx">
       <view class="flex flex-justify" style="padding: 0rpx 28rpx">
         <view class="text-black text-sg text-bold">出货统计</view>
@@ -43,7 +43,7 @@
         </view>
       </view>
     </view>
-  </view>
+  </view> -->
 
   <view style="padding: 0rpx 28rpx;margin-top:24rpx">
     <view class="bg-white" style="border-radius: 20rpx;padding: 24rpx 0rpx">