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

@@ -124,7 +124,11 @@ function initDialog(){
 function initForm(data) {
 function initForm(data) {
 	var parentName = "";
 	var parentName = "";
 	getParentsName(data.parentSC);
 	getParentsName(data.parentSC);
-	data.parentName = (parentName == ""?"（无根目录）":parentName);
+	if(data.curParent){
+		data.parentName = (parentName == "" ? data.curParent : parentName + "  >  " + data.curParent);
+	}else{
+		data.parentName = (parentName == "" ? "（无根目录）" : parentName);
+	}
 
 
 	$(".saleCategoryEdit").html(common.util.__template2(editHtml, data)),
 	$(".saleCategoryEdit").html(common.util.__template2(editHtml, data)),
 	e = new common.edit('#basicForm', {bucket: 'taobaocms'});
 	e = new common.edit('#basicForm', {bucket: 'taobaocms'});
@@ -135,7 +139,7 @@ function initForm(data) {
 		if(parentsData && parentsData.length > 0){
 		if(parentsData && parentsData.length > 0){
 			var parent = parentsData[0];
 			var parent = parentsData[0];
 			parentName += parent.categoryName;
 			parentName += parent.categoryName;
-			if(parent.items) parentName += "<span style='color: #3071a9; font-weight: bold; padding: 0 5px'>&nbsp;>&nbsp;</span>";
+			if(parent.items) parentName += "&nbsp;&nbsp;>&nbsp;&nbsp;";
 			getParentsName(parent.items, parentName);
 			getParentsName(parent.items, parentName);
 		}else{
 		}else{
 			return parentName;
 			return parentName;
@@ -183,6 +187,7 @@ $(document).on('click', '.add-sub-category', function() {
 		var data = {};
 		var data = {};
 		data.action = '/sale/salesCategory/addSC';
 		data.action = '/sale/salesCategory/addSC';
 		data.parentSC = res.data.parentSC;
 		data.parentSC = res.data.parentSC;
+		data.curParent = res.data.categoryName;
 		data.subCategoryName = res.data.categoryName;
 		data.subCategoryName = res.data.categoryName;
 		data.parentId = res.data.categoryId;
 		data.parentId = res.data.categoryId;
 		initForm(data);
 		initForm(data);