Merge branch 'master' into grey

 {
   "name": "yohobuy-portal-fe",
-  "version": "4.9.6",
+  "version": "4.9.7",
   "description": "Construction of the presentation layer solution is based on express, handlebars",
   "main": "app.js",
   "scripts": {

-{"name":"yohobuy-portal-fe","version":"4.9.6","description":"Construction of the presentation layer solution is based on express, handlebars","main":"app.js","scripts":{"code":"set NODE_ENV=coding&& gulp start","build":"set NODE_ENV=production && gulp && gulp mvc","server":"set NODE_ENV=server&& gulp start"},"dependencies":{"art-template":"^3.0.3","async":"^2.0.0-rc.3","body-parser":"^1.15.0","connect-multiparty":"^2.0.0","connect-redis":"^3.0.2","cookie-parser":"^1.4.1","dev":"^0.1.3","express":"^4.13.4","express-session":"^1.13.0","glob":"^7.0.3","lodash":"^4.11.1","md5":"^2.1.0","mkdirp":"^0.5.1","request":"^2.72.0","vue-router":"^0.7.13","vuex":"^1.0.0-rc.2","winston":"^2.2.0"}}
\ No newline at end of file
+{"name":"yohobuy-portal-fe","version":"4.9.7","description":"Construction of the presentation layer solution is based on express, handlebars","main":"app.js","scripts":{"code":"set NODE_ENV=coding&& gulp start","build":"set NODE_ENV=production && gulp && gulp mvc","server":"set NODE_ENV=server&& gulp start"},"dependencies":{"art-template":"^3.0.3","async":"^2.0.0-rc.3","body-parser":"^1.15.0","connect-multiparty":"^2.0.0","connect-redis":"^3.0.2","cookie-parser":"^1.4.1","dev":"^0.1.3","express":"^4.13.4","express-session":"^1.13.0","glob":"^7.0.3","lodash":"^4.11.1","md5":"^2.1.0","mkdirp":"^0.5.1","request":"^2.72.0","vue-router":"^0.7.13","vuex":"^1.0.0-rc.2","winston":"^2.2.0"}}
\ No newline at end of file

@@ -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