diff --git a/Application/Mobile/View/Index/product.html b/Application/Mobile/View/Index/product.html
index ecc0a3a05..370123230 100644
--- a/Application/Mobile/View/Index/product.html
+++ b/Application/Mobile/View/Index/product.html
@@ -115,7 +115,7 @@
     <div class="banner" style="width:100%;">
       <div class="swiper-container swiper-container-banner" style="width:100%;">
         <div class="swiper-wrapper">
-          <volist name="wap_index" id="cr" offset="3" length='3'>
+          <volist name="wap_index" id="cr" >
             <div class="swiper-slide">
               <a href="{$cr.url}" target="{$cr.target}" class="swiper-slide_a">
 
diff --git a/Application/Mobile/View/Public/bases.html b/Application/Mobile/View/Public/bases.html
index 0383c36d7..683b189b1 100644
--- a/Application/Mobile/View/Public/bases.html
+++ b/Application/Mobile/View/Public/bases.html
@@ -157,7 +157,13 @@
                     <div class="kf_pic">
                         <a href="tencent://message/?uin={:C('PC_SET_SERVER_QQ')}&amp;menu=yes" id="launch_qq "><span><img src="__IMG__/qq_icon.png "></span><b>在线客服</b></a>
                         <i class="arrow "></i>
-
+                    </div>
+                </li>
+                <li class="show kf " >
+                    <a href="./media.php"></a>
+                    <div class="kf_pic">
+                        <a href="./media.php" target="_blank"><span><img src="__IMG__/pc_icon.png "></span><b>pc官网</b></a>
+                        <i class="arrow "></i>
 
                     </div>
                 </li>
@@ -177,7 +183,7 @@
                         <i class="arrow "></i>
                     </div>
                 </li>
-                <li class="show pop ">
+                <!-- <li class="show pop ">
                     <a href="./index.php" target="_blank"></a>
                     <div class="pop_pic">
                         推广游戏得分成~<br>
@@ -186,21 +192,13 @@
                         <i class="arrow "></i>
                     </div>
 
-                </li>
-                <li class="show kf " >
-                    <a href="./media.php"></a>
-                    <div class="kf_pic">
-                        <a href="./media.php" target="_blank"><span><img src="__IMG__/pc_icon.png "></span><b>pc官网</b></a>
-                        <i class="arrow "></i>
-
-                    </div>
-                </li>
+                </li> -->
+                
 								<li class="show kf " >
-                    <a href="https://www..com/"></a>
+                    <a href="javascript:alert('暂无')"></a>
                     <div class="kf_pic">
-                        <a href="https://www..com/" target="_blank"><span><img src="__IMG__/pc_icon.png "></span><b>技术支持</b></a>
+                        <a href="javascript:alert('暂无')"><span><img src="__IMG__/pc_icon.png "></span><b>技术支持</b></a>
                         <i class="arrow "></i>
-
                     </div>
                 </li>
                 <li>
diff --git a/Application/Mobile/View/User/index.html b/Application/Mobile/View/User/index.html
index 934dee2f3..7bcfd571f 100644
--- a/Application/Mobile/View/User/index.html
+++ b/Application/Mobile/View/User/index.html
@@ -133,12 +133,12 @@
               </a>
             </li>
             </if>
-			<li>
+			<!-- <li>
               <?php $useing_record = $user['id'] ? U('useing_record') : U('login');?>
               <a class="item" href="{$useing_record}">
                 <img src="__IMG__/icon_xiaofei@3x.png" class="icon"><p class="name">消费记录</p>
               </a>
-            </li>
+            </li> -->
 			<!-- 最后一个空矩形框，无内容 begin! -->
 			<li>
               <a class="item" >
diff --git a/Application/Sdk/Controller/AppleController.class.php b/Application/Sdk/Controller/AppleController.class.php
index 76b9bab76..d9a3a2d9c 100644
--- a/Application/Sdk/Controller/AppleController.class.php
+++ b/Application/Sdk/Controller/AppleController.class.php
@@ -9,6 +9,7 @@ use Org\GoldPig\GoldPig;
 use Org\SqpaySDK\Sqpay;
 use Org\HeepaySDK\Heepay;
 use Qiniu\json_decode;
