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

2026-01-30 10:12:41 +08:00
parent 8683aed1d9 38fb18899b
commit 906517d103
1 changed files with 9 additions and 0 deletions
--- a/application/api/model/GiftNew.php
+++ b/application/api/model/GiftNew.php
@@ -89,6 +89,7 @@ class GiftNew extends Model
                        $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'];
+                        $v['sort'] = 2;
                        break;
                    }
                }
@@ -100,8 +101,16 @@ class GiftNew extends Model
                    $v['rule_url'] = get_system_config_value('web_site')."/api/Page/page_show?id=35";
                    $v['activities_id'] = 88;
                    $v['gift_bag'] = 0;
+                    $v['sort'] = 1;
                }
            }
+            //排序
+            usort($list, function($a, $b) {
+                if ($a['sort'] == $b['sort']) {
+                    return 0;
+                }
+                return ($a['sort'] < $b['sort']) ? -1 : 1;
+            });
        }else{
            foreach ($list as $key =>&$v) {
                $v['is_lock'] = $is_lock;