From 8749858003183777cf5881d88cc79fdb8765dbff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=81=E5=8F=B6?= <yerz@shengshi.com.cn>
Date: Fri, 8 Apr 2022 11:48:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/filterList/index.wxml  | 41 +++++++++++++-----------------
 pages/order/filterList/index2.wxml | 41 +++++++++++++-----------------
 pages/order/index.wxml             | 41 +++++++++++++-----------------
 3 files changed, 54 insertions(+), 69 deletions(-)

diff --git a/pages/order/filterList/index.wxml b/pages/order/filterList/index.wxml
index 30b4aa8..62ca0fd 100644
--- a/pages/order/filterList/index.wxml
+++ b/pages/order/filterList/index.wxml
@@ -6,16 +6,21 @@
       <block wx:if="{{item.id>=v2OrderId}}">
         <view class="inner40 relative ulib-r10 box-shadow-000-10-10 mb30 overflowhidden" bindtap="pushLink" data-url="/pages/order/detail/index2?id={{item.id}}">
         <!-- <view class="absolute top-0 left-0 ml40 pt5 pb5 pl10 pr10 bg-36afa2 font-22 color-fff" wx:if="{{item.status_name}}">{{item.status_name}}</view> -->
-          <view class="relative pt10 pb10 pr180">
-            <view class="font-32">
-              <text>{{item.name}}</text>
-              <text>({{item.mobile}})</text>
-            </view>
-            <view class="absolute right-0 box-middle">
-              <view class="inline-block relative img-55x55 bg-333 font-28 color-fff ulib-r750" catchtap="call" data-id="{{item.id}}">
-                <i class="absolute box-center-middle iconfont icon-dianhua"></i>
-              </view>
-            </view>
+          <view class="relative pt10 pb10 color-36afa2" catchtap="pushLink" data-url="/pages/customer/detail/index?id={{item.cus_id}}">
+            <view class="font-32">{{item.name}}({{item.mobile}})</view>
+            <i class="absolute right-0 box-middle iconfont icon-gengduo font-26"></i>
+          </view>
+          <view class="mt20 fn-clear font-28 text-bold" wx:if="{{item.owner_name}}">
+            <view class="fn-fl color-333">车主姓名</view>
+            <view class="fn-fr wp60 text-nowrap text-right color-666">{{item.owner_name}}</view>
+          </view>
+          <view class="mt20 fn-clear font-28 text-bold" wx:if="{{item.owner_mobile}}">
+            <view class="fn-fl color-333">车主电话</view>
+            <view class="fn-fr wp60 text-nowrap text-right color-666">{{item.owner_mobile}}</view>
+          </view>
+          <view class="mt20 fn-clear font-28 text-bold" wx:if="{{item.company}}">
+            <view class="fn-fl color-333">企业名称</view>
+            <view class="fn-fr wp60 text-nowrap text-right color-666">{{item.company}}</view>
           </view>
 
           <block wx:for="{{item.other_data}}" wx:for-index='key' wx:for-item="pin" wx:key='i'>
@@ -41,19 +46,9 @@
       <block wx:else>
         <view class="inner40 relative ulib-r10 box-shadow-000-10-10 mb30 overflowhidden" bindtap="pushLink" data-url="/pages/order/detail/index?id={{item.id}}">
           <view class="absolute top-0 left-0 ml40 pt5 pb5 pl10 pr10 bg-36afa2 font-22 color-fff" wx:if="{{item.status_name}}">{{item.status_name}}</view>
-          <view class="relative pr180">
-            <view class="font-32">
-              <text>{{item.name}}</text>
-              <text>({{item.mobile}})</text>
-            </view>
-            <view class="absolute right-0 box-middle">
-              <view class="inline-block relative img-55x55 bg-333 font-28 color-fff mr30 ulib-r750" catchtap="showMessage" data-id="{{item.id}}">
-                <i class="absolute box-center-middle iconfont icon-duanxinguanli"></i>
-              </view>
-              <view class="inline-block relative img-55x55 bg-333 font-28 color-fff ulib-r750" catchtap="call" data-id="{{item.id}}">
-                <i class="absolute box-center-middle iconfont icon-dianhua"></i>
-              </view>
-            </view>
+          <view class="relative pt10 pb10 color-36afa2" catchtap="pushLink" data-url="/pages/customer/detail/index?id={{item.cus_id}}">
+            <view class="font-32">{{item.name}}({{item.mobile}})</view>
+            <i class="absolute right-0 box-middle iconfont icon-gengduo font-26"></i>
           </view>
 
           <block wx:for="{{item.other_data}}" wx:for-index='key' wx:for-item='value' wx:key='i'>
