diff --git a/webapp/controller/FesActivityController.class.php b/webapp/controller/FesActivityController.class.php
index 75fa962..2c585d7 100644
--- a/webapp/controller/FesActivityController.class.php
+++ b/webapp/controller/FesActivityController.class.php
@@ -197,41 +197,42 @@ class FesActivityController{
         foreach ($user_db['info_list'] as &$us) {
             if ($us['id'] == $id) {
                 if ($us['status'] != 1) {
-                    phpcommon\sendError(ERR_USER_BASE + 4, '奖励不可领');
-                    return;
-                }
-
-                if ($us['type'] == '2') {
-                    //扣除钻石
-                    $userrow = $conn->execQueryOne(
-                        'SELECT diamond_num FROM user WHERE accountid=:accountid;',
-                        array(
-                            ':accountid' => $account_id
-                        )
-                    );
-                    if (!$userrow) {
-                        phpcommon\sendError(ERR_USER_BASE + 1, '没有这个玩家');
-                        return;
-                    }
-                    
-                    if ($userrow['diamond_num'] < $us['condition']) {
-                        phpcommon\sendError(ERR_USER_BASE + 3, '钻石不足');
-                        return;
-                    }
-                    $ret = $conn->execScript(
-                        'UPDATE user SET diamond_num=:diamond_num, modify_time=:modify_time ' .
-                            ' WHERE accountid=:accountid;',
-                        array(
-                            ':accountid' => $account_id,
-                            ':diamond_num' => $userrow['diamond_num'] - $us['condition'],
-                            ':modify_time' => time()
-                        )
-                    );
-                    if (!$ret) {
-                        die();
+                    if ($us['type'] == '2') {
+                        //扣除钻石
+                        $userrow = $conn->execQueryOne(
+                            'SELECT diamond_num FROM user WHERE accountid=:accountid;',
+                            array(
+                                ':accountid' => $account_id
+                            )
+                        );
+                        if (!$userrow) {
+                            phpcommon\sendError(ERR_USER_BASE + 1, '没有这个玩家');
+                            return;
+                        }
+                        
+                        if ($userrow['diamond_num'] < $us['condition']) {
+                            phpcommon\sendError(ERR_USER_BASE + 3, '钻石不足');
+                            return;
+                        }
+                        $ret = $conn->execScript(
+                            'UPDATE user SET diamond_num=:diamond_num, modify_time=:modify_time ' .
+                                ' WHERE accountid=:accountid;',
+                            array(
+                                ':accountid' => $account_id,
+                                ':diamond_num' => $userrow['diamond_num'] - $us['condition'],
+                                ':modify_time' => time()
+                            )
+                        );
+                        if (!$ret) {
+                            die();
+                            return;
+                        }
+                    } else {
+                        phpcommon\sendError(ERR_USER_BASE + 4, '奖励不可领');
                         return;
                     }
                 }
+                
                 $us['status'] = 2;
                 $status = 2;
                 $reward = metatable\getRewardInfo($user_db['act_id'], $id, 0);
diff --git a/webapp/metatable/activity.php b/webapp/metatable/activity.php
index 153898a..6467413 100644
--- a/webapp/metatable/activity.php
+++ b/webapp/metatable/activity.php
@@ -67,10 +67,9 @@ function getActInfo($act_conf)
     $info_list = array();
     $conditions = getExplode($act_conf['condition']);
     for ($i = 0; $i < count($conditions); $i++) {
-        $status = $conditions[$i][0] == '1' ? 0: 1; // contition 1:video; 2: cost diamond
         array_push($info_list,array(
             'id' => $i,
-            'status' => $status,
+            'status' => 0,
             'times' => 0,
             'type' => $conditions[$i][0],
             'condition' => $conditions[$i][1],