Merge branch 'hotfix/4.3.2' into release/pre

@@ -493,3 +493,10 @@ li.sortable-placeholder {
     display:inline-block;
     display:inline-block;
     width: 200px;
     width: 200px;
 }
 }
+
+.hotCategory-info{
+    height: 158px;
+    width:100%;
+    background: url(../assets/images/hotCategory.png) no-repeat;
+    background-size: cover;
+}

@@ -58,23 +58,7 @@ module.exports = function(proxyRoute) {
         delete options.form;
         delete options.form;
       }
       }
       logger.log('info','grayroute: request options: %j',options,{});
       logger.log('info','grayroute: request options: %j',options,{});
-      
-      //发起代理请求
-      if(req.headers['accept'].indexOf('text/html')>-1||req.xhr) { 
-        request(options,function(err,res,body) {
-          if(err) {
-            logger.log('error','grayroute: request error:',err);
-            ress.status(500).send('');
-          } else if(res&&res.statusCode === 302) {
-            //跳转
-            ress.redirect(res.caseless.get('location'));
-          }else {
       request(options).pipe(ress);
       request(options).pipe(ress);
-          }
-        });
-      } else {
-        request(options).pipe(ress);//如果是静态资源，直接管道传递结果
-     }
     } else {
     } else {
 
 
       //当不是老系统的URL，需要访问老系统保持session
       //当不是老系统的URL，需要访问老系统保持session

@@ -980,15 +980,26 @@
             [[/each]]
             [[/each]]
         </ul>
         </ul>
         [[/if]]
         [[/if]]
-        <p>添加左下导航:</p>
+        <div class="form-group">
+            <label>添加左下导航:</label>
+        </div>
         [[each contentData.data.list as item index]]
         [[each contentData.data.list as item index]]
-        <p>
-            导航名称：<input type="text" placeholder="导航名称" class="observe" value="[[item.name]]" data-field="list.[[index]].name">
-            <select name="goTo" class="observe" value="[[item.url.action]]" data-field="list.[[index]].url.action">
+        <div class="form-group">
+        <div class="col-sm-2">
+        <label>导航名称:</label>
+        </div>
+        <div class="col-sm-3">
+        <input type="text" placeholder="导航名称" class="observe form-control" value="[[item.name]]" data-field="list.[[index]].name">
+        </div>
+        <div class="col-sm-3">
+        <select name="goTo" class="observe form-control" value="[[item.url.action]]" data-field="list.[[index]].url.action">
                 [[layout action_template]]
                 [[layout action_template]]
             </select>
             </select>
-            <input type="text" placeholder="url" value="[[item.url.url]]" class="observe" required="required" data-field="list.[[index]].url.url"/>
-        </p>
+        </div>
+        <div class="col-sm-4">
+        <input type="text" placeholder="url" value="[[item.url.url]]" class="observe form-control" required="required" data-field="list.[[index]].url.url"/>
+        </div>
+        </div>
         [[/each]]
         [[/each]]
         <p>
         <p>
             <input type="button" name="select-pic" class="btn btn-info btn-xs addBtn" value="添加右侧图片" style="margin:10px;" data-event="hotCategory.imgs">
             <input type="button" name="select-pic" class="btn btn-info btn-xs addBtn" value="添加右侧图片" style="margin:10px;" data-event="hotCategory.imgs">

@@ -213,8 +213,7 @@
 </div>
 </div>
 [[else if module.contentData.template_name=='hotCategory']]
 [[else if module.contentData.template_name=='hotCategory']]
 <div class="hotCategory">
 <div class="hotCategory">
-    <div class="wordText">
-        <span>热门品类</span>
+    <div class="hotCategory-info">
     </div>
     </div>
 </div>
 </div>
 [[else if module.contentData.template_name=='debrisSlider']]
 [[else if module.contentData.template_name=='debrisSlider']]