fe / yohobuy-shop-fe2 · Commits

Go to a project

Authored by xuhongyun
Commit 6e8551be9216e607b2e16e438e365e1f7e6b4696 2 parents 35f47819 a9ce1e4e

Merge branch 'dev_2.2' into test

Inline Side-by-side
Showing 1 changed file with 16 additions and 2 deletions
@@ -642,7 +642,14 @@ function gridInit(id){ @@ -642,7 +642,14 @@ function gridInit(id){
642 return "<input type=file name='recommendImage' id='recommendImage_"+item.__index+"' value='"+item.src+"' />"; 642 return "<input type=file name='recommendImage' id='recommendImage_"+item.__index+"' value='"+item.src+"' />";
643 }}, 643 }},
644 {display:"链接", render:function(item){ 644 {display:"链接", render:function(item){
645 - return "<input class='form-control inputChange urlInput' type=text name='url' value='"+(item.url).replace(/'/g,'\"')+"' data-index='"+item.__index+"' />"; 645 + // return "<input class='form-control inputChange urlInput' type=text name='url' value='"+(item.url).replace(/'/g,'\"')+"' data-index='"+item.__index+"' />";
  646 + if(item.url != ''){
  647 + item.linkType = item.linkType || '0';
  648 + }else{
  649 + item.linkType = item.linkType || '1';
  650 + }
  651 + item.categoryId = item.categoryId || '-1';
  652 + return common.util.__template2($("#link").html(),{data:item, categoryList:shopCategory, index:item.__index});
646 }}, 653 }},
647 {display:"操作", render:function(item){ 654 {display:"操作", render:function(item){
648 var htmlPic = "",i=item.__index; 655 var htmlPic = "",i=item.__index;
@@ -690,7 +697,14 @@ function gridInit(id){ @@ -690,7 +697,14 @@ function gridInit(id){
690 return "<input type=file name='signboardImage' id='hotRecommendImage_"+item.__index+"' value='"+item.src+"' />"; 697 return "<input type=file name='signboardImage' id='hotRecommendImage_"+item.__index+"' value='"+item.src+"' />";
691 }}, 698 }},
692 {display:"链接", render:function(item){ 699 {display:"链接", render:function(item){
693 - return "<input class='form-control inputChange urlInput' type=text name='url' value='"+(item.url).replace(/'/g,'\"')+"' data-index='"+item.__index+"' />"; 700 + if(item.url != ''){
  701 + item.linkType = item.linkType || '0';
  702 + }else{
  703 + item.linkType = item.linkType || '1';
  704 + }
  705 + item.categoryId = item.categoryId || '-1';
  706 + return common.util.__template2($("#link").html(),{data:item, categoryList:shopCategory, index:item.__index});
  707 + // return "<input class='form-control inputChange urlInput' type=text name='url' value='"+(item.url).replace(/'/g,'\"')+"' data-index='"+item.__index+"' />";
694 }}, 708 }},
695 {display:"操作", render:function(item){ 709 {display:"操作", render:function(item){
696 var htmlPic = "",i=item.__index; 710 var htmlPic = "",i=item.__index;