From 715f8c981671b716b5f0d4a742639ce5ecc10709 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=81=E5=8F=B6?= <yerz@shengshi.com.cn>
Date: Thu, 24 Mar 2022 16:14:24 +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  | 77 ++++++++++++++++++++--------
 pages/order/filterList/index2.wxml | 81 +++++++++++++++++++++---------
 2 files changed, 113 insertions(+), 45 deletions(-)

diff --git a/pages/order/filterList/index.wxml b/pages/order/filterList/index.wxml
index e854d2d..30b4aa8 100644
--- a/pages/order/filterList/index.wxml
+++ b/pages/order/filterList/index.wxml
@@ -3,33 +3,70 @@
   <view class="mt30 pl30 pr30">
 
     <block wx:for='{{list}}' wx:key='index'>
-      <view class="inner40 relative ulib-r10 box-shadow-000-10-10 mb30 overflowhidden" bindtap="pushLink" data-url="/pages/order/detail/index{{item.id>=v2OrderId?'2':''}}?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>
+      <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="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 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>
+
+          <block wx:for="{{item.other_data}}" wx:for-index='key' wx:for-item="pin" wx:key='i'>
+            <view class="mt20 fn-clear font-28">
+              <view class="fn-fl color-333">{{key}}</view>
+              <view class="fn-fr wp60 text-nowrap text-right color-666">
+                <block wx:if="{{pin.type=='checkbox'}}">
+                  <block wx:for="{{pin.lists}}" wx:for-index='key' wx:for-item="lable" wx:key='j'>
+                    <view class="inline-block ml10 mr10"><i class="iconfont font-34 mr5 text-middle {{lable.selected?'icon-danxuan_xuanzhong color-36afa2':'icon-danxuan'}}" /><text class="text-middle">{{lable.value}}</text></view>
+                  </block>
+                </block>
+                <block wx:elif="{{pin.type=='text'}}">
+                  <text class="inline-block mr10 pt5 pb5 pl20 pr20 font-22 color-fff ulib-r750" style="background-color:{{pin.bg_color}};" wx:if="{{pin.bg_color}}">{{pin.value}}</text>
+                  <text wx:else>{{pin.value}}</text>
+                </block>
+              </view>
+            </view>
+          </block>
+          <view class="mt20 pt5 pb5 pl20 pr20 bg-f6 font-22 color-666 ulib-rlb750 ulib-rr750" wx:if="{{item.remark}}">注：{{item.remark}}</view>
+
         </view>
-
-        <block wx:for="{{item.other_data}}" wx:for-index='key' wx:for-item='value' wx:key='i'>
-          <view class="mt25 fn-clear font-28" wx:if="{{value}}">
-            <view class="fn-fl color-333">{{key}}</view>
-            <view class="fn-fr wp60 text-nowrap text-right color-666">{{value}}</view>
+      </block>
+      <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>
-        </block>
 
-        <view class="mt20 pt5 pb5 pl20 pr20 bg-f6 font-22 color-666 ulib-rlb750 ulib-rr750" wx:if="{{item.remark}}">注：{{item.remark}}</view>
+          <block wx:for="{{item.other_data}}" wx:for-index='key' wx:for-item='value' wx:key='i'>
+            <view class="mt25 fn-clear font-28" wx:if="{{value}}">
+              <view class="fn-fl color-333">{{key}}</view>
+              <view class="fn-fr wp60 text-nowrap text-right color-666">{{value}}</view>
+            </view>
+          </block>
 
-      </view>
+          <view class="mt20 pt5 pb5 pl20 pr20 bg-f6 font-22 color-666 ulib-rlb750 ulib-rr750" wx:if="{{item.remark}}">注：{{item.remark}}</view>
+
+        </view>
+      </block>
     </block>
     <lcb-listmore isLoading='{{loading}}' isEnd='{{end}}' isNoData='{{noData}}'></lcb-listmore>
   </view>
diff --git a/pages/order/filterList/index2.wxml b/pages/order/filterList/index2.wxml
index 62ed793..30b4aa8 100644
--- a/pages/order/filterList/index2.wxml
+++ b/pages/order/filterList/index2.wxml
@@ -3,39 +3,70 @@
   <view class="mt30 pl30 pr30">
 
     <block wx:for='{{list}}' wx:key='index'>
-      <view class="inner40 relative ulib-r10 box-shadow-000-10-10 mb30 overflowhidden" bindtap="pushLink" data-url="/pages/order/detail/index{{item.id>=v2OrderId?'2':''}}?id={{item.id}}">
+      <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 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>
-        </view>
 
-        <block wx:for="{{item.other_data}}" wx:for-index='key' wx:for-item="pin" wx:key='i'>
-          <view class="mt20 fn-clear font-28">
-            <view class="fn-fl color-333">{{key}}</view>
-            <view class="fn-fr wp60 text-nowrap text-right color-666">
-              <block wx:if="{{pin.type=='checkbox'}}">
-                <block wx:for="{{pin.lists}}" wx:for-index='key' wx:for-item="lable" wx:key='j'>
-                  <view class="inline-block ml10 mr10"><i class="iconfont font-34 mr5 text-middle {{lable.selected?'icon-danxuan_xuanzhong color-36afa2':'icon-danxuan'}}" /><text class="text-middle">{{lable.value}}</text></view>
+          <block wx:for="{{item.other_data}}" wx:for-index='key' wx:for-item="pin" wx:key='i'>
+            <view class="mt20 fn-clear font-28">
+              <view class="fn-fl color-333">{{key}}</view>
+              <view class="fn-fr wp60 text-nowrap text-right color-666">
+                <block wx:if="{{pin.type=='checkbox'}}">
+                  <block wx:for="{{pin.lists}}" wx:for-index='key' wx:for-item="lable" wx:key='j'>
+                    <view class="inline-block ml10 mr10"><i class="iconfont font-34 mr5 text-middle {{lable.selected?'icon-danxuan_xuanzhong color-36afa2':'icon-danxuan'}}" /><text class="text-middle">{{lable.value}}</text></view>
+                  </block>
                 </block>
-              </block>
-              <block wx:elif="{{pin.type=='text'}}">
-                <text class="inline-block mr10 pt5 pb5 pl20 pr20 font-22 color-fff ulib-r750" style="background-color:{{pin.bg_color}};" wx:if="{{pin.bg_color}}">{{pin.value}}</text>
-                <text wx:else>{{pin.value}}</text>
-              </block>
+                <block wx:elif="{{pin.type=='text'}}">
+                  <text class="inline-block mr10 pt5 pb5 pl20 pr20 font-22 color-fff ulib-r750" style="background-color:{{pin.bg_color}};" wx:if="{{pin.bg_color}}">{{pin.value}}</text>
+                  <text wx:else>{{pin.value}}</text>
+                </block>
+              </view>
+            </view>
+          </block>
+          <view class="mt20 pt5 pb5 pl20 pr20 bg-f6 font-22 color-666 ulib-rlb750 ulib-rr750" wx:if="{{item.remark}}">注：{{item.remark}}</view>
+
+        </view>
+      </block>
+      <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>
-        </block>
-        <view class="mt20 pt5 pb5 pl20 pr20 bg-f6 font-22 color-666 ulib-rlb750 ulib-rr750" wx:if="{{item.remark}}">注：{{item.remark}}</view>
 
-      </view>
+          <block wx:for="{{item.other_data}}" wx:for-index='key' wx:for-item='value' wx:key='i'>
+            <view class="mt25 fn-clear font-28" wx:if="{{value}}">
+              <view class="fn-fl color-333">{{key}}</view>
+              <view class="fn-fr wp60 text-nowrap text-right color-666">{{value}}</view>
+            </view>
+          </block>
+
+          <view class="mt20 pt5 pb5 pl20 pr20 bg-f6 font-22 color-666 ulib-rlb750 ulib-rr750" wx:if="{{item.remark}}">注：{{item.remark}}</view>
+
+        </view>
+      </block>
     </block>
     <lcb-listmore isLoading='{{loading}}' isEnd='{{end}}' isNoData='{{noData}}'></lcb-listmore>
   </view>