Merge branch 'dev-cz' into dev_zcl

# Conflicts:
#	Application/Sdk/Controller/Ipa365Controller.class.php

Application/Base/Repository/PromoteRepository.class.php

@@ -40,8 +40,8 @@ class PromoteRepository {
         if (isset($params['sdk_version'])) {
             $map['sdk_version'] = $params['sdk_version'];
         }
-        if (isset($params['begin_time']) && isset($params['begin_time'])) {
-            $map['create_time'] = ['between', [$params['begin_time'], $params['end_time']]];
+        if (isset($params['begin_time']) && isset($params['begin_time']) && isset($params['time_column'])) {
+            $map[$params['time_column']] = ['between', [$params['begin_time'], $params['end_time']]];
         }
         return $map;
     }
@@ -54,6 +54,7 @@ class PromoteRepository {
         if (count($ids) == 0) {
             return [];
         }
+        $params['time_column'] = 'create_time';
         $map = $this->getPublicAchievementMap($ids, $params);
         $items = M('user_play_info', 'tab_')->field(['count(*) count', 'promote_id'])->where($map)->group('promote_id')->select();
         $records = [];
@@ -82,6 +83,8 @@ class PromoteRepository {
         if (count($ids) == 0) {
             return [];
         }
+
+        $params['time_column'] = 'create_time';
         $map = $this->getPublicAchievementMap($ids, $params);
         $items = M('user_play_info', 'tab_')->field(['count(distinct user_id) count', 'promote_id'])->where($map)->group('promote_id')->select();
 
@@ -111,6 +114,8 @@ class PromoteRepository {
         if (count($ids) == 0) {
             return [];
         }
+
+        $params['time_column'] = 'create_time';
         $map = $this->getPublicAchievementMap($ids, $params);
 
         $subMap = $map;
@@ -150,6 +155,8 @@ class PromoteRepository {
         if (count($ids) == 0) {
             return [];
         }
+
+        $params['time_column'] = 'create_time';
         $map = $this->getPublicAchievementMap($ids, $params);
 
         $subMap = $map;
@@ -189,6 +196,8 @@ class PromoteRepository {
         if (count($ids) == 0) {
             return [];
         }
+
+        $params['time_column'] = 'create_time';
         $map = $this->getPublicAchievementMap($ids, $params);
 
         $subMap = $map;
@@ -228,8 +237,9 @@ class PromoteRepository {
         if (count($ids) == 0) {
             return [];
         }
+        $params['time_column'] = 'login_time';
         $map = $this->getPublicAchievementMap($ids, $params);
-        $items = M('user', 'tab_')->field(['count(*) count', 'promote_id'])->where($map)->group('promote_id')->select();
+        $items = M('user_login_record', 'tab_')->field(['count(DISTINCT user_id) as count', 'promote_id'])->where($map)->group('promote_id')->select();
 
         $records = [];
         foreach ($items as $item) {
@@ -257,6 +267,8 @@ class PromoteRepository {
         if (count($ids) == 0) {
             return [];
         }
+
+        $params['time_column'] = 'pay_time';
         $map = $this->getPublicAchievementMap($ids, $params);
         
         $items = M('spend', 'tab_')->field(['count(*) count', 'promote_id'])->where($map)->group('promote_id')->select();
@@ -287,6 +299,8 @@ class PromoteRepository {
         if (count($ids) == 0) {
             return [];
         }
+
+        $params['time_column'] = 'pay_time';
         $map = $this->getPublicAchievementMap($ids, $params);
         $items = M('spend', 'tab_')->field(['count(distinct user_id) count', 'promote_id'])->where($map)->group('promote_id')->select();
 
@@ -316,6 +330,8 @@ class PromoteRepository {
         if (count($ids) == 0) {
             return [];
         }
+
+        $params['time_column'] = 'pay_time';
         $map = $this->getPublicAchievementMap($ids, $params);
         $items = M('spend', 'tab_')->field(['sum(pay_amount) amount', 'promote_id', 'pay_way'])->where($map)->group('promote_id, pay_way')->select();
         $records = [];

Application/Base/Service/GameSourceService.class.php

@@ -0,0 +1,45 @@
+<?php
+namespace Base\Service;
+
+use Base\Model\PromoteModel;
+use Base\Model\ApplyModel;
+
+class GameSourceService {
+
+    public function __construct()
+    {
+
+    }
+
+    public function getChannelConfigFile($gameSource) {
+        $configUrl = '';
+        if ($gameSource['sdk_version'] == 1) {
+            $configUrl = "META-INF/mch.properties";
+        } else {
+            $preUrl = '';
+            $zipGameSource = zip_open($this->getGameSourceUrl($gameSource));
+            if ($zipGameSource) {
+                while ($zipEntry = zip_read($zipGameSource)) {
+                    if (preg_match("/^Payload.*?\.app/", zip_entry_name($zipEntry), $matches)) {
+                        $preUrl = $matches[0];
+                        break;
+                    }
+                }
+                zip_close($zipGameSource);
+            }
+            $configUrl = $preUrl . '/_CodeSignature/TXChannel';
+        }
+        return $configUrl;
+    }
+
+    public function getGameSourceUrl($gameSource){
+        $path = '';
+        if($gameSource['file_type'] == '1'){
+            $path = './Uploads/SourcePack/';
+        }else{
+            $path = './Uploads/Ios/original/';
+        }
+        $fileUrl = $path . $gameSource['file_name'];
+        return ROOTTT . ltrim($fileUrl, './');
+    }
+}

Application/Common/Common/extend.php

@@ -2804,3 +2804,12 @@ function sendBrushMail($to,$content) {
     $mail->AltBody = $c; //邮件正文不支持HTML的备用显示
     return($mail->Send());
 }
+
+function index_by_column($column, $items)
+{
+    $records = [];
+    foreach ($items as $item) {
+        $records[$item[$column]] = $item;
+    }
+    return $records;
+}

Application/Home/Conf/config.php

@@ -64,6 +64,8 @@ return array(
         '__IMG__'    => __ROOT__ . '/Public/' . MODULE_NAME . '/images',
         '__CSS__'    => __ROOT__ . '/Public/' . MODULE_NAME . '/css',
         '__JS__'     => __ROOT__ . '/Public/' . MODULE_NAME . '/js',
+        '__LAY__'    => __ROOT__ . '/Public/' . MODULE_NAME . '/layui',
+        
     ),
 
     /* SESSION 和 COOKIE 配置 */

Application/Home/Controller/BaseController.class.php

@@ -172,7 +172,7 @@ class BaseController extends HomeController{
         'p' => $page,
         'row' => $pageSize
       ];
-      $pagination = set_pagination($count, $pageSize);
+      $pagination = set_pagination($count, $pageSize, $_POST);
       
       return [$records, $pagination, $count];
     }

Application/Home/Controller/PromoteController.class.php

@@ -36,8 +36,8 @@ class PromoteController extends BaseController
     public function index($p = 1)
     {
         $this->meta_title = "首页";
-//        $this->display('prepare');
-//        exit(0);
+        $this->display('prepare');
+        exit(0);
 
         header("Content-type:text/html;charset=utf-8");
         $user = D('Promote')->isLogin();

Application/Home/Controller/QueryController.class.php

@@ -84,11 +84,15 @@ class QueryController extends BaseController
             $map['tab_spend.pay_time'] = ['between', [strtotime(I('begtime')), strtotime(I('endtime')) + 86399]];
         }
 
-        if (I('pay_way') !== null && I('pay_way') !== '') {
-            if (I('pay_way') == 2) {
+        if (isset($_REQUEST['pay_way']) && $_REQUEST['pay_way'] !== '') {
+            $payWay = intval(I('pay_way'));
+
+            if (in_array($payWay, array_keys(QueryController::$payWay))) {
+                if ($payWay == 2) {
                     $map['tab_spend.pay_way'] = ['in', '2,3,4'];
                 } else {
-                $map['tab_spend.pay_way'] = I('pay_way');
+                    $map['tab_spend.pay_way'] = $payWay;
+                }
             }
         }
 
@@ -222,6 +226,7 @@ class QueryController extends BaseController
         }
 
         empty(I('account')) || $map['tab_user.account'] = ['like', '%' . I('account') . '%'];
+        empty(I('id')) || $map['tab_user.id'] = intval(I('id'));
 
         $data = M('User', 'tab_')
             ->field('tab_user.*,tab_promote.real_name as pro_real_name')
@@ -652,10 +657,10 @@ class QueryController extends BaseController
     {
         $this->meta_title = 'ARPU统计';
 
-        $defaultTime = date('Y-m-d', time() - 7 * 24 * 3600) . ' 至 ' . date('Y-m-d');
-        $defaultTime = date('Y-m-d', time() - 7 * 24 * 3600) . ' 至 ' . date('Y-m-d');
+        $defaultTime = date('Y-m-d', time() - 6 * 24 * 3600) . ' 至 ' . date('Y-m-d');
 
-        $time = I('time', $defaultTime);
+        $time = I('time', '');
+        $time = $time == '' ? $defaultTime : $time;
         $sdkVersion = I('sdk_version', 0);
         $gameId = I('game_id', 0);
         $serverId = I('server_id', 0);
@@ -672,11 +677,15 @@ class QueryController extends BaseController
         $games = $this->getGamesByPromote($promote);
 
         $params = [];
+        $searchGameName = '';
+        $searchServerName = '';
         if ($gameId > 0) {
             $params['game_id'] = $gameId;
+            $searchGameName = M('game', 'tab_')->where(['id' => $gameId])->getField('game_name');
         }
         if ($serverId > 0) {
             $params['server_id'] = $serverId;
+            $searchServerName = M('server', 'tab_')->where(['server_id' => $serverId])->getField('server_name');
         }
         if ($sdkVersion > 0) {
             $params['sdk_version'] = $sdkVersion;
@@ -727,9 +736,19 @@ class QueryController extends BaseController
         $this->assign('subPromotes', $subPromotes);
         $this->assign('timeout', $timeout);
         $this->assign('records', $records);
+        $this->assign('searchGameName', $searchGameName);
+        $this->assign('searchServerName', $searchServerName);
         $this->display();
     }
 
+    public function gameArpu()
+    {
+        $time = I('time');
+        $data = M('Apply', 'tab_')->field('game_id, game_name')->where(['promote_id' => $promote_id])->order('game_id desc')->select();
+
+        
+    }
+
     public function arpu_analysis()
     {
         $this->meta_title = "ARPU统计";
@@ -1730,6 +1749,13 @@ class QueryController extends BaseController
             'parent_id' => $promote['id'],
             'grand_id' => $promote['id'],
         ];
+        if ($headmanPromoteId > 0) {
+            $map['parent_id'] = $headmanPromoteId;
+        }
+        if ($promoteId > 0) {
+            $map['id'] = $promoteId;
+        }
+
         $ids = M('promote', 'tab_')->where($map)->getField('id', true);
 
         $promotes = [];
@@ -1751,7 +1777,7 @@ class QueryController extends BaseController
             $map['role_name'] = ['like', '%' . $roleName . '%'];
         }
         if ($userAccount != '') {
-            $map['user_acount'] = ['like', '%' . $userAccount . '%'];
+            $map['user_account'] = ['like', '%' . $userAccount . '%'];
         }
         if ($sdkVersion != 0) {
             $map['sdk_version'] = $sdkVersion;
@@ -1778,7 +1804,6 @@ class QueryController extends BaseController
         }
         if ($isSelf) {
             $map['promote_id'] = $promote['id'];
-        } else {
             if ($headmanPromoteId != 0) {
                 $map['promote_id'] = $headmanPromoteId;
             }
@@ -1818,6 +1843,12 @@ class QueryController extends BaseController
             'parent_id' => $promote['id'],
             'grand_id' => $promote['id'],
         ];
+        if ($headmanPromoteId > 0) {
+            $map['parent_id'] = $headmanPromoteId;
+        }
+        if ($promoteId > 0) {
+            $map['id'] = $promoteId;
+        }
         $ids = M('promote', 'tab_')->where($map)->getField('id', true);
 
         $promotes = [];
@@ -1837,7 +1868,7 @@ class QueryController extends BaseController
             $map['role_name'] = ['like', '%' . $roleName . '%'];
         }
         if ($userAccount != '') {
-            $map['user_acount'] = ['like', '%' . $userAccount . '%'];
+            $map['user_account'] = ['like', '%' . $userAccount . '%'];
         }
         if ($sdkVersion != 0) {
             $map['sdk_version'] = $sdkVersion;
@@ -1845,11 +1876,12 @@ class QueryController extends BaseController
         if ($isSelf) {
             $map['promote_id'] = $promote['id'];
             $spendMap['promote_id'] = $promote['id'];
-        } else {
+
             if ($headmanPromoteId != 0) {
                 $map['promote_id'] = $headmanPromoteId;
                 $spendMap['promote_id'] = $headmanPromoteId;
             }
+
             if ($promoteId != 0) {
                 $map['promote_id'] = $promoteId;
                 $spendMap['promote_id'] = $promoteId;
@@ -2009,6 +2041,7 @@ class QueryController extends BaseController
         $gameId = I('game_id', 0);
         $serverId = I('server_id', 0);
         $parentId = I('parent_id', 0);
+        $promoteId = I('promote_id', 0);
 
         $loginPromote = $this->getLoginPromote();
 
@@ -2023,7 +2056,12 @@ class QueryController extends BaseController
 
         $subPromotes = M('promote', 'tab_')->field(['id', 'account', 'real_name'])->where(['parent_id' => $promote['id']])->select();
 
-        $query = M('promote', 'tab_')->field(['id', 'account', 'real_name'])->where(['parent_id' => $promote['id']]);
+        $map = ['parent_id' => $promote['id']];
+        if ($promoteId > 0) {
+            $map['id'] = $promoteId;
+        }
+
+        $query = M('promote', 'tab_')->field(['id', 'account', 'real_name'])->where($map);
         list($promotes, $pagination, $count) = $this->paginate($query);
         $ids = array_column($promotes, 'id');
 

Application/Home/View/default/Apply/feature.html

@@ -6,7 +6,7 @@
   <link href="__CSS__/20180207/finance.css" rel="stylesheet">
   <link href="__CSS__/game_detailed.css" rel="stylesheet">
   <link href="__STATIC__/icons_alibaba/iconfont.css" rel="stylesheet">
-
+  <link rel="stylesheet" href="__LAY__/css/layui.css"  media="all">
   <style type="text/css">
     .trunk-list {
       position: relative;
@@ -114,12 +114,9 @@
         display: flex;
         flex-direction: column;
         flex-wrap: wrap;
-        justify-content:center;
         align-items:center;
-        width:50%;
-        margin-left:25%;
         background: white;opacity: 1.0;
-        min-height:900px;
+        min-height:800px;
     }
     .detailindex img {
         width: 100%;
@@ -215,7 +212,12 @@
                         </if>
                       </if>-->
                       <!--<span onclick="commonApply({$vo.id},this,0,0)" style="cursor: pointer;"><u>查看详情</u></span>-->
-                      <span onclick="lookdetail({$vo.id})" style="cursor: pointer;"><u class="lookdetail">查看详情</u></span>
+<!--                      <span onclick="lookdetail({$vo.id})" style="cursor: pointer;"><u class="lookdetail">查看详情</u></span>-->
+                      <div class="site-demo-button" id="layerDemo" style="margin-bottom: 0;">
+<!--                         <button data-method="notice" class="layui-btn">示范一个公告层</button>-->
+                             <span id="detailArr"   onclick="lookdetail({$vo.id})" class="layui-btn" style="cursor: pointer;background:#62A8EA"><u>查看详情</u><u  class="hiddenattr"  style="">{$vo.id}</u></span>
+                          
+                      </div>
                     </div>
                   </div>
                 </li>
@@ -230,17 +232,21 @@
     </div>
   </div>
     
-  <div class="detailback" id="detailback"> 
+<!--  <div class="detailback" id="detailback"> 
       <div class="detailindex" style="">
           
       </div>
-  </div>
+  </div>-->
 </block>
 
 <block name="script">
   <script src="__STATIC__/zeroclipboard/jquery.zclip.min.js"></script>
   <script type="text/javascript" src="__JS__/20170831/select2.min.js"></script>
+  <script type="text/javascript" src="__JS__/jquery.min.js"></script>
+   <script src="__LAY__/layui.js" type="text/javascript" ></script>
+
   <script type="text/javascript">
+      
       function lookdetail(id) {
           $.ajax({
               type: "post",
@@ -251,34 +257,47 @@
                   console.log(res)
                   if(res.code == 10000) {
                       content = res.info;
-                      html = '';
-                      html += content;
-                      $('.detailindex').html(html);$('.detailindex').val();
-                      $('.detailback').css('display','block')
                   }else {
                       content = "暂无资料查询";
-                      html = '';
-                      html += content;
-                      $('.detailindex').html(html);$('.detailindex').val();
-                      $('.detailback').css('display','block')
                   }
+                  layer.open({
+                        type: 1
+                        ,title: false //不显示标题栏
+                        ,closeBtn: true
+                        ,area: ["800px","900px"]
+                        ,shade: 0.8
+                        ,id: 'LAY_layuipro' //设定一个id，防止重复弹出
+                        //,btn: ['我已查阅']
+                        ,btnAlign: 'c'
+                        ,moveType: 1 //拖拽模式，0或者1
+                       ,content: '<div style="padding: 50px;line-height: 22px; background-color: #393D49; color: #fff; font-weight: 300;" class="detailindex" >'+content+'</div>'
+                       // ,content:content
+                     
+                        ,success: function(layero){
+                         
+                        },
+
+                    fail:function(err) {
+                        console.log('err')
+                    }
+                 }) 
               },
               fail:function(err) {
                   console.log('err')
               }
            })  
       }
-      
-      window.onload=function(){
-        var detailback = document.getElementById("detailback");
-        document.addEventListener("click",function(){
-            detailback.style.display="none";
-        });
-        detailback.addEventListener("click",function(event){
-            event=event||window.event;
-            event.stopPropagation();
-        });
-    };
+      //处理空白地方点击关掉事件
+//      window.onload=function(){
+//        var detailback = document.getElementById("detailback");
+//        document.addEventListener("click",function(){
+//            detailback.style.display="none";
+//        });
+//        detailback.addEventListener("click",function(event){          //添加监听事件
+//            event=event||window.event;
+//            event.stopPropagation();
+//        });
+//    };
   </script>
   <script type="text/javascript">
       var gameScreenshotCount = 0;  //游戏截图数量

Application/Home/View/default/Promote/index.html

@@ -44,24 +44,33 @@
                 <div class="fxui-tab">
                     <div class="fxui-tab-hand">
                         <span class="fxui-tab-tit"><a href="#;">公告</a>
-                            <span style="width: 25px;height: 25px;float: left;position: relative;bottom:50px;left:55px;text-align: center;background: rgba(255, 0, 0, 1)">
+                            <if condition="$gg_count neq 0">
+                                <span style="width: 25px;height: 25px;float: left;position: relative;bottom:50px;left:55px;text-align: center;background: rgba(255, 0, 0, 1);border-radius:15px">
                                     <a style="line-height: 25px;padding: 0px;color: #fff">{$gg_count}</a>
                                 </span>
+                            </if>
+
                         </span>
                         <span class="fxui-tab-tit"><a href="#;">消息</a>
-                            <span style="width: 25px;height: 25px;float: left;position: relative;bottom:50px;left:55px;text-align: center;background: rgba(255, 0, 0, 1)">
-                                <a style="line-height: 25px;padding: 0;color: #fff">0</a>
-                            </span>
+<!--                            <if condition="gg_count neq 0">-->
+<!--                                <span style="width: 25px;height: 25px;float: left;position: relative;bottom:50px;left:55px;text-align: center;background: rgba(255, 0, 0, 1)">-->
+<!--                                    <a style="line-height: 25px;padding: 0;color: #fff">0</a>-->
+<!--                                </span>-->
+<!--                            </if>-->
                         </span>
                         <span class="fxui-tab-tit"><a href="#;">游戏活动</a>
-                            <span style="width: 25px;height: 25px;float: left;position: relative;bottom:50px;left:83px;text-align: center;background: rgba(255, 0, 0, 1)">
+                            <if condition="$zx_count neq 0">
+                                <span style="width: 25px;height: 25px;float: left;position: relative;bottom:50px;left:83px;text-align: center;background: rgba(255, 0, 0, 1);border-radius:15px">
                                     <a style="line-height: 25px;padding: 0px;color: #fff">{$zx_count}</a>
                                 </span>
+                            </if>
                         </span>
                         <span class="fxui-tab-tit"><a href="#;">资源号异常日志</a>
-                            <span style="width: 25px;height: 25px;float: left;position: relative;bottom:50px;left:125px;text-align: center;background: rgba(255, 0, 0, 1)">
+                            <if condition="$rz_count neq 0">
+                                <span style="width: 25px;height: 25px;float: left;position: relative;bottom:50px;left:125px;text-align: center;background: rgba(255, 0, 0, 1);border-radius:15px">
                                     <a style="line-height: 25px;padding: 0px;color: #fff">{$rz_count}</a>
                                 </span>
+                            </if>
                         </span>
                         <div id="u271_ann" class="annotation"></div>
                         <span class="more"><a href="{:U('msg_list')}">查看更多></a></span>

Application/Home/View/default/Public/promote_base.html

@@ -51,7 +51,7 @@
 			<div class="navContent jsnavContent">
 				<a href="{:U('Query/dailySummary')}" class="<if condition='CONTROLLER_NAME eq Query and ACTION_NAME eq dailySummary '>active</if> ">每日概况</a>
 				<a href="{:U('Query/summary')}" class="<if condition='CONTROLLER_NAME eq Query and ACTION_NAME eq summary '>active</if> ">数据汇总</a>
-							<a href="{:U('Query/recharge')}" class="<if condition='CONTROLLER_NAME eq Query and (ACTION_NAME eq recharge or ACTION_NAME eq viewSpendDetailed) '>active</if> ">充值明细</a>
+				<a href="{:U('Query/recharge')}" class="<if condition='CONTROLLER_NAME eq Query and (ACTION_NAME eq recharge or ACTION_NAME eq viewSpendDetailed) '>active</if> ">订单查询</a>
 				<a href="{:U('Query/register')}" class="<if condition='CONTROLLER_NAME eq Query and (ACTION_NAME eq register or ACTION_NAME eq viewRole) '>active</if> ">注册明细</a>
 				<a href="{:U('Query/arpu')}" class="<if condition='CONTROLLER_NAME eq Query and ACTION_NAME eq arpu '>active</if> ">ARPU统计</a>
 				<!-- <a href="{:U('Query/retention_analysis')}" class="<if condition='CONTROLLER_NAME eq Query and ACTION_NAME eq retention_analysis '>active</if> ">留存统计</a> -->

Application/Home/View/default/Query/achievement.html

@@ -23,7 +23,8 @@
     </div>
     <div class="trunk-content article">
         <div class="trunk-search clearfix">
-          <form action="{:U('Query/achievement',array('row'=>I('get.row')))}" method="post" enctype="multipart/form-data">
+          <form action="{:U('Query/achievement',['row'=>I('get.row')])}" method="post" enctype="multipart/form-data">
+            <input type="hidden" name="parent_id" value="{:I('parent_id', 0)}">
             <div class="form-group normal_space">
               <select id="game-select" name="game_id" class="reselect select_gallery" style="width: 220px;" >
                 <option value="0">请选择游戏</option>

Application/Home/View/default/Query/arpu.html

@@ -189,7 +189,7 @@
                   <th>付费率</th>
                   <th>新增付费额</th>
                   <th>累计付费用户</th>
-                  <th>1日留存</th>
+                  <!-- <th>1日留存</th> -->
                   <th>ARPU</th>
                   <th>ARPPU</th>
                     <if condition='empty(I("game_id")) == true'>
@@ -203,7 +203,7 @@
                 <tr name="rows" class="<eq name='mod' value='1'>odd</eq>">
                   <td>{$vo.day}</td>
                   <if condition='empty(I("game_id")) != true'>
-                    <th>{:I("game_name")}</th>
+                    <th>{$searchGameName}</th>
                   <else/>
                     <td>{$vo.payGameCount}</th>
                   </if>
@@ -218,7 +218,7 @@
                   <td>{$vo.payRate}</td>
                   <td>{$vo.newPayAmount}</td>
                   <td>{$vo.historyPayCount}</td>
-                  <td>{$vo.ratentionOneDay}</td>
+                  <!-- <td>{$vo.ratentionOneDay}</td> -->
                   <td>{$vo.arpu}</td>
                   <td>{$vo.arppu}</td>
                     <if condition='empty(I("game_id")) == true'>

Application/Home/View/default/Query/dailySummary.html

@@ -582,7 +582,7 @@
 
                           if (serverData.length > 0) {
                               for (var i in serverData) {
-                                  html += "<option value='" + serverData[i]['id'] + "'>" + serverData[i]['server_name'] + "</option>";
+                                  html += "<option value='" + serverData[i]['server_id'] + "'>" + serverData[i]['server_name'] + "</option>";
                               }
                           }
                       }

Application/Home/View/default/Query/recharge.html

@@ -87,7 +87,7 @@
           <select id="server_id" name="server_id" class=" reselect select_gallery">
             <option value="">请选择区服</option>
             <volist name="serverData" id="vo">
-              <option value="{$vo.id}">{$vo.server_name}</option>
+              <option value="{$vo.server_id}">{$vo.server_name}</option>
             </volist>
           </select>
         </div>
@@ -142,14 +142,14 @@
 
         <div class="form-group normal_space fl">
           <select id="pay_way" name="pay_way" class="reselect select_gallery" style="min-width:130px;">
-            <option value="">支付方式</option>
-            <volist name="payWayData" id="vo" key="k">
-              <if condition="$k eq I('pay_way')">
+            <option value="-2">支付方式</option>
+            <foreach name="payWayData" item="vo" key="k">
+              <if condition="$k eq I('pay_way',-2)">
                 <option value="{$k}" selected>{$vo}</option>
                 <else/>
                 <option value="{$k}">{$vo}</option>
               </if>
-            </volist>
+            </foreach>
           </select>
         </div>
 
@@ -320,7 +320,7 @@
 
                           if (serverData.length > 0) {
                               for (var i in serverData) {
-                                  html += "<option value='" + serverData[i]['id'] + "'>" + serverData[i]['server_name'] + "</option>";
+                                  html += "<option value='" + serverData[i]['server_id'] + "'>" + serverData[i]['server_name'] + "</option>";
                               }
                           }
                       }

Application/Home/View/default/Query/register.html

@@ -59,10 +59,15 @@
           </eq>
 
           <div class="form-group fl">
-            <input type="text" name="account" class="txt normal_txt" id="uid" placeholder="请输入玩家账号"
+            <input type="text" name="account" class="txt normal_txt" placeholder="请输入玩家账号"
                    value="{:I('account')}">
           </div>
 
+          <div class="form-group fl">
+            <input type="text" name="id" class="txt normal_txt" placeholder="请输入玩家ID"
+                   value="{:I('id')}">
+          </div>
+
           <div class="form-group normal_space fl">
             <label class="form-title select-title" style="position: relative;">起止时间：</label>
             <div class="select-time">

Application/Home/View/default/Query/summary.html

@@ -350,7 +350,7 @@
 
                           if (serverData.length > 0) {
                               for (var i in serverData) {
-                                  html += "<option value='" + serverData[i]['id'] + "'>" + serverData[i]['server_name'] + "</option>";
+                                  html += "<option value='" + serverData[i]['server_id'] + "'>" + serverData[i]['server_name'] + "</option>";
                               }
                           }
                       }

Application/Home/View/default/Query/view_role.html

@@ -43,7 +43,7 @@
             <select id="server_id" name="server_id" class=" reselect select_gallery">
               <option value="">请选择区服</option>
               <volist name="serverData" id="vo">
-                <option value="{$vo.id}">{$vo.server_name}</option>
+                <option value="{$vo.server_id}">{$vo.server_name}</option>
               </volist>
             </select>
           </div>
@@ -183,7 +183,7 @@
 
                           if (serverData.length > 0) {
                               for (var i in serverData) {
-                                  html += "<option value='" + serverData[i]['id'] + "'>" + serverData[i]['server_name'] + "</option>";
+                                  html += "<option value='" + serverData[i]['server_id'] + "'>" + serverData[i]['server_name'] + "</option>";
                               }
                           }
                       }

Application/Mobile/Controller/SsgController.class.php

@@ -23,27 +23,33 @@ class SsgController extends BaseController {
     {
         $promoteId = I("promote_id", 0);
         $user = session("user_auth");
-        if ($user) {
-            redirect(U("ssg/index", array('promete_id' => $promoteId)));
-        }
+        // if ($user) {
+        //     redirect(U("ssg/index", array('promete_id' => $promoteId)));
+        // }
 
-        /*if (!$promoteId) {
-        	echo "链接失效，请重新向推广员索取链接。";
-        	exit();
-        	$this->error("参数非法");
-        }*/
+        // /*if (!$promoteId) {
+        // 	echo "链接失效，请重新向推广员索取链接。";
+        // 	exit();
+        // 	$this->error("参数非法");
+        // }*/
         if ($promoteId) {
             $exists = M("promote", "tab_")->where(array('id' => $promoteId))->find();
             if (!$exists) {
                 $this->error("链接失效，请重新向推广员索取链接.");
             }
         }
+        //获取客服qq
+        $appqq = M("config", "sys_")->field('value')->where("name='APP_QQ'")->find()['value'];
+        $this->assign("app_qq", $appqq);
 
         $this->assign("promote_id", $promoteId);
         $this->display();
     }
 
     public function home(){
+        //获取客服qq
+        $appqq = M("config", "sys_")->field('value')->where("name='APP_QQ'")->find()['value'];
+        $this->assign("app_qq", $appqq);
         $this->display();
     }
 
@@ -123,6 +129,22 @@ class SsgController extends BaseController {
         $verify = new \Think\Verify($config);
         $verify->codeSet = '0123456789';
         $verify->entry($vid);
+    
+    }
+
+    //注册
+    public function phoneRegister()
+    {
+        //获取手机号
+        
+
+        # code...
+    }
+    //真正注册代码
+    public function doRegister()
+    {
+
+        # code...
     }
 
     //首页
@@ -199,7 +221,24 @@ class SsgController extends BaseController {
         \Think\Log::record('缓存清理业务触发');
         session(null);
     }
+    //发送验证码
+    public function sendPhoneCode()
+    {
+        $phone = I("phone");
+        $result = R('Common/Sms/send_sms_code', array($phone, 10, false));
 
+        if ($result['code'] == 200) {
+            $data['status'] = 1;
+            $data['data'] = $result['data'];
+        } else {
+            $data['status'] = 0;
+        }
+
+        $data['msg'] = $result['msg'];
+
+        echo json_encode($data);
+        exit;
+    }
     public function timediffs($begin_time, $end_time) {
         if ($begin_time < $end_time) {
             $starttime = $begin_time;

Application/Mobile/View/Ssg/home.html

@@ -2,92 +2,118 @@
 <html>
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1,
-      minimum-scale=1, maximum-scale=1, user-scalable=no">
-    <meta name="apple-mobile-web-app-status-bar-style" content="black">
-    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="viewport" content="width=device-width, initial-scale=1,minimum-scale=1, maximum-scale=1, user-scalable=no">
     <title>苹果超级签购买（在线支付）</title>
     <link href="__CSS__/ssg/common.css" rel="stylesheet" type="text/css">
+    <script src="__JS__/ssg/flexible.min.js" type="text/javascript"></script>
     <style>
-        .title-1 {
-            margin: 0.17rem auto 0;
-            width: 1.12rem;
-            height: 0.27rem;
-            background-image: url(__IMG__/ssg/title-bg.png);
-            background-repeat: no-repeat;
-            background-size: 100%;
+        *{
+            padding: 0px;
+            margin: 0px;
+            max-width: 768px;
         }
-        .index-up .button {
-            position: absolute;
-            left: 50%;
-            bottom: 0.84rem;
-            margin-left: -0.76rem;
-            display: block;
-            width: 1.52rem;
-            height: 0.46rem;
-            background-image: url(__IMG__/ssg/transaction-btn.png);
-            background-repeat: no-repeat;
-            background-size: 100%;
-        }
-        .protect-box .inner{
-            background-image: url(__IMG__/ssg/box-bg.png);
-        }
-        .install-box .inner{
-            background-image: url(__IMG__/ssg/box-bg2.png);
+        li{
+            line-height:2;
+            max-width: 6rem;
+            list-style-type:disc;
         }
+
     </style>
 </head>
 
 <body>
-<div class="page-container">
-    <div class="index-up">
-        <img src="__IMG__/ssg/index/index-bg.jpg" alt="">
-        <a href="{:U('login')}" class="button">
+    <div id="safari_box" style="height: 100vh;background:rgba(41,41,41,.8);position:fixed;z-index:9999;top: 0px;width: 100%;display: none;">
+        <div style="line-height: 1;color: #fff;width: 100%;text-align: center;font-size: .36rem;position: absolute;top:2.05rem;">
+            请选择在“Safari”中打开 <img src="__IMG__/ssg/home/jt.png" style="position: absolute;width: 1rem;height: .8rem;right: .57rem;top:-.5rem;">
+        </div>
+        <div style="top:3.5rem;position:absolute;width: 6.3rem;left: 50%;margin-left: -3.2rem;">
+            <div style="background:url('__IMG__/ssg/home/alertbg.png') no-repeat top center/cover;height: 2.8rem;width: 6.3rem;position: relative;">
+                <img onclick="closeSafari()" src="__IMG__/ssg/home/close.png" style="width: .3rem;height: .3rem;position: absolute;left: .3rem;top: .3rem;">
+                <img src="__IMG__/ssg/home/safari.png" style="width:1.5rem;height: 1.5rem;position: absolute;left: .79rem;top:.75rem;">
+                <div style="width:3.5rem;height: .79rem;font-size: .34rem;left: 2.5rem;position: absolute;top:1rem;color:#fff;">
+                    该链接只支持<text style="color:yellow">Safari</text>，
+                    <br/> 
+                    请在<text style="color:yellow">Safari</text>中打开
+                </div>
+            </div>
+            <div style="width: 6.3rem;height:1.2rem;background-color: #ffffff;position: absolute;border-bottom-left-radius:.32rem;border-bottom-right-radius:.32rem;">
+                <div style="display:flex;width:100%;justify-content:center;position: absolute;top: .18rem;">
+                    <input id="copyVal" type="text" readonly='' value="" style="background: #e6e6e6;border: 0px;width: 3.5rem;padding:0 .2rem;border-top-left-radius:64px;border-bottom-left-radius:64px;height: .8rem;color:#777;font-size: .32rem;">
+                    <a href="javascript:" id="copy" data-clipboard-target="#copyVal"  style="background:url('__IMG__/ssg/home/copybt.png') no-repeat top center/cover;width: 1.4rem;height: .8rem;text-align: center;line-height: .8rem;color:white;font-size: .28rem;">
+                        复制
                     </a>
-        <ul class="link-list">
-            <li><a href="{:U('process')}">充值流程</a></li>
-            <li><a href="{:U('tutorial')}">安装教程</a></li>
-        </ul>
                 </div>    
-    <div class="protect-box">
-        <img src="__IMG__/ssg/index/index-bg2.jpg">
-        <div class="inner">
-            <div class="title-1">
-                <h2>至尊保障</h2>
             </div>
-            <ul class="word-list">
-                <li>高端定制，仅对iOS老用户开放。</li>
+        </div>
+    </div>
+
+
+    <div style="background: url('__IMG__/ssg/home/bg.png') no-repeat top center/100% auto;padding-bottom: .6rem;">
+        <div style="width: 100%;text-align: center;padding-top: .55rem;">
+            <img src="__IMG__/ssg/home/hader.png" style="width:6.7rem;height: 5.35rem;">
+        </div>
+       <div style="text-align: center;padding-top: .3rem;">
+            <a href="{:U('login')}"  onclick="return check()"><img src="__IMG__/ssg/home/button1.png" style="width:3.9rem;height: 1.3rem;"></a>
+        </div>
+        <div style="display: flex;justify-content:space-around;padding-top: .2rem;">
+            <a href="{:U('process')}" onclick="return check()"><img src="__IMG__/ssg/home/button2.png" style="width:1.75rem;height:.6rem;"></a>
+            <a href="{:U('tutorial')}"  onclick="return check()"><img src="__IMG__/ssg/home/button3.png" style="width:1.75rem;height:.6rem;"></a>
+            <a href="javascript:" onclick="chatQQ()"><img src="__IMG__/ssg/home/button4.png" style="width:1.75rem;height:.6rem;"></a>
+        </div>
+        <div style="background: url('__IMG__/ssg/home/list1.png') no-repeat top center/100% 100%;height: 4.3rem;width: 100%;margin-top: .45rem;">
+            <ul style="padding-top: 1.74rem;padding-left: 1rem;color: white;font-size: .28rem;">
+                <li>高端定制，仅对IOS老用户开放</li>
                 <li>永不闪退，不丢游戏，不丢数据，稳定有保障</li>
                 <li>同一设备安装一次可在一年内无限次下载重装</li>
             </ul>
         </div>
-    </div>
-    <div class="install-box">
-        <img src="__IMG__/ssg/index/index-bg3.jpg">
-        <div class="inner">
-            <div class="title-1">
-                <h2>安装步骤</h2>
-            </div>
-            <ul class="word-list">
-                <li>账号登录且付费，购买苹果超级签<b>(不同设备需要分别付费安装哦)</b></li>
+        <div style="background: url('__IMG__/ssg/home/list2.png') no-repeat top center/100% 100%;height: 4.7rem;width: 100%;">
+            <ul style="padding-top: 1.74rem;padding-left: 1rem;color: white;font-size: .28rem;">
+                    <li style="line-height:1.5;"> 
+                        账号登入且付费，购买苹果超级签（不同设备需要分别付费安装哦）
+                    </li>
                     <li>下载安装描述文件</li>
                     <li>下载安装游戏</li>
                 </ul>
         </div>
+        <div style="text-align: center;">
+            <a href="{:U('login')}"  onclick="return check()"><img src="__IMG__/ssg/home/button5.png" style="width:3.4rem;height: 1.1rem;"></a>
         </div>
-    <div class="download-btn">
-        <a href="{:U('login')}">
-            <img src="__IMG__/ssg/index/download-btn.jpg">
-        </a>
     </div>
-    <div class="footer">
-        <p class="footer-up">琼ICP备19000556号-1&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;琼网文（2019）2354-200号</p>
+    <div class="footer" style="height: auto;">
+        <p class="footer-up">闽ICP备19003775号-1&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;闽网文{2019}1554-099号</p>
         <p class="footer-down">抵制不良游戏，拒绝盗版游戏。注意自我保护，谨防受骗上当。<br>适度游戏益脑，沉迷游戏伤身。合理安排时间，享受健康生活。</p>
     </div>
-</div>
+ 
 <script src="__JS__/jquery-1.11.1.min.js" type="text/javascript"></script>
-<script src="__JS__/ssg/common.js" type="text/javascript"></script>
+<script src="__JS__/ssg/clipboard.min.js" type="text/javascript"></script>
+<script>
+    var issafariBrowser = /Safari/.test(navigator.userAgent) && !/Chrome/.test(navigator.userAgent);
+    $("#copyVal").val(window.location.href);
+    function check(){
+        if(!issafariBrowser){
+            $("#safari_box").show();
+            return false;
+        }else{
+            return true;
+        }
+        
+    }
+    function chatQQ() {
+        if(check()){
+            window.location.href = 'mqqwpa://im/chat?chat_type=wpa&uin={$app_qq}&version=1&src_type=web&web_src=oicqzone.com';
+        }
+    }
+    function closeSafari(){
+        $("#safari_box").hide();
+    }
+    var clipboard = new ClipboardJS('#copy');
 
+    clipboard.on('success', function(e) {
+        alert("复制成功，请在Safari中打开");
+        e.clearSelection();
+    });
+</script>
 </body>
 
 </html>

Application/Mobile/View/Ssg/login.html

@@ -1,57 +1,263 @@
 <!DOCTYPE html>
 <html>
+
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <meta name="apple-mobile-web-app-capable" content="yes">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
+    <meta name="viewport"
+        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
     <title>登陆页</title>
     <link href="__CSS__/ssg/common.css" rel="stylesheet" type="text/css">
+    <link href="__CSS__/swiper.min.css" rel="stylesheet" type="text/css">
+    <script src="__JS__/ssg/flexible.min.js" type="text/javascript"></script>
+
 </head>
+<style>
+    * {
+        padding: 0px;
+        margin: 0px;
+    }
+
+    .loginbox {
+        width: 6.3rem;
+        height: 6.34rem;
+        background-color: #fff;
+        border-radius: .32rem;
+        margin: .6rem auto 0;
+    }
+
+    .loginbox .title {
+        display: flex;
+        height: 1rem;
+        width: 100%;
+        justify-content: space-between;
+        align-items: center;
+    }
+
+    .loginbox .title img,
+    .loginbox .titleright {
+        width: .4rem;
+        height: .4rem;
+    }
+
+    .loginbox .title img {
+        padding-left: .22rem;
+    }
+
+    .loginbox .titleright {
+        padding-right: .22rem;
+    }
+
+    .loginbox .title div {
+        font-size: .4rem;
+        color: #292929;
+    }
+
+    .loginbox .formitem {
+        display: flex;
+        height: .8rem;
+        width: 5rem;
+        margin: auto;
+        ;
+        justify-content: flex-start;
+        align-items: center;
+        border-bottom: 1px solid #292929;
+        margin: .3rem auto 0;
+    }
+
+    .loginbox .formitem img {
+        width: .4rem;
+        height: .4rem;
+        margin-right: .1rem;
+    }
+
+    .loginbox .formitem input {
+        border: 0px;
+        height: .8rem;
+        font-size: .28rem;
+        text-align: left;
+        width: 4.5rem;
+    }
+</style>
+
 <body>
-<div class="page-container container-white">
-    <div class="top">
-        <a href="javascript:history.go(-1);"></a>登录
+    <div
+        style="background: url('__IMG__/ssg/login/bg.png') no-repeat top center/100% 100%;padding-bottom: .4rem;min-height: 100vh;">
+        <div style="width: 100%;text-align: center;padding-top: .55rem;">
+            <img src="__IMG__/ssg/home/hader.png" style="width:6.7rem;height: 5.35rem;">
         </div>
-    <div class="login">
-        <div class="login-title">
-            <h2>Hello!终于等到你~</h2>
         <input type="hidden" value="{$promote_id}" id="promote_id" name="promote_id"/>
+        <div class="swiper-container">
+            <div class="swiper-wrapper">
+                <div class="swiper-slide swiper-no-swiping">
+                     <!--登陆-->
+                    <div class="loginbox">
+                        <div class="title">
+                            <img class="back" src="__IMG__/ssg/login/back.png">
+                            <div>登陆</div>
+                            <div class="titleright"></div>
+                        </div>
+                        <div class="formitem" style="margin-top: 0px;">
+                            <img src="__IMG__/ssg/login/user.png">
+                            <input id="userAccount" type="text" placeholder="请输入用户名" value="">
+                        </div>
+                        <div class="formitem">
+                            <img src="__IMG__/ssg/login/password.png">
+                            <input id="password" type="password" placeholder="请输入密码" value="">
+                        </div>
+                        <div class="formitem" style="border: 0px;">
+                            <div class="formitem" style="margin-right: .2rem;margin-top: 0px;width: 3.5rem;">
+                                <img src="__IMG__/ssg/login/code.png">
+                                <input id="userCode" type="text" placeholder="请输入验证码" value="" style="width:2rem;">
+                            </div>
+                            <img id="verifyCode" style="cursor:pointer;width:1.5rem;height: .7rem;margin-right:0px;"
+                                onclick="GetVerityCode()" src="/mobile.php?s=/Ssg/verify.html">
+                        </div>
+                        <!---按钮-->
+                        <div
+                            style="display: flex;width:100%;margin:.22rem auto 0;justify-content:center;align-items:center;font-size: .32rem;text-align: center;line-height:1.1rem;color: #fff;">
+                            <div id="loginbtn" style="background: url('__IMG__/ssg/login/bottonbg.png') no-repeat top center/cover;width: 2.9rem;height: 1.4rem;">
+                                登陆
+                            </div>
+                            <div class="gophonreg" style="background: url('__IMG__/ssg/login/bottonbg.png') no-repeat top center/cover;width: 2.9rem;height: 1.4rem;">
+                                注册
+                            </div>
+                        </div>
+                        <div style="display: flex;width:100%;justify-content:center;align-items:center;">
+                            <img src="__IMG__/ssg/login/kf.png" style="width: .3rem;height: .3rem;">
+                            <div class="chatqq" style="font-size: .24rem;color:#21B1EB;margin-left: .1rem;">
+                                联系客服
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="swiper-slide swiper-no-swiping">
+                    <!--手机注册-->
+                    <div class="loginbox">
+                        <div class="title">
+                            <img class="gologin" src="__IMG__/ssg/login/back.png">
+                            <div>手机注册</div>
+                            <div class="titleright"></div>
+                        </div>
+                        <div class="formitem" style="margin-top: 0px;">
+                            <img src="__IMG__/ssg/login/phone.png">
+                            <input id="phoneval" type="text" placeholder="请输入手机号" value="">
+                        </div>
+                        <div class="formitem">
+                            <img src="__IMG__/ssg/login/password.png">
+                            <input type="password" placeholder="请输入6-12位自字母组合密码" value="">
+                        </div>
+                        <div class="formitem" style="border: 0px;">
+                            <div class="formitem" style="margin-right: .2rem;margin-top: 0px;width: 3.5rem;">
+                                <img src="__IMG__/ssg/login/code.png">
+                                <input type="text" placeholder="请输入短信验证码" value="" style="width:2.5rem;">
+                            </div>
+                            <div id="getPhoneCode" style="width:1.8rem;height: .6rem;color: white;background-color:#21B1EB;border-radius: .3rem;line-height: .6rem;font-size: .24rem;text-align: center;">
+                                获取验证码
+                            </div>
+                        </div>
+                        <!---按钮-->
+                        <div
+                            style="display: flex;width:100%;margin:.22rem auto 0;justify-content:center;align-items:center;font-size: .32rem;text-align: center;line-height:1.1rem;color: #fff;">
+                            <div
+                                style="background: url('__IMG__/ssg/login/bigbuttonbg.png') no-repeat top center/cover;width: 5.6rem;height: 1.4rem;">
+                                立即注册
+                            </div>
+                        </div>
+                        <div style="display: flex;width:100%;justify-content:center;align-items:center;font-size: .24rem;">
+                            <div>注册即表示同意<a href="{:U('News/protocol')}" style="color:#3CC2EF">《用户协议》</a></div>
+                            <div style="display: flex;align-items:center;margin-left: .25rem;">
+                                <img src="__IMG__/ssg/login/change.png" style="width: .3rem;height: .3rem;">
+                                <div class="gouserreg" style="color:#21B1EB;margin-left: .1rem;">
+                                    切换普通注册
+                                </div>
+                            </div>
+                        </div>
+                        
+                    </div>
+
+                </div>
+                <div class="swiper-slide swiper-no-swiping">
+                    <!--普通注册-->
+                    <div class="loginbox">
+                        <div class="title">
+                            <img class="gologin" src="__IMG__/ssg/login/back.png">
+                            <div>普通注册</div>
+                            <div class="titleright"></div>
+                        </div>
+                        <div class="formitem" style="margin-top: 0px;">
+                            <img src="__IMG__/ssg/login/user.png">
+                            <input type="text" placeholder="请输入账号(6-12位字母数字组合)" value="">
+                        </div>
+                        <div class="formitem">
+                            <img src="__IMG__/ssg/login/password.png">
+                            <input type="password" placeholder="请输入6-12位自字母组合密码" value="">
+                        </div>
+                        <div class="formitem">
+                            <img src="__IMG__/ssg/login/password.png">
+                            <input type="password" placeholder="请再次确认输入密码" value="">
+                        </div>
+                        <!---按钮-->
+                        <div
+                            style="display: flex;width:100%;margin:.22rem auto 0;justify-content:center;align-items:center;font-size: .32rem;text-align: center;line-height:1.1rem;color: #fff;">
+                            <div
+                                style="background: url('__IMG__/ssg/login/bigbuttonbg.png') no-repeat top center/cover;width: 5.6rem;height: 1.4rem;">
+                                立即注册
+                            </div>
+                        </div>
+                        <div style="display: flex;width:100%;justify-content:center;align-items:center;font-size: .24rem;">
+                            <div>注册即表示同意 <a href="{:U('News/protocol')}" style="color:#3CC2EF">《用户协议》</a></div>
+                            <div style="display: flex;align-items:center;margin-left: .25rem;">
+                                <img src="__IMG__/ssg/login/change.png" style="width: .3rem;height: .3rem;">
+                                <div class="gophonreg" style="color:#21B1EB;margin-left: .1rem;">
+                                    切换手机注册
+                                </div>
+                            </div>
+                        </div>
+                        
+                    </div>
+
+                </div>
             </div>
-        <div class="login-input">
-            <ul>
-                <li>
-                    <label>
-                        <input type="text" id="userAccount" name="userAccount" placeholder="用户名">
-                    </label>
-                </li>
-                <li>
-                    <label>
-                        <input type="password" id="password" name="password" placeholder="登录密码">
-                    </label>
-                </li>
-                <li>
-                    <label>
-                        <input type="text" id="userCode" name="userCode" maxlength="4" placeholder="验证码">
-                        <img id="verifyCode" style="cursor:pointer" onclick="GetVerityCode()"  src="/mobile.php?s=/Ssg/verify.html">
-                    </label>
-                </li>
-            </ul>
-        </div>
-        <div class="login-btn"><a href="javascript:;" onclick="Login()">登录</a></div>
-        <div style="padding-top: 0.2rem;" class="login-btn"><a href="/mobile.php?s=/User/step1.html">注册</a></div>
         </div>
     </div>
 </body>
 <script src="__JS__/jquery-1.11.1.min.js" type="text/javascript"></script>
-<script src="__JS__/ssg/jquery.md5.js" type="text/javascript"></script>
-<script src="__JS__/ssg/common.js" type="text/javascript"></script>
+<script src="__JS__/swiper.min.js" type="text/javascript"></script>
 <script type="text/javascript">
+    var mySwiper = new Swiper('.swiper-container', {
+        // autoplay: true,//可选选项，自动滑动
+        initialSlide :1,
+        noSwiping : true,
+    })
+
     var loginLock = false;
     function GetVerityCode() {
         //刷新验证码
         $("#verifyCode").attr("src", "/mobile.php?s=/Ssg/verify.html&id=" + Math.random());
     }
-    function Login() {
+    $(".gophonreg").on("click",function() {
+        //去手机注册页
+        mySwiper.slideTo(1, 350, false);
+    })
+    $(".gouserreg").on("click",function() {
+        //去手机注册页
+        mySwiper.slideTo(2, 350, false);
+    })
+    $(".gologin").on("click",function(){
+        mySwiper.slideTo(0, 350, false);
+    })
+    $(".back").on("click",function(){
+
+        window.history.go(-1);
+    })
+    $(".chatqq").on("click",function(){
+        window.location.href = 'mqqwpa://im/chat?chat_type=wpa&uin={$app_qq}&version=1&src_type=web&web_src=oicqzone.com';
+    })
+    //获取登录密码
+
+    //登陆
+    $("#loginbtn").on("click",function(){
         var loginName = $("#userAccount").val();
         var loginPass = $("#password").val();
         var userCode = $("#userCode").val();
@@ -97,6 +303,57 @@
                 }
             }
         });
+    })
+    //倒计时
+    var codeflag = true;  
+    //获取手机验证码
+    $("#getPhoneCode").on("click",function(){
+        //获取手机
+        var phone = $('#phoneval').val();
+        if(codeflag){
+            if(checkPhone(phone)){
+                //获取验证码
+                $.ajax({
+                    type: 'GET',
+                    url: 'mobile.php?s=/Ssg/sendPhoneCode.html&phone='+phone,
+                    dataType: 'JSON',
+                    success: function (result) {
+                        console.log(result)
+                        if (result.status != 1) {
+                            alert(result.msg);
+                        } else {
+                            countDown();
+                        }
+                    }
+                })
+                
+            }
+        }
+        
+
+    })
+    var i = 60;  
+    function countDown() {  
+        codeflag = false; 
+        i = i - 1;  
+        $("#getPhoneCode").html(i+"秒后重发").css("backgroundColor","#A9A9A9");  
+        if (i == 0) {  
+            $("#getPhoneCode").html("重新发送").css("backgroundColor","#21B1EB");  
+            codeflag = true;  
+            i = 60;  
+            return;  
+        }  
+        setTimeout('countDown()',1000);  
+    }   
+    //验证手机
+    function checkPhone(phone){ 
+        if(!(/^1[3456789]\d{9}$/.test(phone))){ 
+            alert("手机号码有误，请重填");  
+            return false; 
+        } else{
+            return true;
+        }
     }
 </script>
+
 </html>

Application/Mobile/View/Ssg/loginback.html

@@ -0,0 +1,102 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
+    <title>登陆页</title>
+    <link href="__CSS__/ssg/common.css" rel="stylesheet" type="text/css">
+</head>
+<body>
+<div class="page-container container-white">
+    <div class="top">
+        <a href="javascript:history.go(-1);"></a>登录
+    </div>
+    <div class="login">
+        <div class="login-title">
+            <h2>Hello!终于等到你~</h2>
+            <input type="hidden" value="{$promote_id}" id="promote_id" name="promote_id"/>
+        </div>
+        <div class="login-input">
+            <ul>
+                <li>
+                    <label>
+                        <input type="text" id="userAccount" name="userAccount" placeholder="用户名">
+                    </label>
+                </li>
+                <li>
+                    <label>
+                        <input type="password" id="password" name="password" placeholder="登录密码">
+                    </label>
+                </li>
+                <li>
+                    <label>
+                        <input type="text" id="userCode" name="userCode" maxlength="4" placeholder="验证码">
+                        <img id="verifyCode" style="cursor:pointer" onclick="GetVerityCode()"  src="/mobile.php?s=/Ssg/verify.html">
+                    </label>
+                </li>
+            </ul>
+        </div>
+        <div class="login-btn"><a href="javascript:;" onclick="Login()">登录</a></div>
+        <div style="padding-top: 0.2rem;" class="login-btn"><a href="/mobile.php?s=/User/step1.html">注册</a></div>
+    </div>
+</div>
+</body>
+<script src="__JS__/jquery-1.11.1.min.js" type="text/javascript"></script>
+<script src="__JS__/ssg/jquery.md5.js" type="text/javascript"></script>
+<script src="__JS__/ssg/common.js" type="text/javascript"></script>
+<script type="text/javascript">
+    var loginLock = false;
+    function GetVerityCode() {
+        //刷新验证码
+        $("#verifyCode").attr("src", "/mobile.php?s=/Ssg/verify.html&id=" + Math.random());
+    }
+    function Login() {
+        var loginName = $("#userAccount").val();
+        var loginPass = $("#password").val();
+        var userCode = $("#userCode").val();
+        var promoteId = $("#promote_id").val();
+        if (loginName == "") {
+            alert("账号不能为空");
+            return false;
+        }
+        if (loginPass == "") {
+            alert("密码不能为空");
+            return false;
+        }
+        if (userCode == "") {
+            alert("验证码不能为空");
+            return false;
+        }
+        if (promoteId == "") {
+            alert("推广员ID不能为空");
+            return false;
+        }
+
+        jQuery.ajax({
+            type: 'POST',
+            url:'mobile.php?s=/Ssg/do_login.html',
+            data: {
+                'Account':loginName,
+                'Password':(loginPass),
+                'VerifyCode':userCode,
+                'promote_id' :promoteId,
+            },
+            dataType: 'JSON',
+            xhrFields:{
+                withCredentials:true
+            },
+            async: false,
+            cache: false,
+            success: function (result) {
+                if (result.ErrorCode!=0){
+                    alert(result.ResultMsg);
+                    GetVerityCode();
+                }else{
+                    window.location.href="mobile.php?s=/Ssg/index.html"
+                }
+            }
+        });
+    }
+</script>
+</html>

Application/Sdk/View/default/Ipa365/pay.html

@@ -3,28 +3,48 @@
 
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-
-    <meta name="apple-mobile-web-app-capable" content="yes">
-    <meta name="apple-mobile-web-app-status-bar-style" content="black">
-    <meta name="format-detection" content="telephone=no">
-    <meta name="format-detection" content="email=no">
-    <meta name="viewport"
-          content="initial-scale=1, width=device-width, maximum-scale=1, minimum-scale=1, user-scalable=no">
+    <meta name="viewport"  content="initial-scale=1, width=device-width, maximum-scale=1, minimum-scale=1, user-scalable=no">
     <title>支付中心-网上支付 安全快速！</title>
     <link href="__IMG__/ssg/favicon.ico" type="image/x-icon" rel="shortcut icon">
     <link href="__CSS__/ssg/pay-center.css" rel="stylesheet" type="text/css">
-
+    <link href="__CSS__/ssg/common.css" rel="stylesheet" type="text/css">
+    <script src="/Public/Mobile/js/ssg/flexible.min.js" type="text/javascript"></script>
     <script src="__JS__/jquery-1.11.1.min.js" type="text/javascript"></script>
     <script src="__JS__/jquery.base64.js" type="text/javascript"></script>
 </head>
+<style>
+
+body{
+    min-height: 100vh;
+}
+.title{
+    display: flex;
+    height: 1rem;
+    width: 100%;
+    justify-content: space-between;
+    align-items: center;
+    background-color: #21B1EB;
+}
+.title img,
+.titleright {
+    width: .3rem;
+    height: .3rem;
+}
+</style>
 
 <body>
-<div class="topbar">
+<!-- <div class="topbar">
     <div class="topcon auto">
         <h1 class="pay-logo">
             <img src="__IMG__/ssg/alipay/pay-logo.png" alt="Logo"></h1>
     </div>
+</div> -->
+<div class="title" >
+        <img class="gologin" src="__IMG__/ssg/alipay/back.png" style="margin-left:.24rem;">
+        <div style="font-size: .32rem;color: #fff;">天宫计</div>
+        <div class="titleright" style="margin-right:.24rem;"></div>
     </div>
+  <!-- 其他通道 -->  
 <div class="container-pay">
     <div class="auto">
         <div class="orders-summary">
@@ -54,29 +74,45 @@
     </div>
 </div>
 <!-- 触屏订单通道 -->
-<div class="m-order hidden">
-    <div class="m-order-base">
-        <div class="m-order-item">
-            <label>订单名称：</label><span>超级签购买</span>
+<div class="m-order hidden" style="min-height: 100vh;">
+    <div style="padding: .3rem;">
+        <div style="width: 6.9rem;height: 1.7rem;background-color: #fff;border-radius:10px;margin: auto;font-size: .28rem;color:#292929;">
+                <div style="display: flex;height: .8rem; justify-content: space-between;align-items:center;padding: 0 .3rem;">
+                    <div>订单名称：</div>
+                    <div>超级签购买</div>
+                </div>
+                <div  style="display: flex;height: .8rem; justify-content: space-between;align-items:center;padding: 0 .3rem;">
+                    <div>订单金额：</div>
+                    <div>{$price}元</div>
                 </div>
-        <div class="m-order-item">
-            <label>订单金额：</label><span>{$price}元</span>
         </div>
+
     </div>
-    <div class="m-order-payinfo">
-        <div class="payinfo-tit">
-            <label>还需支付: </label>
-            <span>{$price}元</span>
+    <div class="m-order-payinfo" style="width: 6.9rem;margin:auto;border-radius:10px;border: 0px;">
+        <div class="payinfo-tit" style="display: flex;justify-content: space-between;">
+            <label style="font-weight: normal;color:#292929;">还需支付: </label>
+            <span>{$price}</span>
         </div>
         <a class="order-payinfo-item"
            href="#;" onclick="jump('{$url}', '{$order_id}')"
-           title="支付宝">
-            <div class="order-payinfo-icon">
-                <img src="__IMG__/ssg/alipay/zfb-pic.jpg" alt="支付宝">
+           title="支付宝" style="padding: .3rem 0;width: 6.3rem;margin-left: .3rem;">
+            <div class="order-payinfo-icon" style="width: .7rem;height: .7rem;">
+                <img src="__IMG__/ssg/alipay/zfb-pic.jpg" style="width: 100%;height: 100%;border: 0px;" alt="支付宝">
             </div>
-            <div class="order-payinfo-con">
-                <div class="pay-title">支付宝</div>
-                <div class="pay-meta">支持支付宝</div>
+            <div class="order-payinfo-con" style="margin-left: .21rem;">
+                <div class="pay-title">支付宝支付</div>
+                <div class="pay-meta">推荐支付宝用户使用</div>
+            </div>
+        </a>
+        <a class="order-payinfo-item"
+           href="#;" onclick="jump('{$url}', '{$order_id}')"
+           title="微信支付" style="padding: .3rem 0;width: 6.3rem;margin-left: .3rem;">
+            <div class="order-payinfo-icon" style="width: .7rem;height: .7rem;">
+                <img src="__IMG__/ssg/alipay/wxpay.png" style="width: 100%;height: 100%;border: 0px;" alt="微信支付">
+            </div>
+            <div class="order-payinfo-con" style="margin-left: .21rem;">
+                <div class="pay-title">微信支付</div>
+                <div class="pay-meta">推荐微信用户使用</div>
             </div>
         </a>
         <!--<a class="order-payinfo-item"
@@ -92,9 +128,9 @@
         </a>-->
     </div>
 </div>
-<div class="footer-pay">
+<!-- <div class="footer-pay">
     <p>海南万盟天下科技有限公司 版权所有 ©2019 支付中心</p>
-</div>
+</div> -->
 </body>
 <script>
     function jump(pay_url, order_id) {

Application/Sdk/View/default/Ipa365/payback.html

@@ -0,0 +1,108 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="format-detection" content="telephone=no">
+    <meta name="format-detection" content="email=no">
+    <meta name="viewport"
+          content="initial-scale=1, width=device-width, maximum-scale=1, minimum-scale=1, user-scalable=no">
+    <title>支付中心-网上支付 安全快速！</title>
+    <link href="__IMG__/ssg/favicon.ico" type="image/x-icon" rel="shortcut icon">
+    <link href="__CSS__/ssg/pay-center.css" rel="stylesheet" type="text/css">
+
+    <script src="__JS__/jquery-1.11.1.min.js" type="text/javascript"></script>
+    <script src="__JS__/jquery.base64.js" type="text/javascript"></script>
+</head>
+
+<body>
+<div class="topbar">
+    <div class="topcon auto">
+        <h1 class="pay-logo">
+            <img src="__IMG__/ssg/alipay/pay-logo.png" alt="Logo"></h1>
+    </div>
+</div>
+<div class="container-pay">
+    <div class="auto">
+        <div class="orders-summary">
+            <div class="orders-name">超级签购买</div>
+            <div class="orders-desc">订单描述：<span>{$order_id}</span></div>
+            <div class="total-money">应付金额：<strong>{$price}</strong></div>
+        </div>
+        <div class="order-checkbank">
+            <div class="order-checkbank-con">
+                <div class="order-checkbank-tit">请选择付款方式：</div>
+                <ul class="order-checkbank-list">
+                    <li>
+                        <a href="{$url}"
+                           title="支付宝">
+                            <img src="__IMG__/ssg/alipay/zfb-icon.png" alt="支付宝">
+                        </a>
+                    </li>
+
+                </ul>
+            </div>
+            <div class="order-checkbank-mid">
+                <p class="odd">请选择支付方式。建议选择使用支付宝、微信支付、银行卡，支付请直接点击相应付款按钮。如果您使用支付宝账户支付，请点击“支付宝”按钮。</p>
+                <p class="odd">如果您选择支付宝、微信支付、银行卡支付时，请遵守相关支付宝、微信支付、财付通的规定进行操作。您在支付宝、微信支付、财付通页面上进行的任何操作及其产生的</p>
+                <p>任何法律后果，将按照您与支付宝、微信支付、银行卡之间签订的合同处理。本网站不承担任何责任。</p>
+            </div>
+        </div>
+    </div>
+</div>
+<!-- 触屏订单通道 -->
+<div class="m-order hidden">
+    <div class="m-order-base">
+        <div class="m-order-item">
+            <label>订单名称：</label><span>超级签购买</span>
+        </div>
+        <div class="m-order-item">
+            <label>订单金额：</label><span>{$price}元</span>
+        </div>
+    </div>
+    <div class="m-order-payinfo">
+        <div class="payinfo-tit">
+            <label>还需支付: </label>
+            <span>{$price}元</span>
+        </div>
+        <a class="order-payinfo-item"
+           href="#;" onclick="jump('{$url}', '{$order_id}')"
+           title="支付宝">
+            <div class="order-payinfo-icon">
+                <img src="__IMG__/ssg/alipay/zfb-pic.jpg" alt="支付宝">
+            </div>
+            <div class="order-payinfo-con">
+                <div class="pay-title">支付宝</div>
+                <div class="pay-meta">支持支付宝</div>
+            </div>
+        </a>
+    </div>
+</div>
+<div class="footer-pay">
+    <p>海南万盟天下科技有限公司 版权所有 ©2019 支付中心</p>
+</div>
+</body>
+<script>
+    function jump(pay_url, order_id) {
+        if(isWeiXin()){
+            window.location.href = "/sdk.php/Ipa365/paytip/order_id/"+order_id;
+        }else{
+            window.location.href=pay_url;
+        }
+    }
+    //判断是否是微信浏览器的函数
+    function isWeiXin(){
+        //window.navigator.userAgent属性包含了浏览器类型、版本、操作系统类型、浏览器引擎类型等信息，这个属性可以用来判断浏览器类型
+        var ua = window.navigator.userAgent.toLowerCase();
+        //通过正则表达式匹配ua中是否含有MicroMessenger字符串
+        if(ua.match(/MicroMessenger/i) == 'micromessenger'){
+            return true;
+        }else{
+            return false;
+        }
+    }
+</script>
+</html>

Data/update.sql

@@ -80,7 +80,7 @@ ALTER TABLE `tab_apply` ADD COLUMN `bale_sort`  int(5) NOT NULL DEFAULT 0 COMMEN
 -- ----------------------------
 -- 2019-10-11 zyx
 -- ----------------------------
-ALTER TABLE `tab_user` ADD COLUMN `last_device_number`  varchar(50) DEFAULT '' COMMENT '上一次登录设备号' AFTER `device_number`;
+ALTER TABLE `tab_user` ADD COLUMN `last_device_number`  varchar(50) DEFAULT '' COMMENT '上一次登录设备号' AFTER `device_tab_protect_log_readnumber`;
 ALTER TABLE `tab_user` ADD COLUMN `last_login_ip`  varchar(16) DEFAULT '' COMMENT '上一次登录id' AFTER `login_ip`;
 
 CREATE TABLE `tab_protect_log` (

Public/Home/layui/css/modules/code.css

@@ -0,0 +1,2 @@
+/** layui-v2.5.5 MIT License By https://www.layui.com */
+ html #layuicss-skincodecss{display:none;position:absolute;width:1989px}.layui-code-h3,.layui-code-view{position:relative;font-size:12px}.layui-code-view{display:block;margin:10px 0;padding:0;border:1px solid #e2e2e2;border-left-width:6px;background-color:#F2F2F2;color:#333;font-family:Courier New}.layui-code-h3{padding:0 10px;height:32px;line-height:32px;border-bottom:1px solid #e2e2e2}.layui-code-h3 a{position:absolute;right:10px;top:0;color:#999}.layui-code-view .layui-code-ol{position:relative;overflow:auto}.layui-code-view .layui-code-ol li{position:relative;margin-left:45px;line-height:20px;padding:0 5px;border-left:1px solid #e2e2e2;list-style-type:decimal-leading-zero;*list-style-type:decimal;background-color:#fff}.layui-code-view pre{margin:0}.layui-code-notepad{border:1px solid #0C0C0C;border-left-color:#3F3F3F;background-color:#0C0C0C;color:#C2BE9E}.layui-code-notepad .layui-code-h3{border-bottom:none}.layui-code-notepad .layui-code-ol li{background-color:#3F3F3F;border-left:none}