合利宝支付联调

src/main/resources/static/MP_verify_77ef8FTVty438PCG.txt

@@ -0,0 +1 @@
+77ef8FTVty438PCG

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

@@ -147,11 +147,11 @@ var payContainer = new Vue({
             } else {
                 orderInfo = {//普通订单微信二维码参数
                     pageType:0,
-                    orderID:_self.payInfo.shopOrderId,
+                    shopOrderId:_self.payInfo.shopOrderId,
                     payAmount:_self.payAmount
                 };
             }
-            _self.payInfo.payMobileUrl = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx91c4152b60ca91a3&redirect_uri=https://www.caimei365.com/pay/wechatpay.html&response_type=code&scope=snsapi_base&state="+JSON.stringify(orderInfo)+"#wechat_redirect";
+            _self.payInfo.payMobileUrl = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx91c4152b60ca91a3&redirect_uri=https://www-b.caimei365.com/pay/wechatpay.html&response_type=code&scope=snsapi_base&state="+JSON.stringify(orderInfo)+"#wechat_redirect";
             console.log(_self.payInfo.payMobileUrl);
             var qrcode = new QRCode(document.getElementById("wx_pay_container"), {
                 render: "canvas", //也可以替换为table

src/main/resources/static/js/pay/mixin/hlb_payMixin.js

@@ -78,7 +78,7 @@ var hlbPayMixin = function () {// 合利宝支付渠道
 						shopOrderId:_this.payInfo.shopOrderId,
 						payAmount:_this.payAmount
 					};
-					_this.payInfo.payMobileUrl = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx91c4152b60ca91a3&redirect_uri=https://www.caimei365.com/pay/wechatpay.html&response_type=code&scope=snsapi_base&state="+JSON.stringify(orderInfo)+"#wechat_redirect";
+					_this.payInfo.payMobileUrl = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx91c4152b60ca91a3&redirect_uri=https://www-b.caimei365.com/pay/wechatpay.html&response_type=code&scope=snsapi_base&state="+JSON.stringify(orderInfo)+"#wechat_redirect";
 					location.href = _this.payInfo.payMobileUrl;
 				}else{
 					_this.payInfo.payData = {//正常订单
@@ -132,7 +132,7 @@ var hlbPayMixin = function () {// 合利宝支付渠道
 						couponId: this.couponId,
 						userId : this.userId
 					};
-					this.payInfo.payMobileUrl = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx91c4152b60ca91a3&redirect_uri=https://www.caimei365.com/pay/wechatpay.html&response_type=code&scope=snsapi_base&state=" + JSON.stringify(orderInfo) + "#wechat_redirect";
+					this.payInfo.payMobileUrl = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx91c4152b60ca91a3&redirect_uri=https://www-b.caimei365.com/pay/wechatpay.html&response_type=code&scope=snsapi_base&state=" + JSON.stringify(orderInfo) + "#wechat_redirect";
 					location.href = this.payInfo.payMobileUrl;
 				} else {
 					this.payInfo.payData = {
@@ -256,7 +256,7 @@ var hlbPayMixin = function () {// 合利宝支付渠道
 						vipRecordId: _this.vipRecordId,
 						payAmount: _this.payAmount
 					};
-					_this.payInfo.payMobileUrl = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx91c4152b60ca91a3&redirect_uri=https://www.caimei365.com/pay/wechatpay.html&response_type=code&scope=snsapi_base&state=" + JSON.stringify(orderInfo) + "#wechat_redirect";
+					_this.payInfo.payMobileUrl = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx91c4152b60ca91a3&redirect_uri=https://www-b.caimei365.com/pay/wechatpay.html&response_type=code&scope=snsapi_base&state=" + JSON.stringify(orderInfo) + "#wechat_redirect";
 					location.href = _this.payInfo.payMobileUrl;
 				} else {
 					_this.payInfo.payData = {
@@ -335,7 +335,7 @@ var hlbPayMixin = function () {// 合利宝支付渠道
 						productId:_this.productID,
 						payAmount:_this.payAmount
 					};
-					_this.payInfo.payMobileUrl = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx91c4152b60ca91a3&redirect_uri=https://www.caimei365.com/pay/wechatpay.html&response_type=code&scope=snsapi_base&state="+JSON.stringify(orderInfo)+"#wechat_redirect";
+					_this.payInfo.payMobileUrl = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx91c4152b60ca91a3&redirect_uri=https://www-b.caimei365.com/pay/wechatpay.html&response_type=code&scope=snsapi_base&state="+JSON.stringify(orderInfo)+"#wechat_redirect";
 					location.href = _this.payInfo.payMobileUrl;
 				}else{// PC 跳扫码支付页
 					_this.payInfo.payData = {//二手

src/main/resources/templates/user-center/order/detail.html

@@ -152,9 +152,8 @@
                                     </div>
                                 </div>
                                 <div class="shopinfo-bott clear">
-                                    <p v-if="shop.totalAmount>0">商品总额：<span class="none" >{{shop.totalAmount }}</span> </p>
+                                    <p v-if="shop.totalAmount>0">商品总额：<span class="none" >￥{{shop.totalAmount | NumFormat }}</span> </p>
                                     <p v-if="shop.totalAmount>0">优惠：<span class="none">￥{{shop.eachDiscount | NumFormat}}</span> </p>
-                                    <p v-if="shop.totalAmount>0">余额抵扣：<span class="none">￥{{shop.totalAmount | NumFormat}}</span> </p>
                                     <p v-if="shop.totalAmount>0">应付金额：<span class="none">￥{{shop.realPay | NumFormat}}</span> </p>
                                     <p v-if="shop.totalAmount>0">已付金额：<span class="none">￥{{shop.receiptAmount | NumFormat}}</span> </p>
                                     <p v-if="shop.totalAmount>0">待付金额：<span class="red">￥{{shop.obligation | NumFormat}}</span> </p>