Merge branch 'portal_dev_4.9' of http://git.yoho.cn/fe/yohobuy-portal-fe2 into portal_dev_4.9

@@ -45,6 +45,7 @@ module.exports={
             url: '/salesCategory/addSC',
             params: [
                 {name: 'categoryName', type: 'string'},
+                {name: 'appType', type: 'number'},
                 {name: 'relationParameter', type: 'string'},
                 {name: 'relationUrl', type: 'string'},
                 {name: 'parentId', type: 'string'},
@@ -58,6 +59,7 @@ module.exports={
             params: [
                 {name: 'categoryId', type: 'string'},
                 {name: 'categoryName', type: 'string'},
+                {name: 'appType', type: 'number'},
                 {name: 'relationParameter', type: 'string'},
                 {name: 'relationUrl', type: 'string'},
                 {name: 'parentId', type: 'string'},

@@ -30,6 +30,15 @@
                 {{/unless}}
                 
                 <div class="form-group">
+                     <label class="col-sm-2 control-label">是否BLK:</label>
+                     <div class="col-sm-8">
+                          <select class="form-control" id="appType" value="[[appType]]">
+                             <option value="0">否</option>
+                             <option value="1">是</option>
+                         </select>
+                     </div>
+               </div>     
+                <div class="form-group">
                     <label class="col-sm-2 control-label">分类名称</label>
                     <div class="col-sm-8"><input type="text" id="categoryName" name="categoryName" class="form-control" placeholder="分类名称" value="{{categoryName}}"></div>
                 </div>

@@ -37,6 +37,26 @@
                      <div class="col-sm-8 height40">[[parentName]]</div>
                 </div> 
                 <div class="form-group">
+                     <label class="col-sm-2 control-label">是否BLK:</label>
+
+                [[if parentId==0]]
+                        <div class="col-sm-8">
+                          <select class="form-control" id="appType" value="[[appType]]">
+                             <option value="0">否</option>
+                             <option value="1">是</option>
+                         </select>
+                        </div>
+                 [[/if]]
+                [[if  parentId>0]]
+                    <div class="col-sm-8">
+                          <select class="form-control" id="appType" value="[[appType]]" disabled>
+                             <option value="0">否</option>
+                             <option value="1">是</option>
+                         </select>
+                     </div>
+                [[/if]]
+                </div>     
+                <div class="form-group">
                     <label class="col-sm-2 control-label">分类名称：</label>
                     <div class="col-sm-8">
                         <div class="form-inline">
@@ -87,7 +107,8 @@
     <div class="level-hd clearfix">
         <span class="folder"></span>
         <span style="width: 5%">ID</span>
-        <span style="width: 20%">品类名称</span>
+        <span style="width: 5%">BLK商品</span>
+        <span style="width: 15%">品类名称</span>
         <span>所属分类</span>
         <span>分类图标</span>
         <span class="orderby">排序</span>
@@ -199,7 +220,8 @@
 <script type="text/template" id="tableTemp2">
     <span class="folder"></span>
     <span style="width: 5%">[[categoryId]]</span>
-    <span style="width: 20%">[[categoryName]]</span>
+    <span style="width: 5%">[[if appType=="1"]]是[[/if]][[if appType=="0"]]否[[/if]]</span>
+    <span style="width: 15%">[[categoryName]]</span>
     <span>[[levelNumber]]级分类</span>
     <span><img src="[[icon]]" alt=""></span>
     <span class="orderby"> <input type="text" class="form-control saleCategoryNumInput" value="[[orderBy]]" categoryId="[[categoryId]]" /></span>

@@ -23,7 +23,7 @@
                 <div class="panel-col">
                     <select name="status" id="yohoStatus" tabindex="-1" title="" class="form-control">
                         <option value="" selected="">有货状态</option>
-                        <option value="0">待装修</option>
+                        <option value="1">待装修</option>
                         <option value="100">暂存</option>
                         <option value="200">待审核</option>
                         <option value="300">审核通过</option>
@@ -33,7 +33,7 @@
                 <div class="panel-col">
                     <select name="status" id="blkStatus" tabindex="-1" title="" class="form-control">
                         <option value="" selected="">BLK状态</option>
-                        <option value="0">待装修</option>
+                        <option value="1">待装修</option>
                         <option value="100">暂存</option>
                         <option value="200">待审核</option>
                         <option value="300">审核通过</option>

@@ -190,8 +190,9 @@ $(document).on('click', '.add-sub-category', function() {
 		data.curParent = res.data.categoryName;
 		data.subCategoryName = res.data.categoryName;
 		data.parentId = res.data.categoryId;
-		initForm(data);
-
+		data.sub="sub";    //添加子分类时不允许编辑BLK判断用
+ 		initForm(data);
+ 		console.info(data.parentId);
 		tabTreeArr = [];
 		tabTree = new common.tabTree(".sortTree", {
 			status: 1,