Merge remote-tracking branch 'origin/dev-mysql' into dev-mysql

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_materialCtrl.js

@@ -213,12 +213,12 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
             if (data && typeof data.fluctuateRate != 'undefined') {
                 $scope.uasBatchPutOnProperty = data;
                 $scope.uasBatchPutOnProperty.editFluctuateRate = NumberService.mul($scope.uasBatchPutOnProperty.fluctuateRate, 100) || 100;
-                $scope.uasBatchPutOnProperty.editMaxDelivery = $scope.uasBatchPutOnProperty.maxDelivery || 1;
+                $scope.uasBatchPutOnProperty.editMaxDelivery = $scope.uasBatchPutOnProperty.maxDelivery || 10;
                 $scope.uasBatchPutOnProperty.editMinDelivery = $scope.uasBatchPutOnProperty.minDelivery || 1;
             } else {
 				$scope.uasBatchPutOnProperty = {};
                 $scope.uasBatchPutOnProperty.editFluctuateRate = 100;
-                $scope.uasBatchPutOnProperty.editMaxDelivery = 1;
+                $scope.uasBatchPutOnProperty.editMaxDelivery = 10;
                 $scope.uasBatchPutOnProperty.editMinDelivery = 1;
             }
         }, function (response) {

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 ;