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 {
 		}
 		//将有库存的先排序
 		String [] properties = {"cmpReserve", "cmpId", "reserve"};
-		info.sorting(Direction.ASC, properties);
+		info.sorting(Direction.DESC, properties);
 		if(filter != null) {
 			if(filter.get("properties") != null) {
 				String property = filter.get("properties").toString();

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

@@ -408,7 +408,7 @@
             <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}}">
-                        <img src="{{item.img || 'static/img/store/common/default.png'}}"/></a>
+                        <img ng-src="{{item.img || '/static/img/store/common/default.png'}}"/></a>
                 </div>
                 <div class="content">
                     <p class="red" ng-if="item.minPriceRMB">￥<span ng-bind="item.minPriceRMB"></span></p>