From 8bbf1f8df4f7b2e25c959f468bce83b2e7990373 Mon Sep 17 00:00:00 2001
From: zhengchanglong <zcl_office@163.com>
Date: Sun, 29 Sep 2019 10:50:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=91=98=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=90=8E=E5=8F=B0=E9=A6=96=E9=A1=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Home/Controller/PromoteController.class.php     | 13 ++++++++++++-
 Application/Home/View/default/Promote/index.html    |  4 ++--
 .../Home/View/default/Promote/quick_menu_list.html  |  2 +-
 .../Mobile/Controller/SsgController.class.php       |  9 +++++++--
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/Application/Home/Controller/PromoteController.class.php b/Application/Home/Controller/PromoteController.class.php
index 8c84c8e48..434e276ca 100644
--- a/Application/Home/Controller/PromoteController.class.php
+++ b/Application/Home/Controller/PromoteController.class.php
@@ -213,7 +213,18 @@ class PromoteController extends BaseController
             ->order("sv.start_time desc")
             //->page(1, 20)
             ->select();;
-
+        foreach ($open_server_list as $key => $server){
+            $open_server_list[$key]['icon']=get_cover($server['icon'],'path');
+            if($server['pay_type']==1){
+                $open_server_list[$key]['pay_type']='安卓';
+            }elseif ($server['pay_type']==1){
+                $open_server_list[$key]['pay_type']='iOS';
+            }else{
+                $open_server_list[$key]['pay_type']='安卓、iOS';
+            }
+            $open_server_list[$key]['pay_type'];
+            $open_server_list[$key]['start_time'] = date('Y-m-s h:i',$server['start_time']);
+        }
         $this->ajaxReturn(['status'=>1,'info'=>'调用成功','data'=>$open_server_list],"JSON");
     }
 
diff --git a/Application/Home/View/default/Promote/index.html b/Application/Home/View/default/Promote/index.html
index ac3d8b9e8..28e850a6d 100644
--- a/Application/Home/View/default/Promote/index.html
+++ b/Application/Home/View/default/Promote/index.html
@@ -125,8 +125,8 @@
                                 <tr>
                                     <td><img src="{$data.icon|get_cover='path'}"></td>
                                     <td>{$data.game_name}</td>
-                                    <td><if condition="$data.pay_type eq 0">安卓、IOS<elseif condition="$data.pay_type eq 1">安卓<else />IOS</if></td>
-                                    <td>{$data.start_time|date="m-d H:i",###}}</td>
+                                    <td><if condition="$data.pay_type eq 0">安卓、iOS<elseif condition="$data.pay_type eq 1">安卓<else />iOS</if></td>
+                                    <td>{$data.start_time|date="m-d H:i",###}</td>
                                     <td>{$data.server_name}</td>
                                 </tr>
                             </volist>
diff --git a/Application/Home/View/default/Promote/quick_menu_list.html b/Application/Home/View/default/Promote/quick_menu_list.html
index 37f8f1bcf..097cf441b 100644
--- a/Application/Home/View/default/Promote/quick_menu_list.html
+++ b/Application/Home/View/default/Promote/quick_menu_list.html
@@ -26,7 +26,7 @@
                     <else />
                     <volist name="data_list" id="data">
                         <tr>
-                            <td>{$data.icon}</td>
+                            <td><img src="{$data.icon|get_cover='path'}"></td>
                             <td>{$data.name}</td>
                             <td><if condition="$data.exist_id neq ''">已添加<else/>未添加</if></td>
                             <td><a href="javascript:operation('{$data.id}')"><if condition="$data.exist_id neq ''">移除<else/>添加</if></a></td>
diff --git a/Application/Mobile/Controller/SsgController.class.php b/Application/Mobile/Controller/SsgController.class.php
index e6ff15a4c..07c49507c 100644
--- a/Application/Mobile/Controller/SsgController.class.php
+++ b/Application/Mobile/Controller/SsgController.class.php
@@ -21,9 +21,9 @@ class SsgController extends BaseController {
 
     public function login(){
         $user = session("user_auth");
-        if ($user) {
+        /*if ($user) {
             redirect(U("ssg/index"));
-        }
+        }*/
         $this->display();
     }
 
@@ -146,6 +146,11 @@ class SsgController extends BaseController {
         $this->display();
     }
 
+    public function clear(){
+        \Think\Log::record('缓存清理业务触发');
+        session(null);
+    }
+
     public function timediffs($begin_time, $end_time) {
         if ($begin_time < $end_time) {
             $starttime = $begin_time;