Merge remote-tracking branch 'origin/websocket' into websocket

helper/goods_helper.php

@@ -200,13 +200,13 @@ class goods_helper
             array_push($ret['bundling'],$val);
         }
 
-        $ret['bargain'] = [];
+        $ret['bargain_create'] = [];
         foreach ($goods_list as $goods)
         {
             $gid = intval($goods['goods_id']);
             $item = activity\bargain_goods::instance()->get_info($gid);
             if($item != false) {
-                $ret['bargain'][] = $item;
+                $ret['bargain_create'][] = $item;
             }
         }
 

mobile/control/special.php

@@ -117,7 +117,7 @@ class specialControl extends mobileHomeControl
                 'groupbuy' => $goodsex['groupbuy'],
                 'limitime' => $goodsex['limitime'],
                 'bundling' => $goodsex['bundling'],
-                'bargain' => $goodsex['bargain'],
+                'bargain_create' => $goodsex['bargain_create'],
                 'mobile_page' => mobile_page(1));
         }
         else