Authored by dongjunjie

Merge branch 'protal_dev_2.1' into testBLK

... ... @@ -117,11 +117,13 @@
<div class="col-sm-5">
<div id="tree" style="width: 100%"></div>
</div>
<label class="col-sm-1 control-label">展示平台</label>
<div class="col-sm-2 checkbox" style="margin-top: 3px">
<label><input type="checkbox" name="appType" value="1" [[appType==1?'checked':'']]>BLK</label>
<input type="hidden" id="appType" name="appType" value="[[appType||'0']]" for="checkbox" />
</div>
<span class="showPlatform" style="display: none">
<label class="col-sm-1 control-label">展示平台</label>
<div class="col-sm-2 checkbox" style="margin-top: 3px">
<label><input type="checkbox" name="appType" value="1" [[appType==1?'checked':'']]>BLK</label>
<input type="hidden" id="appType" name="appType" value="[[appType||'0']]" for="checkbox" />
</div>
</span>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">商品名称 <span class="red">*</span></label>
... ...
... ... @@ -101,6 +101,10 @@ var SORTDATA={
var tabTree=new common.tabTree("#tree",SORTDATA);
tabTree.isfeeze=true;
if(ACTION == 1){ //编辑页面显示展示平台
$('.showPlatform').show();
}
if(ACTION == 1 && canEditSort){
tabTree.options.datas[0].disabled = true;
tabTree.isfeeze=false;
... ...
... ... @@ -117,11 +117,13 @@
<div class="col-sm-5">
<div id="tree" style="width: 100%"></div>
</div>
<label class="col-sm-1 control-label">展示平台</label>
<div class="col-sm-2 checkbox" style="margin-top: 3px">
<label><input type="checkbox" name="appType" value="1" [[appType==1?'checked':'']]>BLK</label>
<input type="hidden" id="appType" name="appType" value="[[appType||'0']]" for="checkbox" />
</div>
<span class="showPlatform" style="display: none">
<label class="col-sm-1 control-label">展示平台</label>
<div class="col-sm-2 checkbox" style="margin-top: 3px">
<label><input type="checkbox" name="appType" value="1" [[appType==1?'checked':'']]>BLK</label>
<input type="hidden" id="appType" name="appType" value="[[appType||'0']]" for="checkbox" />
</div>
</span>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">商品名称 <span class="red">*</span></label>
... ...