diff --git a/pages/order/filterList/index2.wxml b/pages/order/filterList/index2.wxml
index 30b4aa8..62ca0fd 100644
--- a/pages/order/filterList/index2.wxml
+++ b/pages/order/filterList/index2.wxml
@@ -6,16 +6,21 @@
       <block wx:if="{{item.id>=v2OrderId}}">
         <view class="inner40 relative ulib-r10 box-shadow-000-10-10 mb30 overflowhidden" bindtap="pushLink" data-url="/pages/order/detail/index2?id={{item.id}}">
         <!-- <view class="absolute top-0 left-0 ml40 pt5 pb5 pl10 pr10 bg-36afa2 font-22 color-fff" wx:if="{{item.status_name}}">{{item.status_name}}</view> -->
-          <view class="relative pt10 pb10 pr180">
-            <view class="font-32">
-              <text>{{item.name}}</text>
-              <text>({{item.mobile}})</text>
-            </view>
-            <view class="absolute right-0 box-middle">
-              <view class="inline-block relative img-55x55 bg-333 font-28 color-fff ulib-r750" catchtap="call" data-id="{{item.id}}">
-                <i class="absolute box-center-middle iconfont icon-dianhua"></i>
-              </view>
-            </view>
+          <view class="relative pt10 pb10 color-36afa2" catchtap="pushLink" data-url="/pages/customer/detail/index?id={{item.cus_id}}">
+            <view class="font-32">{{item.name}}({{item.mobile}})</view>
+            <i class="absolute right-0 box-middle iconfont icon-gengduo font-26"></i>
+          </view>
+          <view class="mt20 fn-clear font-28 text-bold" wx:if="{{item.owner_name}}">
+            <view class="fn-fl color-333">车主姓名</view>
+            <view class="fn-fr wp60 text-nowrap text-right color-666">{{item.owner_name}}</view>
+          </view>
+          <view class="mt20 fn-clear font-28 text-bold" wx:if="{{item.owner_mobile}}">
+            <view class="fn-fl color-333">车主电话</view>
+            <view class="fn-fr wp60 text-nowrap text-right color-666">{{item.owner_mobile}}</view>
+          </view>
+          <view class="mt20 fn-clear font-28 text-bold" wx:if="{{item.company}}">
+            <view class="fn-fl color-333">企业名称</view>
+            <view class="fn-fr wp60 text-nowrap text-right color-666">{{item.company}}</view>
           </view>
 
           <block wx:for="{{item.other_data}}" wx:for-index='key' wx:for-item="pin" wx:key='i'>
@@ -41,19 +46,9 @@
       <block wx:else>
         <view class="inner40 relative ulib-r10 box-shadow-000-10-10 mb30 overflowhidden" bindtap="pushLink" data-url="/pages/order/detail/index?id={{item.id}}">
           <view class="absolute top-0 left-0 ml40 pt5 pb5 pl10 pr10 bg-36afa2 font-22 color-fff" wx:if="{{item.status_name}}">{{item.status_name}}</view>
-          <view class="relative pr180">
-            <view class="font-32">
-              <text>{{item.name}}</text>
-              <text>({{item.mobile}})</text>
-            </view>
-            <view class="absolute right-0 box-middle">
-              <view class="inline-block relative img-55x55 bg-333 font-28 color-fff mr30 ulib-r750" catchtap="showMessage" data-id="{{item.id}}">
-                <i class="absolute box-center-middle iconfont icon-duanxinguanli"></i>
-              </view>
-              <view class="inline-block relative img-55x55 bg-333 font-28 color-fff ulib-r750" catchtap="call" data-id="{{item.id}}">
-                <i class="absolute box-center-middle iconfont icon-dianhua"></i>
-              </view>
-            </view>
+          <view class="relative pt10 pb10 color-36afa2" catchtap="pushLink" data-url="/pages/customer/detail/index?id={{item.cus_id}}">
+            <view class="font-32">{{item.name}}({{item.mobile}})</view>
+            <i class="absolute right-0 box-middle iconfont icon-gengduo font-26"></i>
           </view>
 
           <block wx:for="{{item.other_data}}" wx:for-index='key' wx:for-item='value' wx:key='i'>
