From d46000efc7ace4892d95eaaf59897a4ef63d6c62 Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Tue, 6 Jul 2021 15:07:26 +0800
Subject: [PATCH] icon

---
 pages/process/check-list/index.wxml   |  4 +-
 pages/process/order-list/index.wxml   | 46 +++++++++---------
 pages/process/order-list/index.wxss   |  7 +++
 pages/process/outside-list/index.js   |  6 +++
 pages/process/outside-list/index.json |  1 +
 pages/process/outside-list/index.wxml | 67 ++++++++++++++++++++-------
 pages/process/outside-list/index.wxss |  9 +++-
 pages/process/payment-list/index.wxml |  6 +--
 8 files changed, 102 insertions(+), 44 deletions(-)

diff --git a/pages/process/check-list/index.wxml b/pages/process/check-list/index.wxml
index 227bb82..55f4d20 100644
--- a/pages/process/check-list/index.wxml
+++ b/pages/process/check-list/index.wxml
@@ -21,7 +21,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 textt-bold" style="max-width: 360rpx;">
+            <view class="flex flex-center text-sg text-black van-ellipsis text-bold" style="justify-content: flex-start;max-width: 500rpx;">
               <text style="margin-left:24rpx">{{item.factoryCustomerName}}</text>
               <text wx:if="{{item.status != 1 && item.factoryCustomerMobile}}">-{{item.factoryCustomerMobile}}</text>
             </view>
@@ -55,7 +55,7 @@
           <view class="text-sm text-black">结算金额(元)：</view>
           <view class="text-sm text-black">{{item.settlePrice}}</view>
         </view>
-        <view class="flex" style="justify-content: flex-end;margin-top:12rpx">
+        <view class="flex" style="justify-content: flex-end;margin-top:16rpx">
           <van-button round plain type="default" custom-style="height:64rpx;width:180rpx" data-id="{{item.id}}"
             bind:click="cancelOrder" wx:if="{{item.status == 1}}">取消订单</van-button>
           <van-button round type="info" custom-style="margin-left:24rpx;height:64rpx;width:132rpx" data-id="{{item.id}}"
diff --git a/pages/process/order-list/index.wxml b/pages/process/order-list/index.wxml
index 3cfb6a0..9194c47 100644
--- a/pages/process/order-list/index.wxml
+++ b/pages/process/order-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 textt-bold" style="max-width: 360rpx;">
+            <view class="flex flex-center text-sg text-black van-ellipsis text-bold" style="justify-content: flex-start;max-width: 500rpx;">
               <text style="margin-left:24rpx">{{item.factoryCustomerName}}</text>
               <text wx:if="{{item.status != 1 && item.factoryCustomerMobile}}">-{{item.factoryCustomerMobile}}</text>
             </view>
@@ -39,27 +39,31 @@
           <view class="text-df" style="color:#028A00" wx:elif="{{item.status == 5}}">已完成</view>
           <view class="text-df text-gray" wx:elif="{{item.status == 6}}">已关闭</view>
         </view>
-        <view class="flex flex-justify" style="margin-top:12rpx" wx:if="{{item.productName}}">
-          <view class="text-sm text-black">品类：</view>
-          <view class="text-sm text-black">{{item.productName}}</view>
-        </view>
-        <view class="flex flex-justify" style="margin-top:12rpx" wx:if="{{item.totalWeight}}">
-          <view class="text-sm text-black">毛重(公斤)：</view>
-          <view class="text-sm text-black">{{item.totalWeight}}</view>
-        </view>
-        <view class="flex flex-justify" style="margin-top:12rpx" wx:if="{{item.settleWeight}}">
-          <view class="text-sm text-black">结算重量(公斤)：</view>
-          <view class="text-sm text-black">{{item.settleWeight}}</view>
-        </view>
-        <view class="flex flex-justify" style="margin-top:12rpx" wx:if="{{item.unitPrice}}">
-          <view class="text-sm text-black">单价(元/公斤)：</view>
-          <view class="text-sm text-black">{{item.unitPrice}}</view>
-        </view>
-        <view class="flex flex-justify" style="margin-top:12rpx" wx:if="{{item.settlePrice}}">
-          <view class="text-sm text-black">结算金额(元)：</view>
-          <view class="text-sm text-black">{{item.settlePrice}}</view>
+        <view style="position:relative">
+          <view class="flex flex-justify" style="margin-top:12rpx" wx:if="{{item.productName}}">
+            <view class="text-sm text-black">品类：</view>
+            <view class="text-sm text-black">{{item.productName}}</view>
+          </view>
+          <view class="flex flex-justify" style="margin-top:12rpx" wx:if="{{item.totalWeight}}">
+            <view class="text-sm text-black">毛重(公斤)：</view>
+            <view class="text-sm text-black">{{item.totalWeight}}</view>
+          </view>
+          <view class="flex flex-justify" style="margin-top:12rpx" wx:if="{{item.settleWeight}}">
+            <view class="text-sm text-black">结算重量(公斤)：</view>
+            <view class="text-sm text-black">{{item.settleWeight}}</view>
+          </view>
+          <view class="flex flex-justify" style="margin-top:12rpx" wx:if="{{item.unitPrice}}">
+            <view class="text-sm text-black">单价(元/公斤)：</view>
+            <view class="text-sm text-black">{{item.unitPrice}}</view>
+          </view>
+          <view class="flex flex-justify" style="margin-top:12rpx" wx:if="{{item.settlePrice}}">
+            <view class="text-sm text-black">结算金额(元)：</view>
+            <view class="text-sm text-black">{{item.settlePrice}}</view>
+          </view>
+          <image class="item-icon" src="/assets/image/icon-finish.png" wx:if="{{item.status == 5}}"></image>
+          <!-- <image class="item-icon" src="/assets/image/icon-delete.png" wx:if="{{item.status == 6}}"></image> -->
         </view>
