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 @@
|
{$data.game_name} |
- 安卓、IOS安卓IOS |
- {$data.start_time|date="m-d H:i",###}} |
+ 安卓、iOS安卓iOS |
+ {$data.start_time|date="m-d H:i",###} |
{$data.server_name} |
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 @@
- {$data.icon} |
+ |
{$data.name} |
已添加未添加 |
移除添加 |
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;