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 | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 2241827..d569d87 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/order/orders/details.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/order/orders/details.html
@@ -213,6 +213,7 @@
<th>鍟嗗搧鍚嶇О</th>
<th width="30">鍟嗗搧<br />鍗曚环</th>
<th width="30">璐拱<br />鏁伴噺</th>
+ <th width="50">鏄惁瀹氬埗</th>
<th width="30">淇冮攢<br />閲戦</th>
<th width="40">鍟嗗搧<br />鎬讳环</th>
<th width="110">淇冮攢鍚嶇О</th>
@@ -229,6 +230,11 @@
<td>{{item.name}} - {{item.addon}}</td>
<td>{{item.price}}</td>
<td>{{item.nums}}</td>
+ {{#if (item.isCustomizable == true){}}
+ <td style="color: red;" >鏄�</td>
+ {{#}else{}}
+ <td >鍚�</td>
+ {{#}}}
<td>{{item.promotionAmount}}</td>
<td>{{item.amount}}</td>
<td>
@@ -334,7 +340,7 @@
<th>鏀惰揣浜哄悕</th>
<th>鏀惰揣鐢佃瘽</th>
<th>鏀惰揣鍦板潃</th>
- <th style="width: 60px">鎿嶄綔</th>
+ <th style="width: 60px">鐘舵��</th>
</tr>
</thead>
<tbody>
@@ -348,7 +354,9 @@
<td>{{item.shipMobile}}</td>
<td>{{item.shipAreaIdName}}-{{item.shipAddress}}</td>
<td>
- <button type="button" class="layui-btn layui-btn-warm layui-btn-xs" data-deliveryId="{{item.deliveryId}}" lay-active="refreshDelivery" style="margin-left: 0px">鍚屾鐩存挱璁㈠崟</button>
+
+ {{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