fe / yohobuy-portal-fe2 · Commits

Go to a project

Authored by xuhongyun
Commit 8e19a3ec7f2f15167a24423404ece7962045a942 1 parent ff2499e8

build

Inline Side-by-side
Showing 4 changed files with 18 additions and 27 deletions
... ... @@ -566,9 +566,11 @@ webpackJsonp([33],[
});
});
}
if(_count>0){
return "同一颜色包含两组相同尺码";
}
// 食品类目支持同一skc包括相同sku
//if(_count>0){
// return "同一颜色包含两组相同尺码";
//}
if(map3.length>0){
var len=map3.length;
map3=map3.filter(function(item){
... ...
... ... @@ -265,7 +265,11 @@ webpackJsonp([48],[
html += '<strong>类目：</strong>' + sortName + '</br>';
html += '<strong>店铺：</strong>' + item.shopName + '</br>';
html += '<strong>经营模式：</strong>' + (item.sellType ? item.sellType : '') + '</br>';
html += '<strong>可售平台：</strong>' + (ENUM.salePlatform[item.salePlatform] ? ENUM.salePlatform[item.salePlatform] : '');
html += '<strong>可售平台：</strong>' + (ENUM.salePlatform[item.salePlatform] ? ENUM.salePlatform[item.salePlatform] : '') + '</br>';
if (typeof(item.foodWarning) != "undefined"){
html += '<strong>保质期：</strong>' + item.foodWarning + '</br>';
}
return html;
}
}, {
... ...
... ... @@ -37,7 +37,10 @@ module.exports={
{name: 'limitProductType', type: 'Number'},
{name: 'activityId', type: 'Number'},
{name: 'channelType', type: 'Number'},
{name: 'helpLimit', type: 'Number'}
{name: 'helpLimit', type: 'Number'},
{name: 'showTimeStr', type: 'String'},
{name: 'isApp', type: 'String'},
{name: 'isNew', type: 'String'}
]
},
updateLimitProduct:{
... ... @@ -62,7 +65,10 @@ module.exports={
{name: 'activityId', type: 'Number'},
{name: 'limitProductTips', type: 'String'},
{name: 'channelType', type: 'Number'},
{name: 'helpLimit', type: 'Number'}
{name: 'helpLimit', type: 'Number'},
{name: 'showTimeStr', type: 'String'},
{name: 'isApp', type: 'String'},
{name: 'isNew', type: 'String'}
]
},
getCountByStatus:{
... ...
... ... @@ -100,27 +100,6 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">展示时间<span class="red">*</span>：</label>
<div class="col-sm-4">
<input id="showTimeStr" data-time="" value="<%data.showTimeStr%>" type="text" class="form-control" jsaction="time" placeholder="展示时间" readonly required>
</div>
</div>
<div class="form-group">
<div class="col-md-3">
<label>是否APP专享：</label>
<label class="radio-inline"><input type="radio" name="isApp" value="Y">是</label>
<label class="radio-inline"><input type="radio" name="isApp" value="N">否</label>
<input type="hidden" value="<%data.isApp%>" id="isApp" for="radio">
</div>
<div class="col-md-3">
<label>是否新客：</label>
<label class="radio-inline"><input type="radio" name="isNew" value="Y">是</label>
<label class="radio-inline"><input type="radio" name="isNew" value="N">否</label>
<input type="hidden" value="<%data.isNew%>" id="isNew" for="radio">
</div>
</div>
<div class="form-group product_global" id="price_div">
<label class="col-sm-2 control-label">价格：</label>
<div class="col-sm-3">
... ...