From 1ec3b69f8cc1c04252c4418ca02e8893564e7d12 Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Fri, 27 Aug 2021 16:17:29 +0800
Subject: [PATCH] no message

---
 pages/storage/order-info/index.wxml       | 9 ++++++---
 pages/storage/order-info/index.wxss       | 4 ++++
 pages/storage/order-settlement/index.wxml | 4 ++--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/pages/storage/order-info/index.wxml b/pages/storage/order-info/index.wxml
index 3727c32..ff6561b 100644
--- a/pages/storage/order-info/index.wxml
+++ b/pages/storage/order-info/index.wxml
@@ -4,9 +4,12 @@
   <view slot="content">出货详情</view>
 </cu-custom>
 
-<view class="flex flex-center info_status" style="justify-content: flex-start;"  wx:if="{{orderInfo}}">
-  <image style="height:42rpx;width:42rpx" src="/assets/image/icon_payfor.png"></image>
-  <view class="text-white text-sg" style="margin-left:12rpx">{{ statusOrder(orderInfo.status) }}</view>
+<view class="flex flex-justify info_status" wx:if="{{orderInfo}}">
+  <view class="flex flex-center" style="flex: 1;justify-content: flex-start">
+    <image style="height:42rpx;width:42rpx" src="/assets/image/icon_payfor.png"></image>
+    <view class="text-white text-sg" style="margin-left:12rpx">{{ statusOrder(orderInfo.status) }}</view>
+  </view>
+  <view id="refuse" class="text-white text-cancel" wx:if="{{auditable || orderInfo.status == 1}}" bindtap="submitForm">关闭订单</view>
 </view>
 <view wx:if="{{orderInfo.status == 0 || orderInfo.status == 1 || orderInfo.status == 3}}">
   <view wx:if="{{orderInfo}}">
diff --git a/pages/storage/order-info/index.wxss b/pages/storage/order-info/index.wxss
index 67bdb2c..9a786f8 100644
--- a/pages/storage/order-info/index.wxss
+++ b/pages/storage/order-info/index.wxss
@@ -3,4 +3,8 @@
   background-image: linear-gradient(90deg, #FF4D2E 6%, #FF952F 100%);
   height:90rpx;
   padding: 0rpx 32rpx;
+}
+
+.text-cancel{
+  padding: 12rpx 0rpx 12rpx 12rpx
 }
\ No newline at end of file
diff --git a/pages/storage/order-settlement/index.wxml b/pages/storage/order-settlement/index.wxml
index 89988aa..8aa3218 100644
--- a/pages/storage/order-settlement/index.wxml
+++ b/pages/storage/order-settlement/index.wxml
@@ -10,8 +10,8 @@
       <view style="height:30rpx;width:6rpx;background-image: linear-gradient(180deg, #007AFF 0%, #027BFF 15%, #5AABFF 45%, #CAF4FE 100%);"></view>
       <view class="text-black text-sg text-bold" style="margin-left: 12rpx">结算信息</view>
     </view>
-    <view class="text-red text-cancel" style="padding:4rpx 0rpx 4rpx 4rpx" bindtap="closeForm">关闭订单</view>
-    <!-- <van-button type="danger" round custom-style="width:120rpx" size="mini" bind:click="closeForm">关闭订单</van-button> -->
+    <!-- <view class="text-red text-cancel" style="padding:4rpx 0rpx 4rpx 4rpx" bindtap="closeForm">关闭订单</view> -->
+    <van-button type="danger" round custom-style="width:120rpx" size="mini" bind:click="closeForm">关闭订单</van-button>
   </view>
   <van-cell center required clickable is-link arrow-direction="down" bind:click="showCategory">
     <view slot="title" class="flex flex-justify">