Merge branch 'yohobuy_shops_dev_v4.5_20160601' of http://git.yoho.cn/fe/yohobuy-…

…shops-fe into yohobuy_shops_dev_v4.5_20160601

@@ -217,24 +217,8 @@ function editorIconEvent(title,id){
                 }
             ]
         }
-        if(id == "editor-recommend" && curPlatform == "pc" && jsonMain.resources.recommend_APP.isUsed == "Y"){
-            option.button.push({
-                value:"保存并同步至APP",
-                css:"btn-success",
-                callback: function(){
-                    if(editorCheck(id)){
-                        freshJson(id, g.__rows, 1);
-                        cloneArr(sortJson(g.__rows,1),jsonMain.resources.recommend_APP.data);
-                        cloneArr(sortJson(g.__rows,1),jsonClone.resources.recommend_APP.data);
-                        removeUrlParam("editor-recommend",jsonMain.resources.recommend_APP.data);  //去除url
-                        removeUrlParam("editor-recommend",jsonClone.resources.recommend_APP.data);
-                        common.util.__tip("同步APP成功！","success");
-                        showMain();
-                    }else{
-                        return false;
-                    }
-                }
-            });
+        if(curPlatform == "pc"){
+            option = setSendToAppBtm(id, option);
         }
         new common.dialog(option);
         gridInit(id);
@@ -490,7 +474,7 @@ function gridInit(id){
                         return "<input class='form-control inputChange' type=text name='name' value='"+item.name+"' data-index='"+item.__index+"' maxlength='5' />";
                     }},
                     {display:"链接", render:function(item){
-                        return '<input class="form-control inputChange urlInput" type=text name="url" value="'+item.url+'" data-index="'+item.__index+'" />';
+                        return "<input class='form-control inputChange urlInput' type=text name='url' value='"+(item.url).replace(/'/g,'\"')+"' data-index='"+item.__index+"' />";
                     }}
                 ]
             });
