Merge branch 'portal_dev_4.9' into grey

@@ -52,7 +52,7 @@
 
                 <div class="panel-col">
                     <select id="appType" class="form-control">
-                        <option value="-1">是否BLK商品</option>
+                        <option value="-1">是否BLK资讯</option>
                         <option value="1">是BLK</option>
                         <option value="0">非BLK</option>
                     </select>

@@ -37,7 +37,7 @@
         <div class="form-group">
             <label class="col-sm-1 control-label">英文名称</label>
             <div class="col-sm-9">
-                <input type="text" value="[[sortNameEn]]" class="form-control observe" data-field="sortNameEn" placeholder="英文名称" required>
+                <input type="text" value="[[sortNameEn]]" class="form-control observe" data-field="sortNameEn" placeholder="英文名称">
             </div>
         </div><!-- form-group -->
         <div class="form-group">

@@ -439,12 +439,16 @@
         <p class="title">[[module.contentData.data.title.name]]<a class="more" href="#">[[module.contentData.data.title.more_name]]</a></p>
         [[/if]]
 
-        <p class="big-pic"><img src="[[module.contentData.data.list[0].src]]"></p>
-        <div class="col-sm-6 matchImage" style="padding-left: 3px">
-            <img src="[[module.contentData.data.list[1].src]]">
-        </div>
-        <div class="col-sm-6 matchImage">
-            <img style="height: 50%;width: 100%" src="[[module.contentData.data.list[2].src]]">
+        <div>
+            <div class="col-sm-4 matchImage">
+                <img src="[[module.contentData.data.list[0].src]]">
+            </div>
+            <div class="col-sm-4 matchImage">
+                <img src="[[module.contentData.data.list[1].src]]">
+            </div>
+            <div class="col-sm-4 matchImage">
+                <img src="[[module.contentData.data.list[2].src]]">
+            </div>
         </div>
     </div>
 </div>
\ No newline at end of file

@@ -95,7 +95,7 @@ components.prototype={
         //下拉选择
         $("select", that.el).each(function() {
             var value = $.trim($(this).val());
-            var name = $(this).children(":first").text().replace(/[请选择]/g, "");
+            var name = $(this).children(":first").text().replace(/请选择/g, "");
 
             if ($(this).attr("required") && (value == -1 || value == "")) {
                 err.push("<p>请选择 " + name + "</p>");

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