Browse Source

fix:大小写

super-yimizi 1 day ago
parent
commit
96cdc8ea8a

+ 2 - 1
application/admin/controller/general/AiMeasureConfig.php

@@ -37,9 +37,10 @@ class AiMeasureConfig extends Backend
     {
     {
         // AI测量素材配置分组
         // AI测量素材配置分组
         $aiMeasureGroups = [
         $aiMeasureGroups = [
+            'ai_measure_common' => 'AI测量通用配置', 
             'ai_measure_selfie' => 'AI测量自拍模式',
             'ai_measure_selfie' => 'AI测量自拍模式',
             'ai_measure_helper' => 'AI测量帮拍模式',
             'ai_measure_helper' => 'AI测量帮拍模式',
-            // 'ai_measure_common' => 'AI测量通用配置'
+            
         ];
         ];
         
         
         $siteList = [];
         $siteList = [];

+ 24 - 53
application/api/controller/AiMeasurement.php

@@ -338,22 +338,25 @@ class AiMeasurement extends Api
             // 拍摄正面
             // 拍摄正面
             'front_shooting' => [
             'front_shooting' => [
                 'frame' => $this->formatFileUrl(config('site.ai_measure_selfie_front_frame')),
                 'frame' => $this->formatFileUrl(config('site.ai_measure_selfie_front_frame')),
-                'voice' => $this->formatFileUrl(config('site.ai_measure_selfie_front_voice')),
-                'demo' => $this->formatFileUrl(config('site.ai_measure_selfie_front_demo'))
+                'demo' => $this->formatFileUrl(config('site.ai_measure_selfie_front_demo')),
+                'text' => config('site.ai_measure_selfie_front_text'),
+                'voice' => $this->formatFileUrl(config('site.ai_measure_selfie_front_voice'))
             ],
             ],
             
             
             // 拍摄侧面
             // 拍摄侧面
             'side_shooting' => [
             'side_shooting' => [
                 'frame' => $this->formatFileUrl(config('site.ai_measure_selfie_side_frame')),
                 'frame' => $this->formatFileUrl(config('site.ai_measure_selfie_side_frame')),
-                'voice' => $this->formatFileUrl(config('site.ai_measure_selfie_side_voice')),
-                'demo' => $this->formatFileUrl(config('site.ai_measure_selfie_side_demo'))
+                'demo' => $this->formatFileUrl(config('site.ai_measure_selfie_side_demo')),
+                'text' => config('site.ai_measure_selfie_side_text'),
+                'voice' => $this->formatFileUrl(config('site.ai_measure_selfie_side_voice'))
             ],
             ],
             
             
             // 拍摄正面侧平举
             // 拍摄正面侧平举
             'arms_shooting' => [
             'arms_shooting' => [
                 'frame' => $this->formatFileUrl(config('site.ai_measure_selfie_arms_frame')),
                 'frame' => $this->formatFileUrl(config('site.ai_measure_selfie_arms_frame')),
-                'voice' => $this->formatFileUrl(config('site.ai_measure_selfie_arms_voice')),
-                'demo' => $this->formatFileUrl(config('site.ai_measure_selfie_arms_demo'))
+                'demo' => $this->formatFileUrl(config('site.ai_measure_selfie_arms_demo')),
+                'text' => config('site.ai_measure_selfie_arms_text'),
+                'voice' => $this->formatFileUrl(config('site.ai_measure_selfie_arms_voice'))
             ],
             ],
             
             
             // 拍摄过程素材
             // 拍摄过程素材
@@ -390,22 +393,25 @@ class AiMeasurement extends Api
             // 拍摄正面
             // 拍摄正面
             'front_shooting' => [
             'front_shooting' => [
                 'frame' => $this->formatFileUrl(config('site.ai_measure_helper_front_frame')),
                 'frame' => $this->formatFileUrl(config('site.ai_measure_helper_front_frame')),
-                'voice' => $this->formatFileUrl(config('site.ai_measure_helper_front_voice')),
-                'demo' => $this->formatFileUrl(config('site.ai_measure_helper_front_demo'))
+                'demo' => $this->formatFileUrl(config('site.ai_measure_helper_front_demo')),
+                'text' => config('site.ai_measure_helper_front_text'),
+                'voice' => $this->formatFileUrl(config('site.ai_measure_helper_front_voice'))
             ],
             ],
             
             
             // 拍摄侧面
             // 拍摄侧面
             'side_shooting' => [
             'side_shooting' => [
                 'frame' => $this->formatFileUrl(config('site.ai_measure_helper_side_frame')),
                 'frame' => $this->formatFileUrl(config('site.ai_measure_helper_side_frame')),
-                'voice' => $this->formatFileUrl(config('site.ai_measure_helper_side_voice')),
-                'demo' => $this->formatFileUrl(config('site.ai_measure_helper_side_demo'))
+                'demo' => $this->formatFileUrl(config('site.ai_measure_helper_side_demo')),
+                'text' => config('site.ai_measure_helper_side_text'),
+                'voice' => $this->formatFileUrl(config('site.ai_measure_helper_side_voice'))
             ],
             ],
             
             
             // 拍摄正面侧平举
             // 拍摄正面侧平举
             'arms_shooting' => [
             'arms_shooting' => [
                 'frame' => $this->formatFileUrl(config('site.ai_measure_helper_arms_frame')),
                 'frame' => $this->formatFileUrl(config('site.ai_measure_helper_arms_frame')),
-                'voice' => $this->formatFileUrl(config('site.ai_measure_helper_arms_voice')),
-                'demo' => $this->formatFileUrl(config('site.ai_measure_helper_arms_demo'))
+                'demo' => $this->formatFileUrl(config('site.ai_measure_helper_arms_demo')),
+                'text' => config('site.ai_measure_helper_arms_text'),
+                'voice' => $this->formatFileUrl(config('site.ai_measure_helper_arms_voice'))
             ],
             ],
             
             
             // 拍摄过程素材
             // 拍摄过程素材
@@ -425,13 +431,14 @@ class AiMeasurement extends Api
     private function getCommonConfig()
     private function getCommonConfig()
     {
     {
         return [
         return [
+            'welcome_notice' => config('site.ai_measure_welcome_notice'),
             'privacy_notice' => config('site.ai_measure_privacy_notice'),
             'privacy_notice' => config('site.ai_measure_privacy_notice'),
             'accuracy_disclaimer' => config('site.ai_measure_accuracy_disclaimer'),
             'accuracy_disclaimer' => config('site.ai_measure_accuracy_disclaimer'),
-            'measurement_types' => $this->parseMeasurementTypes(config('site.ai_measure_measurement_types')),
-            'ai_model_version' => config('site.ai_measure_ai_model_version'),
-            'feedback_enabled' => config('site.ai_measure_feedback_enabled'),
-            'debug_mode' => config('site.ai_measure_debug_mode'),
-            'log_level' => config('site.ai_measure_log_level')
+            'demo_images' => [
+                'front_demo' => $this->formatFileUrl(config('site.ai_measure_common_front_demo')),
+                'side_demo' => $this->formatFileUrl(config('site.ai_measure_common_side_demo')),
+                'arms_demo' => $this->formatFileUrl(config('site.ai_measure_common_arms_demo'))
+            ]
         ];
         ];
     }
     }
 
 
@@ -477,42 +484,6 @@ class AiMeasurement extends Api
         }, array_filter($images));
         }, array_filter($images));
     }
     }
 
 
