From 7a3a4f8012a72f80d8dd62064a76655c803da864 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 29 五月 2024 12:42:45 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/baifenbaishop
---
CoreCms.Net.Web.Admin/wwwroot/views/good/goods/details.html | 45 ++++++++++++++++++++++++++++-----------------
1 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/details.html b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/details.html
index c5fc8ff..105ac2c 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/details.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/details.html
@@ -203,18 +203,22 @@
<th>鍥剧墖</th>
<th>璐у彿</th>
<th>SKU</th>
- <th>鍐荤粨搴撳瓨</th>
+
<th>閲嶉噺(鍏�)</th>
- <th>搴撳瓨</th>
- <th><i class="required-color">*</i>閿�鍞环</th>
- <th>鎴愭湰浠�</th>
- <th>缁忛攢鍟嗕环鏍�</th>
- <th>鎸囧闆跺敭浠�</th>
- <th>缁忛攢鍟嗙敤鎴疯喘涔拌繑鐜�</th>
- <th>鏅�氱敤鎴疯喘涔拌繑鐜�</th>
- <!-- <th>涓�绾ц繑鐜�</th>
- <th>浜岀骇杩旂幇</th>
- <th>涓夌骇杩旂幇</th> -->
+ <!-- <th>璧犻�佺Н鍒�</th>
+ <th>绉垎鏈�澶�<br />鍙姷閲戦</th> -->
+ <th>搴撳瓨鏁伴噺</th>
+ <th>鍐荤粨搴撳瓨</th>
+ <th style="width: 60px;">寤鸿闆跺敭浠�</th>
+ <th><i class="required-color">*</i>閿�鍞环</th>
+ <th>缁忛攢鍟嗕环</th>
+ <th>鎴愭湰浠�</th>
+
+ <th style="width: 60px;">鎺ㄥ箍缁忛攢鍟嗛噰璐繑鐜�</th>
+ <th>鎺ㄥ箍鐢ㄦ埛璐拱杩旂幇</th>
+ <th style="width: 80px;">鏀寔瀹氬埗</th>
+ <!-- <th>浜岀骇杩旂幇</th>
+ <!-- <th>涓夌骇杩旂幇</th> --> -->
</tr>
</thead>
<tbody id="productsTbody">
@@ -242,9 +246,7 @@
<td>
{{item.spesDesc}}
</td>
- <td>
- {{item.freezeStock}}
- </td>
+
<td>
{{item.weight}}
</td>
@@ -253,16 +255,20 @@
{{item.stock}}
</td>
<td>
- {{item.price}}
+ {{item.freezeStock}}
</td>
<td>
- {{item.costprice}}
+ {{item.mktprice}}
</td>
+ <td>
+ {{item.price}}
+ </td>
+
<td>
{{item.distributionPrice}}
</td>
<td>
- {{item.mktprice}}
+ {{item.costprice}}
</td>
<td>
{{item.distributionCutMoney}}
@@ -270,6 +276,11 @@
<td>
{{item.cutMoney}}
</td>
+ {{#if (item.isCustomizable == true){}}
+ <td style="color: red;" >鏄�</td>
+ {{#}else{}}
+ <td >鍚�</td>
+ {{#}}}
<!-- <td>
{{item.levelOne}}
</td>
--
Gitblit v1.9.1