diff --git a/pages/order/index.wxml b/pages/order/index.wxml
index 756bbc8..eda66c1 100644
--- a/pages/order/index.wxml
+++ b/pages/order/index.wxml
@@ -37,16 +37,21 @@
       <block wx:if="{{item.id>=v2OrderId}}">
         <view class="inner40 relative ulib-r10 box-shadow-000-10-10 mb30 overflowhidden" bindtap="pushLink" data-url="/pages/order/detail/index2?id={{item.id}}">
         <!-- <view class="absolute top-0 left-0 ml40 pt5 pb5 pl10 pr10 bg-36afa2 font-22 color-fff" wx:if="{{item.status_name}}">{{item.status_name}}</view> -->
-          <view class="relative pt10 pb10 pr180">
-            <view class="font-32">
-              <text>{{item.name}}</text>
-              <text>({{item.mobile}})</text>
-            </view>
-            <view class="absolute right-0 box-middle">
-              <view class="inline-block relative img-55x55 bg-333 font-28 color-fff ulib-r750" catchtap="call" data-id="{{item.id}}">
-                <i class="absolute box-center-middle iconfont icon-dianhua"></i>
-              </view>
-            </view>
+          <view class="relative pt10 pb10 color-36afa2" catchtap="pushLink" data-url="/pages/customer/detail/index?id={{item.cus_id}}">
+            <view class="font-32">{{item.name}}({{item.mobile}})</view>
+            <i class="absolute right-0 box-middle iconfont icon-gengduo font-26"></i>
+          </view>
+          <view class="mt20 fn-clear font-28 text-bold" wx:if="{{item.owner_name}}">
+            <view class="fn-fl color-333">车主姓名</view>
+            <view class="fn-fr wp60 text-nowrap text-right color-666">{{item.owner_name}}</view>
+          </view>
+          <view class="mt20 fn-clear font-28 text-bold" wx:if="{{item.owner_mobile}}">
+            <view class="fn-fl color-333">车主电话</view>
+            <view class="fn-fr wp60 text-nowrap text-right color-666">{{item.owner_mobile}}</view>
+          </view>
+          <view class="mt20 fn-clear font-28 text-bold" wx:if="{{item.company}}">
+            <view class="fn-fl color-333">企业名称</view>
+            <view class="fn-fr wp60 text-nowrap text-right color-666">{{item.company}}</view>
           </view>
 
           <block wx:for="{{item.other_data}}" wx:for-index='key' wx:for-item="pin" wx:key='i'>
@@ -72,19 +77,9 @@
       <block wx:else>
         <view class="inner40 relative ulib-r10 box-shadow-000-10-10 mb30 overflowhidden" bindtap="pushLink" data-url="/pages/order/detail/index?id={{item.id}}">
           <view class="absolute top-0 left-0 ml40 pt5 pb5 pl10 pr10 bg-36afa2 font-22 color-fff" wx:if="{{item.status_name}}">{{item.status_name}}</view>
-          <view class="relative pr180">
-            <view class="font-32">
-              <text>{{item.name}}</text>
-              <text>({{item.mobile}})</text>
-            </view>
-            <view class="absolute right-0 box-middle">
-              <view class="inline-block relative img-55x55 bg-333 font-28 color-fff mr30 ulib-r750" catchtap="showMessage" data-id="{{item.id}}">
-                <i class="absolute box-center-middle iconfont icon-duanxinguanli"></i>
-              </view>
-              <view class="inline-block relative img-55x55 bg-333 font-28 color-fff ulib-r750" catchtap="call" data-id="{{item.id}}">
-                <i class="absolute box-center-middle iconfont icon-dianhua"></i>
-              </view>
-            </view>
+          <view class="relative pt10 pb10 color-36afa2" catchtap="pushLink" data-url="/pages/customer/detail/index?id={{item.cus_id}}">
+            <view class="font-32">{{item.name}}({{item.mobile}})</view>
+            <i class="absolute right-0 box-middle iconfont icon-gengduo font-26"></i>
           </view>
 
           <block wx:for="{{item.other_data}}" wx:for-index='key' wx:for-item='value' wx:key='i'>