Merge branch 'master' of http://git.yoho.cn/ufo/ufo-platform

@@ -109,7 +109,7 @@
   </select>
   </select>
 
 
   <select id="selectStoragePriceCount" resultType="java.lang.Integer">
   <select id="selectStoragePriceCount" resultType="java.lang.Integer">
-    select count(*) from from storage_price where <include refid="skupPageCondition2" />
+    select count(*) from storage_price where <include refid="skupPageCondition2" />
   </select>
   </select>
 
 
   <select id="selectStoragePriceList" resultMap="BaseResultMap">
   <select id="selectStoragePriceList" resultMap="BaseResultMap">

@@ -42,9 +42,9 @@
         LEFT JOIN brand
         LEFT JOIN brand
         ON product.brand_id = brand.id
         ON product.brand_id = brand.id
         LEFT JOIN product_sort sort1
         LEFT JOIN product_sort sort1
-        ON product.series_id = sort1.id
+        ON product.mid_sort_id = sort1.id
         LEFT JOIN product_sort sort2
         LEFT JOIN product_sort sort2
-        ON sort1.parent_id=sort2.id
+        ON product.max_sort_id = sort2.id
     </sql>
     </sql>
 
 
     <select id="selectProductDetailsCount" resultType="integer">
     <select id="selectProductDetailsCount" resultType="integer">

@@ -32,6 +32,7 @@
 
 
         <a id="searchLinkButton" class="easyui-linkbutton btn-info" data-options="iconCls:'icon-search'">筛选</a>
         <a id="searchLinkButton" class="easyui-linkbutton btn-info" data-options="iconCls:'icon-search'">筛选</a>
         <a id="searchAllLinkButton" class="easyui-linkbutton btn-info" data-options="iconCls:'icon-search'">全部</a>
         <a id="searchAllLinkButton" class="easyui-linkbutton btn-info" data-options="iconCls:'icon-search'">全部</a>
+        <a id="returnList" class="easyui-linkbutton btn-info" data-options="iconCls:'icon-search'">返回列表</a>
     </div>
     </div>
 </div>
 </div>
 <div region="center">
 <div region="center">
@@ -59,6 +60,12 @@
 
 
 
 
     $(function () {
     $(function () {
+
+        $('#returnList').linkbutton({
+            onClick: function () {
+                location.href = contextPath + "/html/commodityManage/commodityPoolManage/commodityPoolManage.html";
+            }
+        });
         var poolId = parseURL(window.location.href).poolId;
         var poolId = parseURL(window.location.href).poolId;
 
 
         $("#productCode").textbox({
         $("#productCode").textbox({

@@ -46,7 +46,7 @@ $.ajaxSetup({
 					text : "重新登录",
 					text : "重新登录",
 					iconCls : "icon-no",
 					iconCls : "icon-no",
 					handler : function() {
 					handler : function() {
-						window.top.location.href = "http://admin.portal.yohobuy.com/login";
+						window.top.location.href = "http://java-ufo-platform.test3.ingress.dev.yohocorp.com/ufoPlatform/html/login.html";
 					}
 					}
 				}]
 				}]
 			});
 			});