Browse Source

bugCommit

zhengjinyi 4 years ago
parent
commit
1363f8f046

+ 1 - 1
src/main/resources/static/css/pay/caimei-wechatpay.css

@@ -77,5 +77,5 @@
     font-size: .3rem;
     font-size: .3rem;
     text-align: center;
     text-align: center;
     padding-left: 1.5rem;
     padding-left: 1.5rem;
-    background: url("/web/order/img/logo@2x.png")no-repeat left top;
+    background: url("/img/pay/logo@2x.png")no-repeat left top;
 }
 }

BIN
src/main/resources/static/img/pay/logo@2x.png


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

@@ -18,8 +18,8 @@ var payContainer = new Vue({
     methods: {
     methods: {
         infoPayOrderCheckoutCounter:function(){//初始化订单数据
         infoPayOrderCheckoutCounter:function(){//初始化订单数据
             var _this = this;
             var _this = this;
-            _this.wechatcode = _util.getUrlParam('code');
-            _this.state = JSON.parse(decodeURIComponent(_util.getUrlParam('state')));
+            _this.wechatcode = CAIMEI.getUrlParam('code');
+            _this.state = JSON.parse(decodeURIComponent(CAIMEI.getUrlParam('state')));
             _this.payAmount = _this.state.payAmount;
             _this.payAmount = _this.state.payAmount;
             _this.pageType = _this.state.pageType;
             _this.pageType = _this.state.pageType;
             _this.isRequest = true;
             _this.isRequest = true;
@@ -47,7 +47,7 @@ var payContainer = new Vue({
             };
             };
             PayApi.PayOrdersecondHandPay(params,function(response){
             PayApi.PayOrdersecondHandPay(params,function(response){
                 if(response.code == 0){
                 if(response.code == 0){
-                    let PayInfo = JSON.parse(response.data.data.payInfo);
+                    var PayInfo = JSON.parse(response.data.data.payInfo);
                     if (typeof WeixinJSBridge == "undefined"){
                     if (typeof WeixinJSBridge == "undefined"){
                         if( document.addEventListener ){
                         if( document.addEventListener ){
                             document.addEventListener('WeixinJSBridgeReady', onBridgeReady, false);
                             document.addEventListener('WeixinJSBridgeReady', onBridgeReady, false);
@@ -59,7 +59,7 @@ var payContainer = new Vue({
                         _this.onBridgeReady(PayInfo);
                         _this.onBridgeReady(PayInfo);
                     }
                     }
                 }else{
                 }else{
-                    layer.msg("支付链接已失效,请重新扫码支付");
+                     CAIMEI.dialog("支付链接已失效,请重新扫码支付");
                     setTimeout(function(){
                     setTimeout(function(){
                         WeixinJSBridge.call('closeWindow');
                         WeixinJSBridge.call('closeWindow');
                     },3000);
                     },3000);
@@ -78,7 +78,7 @@ var payContainer = new Vue({
             };
             };
             PayApi.PayOrderMiniWxPay(params,function(response){
             PayApi.PayOrderMiniWxPay(params,function(response){
                 if(response.code == 0){
                 if(response.code == 0){
-                    let PayInfo = JSON.parse(response.data.data.payInfo);
+                    var PayInfo = JSON.parse(response.data.data.payInfo);
                     if (typeof WeixinJSBridge == "undefined"){
                     if (typeof WeixinJSBridge == "undefined"){
                         if( document.addEventListener ){
                         if( document.addEventListener ){
                             document.addEventListener('WeixinJSBridgeReady', onBridgeReady, false);
                             document.addEventListener('WeixinJSBridgeReady', onBridgeReady, false);
@@ -90,7 +90,7 @@ var payContainer = new Vue({
                         _this.onBridgeReady(PayInfo);
                         _this.onBridgeReady(PayInfo);
                     }
                     }
                 }else{
                 }else{
-                    layer.msg("支付链接已失效,请重新扫码支付");
+                    CAIMEI.dialog('支付链接已失效,请重新扫码支付');
                     setTimeout(function(){
                     setTimeout(function(){
                         WeixinJSBridge.call('closeWindow');
                         WeixinJSBridge.call('closeWindow');
                     },3000);
                     },3000);
@@ -109,15 +109,15 @@ var payContainer = new Vue({
                     },
                     },
                 function(res) {
                 function(res) {
                     if(res.err_msg == "get_brand_wcpay_request:ok"){
                     if(res.err_msg == "get_brand_wcpay_request:ok"){
-                        layer.msg('支付成功');
+                         CAIMEI.dialog('支付成功');
                         window.open("https://www.caimei365.com/");
                         window.open("https://www.caimei365.com/");
                     }else if(res.err_msg == "get_brand_wcpay_request:cancel"){
                     }else if(res.err_msg == "get_brand_wcpay_request:cancel"){
-                        layer.msg("用户取消支付,请重新扫码支付");
+                         CAIMEI.dialog("用户取消支付,请重新扫码支付");
                         setTimeout(function(){
                         setTimeout(function(){
                             WeixinJSBridge.call('closeWindow');
                             WeixinJSBridge.call('closeWindow');
                         },3000);
                         },3000);
                     }else{
                     }else{
-                        layer.msg("支付失败,请重新扫码支付");
+                         CAIMEI.dialog("支付失败,请重新扫码支付");
                         setTimeout(function(){
                         setTimeout(function(){
                             WeixinJSBridge.call('closeWindow');
                             WeixinJSBridge.call('closeWindow');
                         },3000);
                         },3000);