From c33e3f13b7817bf4cae5005e32bab1efa6929c5a Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Mon, 23 Mar 2020 11:32:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E9=99=90=E9=A2=9D=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/ShortcutController.class.php   |  4 +-
 .../Sdk/View/default/Spend/pay_way.html       | 11 ++--
 .../Sdk/View/default/UserH/platform_pay.html  | 65 +++++++++++++++----
 3 files changed, 61 insertions(+), 19 deletions(-)

diff --git a/Application/Sdk/Controller/ShortcutController.class.php b/Application/Sdk/Controller/ShortcutController.class.php
index 1868a8a8..9b4aec8c 100644
--- a/Application/Sdk/Controller/ShortcutController.class.php
+++ b/Application/Sdk/Controller/ShortcutController.class.php
@@ -449,7 +449,7 @@ class ShortcutController extends BaseController{
     
     // 快捷---易宝支付
     public function yee_pay($user_id,$game_id) {
-        
+
         $is_platform = 0;
         if (I('request.code') == 0 && I('request.type') == 'platform') {
             $is_platform = 1;	// 平台币充值
@@ -705,7 +705,9 @@ class ShortcutController extends BaseController{
             ])->order('id desc')->find();
             $request['pay_order_number'] = $payInfo['order_id'];
 
+
             if (!$payInfo) {
+                echo json_encode(['code'=>0,'msg'=>'订单信息不存在']);exit;
                 return ;
             }
         } else {  // 游戏充值
diff --git a/Application/Sdk/View/default/Spend/pay_way.html b/Application/Sdk/View/default/Spend/pay_way.html
index 233ce846..e7db7440 100644
--- a/Application/Sdk/View/default/Spend/pay_way.html
+++ b/Application/Sdk/View/default/Spend/pay_way.html
@@ -303,9 +303,10 @@
 
     }
 
-    function showWindow() {
+    function showWindow(msg) {
       $(".payment_window").show();
       $(".payment_model").show();
+      $(".payment_window_img").children().next().text(msg);
     }
 
 
@@ -411,7 +412,7 @@
 						$(".tipmsg").html(result.msg);
 						$(".msgdialog").show();
 					} else {
-            showWindow();
+            showWindow(result.msg);
           }
 				},
                 error: function(){
@@ -439,7 +440,7 @@
 					$(".tipmsg").html(result.msg);
 					$(".msgdialog").show();
 				} else {
-          showWindow();
+          showWindow(result.msg);
         }
 			},
             error:function(){
@@ -467,7 +468,7 @@
 					$(".tipmsg").html(result.msg);
 					$(".msgdialog").show();
 				} else {
-          showWindow();
+          showWindow(result.msg);
         }
 			},
             error:function(){
@@ -498,7 +499,7 @@
             $(".tipmsg").html(result.msg);
             $(".msgdialog").show();
           } else {
-            showWindow();
+            showWindow(result.msg);
           }
         },
         error:function(){
diff --git a/Application/Sdk/View/default/UserH/platform_pay.html b/Application/Sdk/View/default/UserH/platform_pay.html
index 3de6bc87..e21ef071 100644
--- a/Application/Sdk/View/default/UserH/platform_pay.html
+++ b/Application/Sdk/View/default/UserH/platform_pay.html
@@ -18,8 +18,8 @@
                  支付中心
             </div>
          </div> -->
-
-      <div class="payment_window" style="">
+      <div class="payment_model" style="position: fixed;width: 100%;height: 100%;top: 0;left: 0;background:rgba(38,38,38,0.4);z-index: 0;display: none"></div>
+      <div class="payment_window" style="display: none">
         <div class="payment_window_img">
           <img src="__IMG__/payment_window.png" alt="">
           <div>请求发起失效，编号SP_202001 10134640KYdp，请选择其他支 付方式或联系客服。</div>
@@ -124,8 +124,8 @@
                  支付中心
             </div>
          </div> -->
-
-      <div class="payment_window" style="">
+      <div class="payment_model" style="position: fixed;width: 100%;height: 100%;top: 0;left: 0;background:rgba(38,38,38,0.4);z-index: 0;display: none"></div>
+      <div class="payment_window" style="display: none">
         <div class="payment_window_img">
           <img src="__IMG__/payment_window.png" alt="">
           <div>请求发起失效，编号SP_202001 10134640KYdp，请选择其他支 付方式或联系客服。</div>
@@ -265,17 +265,23 @@
     defaultInit();
 
     function closeWindow() {
+      $(".payment_window").hide();
+      $(".payment_model").hide();
+    }
 
+    function showWindow(msg) {
 
-
+      $(".payment_window").show();
+      $(".payment_model").show();
+      $(".payment_window_img").children().next().text(msg);
     }
 
     $(".payment_window_close").click(function() {
-      $(".payment_window").hide();
+      closeWindow();
     });
 
     $(".payment_window_confirm").click(function() {
-      $(".payment_window").hide();
+      closeWindow();
     });
 
     $(".select_pay_info").click(function(){
@@ -333,9 +339,11 @@
                 flag = false;
                 if (r.code == 200) {
                     window.location.href = r.url;
-                } else {
-                    $(".tipmsg").html(result.msg);
+                } else  if(r.code!=1001){
+                    $(".tipmsg").html(r.msg);
 					$(".msgdialog").show();
+                } else {
+                  showWindow(r.msg);
                 }
             }
 
@@ -373,9 +381,11 @@
                             }
                         }
                     }
-                } else {
+                } else if(result.code!=1001) {
                     $(".tipmsg").html(result.msg);
 					$(".msgdialog").show();
+                } else {
+                  showWindow(result.msg);
                 }
             }
         });
@@ -393,9 +403,11 @@
                 flag = false;
                 if (r.code == 200) {
                     window.location.href = r.url;
-                } else {
-                    $(".tipmsg").html(result.msg);
+                } else if(r.code!=1001) {
+                    $(".tipmsg").html(r.msg);
 					$(".msgdialog").show();
+                } else {
+                  showWindow(r.msg);
                 }
             }
 
@@ -407,8 +419,35 @@
     
   //快捷支付
     function sqshorcut(){
+
+      var url = payurl;
       flag = false;
-      window.location.href =payurl;
+      $.ajax({
+        type:'post',
+        dataType:'json',
+        data:{sign: 1},
+        url:url,
+        success:function(result) {
+          if(result.code==200) {
+            window.location.href = url;
+          } else if(result.code!=1001){
+            flag=false;
+            $(".tipmsg").html(result.msg);
+            $(".msgdialog").show();
+          } else {
+            showWindow(result.msg);
+          }
+        },
+        error:function(){
+          flag=false;
+          $(".tipmsg").html("接口请求错误");
+          $(".msgdialog").show();
+        }
+      });
+      return false;
+
+      // flag = false;
+      // window.location.href =payurl;
     }
     $(".payment_rest_btn").click(function(){
         $(".payment_rest_btn").hide();