Merge branch 'dev-cz' into dev

5 years ago · 7a1b537d98
parent 145144ba51 4441f2844c
commit 7a1b537d98
4 changed files with 17 additions and 9 deletions
--- a/Application/Mobile/Controller/SsgController.class.php
+++ b/Application/Mobile/Controller/SsgController.class.php
@ -49,7 +49,9 @@ class SsgController extends BaseController {
    public function home(){
        //获取客服qq
        $appqq = M("config", "sys_")->field('value')->where("name='APP_QQ'")->find()['value'];
+
        $this->assign("app_qq", $appqq);
+        $this->assign("rand", rand());
        $this->display();
    }

@ -152,7 +154,9 @@ class SsgController extends BaseController {
            $this -> set_message(1017, "fail", "添加失败");
         }
         //添加自动登录
-         $_SESSION['user_id'] = $res;
+         $userApi = new MemberApi();
+         $user_id = $userApi->login($account, $password,1);
+         
         $this -> set_message(1, "success", "添加成功");

    }
@ -166,8 +170,12 @@ class SsgController extends BaseController {
        if(empty($res)){
            $this -> set_message(1017, "fail", "添加失败");
         }
+
+         
         //添加自动登录
-         $_SESSION['user_id'] = $res;
+         $userApi = new MemberApi();
+         $user_id = $userApi->login($account, $password,1);
+
         $this -> set_message(1, "success", "添加成功");
        # code...
    }
--- a/Application/Mobile/View/Ssg/home.html
+++ b/Application/Mobile/View/Ssg/home.html
@ -4,8 +4,8 @@
    <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">
    <title>苹果超级签购买（在线支付）</title>
-    <link href="__CSS__/ssg/common.css" rel="stylesheet" type="text/css">
-    <script src="__JS__/ssg/flexible.min.js" type="text/javascript"></script>
+    <link href="__CSS__/ssg/common.css?v={$rand}" rel="stylesheet" type="text/css">
+    <script src="__JS__/ssg/flexible.min.js?v={$rand}" type="text/javascript"></script>
 </head>

 <body>
@ -57,7 +57,7 @@
        <div class="descitem" style="background: url('__IMG__/ssg/home/list2.png') no-repeat top center/100% 100%;">
            <ul>
                <li style="line-height:1.5;"> 
-                    账号登入且付费，购买苹果超级签（不同设备需要分别付费安装哦）
+                    账号登入且付费，购买苹果超级签（同个账号多个设备需要去找客服那边购买）
                </li>
                <li>下载安装描述文件</li>
                <li>下载安装游戏</li>
@ -72,7 +72,7 @@
        <p class="footer-down">抵制不良游戏，拒绝盗版游戏。注意自我保护，谨防受骗上当。<br>适度游戏益脑，沉迷游戏伤身。合理安排时间，享受健康生活。</p>
    </div>
 
-<script src="__JS__/jquery-1.11.1.min.js" type="text/javascript"></script>
+<script src="__JS__/jquery-1.11.1.min.js?v={$rand}" type="text/javascript"></script>
 <script src="__JS__/ssg/clipboard.min.js" type="text/javascript"></script>
 <script>
    var issafariBrowser = checkSafari();
--- a/Application/Mobile/View/Ssg/index.html
+++ b/Application/Mobile/View/Ssg/index.html
@ -229,7 +229,8 @@ var index = {
            index.choose.game_id = data.game_id;
        })
        $("#selectVal").on("keyup",function(){
-            index.select.game_name =$(this).val().replace(/\s*/g,"");
+            // index.select.game_name =$(this).val().replace(/\s*/g,"");
+            index.select.game_name =$(this).val().replace(/[\w\s]/g,"");
            index.select.type = 0;
            index.getgamelist()
        })
--- a/Application/Mobile/View/Ssg/order.html
+++ b/Application/Mobile/View/Ssg/order.html
@ -13,7 +13,6 @@
        body {
            background-color: #F5F5F5;
        }
-
        .flexitem {
            display: flex;
            justify-content: flex-start;
@ -152,7 +151,7 @@
        </volist>
        </div>
    <else />
-        <div class="page-container ">
+        <div class="page-container" style="background-color: rgba(0,0,0,0);">
            <div class="order-search">
                <div class="no-order">
                    您还没有订单哟~快去下单吧~