From 25aab323d4c6405aaf00a1e2076c6ec6f95639e7 Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Fri, 9 Jul 2021 11:00:05 +0800
Subject: [PATCH] no message

---
 pages/process/order-info/index.wxml   | 2 +-
 pages/process/outside-info/index.wxml | 2 +-
 pages/process/outside-list/index.wxml | 4 +++-
 pages/storage/order-info/index.wxml   | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pages/process/order-info/index.wxml b/pages/process/order-info/index.wxml
index 54b40da..675d326 100644
--- a/pages/process/order-info/index.wxml
+++ b/pages/process/order-info/index.wxml
@@ -190,7 +190,7 @@
   <van-button type="info" custom-style="height:88rpx;width:686rpx" bind:click="paymentOrder" wx:if="{{form.status == 42}}">客户结算</van-button>
 </submit-layout>
 
-<view style="border-radius: 50rpx;position:fixed;bottom:160rpx;right:50rpx" wx:if="{{form && (form.status == 3 || form.status == 4 || form.status == 42)}}">
+<view style="border-radius: 50rpx;position:fixed;bottom:{{160 + safeBottom}}rpx;right:50rpx" wx:if="{{form && (form.status == 3 || form.status == 4 || form.status == 42)}}">
   <van-button round bind:click="printOrderInfo" custom-style="width: 100rpx;height: 100rpx;padding-top:12rpx">
     <van-icon name="/assets/image/icon-print.png" size="100rpx"/>
   </van-button>
diff --git a/pages/process/outside-info/index.wxml b/pages/process/outside-info/index.wxml
index f982082..c1261a0 100644
--- a/pages/process/outside-info/index.wxml
+++ b/pages/process/outside-info/index.wxml
@@ -237,7 +237,7 @@
   <van-button type="info" custom-style="height:88rpx;width:300rpx" bind:click="paymentOrder" wx:if="{{form.orderStatus == 42}}">客户结算</van-button>
 </submit-layout>
 
-<view style="border-radius: 50rpx;position: fixed;bottom:160rpx;right:50rpx" wx:if="{{form && form.orderStatus != 6}}">
+<view style="border-radius: 50rpx;position: fixed;bottom:{{160 + safeBottom}}rpx;right:50rpx" wx:if="{{form && form.orderStatus != 6}}">
   <van-button round bind:click="printOrderInfo" custom-style="width: 100rpx;height: 100rpx;padding-top:12rpx">
     <van-icon name="/assets/image/icon-print.png" size="100rpx"/>
   </van-button>
diff --git a/pages/process/outside-list/index.wxml b/pages/process/outside-list/index.wxml
index 4e2df23..c9ac9bd 100644
--- a/pages/process/outside-list/index.wxml
+++ b/pages/process/outside-list/index.wxml
@@ -73,7 +73,9 @@
           <van-button round type="info" custom-style="margin-left:24rpx;height:64rpx;width:180rpx" data-page="{{pageIndex}}" data-index="{{index}}"
             bind:click="lookItem" wx:if="{{item.orderStatus == 3}}">审核订单</van-button>
           <van-button round type="info" custom-style="margin-left:24rpx;height:64rpx;width:160rpx" data-page="{{pageIndex}}" data-index="{{index}}"
-            bind:click="lookItem" wx:if="{{(item.orderStatus == 4 || item.orderStatus == 42) && admin}}">去支付</van-button>
+            bind:click="lookItem" wx:if="{{item.orderStatus == 4 && admin}}">去支付</van-button>
+            <van-button round type="info" custom-style="margin-left:24rpx;height:64rpx;width:160rpx" data-page="{{pageIndex}}" data-index="{{index}}"
+            bind:click="lookItem" wx:if="{{item.orderStatus == 42 && admin}}">去结算</van-button>
           <van-button round plain type="default" custom-style="height:64rpx;width:180rpx" data-id="{{item.orderId}}"
             bind:click="orderLogger" wx:if="{{item.orderStatus == 5 || item.orderStatus == 6}}">查看日志</van-button>
         </view>
diff --git a/pages/storage/order-info/index.wxml b/pages/storage/order-info/index.wxml
index 2852521..8eceb3e 100644
--- a/pages/storage/order-info/index.wxml
+++ b/pages/storage/order-info/index.wxml
@@ -266,7 +266,7 @@
   <van-button type="info" custom-style="height:88rpx;width:686rpx" bind:click="settleForm" wx:if="{{orderInfo.status == 1}}">收款结算</van-button>
 </submit-layout>
 
-<view style="border-radius: 50rpx;position:fixed;bottom:160rpx;right:50rpx" wx:if="{{poundInfo.secondWeight}}">
+<view style="border-radius: 50rpx;position:fixed;bottom:{{160 + safeBottom}}rpx;right:50rpx" wx:if="{{poundInfo.secondWeight}}">
   <van-button round bind:click="printOrderInfo" custom-style="width: 100rpx;height: 100rpx;padding-top:12rpx">
     <van-icon name="/assets/image/icon-print.png" size="100rpx"/>
   </van-button>