diff --git a/home/controllers/h5/market/sylive2/Stic.php b/home/controllers/h5/market/sylive2/Stic.php index 0eaeb444..6586ad32 100644 --- a/home/controllers/h5/market/sylive2/Stic.php +++ b/home/controllers/h5/market/sylive2/Stic.php @@ -53,7 +53,11 @@ class Stic extends Admin{ $info['biz_id'] = $groups['ifBiz'] ? $groups['groupsId'] : 0; } $info['groupsId'] = $groupsId ? $groupsId : $group_user['groupsId']; - $info['tab'] = time()>=strtotime($row['timeStart']) ? 2 : 1; + $info['tab'] = 1; + if(time()>=strtotime($row['timeStart']) && $this->a_id!=11){ + $info['tab'] = 2; + } + $info['aId'] = $this->a_id; $this->data['info'] = $info; //微信分享 $wx_info = $this->share_info($row); @@ -514,7 +518,6 @@ class Stic extends Admin{ } $this->data['day_list'] = $day_list; $groups = []; - $group_user = $this->groups_user_model->get(['activityId'=>$this->a_id,'userId'=>$this->uid]); $disk = $this->sylive2_entity->level_disk($this->a_id); if($disk){ foreach ($disk as $key=>$item) { @@ -529,8 +532,12 @@ class Stic extends Admin{ 'activityId' => $this->a_id, 'status' => 0 ]; + if($this->a_id==11){ + $where['price>'] = 0; + } $goods = $this->market_sylive_items_model->select($where,'sort desc,itemId desc',0,0,'itemId,title'); $info['itemId'] = $goods[0]['itemId'] ? $goods[0]['itemId'] : 0; + $info['aId'] = $this->a_id; $this->data['goods'] = $goods ? $goods : []; $groups[] = ['value'=>'','type'=>'biz','title'=>'门店排名']; $groups[] = ['value'=>'','type'=>'user','title'=>'顾问排名']; @@ -556,6 +563,9 @@ class Stic extends Admin{ 'watch' => $title.'观看排行', 'order' => $title.'订单排行' ]; + if($this->a_id==11){ + $title_arr['beforeOrder'] = $title.'留资排行'; + } $group_user = $this->groups_user_model->get(['activityId'=>$this->a_id,'userId'=>$this->uid]); $page = $params['page'] ? intval($params['page']) : 1; $size = 20; @@ -637,7 +647,6 @@ class Stic extends Admin{ $day_list[] = date('Y-m-d',$timeEnd - $i*24*60*60); } } - $group_user = $this->groups_user_model->get(['activityId'=>$this->a_id,'userId'=>$this->uid]); $disk = $this->sylive2_entity->level_disk($this->a_id); if($disk){ foreach ($disk as $key=>$item) { @@ -654,6 +663,9 @@ class Stic extends Admin{ 'activityId' => $this->a_id, 'status' => 0 ]; + if($this->a_id==11){ + $where['price>'] = 0; + } $goods = $this->market_sylive_items_model->select($where,'sort desc,itemId desc',0,0,'itemId,title'); } $groups[] = ['value'=>'','type'=>'biz','title'=>'门店排名']; diff --git a/home/views/h5/market/sylive2/stic/index.php b/home/views/h5/market/sylive2/stic/index.php index a322d95b..ec59e43e 100644 --- a/home/views/h5/market/sylive2/stic/index.php +++ b/home/views/h5/market/sylive2/stic/index.php @@ -27,6 +27,7 @@
+
@@ -40,6 +41,7 @@
+
diff --git a/home/views/h5/market/sylive2/stic/ranking.php b/home/views/h5/market/sylive2/stic/ranking.php index 7cefe653..686f408b 100644 --- a/home/views/h5/market/sylive2/stic/ranking.php +++ b/home/views/h5/market/sylive2/stic/ranking.php @@ -124,6 +124,25 @@ getInfo(){ this.info = { theme:'', + + tab:[ + { + id:'1', + kpi:'browse', + title:'浏览', + }, + { + id:'2', + kpi:'beforeOrder', + title:'留资', + }, + { + id:'4', + kpi:'order', + title:'订单', + }, + ], + tab:[ { id:'1', @@ -146,6 +165,7 @@ title:'订单', }, ], + date:, group:, goods: