diff --git a/common/libraries/SsApi.php b/common/libraries/SsApi.php index f9eb43b6..83441956 100644 --- a/common/libraries/SsApi.php +++ b/common/libraries/SsApi.php @@ -117,7 +117,7 @@ class SsApi public function getBiz($biz_id, $cache = true) { - $cacheKey = "SYTSTOPIC_SSAPI_BIZ_{$biz_id}"; + $cacheKey = "SYSTOPIC_SSAPI_BIZ_{$biz_id}"; $redis = &load_cache(); if ($cache) { $bizInfo = $redis->get($cacheKey); diff --git a/common/models/market/Market_sytopic_module_model.php b/common/models/market/Market_sytopic_module_model.php index 6ca7c54b..22195497 100644 --- a/common/models/market/Market_sytopic_module_model.php +++ b/common/models/market/Market_sytopic_module_model.php @@ -36,7 +36,7 @@ class Market_sytopic_module_model extends HD_Model public function getTopicModelIds($topicId) { $where = ['topicId' => $topicId, 'status' => 0, 'type!=' => self::TYPE_ENROLL_BANNER]; - $modelList = $this->map('id', 'type', $where, 'sort desc,type asc', 1, 100, 'id,type'); + $modelList = $this->map('id', '', $where, 'sort desc,type asc', 1, 100, 'id,type,title'); return $modelList ?: []; } diff --git a/common/models/market/Market_sytopic_module_option_model.php b/common/models/market/Market_sytopic_module_option_model.php index d1328981..4ae27adc 100644 --- a/common/models/market/Market_sytopic_module_option_model.php +++ b/common/models/market/Market_sytopic_module_option_model.php @@ -20,9 +20,9 @@ class Market_sytopic_module_option_model extends HD_Model $where = ['topicId' => $topicId, 'status' => 0, "moduleId in ({$modelIdsStr})" => null]; $modelOptionsList = $this->select($where, "FIELD (moduleId,{$modelIdsStr})", 1, 100); foreach ($modelOptionsList as $item) { - $type = $modelList[$item['moduleId']]; - $lists[$item['moduleId']]['type'] = $type; - $lists[$item['moduleId']]['lists'][] = $this->formItem($type, $item);; + $model = $modelList[$item['moduleId']][0]; + $lists[$item['moduleId']]['type'] = $model['type']; + $lists[$item['moduleId']]['lists'][] = $this->formItem($model, $item);; } } return $lists; @@ -37,16 +37,18 @@ class Market_sytopic_module_option_model extends HD_Model { $this->load->model('market/market_sytopic_module_model'); $moduleModel = new Market_sytopic_module_model(); - $modelList = $moduleModel->select(['type' => $moduleModel::TYPE_ENROLL_BANNER,'status'=>0], '', '', '', 'id'); + $modelList = $moduleModel->map('id','',['type' => $moduleModel::TYPE_ENROLL_BANNER, 'status' => 0], '', '', '', 'id,title'); $lists = []; if ($modelList) { - $modelIdsStr = implode(',', array_column($modelList, 'id')); + $modelIdsStr = implode(',', array_keys($modelList)); $where = ['topicId' => $topicId, 'status' => 0, "moduleId in ({$modelIdsStr})" => null]; $modelOptionsList = $this->select($where, "FIELD (moduleId,{$modelIdsStr})", 1, 100); foreach ($modelOptionsList as $item) { + $model = $modelList[$item['moduleId']][0]; $lists[] = [ 'id' => $item['id'], 'title' => '', + 'model_title' => $model['title'], 'popUpType' => $item['popUpType'], 'banner' => $item['banner'] ? build_qiniu_image_url($item['banner']) : '', 'type' => $moduleModel::TYPE_ENROLL_BANNER, @@ -57,12 +59,13 @@ class Market_sytopic_module_option_model extends HD_Model } //格式化数据 - private function formItem($type, $item) + private function formItem($model, $item) { $this->load->model('market/market_sytopic_module_model'); $this->load->model('market/market_sytopic_enroll_model'); $data = [ 'id' => $item['id'], + 'model_title' => $model['title'], 'title' => $item['title'], 'subTitle' => $item['subTitle'], 'showBtn' => (bool)$item['showBtn'], @@ -80,7 +83,7 @@ class Market_sytopic_module_option_model extends HD_Model } $data['otherImg'] = $otherImgSet; $jsonData = json_encode($item['jsondata'], true); - switch ($type) { + switch ($model['type']) { case Market_sytopic_module_model::TYPE_DISCOUNT: //特惠报名 $endTime = 0; $showTime = false; diff --git a/home/controllers/Welcome.php b/home/controllers/Welcome.php index 2d163730..69c3745e 100644 --- a/home/controllers/Welcome.php +++ b/home/controllers/Welcome.php @@ -73,8 +73,8 @@ class Welcome extends CI_Controller { public function add_clues() { - $mobiles = array('18026707289','13725087668','15006189925','18001799458','13932314222','13955578727','15006164471','18206199976','18916099217','15166749793','15382387791','18567463777','13715262293','18861815522','18712271527','15655009393','15161556496','18861823876','17312709562','18036039699','15345357177','15986907547','15323224293','18915271818','18818868225','19868733121','18818868225','15021728341','13928969565','18602532138','18915271818','13829938512','15815556647','15026876266','18516515323','18616678727','15346194240','15908007270','13068252098','15087784912','18217276629','15755354760','13601928214','13416806753','18938548608','15819666634','13723673107','17373871079','13450438323','15871072727'); - $dealerCode = '100531'; + $mobiles = array('13851395658','18271924002','13972345374','15826574179','15866211996','15826501048','18172576894','15036807871','13956709302','15109311801','13648040299','15965116200','15192717702','18743498212','13694396399','13302198068','13296329907','18537096927','13997695028','13336329575'); + $dealerCode = '101207'; foreach ($mobiles as $k => $v) { $city_id = '350200'; @@ -82,7 +82,7 @@ class Welcome extends CI_Controller { $data[] = array( 'voId' => $voId, - 'cusSource3' => '020103',//'023409',//023410：云店营销节点 + 'cusSource3' => '023410',//'023409',//023410：云店营销节点 'customerName' => '客户', 'dealerCode' => $dealerCode, 'fromSystem' => "好店云", diff --git a/home/controllers/h5/market/Draw.php b/home/controllers/h5/market/Draw.php index 4aa60e18..b0a40b93 100644 --- a/home/controllers/h5/market/Draw.php +++ b/home/controllers/h5/market/Draw.php @@ -136,7 +136,7 @@ class Draw extends CI_Controller if ($v['itemIds']) { //不中奖奖品 - if($activityId == 29 and in_array($winType, array(1,2,3))){ + if(($activityId == 29 || $activityId == 32) and in_array($winType, array(1,2,3,4))){ $activityId = 21; $whereOrder = ['activityId' => $activityId, 'status' => 1]; $v['itemIds'] = [27]; @@ -257,7 +257,7 @@ class Draw extends CI_Controller $dev = false !== strpos($_SERVER['HTTP_HOST'], 'dev') ? 1 : 0; foreach ($result as $v) { - if($activityId == 29 and in_array($winType, array(1,2,3))){ + if(($activityId == 29 || $activityId == 32) and in_array($winType, array(1,2,3,4))){ $resultSet[] = $v; $winNum++; $sms++; diff --git a/home/controllers/h5/market/sylive2/Login.php b/home/controllers/h5/market/sylive2/Login.php index 078e4cc3..14ce6d56 100644 --- a/home/controllers/h5/market/sylive2/Login.php +++ b/home/controllers/h5/market/sylive2/Login.php @@ -35,11 +35,15 @@ class Login extends CI_Controller{ if($wx_info['nickname'] || $wx_info['headimgurl']){ $data['auth_userinfo'] = true; } + + $cf = $this->input->get('cf'); + //微信分享 $this->load->library('Jssdk'); $jssdk = new Jssdk('liche'); $sign_package = $jssdk->getSignPackage(); $data['sign_package'] = $sign_package; + $data['cf'] = $cf; $this->load->view('h5/market/sylive2/login',$data); } } diff --git a/home/controllers/h5/market/sylive2/Stic.php b/home/controllers/h5/market/sylive2/Stic.php index dac134f5..5d854061 100644 --- a/home/controllers/h5/market/sylive2/Stic.php +++ b/home/controllers/h5/market/sylive2/Stic.php @@ -111,9 +111,9 @@ class Stic extends Admin //"cfUserId in (SELECT userId FROM lc_market_sylive_groups_user WHERE activityId = {$this->a_id} and bizId > 0 and status = 0)" => null ]; $kgw_total = $this->mdSytActivityKpiData->count($where, "cfUserId"); - $h_lists[] = ['title' => '参与门店', 'num' => "{$biz_total}个"]; - $h_lists[] = ['title' => '参与顾问', 'num' => "{$gw_total}人"]; - $h_lists[] = ['title' => '开工顾问', 'num' => "{$kgw_total}人"]; + $h_lists[] = ['title' => '参与团队', 'num' => "{$biz_total}个"]; + $h_lists[] = ['title' => '参与团员', 'num' => "{$gw_total}人"]; + $h_lists[] = ['title' => '开工团员', 'num' => "{$kgw_total}人"]; $h_lists[] = ['title' => '开工率', 'num' => $gw_total ? round($kgw_total / $gw_total * 100, 2) . "%" : 0]; //我的 $where = [ @@ -225,7 +225,7 @@ class Stic extends Admin $biz[] = ['title' => '预约率', 'num' => $browse_count ? round($subscribe_count / $browse_count * 100, 2) . "%" : 0]; } $biz[] = ['title' => '留资数', 'num' => "{$order_count}人"]; - $title = $disk[$group_row['groupsLevel'] + 1] ? '所有' . $disk[$group_row['groupsLevel'] + 1] : '所有门店'; + $title = $disk[$group_row['groupsLevel'] + 1] ? '所有' . $disk[$group_row['groupsLevel'] + 1] : '所有团队'; $group_row['ifBiz'] && $title = $group_row['groupsName']; $sub_lists[] = ['title' => "{$title}", 'lists' => $biz]; } @@ -274,7 +274,7 @@ class Stic extends Admin ['title' => '人均观看', 'num' => "{$avg_UV_time}分钟"], ['title' => '观看次数', 'num' => "{$livePV}次"], ]; - if ($group_user['bizId']) { //门店和顾问 + if ($group_user['bizId']) { //团队和团员 $biz_id = $group_user['bizId']; $where = [ 'activityId' => $this->a_id, @@ -310,7 +310,7 @@ class Stic extends Admin ['title' => '下单数', 'num' => "{$subscribe_count}单", 'url' => $sub_url], ['title' => '转化率', 'num' => $browse_count ? round($subscribe_count / $browse_count * 100, 2) . "%" : 0], ]; - $title = $disk[$group_row['groupsLevel'] + 1] ? '所有' . $disk[$group_row['groupsLevel'] + 1] : '所有门店'; + $title = $disk[$group_row['groupsLevel'] + 1] ? '所有' . $disk[$group_row['groupsLevel'] + 1] : '所有团队'; $group_row['ifBiz'] && $title = $group_row['groupsName']; $sub_lists[] = ['title' => "{$title}", 'lists' => $biz]; } @@ -400,8 +400,8 @@ class Stic extends Admin $tab = [ ['id' => 1, 'title' => '客户列表'] ]; - if ($params['type'] == 'biz' && $params['type_id']) { //显示顾问数据 - $tab[] = ['id' => 2, 'title' => '顾问数据']; + if ($params['type'] == 'biz' && $params['type_id']) { //显示团员数据 + $tab[] = ['id' => 2, 'title' => '团员数据']; } $goods = []; if ($params['kpi'] == 'order') { @@ -427,7 +427,7 @@ class Stic extends Admin public function user_lists() { $params = $this->input->get(); - if ($params['tabid'] == 2) { //顾问数据 + if ($params['tabid'] == 2) { //团员数据 $this->gw_lists(); } $page = $params['page'] ? intval($params['page']) : 1; @@ -600,7 +600,7 @@ class Stic extends Admin $note = ''; $url = "/h5/market/sylive2/stic?groupsId={$item['groupsId']}"; if (!$item['ifBiz']) { - $note = $disk[$item['groupsLevel'] + 1] ? $disk[$item['groupsLevel'] + 1] : '门店'; + $note = $disk[$item['groupsLevel'] + 1] ? $disk[$item['groupsLevel'] + 1] : '团队'; } else { $count = ''; } @@ -663,8 +663,8 @@ class Stic extends Admin $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' => '顾问排名']; + $groups[] = ['value' => '', 'type' => 'biz', 'title' => '团队排名']; + $groups[] = ['value' => '', 'type' => 'user', 'title' => '团员排名']; $this->data['groups'] = $groups; $this->data['info'] = $info; //微信分享 @@ -794,8 +794,8 @@ class Stic extends Admin } $goods = $this->market_sylive_items_model->select($where, 'sort desc,itemId desc', 0, 0, 'itemId,title'); } - $groups[] = ['value' => '', 'type' => 'biz', 'title' => '门店排名']; - $groups[] = ['value' => '', 'type' => 'user', 'title' => '顾问排名']; + $groups[] = ['value' => '', 'type' => 'biz', 'title' => '团队排名']; + $groups[] = ['value' => '', 'type' => 'user', 'title' => '团员排名']; $this->data['groups'] = $groups; $this->data['day_list'] = $day_list; $this->data['params'] = $params; diff --git a/home/controllers/h5/market/sytopic/Welcome.php b/home/controllers/h5/market/sytopic/Welcome.php index fefbf291..13a5aafe 100644 --- a/home/controllers/h5/market/sytopic/Welcome.php +++ b/home/controllers/h5/market/sytopic/Welcome.php @@ -45,6 +45,7 @@ class Welcome extends Wx 'banner' => $jsonData['banner'] ? build_qiniu_image_url($jsonData['banner']) : '', 'bgColor' => $jsonData['bg_color'] ?: '', 'buttonType' => $jsonData['button_type'] ? (int)$jsonData['button_type'] : '', + 'bottom_img' => $jsonData['bottom_img'] ? build_qiniu_image_url($jsonData['bottom_img']) : '', ]; $moduleLists = $this->module_option_model->getTopicModelOptionsList($this->a_id); $this->data['modules'] = array_values($moduleLists); @@ -66,6 +67,7 @@ class Welcome extends Wx $wx_info = $this->share_info([], $row);//微信分享 $this->data['sign_package'] = $wx_info['sign_package']; $this->data['share'] = $wx_info['share']; + $this->data['_title'] = $row['title']; $this->show_view('h5/market/sytopic/index'); } diff --git a/home/views/h5/market/sylive2/act/share.php b/home/views/h5/market/sylive2/act/share.php index 68d763b6..2b738adb 100644 --- a/home/views/h5/market/sylive2/act/share.php +++ b/home/views/h5/market/sylive2/act/share.php @@ -9,7 +9,7 @@
-
{{posterTip}}

欢迎使用

-

好店云私域营销系统

+

私域营销系统

    diff --git a/home/views/h5/market/sylive2/login.php b/home/views/h5/market/sylive2/login.php index 395aa059..da194901 100644 --- a/home/views/h5/market/sylive2/login.php +++ b/home/views/h5/market/sylive2/login.php @@ -22,7 +22,11 @@
    手机号登录
    + +
    欢迎使用理车宝-私域活动系统
    +
    欢迎使用好店云-私域活动系统
    +
    @@ -43,9 +47,11 @@ -->
    +
    powered by haodian.cn
    +
diff --git a/home/views/h5/market/sytopic/index.php b/home/views/h5/market/sytopic/index.php index 9a3f9881..3791b7cf 100644 --- a/home/views/h5/market/sytopic/index.php +++ b/home/views/h5/market/sytopic/index.php @@ -125,10 +125,22 @@
+
+ +
@@ -416,14 +432,14 @@
-

{{info.title}}

+

{{popCarInfo.mTitle ? popCarInfo.mTitle : info.title}}

{{popCarInfo.title}}

-

指导价{{popCarInfo.subTitle}} +

{{popCarInfo.subTitle}}

@@ -456,14 +472,14 @@ :style="{ 'min-height': '30%', 'background-color': 'transparent' }">
-

{{info.title}}

+

{{popCarInfo.mTitle ? popCarInfo.mTitle : info.title}}

{{popCarInfo.title}}

-

指导价{{popCarInfo.subTitle}} +

{{popCarInfo.subTitle}}

@@ -509,7 +525,7 @@
-

{{info.title}}

+

{{info.title}}