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

@@ -86,7 +86,7 @@ var g = new common.grid({
 			if (item.checkStatus) {
 				return ENUM.checkStatus[item.checkStatus]
 			} else {
-				return '未装修';
+				return '待装修';
 			}
 		}
 	}, {

@@ -1013,7 +1013,7 @@ function untilEditorEvent(id){
     });
     $("#"+id+" nav").hide();
     $(".modal-dialog").css("width","900px");
-    $(".modal-dialog .modal-body .editor-dialog").css("max-height","650px");
+    $(".modal-dialog .modal-body .editor-dialog").css("max-height",($(window).height()-300) + "px");
     $(".modal-dialog .modal-body .editor-dialog").css("overflow-y","auto");
     $(".modal-dialog .modal-body .editor-dialog").css("overflow-x","hidden");
 }

@@ -52,6 +52,7 @@
                 <div class="panel-col2">
                     <select name="status" id="status" style="width: 280px;" tabindex="-1" title="" class="form-control">
                         <option value="" selected="">选择提交状态</option>
+                        <option value="0">待装修</option>
                         <option value="100">暂存</option>
                         <option value="200">待审核</option>
                         <option value="300">审核通过</option>