Merge branch 'group_0313'

app/adminapi/logic/group_activity/GroupActivityCategoryLogic.php

@@ -224,7 +224,7 @@ class GroupActivityCategoryLogic extends BaseLogic
         $detail['block_data'] = json_decode($detail['block_data'],true);
         $block_data = [];
         foreach($detail['block_data'] as $key => $item) {
-            $tmpKey = empty($item['sort']) ? 0 : $item['sort']."_".$key;
+            $tmpKey = empty($item['sort']) ? "0_".$key : $item['sort']."_".$key;
             $block_data[$tmpKey] = $item;
             $block_data[$tmpKey]['activity'] = GroupActivity::where(['block_key' => $item['block_key'],'group_category_id' => $detail['id']])
                     ->field('id,id as data_id,title,image,equity_id,block_key,origin_price,price,work_amount,settlement_amount')

app/common/model/group_activity/GroupActivity.php

@@ -82,10 +82,10 @@ class GroupActivity extends BaseModel
         }
 
         $block_data = [];
-        foreach($category['block_data'] as $item) {
+        foreach($category['block_data'] as $key => $item) {
             if (isset($list[$item['block_key']])) {
                 $item['activity'] = $list[$item['block_key']]['activity'];
-                $tmpKey = empty($item['sort']) ? $item['block_key'] : $item['sort']."_".$item['block_key'];
+                $tmpKey = empty($item['sort']) ? '0_'.$key : $item['sort']."_".$key;
                 $block_data[$tmpKey] = $item;
             }
             if ($block_key && $item['block_key'] == $block_key) {