Merge branch 'developerC' into developerA

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

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

@@ -252,7 +252,7 @@ var payContainer = new Vue({
                 if(_self.pageType === '1'){
                     var params = {//二手
                             bankCode:_self.payInfo.payBankNum,
-                            returnUrl:'https://www.caimei365.com/',
+                            returnUrl:'https://www.caimei365.com/pay/success.html?pageType=www&type=success&payAmount='+_self.payAmount,
                             productId:_self.productID,
                             userType:_self.payInfo.payUserType,
                     };
@@ -263,7 +263,7 @@ var payContainer = new Vue({
                     var params = {//正常订单
                             payAmount: parseInt(_self.payAmount*100),
                             bankCode:_self.payInfo.payBankNum,
-                            returnUrl:'https://www.caimei365.com/',
+                            returnUrl:'https://www.caimei365.com/pay/success.html?pageType=www&type=success&payAmount='+_self.payAmount,
                             orderId:_self.payInfo.payOrderId,
                             userType:_self.payInfo.payUserType
                     };