From 58590116b279d57e6c3f70736924ebea890a779d Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期一, 17 七月 2023 15:24:56 +0800
Subject: [PATCH] no message
---
application/api/logic/ActivityInfo.php | 2
public/html/activity/invite2308.html | 63 +++++++++++++++++++++++++++++++
application/api/controller/User.php | 5 ++
application/api/logic/taoke/Parser.php | 4 +-
4 files changed, 71 insertions(+), 3 deletions(-)
diff --git a/application/api/controller/User.php b/application/api/controller/User.php
index a50f2e1..f726253 100644
--- a/application/api/controller/User.php
+++ b/application/api/controller/User.php
@@ -694,6 +694,7 @@
public function bind_invitation()
{
$invite_code = request()->param('invite_code','');
+ $deviceid=request()->param('deviceid','');
if(empty($invite_code)) $this->error('閭�璇风爜涓嶈兘涓虹┖');
$is_official = false;
$isOpenOfficialCode = config('site.isOpenOfficialCode');
@@ -714,6 +715,10 @@
if($f_user['status'] != 'normal')$this->error('閭�璇蜂汉甯愬彿宸茶閿佸畾锛屾殏鏃舵棤娉曢個璇�');
if($user['invitation_id'] != 0)$this->error('褰撳墠宸茬粦瀹氫笂绾х敤鎴�');
$save_data['invitation_id'] = $f_user['id'];
+ if(!empty($deviceid))
+ {//璁惧id
+ $save_data['login_deviceid'] = $deviceid;
+ }
if($f_user['invitation_id'] != 0)$save_data['f_invitation_id'] = $f_user['invitation_id'];
$res2 = $ModelUser->where(['id'=>$f_user['id']])->setInc('fans',1);
if(!$res2){
diff --git a/application/api/logic/ActivityInfo.php b/application/api/logic/ActivityInfo.php
index 2a08cdd..12e25b4 100644
--- a/application/api/logic/ActivityInfo.php
+++ b/application/api/logic/ActivityInfo.php
@@ -162,7 +162,7 @@
foreach($cusList as $cus)
{//寰幆鍙備笌娲诲姩鐨勪細鍛�
$tradeId=$act['id'].'u'.$cus['user_id'];
- $yqCount=Db::query('select count(1) as count from t_user where invitation_id=? and invite_bind_time>=? and invite_bind_time<=?',[$cus['user_id'],$cus['create_time'],$actEndTime]);
+ $yqCount=Db::query('select count(1) as count from t_user where invitation_id=? and status=? and invite_bind_time>=? and invite_bind_time<=?',[$cus['user_id'],'normal',$cus['create_time'],$actEndTime]);
if(empty($yqCount))
{
Db::execute('update t_recruit_act set settlement_status=?,settlement_time=?,act_count=0,act_award=0 where id=?',[1, date("Y-m-d H:i:s", time()),$tradeId]);
diff --git a/application/api/logic/taoke/Parser.php b/application/api/logic/taoke/Parser.php
index 2e90422..a1d519f 100644
--- a/application/api/logic/taoke/Parser.php
+++ b/application/api/logic/taoke/Parser.php
@@ -47,7 +47,7 @@
$topLevelInfo = $ModelUserLevel->where(['level'=>3])->find();
if(empty($topLevelInfo)) fault('浠ｇ悊閰嶇疆澶辫触');
//鑾峰彇璐拱娆℃暟
- $ModelUserExtend=new ModelUserExtend();
+ /* $ModelUserExtend=new ModelUserExtend();
$userBuy= $ModelUserExtend->where(['id'=>USERID])->find();
if(!empty($userBuy))
{
@@ -56,7 +56,7 @@
if(self::$buyCount>=0&&self::$buyCount<self::$returnLimit)
{//绗﹀悎鍏ㄨ繑瑙勫垯
self::$userRate =1;
- }
+ } */
self::$topFanliRate = $topLevelInfo['own_commission_rate'] * 0.01;
self::$topLevelName = $topLevelInfo['level_name'];
}
diff --git a/public/html/activity/invite2308.html b/public/html/activity/invite2308.html
index e69de29..28e9f67 100644
--- a/public/html/activity/invite2308.html
+++ b/public/html/activity/invite2308.html
@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+ <meta charset="UTF-8"><meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta name="App-Config" content="fullscreen=yes,useHistoryState=yes,transition=yes">
+ <meta content="yes" name="apple-mobile-web-app-capable"><meta content="yes" name="apple-touch-fullscreen">
+ <meta content="telephone=no,email=no" name="format-detection">
+ <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no,viewport-fit=cover">
+ <script type="text/javascript" src="https://public.ffquan.cn/lib/jquery-1.12.4.min.js"></script>
+ <script type="text/javascript" src="https://public.ffquan.cn/lib/vue-lazyload.js"></script>
+ <script type="text/javascript" src="https://public.ffquan.cn/lib/swiper/js/swiper.min.js"></script>
+ <script type="text/javascript" src="https://public.ffquan.cn/lib/taobaoCode/taobaoCode.js?v=1.2.1"></script>
+ <script type="text/javascript" src="https://public.ffquan.cn/lib/clipboard.min.js"></script>
+ <script type="text/javascript" src="https://p1static.dataoke.com/web/js/layer/layer.js?t=202104191256"></script>
+ <script type="text/javascript" src="https://img.ushopvip.com/js/uni-webview-js.js"></script>
+ <title>閭�绮夐鐜伴噾</title>
+
+ <style>
+
+ </style>
+</head>
+
+<body style="background: #f5f5f9;">
+ <div id="inviteact">
+
+ </div>
+</body>
+
+</html>
+<script type="text/javascript" src="https://cdn.staticfile.org/vue/2.6.11/vue.min.js"></script>
+<script>
+
+(function () {
+ var size1=document.body.clientWidth;
+ var size2=document.documentElement.clientWidth;
+ var size=size1<=0?size2:size1;
+ size=size<=0?400:size;
+ document.documentElement.style.fontSize = (size > 750 ? 750 : size) / 7.5 + 'px';
+ })();
+
+ Vue.use(VueLazyload, {
+ preLoad: 1.3,//
+ error: 'https://sr.ffquan.cn/cms_pic/20200622/bro7s7f6vrkd3jat4ujg0.png',
+ loading: 'https://sr.ffquan.cn/cms_pic/20200612/brhjkf76vrkcrfpi79eg0.png',
+ attempt: 1
+ })
+ var app= new Vue({
+ el: '#inviteact',
+ data:{
+ //posturl:'http://dfg.shop.com',
+ posturl:'https://appapitest.ushopvip.com',
+ //posturl:'http://dfgapp.ushopvip.com',
+
+ },
+ methods:{
+
+ },
+ mounted:function(){
+
+ }
+ })
+</script>
\ No newline at end of file
--
Gitblit v1.9.3