dever пре 4 година
родитељ
комит
4baa83e716
3 измењених фајлова са 23 додато и 11 уклоњено
  1. 1 1
      app/collection/lib/Info.php
  2. 18 3
      app/user/src/Api.php
  3. 4 7
      config/base.php

+ 1 - 1
app/collection/lib/Info.php

@@ -14,7 +14,7 @@ class Info
         return $info;
     }
 
-	public function num($data)
+    public function num($data)
     {
     	if (is_numeric($data)) {
     		$data = $this->get($data);

+ 18 - 3
app/user/src/Api.php

@@ -34,19 +34,19 @@ class Api extends Core
         # 有多少余额
         $score = Dever::load('score/lib/core')->getUserScore($this->uid);
         if ($score) {
-            $data['num'][] = array('¥' . $score['score'], '', $score['name']);
+            $data['num'][] = array('¥' . $score['score'], '', $score['name'], 'yue');
         }
 
         # 有多少积分
         $score = Dever::load('score/lib/core')->getUserScore($this->uid, $info['score_id'], 'collection/info', $info['id']);
         if ($score) {
-            $data['num'][] = array($score['score'], '', $score['name']);
+            $data['num'][] = array($score['score'], '', $score['name'], 'score');
         }
 
         # 有多少门票
         $ticket = Dever::load('user/lib/ticket')->check($this->uid, $info['id']);
         if ($ticket) {
-            $data['num'][] = array($ticket['num'], '', $info['ticket_name']);
+            $data['num'][] = array($ticket['num'], '', $info['ticket_name'], 'ticket');
         }
 
         //$data['num'][] = array('10', '', '好友');
@@ -55,6 +55,21 @@ class Api extends Core
         return $data;
     }
 
+    # 获取积分详情列表
+    public function score()
+    {
+        $info = $this->checkInfo();
+
+        $type = Dever::input('method');
+        if ($type == 'score') {
+            $score = Dever::load('score/lib/core')->getUserScoreList($this->uid, $info['score_id'], 'collection/info', $info['id']);
+        } else {
+            $score = Dever::load('score/lib/core')->getUserScoreList($this->uid);
+        }
+        $data['score'] = $score;
+        return $data;
+    }
+
     # 收下门票
     public function saveTicket()
     {

+ 4 - 7
config/base.php

@@ -149,10 +149,11 @@ $config['base'] = array
 $config['template'] = array
 (
     # 静态页面目录
-    'assets' => array('pc', 'mobile'),
+    //'assets' => array('pc', 'mobile'),
+    'assets' => 'mobile',
 
     # 模板编译器目录
-    'template' => 'pc',
+    'template' => 'mobile',
 
     # 模板html文件的所在目录,默认为html
     'path' => '',
@@ -170,11 +171,7 @@ $config['template'] = array
     'relation' => array
     (
         # 首页启动屏幕
-        'home' => 'index',
-        'list_text' => 'list1',
-        'page' => 'intro',
-        'view' => 'article',
-        'magazine' => 'magzine',
+        'home' => 'page',
     ),
     
 );