Commit 52f451f1 by halweg

size

parent 5b86335a
......@@ -146,7 +146,7 @@ class Main extends Generic implements TabInterface
'chart_table',
[
'name' => 'chart_table',
'label' => __('Chart Table'),
'label' => __('Chart Table(英尺)'),
'id' => 'chart_table',
'title' => __('Chart Table'),
'required' => false,
......@@ -155,14 +155,14 @@ class Main extends Generic implements TabInterface
$fieldset->addField(
'type_display',
'select',
'hidden',
[
'name' => 'type_display',
'label' => __('Type Display'),
'id' => 'type_display',
'title' => __('Type Display'),
'values' => $this->_typeDisplay->getOptionArray(),
'required' => true,
'value' => 1,
'required' => false,
]
);
......
......@@ -134,6 +134,6 @@ class Sizechart extends \Magento\Catalog\Block\Product\AbstractProduct
$chartTable = $sizeChart->getData('custom_size');
$chartTableArray = $chartTable;
}
return json_encode($chartTableArray, true);
return json_encode([], true);
}
}
\ No newline at end of file
......@@ -300,7 +300,6 @@
var percent = 2.54;
$.each($(".size-item"), function (x) {
var current = $(this).data('size-item-cm');
console.log(current);
if (type == 'inc') {
var data = (current / percent - 0).toFixed(2);
} else {
......@@ -324,7 +323,8 @@
<div id="chart-details">
<div class="chart-size-switch ">
<input type="hidden" value="">
<span class="chart-size-switch-item -active" data-size-type="cm"><?= __('cm'); ?></span><span data-size-type="inc" class="chart-size-switch-item"><?= __('Inch'); ?></span>
<span data-size-type="inc" class="chart-size-switch-item -active"><?= __('Inch'); ?></span>
<span class="chart-size-switch-item " data-size-type="cm"><?= __('cm'); ?></span>
</div>
<!--全局table已被污染,请使用div模拟表格-->
<div class="table" id="fme_sizechart_table" style="display: table;">
......
......@@ -398,6 +398,9 @@ define([
_getSizeChartData: function (item, value) {
var chartData = this.options.sizeChartData;
if (chartData.length == 0) {
return '';
}
chartData = JSON.parse(chartData);
var len = chartData.length
var currentItem = [];
......@@ -422,7 +425,7 @@ define([
label += currentItem[i]+" : ";
continue;
}
label += option[i] + ' ' + currentItem[i] +"(cm)";
label += option[i] + ' ' + currentItem[i] +"(inc) ";
if (i < labelLen - 1) {
label +=", ";
}
......@@ -600,8 +603,13 @@ define([
}
if (item.id == 137) {
// Create new control
var sizeContent = '<div class="swatch-attribute-selected-option-size-content" style="display:block;">'+
'<span class="'+classes.attributeSelectedOptionLabelClass + '">'+that._getSizeChartData(item, optionConfig[137][item.options[0].id].value)+'</span></div>';
var sizeContentText = that._getSizeChartData(item, optionConfig[137][item.options[0].id].value);
var sizeContent = '';
if (sizeContentText.length > 0) {
sizeContent += '<div class="swatch-attribute-selected-option-size-content" style="display:block;">';
sizeContent += '<span class="'+classes.attributeSelectedOptionLabelClass + '">'+that._getSizeChartData(item, optionConfig[137][item.options[0].id].value)+'</span>';
sizeContent += "</div>";
}
container.append(
'<div class="' + classes.attributeClass + ' ' + item.code + '" ' +
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment