Merge branch 'developer' into developerA

# Conflicts:
#	src/main/resources/static/js/pay/caimei-paycash.js
#	src/main/resources/static/js/pay/caimei-wechatpay.js

src/main/resources/static/js/pay/caimei-paycash.js

@@ -209,10 +209,10 @@ var payContainer = new Vue({
                         _self.payVipAliPay();
                     }else{
                         var params = {//正常订单
-                            payAmount: parseInt(_self.payAmount * 100),
-                            returnUrl: 'https://www.caimei365.com/',
-                            orderId: _self.payInfo.payOrderId
-                        };
+                                payAmount:Math.round(_self.payAmount*100),
+                                returnUrl:'https://www.caimei365.com/',
+                                orderId:_self.payInfo.payOrderId
+                            };
                         _self.PayOrderPcMallAlipay(params);
                     }
                 }else{// 网银支付
@@ -228,7 +228,7 @@ var payContainer = new Vue({
                     }else{
                         var params = {//正常订单
                             payWay:_self.payInfo.payBankNum,
-                            payAmount:parseInt(_self.payAmount*100),
+                            payAmount:Math.round(_self.payAmount*100),
                             returnUrl:'https://www.caimei365.com/',
                             orderId:_self.payInfo.payOrderId
                         };
@@ -262,7 +262,7 @@ var payContainer = new Vue({
                     _self.payVipPcMallPay();
                 } else {
                     var params = {//正常订单
-                            payAmount: parseInt(_self.payAmount*100),
+                            payAmount:Math.round(_self.payAmount*100),
                             bankCode:_self.payInfo.payBankNum,
                             returnUrl:'https://www.caimei365.com/pay/success.html?pageType=www&type=success&payAmount='+_self.payAmount,
                             orderId:_self.payInfo.payOrderId,

src/main/resources/static/js/pay/caimei-wechatpay.js

@@ -105,12 +105,12 @@ var payContainer = new Vue({
         },
         WxRequestPaymentFn:function(){ // 普通订单支付
             var _this = this;
-            var params = {
-                payAmount: _this.payAmount * 100,
-                code: _this.wechatcode,
-                state: _this.rand(1000, 9999),
-                orderId: _this.orderID,
-                returnUrl: 'https://www.caimei365.com/',
+            var params={
+                    payAmount:Math.round(_this.payAmount*100),
+                    code:_this.wechatcode,
+                    state:_this.rand(1000,9999),
+                    orderId:_this.orderID,
+                    returnUrl:'https://www.caimei365.com/',
             };
             PayApi.PayOrderMiniWxPay(params,function(response){
                 if(response.code == 0){