新需求： 盲盒转盘开发

application/api/model/Gift.php

@@ -44,13 +44,15 @@ class Gift extends Model
         if($label==2){
             foreach ($list as &$v) {
                 //获取盲盒列表
-                $box_list  = Db::name('vs_gift_bag')->where(['status'=>1])->where('activities_id',4)->select();
+                $box_list  = Db::name('vs_gift_bag')->where(['status'=>1])->where(['activities_id'=>["in",[4,5]]])->select();
                 foreach ($box_list as $key =>$box) {
                     $ext = json_decode($box['ext'],true);
                     if ($ext['gift_id'] == $v['gift_id']) {
                         $v['gift_bag_name'] = $box['name'];
                         $v['rule'] = $ext['description'];
                         $v['rule_url'] = get_system_config_value('web_site')."/api/Page/get_gift_box_rule?box_id=".$box["id"];
+                        $v['activities_id'] = $box['activities_id'];
+                        $v['gift_bag'] = $box['id'];
                         break;
                     }
                 }
@@ -58,11 +60,4 @@ class Gift extends Model
         }
         return ['code' => 1, 'msg' => '获取成功', 'data' => $list];
     }
-
-    /*
-     * 盲盒规则链接
-     */
-    public function get_gift_box_rule($box_id){
-
-    }
 }