From 4b3e1df6f88a320f07601e4010d1d98e985c2497 Mon Sep 17 00:00:00 2001
From: lccsw <805383944@qq.com>
Date: Tue, 22 Nov 2022 15:39:35 +0800
Subject: [PATCH] edit-sylive-team_logo

---
 common/libraries/market/Sylive_entity.php | 2 +-
 home/controllers/h5/market/sylive/Biz.php | 6 +++---
 home/views/h5/market/sylive/act/index.php | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/libraries/market/Sylive_entity.php b/common/libraries/market/Sylive_entity.php
index f0def645..4e889fa3 100644
--- a/common/libraries/market/Sylive_entity.php
+++ b/common/libraries/market/Sylive_entity.php
@@ -392,7 +392,7 @@ class Sylive_entity{
      * @return int
      */
     public function get_team_lists($teamId,$data=[]){
-        $row = $this->ci->market_sylive_team_model->get(['teamId'=>$teamId],'teamId,parentId,teamName');
+        $row = $this->ci->market_sylive_team_model->get(['teamId'=>$teamId],'teamId,parentId,teamName,logo');
         if(!$row){
             return $data;
         }else{
diff --git a/home/controllers/h5/market/sylive/Biz.php b/home/controllers/h5/market/sylive/Biz.php
index 5198e8d7..683940ec 100644
--- a/home/controllers/h5/market/sylive/Biz.php
+++ b/home/controllers/h5/market/sylive/Biz.php
@@ -103,7 +103,7 @@ class Biz extends Admin {
             $count_gw = $this->user_model->count($where); //顾问
             $where = [
                 'status' => 0,
-                "activityId in (select activityId from lc_market_sylive_activity_biz where areaId={$area_id})" => null
+                "activityId in (select activityId from lc_market_sylive_activity_biz where areaId={$area_id} and status=0)" => null
             ];
             $count_live = $this->market_sylive_activity_model->count($where);
             $where = [
@@ -174,7 +174,7 @@ class Biz extends Admin {
             foreach ($rows as $val) {
                 $where = [
                     'status' => 0,
-                    "activityId in (select activityId from lc_market_sylive_activity_biz where areaId={$val['organizationId']})" => null
+                    "activityId in (select activityId from lc_market_sylive_activity_biz where areaId={$val['organizationId']} and status=0)" => null
                 ];
                 $activitynum = $this->market_sylive_activity_model->count($where);
                 $temp = [
@@ -213,7 +213,7 @@ class Biz extends Admin {
             foreach ($rows as $val) {
                 $where = [
                     'status' => 0,
-                    "activityId in (select activityId from lc_market_sylive_activity_biz where bizId={$val['organizationId']})" => null
+                    "activityId in (select activityId from lc_market_sylive_activity_biz where bizId={$val['organizationId']} and status=0)" => null
                 ];
                 $activitynum = $this->market_sylive_activity_model->count($where);
                 $where = [
diff --git a/home/views/h5/market/sylive/act/index.php b/home/views/h5/market/sylive/act/index.php
index c207a396..a0dd4055 100644
--- a/home/views/h5/market/sylive/act/index.php
+++ b/home/views/h5/market/sylive/act/index.php
@@ -119,7 +119,7 @@
             this.getInfo()
             if(this.info.alert_code){
                 // this.msgisShowCode = true
-                mDialog.msg('预约成功');
+                mDialog.msg({content: '预约成功'});
             }
             this.getNotice()