Merge branch 'dev-mysql' into feature_release-tomysql

src/main/java/com/uas/platform/b2c/prod/product/component/service/impl/ComponentGoodsServiceImpl.java

@@ -47,7 +47,7 @@ public class ComponentGoodsServiceImpl implements ComponentGoodsService {
 			info.setPageNumber(Constant.PAGEMAX);
 		}
 		//将有库存的先排序
-		String [] properties = {"cmpReserve", "cmpId", "reserve"};
+		String [] properties = {"goId", "cmpId", "reserve"};
 		info.sorting(Direction.DESC, properties);
 		if(filter != null) {
 			if(filter.get("properties") != null) {

src/main/webapp/resources/view/usercenter/forstore/browsing_history.html

@@ -423,7 +423,7 @@
         <ul>
             <li ng-class="{'select': isBatch&& !item.active ,'isselect': isBatch&& item.active }" ng-repeat="item in his.dateList" ng-click="setActive(item)">
                 <div class="img">
-                    <a name="detail" href="{{'store/' + item.storeid + '/' + item.batchCode}}">
+                    <a name="detail" href="{{'store/productDetail/' + item.batchCode}}">
                         <img ng-src="{{item.img || '/static/img/store/common/default.png'}}"/></a>
                 </div>
                 <div class="content">

src/main/webapp/resources/view/usercenter/forstore/buyer_cart.html

@@ -538,6 +538,7 @@
 	.com-del-box {
 		top: 101%!important ;
 		left: 24%!important ;
+		background: #fff !important;
 	}
 	.com-del-box .title{
 		width: 100%!important ;