From 5f4384bdab4697cc0a678fb17e55603a91a4750b Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 12 四月 2024 08:44:54 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/baifenbaishop
---
CoreCms.Net.Web.Admin/wwwroot/views/good/goods/edit.html | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/edit.html b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/edit.html
index 19d4c86..d0f84ff 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/edit.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/edit.html
@@ -316,11 +316,14 @@
<th>绉垎鏈�澶�<br />鍙姷閲戦</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>鍐荤粨搴撳瓨</th>
<th>鎿嶄綔</th>
</tr>
@@ -375,13 +378,20 @@
<input type="text" name="product[price][]" value="{{item.price}}" placeholder="閿�鍞环" class="layui-input layui-inline-1">
</td>
<td>
+
+ <input type="text" name="product[distributionPrice][]" value="{{item.distributionPrice||'0'}}" placeholder="缁忛攢鍟嗕环鏍�" class="layui-input layui-inline-1">
+ </td>
+ <td>
<input type="text" name="product[costprice][]" value="{{item.costprice}}" placeholder="鎴愭湰浠�" class="layui-input layui-inline-1">
</td>
<td>
<input type="text" name="product[mktprice][]" value="{{item.mktprice}}" placeholder="鎸囧闆跺敭浠�" class="layui-input layui-inline-1">
</td>
<td>
- <input type="text" name="product[levelOne][]" value="{{item.levelOne}}" placeholder="缁忛攢鍟嗚繑鐜�" class="layui-input layui-inline-1">
+ <input type="text" name="product[distributionCutMoney][]" value="{{item.distributionCutMoney||'0'}}" placeholder="缁忛攢鍟嗚喘涔拌繑鐜�" class="layui-input layui-inline-1">
+ </td>
+ <td>
+ <input type="text" name="product[cutMoney][]" value="{{item.cutMoney||'0'}}" placeholder="鏅�氱敤鎴疯喘涔拌繑鐜�" class="layui-input layui-inline-1">
</td>
<!-- <td>
<input type="text" name="product[levelTwo][]" value="{{item.levelTwo}}" placeholder="浜岀骇杩旂幇" class="layui-input layui-inline-1">
@@ -468,11 +478,11 @@
<div class="layui-input-inline">
<button type="button" class="layui-btn layui-btn-warm layui-btn-sm" lay-active="getGenerateSpecBtn"><i class="layui-icon layui-icon-export"></i>鐢熸垚SKU璐у搧鍒楄〃</button>
</div>
- <div class="layui-input-inline">
+ <!-- <div class="layui-input-inline">
<button type="button" class="aKeySetBtn layui-btn layui-btn-warm layui-btn-sm">
<i class="layui-icon layui-icon-set"></i>涓�閿缃�
</button>
- </div>
+ </div> -->
</div>
</div>
<div id="more_spec"></div>
@@ -1981,7 +1991,12 @@
productModel.levelThree = field['product[levelThree][' + i + ']'];
productModel.pointsDeduction = field['product[pointsDeduction][' + i + ']'];
productModel.points = field['product[points][' + i + ']'];
+ //娣诲姞 鐧惧垎鍏垫硶
+ productModel.distributionPrice = field['product[distributionPrice][' + i + ']'];
+ productModel.distributionCutMoney = field['product[distributionCutMoney][' + i + ']'];
+ productModel.cutMoney = field['product[cutMoney][' + i + ']'];
products.push(productModel);
+
}
//浼氬憳浠锋牸妯″瀷
var gradePrice = [];
--
Gitblit v1.9.1