|
@@ -886,27 +886,33 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template'], function
|
|
|
totalStocks += parseInt(spec.discount_stocks || 0);
|
|
|
count++;
|
|
|
});
|
|
|
- var avgDiscount = count > 0 ? (totalDiscount / count).toFixed(1) : '0';
|
|
|
- summaryInfo = '<div class="spec-discount-info text-muted" style="margin-top:5px;">已设置' + count + '个规格,平均' + avgDiscount + '折,共' + totalStocks + '件</div>';
|
|
|
+ var avgDiscount = count > 0 ? (totalDiscount / count).toFixed(1) : '0';
|
|
|
+ summaryInfo = '<div class="spec-discount-info text-muted" style="margin-top:5px;"><i class="fa fa-check-circle text-success"></i> 已设置' + count + '个规格,平均' + avgDiscount + '折,共' + totalStocks + '件</div>';
|
|
|
}
|
|
|
// 再检查existingDiscountData
|
|
|
else if (existingDiscountData[row.id] && existingDiscountData[row.id].specs) {
|
|
|
hasSpec = true;
|
|
|
specBtnText = '规格折扣设置 <span class="label label-success">已设置</span>';
|
|
|
|
|
|
- if (existingDiscountData[row.id].summary) {
|
|
|
- var summary = existingDiscountData[row.id].summary;
|
|
|
- summaryInfo = '<div class="spec-discount-info text-muted" style="margin-top:5px;">已设置' + summary.participate_count + '个规格,平均' + summary.avg_discount + '折,共' + summary.total_stocks + '件</div>';
|
|
|
- }
|
|
|
+ if (existingDiscountData[row.id].summary) {
|
|
|
+ var summary = existingDiscountData[row.id].summary;
|
|
|
+ summaryInfo = '<div class="spec-discount-info text-muted" style="margin-top:5px;"><i class="fa fa-check-circle text-success"></i> 已设置' + summary.participate_count + '个规格,平均' + summary.avg_discount + '折,共' + summary.total_stocks + '件</div>';
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
- var html = '<div class="text-center">' +
|
|
|
- '<a href="javascript:;" class="btn btn-info btn-sm btn-spec-discount" data-id="' + row.id + '">' + specBtnText + '</a>' +
|
|
|
- '<div class="text-muted small" style="margin-top:8px;">请点击设置各规格折扣</div>' +
|
|
|
- summaryInfo +
|
|
|
- '</div>';
|
|
|
-
|
|
|
- return html;
|
|
|
+ var html = '<div class="text-center">' +
|
|
|
+ '<a href="javascript:;" class="btn btn-info btn-sm btn-spec-discount" data-id="' + row.id + '">' + specBtnText + '</a>';
|
|
|
+
|
|
|
+ // 根据是否已设置显示不同的提示语
|
|
|
+ if (hasSpec) {
|
|
|
+ html += '<div class="text-muted small" style="margin-top:8px;">点击可重新设置各规格折扣</div>';
|
|
|
+ } else {
|
|
|
+ html += '<div class="text-muted small" style="margin-top:8px;">请点击设置各规格折扣</div>';
|
|
|
+ }
|
|
|
+
|
|
|
+ html += summaryInfo + '</div>';
|
|
|
+
|
|
|
+ return html;
|
|
|
} else {
|
|
|
var discount = (existingDiscountData[row.id] && existingDiscountData[row.id].discount) ? existingDiscountData[row.id].discount : defaultDiscount;
|
|
|
return '<div class="input-group">' +
|
|
@@ -1076,19 +1082,19 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template'], function
|
|
|
if ($btn.length > 0) {
|
|
|
$btn.html('规格折扣设置 <span class="label label-success">已设置</span>');
|
|
|
|
|
|
- // 显示汇总信息
|
|
|
- if (discountData[goodsId].summary) {
|
|
|
- var summary = discountData[goodsId].summary;
|
|
|
- var infoText = '已设置' + summary.participate_count + '个规格,平均' + summary.avg_discount + '折,共' + summary.total_stocks + '件';
|
|
|
-
|
|
|
- // 检查是否已有汇总信息区域
|
|
|
- var $infoArea = $row.find('.spec-discount-info');
|
|
|
- if ($infoArea.length > 0) {
|
|
|
- $infoArea.text(infoText);
|
|
|
- } else {
|
|
|
- $btn.parent().append('<div class="spec-discount-info text-muted" style="margin-top:5px;">' + infoText + '</div>');
|
|
|
- }
|
|
|
- }
|
|
|
+ // 显示汇总信息
|
|
|
+ if (discountData[goodsId].summary) {
|
|
|
+ var summary = discountData[goodsId].summary;
|
|
|
+ var infoText = '<i class="fa fa-check-circle text-success"></i> 已设置' + summary.participate_count + '个规格,平均' + summary.avg_discount + '折,共' + summary.total_stocks + '件';
|
|
|
+
|
|
|
+ // 检查是否已有汇总信息区域
|
|
|
+ var $infoArea = $row.find('.spec-discount-info');
|
|
|
+ if ($infoArea.length > 0) {
|
|
|
+ $infoArea.html(infoText);
|
|
|
+ } else {
|
|
|
+ $btn.parent().append('<div class="spec-discount-info text-muted" style="margin-top:5px;">' + infoText + '</div>');
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -1213,14 +1219,14 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template'], function
|
|
|
total_stocks: totalStocks
|
|
|
};
|
|
|
|
|
|
- var infoText = '已设置' + summary.participate_count + '个规格,平均' + summary.avg_discount + '折,共' + summary.total_stocks + '件';
|
|
|
-
|
|
|
- var $infoArea = $row.find('.spec-discount-info');
|
|
|
- if ($infoArea.length > 0) {
|
|
|
- $infoArea.text(infoText);
|
|
|
- } else {
|
|
|
- $row.find('.btn-spec-discount').parent().append('<div class="spec-discount-info text-muted" style="margin-top:5px;">' + infoText + '</div>');
|
|
|
- }
|
|
|
+ var infoText = '<i class="fa fa-check-circle text-success"></i> 已设置' + summary.participate_count + '个规格,平均' + summary.avg_discount + '折,共' + summary.total_stocks + '件';
|
|
|
+
|
|
|
+ var $infoArea = $row.find('.spec-discount-info');
|
|
|
+ if ($infoArea.length > 0) {
|
|
|
+ $infoArea.html(infoText);
|
|
|
+ } else {
|
|
|
+ $row.find('.btn-spec-discount').parent().append('<div class="spec-discount-info text-muted" style="margin-top:5px;">' + infoText + '</div>');
|
|
|
+ }
|
|
|
|
|
|
data.summary = summary;
|
|
|
|