Merge branch 'hotfix/model_change' into dev

# Conflicts:
#	Application/Sdk/View/default/UserH/platform_pay.html

Application/Sdk/Controller/ShortcutController.class.php

@@ -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 {  // 游戏充值

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(){

Application/Sdk/View/default/UserH/platform_pay.html

@@ -18,7 +18,7 @@
                  支付中心
             </div>
          </div> -->
-
+      <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="">
@@ -124,7 +124,7 @@
                  支付中心
             </div>
          </div> -->
-
+      <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="">
@@ -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();