Merge branch 'release/1.6' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into release/1.6

Conflicts:
	client/js/sourceManage/resourceManage.js

@@ -125,15 +125,26 @@ $(document).on("click", ".add2", function() {
     item.resPlatforms = resPlatforms;
     Bll.toast("/resources/saveResource", item, "编辑资源");
 });
-
-$(document).on("click", ".delbtn", function() {
+/**
+ * 预发布版本
+ */
+/*$(document).on("click", ".delbtn", function() {
+ var item = g.rows[$(this).data("index")];
+ common.dialog.confirm("警告", "是否确认删除？",function() {
+ common.util.__ajax({
+ url: "/resources/deleteAllResourceByCode",
+ data: {code: item.code}
+ }, function () {
+ g.reload();
+ });
+ });
+ });*/
+$(document).on("click", ".delbtn", function () {
     var item = g.rows[$(this).data("index")];
-    common.dialog.confirm("警告", "是否确认删除？",function() {
+    common.dialog.confirm("警告", "是否确认删除？", function () {
         common.util.__ajax({
             url: "/resources/deleteResourceById",
-            //url: "/resources/deleteAllResourceByCode",
-            //data: {code: item.code},
-            data: {id: item.id},
+            data: {id: item.id}
         }, function () {
             g.reload();
         });