-        <view class="flex" style="justify-content: flex-end;margin-top:12rpx">
+        <view class="flex" style="justify-content: flex-end;margin-top:16rpx">
           <van-button round plain type="default" custom-style="height:64rpx;width:180rpx" data-id="{{item.id}}"
             bind:click="cancelOrder" wx:if="{{item.status == 1}}">取消订单</van-button>
           <van-button round type="info" custom-style="margin-left:24rpx;height:64rpx;width:132rpx" data-id="{{item.id}}"
diff --git a/pages/process/order-list/index.wxss b/pages/process/order-list/index.wxss
index 42787bf..773887b 100644
--- a/pages/process/order-list/index.wxss
+++ b/pages/process/order-list/index.wxss
@@ -3,4 +3,11 @@
   padding: 20rpx 32rpx 20rpx 0rpx;
   margin-left:32rpx;
   align-items: flex-start;
+}
+.item-icon{
+  width:120rpx;
+  height:120rpx;
+  position:absolute;
+  right:200rpx;
+  top:0rpx;
 }
\ No newline at end of file
diff --git a/pages/process/outside-list/index.js b/pages/process/outside-list/index.js
index a5c28b0..ef16172 100644
--- a/pages/process/outside-list/index.js
+++ b/pages/process/outside-list/index.js
@@ -152,6 +152,12 @@ Scene({
       wx.navigateTo({ url: `/pages/process/outside-info/index?id=${item.orderId}` })
     }
   },
+  orderLogger: function(e){
+    wx.navigateTo({url: `/pages/process/order-logger/index?type=1&orderId=${e.currentTarget.dataset.id}` })
+  },
+  repriceOrder: function(e){
+    wx.navigateTo({ url: `/pages/process/outside-check/index?id=${e.currentTarget.dataset.id}` })
+  },
   addOutside: function(e){
     wx.navigateTo({ url: '/pages/process/outside-add/index' })
   },
