From 7e5fa7d3fce3405bb5f5ad05310d86894f396c3b Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Thu, 8 Jul 2021 10:22:56 +0800
Subject: [PATCH] no message

---
 pages/process/outside-list/index.js   | 4 ++++
 pages/process/outside-list/index.wxml | 6 ++++--
 pages/storage/order-list/index.wxml   | 1 +
 pages/storage/pound-list/index.wxml   | 6 +++---
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/pages/process/outside-list/index.js b/pages/process/outside-list/index.js
index ef16172..449cee3 100644
--- a/pages/process/outside-list/index.js
+++ b/pages/process/outside-list/index.js
@@ -138,6 +138,10 @@ Scene({
       })
     })
   },
+  editItem: function (e) {
+    var item = this.data.orderList[e.currentTarget.dataset.page][e.currentTarget.dataset.index]
+    wx.navigateTo({ url: `/pages/process/outside-add/index?id=${item.orderId}` })
+  },
   lookItem: function (e) {
     var item = this.data.orderList[e.currentTarget.dataset.page][e.currentTarget.dataset.index]
     if(item.orderStatus == 0 || item.orderStatus == 1){
diff --git a/pages/process/outside-list/index.wxml b/pages/process/outside-list/index.wxml
index 4ceba00..4e2df23 100644
--- a/pages/process/outside-list/index.wxml
+++ b/pages/process/outside-list/index.wxml
@@ -25,7 +25,7 @@
         <view class="flex flex-justify" style="border-bottom: 1rpx solid #f3f3f3;padding-bottom:16rpx">
           <view class="flex flex-center">
             <van-icon name="/assets/image/icon-logoc.png" size="56rpx"/>
-            <view class="flex flex-center text-sg text-black van-ellipsis text-bold" style="justify-content: flex-start;max-width: 500rpx;">
+            <view class="flex flex-center text-sg text-black van-ellipsis text-bold" style="justify-content: flex-start;max-width: 480rpx;">
               <text style="margin-left:24rpx">{{item.factoryCustomerName}}</text>
               <text wx:if="{{item.status != 1 && item.factoryCustomerMobile}}">-{{item.factoryCustomerMobile}}</text>
             </view>
@@ -63,7 +63,9 @@
           <van-button round plain type="default" custom-style="height:64rpx;width:180rpx" data-id="{{item.orderId}}"
             bind:click="cancelOrder" wx:if="{{item.orderStatus == 0 || item.orderStatus == 1}}">取消订单</van-button>
           <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 == 0}}">查看订单</van-button>
+            bind:click="editItem" wx:if="{{item.orderStatus == 0}}">修改订单</van-button>
+          <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 == 0}}">收货</van-button>
           <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 == 1}}">确认定价</van-button>
           <van-button round plain type="default" custom-style="height:64rpx;width:180rpx" data-id="{{item.orderId}}"
diff --git a/pages/storage/order-list/index.wxml b/pages/storage/order-list/index.wxml
index 2a2b8a6..b7a74f1 100644
--- a/pages/storage/order-list/index.wxml
+++ b/pages/storage/order-list/index.wxml
@@ -20,6 +20,7 @@
       <view style="background-color:#f3f3f3;" wx:if="{{item.tipsTime}}">
         <text class="text-sg" style="line-height:64rpx;padding-left:32rpx">{{item.tipsTime}}</text>
       </view>
+      <view style="background-color:#f3f3f3;height:16rpx" wx:else></view>
       <view class="bg-white" style="border-bottom:1rpx solid #f3f3f3" data-page="{{pageIndex}}" data-index="{{index}}" bindtap="lookItem">
         <view class="flex flex-justify" style="padding:24rpx 32rpx 0rpx 32rpx;">
           <view class="flex">
diff --git a/pages/storage/pound-list/index.wxml b/pages/storage/pound-list/index.wxml
index 075a9e3..5c30683 100644
--- a/pages/storage/pound-list/index.wxml
+++ b/pages/storage/pound-list/index.wxml
@@ -30,15 +30,15 @@
           <view class="text-df" style="color:#028A00" wx:elif="{{item.status == 1}}">已过磅</view>
         </view>
         <view class="flex flex-justify" style="margin-top:12rpx">
-          <view class="text-sm text-black">皮重(公斤)：</view>
+          <view class="text-sm text-black" style="margin-left:80rpx">皮重(公斤)：</view>
           <view class="text-sm text-black">{{formate.minWeight(item.firstWeight, item.secondWeight)}}</view>
         </view>
         <view class="flex flex-justify" style="margin-top:12rpx">
-          <view class="text-sm text-black">毛重(公斤)：</view>
+          <view class="text-sm text-black" style="margin-left:80rpx">毛重(公斤)：</view>
           <view class="text-sm text-black">{{formate.maxWeight(item.firstWeight, item.secondWeight)}}</view>
         </view>
         <view class="flex flex-justify" style="margin-top:12rpx" wx:if="{{item.netWeight}}">
-          <view class="text-sm text-black">净重(公斤)：</view>
+          <view class="text-sm text-black" style="margin-left:80rpx">净重(公斤)：</view>
           <view class="text-sm text-black">{{item.netWeight}}</view>
         </view>
         <view class="flex" style="justify-content: flex-end;margin-top:16rpx">