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

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">
 

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>
+                </li> -->
                 
-                    </div>
-                </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>

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" >

Application/Sdk/Controller/ExchangeController.class.php

@@ -104,7 +104,10 @@ 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;
+<<<<<<< HEAD
+=======
 
+>>>>>>> 02043044b5ad23725e95e03440fc41595e79047f
 
 			}elseif(!get_game_appstatus2($request['game_id'])&&$request['is_create_ordernumer']==1){ /* 苹果支付 */
 

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;