diff --git a/Application/Admin/Controller/MemberController.class.php b/Application/Admin/Controller/MemberController.class.php index 439c2cc3d..aa41fecb6 100644 --- a/Application/Admin/Controller/MemberController.class.php +++ b/Application/Admin/Controller/MemberController.class.php @@ -812,20 +812,13 @@ class MemberController extends ThinkController $map['server_name'] = $_REQUEST['server_name']; unset($_REQUEST['server_name']); } - if (isset($_REQUEST['promote_id'])) { - $map['promote_id'] = $_REQUEST['promote_id']; - unset($_REQUEST['promote_id']); - } // $map['type'] = 1; // $map['login_time'] = ['exp', 'login_time<>0']; $extend = array(); $extend['map'] = $map; - $count = M('UserLoginRecord','tab_')->field('user_id')->where($extend['map'])->group('user_id')->select(false); - $sql = "select count(user_id) as count from ({$count})t"; - $count = M('UserLoginRecord','tab_')->query($sql); + $this->m_title = '登录记录'; - $this->assign('user_count',$count[0]['count']); $this->assign('commonset', M('Kuaijieicon')->where(['url' => 'Member/login_record', 'status' => 1])->find()); parent::lists("UserLoginRecord", $p, $extend['map']); diff --git a/Application/Admin/View/Spend/lists.html b/Application/Admin/View/Spend/lists.html index 4c52357aa..ea64fb7c6 100644 --- a/Application/Admin/View/Spend/lists.html +++ b/Application/Admin/View/Spend/lists.html @@ -169,7 +169,7 @@ - aOh! 暂时还没有内容! + aOh! 暂时还没有内容! @@ -212,7 +212,6 @@ - 补单 @@ -227,19 +226,17 @@ - - 汇总 - + 当页充值:{:null_to_0(array_sum(array_column(array_status2value('pay_status','',$list_data),'pay_amount')))} - 今日充值:{$ttotal} - 昨日充值:{$ytotal} + + 累计充值:{$total}(此处只汇总充值成功的订单) - + diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html index 0dce88c12..b9b47fe62 100644 --- a/Application/Home/View/default/Home/landingPage.html +++ b/Application/Home/View/default/Home/landingPage.html @@ -48,32 +48,36 @@
style="height: 0" > -
+
- -
- -
- + +
+ +
+ -
- +
+
+
-
+
+
-