add make_vote_type for bonus

helper/ugc/setting.php

@@ -35,7 +35,7 @@ class bonus_builder
 
     private function fill_param()
     {
-        $param['make_type']  = type::MakeSendType;
+        $param['make_type']  = type::MakeVoteType;
         $param['type_name']  = $this->bless;
         $param['type_bless'] = $this->bless;
         $param['send_type']  = $this->sendtype;

mobile/control/bonusex.php

@@ -1129,7 +1129,8 @@ function bonus_canshare($output)
     if(empty($type_info)) return 'false';
 
     $type = \bonus\type::create_by_paramer($type_info);
-    if($type->binded_over() || $type->isEnd()) {
+    $make_type = $type->send_type();
+    if($type->binded_over() || $type->isEnd() || $make_type == bonus\type::MakeVoteType) {
         return 'false';
     } else {
         return 'true';

mobile/control/member_bonus.php

@@ -942,7 +942,8 @@ class member_bonusControl extends mbMemberControl
 
     private function show_type($make_type)
     {
-        switch ($make_type) {
+        switch ($make_type)
+        {
             case bonus\type::MakeSendType: //抢
             case bonus\type::MakeInviteType:
                 return 1;
@@ -957,6 +958,8 @@ class member_bonusControl extends mbMemberControl
             case bonus\type::MakeRegisterType:
             case bonus\type::MakeEvaluateType:
                 return 4;
+            case bonus\type::MakeVoteType:
+                return 5;
             default:
                 return 0;   //什么都不显示
         }
@@ -965,12 +968,12 @@ class member_bonusControl extends mbMemberControl
     private function show_name(bonus\type $type)
     {
         $make_type = $type->make_type();
-
         switch ($make_type) {
             case bonus\type::MakeSendType: //抢
             case bonus\type::MakeShakeGainType: //摇
-            return $type->sender_name();
-
+                return $type->sender_name();
+            case bonus\type::MakeVoteType:
+                return "投票和答题红包";
             case bonus\type::MakeEvaluateType:
             case bonus\type::MakeInviteType:
             case bonus\type::MakeBonusRefundType: //退
@@ -981,7 +984,6 @@ class member_bonusControl extends mbMemberControl
             case bonus\type::MakeRegisterType:
             case bonus\type::MakeInviteRewardType:
                 return $type->name();
-
             default:
                 return 0;   //什么都不显示
         }