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/create.html | 53 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 33 insertions(+), 20 deletions(-)
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/create.html b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/create.html
index 5288dba..ded9a9f 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/create.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/good/goods/create.html
@@ -189,7 +189,7 @@
1銆侀�夋嫨瀵瑰簲鐨勩�愬晢鍝佺被鍨嬨�戯紝灏嗚繘鍏ュSKU璐у搧妯″紡銆傚悓鏃跺鏋滅被鍒湁鍙傛暟锛屼篃灏嗚繘琛屾樉绀鸿缃��<br />
2銆佽缃SKU鍚庯紝鍟嗗搧鏈韩鐨勪环鏍煎彧鍋氬澶栧睍绀虹敤锛屽疄闄呬互杩涘叆鍟嗗搧璇︽儏閫夋嫨涓嶅悓璐у搧涓哄噯銆�<br />
3銆佽揣鍝丼KU缁勫悎灞炴�у�煎彧鏀寔锛氫腑鏂囥�佽嫳鏂囥�佹暟瀛椼�佸ぇ鍐欑鍙凤紝灏忓啓绗﹀彿涓変釜锛�-銆�/銆�.锛夛級<br />
- 4銆佽揣鍙峰繀椤讳负SN瀛楁瘝寮�澶�<br />
+ 4銆佽揣鍝佺紪鐮佸繀椤讳负SN瀛楁瘝寮�澶�<br />
5銆佸鏋滀笉璁剧疆鍗曡揣鍝侀噸閲忥紝灏嗛粯璁や娇鐢ㄥ晢鍝侀噸閲忎负1涓崟浣嶇殑閲嶉噺銆�
</blockquote>-->
@@ -197,7 +197,7 @@
<label for="brandId" class="layui-form-label">浣ｉ噾璁剧疆</label>
<div class="layui-input-inline layui-inline-6" pane>
{{# layui.each(d.data.productsDistributionType, function(index, item){ }}
- <input type="radio" name="goods[productsDistributionType]" value="{{ item.value }}" title="{{ item.description }}" {{item.value===1?'checked="checked"':''}}>
+ <input type="radio" name="goods[productsDistributionType]" value="{{ item.value }}" title="{{ item.description }}" {{item.value===2?'checked="checked"':''}}>
{{# }); }}
</div>
</div>
@@ -456,21 +456,20 @@
<tr>
<th>榛樿璐у搧</th>
<th>鍥剧墖</th>
- <th>璐у彿</th>
+ <th>璐у搧缂栫爜</th>
<th>SKU</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>鎸囧闆跺敭浠�</th>
- <th>缁忛攢鍟嗙敤鎴疯喘涔拌繑鐜�</th>
- <th>鏅�氱敤鎴疯喘涔拌繑鐜�</th>
-
+ <th>缁忛攢鍟嗕环</th>
+ <th>鎴愭湰浠�</th>
+
+ <th style="width: 60px;">鎺ㄥ箍缁忛攢鍟嗛噰璐繑鐜�</th>
+ <th>鎺ㄥ箍鐢ㄦ埛璐拱杩旂幇</th>
+ <th style="width: 80px;">鏄惁鏀寔瀹氬埗</th>
<!-- <th>浜岀骇杩旂幇</th>
- <th>涓夌骇杩旂幇</th> -->
+ <!-- <th>涓夌骇杩旂幇</th> --> -->
<th>鎿嶄綔</th>
</tr>
</thead>
@@ -502,7 +501,7 @@
</div>
</td>
<td>
- <input type="text" name="product[sn][]" value="{{item.sn}}" placeholder="璐у彿" class="layui-input layui-inline-3">
+ <input type="text" name="product[sn][]" value="{{item.sn}}" placeholder="璐у搧缂栫爜" class="layui-input layui-inline-3">
</td>
<td>
<input type="hidden" name="product[spesDesc][]" value="{{item.spesDesc}}" placeholder="SKU" class="layui-input">
@@ -521,6 +520,9 @@
<input type="number" name="product[stock][]" value="{{item.stock}}" placeholder="搴撳瓨" class="layui-input layui-inline-1 goods-stock">
</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[price][]" value="{{item.price}}" placeholder="閿�鍞环" class="layui-input layui-inline-1">
</td>
<td>
@@ -529,14 +531,16 @@
<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[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="checkbox" name="product[isCustomizable][]" value="{{item.isCustomizable||'false'}}" placeholder="鏅�氱敤鎴疯喘涔拌繑鐜�" class="layui-input layui-inline-1"> -->
+ <input type="checkbox" name="product[isCustomizable][]" title="鏀寔|涓嶆敮鎸�" lay-skin="switch" value="{{item.distributionCutMoney||'false'}}" lay-filter="isCustomizable" class="isCustomizable">
</td>
<!-- <td>
<input type="text" name="product[levelTwo][]" value="{{item.levelTwo}}" placeholder="浜岀骇杩旂幇" class="layui-input layui-inline-1">
@@ -1205,7 +1209,7 @@
form.verify({
money: [/((^[1-9]\d*)|^0)(\.\d{0,2}){0,1}$/, '璇疯緭鍏ラ噾棰�'],
verifybn: [/^[\S]{0,30}$/, '鍟嗗搧缂栫爜鏈�澶у彧鍏佽杈撳叆30浣嶅瓧绗︼紝涓斾笉鑳藉嚭鐜扮┖鏍�'],
- verifysn: [/^[\S]{0,30}$/, '璐у彿鏈�澶у彧鍏佽杈撳叆30浣嶅瓧绗︼紝涓斾笉鑳藉嚭鐜扮┖鏍�'],
+ verifysn: [/^[\S]{0,30}$/, '璐у搧缂栫爜鏈�澶у彧鍏佽杈撳叆30浣嶅瓧绗︼紝涓斾笉鑳藉嚭鐜扮┖鏍�'],
verifyname: [/^.{0,200}$/, '鍟嗗搧鍚嶇О鏈�澶у彧鍏佽杈撳叆200浣嶅瓧绗�'],
verifybrief: [/^.{0,255}$/, '鍟嗗搧绠�浠嬫渶澶у彧鍏佽杈撳叆255浣嶅瓧绗�'],
verifyimageIds: [/^[\S]{0,255}$/, '榛樿鍥剧墖 鍥剧墖id鏈�澶у彧鍏佽杈撳叆255浣嶅瓧绗︼紝涓斾笉鑳藉嚭鐜扮┖鏍�'],
@@ -1464,7 +1468,13 @@
}
form.render();
});
-
+
+ // 鐩戝惉寮�鍏冲垏鎹簨浠�
+ form.on('switch(isCustomizable)', function(data){
+ var elem = data.elem; // 褰撳墠寮�鍏冲厓绱�
+ elem.value=true;
+
+ });
function openSpecBox(is_open) {
if (is_open == '0') {
$("input[name=openSpec]").val("1");
@@ -1862,7 +1872,7 @@
//澶氬弬鏁颁骇鍝佸簱鐢熸垚鍒楄〃闆嗗悎
var products = [];
var productsCount = parseInt(field['productsCount']);
- debugger
+
for (var i = 0; i < productsCount; i++) {
var productModel = {};
productModel.costprice = field['product[costprice][' + i + ']'];
@@ -1883,7 +1893,10 @@
productModel.levelThree = field['product[levelThree][' + i + ']'];
productModel.pointsDeduction = field['product[pointsDeduction][' + i + ']'];
productModel.points = field['product[points][' + i + ']'];
+ debugger
//鐧惧垎鍏垫硶娣诲姞
+ productModel.isCustomizable = field['product[isCustomizable][' + 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 + ']'];
--
Gitblit v1.9.1