From 9173f6e5b34a12c01804676d76842031e9ec6724 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 26 六月 2024 11:52:16 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/baifenbaishop

---
 CoreCms.Net.Web.Admin/wwwroot/views/order/orders/details.html |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/order/orders/details.html b/CoreCms.Net.Web.Admin/wwwroot/views/order/orders/details.html
index aa85068..d569d87 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/order/orders/details.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/order/orders/details.html
@@ -340,7 +340,7 @@
                                 <th>鏀惰揣浜哄悕</th>
                                 <th>鏀惰揣鐢佃瘽</th>
                                 <th>鏀惰揣鍦板潃</th>
-                                <th style="width: 60px">鎿嶄綔</th>
+                                <th style="width: 60px">鐘舵��</th>
                             </tr>
                         </thead>
                         <tbody>
@@ -354,6 +354,8 @@
                                 <td>{{item.shipMobile}}</td>
                                 <td>{{item.shipAreaIdName}}-{{item.shipAddress}}</td>
                                 <td>
+
+                                    {{item.logiCode=="Distributor"? item.distributionAcceptStr??"鏈‘璁ゆ帴鍙楅厤閫�":""}}
                                     <!-- <button type="button" class="layui-btn  layui-btn-warm layui-btn-xs" data-deliveryId="{{item.deliveryId}}" lay-active="refreshDelivery" style="margin-left: 0px">鍚屾鐩存挱璁㈠崟</button> -->
                                 </td>
                             </tr>

--
Gitblit v1.9.1