-    /**
-     * 解析测量类型
-     */
-    private function parseMeasurementTypes($types)
-    {
-        if (empty($types)) {
-            return [];
-        }
-        
-        $typeLabels = [
-            'bust' => '胸围',
-            'waist' => '腰围', 
-            'hips' => '臀围',
-            'shoulder' => '肩宽',
-            'sleeve' => '袖长',
-            'inseam' => '内缝长',
-            'outseam' => '外缝长',
-            'thigh' => '大腿围',
-            'neck' => '颈围'
-        ];
-        
-        $typeArray = is_string($types) ? explode(',', $types) : $types;
-        $result = [];
-        
-        foreach ($typeArray as $type) {
-            $type = trim($type);
-            if (isset($typeLabels[$type])) {
-                $result[] = [
-                    'key' => $type,
-                    'label' => $typeLabels[$type]
-                ];
-            }
-        }
-        
-        return $result;
-    }
 
 
     /**
     /**
      * 直接调用第三方AI测量服务
      * 直接调用第三方AI测量服务

+ 9 - 2
application/api/controller/commission/Commission.php

@@ -23,8 +23,15 @@ class Commission extends Base
 
 
         // 检查分销商状态
         // 检查分销商状态
         $this->service = new AgentService($user);
         $this->service = new AgentService($user);
-        if ($this->service->agent && $this->service->agent->status === AgentModel::AGENT_STATUS_FORBIDDEN) {
-            $this->error('账户已被禁用,该功能暂不可用', null, 102);
+        
+        // 检查用户是否是代理商
+        if (!$this->service->agent) {
+            $this->error('您还不是代理商,无法访问该功能', null);
+        }
+        
+        // 检查代理商状态是否被禁用
+        if ($this->service->agent->status === AgentModel::AGENT_STATUS_FORBIDDEN) {
+            $this->error('您的账户已被禁用,该功能暂不可用', null);
         }
         }
     }
     }