Merge remote-tracking branch 'remotes/origin/developer' into developerA

src/main/webapp/WEB-INF/views/modules/order/cmPayShopForm.jsp

@@ -505,7 +505,8 @@
 	$('body').on('input propertychange','.used-amount',function() {
 		var thisEle = $(this),
 			thisVal = Number(thisEle.val()),
-			totalAmount = Number($('#totalAmount').text()),
+			//totalAmount = Number($('#totalAmount').text()),
+			totalAmount = ${cmPayShop.totalAmount},
 			rebateAmount = Number($('#rebateAmount-hidden').val()),
 			ableRebateAmount = Number($('#ableRebateAmount-hidden').val());