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

Application/Sdk/Controller/ChangyanController.class.php

@@ -48,7 +48,8 @@ class ChangyanController extends Controller {
         // $this->assign('game_id',"1"); 
         // $this->display("WapPay/wap_shortcut_pay");
 
-        $this->display("UserH/platform_pay");
+        // $this->display("UserH/platform_pay");
+        $this->display("Spend/paycallback");
         
         # code...
     }

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

@@ -24,7 +24,15 @@
             <a href="javascript:">
                 <img src="__IMG__/callback/close.png">
             </a>
-        </div> -->
+		</div> -->
+		<div id="toast" style="display: none;">
+			<div class="weui-mask_transparent"></div>
+			<div class="weui-toast" style="min-height: 0px;">
+				<!-- <i class="weui-icon-success-no-circle weui-icon_toast"></i> -->
+				<p class="weui-toast__content" style="margin:15px;"><span id="paytype">支付成功</span><br/><span style="font-size: .24rem;">2秒后将自动跳转</span></p>
+			</div>
+		</div>
+
         <div class="wxicon">
             <eq name="paytype" value="weixinpay">
             <img src="__IMG__/wxpay2x.png">
@@ -143,11 +151,15 @@ $(function() {
 				if (r.type == "deposit") {
 					if (r.payStatus == '1') {
 						// 提示支付成功
+						$("#paytype").html("支付成功");
 					} else {
 						// 提示支付失败
+						$("#paytype").html("支付失败");
 					}
-					
-					window.location.href = r.url;
+					$("#toast").show();
+					setTimeout(function(){
+						window.location.href = r.url;
+					},2000)
 				} 
 		
 				if (r.type == "spend") {