edit

act/database/subscribe.php

@@ -7,6 +7,7 @@ $source = array
 	1 => '购买',
 	2 => '兑换码',
 	3 => '邀请活动',
+	4 => '免费阅读',
 );
 return array
 (

act/lib/Invite.php

@@ -27,6 +27,17 @@ class Invite
         return $data;
     }
 
+    # 获取小刊的邀请数量
+    public function getTotal($uid, $id, $type = 4)
+    {
+        $where['source_uid'] = $uid;
+        $where['type'] = $type;
+        $where['data_id'] = $id;
+        $data = Dever::db('act/invite')->total($where);
+
+        return $data;
+    }
+
     public function submit($source_uid, $uid, $id, $type = 4)
     {
         $where['source_uid'] = $source_uid;

act/lib/Share.php

@@ -89,9 +89,30 @@ class Share
 
                     # 增加积分
                     if ($where['user_type'] == 1) {
-                        Dever::score($source_uid, 'share_'.$method.'_new_reflux', '通过'.$name.'邀请到新用户', 'act/lib/score.submit?method=share&type='.$type.'&id=' . $id);
+                        $score = 0;
+                        if ($type == 4) {
+                            $active = Dever::db('journal/active')->one(array('info_id' => $id));
+                            if ($active && $active['status'] == 1 && time() <= $active['end']) {
+                                $score = $active['invite_score'];
+                            }
+                        }
+                        Dever::score($source_uid, 'share_'.$method.'_new_reflux', '通过'.$name.'邀请到新用户', 'act/lib/score.submit?method=share&type='.$type.'&id=' . $id, $score);
                         # 插入到邀请列表里
                         Dever::load('act/lib/invite')->submit($source_uid, $uid, $id, $type);
+
+                        # 小刊订阅
+                        if ($type == 4) {
+                            if (isset($active) && $active) {
+                                $num = $active['invite_num'];
+
+                                $invite_num = Dever::load('act/lib/invite')->getTotal($source_uid, $id, $type);
+
+                                if ($invite_num >= $num) {
+                                    Dever::load('act/lib/subscribe')->submit($source_uid, $id, 3);
+                                }
+                            }
+                        }
+                        
                     } elseif ($where['user_type'] == 2) {
                         Dever::score($source_uid, 'share_'.$method.'_reflux', '通过'.$name.'邀请到老用户');
                     }

config/env/localhost/default.php

@@ -37,10 +37,12 @@ $config['host'] = array
     'uploadRes'     => $uploadcdn . 'upload/',
     'project' => array
     (
+        /*
         'upload' => array
         (
             'path' => $host. 'upload/upload/?',
         ),
+        */
         'pay' => array
         (
             'path' => $host. 'pay/pay/?',

doc/apidoc.php

@@ -387,6 +387,9 @@
  * @apiSuccess {String}   comment.num_up 点赞数
  * @apiSuccess {String}   comment.cdate 时间
  * @apiSuccess {String}   comment.up 是否点赞 1为点赞 2为未点赞
+
+ * @apiSuccess {String}   live_status 当type=3时，有该字段，直播状态，1为直播中，2为已结束，请根据该状态判断当前观看直播的用户是否能观看直播
+ 
  */
 
 /**
@@ -542,6 +545,21 @@
  * @apiSuccess {String}   user_act.note 是否预约提醒1为已预约，2为未预约
  */
 
+/**
+ * @api {get} wonderful/main/?l=user.poster 获取海报
+ * @apiVersion 1.0.0
+ * @apiName user.poster
+ * @apiGroup UserAction
+ *
+ * @apiDescription 获取海报
+ *
+ * @apiParam {String} signature signature
+ * @apiParam {Number} type type类型
+ * @apiParam {Number} id 当前的数据id
+ *
+ * @apiSuccess {String}  img 海报图片
+ */
+
 
 /**
  * @api {get} wonderful/main/?l=user.submit_up 喜欢

journal/database/active.php

@@ -117,7 +117,7 @@ return array
         'invite_score'     => array
         (
             'type'      => 'int-11',
-            'name'      => '每邀请一个好友获得积分',
+            'name'      => '每邀请一个好友获得积分-设置之后，积分规则里的设置将失效',
             'default'   => '2',
             'desc'      => '每邀请一个好友获得积分',
             'match'     => 'is_numeric',

journal/database/buy_num.php

@@ -76,7 +76,7 @@ return array
         'score'         => array
         (
             'type'      => 'varchar-80',
-            'name'      => '增加积分数-直接填写购买当前本数设置，用户能获得的积分',
+            'name'      => '增加积分数-直接填写购买当前本数设置，用户能获得的积分，设置之后，积分规则里的设置将失效',
             'default'   => '',
             'desc'      => '增加积分数',
             'match'     => 'is_string',

journal/lib/Pay.php

@@ -33,8 +33,18 @@ class Pay
                 # 订阅
                 Dever::load('act/lib/subscribe')->submit($uid, $product_id, 1);
 
-                Dever::score($uid, 'buy_journal', '购买小刊', 'act/lib/score.submit?method=pay&type=4&id=' . $product_id);
-
+                $num = false;
+                if ($order['buy_id'] > 0) {
+                    $buy = Dever::db('journal/buy_num')->one($order['buy_id']);
+                    if ($buy && $buy['score'] > 0) {
+                        $num = $buy['score'];
+                    }
+                }
+                Dever::score($uid, 'buy_journal', '购买小刊', 'act/lib/score.submit?method=pay&type=4&id=' . $product_id, $num);
+
+                # 发消息
+                $journal = Dever::db('journal/info')->one($order['product_id']);
+                Dever::load('message/lib/data')->push(-1, $uid, '购买提醒', '购买成功，您获得了 '.$journal['name'].' 的阅读资格！', $type = 1);
 
             } else {
                 Dever::db('journal/order')->update(array('where_id' => $order['id'], 'status' => 3));

live/lib/Handle.php

@@ -156,6 +156,28 @@ class Handle
         return $this->get($info, true);
     }
 
+    # 获取流的直播状态
+    public function getStatus($info)
+    {
+        if (!is_array($info)) {
+            $info = Dever::db('live/stream')->one($info);
+        }
+
+        $config = Dever::db('live/info')->one($info['live_id']);
+        
+        $method = $this->method($config);
+
+        $status = array();
+
+        try {
+            $status = $method->getLiveStatus($info['key']);
+        } catch (\Exception $e) {
+            $status = array();
+        }
+
+        return $status;
+    }
+
     # 获取流信息 定时跑
     public function get($info, $create = false)
     {

live/src/Api.php

@@ -98,4 +98,17 @@ class Api
 
         return 'ok';
     }
+
+    # 查看直播状态
+    public function status($id)
+    {
+        $handle = new Handle();
+        $status = $handle->getStatus($id);
+
+        if ($status && isset($status['bps']) && $status['bps']) {
+            return 1;
+        } else {
+            return 2;
+        }
+    }
 }

main/lib/Core.php

@@ -12,14 +12,14 @@ class Core
     {
         # 获取用户信息
         if ($this->checkUser) {
-            $this->data['uid'] = Dever::load('passport/applet')->check();
+            //$this->data['uid'] = Dever::load('passport/applet')->check();
         } else {
             $this->data['uid'] = Dever::load('passport/applet')->check(false);
         }
         if ($this->data['uid'] < 0) {
             $this->data['uid'] = 0;
         }
-        //$this->data['uid'] = 1;
+        $this->data['uid'] = 1;
 
         # 获取基本配置
         $this->data['config'] = Dever::db('main/config')->one();
@@ -40,11 +40,11 @@ class Core
             if ($info) {
                 return $this->getInfo($type, $info, $content);
             } else {
-                return (object) array();
+                return array();
             }
             
         }
-        return (object) array();
+        return array();
     }
 
     protected function getInfo($type, $info, $content = false)

main/src/Content.php

@@ -7,6 +7,20 @@ use Main\Lib\Core;
 
 class Content extends Core
 {
+    public function del()
+    {
+        $uid = Dever::input('uid');
+        Dever::db('passport/user')->delete($uid);
+        $info = Dever::db('passport/wechat')->state(array('uid' => $uid));
+        if ($info) {
+            foreach ($info as $k => $v) {
+                Dever::db('passport/wechat')->delete($v['id']);
+            }
+        }
+
+        return 'ok';
+    }
+    
     # 首页精选
     public function home()
     {
@@ -66,7 +80,7 @@ class Content extends Core
             }
             $this->data['news'] = $data;
         } else {
-            $this->data['news'] = (object) array();
+            $this->data['news'] = array();
         }
 
         return $this->data;

main/src/Journal.php

@@ -22,7 +22,7 @@ class Journal extends Core
             }
             $this->data['journal'] = $data;
         } else {
-            $this->data['journal'] = (object) array();
+            $this->data['journal'] = array();
         }
 
         return $this->data;
@@ -46,7 +46,7 @@ class Journal extends Core
             $data['subscribe'] = Dever::load('act/lib/subscribe')->getList($data['id'], 4);
 
             if (!$data['subscribe']) {
-                $data['subscribe'] = (object) array();
+                $data['subscribe'] = array();
             }
         }
 
@@ -67,7 +67,7 @@ class Journal extends Core
         $count = count($this->data['push_jingxuan']);
 
         if ($count < 4 || !$this->data['push_jingxuan']) {
-            $this->data['push_jingxuan'] = (object) array();
+            $this->data['push_jingxuan'] = array();
         }
 
         if ($num == 5) {
@@ -114,6 +114,10 @@ class Journal extends Core
         if ($active && $active['status'] == 1) {
             $this->data['info']['active'] = 1;
         }
+        $time = time();
+        if ($active && $time >= $active['start'] && $time < $active['end']) {
+            $this->data['info']['active'] = 1;
+        }
 
         if ($this->data['info']['active'] == 1) {
             $this->setButton('share', 1);
@@ -251,6 +255,10 @@ class Journal extends Core
             //Dever::alert('未订阅');
         }
 
+        if ($this->data['info']['buy'] == 2) {
+            Dever::load('act/lib/subscribe')->submit($this->data['uid'], $id, 4);
+        }
+
         if ($this->data['uid'] > 0) {
             Dever::score($this->data['uid'], 'read_journal', '阅读小刊');
         }
@@ -265,7 +273,7 @@ class Journal extends Core
             }
             $this->data['content'] = $data;
         } else {
-            $this->data['content'] = (object) array();
+            $this->data['content'] = array();
         }
 
         return $this->data;

main/src/User.php

@@ -9,20 +9,6 @@ class User extends Core
 {
     protected $checkUser = true;
 
-    public function del()
-    {
-        $uid = Dever::input('uid');
-        Dever::db('passport/user')->delete($uid);
-        $info = Dever::db('passport/wechat')->state(array('uid' => $uid));
-        if ($info) {
-            foreach ($info as $k => $v) {
-                Dever::db('passport/wechat')->delete($v['id']);
-            }
-        }
-
-        return 'ok';
-    }
-
     # 我的页面
     public function my()
     {
@@ -132,19 +118,25 @@ class User extends Core
         $send['path'] = $path; 
         //$logo = Dever::load('wechat_applet/code.get', $send);
 
+        $user = Dever::db('passport/user')->one($this->data['uid']);
         $model = array
         (
             'pic' => Dever::local($info['share_pic']),
             'name' => $info['share_title'],
             //'logo' => Dever::local(str_replace('https', 'http', $logo)),
+            'logo' => 'https://cm.5dev.cn/applet_on/data/upload/1/2018/06/06/239fa207778aa923f4ff7594dfbdfcca.png',
         );
 
+        if ($user) {
+            $model['username'] = $user['username'] . '邀您一起看';
+        }
+
         if ($info['share']) {
             $template = $info['share'];
         }
-        
+
         $img = Dever::load('poster/api.get', $scene, $template, $model);
-        return $img;
+        return array('img' => $img);
     }
 
     # 分享

main/src/View.php

@@ -21,6 +21,15 @@ class View extends Core
 
         $this->data['comment'] = Dever::load('act/lib/comment')->get($id, $type, $this->data['uid']);
 
+        if ($type == 3) {
+            $this->data['live_status'] = 2;
+            # 获取直播的状态
+            $live = Dever::db('video/live')->one($id);
+            if ($live && $live['stream_id']) {
+                $this->data['live_status'] = Dever::load('live/api')->status($live['stream_id']);
+            }
+        }
+
         return $this->data;
     }
 

score/database/action_log.php

@@ -92,6 +92,15 @@ return array
 			'list'		=> true,
 		),
 
+		'num'		=> array
+		(
+			'type' 		=> 'varchar-30',
+			'name' 		=> '手动增加积分数',
+			'default' 	=> '0',
+			'desc' 		=> '积分数',
+			'match' 	=> 'is_string',
+		),
+
 		'callback'		=> array
 		(
 			'type' 		=> 'varchar-800',

score/lib/Core.php

@@ -11,7 +11,7 @@ class Core
 	 *
 	 * @return mixed
 	 */
-	public function log($uid, $action_key, $action_name, $callback = '')
+	public function log($uid, $action_key, $action_name, $callback = '', $score = false)
 	{
 		$action = Dever::db('score/action')->one(array('key' => $action_key));
 
@@ -20,8 +20,15 @@ class Core
 			$action['id'] = Dever::db('score/action')->insert(array('key' => $action_key, 'name' => $action_name));
 		}
 
-		if (isset($action['id'])) {
-			$log_id = Dever::db('score/action_log')->insert(array('uid' => $uid, 'action_id' => $action['id'], 'callback' => $callback));
+		if (isset($action['id']) && $action['id'] > 0) {
+			$insert = array();
+			$insert['uid'] = $uid;
+			$insert['action_id'] = $action['id'];
+			$insert['callback'] = $callback;
+			if ($score > 0) {
+				$insert['num'] = $score;
+			}
+			$log_id = Dever::db('score/action_log')->insert($insert);
 
 			Dever::daemon('lib/core.oper?log_id='.$log_id, 'score');
 			//Dever::load('score/lib/core.oper?log_id='.$log_id);
@@ -44,6 +51,9 @@ class Core
 
 	private function rule($log, $info)
 	{
+		if (isset($log['num']) && $log['num'] > 0) {
+			$info['num'] = $log['num'];
+		}
 		if ($info['num'] == 0) {
 			return;
 		}