From e57dc7a24d12a33691360ffbbd6741da35a204a2 Mon Sep 17 00:00:00 2001 From: lccsw <805383944@qq.com> Date: Thu, 20 Oct 2022 14:00:58 +0800 Subject: [PATCH] add-sylive-hidden_wx_share --- api/third_party/WXconfig/hdy_WxPay.Config.php | 29 +++++++++++++++++++ common/libraries/market/Sylive_entity.php | 20 +++++++++++++ .../libraries/receiver/Order_datas_entity.php | 2 +- home/controllers/h5/market/sylive/Act.php | 15 ++++++---- home/controllers/h5/market/sylive/Notify.php | 2 +- home/views/h5/market/sylive/act/index.php | 6 ++-- home/views/h5/market/sylive/act/item.php | 3 +- home/views/h5/market/sylive/act/share.php | 3 +- home/views/h5/market/sylive/act/ucenter.php | 3 +- home/views/h5/market/sylive/biz/brands.php | 5 ++-- home/views/h5/market/sylive/biz/index.php | 5 ++-- home/views/h5/market/sylive/biz/lists.php | 5 ++-- home/views/h5/market/sylive/header.php | 2 +- .../h5/market/sylive/hidden_wx_share.php | 13 ++------- home/views/h5/market/sylive/login.php | 5 ++-- home/views/h5/market/sylive/share_script.php | 13 ++++++++- home/views/h5/market/sylive/stic/area.php | 3 +- home/views/h5/market/sylive/stic/index.php | 3 +- home/views/h5/market/sylive/stic/rank.php | 3 +- home/views/h5/market/sylive/stic/users.php | 3 +- www/home/css/h5/market/sylive/h5.css | 2 +- 21 files changed, 106 insertions(+), 39 deletions(-) create mode 100755 api/third_party/WXconfig/hdy_WxPay.Config.php diff --git a/api/third_party/WXconfig/hdy_WxPay.Config.php b/api/third_party/WXconfig/hdy_WxPay.Config.php new file mode 100755 index 00000000..c4da0141 --- /dev/null +++ b/api/third_party/WXconfig/hdy_WxPay.Config.php @@ -0,0 +1,29 @@ +ci->mdSytActivityBiz->count($where) ? true : false; + } /** * 获取等级数据 * @param $organizationId diff --git a/common/libraries/receiver/Order_datas_entity.php b/common/libraries/receiver/Order_datas_entity.php index 5c19c47d..54f719c2 100644 --- a/common/libraries/receiver/Order_datas_entity.php +++ b/common/libraries/receiver/Order_datas_entity.php @@ -373,7 +373,7 @@ class Order_datas_entity{ 'color' => $color['title'] ? $color['title'] : '', 'vin' => $item['vin'] ? $item['vin'] : '', 'sale_name' => $sale_row['uname'] ? $sale_row['uname'] : '', - 'channel_name' => $qd_row['uname'] ? $qd_row['uname'] : '', + 'channel_name' => $qd_row['uname'] ? $qd_row['uname'] : $sale_row['uname'], 'time' => date('Y-m-d'), 'fill_2' => $fill_2 ]; diff --git a/home/controllers/h5/market/sylive/Act.php b/home/controllers/h5/market/sylive/Act.php index 53f5a2d6..63df2732 100644 --- a/home/controllers/h5/market/sylive/Act.php +++ b/home/controllers/h5/market/sylive/Act.php @@ -12,11 +12,18 @@ class Act extends Wx { parent::__construct(); $this->load->model('market/market_sylive_organization_model'); $this->load->model('market/market_sylive_activity_model'); + $this->load->model('market/market_sylive_activity_biz_model','mdSytActivityBiz'); $this->load->model('market/market_sylive_subscribemsg_model','mdSytSubscribemsg'); $this->load->model('market/market_sylive_activity_kpidata_model','mdSytActivityKpiData'); $this->load->model('market/market_sylive_order_model'); $this->load->library('market/sylive_entity'); + $skey = $this->input->get('skey'); + $param = $this->myencryption->base64url_decode($skey); + $a_id = intval($param['a_id']);//活动id $this->group_id = $this->sylive_entity->get_level($this->session['org_id']); + if($this->group_id<4 && $a_id && !$this->sylive_entity->act_role($this->session['org_id'],$this->group_id,$a_id)){ + $this->group_id = 4; + } } public function index(){ @@ -72,13 +79,11 @@ class Act extends Wx { $info['a_id'] = $a_id; $info['org_id'] = $this->session['org_id']; $info['subscribemsg'] = $subscribemsg; - $info['code'] = ''; + $info['statisticsurl'] = $info['shareurl'] = $info['code'] = ''; if($this->group_id<4){ $info['shareurl'] = '/h5/market/sylive/act/share?skey='.$info['skey']; - }else{ - $info['shareurl'] = ''; + $info['statisticsurl'] = '/h5/market/sylive/stic?skey='.$info['skey']; } - $info['statisticsurl'] = '/h5/market/sylive/stic?skey='.$info['skey']; $info['channelImg'] = build_qiniu_image_url($row['channelImg']); // $info['live_url'] = 'https://live.liche.cn/watch/'.$row['channelId']; $userid = $user['unionid'] ? $user['unionid'] : $this->uid; @@ -412,7 +417,7 @@ class Act extends Wx { private function pay($trade_no,$price,$openid,$body,$notify_url,$expire_time,$attach=''){ if(!$body){return false;} - require_once APPPATH."../api/third_party/WXconfig/liche_home_WxPay.Config.php"; + require_once APPPATH."../api/third_party/WXconfig/hdy_WxPay.Config.php"; require_once APPPATH."../api/third_party/WXpay/WxPay.Api.php"; $config = new WxPayConfig(); $wxpay = new WxPayUnifiedOrder(); diff --git a/home/controllers/h5/market/sylive/Notify.php b/home/controllers/h5/market/sylive/Notify.php index a91ea90a..14fb8392 100644 --- a/home/controllers/h5/market/sylive/Notify.php +++ b/home/controllers/h5/market/sylive/Notify.php @@ -1,7 +1,7 @@ -
+
+
@@ -206,6 +207,5 @@ } }) - load->view('h5/market/sylive/share_script')?> diff --git a/home/views/h5/market/sylive/act/item.php b/home/views/h5/market/sylive/act/item.php index adf4aa12..60fc5fa3 100644 --- a/home/views/h5/market/sylive/act/item.php +++ b/home/views/h5/market/sylive/act/item.php @@ -1,5 +1,6 @@ -
+
+
diff --git a/home/views/h5/market/sylive/act/share.php b/home/views/h5/market/sylive/act/share.php index 98972e78..fbce29aa 100644 --- a/home/views/h5/market/sylive/act/share.php +++ b/home/views/h5/market/sylive/act/share.php @@ -1,6 +1,7 @@ -
+
+
diff --git a/home/views/h5/market/sylive/act/ucenter.php b/home/views/h5/market/sylive/act/ucenter.php index 6fe76f11..d696a74e 100644 --- a/home/views/h5/market/sylive/act/ucenter.php +++ b/home/views/h5/market/sylive/act/ucenter.php @@ -1,5 +1,6 @@ -
+
+
diff --git a/home/views/h5/market/sylive/biz/brands.php b/home/views/h5/market/sylive/biz/brands.php index df05ee1f..2063c581 100644 --- a/home/views/h5/market/sylive/biz/brands.php +++ b/home/views/h5/market/sylive/biz/brands.php @@ -1,5 +1,6 @@ -
+
+
@@ -216,5 +217,5 @@ }, }) -load->view('h5/market/sylive/share_script')?> +load->view('h5/market/sylive/hidden_wx_share')?> \ No newline at end of file diff --git a/home/views/h5/market/sylive/biz/index.php b/home/views/h5/market/sylive/biz/index.php index 3f95c2f4..b280e34c 100644 --- a/home/views/h5/market/sylive/biz/index.php +++ b/home/views/h5/market/sylive/biz/index.php @@ -1,5 +1,6 @@ -
+
+
@@ -131,5 +132,5 @@ }, }) -load->view('h5/market/sylive/share_script')?> +load->view('h5/market/sylive/hidden_wx_share')?> \ No newline at end of file diff --git a/home/views/h5/market/sylive/biz/lists.php b/home/views/h5/market/sylive/biz/lists.php index 21796d27..519cc350 100644 --- a/home/views/h5/market/sylive/biz/lists.php +++ b/home/views/h5/market/sylive/biz/lists.php @@ -1,5 +1,6 @@ -
+
+
@@ -224,5 +225,5 @@ }, }) -load->view('h5/market/sylive/share_script')?> +load->view('h5/market/sylive/hidden_wx_share')?> \ No newline at end of file diff --git a/home/views/h5/market/sylive/header.php b/home/views/h5/market/sylive/header.php index 192f9717..221c39dd 100644 --- a/home/views/h5/market/sylive/header.php +++ b/home/views/h5/market/sylive/header.php @@ -7,7 +7,7 @@ content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no"> <?=$_title?> - + diff --git a/home/views/h5/market/sylive/hidden_wx_share.php b/home/views/h5/market/sylive/hidden_wx_share.php index e0527a8a..98e8144b 100644 --- a/home/views/h5/market/sylive/hidden_wx_share.php +++ b/home/views/h5/market/sylive/hidden_wx_share.php @@ -5,20 +5,11 @@ timestamp: "", // 必填,生成签名的时间戳 nonceStr: "", // 必填,生成签名的随机串 signature: "",// 必填,签名 - jsApiList: ["openLocation", "updateAppMessageShareData", "updateTimelineShareData"], // 必填,需要使用的JS接口列表 + jsApiList: ["hideAllNonBaseMenuItem", "hideMenuItems"], // 必填,需要使用的JS接口列表 openTagList: ['wx-open-launch-weapp'] // 可选,需要使用的开放标签列表,例如['wx-open-launch-app'] }); wx.ready(function () { - wx.closeWindow(); - wx.hideMenuItems({ - menuList: [ - 'menuItem:share:appMessage', 'menuItem:share:timeline','menuItem:share:qq' - 'menuItem:share:weiboApp','menuItem:share:facebook','menuItem:share:QZone', - 'menuItem:editTag','menuItem:delete','menuItem:copyUrl', - 'menuItem:originPage','menuItem:readMode','menuItem:openWithQQBrowser','menuItem:openWithSafari', - 'menuItem:share:email','menuItem:share:brand' - ] // 要隐藏的菜单项,只能隐藏“传播类”和“保护类”按钮,所有 menu 项见附录3 - }); + wx.hideAllNonBaseMenuItem(); }); wx.error(function (res) { console.log('res', res); diff --git a/home/views/h5/market/sylive/login.php b/home/views/h5/market/sylive/login.php index 182fb994..484dfeed 100644 --- a/home/views/h5/market/sylive/login.php +++ b/home/views/h5/market/sylive/login.php @@ -7,7 +7,7 @@ content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no"> <?=$_title?> - + @@ -15,7 +15,8 @@ -