1

src/cn/compass/entity/definition/EventScope.inc

@@ -29,7 +29,7 @@ class EventScope
 			$tmp = array("id"=>1, "title"=>"全部对象");
 			array_push($data, $tmp);
 			
-			$tmp = array("id"=>2, "title"=>"校内");
+			$tmp = array("id"=>2, "title"=>"校(园)内");
 			array_push($data, $tmp);
 			
 			$tmp = array("id"=>3, "title"=>"社会机构");

src/cn/compass/entity/definition/PointActionType.inc

@@ -2,7 +2,7 @@
 /**
  * 系统流水记录表
  * $Id: PointActionType.inc 81583 2015-04-02 08:59:46Z wanggb $
- * @author wanggb
+ * @author 用户积分
  * @access public
  * @package jp.fishow.entity.definition
  */
@@ -41,19 +41,12 @@ class PointActionType {
 			$data = array();
 			$tmp = array("id"=>1, "title"=>"用户注册");
 			array_push($data, $tmp);
-			$tmp = array("id"=>2, "title"=>"签到奖励");
+			$tmp = array("id"=>2, "title"=>"社会实践获得");
 			array_push($data, $tmp);
-			$tmp = array("id"=>3, "title"=>"邀请好友奖励");
+			$tmp = array("id"=>3, "title"=>"亲子活动获得");
 			array_push($data, $tmp);
-			$tmp = array("id"=>4, "title"=>"购买课程奖励");
+			$tmp = array("id"=>4, "title"=>"兑换商品");
 			array_push($data, $tmp);
-			$tmp = array("id"=>5, "title"=>"兑换代金券");
-			array_push($data, $tmp);
-			$tmp = array("id"=>6, "title"=>"兑换商品");
-			array_push($data, $tmp);
-			$tmp = array("id"=>7, "title"=>"系统赠送[抽奖等]");
-			array_push($data, $tmp);			
-
 			$result = array();
 			foreach ($data as $row) {
 				$tmp2 = new PointActionType($row);