dever 6 years ago
parent
commit
deec8c0a3d

+ 10 - 0
h5/assets/mobile/article.html

@@ -126,6 +126,16 @@
             </a>
         </div>
 
+        <{elseif($v['type'] == 8):}>
+        <!--动图-->
+        <div class="p-img">
+            <a id="link_<{$k}>" href="<{if (isset($v['link']) && $v['link']):}><{$v['link']}><{else:}>javascript:;<{endif}>">
+
+                <img class="img" src="<{$v['pic']}>" alt="">
+
+            </a>
+        </div>
+
         <{endif}>
 
         <{endloop}>

+ 10 - 0
h5/assets/mobile/feature.html

@@ -109,6 +109,16 @@
             </a>
         </div>
 
+        <{elseif($v['type'] == 8):}>
+        <!--动图-->
+        <div class="p-img">
+            <a id="link_<{$k}>" href="<{if (isset($v['link']) && $v['link']):}><{$v['link']}><{else:}>javascript:;<{endif}>">
+
+                <img class="img" src="<{$v['pic']}>" alt="">
+
+            </a>
+        </div>
+
         <{endif}>
 
         <{endloop}>

+ 13 - 0
main/lib/Cron.php

@@ -6,6 +6,19 @@ use Dever;
 
 class Cron
 {
+    # 增加积分
+    public function score_api()
+    {
+        $data = Dever::load('score/action_log')->getDataByDate();
+
+        if ($data) {
+            foreach ($data as $k => $v) {
+                Dever::load('score/lib/core.oper?log_id='.$v['id']);
+            }
+        }
+    }
+
+
     # 收回多余的兑换码
     public function deleteCode_api()
     {

+ 5 - 1
main/src/Journal.php

@@ -243,7 +243,7 @@ class Journal extends Core
         $this->button_old($this->data['info']);
 
         if ($this->data['uid'] > 0) {
-            Dever::score($this->data['uid'], 'view_journal', '浏览小刊首页');
+            //Dever::score($this->data['uid'], 'view_journal', '浏览小刊首页');
         }
 
         return $this->data;
@@ -1073,6 +1073,10 @@ class Journal extends Core
                 Dever::alert('兑换码已被使用');
             }
 
+            if ($info['state'] != 1) {
+                Dever::alert('兑换码已作废');
+            }
+
             if ($info['type'] == 4) {
                 Dever::alert('兑换码已作废');
             }

+ 17 - 0
score/database/action_log.php

@@ -36,6 +36,7 @@ return array
 			'default' 	=> '',
 			'desc' 		=> '',
 			'match' 	=> 'is_numeric',
+			'list'		=> true,
 		),
 
 		'uid'		=> array
@@ -139,4 +140,20 @@ return array
 		'edit' => false,
 		'insert' => false,
 	),
+
+	# request 请求接口定义
+	'request' => array
+	(
+		'getDataByDate' => array
+		(
+			# 匹配的正则或函数 选填项
+			'option' => array
+			(
+				'uid' => 'yes',
+			),
+			'type' => 'all',
+			'order' => array('id' => 'desc'),
+			'col' => 'uid,config_id,score|config_id',
+		),
+	)
 );

+ 5 - 0
score/lib/Core.php

@@ -38,6 +38,11 @@ class Core
 		}
 	}
 
+	public function oper_api()
+	{
+
+	}
+
 	/**
 	 * 根据用户行为,增加积分
 	 *

+ 1 - 1
stat/lib/Journal.php

@@ -6,7 +6,7 @@ use Dever;
 
 class Journal
 {
-    const NUM = 2;
+    const NUM = 7;
 
     public function data_api()
     {

+ 1 - 1
stat/lib/Seller.php

@@ -6,7 +6,7 @@ use Dever;
 
 class Seller
 {
-    const NUM = 2;
+    const NUM = 7;
 
     public function data_api()
     {

+ 1 - 1
stat/lib/Source.php

@@ -6,7 +6,7 @@ use Dever;
 
 class Source
 {
-    const NUM = 2;
+    const NUM = 7;
 
     public function data_api()
     {