From fd3c6a6f3d252f85d9601d1ea31493b39218715c Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Fri, 1 Sep 2023 16:13:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/IndexController.php | 3 ++-
 app/api/logic/IndexLogic.php           | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/api/controller/IndexController.php b/app/api/controller/IndexController.php
index af61aaa6c..2c6e69a69 100755
--- a/app/api/controller/IndexController.php
+++ b/app/api/controller/IndexController.php
@@ -61,8 +61,9 @@ class IndexController extends BaseApiController
      */
     public function config()
     {
+        $parmas=$this->request->param();
         $group_id=$this->userInfo?$this->userInfo['group_id']:1;
-        $result = IndexLogic::getConfigData($group_id);
+        $result = IndexLogic::getConfigData($group_id,$parmas);
         return $this->data($result);
     }
 
diff --git a/app/api/logic/IndexLogic.php b/app/api/logic/IndexLogic.php
index 08eabbe82..d4f682561 100755
--- a/app/api/logic/IndexLogic.php
+++ b/app/api/logic/IndexLogic.php
@@ -106,7 +106,7 @@ class IndexLogic extends BaseLogic
      * @author 段誉
      * @date 2022/9/21 19:38
      */
-    public static function getConfigData($group_id = 1)
+    public static function getConfigData($group_id = 1,$parmas)
     {
         if ($group_id == null) {
             $group_id = 1;
@@ -156,9 +156,9 @@ class IndexLogic extends BaseLogic
         ];
         $versionInfo = [];
         $version='1.0.0';
-        if(self::isAndroid()){
+        if(isset($parmas['os'])&&$parmas['os']=='android'||self::isAndroid()){
             $versionInfo=AppUpdate::where('type',2)->order('id','desc')->find();
-        }elseif(self::isIOS()){
+        }elseif(isset($parmas['os'])&&$parmas['os']=='ios'||self::isIOS()){
             $versionInfo=AppUpdate::where('type',1)->order('id','desc')->find();
         }
         if($versionInfo){