From 22c1ef83a434f7b1ddcdec1d915cc64ed459ac54 Mon Sep 17 00:00:00 2001
From: lccsw <805383944@qq.com>
Date: Mon, 20 Mar 2023 16:46:35 +0800
Subject: [PATCH] edit-sylive-kpi

---
 home/controllers/h5/market/sylive2/Act.php    |  3 ++-
 home/controllers/h5/market/sylive2/Stic.php   | 13 +++++++++----
 home/views/h5/market/sylive2/stic/rank.php    |  1 -
 home/views/h5/market/sylive2/stic/ranking.php |  3 +--
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/home/controllers/h5/market/sylive2/Act.php b/home/controllers/h5/market/sylive2/Act.php
index 02d258e5..5cbcc0e0 100644
--- a/home/controllers/h5/market/sylive2/Act.php
+++ b/home/controllers/h5/market/sylive2/Act.php
@@ -545,7 +545,8 @@ class Act extends Wx {
                 'userId' => $this->uid,
                 'ifAppointment' => 1,
                 'mobile' => $mobile,
-                'createTime' => date('Y-m-d H:i:s')
+                'createTime' => date('Y-m-d H:i:s'),
+                'level' => 'H'
             ];
             $act_user_row['channelId'] && $add_data['cfUserId'] = $act_user_row['channelId'];
             $p_user['bizId'] && $add_data['bizId'] = $p_user['bizId'];
diff --git a/home/controllers/h5/market/sylive2/Stic.php b/home/controllers/h5/market/sylive2/Stic.php
index e5c0c414..e2480e8f 100644
--- a/home/controllers/h5/market/sylive2/Stic.php
+++ b/home/controllers/h5/market/sylive2/Stic.php
@@ -489,7 +489,7 @@ class Stic extends Admin{
         $end_time = time()< strtotime($row['timeEnd']) ? time() : strtotime($row['timeEnd']);
         $diff_seconds = $end_time - $activityStart;
         $diff_days = ceil($diff_seconds/86400);
-        $day_list = ['全部'];
+        $day_list = ['日期'];
         $timeEnd = strtotime($row['timeEnd']);//直播结束往前七天
         for($i=0;$i<$diff_days;$i++){
             if(time()< strtotime($row['timeEnd'])){
@@ -516,6 +516,7 @@ class Stic extends Admin{
             'status' => 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;
         $this->data['goods'] = $goods ? $goods : [];
         $groups[] = ['value'=>'','type'=>'biz','title'=>'门店排名'];
         $groups[] = ['value'=>'','type'=>'user','title'=>'顾问排名'];
@@ -550,8 +551,12 @@ class Stic extends Admin{
             $where = [
                 'activityId' => $this->a_id,
                 'status' => 0,
-                'kpi' => $kpi
             ];
+            if($kpi=='order'){
+                $where["(kpi='order' or kpi='beforeOrder')"] = null;
+            }else{
+                $where['kpi'] = $kpi;
+            }
             if($params['type']=='level'){
                 $group_by = "levelId{$params['value']}";
                 $select = "{$group_by} as tagId,count(id) as t";
@@ -600,7 +605,7 @@ class Stic extends Admin{
 
     public function rank(){
         $params = $this->input->get();
-        !$params['day'] && $params['day'] = '全部';
+        !$params['day'] && $params['day'] = '日期';
         $row = $this->market_sylive_activity_model->get(['activityId'=>$this->a_id]);
         if(!$row){
             throw new Hd_exception('参数错误',400);
@@ -609,7 +614,7 @@ class Stic extends Admin{
         $end_time = time()< strtotime($row['timeEnd']) ? time() : strtotime($row['timeEnd']);
         $diff_seconds = $end_time - $activityStart;
         $diff_days = ceil($diff_seconds/86400);
-        $day_list = ['全部'];
+        $day_list = ['日期'];
         $timeEnd = strtotime($row['timeEnd']);//直播结束往前七天
         for($i=0;$i<$diff_days;$i++){
             if(time()< strtotime($row['timeEnd'])){
diff --git a/home/views/h5/market/sylive2/stic/rank.php b/home/views/h5/market/sylive2/stic/rank.php
index 114f44fc..154871fd 100644
--- a/home/views/h5/market/sylive2/stic/rank.php
+++ b/home/views/h5/market/sylive2/stic/rank.php
@@ -15,7 +15,6 @@
             </div>
             <div class="pt30" v-if="kpi=='order' && goodsList">
                 <select class="wp100 select-more ulib-r10 font-28" style="width: 100%" @change="changegoods" v-model="goodsId">
-                    <option value="">全部</option>
                     <option :value="item.itemId" v-for="item in goodsList">{{item.title}}</option>
                 </select>
             </div>
diff --git a/home/views/h5/market/sylive2/stic/ranking.php b/home/views/h5/market/sylive2/stic/ranking.php
index d6c8b14e..3e16a24b 100644
--- a/home/views/h5/market/sylive2/stic/ranking.php
+++ b/home/views/h5/market/sylive2/stic/ranking.php
@@ -40,7 +40,6 @@
                 </div>
                 <div v-if="tabid==4">
                     <select class="select-more box-shadow-lightGray ulib-r10 font-22" @change="handleChange($event,'goods')" style="width: 100%">
-                        <option value="0">全部</option>
                         <option :value="item.itemId" v-for="item in info.goods">{{item.title}}</option>
                     </select>
                 </div>
@@ -95,7 +94,7 @@
                 list:[],
             },
             kpi: 'browse',
-            itemId:0,
+            itemId:<?=$info['itemId']?>,
         },
         mounted() {
             window.addEventListener('scroll', this.handleScroll, true)