From 8a4fe681cbca3995707e63b4f4d274ad93e12e22 Mon Sep 17 00:00:00 2001
From: jianweie code <jianweie@live.com>
Date: Tue, 16 Apr 2024 11:56:40 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4=E4=BD=A3=E9=87=91=E6=98=8E=E7=BB=86=E4=B8=8B=E9=9D=A2?=
 =?UTF-8?q?tag=E6=A0=87=E7=AD=BE=EF=BC=8C=E4=BD=BF=E7=94=A8=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E7=BB=9F=E4=B8=80=E7=9A=84=E6=98=AF=E5=90=A6=E7=BB=93?=
 =?UTF-8?q?=E7=AE=97=E6=A0=87=E8=AE=B0=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CoreCms.Net.Model/CoreCms.Net.Model.xml                      | 5 +++++
 .../CoreShop/pages/member/agent/order/order.vue              | 2 +-
 .../CoreShop/pages/member/distribution/order/order.vue       | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CoreCms.Net.Model/CoreCms.Net.Model.xml b/CoreCms.Net.Model/CoreCms.Net.Model.xml
index 69b9c80c..e61b5390 100644
--- a/CoreCms.Net.Model/CoreCms.Net.Model.xml
+++ b/CoreCms.Net.Model/CoreCms.Net.Model.xml
@@ -9706,6 +9706,11 @@
                 每页数据量
             </summary>
         </member>
+        <member name="P:CoreCms.Net.Model.FromBody.FMPageByWhereOrder.order">
+            <summary>
+                排序
+            </summary>
+        </member>
         <member name="P:CoreCms.Net.Model.FromBody.FMPageByWhereOrder.where">
             <summary>
                 判断条件
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/order/order.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/order/order.vue
index d9c87a20..5778385e 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/order/order.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/order/order.vue
@@ -92,7 +92,7 @@
                         <view class="total-box  coreshop-flex coreshop-align-center coreshop-justify-between">
                             <view class="goods-price">
                                 {{ goods.productPrice * goods.productNums }}
-                                <text class="goods-state">未结算</text>
+                                <!--<text class="goods-state">未结算</text>-->
                             </view>
                             <view class="coreshop-flex coreshop-align-center">
                                 <text class="name">佣金：</text>
diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/order/order.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/order/order.vue
index 1e460c77..1ea7024d 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/order/order.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/order/order.vue
@@ -92,7 +92,7 @@
                         <view class="total-box  coreshop-flex coreshop-align-center coreshop-justify-between">
                             <view class="goods-price">
                                 {{ goods.productPrice }}
-                                <text class="goods-state">未结算</text>
+                                <!--<text class="goods-state">未结算</text>-->
                             </view>
                             <view class="coreshop-flex coreshop-align-center">
                                 <text class="name">佣金：</text>