fix four bug

data/logic/buy_1.logic.php

@@ -909,7 +909,18 @@ class buy_1Logic
         //cart_id=goods_id,优惠套装目前只能进购物车,不能立即购买
         $result['cart_id'] = $goods_id;
         $result['bl_id'] = 0;
-        
+
+        $goods_spec = unserialize($goods_info['goods_spec']);
+        if(empty($goods_spec)) {
+            $goods_spec = [];
+        }
+
+        $goods_spec_array = [];
+        foreach ($goods_spec as $value) {
+            array_push($goods_spec_array, $value);
+        }
+        $result['goods_spec'] = implode(',', $goods_spec_array);
+
         return $result;
     }
     

helper/bonus/account.php

@@ -681,7 +681,7 @@ class account implements IPriceCalculate
             }
         }
 
-        return ['user_bonus' => $ways['available_bonus'],'room_bonus' => $room_val,'room_id' => $roomid];
+        return ['user_bonus' => $ways['user_bonus'],'room_bonus' => $room_val,'room_id' => $roomid];
     }
 
     public function hold_bonus($user_bonus)

mobile/control/member_bonus.php

@@ -1074,8 +1074,8 @@ class member_bonusControl extends mbMemberControl
         if(empty($items)) {
             return self::outsuccess(array('pd_logs' => array(),'mobile_page' => mobile_page(0)));
         }
-        $pd_logs = $this->mUserAccount->filter_pd_log($items);
-
+        $logger = new bonus\recorder(session_helper::memberid());
+        $pd_logs = $logger->filter_pd_log($items);
         $pages = $this->pages($count);
 
         return self::outsuccess(array('pd_logs' => $pd_logs,'mobile_page' => mobile_page($pages)));

mobile/templates/default/game/shake_bonus.php

@@ -97,17 +97,15 @@
      };
 
      var barrage = new Barrage();
-
      var shakeClientWebsocket = new ShakeClientWebsocket(addr,token,room,user,true);
-
-     shakeClientWebsocket.client.onmessage = function(res){
+     shakeClientWebsocket.client.onmessage = function(res)
+     {
          var datas = JSON.parse(res.data);
          if(datas.op == 'shake') {
              barrage.add(datas.content).send();
          }
      };
 
-
      var shake_start   = document.getElementById('shake_start');
      var shake_null    = document.getElementById('shake_null');
      var shake_success = document.getElementById('shake_success');
@@ -228,8 +226,8 @@
                          shakeClientWebsocket.shake_bonus(bonus.info.money);
 
                          html += '<div class="head_icon">' + avatar + '</div>' +
-                             '<div class="name_box">' + '<div class="name">' + bonus.bonuses[i].name + '</div>' +
-                             '<div class="results_msg">' + msg + '</div>' + '</div>';
+                                 '<div class="name_box">' + '<div class="name">' + bonus.bonuses[i].name + '</div>' +
+                                 '<div class="results_msg">' + msg + '</div>' + '</div>';
                          html += '<div class="arrow_icon"></div>';
                          html += '<input type="hidden" value="'+ bonus.bonuses[i].url + '" id="url">';
                      }
@@ -249,9 +247,6 @@
          shaker.run(eventData)
      }
 
-
-
-
      if(isMobile.iOS()) {
          init_ios_bridge(function(bridge) { });
          shaker.init(30);