Merge branch 'dev' of 47.111.118.107:/srv/git/platform

Application/Sdk/Controller/SpendController.class.php

@@ -62,16 +62,18 @@ class SpendController extends Controller {
 			'user_id' => $user_id,
 			'game_id' => $game_id 
 		) )->getField ( 'bind_balance' );
-		$data['price'] = 1;
+		// $data['price'] = 1;
 		
 		$this->assign ( 'balance', $balance );
 		$this->assign ( 'bind_balance', $bind_balance );
 		$this->assign ( 'data', $data );
 		$this->assign ( 'btncolor', $request ['btncolor'] );
-		if ($balance + $bind_balance > $data['price'])
+		if ($balance + $bind_balance > $data['price']) {
 			$this->assign ('pay_price', 0); // 是否第三方支付
-		else 
-			$this->assign ('pay_price', $data['price'] - $balance - $bind_balance); 
+		} else {
+			$payPrice = $data['price'] - $balance - $bind_balance;
+			$this->assign ('pay_price', $payPrice ? $payPrice : 0);
+		} 
 		
 		/* $this->assign ( 'alipayurl', $ret[0]['payURL']);
 		header("Access-Control-Allow-Origin: *"); */