Prechádzať zdrojové kódy

修改4G带云存字段命名

zhangdongming 2 týždňov pred
rodič
commit
8f4479163a

+ 14 - 1
AdminController/ServeManagementController.py

@@ -740,8 +740,21 @@ class serveManagement(View):
                                                                               'pixel_level', 'is_ai', 'pay_type')
             if not store_meal.exists():
                 return response.json(0, [])
-            store_meal_list = []
+            # 过滤重复标题
+            seen_titles = set()
+            unique_meals = []
+
             for item in store_meal:
+                pixel_content = '(4k)' if item['pixel_level'] == 1 and item['pay_type'] != 11 else '(4k以下)' if item['pay_type'] != 11 else ''
+                ai_content = '+AI套餐' if item['is_ai'] == 1 else ''
+                full_title = f"{item['lang__title']}-{item['lang__content']}{ai_content}{pixel_content}"
+
+                if full_title not in seen_titles:
+                    seen_titles.add(full_title)
+                    unique_meals.append(item)
+
+            store_meal_list = []
+            for item in unique_meals:
                 pixel_content = ''
                 if item['pay_type'] != 11:
                     pixel_content = '(4k)' if item['pixel_level'] == 1 else '(4k以下)'

+ 1 - 1
Ansjer/config.py

@@ -480,7 +480,7 @@ APP_TYPE = {
 
 ALGORITHM_COMBO_TYPES = [51, 57, 58, 60, 59, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70]
 # 双目设备类型
-BINOCULAR_DEVICE_TYPE = [34, 37, 43, 50, 53, 54]
+BINOCULAR_DEVICE_TYPE = [34, 37, 43, 50, 53, 54, 46]
 
 # 联通Unicom config
 # 应用地址,请向开发人员索取

+ 2 - 0
Controller/CloudStorage.py

@@ -258,6 +258,8 @@ class CloudStorageView(View):
 
                 if CONFIG_INFO != CONFIG_CN:  # 国内生产环境不筛选像素 加载所有上架套餐
                     store_qs = store_qs.filter(Q(pixel_level=pixel_level))
+                elif CONFIG_INFO == CONFIG_CN and is_4g == 1:
+                    store_qs = store_qs.filter(Q(pixel_level=pixel_level))
 
                 # 根据是否支持4g过滤设备
                 store_qs = store_qs.filter(is_4g=is_4g)