Merge branch 'talksec' of 121.43.114.153:/home/git/repositories/shopnc into talksec

mobile/control/festval.php

@@ -59,9 +59,10 @@ class festvalControl extends mobileControl
     }
 
     private $freeCollection = [
-        "0" => ["common_id"=>819,'goods_id' => 1301, 'need_bonus' => 39.90],
-        "1" => ["common_id"=>3725,'goods_id' => 3845, 'need_bonus' => 100],
-        "2" => ["common_id"=>3725,'goods_id' => 4649, 'need_bonus' => 1000],
+//        "0" => ["common_id"=>819,'goods_id' => 1301, 'need_bonus' => 39.90], //89
+        "0" => ["common_id"=>3445,'goods_id' => 6214, 'need_bonus' => 88.00],
+        "1" => ["common_id"=>3446,'goods_id' => 6215, 'need_bonus' => 88],
+        "2" => ["common_id"=>3447,'goods_id' => 6216, 'need_bonus' => 88.0],
     ];
 
     public function freeCollectionOp()