+use Think\Log;
 
 
 class AppleController extends BaseController{    
@@ -88,18 +89,20 @@ class AppleController extends BaseController{
     */
     public function apple_alipay_pay($user_id,$game_id){
         #获取SDK上POST方式传过来的数据 然后base64解密 然后将json字符串转化成数组
+        //echo json_encode(['code'=>0,'msg'=> $user_id."game:".$game_id]);exit;
         $file=file_get_contents("./Application/Sdk/OrderNo/".$user_id."-".$game_id.".txt");
         $request = json_decode(think_decrypt($file),true);
         C(api('Config/lists'));
        
-        /*$request['user_id'] = 1;
+        /*
+        $request['user_id'] = 1;
         $request['game_id'] = 1;
         $request['price'] = 1.01;
-        $request['extend'] = 21111183;
+        $request['extend'] = 21111184;
         $request['pay_order_number'] = 21111183;
         $request['sdk_version'] = 2;
         $request['code'] =1;
-        */
+*/
         if (empty($request)) {
 			echo json_encode(['code'=>0,'msg'=>'登录数据不能为空']);exit;
 		}
@@ -125,7 +128,7 @@ class AppleController extends BaseController{
 		$this->other_price($request);
 
         if(get_zfb_type()==0){ // 支付宝官方
-			if(C('alipay.way')==1 || ($request['is_create_ordernumer']==1 && C('alipay.way')==0)){/* wap */
+			if(C('alipay.way')==1 || ($request['is_create_ordernumer']==1 && C('alipay.way')==0)){ /* wap */
 
 	            $game_set_data = get_game_set_info($request['game_id']);
 	            $request['apitype'] = "alipay";
@@ -324,7 +327,8 @@ class AppleController extends BaseController{
             ->setGameId($param['game_id'])
             ->setGameName(get_game_name($param['game_id']))
             ->setGameAppid($param['game_appid'])
-            ->setServerId(0)
+            ->setServerId($param['server_id'])
+            ->setGameplayerId($param['game_player_id'])
             ->setCallback($param['callback'])
             ->setNotifyUrl($param['notifyurl'])
             ->setGameplayerName($param['game_player_name'])
@@ -354,6 +358,7 @@ class AppleController extends BaseController{
     {
         $file=file_get_contents("./Application/Sdk/OrderNo/".$user_id."-".$game_id.".txt");
         $request = json_decode(think_decrypt($file),true);
+//         Log::write("wxpay:".serialize($request));
         /*$request['user_id'] = 1;
         $request['game_id'] = 1;
         $request['price'] = 157.01;
diff --git a/Application/Sdk/Controller/ExchangeController.class.php b/Application/Sdk/Controller/ExchangeController.class.php
index e116969e5..9fcdbfe50 100644
--- a/Application/Sdk/Controller/ExchangeController.class.php
+++ b/Application/Sdk/Controller/ExchangeController.class.php
@@ -75,10 +75,9 @@ class ExchangeController extends BaseController{
 
 
             file_put_contents("./Application/Sdk/OrderNo/".$request['user_id']."-".$request['game_id'].".txt",think_encrypt(json_encode($request)));
-
-
             echo base64_encode(json_encode(array('status'=>200,'out_trade_no'=>$out_trade_no,'img'=>'http://' . $_SERVER ['HTTP_HOST'].'/sdk.php?s=/Spend/pay_way&user_id='.$request['user_id'].'&game_id='.$request['game_id'].'&type=1')));exit;
 
+
         } else {
 
              $extend_data = M('spend','tab_')->where(array('extend'=>$request['extend'],'pay_status'=>1,'game_id'=>$request['game_id']))->find();
@@ -106,7 +105,6 @@ class ExchangeController extends BaseController{
 
 
                             file_put_contents("./Application/Sdk/OrderNo/".$request['user_id']."-".$request['game_id'].".txt",think_encrypt(json_encode($request)));
-
                             echo base64_encode(json_encode(array('status'=>200,'out_trade_no'=>$out_trade_no,'img'=>'http://' . $_SERVER ['HTTP_HOST'].'/sdk.php?s=/Spend/pay_way&user_id='.$request['user_id'].'&game_id='.$request['game_id'].'&type=1')));exit;
 
 			}elseif(!get_game_appstatus2($request['game_id'])&&$request['is_create_ordernumer']==1){ /* 苹果支付 */
diff --git a/Application/Sdk/Controller/WapPayController.class.php b/Application/Sdk/Controller/WapPayController.class.php
index 69be342d5..aba65f93c 100644
--- a/Application/Sdk/Controller/WapPayController.class.php
+++ b/Application/Sdk/Controller/WapPayController.class.php
@@ -11,7 +11,7 @@ use Org\GoldPig\GoldPig;
 use Org\SqpaySDK\Sqpay;
 use Qiniu\json_decode;
 use Think\Log;
-class WapPayController extends BaseController{ 
+class WapPayController extends BaseController{
 	
     private function pay($param=array()){ 
         $table  = $param['code'] == 1 ? "spend" : "deposit"; 
@@ -41,7 +41,8 @@ class WapPayController extends BaseController{
             ->setGameId($param['game_id']) 
             ->setGameName(get_game_name($param['game_id'])) 
             ->setGameAppid($param['game_appid']) 
-            ->setServerId(0) 
+            ->setServerId($param['server_id']) 
+            ->setGamePlayerId($param['game_player_id'])
             ->setGameplayerName($param['game_player_name']) 
             ->setServerName($param['server_name']) 
             ->setUserId($param['user_id']) 
@@ -623,21 +624,20 @@ class WapPayController extends BaseController{
                       $json_data['paytype'] ="wx"; 
                 }else{
                     if(!empty($request['scheme'])) {
-                        $redirect_url = (is_ssl()?'https://':'http://'). $_SERVER ['HTTP_HOST'] . "/sdk.php/Spend/pay_success2/orderno/".$request['pay_order_number'].'/game_id/'.$request['game_id'];
+                        $redirect_url = (is_ssl()?'https://':'http://'). 'api.wmtxkj.com' . "/sdk.php/Spend/pay_success2/orderno/".$request['pay_order_number'].'/game_id/'.$request['game_id'];
                     } else {
-                        $redirect_url = (is_ssl()?'https://':'http://'). $_SERVER ['HTTP_HOST'] . "/sdk.php/Spend/pay_success/orderno/".$request['pay_order_number'];
+                        $redirect_url = (is_ssl()?'https://':'http://'). 'api.wmtxkj.com' . "/sdk.php/Spend/pay_success/orderno/".$request['pay_order_number'];
                     }
                      $json_data['url'] = $is_pay['mweb_url'].'&redirect_url='.urlencode( $redirect_url );
                       $json_data['paytype'] ="wx"; 
                 } 
             }else{ 
                 $json_data['status'] = 500; 
-                $json_data['url']    = "http://" . $_SERVER['HTTP_HOST']; 
+                $json_data['url']    = "http://" . 'api.wmtxkj.com'; 
             } 
-                $json_data['cal_url']    = C("pay_header"); 
-
-                  echo base64_encode(json_encode($json_data));exit; 
-            // $this->redirect('WapPay/weixin_pay_view',['user_id'=>$request['user_id'],'game_id'=>$request['game_id']]); 
+                $json_data['cal_url']    = 'api.wmtxkj.com';
+                echo base64_encode(json_encode($json_data));exit;
+                // $this->redirect('WapPay/weixin_pay_view',['user_id'=>$request['user_id'],'game_id'=>$request['game_id']]);
         } else if(get_wx_pay_type() == 1){  // 威富通
             if( empty(C('heepay.partner'))||empty(C('heepay.key'))){ 
                 $this->set_message(1009, "fail", "支付参数未配置"); 
diff --git a/Public/Mobile/css/public1.css b/Public/Mobile/css/public1.css
index 28d59d8e1..5b291dad5 100644
--- a/Public/Mobile/css/public1.css
+++ b/Public/Mobile/css/public1.css
@@ -436,8 +436,8 @@
 }
 .float_contact1 .float-bg {
 	width: 50px;
-	height:342px;
-	background: url(../images/float_contact1.png);
+	height: 230px;
+	background: url(../images/float_contact2.png);
 	position: absolute;
 	top: 0;
 	left: 0;
@@ -446,17 +446,17 @@
 .float_contact1 ul {
 	width: 52px;
 	height: 171px;
-	padding-top: 14px;
+	padding-top: 13px;
 }
 .float_contact1 ul li {
 	float: left;
 	width: 100%;
-	margin-bottom: 11px;
+	margin-bottom: 14px;
 	position: relative;
 }
 .float_contact1 ul li a {
 	width: 100%;
-	height: 39px;
+	height: 32px;
 	display: inline-block;
 	float: left;
 	position: relative;
diff --git a/Public/Mobile/images/float_contact2.png b/Public/Mobile/images/float_contact2.png
new file mode 100644
index 000000000..6efb59641
Binary files /dev/null and b/Public/Mobile/images/float_contact2.png differ
diff --git a/ThinkPHP/Library/Think/Pay.class.php b/ThinkPHP/Library/Think/Pay.class.php
index 481a0c264..af718417e 100644
--- a/ThinkPHP/Library/Think/Pay.class.php
+++ b/ThinkPHP/Library/Think/Pay.class.php
@@ -313,6 +313,7 @@ class Pay
         $spend_data['game_name'] = $vo->getGameName();
         $spend_data['server_id'] = $vo->getServerId();
         $spend_data['server_name'] = $vo->getServerName();
+        $spend_data['game_player_id'] = $vo->getGameplayerId();
         $spend_data['game_player_name'] = $vo->getGameplayerName();
         $spend_data['promote_id'] = $vo->getPromoteId();
         $spend_data['promote_account'] = $vo->getPromoteName();
diff --git a/ThinkPHP/Library/Think/Pay/PayVo.class.php b/ThinkPHP/Library/Think/Pay/PayVo.class.php
index bc52288a8..22344066b 100644
--- a/ThinkPHP/Library/Think/Pay/PayVo.class.php
+++ b/ThinkPHP/Library/Think/Pay/PayVo.class.php
@@ -24,6 +24,7 @@ class PayVo {
     protected $_serverid;
     protected $_serverName;
     protected $_gameplayerName;
+    protected $_gameplayerId;
     protected $_userid;
     protected $_account;
     protected $_userNickName;
@@ -59,6 +60,12 @@ class PayVo {
         $this->_gameplayerName = $gameplayerName;
         return $this;
     }
+    
+    // 设置游戏玩家ID
+    public function setGameplayerId($gameplayerId) {
+    	$this->_gameplayerId = $gameplayerId;
+    	return $this;
+    }
 
    //退款批次号
     public function setBatchNo($batchno) {
@@ -445,6 +452,14 @@ class PayVo {
     public function getGameId() {
         return $this->_gameid;
     }
+    
+    /**
+     * 获取角色id
+     * @return type
+     */
+    public function getGameplayerId() {
+    	return $this->_gameplayerId;
+    }
 
     /**
      * 获取游戏名称