fe / yohobuy-portal-fe2 · Commits

Go to a project

Authored by xuhongyun
Commit 2b96e3a910879614f178c879813cece12f1c74aa 1 parent acfd1f6d

build

Inline Side-by-side
Showing 6 changed files with 16 additions and 11 deletions
... ... @@ -96,7 +96,7 @@ webpackJsonp([32],[
{id:RESPONSEDATA.sortId,sortName:RESPONSEDATA.sortName}
],
otherParam:function(){
return {brandId:$("#brandId").val(),supplierId:common.util.__input("supplierId"),shopId:common.util.__input("shopId")}
return {brandId:$("#brandId").val(),supplierId:common.util.__input("supplierId"),shopId:common.util.__input("shopId"),sellType:common.util.__input("sellType")}
},
complete:function(data,bool){
if(!bool){
... ... @@ -202,10 +202,9 @@ webpackJsonp([32],[
}else{
if(item.isNew){
html.push("<p>厂家颜色:</p><p><input type='text' id='factoryGoodsName' class='w-goods-text form-control' data-index="+item.__index+" value='"+item.goodsName+"' placeholder='厂家颜色' required style='padding: 10px; width: 150px' /></p>");
}else if (RESPONSEDATA.isJit =='Y'){
// JIT商品厂家颜色上架后也能修改
}else if(RESPONSEDATA.sellType == 3 || RESPONSEDATA.isJit == 'Y'){ // JIT上架后的商品也可以修改厂家颜色
html.push("<p>厂家颜色:</p><p><input type='text' id='factoryGoodsName' class='w-goods-text form-control' data-index="+item.__index+" value='"+txt+"' placeholder='厂家颜色' required style='padding: 10px; width: 150px' /></p>");
} else {
}else{
html.push("<p>厂家颜色:</p><p><input type='text' id='factoryGoodsName' disabled='disabled' class='w-goods-text form-control' data-index="+item.__index+" value='"+txt+"' placeholder='厂家颜色' required style='padding: 10px; width: 150px' /></p>");
}
... ... @@ -375,6 +374,10 @@ webpackJsonp([32],[
$("#sellType").val(-1).trigger("change");
});
$(document).on("change","#sellType",function(){
tabTree.isfeeze=false;
tabTree.init([{id:"",sortName:""},{id:"",sortName:""},{id:"",sortName:""},{id:"",sortName:""}]);
});
$(document).on("change",":radio[name=gender]",function(){
Bll.productNameArr[1]=["男","女","通用"][+$(this).val()-1];
... ...
... ... @@ -241,7 +241,7 @@ webpackJsonp([46],[
html += '<p><strong>品牌：</strong>' + brandName + '</p>';
html += '<p><strong>类目：</strong>' + sortName + '</p>';
html += '<p><strong>店铺：</strong>' + item.shopName + '</p>';
html += '<p><strong>经营模式：</strong>' + item.sellType + '</p>';
html += '<p><strong>经营模式：</strong>' + (item.sellType ? item.sellType : '') + '</p>';
return html;
}
}, {
... ... @@ -692,7 +692,7 @@ webpackJsonp([46],[
}
}
}, {
display: '<div class="subhhead"><span>SKU</span><span>尺码</span><span>库存</span><span>SKU上架操作</span><span>SKU上架操作</span></div>',
display: '<div class="subhhead"><span>SKU</span><span>尺码</span><span>库存</span><span>SKU状态</span><span>SKU上架操作</span></div>',
render: function (item) {
return common.util.__template2($("#template2").html(), item)
}
... ...
... ... @@ -174,7 +174,8 @@ module.exports={
{name: "brandId", type: "Number"},
{name: "sortId", type: "Number"},
{name: "supplierId", type: "Number"},
{name: "shopId", type: "Number"}
{name: "shopId", type: "Number"},
{name: "sellType", type: "Number"}
]
},
queryAllMaxSortList:{
... ...
... ... @@ -142,7 +142,8 @@ module.exports={
{name: 'isAuditing', type: 'Number'},
{name: 'productStandardRelationStr', type: 'String'},
{name: 'appType', type: 'Number'},
{name: 'deposit', type: 'Number'}
{name: 'deposit', type: 'Number'},
{name: 'sellType', type: 'Number'}
]
},
getBaseProduct:{
... ...
... ... @@ -178,7 +178,7 @@
<div class="panel-col" style="position: relative;">
<input id="baseProduct" name="file" data-type="baseProduct" type="file" style="cursor: pointer; height: 37px; top: 8px;">
</div>
<div class="panel-col" style="line-height: 40px;position: relative;left: -60px;">
<div class="panel-col" style="line-height: 40px;position: relative;left: -60px;width: 182px;">
<span class="red">必须输入品牌、店铺、经营模式</span>
</div>
</td>
... ...
... ... @@ -118,10 +118,10 @@
<script type="text/template" id="productExtBoTemp">
<div class="form-group">
<label class="col-sm-1 control-label">商品短评：</label>
<label class="col-sm-1 control-label">推荐短语：</label>
[[if renderType=='edit']]
<div class="col-sm-11">
<textarea id="phrase" class="form-control" placeholder="商品短评" type="text" value="[[phrase]]" rows="4"> [[phrase]]</textarea>
<textarea id="phrase" class="form-control" placeholder="推荐短语" type="text" value="[[phrase]]" rows="4"> [[phrase]]</textarea>
</div>
[[else]]
<div class="col-sm-11">
... ...