Merge branch 'dev-mysql' into feature_release-tomysql

src/main/webapp/resources/css/common.css

@@ -1044,4 +1044,93 @@ select {
 .seek-purchase .seek-purchase-content >table >tbody >tr.default-row .operate-seek .row-wrap >span {
 	color: #4290f7;
 	cursor: pointer;
+}
+
+/*买卖家订单详情及结算页手续费样式*/
+.oder_xq_list dl span.total-price{
+	float: right;
+	width: auto !important;
+	position: relative;
+	bottom: 22px;
+	z-index: 10;
+	/*margin-right: 20px;*/
+}
+.oder_xq_list dl span.total-price p{
+	line-height: 25px;
+	font-size: 14px;
+	text-align: right;
+}
+.oder_xq_list dl span.total-price p:last-child,
+.oder_xq_list dl span.total-price p:last-child em,
+.oder_xq_list dl span.total-price p:last-child strong{
+	color: #e64040;
+	font-weight: bold;
+}
+.oder_xq_list dl span.total-price p em{
+	color: #333;
+	width: 150px;
+	text-align: left;
+}
+.oder_xq_list dl span.total-price strong{
+	font-weight: normal;
+	width: 200px;
+	display: inline-block;
+	float: left;
+	color: #666;
+	padding-right: 15px;
+}
+.oder_xq_list dl span.total-price strong .price-down {
+	display: inline-block;
+	width: 32px;
+	height: 16px;
+	line-height: 16px;
+	text-align: center;
+	color: #fff;
+	background: #36ab67;
+	border-radius: 2px;
+	float: none;
+	font-size: 12px;
+	margin-right: 6px;
+	cursor: pointer;
+}
+.oder_xq_list dl span.total-price .price-down-tag {
+	text-decoration: line-through;
+	margin: 0;
+	font-size: 12px;
+}
+.oder_xq_list dl span.total-price .remind-tag {
+	position: absolute;
+	background: #fff;
+	padding: 12px;
+	border: 1px solid #d3e2fc;
+	top: 54px;
+}
+.oder_xq_list dl span.total-price .remind-tag .remind-tag-content {
+	text-align: left;
+	line-height: 21px;
+}
+.oder_xq_list dl span.total-price .remind-tag .remind-tag-content.red-text {
+	color: #ef2324;
+}
+.oder_xq_list dl span.total-price .remind-tag.intro {
+	left: -46px;
+}
+.oder_xq_list dl span.total-price .remind-tag.intro .remind-tag-content{
+	max-width: 214px;
+}
+.oder_xq_list dl span.total-price .remind-tag.activity {
+	left: 0;
+}
+.oder_xq_list dl span.total-price .remind-tag.activity .remind-tag-content{
+	max-width: 173px;
+}
+.oder_xq_list dl span.total-price strong .fa {
+	font-size: 19px;
+	color: #cdddfc;
+	margin-right: 5px;
+	vertical-align: middle;
+	cursor: pointer;
+}
+.oder_xq_list dl span.total-price em{
+	float: left;
 }

src/main/webapp/resources/css/user/user.css

@@ -3413,7 +3413,6 @@ body {
 .sure_oder .oder_xq_list dl dd.pay_price {
     width: 100%;
     min-height: 240px;
-    padding-top: 20px;
     border-bottom: none;
 }
 
@@ -3434,6 +3433,7 @@ body {
 .pay_price div h4 em {
     color: #dd2727;
     font-size: 36px;
+    font-weight: bold;
 }
 
 .pay_price p {

src/main/webapp/resources/js/common/controllers/commonCtrls.js

@@ -1752,23 +1752,41 @@ define([ 'app/app' ], function(app) {
 		};
 	}]);
 
-	/**
-	 * 左侧导航栏控制器
-	 */
-	app.controller('leftNavCtrl', ["$scope", "toaster", '$modal', '$rootScope', function($scope, toaster, $modal, $rootScope){
-		//安全设置提醒框
+    // 手续费控制器
+    app.controller('poundageCtrl', ["$scope", "NumberService", function($scope, NumberService){
+        // 手续费介绍提示框
+        $scope.showRemindTagIntro = false;
 
-		$scope.openHomeCenterModel = function() {
-			var modalInstance = $modal.open({
-				animation: true,
-				templateUrl: $rootScope.rootPath + '/static/view/usercenter/modal/homeCenter_modal.html',
-				controller:'homeModalCtrl'
-			});
-			modalInstance.result.then(function(){
-			}, function(){
-			});
-		};
-		$scope.promptUpdate = function() {
+        // 手续费减免提示框
+        $scope.showRemindTagActivity = false;
+
+        $scope.getMul = function (val1, val2) {
+            return NumberService.mul(Number(val1), Number(val2)) < 0.01 ? 0.01 : NumberService.mul(Number(val1), Number(val2));
+        }
+
+        $scope.getAdd = function (val1, val2) {
+            return NumberService.add(Number(val1), Number(val2));
+        }
+    }]);
+
+  /**
+   * 左侧导航栏控制器
+   */
+	app.controller('leftNavCtrl', ["$scope", "toaster", function($scope, toaster){
+        //安全设置提醒框
+
+        $scope.openHomeCenterModel = function() {
+            var modalInstance = $modal.open({
+                animation: true,
+                templateUrl: $rootScope.rootPath + '/static/view/usercenter/modal/homeCenter_modal.html',
+                controller:'homeModalCtrl'
+            });
+            modalInstance.result.then(function(){
+            }, function(){
+            });
+        };
+
+	    $scope.promptUpdate = function() {
             if (!$scope.userInfo.pwdEnable || !$scope.userInfo.haveUserQuestion||!$scope.userInfo.emailValidCode || $scope.userInfo.emailValidCode != 2) {
                 $scope.openHomeCenterModel();
             }

src/main/webapp/resources/js/usercenter/controllers/forstore/order_pay_ctrl.js

@@ -908,6 +908,7 @@ define(['app/app'], function(app) {
 		$scope.calculateTotal = function () {
 			$scope.order.totalprice = 0;
 			$scope.storePrice = {};
+            $scope.poundageList = {};//手续费列表
 			angular.forEach($scope.order.orderDetails, function(detail) {
 				detail.ensurePrice = Number(NumberService.mul(detail.taxUnitprice, detail.number));
 				if(!$scope.storePrice[detail.storeName]) {
@@ -950,6 +951,7 @@ define(['app/app'], function(app) {
 				toaster.pop('info', '提示 ' + '您已取消编辑发票信息');
 			});
 		};
+
 	}]);
 
 	//地址编辑模态框

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

@@ -120,34 +120,6 @@
 		color: #333 !important;
 		margin-left: 40px;
 	}
-	.oder_xq_list dl span.total-price{
-		float: right;
-		width: auto !important;
-		position: relative;
-		bottom: 10px;
-		margin-right: 20px;
-	}
-	.oder_xq_list dl span.total-price p{
-		line-height: 25px;
-		font-size: 14px;
-		text-align: right;
-		font-weight: bold;
-		display: flex;
-	}
-	.oder_xq_list dl span.total-price p:first-child em{
-		color: #333;
-	}
-	.oder_xq_list dl span.total-price p:last-child{
-		color: #e64040;
-	}
-	.oder_xq_list dl span.total-price p em{
-		color: #e64040;
-	}
-	.oder_xq_list dl span.total-price strong {
-		width: 70px;
-		display: inline-block;
-		float: left;
-	}
 	.open-more{
 		text-align: center;
 		background: #f6f9ff;
@@ -512,10 +484,25 @@
 						<span class="wd02" style="width: 60%; text-align: left; margin-left: 40px; line-height: 30px;">配送方式：<i ng-bind="deliveryMethod[order.deliverytype]"></i>
 							<i style="color: #999;" ng-if="rule" ng-bind="'(' + rule.ruleName + ')'">（满1000元包邮，未满足的订单收取运费20元）</i>
 						</span>
-						<span class="total-price">
+						<span class="total-price" ng-controller="poundageCtrl">
 								<p><strong>运费：</strong>
-									<em ng-if="rule && rule.fareType != 3" ng-bind="order.fare | formateNumber : 2 | currencySysmbol : order.currency.substring(0,3)" style="font-weight: bold"></em>
-									<em ng-if="rule && rule.fareType == 3"  style="font-weight: bold;color:#e64040">到付</em>
+									<em ng-if="rule && rule.fareType != 3" ng-bind="order.fare | formateNumber : 2 | currencySysmbol : order.currency.substring(0,3)"></em>
+									<em ng-if="rule && rule.fareType == 3" >到付</em>
+								</p>
+								<p>
+									<strong>
+										<i class="fa fa-exclamation-circle" ng-mouseenter="showRemindTagIntro = true" ng-mouseleave="showRemindTagIntro = false"></i>
+										<span class="price-down" ng-mouseenter="showRemindTagActivity = true" ng-mouseleave="showRemindTagActivity = false">减免</span>
+										手续费：
+									</strong>
+									<em>{{order.currency == 'RMB' ? '￥ ':'$'}}0.00（<i class="price-down-tag" ng-bind="getMul(order.ensurePrice, 0.00453) | formateNumber : 2 | currencySysmbol : order.currency">$1.11</i>）</em>
+									<div class="remind-tag intro" ng-show="showRemindTagIntro">
+										<div class="remind-tag-content">手续费：是指第三方支付机构在交易过程中，按照一定的百分比进行收取的费用。</div>
+										<div class="remind-tag-content red-text">手续费金额=订单金额 * 0.45%</div>
+									</div>
+									<div class="remind-tag activity" ng-show="showRemindTagActivity">
+										<div class="remind-tag-content">活动期间，减免手续费，已由商城支付给第三方机构。</div>
+									</div>
 								</p>
 								<p><strong>店铺合计：</strong>
 									<em ng-bind="order.ensurePrice | formateNumber : 2 | currencySysmbol : order.currency" style="font-weight: bold"></em>

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

@@ -171,28 +171,6 @@
 	.sure_oder .select{
 		padding-left: 15px;
 	}
-	.sure_oder .oder_xq_list dl span.total-price{
-		float: right;
-		width: auto;
-		position: relative;
-		bottom: 10px;
-		margin-right: 20px;
-	}
-	.sure_oder .oder_xq_list dl span.total-price p{
-		line-height: 25px;
-		font-size: 14px;
-		text-align: right;
-		font-weight: bold;
-	}
-	.sure_oder .oder_xq_list dl span.total-price p:first-child em{
-		color: #333;
-	}
-	.sure_oder .oder_xq_list dl span.total-price p:last-child{
-		color: #e64040;
-	}
-	.sure_oder .oder_xq_list dl span.total-price p em{
-		color: #e64040;
-	}
 	.pay_price a:hover{
 		color: #fff !important;
 		opacity: .9;
@@ -259,21 +237,25 @@
 	.pay_price div{
 		max-width: 490px;
 		width: auto;
-		min-height: 106px;
-		padding: 10px 10px 5px;
+		min-height: 133px;
+		padding: 29px 10px;
 	}
 	.pay_price h4,.pay_price p{
 		text-align: right;
 	}
 	.sure_oder .oder_xq_list dl dd.pay_price{
 		display: inline-block;
-		min-height: 170px;
+		min-height: 237px;
 	}
 	.pay_price div p{
 		float: left;
 		height: auto;
 		line-height: 25px;
 	}
+	.pay_price .bulb-remind {
+		padding-right: 80px;
+		font-size: 14px;
+	}
 	.oder-remark{
 		height: 30px;
 		border-bottom: none !important;
@@ -295,14 +277,6 @@
 		margin-top: 10px;
 		margin-left: 4px;
 	}
-	.sure_oder .oder_xq_list dl span.total-price strong{
-		width: 70px;
-		display: inline-block;
-		float: left;
-	}
-	.sure_oder .oder_xq_list dl span.total-price em{
-		float: left;
-	}
 	.oder_xq_list dl .oder_l{
 		background: #f6f9ff;
 		border-bottom: #fff 1px solid;
@@ -317,6 +291,7 @@
 		border-bottom: none;
 	}
 	.pay_price div{
+		min-height: unset;
 		margin-right: 0;
 	}
 	.pay_price div h6{
@@ -611,6 +586,23 @@
 	.oder_xq_list dl span a.unstand:hover b{
 		color: #323232!important;
 	}
+	.pay_price div {
+		width: 100%;
+		max-width: unset;
+		border: none;
+		background: #faf8f8;
+		text-align: right;
+	}
+	.pay_price div h6 {
+		font-size: 14px;
+		text-align: right;
+		line-height: 24px;
+		display: inline-block;
+		margin-left: 20px;
+	}
+	.pay_price div h6 strong {
+		font-weight: normal;
+	}
 </style>
 <!--右侧主体部分-->
 <div class="user_right fr" id="pay-cart">
@@ -845,7 +837,7 @@
 								</i>
 								<!--<button ng-click="getRule(order.storeid)">获取配送规则</button>-->
 							</span>
-							<span class="total-price">
+							<span class="total-price" ng-controller="poundageCtrl">
 								<p><strong>运费：</strong>
 									<em ng-if="order.status==501 && deliveryList[details[0].storeid].fareType == 3" style="font-weight: bold;color:#e64040">到付</em>
 									<em ng-if="order.status==501 && deliveryList[details[0].storeid].fareType == 4" ng-bind="deliveryList[details[0].storeid].fare | formateNumber : 2 | currencySysmbol : order.currency.substring(0,3) " style="font-weight: bold;color:#e64040"></em>
@@ -859,10 +851,29 @@
 										<em ng-if="deliveryList && deliveryList[details[0].storeid].fareType == 4" style="font-weight: bold;color:#e64040">包邮</em>
 									</em>
 								</p>
+								<p>
+									<strong>
+										<i class="fa fa-exclamation-circle" ng-mouseenter="showRemindTagIntro = true" ng-mouseleave="showRemindTagIntro = false"></i>
+										<span class="price-down" ng-mouseenter="showRemindTagActivity = true" ng-mouseleave="showRemindTagActivity = false">减免</span>
+										手续费：
+									</strong>
+									<em ng-if="order.status == 501">{{order.currency == 'RMB' ? '￥ ':'$'}}0.00（<i class="price-down-tag" ng-bind="getMul(getAdd(storePrice[key], fareList[details[0].storeid]), 0.00453) | formateNumber : 2 | currencySysmbol : order.currency.substring(0,3)">$1.11</i>）</em>
+									<em ng-if="order.status != 501">
+										<em ng-if="storeArray.length == 1">{{order.currency == 'RMB' ? '￥ ':'$'}}0.00（<i class="price-down-tag" ng-bind="getMul(order.ensurePrice, 0.00453) | formateNumber : 2 | currencySysmbol : order.currency.substring(0,3)">$1.11</i>）</em>
+										<em ng-if="storeArray.length != 1">{{order.currency == 'RMB' ? '￥ ':'$'}}0.00（<i class="price-down-tag" ng-bind="getMul(getAdd(storePrice[key], deliveryList[details[0].storeid].fare), 0.00453) | formateNumber : 2 | currencySysmbol : order.currency.substring(0,3)">$1.11</i>）</em>
+									</em>
+									<div class="remind-tag intro" ng-show="showRemindTagIntro">
+										<div class="remind-tag-content">手续费：是指第三方支付机构在交易过程中，按照一定的百分比进行收取的费用。</div>
+										<div class="remind-tag-content red-text">手续费金额=订单金额 * 0.45%</div>
+									</div>
+									<div class="remind-tag activity" ng-show="showRemindTagActivity">
+										<div class="remind-tag-content">活动期间，减免手续费，已由商城支付给第三方机构。</div>
+									</div>
+								</p>
 								<p><strong>店铺合计：</strong>
-									<em ng-if="order.status==501" ng-bind="storePrice[key] + fareList[details[0].storeid] | formateNumber :2 | currencySysmbol : order.currency.substring(0,3)" style="font-weight: bold"></em>
+									<em ng-if="order.status==501" ng-bind="getAdd(storePrice[key], fareList[details[0].storeid]) | formateNumber :2 | currencySysmbol : order.currency.substring(0,3)"></em>
 
-									<em ng-if="order.status!=501" style="font-weight: bold">
+									<em ng-if="order.status!=501">
 										<em ng-if="storeArray.length == 1" ng-bind="order.ensurePrice | formateNumber :2 | currencySysmbol : order.currency.substring(0,3)"></em>
 										<em ng-if="storeArray.length != 1" ng-bind="storePrice[key] + deliveryList[details[0].storeid].fare | formateNumber :2 | currencySysmbol : order.currency.substring(0,3)"></em>
 									</em>
@@ -947,6 +958,7 @@
 								</select>
 							</span>
 							<a ng-click="confirmPay()">提交订单</a></p>
+						<p class="bulb-remind"><img src="static/img/user/bulb.png" alt="">若价格变动，请在订单提交后联系卖家改价</p>
 					</dd>
 				</dl>
 			</div>

src/main/webapp/resources/view/vendor/forstore/purchase_detail.html

@@ -159,34 +159,6 @@
 		color: #333 !important;
 		margin-left: 40px;
 	}
-	.oder_xq_list dl span.total-price{
-		float: right;
-		width: auto !important;
-		position: relative;
-		bottom: 10px;
-		margin-right: 20px;
-	}
-	.oder_xq_list dl span.total-price p{
-		line-height: 25px;
-		font-size: 14px;
-		text-align: right;
-		font-weight: bold;
-		display: flex;
-	}
-	.oder_xq_list dl span.total-price p:first-child em{
-		color: #333;
-	}
-	.oder_xq_list dl span.total-price p:last-child{
-		color: #e64040;
-	}
-	.oder_xq_list dl span.total-price p em{
-		color: #e64040;
-	}
-	.oder_xq_list dl span.total-price strong {
-		width: 70px;
-		display: inline-block;
-		float: left;
-	}
 	.oder_xq_list dl span.user-address{
 		width: 100% !important;
 		line-height: 30px;
@@ -569,10 +541,26 @@
 						<span class="wd02" style="width: 60%; text-align: left; margin-left: 40px; line-height: 30px;">配送方式：<i ng-bind="deliveryMethod[purchase.sendType]"></i>
 							<i style="color: #999;" ng-if="rule" ng-bind="'(' + rule.ruleName + ')'">（满1000元包邮，未满足的订单收取运费20元）</i>
 						</span>
-						<span class="total-price">
+						<span class="total-price" ng-controller="poundageCtrl">
 								<p><strong>运费：</strong>
-									<em ng-if="!rule || rule.fareType != 3" ng-bind="purchase.fare | formateNumber : 2 | currencySysmbol : purchase.currency.substring(0,3)" style="font-weight: bold"></em>
-									<em ng-if="rule && rule.fareType == 3" style="font-weight: bold;color:#e64040">到付</em>
+									<em ng-if="!rule || rule.fareType != 3" ng-bind="purchase.fare | formateNumber : 2 | currencySysmbol : purchase.currency.substring(0,3)"></em>
+									<em ng-if="rule && rule.fareType == 3">到付</em>
+								</p>
+								<p>
+									<strong>
+										<i class="fa fa-exclamation-circle" ng-mouseenter="showRemindTagIntro = true" ng-mouseleave="showRemindTagIntro = false"></i>
+										<span class="price-down" ng-mouseenter="showRemindTagActivity = true" ng-mouseleave="showRemindTagActivity = false">减免</span>
+										手续费：
+									</strong>
+									<em ng-if="!isChange">{{purchase.currency == 'RMB' ? '￥ ':'$'}}0.00（<i ng-if="!isChange" ng-bind="getMul(purchase.ensurePrice, 0.00453) | formateNumber : 2 | currencySysmbol : purchase.currency" class="price-down-tag">$1.11</i><i ng-bind="getMul(purchase.currentTotal, 0.00453) | formateNumber : 2 | currencySysmbol : purchase.currency" ng-if="isChange" class="price-down-tag">$1.11</i>）</em>
+									<em ng-if="isChange">{{purchase.currency == 'RMB' ? '￥ ':'$'}}0.00（<i ng-if="!isChange" ng-bind="getMul(purchase.ensurePrice, 0.00453) | formateNumber : 2 | currencySysmbol : purchase.currency" class="price-down-tag">$1.11</i><i ng-bind="getMul(purchase.currentTotal, 0.00453) | formateNumber : 2 | currencySysmbol : purchase.currency" ng-if="isChange" class="price-down-tag">$1.11</i>）</em>
+									<div class="remind-tag intro" ng-show="showRemindTagIntro">
+										<div class="remind-tag-content">手续费：是指第三方支付机构在交易过程中，按照一定的百分比进行收取的费用。</div>
+										<div class="remind-tag-content red-text">手续费金额=订单金额 * 0.45%</div>
+									</div>
+									<div class="remind-tag activity" ng-show="showRemindTagActivity">
+										<div class="remind-tag-content">活动期间，减免手续费，已由商城支付给第三方机构。</div>
+									</div>
 								</p>
 								<p><strong>店铺合计：</strong>
 									<em ng-if="!isChange" ng-bind="purchase.ensurePrice | formateNumber : 2 | currencySysmbol : purchase.currency" style="font-weight: bold"></em>