fe / yohobuy-portal-fe2 · Commits

Go to a project

Authored by dongjunjie
Commit 812af2a3f44e5bc8af5b64083be1845fb8412587 2 parents 90f52d4d 14606556

Merge branch 'testBLK' into portal_dev_4.9

Inline Side-by-side
Showing 3 changed files with 18 additions and 10 deletions
@@ -117,11 +117,13 @@ @@ -117,11 +117,13 @@
117 <div class="col-sm-5"> 117 <div class="col-sm-5">
118 <div id="tree" style="width: 100%"></div> 118 <div id="tree" style="width: 100%"></div>
119 </div> 119 </div>
120 - <label class="col-sm-1 control-label">展示平台</label>  
121 - <div class="col-sm-2 checkbox" style="margin-top: 3px">  
122 - <label><input type="checkbox" name="appType" value="1" [[appType==1?'checked':'']]>BLK</label>  
123 - <input type="hidden" id="appType" name="appType" value="[[appType||'0']]" for="checkbox" />  
124 - </div> 120 + <span class="showPlatform" style="display: none">
  121 + <label class="col-sm-1 control-label">展示平台</label>
  122 + <div class="col-sm-2 checkbox" style="margin-top: 3px">
  123 + <label><input type="checkbox" name="appType" value="1" [[appType==1?'checked':'']]>BLK</label>
  124 + <input type="hidden" id="appType" name="appType" value="[[appType||'0']]" for="checkbox" />
  125 + </div>
  126 + </span>
125 </div> 127 </div>
126 <div class="form-group"> 128 <div class="form-group">
127 <label class="col-sm-2 control-label">商品名称 <span class="red">*</span></label> 129 <label class="col-sm-2 control-label">商品名称 <span class="red">*</span></label>
@@ -101,6 +101,10 @@ var SORTDATA={ @@ -101,6 +101,10 @@ var SORTDATA={
101 var tabTree=new common.tabTree("#tree",SORTDATA); 101 var tabTree=new common.tabTree("#tree",SORTDATA);
102 tabTree.isfeeze=true; 102 tabTree.isfeeze=true;
103 103
  104 +if(ACTION == 1){ //编辑页面显示展示平台
  105 + $('.showPlatform').show();
  106 +}
  107 +
104 if(ACTION == 1 && canEditSort){ 108 if(ACTION == 1 && canEditSort){
105 tabTree.options.datas[0].disabled = true; 109 tabTree.options.datas[0].disabled = true;
106 tabTree.isfeeze=false; 110 tabTree.isfeeze=false;
@@ -117,11 +117,13 @@ @@ -117,11 +117,13 @@
117 <div class="col-sm-5"> 117 <div class="col-sm-5">
118 <div id="tree" style="width: 100%"></div> 118 <div id="tree" style="width: 100%"></div>
119 </div> 119 </div>
120 - <label class="col-sm-1 control-label">展示平台</label>  
121 - <div class="col-sm-2 checkbox" style="margin-top: 3px">  
122 - <label><input type="checkbox" name="appType" value="1" [[appType==1?'checked':'']]>BLK</label>  
123 - <input type="hidden" id="appType" name="appType" value="[[appType||'0']]" for="checkbox" />  
124 - </div> 120 + <span class="showPlatform" style="display: none">
  121 + <label class="col-sm-1 control-label">展示平台</label>
  122 + <div class="col-sm-2 checkbox" style="margin-top: 3px">
  123 + <label><input type="checkbox" name="appType" value="1" [[appType==1?'checked':'']]>BLK</label>
  124 + <input type="hidden" id="appType" name="appType" value="[[appType||'0']]" for="checkbox" />
  125 + </div>
  126 + </span>
125 </div> 127 </div>
126 <div class="form-group"> 128 <div class="form-group">
127 <label class="col-sm-2 control-label">商品名称 <span class="red">*</span></label> 129 <label class="col-sm-2 control-label">商品名称 <span class="red">*</span></label>