@@ -597,7 +581,7 @@ function gridInit(id){
                         return "<input type=file name='recommendImage' id='recommendImage_"+item.__index+"' value='"+item.src+"' />";
                     }},
                     {display:"链接", render:function(item){
-                        return '<input class="form-control inputChange urlInput" type=text name="url" value="'+item.url+'" data-index="'+item.__index+'" />';
+                        return "<input class='form-control inputChange urlInput' type=text name='url' value='"+(item.url).replace(/'/g,'\"')+"' data-index='"+item.__index+"' />";
                     }},
                     {display:"操作", render:function(item){
                         var htmlPic = "",i=item.__index;
@@ -645,7 +629,7 @@ function gridInit(id){
                         return "<input type=file name='signboardImage' id='hotRecommendImage_"+item.__index+"' value='"+item.src+"' />";
                     }},
                     {display:"链接", render:function(item){
-                        return '<input class="form-control inputChange urlInput" type=text name="url" value="'+item.url+'" data-index="'+item.__index+'" />';
+                        return "<input class='form-control inputChange urlInput' type=text name='url' value='"+(item.url).replace(/'/g,'\"')+"' data-index='"+item.__index+"' />";
                     }},
                     {display:"操作", render:function(item){
                         var htmlPic = "",i=item.__index;
@@ -725,7 +709,7 @@ function gridInit(id){
                         if(item.__index == 0){
                             return "http://店铺商品列表页（默认）";
                         }else{
-                            return '<input class="form-control inputChange urlInput" type=text name="url" value="'+item.url+'" data-index="'+item.__index+'" />';
+                            return "<input class='form-control inputChange urlInput' type=text name='url' value='"+(item.url).replace(/'/g,'\"')+"' data-index='"+item.__index+"' />";
                         }
                     }},
                     {display:"操作", render:function(item){
@@ -773,7 +757,7 @@ function gridInit(id){
                         if(item.__index == 0){
                             return "http://店铺商品列表页（默认）";
                         }else{
-                            return '<input class="form-control inputChange urlInput" type=text name="url" value="'+item.url+'" data-index="'+item.__index+'" />';
+                            return "<input class='form-control inputChange urlInput' type=text name='url' value='"+(item.url).replace(/'/g,'\"')+"' data-index='"+item.__index+"' />";
                         }
                     }},
                     {display:"操作", render:function(item){
@@ -1053,6 +1037,67 @@ function freshJson(id,data,status){
             break;
     }
 }
+//同步至APP按钮生成
+function sendToAppBtmInit(id, json){
+    return {
+        value:"保存并同步至APP",
+        css:"btn-success",
+        callback: function(){
+            if(editorCheck(id)){
+                json.isUsed = "N";
+                freshJson(id, g.__rows, 1);
+                json.isUsed = "Y";
+                common.util.__tip("同步APP成功！","success");
+                showMain();
+            }else{
+                return false;
+            }
+        }
+    }
+}
+//pc端根据模块不同增加同步至APP按钮
+function setSendToAppBtm(id, option){
+    switch (id){
+        case "editor-banner":
+            if(jsonMain.resources.shopTopBanner_APP.isUsed == "Y"){
+                option.button.push(sendToAppBtmInit(id, jsonMain.resources.shopTopBanner_APP));
+            }
+            return option;
+            break;
+
+        case "editor-largePic":
+            if(jsonMain.resources.largeSlideImg_APP.isUsed == "Y"){
+                option.button.push(sendToAppBtmInit(id, jsonMain.resources.largeSlideImg_APP));
+            }
+            return option;
+            break;
+
+        case "editor-smallPic":
+            if(jsonMain.resources.oneRowTwoColImages_APP.isUsed == "Y"){
+                option.button.push(sendToAppBtmInit(id, jsonMain.resources.oneRowTwoColImages_APP));
+            }
+            return option;
+            break;
+
+        case "editor-recommend":
+            if(jsonMain.resources.recommend_APP.isUsed == "Y"){
+                option.button.push(sendToAppBtmInit(id, jsonMain.resources.recommend_APP));
+            }
+            return option;
+            break;
+
+        case "editor-hotProduct":
+            if(jsonMain.resources.hotProducts_APP.isUsed == "Y"){
+                option.button.push(sendToAppBtmInit(id, jsonMain.resources.hotProducts_APP));
+            }
+            return option;
+            break;
+
+        default :
+            return option;
+            break;
+    }
+}
 //tip生成
 function editorTipInit(id){
     var tipHtml = "";
@@ -1299,10 +1344,10 @@ function resourcesHtmlInit(item,resName){
     var picList = item.data,
         htmlPic = "";
     for(var i=0; i<picList.length; i++){
-        picList[i].url=picList[i].url.replace(/"/g,'\'');  //  字符串里面双引号转换成单引号
+        picList[i].url=picList[i].url.replace(/'/g,'\"');  //  字符串里面双引号转换成单引号
         htmlPic += "<div class='row'>" +
         "<div class='col-sm-2'><input type=file name='"+ resName +"Image' id='"+ resName +"Image_"+item.__index+"_"+i+"' value='"+picList[i].src+"' /></div>" +
-        '<div class="col-sm-3"><input type=text class="form-control inputChange urlInput" name="url" value="'+ picList[i].url +'" data-index="'+ item.__index +"_"+ i +'" /></div>' +
+        "<div class='col-sm-3'><input type=text class='form-control inputChange urlInput' name='url' value='"+picList[i].url+"' data-index='"+item.__index+"_"+i+"' /></div>" +
         "<div class='col-sm-2'>";
         if(i>0){
             htmlPic += "<input type=text class='form-control' disabled jsaction='time:end:endTime_"+item.__index+"_"+ i +"' id='startTime_"+item.__index+"_"+ i +"' name='startTime' value='"+ picList[i].startTime +"' />" +