diff --git a/pages/process/outside-list/index.json b/pages/process/outside-list/index.json
index 5cc328a..e757706 100644
--- a/pages/process/outside-list/index.json
+++ b/pages/process/outside-list/index.json
@@ -2,6 +2,7 @@
   "usingComponents": {
     "refresh-view": "/components/refresh-view/index",
     "van-button": "/components/button/index",
+    "van-icon": "/components/icon/index",
     "van-index-bar": "/components/index-bar/index",
     "van-index-anchor": "/components/index-anchor/index",
     "van-tabs": "/components/tabs/index",
diff --git a/pages/process/outside-list/index.wxml b/pages/process/outside-list/index.wxml
index df892a8..11a802b 100644
--- a/pages/process/outside-list/index.wxml
+++ b/pages/process/outside-list/index.wxml
@@ -20,27 +20,60 @@
       <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="item-content" data-page="{{pageIndex}}" data-index="{{index}}" bindtap="lookItem">
-        <view class="flex flex-justify">
-          <view class="flex flex-center van-ellipsis" style="max-width:560rpx;justify-content: flex-start">
-            <text>{{item.factoryCustomerName}}</text>
-            <!-- <text wx:if="{{item.factoryCustomerMobile}}">({{item.factoryCustomerMobile}})</text> -->
+        <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;">
+              <text style="margin-left:24rpx">{{item.factoryCustomerName}}</text>
+              <text wx:if="{{item.status != 1 && item.factoryCustomerMobile}}">-{{item.factoryCustomerMobile}}</text>
+            </view>
           </view>
-          <view class="flex" >
-            <view class="text-df" style="color:#FA541C" wx:if="{{item.orderStatus == 0}}">待收货</view>
-            <view class="text-df" style="color:#028A00" wx:elif="{{item.orderStatus == 1}}">待定价</view>
-            <view class="text-df" style="color:#028A00" wx:elif="{{item.orderStatus == 3}}">过磅待审核</view>
-            <view class="text-df" style="color:#028A00" wx:elif="{{item.orderStatus == 4}}">待付款</view>
-            <view class="text-df" style="color:#028A00" wx:elif="{{item.orderStatus == 41}}">代付中</view>
-            <view class="text-df" style="color:#028A00" wx:elif="{{item.orderStatus == 42}}">待结算</view>
-            <view class="text-df" style="color:#028A00" wx:elif="{{item.orderStatus == 5}}">已完成</view>
-            <view class="text-df" style="color:#999999" wx:elif="{{item.orderStatus == 6}}">已取消</view>
+          <view class="text-df" style="color:#FA541C" wx:if="{{item.orderStatus == 0}}">待收货</view>
+          <view class="text-df" style="color:#028A00" wx:elif="{{item.orderStatus == 1}}">待定价</view>
+          <view class="text-df" style="color:#028A00" wx:elif="{{item.orderStatus == 3}}">过磅待审核</view>
+          <view class="text-df" style="color:#028A00" wx:elif="{{item.orderStatus == 4}}">待付款</view>
+          <view class="text-df" style="color:#028A00" wx:elif="{{item.orderStatus == 41}}">代付中</view>
+          <view class="text-df" style="color:#028A00" wx:elif="{{item.orderStatus == 42}}">待结算</view>
+          <view class="text-df" style="color:#028A00" wx:elif="{{item.orderStatus == 5}}">已完成</view>
+          <view class="text-df" style="color:#999999" wx:elif="{{item.orderStatus == 6}}">已取消</view>
+        </view>
+        <view style="position:relative">
+          <view class="flex flex-justify" style="margin-top:12rpx" wx:if="{{item.productCategoryName}}">
+            <view class="text-sm text-black">品类：</view>
+            <view class="text-sm text-black">{{item.productCategoryName}}</view>
+          </view>
+          <view class="flex flex-justify" style="margin-top:12rpx" wx:if="{{item.plateNumber}}">
+            <view class="text-sm text-black">车牌号码：</view>
+            <view class="text-sm text-black">{{item.plateNumber || ''}}</view>
+          </view>
+          <view class="flex flex-justify" style="margin-top:12rpx" wx:if="{{item.settleWeight}}">
+            <view class="text-sm text-black">结算重量(公斤)：</view>
+            <view class="text-sm text-black">{{item.settleWeight}}</view>
+          </view>
+          <view class="flex flex-justify" style="margin-top:12rpx" wx:if="{{item.settlePrice}}">
+            <view class="text-sm text-black">结算金额(元)：</view>
+            <view class="text-sm text-black">{{item.settlePrice}}</view>
           </view>
+          <image class="item-icon" src="/assets/image/icon-finish.png" wx:if="{{item.orderStatus == 5}}"></image>
+          <image class="item-icon" src="/assets/image/icon-delete.png" wx:if="{{item.orderStatus == 6}}"></image>
         </view>
-        <view class="flex flex-justify" style="margin-top:12rpx">
-          <view class="text-sm text-gray">车牌号码：{{item.plateNumber || ''}}</view>
-          <view class="text-sm text-gray">品类：{{item.productCategoryName}}</view>
-          <!-- <view class="text-sm text-gray">金额：{{item.settlePrice}}元</view> -->
+        <view class="flex" style="justify-content: flex-end;margin-top:16rpx">
+          <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>
+          <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}}"
+            bind:click="repriceOrder" wx:if="{{item.orderStatus == 3}}">重新定价</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 == 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>
+          <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>
       </view>
     </view>
diff --git a/pages/process/outside-list/index.wxss b/pages/process/outside-list/index.wxss
index bc19567..06b8159 100644
--- a/pages/process/outside-list/index.wxss
+++ b/pages/process/outside-list/index.wxss
@@ -1,7 +1,14 @@
 /* pages/process/order-list/index.wxss */
 .item-content{
   padding: 20rpx 32rpx 20rpx 0rpx;
-  border-bottom:1rpx solid #f3f3f3;
   margin-left:32rpx;
   align-items: flex-start;
+}
+
+.item-icon{
+  width:120rpx;
+  height:120rpx;
+  position:absolute;
+  right:200rpx;
+  top:0rpx;
 }
\ No newline at end of file
diff --git a/pages/process/payment-list/index.wxml b/pages/process/payment-list/index.wxml
index 58fc89f..ea3034e 100644
--- a/pages/process/payment-list/index.wxml
+++ b/pages/process/payment-list/index.wxml
@@ -22,7 +22,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 textt-bold" style="max-width: 360rpx;">
+            <view class="flex flex-center text-sg text-black van-ellipsis text-bold" style="justify-content: flex-start;max-width: 500rpx;">
               <text style="margin-left:24rpx">{{item.factoryCustomerName}}</text>
               <text wx:if="{{item.status != 1 && item.factoryCustomerMobile}}">-{{item.factoryCustomerMobile}}</text>
             </view>
@@ -56,9 +56,9 @@
           <view class="text-sm text-black">结算金额(元)：</view>
           <view class="text-sm text-black">{{item.settlePrice}}</view>
         </view>
-        <view class="flex" style="justify-content: flex-end;margin-top:12rpx">
+        <view class="flex" style="justify-content: flex-end;margin-top:16rpx">
           <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.status == 4 && admin}}">去支付</van-button>
+            bind:click="lookItem" wx:if="{{(item.status == 4 || item.status == 42) && admin}}">去支付</van-button>
         </view>
       </view>
     </view>