Merge branch 'dev' of 47.111.118.107:/srv/git/sdk into dev

Application/Sdk/View/default/Spend/paycallback.html

@@ -60,7 +60,7 @@
             </a>
         </div>
         
-        <div class="btn2">
+        <!-- <div class="btn2">
             <a id="payed1" data-order="{$pay_order_number}" href="javascript:" style="background:url('__IMG__/callback/btn2.png') no-repeat center center/100% 100%;">
                跳成功
             </a>
@@ -70,7 +70,7 @@
             <a id="payed2" data-order="{$pay_order_number}" href="javascript:" style="background:url('__IMG__/callback/btn2.png') no-repeat center center/100% 100%;">
                跳失败
             </a>
-        </div>
+        </div> -->
         <div class="whitesc"></div>
     </div>
     
@@ -102,13 +102,15 @@ $(function() {
 				}
 				
 			} else {
+				if ($(".gopay_url").val()) {
 					window.location.href = $(".gopay_url").val();
 				}
+			}
 			
 		} 
 	});
 	
-	$("#payed1").click(function(){
+	/* $("#payed1").click(function(){
 		var Scheme=$('.Scheme').val();
 		window.location.href = Scheme+"://1&back";
 		
@@ -117,7 +119,7 @@ $(function() {
 		var Scheme=$('.Scheme').val();
 		window.location.href = Scheme+"://0&back";
 		
-	});
+	}); */
 	
 	$("#payed").click(function() {
 		var orderno=$('.orderno').val();